1083 files changed, 4927 insertions, 22664 deletions

diff --git a/data/battle_bg.s b/data/battle_bg.s
deleted file mode 100644
index a6c67612e..000000000
--- a/data/battle_bg.s
+++ /dev/null
@@ -1,583 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_824829C:: @ 824829C
-	.byte 1, 2, 0
-
-	.align 2
-gOamData_82482A0::
-	.4byte 0xc0000300, 0x00000000
-
-gOamData_82482A8::
-	.4byte 0xc0000300, 0x00000040
-
-gUnknown_82482B0::
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_end
-
-gUnknown_82482C0::
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x18, 0x18, 0, 0x80
-	obj_rot_scal_anim_frame 0x18, 0x18, 0, 0x80
-	obj_rot_scal_anim_end
-
-gAffineAnimTable_82482E0::
-	.4byte gUnknown_82482B0
-	.4byte gUnknown_82482C0
-
-gUnknown_82482E8:: @ 82482E8
-	spr_template 10000, 10000, gOamData_82482A0, gDummySpriteAnimTable, NULL, gAffineAnimTable_82482E0, nullsub_9
-
-gUnknown_8248300:: @ 8248300
-	spr_template 10000, 10000, gOamData_82482A8, gDummySpriteAnimTable, NULL, gAffineAnimTable_82482E0, nullsub_9
-
-gUnknown_8248318:: @ 8248318
-	obj_tiles gFile_graphics_battle_transitions_vs_sheet, 0x1000, 10000
-
-gBattleBgTemplates:: @ 8248320
-	.4byte 0x00000580
-	@ {
-	@   .bg = 0,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 24,
-	@   .screenSize = 2,
-	@   .paletteMode = 0,
-	@   .priority = 0,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x000005c5
-	@ {
-	@   .bg = 1,
-	@   .charBaseIndex = 1,
-	@   .mapBaseIndex = 28,
-	@   .screenSize = 2,
-	@   .paletteMode = 0,
-	@   .priority = 0,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x000013e6
-	@ {
-	@   .bg = 2,
-	@   .charBaseIndex = 1,
-	@   .mapBaseIndex = 30,
-	@   .screenSize = 1,
-	@   .paletteMode = 0,
-	@   .priority = 1,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x000033ab
-	@ {
-	@   .bg = 3,
-	@   .charBaseIndex = 2,
-	@   .mapBaseIndex = 26,
-	@   .screenSize = 1,
-	@   .paletteMode = 0,
-	@   .priority = 3,
-	@   .baseTile = 0x0000
-	@ }
-
-gUnknown_8248330:: @ 8248330
-	.byte 0, 1, 15, 28, 4, 0
-	.2byte 0x0090
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 1,
-	@   .tilemapTop = 15,
-	@   .width = 28,
-	@   .height = 4,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x0090
-	@ }
-	.byte 0, 1, 35, 14, 4, 0
-	.2byte 0x01c0
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 1,
-	@   .tilemapTop = 35,
-	@   .width = 14,
-	@   .height = 4,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x01c0
-	@ }
-	.byte 0, 17, 35, 12, 4, 5
-	.2byte 0x0190
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 17,
-	@   .tilemapTop = 35,
-	@   .width = 12,
-	@   .height = 4,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0190
-	@ }
-	.byte 0, 2, 55, 8, 2, 5
-	.2byte 0x0300
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 55,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0300
-	@ }
-	.byte 0, 11, 55, 8, 2, 5
-	.2byte 0x0310
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 11,
-	@   .tilemapTop = 55,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0310
-	@ }
-	.byte 0, 2, 57, 8, 2, 5
-	.2byte 0x0320
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 57,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0320
-	@ }
-	.byte 0, 11, 57, 8, 2, 5
-	.2byte 0x0330
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 11,
-	@   .tilemapTop = 57,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0330
-	@ }
-	.byte 0, 21, 55, 3, 2, 5
-	.2byte 0x0290
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 21,
-	@   .tilemapTop = 55,
-	@   .width = 3,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0290
-	@ }
-	.byte 0, 21, 57, 8, 2, 5
-	.2byte 0x0296
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 21,
-	@   .tilemapTop = 57,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0296
-	@ }
-	.byte 0, 24, 55, 5, 2, 5
-	.2byte 0x02a6
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 24,
-	@   .tilemapTop = 55,
-	@   .width = 5,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x02a6
-	@ }
-	.byte 0, 25, 57, 0, 0, 5
-	.2byte 0x02b0
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 25,
-	@   .tilemapTop = 57,
-	@   .width = 0,
-	@   .height = 0,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x02b0
-	@ }
-	.byte 0, 21, 55, 8, 4, 5
-	.2byte 0x02b0
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 21,
-	@   .tilemapTop = 55,
-	@   .width = 8,
-	@   .height = 4,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x02b0
-	@ }
-	.byte 1, 19, 8, 10, 11, 5
-	.2byte 0x0100
-	@ {
-	@   .bg = 1,
-	@   .tilemapLeft = 19,
-	@   .tilemapTop = 8,
-	@   .width = 10,
-	@   .height = 11,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0100
-	@ }
-	.byte 2, 18, 0, 12, 3, 6
-	.2byte 0x016e
-	@ {
-	@   .bg = 2,
-	@   .tilemapLeft = 18,
-	@   .tilemapTop = 0,
-	@   .width = 12,
-	@   .height = 3,
-	@   .paletteNum = 6,
-	@   .baseBlock = 0x016e
-	@ }
-	.byte 0, 25, 9, 4, 4, 5
-	.2byte 0x0100
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 25,
-	@   .tilemapTop = 9,
-	@   .width = 4,
-	@   .height = 4,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0100
-	@ }
-	.byte 1, 2, 3, 7, 2, 5
-	.2byte 0x0020
-	@ {
-	@   .bg = 1,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 3,
-	@   .width = 7,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0020
-	@ }
-	.byte 2, 2, 3, 7, 2, 5
-	.2byte 0x0040
-	@ {
-	@   .bg = 2,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 3,
-	@   .width = 7,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0040
-	@ }
-	.byte 1, 2, 2, 7, 2, 5
-	.2byte 0x0020
-	@ {
-	@   .bg = 1,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 2,
-	@   .width = 7,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0020
-	@ }
-	.byte 2, 2, 2, 7, 2, 5
-	.2byte 0x0040
-	@ {
-	@   .bg = 2,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 2,
-	@   .width = 7,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0040
-	@ }
-	.byte 1, 2, 6, 7, 2, 5
-	.2byte 0x0060
-	@ {
-	@   .bg = 1,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 6,
-	@   .width = 7,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0060
-	@ }
-	.byte 2, 2, 6, 7, 2, 5
-	.2byte 0x0080
-	@ {
-	@   .bg = 2,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 6,
-	@   .width = 7,
-	@   .height = 2,
-	@   .paletteNum = 5,
-	@   .baseBlock = 0x0080
-	@ }
-	.byte 0, 11, 2, 8, 2, 0
-	.2byte 0x00a0
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 11,
-	@   .tilemapTop = 2,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x00a0
-	@ }
-	.byte 0, 4, 2, 8, 2, 0
-	.2byte 0x00a0
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 4,
-	@   .tilemapTop = 2,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x00a0
-	@ }
-	.byte 0, 19, 2, 8, 2, 0
-	.2byte 0x00b0
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 19,
-	@   .tilemapTop = 2,
-	@   .width = 8,
-	@   .height = 2,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x00b0
-	@ }
-	.byte 0, 2, 15, 26, 4, 7
-	.2byte 0x0090
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 15,
-	@   .width = 26,
-	@   .height = 4,
-	@   .paletteNum = 7,
-	@   .baseBlock = 0x0090
-	@ }
-	.byte 255, 0, 0, 0, 0, 0
-	.2byte 0x0000
-	@ {
-	@   .bg = 255,
-	@   .tilemapLeft = 0,
-	@   .tilemapTop = 0,
-	@   .width = 0,
-	@   .height = 0,
-	@   .paletteNum = 0,
-	@   .baseBlock = 0x0000
-	@ }
-
-gUnknown_8248400:: @ 8248400
-	.incbin "graphics/battle/unk_8248400.gbapal.lz"
-
-gUnknown_824844C:: @ 824844C
-	.incbin "graphics/battle/unk_824844C.4bpp.lz"
-
-gUnknown_82489A8:: @ 82489A8
-	.incbin "graphics/battle/unk_82489A8.bin.lz"
-
-gUnknown_8248C68:: @ 8248C68
-	.incbin "graphics/battle/unk_8248C68.4bpp.lz"
-
-gUnknown_8248F58:: @ 8248F58
-	.incbin "graphics/battle/unk_8248F58.bin.lz"
-
-gUnknown_8249074:: @ 8249074
-	.incbin "graphics/battle/unk_8249074.gbapal.lz"
-
-gUnknown_82490C4:: @ 82490C4
-	.incbin "graphics/battle/unk_82490C4.4bpp.lz"
-
-gUnknown_8249620:: @ 8249620
-	.incbin "graphics/battle/unk_8249620.bin.lz"
-
-gUnknown_82498DC:: @ 82498DC
-	.incbin "graphics/battle/unk_82498DC.4bpp.lz"
-
-gUnknown_8249E10:: @ 8249E10
-	.incbin "graphics/battle/unk_8249E10.bin.lz"
-
-gUnknown_8249F98:: @ 8249F98
-	.incbin "graphics/battle/unk_8249F98.gbapal.lz"
-
-gUnknown_8249FE4:: @ 8249FE4
-	.incbin "graphics/battle/unk_8249FE4.4bpp.lz"
-
-gUnknown_824A37C:: @ 824A37C
-	.incbin "graphics/battle/unk_824A37C.bin.lz"
-
-gUnknown_824A618:: @ 824A618
-	.incbin "graphics/battle/unk_824A618.4bpp.lz"
-
-gUnknown_824A844:: @ 824A844
-	.incbin "graphics/battle/unk_824A844.bin.lz"
-
-gUnknown_824A940:: @ 824A940
-	.incbin "graphics/battle/unk_824A940.gbapal.lz"
-
-gUnknown_824A990:: @ 824A990
-	.incbin "graphics/battle/unk_824A990.4bpp.lz"
-
-gUnknown_824ACD0:: @ 824ACD0
-	.incbin "graphics/battle/unk_824ACD0.bin.lz"
-
-gUnknown_824AF70:: @ 824AF70
-	.incbin "graphics/battle/unk_824AF70.4bpp.lz"
-
-gUnknown_824B0DC:: @ 824B0DC
-	.incbin "graphics/battle/unk_824B0DC.bin.lz"
-
-gUnknown_824B19C:: @ 824B19C
-	.incbin "graphics/battle/unk_824B19C.gbapal.lz"
-
-gUnknown_824B1EC:: @ 824B1EC
-	.incbin "graphics/battle/unk_824B1EC.4bpp.lz"
-
-gUnknown_824B608:: @ 824B608
-	.incbin "graphics/battle/unk_824B608.bin.lz"
-
-gUnknown_824B8A8:: @ 824B8A8
-	.incbin "graphics/battle/unk_824B8A8.4bpp.lz"
-
-gUnknown_824BBE0:: @ 824BBE0
-	.incbin "graphics/battle/unk_824BBE0.bin.lz"
-
-gUnknown_824BCE0:: @ 824BCE0
-	.incbin "graphics/battle/unk_824BCE0.gbapal.lz"
-
-gUnknown_824BD38:: @ 824BD38
-	.incbin "graphics/battle/unk_824BD38.4bpp.lz"
-
-gUnknown_824C07C:: @ 824C07C
-	.incbin "graphics/battle/unk_824C07C.bin.lz"
-
-gUnknown_824C314:: @ 824C314
-	.incbin "graphics/battle/unk_824C314.4bpp.lz"
-
-gUnknown_824C520:: @ 824C520
-	.incbin "graphics/battle/unk_824C520.bin.lz"
-
-gUnknown_824C5D8:: @ 824C5D8
-	.incbin "graphics/battle/unk_824C5D8.gbapal.lz"
-
-gUnknown_824C624:: @ 824C624
-	.incbin "graphics/battle/unk_824C624.4bpp.lz"
-
-gUnknown_824C958:: @ 824C958
-	.incbin "graphics/battle/unk_824C958.bin.lz"
-
-gUnknown_824CBF8:: @ 824CBF8
-	.incbin "graphics/battle/unk_824CBF8.4bpp.lz"
-
-gUnknown_824CEC8:: @ 824CEC8
-	.incbin "graphics/battle/unk_824CEC8.bin.lz"
-
-gUnknown_824CF98:: @ 824CF98
-	.incbin "graphics/battle/unk_824CF98.gbapal.lz"
-
-gUnknown_824CFEC:: @ 824CFEC
-	.incbin "graphics/battle/unk_824CFEC.4bpp.lz"
-
-gUnknown_824D418:: @ 824D418
-	.incbin "graphics/battle/unk_824D418.bin.lz"
-
-gUnknown_824D6B8:: @ 824D6B8
-	.incbin "graphics/battle/unk_824D6B8.4bpp.lz"
-
-gUnknown_824DC98:: @ 824DC98
-	.incbin "graphics/battle/unk_824DC98.bin.lz"
-
-gUnknown_824DDF0:: @ 824DDF0
-	.incbin "graphics/battle/unk_824DDF0.gbapal.lz"
-
-gUnknown_824DE34:: @ 824DE34
-	.incbin "graphics/battle/unk_824DE34.4bpp.lz"
-
-gUnknown_824E16C:: @ 824E16C
-	.incbin "graphics/battle/unk_824E16C.bin.lz"
-
-gUnknown_824E410:: @ 824E410
-	.incbin "graphics/battle/unk_824E410.4bpp.lz"
-
-gUnknown_824E490:: @ 824E490
-	.incbin "graphics/battle/unk_824E490.bin.lz"
-
-gUnknown_824E528:: @ 824E528
-	.incbin "graphics/battle/unk_824E528.gbapal.lz"
-
-gUnknown_824E56C:: @ 824E56C
-	.incbin "graphics/battle/unk_824E56C.gbapal.lz"
-
-gUnknown_824E5B8:: @ 824E5B8
-	.incbin "graphics/battle/unk_824E5B8.gbapal.lz"
-
-gUnknown_824E604:: @ 824E604
-	.incbin "graphics/battle/unk_824E604.gbapal.lz"
-
-gUnknown_824E650:: @ 824E650
-	.incbin "graphics/battle/unk_824E650.gbapal.lz"
-
-gUnknown_824E6A4:: @ 824E6A4
-	.incbin "graphics/battle/unk_824E6A4.gbapal.lz"
-
-gUnknown_824E6F0:: @ 824E6F0
-	.incbin "graphics/battle/unk_824E6F0.gbapal.lz"
-
-gUnknown_824E740:: @ 824E740
-	.incbin "graphics/battle/unk_824E740.gbapal.lz"
-
-gUnknown_824E78C:: @ 824E78C
-	.incbin "graphics/battle/unk_824E78C.gbapal.lz"
-
-gUnknown_824E7DC:: @ 824E7DC
-	.incbin "graphics/battle/unk_824E7DC.gbapal.lz"
-
-gUnknown_824E81C:: @ 824E81C
-	.incbin "graphics/battle/unk_824E81C.gbapal.lz"
-
-gUnknown_824E858:: @ 824E858
-	.incbin "graphics/battle/unk_824E858.4bpp.lz"
-
-gUnknown_824EB90:: @ 824EB90
-	.incbin "graphics/battle/unk_824EB90.bin.lz"
-
-gUnknown_824EE34:: @ 824EE34
-	.4byte gUnknown_824844C, gUnknown_82489A8, gUnknown_8248C68, gUnknown_8248F58, gUnknown_8248400
-	.4byte gUnknown_82490C4, gUnknown_8249620, gUnknown_82498DC, gUnknown_8249E10, gUnknown_8249074
-	.4byte gUnknown_8249FE4, gUnknown_824A37C, gUnknown_824A618, gUnknown_824A844, gUnknown_8249F98
-	.4byte gUnknown_824A990, gUnknown_824ACD0, gUnknown_824AF70, gUnknown_824B0DC, gUnknown_824A940
-	.4byte gUnknown_824B1EC, gUnknown_824B608, gUnknown_824B8A8, gUnknown_824BBE0, gUnknown_824B19C
-	.4byte gUnknown_824BD38, gUnknown_824C07C, gUnknown_824C314, gUnknown_824C520, gUnknown_824BCE0
-	.4byte gUnknown_824C624, gUnknown_824C958, gUnknown_824CBF8, gUnknown_824CEC8, gUnknown_824C5D8
-	.4byte gUnknown_824CFEC, gUnknown_824D418, gUnknown_824D6B8, gUnknown_824DC98, gUnknown_824CF98
-	.4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824DDF0
-	.4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E81C
-	.4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E528
-	.4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E56C
-	.4byte gUnknown_824DE34, gUnknown_824E16C, gUnknown_824E410, gUnknown_824E490, gUnknown_824E5B8
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E604
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E650
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E6A4
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E6F0
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E740
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E78C
-	.4byte gUnknown_824E858, gUnknown_824EB90, gUnknown_824E410, gUnknown_824E490, gUnknown_824E7DC
-
-@ struct {u8; u8;}
-gUnknown_824EFC4:: @ 824EFC4
-	.byte 0x01, 0x0b
-	.align 2
-	.byte 0x02, 0x0e
-	.align 2
-	.byte 0x03, 0x0d
-	.align 2
-	.byte 0x04, 0x0f
-	.align 2
-	.byte 0x05, 0x10
-	.align 2
-	.byte 0x06, 0x11
-	.align 2
-	.byte 0x07, 0x12
-	.align 2
-	.byte 0x08, 0x0a
-	.align 2
diff --git a/data/event_object_movement.s b/data/event_object_movement.s
index 9c4f0a7ca..17adf3ef4 100644
--- a/data/event_object_movement.s
+++ b/data/event_object_movement.s
@@ -7668,17 +7668,19 @@ gUnknown_83A6404:: @ 83A6404
 	.4byte sub_80633F4
 
 @ gFaceDirectionAnimNums ?
+@ gFaceDirectionAnimNums?
 gUnknown_83A640C:: @ 83A640C
-	.byte 0x00
-	.byte 0x00
-	.byte 0x01
-	.byte 0x02
-	.byte 0x03
-	.byte 0x00
-	.byte 0x00
-	.byte 0x01
-	.byte 0x01
-
+	.byte 0x00 @ DIR_NONE
+	.byte 0x00 @ DIR_SOUTH
+	.byte 0x01 @ DIR_NORTH
+	.byte 0x02 @ DIR_WEST
+	.byte 0x03 @ DIR_EAST
+	.byte 0x00 @ DIR_SOUTHWEST
+	.byte 0x00 @ DIR_SOUTHEAST
+	.byte 0x01 @ DIR_NORTHWEST
+	.byte 0x01 @ DIR_NORTHEAST
+
+@ gMoveDirectionAnimNums?
 gUnknown_83A6415:: @ 83A6415
 	.byte 0x4 @ DIR_NONE
 	.byte 0x4 @ DIR_SOUTH
@@ -7690,6 +7692,7 @@ gUnknown_83A6415:: @ 83A6415
 	.byte 0x5 @ DIR_NORTHWEST
 	.byte 0x5 @ DIR_NORTHEAST
 
+@ gMoveDirectionFastAnimNums?
 gUnknown_83A641E:: @ 83A641E
 	.byte 0x8 @ DIR_NONE
 	.byte 0x8 @ DIR_SOUTH
@@ -7701,6 +7704,7 @@ gUnknown_83A641E:: @ 83A641E
 	.byte 0x9 @ DIR_NORTHWEST
 	.byte 0x9 @ DIR_NORTHEAST
 
+@ gMoveDirectionFasterAnimNums?
 gUnknown_83A6427:: @ 83A6427
 	.byte 0xC @ DIR_NONE
 	.byte 0xC @ DIR_SOUTH
@@ -7712,6 +7716,7 @@ gUnknown_83A6427:: @ 83A6427
 	.byte 0xD @ DIR_NORTHWEST
 	.byte 0xD @ DIR_NORTHEAST
 
+@ gMoveDirectionFastestAnimNums?
 gUnknown_83A6430:: @ 83A6430
 	.byte 0x10 @ DIR_NONE
 	.byte 0x10 @ DIR_SOUTH
@@ -7723,6 +7728,7 @@ gUnknown_83A6430:: @ 83A6430
 	.byte 0x11 @ DIR_NORTHWEST
 	.byte 0x11 @ DIR_NORTHEAST
 
+@ gJumpSpecialDirectionAnimNums?
 gUnknown_83A6439:: @ 83A6439
 	.byte 0x14 @ DIR_NONE
 	.byte 0x14 @ DIR_SOUTH
@@ -7734,6 +7740,7 @@ gUnknown_83A6439:: @ 83A6439
 	.byte 0x15 @ DIR_NORTHWEST
 	.byte 0x15 @ DIR_NORTHEAST
 
+@ gAcroWheelieDirectionAnimNums?
 gUnknown_83A6442:: @ 83A6442
 	.byte 0x14 @ DIR_NONE
 	.byte 0x14 @ DIR_SOUTH
@@ -7745,6 +7752,7 @@ gUnknown_83A6442:: @ 83A6442
 	.byte 0x15 @ DIR_NORTHWEST
 	.byte 0x15 @ DIR_NORTHEAST
 
+@ ???
 gUnknown_83A644B:: @ 83A644B
 	.byte 0x18 @ DIR_NONE
 	.byte 0x18 @ DIR_SOUTH
@@ -7756,6 +7764,7 @@ gUnknown_83A644B:: @ 83A644B
 	.byte 0x19 @ DIR_NORTHWEST
 	.byte 0x19 @ DIR_NORTHEAST
 
+@ gAcroEndWheelieDirectionAnimNums?
 gUnknown_83A6454:: @ 83A6454
 	.byte 0x1C @ DIR_NONE
 	.byte 0x1C @ DIR_SOUTH
@@ -7767,6 +7776,7 @@ gUnknown_83A6454:: @ 83A6454
 	.byte 0x1D @ DIR_NORTHWEST
 	.byte 0x1D @ DIR_NORTHEAST
 
+@ gAcroUnusedActionDirectionAnimNums?
 gUnknown_83A645D:: @ 83A645D
 	.byte 0x18 @ DIR_NONE
 	.byte 0x18 @ DIR_SOUTH
@@ -7778,6 +7788,7 @@ gUnknown_83A645D:: @ 83A645D
 	.byte 0x1A @ DIR_NORTHWEST
 	.byte 0x1B @ DIR_NORTHEAST
 
+@ gAcroWheeliePedalDirectionAnimNums?
 gUnknown_83A6466:: @ 83A6466
 	.byte 0x20 @ DIR_NONE
 	.byte 0x20 @ DIR_SOUTH
@@ -7789,6 +7800,7 @@ gUnknown_83A6466:: @ 83A6466
 	.byte 0x21 @ DIR_NORTHWEST
 	.byte 0x21 @ DIR_NORTHEAST
 
+@ ???
 gUnknown_83A646F:: @ 83A646F
 	.byte 0x24 @ DIR_NONE
 	.byte 0x24 @ DIR_SOUTH
@@ -7800,6 +7812,7 @@ gUnknown_83A646F:: @ 83A646F
 	.byte 0x25 @ DIR_NORTHWEST
 	.byte 0x25 @ DIR_NORTHEAST
 
+@ gFishingDirectionAnimNums?
 gUnknown_83A6478:: @ 83A6478
 	.byte 0x0 @ DIR_NONE
 	.byte 0x0 @ DIR_SOUTH
@@ -7811,6 +7824,7 @@ gUnknown_83A6478:: @ 83A6478
 	.byte 0x1 @ DIR_NORTHWEST
 	.byte 0x1 @ DIR_NORTHEAST
 
+@ gFishingNoCatchDirectionAnimNums?
 gUnknown_83A6481:: @ 83A6481
 	.byte 0x4 @ DIR_NONE
 	.byte 0x4 @ DIR_SOUTH
@@ -7822,6 +7836,7 @@ gUnknown_83A6481:: @ 83A6481
 	.byte 0x5 @ DIR_NORTHWEST
 	.byte 0x5 @ DIR_NORTHEAST
 
+@ gFishingBiteDirectionAnimNums?
 gUnknown_83A648A:: @ 83A648A
 	.byte 0x8 @ DIR_NONE
 	.byte 0x8 @ DIR_SOUTH
@@ -7833,6 +7848,7 @@ gUnknown_83A648A:: @ 83A648A
 	.byte 0x9 @ DIR_NORTHWEST
 	.byte 0x9 @ DIR_NORTHEAST
 
+@ gRunningDirectionAnimNums?
 gUnknown_83A6493:: @ 83A6493
 	.byte 0x14 @ DIR_NONE
 	.byte 0x14 @ DIR_SOUTH
@@ -7844,20 +7860,19 @@ gUnknown_83A6493:: @ 83A6493
 	.byte 0x15 @ DIR_NORTHWEST
 	.byte 0x15 @ DIR_NORTHEAST
 
+@ gTrainerFacingDirectionMovementTypes?
 gUnknown_83A649C:: @ 83A649C
-	.byte 0x08
-	.byte 0x08
-	.byte 0x07
-	.byte 0x09
-	.byte 0x0A
-	.byte 0x08
-	.byte 0x08
-	.byte 0x07
-	.byte 0x07
-	.byte 0x00
-	.byte 0x00
-	.byte 0x00
+	.byte 0x08 @ DIR_NONE
+	.byte 0x08 @ DIR_SOUTH
+	.byte 0x07 @ DIR_NORTH
+	.byte 0x09 @ DIR_WEST
+	.byte 0x0A @ DIR_EAST
+	.byte 0x08 @ DIR_SOUTHWEST
+	.byte 0x08 @ DIR_SOUTHEAST
+	.byte 0x07 @ DIR_NORTHWEST
+	.byte 0x07 @ DIR_NORTHEAST
 
+	.align 2
 gUnknown_83A64A8:: @ 83A64A8
 	.4byte MetatileBehavior_IsSouthBlocked
 	.4byte MetatileBehavior_IsNorthBlocked
@@ -8164,281 +8179,280 @@ gUnknown_83A65A9:: @ 83A65A9
 	.byte 0x00
 	.byte 0x00
 
-@ gMovementActionFuncs
-gUnknown_83A65BC:: @ 83A65BC
-	.4byte gUnknown_83A6864
-	.4byte gUnknown_83A686C
-	.4byte gUnknown_83A6874
-	.4byte gUnknown_83A687C
-	.4byte gUnknown_83A6A30
-	.4byte gUnknown_83A6A38
-	.4byte gUnknown_83A6A40
-	.4byte gUnknown_83A6A48
-	.4byte gUnknown_83A68C8
-	.4byte gUnknown_83A68D4
-	.4byte gUnknown_83A68E0
-	.4byte gUnknown_83A68EC
-	.4byte gUnknown_83A6904
-	.4byte gUnknown_83A68F8
-	.4byte gUnknown_83A6910
-	.4byte gUnknown_83A691C
-	.4byte gUnknown_83A6928
-	.4byte gUnknown_83A6934
-	.4byte gUnknown_83A6940
-	.4byte gUnknown_83A694C
-	.4byte gUnknown_83A6964
-	.4byte gUnknown_83A6970
-	.4byte gUnknown_83A697C
-	.4byte gUnknown_83A6988
-	.4byte gUnknown_83A6994
-	.4byte gUnknown_83A69A0
-	.4byte gUnknown_83A69AC
-	.4byte gUnknown_83A69B8
-	.4byte gUnknown_83A69C4
-	.4byte gUnknown_83A69D0
-	.4byte gUnknown_83A69DC
-	.4byte gUnknown_83A69E8
-	.4byte gUnknown_83A69F4
-	.4byte gUnknown_83A6A50
-	.4byte gUnknown_83A6A5C
-	.4byte gUnknown_83A6A68
-	.4byte gUnknown_83A6A74
-	.4byte gUnknown_83A6A80
-	.4byte gUnknown_83A6A8C
-	.4byte gUnknown_83A6A98
-	.4byte gUnknown_83A6AA4
-	.4byte gUnknown_83A6AB0
-	.4byte gUnknown_83A6ABC
-	.4byte gUnknown_83A6AC8
-	.4byte gUnknown_83A6AD4
-	.4byte gUnknown_83A6AE0
-	.4byte gUnknown_83A6AEC
-	.4byte gUnknown_83A6AF8
-	.4byte gUnknown_83A6B04
-	.4byte gUnknown_83A6B10
-	.4byte gUnknown_83A6B1C
-	.4byte gUnknown_83A6B28
-	.4byte gUnknown_83A6B34
-	.4byte gUnknown_83A6B40
-	.4byte gUnknown_83A6B4C
-	.4byte gUnknown_83A6B58
-	.4byte gUnknown_83A6B64
-	.4byte gUnknown_83A6B70
-	.4byte gUnknown_83A6B7C
-	.4byte gUnknown_83A6B88
-	.4byte gUnknown_83A6B94
-	.4byte gUnknown_83A6BA0
-	.4byte gUnknown_83A6BAC
-	.4byte gUnknown_83A6BB8
-	.4byte gUnknown_83A6BC4
-	.4byte gUnknown_83A6BD0
-	.4byte gUnknown_83A6BDC
-	.4byte gUnknown_83A6BE8
-	.4byte gUnknown_83A6BF4
-	.4byte gUnknown_83A6C00
-	.4byte gUnknown_83A6C0C
-	.4byte gUnknown_83A6C18
-	.4byte gUnknown_83A6C24
-	.4byte gUnknown_83A6C30
-	.4byte gUnknown_83A6C6C
-	.4byte gUnknown_83A6C74
-	.4byte gUnknown_83A6C7C
-	.4byte gUnknown_83A6C84
-	.4byte gUnknown_83A6C8C
-	.4byte gUnknown_83A6C98
-	.4byte gUnknown_83A6CA4
-	.4byte gUnknown_83A6CB0
-	.4byte gUnknown_83A6CBC
-	.4byte gUnknown_83A6CC8
-	.4byte gUnknown_83A6CD4
-	.4byte gUnknown_83A6CE0
-	.4byte gUnknown_83A6CEC
-	.4byte gUnknown_83A6CF8
-	.4byte gUnknown_83A6D04
-	.4byte gUnknown_83A6D10
-	.4byte gUnknown_83A6D1C
-	.4byte gUnknown_83A6D24
-	.4byte gUnknown_83A6D30
-	.4byte gUnknown_83A6D38
-	.4byte gUnknown_83A6D40
-	.4byte gUnknown_83A6D48
-	.4byte gUnknown_83A6D50
-	.4byte gUnknown_83A6D58
-	.4byte gUnknown_83A6D60
-	.4byte gUnknown_83A6D68
-	.4byte gUnknown_83A6D70
-	.4byte gUnknown_83A6D78
-	.4byte gUnknown_83A6D80
-	.4byte gUnknown_83A6D88
-	.4byte gUnknown_83A6D94
-	.4byte gUnknown_83A6DA4
-	.4byte gUnknown_83A6DB4
-	.4byte gUnknown_83A6DBC
-	.4byte gUnknown_83A6DC4
-	.4byte gUnknown_83A6DCC
-	.4byte gUnknown_83A6DD4
-	.4byte gUnknown_83A6DE0
-	.4byte gUnknown_83A6DEC
-	.4byte gUnknown_83A6DF4
-	.4byte gUnknown_83A6DFC
-	.4byte gUnknown_83A6E04
-	.4byte gUnknown_83A6E0C
-	.4byte gUnknown_83A6E18
-	.4byte gUnknown_83A6E24
-	.4byte gUnknown_83A6E30
-	.4byte gUnknown_83A6E3C
-	.4byte gUnknown_83A6E48
-	.4byte gUnknown_83A6E54
-	.4byte gUnknown_83A6E60
-	.4byte gUnknown_83A6E9C
-	.4byte gUnknown_83A6EA8
-	.4byte gUnknown_83A6EB4
-	.4byte gUnknown_83A6EC0
-	.4byte gUnknown_83A6ECC
-	.4byte gUnknown_83A6ED8
-	.4byte gUnknown_83A6EE4
-	.4byte gUnknown_83A6EF0
-	.4byte gUnknown_83A6EFC
-	.4byte gUnknown_83A6F08
-	.4byte gUnknown_83A6F14
-	.4byte gUnknown_83A6F20
-	.4byte gUnknown_83A6F2C
-	.4byte gUnknown_83A6F38
-	.4byte gUnknown_83A6F44
-	.4byte gUnknown_83A6F50
-	.4byte gUnknown_83A6F5C
-	.4byte gUnknown_83A6F68
-	.4byte gUnknown_83A6F74
-	.4byte gUnknown_83A6F80
-	.4byte gUnknown_83A6F8C
-	.4byte gUnknown_83A6F98
-	.4byte gUnknown_83A6FA4
-	.4byte gUnknown_83A6FB0
-	.4byte gUnknown_83A6FBC
-	.4byte gUnknown_83A6FC8
-	.4byte gUnknown_83A6FD4
-	.4byte gUnknown_83A6FE0
-	.4byte gUnknown_83A6FEC
-	.4byte gUnknown_83A6FF4
-	.4byte gUnknown_83A6FFC
-	.4byte gUnknown_83A6898
-	.4byte gUnknown_83A68A4
-	.4byte gUnknown_83A68B0
-	.4byte gUnknown_83A68BC
-	.4byte gUnknown_83A7004
-	.4byte gUnknown_83A6A00
-	.4byte gUnknown_83A6A0C
-	.4byte gUnknown_83A6A18
-	.4byte gUnknown_83A6A24
-	.4byte gUnknown_83A700C
-	.4byte gUnknown_83A7018
-	.4byte gUnknown_83A6C3C
-	.4byte gUnknown_83A6C48
-	.4byte gUnknown_83A6C54
-	.4byte gUnknown_83A6C60
-
-gUnknown_83A6864:: @ 83A6864
-	.4byte sub_8064638
-	.4byte sub_8067934
-
-gUnknown_83A686C:: @ 83A686C
-	.4byte sub_8064648
-	.4byte sub_8067934
-
-gUnknown_83A6874:: @ 83A6874
-	.4byte sub_8064658
-	.4byte sub_8067934
-
-gUnknown_83A687C:: @ 83A687C
-	.4byte sub_8064668
-	.4byte sub_8067934
+sMovementActionFuncs:: @ 83A65BC
+	.4byte sMovementActionFuncs_x00
+	.4byte sMovementActionFuncs_x01
+	.4byte sMovementActionFuncs_x02
+	.4byte sMovementActionFuncs_x03
+	.4byte sMovementActionFuncs_x04
+	.4byte sMovementActionFuncs_x05
+	.4byte sMovementActionFuncs_x06
+	.4byte sMovementActionFuncs_x07
+	.4byte sMovementActionFuncs_x08
+	.4byte sMovementActionFuncs_x09
+	.4byte sMovementActionFuncs_x0A
+	.4byte sMovementActionFuncs_x0B
+	.4byte sMovementActionFuncs_x0C
+	.4byte sMovementActionFuncs_x0D
+	.4byte sMovementActionFuncs_x0E
+	.4byte sMovementActionFuncs_x0F
+	.4byte sMovementActionFuncs_x10
+	.4byte sMovementActionFuncs_x11
+	.4byte sMovementActionFuncs_x12
+	.4byte sMovementActionFuncs_x13
+	.4byte sMovementActionFuncs_x14
+	.4byte sMovementActionFuncs_x15
+	.4byte sMovementActionFuncs_x16
+	.4byte sMovementActionFuncs_x17
+	.4byte sMovementActionFuncs_x18
+	.4byte sMovementActionFuncs_x19
+	.4byte sMovementActionFuncs_x1A
+	.4byte sMovementActionFuncs_x1B
+	.4byte sMovementActionFuncs_x1C
+	.4byte sMovementActionFuncs_x1D
+	.4byte sMovementActionFuncs_x1E
+	.4byte sMovementActionFuncs_x1F
+	.4byte sMovementActionFuncs_x20
+	.4byte sMovementActionFuncs_x21
+	.4byte sMovementActionFuncs_x22
+	.4byte sMovementActionFuncs_x23
+	.4byte sMovementActionFuncs_x24
+	.4byte sMovementActionFuncs_x25
+	.4byte sMovementActionFuncs_x26
+	.4byte sMovementActionFuncs_x27
+	.4byte sMovementActionFuncs_x28
+	.4byte sMovementActionFuncs_x29
+	.4byte sMovementActionFuncs_x2A
+	.4byte sMovementActionFuncs_x2B
+	.4byte sMovementActionFuncs_x2C
+	.4byte sMovementActionFuncs_x2D
+	.4byte sMovementActionFuncs_x2E
+	.4byte sMovementActionFuncs_x2F
+	.4byte sMovementActionFuncs_x30
+	.4byte sMovementActionFuncs_x31
+	.4byte sMovementActionFuncs_x32
+	.4byte sMovementActionFuncs_x33
+	.4byte sMovementActionFuncs_x34
+	.4byte sMovementActionFuncs_x35
+	.4byte sMovementActionFuncs_x36
+	.4byte sMovementActionFuncs_x37
+	.4byte sMovementActionFuncs_x38
+	.4byte sMovementActionFuncs_x39
+	.4byte sMovementActionFuncs_x3A
+	.4byte sMovementActionFuncs_x3B
+	.4byte sMovementActionFuncs_x3C
+	.4byte sMovementActionFuncs_x3D
+	.4byte sMovementActionFuncs_x3E
+	.4byte sMovementActionFuncs_x3F
+	.4byte sMovementActionFuncs_x40
+	.4byte sMovementActionFuncs_x41
+	.4byte sMovementActionFuncs_x42
+	.4byte sMovementActionFuncs_x43
+	.4byte sMovementActionFuncs_x44
+	.4byte sMovementActionFuncs_x45
+	.4byte sMovementActionFuncs_x46
+	.4byte sMovementActionFuncs_x47
+	.4byte sMovementActionFuncs_x48
+	.4byte sMovementActionFuncs_x49
+	.4byte sMovementActionFuncs_x4A
+	.4byte sMovementActionFuncs_x4B
+	.4byte sMovementActionFuncs_x4C
+	.4byte sMovementActionFuncs_x4D
+	.4byte sMovementActionFuncs_x4E
+	.4byte sMovementActionFuncs_x4F
+	.4byte sMovementActionFuncs_x50
+	.4byte sMovementActionFuncs_x51
+	.4byte sMovementActionFuncs_x52
+	.4byte sMovementActionFuncs_x53
+	.4byte sMovementActionFuncs_x54
+	.4byte sMovementActionFuncs_x55
+	.4byte sMovementActionFuncs_x56
+	.4byte sMovementActionFuncs_x57
+	.4byte sMovementActionFuncs_x58
+	.4byte sMovementActionFuncs_x59
+	.4byte sMovementActionFuncs_x5A
+	.4byte sMovementActionFuncs_x5B
+	.4byte sMovementActionFuncs_x5C
+	.4byte sMovementActionFuncs_x5D
+	.4byte sMovementActionFuncs_x5E
+	.4byte sMovementActionFuncs_x5F
+	.4byte sMovementActionFuncs_x60
+	.4byte sMovementActionFuncs_x61
+	.4byte sMovementActionFuncs_x62
+	.4byte sMovementActionFuncs_x63
+	.4byte sMovementActionFuncs_x64
+	.4byte sMovementActionFuncs_x65
+	.4byte sMovementActionFuncs_x66
+	.4byte sMovementActionFuncs_x67
+	.4byte sMovementActionFuncs_x68
+	.4byte sMovementActionFuncs_x69
+	.4byte sMovementActionFuncs_x6A
+	.4byte sMovementActionFuncs_x6B
+	.4byte sMovementActionFuncs_x6C
+	.4byte sMovementActionFuncs_x6D
+	.4byte sMovementActionFuncs_x6E
+	.4byte sMovementActionFuncs_x6F
+	.4byte sMovementActionFuncs_x70
+	.4byte sMovementActionFuncs_x71
+	.4byte sMovementActionFuncs_x72
+	.4byte sMovementActionFuncs_x73
+	.4byte sMovementActionFuncs_x74
+	.4byte sMovementActionFuncs_x75
+	.4byte sMovementActionFuncs_x76
+	.4byte sMovementActionFuncs_x77
+	.4byte sMovementActionFuncs_x78
+	.4byte sMovementActionFuncs_x79
+	.4byte sMovementActionFuncs_x7A
+	.4byte sMovementActionFuncs_x7B
+	.4byte sMovementActionFuncs_x7C
+	.4byte sMovementActionFuncs_x7D
+	.4byte sMovementActionFuncs_x7E
+	.4byte sMovementActionFuncs_x7F
+	.4byte sMovementActionFuncs_x80
+	.4byte sMovementActionFuncs_x81
+	.4byte sMovementActionFuncs_x82
+	.4byte sMovementActionFuncs_x83
+	.4byte sMovementActionFuncs_x84
+	.4byte sMovementActionFuncs_x85
+	.4byte sMovementActionFuncs_x86
+	.4byte sMovementActionFuncs_x87
+	.4byte sMovementActionFuncs_x88
+	.4byte sMovementActionFuncs_x89
+	.4byte sMovementActionFuncs_x8A
+	.4byte sMovementActionFuncs_x8B
+	.4byte sMovementActionFuncs_x8C
+	.4byte sMovementActionFuncs_x8D
+	.4byte sMovementActionFuncs_x8E
+	.4byte sMovementActionFuncs_x8F
+	.4byte sMovementActionFuncs_x90
+	.4byte sMovementActionFuncs_x91
+	.4byte sMovementActionFuncs_x92
+	.4byte sMovementActionFuncs_x93
+	.4byte sMovementActionFuncs_x94
+	.4byte sMovementActionFuncs_x95
+	.4byte sMovementActionFuncs_x96
+	.4byte sMovementActionFuncs_x97
+	.4byte sMovementActionFuncs_x98
+	.4byte sMovementActionFuncs_x99
+	.4byte sMovementActionFuncs_x9A
+	.4byte sMovementActionFuncs_x9B
+	.4byte sMovementActionFuncs_x9C
+	.4byte sMovementActionFuncs_x9D
+	.4byte sMovementActionFuncs_x9E
+	.4byte sMovementActionFuncs_x9F
+	.4byte sMovementActionFuncs_xA0
+	.4byte sMovementActionFuncs_xA1
+	.4byte sMovementActionFuncs_xA2
+	.4byte sMovementActionFuncs_xA3
+	.4byte sMovementActionFuncs_xA4
+	.4byte sMovementActionFuncs_xA5
+	.4byte sMovementActionFuncs_xA6
+	.4byte sMovementActionFuncs_xA7
+	.4byte sMovementActionFuncs_xA8
+	.4byte sMovementActionFuncs_xA9
+
+sMovementActionFuncs_x00:: @ 83A6864
+	.4byte MovementActionFunc_x00_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x01:: @ 83A686C
+	.4byte MovementActionFunc_x01_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x02:: @ 83A6874
+	.4byte MovementActionFunc_x02_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x03:: @ 83A687C
+	.4byte MovementActionFunc_x03_0
+	.4byte MovementActionFunc_x00_1
 
 gUnknown_83A6884:: @ 83A6884
 	.4byte get_go_image_anim_num
 	.4byte get_go_fast_image_anim_num
 	.4byte get_go_fast_image_anim_num
 	.4byte get_go_faster_image_anim_num
-	.4byte sub_8063470
-
-gUnknown_83A6898:: @ 83A6898
-	.4byte sub_8064968
-	.4byte sub_8064988
-	.4byte sub_8067934
-
-gUnknown_83A68A4:: @ 83A68A4
-	.4byte sub_80649A8
-	.4byte sub_80649C8
-	.4byte sub_8067934
-
-gUnknown_83A68B0:: @ 83A68B0
-	.4byte sub_80649E8
-	.4byte sub_8064A08
-	.4byte sub_8067934
-
-gUnknown_83A68BC:: @ 83A68BC
-	.4byte sub_8064A28
-	.4byte sub_8064A48
-	.4byte sub_8067934
-
-gUnknown_83A68C8:: @ 83A68C8
-	.4byte sub_8064A68
-	.4byte sub_8064A88
-	.4byte sub_8067934
-
-gUnknown_83A68D4:: @ 83A68D4
-	.4byte sub_8064AA8
-	.4byte sub_8064AC8
-	.4byte sub_8067934
-
-gUnknown_83A68E0:: @ 83A68E0
-	.4byte sub_8064AE8
-	.4byte sub_8064B08
-	.4byte sub_8067934
-
-gUnknown_83A68EC:: @ 83A68EC
-	.4byte sub_8064B28
-	.4byte sub_8064B48
-	.4byte sub_8067934
-
-gUnknown_83A68F8:: @ 83A68F8
-	.4byte sub_8064C3C
-	.4byte sub_8064C5C
-	.4byte sub_8067934
-
-gUnknown_83A6904:: @ 83A6904
-	.4byte sub_8064C7C
-	.4byte sub_8064C9C
-	.4byte sub_8067934
-
-gUnknown_83A6910:: @ 83A6910
-	.4byte sub_8064CBC
-	.4byte sub_8064CDC
-	.4byte sub_8067934
-
-gUnknown_83A691C:: @ 83A691C
-	.4byte sub_8064CFC
-	.4byte sub_8064D1C
-	.4byte sub_8067934
-
-gUnknown_83A6928:: @ 83A6928
-	.4byte sub_8064D3C
-	.4byte sub_8064D5C
-	.4byte sub_8067934
-
-gUnknown_83A6934:: @ 83A6934
-	.4byte sub_8064D7C
-	.4byte sub_8064D9C
-	.4byte sub_8067934
-
-gUnknown_83A6940:: @ 83A6940
-	.4byte sub_8064DBC
-	.4byte sub_8064DDC
-	.4byte sub_8067934
-
-gUnknown_83A694C:: @ 83A694C
-	.4byte sub_8064DFC
-	.4byte sub_8064E1C
-	.4byte sub_8067934
+	.4byte MovementActionFunc_x03_4
+
+sMovementActionFuncs_x9B:: @ 83A6898
+	.4byte MovementActionFunc_x9B_0
+	.4byte MovementActionFunc_x9B_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x9C:: @ 83A68A4
+	.4byte MovementActionFunc_x9C_0
+	.4byte MovementActionFunc_x9C_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x9D:: @ 83A68B0
+	.4byte MovementActionFunc_x9D_0
+	.4byte MovementActionFunc_x9D_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x9E:: @ 83A68BC
+	.4byte MovementActionFunc_x9E_0
+	.4byte MovementActionFunc_x9E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x08:: @ 83A68C8
+	.4byte MovementActionFunc_x08_0
+	.4byte MovementActionFunc_x08_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x09:: @ 83A68D4
+	.4byte MovementActionFunc_x09_0
+	.4byte MovementActionFunc_x09_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x0A:: @ 83A68E0
+	.4byte MovementActionFunc_x0A_0
+	.4byte MovementActionFunc_x0A_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x0B:: @ 83A68EC
+	.4byte MovementActionFunc_x0B_0
+	.4byte MovementActionFunc_x0B_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x0D:: @ 83A68F8
+	.4byte MovementActionFunc_x0D_0
+	.4byte MovementActionFunc_x0D_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x0C:: @ 83A6904
+	.4byte MovementActionFunc_x0C_0
+	.4byte MovementActionFunc_x0C_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x0E:: @ 83A6910
+	.4byte MovementActionFunc_x0E_0
+	.4byte MovementActionFunc_x0E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x0F:: @ 83A691C
+	.4byte MovementActionFunc_x0F_0
+	.4byte MovementActionFunc_x0F_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x10:: @ 83A6928
+	.4byte MovementActionFunc_x10_0
+	.4byte MovementActionFunc_x10_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x11:: @ 83A6934
+	.4byte MovementActionFunc_x11_0
+	.4byte MovementActionFunc_x11_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x12:: @ 83A6940
+	.4byte MovementActionFunc_x12_0
+	.4byte MovementActionFunc_x12_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x13:: @ 83A694C
+	.4byte MovementActionFunc_x13_0
+	.4byte MovementActionFunc_x13_1
+	.4byte MovementActionFunc_x00_1
 
 gUnknown_83A6958:: @ 83A6958
 	.2byte 0x0000
@@ -8450,734 +8464,796 @@ gUnknown_83A695E:: @ 83A695E
 	.2byte 0x0000
 	.2byte 0x0001
 
-gUnknown_83A6964:: @ 83A6964
-	.4byte sub_80650A8
-	.4byte sub_80650D4
-	.4byte sub_8067934
-
-gUnknown_83A6970:: @ 83A6970
-	.4byte sub_8065100
-	.4byte sub_806512C
-	.4byte sub_8067934
-
-gUnknown_83A697C:: @ 83A697C
-	.4byte sub_8065158
-	.4byte sub_8065184
-	.4byte sub_8067934
-
-gUnknown_83A6988:: @ 83A6988
-	.4byte sub_80651B0
-	.4byte sub_80651DC
-	.4byte sub_8067934
-
-gUnknown_83A6994:: @ 83A6994
-	.4byte sub_806522C
-	.4byte sub_8065210
-	.4byte sub_8067930
-
-gUnknown_83A69A0:: @ 83A69A0
-	.4byte sub_806524C
-	.4byte sub_8065210
-	.4byte sub_8067930
-
-gUnknown_83A69AC:: @ 83A69AC
-	.4byte sub_806526C
-	.4byte sub_8065210
-	.4byte sub_8067930
-
-gUnknown_83A69B8:: @ 83A69B8
-	.4byte sub_806528C
-	.4byte sub_8065210
-	.4byte sub_8067930
-
-gUnknown_83A69C4:: @ 83A69C4
-	.4byte sub_80652AC
-	.4byte sub_8065210
-	.4byte sub_8067930
-
-gUnknown_83A69D0:: @ 83A69D0
-	.4byte sub_80652CC
-	.4byte sub_80652EC
-	.4byte sub_8067934
-
-gUnknown_83A69DC:: @ 83A69DC
-	.4byte sub_806530C
-	.4byte sub_806532C
-	.4byte sub_8067934
-
-gUnknown_83A69E8:: @ 83A69E8
-	.4byte sub_806534C
-	.4byte sub_806536C
-	.4byte sub_8067934
-
-gUnknown_83A69F4:: @ 83A69F4
-	.4byte sub_806538C
-	.4byte sub_80653AC
-	.4byte sub_8067934
-
-gUnknown_83A6A00:: @ 83A6A00
-	.4byte sub_80653F8
-	.4byte sub_8065438
-	.4byte sub_8067930
-
-gUnknown_83A6A0C:: @ 83A6A0C
-	.4byte sub_8065464
-	.4byte sub_80654A4
-	.4byte sub_8067930
-
-gUnknown_83A6A18:: @ 83A6A18
-	.4byte sub_80654D0
-	.4byte sub_8065510
-	.4byte sub_8067930
-
-gUnknown_83A6A24:: @ 83A6A24
-	.4byte sub_806553C
-	.4byte sub_806557C
-	.4byte sub_8067930
-
-gUnknown_83A6A30:: @ 83A6A30
-	.4byte sub_80655D4
-	.4byte sub_8067930
-
-gUnknown_83A6A38:: @ 83A6A38
-	.4byte sub_8065610
-	.4byte sub_8067930
-
-gUnknown_83A6A40:: @ 83A6A40
-	.4byte sub_806564C
-	.4byte sub_8067930
-
-gUnknown_83A6A48:: @ 83A6A48
-	.4byte sub_8065688
-	.4byte sub_8067930
-
-gUnknown_83A6A50:: @ 83A6A50
-	.4byte sub_8065770
-	.4byte sub_8065734
-	.4byte sub_8067934
-
-gUnknown_83A6A5C:: @ 83A6A5C
-	.4byte sub_80657A8
-	.4byte sub_8065734
-	.4byte sub_8067934
-
-gUnknown_83A6A68:: @ 83A6A68
-	.4byte sub_80657E0
-	.4byte sub_8065734
-	.4byte sub_8067934
-
-gUnknown_83A6A74:: @ 83A6A74
-	.4byte sub_8065818
-	.4byte sub_8065734
-	.4byte sub_8067934
-
-gUnknown_83A6A80:: @ 83A6A80
-	.4byte sub_8065850
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6A8C:: @ 83A6A8C
-	.4byte sub_8065888
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6A98:: @ 83A6A98
-	.4byte sub_80658C0
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AA4:: @ 83A6AA4
-	.4byte sub_80658F8
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AB0:: @ 83A6AB0
-	.4byte sub_8065930
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6ABC:: @ 83A6ABC
-	.4byte sub_8065968
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AC8:: @ 83A6AC8
-	.4byte sub_80659A0
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AD4:: @ 83A6AD4
-	.4byte sub_80659D8
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AE0:: @ 83A6AE0
-	.4byte sub_8065A10
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AEC:: @ 83A6AEC
-	.4byte sub_8065A48
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6AF8:: @ 83A6AF8
-	.4byte sub_8065A80
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6B04:: @ 83A6B04
-	.4byte sub_8065AB8
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6B10:: @ 83A6B10
-	.4byte sub_8065AF0
-	.4byte sub_8065B10
-	.4byte sub_8067934
-
-gUnknown_83A6B1C:: @ 83A6B1C
-	.4byte sub_8065B30
-	.4byte sub_8065B50
-	.4byte sub_8067934
-
-gUnknown_83A6B28:: @ 83A6B28
-	.4byte sub_8065B70
-	.4byte sub_8065B90
-	.4byte sub_8067934
-
-gUnknown_83A6B34:: @ 83A6B34
-	.4byte sub_8065BB0
-	.4byte sub_8065BD0
-	.4byte sub_8067934
-
-gUnknown_83A6B40:: @ 83A6B40
-	.4byte sub_8065BF0
-	.4byte sub_8065C10
-	.4byte sub_8067934
-
-gUnknown_83A6B4C:: @ 83A6B4C
-	.4byte sub_8065C30
-	.4byte sub_8065C50
-	.4byte sub_8067934
-
-gUnknown_83A6B58:: @ 83A6B58
-	.4byte sub_8065C70
-	.4byte sub_8065C90
-	.4byte sub_8067934
-
-gUnknown_83A6B64:: @ 83A6B64
-	.4byte sub_8065CB0
-	.4byte sub_8065CD0
-	.4byte sub_8067934
-
-gUnknown_83A6B70:: @ 83A6B70
-	.4byte sub_8065CF0
-	.4byte sub_8065D10
-	.4byte sub_8067934
-
-gUnknown_83A6B7C:: @ 83A6B7C
-	.4byte sub_8065D30
-	.4byte sub_8065D50
-	.4byte sub_8067934
-
-gUnknown_83A6B88:: @ 83A6B88
-	.4byte sub_8065D70
-	.4byte sub_8065D90
-	.4byte sub_8067934
-
-gUnknown_83A6B94:: @ 83A6B94
-	.4byte sub_8065DB0
-	.4byte sub_8065DD0
-	.4byte sub_8067934
-
-gUnknown_83A6BA0:: @ 83A6BA0
+sMovementActionFuncs_x14:: @ 83A6964
+	.4byte MovementActionFunc_x14_0
+	.4byte MovementActionFunc_x14_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x15:: @ 83A6970
+	.4byte MovementActionFunc_x15_0
+	.4byte MovementActionFunc_x15_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x16:: @ 83A697C
+	.4byte MovementActionFunc_x16_0
+	.4byte MovementActionFunc_x16_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x17:: @ 83A6988
+	.4byte MovementActionFunc_x17_0
+	.4byte MovementActionFunc_x17_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x18:: @ 83A6994
+	.4byte MovementActionFunc_x18_0
+	.4byte MovementActionFunc_x18_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x19:: @ 83A69A0
+	.4byte MovementActionFunc_x19_0
+	.4byte MovementActionFunc_x18_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x1A:: @ 83A69AC
+	.4byte MovementActionFunc_x1A_0
+	.4byte MovementActionFunc_x18_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x1B:: @ 83A69B8
+	.4byte MovementActionFunc_x1B_0
+	.4byte MovementActionFunc_x18_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x1C:: @ 83A69C4
+	.4byte MovementActionFunc_x1C_0
+	.4byte MovementActionFunc_x18_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x1D:: @ 83A69D0
+	.4byte MovementActionFunc_x1D_0
+	.4byte MovementActionFunc_x1D_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x1E:: @ 83A69DC
+	.4byte MovementActionFunc_x1E_0
+	.4byte MovementActionFunc_x1E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x1F:: @ 83A69E8
+	.4byte MovementActionFunc_x1F_0
+	.4byte MovementActionFunc_x1F_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x20:: @ 83A69F4
+	.4byte MovementActionFunc_x20_0
+	.4byte MovementActionFunc_x20_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_xA0:: @ 83A6A00
+	.4byte MovementActionFunc_xA0_0
+	.4byte MovementActionFunc_xA0_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_xA1:: @ 83A6A0C
+	.4byte MovementActionFunc_xA1_0
+	.4byte MovementActionFunc_xA1_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_xA2:: @ 83A6A18
+	.4byte MovementActionFunc_xA2_0
+	.4byte MovementActionFunc_xA2_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_xA3:: @ 83A6A24
+	.4byte MovementActionFunc_xA3_0
+	.4byte MovementActionFunc_xA3_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x04:: @ 83A6A30
+	.4byte MovementActionFunc_x04_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x05:: @ 83A6A38
+	.4byte MovementActionFunc_x05_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x06:: @ 83A6A40
+	.4byte MovementActionFunc_x06_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x07:: @ 83A6A48
+	.4byte MovementActionFunc_x07_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x21:: @ 83A6A50
+	.4byte MovementActionFunc_x21_0
+	.4byte MovementActionFunc_x21_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x22:: @ 83A6A5C
+	.4byte MovementActionFunc_x22_0
+	.4byte MovementActionFunc_x21_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x23:: @ 83A6A68
+	.4byte MovementActionFunc_x23_0
+	.4byte MovementActionFunc_x21_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x24:: @ 83A6A74
+	.4byte MovementActionFunc_x24_0
+	.4byte MovementActionFunc_x21_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x25:: @ 83A6A80
+	.4byte MovementActionFunc_x25_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x26:: @ 83A6A8C
+	.4byte MovementActionFunc_x26_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x27:: @ 83A6A98
+	.4byte MovementActionFunc_x27_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x28:: @ 83A6AA4
+	.4byte MovementActionFunc_x28_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x29:: @ 83A6AB0
+	.4byte MovementActionFunc_x29_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x2A:: @ 83A6ABC
+	.4byte MovementActionFunc_x2A_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x2B:: @ 83A6AC8
+	.4byte MovementActionFunc_x2B_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x2C:: @ 83A6AD4
+	.4byte MovementActionFunc_x2C_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x2D:: @ 83A6AE0
+	.4byte MovementActionFunc_x2D_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x2E:: @ 83A6AEC
+	.4byte MovementActionFunc_x2E_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x2F:: @ 83A6AF8
+	.4byte MovementActionFunc_x2F_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x30:: @ 83A6B04
+	.4byte MovementActionFunc_x30_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x31:: @ 83A6B10
+	.4byte MovementActionFunc_x31_0
+	.4byte MovementActionFunc_x31_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x32:: @ 83A6B1C
+	.4byte MovementActionFunc_x32_0
+	.4byte MovementActionFunc_x32_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x33:: @ 83A6B28
+	.4byte MovementActionFunc_x33_0
+	.4byte MovementActionFunc_x33_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x34:: @ 83A6B34
+	.4byte MovementActionFunc_x34_0
+	.4byte MovementActionFunc_x34_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x35:: @ 83A6B40
+	.4byte MovementActionFunc_x35_0
+	.4byte MovementActionFunc_x35_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x36:: @ 83A6B4C
+	.4byte MovementActionFunc_x36_0
+	.4byte MovementActionFunc_x36_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x37:: @ 83A6B58
+	.4byte MovementActionFunc_x37_0
+	.4byte MovementActionFunc_x37_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x38:: @ 83A6B64
+	.4byte MovementActionFunc_x38_0
+	.4byte MovementActionFunc_x38_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x39:: @ 83A6B70
+	.4byte MovementActionFunc_x39_0
+	.4byte MovementActionFunc_x39_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x3A:: @ 83A6B7C
+	.4byte MovementActionFunc_x3A_0
+	.4byte MovementActionFunc_x3A_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x3B:: @ 83A6B88
+	.4byte MovementActionFunc_x3B_0
+	.4byte MovementActionFunc_x3B_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x3C:: @ 83A6B94
+	.4byte MovementActionFunc_x3C_0
+	.4byte MovementActionFunc_x3C_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x3D:: @ 83A6BA0
 	.4byte do_run_south_anim
-	.4byte sub_8065E10
-	.4byte sub_8067934
+	.4byte MovementActionFunc_x3D_1
+	.4byte MovementActionFunc_x00_1
 
-gUnknown_83A6BAC:: @ 83A6BAC
+sMovementActionFuncs_x3E:: @ 83A6BAC
 	.4byte do_run_north_anim
-	.4byte sub_8065E50
-	.4byte sub_8067934
+	.4byte MovementActionFunc_x3E_1
+	.4byte MovementActionFunc_x00_1
 
-gUnknown_83A6BB8:: @ 83A6BB8
+sMovementActionFuncs_x3F:: @ 83A6BB8
 	.4byte do_run_west_anim
-	.4byte sub_8065E90
-	.4byte sub_8067934
+	.4byte MovementActionFunc_x3F_1
+	.4byte MovementActionFunc_x00_1
 
-gUnknown_83A6BC4:: @ 83A6BC4
+sMovementActionFuncs_x40:: @ 83A6BC4
 	.4byte do_run_east_anim
-	.4byte sub_8065ED0
-	.4byte sub_8067934
-
-gUnknown_83A6BD0:: @ 83A6BD0
-	.4byte sub_8065FC4
-	.4byte sub_8065FE4
-	.4byte sub_8067934
-
-gUnknown_83A6BDC:: @ 83A6BDC
-	.4byte sub_8066004
-	.4byte sub_8066024
-	.4byte sub_8067934
-
-gUnknown_83A6BE8:: @ 83A6BE8
-	.4byte sub_8066044
-	.4byte sub_8066064
-	.4byte sub_8067934
-
-gUnknown_83A6BF4:: @ 83A6BF4
-	.4byte sub_8066084
-	.4byte sub_80660A4
-	.4byte sub_8067934
-
-gUnknown_83A6C00:: @ 83A6C00
-	.4byte sub_80660F0
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6C0C:: @ 83A6C0C
-	.4byte sub_806615C
-	.4byte sub_806617C
-	.4byte sub_8067934
-
-gUnknown_83A6C18:: @ 83A6C18
-	.4byte sub_80661A4
-	.4byte sub_80661C4
-	.4byte sub_8067934
-
-gUnknown_83A6C24:: @ 83A6C24
-	.4byte sub_80661EC
-	.4byte sub_806620C
-	.4byte sub_8067934
-
-gUnknown_83A6C30:: @ 83A6C30
-	.4byte sub_8066234
-	.4byte sub_8066254
-	.4byte sub_8067934
-
-gUnknown_83A6C3C:: @ 83A6C3C
-	.4byte sub_806627C
-	.4byte sub_806629C
-	.4byte sub_8067934
-
-gUnknown_83A6C48:: @ 83A6C48
-	.4byte sub_80662BC
-	.4byte sub_80662DC
-	.4byte sub_8067934
-
-gUnknown_83A6C54:: @ 83A6C54
-	.4byte sub_80662FC
-	.4byte sub_806631C
-	.4byte sub_8067934
-
-gUnknown_83A6C60:: @ 83A6C60
-	.4byte sub_806633C
-	.4byte sub_806635C
-	.4byte sub_8067934
-
-gUnknown_83A6C6C:: @ 83A6C6C
-	.4byte sub_806637C
-	.4byte sub_8067934
-
-gUnknown_83A6C74:: @ 83A6C74
-	.4byte sub_80663D8
-	.4byte sub_8067934
-
-gUnknown_83A6C7C:: @ 83A6C7C
-	.4byte sub_806643C
-	.4byte sub_8067934
-
-gUnknown_83A6C84:: @ 83A6C84
-	.4byte sub_806644C
-	.4byte sub_8067934
-
-gUnknown_83A6C8C:: @ 83A6C8C
-	.4byte sub_806645C
-	.4byte sub_8066488
-	.4byte sub_8067934
-
-gUnknown_83A6C98:: @ 83A6C98
-	.4byte sub_80664B4
-	.4byte sub_80664E0
-	.4byte sub_8067934
-
-gUnknown_83A6CA4:: @ 83A6CA4
-	.4byte sub_806650C
-	.4byte sub_8066538
-	.4byte sub_8067934
-
-gUnknown_83A6CB0:: @ 83A6CB0
-	.4byte sub_8066564
-	.4byte sub_8066590
-	.4byte sub_8067934
-
-gUnknown_83A6CBC:: @ 83A6CBC
-	.4byte sub_80665BC
-	.4byte sub_80665E8
-	.4byte sub_8067934
-
-gUnknown_83A6CC8:: @ 83A6CC8
-	.4byte sub_8066614
-	.4byte sub_8066640
-	.4byte sub_8067934
-
-gUnknown_83A6CD4:: @ 83A6CD4
-	.4byte sub_806666C
-	.4byte sub_8066698
-	.4byte sub_8067934
-
-gUnknown_83A6CE0:: @ 83A6CE0
-	.4byte sub_80666C4
-	.4byte sub_80666F0
-	.4byte sub_8067934
-
-gUnknown_83A6CEC:: @ 83A6CEC
-	.4byte sub_806671C
-	.4byte sub_8066748
-	.4byte sub_8067934
-
-gUnknown_83A6CF8:: @ 83A6CF8
-	.4byte sub_8066774
-	.4byte sub_80667A0
-	.4byte sub_8067934
-
-gUnknown_83A6D04:: @ 83A6D04
-	.4byte sub_80667CC
-	.4byte sub_80667F8
-	.4byte sub_8067934
-
-gUnknown_83A6D10:: @ 83A6D10
-	.4byte sub_8066824
-	.4byte sub_8066850
-	.4byte sub_8067934
-
-gUnknown_83A6D1C:: @ 83A6D1C
-	.4byte sub_806687C
-	.4byte sub_8067934
-
-gUnknown_83A6D24:: @ 83A6D24
-	.4byte sub_8066894
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6D30:: @ 83A6D30
-	.4byte sub_80668A4
-	.4byte sub_8067930
-
-gUnknown_83A6D38:: @ 83A6D38
-	.4byte sub_80668B4
-	.4byte sub_8067930
-
-gUnknown_83A6D40:: @ 83A6D40
-	.4byte sub_80668C4
-	.4byte sub_8067930
-
-gUnknown_83A6D48:: @ 83A6D48
-	.4byte sub_80668D4
-	.4byte sub_8067930
-
-gUnknown_83A6D50:: @ 83A6D50
-	.4byte sub_8066900
-	.4byte sub_8067930
-
-gUnknown_83A6D58:: @ 83A6D58
-	.4byte sub_8066910
-	.4byte sub_8067930
-
-gUnknown_83A6D60:: @ 83A6D60
+	.4byte MovementActionFunc_x40_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x41:: @ 83A6BD0
+	.4byte MovementActionFunc_x41_0
+	.4byte MovementActionFunc_x41_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x42:: @ 83A6BDC
+	.4byte MovementActionFunc_x42_0
+	.4byte MovementActionFunc_x42_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x43:: @ 83A6BE8
+	.4byte MovementActionFunc_x43_0
+	.4byte MovementActionFunc_x43_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x44:: @ 83A6BF4
+	.4byte MovementActionFunc_x44_0
+	.4byte MovementActionFunc_x44_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x45:: @ 83A6C00
+	.4byte MovementActionFunc_x45_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x46:: @ 83A6C0C
+	.4byte MovementActionFunc_x46_0
+	.4byte MovementActionFunc_x46_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x47:: @ 83A6C18
+	.4byte MovementActionFunc_x47_0
+	.4byte MovementActionFunc_x47_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x48:: @ 83A6C24
+	.4byte MovementActionFunc_x48_0
+	.4byte MovementActionFunc_x48_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x49:: @ 83A6C30
+	.4byte MovementActionFunc_x49_0
+	.4byte MovementActionFunc_x49_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_xA6:: @ 83A6C3C
+	.4byte MovementActionFunc_xA6_0
+	.4byte MovementActionFunc_xA6_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_xA7:: @ 83A6C48
+	.4byte MovementActionFunc_xA7_0
+	.4byte MovementActionFunc_xA7_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_xA8:: @ 83A6C54
+	.4byte MovementActionFunc_xA8_0
+	.4byte MovementActionFunc_xA8_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_xA9:: @ 83A6C60
+	.4byte MovementActionFunc_xA9_0
+	.4byte MovementActionFunc_xA9_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x4A:: @ 83A6C6C
+	.4byte MovementActionFunc_x4A_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x4B:: @ 83A6C74
+	.4byte MovementActionFunc_x4B_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x4C:: @ 83A6C7C
+	.4byte MovementActionFunc_x4C_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x4D:: @ 83A6C84
+	.4byte MovementActionFunc_x4D_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x4E:: @ 83A6C8C
+	.4byte MovementActionFunc_x4E_0
+	.4byte MovementActionFunc_x4E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x4F:: @ 83A6C98
+	.4byte MovementActionFunc_x4F_0
+	.4byte MovementActionFunc_x4F_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x50:: @ 83A6CA4
+	.4byte MovementActionFunc_x50_0
+	.4byte MovementActionFunc_x50_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x51:: @ 83A6CB0
+	.4byte MovementActionFunc_x51_0
+	.4byte MovementActionFunc_x51_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x52:: @ 83A6CBC
+	.4byte MovementActionFunc_x52_0
+	.4byte MovementActionFunc_x52_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x53:: @ 83A6CC8
+	.4byte MovementActionFunc_x53_0
+	.4byte MovementActionFunc_x53_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x54:: @ 83A6CD4
+	.4byte MovementActionFunc_x54_0
+	.4byte MovementActionFunc_x54_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x55:: @ 83A6CE0
+	.4byte MovementActionFunc_x55_0
+	.4byte MovementActionFunc_x55_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x56:: @ 83A6CEC
+	.4byte MovementActionFunc_x56_0
+	.4byte MovementActionFunc_x56_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x57:: @ 83A6CF8
+	.4byte MovementActionFunc_x57_0
+	.4byte MovementActionFunc_x57_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x58:: @ 83A6D04
+	.4byte MovementActionFunc_x58_0
+	.4byte MovementActionFunc_x58_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x59:: @ 83A6D10
+	.4byte MovementActionFunc_x59_0
+	.4byte MovementActionFunc_x59_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x5A:: @ 83A6D1C
+	.4byte MovementActionFunc_x5A_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x5B:: @ 83A6D24
+	.4byte MovementActionFunc_x5B_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x5C:: @ 83A6D30
+	.4byte MovementActionFunc_x5C_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x5D:: @ 83A6D38
+	.4byte MovementActionFunc_x5D_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x5E:: @ 83A6D40
+	.4byte MovementActionFunc_x5E_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x5F:: @ 83A6D48
+	.4byte MovementActionFunc_x5F_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x60:: @ 83A6D50
+	.4byte MovementActionFunc_x60_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x61:: @ 83A6D58
+	.4byte MovementActionFunc_x61_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x62:: @ 83A6D60
 	.4byte do_exclamation_mark_bubble_1
-	.4byte sub_8067930
+	.4byte MovementActionFunc_x18_2
 
-gUnknown_83A6D68:: @ 83A6D68
+sMovementActionFuncs_x63:: @ 83A6D68
 	.4byte do_exclamation_mark_bubble_2
-	.4byte sub_8067930
-
-gUnknown_83A6D70:: @ 83A6D70
-	.4byte do_heart_bubble
-	.4byte sub_8067930
-
-gUnknown_83A6D78:: @ 83A6D78
-	.4byte sub_806698C
-	.4byte sub_8067930
-
-gUnknown_83A6D80:: @ 83A6D80
-	.4byte sub_80669B0
-	.4byte sub_8067930
-
-gUnknown_83A6D88:: @ 83A6D88
-	.4byte sub_80669D4
-	.4byte sub_8066A18
-	.4byte sub_8067930
-
-gUnknown_83A6D94:: @ 83A6D94
-	.4byte sub_8066A38
-	.4byte sub_8066A54
-	.4byte sub_8066A78
-	.4byte sub_8067930
-
-gUnknown_83A6DA4:: @ 83A6DA4
-	.4byte sub_8066AB4
-	.4byte sub_8066AD0
-	.4byte sub_8066AF4
-	.4byte sub_8067930
-
-gUnknown_83A6DB4:: @ 83A6DB4
-	.4byte sub_8066B30
-	.4byte sub_8067930
-
-gUnknown_83A6DBC:: @ 83A6DBC
-	.4byte sub_8066B40
-	.4byte sub_8067930
-
-gUnknown_83A6DC4:: @ 83A6DC4
-	.4byte sub_8066B50
-	.4byte sub_8067930
-
-gUnknown_83A6DCC:: @ 83A6DCC
-	.4byte sub_8066B80
-	.4byte sub_8067930
-
-gUnknown_83A6DD4:: @ 83A6DD4
-	.4byte sub_8066BB0
-	.4byte sub_8066BE4
-	.4byte sub_8067934
-
-gUnknown_83A6DE0:: @ 83A6DE0
-	.4byte sub_8066C10
-	.4byte sub_8066C44
-	.4byte sub_8067934
-
-gUnknown_83A6DEC:: @ 83A6DEC
-	.4byte sub_8066CB0
-	.4byte sub_8067934
-
-gUnknown_83A6DF4:: @ 83A6DF4
-	.4byte sub_8066CC0
-	.4byte sub_8067934
-
-gUnknown_83A6DFC:: @ 83A6DFC
-	.4byte sub_8066CD0
-	.4byte sub_8067934
-
-gUnknown_83A6E04:: @ 83A6E04
-	.4byte sub_8066CE0
-	.4byte sub_8067934
-
-gUnknown_83A6E0C:: @ 83A6E0C
-	.4byte sub_8066CF0
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E18:: @ 83A6E18
-	.4byte sub_8066D14
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E24:: @ 83A6E24
-	.4byte sub_8066D38
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E30:: @ 83A6E30
-	.4byte sub_8066D5C
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E3C:: @ 83A6E3C
-	.4byte sub_8066D80
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E48:: @ 83A6E48
-	.4byte sub_8066DA4
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E54:: @ 83A6E54
-	.4byte sub_8066DC8
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E60:: @ 83A6E60
-	.4byte sub_8066DEC
-	.4byte sub_8066108
-	.4byte sub_8067934
-	.4byte sub_8066E10
-	.4byte sub_8066108
-	.4byte sub_8067934
-	.4byte sub_8066E34
-	.4byte sub_8066108
-	.4byte sub_8067934
-	.4byte sub_8066E58
-	.4byte sub_8066108
-	.4byte sub_8067934
-	.4byte sub_8066E7C
-	.4byte sub_8066108
-	.4byte sub_8067934
-
-gUnknown_83A6E9C:: @ 83A6E9C
-	.4byte sub_8066EE4
-	.4byte sub_8066F10
-	.4byte sub_8067934
-
-gUnknown_83A6EA8:: @ 83A6EA8
-	.4byte sub_8066F3C
-	.4byte sub_8066F68
-	.4byte sub_8067934
-
-gUnknown_83A6EB4:: @ 83A6EB4
-	.4byte sub_8066F94
-	.4byte sub_8066FC0
-	.4byte sub_8067934
-
-gUnknown_83A6EC0:: @ 83A6EC0
-	.4byte sub_8066FEC
-	.4byte sub_8067018
-	.4byte sub_8067934
-
-gUnknown_83A6ECC:: @ 83A6ECC
-	.4byte sub_8067044
-	.4byte sub_8067070
-	.4byte sub_8067934
-
-gUnknown_83A6ED8:: @ 83A6ED8
-	.4byte sub_806709C
-	.4byte sub_80670C8
-	.4byte sub_8067934
-
-gUnknown_83A6EE4:: @ 83A6EE4
-	.4byte sub_80670F4
-	.4byte sub_8067120
-	.4byte sub_8067934
-
-gUnknown_83A6EF0:: @ 83A6EF0
-	.4byte sub_806714C
-	.4byte sub_8067178
-	.4byte sub_8067934
-
-gUnknown_83A6EFC:: @ 83A6EFC
-	.4byte sub_80671A4
-	.4byte sub_80671D0
-	.4byte sub_8067934
-
-gUnknown_83A6F08:: @ 83A6F08
-	.4byte sub_80671FC
-	.4byte sub_8067228
-	.4byte sub_8067934
-
-gUnknown_83A6F14:: @ 83A6F14
-	.4byte sub_8067254
-	.4byte sub_8067280
-	.4byte sub_8067934
-
-gUnknown_83A6F20:: @ 83A6F20
-	.4byte sub_80672AC
-	.4byte sub_80672D8
-	.4byte sub_8067934
-
-gUnknown_83A6F2C:: @ 83A6F2C
-	.4byte sub_8067304
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6F38:: @ 83A6F38
-	.4byte sub_806733C
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6F44:: @ 83A6F44
-	.4byte sub_8067374
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6F50:: @ 83A6F50
-	.4byte sub_80673AC
-	.4byte sub_806570C
-	.4byte sub_8067934
-
-gUnknown_83A6F5C:: @ 83A6F5C
-	.4byte sub_806741C
-	.4byte sub_806743C
-	.4byte sub_8067934
-
-gUnknown_83A6F68:: @ 83A6F68
-	.4byte sub_806745C
-	.4byte sub_806747C
-	.4byte sub_8067934
-
-gUnknown_83A6F74:: @ 83A6F74
-	.4byte sub_806749C
-	.4byte sub_80674BC
-	.4byte sub_8067934
-
-gUnknown_83A6F80:: @ 83A6F80
-	.4byte sub_80674DC
-	.4byte sub_80674FC
-	.4byte sub_8067934
-
-gUnknown_83A6F8C:: @ 83A6F8C
-	.4byte sub_806754C
-	.4byte sub_806756C
-	.4byte sub_8067934
-
-gUnknown_83A6F98:: @ 83A6F98
-	.4byte sub_806758C
-	.4byte sub_80675AC
-	.4byte sub_8067934
-
-gUnknown_83A6FA4:: @ 83A6FA4
-	.4byte sub_80675CC
-	.4byte sub_80675EC
-	.4byte sub_8067934
-
-gUnknown_83A6FB0:: @ 83A6FB0
-	.4byte sub_806760C
-	.4byte sub_806762C
-	.4byte sub_8067934
-
-gUnknown_83A6FBC:: @ 83A6FBC
-	.4byte sub_8067684
-	.4byte sub_80676A4
-	.4byte sub_8067934
-
-gUnknown_83A6FC8:: @ 83A6FC8
-	.4byte sub_80676C4
-	.4byte sub_80676E4
-	.4byte sub_8067934
-
-gUnknown_83A6FD4:: @ 83A6FD4
-	.4byte sub_8067704
-	.4byte sub_8067724
-	.4byte sub_8067934
-
-gUnknown_83A6FE0:: @ 83A6FE0
-	.4byte sub_8067744
-	.4byte sub_8067764
-	.4byte sub_8067934
-
-gUnknown_83A6FEC:: @ 83A6FEC
-	.4byte sub_8067784
-	.4byte sub_80677C0
-
-gUnknown_83A6FF4:: @ 83A6FF4
-	.4byte sub_8067784
-	.4byte sub_80677CC
-
-gUnknown_83A6FFC:: @ 83A6FFC
-	.4byte sub_8067784
-	.4byte sub_80678C0
-
-gUnknown_83A7004:: @ 83A7004
-	.4byte sub_80678F0
-	.4byte sub_8067924
-
-gUnknown_83A700C:: @ 83A700C
-	.4byte sub_8067944
-	.4byte sub_8067954
-	.4byte sub_80679A8
-
-gUnknown_83A7018:: @ 83A7018
-	.4byte sub_8067978
-	.4byte sub_806798C
-	.4byte sub_80679A8
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x64:: @ 83A6D70
+	.4byte do_x_bubble
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x65:: @ 83A6D78
+	.4byte do_double_excl_bubble
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x66:: @ 83A6D80
+	.4byte do_smile_bubble
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x67:: @ 83A6D88
+	.4byte MovementActionFunc_x67_0
+	.4byte MovementActionFunc_x67_1
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x68:: @ 83A6D94
+	.4byte MovementActionFunc_x68_0
+	.4byte MovementActionFunc_x68_1
+	.4byte MovementActionFunc_x68_2
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x69:: @ 83A6DA4
+	.4byte MovementActionFunc_x69_0
+	.4byte MovementActionFunc_x69_1
+	.4byte MovementActionFunc_x69_2
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x6A:: @ 83A6DB4
+	.4byte MovementActionFunc_x6A_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x6B:: @ 83A6DBC
+	.4byte MovementActionFunc_x6B_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x6C:: @ 83A6DC4
+	.4byte MovementActionFunc_x6C_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x6D:: @ 83A6DCC
+	.4byte MovementActionFunc_x6D_0
+	.4byte MovementActionFunc_x18_2
+
+sMovementActionFuncs_x6E:: @ 83A6DD4
+	.4byte MovementActionFunc_x6E_0
+	.4byte MovementActionFunc_x6E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x6F:: @ 83A6DE0
+	.4byte MovementActionFunc_x6F_0
+	.4byte MovementActionFunc_x6F_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x70:: @ 83A6DEC
+	.4byte MovementActionFunc_x70_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x71:: @ 83A6DF4
+	.4byte MovementActionFunc_x71_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x72:: @ 83A6DFC
+	.4byte MovementActionFunc_x72_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x73:: @ 83A6E04
+	.4byte MovementActionFunc_x73_0
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x74:: @ 83A6E0C
+	.4byte MovementActionFunc_x74_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x75:: @ 83A6E18
+	.4byte MovementActionFunc_x75_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x76:: @ 83A6E24
+	.4byte MovementActionFunc_x76_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x77:: @ 83A6E30
+	.4byte MovementActionFunc_x77_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x78:: @ 83A6E3C
+	.4byte MovementActionFunc_x78_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x79:: @ 83A6E48
+	.4byte MovementActionFunc_x79_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x7A:: @ 83A6E54
+	.4byte MovementActionFunc_x7A_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x7B:: @ 83A6E60
+	.4byte MovementActionFunc_x7B_0
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+	.4byte MovementActionFunc_x7B_3
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+	.4byte MovementActionFunc_x7B_6
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+	.4byte MovementActionFunc_x7B_9
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+	.4byte MovementActionFunc_x7B_12
+	.4byte MovementActionFunc_x45_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x7C:: @ 83A6E9C
+	.4byte MovementActionFunc_x7C_0
+	.4byte MovementActionFunc_x7C_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x7D:: @ 83A6EA8
+	.4byte MovementActionFunc_x7D_0
+	.4byte MovementActionFunc_x7D_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x7E:: @ 83A6EB4
+	.4byte MovementActionFunc_x7E_0
+	.4byte MovementActionFunc_x7E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x7F:: @ 83A6EC0
+	.4byte MovementActionFunc_x7F_0
+	.4byte MovementActionFunc_x7F_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x80:: @ 83A6ECC
+	.4byte MovementActionFunc_x80_0
+	.4byte MovementActionFunc_x80_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x81:: @ 83A6ED8
+	.4byte MovementActionFunc_x81_0
+	.4byte MovementActionFunc_x81_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x82:: @ 83A6EE4
+	.4byte MovementActionFunc_x82_0
+	.4byte MovementActionFunc_x82_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x83:: @ 83A6EF0
+	.4byte MovementActionFunc_x83_0
+	.4byte MovementActionFunc_x83_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x84:: @ 83A6EFC
+	.4byte MovementActionFunc_x84_0
+	.4byte MovementActionFunc_x84_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x85:: @ 83A6F08
+	.4byte MovementActionFunc_x85_0
+	.4byte MovementActionFunc_x85_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x86:: @ 83A6F14
+	.4byte MovementActionFunc_x86_0
+	.4byte MovementActionFunc_x86_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x87:: @ 83A6F20
+	.4byte MovementActionFunc_x87_0
+	.4byte MovementActionFunc_x87_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x88:: @ 83A6F2C
+	.4byte MovementActionFunc_x88_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x89:: @ 83A6F38
+	.4byte MovementActionFunc_x89_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x8A:: @ 83A6F44
+	.4byte MovementActionFunc_x8A_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x8B:: @ 83A6F50
+	.4byte MovementActionFunc_x8B_0
+	.4byte MovementActionFunc_x25_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x8C:: @ 83A6F5C
+	.4byte MovementActionFunc_x8C_0
+	.4byte MovementActionFunc_x8C_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x8D:: @ 83A6F68
+	.4byte MovementActionFunc_x8D_0
+	.4byte MovementActionFunc_x8D_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x8E:: @ 83A6F74
+	.4byte MovementActionFunc_x8E_0
+	.4byte MovementActionFunc_x8E_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x8F:: @ 83A6F80
+	.4byte MovementActionFunc_x8F_0
+	.4byte MovementActionFunc_x8F_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x90:: @ 83A6F8C
+	.4byte MovementActionFunc_x90_0
+	.4byte MovementActionFunc_x90_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x91:: @ 83A6F98
+	.4byte MovementActionFunc_x91_0
+	.4byte MovementActionFunc_x91_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x92:: @ 83A6FA4
+	.4byte MovementActionFunc_x92_0
+	.4byte MovementActionFunc_x92_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x93:: @ 83A6FB0
+	.4byte MovementActionFunc_x93_0
+	.4byte MovementActionFunc_x93_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x94:: @ 83A6FBC
+	.4byte MovementActionFunc_x94_0
+	.4byte MovementActionFunc_x94_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x95:: @ 83A6FC8
+	.4byte MovementActionFunc_x95_0
+	.4byte MovementActionFunc_x95_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x96:: @ 83A6FD4
+	.4byte MovementActionFunc_x96_0
+	.4byte MovementActionFunc_x96_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x97:: @ 83A6FE0
+	.4byte MovementActionFunc_x97_0
+	.4byte MovementActionFunc_x97_1
+	.4byte MovementActionFunc_x00_1
+
+sMovementActionFuncs_x98:: @ 83A6FEC
+	.4byte MovementActionFunc_x98_0
+	.4byte MovementActionFunc_x98_1
+
+sMovementActionFuncs_x99:: @ 83A6FF4
+	.4byte MovementActionFunc_x98_0
+	.4byte MovementActionFunc_x99_1
+
+sMovementActionFuncs_x9A:: @ 83A6FFC
+	.4byte MovementActionFunc_x98_0
+	.4byte MovementActionFunc_x9A_1
+
+sMovementActionFuncs_x9F:: @ 83A7004
+	.4byte MovementActionFunc_x9F_0
+	.4byte MovementActionFunc_x9F_1
+
+sMovementActionFuncs_xA4:: @ 83A700C
+	.4byte MovementActionFunc_xA4_0
+	.4byte MovementActionFunc_xA4_1
+	.4byte MovementActionFunc_xA4_2
+
+sMovementActionFuncs_xA5:: @ 83A7018
+	.4byte MovementActionFunc_xA5_0
+	.4byte MovementActionFunc_xA5_1
+	.4byte MovementActionFunc_xA4_2
+	.align 2
+gUnknown_83A7024:: @ 83A7024
+	.4byte 0x00000020, 0x00000010
+
+gUnknown_83A702C:: @ 83A702C
+	.4byte MetatileBehavior_IsTallGrass_2
+	.4byte MetatileBehavior_IsLongGrass
+	.4byte MetatileBehavior_IsPuddle
+	.4byte MetatileBehavior_IsSurfable
+	.4byte MetatileBehavior_IsWaterfallBottom
+	.4byte MetatileBehavior_UnusedReturnTrue
+
+gUnknown_83A7044:: @ 83A7044
+	.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
+
+gUnknown_83A705C:: @ 83A705C
+	.4byte MetatileBehavior_IsJumpSouth
+	.4byte MetatileBehavior_IsJumpNorth
+	.4byte MetatileBehavior_IsJumpWest
+	.4byte MetatileBehavior_IsJumpEast
+
+gUnknown_83A706C:: @ 83A706C
+	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
+
+gUnknown_83A707C:: @ 83A707C
+	.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
+
+gUnknown_83A708C:: @ 83A708C
+	.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
+
+gUnknown_83A709C:: @ 83A709C
+	.4byte nullsub_26
+	.4byte DoTracksGroundEffect_Footprints
+	.4byte DoTracksGroundEffect_BikeTireTracks
+
+gUnknown_83A70A8:: @ 83A70A8
+	.byte 0x0d, 0x00, 0x18, 0x00
+
+gUnknown_83A70AC:: @ 83A70AC
+	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
+
+gUnknown_83A70BC:: @ 83A70BC
+	.4byte GroundEffect_SpawnOnTallGrass
+	.4byte GroundEffect_StepOnTallGrass
+	.4byte GroundEffect_SpawnOnLongGrass
+	.4byte GroundEffect_StepOnLongGrass
+	.4byte GroundEffect_WaterReflection
+	.4byte GroundEffect_IceReflection
+	.4byte GroundEffect_FlowingWater
+	.4byte GroundEffect_SandTracks
+	.4byte GroundEffect_DeepSandTracks
+	.4byte GroundEffect_Ripple
+	.4byte GroundEffect_StepOnPuddle
+	.4byte GroundEffect_SandHeap
+	.4byte GroundEffect_JumpOnTallGrass
+	.4byte GroundEffect_JumpOnLongGrass
+	.4byte GroundEffect_JumpOnShallowWater
+	.4byte GroundEffect_JumpOnWater
+	.4byte GroundEffect_JumpLandingDust
+	.4byte GroundEffect_ShortGrass
+	.4byte GroundEffect_HotSprings
+	.4byte GroundEffect_Seaweed
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 671e2436c..c088f893d 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -18,7 +18,6 @@
 #include "constants/field_effects.h"
 #include "constants/trainers.h"
 #include "constants/trainer_tower.h"
-#include "constants/object_events.h"
 #include "constants/fame_checker.h"
 #include "constants/seagallop.h"
 #include "constants/game_stat.h"
@@ -1331,16 +1330,14 @@ EventScript_SetResultFalse:: @ 81A77B0
 	setvar VAR_RESULT, FALSE
 	return
 
-Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6
-Route18_EastEntrance_1F_EventScript_1A77B6:: @ 81A77B6
+EventScript_SetExitingCyclingRoad:: @ 81A77B6
 	lockall
 	clearflag FLAG_SYS_ON_CYCLING_ROAD
 	setvar VAR_MAP_SCENE_ROUTE16, 0
 	releaseall
 	end
 
-Route16_NorthEntrance_1F_EventScript_1A77C1:: @ 81A77C1
-Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
+EventScript_SetEnteringCyclingRoad:: @ 81A77C1
 	lockall
 	setvar VAR_MAP_SCENE_ROUTE16, 1
 	releaseall
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 98685da05..cac76bea9 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -2,7 +2,7 @@
 	.section script_data, "aw", %progbits
 	.align 2
 gUnknown_81D96AC:: @ 81D96AC
-	.4byte gFldEffScript_ExclamationMarkIcon1
+	.4byte gFldEffScript_ExclamationMarkIcon
 	.4byte gFldEffScript_UseCutOnGrass
 	.4byte gFldEffScript_UseCutOnTree
 	.4byte gFldEffScript_Shadow
@@ -35,7 +35,7 @@ gUnknown_81D96AC:: @ 81D96AC
 	.4byte gFldEffScript_NpcflyOut
 	.4byte gFldEffScript_UseFly
 	.4byte gFldEffScript_FlyIn
-	.4byte gFldEffScript_ExclamationMarkIcon2
+	.4byte gFldEffScript_QuestionMarkIcon
 	.4byte gFldEffScript_FeetInFlowingWater
 	.4byte gFldEffScript_BikeTireTracks
 	.4byte gFldEffScript_SandDisguise
@@ -66,23 +66,23 @@ gUnknown_81D96AC:: @ 81D96AC
 	.4byte gFldEffScript_PcturnOn
 	.4byte gFldEffScript_HallOfFameRecord
 	.4byte gFldEffScript_UseTeleport
-	.4byte gFldEffScript_Unk40
+	.4byte gFldEffScript_SmileyFaceIcon
 	.4byte gFldEffScript_Unk41
-	.4byte gFldEffScript_Unk42
+	.4byte gFldEffScript_DoubleExclMarkIcon
 	.4byte gFldEffScript_Unk43
 	.4byte gFldEffScript_Unk44
 	.4byte gFldEffScript_Unk45
 
-gFldEffScript_ExclamationMarkIcon1:: @ 81D97C4
+gFldEffScript_ExclamationMarkIcon:: @ 81D97C4
 	callnative FldEff_ExclamationMarkIcon1
 	end 
 
 gFldEffScript_UseCutOnGrass:: @ 81D97CA
-	callnative sub_80979A0
+	callnative FldEff_UseCutOnGrass
 	end 
 
 gFldEffScript_UseCutOnTree:: @ 81D97D0
-	callnative sub_80979F0
+	callnative FldEff_UseCutOnTree
 	end 
 
 gFldEffScript_Shadow:: @ 81D97D6
@@ -203,8 +203,8 @@ gFldEffScript_FlyIn:: @ 81D98BE
 	callnative FldEff_FlyIn
 	end 
 
-gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4
-	callnative sub_8082624
+gFldEffScript_QuestionMarkIcon:: @ 81D98C4
+	callnative FldEff_QuestionMarkIcon
 	end 
 
 gFldEffScript_FeetInFlowingWater:: @ 81D98CA
@@ -257,7 +257,7 @@ gFldEffScript_Pokeball:: @ 81D9920
 	end 
 
 gFldEffScript_HeartIcon:: @ 81D992B
-	callnative sub_80825B4
+	callnative FldEff_XIcon
 	end 
 
 gFldEffScript_Nop47:: @ 81D9931
@@ -299,7 +299,7 @@ gFldEffScript_SecretPowerShrub:: @ 81D9964
 	end 
 
 gFldEffScript_CutGrass:: @ 81D9965
-	loadfadedpal_callnative gUnknown_83D4144, sub_8097A48
+	loadfadedpal_callnative gFldEffPalette_CutGrass, FldEff_CutGrass
 	end 
 
 gFldEffScript_FieldMoveShowMonInit:: @ 81D996F
@@ -321,16 +321,16 @@ gFldEffScript_UseTeleport:: @ 81D9986
 	callnative FldEff_UseTeleport
 	end 
 
-gFldEffScript_Unk40:: @ 81D998C
-	callnative sub_80825EC
+gFldEffScript_SmileyFaceIcon:: @ 81D998C
+	callnative FldEff_SmileyFaceIcon
 	end 
 
 gFldEffScript_Unk41:: @ 81D9992
 	callnative sub_8086BA8
 	end 
 
-gFldEffScript_Unk42:: @ 81D9998
-	callnative sub_808257C
+gFldEffScript_DoubleExclMarkIcon:: @ 81D9998
+	callnative FldEff_DoubleExclMarkIcon
 	end 
 
 gFldEffScript_Unk43:: @ 81D999E
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
deleted file mode 100644
index c871b2d4b..000000000
--- a/data/field_ground_effect.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.section .rodata
-	.align 2
-gUnknown_83A7024:: @ 83A7024
-	.4byte 0x00000020, 0x00000010
-
-gUnknown_83A702C:: @ 83A702C
-	.4byte MetatileBehavior_IsTallGrass_2
-	.4byte MetatileBehavior_IsLongGrass
-	.4byte MetatileBehavior_IsPuddle
-	.4byte MetatileBehavior_IsSurfable
-	.4byte MetatileBehavior_IsWaterfallBottom
-	.4byte MetatileBehavior_UnusedReturnTrue
-
-gUnknown_83A7044:: @ 83A7044
-	.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
-
-gUnknown_83A705C:: @ 83A705C
-	.4byte MetatileBehavior_IsJumpSouth
-	.4byte MetatileBehavior_IsJumpNorth
-	.4byte MetatileBehavior_IsJumpWest
-	.4byte MetatileBehavior_IsJumpEast
-
-gUnknown_83A706C:: @ 83A706C
-	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
-
-gUnknown_83A707C:: @ 83A707C
-	.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
-
-gUnknown_83A708C:: @ 83A708C
-	.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
-
-gUnknown_83A709C:: @ 83A709C
-	.4byte nullsub_26
-	.4byte DoTracksGroundEffect_Footprints
-	.4byte DoTracksGroundEffect_BikeTireTracks
-
-gUnknown_83A70A8:: @ 83A70A8
-	.byte 0x0d, 0x00, 0x18, 0x00
-
-gUnknown_83A70AC:: @ 83A70AC
-	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
-
-gUnknown_83A70BC:: @ 83A70BC
-	.4byte GroundEffect_SpawnOnTallGrass
-	.4byte GroundEffect_StepOnTallGrass
-	.4byte GroundEffect_SpawnOnLongGrass
-	.4byte GroundEffect_StepOnLongGrass
-	.4byte GroundEffect_WaterReflection
-	.4byte GroundEffect_IceReflection
-	.4byte GroundEffect_FlowingWater
-	.4byte GroundEffect_SandTracks
-	.4byte GroundEffect_DeepSandTracks
-	.4byte GroundEffect_Ripple
-	.4byte GroundEffect_StepOnPuddle
-	.4byte GroundEffect_SandHeap
-	.4byte GroundEffect_JumpOnTallGrass
-	.4byte GroundEffect_JumpOnLongGrass
-	.4byte GroundEffect_JumpOnShallowWater
-	.4byte GroundEffect_JumpOnWater
-	.4byte GroundEffect_JumpLandingDust
-	.4byte GroundEffect_ShortGrass
-	.4byte GroundEffect_HotSprings
-	.4byte GroundEffect_Seaweed
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index d89daa03c..be4036928 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -1,3 +1,4 @@
+#include "constants/event_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.section .rodata
@@ -36,11 +37,11 @@ gUnknown_835B820:: @ 835B820
 
 	.align 2
 gUnknown_835B828:: @ 835B828
-	.4byte MetatileBehavior_ReturnFalse_14
-	.4byte MetatileBehavior_ReturnFalse_15
-	.4byte MetatileBehavior_ReturnFalse_16
-	.4byte MetatileBehavior_ReturnFalse_17
-	.4byte MetatileBehavior_ReturnFalse_18
+	.4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike
 
 gUnknown_835B83C:: @ 835B83C
 	.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
@@ -63,16 +64,30 @@ gUnknown_835B864:: @ 835B864
 	.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_835B874:: @ 835B874
-	.byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c
+	.byte OBJ_EVENT_GFX_RED_NORMAL,    OBJ_EVENT_GFX_GREEN_NORMAL
+	.byte OBJ_EVENT_GFX_RED_BIKE,      OBJ_EVENT_GFX_GREEN_BIKE
+	.byte OBJ_EVENT_GFX_RED_SURF,      OBJ_EVENT_GFX_GREEN_SURF
+	.byte OBJ_EVENT_GFX_RED_ITEM,      OBJ_EVENT_GFX_GREEN_ITEM
+	.byte OBJ_EVENT_GFX_RED_FISH,      OBJ_EVENT_GFX_GREEN_FISH
+	.byte OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY
 
 gUnknown_835B880:: @ 835B880
-	.byte 0x0e, 0x0f
+	.byte OBJ_EVENT_GFX_RS_BRENDAN
+	.byte OBJ_EVENT_GFX_RS_MAY
 
 gUnknown_835B882:: @ 835B882
-	.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08
+	@ Male
+	.byte OBJ_EVENT_GFX_RED_NORMAL, 0x01
+	.byte OBJ_EVENT_GFX_RED_BIKE, 0x02
+	.byte OBJ_EVENT_GFX_RED_SURF, 0x08
+	@ Female
+	.byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01
+	.byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02
+	.byte OBJ_EVENT_GFX_GREEN_SURF, 0x08
 
 gUnknown_835B88E:: @ 835B88E
-	.byte 0x06, 0x0d
+	.byte OBJ_EVENT_GFX_RED_VS_SEEKER
+	.byte OBJ_EVENT_GFX_GREEN_VS_SEEKER
 
 gUnknown_835B890:: @ 835B890
 	.4byte MetatileBehavior_IsSouthArrowWarp
diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s
deleted file mode 100644
index ca25b396a..000000000
--- a/data/fldeff_cut.s
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83D4100:: @ 83D4100
-	.2byte 0x000d, 0x0001
-	.2byte 0x000a, 0x0013
-	.2byte 0x000b, 0x000e
-	.2byte 0x000c, 0x000f
-	.2byte 0x0352, 0x033e
-	.2byte 0x0300, 0x0310
-	.2byte 0x0301, 0x0311
-	.2byte 0x0302, 0x0312
-	.2byte 0x0284, 0x0281
-	.2byte 0xffff, 0xffff
-
-	.align 2
-gOamData_83D4128::
-	.4byte 0x00000000, 0x00001401
-
-gAnimCmd_83D4130::
-	obj_image_anim_frame 0, 30
-	obj_image_anim_jump 0
-
-gSpriteAnimTable_83D4138::
-	.4byte gAnimCmd_83D4130
-
-gUnknown_83D413C::
-	obj_frame_tiles gUnknown_8398648, 0x20
-
-gUnknown_83D4144::
-	obj_pal gUnknown_8398688, 4096
-
-gUnknown_83D414C:: @ 83D414C
-	spr_template 0xFFFF, 4096, gOamData_83D4128, gSpriteAnimTable_83D4138, gUnknown_83D413C, gDummySpriteAffineAnimTable, objc_8097BA8
-
diff --git a/data/graphics.s b/data/graphics.s
deleted file mode 100644
index 3ae4f8e8a..000000000
--- a/data/graphics.s
+++ /dev/null
@@ -1,16631 +0,0 @@
-	.section gfx_data, "aw", %progbits
-
-	.align 2
-gBattleTextboxTiles:: @ 8D00000
-	.incbin "graphics/battle_interface/window.4bpp.lz"
-
-	.align 2
-gBattleTextboxPalette:: @ 8D004D8
-	.incbin "graphics/battle_interface/window.gbapal.lz"
-
-	.align 2
-gFile_graphics_interface_menu_map_tilemap:: @ 8D0051C
-	.incbin "graphics/interface/menu_map.bin.lz"
-
-	.align 2
-gMonFrontPic_CircledQuestionMark:: @ 8D00748
-	.incbin "graphics/pokemon/circled_question_mark/circled/front.4bpp.lz"
-
-	.align 2	
-gMonBackPic_CircledQuestionMark:: @ 8D0098C
-	.incbin "graphics/pokemon/circled_question_mark/circled/back.4bpp.lz"
-
-	.align 2
-gMonPalette_CircledQuestionMark:: @ 8D00BD0
-	.incbin "graphics/pokemon/circled_question_mark/circled/normal.gbapal.lz"
-
-	.align 2
-gMonShinyPalette_CircledQuestionMark:: @ 8D00BE8
-	.incbin "graphics/pokemon/circled_question_mark/circled/shiny.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_old_charmap_sheet:: @ 8D00C00
-	.incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby
-
-	.align 2
-gFile_graphics_unused_old_charmap_tilemap:: @ 8D013D8
-	.incbin "graphics/unused/old_charmap.bin.lz" @from ruby
-
-	.align 2
-gFile_graphics_unused_old_charmap_palette:: @ 8D01604
-	.incbin "graphics/unused/old_charmap.gbapal.lz" @from ruby
-
-	.align 2
-gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet:: @ 8D0162C
-	.incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_anims_sprites_smokescreen_impact_palette:: @ 8D0170C
-	.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_PokeBall:: @ 8D01724
-	.incbin "graphics/interface/ball/poke.4bpp.lz"
-
-	.align 2
-gInterfacePal_PokeBall:: @ 8D017E0
-	.incbin "graphics/interface/ball/poke.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_GreatBall:: @ 8D01800
-	.incbin "graphics/interface/ball/great.4bpp.lz"
-
-	.align 2
-gInterfacePal_GreatBall:: @ 8D018BC
-	.incbin "graphics/interface/ball/great.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_SafariBall:: @ 8D018E0
-	.incbin "graphics/interface/ball/safari.4bpp.lz"
-
-	.align 2
-gInterfacePal_SafariBall:: @ 8D019A4
-	.incbin "graphics/interface/ball/safari.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_UltraBall:: @ 8D019C8
-	.incbin "graphics/interface/ball/ultra.4bpp.lz"
-
-	.align 2
-gInterfacePal_UltraBall:: @ 8D01A7C
-	.incbin "graphics/interface/ball/ultra.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_MasterBall:: @ 8D01A9C
-	.incbin "graphics/interface/ball/master.4bpp.lz"
-
-	.align 2
-gInterfacePal_MasterBall:: @ 8D01B5C
-	.incbin "graphics/interface/ball/master.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_NetBall:: @ 8D01B80
-	.incbin "graphics/interface/ball/net.4bpp.lz"
-
-	.align 2
-gInterfacePal_NetBall:: @ 8D01C40
-	.incbin "graphics/interface/ball/net.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_DiveBall:: @ 8D01C60
-	.incbin "graphics/interface/ball/dive.4bpp.lz"
-
-	.align 2
-gInterfacePal_DiveBall:: @ 8D01D74
-	.incbin "graphics/interface/ball/dive.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_NestBall:: @ 8D01D9C
-	.incbin "graphics/interface/ball/nest.4bpp.lz"
-
-	.align 2
-gInterfacePal_NestBall:: @ 8D01E60
-	.incbin "graphics/interface/ball/nest.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_RepeatBall:: @ 8D01E84
-	.incbin "graphics/interface/ball/repeat.4bpp.lz"
-
-	.align 2
-gInterfacePal_RepeatBall:: @ 8D01F44
-	.incbin "graphics/interface/ball/repeat.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_TimerBall:: @ 8D01F68
-	.incbin "graphics/interface/ball/timer.4bpp.lz"
-
-	.align 2
-gInterfacePal_TimerBall:: @ 8D02060
-	.incbin "graphics/interface/ball/timer.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_LuxuryBall:: @ 8D02084
-	.incbin "graphics/interface/ball/luxury.4bpp.lz"
-
-	.align 2
-gInterfacePal_LuxuryBall:: @ 8D021B0
-	.incbin "graphics/interface/ball/luxury.gbapal.lz"
-
-	.align 2
-gInterfaceGfx_PremierBall:: @ 8D021D8
-	.incbin "graphics/interface/ball/premier.4bpp.lz"
-
-	.align 2
-gInterfacePal_PremierBall:: @ 8D022C8
-	.incbin "graphics/interface/ball/premier.gbapal.lz"
-
-	.align 2
-gOpenPokeballGfx:: @ 8D022E8
-	.incbin "graphics/interface/ball_open.4bpp.lz"
-
-	.align 2
-gBlankGfxCompressed:: @ 8D02364
-	.incbin "graphics/interface/blank.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Bubble:: @ 8D02460
-	.incbin "graphics/battle_anims/sprites/146.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Bone:: @ 8D02520
-	.incbin "graphics/battle_anims/sprites/000.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_AirWave:: @ 8D025D0
-	.incbin "graphics/battle_anims/sprites/003.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Orb:: @ 8D02644
-	.incbin "graphics/battle_anims/sprites/004.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sword:: @ 8D026F4
-	.incbin "graphics/battle_anims/sprites/005.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Seed:: @ 8D027C8
-	.incbin "graphics/battle_anims/sprites/006.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RainDrops:: @ 8D02894
-	.incbin "graphics/battle_anims/sprites/115.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Bone:: @ 8D028B4
-	.incbin "graphics/battle_anims/sprites/000.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_AirWave:: @ 8D028D8
-	.incbin "graphics/battle_anims/sprites/003.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Orb:: @ 8D02900
-	.incbin "graphics/battle_anims/sprites/004.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sword:: @ 8D02914
-	.incbin "graphics/battle_anims/sprites/005.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Seed:: @ 8D0293C
-	.incbin "graphics/battle_anims/sprites/006.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Needle:: @ 8D02964
-	.incbin "graphics/battle_anims/sprites/161.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Needle:: @ 8D0298C
-	.incbin "graphics/battle_anims/sprites/161.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Explosion6:: @ 8D029B4
-	.incbin "graphics/battle_anims/sprites/007.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Explosion6:: @ 8D02B30
-	.incbin "graphics/battle_anims/sprites/007.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PinkOrb:: @ 8D02B50
-	.incbin "graphics/battle_anims/sprites/008.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PinkOrb:: @ 8D02B70
-	.incbin "graphics/battle_anims/sprites/008.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_IceCube:: @ 8D02B8C
-	.incbin "graphics/battle_anims/sprites/010.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_IceCube:: @ 8D02BAC
-	.incbin "graphics/battle_anims/sprites/010.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Gust:: @ 8D02F8C
-	.incbin "graphics/battle_anims/sprites/009.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Gust:: @ 8D03274
-	.incbin "graphics/battle_anims/sprites/009.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Spark2:: @ 8D03294
-	.incbin "graphics/battle_anims/sprites/011.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Spark2:: @ 8D0330C
-	.incbin "graphics/battle_anims/sprites/011.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Orange:: @ 8D03334
-	.incbin "graphics/battle_anims/sprites/012.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Orange:: @ 8D0339C
-	.incbin "graphics/battle_anims/sprites/012.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Spikes:: @ 8D033B4
-	.incbin "graphics/battle_anims/sprites/152.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Spikes:: @ 8D033FC
-	.incbin "graphics/battle_anims/sprites/152.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_YellowBall:: @ 8D03420
-	.incbin "graphics/battle_anims/sprites/013.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_YellowBall:: @ 8D03454
-	.incbin "graphics/battle_anims/sprites/013.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_TiedBag:: @ 8D0346C
-	.incbin "graphics/battle_anims/sprites/015.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_TiedBag:: @ 8D034D8
-	.incbin "graphics/battle_anims/sprites/015.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlackSmoke:: @ 8D03500
-	.incbin "graphics/battle_anims/sprites/016.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlackSmoke:: @ 8D03570
-	.incbin "graphics/battle_anims/sprites/016.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlackBall:: @ 8D03580
-	.incbin "graphics/battle_anims/sprites/017.4bpp.lz"
-
-	.align 2
-gFile_graphics_unknown_Unknown_8D035A0_sheet:: @ 8D035A0
-	.incbin "graphics/unknown/unknown_D035A0.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Glass:: @ 8D035C4
-	.incbin "graphics/battle_anims/sprites/019.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Glass:: @ 8D035E0
-	.incbin "graphics/battle_anims/sprites/019.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HornHit:: @ 8D036A0
-	.incbin "graphics/battle_anims/sprites/020.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_HornHit:: @ 8D0376C
-	.incbin "graphics/battle_anims/sprites/020.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueShards:: @ 8D03794
-	.incbin "graphics/battle_anims/sprites/023.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlueShards:: @ 8D037BC
-	.incbin "graphics/battle_anims/sprites/023.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_battle_anim_023_palette:: @ 8D038C4
-	.incbin "graphics/unused/battle_anim_023.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_music_notes_sheet:: @ 8D038EC
-	.incbin "graphics/unused/music_notes.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Hit:: @ 8D039E8
-	.incbin "graphics/battle_anims/sprites/021.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Hit:: @ 8D03A10
-	.incbin "graphics/battle_anims/sprites/021.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Hit2:: @ 8D03D48
-	.incbin "graphics/battle_anims/sprites/022.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_WavingHand:: @ 8D03D70
-	.incbin "graphics/battle_anims/sprites/025.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WavingHand:: @ 8D03D98
-	.incbin "graphics/battle_anims/sprites/025.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ClosingEye:: @ 8D03E88
-	.incbin "graphics/battle_anims/sprites/024.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ClosingEye:: @ 8D03F54
-	.incbin "graphics/battle_anims/sprites/024.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlueStar:: @ 8D03F68
-	.incbin "graphics/battle_anims/sprites/031.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueStar:: @ 8D04348
-	.incbin "graphics/battle_anims/sprites/031.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BubbleBurst:: @ 8D04368
-	.incbin "graphics/battle_anims/sprites/032.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BubbleBurst:: @ 8D04390
-	.incbin "graphics/battle_anims/sprites/032.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HitDuplicate:: @ 8D0447C
-	.incbin "graphics/battle_anims/sprites/026.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_HitDuplicate:: @ 8D047B4
-	.incbin "graphics/battle_anims/sprites/026.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Leer:: @ 8D047DC
-	.incbin "graphics/battle_anims/sprites/027.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Leer:: @ 8D04804
-	.incbin "graphics/battle_anims/sprites/027.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueBurst:: @ 8D04B00
-	.incbin "graphics/battle_anims/sprites/028.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlueBurst:: @ 8D04B28
-	.incbin "graphics/battle_anims/sprites/028.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SmallEmber:: @ 8D04E78
-	.incbin "graphics/battle_anims/sprites/029.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SmallEmber:: @ 8D05130
-	.incbin "graphics/battle_anims/sprites/029.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GraySmoke:: @ 8D05158
-	.incbin "graphics/battle_anims/sprites/030.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GraySmoke:: @ 8D05518
-	.incbin "graphics/battle_anims/sprites/030.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Fire:: @ 8D0553C
-	.incbin "graphics/battle_anims/sprites/033.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Fire:: @ 8D05564
-	.incbin "graphics/battle_anims/sprites/033.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SpinningFire:: @ 8D05ED4
-	.incbin "graphics/battle_anims/sprites/034.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FirePlume:: @ 8D062A0
-	.incbin "graphics/battle_anims/sprites/035.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Lightning2:: @ 8D06638
-	.incbin "graphics/battle_anims/sprites/036.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Lightning2:: @ 8D06660
-	.incbin "graphics/battle_anims/sprites/036.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Lightning:: @ 8D06A34
-	.incbin "graphics/battle_anims/sprites/037.4bpp.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D06D80_sheet:: @ 8D06D80
-	.incbin "graphics/unknown/unknown_D06D80.4bpp.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D06D80_palette:: @ 8D06DC4
-	.incbin "graphics/unknown/unknown_D06D80.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D06D80_2_palette:: @ 8D06DD8
-	.incbin "graphics/unknown/unknown_D06D80_2.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_obi1_sheet:: @ 8D06E0C
-	.incbin "graphics/unused/obi1.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_obi_palpak1_palette:: @ 8D07170
-	.incbin "graphics/unused/obi_palpak1.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_old_pal4_palette:: @ 8D071B4
-	.incbin "graphics/unused/old_pal4.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_obi_palpak3_palette:: @ 8D071CC
-	.incbin "graphics/unused/obi_palpak3.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_obi2_sheet:: @ 8D07224
-	.incbin "graphics/unused/obi2.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_old_battle_interface_tilemap:: @ 8D077EC
-	.incbin "graphics/unused/old_battle_interface_tilemap.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_ClawSlash2:: @ 8D078FC
-	.incbin "graphics/battle_anims/sprites/038.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_ClawSlash:: @ 8D07924
-	.incbin "graphics/battle_anims/sprites/039.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ClawSlash2:: @ 8D0794C
-	.incbin "graphics/battle_anims/sprites/038.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ClawSlash:: @ 8D07B70
-	.incbin "graphics/battle_anims/sprites/039.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Scratch3:: @ 8D07E6C
-	.incbin "graphics/battle_anims/sprites/040.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Scratch2:: @ 8D08078
-	.incbin "graphics/battle_anims/sprites/041.4bpp.lz"
-
-	.align 2
-gFile_graphics_interface_party_menu_hpbar_sheet:: @ 8D08218
-	.incbin "graphics/interface/party_menu_hpbar.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BubbleBurst2:: @ 8D082AC
-	.incbin "graphics/battle_anims/sprites/042.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BubbleBurst2:: @ 8D0857C
-	.incbin "graphics/battle_anims/sprites/042.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_IceChunk:: @ 8D085A4
-	.incbin "graphics/battle_anims/sprites/043.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_IceChunk:: @ 8D089A4
-	.incbin "graphics/battle_anims/sprites/043.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Glass2:: @ 8D089CC
-	.incbin "graphics/battle_anims/sprites/044.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Glass2:: @ 8D089F4
-	.incbin "graphics/battle_anims/sprites/044.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PinkHeart2:: @ 8D08C60
-	.incbin "graphics/battle_anims/sprites/045.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PinkHeart2:: @ 8D08C88
-	.incbin "graphics/battle_anims/sprites/045.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_interface_unused_window_sheet:: @ 8D08EF4
-	.incbin "graphics/battle_interface/unused_window.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_interface_unused_window_palette:: @ 8D093B0
-	.incbin "graphics/battle_interface/unused_window.gbapal.lz"
-
-	.align 2
-gFile_graphics_interface_hp_numbers:: @ 8D093D8
-	.incbin "graphics/interface/hp_numbers.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SapDrip:: @ 8D095EC
-	.incbin "graphics/battle_anims/sprites/046.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SapDrip:: @ 8D099CC
-	.incbin "graphics/battle_anims/sprites/046.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_SapDrip2:: @ 8D099EC
-	.incbin "graphics/battle_anims/sprites/047.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_interface_unused_window2_sheet:: @ 8D09A10
-	.incbin "graphics/battle_interface/unused_window2.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_interface_unused_window2bar_sheet:: @ 8D09CAC
-	.incbin "graphics/battle_interface/unused_window2bar.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sparkle1:: @ 8D09CD8
-	.incbin "graphics/battle_anims/sprites/048.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sparkle1:: @ 8D09F70
-	.incbin "graphics/battle_anims/sprites/048.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sparkle2:: @ 8D09F98
-	.incbin "graphics/battle_anims/sprites/049.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_HumanoidFoot:: @ 8D09FC0
-	.incbin "graphics/battle_anims/sprites/050.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HumanoidFoot:: @ 8D09FE4
-	.incbin "graphics/battle_anims/sprites/050.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MonsterFoot:: @ 8D0A084
-	.incbin "graphics/battle_anims/sprites/051.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HumanoidHand:: @ 8D0A130
-	.incbin "graphics/battle_anims/sprites/052.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_line_sketch_sheet:: @ 8D0A1FC
-	.incbin "graphics/unused/line_sketch.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_line_sketch_palette:: @ 8D0A380
-	.incbin "graphics/unused/line_sketch.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_YellowUnk:: @ 8D0A390
-	.incbin "graphics/battle_anims/sprites/054.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_YellowUnk:: @ 8D0A3BC
-	.incbin "graphics/battle_anims/sprites/054.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SlamHit:: @ 8D0A3D4
-	.incbin "graphics/battle_anims/sprites/056.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SlamHit:: @ 8D0A87C
-	.incbin "graphics/battle_anims/sprites/056.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RedFist:: @ 8D0A8A4
-	.incbin "graphics/battle_anims/sprites/055.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Ring:: @ 8D0A968
-	.incbin "graphics/battle_anims/sprites/057.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Ring:: @ 8D0A9F0
-	.incbin "graphics/battle_anims/sprites/057.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Rocks:: @ 8D0AA14
-	.incbin "graphics/battle_anims/sprites/058.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Rocks:: @ 8D0AE7C
-	.incbin "graphics/battle_anims/sprites/058.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Z:: @ 8D0AEA4
-	.incbin "graphics/battle_anims/sprites/059.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Z:: @ 8D0AF04
-	.incbin "graphics/battle_anims/sprites/059.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_YellowUnk2:: @ 8D0AF20
-	.incbin "graphics/battle_anims/sprites/060.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_YellowUnk2:: @ 8D0AF48
-	.incbin "graphics/battle_anims/sprites/060.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_AirSlash:: @ 8D0AF64
-	.incbin "graphics/battle_anims/sprites/061.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_AirSlash:: @ 8D0B014
-	.incbin "graphics/battle_anims/sprites/061.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SpinningGreenOrbs:: @ 8D0B034
-	.incbin "graphics/battle_anims/sprites/062.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SpinningGreenOrbs:: @ 8D0B404
-	.incbin "graphics/battle_anims/sprites/062.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Leaf:: @ 8D0B42C
-	.incbin "graphics/battle_anims/sprites/063.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Leaf:: @ 8D0B5E8
-	.incbin "graphics/battle_anims/sprites/063.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_metronome_hand_small_sheet:: @ 8D0B610
-	.incbin "graphics/unused/metronome_hand_small.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Clapping:: @ 8D0B680
-	.incbin "graphics/battle_anims/sprites/091.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PoisonPowder:: @ 8D0B6A4
-	.incbin "graphics/battle_anims/sprites/065.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PoisonPowder:: @ 8D0B7B8
-	.incbin "graphics/battle_anims/sprites/065.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BrownTriangle:: @ 8D0B7D8
-	.incbin "graphics/battle_anims/sprites/066.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BrownTriangle:: @ 8D0B824
-	.incbin "graphics/battle_anims/sprites/066.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sparkle3:: @ 8D0B84C
-	.incbin "graphics/battle_anims/sprites/070.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sparkle3:: @ 8D0B8CC
-	.incbin "graphics/battle_anims/sprites/070.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sparkle4:: @ 8D0B8F4
-	.incbin "graphics/battle_anims/sprites/071.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MusicNotes:: @ 8D0BB20
-	.incbin "graphics/battle_anims/sprites/072.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MusicNotes:: @ 8D0BBF0
-	.incbin "graphics/battle_anims/sprites/072.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Duck:: @ 8D0BC08
-	.incbin "graphics/battle_anims/sprites/073.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Duck:: @ 8D0BD24
-	.incbin "graphics/battle_anims/sprites/073.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Alert:: @ 8D0BD44
-	.incbin "graphics/battle_anims/sprites/075.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Alert:: @ 8D0BFC0
-	.incbin "graphics/battle_anims/sprites/075.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Shock4:: @ 8D0BFE4
-	.incbin "graphics/battle_anims/sprites/078.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Shock4:: @ 8D0C17C
-	.incbin "graphics/battle_anims/sprites/078.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Shock:: @ 8D0C1A4
-	.incbin "graphics/battle_anims/sprites/079.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Bell2:: @ 8D0C5D4
-	.incbin "graphics/battle_anims/sprites/080.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Bell2:: @ 8D0C938
-	.incbin "graphics/battle_anims/sprites/080.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PinkGlove:: @ 8D0C95C
-	.incbin "graphics/battle_anims/sprites/081.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PinkGlove:: @ 8D0C9E0
-	.incbin "graphics/battle_anims/sprites/081.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D0CA04:: @ 8D0CA04
-	.incbin "graphics/unknown/unknown_D0CA04.bin"
-
-	.align 2
-gFile_graphics_unknown_unknown_D0CA28:: @ 8D0CA28
-	.incbin "graphics/unknown/unknown_D0CA28.bin"
-
-	.align 2
-gFile_graphics_unknown_unknown_D0CA4C:: @ 8D0CA4C
-	.incbin "graphics/unknown/unknown_D0CA4C.bin"
-
-	.align 2
-gFile_graphics_unused_line_sketch_2_sheet:: @ 8D0CA70
-	.incbin "graphics/unused/line_sketch_2.8bpp.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D0CAC8:: @ 8D0CAC8
-	.incbin "graphics/unknown/unknown_D0CAC8.bin"
-
-	.align 2
-gFile_graphics_unused_line_sketch_2_tilemap:: @ 8D0CAE8
-	.incbin "graphics/unused/line_sketch_2.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlueLines:: @ 8D0CB78
-	.incbin "graphics/battle_anims/sprites/082.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueLines:: @ 8D0CB9C
-	.incbin "graphics/battle_anims/sprites/082.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Impact3:: @ 8D0CBB0
-	.incbin "graphics/battle_anims/sprites/083.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Impact2:: @ 8D0CBD8
-	.incbin "graphics/battle_anims/sprites/084.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Reticle:: @ 8D0CC00
-	.incbin "graphics/battle_anims/sprites/085.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Breath:: @ 8D0CC18
-	.incbin "graphics/battle_anims/sprites/086.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Snowball:: @ 8D0CC40
-	.incbin "graphics/battle_anims/sprites/088.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Vine:: @ 8D0CC5C
-	.incbin "graphics/battle_anims/sprites/089.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sword2:: @ 8D0CC84
-	.incbin "graphics/battle_anims/sprites/090.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedTube:: @ 8D0CCA8
-	.incbin "graphics/battle_anims/sprites/092.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Amnesia:: @ 8D0CCC4
-	.incbin "graphics/battle_anims/sprites/093.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_String2:: @ 8D0CCEC
-	.incbin "graphics/battle_anims/sprites/094.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D0CD0C:: @ 8D0CD0C
-	.incbin "graphics/unknown/unknown_D0CD0C.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_Pencil2:: @ 8D0CD2C
-	.incbin "graphics/battle_anims/sprites/095.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Petal:: @ 8D0CD54
-	.incbin "graphics/battle_anims/sprites/096.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BentSpoon:: @ 8D0CD70
-	.incbin "graphics/battle_anims/sprites/097.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Coin:: @ 8D0CD98
-	.incbin "graphics/battle_anims/sprites/100.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_CrackedEgg:: @ 8D0CDB4
-	.incbin "graphics/battle_anims/sprites/101.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_FreshEgg:: @ 8D0CDDC
-	.incbin "graphics/battle_anims/sprites/103.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Impact3:: @ 8D0CE00
-	.incbin "graphics/battle_anims/sprites/083.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Impact2:: @ 8D0D2A4
-	.incbin "graphics/battle_anims/sprites/084.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Reticle:: @ 8D0D668
-	.incbin "graphics/battle_anims/sprites/085.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Breath:: @ 8D0D720
-	.incbin "graphics/battle_anims/sprites/086.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Snowball:: @ 8D0D890
-	.incbin "graphics/battle_anims/sprites/088.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Vine:: @ 8D0D8E0
-	.incbin "graphics/battle_anims/sprites/089.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sword2:: @ 8D0DB54
-	.incbin "graphics/battle_anims/sprites/090.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Clapping:: @ 8D0DBE4
-	.incbin "graphics/battle_anims/sprites/091.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RedTube:: @ 8D0DD18
-	.incbin "graphics/battle_anims/sprites/092.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Amnesia:: @ 8D0DD94
-	.incbin "graphics/battle_anims/sprites/093.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_String2:: @ 8D0E464
-	.incbin "graphics/battle_anims/sprites/094.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Pencil2:: @ 8D0E608
-	.incbin "graphics/battle_anims/sprites/095.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Petal:: @ 8D0E6B8
-	.incbin "graphics/battle_anims/sprites/096.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BentSpoon:: @ 8D0E828
-	.incbin "graphics/battle_anims/sprites/097.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Web:: @ 8D0EA08
-	.incbin "graphics/battle_anims/sprites/098.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Coin:: @ 8D0EB40
-	.incbin "graphics/battle_anims/sprites/100.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_CrackedEgg:: @ 8D0EC40
-	.incbin "graphics/battle_anims/sprites/101.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HatchedEgg:: @ 8D0ED70
-	.incbin "graphics/battle_anims/sprites/102.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FreshEgg:: @ 8D0EF08
-	.incbin "graphics/battle_anims/sprites/103.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Fangs:: @ 8D0EF74
-	.incbin "graphics/battle_anims/sprites/104.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Fangs:: @ 8D0F134
-	.incbin "graphics/battle_anims/sprites/104.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Explosion2:: @ 8D0F15C
-	.incbin "graphics/battle_anims/sprites/105.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Explosion2:: @ 8D0F6E0
-	.incbin "graphics/battle_anims/sprites/105.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Explosion3:: @ 8D0F708
-	.incbin "graphics/battle_anims/sprites/106.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WaterDroplet:: @ 8D0F7F8
-	.incbin "graphics/battle_anims/sprites/107.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WaterDroplet:: @ 8D0FBA4
-	.incbin "graphics/battle_anims/sprites/107.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WaterDroplet2:: @ 8D0FBCC
-	.incbin "graphics/battle_anims/sprites/108.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Seed2:: @ 8D0FF50
-	.incbin "graphics/battle_anims/sprites/109.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Seed2:: @ 8D0FF78
-	.incbin "graphics/battle_anims/sprites/109.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sprout:: @ 8D0FFA0
-	.incbin "graphics/battle_anims/sprites/110.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RedWand:: @ 8D10384
-	.incbin "graphics/battle_anims/sprites/111.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedWand:: @ 8D103C8
-	.incbin "graphics/battle_anims/sprites/111.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleGreenUnk:: @ 8D103EC
-	.incbin "graphics/battle_anims/sprites/112.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleGreenUnk:: @ 8D10714
-	.incbin "graphics/battle_anims/sprites/112.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WaterColumn:: @ 8D1073C
-	.incbin "graphics/battle_anims/sprites/113.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WaterColumn:: @ 8D109A8
-	.incbin "graphics/battle_anims/sprites/113.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MudUnk:: @ 8D109D0
-	.incbin "graphics/battle_anims/sprites/114.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MudUnk:: @ 8D10AC4
-	.incbin "graphics/battle_anims/sprites/114.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_blue_frame_tilemap:: @ 8D10AEC
-	.incbin "graphics/unused/blue_frame.bin.lz"
-
-	.align 2
-gFile_graphics_unused_redyellowgreen_frame_tilemap:: @ 8D10C04
-	.incbin "graphics/unused/redyellowgreen_frame.bin.lz"
-
-	.align 2
-gFile_graphics_unused_color_frames_sheet:: @ 8D11004
-	.incbin "graphics/unused/color_frames.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_color_frames_palette:: @ 8D115A4
-	.incbin "graphics/unused/color_frames.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RainDrops:: @ 8D115CC
-	.incbin "graphics/battle_anims/sprites/115.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_water_splash_sheet:: @ 8D116FC
-	.incbin "graphics/unused/water_splash.8bpp.lz"
-
-	.align 2
-gFile_graphics_unused_water_splash_tilemap:: @ 8D11884
-	.incbin "graphics/unused/water_splash.bin.lz"
-
-	.align 2
-gFile_graphics_unused_water_splash_palette:: @ 8D11964
-	.incbin "graphics/unused/water_splash.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_basic_frame_sheet:: @ 8D119C4
-	.incbin "graphics/unused/basic_frame.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_basic_frame_palette:: @ 8D11A50
-	.incbin "graphics/unused/basic_frame.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78
-	.incbin "graphics/unused/basic_frame.bin.lz"
-
-	.align 2
-gBattleInterface_BallStatusBarPal:: @ 8D11B84
-	.incbin "graphics/battle_interface/ball_status_bar.gbapal"
-
-gBattleInterface_BallDisplayPal:: @ 8D11BA4
-	.incbin "graphics/battle_interface/ball_display.gbapal"
-
-@ Originally an array?
-gHealthboxElementsGfxTable:: @ 8D11BC4
-    .incbin "graphics/battle_interface/hp_bar.4bpp"
-    
-gHealthboxElementsGfxTable_ExpBar::
-    .incbin "graphics/battle_interface/exp_bar.4bpp"
-    
-gHealthboxElementsGfxTable_StatusPsn::
-    .incbin "graphics/battle_interface/status_psn.4bpp"
-
-gHealthboxElementsGfxTable_StatusPar::
-    .incbin "graphics/battle_interface/status_par.4bpp"
-
-gHealthboxElementsGfxTable_StatusSlp::
-    .incbin "graphics/battle_interface/status_slp.4bpp"
-
-gHealthboxElementsGfxTable_StatusFrz::
-    .incbin "graphics/battle_interface/status_frz.4bpp"
-
-gHealthboxElementsGfxTable_StatusBrn::
-    .incbin "graphics/battle_interface/status_brn.4bpp"
-
-gHealthboxElementsGfxTable_Misc::
-    .incbin "graphics/battle_interface/misc.4bpp"
-
-gHealthboxElementsGfxTable_HpBarAnim::
-    .incbin "graphics/battle_interface/hp_bar_anim.4bpp"
-
-gHealthboxElementsGfxTable_MiscFrameEnd::
-    .incbin "graphics/battle_interface/misc_frame_end.4bpp"
-
-gUnknown_8D12404::
-	.incbin "graphics/battle_interface/ball_display.4bpp"
-
-gUnknown_8D12484::
-    .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp"
-
-gBattleInterfaceGfx_Status2::
-    .incbin "graphics/battle_interface/status2.4bpp"
-
-gBattleInterfaceGfx_Status3::
-    .incbin "graphics/battle_interface/status3.4bpp"
-
-gBattleInterfaceGfx_Status4::
-    .incbin "graphics/battle_interface/status4.4bpp"
-
-gUnknown_8D12A44::
-    .incbin "graphics/unknown/unknown_D12A44.4bpp"
-
-gUnknown_8D12A64::
-    .incbin "graphics/unknown/unknown_D12A64.4bpp"
-
-	.align 2
-gFile_graphics_battle_interface_unused_window3_sheet:: @ 8D12AC4
-	.incbin "graphics/battle_interface/unused_window3.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_interface_unused_window4_sheet:: @ 8D12C00
-	.incbin "graphics/battle_interface/unused_window4.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FurySwipes:: @ 8D12EB0
-	.incbin "graphics/battle_anims/sprites/116.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_FurySwipes:: @ 8D1315C
-	.incbin "graphics/battle_anims/sprites/116.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Vine2:: @ 8D13184
-	.incbin "graphics/battle_anims/sprites/117.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Vine2:: @ 8D133C0
-	.incbin "graphics/battle_anims/sprites/117.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Teeth:: @ 8D133DC
-	.incbin "graphics/battle_anims/sprites/118.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Teeth:: @ 8D13574
-	.incbin "graphics/battle_anims/sprites/118.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Bone2:: @ 8D13590
-	.incbin "graphics/battle_anims/sprites/119.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Bone2:: @ 8D13820
-	.incbin "graphics/battle_anims/sprites/119.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WhiteBag:: @ 8D13848
-	.incbin "graphics/battle_anims/sprites/120.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhiteBag:: @ 8D1393C
-	.incbin "graphics/battle_anims/sprites/120.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Unknown:: @ 8D13964
-	.incbin "graphics/battle_anims/sprites/121.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Unknown:: @ 8D13990
-	.incbin "graphics/battle_anims/sprites/121.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleCoral:: @ 8D139B4
-	.incbin "graphics/battle_anims/sprites/122.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleCoral:: @ 8D13AB0
-	.incbin "graphics/battle_anims/sprites/122.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleDroplet:: @ 8D13ACC
-	.incbin "graphics/battle_anims/sprites/123.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Shock2:: @ 8D13C08
-	.incbin "graphics/battle_anims/sprites/124.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Shock2:: @ 8D13EA0
-	.incbin "graphics/battle_anims/sprites/124.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ClosingEye2:: @ 8D13EC8
-	.incbin "graphics/battle_anims/sprites/125.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ClosingEye2:: @ 8D13FB4
-	.incbin "graphics/battle_anims/sprites/125.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MetalBall:: @ 8D13FDC
-	.incbin "graphics/battle_anims/sprites/126.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MetalBall:: @ 8D14044
-	.incbin "graphics/battle_anims/sprites/126.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MonsterDoll:: @ 8D14064
-	.incbin "graphics/battle_anims/sprites/127.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MonsterDoll:: @ 8D14204
-	.incbin "graphics/battle_anims/sprites/127.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Whirlwind:: @ 8D14228
-	.incbin "graphics/battle_anims/sprites/128.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Whirlwind:: @ 8D14494
-	.incbin "graphics/battle_anims/sprites/128.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Whirlwind2:: @ 8D144B4
-	.incbin "graphics/battle_anims/sprites/129.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Explosion4:: @ 8D14518
-	.incbin "graphics/battle_anims/sprites/130.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Explosion4:: @ 8D148E8
-	.incbin "graphics/battle_anims/sprites/130.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Explosion5:: @ 8D14910
-	.incbin "graphics/battle_anims/sprites/131.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Tongue:: @ 8D14A80
-	.incbin "graphics/battle_anims/sprites/132.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Tongue:: @ 8D14B80
-	.incbin "graphics/battle_anims/sprites/132.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Smoke:: @ 8D14BA0
-	.incbin "graphics/battle_anims/sprites/133.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Smoke:: @ 8D14C1C
-	.incbin "graphics/battle_anims/sprites/133.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Smoke2:: @ 8D14C44
-	.incbin "graphics/battle_anims/sprites/134.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlueFlames:: @ 8D14D14
-	.incbin "graphics/battle_anims/sprites/076.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueFlames:: @ 8D14F50
-	.incbin "graphics/battle_anims/sprites/076.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlueFlames2:: @ 8D14F78
-	.incbin "graphics/battle_anims/sprites/077.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_old_contest_sheet:: @ 8D1504C
-	.incbin "graphics/unused/old_contest.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_old_contest_palette:: @ 8D15960
-	.incbin "graphics/unused/old_contest.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_old_contest_tilemap:: @ 8D15A64
-	.incbin "graphics/unused/old_contest.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D15BE8_tilemap:: @ 8D15BE8
-	.incbin "graphics/unknown/unknown_D15BE8.bin.lz"
-
-	.align 2
-gFile_graphics_unused_numbers_sheet:: @ 8D15EA8
-	.incbin "graphics/unused/numbers.4bpp.lz" @from ruby
-
-	.align 2
-gFile_graphics_unused_numbers_palette:: @ 8D15F98
-	.incbin "graphics/unused/numbers.gbapal.lz" @from ruby
-
-	.align 2
-gFile_graphics_unused_old_contest_2_sheet:: @ 8D15FB8
-	.incbin "graphics/unused/old_contest_2.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_old_contest_2_palette:: @ 8D16FC8
-	.incbin "graphics/unused/old_contest_2.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_old_contest_2_tilemap:: @ 8D170E0
-	.incbin "graphics/unused/old_contest_2.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D172A8_tilemap:: @ 8D172A8
-	.incbin "graphics/unknown/unknown_D172A8.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D17548_tilemap:: @ 8D17548
-	.incbin "graphics/unknown/unknown_D17548.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D17654_tilemap:: @ 8D17654
-	.incbin "graphics/unknown/unknown_D17654.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D17AB8_tilemap:: @ 8D17AB8
-	.incbin "graphics/unknown/unknown_D17AB8.bin.lz"
-
-	.align 2
-gContestMiscGfx:: @ 8D17BE8
-	.incbin "graphics/contest/misc.4bpp.lz" @ huh? this is the JP one...
-	
-	.align 2
-gFile_graphics_contest_audience_sheet:: @ 8D18780
-	.incbin "graphics/contest/audience.4bpp.lz"
-
-	.align 2
-gFile_graphics_contest_faces_sheet:: @ 8D193DC
-	.incbin "graphics/contest/faces.4bpp.lz"
-
-	.align 2
-gFile_graphics_contest_judge_symbols_sheet:: @ 8D194F8
-	.incbin "graphics/contest/judge_symbols.4bpp.lz"
-
-	.align 2
-gFile_graphics_contest_judge_symbols_palette:: @ 8D1969C
-	.incbin "graphics/contest/judge_symbols.gbapal.lz"
-
-	.align 2
-gFile_graphics_contest_heart:: @ 8D196C4
-	.incbin "graphics/contest/heart.4bpp"
-
-	.align 2
-gFile_graphics_unknown_unknown_D196E4_sheet:: @ 8D196E4
-	.incbin "graphics/unknown/unknown_D196E4.4bpp.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D196E4_palette:: @ 8D197D4
-	.incbin "graphics/unknown/unknown_D196E4.gbapal.lz"
-
-	.align 2
-gUnknown_8D197FC:: @ 8D197FC
-	.incbin "graphics/contest/misc_2.4bpp.lz" @ still in JP...
-	
-	.align 2
-gFile_graphics_contest_misc_2_tilemap_1_tilemap:: @ 8D1A064
-	.incbin "graphics/contest/misc_2_tilemap_1.bin.lz"
-
-	.align 2
-gFile_graphics_contest_misc_2_tilemap_2_tilemap:: @ 8D1A178
-	.incbin "graphics/contest/misc_2_tilemap_2.bin.lz"
-
-	.align 2
-gFile_graphics_contest_misc_2_tilemap_3_tilemap:: @ 8D1A2A4
-	.incbin "graphics/contest/misc_2_tilemap_3.bin.lz"
-
-	.align 2
-gFile_graphics_contest_misc_2_palette:: @ 8D1A42C
-	.incbin "graphics/contest/misc_2.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Impact:: @ 8D1A518
-	.incbin "graphics/battle_anims/sprites/135.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Impact:: @ 8D1A5F0
-	.incbin "graphics/battle_anims/sprites/135.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Particles:: @ 8D1A608
-	.incbin "graphics/battle_anims/sprites/particles.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_CircleImpact:: @ 8D1A6B8
-	.incbin "graphics/battle_anims/sprites/136.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_CircleImpact:: @ 8D1A6DC
-	.incbin "graphics/battle_anims/sprites/136.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Scratch:: @ 8D1A704
-	.incbin "graphics/battle_anims/sprites/137.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SharpTeeth:: @ 8D1A908
-	.incbin "graphics/battle_anims/sprites/139.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SharpTeeth:: @ 8D1AAF8
-	.incbin "graphics/battle_anims/sprites/139.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Clamp:: @ 8D1AB18
-	.incbin "graphics/battle_anims/sprites/145.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Cut:: @ 8D1ACB8
-	.incbin "graphics/battle_anims/sprites/138.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RainbowRings:: @ 8D1AE04
-	.incbin "graphics/battle_anims/sprites/140.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RainbowRings:: @ 8D1AE84
-	.incbin "graphics/battle_anims/sprites/140.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_IceCrystals:: @ 8D1AEA4
-	.incbin "graphics/battle_anims/sprites/141.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_IceCrystals:: @ 8D1AFAC
-	.incbin "graphics/battle_anims/sprites/141.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_IceSpikes:: @ 8D1AFCC
-	.incbin "graphics/battle_anims/sprites/142.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_old_beatup_sheet:: @ 8D1B02C
-	.incbin "graphics/unused/old_beatup.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_old_beatup_palette:: @ 8D1B0C8
-	.incbin "graphics/unused/old_beatup.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Orbs:: @ 8D1B0E4
-	.incbin "graphics/battle_anims/sprites/147.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Orbs:: @ 8D1B1F8
-	.incbin "graphics/battle_anims/sprites/147.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WaterOrb:: @ 8D1B220
-	.incbin "graphics/battle_anims/sprites/149.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WaterImpact:: @ 8D1B2F0
-	.incbin "graphics/battle_anims/sprites/148.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WaterImpact:: @ 8D1B3D4
-	.incbin "graphics/battle_anims/sprites/148.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BrownOrb:: @ 8D1B3F4
-	.incbin "graphics/battle_anims/sprites/259.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MudSand:: @ 8D1B414
-	.incbin "graphics/battle_anims/sprites/074.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MudSand:: @ 8D1B47C
-	.incbin "graphics/battle_anims/sprites/074.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PoisonBubble:: @ 8D1B4A0
-	.incbin "graphics/battle_anims/sprites/150.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PoisonBubble:: @ 8D1B574
-	.incbin "graphics/battle_anims/sprites/150.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ToxicBubble:: @ 8D1B590
-	.incbin "graphics/battle_anims/sprites/151.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HornHit2:: @ 8D1B688
-	.incbin "graphics/battle_anims/sprites/153.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_HornHit2:: @ 8D1B6F4
-	.incbin "graphics/battle_anims/sprites/153.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_AirWave2:: @ 8D1B70C
-	.incbin "graphics/battle_anims/sprites/154.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_AirWave2:: @ 8D1B7B8
-	.incbin "graphics/battle_anims/sprites/154.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SmallBubbles:: @ 8D1B7D8
-	.incbin "graphics/battle_anims/sprites/155.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SmallBubbles:: @ 8D1B8A0
-	.incbin "graphics/battle_anims/sprites/155.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RoundShadow:: @ 8D1B8C0
-	.incbin "graphics/battle_anims/sprites/156.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RoundShadow:: @ 8D1BAD8
-	.incbin "graphics/battle_anims/sprites/156.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sunlight:: @ 8D1BB00
-	.incbin "graphics/battle_anims/sprites/157.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sunlight:: @ 8D1BB64
-	.incbin "graphics/battle_anims/sprites/157.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Spore:: @ 8D1BB7C
-	.incbin "graphics/battle_anims/sprites/158.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Spore:: @ 8D1BC44
-	.incbin "graphics/battle_anims/sprites/158.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Flower:: @ 8D1BC68
-	.incbin "graphics/battle_anims/sprites/159.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Flower:: @ 8D1BCE4
-	.incbin "graphics/battle_anims/sprites/159.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RazorLeaf:: @ 8D1BD0C
-	.incbin "graphics/battle_anims/sprites/160.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RazorLeaf:: @ 8D1BDB4
-	.incbin "graphics/battle_anims/sprites/160.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MistCloud:: @ 8D1BDDC
-	.incbin "graphics/battle_anims/sprites/144.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MistCloud:: @ 8D1BE54
-	.incbin "graphics/battle_anims/sprites/144.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D1BE74_sheet:: @ 8D1BE74
-	.incbin "graphics/unknown/unknown_D1BE74.4bpp.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D1BE74_palette:: @ 8D1BE9C
-	.incbin "graphics/unknown/unknown_D1BE74.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_D1BE74_tilemap:: @ 8D1BEB4
-	.incbin "graphics/unknown/unknown_D1BE74.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WhirlwindLines:: @ 8D1BFB8
-	.incbin "graphics/battle_anims/sprites/162.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhirlwindLines:: @ 8D1C03C
-	.incbin "graphics/battle_anims/sprites/162.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GoldRing:: @ 8D1C05C
-	.incbin "graphics/battle_anims/sprites/163.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GoldRing:: @ 8D1C0BC
-	.incbin "graphics/battle_anims/sprites/163.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueRing2:: @ 8D1C0D4
-	.incbin "graphics/battle_anims/sprites/288.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleRing:: @ 8D1C0EC
-	.incbin "graphics/battle_anims/sprites/164.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueRing:: @ 8D1C104
-	.incbin "graphics/battle_anims/sprites/165.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GreenLightWall:: @ 8D1C11C
-	.incbin "graphics/battle_anims/sprites/166.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GreenLightWall:: @ 8D1C428
-	.incbin "graphics/battle_anims/sprites/166.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueLightWall:: @ 8D1C448
-	.incbin "graphics/battle_anims/sprites/167.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedLightWall:: @ 8D1C468
-	.incbin "graphics/battle_anims/sprites/168.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_GrayLightWall:: @ 8D1C488
-	.incbin "graphics/battle_anims/sprites/169.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_OrangeLightWall:: @ 8D1C4A8
-	.incbin "graphics/battle_anims/sprites/170.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BlackBall2:: @ 8D1C4C8
-	.incbin "graphics/battle_anims/sprites/171.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlackBall2:: @ 8D1C514
-	.incbin "graphics/battle_anims/sprites/171.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleGasCloud:: @ 8D1C53C
-	.incbin "graphics/battle_anims/sprites/172.gbapal.lz"
-
-	.align 2
-gFile_graphics_contest_judge_sheet:: @ 8D1C55C
-	.incbin "graphics/contest/judge.4bpp.lz"
-
-	.align 2
-gFile_graphics_contest_judge_palette:: @ 8D1C830
-	.incbin "graphics/contest/judge.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Spark:: @ 8D1C858
-	.incbin "graphics/battle_anims/sprites/001.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Spark:: @ 8D1C90C
-	.incbin "graphics/battle_anims/sprites/001.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SparkH:: @ 8D1C934
-	.incbin "graphics/battle_anims/sprites/173.4bpp.lz"
-
-	.align 2
-gBattleAnimBgImage_Dark:: @ 8D1C9BC
-	.incbin "graphics/battle_anims/backgrounds/00.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Dark:: @ 8D1CFB4
-	.incbin "graphics/battle_anims/backgrounds/00.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Dark:: @ 8D1CFD4
-	.incbin "graphics/battle_anims/backgrounds/00.bin.lz"
-
-	.align 2
-gMetalShineGfx:: @ 8D1D224
-	.incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz"
-
-	.align 2
-gMetalShinePalette:: @ 8D1D360
-	.incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz"
-
-	.align 2
-gMetalShineTilemap:: @ 8D1D388
-	.incbin "graphics/battle_anims/masks/metal_shine.bin.lz"
-
-	.align 2
-gFile_graphics_unused_goosuto_sheet:: @ 8D1D4FC
-	.incbin "graphics/unused/goosuto.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_goosuto_palette:: @ 8D1D60C
-	.incbin "graphics/unused/goosuto.gbapal.lz"
-
-	.align 2
-gFile_graphics_unused_goosuto_tilemap:: @ 8D1D624
-	.incbin "graphics/unused/goosuto.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_YellowStar:: @ 8D1D774
-	.incbin "graphics/battle_anims/sprites/174.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_YellowStar:: @ 8D1D814
-	.incbin "graphics/battle_anims/sprites/174.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_LargeFreshEgg:: @ 8D1D83C
-	.incbin "graphics/battle_anims/sprites/175.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_LargeFreshEgg:: @ 8D1D8A0
-	.incbin "graphics/battle_anims/sprites/175.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ShadowBall:: @ 8D1D8C8
-	.incbin "graphics/battle_anims/sprites/176.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ShadowBall:: @ 8D1DA20
-	.incbin "graphics/battle_anims/sprites/176.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Lick:: @ 8D1DA48
-	.incbin "graphics/battle_anims/sprites/177.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Lick:: @ 8D1DB0C
-	.incbin "graphics/battle_anims/sprites/177.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_VoidLines:: @ 8D1DB24
-	.incbin "graphics/battle_anims/sprites/178.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_VoidLines:: @ 8D1DC8C
-	.incbin "graphics/battle_anims/sprites/178.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_String:: @ 8D1DCB4
-	.incbin "graphics/battle_anims/sprites/179.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_String:: @ 8D1DCDC
-	.incbin "graphics/battle_anims/sprites/179.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WebThread:: @ 8D1DDB8
-	.incbin "graphics/battle_anims/sprites/180.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SpiderWeb:: @ 8D1DDD0
-	.incbin "graphics/battle_anims/sprites/181.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Lightbulb:: @ 8D1E160
-	.incbin "graphics/battle_anims/sprites/182.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Lightbulb:: @ 8D1E204
-	.incbin "graphics/battle_anims/sprites/182.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Slash:: @ 8D1E22C
-	.incbin "graphics/battle_anims/sprites/183.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Slash:: @ 8D1E4A4
-	.incbin "graphics/battle_anims/sprites/183.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FocusEnergy:: @ 8D1E4CC
-	.incbin "graphics/battle_anims/sprites/184.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_FocusEnergy:: @ 8D1E620
-	.incbin "graphics/battle_anims/sprites/184.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SphereToCube:: @ 8D1E648
-	.incbin "graphics/battle_anims/sprites/185.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SphereToCube:: @ 8D1EA5C
-	.incbin "graphics/battle_anims/sprites/185.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Psychic:: @ 8D1EA84
-	.incbin "graphics/battle_anims/backgrounds/03.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Psychic:: @ 8D1EC54
-	.incbin "graphics/battle_anims/backgrounds/03.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Psychic:: @ 8D1EC78
-	.incbin "graphics/battle_anims/backgrounds/03.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Eye:: @ 8D1ED40
-	.incbin "graphics/battle_anims/sprites/187.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Eye:: @ 8D1EF30
-	.incbin "graphics/battle_anims/sprites/187.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Tendrils:: @ 8D1EF50
-	.incbin "graphics/battle_anims/sprites/186.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Tendrils:: @ 8D1F31C
-	.incbin "graphics/battle_anims/sprites/186.gbapal.lz"
-	
-	.align 2
-gHealthboxSinglesPlayerGfx:: @ 8D1F340
-	.incbin "graphics/battle_interface/healthbox_singles_player.4bpp.lz"
-	
-	.align 2
-gHealthboxSinglesOpponentGfx:: @ 8D1F604
-	.incbin "graphics/battle_interface/healthbox_singles_opponent.4bpp.lz"
-	
-	.align 2
-gHealthboxDoublesPlayerGfx:: @ 8D1F794
-	.incbin "graphics/battle_interface/healthbox_doubles_player.4bpp.lz"
-	
-	.align 2
-gHealthboxDoublesOpponentGfx:: @ 8D1F928
-	.incbin "graphics/battle_interface/healthbox_doubles_opponent.4bpp.lz"
-	
-	.align 2
-gHealthboxSafariGfx:: @ 8D1FABC
-	.incbin "graphics/battle_interface/healthbox_safari.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_shadow_sheet:: @ 8D1FD34
-	.incbin "graphics/unused/shadow.4bpp.lz"
-
-	.align 2
-gFile_graphics_unused_shadow_palette:: @ 8D1FD94
-	.incbin "graphics/unused/shadow.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_LockOn:: @ 8D1FDA8
-	.incbin "graphics/battle_anims/sprites/014.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_LockOn:: @ 8D1FE3C
-	.incbin "graphics/battle_anims/sprites/014.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_OpeningEye:: @ 8D1FE58
-	.incbin "graphics/battle_anims/sprites/190.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_OpeningEye:: @ 8D200B4
-	.incbin "graphics/battle_anims/sprites/190.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RoundWhiteHalo:: @ 8D200D8
-	.incbin "graphics/battle_anims/sprites/191.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RoundWhiteHalo:: @ 8D20344
-	.incbin "graphics/battle_anims/sprites/191.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_TealAlert:: @ 8D2036C
-	.incbin "graphics/battle_anims/sprites/189.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_TealAlert:: @ 8D203F0
-	.incbin "graphics/battle_anims/sprites/189.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FangAttack:: @ 8D20410
-	.incbin "graphics/battle_anims/sprites/192.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_FangAttack:: @ 8D20690
-	.incbin "graphics/battle_anims/sprites/192.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleHandOutline:: @ 8D206B8
-	.incbin "graphics/battle_anims/sprites/193.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleHandOutline:: @ 8D20814
-	.incbin "graphics/battle_anims/sprites/193.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_anims_masks_curse_sheet:: @ 8D2083C
-	.incbin "graphics/battle_anims/masks/curse.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_anims_masks_curse_tilemap:: @ 8D20858
-	.incbin "graphics/battle_anims/masks/curse.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Pencil:: @ 8D20958
-	.incbin "graphics/battle_anims/sprites/002.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Pencil:: @ 8D20A3C
-	.incbin "graphics/battle_anims/sprites/002.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Spiral:: @ 8D20A64
-	.incbin "graphics/battle_anims/sprites/196.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Spiral:: @ 8D20E08
-	.incbin "graphics/battle_anims/sprites/196.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Moon:: @ 8D20E20
-	.incbin "graphics/battle_anims/sprites/194.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Moon:: @ 8D21158
-	.incbin "graphics/battle_anims/sprites/194.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GreenSparkle:: @ 8D21180
-	.incbin "graphics/battle_anims/sprites/195.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GreenSparkle:: @ 8D21238
-	.incbin "graphics/battle_anims/sprites/195.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SnoreZ:: @ 8D21258
-	.incbin "graphics/battle_anims/sprites/197.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SnoreZ:: @ 8D213C8
-	.incbin "graphics/battle_anims/sprites/197.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Explosion:: @ 8D213F0
-	.incbin "graphics/battle_anims/sprites/198.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Explosion:: @ 8D217E0
-	.incbin "graphics/battle_anims/sprites/198.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Nail:: @ 8D21808
-	.incbin "graphics/battle_anims/sprites/199.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Nail:: @ 8D218D0
-	.incbin "graphics/battle_anims/sprites/199.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GhostlySpirit:: @ 8D218EC
-	.incbin "graphics/battle_anims/sprites/200.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GhostlySpirit:: @ 8D21A2C
-	.incbin "graphics/battle_anims/sprites/200.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WarmRock:: @ 8D21A48
-	.incbin "graphics/battle_anims/sprites/201.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WarmRock:: @ 8D220B8
-	.incbin "graphics/battle_anims/sprites/201.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PunchImpact:: @ 8D220E0
-	.incbin "graphics/battle_anims/sprites/204.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PunchImpact:: @ 8D22254
-	.incbin "graphics/battle_anims/sprites/204.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BreakingEgg:: @ 8D2227C
-	.incbin "graphics/battle_anims/sprites/202.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BreakingEgg:: @ 8D223E4
-	.incbin "graphics/battle_anims/sprites/202.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ThinRing:: @ 8D22408
-	.incbin "graphics/battle_anims/sprites/203.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ThinRing:: @ 8D225B4
-	.incbin "graphics/battle_anims/sprites/203.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MusicNotes2:: @ 8D225D8
-	.incbin "graphics/battle_anims/sprites/206.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MusicNotes2:: @ 8D227E4
-	.incbin "graphics/battle_anims/sprites/206.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Bell:: @ 8D22878
-	.incbin "graphics/battle_anims/sprites/205.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Bell:: @ 8D22AAC
-	.incbin "graphics/battle_anims/sprites/205.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SpeedDust:: @ 8D22AD0
-	.incbin "graphics/battle_anims/sprites/207.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SpeedDust:: @ 8D22B9C
-	.incbin "graphics/battle_anims/sprites/207.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_TornMetal:: @ 8D22BC0
-	.incbin "graphics/battle_anims/sprites/208.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ThoughtBubble:: @ 8D22FB0
-	.incbin "graphics/battle_anims/sprites/209.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ThoughtBubble:: @ 8D232B8
-	.incbin "graphics/battle_anims/sprites/209.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Finger:: @ 8D232D8
-	.incbin "graphics/battle_anims/sprites/064.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Finger:: @ 8D233C8
-	.incbin "graphics/battle_anims/sprites/064.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MagentaHeart:: @ 8D233EC
-	.incbin "graphics/battle_anims/sprites/210.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PinkHeart:: @ 8D23454
-	.incbin "graphics/battle_anims/sprites/219.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_MagentaHeart:: @ 8D23474
-	.incbin "graphics/battle_anims/sprites/210.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedHeart:: @ 8D23494
-	.incbin "graphics/battle_anims/sprites/216.gbapal.lz"
-
-	.align 2
-gBattleAnimBg_AttractGfx:: @ 8D234B4
-	.incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz"
-
-	.align 2
-gBattleAnimBg_AttractPal:: @ 8D23F24
-	.incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz"
-
-	.align 2
-gBattleAnimBg_AttractTilemap:: @ 8D23F4C
-	.incbin "graphics/battle_anims/backgrounds/attract.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RedOrb:: @ 8D241C8
-	.incbin "graphics/battle_anims/sprites/217.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedOrb:: @ 8D24230
-	.incbin "graphics/battle_anims/sprites/217.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_CircleOfLight:: @ 8D24250
-	.incbin "graphics/battle_anims/sprites/212.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ElectricOrbs:: @ 8D24484
-	.incbin "graphics/battle_anims/sprites/211.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Electricity:: @ 8D244D4
-	.incbin "graphics/battle_anims/sprites/213.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ElectricOrbs:: @ 8D24740
-	.incbin "graphics/battle_anims/sprites/211.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Finger2:: @ 8D24764
-	.incbin "graphics/battle_anims/sprites/214.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MovementWaves:: @ 8D249F4
-	.incbin "graphics/battle_anims/sprites/215.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MovementWaves:: @ 8D24B80
-	.incbin "graphics/battle_anims/sprites/215.gbapal.lz"
-
-	.align 2
-gBattleAnim_ScaryFacePal:: @ 8D24BA4
-	.incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz"
-
-	.align 2
-gBattleAnim_ScaryFaceGfx:: @ 8D24BCC
-	.incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_EyeSparkle:: @ 8D24DFC
-	.incbin "graphics/battle_anims/sprites/218.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_EyeSparkle:: @ 8D24E24
-	.incbin "graphics/battle_anims/sprites/218.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Anger:: @ 8D24ED0
-	.incbin "graphics/battle_anims/sprites/087.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Anger:: @ 8D24F28
-	.incbin "graphics/battle_anims/sprites/087.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Conversion:: @ 8D24F50
-	.incbin "graphics/battle_anims/sprites/018.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Conversion:: @ 8D24F8C
-	.incbin "graphics/battle_anims/sprites/018.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Angel:: @ 8D24FA8
-	.incbin "graphics/battle_anims/sprites/220.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Angel:: @ 8D24FD0
-	.incbin "graphics/battle_anims/sprites/220.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Devil:: @ 8D250FC
-	.incbin "graphics/battle_anims/sprites/221.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Devil:: @ 8D2511C
-	.incbin "graphics/battle_anims/sprites/221.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Swipe:: @ 8D25380
-	.incbin "graphics/battle_anims/sprites/222.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Swipe:: @ 8D2566C
-	.incbin "graphics/battle_anims/sprites/222.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Roots:: @ 8D25694
-	.incbin "graphics/battle_anims/sprites/223.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Roots:: @ 8D256B4
-	.incbin "graphics/battle_anims/sprites/223.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_ItemBag:: @ 8D25948
-	.incbin "graphics/battle_anims/sprites/224.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_ItemBag:: @ 8D25968
-	.incbin "graphics/battle_anims/sprites/224.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_TriForceTriangle:: @ 8D25A64
-	.incbin "graphics/battle_anims/sprites/230.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_TriForceTriangle:: @ 8D25A8C
-	.incbin "graphics/battle_anims/sprites/230.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_LetterZ:: @ 8D25CD0
-	.incbin "graphics/battle_anims/sprites/228.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_LetterZ:: @ 8D25CF0
-	.incbin "graphics/battle_anims/sprites/228.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Impact:: @ 8D25D98
-	.incbin "graphics/battle_anims/backgrounds/04.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Impact:: @ 8D25DC0
-	.incbin "graphics/battle_anims/backgrounds/04.4bpp.lz"
-
-	.align 2
-gBattleAnimBgTilemap_ImpactOpponent:: @ 8D26B2C
-	.incbin "graphics/battle_anims/backgrounds/04.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_ImpactPlayer:: @ 8D27028
-	.incbin "graphics/battle_anims/backgrounds/05.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_ImpactContests:: @ 8D274F8
-	.incbin "graphics/battle_anims/backgrounds/06.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_JaggedMusicNote:: @ 8D27938
-	.incbin "graphics/battle_anims/sprites/225.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_JaggedMusicNote:: @ 8D27ABC
-	.incbin "graphics/battle_anims/sprites/225.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Spotlight:: @ 8D27AE4
-	.incbin "graphics/battle_anims/sprites/227.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Pokeball:: @ 8D27C2C
-	.incbin "graphics/battle_anims/sprites/226.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Pokeball:: @ 8D27CB8
-	.incbin "graphics/battle_anims/sprites/226.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RapidSpin:: @ 8D27CDC
-	.incbin "graphics/battle_anims/sprites/229.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RapidSpin:: @ 8D27E98
-	.incbin "graphics/battle_anims/sprites/229.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MilkBottle:: @ 8D27EC0
-	.incbin "graphics/battle_anims/sprites/099.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MilkBottle:: @ 8D27FE0
-	.incbin "graphics/battle_anims/sprites/099.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WispFire:: @ 8D28008
-	.incbin "graphics/battle_anims/sprites/232.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WispOrb:: @ 8D28540
-	.incbin "graphics/battle_anims/sprites/231.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WispOrb:: @ 8D28568
-	.incbin "graphics/battle_anims/sprites/231.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GoldStars:: @ 8D28738
-	.incbin "graphics/battle_anims/sprites/233.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GoldStars:: @ 8D287BC
-	.incbin "graphics/battle_anims/sprites/233.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_EclipsingOrb:: @ 8D287E4
-	.incbin "graphics/battle_anims/sprites/234.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_EclipsingOrb:: @ 8D289A4
-	.incbin "graphics/battle_anims/sprites/234.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PinkPetal:: @ 8D289C8
-	.incbin "graphics/battle_anims/sprites/238.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PinkPetal:: @ 8D28A30
-	.incbin "graphics/battle_anims/sprites/238.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GrayOrb:: @ 8D28A54
-	.incbin "graphics/battle_anims/sprites/235.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GrayOrb:: @ 8D28AA4
-	.incbin "graphics/battle_anims/sprites/235.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_BlueOrb:: @ 8D28AC0
-	.incbin "graphics/battle_anims/sprites/236.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedOrb2:: @ 8D28ADC
-	.incbin "graphics/battle_anims/sprites/237.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Drill:: @ 8D28AF8
-	.incbin "graphics/battle_anims/backgrounds/07.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Drill:: @ 8D28CA0
-	.incbin "graphics/battle_anims/backgrounds/07.gbapal.lz"
-
-	.align 2
-gBattleAnimBgPalette_Sky:: @ 8D28CC8
-	.incbin "graphics/battle_anims/backgrounds/18.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Drill:: @ 8D28CF0
-	.incbin "graphics/battle_anims/backgrounds/07.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_DrillContests:: @ 8D28E80
-	.incbin "graphics/battle_anims/backgrounds/08.bin.lz"
-
-	.align 2
-gBattleAnimBgImage_Aurora:: @ 8D2900C
-	.incbin "graphics/battle_anims/backgrounds/20.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Aurora:: @ 8D29A34
-	.incbin "graphics/battle_anims/backgrounds/20.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Aurora:: @ 8D29A54
-	.incbin "graphics/battle_anims/backgrounds/20.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_HighspeedOpponent:: @ 8D29C58
-	.incbin "graphics/battle_anims/backgrounds/09.bin.lz"
-
-	.align 2
-gBattleAnimBgPalette_Highspeed:: @ 8D29F50
-	.incbin "graphics/battle_anims/backgrounds/09.gbapal.lz"
-
-	.align 2
-gBattleAnimBgPalette_Bug:: @ 8D29F70
-	.incbin "graphics/battle_anims/backgrounds/22.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Highspeed:: @ 8D29F90
-	.incbin "graphics/battle_anims/backgrounds/09.4bpp.lz"
-
-	.align 2
-gBattleAnimBgTilemap_HighspeedPlayer:: @ 8D2A510
-	.incbin "graphics/battle_anims/backgrounds/10.bin.lz"
-
-	.align 2
-gBattleAnim_MorningSunGfx:: @ 8D2A808
-	.incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz"
-
-	.align 2
-gBattleAnim_MorningSunPal:: @ 8D2A8A8
-	.incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz"
-
-	.align 2
-gBattleAnim_MorningSunTilemap:: @ 8D2A8C0
-	.incbin "graphics/battle_anims/masks/morning_sun.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_GuillotineOpponent:: @ 8D2A9DC
-	.incbin "graphics/battle_anims/backgrounds/12.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_GuillotinePlayer:: @ 8D2ACA4
-	.incbin "graphics/battle_anims/backgrounds/13.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_GuillotineContests:: @ 8D2AFA0
-	.incbin "graphics/battle_anims/backgrounds/14.bin.lz"
-
-	.align 2
-gBattleAnimBgImage_Guillotine:: @ 8D2B230
-	.incbin "graphics/battle_anims/backgrounds/12.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Guillotine:: @ 8D2BF98
-	.incbin "graphics/battle_anims/backgrounds/12.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Thunder:: @ 8D2BFB8
-	.incbin "graphics/battle_anims/backgrounds/11.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Thunder:: @ 8D2C954
-	.incbin "graphics/battle_anims/backgrounds/11.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Thunder:: @ 8D2C97C
-	.incbin "graphics/battle_anims/backgrounds/11.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PainSplit:: @ 8D2CC74
-	.incbin "graphics/battle_anims/sprites/239.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PainSplit:: @ 8D2CD58
-	.incbin "graphics/battle_anims/sprites/239.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HandsAndFeet:: @ 8D2CD80
-	.incbin "graphics/battle_anims/sprites/143.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_HandsAndFeet:: @ 8D2CFB0
-	.incbin "graphics/battle_anims/sprites/143.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Confetti:: @ 8D2CFC8
-	.incbin "graphics/battle_anims/sprites/240.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Confetti:: @ 8D2D068
-	.incbin "graphics/battle_anims/sprites/240.gbapal.lz"
-
-	.align 2
-gSubstituteDollPal:: @ 8D2D090
-	.incbin "graphics/battle_anims/sprites/substitute.gbapal.lz"
-
-	.align 2
-gSubstituteDollGfx:: @ 8D2D0B4
-	.incbin "graphics/battle_anims/sprites/substitute.4bpp.lz"
-
-	.align 2
-gSubstituteDollTilemap:: @ 8D2D2F4
-	.incbin "graphics/battle_anims/sprites/substitute.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GreenStar:: @ 8D2D51C
-	.incbin "graphics/battle_anims/sprites/241.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GreenStar:: @ 8D2D5E0
-	.incbin "graphics/battle_anims/sprites/241.gbapal.lz"
-
-	.align 2
-gFile_graphics_misc_confetti_sheet:: @ 8D2D5FC
-	.incbin "graphics/misc/confetti.4bpp.lz"
-
-	.align 2
-gFile_graphics_misc_confetti_palette:: @ 8D2D71C
-	.incbin "graphics/misc/confetti.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PinkCloud:: @ 8D2D744
-	.incbin "graphics/battle_anims/sprites/242.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PinkCloud:: @ 8D2D880
-	.incbin "graphics/battle_anims/sprites/242.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SweatDrop:: @ 8D2D8A4
-	.incbin "graphics/battle_anims/sprites/243.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SweatDrop:: @ 8D2D8CC
-	.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
-
-	.align 2
-gBattleStatMask_Gfx:: @ 8D2D8F4
-	.incbin "graphics/battle_anims/masks/stat.4bpp.lz"
-
-	.align 2
-gBattleStatMask1_Tilemap:: @ 8D2DB04
-	.incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz"
-
-	.align 2
-gBattleStatMask2_Tilemap:: @ 8D2DC20
-	.incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz"
-
-	.align 2
-gBattleStatMask1_Pal:: @ 8D2DD3C
-	.incbin "graphics/battle_anims/masks/stat1.gbapal.lz"
-
-	.align 2
-gBattleStatMask2_Pal:: @ 8D2DD5C
-	.incbin "graphics/battle_anims/masks/stat2.gbapal.lz"
-
-	.align 2
-gBattleStatMask3_Pal:: @ 8D2DD7C
-	.incbin "graphics/battle_anims/masks/stat3.gbapal.lz"
-
-	.align 2
-gBattleStatMask4_Pal:: @ 8D2DD9C
-	.incbin "graphics/battle_anims/masks/stat4.gbapal.lz"
-
-	.align 2
-gBattleStatMask5_Pal:: @ 8D2DDBC
-	.incbin "graphics/battle_anims/masks/stat5.gbapal.lz"
-
-	.align 2
-gBattleStatMask6_Pal:: @ 8D2DDDC
-	.incbin "graphics/battle_anims/masks/stat6.gbapal.lz"
-
-	.align 2
-gBattleStatMask7_Pal:: @ 8D2DDFC
-	.incbin "graphics/battle_anims/masks/stat7.gbapal.lz"
-
-	.align 2
-gBattleStatMask8_Pal:: @ 8D2DE1C
-	.incbin "graphics/battle_anims/masks/stat8.gbapal.lz"
-
-	.align 2
-gCureBubblesGfx:: @ 8D2DE3C
-	.incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz"
-
-	.align 2
-gCureBubblesPal:: @ 8D2DF78
-	.incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz"
-
-	.align 2
-gCureBubblesTilemap:: @ 8D2DF98
-	.incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleScratch:: @ 8D2E0B4
-	.incbin "graphics/battle_anims/sprites/245.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleScratch:: @ 8D2E0DC
-	.incbin "graphics/battle_anims/sprites/245.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleSwipe:: @ 8D2E280
-	.incbin "graphics/battle_anims/sprites/246.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GuardRing:: @ 8D2E728
-	.incbin "graphics/battle_anims/sprites/244.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GuardRing:: @ 8D2E804
-	.incbin "graphics/battle_anims/sprites/244.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_TagHand:: @ 8D2E820
-	.incbin "graphics/battle_anims/sprites/247.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_NoiseLine:: @ 8D2EA04
-	.incbin "graphics/battle_anims/sprites/053.4bpp.lz"
-
-	.align 2
-gUnknown_D2EC24_Gfx:: @ 8D2EC24
-	.incbin "graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz"
-
-	.align 2
-gUnknown_D2EC24_Tilemap:: @ 8D2EC70
-	.incbin "graphics/battle_anims/masks/unknown_D2EC24.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SmallRedEye:: @ 8D2ED78
-	.incbin "graphics/battle_anims/sprites/248.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SmallRedEye:: @ 8D2ED90
-	.incbin "graphics/battle_anims/sprites/248.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_HollowOrb:: @ 8D2EDA8
-	.incbin "graphics/battle_anims/sprites/249.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_HollowOrb:: @ 8D2EDF8
-	.incbin "graphics/battle_anims/sprites/249.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_XSign:: @ 8D2EE18
-	.incbin "graphics/battle_anims/sprites/250.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_BluegreenOrb:: @ 8D2F00C
-	.incbin "graphics/battle_anims/sprites/251.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_BluegreenOrb:: @ 8D2F070
-	.incbin "graphics/battle_anims/sprites/251.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PawPrint:: @ 8D2F088
-	.incbin "graphics/battle_anims/sprites/252.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PawPrint:: @ 8D2F1A0
-	.incbin "graphics/battle_anims/sprites/252.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_PurpleFlame:: @ 8D2F1C4
-	.incbin "graphics/battle_anims/sprites/253.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_PurpleFlame:: @ 8D2F3A0
-	.incbin "graphics/battle_anims/sprites/253.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RedBall:: @ 8D2F3C8
-	.incbin "graphics/battle_anims/sprites/254.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedBall:: @ 8D2F500
-	.incbin "graphics/battle_anims/sprites/254.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SmellingsaltEffect:: @ 8D2F528
-	.incbin "graphics/battle_anims/sprites/255.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_SmellingsaltEffect:: @ 8D2F5A0
-	.incbin "graphics/battle_anims/sprites/255.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MagnifyingGlass:: @ 8D2F5B4
-	.incbin "graphics/battle_anims/sprites/258.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MagnifyingGlass:: @ 8D2F69C
-	.incbin "graphics/battle_anims/sprites/258.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Meteor:: @ 8D2F6C4
-	.incbin "graphics/battle_anims/sprites/256.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Meteor:: @ 8D2FA50
-	.incbin "graphics/battle_anims/sprites/256.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FlatRock:: @ 8D2FA78
-	.incbin "graphics/battle_anims/sprites/257.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_FlatRock:: @ 8D2FB94
-	.incbin "graphics/battle_anims/sprites/257.gbapal.lz"
-
-	.align 2
-gUnknown_8D2FBB4:: @ 8D2FBB4
-	.incbin "graphics/interface/unk_8D2FBB4.gbapal"
-
-	.align 2
-gMonFrontPic_Bulbasaur:: @ 8D2FBD4
-	.incbin "graphics/pokemon/bulbasaur/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Bulbasaur:: @ 8D2FE78
-	.incbin "graphics/pokemon/bulbasaur/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Bulbasaur:: @ 8D2FEA0
-	.incbin "graphics/pokemon/bulbasaur/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Bulbasaur:: @ 8D30164
-	.incbin "graphics/pokemon/bulbasaur/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Bulbasaur:: @ 8D3018C
-	.incbin "graphics/pokemon/bulbasaur/icon.4bpp"
-
-	.align 2
-gMonFootprint_Bulbasaur:: @ 8D3058C
-	.incbin "graphics/pokemon/bulbasaur/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ivysaur:: @ 8D305AC
-	.incbin "graphics/pokemon/ivysaur/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ivysaur:: @ 8D308E8
-	.incbin "graphics/pokemon/ivysaur/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ivysaur:: @ 8D30910
-	.incbin "graphics/pokemon/ivysaur/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ivysaur:: @ 8D30C64
-	.incbin "graphics/pokemon/ivysaur/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ivysaur:: @ 8D30C8C
-	.incbin "graphics/pokemon/ivysaur/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ivysaur:: @ 8D3108C
-	.incbin "graphics/pokemon/ivysaur/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Venusaur:: @ 8D310AC
-	.incbin "graphics/pokemon/venusaur/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Venusaur:: @ 8D315EC
-	.incbin "graphics/pokemon/venusaur/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Venusaur:: @ 8D31614
-	.incbin "graphics/pokemon/venusaur/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Venusaur:: @ 8D31ADC
-	.incbin "graphics/pokemon/venusaur/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Venusaur:: @ 8D31B04
-	.incbin "graphics/pokemon/venusaur/icon.4bpp"
-
-	.align 2
-gMonFootprint_Venusaur:: @ 8D31F04
-	.incbin "graphics/pokemon/venusaur/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Charmander:: @ 8D31F24
-	.incbin "graphics/pokemon/charmander/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Charmander:: @ 8D321C4
-	.incbin "graphics/pokemon/charmander/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Charmander:: @ 8D321EC
-	.incbin "graphics/pokemon/charmander/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Charmander:: @ 8D32470
-	.incbin "graphics/pokemon/charmander/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Charmander:: @ 8D32498
-	.incbin "graphics/pokemon/charmander/icon.4bpp"
-
-	.align 2
-gMonFootprint_Charmander:: @ 8D32898
-	.incbin "graphics/pokemon/charmander/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Charmeleon:: @ 8D328B8
-	.incbin "graphics/pokemon/charmeleon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Charmeleon:: @ 8D32C64
-	.incbin "graphics/pokemon/charmeleon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Charmeleon:: @ 8D32C8C
-	.incbin "graphics/pokemon/charmeleon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Charmeleon:: @ 8D32F80
-	.incbin "graphics/pokemon/charmeleon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Charmeleon:: @ 8D32FA8
-	.incbin "graphics/pokemon/charmeleon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Charmeleon:: @ 8D333A8
-	.incbin "graphics/pokemon/charmeleon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Charizard:: @ 8D333C8
-	.incbin "graphics/pokemon/charizard/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Charizard:: @ 8D338C4
-	.incbin "graphics/pokemon/charizard/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Charizard:: @ 8D338EC
-	.incbin "graphics/pokemon/charizard/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Charizard:: @ 8D33CF8
-	.incbin "graphics/pokemon/charizard/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Charizard:: @ 8D33D20
-	.incbin "graphics/pokemon/charizard/icon.4bpp"
-
-	.align 2
-gMonFootprint_Charizard:: @ 8D34120
-	.incbin "graphics/pokemon/charizard/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Squirtle:: @ 8D34140
-	.incbin "graphics/pokemon/squirtle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Squirtle:: @ 8D343DC
-	.incbin "graphics/pokemon/squirtle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Squirtle:: @ 8D34404
-	.incbin "graphics/pokemon/squirtle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Squirtle:: @ 8D3468C
-	.incbin "graphics/pokemon/squirtle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Squirtle:: @ 8D346B4
-	.incbin "graphics/pokemon/squirtle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Squirtle:: @ 8D34AB4
-	.incbin "graphics/pokemon/squirtle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wartortle:: @ 8D34AD4
-	.incbin "graphics/pokemon/wartortle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wartortle:: @ 8D34E80
-	.incbin "graphics/pokemon/wartortle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wartortle:: @ 8D34EA8
-	.incbin "graphics/pokemon/wartortle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wartortle:: @ 8D351F0
-	.incbin "graphics/pokemon/wartortle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wartortle:: @ 8D35218
-	.incbin "graphics/pokemon/wartortle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wartortle:: @ 8D35618
-	.incbin "graphics/pokemon/wartortle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Blastoise:: @ 8D35638
-	.incbin "graphics/pokemon/blastoise/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Blastoise:: @ 8D35B3C
-	.incbin "graphics/pokemon/blastoise/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Blastoise:: @ 8D35B64
-	.incbin "graphics/pokemon/blastoise/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Blastoise:: @ 8D35F78
-	.incbin "graphics/pokemon/blastoise/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Blastoise:: @ 8D35FA0
-	.incbin "graphics/pokemon/blastoise/icon.4bpp"
-
-	.align 2
-gMonFootprint_Blastoise:: @ 8D363A0
-	.incbin "graphics/pokemon/blastoise/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Caterpie:: @ 8D363C0
-	.incbin "graphics/pokemon/caterpie/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Caterpie:: @ 8D36618
-	.incbin "graphics/pokemon/caterpie/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Caterpie:: @ 8D36640
-	.incbin "graphics/pokemon/caterpie/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Caterpie:: @ 8D368C8
-	.incbin "graphics/pokemon/caterpie/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Caterpie:: @ 8D368F0
-	.incbin "graphics/pokemon/caterpie/icon.4bpp"
-
-	.align 2
-gMonFootprint_Caterpie:: @ 8D36CF0
-	.incbin "graphics/pokemon/caterpie/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Metapod:: @ 8D36D10
-	.incbin "graphics/pokemon/metapod/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Metapod:: @ 8D36F2C
-	.incbin "graphics/pokemon/metapod/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Metapod:: @ 8D36F4C
-	.incbin "graphics/pokemon/metapod/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Metapod:: @ 8D37168
-	.incbin "graphics/pokemon/metapod/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Metapod:: @ 8D37188
-	.incbin "graphics/pokemon/metapod/icon.4bpp"
-
-	.align 2
-gMonFootprint_Metapod:: @ 8D37588
-	.incbin "graphics/pokemon/metapod/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Butterfree:: @ 8D375A8
-	.incbin "graphics/pokemon/butterfree/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Butterfree:: @ 8D37920
-	.incbin "graphics/pokemon/butterfree/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Butterfree:: @ 8D37948
-	.incbin "graphics/pokemon/butterfree/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Butterfree:: @ 8D37D4C
-	.incbin "graphics/pokemon/butterfree/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Butterfree:: @ 8D37D74
-	.incbin "graphics/pokemon/butterfree/icon.4bpp"
-
-	.align 2
-gMonFootprint_Butterfree:: @ 8D38174
-	.incbin "graphics/pokemon/butterfree/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Weedle:: @ 8D38194
-	.incbin "graphics/pokemon/weedle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Weedle:: @ 8D383D0
-	.incbin "graphics/pokemon/weedle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Weedle:: @ 8D383F8
-	.incbin "graphics/pokemon/weedle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Weedle:: @ 8D38660
-	.incbin "graphics/pokemon/weedle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Weedle:: @ 8D38688
-	.incbin "graphics/pokemon/weedle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Weedle:: @ 8D38A88
-	.incbin "graphics/pokemon/weedle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kakuna:: @ 8D38AA8
-	.incbin "graphics/pokemon/kakuna/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kakuna:: @ 8D38CE8
-	.incbin "graphics/pokemon/kakuna/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kakuna:: @ 8D38D0C
-	.incbin "graphics/pokemon/kakuna/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kakuna:: @ 8D38F90
-	.incbin "graphics/pokemon/kakuna/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kakuna:: @ 8D38FB4
-	.incbin "graphics/pokemon/kakuna/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kakuna:: @ 8D393B4
-	.incbin "graphics/pokemon/kakuna/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Beedrill:: @ 8D393D4
-	.incbin "graphics/pokemon/beedrill/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Beedrill:: @ 8D397F4
-	.incbin "graphics/pokemon/beedrill/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Beedrill:: @ 8D3981C
-	.incbin "graphics/pokemon/beedrill/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Beedrill:: @ 8D39B90
-	.incbin "graphics/pokemon/beedrill/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Beedrill:: @ 8D39BB8
-	.incbin "graphics/pokemon/beedrill/icon.4bpp"
-
-	.align 2
-gMonFootprint_Beedrill:: @ 8D39FB8
-	.incbin "graphics/pokemon/beedrill/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pidgey:: @ 8D39FD8
-	.incbin "graphics/pokemon/pidgey/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pidgey:: @ 8D3A250
-	.incbin "graphics/pokemon/pidgey/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pidgey:: @ 8D3A278
-	.incbin "graphics/pokemon/pidgey/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pidgey:: @ 8D3A5CC
-	.incbin "graphics/pokemon/pidgey/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pidgey:: @ 8D3A5F4
-	.incbin "graphics/pokemon/pidgey/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pidgey:: @ 8D3A9F4
-	.incbin "graphics/pokemon/pidgey/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pidgeotto:: @ 8D3AA14
-	.incbin "graphics/pokemon/pidgeotto/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pidgeotto:: @ 8D3ADAC
-	.incbin "graphics/pokemon/pidgeotto/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pidgeotto:: @ 8D3ADD4
-	.incbin "graphics/pokemon/pidgeotto/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pidgeotto:: @ 8D3B120
-	.incbin "graphics/pokemon/pidgeotto/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pidgeotto:: @ 8D3B148
-	.incbin "graphics/pokemon/pidgeotto/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pidgeotto:: @ 8D3B548
-	.incbin "graphics/pokemon/pidgeotto/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pidgeot:: @ 8D3B568
-	.incbin "graphics/pokemon/pidgeot/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pidgeot:: @ 8D3BA54
-	.incbin "graphics/pokemon/pidgeot/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pidgeot:: @ 8D3BA7C
-	.incbin "graphics/pokemon/pidgeot/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pidgeot:: @ 8D3BE64
-	.incbin "graphics/pokemon/pidgeot/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pidgeot:: @ 8D3BE8C
-	.incbin "graphics/pokemon/pidgeot/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pidgeot:: @ 8D3C28C
-	.incbin "graphics/pokemon/pidgeot/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Rattata:: @ 8D3C2AC
-	.incbin "graphics/pokemon/rattata/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Rattata:: @ 8D3C504
-	.incbin "graphics/pokemon/rattata/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Rattata:: @ 8D3C52C
-	.incbin "graphics/pokemon/rattata/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Rattata:: @ 8D3C7E4
-	.incbin "graphics/pokemon/rattata/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Rattata:: @ 8D3C80C
-	.incbin "graphics/pokemon/rattata/icon.4bpp"
-
-	.align 2
-gMonFootprint_Rattata:: @ 8D3CC0C
-	.incbin "graphics/pokemon/rattata/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Raticate:: @ 8D3CC2C
-	.incbin "graphics/pokemon/raticate/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Raticate:: @ 8D3CFBC
-	.incbin "graphics/pokemon/raticate/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Raticate:: @ 8D3CFE4
-	.incbin "graphics/pokemon/raticate/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Raticate:: @ 8D3D2F4
-	.incbin "graphics/pokemon/raticate/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Raticate:: @ 8D3D31C
-	.incbin "graphics/pokemon/raticate/icon.4bpp"
-
-	.align 2
-gMonFootprint_Raticate:: @ 8D3D71C
-	.incbin "graphics/pokemon/raticate/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Spearow:: @ 8D3D73C
-	.incbin "graphics/pokemon/spearow/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Spearow:: @ 8D3D9FC
-	.incbin "graphics/pokemon/spearow/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Spearow:: @ 8D3DA24
-	.incbin "graphics/pokemon/spearow/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Spearow:: @ 8D3DD00
-	.incbin "graphics/pokemon/spearow/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Spearow:: @ 8D3DD28
-	.incbin "graphics/pokemon/spearow/icon.4bpp"
-
-	.align 2
-gMonFootprint_Spearow:: @ 8D3E128
-	.incbin "graphics/pokemon/spearow/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Fearow:: @ 8D3E148
-	.incbin "graphics/pokemon/fearow/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Fearow:: @ 8D3E604
-	.incbin "graphics/pokemon/fearow/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Fearow:: @ 8D3E62C
-	.incbin "graphics/pokemon/fearow/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Fearow:: @ 8D3E924
-	.incbin "graphics/pokemon/fearow/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Fearow:: @ 8D3E94C
-	.incbin "graphics/pokemon/fearow/icon.4bpp"
-
-	.align 2
-gMonFootprint_Fearow:: @ 8D3ED4C
-	.incbin "graphics/pokemon/fearow/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ekans:: @ 8D3ED6C
-	.incbin "graphics/pokemon/ekans/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ekans:: @ 8D3F034
-	.incbin "graphics/pokemon/ekans/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ekans:: @ 8D3F05C
-	.incbin "graphics/pokemon/ekans/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ekans:: @ 8D3F34C
-	.incbin "graphics/pokemon/ekans/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ekans:: @ 8D3F374
-	.incbin "graphics/pokemon/ekans/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ekans:: @ 8D3F774
-	.incbin "graphics/pokemon/ekans/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Arbok:: @ 8D3F794
-	.incbin "graphics/pokemon/arbok/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Arbok:: @ 8D3FC08
-	.incbin "graphics/pokemon/arbok/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Arbok:: @ 8D3FC30
-	.incbin "graphics/pokemon/arbok/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Arbok:: @ 8D3FEB8
-	.incbin "graphics/pokemon/arbok/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Arbok:: @ 8D3FEE0
-	.incbin "graphics/pokemon/arbok/icon.4bpp"
-
-	.align 2
-gMonFootprint_Arbok:: @ 8D402E0
-	.incbin "graphics/pokemon/arbok/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pikachu:: @ 8D40300
-	.incbin "graphics/pokemon/pikachu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pikachu:: @ 8D405D0
-	.incbin "graphics/pokemon/pikachu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pikachu:: @ 8D405F8
-	.incbin "graphics/pokemon/pikachu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pikachu:: @ 8D408D0
-	.incbin "graphics/pokemon/pikachu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pikachu:: @ 8D408F8
-	.incbin "graphics/pokemon/pikachu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pikachu:: @ 8D40CF8
-	.incbin "graphics/pokemon/pikachu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Raichu:: @ 8D40D18
-	.incbin "graphics/pokemon/raichu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Raichu:: @ 8D41110
-	.incbin "graphics/pokemon/raichu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Raichu:: @ 8D41138
-	.incbin "graphics/pokemon/raichu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Raichu:: @ 8D41458
-	.incbin "graphics/pokemon/raichu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Raichu:: @ 8D41480
-	.incbin "graphics/pokemon/raichu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Raichu:: @ 8D41880
-	.incbin "graphics/pokemon/raichu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sandshrew:: @ 8D418A0
-	.incbin "graphics/pokemon/sandshrew/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sandshrew:: @ 8D41B7C
-	.incbin "graphics/pokemon/sandshrew/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sandshrew:: @ 8D41BA4
-	.incbin "graphics/pokemon/sandshrew/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sandshrew:: @ 8D41ECC
-	.incbin "graphics/pokemon/sandshrew/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sandshrew:: @ 8D41EF4
-	.incbin "graphics/pokemon/sandshrew/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sandshrew:: @ 8D422F4
-	.incbin "graphics/pokemon/sandshrew/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sandslash:: @ 8D42314
-	.incbin "graphics/pokemon/sandslash/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sandslash:: @ 8D4272C
-	.incbin "graphics/pokemon/sandslash/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sandslash:: @ 8D42754
-	.incbin "graphics/pokemon/sandslash/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sandslash:: @ 8D42B70
-	.incbin "graphics/pokemon/sandslash/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sandslash:: @ 8D42B98
-	.incbin "graphics/pokemon/sandslash/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sandslash:: @ 8D42F98
-	.incbin "graphics/pokemon/sandslash/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_NidoranF:: @ 8D42FB8
-	.incbin "graphics/pokemon/nidoran_f/front.4bpp.lz"
-
-	.align 2
-gMonPalette_NidoranF:: @ 8D4321C
-	.incbin "graphics/pokemon/nidoran_f/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_NidoranF:: @ 8D43244
-	.incbin "graphics/pokemon/nidoran_f/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_NidoranF:: @ 8D43524
-	.incbin "graphics/pokemon/nidoran_f/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_NidoranF:: @ 8D4354C
-	.incbin "graphics/pokemon/nidoran_f/icon.4bpp"
-
-	.align 2
-gMonFootprint_NidoranF:: @ 8D4394C
-	.incbin "graphics/pokemon/nidoran_f/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nidorina:: @ 8D4396C
-	.incbin "graphics/pokemon/nidorina/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nidorina:: @ 8D43C8C
-	.incbin "graphics/pokemon/nidorina/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nidorina:: @ 8D43CB4
-	.incbin "graphics/pokemon/nidorina/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nidorina:: @ 8D44048
-	.incbin "graphics/pokemon/nidorina/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nidorina:: @ 8D44070
-	.incbin "graphics/pokemon/nidorina/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nidorina:: @ 8D44470
-	.incbin "graphics/pokemon/nidorina/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nidoqueen:: @ 8D44490
-	.incbin "graphics/pokemon/nidoqueen/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nidoqueen:: @ 8D448BC
-	.incbin "graphics/pokemon/nidoqueen/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nidoqueen:: @ 8D448E4
-	.incbin "graphics/pokemon/nidoqueen/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nidoqueen:: @ 8D44CA8
-	.incbin "graphics/pokemon/nidoqueen/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nidoqueen:: @ 8D44CD0
-	.incbin "graphics/pokemon/nidoqueen/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nidoqueen:: @ 8D450D0
-	.incbin "graphics/pokemon/nidoqueen/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_NidoranM:: @ 8D450F0
-	.incbin "graphics/pokemon/nidoran_m/front.4bpp.lz"
-
-	.align 2
-gMonPalette_NidoranM:: @ 8D4537C
-	.incbin "graphics/pokemon/nidoran_m/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_NidoranM:: @ 8D453A4
-	.incbin "graphics/pokemon/nidoran_m/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_NidoranM:: @ 8D456D8
-	.incbin "graphics/pokemon/nidoran_m/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_NidoranM:: @ 8D45700
-	.incbin "graphics/pokemon/nidoran_m/icon.4bpp"
-
-	.align 2
-gMonFootprint_NidoranM:: @ 8D45B00
-	.incbin "graphics/pokemon/nidoran_m/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nidorino:: @ 8D45B20
-	.incbin "graphics/pokemon/nidorino/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nidorino:: @ 8D45EA4
-	.incbin "graphics/pokemon/nidorino/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nidorino:: @ 8D45ECC
-	.incbin "graphics/pokemon/nidorino/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nidorino:: @ 8D46288
-	.incbin "graphics/pokemon/nidorino/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nidorino:: @ 8D462B0
-	.incbin "graphics/pokemon/nidorino/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nidorino:: @ 8D466B0
-	.incbin "graphics/pokemon/nidorino/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nidoking:: @ 8D466D0
-	.incbin "graphics/pokemon/nidoking/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nidoking:: @ 8D46C0C
-	.incbin "graphics/pokemon/nidoking/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nidoking:: @ 8D46C34
-	.incbin "graphics/pokemon/nidoking/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nidoking:: @ 8D47070
-	.incbin "graphics/pokemon/nidoking/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nidoking:: @ 8D47098
-	.incbin "graphics/pokemon/nidoking/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nidoking:: @ 8D47498
-	.incbin "graphics/pokemon/nidoking/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Clefairy:: @ 8D474B8
-	.incbin "graphics/pokemon/clefairy/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Clefairy:: @ 8D47754
-	.incbin "graphics/pokemon/clefairy/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Clefairy:: @ 8D4777C
-	.incbin "graphics/pokemon/clefairy/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Clefairy:: @ 8D47A4C
-	.incbin "graphics/pokemon/clefairy/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Clefairy:: @ 8D47A74
-	.incbin "graphics/pokemon/clefairy/icon.4bpp"
-
-	.align 2
-gMonFootprint_Clefairy:: @ 8D47E74
-	.incbin "graphics/pokemon/clefairy/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Clefable:: @ 8D47E94
-	.incbin "graphics/pokemon/clefable/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Clefable:: @ 8D481D4
-	.incbin "graphics/pokemon/clefable/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Clefable:: @ 8D481FC
-	.incbin "graphics/pokemon/clefable/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Clefable:: @ 8D48534
-	.incbin "graphics/pokemon/clefable/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Clefable:: @ 8D4855C
-	.incbin "graphics/pokemon/clefable/icon.4bpp"
-
-	.align 2
-gMonFootprint_Clefable:: @ 8D4895C
-	.incbin "graphics/pokemon/clefable/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Vulpix:: @ 8D4897C
-	.incbin "graphics/pokemon/vulpix/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Vulpix:: @ 8D48CA8
-	.incbin "graphics/pokemon/vulpix/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Vulpix:: @ 8D48CD0
-	.incbin "graphics/pokemon/vulpix/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Vulpix:: @ 8D48FD4
-	.incbin "graphics/pokemon/vulpix/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Vulpix:: @ 8D48FFC
-	.incbin "graphics/pokemon/vulpix/icon.4bpp"
-
-	.align 2
-gMonFootprint_Vulpix:: @ 8D493FC
-	.incbin "graphics/pokemon/vulpix/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ninetales:: @ 8D4941C
-	.incbin "graphics/pokemon/ninetales/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ninetales:: @ 8D49870
-	.incbin "graphics/pokemon/ninetales/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ninetales:: @ 8D49894
-	.incbin "graphics/pokemon/ninetales/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ninetales:: @ 8D49C84
-	.incbin "graphics/pokemon/ninetales/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ninetales:: @ 8D49CA8
-	.incbin "graphics/pokemon/ninetales/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ninetales:: @ 8D4A0A8
-	.incbin "graphics/pokemon/ninetales/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Jigglypuff:: @ 8D4A0C8
-	.incbin "graphics/pokemon/jigglypuff/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Jigglypuff:: @ 8D4A34C
-	.incbin "graphics/pokemon/jigglypuff/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Jigglypuff:: @ 8D4A374
-	.incbin "graphics/pokemon/jigglypuff/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Jigglypuff:: @ 8D4A5D0
-	.incbin "graphics/pokemon/jigglypuff/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Jigglypuff:: @ 8D4A5F8
-	.incbin "graphics/pokemon/jigglypuff/icon.4bpp"
-
-	.align 2
-gMonFootprint_Jigglypuff:: @ 8D4A9F8
-	.incbin "graphics/pokemon/jigglypuff/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wigglytuff:: @ 8D4AA18
-	.incbin "graphics/pokemon/wigglytuff/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wigglytuff:: @ 8D4AD8C
-	.incbin "graphics/pokemon/wigglytuff/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wigglytuff:: @ 8D4ADB4
-	.incbin "graphics/pokemon/wigglytuff/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wigglytuff:: @ 8D4B04C
-	.incbin "graphics/pokemon/wigglytuff/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wigglytuff:: @ 8D4B074
-	.incbin "graphics/pokemon/wigglytuff/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wigglytuff:: @ 8D4B474
-	.incbin "graphics/pokemon/wigglytuff/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Zubat:: @ 8D4B494
-	.incbin "graphics/pokemon/zubat/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Zubat:: @ 8D4B750
-	.incbin "graphics/pokemon/zubat/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Zubat:: @ 8D4B778
-	.incbin "graphics/pokemon/zubat/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Zubat:: @ 8D4BA34
-	.incbin "graphics/pokemon/zubat/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Zubat:: @ 8D4BA5C
-	.incbin "graphics/pokemon/zubat/icon.4bpp"
-
-	.align 2
-gMonFootprint_Zubat:: @ 8D4BE5C
-	.incbin "graphics/pokemon/zubat/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Golbat:: @ 8D4BE7C
-	.incbin "graphics/pokemon/golbat/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Golbat:: @ 8D4C21C
-	.incbin "graphics/pokemon/golbat/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Golbat:: @ 8D4C244
-	.incbin "graphics/pokemon/golbat/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Golbat:: @ 8D4C500
-	.incbin "graphics/pokemon/golbat/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Golbat:: @ 8D4C528
-	.incbin "graphics/pokemon/golbat/icon.4bpp"
-
-	.align 2
-gMonFootprint_Golbat:: @ 8D4C928
-	.incbin "graphics/pokemon/golbat/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Oddish:: @ 8D4C948
-	.incbin "graphics/pokemon/oddish/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Oddish:: @ 8D4CB88
-	.incbin "graphics/pokemon/oddish/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Oddish:: @ 8D4CBB0
-	.incbin "graphics/pokemon/oddish/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Oddish:: @ 8D4CE74
-	.incbin "graphics/pokemon/oddish/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Oddish:: @ 8D4CE9C
-	.incbin "graphics/pokemon/oddish/icon.4bpp"
-
-	.align 2
-gMonFootprint_Oddish:: @ 8D4D29C
-	.incbin "graphics/pokemon/oddish/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gloom:: @ 8D4D2BC
-	.incbin "graphics/pokemon/gloom/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gloom:: @ 8D4D624
-	.incbin "graphics/pokemon/gloom/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gloom:: @ 8D4D64C
-	.incbin "graphics/pokemon/gloom/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gloom:: @ 8D4D9CC
-	.incbin "graphics/pokemon/gloom/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gloom:: @ 8D4D9F4
-	.incbin "graphics/pokemon/gloom/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gloom:: @ 8D4DDF4
-	.incbin "graphics/pokemon/gloom/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Vileplume:: @ 8D4DE14
-	.incbin "graphics/pokemon/vileplume/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Vileplume:: @ 8D4E168
-	.incbin "graphics/pokemon/vileplume/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Vileplume:: @ 8D4E190
-	.incbin "graphics/pokemon/vileplume/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Vileplume:: @ 8D4E5DC
-	.incbin "graphics/pokemon/vileplume/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Vileplume:: @ 8D4E604
-	.incbin "graphics/pokemon/vileplume/icon.4bpp"
-
-	.align 2
-gMonFootprint_Vileplume:: @ 8D4EA04
-	.incbin "graphics/pokemon/vileplume/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Paras:: @ 8D4EA24
-	.incbin "graphics/pokemon/paras/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Paras:: @ 8D4EC90
-	.incbin "graphics/pokemon/paras/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Paras:: @ 8D4ECB8
-	.incbin "graphics/pokemon/paras/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Paras:: @ 8D4EF58
-	.incbin "graphics/pokemon/paras/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Paras:: @ 8D4EF80
-	.incbin "graphics/pokemon/paras/icon.4bpp"
-
-	.align 2
-gMonFootprint_Paras:: @ 8D4F380
-	.incbin "graphics/pokemon/paras/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Parasect:: @ 8D4F3A0
-	.incbin "graphics/pokemon/parasect/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Parasect:: @ 8D4F730
-	.incbin "graphics/pokemon/parasect/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Parasect:: @ 8D4F758
-	.incbin "graphics/pokemon/parasect/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Parasect:: @ 8D4FA54
-	.incbin "graphics/pokemon/parasect/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Parasect:: @ 8D4FA7C
-	.incbin "graphics/pokemon/parasect/icon.4bpp"
-
-	.align 2
-gMonFootprint_Parasect:: @ 8D4FE7C
-	.incbin "graphics/pokemon/parasect/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Venonat:: @ 8D4FE9C
-	.incbin "graphics/pokemon/venonat/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Venonat:: @ 8D501BC
-	.incbin "graphics/pokemon/venonat/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Venonat:: @ 8D501E4
-	.incbin "graphics/pokemon/venonat/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Venonat:: @ 8D50514
-	.incbin "graphics/pokemon/venonat/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Venonat:: @ 8D5053C
-	.incbin "graphics/pokemon/venonat/icon.4bpp"
-
-	.align 2
-gMonFootprint_Venonat:: @ 8D5093C
-	.incbin "graphics/pokemon/venonat/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Venomoth:: @ 8D5095C
-	.incbin "graphics/pokemon/venomoth/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Venomoth:: @ 8D50D60
-	.incbin "graphics/pokemon/venomoth/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Venomoth:: @ 8D50D88
-	.incbin "graphics/pokemon/venomoth/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Venomoth:: @ 8D5112C
-	.incbin "graphics/pokemon/venomoth/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Venomoth:: @ 8D51154
-	.incbin "graphics/pokemon/venomoth/icon.4bpp"
-
-	.align 2
-gMonFootprint_Venomoth:: @ 8D51554
-	.incbin "graphics/pokemon/venomoth/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Diglett:: @ 8D51574
-	.incbin "graphics/pokemon/diglett/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Diglett:: @ 8D51784
-	.incbin "graphics/pokemon/diglett/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Diglett:: @ 8D517AC
-	.incbin "graphics/pokemon/diglett/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Diglett:: @ 8D519B8
-	.incbin "graphics/pokemon/diglett/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Diglett:: @ 8D519E0
-	.incbin "graphics/pokemon/diglett/icon.4bpp"
-
-	.align 2
-gMonFootprint_Diglett:: @ 8D51DE0
-	.incbin "graphics/pokemon/diglett/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dugtrio:: @ 8D51E00
-	.incbin "graphics/pokemon/dugtrio/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dugtrio:: @ 8D5212C
-	.incbin "graphics/pokemon/dugtrio/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dugtrio:: @ 8D52154
-	.incbin "graphics/pokemon/dugtrio/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dugtrio:: @ 8D52400
-	.incbin "graphics/pokemon/dugtrio/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dugtrio:: @ 8D52428
-	.incbin "graphics/pokemon/dugtrio/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dugtrio:: @ 8D52828
-	.incbin "graphics/pokemon/dugtrio/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Meowth:: @ 8D52848
-	.incbin "graphics/pokemon/meowth/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Meowth:: @ 8D52B34
-	.incbin "graphics/pokemon/meowth/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Meowth:: @ 8D52B5C
-	.incbin "graphics/pokemon/meowth/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Meowth:: @ 8D52E40
-	.incbin "graphics/pokemon/meowth/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Meowth:: @ 8D52E68
-	.incbin "graphics/pokemon/meowth/icon.4bpp"
-
-	.align 2
-gMonFootprint_Meowth:: @ 8D53268
-	.incbin "graphics/pokemon/meowth/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Persian:: @ 8D53288
-	.incbin "graphics/pokemon/persian/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Persian:: @ 8D53600
-	.incbin "graphics/pokemon/persian/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Persian:: @ 8D53628
-	.incbin "graphics/pokemon/persian/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Persian:: @ 8D53968
-	.incbin "graphics/pokemon/persian/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Persian:: @ 8D53990
-	.incbin "graphics/pokemon/persian/icon.4bpp"
-
-	.align 2
-gMonFootprint_Persian:: @ 8D53D90
-	.incbin "graphics/pokemon/persian/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Psyduck:: @ 8D53DB0
-	.incbin "graphics/pokemon/psyduck/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Psyduck:: @ 8D54094
-	.incbin "graphics/pokemon/psyduck/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Psyduck:: @ 8D540BC
-	.incbin "graphics/pokemon/psyduck/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Psyduck:: @ 8D54358
-	.incbin "graphics/pokemon/psyduck/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Psyduck:: @ 8D54380
-	.incbin "graphics/pokemon/psyduck/icon.4bpp"
-
-	.align 2
-gMonFootprint_Psyduck:: @ 8D54780
-	.incbin "graphics/pokemon/psyduck/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Golduck:: @ 8D547A0
-	.incbin "graphics/pokemon/golduck/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Golduck:: @ 8D54B58
-	.incbin "graphics/pokemon/golduck/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Golduck:: @ 8D54B80
-	.incbin "graphics/pokemon/golduck/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Golduck:: @ 8D54EAC
-	.incbin "graphics/pokemon/golduck/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Golduck:: @ 8D54ED4
-	.incbin "graphics/pokemon/golduck/icon.4bpp"
-
-	.align 2
-gMonFootprint_Golduck:: @ 8D552D4
-	.incbin "graphics/pokemon/golduck/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mankey:: @ 8D552F4
-	.incbin "graphics/pokemon/mankey/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mankey:: @ 8D555EC
-	.incbin "graphics/pokemon/mankey/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mankey:: @ 8D55614
-	.incbin "graphics/pokemon/mankey/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mankey:: @ 8D5597C
-	.incbin "graphics/pokemon/mankey/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mankey:: @ 8D559A4
-	.incbin "graphics/pokemon/mankey/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mankey:: @ 8D55DA4
-	.incbin "graphics/pokemon/mankey/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Primeape:: @ 8D55DC4
-	.incbin "graphics/pokemon/primeape/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Primeape:: @ 8D56150
-	.incbin "graphics/pokemon/primeape/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Primeape:: @ 8D56178
-	.incbin "graphics/pokemon/primeape/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Primeape:: @ 8D564E8
-	.incbin "graphics/pokemon/primeape/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Primeape:: @ 8D56510
-	.incbin "graphics/pokemon/primeape/icon.4bpp"
-
-	.align 2
-gMonFootprint_Primeape:: @ 8D56910
-	.incbin "graphics/pokemon/primeape/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Growlithe:: @ 8D56930
-	.incbin "graphics/pokemon/growlithe/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Growlithe:: @ 8D56C58
-	.incbin "graphics/pokemon/growlithe/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Growlithe:: @ 8D56C80
-	.incbin "graphics/pokemon/growlithe/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Growlithe:: @ 8D56FBC
-	.incbin "graphics/pokemon/growlithe/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Growlithe:: @ 8D56FE4
-	.incbin "graphics/pokemon/growlithe/icon.4bpp"
-
-	.align 2
-gMonFootprint_Growlithe:: @ 8D573E4
-	.incbin "graphics/pokemon/growlithe/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Arcanine:: @ 8D57404
-	.incbin "graphics/pokemon/arcanine/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Arcanine:: @ 8D57900
-	.incbin "graphics/pokemon/arcanine/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Arcanine:: @ 8D57928
-	.incbin "graphics/pokemon/arcanine/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Arcanine:: @ 8D57D08
-	.incbin "graphics/pokemon/arcanine/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Arcanine:: @ 8D57D30
-	.incbin "graphics/pokemon/arcanine/icon.4bpp"
-
-	.align 2
-gMonFootprint_Arcanine:: @ 8D58130
-	.incbin "graphics/pokemon/arcanine/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Poliwag:: @ 8D58150
-	.incbin "graphics/pokemon/poliwag/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Poliwag:: @ 8D583EC
-	.incbin "graphics/pokemon/poliwag/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Poliwag:: @ 8D58414
-	.incbin "graphics/pokemon/poliwag/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Poliwag:: @ 8D58678
-	.incbin "graphics/pokemon/poliwag/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Poliwag:: @ 8D586A0
-	.incbin "graphics/pokemon/poliwag/icon.4bpp"
-
-	.align 2
-gMonFootprint_Poliwag:: @ 8D58AA0
-	.incbin "graphics/pokemon/poliwag/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Poliwhirl:: @ 8D58AC0
-	.incbin "graphics/pokemon/poliwhirl/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Poliwhirl:: @ 8D58E40
-	.incbin "graphics/pokemon/poliwhirl/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Poliwhirl:: @ 8D58E68
-	.incbin "graphics/pokemon/poliwhirl/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Poliwhirl:: @ 8D590E4
-	.incbin "graphics/pokemon/poliwhirl/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Poliwhirl:: @ 8D5910C
-	.incbin "graphics/pokemon/poliwhirl/icon.4bpp"
-
-	.align 2
-gMonFootprint_Poliwhirl:: @ 8D5950C
-	.incbin "graphics/pokemon/poliwhirl/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Poliwrath:: @ 8D5952C
-	.incbin "graphics/pokemon/poliwrath/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Poliwrath:: @ 8D598F0
-	.incbin "graphics/pokemon/poliwrath/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Poliwrath:: @ 8D59918
-	.incbin "graphics/pokemon/poliwrath/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Poliwrath:: @ 8D59C0C
-	.incbin "graphics/pokemon/poliwrath/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Poliwrath:: @ 8D59C34
-	.incbin "graphics/pokemon/poliwrath/icon.4bpp"
-
-	.align 2
-gMonFootprint_Poliwrath:: @ 8D5A034
-	.incbin "graphics/pokemon/poliwrath/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Abra:: @ 8D5A054
-	.incbin "graphics/pokemon/abra/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Abra:: @ 8D5A328
-	.incbin "graphics/pokemon/abra/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Abra:: @ 8D5A34C
-	.incbin "graphics/pokemon/abra/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Abra:: @ 8D5A620
-	.incbin "graphics/pokemon/abra/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Abra:: @ 8D5A644
-	.incbin "graphics/pokemon/abra/icon.4bpp"
-
-	.align 2
-gMonFootprint_Abra:: @ 8D5AA44
-	.incbin "graphics/pokemon/abra/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kadabra:: @ 8D5AA64
-	.incbin "graphics/pokemon/kadabra/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kadabra:: @ 8D5AF2C
-	.incbin "graphics/pokemon/kadabra/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kadabra:: @ 8D5AF54
-	.incbin "graphics/pokemon/kadabra/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kadabra:: @ 8D5B300
-	.incbin "graphics/pokemon/kadabra/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kadabra:: @ 8D5B328
-	.incbin "graphics/pokemon/kadabra/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kadabra:: @ 8D5B728
-	.incbin "graphics/pokemon/kadabra/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Alakazam:: @ 8D5B748
-	.incbin "graphics/pokemon/alakazam/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Alakazam:: @ 8D5BBE0
-	.incbin "graphics/pokemon/alakazam/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Alakazam:: @ 8D5BC08
-	.incbin "graphics/pokemon/alakazam/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Alakazam:: @ 8D5BF88
-	.incbin "graphics/pokemon/alakazam/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Alakazam:: @ 8D5BFB0
-	.incbin "graphics/pokemon/alakazam/icon.4bpp"
-
-	.align 2
-gMonFootprint_Alakazam:: @ 8D5C3B0
-	.incbin "graphics/pokemon/alakazam/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Machop:: @ 8D5C3D0
-	.incbin "graphics/pokemon/machop/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Machop:: @ 8D5C65C
-	.incbin "graphics/pokemon/machop/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Machop:: @ 8D5C684
-	.incbin "graphics/pokemon/machop/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Machop:: @ 8D5C964
-	.incbin "graphics/pokemon/machop/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Machop:: @ 8D5C98C
-	.incbin "graphics/pokemon/machop/icon.4bpp"
-
-	.align 2
-gMonFootprint_Machop:: @ 8D5CD8C
-	.incbin "graphics/pokemon/machop/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Machoke:: @ 8D5CDAC
-	.incbin "graphics/pokemon/machoke/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Machoke:: @ 8D5D178
-	.incbin "graphics/pokemon/machoke/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Machoke:: @ 8D5D1A0
-	.incbin "graphics/pokemon/machoke/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Machoke:: @ 8D5D4F0
-	.incbin "graphics/pokemon/machoke/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Machoke:: @ 8D5D518
-	.incbin "graphics/pokemon/machoke/icon.4bpp"
-
-	.align 2
-gMonFootprint_Machoke:: @ 8D5D918
-	.incbin "graphics/pokemon/machoke/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Machamp:: @ 8D5D938
-	.incbin "graphics/pokemon/machamp/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Machamp:: @ 8D5DE24
-	.incbin "graphics/pokemon/machamp/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Machamp:: @ 8D5DE4C
-	.incbin "graphics/pokemon/machamp/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Machamp:: @ 8D5E2A8
-	.incbin "graphics/pokemon/machamp/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Machamp:: @ 8D5E2D0
-	.incbin "graphics/pokemon/machamp/icon.4bpp"
-
-	.align 2
-gMonFootprint_Machamp:: @ 8D5E6D0
-	.incbin "graphics/pokemon/machamp/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Bellsprout:: @ 8D5E6F0
-	.incbin "graphics/pokemon/bellsprout/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Bellsprout:: @ 8D5E97C
-	.incbin "graphics/pokemon/bellsprout/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Bellsprout:: @ 8D5E9A4
-	.incbin "graphics/pokemon/bellsprout/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Bellsprout:: @ 8D5EC40
-	.incbin "graphics/pokemon/bellsprout/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Bellsprout:: @ 8D5EC68
-	.incbin "graphics/pokemon/bellsprout/icon.4bpp"
-
-	.align 2
-gMonFootprint_Bellsprout:: @ 8D5F068
-	.incbin "graphics/pokemon/bellsprout/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Weepinbell:: @ 8D5F088
-	.incbin "graphics/pokemon/weepinbell/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Weepinbell:: @ 8D5F3AC
-	.incbin "graphics/pokemon/weepinbell/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Weepinbell:: @ 8D5F3D4
-	.incbin "graphics/pokemon/weepinbell/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Weepinbell:: @ 8D5F6D0
-	.incbin "graphics/pokemon/weepinbell/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Weepinbell:: @ 8D5F6F8
-	.incbin "graphics/pokemon/weepinbell/icon.4bpp"
-
-	.align 2
-gMonFootprint_Weepinbell:: @ 8D5FAF8
-	.incbin "graphics/pokemon/weepinbell/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Victreebel:: @ 8D5FB18
-	.incbin "graphics/pokemon/victreebel/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Victreebel:: @ 8D5FF44
-	.incbin "graphics/pokemon/victreebel/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Victreebel:: @ 8D5FF6C
-	.incbin "graphics/pokemon/victreebel/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Victreebel:: @ 8D60304
-	.incbin "graphics/pokemon/victreebel/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Victreebel:: @ 8D6032C
-	.incbin "graphics/pokemon/victreebel/icon.4bpp"
-
-	.align 2
-gMonFootprint_Victreebel:: @ 8D6072C
-	.incbin "graphics/pokemon/victreebel/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tentacool:: @ 8D6074C
-	.incbin "graphics/pokemon/tentacool/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tentacool:: @ 8D609F4
-	.incbin "graphics/pokemon/tentacool/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tentacool:: @ 8D60A1C
-	.incbin "graphics/pokemon/tentacool/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tentacool:: @ 8D60CE8
-	.incbin "graphics/pokemon/tentacool/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tentacool:: @ 8D60D10
-	.incbin "graphics/pokemon/tentacool/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tentacool:: @ 8D61110
-	.incbin "graphics/pokemon/tentacool/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tentacruel:: @ 8D61130
-	.incbin "graphics/pokemon/tentacruel/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tentacruel:: @ 8D61624
-	.incbin "graphics/pokemon/tentacruel/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tentacruel:: @ 8D6164C
-	.incbin "graphics/pokemon/tentacruel/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tentacruel:: @ 8D619E8
-	.incbin "graphics/pokemon/tentacruel/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tentacruel:: @ 8D61A10
-	.incbin "graphics/pokemon/tentacruel/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tentacruel:: @ 8D61E10
-	.incbin "graphics/pokemon/tentacruel/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Geodude:: @ 8D61E30
-	.incbin "graphics/pokemon/geodude/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Geodude:: @ 8D620C4
-	.incbin "graphics/pokemon/geodude/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Geodude:: @ 8D620E0
-	.incbin "graphics/pokemon/geodude/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Geodude:: @ 8D62374
-	.incbin "graphics/pokemon/geodude/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Geodude:: @ 8D62390
-	.incbin "graphics/pokemon/geodude/icon.4bpp"
-
-	.align 2
-gMonFootprint_Geodude:: @ 8D62790
-	.incbin "graphics/pokemon/geodude/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Graveler:: @ 8D627B0
-	.incbin "graphics/pokemon/graveler/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Graveler:: @ 8D62BAC
-	.incbin "graphics/pokemon/graveler/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Graveler:: @ 8D62BD0
-	.incbin "graphics/pokemon/graveler/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Graveler:: @ 8D62E4C
-	.incbin "graphics/pokemon/graveler/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Graveler:: @ 8D62E70
-	.incbin "graphics/pokemon/graveler/icon.4bpp"
-
-	.align 2
-gMonFootprint_Graveler:: @ 8D63270
-	.incbin "graphics/pokemon/graveler/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Golem:: @ 8D63290
-	.incbin "graphics/pokemon/golem/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Golem:: @ 8D636C0
-	.incbin "graphics/pokemon/golem/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Golem:: @ 8D636E8
-	.incbin "graphics/pokemon/golem/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Golem:: @ 8D639A8
-	.incbin "graphics/pokemon/golem/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Golem:: @ 8D639D0
-	.incbin "graphics/pokemon/golem/icon.4bpp"
-
-	.align 2
-gMonFootprint_Golem:: @ 8D63DD0
-	.incbin "graphics/pokemon/golem/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ponyta:: @ 8D63DF0
-	.incbin "graphics/pokemon/ponyta/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ponyta:: @ 8D64180
-	.incbin "graphics/pokemon/ponyta/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ponyta:: @ 8D641A8
-	.incbin "graphics/pokemon/ponyta/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ponyta:: @ 8D644E4
-	.incbin "graphics/pokemon/ponyta/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ponyta:: @ 8D6450C
-	.incbin "graphics/pokemon/ponyta/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ponyta:: @ 8D6490C
-	.incbin "graphics/pokemon/ponyta/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Rapidash:: @ 8D6492C
-	.incbin "graphics/pokemon/rapidash/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Rapidash:: @ 8D64DB4
-	.incbin "graphics/pokemon/rapidash/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Rapidash:: @ 8D64DDC
-	.incbin "graphics/pokemon/rapidash/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Rapidash:: @ 8D651EC
-	.incbin "graphics/pokemon/rapidash/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Rapidash:: @ 8D65214
-	.incbin "graphics/pokemon/rapidash/icon.4bpp"
-
-	.align 2
-gMonFootprint_Rapidash:: @ 8D65614
-	.incbin "graphics/pokemon/rapidash/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Slowpoke:: @ 8D65634
-	.incbin "graphics/pokemon/slowpoke/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Slowpoke:: @ 8D65908
-	.incbin "graphics/pokemon/slowpoke/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Slowpoke:: @ 8D65930
-	.incbin "graphics/pokemon/slowpoke/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Slowpoke:: @ 8D65B94
-	.incbin "graphics/pokemon/slowpoke/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Slowpoke:: @ 8D65BBC
-	.incbin "graphics/pokemon/slowpoke/icon.4bpp"
-
-	.align 2
-gMonFootprint_Slowpoke:: @ 8D65FBC
-	.incbin "graphics/pokemon/slowpoke/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Slowbro:: @ 8D65FDC
-	.incbin "graphics/pokemon/slowbro/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Slowbro:: @ 8D6647C
-	.incbin "graphics/pokemon/slowbro/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Slowbro:: @ 8D664A4
-	.incbin "graphics/pokemon/slowbro/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Slowbro:: @ 8D66840
-	.incbin "graphics/pokemon/slowbro/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Slowbro:: @ 8D66868
-	.incbin "graphics/pokemon/slowbro/icon.4bpp"
-
-	.align 2
-gMonFootprint_Slowbro:: @ 8D66C68
-	.incbin "graphics/pokemon/slowbro/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Magnemite:: @ 8D66C88
-	.incbin "graphics/pokemon/magnemite/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Magnemite:: @ 8D66E60
-	.incbin "graphics/pokemon/magnemite/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Magnemite:: @ 8D66E88
-	.incbin "graphics/pokemon/magnemite/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Magnemite:: @ 8D67070
-	.incbin "graphics/pokemon/magnemite/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Magnemite:: @ 8D67094
-	.incbin "graphics/pokemon/magnemite/icon.4bpp"
-
-	.align 2
-gMonFootprint_Magnemite:: @ 8D67494
-	.incbin "graphics/pokemon/magnemite/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Magneton:: @ 8D674B4
-	.incbin "graphics/pokemon/magneton/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Magneton:: @ 8D677F0
-	.incbin "graphics/pokemon/magneton/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Magneton:: @ 8D67818
-	.incbin "graphics/pokemon/magneton/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Magneton:: @ 8D67B98
-	.incbin "graphics/pokemon/magneton/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Magneton:: @ 8D67BC0
-	.incbin "graphics/pokemon/magneton/icon.4bpp"
-
-	.align 2
-gMonFootprint_Magneton:: @ 8D67FC0
-	.incbin "graphics/pokemon/magneton/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Farfetchd:: @ 8D67FE0
-	.incbin "graphics/pokemon/farfetch_d/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Farfetchd:: @ 8D68334
-	.incbin "graphics/pokemon/farfetch_d/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Farfetchd:: @ 8D6835C
-	.incbin "graphics/pokemon/farfetch_d/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Farfetchd:: @ 8D686C8
-	.incbin "graphics/pokemon/farfetch_d/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Farfetchd:: @ 8D686F0
-	.incbin "graphics/pokemon/farfetch_d/icon.4bpp"
-
-	.align 2
-gMonFootprint_Farfetchd:: @ 8D68AF0
-	.incbin "graphics/pokemon/farfetch_d/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Doduo:: @ 8D68B10
-	.incbin "graphics/pokemon/doduo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Doduo:: @ 8D68DFC
-	.incbin "graphics/pokemon/doduo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Doduo:: @ 8D68E20
-	.incbin "graphics/pokemon/doduo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Doduo:: @ 8D69138
-	.incbin "graphics/pokemon/doduo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Doduo:: @ 8D6915C
-	.incbin "graphics/pokemon/doduo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Doduo:: @ 8D6955C
-	.incbin "graphics/pokemon/doduo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dodrio:: @ 8D6957C
-	.incbin "graphics/pokemon/dodrio/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dodrio:: @ 8D699BC
-	.incbin "graphics/pokemon/dodrio/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dodrio:: @ 8D699E4
-	.incbin "graphics/pokemon/dodrio/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dodrio:: @ 8D69E48
-	.incbin "graphics/pokemon/dodrio/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dodrio:: @ 8D69E70
-	.incbin "graphics/pokemon/dodrio/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dodrio:: @ 8D6A270
-	.incbin "graphics/pokemon/dodrio/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Seel:: @ 8D6A290
-	.incbin "graphics/pokemon/seel/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Seel:: @ 8D6A5B4
-	.incbin "graphics/pokemon/seel/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Seel:: @ 8D6A5DC
-	.incbin "graphics/pokemon/seel/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Seel:: @ 8D6A8C8
-	.incbin "graphics/pokemon/seel/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Seel:: @ 8D6A8F0
-	.incbin "graphics/pokemon/seel/icon.4bpp"
-
-	.align 2
-gMonFootprint_Seel:: @ 8D6ACF0
-	.incbin "graphics/pokemon/seel/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dewgong:: @ 8D6AD10
-	.incbin "graphics/pokemon/dewgong/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dewgong:: @ 8D6B0E0
-	.incbin "graphics/pokemon/dewgong/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dewgong:: @ 8D6B104
-	.incbin "graphics/pokemon/dewgong/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dewgong:: @ 8D6B398
-	.incbin "graphics/pokemon/dewgong/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dewgong:: @ 8D6B3BC
-	.incbin "graphics/pokemon/dewgong/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dewgong:: @ 8D6B7BC
-	.incbin "graphics/pokemon/dewgong/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Grimer:: @ 8D6B7DC
-	.incbin "graphics/pokemon/grimer/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Grimer:: @ 8D6BB04
-	.incbin "graphics/pokemon/grimer/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Grimer:: @ 8D6BB28
-	.incbin "graphics/pokemon/grimer/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Grimer:: @ 8D6BDEC
-	.incbin "graphics/pokemon/grimer/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Grimer:: @ 8D6BE10
-	.incbin "graphics/pokemon/grimer/icon.4bpp"
-
-	.align 2
-gMonFootprint_Grimer:: @ 8D6C210
-	.incbin "graphics/pokemon/grimer/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Muk:: @ 8D6C230
-	.incbin "graphics/pokemon/muk/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Muk:: @ 8D6C5C0
-	.incbin "graphics/pokemon/muk/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Muk:: @ 8D6C5E4
-	.incbin "graphics/pokemon/muk/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Muk:: @ 8D6C8DC
-	.incbin "graphics/pokemon/muk/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Muk:: @ 8D6C900
-	.incbin "graphics/pokemon/muk/icon.4bpp"
-
-	.align 2
-gMonFootprint_Muk:: @ 8D6CD00
-	.incbin "graphics/pokemon/muk/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shellder:: @ 8D6CD20
-	.incbin "graphics/pokemon/shellder/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shellder:: @ 8D6CF94
-	.incbin "graphics/pokemon/shellder/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shellder:: @ 8D6CFB8
-	.incbin "graphics/pokemon/shellder/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shellder:: @ 8D6D2CC
-	.incbin "graphics/pokemon/shellder/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shellder:: @ 8D6D2F0
-	.incbin "graphics/pokemon/shellder/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shellder:: @ 8D6D6F0
-	.incbin "graphics/pokemon/shellder/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cloyster:: @ 8D6D710
-	.incbin "graphics/pokemon/cloyster/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cloyster:: @ 8D6DB4C
-	.incbin "graphics/pokemon/cloyster/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cloyster:: @ 8D6DB70
-	.incbin "graphics/pokemon/cloyster/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cloyster:: @ 8D6DF7C
-	.incbin "graphics/pokemon/cloyster/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cloyster:: @ 8D6DFA0
-	.incbin "graphics/pokemon/cloyster/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cloyster:: @ 8D6E3A0
-	.incbin "graphics/pokemon/cloyster/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gastly:: @ 8D6E3C0
-	.incbin "graphics/pokemon/gastly/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gastly:: @ 8D6E778
-	.incbin "graphics/pokemon/gastly/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gastly:: @ 8D6E7A0
-	.incbin "graphics/pokemon/gastly/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gastly:: @ 8D6EAC4
-	.incbin "graphics/pokemon/gastly/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gastly:: @ 8D6EAEC
-	.incbin "graphics/pokemon/gastly/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gastly:: @ 8D6EEEC
-	.incbin "graphics/pokemon/gastly/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Haunter:: @ 8D6EF0C
-	.incbin "graphics/pokemon/haunter/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Haunter:: @ 8D6F2F4
-	.incbin "graphics/pokemon/haunter/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Haunter:: @ 8D6F318
-	.incbin "graphics/pokemon/haunter/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Haunter:: @ 8D6F5FC
-	.incbin "graphics/pokemon/haunter/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Haunter:: @ 8D6F620
-	.incbin "graphics/pokemon/haunter/icon.4bpp"
-
-	.align 2
-gMonFootprint_Haunter:: @ 8D6FA20
-	.incbin "graphics/pokemon/haunter/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gengar:: @ 8D6FA40
-	.incbin "graphics/pokemon/gengar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gengar:: @ 8D6FD9C
-	.incbin "graphics/pokemon/gengar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gengar:: @ 8D6FDC0
-	.incbin "graphics/pokemon/gengar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gengar:: @ 8D70104
-	.incbin "graphics/pokemon/gengar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gengar:: @ 8D70128
-	.incbin "graphics/pokemon/gengar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gengar:: @ 8D70528
-	.incbin "graphics/pokemon/gengar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Onix:: @ 8D70548
-	.incbin "graphics/pokemon/onix/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Onix:: @ 8D70A18
-	.incbin "graphics/pokemon/onix/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Onix:: @ 8D70A34
-	.incbin "graphics/pokemon/onix/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Onix:: @ 8D70DB0
-	.incbin "graphics/pokemon/onix/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Onix:: @ 8D70DCC
-	.incbin "graphics/pokemon/onix/icon.4bpp"
-
-	.align 2
-gMonFootprint_Onix:: @ 8D711CC
-	.incbin "graphics/pokemon/onix/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Drowzee:: @ 8D711EC
-	.incbin "graphics/pokemon/drowzee/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Drowzee:: @ 8D7152C
-	.incbin "graphics/pokemon/drowzee/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Drowzee:: @ 8D71550
-	.incbin "graphics/pokemon/drowzee/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Drowzee:: @ 8D7178C
-	.incbin "graphics/pokemon/drowzee/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Drowzee:: @ 8D717B0
-	.incbin "graphics/pokemon/drowzee/icon.4bpp"
-
-	.align 2
-gMonFootprint_Drowzee:: @ 8D71BB0
-	.incbin "graphics/pokemon/drowzee/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hypno:: @ 8D71BD0
-	.incbin "graphics/pokemon/hypno/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hypno:: @ 8D72008
-	.incbin "graphics/pokemon/hypno/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hypno:: @ 8D7202C
-	.incbin "graphics/pokemon/hypno/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hypno:: @ 8D7235C
-	.incbin "graphics/pokemon/hypno/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hypno:: @ 8D72380
-	.incbin "graphics/pokemon/hypno/icon.4bpp"
-
-	.align 2
-gMonFootprint_Hypno:: @ 8D72780
-	.incbin "graphics/pokemon/hypno/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Krabby:: @ 8D727A0
-	.incbin "graphics/pokemon/krabby/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Krabby:: @ 8D72AC4
-	.incbin "graphics/pokemon/krabby/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Krabby:: @ 8D72AEC
-	.incbin "graphics/pokemon/krabby/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Krabby:: @ 8D72E78
-	.incbin "graphics/pokemon/krabby/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Krabby:: @ 8D72EA0
-	.incbin "graphics/pokemon/krabby/icon.4bpp"
-
-	.align 2
-gMonFootprint_Krabby:: @ 8D732A0
-	.incbin "graphics/pokemon/krabby/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kingler:: @ 8D732C0
-	.incbin "graphics/pokemon/kingler/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kingler:: @ 8D73740
-	.incbin "graphics/pokemon/kingler/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kingler:: @ 8D73768
-	.incbin "graphics/pokemon/kingler/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kingler:: @ 8D73AEC
-	.incbin "graphics/pokemon/kingler/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kingler:: @ 8D73B14
-	.incbin "graphics/pokemon/kingler/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kingler:: @ 8D73F14
-	.incbin "graphics/pokemon/kingler/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Voltorb:: @ 8D73F34
-	.incbin "graphics/pokemon/voltorb/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Voltorb:: @ 8D7413C
-	.incbin "graphics/pokemon/voltorb/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Voltorb:: @ 8D74160
-	.incbin "graphics/pokemon/voltorb/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Voltorb:: @ 8D743D4
-	.incbin "graphics/pokemon/voltorb/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Voltorb:: @ 8D743F8
-	.incbin "graphics/pokemon/voltorb/icon.4bpp"
-
-	.align 2
-gMonFootprint_Voltorb:: @ 8D747F8
-	.incbin "graphics/pokemon/voltorb/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Electrode:: @ 8D74818
-	.incbin "graphics/pokemon/electrode/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Electrode:: @ 8D74A84
-	.incbin "graphics/pokemon/electrode/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Electrode:: @ 8D74AA8
-	.incbin "graphics/pokemon/electrode/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Electrode:: @ 8D74D18
-	.incbin "graphics/pokemon/electrode/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Electrode:: @ 8D74D3C
-	.incbin "graphics/pokemon/electrode/icon.4bpp"
-
-	.align 2
-gMonFootprint_Electrode:: @ 8D7513C
-	.incbin "graphics/pokemon/electrode/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Exeggcute:: @ 8D7515C
-	.incbin "graphics/pokemon/exeggcute/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Exeggcute:: @ 8D754EC
-	.incbin "graphics/pokemon/exeggcute/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Exeggcute:: @ 8D75510
-	.incbin "graphics/pokemon/exeggcute/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Exeggcute:: @ 8D75818
-	.incbin "graphics/pokemon/exeggcute/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Exeggcute:: @ 8D7583C
-	.incbin "graphics/pokemon/exeggcute/icon.4bpp"
-
-	.align 2
-gMonFootprint_Exeggcute:: @ 8D75C3C
-	.incbin "graphics/pokemon/exeggcute/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Exeggutor:: @ 8D75C5C
-	.incbin "graphics/pokemon/exeggutor/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Exeggutor:: @ 8D760AC
-	.incbin "graphics/pokemon/exeggutor/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Exeggutor:: @ 8D760D4
-	.incbin "graphics/pokemon/exeggutor/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Exeggutor:: @ 8D764A0
-	.incbin "graphics/pokemon/exeggutor/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Exeggutor:: @ 8D764C8
-	.incbin "graphics/pokemon/exeggutor/icon.4bpp"
-
-	.align 2
-gMonFootprint_Exeggutor:: @ 8D768C8
-	.incbin "graphics/pokemon/exeggutor/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cubone:: @ 8D768E8
-	.incbin "graphics/pokemon/cubone/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cubone:: @ 8D76BA4
-	.incbin "graphics/pokemon/cubone/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cubone:: @ 8D76BCC
-	.incbin "graphics/pokemon/cubone/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cubone:: @ 8D76F0C
-	.incbin "graphics/pokemon/cubone/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cubone:: @ 8D76F34
-	.incbin "graphics/pokemon/cubone/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cubone:: @ 8D77334
-	.incbin "graphics/pokemon/cubone/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Marowak:: @ 8D77354
-	.incbin "graphics/pokemon/marowak/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Marowak:: @ 8D776D4
-	.incbin "graphics/pokemon/marowak/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Marowak:: @ 8D776FC
-	.incbin "graphics/pokemon/marowak/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Marowak:: @ 8D77A10
-	.incbin "graphics/pokemon/marowak/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Marowak:: @ 8D77A38
-	.incbin "graphics/pokemon/marowak/icon.4bpp"
-
-	.align 2
-gMonFootprint_Marowak:: @ 8D77E38
-	.incbin "graphics/pokemon/marowak/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hitmonlee:: @ 8D77E58
-	.incbin "graphics/pokemon/hitmonlee/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hitmonlee:: @ 8D781CC
-	.incbin "graphics/pokemon/hitmonlee/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hitmonlee:: @ 8D781F4
-	.incbin "graphics/pokemon/hitmonlee/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hitmonlee:: @ 8D78498
-	.incbin "graphics/pokemon/hitmonlee/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hitmonlee:: @ 8D784C0
-	.incbin "graphics/pokemon/hitmonlee/icon.4bpp"
-
-	.align 2
-gMonFootprint_Hitmonlee:: @ 8D788C0
-	.incbin "graphics/pokemon/hitmonlee/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hitmonchan:: @ 8D788E0
-	.incbin "graphics/pokemon/hitmonchan/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hitmonchan:: @ 8D78C20
-	.incbin "graphics/pokemon/hitmonchan/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hitmonchan:: @ 8D78C48
-	.incbin "graphics/pokemon/hitmonchan/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hitmonchan:: @ 8D78F8C
-	.incbin "graphics/pokemon/hitmonchan/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hitmonchan:: @ 8D78FB4
-	.incbin "graphics/pokemon/hitmonchan/icon.4bpp"
-
-	.align 2
-gMonFootprint_Hitmonchan:: @ 8D793B4
-	.incbin "graphics/pokemon/hitmonchan/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lickitung:: @ 8D793D4
-	.incbin "graphics/pokemon/lickitung/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lickitung:: @ 8D797AC
-	.incbin "graphics/pokemon/lickitung/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lickitung:: @ 8D797D4
-	.incbin "graphics/pokemon/lickitung/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lickitung:: @ 8D79A78
-	.incbin "graphics/pokemon/lickitung/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lickitung:: @ 8D79AA0
-	.incbin "graphics/pokemon/lickitung/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lickitung:: @ 8D79EA0
-	.incbin "graphics/pokemon/lickitung/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Koffing:: @ 8D79EC0
-	.incbin "graphics/pokemon/koffing/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Koffing:: @ 8D7A1C0
-	.incbin "graphics/pokemon/koffing/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Koffing:: @ 8D7A1E8
-	.incbin "graphics/pokemon/koffing/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Koffing:: @ 8D7A4E8
-	.incbin "graphics/pokemon/koffing/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Koffing:: @ 8D7A510
-	.incbin "graphics/pokemon/koffing/icon.4bpp"
-
-	.align 2
-gMonFootprint_Koffing:: @ 8D7A910
-	.incbin "graphics/pokemon/koffing/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Weezing:: @ 8D7A930
-	.incbin "graphics/pokemon/weezing/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Weezing:: @ 8D7ADEC
-	.incbin "graphics/pokemon/weezing/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Weezing:: @ 8D7AE14
-	.incbin "graphics/pokemon/weezing/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Weezing:: @ 8D7B198
-	.incbin "graphics/pokemon/weezing/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Weezing:: @ 8D7B1C0
-	.incbin "graphics/pokemon/weezing/icon.4bpp"
-
-	.align 2
-gMonFootprint_Weezing:: @ 8D7B5C0
-	.incbin "graphics/pokemon/weezing/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Rhyhorn:: @ 8D7B5E0
-	.incbin "graphics/pokemon/rhyhorn/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Rhyhorn:: @ 8D7B9DC
-	.incbin "graphics/pokemon/rhyhorn/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Rhyhorn:: @ 8D7B9FC
-	.incbin "graphics/pokemon/rhyhorn/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Rhyhorn:: @ 8D7BD44
-	.incbin "graphics/pokemon/rhyhorn/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Rhyhorn:: @ 8D7BD64
-	.incbin "graphics/pokemon/rhyhorn/icon.4bpp"
-
-	.align 2
-gMonFootprint_Rhyhorn:: @ 8D7C164
-	.incbin "graphics/pokemon/rhyhorn/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Rhydon:: @ 8D7C184
-	.incbin "graphics/pokemon/rhydon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Rhydon:: @ 8D7C678
-	.incbin "graphics/pokemon/rhydon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Rhydon:: @ 8D7C6A0
-	.incbin "graphics/pokemon/rhydon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Rhydon:: @ 8D7CAF0
-	.incbin "graphics/pokemon/rhydon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Rhydon:: @ 8D7CB18
-	.incbin "graphics/pokemon/rhydon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Rhydon:: @ 8D7CF18
-	.incbin "graphics/pokemon/rhydon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Chansey:: @ 8D7CF38
-	.incbin "graphics/pokemon/chansey/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Chansey:: @ 8D7D274
-	.incbin "graphics/pokemon/chansey/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Chansey:: @ 8D7D298
-	.incbin "graphics/pokemon/chansey/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Chansey:: @ 8D7D4E8
-	.incbin "graphics/pokemon/chansey/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Chansey:: @ 8D7D50C
-	.incbin "graphics/pokemon/chansey/icon.4bpp"
-
-	.align 2
-gMonFootprint_Chansey:: @ 8D7D90C
-	.incbin "graphics/pokemon/chansey/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tangela:: @ 8D7D92C
-	.incbin "graphics/pokemon/tangela/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tangela:: @ 8D7DD00
-	.incbin "graphics/pokemon/tangela/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tangela:: @ 8D7DD24
-	.incbin "graphics/pokemon/tangela/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tangela:: @ 8D7E0D0
-	.incbin "graphics/pokemon/tangela/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tangela:: @ 8D7E0F4
-	.incbin "graphics/pokemon/tangela/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tangela:: @ 8D7E4F4
-	.incbin "graphics/pokemon/tangela/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kangaskhan:: @ 8D7E514
-	.incbin "graphics/pokemon/kangaskhan/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kangaskhan:: @ 8D7E9BC
-	.incbin "graphics/pokemon/kangaskhan/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kangaskhan:: @ 8D7E9E4
-	.incbin "graphics/pokemon/kangaskhan/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kangaskhan:: @ 8D7EE14
-	.incbin "graphics/pokemon/kangaskhan/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kangaskhan:: @ 8D7EE3C
-	.incbin "graphics/pokemon/kangaskhan/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kangaskhan:: @ 8D7F23C
-	.incbin "graphics/pokemon/kangaskhan/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Horsea:: @ 8D7F25C
-	.incbin "graphics/pokemon/horsea/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Horsea:: @ 8D7F4C8
-	.incbin "graphics/pokemon/horsea/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Horsea:: @ 8D7F4F0
-	.incbin "graphics/pokemon/horsea/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Horsea:: @ 8D7F7D0
-	.incbin "graphics/pokemon/horsea/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Horsea:: @ 8D7F7F8
-	.incbin "graphics/pokemon/horsea/icon.4bpp"
-
-	.align 2
-gMonFootprint_Horsea:: @ 8D7FBF8
-	.incbin "graphics/pokemon/horsea/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Seadra:: @ 8D7FC18
-	.incbin "graphics/pokemon/seadra/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Seadra:: @ 8D7FFA0
-	.incbin "graphics/pokemon/seadra/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Seadra:: @ 8D7FFC8
-	.incbin "graphics/pokemon/seadra/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Seadra:: @ 8D80368
-	.incbin "graphics/pokemon/seadra/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Seadra:: @ 8D80390
-	.incbin "graphics/pokemon/seadra/icon.4bpp"
-
-	.align 2
-gMonFootprint_Seadra:: @ 8D80790
-	.incbin "graphics/pokemon/seadra/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Goldeen:: @ 8D807B0
-	.incbin "graphics/pokemon/goldeen/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Goldeen:: @ 8D80B18
-	.incbin "graphics/pokemon/goldeen/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Goldeen:: @ 8D80B40
-	.incbin "graphics/pokemon/goldeen/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Goldeen:: @ 8D80EB0
-	.incbin "graphics/pokemon/goldeen/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Goldeen:: @ 8D80ED8
-	.incbin "graphics/pokemon/goldeen/icon.4bpp"
-
-	.align 2
-gMonFootprint_Goldeen:: @ 8D812D8
-	.incbin "graphics/pokemon/goldeen/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Seaking:: @ 8D812F8
-	.incbin "graphics/pokemon/seaking/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Seaking:: @ 8D8176C
-	.incbin "graphics/pokemon/seaking/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Seaking:: @ 8D81794
-	.incbin "graphics/pokemon/seaking/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Seaking:: @ 8D81AE4
-	.incbin "graphics/pokemon/seaking/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Seaking:: @ 8D81B0C
-	.incbin "graphics/pokemon/seaking/icon.4bpp"
-
-	.align 2
-gMonFootprint_Seaking:: @ 8D81F0C
-	.incbin "graphics/pokemon/seaking/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Staryu:: @ 8D81F2C
-	.incbin "graphics/pokemon/staryu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Staryu:: @ 8D821DC
-	.incbin "graphics/pokemon/staryu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Staryu:: @ 8D82204
-	.incbin "graphics/pokemon/staryu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Staryu:: @ 8D8246C
-	.incbin "graphics/pokemon/staryu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Staryu:: @ 8D82494
-	.incbin "graphics/pokemon/staryu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Staryu:: @ 8D82894
-	.incbin "graphics/pokemon/staryu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Starmie:: @ 8D828B4
-	.incbin "graphics/pokemon/starmie/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Starmie:: @ 8D82C54
-	.incbin "graphics/pokemon/starmie/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Starmie:: @ 8D82C7C
-	.incbin "graphics/pokemon/starmie/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Starmie:: @ 8D82F20
-	.incbin "graphics/pokemon/starmie/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Starmie:: @ 8D82F48
-	.incbin "graphics/pokemon/starmie/icon.4bpp"
-
-	.align 2
-gMonFootprint_Starmie:: @ 8D83348
-	.incbin "graphics/pokemon/starmie/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mrmime:: @ 8D83368
-	.incbin "graphics/pokemon/mr_mime/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mrmime:: @ 8D83724
-	.incbin "graphics/pokemon/mr_mime/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mrmime:: @ 8D8374C
-	.incbin "graphics/pokemon/mr_mime/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mrmime:: @ 8D83A80
-	.incbin "graphics/pokemon/mr_mime/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mrmime:: @ 8D83AA8
-	.incbin "graphics/pokemon/mr_mime/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mrmime:: @ 8D83EA8
-	.incbin "graphics/pokemon/mr_mime/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Scyther:: @ 8D83EC8
-	.incbin "graphics/pokemon/scyther/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Scyther:: @ 8D842F0
-	.incbin "graphics/pokemon/scyther/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Scyther:: @ 8D84318
-	.incbin "graphics/pokemon/scyther/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Scyther:: @ 8D84730
-	.incbin "graphics/pokemon/scyther/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Scyther:: @ 8D84758
-	.incbin "graphics/pokemon/scyther/icon.4bpp"
-
-	.align 2
-gMonFootprint_Scyther:: @ 8D84B58
-	.incbin "graphics/pokemon/scyther/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Jynx:: @ 8D84B78
-	.incbin "graphics/pokemon/jynx/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Jynx:: @ 8D84F44
-	.incbin "graphics/pokemon/jynx/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Jynx:: @ 8D84F6C
-	.incbin "graphics/pokemon/jynx/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Jynx:: @ 8D85258
-	.incbin "graphics/pokemon/jynx/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Jynx:: @ 8D85280
-	.incbin "graphics/pokemon/jynx/icon.4bpp"
-
-	.align 2
-gMonFootprint_Jynx:: @ 8D85680
-	.incbin "graphics/pokemon/jynx/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Electabuzz:: @ 8D856A0
-	.incbin "graphics/pokemon/electabuzz/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Electabuzz:: @ 8D85AF8
-	.incbin "graphics/pokemon/electabuzz/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Electabuzz:: @ 8D85B20
-	.incbin "graphics/pokemon/electabuzz/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Electabuzz:: @ 8D85E30
-	.incbin "graphics/pokemon/electabuzz/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Electabuzz:: @ 8D85E58
-	.incbin "graphics/pokemon/electabuzz/icon.4bpp"
-
-	.align 2
-gMonFootprint_Electabuzz:: @ 8D86258
-	.incbin "graphics/pokemon/electabuzz/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Magmar:: @ 8D86278
-	.incbin "graphics/pokemon/magmar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Magmar:: @ 8D866A8
-	.incbin "graphics/pokemon/magmar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Magmar:: @ 8D866D0
-	.incbin "graphics/pokemon/magmar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Magmar:: @ 8D86A08
-	.incbin "graphics/pokemon/magmar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Magmar:: @ 8D86A30
-	.incbin "graphics/pokemon/magmar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Magmar:: @ 8D86E30
-	.incbin "graphics/pokemon/magmar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pinsir:: @ 8D86E50
-	.incbin "graphics/pokemon/pinsir/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pinsir:: @ 8D87280
-	.incbin "graphics/pokemon/pinsir/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pinsir:: @ 8D872A4
-	.incbin "graphics/pokemon/pinsir/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pinsir:: @ 8D875F8
-	.incbin "graphics/pokemon/pinsir/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pinsir:: @ 8D8761C
-	.incbin "graphics/pokemon/pinsir/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pinsir:: @ 8D87A1C
-	.incbin "graphics/pokemon/pinsir/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tauros:: @ 8D87A3C
-	.incbin "graphics/pokemon/tauros/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tauros:: @ 8D87E9C
-	.incbin "graphics/pokemon/tauros/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tauros:: @ 8D87EC4
-	.incbin "graphics/pokemon/tauros/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tauros:: @ 8D88178
-	.incbin "graphics/pokemon/tauros/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tauros:: @ 8D881A0
-	.incbin "graphics/pokemon/tauros/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tauros:: @ 8D885A0
-	.incbin "graphics/pokemon/tauros/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Magikarp:: @ 8D885C0
-	.incbin "graphics/pokemon/magikarp/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Magikarp:: @ 8D88908
-	.incbin "graphics/pokemon/magikarp/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Magikarp:: @ 8D88930
-	.incbin "graphics/pokemon/magikarp/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Magikarp:: @ 8D88C60
-	.incbin "graphics/pokemon/magikarp/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Magikarp:: @ 8D88C88
-	.incbin "graphics/pokemon/magikarp/icon.4bpp"
-
-	.align 2
-gMonFootprint_Magikarp:: @ 8D89088
-	.incbin "graphics/pokemon/magikarp/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gyarados:: @ 8D890A8
-	.incbin "graphics/pokemon/gyarados/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gyarados:: @ 8D8964C
-	.incbin "graphics/pokemon/gyarados/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gyarados:: @ 8D89674
-	.incbin "graphics/pokemon/gyarados/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gyarados:: @ 8D89B2C
-	.incbin "graphics/pokemon/gyarados/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gyarados:: @ 8D89B54
-	.incbin "graphics/pokemon/gyarados/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gyarados:: @ 8D89F54
-	.incbin "graphics/pokemon/gyarados/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lapras:: @ 8D89F74
-	.incbin "graphics/pokemon/lapras/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lapras:: @ 8D8A354
-	.incbin "graphics/pokemon/lapras/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lapras:: @ 8D8A37C
-	.incbin "graphics/pokemon/lapras/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lapras:: @ 8D8A6C0
-	.incbin "graphics/pokemon/lapras/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lapras:: @ 8D8A6E8
-	.incbin "graphics/pokemon/lapras/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lapras:: @ 8D8AAE8
-	.incbin "graphics/pokemon/lapras/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ditto:: @ 8D8AB08
-	.incbin "graphics/pokemon/ditto/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ditto:: @ 8D8ACF8
-	.incbin "graphics/pokemon/ditto/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ditto:: @ 8D8AD18
-	.incbin "graphics/pokemon/ditto/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ditto:: @ 8D8AF18
-	.incbin "graphics/pokemon/ditto/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ditto:: @ 8D8AF38
-	.incbin "graphics/pokemon/ditto/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ditto:: @ 8D8B338
-	.incbin "graphics/pokemon/ditto/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Eevee:: @ 8D8B358
-	.incbin "graphics/pokemon/eevee/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Eevee:: @ 8D8B644
-	.incbin "graphics/pokemon/eevee/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Eevee:: @ 8D8B66C
-	.incbin "graphics/pokemon/eevee/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Eevee:: @ 8D8B994
-	.incbin "graphics/pokemon/eevee/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Eevee:: @ 8D8B9BC
-	.incbin "graphics/pokemon/eevee/icon.4bpp"
-
-	.align 2
-gMonFootprint_Eevee:: @ 8D8BDBC
-	.incbin "graphics/pokemon/eevee/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Vaporeon:: @ 8D8BDDC
-	.incbin "graphics/pokemon/vaporeon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Vaporeon:: @ 8D8C170
-	.incbin "graphics/pokemon/vaporeon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Vaporeon:: @ 8D8C198
-	.incbin "graphics/pokemon/vaporeon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Vaporeon:: @ 8D8C460
-	.incbin "graphics/pokemon/vaporeon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Vaporeon:: @ 8D8C488
-	.incbin "graphics/pokemon/vaporeon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Vaporeon:: @ 8D8C888
-	.incbin "graphics/pokemon/vaporeon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Jolteon:: @ 8D8C8A8
-	.incbin "graphics/pokemon/jolteon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Jolteon:: @ 8D8CBF8
-	.incbin "graphics/pokemon/jolteon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Jolteon:: @ 8D8CC20
-	.incbin "graphics/pokemon/jolteon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Jolteon:: @ 8D8CFCC
-	.incbin "graphics/pokemon/jolteon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Jolteon:: @ 8D8CFF4
-	.incbin "graphics/pokemon/jolteon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Jolteon:: @ 8D8D3F4
-	.incbin "graphics/pokemon/jolteon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Flareon:: @ 8D8D414
-	.incbin "graphics/pokemon/flareon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Flareon:: @ 8D8D798
-	.incbin "graphics/pokemon/flareon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Flareon:: @ 8D8D7C0
-	.incbin "graphics/pokemon/flareon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Flareon:: @ 8D8DB50
-	.incbin "graphics/pokemon/flareon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Flareon:: @ 8D8DB78
-	.incbin "graphics/pokemon/flareon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Flareon:: @ 8D8DF78
-	.incbin "graphics/pokemon/flareon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Porygon:: @ 8D8DF98
-	.incbin "graphics/pokemon/porygon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Porygon:: @ 8D8E250
-	.incbin "graphics/pokemon/porygon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Porygon:: @ 8D8E274
-	.incbin "graphics/pokemon/porygon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Porygon:: @ 8D8E52C
-	.incbin "graphics/pokemon/porygon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Porygon:: @ 8D8E550
-	.incbin "graphics/pokemon/porygon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Porygon:: @ 8D8E950
-	.incbin "graphics/pokemon/porygon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Omanyte:: @ 8D8E970
-	.incbin "graphics/pokemon/omanyte/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Omanyte:: @ 8D8EC00
-	.incbin "graphics/pokemon/omanyte/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Omanyte:: @ 8D8EC28
-	.incbin "graphics/pokemon/omanyte/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Omanyte:: @ 8D8EF74
-	.incbin "graphics/pokemon/omanyte/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Omanyte:: @ 8D8EF9C
-	.incbin "graphics/pokemon/omanyte/icon.4bpp"
-
-	.align 2
-gMonFootprint_Omanyte:: @ 8D8F39C
-	.incbin "graphics/pokemon/omanyte/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Omastar:: @ 8D8F3BC
-	.incbin "graphics/pokemon/omastar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Omastar:: @ 8D8F77C
-	.incbin "graphics/pokemon/omastar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Omastar:: @ 8D8F7A4
-	.incbin "graphics/pokemon/omastar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Omastar:: @ 8D8FAE4
-	.incbin "graphics/pokemon/omastar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Omastar:: @ 8D8FB0C
-	.incbin "graphics/pokemon/omastar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Omastar:: @ 8D8FF0C
-	.incbin "graphics/pokemon/omastar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kabuto:: @ 8D8FF2C
-	.incbin "graphics/pokemon/kabuto/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kabuto:: @ 8D90154
-	.incbin "graphics/pokemon/kabuto/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kabuto:: @ 8D9017C
-	.incbin "graphics/pokemon/kabuto/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kabuto:: @ 8D90414
-	.incbin "graphics/pokemon/kabuto/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kabuto:: @ 8D9043C
-	.incbin "graphics/pokemon/kabuto/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kabuto:: @ 8D9083C
-	.incbin "graphics/pokemon/kabuto/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kabutops:: @ 8D9085C
-	.incbin "graphics/pokemon/kabutops/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kabutops:: @ 8D90C6C
-	.incbin "graphics/pokemon/kabutops/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kabutops:: @ 8D90C90
-	.incbin "graphics/pokemon/kabutops/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kabutops:: @ 8D91034
-	.incbin "graphics/pokemon/kabutops/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kabutops:: @ 8D91058
-	.incbin "graphics/pokemon/kabutops/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kabutops:: @ 8D91458
-	.incbin "graphics/pokemon/kabutops/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Aerodactyl:: @ 8D91478
-	.incbin "graphics/pokemon/aerodactyl/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Aerodactyl:: @ 8D918C8
-	.incbin "graphics/pokemon/aerodactyl/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Aerodactyl:: @ 8D918F0
-	.incbin "graphics/pokemon/aerodactyl/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Aerodactyl:: @ 8D91BF4
-	.incbin "graphics/pokemon/aerodactyl/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Aerodactyl:: @ 8D91C1C
-	.incbin "graphics/pokemon/aerodactyl/icon.4bpp"
-
-	.align 2
-gMonFootprint_Aerodactyl:: @ 8D9201C
-	.incbin "graphics/pokemon/aerodactyl/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Snorlax:: @ 8D9203C
-	.incbin "graphics/pokemon/snorlax/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Snorlax:: @ 8D92410
-	.incbin "graphics/pokemon/snorlax/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Snorlax:: @ 8D92438
-	.incbin "graphics/pokemon/snorlax/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Snorlax:: @ 8D92654
-	.incbin "graphics/pokemon/snorlax/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Snorlax:: @ 8D9267C
-	.incbin "graphics/pokemon/snorlax/icon.4bpp"
-
-	.align 2
-gMonFootprint_Snorlax:: @ 8D92A7C
-	.incbin "graphics/pokemon/snorlax/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Articuno:: @ 8D92A9C
-	.incbin "graphics/pokemon/articuno/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Articuno:: @ 8D92F94
-	.incbin "graphics/pokemon/articuno/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Articuno:: @ 8D92FBC
-	.incbin "graphics/pokemon/articuno/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Articuno:: @ 8D93218
-	.incbin "graphics/pokemon/articuno/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Articuno:: @ 8D93240
-	.incbin "graphics/pokemon/articuno/icon.4bpp"
-
-	.align 2
-gMonFootprint_Articuno:: @ 8D93640
-	.incbin "graphics/pokemon/articuno/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Zapdos:: @ 8D93660
-	.incbin "graphics/pokemon/zapdos/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Zapdos:: @ 8D93AB0
-	.incbin "graphics/pokemon/zapdos/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Zapdos:: @ 8D93AD8
-	.incbin "graphics/pokemon/zapdos/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Zapdos:: @ 8D93E14
-	.incbin "graphics/pokemon/zapdos/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Zapdos:: @ 8D93E3C
-	.incbin "graphics/pokemon/zapdos/icon.4bpp"
-
-	.align 2
-gMonFootprint_Zapdos:: @ 8D9423C
-	.incbin "graphics/pokemon/zapdos/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Moltres:: @ 8D9425C
-	.incbin "graphics/pokemon/moltres/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Moltres:: @ 8D94728
-	.incbin "graphics/pokemon/moltres/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Moltres:: @ 8D94750
-	.incbin "graphics/pokemon/moltres/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Moltres:: @ 8D94A8C
-	.incbin "graphics/pokemon/moltres/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Moltres:: @ 8D94AB4
-	.incbin "graphics/pokemon/moltres/icon.4bpp"
-
-	.align 2
-gMonFootprint_Moltres:: @ 8D94EB4
-	.incbin "graphics/pokemon/moltres/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dratini:: @ 8D94ED4
-	.incbin "graphics/pokemon/dratini/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dratini:: @ 8D95190
-	.incbin "graphics/pokemon/dratini/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dratini:: @ 8D951B4
-	.incbin "graphics/pokemon/dratini/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dratini:: @ 8D95444
-	.incbin "graphics/pokemon/dratini/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dratini:: @ 8D95468
-	.incbin "graphics/pokemon/dratini/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dratini:: @ 8D95868
-	.incbin "graphics/pokemon/dratini/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dragonair:: @ 8D95888
-	.incbin "graphics/pokemon/dragonair/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dragonair:: @ 8D95C20
-	.incbin "graphics/pokemon/dragonair/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dragonair:: @ 8D95C48
-	.incbin "graphics/pokemon/dragonair/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dragonair:: @ 8D95F58
-	.incbin "graphics/pokemon/dragonair/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dragonair:: @ 8D95F80
-	.incbin "graphics/pokemon/dragonair/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dragonair:: @ 8D96380
-	.incbin "graphics/pokemon/dragonair/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dragonite:: @ 8D963A0
-	.incbin "graphics/pokemon/dragonite/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dragonite:: @ 8D968F0
-	.incbin "graphics/pokemon/dragonite/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dragonite:: @ 8D96918
-	.incbin "graphics/pokemon/dragonite/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dragonite:: @ 8D96C10
-	.incbin "graphics/pokemon/dragonite/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dragonite:: @ 8D96C38
-	.incbin "graphics/pokemon/dragonite/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dragonite:: @ 8D97038
-	.incbin "graphics/pokemon/dragonite/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mewtwo:: @ 8D97058
-	.incbin "graphics/pokemon/mewtwo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mewtwo:: @ 8D97494
-	.incbin "graphics/pokemon/mewtwo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mewtwo:: @ 8D974B8
-	.incbin "graphics/pokemon/mewtwo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mewtwo:: @ 8D97884
-	.incbin "graphics/pokemon/mewtwo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mewtwo:: @ 8D978A8
-	.incbin "graphics/pokemon/mewtwo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mewtwo:: @ 8D97CA8
-	.incbin "graphics/pokemon/mewtwo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mew:: @ 8D97CC8
-	.incbin "graphics/pokemon/mew/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mew:: @ 8D97F88
-	.incbin "graphics/pokemon/mew/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mew:: @ 8D97FAC
-	.incbin "graphics/pokemon/mew/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mew:: @ 8D982FC
-	.incbin "graphics/pokemon/mew/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mew:: @ 8D98320
-	.incbin "graphics/pokemon/mew/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mew:: @ 8D98720
-	.incbin "graphics/pokemon/mew/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Chikorita:: @ 8D98740
-	.incbin "graphics/pokemon/chikorita/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Chikorita:: @ 8D989A8
-	.incbin "graphics/pokemon/chikorita/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Chikorita:: @ 8D989D0
-	.incbin "graphics/pokemon/chikorita/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Chikorita:: @ 8D98C94
-	.incbin "graphics/pokemon/chikorita/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Chikorita:: @ 8D98CBC
-	.incbin "graphics/pokemon/chikorita/icon.4bpp"
-
-	.align 2
-gMonFootprint_Chikorita:: @ 8D990BC
-	.incbin "graphics/pokemon/chikorita/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Bayleef:: @ 8D990DC
-	.incbin "graphics/pokemon/bayleef/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Bayleef:: @ 8D994B0
-	.incbin "graphics/pokemon/bayleef/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Bayleef:: @ 8D994D8
-	.incbin "graphics/pokemon/bayleef/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Bayleef:: @ 8D99868
-	.incbin "graphics/pokemon/bayleef/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Bayleef:: @ 8D99890
-	.incbin "graphics/pokemon/bayleef/icon.4bpp"
-
-	.align 2
-gMonFootprint_Bayleef:: @ 8D99C90
-	.incbin "graphics/pokemon/bayleef/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Meganium:: @ 8D99CB0
-	.incbin "graphics/pokemon/meganium/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Meganium:: @ 8D9A20C
-	.incbin "graphics/pokemon/meganium/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Meganium:: @ 8D9A234
-	.incbin "graphics/pokemon/meganium/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Meganium:: @ 8D9A584
-	.incbin "graphics/pokemon/meganium/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Meganium:: @ 8D9A5AC
-	.incbin "graphics/pokemon/meganium/icon.4bpp"
-
-	.align 2
-gMonFootprint_Meganium:: @ 8D9A9AC
-	.incbin "graphics/pokemon/meganium/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cyndaquil:: @ 8D9A9CC
-	.incbin "graphics/pokemon/cyndaquil/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cyndaquil:: @ 8D9AC58
-	.incbin "graphics/pokemon/cyndaquil/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cyndaquil:: @ 8D9AC80
-	.incbin "graphics/pokemon/cyndaquil/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cyndaquil:: @ 8D9AFAC
-	.incbin "graphics/pokemon/cyndaquil/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cyndaquil:: @ 8D9AFD4
-	.incbin "graphics/pokemon/cyndaquil/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cyndaquil:: @ 8D9B3D4
-	.incbin "graphics/pokemon/cyndaquil/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Quilava:: @ 8D9B3F4
-	.incbin "graphics/pokemon/quilava/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Quilava:: @ 8D9B710
-	.incbin "graphics/pokemon/quilava/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Quilava:: @ 8D9B738
-	.incbin "graphics/pokemon/quilava/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Quilava:: @ 8D9BAAC
-	.incbin "graphics/pokemon/quilava/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Quilava:: @ 8D9BAD4
-	.incbin "graphics/pokemon/quilava/icon.4bpp"
-
-	.align 2
-gMonFootprint_Quilava:: @ 8D9BED4
-	.incbin "graphics/pokemon/quilava/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Typhlosion:: @ 8D9BEF4
-	.incbin "graphics/pokemon/typhlosion/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Typhlosion:: @ 8D9C31C
-	.incbin "graphics/pokemon/typhlosion/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Typhlosion:: @ 8D9C344
-	.incbin "graphics/pokemon/typhlosion/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Typhlosion:: @ 8D9C748
-	.incbin "graphics/pokemon/typhlosion/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Typhlosion:: @ 8D9C770
-	.incbin "graphics/pokemon/typhlosion/icon.4bpp"
-
-	.align 2
-gMonFootprint_Typhlosion:: @ 8D9CB70
-	.incbin "graphics/pokemon/typhlosion/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Totodile:: @ 8D9CB90
-	.incbin "graphics/pokemon/totodile/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Totodile:: @ 8D9CE34
-	.incbin "graphics/pokemon/totodile/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Totodile:: @ 8D9CE5C
-	.incbin "graphics/pokemon/totodile/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Totodile:: @ 8D9D13C
-	.incbin "graphics/pokemon/totodile/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Totodile:: @ 8D9D164
-	.incbin "graphics/pokemon/totodile/icon.4bpp"
-
-	.align 2
-gMonFootprint_Totodile:: @ 8D9D564
-	.incbin "graphics/pokemon/totodile/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Croconaw:: @ 8D9D584
-	.incbin "graphics/pokemon/croconaw/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Croconaw:: @ 8D9D8EC
-	.incbin "graphics/pokemon/croconaw/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Croconaw:: @ 8D9D914
-	.incbin "graphics/pokemon/croconaw/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Croconaw:: @ 8D9DC64
-	.incbin "graphics/pokemon/croconaw/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Croconaw:: @ 8D9DC8C
-	.incbin "graphics/pokemon/croconaw/icon.4bpp"
-
-	.align 2
-gMonFootprint_Croconaw:: @ 8D9E08C
-	.incbin "graphics/pokemon/croconaw/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Feraligatr:: @ 8D9E0AC
-	.incbin "graphics/pokemon/feraligatr/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Feraligatr:: @ 8D9E618
-	.incbin "graphics/pokemon/feraligatr/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Feraligatr:: @ 8D9E640
-	.incbin "graphics/pokemon/feraligatr/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Feraligatr:: @ 8D9EB0C
-	.incbin "graphics/pokemon/feraligatr/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Feraligatr:: @ 8D9EB34
-	.incbin "graphics/pokemon/feraligatr/icon.4bpp"
-
-	.align 2
-gMonFootprint_Feraligatr:: @ 8D9EF34
-	.incbin "graphics/pokemon/feraligatr/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sentret:: @ 8D9EF54
-	.incbin "graphics/pokemon/sentret/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sentret:: @ 8D9F230
-	.incbin "graphics/pokemon/sentret/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sentret:: @ 8D9F258
-	.incbin "graphics/pokemon/sentret/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sentret:: @ 8D9F4FC
-	.incbin "graphics/pokemon/sentret/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sentret:: @ 8D9F524
-	.incbin "graphics/pokemon/sentret/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sentret:: @ 8D9F924
-	.incbin "graphics/pokemon/sentret/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Furret:: @ 8D9F944
-	.incbin "graphics/pokemon/furret/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Furret:: @ 8D9FC78
-	.incbin "graphics/pokemon/furret/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Furret:: @ 8D9FCA0
-	.incbin "graphics/pokemon/furret/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Furret:: @ 8D9FFC8
-	.incbin "graphics/pokemon/furret/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Furret:: @ 8D9FFF0
-	.incbin "graphics/pokemon/furret/icon.4bpp"
-
-	.align 2
-gMonFootprint_Furret:: @ 8DA03F0
-	.incbin "graphics/pokemon/furret/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hoothoot:: @ 8DA0410
-	.incbin "graphics/pokemon/hoothoot/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hoothoot:: @ 8DA0694
-	.incbin "graphics/pokemon/hoothoot/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hoothoot:: @ 8DA06BC
-	.incbin "graphics/pokemon/hoothoot/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hoothoot:: @ 8DA09C4
-	.incbin "graphics/pokemon/hoothoot/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hoothoot:: @ 8DA09EC
-	.incbin "graphics/pokemon/hoothoot/icon.4bpp"
-
-	.align 2
-gMonFootprint_Hoothoot:: @ 8DA0DEC
-	.incbin "graphics/pokemon/hoothoot/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Noctowl:: @ 8DA0E0C
-	.incbin "graphics/pokemon/noctowl/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Noctowl:: @ 8DA1160
-	.incbin "graphics/pokemon/noctowl/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Noctowl:: @ 8DA1188
-	.incbin "graphics/pokemon/noctowl/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Noctowl:: @ 8DA14E4
-	.incbin "graphics/pokemon/noctowl/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Noctowl:: @ 8DA150C
-	.incbin "graphics/pokemon/noctowl/icon.4bpp"
-
-	.align 2
-gMonFootprint_Noctowl:: @ 8DA190C
-	.incbin "graphics/pokemon/noctowl/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ledyba:: @ 8DA192C
-	.incbin "graphics/pokemon/ledyba/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ledyba:: @ 8DA1C20
-	.incbin "graphics/pokemon/ledyba/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ledyba:: @ 8DA1C48
-	.incbin "graphics/pokemon/ledyba/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ledyba:: @ 8DA1F78
-	.incbin "graphics/pokemon/ledyba/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ledyba:: @ 8DA1FA0
-	.incbin "graphics/pokemon/ledyba/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ledyba:: @ 8DA23A0
-	.incbin "graphics/pokemon/ledyba/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ledian:: @ 8DA23C0
-	.incbin "graphics/pokemon/ledian/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ledian:: @ 8DA2748
-	.incbin "graphics/pokemon/ledian/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ledian:: @ 8DA2770
-	.incbin "graphics/pokemon/ledian/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ledian:: @ 8DA2AC8
-	.incbin "graphics/pokemon/ledian/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ledian:: @ 8DA2AF0
-	.incbin "graphics/pokemon/ledian/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ledian:: @ 8DA2EF0
-	.incbin "graphics/pokemon/ledian/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Spinarak:: @ 8DA2F10
-	.incbin "graphics/pokemon/spinarak/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Spinarak:: @ 8DA3184
-	.incbin "graphics/pokemon/spinarak/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Spinarak:: @ 8DA31AC
-	.incbin "graphics/pokemon/spinarak/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Spinarak:: @ 8DA3410
-	.incbin "graphics/pokemon/spinarak/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Spinarak:: @ 8DA3438
-	.incbin "graphics/pokemon/spinarak/icon.4bpp"
-
-	.align 2
-gMonFootprint_Spinarak:: @ 8DA3838
-	.incbin "graphics/pokemon/spinarak/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ariados:: @ 8DA3858
-	.incbin "graphics/pokemon/ariados/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ariados:: @ 8DA3C18
-	.incbin "graphics/pokemon/ariados/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ariados:: @ 8DA3C40
-	.incbin "graphics/pokemon/ariados/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ariados:: @ 8DA3FB8
-	.incbin "graphics/pokemon/ariados/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ariados:: @ 8DA3FE0
-	.incbin "graphics/pokemon/ariados/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ariados:: @ 8DA43E0
-	.incbin "graphics/pokemon/ariados/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Crobat:: @ 8DA4400
-	.incbin "graphics/pokemon/crobat/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Crobat:: @ 8DA47B0
-	.incbin "graphics/pokemon/crobat/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Crobat:: @ 8DA47D8
-	.incbin "graphics/pokemon/crobat/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Crobat:: @ 8DA4AE0
-	.incbin "graphics/pokemon/crobat/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Crobat:: @ 8DA4B08
-	.incbin "graphics/pokemon/crobat/icon.4bpp"
-
-	.align 2
-gMonFootprint_Crobat:: @ 8DA4F08
-	.incbin "graphics/pokemon/crobat/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Chinchou:: @ 8DA4F28
-	.incbin "graphics/pokemon/chinchou/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Chinchou:: @ 8DA5200
-	.incbin "graphics/pokemon/chinchou/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Chinchou:: @ 8DA5228
-	.incbin "graphics/pokemon/chinchou/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Chinchou:: @ 8DA5520
-	.incbin "graphics/pokemon/chinchou/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Chinchou:: @ 8DA5548
-	.incbin "graphics/pokemon/chinchou/icon.4bpp"
-
-	.align 2
-gMonFootprint_Chinchou:: @ 8DA5948
-	.incbin "graphics/pokemon/chinchou/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lanturn:: @ 8DA5968
-	.incbin "graphics/pokemon/lanturn/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lanturn:: @ 8DA5CD8
-	.incbin "graphics/pokemon/lanturn/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lanturn:: @ 8DA5D00
-	.incbin "graphics/pokemon/lanturn/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lanturn:: @ 8DA6000
-	.incbin "graphics/pokemon/lanturn/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lanturn:: @ 8DA6028
-	.incbin "graphics/pokemon/lanturn/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lanturn:: @ 8DA6428
-	.incbin "graphics/pokemon/lanturn/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pichu:: @ 8DA6448
-	.incbin "graphics/pokemon/pichu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pichu:: @ 8DA6664
-	.incbin "graphics/pokemon/pichu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pichu:: @ 8DA668C
-	.incbin "graphics/pokemon/pichu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pichu:: @ 8DA68E8
-	.incbin "graphics/pokemon/pichu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pichu:: @ 8DA6910
-	.incbin "graphics/pokemon/pichu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pichu:: @ 8DA6D10
-	.incbin "graphics/pokemon/pichu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cleffa:: @ 8DA6D30
-	.incbin "graphics/pokemon/cleffa/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cleffa:: @ 8DA6F10
-	.incbin "graphics/pokemon/cleffa/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cleffa:: @ 8DA6F38
-	.incbin "graphics/pokemon/cleffa/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cleffa:: @ 8DA7174
-	.incbin "graphics/pokemon/cleffa/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cleffa:: @ 8DA719C
-	.incbin "graphics/pokemon/cleffa/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cleffa:: @ 8DA759C
-	.incbin "graphics/pokemon/cleffa/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Igglybuff:: @ 8DA75BC
-	.incbin "graphics/pokemon/igglybuff/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Igglybuff:: @ 8DA77A4
-	.incbin "graphics/pokemon/igglybuff/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Igglybuff:: @ 8DA77CC
-	.incbin "graphics/pokemon/igglybuff/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Igglybuff:: @ 8DA7A08
-	.incbin "graphics/pokemon/igglybuff/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Igglybuff:: @ 8DA7A30
-	.incbin "graphics/pokemon/igglybuff/icon.4bpp"
-
-	.align 2
-gMonFootprint_Igglybuff:: @ 8DA7E30
-	.incbin "graphics/pokemon/igglybuff/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Togepi:: @ 8DA7E50
-	.incbin "graphics/pokemon/togepi/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Togepi:: @ 8DA8024
-	.incbin "graphics/pokemon/togepi/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Togepi:: @ 8DA804C
-	.incbin "graphics/pokemon/togepi/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Togepi:: @ 8DA82C0
-	.incbin "graphics/pokemon/togepi/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Togepi:: @ 8DA82E8
-	.incbin "graphics/pokemon/togepi/icon.4bpp"
-
-	.align 2
-gMonFootprint_Togepi:: @ 8DA86E8
-	.incbin "graphics/pokemon/togepi/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Togetic:: @ 8DA8708
-	.incbin "graphics/pokemon/togetic/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Togetic:: @ 8DA897C
-	.incbin "graphics/pokemon/togetic/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Togetic:: @ 8DA89A4
-	.incbin "graphics/pokemon/togetic/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Togetic:: @ 8DA8CD0
-	.incbin "graphics/pokemon/togetic/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Togetic:: @ 8DA8CF8
-	.incbin "graphics/pokemon/togetic/icon.4bpp"
-
-	.align 2
-gMonFootprint_Togetic:: @ 8DA90F8
-	.incbin "graphics/pokemon/togetic/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Natu:: @ 8DA9118
-	.incbin "graphics/pokemon/natu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Natu:: @ 8DA92E4
-	.incbin "graphics/pokemon/natu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Natu:: @ 8DA930C
-	.incbin "graphics/pokemon/natu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Natu:: @ 8DA9520
-	.incbin "graphics/pokemon/natu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Natu:: @ 8DA9548
-	.incbin "graphics/pokemon/natu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Natu:: @ 8DA9948
-	.incbin "graphics/pokemon/natu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Xatu:: @ 8DA9968
-	.incbin "graphics/pokemon/xatu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Xatu:: @ 8DA9C44
-	.incbin "graphics/pokemon/xatu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Xatu:: @ 8DA9C6C
-	.incbin "graphics/pokemon/xatu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Xatu:: @ 8DA9FE4
-	.incbin "graphics/pokemon/xatu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Xatu:: @ 8DAA00C
-	.incbin "graphics/pokemon/xatu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Xatu:: @ 8DAA40C
-	.incbin "graphics/pokemon/xatu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mareep:: @ 8DAA42C
-	.incbin "graphics/pokemon/mareep/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mareep:: @ 8DAA6E0
-	.incbin "graphics/pokemon/mareep/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mareep:: @ 8DAA708
-	.incbin "graphics/pokemon/mareep/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mareep:: @ 8DAA9FC
-	.incbin "graphics/pokemon/mareep/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mareep:: @ 8DAAA24
-	.incbin "graphics/pokemon/mareep/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mareep:: @ 8DAAE24
-	.incbin "graphics/pokemon/mareep/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Flaaffy:: @ 8DAAE44
-	.incbin "graphics/pokemon/flaaffy/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Flaaffy:: @ 8DAB144
-	.incbin "graphics/pokemon/flaaffy/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Flaaffy:: @ 8DAB16C
-	.incbin "graphics/pokemon/flaaffy/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Flaaffy:: @ 8DAB488
-	.incbin "graphics/pokemon/flaaffy/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Flaaffy:: @ 8DAB4B0
-	.incbin "graphics/pokemon/flaaffy/icon.4bpp"
-
-	.align 2
-gMonFootprint_Flaaffy:: @ 8DAB8B0
-	.incbin "graphics/pokemon/flaaffy/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ampharos:: @ 8DAB8D0
-	.incbin "graphics/pokemon/ampharos/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ampharos:: @ 8DABC2C
-	.incbin "graphics/pokemon/ampharos/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ampharos:: @ 8DABC54
-	.incbin "graphics/pokemon/ampharos/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ampharos:: @ 8DABFCC
-	.incbin "graphics/pokemon/ampharos/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ampharos:: @ 8DABFF4
-	.incbin "graphics/pokemon/ampharos/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ampharos:: @ 8DAC3F4
-	.incbin "graphics/pokemon/ampharos/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Bellossom:: @ 8DAC414
-	.incbin "graphics/pokemon/bellossom/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Bellossom:: @ 8DAC684
-	.incbin "graphics/pokemon/bellossom/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Bellossom:: @ 8DAC6AC
-	.incbin "graphics/pokemon/bellossom/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Bellossom:: @ 8DAC9D0
-	.incbin "graphics/pokemon/bellossom/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Bellossom:: @ 8DAC9F8
-	.incbin "graphics/pokemon/bellossom/icon.4bpp"
-
-	.align 2
-gMonFootprint_Bellossom:: @ 8DACDF8
-	.incbin "graphics/pokemon/bellossom/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Marill:: @ 8DACE18
-	.incbin "graphics/pokemon/marill/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Marill:: @ 8DAD0DC
-	.incbin "graphics/pokemon/marill/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Marill:: @ 8DAD104
-	.incbin "graphics/pokemon/marill/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Marill:: @ 8DAD3B0
-	.incbin "graphics/pokemon/marill/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Marill:: @ 8DAD3D8
-	.incbin "graphics/pokemon/marill/icon.4bpp"
-
-	.align 2
-gMonFootprint_Marill:: @ 8DAD7D8
-	.incbin "graphics/pokemon/marill/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Azumarill:: @ 8DAD7F8
-	.incbin "graphics/pokemon/azumarill/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Azumarill:: @ 8DADAF8
-	.incbin "graphics/pokemon/azumarill/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Azumarill:: @ 8DADB20
-	.incbin "graphics/pokemon/azumarill/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Azumarill:: @ 8DADDDC
-	.incbin "graphics/pokemon/azumarill/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Azumarill:: @ 8DADE04
-	.incbin "graphics/pokemon/azumarill/icon.4bpp"
-
-	.align 2
-gMonFootprint_Azumarill:: @ 8DAE204
-	.incbin "graphics/pokemon/azumarill/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sudowoodo:: @ 8DAE224
-	.incbin "graphics/pokemon/sudowoodo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sudowoodo:: @ 8DAE53C
-	.incbin "graphics/pokemon/sudowoodo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sudowoodo:: @ 8DAE564
-	.incbin "graphics/pokemon/sudowoodo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sudowoodo:: @ 8DAE8C0
-	.incbin "graphics/pokemon/sudowoodo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sudowoodo:: @ 8DAE8E8
-	.incbin "graphics/pokemon/sudowoodo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sudowoodo:: @ 8DAECE8
-	.incbin "graphics/pokemon/sudowoodo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Politoed:: @ 8DAED08
-	.incbin "graphics/pokemon/politoed/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Politoed:: @ 8DAF044
-	.incbin "graphics/pokemon/politoed/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Politoed:: @ 8DAF06C
-	.incbin "graphics/pokemon/politoed/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Politoed:: @ 8DAF328
-	.incbin "graphics/pokemon/politoed/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Politoed:: @ 8DAF350
-	.incbin "graphics/pokemon/politoed/icon.4bpp"
-
-	.align 2
-gMonFootprint_Politoed:: @ 8DAF750
-	.incbin "graphics/pokemon/politoed/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hoppip:: @ 8DAF770
-	.incbin "graphics/pokemon/hoppip/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hoppip:: @ 8DAFA24
-	.incbin "graphics/pokemon/hoppip/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hoppip:: @ 8DAFA4C
-	.incbin "graphics/pokemon/hoppip/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hoppip:: @ 8DAFD2C
-	.incbin "graphics/pokemon/hoppip/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hoppip:: @ 8DAFD54
-	.incbin "graphics/pokemon/hoppip/icon.4bpp"
-
-	.align 2
-gMonFootprint_Hoppip:: @ 8DB0154
-	.incbin "graphics/pokemon/hoppip/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Skiploom:: @ 8DB0174
-	.incbin "graphics/pokemon/skiploom/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Skiploom:: @ 8DB03FC
-	.incbin "graphics/pokemon/skiploom/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Skiploom:: @ 8DB0424
-	.incbin "graphics/pokemon/skiploom/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Skiploom:: @ 8DB0704
-	.incbin "graphics/pokemon/skiploom/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Skiploom:: @ 8DB072C
-	.incbin "graphics/pokemon/skiploom/icon.4bpp"
-
-	.align 2
-gMonFootprint_Skiploom:: @ 8DB0B2C
-	.incbin "graphics/pokemon/skiploom/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Jumpluff:: @ 8DB0B4C
-	.incbin "graphics/pokemon/jumpluff/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Jumpluff:: @ 8DB0EB8
-	.incbin "graphics/pokemon/jumpluff/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Jumpluff:: @ 8DB0EE0
-	.incbin "graphics/pokemon/jumpluff/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Jumpluff:: @ 8DB12D8
-	.incbin "graphics/pokemon/jumpluff/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Jumpluff:: @ 8DB1300
-	.incbin "graphics/pokemon/jumpluff/icon.4bpp"
-
-	.align 2
-gMonFootprint_Jumpluff:: @ 8DB1700
-	.incbin "graphics/pokemon/jumpluff/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Aipom:: @ 8DB1720
-	.incbin "graphics/pokemon/aipom/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Aipom:: @ 8DB1A1C
-	.incbin "graphics/pokemon/aipom/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Aipom:: @ 8DB1A44
-	.incbin "graphics/pokemon/aipom/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Aipom:: @ 8DB1D38
-	.incbin "graphics/pokemon/aipom/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Aipom:: @ 8DB1D60
-	.incbin "graphics/pokemon/aipom/icon.4bpp"
-
-	.align 2
-gMonFootprint_Aipom:: @ 8DB2160
-	.incbin "graphics/pokemon/aipom/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sunkern:: @ 8DB2180
-	.incbin "graphics/pokemon/sunkern/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sunkern:: @ 8DB23B8
-	.incbin "graphics/pokemon/sunkern/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sunkern:: @ 8DB23E0
-	.incbin "graphics/pokemon/sunkern/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sunkern:: @ 8DB26A4
-	.incbin "graphics/pokemon/sunkern/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sunkern:: @ 8DB26CC
-	.incbin "graphics/pokemon/sunkern/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sunkern:: @ 8DB2ACC
-	.incbin "graphics/pokemon/sunkern/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sunflora:: @ 8DB2AEC
-	.incbin "graphics/pokemon/sunflora/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sunflora:: @ 8DB2E44
-	.incbin "graphics/pokemon/sunflora/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sunflora:: @ 8DB2E6C
-	.incbin "graphics/pokemon/sunflora/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sunflora:: @ 8DB320C
-	.incbin "graphics/pokemon/sunflora/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sunflora:: @ 8DB3234
-	.incbin "graphics/pokemon/sunflora/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sunflora:: @ 8DB3634
-	.incbin "graphics/pokemon/sunflora/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Yanma:: @ 8DB3654
-	.incbin "graphics/pokemon/yanma/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Yanma:: @ 8DB39D8
-	.incbin "graphics/pokemon/yanma/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Yanma:: @ 8DB3A00
-	.incbin "graphics/pokemon/yanma/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Yanma:: @ 8DB3DB4
-	.incbin "graphics/pokemon/yanma/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Yanma:: @ 8DB3DDC
-	.incbin "graphics/pokemon/yanma/icon.4bpp"
-
-	.align 2
-gMonFootprint_Yanma:: @ 8DB41DC
-	.incbin "graphics/pokemon/yanma/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wooper:: @ 8DB41FC
-	.incbin "graphics/pokemon/wooper/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wooper:: @ 8DB443C
-	.incbin "graphics/pokemon/wooper/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wooper:: @ 8DB4464
-	.incbin "graphics/pokemon/wooper/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wooper:: @ 8DB46F0
-	.incbin "graphics/pokemon/wooper/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wooper:: @ 8DB4718
-	.incbin "graphics/pokemon/wooper/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wooper:: @ 8DB4B18
-	.incbin "graphics/pokemon/wooper/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Quagsire:: @ 8DB4B38
-	.incbin "graphics/pokemon/quagsire/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Quagsire:: @ 8DB4EAC
-	.incbin "graphics/pokemon/quagsire/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Quagsire:: @ 8DB4ED4
-	.incbin "graphics/pokemon/quagsire/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Quagsire:: @ 8DB51D0
-	.incbin "graphics/pokemon/quagsire/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Quagsire:: @ 8DB51F8
-	.incbin "graphics/pokemon/quagsire/icon.4bpp"
-
-	.align 2
-gMonFootprint_Quagsire:: @ 8DB55F8
-	.incbin "graphics/pokemon/quagsire/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Espeon:: @ 8DB5618
-	.incbin "graphics/pokemon/espeon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Espeon:: @ 8DB5958
-	.incbin "graphics/pokemon/espeon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Espeon:: @ 8DB597C
-	.incbin "graphics/pokemon/espeon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Espeon:: @ 8DB5C58
-	.incbin "graphics/pokemon/espeon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Espeon:: @ 8DB5C7C
-	.incbin "graphics/pokemon/espeon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Espeon:: @ 8DB607C
-	.incbin "graphics/pokemon/espeon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Umbreon:: @ 8DB609C
-	.incbin "graphics/pokemon/umbreon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Umbreon:: @ 8DB63B0
-	.incbin "graphics/pokemon/umbreon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Umbreon:: @ 8DB63D8
-	.incbin "graphics/pokemon/umbreon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Umbreon:: @ 8DB66EC
-	.incbin "graphics/pokemon/umbreon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Umbreon:: @ 8DB6714
-	.incbin "graphics/pokemon/umbreon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Umbreon:: @ 8DB6B14
-	.incbin "graphics/pokemon/umbreon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Murkrow:: @ 8DB6B34
-	.incbin "graphics/pokemon/murkrow/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Murkrow:: @ 8DB6E14
-	.incbin "graphics/pokemon/murkrow/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Murkrow:: @ 8DB6E3C
-	.incbin "graphics/pokemon/murkrow/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Murkrow:: @ 8DB7154
-	.incbin "graphics/pokemon/murkrow/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Murkrow:: @ 8DB717C
-	.incbin "graphics/pokemon/murkrow/icon.4bpp"
-
-	.align 2
-gMonFootprint_Murkrow:: @ 8DB757C
-	.incbin "graphics/pokemon/murkrow/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Slowking:: @ 8DB759C
-	.incbin "graphics/pokemon/slowking/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Slowking:: @ 8DB7950
-	.incbin "graphics/pokemon/slowking/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Slowking:: @ 8DB7978
-	.incbin "graphics/pokemon/slowking/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Slowking:: @ 8DB7D04
-	.incbin "graphics/pokemon/slowking/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Slowking:: @ 8DB7D2C
-	.incbin "graphics/pokemon/slowking/icon.4bpp"
-
-	.align 2
-gMonFootprint_Slowking:: @ 8DB812C
-	.incbin "graphics/pokemon/slowking/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Misdreavus:: @ 8DB814C
-	.incbin "graphics/pokemon/misdreavus/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Misdreavus:: @ 8DB840C
-	.incbin "graphics/pokemon/misdreavus/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Misdreavus:: @ 8DB8434
-	.incbin "graphics/pokemon/misdreavus/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Misdreavus:: @ 8DB8758
-	.incbin "graphics/pokemon/misdreavus/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Misdreavus:: @ 8DB8780
-	.incbin "graphics/pokemon/misdreavus/icon.4bpp"
-
-	.align 2
-gMonFootprint_Misdreavus:: @ 8DB8B80
-	.incbin "graphics/pokemon/misdreavus/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_UnownA:: @ 8DB8BA0
-	.incbin "graphics/pokemon/unown/a/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Unown:: @ 8DB8D74
-	.incbin "graphics/pokemon/unown/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_UnownA:: @ 8DB8D94
-	.incbin "graphics/pokemon/unown/a/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Unown:: @ 8DB8F94
-	.incbin "graphics/pokemon/unown/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_UnownA:: @ 8DB8FB4
-	.incbin "graphics/pokemon/unown/a/icon.4bpp"
-
-	.align 2
-gMonFootprint_Unown:: @ 8DB93B4
-	.incbin "graphics/pokemon/unown/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wobbuffet:: @ 8DB93D4
-	.incbin "graphics/pokemon/wobbuffet/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wobbuffet:: @ 8DB9724
-	.incbin "graphics/pokemon/wobbuffet/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wobbuffet:: @ 8DB974C
-	.incbin "graphics/pokemon/wobbuffet/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wobbuffet:: @ 8DB9990
-	.incbin "graphics/pokemon/wobbuffet/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wobbuffet:: @ 8DB99B8
-	.incbin "graphics/pokemon/wobbuffet/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wobbuffet:: @ 8DB9DB8
-	.incbin "graphics/pokemon/wobbuffet/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Girafarig:: @ 8DB9DD8
-	.incbin "graphics/pokemon/girafarig/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Girafarig:: @ 8DBA1DC
-	.incbin "graphics/pokemon/girafarig/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Girafarig:: @ 8DBA204
-	.incbin "graphics/pokemon/girafarig/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Girafarig:: @ 8DBA5B0
-	.incbin "graphics/pokemon/girafarig/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Girafarig:: @ 8DBA5D8
-	.incbin "graphics/pokemon/girafarig/icon.4bpp"
-
-	.align 2
-gMonFootprint_Girafarig:: @ 8DBA9D8
-	.incbin "graphics/pokemon/girafarig/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pineco:: @ 8DBA9F8
-	.incbin "graphics/pokemon/pineco/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pineco:: @ 8DBAD38
-	.incbin "graphics/pokemon/pineco/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pineco:: @ 8DBAD5C
-	.incbin "graphics/pokemon/pineco/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pineco:: @ 8DBB034
-	.incbin "graphics/pokemon/pineco/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pineco:: @ 8DBB058
-	.incbin "graphics/pokemon/pineco/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pineco:: @ 8DBB458
-	.incbin "graphics/pokemon/pineco/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Forretress:: @ 8DBB478
-	.incbin "graphics/pokemon/forretress/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Forretress:: @ 8DBB894
-	.incbin "graphics/pokemon/forretress/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Forretress:: @ 8DBB8BC
-	.incbin "graphics/pokemon/forretress/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Forretress:: @ 8DBBB7C
-	.incbin "graphics/pokemon/forretress/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Forretress:: @ 8DBBBA4
-	.incbin "graphics/pokemon/forretress/icon.4bpp"
-
-	.align 2
-gMonFootprint_Forretress:: @ 8DBBFA4
-	.incbin "graphics/pokemon/forretress/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dunsparce:: @ 8DBBFC4
-	.incbin "graphics/pokemon/dunsparce/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dunsparce:: @ 8DBC2D4
-	.incbin "graphics/pokemon/dunsparce/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dunsparce:: @ 8DBC2FC
-	.incbin "graphics/pokemon/dunsparce/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dunsparce:: @ 8DBC5F8
-	.incbin "graphics/pokemon/dunsparce/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dunsparce:: @ 8DBC620
-	.incbin "graphics/pokemon/dunsparce/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dunsparce:: @ 8DBCA20
-	.incbin "graphics/pokemon/dunsparce/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gligar:: @ 8DBCA40
-	.incbin "graphics/pokemon/gligar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gligar:: @ 8DBCE68
-	.incbin "graphics/pokemon/gligar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gligar:: @ 8DBCE90
-	.incbin "graphics/pokemon/gligar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gligar:: @ 8DBD268
-	.incbin "graphics/pokemon/gligar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gligar:: @ 8DBD290
-	.incbin "graphics/pokemon/gligar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gligar:: @ 8DBD690
-	.incbin "graphics/pokemon/gligar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Steelix:: @ 8DBD6B0
-	.incbin "graphics/pokemon/steelix/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Steelix:: @ 8DBDB78
-	.incbin "graphics/pokemon/steelix/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Steelix:: @ 8DBDB9C
-	.incbin "graphics/pokemon/steelix/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Steelix:: @ 8DBDFA8
-	.incbin "graphics/pokemon/steelix/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Steelix:: @ 8DBDFCC
-	.incbin "graphics/pokemon/steelix/icon.4bpp"
-
-	.align 2
-gMonFootprint_Steelix:: @ 8DBE3CC
-	.incbin "graphics/pokemon/steelix/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Snubbull:: @ 8DBE3EC
-	.incbin "graphics/pokemon/snubbull/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Snubbull:: @ 8DBE6C0
-	.incbin "graphics/pokemon/snubbull/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Snubbull:: @ 8DBE6E8
-	.incbin "graphics/pokemon/snubbull/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Snubbull:: @ 8DBEA10
-	.incbin "graphics/pokemon/snubbull/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Snubbull:: @ 8DBEA38
-	.incbin "graphics/pokemon/snubbull/icon.4bpp"
-
-	.align 2
-gMonFootprint_Snubbull:: @ 8DBEE38
-	.incbin "graphics/pokemon/snubbull/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Granbull:: @ 8DBEE58
-	.incbin "graphics/pokemon/granbull/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Granbull:: @ 8DBF1E4
-	.incbin "graphics/pokemon/granbull/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Granbull:: @ 8DBF20C
-	.incbin "graphics/pokemon/granbull/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Granbull:: @ 8DBF530
-	.incbin "graphics/pokemon/granbull/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Granbull:: @ 8DBF558
-	.incbin "graphics/pokemon/granbull/icon.4bpp"
-
-	.align 2
-gMonFootprint_Granbull:: @ 8DBF958
-	.incbin "graphics/pokemon/granbull/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Qwilfish:: @ 8DBF978
-	.incbin "graphics/pokemon/qwilfish/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Qwilfish:: @ 8DBFC38
-	.incbin "graphics/pokemon/qwilfish/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Qwilfish:: @ 8DBFC60
-	.incbin "graphics/pokemon/qwilfish/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Qwilfish:: @ 8DBFF40
-	.incbin "graphics/pokemon/qwilfish/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Qwilfish:: @ 8DBFF68
-	.incbin "graphics/pokemon/qwilfish/icon.4bpp"
-
-	.align 2
-gMonFootprint_Qwilfish:: @ 8DC0368
-	.incbin "graphics/pokemon/qwilfish/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Scizor:: @ 8DC0388
-	.incbin "graphics/pokemon/scizor/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Scizor:: @ 8DC0870
-	.incbin "graphics/pokemon/scizor/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Scizor:: @ 8DC0898
-	.incbin "graphics/pokemon/scizor/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Scizor:: @ 8DC0C18
-	.incbin "graphics/pokemon/scizor/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Scizor:: @ 8DC0C40
-	.incbin "graphics/pokemon/scizor/icon.4bpp"
-
-	.align 2
-gMonFootprint_Scizor:: @ 8DC1040
-	.incbin "graphics/pokemon/scizor/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shuckle:: @ 8DC1060
-	.incbin "graphics/pokemon/shuckle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shuckle:: @ 8DC1328
-	.incbin "graphics/pokemon/shuckle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shuckle:: @ 8DC1350
-	.incbin "graphics/pokemon/shuckle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shuckle:: @ 8DC15A8
-	.incbin "graphics/pokemon/shuckle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shuckle:: @ 8DC15D0
-	.incbin "graphics/pokemon/shuckle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shuckle:: @ 8DC19D0
-	.incbin "graphics/pokemon/shuckle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Heracross:: @ 8DC19F0
-	.incbin "graphics/pokemon/heracross/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Heracross:: @ 8DC1DE0
-	.incbin "graphics/pokemon/heracross/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Heracross:: @ 8DC1E08
-	.incbin "graphics/pokemon/heracross/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Heracross:: @ 8DC2178
-	.incbin "graphics/pokemon/heracross/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Heracross:: @ 8DC21A0
-	.incbin "graphics/pokemon/heracross/icon.4bpp"
-
-gUnknown_heracross_icon:: @ 8DC25A0
-	.incbin "graphics/pokemon/heracross/unk_icon.4bpp"
-
-	.align 2
-gMonFootprint_Heracross:: @ 8DC29A0
-	.incbin "graphics/pokemon/heracross/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sneasel:: @ 8DC29C0
-	.incbin "graphics/pokemon/sneasel/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sneasel:: @ 8DC2D04
-	.incbin "graphics/pokemon/sneasel/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sneasel:: @ 8DC2D2C
-	.incbin "graphics/pokemon/sneasel/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sneasel:: @ 8DC3050
-	.incbin "graphics/pokemon/sneasel/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sneasel:: @ 8DC3078
-	.incbin "graphics/pokemon/sneasel/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sneasel:: @ 8DC3478
-	.incbin "graphics/pokemon/sneasel/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Teddiursa:: @ 8DC3498
-	.incbin "graphics/pokemon/teddiursa/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Teddiursa:: @ 8DC3740
-	.incbin "graphics/pokemon/teddiursa/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Teddiursa:: @ 8DC3768
-	.incbin "graphics/pokemon/teddiursa/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Teddiursa:: @ 8DC39E0
-	.incbin "graphics/pokemon/teddiursa/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Teddiursa:: @ 8DC3A08
-	.incbin "graphics/pokemon/teddiursa/icon.4bpp"
-
-	.align 2
-gMonFootprint_Teddiursa:: @ 8DC3E08
-	.incbin "graphics/pokemon/teddiursa/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ursaring:: @ 8DC3E28
-	.incbin "graphics/pokemon/ursaring/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ursaring:: @ 8DC4260
-	.incbin "graphics/pokemon/ursaring/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ursaring:: @ 8DC4288
-	.incbin "graphics/pokemon/ursaring/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ursaring:: @ 8DC4610
-	.incbin "graphics/pokemon/ursaring/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ursaring:: @ 8DC4638
-	.incbin "graphics/pokemon/ursaring/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ursaring:: @ 8DC4A38
-	.incbin "graphics/pokemon/ursaring/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Slugma:: @ 8DC4A58
-	.incbin "graphics/pokemon/slugma/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Slugma:: @ 8DC4CCC
-	.incbin "graphics/pokemon/slugma/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Slugma:: @ 8DC4CF0
-	.incbin "graphics/pokemon/slugma/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Slugma:: @ 8DC4FD8
-	.incbin "graphics/pokemon/slugma/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Slugma:: @ 8DC4FFC
-	.incbin "graphics/pokemon/slugma/icon.4bpp"
-
-	.align 2
-gMonFootprint_Slugma:: @ 8DC53FC
-	.incbin "graphics/pokemon/slugma/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Magcargo:: @ 8DC541C
-	.incbin "graphics/pokemon/magcargo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Magcargo:: @ 8DC5764
-	.incbin "graphics/pokemon/magcargo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Magcargo:: @ 8DC578C
-	.incbin "graphics/pokemon/magcargo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Magcargo:: @ 8DC5BA4
-	.incbin "graphics/pokemon/magcargo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Magcargo:: @ 8DC5BCC
-	.incbin "graphics/pokemon/magcargo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Magcargo:: @ 8DC5FCC
-	.incbin "graphics/pokemon/magcargo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Swinub:: @ 8DC5FEC
-	.incbin "graphics/pokemon/swinub/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Swinub:: @ 8DC61E8
-	.incbin "graphics/pokemon/swinub/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Swinub:: @ 8DC6210
-	.incbin "graphics/pokemon/swinub/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Swinub:: @ 8DC644C
-	.incbin "graphics/pokemon/swinub/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Swinub:: @ 8DC6474
-	.incbin "graphics/pokemon/swinub/icon.4bpp"
-
-	.align 2
-gMonFootprint_Swinub:: @ 8DC6874
-	.incbin "graphics/pokemon/swinub/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Piloswine:: @ 8DC6894
-	.incbin "graphics/pokemon/piloswine/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Piloswine:: @ 8DC6BBC
-	.incbin "graphics/pokemon/piloswine/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Piloswine:: @ 8DC6BE4
-	.incbin "graphics/pokemon/piloswine/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Piloswine:: @ 8DC6E30
-	.incbin "graphics/pokemon/piloswine/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Piloswine:: @ 8DC6E58
-	.incbin "graphics/pokemon/piloswine/icon.4bpp"
-
-	.align 2
-gMonFootprint_Piloswine:: @ 8DC7258
-	.incbin "graphics/pokemon/piloswine/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Corsola:: @ 8DC7278
-	.incbin "graphics/pokemon/corsola/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Corsola:: @ 8DC7560
-	.incbin "graphics/pokemon/corsola/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Corsola:: @ 8DC7588
-	.incbin "graphics/pokemon/corsola/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Corsola:: @ 8DC7848
-	.incbin "graphics/pokemon/corsola/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Corsola:: @ 8DC7870
-	.incbin "graphics/pokemon/corsola/icon.4bpp"
-
-	.align 2
-gMonFootprint_Corsola:: @ 8DC7C70
-	.incbin "graphics/pokemon/corsola/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Remoraid:: @ 8DC7C90
-	.incbin "graphics/pokemon/remoraid/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Remoraid:: @ 8DC7EF8
-	.incbin "graphics/pokemon/remoraid/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Remoraid:: @ 8DC7F20
-	.incbin "graphics/pokemon/remoraid/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Remoraid:: @ 8DC8234
-	.incbin "graphics/pokemon/remoraid/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Remoraid:: @ 8DC825C
-	.incbin "graphics/pokemon/remoraid/icon.4bpp"
-
-	.align 2
-gMonFootprint_Remoraid:: @ 8DC865C
-	.incbin "graphics/pokemon/remoraid/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Octillery:: @ 8DC867C
-	.incbin "graphics/pokemon/octillery/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Octillery:: @ 8DC89B0
-	.incbin "graphics/pokemon/octillery/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Octillery:: @ 8DC89D8
-	.incbin "graphics/pokemon/octillery/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Octillery:: @ 8DC8C90
-	.incbin "graphics/pokemon/octillery/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Octillery:: @ 8DC8CB8
-	.incbin "graphics/pokemon/octillery/icon.4bpp"
-
-	.align 2
-gMonFootprint_Octillery:: @ 8DC90B8
-	.incbin "graphics/pokemon/octillery/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Delibird:: @ 8DC90D8
-	.incbin "graphics/pokemon/delibird/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Delibird:: @ 8DC9448
-	.incbin "graphics/pokemon/delibird/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Delibird:: @ 8DC9470
-	.incbin "graphics/pokemon/delibird/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Delibird:: @ 8DC9830
-	.incbin "graphics/pokemon/delibird/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Delibird:: @ 8DC9858
-	.incbin "graphics/pokemon/delibird/icon.4bpp"
-
-	.align 2
-gMonFootprint_Delibird:: @ 8DC9C58
-	.incbin "graphics/pokemon/delibird/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mantine:: @ 8DC9C78
-	.incbin "graphics/pokemon/mantine/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mantine:: @ 8DCA114
-	.incbin "graphics/pokemon/mantine/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mantine:: @ 8DCA13C
-	.incbin "graphics/pokemon/mantine/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mantine:: @ 8DCA3DC
-	.incbin "graphics/pokemon/mantine/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mantine:: @ 8DCA404
-	.incbin "graphics/pokemon/mantine/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mantine:: @ 8DCA804
-	.incbin "graphics/pokemon/mantine/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Skarmory:: @ 8DCA824
-	.incbin "graphics/pokemon/skarmory/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Skarmory:: @ 8DCAD04
-	.incbin "graphics/pokemon/skarmory/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Skarmory:: @ 8DCAD2C
-	.incbin "graphics/pokemon/skarmory/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Skarmory:: @ 8DCB030
-	.incbin "graphics/pokemon/skarmory/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Skarmory:: @ 8DCB058
-	.incbin "graphics/pokemon/skarmory/icon.4bpp"
-
-	.align 2
-gMonFootprint_Skarmory:: @ 8DCB458
-	.incbin "graphics/pokemon/skarmory/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Houndour:: @ 8DCB478
-	.incbin "graphics/pokemon/houndour/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Houndour:: @ 8DCB730
-	.incbin "graphics/pokemon/houndour/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Houndour:: @ 8DCB758
-	.incbin "graphics/pokemon/houndour/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Houndour:: @ 8DCB9D8
-	.incbin "graphics/pokemon/houndour/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Houndour:: @ 8DCBA00
-	.incbin "graphics/pokemon/houndour/icon.4bpp"
-
-	.align 2
-gMonFootprint_Houndour:: @ 8DCBE00
-	.incbin "graphics/pokemon/houndour/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Houndoom:: @ 8DCBE20
-	.incbin "graphics/pokemon/houndoom/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Houndoom:: @ 8DCC220
-	.incbin "graphics/pokemon/houndoom/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Houndoom:: @ 8DCC248
-	.incbin "graphics/pokemon/houndoom/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Houndoom:: @ 8DCC56C
-	.incbin "graphics/pokemon/houndoom/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Houndoom:: @ 8DCC594
-	.incbin "graphics/pokemon/houndoom/icon.4bpp"
-
-	.align 2
-gMonFootprint_Houndoom:: @ 8DCC994
-	.incbin "graphics/pokemon/houndoom/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kingdra:: @ 8DCC9B4
-	.incbin "graphics/pokemon/kingdra/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kingdra:: @ 8DCCDD4
-	.incbin "graphics/pokemon/kingdra/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kingdra:: @ 8DCCDFC
-	.incbin "graphics/pokemon/kingdra/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kingdra:: @ 8DCD1B0
-	.incbin "graphics/pokemon/kingdra/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kingdra:: @ 8DCD1D8
-	.incbin "graphics/pokemon/kingdra/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kingdra:: @ 8DCD5D8
-	.incbin "graphics/pokemon/kingdra/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Phanpy:: @ 8DCD5F8
-	.incbin "graphics/pokemon/phanpy/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Phanpy:: @ 8DCD854
-	.incbin "graphics/pokemon/phanpy/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Phanpy:: @ 8DCD87C
-	.incbin "graphics/pokemon/phanpy/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Phanpy:: @ 8DCDB40
-	.incbin "graphics/pokemon/phanpy/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Phanpy:: @ 8DCDB68
-	.incbin "graphics/pokemon/phanpy/icon.4bpp"
-
-	.align 2
-gMonFootprint_Phanpy:: @ 8DCDF68
-	.incbin "graphics/pokemon/phanpy/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Donphan:: @ 8DCDF88
-	.incbin "graphics/pokemon/donphan/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Donphan:: @ 8DCE3FC
-	.incbin "graphics/pokemon/donphan/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Donphan:: @ 8DCE424
-	.incbin "graphics/pokemon/donphan/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Donphan:: @ 8DCE720
-	.incbin "graphics/pokemon/donphan/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Donphan:: @ 8DCE748
-	.incbin "graphics/pokemon/donphan/icon.4bpp"
-
-	.align 2
-gMonFootprint_Donphan:: @ 8DCEB48
-	.incbin "graphics/pokemon/donphan/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Porygon2:: @ 8DCEB68
-	.incbin "graphics/pokemon/porygon2/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Porygon2:: @ 8DCEDF0
-	.incbin "graphics/pokemon/porygon2/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Porygon2:: @ 8DCEE18
-	.incbin "graphics/pokemon/porygon2/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Porygon2:: @ 8DCF134
-	.incbin "graphics/pokemon/porygon2/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Porygon2:: @ 8DCF15C
-	.incbin "graphics/pokemon/porygon2/icon.4bpp"
-
-	.align 2
-gMonFootprint_Porygon2:: @ 8DCF55C
-	.incbin "graphics/pokemon/porygon2/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Stantler:: @ 8DCF57C
-	.incbin "graphics/pokemon/stantler/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Stantler:: @ 8DCF990
-	.incbin "graphics/pokemon/stantler/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Stantler:: @ 8DCF9B8
-	.incbin "graphics/pokemon/stantler/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Stantler:: @ 8DCFD04
-	.incbin "graphics/pokemon/stantler/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Stantler:: @ 8DCFD2C
-	.incbin "graphics/pokemon/stantler/icon.4bpp"
-
-	.align 2
-gMonFootprint_Stantler:: @ 8DD012C
-	.incbin "graphics/pokemon/stantler/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Smeargle:: @ 8DD014C
-	.incbin "graphics/pokemon/smeargle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Smeargle:: @ 8DD04E0
-	.incbin "graphics/pokemon/smeargle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Smeargle:: @ 8DD0508
-	.incbin "graphics/pokemon/smeargle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Smeargle:: @ 8DD082C
-	.incbin "graphics/pokemon/smeargle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Smeargle:: @ 8DD0854
-	.incbin "graphics/pokemon/smeargle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Smeargle:: @ 8DD0C54
-	.incbin "graphics/pokemon/smeargle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tyrogue:: @ 8DD0C74
-	.incbin "graphics/pokemon/tyrogue/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tyrogue:: @ 8DD0F00
-	.incbin "graphics/pokemon/tyrogue/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tyrogue:: @ 8DD0F28
-	.incbin "graphics/pokemon/tyrogue/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tyrogue:: @ 8DD1244
-	.incbin "graphics/pokemon/tyrogue/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tyrogue:: @ 8DD126C
-	.incbin "graphics/pokemon/tyrogue/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tyrogue:: @ 8DD166C
-	.incbin "graphics/pokemon/tyrogue/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hitmontop:: @ 8DD168C
-	.incbin "graphics/pokemon/hitmontop/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hitmontop:: @ 8DD1A18
-	.incbin "graphics/pokemon/hitmontop/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hitmontop:: @ 8DD1A40
-	.incbin "graphics/pokemon/hitmontop/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hitmontop:: @ 8DD1E68
-	.incbin "graphics/pokemon/hitmontop/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hitmontop:: @ 8DD1E90
-	.incbin "graphics/pokemon/hitmontop/icon.4bpp"
-
-    @ this might be undefined memory garbage. Its all 00s except for 1 0F. Its also not referenced.
-    .align 2
-gUndefined_8DD1E90:: @ 8DD2290
-	.incbin "data/garbage_8DD2290.bin"
-
-	.align 2
-gMonFootprint_Hitmontop:: @ 8DD2490
-	.incbin "graphics/pokemon/hitmontop/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Smoochum:: @ 8DD24B0
-	.incbin "graphics/pokemon/smoochum/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Smoochum:: @ 8DD2708
-	.incbin "graphics/pokemon/smoochum/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Smoochum:: @ 8DD2730
-	.incbin "graphics/pokemon/smoochum/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Smoochum:: @ 8DD29A8
-	.incbin "graphics/pokemon/smoochum/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Smoochum:: @ 8DD29D0
-	.incbin "graphics/pokemon/smoochum/icon.4bpp"
-
-	.align 2
-gMonFootprint_Smoochum:: @ 8DD2DD0
-	.incbin "graphics/pokemon/smoochum/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Elekid:: @ 8DD2DF0
-	.incbin "graphics/pokemon/elekid/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Elekid:: @ 8DD30F8
-	.incbin "graphics/pokemon/elekid/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Elekid:: @ 8DD3120
-	.incbin "graphics/pokemon/elekid/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Elekid:: @ 8DD3478
-	.incbin "graphics/pokemon/elekid/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Elekid:: @ 8DD34A0
-	.incbin "graphics/pokemon/elekid/icon.4bpp"
-
-	.align 2
-gMonFootprint_Elekid:: @ 8DD38A0
-	.incbin "graphics/pokemon/elekid/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Magby:: @ 8DD38C0
-	.incbin "graphics/pokemon/magby/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Magby:: @ 8DD3B44
-	.incbin "graphics/pokemon/magby/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Magby:: @ 8DD3B6C
-	.incbin "graphics/pokemon/magby/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Magby:: @ 8DD3E18
-	.incbin "graphics/pokemon/magby/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Magby:: @ 8DD3E40
-	.incbin "graphics/pokemon/magby/icon.4bpp"
-
-	.align 2
-gMonFootprint_Magby:: @ 8DD4240
-	.incbin "graphics/pokemon/magby/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Miltank:: @ 8DD4260
-	.incbin "graphics/pokemon/miltank/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Miltank:: @ 8DD4610
-	.incbin "graphics/pokemon/miltank/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Miltank:: @ 8DD4638
-	.incbin "graphics/pokemon/miltank/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Miltank:: @ 8DD49D4
-	.incbin "graphics/pokemon/miltank/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Miltank:: @ 8DD49FC
-	.incbin "graphics/pokemon/miltank/icon.4bpp"
-
-	.align 2
-gMonFootprint_Miltank:: @ 8DD4DFC
-	.incbin "graphics/pokemon/miltank/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Blissey:: @ 8DD4E1C
-	.incbin "graphics/pokemon/blissey/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Blissey:: @ 8DD5204
-	.incbin "graphics/pokemon/blissey/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Blissey:: @ 8DD522C
-	.incbin "graphics/pokemon/blissey/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Blissey:: @ 8DD54F8
-	.incbin "graphics/pokemon/blissey/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Blissey:: @ 8DD5520
-	.incbin "graphics/pokemon/blissey/icon.4bpp"
-
-	.align 2
-gMonFootprint_Blissey:: @ 8DD5920
-	.incbin "graphics/pokemon/blissey/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Raikou:: @ 8DD5940
-	.incbin "graphics/pokemon/raikou/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Raikou:: @ 8DD5EBC
-	.incbin "graphics/pokemon/raikou/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Raikou:: @ 8DD5EE4
-	.incbin "graphics/pokemon/raikou/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Raikou:: @ 8DD628C
-	.incbin "graphics/pokemon/raikou/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Raikou:: @ 8DD62B4
-	.incbin "graphics/pokemon/raikou/icon.4bpp"
-
-	.align 2
-gMonFootprint_Raikou:: @ 8DD66B4
-	.incbin "graphics/pokemon/raikou/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Entei:: @ 8DD66D4
-	.incbin "graphics/pokemon/entei/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Entei:: @ 8DD6CD0
-	.incbin "graphics/pokemon/entei/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Entei:: @ 8DD6CF8
-	.incbin "graphics/pokemon/entei/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Entei:: @ 8DD711C
-	.incbin "graphics/pokemon/entei/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Entei:: @ 8DD7144
-	.incbin "graphics/pokemon/entei/icon.4bpp"
-
-	.align 2
-gMonFootprint_Entei:: @ 8DD7544
-	.incbin "graphics/pokemon/entei/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Suicune:: @ 8DD7564
-	.incbin "graphics/pokemon/suicune/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Suicune:: @ 8DD7AE8
-	.incbin "graphics/pokemon/suicune/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Suicune:: @ 8DD7B10
-	.incbin "graphics/pokemon/suicune/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Suicune:: @ 8DD7FEC
-	.incbin "graphics/pokemon/suicune/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Suicune:: @ 8DD8014
-	.incbin "graphics/pokemon/suicune/icon.4bpp"
-
-	.align 2
-gMonFootprint_Suicune:: @ 8DD8414
-	.incbin "graphics/pokemon/suicune/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Larvitar:: @ 8DD8434
-	.incbin "graphics/pokemon/larvitar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Larvitar:: @ 8DD8690
-	.incbin "graphics/pokemon/larvitar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Larvitar:: @ 8DD86B8
-	.incbin "graphics/pokemon/larvitar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Larvitar:: @ 8DD8964
-	.incbin "graphics/pokemon/larvitar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Larvitar:: @ 8DD898C
-	.incbin "graphics/pokemon/larvitar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Larvitar:: @ 8DD8D8C
-	.incbin "graphics/pokemon/larvitar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pupitar:: @ 8DD8DAC
-	.incbin "graphics/pokemon/pupitar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pupitar:: @ 8DD909C
-	.incbin "graphics/pokemon/pupitar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pupitar:: @ 8DD90C4
-	.incbin "graphics/pokemon/pupitar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pupitar:: @ 8DD93FC
-	.incbin "graphics/pokemon/pupitar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pupitar:: @ 8DD9424
-	.incbin "graphics/pokemon/pupitar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pupitar:: @ 8DD9824
-	.incbin "graphics/pokemon/pupitar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tyranitar:: @ 8DD9844
-	.incbin "graphics/pokemon/tyranitar/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tyranitar:: @ 8DD9D80
-	.incbin "graphics/pokemon/tyranitar/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tyranitar:: @ 8DD9DA8
-	.incbin "graphics/pokemon/tyranitar/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tyranitar:: @ 8DDA194
-	.incbin "graphics/pokemon/tyranitar/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tyranitar:: @ 8DDA1BC
-	.incbin "graphics/pokemon/tyranitar/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tyranitar:: @ 8DDA5BC
-	.incbin "graphics/pokemon/tyranitar/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lugia:: @ 8DDA5DC
-	.incbin "graphics/pokemon/lugia/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lugia:: @ 8DDAAA0
-	.incbin "graphics/pokemon/lugia/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lugia:: @ 8DDAAC8
-	.incbin "graphics/pokemon/lugia/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lugia:: @ 8DDAE9C
-	.incbin "graphics/pokemon/lugia/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lugia:: @ 8DDAEC4
-	.incbin "graphics/pokemon/lugia/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lugia:: @ 8DDB2C4
-	.incbin "graphics/pokemon/lugia/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_HoOh:: @ 8DDB2E4
-	.incbin "graphics/pokemon/ho_oh/front.4bpp.lz"
-
-	.align 2
-gMonPalette_HoOh:: @ 8DDB938
-	.incbin "graphics/pokemon/ho_oh/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_HoOh:: @ 8DDB960
-	.incbin "graphics/pokemon/ho_oh/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_HoOh:: @ 8DDBD70
-	.incbin "graphics/pokemon/ho_oh/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_HoOh:: @ 8DDBD98
-	.incbin "graphics/pokemon/ho_oh/icon.4bpp"
-
-	.align 2
-gMonFootprint_HoOh:: @ 8DDC198
-	.incbin "graphics/pokemon/ho_oh/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Celebi:: @ 8DDC1B8
-	.incbin "graphics/pokemon/celebi/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Celebi:: @ 8DDC430
-	.incbin "graphics/pokemon/celebi/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Celebi:: @ 8DDC458
-	.incbin "graphics/pokemon/celebi/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Celebi:: @ 8DDC804
-	.incbin "graphics/pokemon/celebi/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Celebi:: @ 8DDC82C
-	.incbin "graphics/pokemon/celebi/icon.4bpp"
-
-	.align 2
-gMonFootprint_Celebi:: @ 8DDCC2C
-	.incbin "graphics/pokemon/celebi/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_DoubleQuestionMark:: @ 8DDCC4C
-	.incbin "graphics/pokemon/circled_question_mark/double/front.4bpp.lz"
-
-	.align 2
-gMonPalette_DoubleQuestionMark:: @ 8DDCDD0
-	.incbin "graphics/pokemon/circled_question_mark/double/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_DoubleQuestionMark:: @ 8DDCDE4
-	.incbin "graphics/pokemon/circled_question_mark/double/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_DoubleQuestionMark:: @ 8DDCF68
-	.incbin "graphics/pokemon/circled_question_mark/double/shiny.gbapal.lz"
-
-	.align 2
-gMonFrontPic_Treecko:: @ 8DDCF7C
-	.incbin "graphics/pokemon/treecko/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Treecko:: @ 8DDD284
-	.incbin "graphics/pokemon/treecko/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Treecko:: @ 8DDD2AC
-	.incbin "graphics/pokemon/treecko/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Treecko:: @ 8DDD5AC
-	.incbin "graphics/pokemon/treecko/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Treecko:: @ 8DDD5D4
-	.incbin "graphics/pokemon/treecko/icon.4bpp"
-
-	.align 2
-gMonFootprint_Treecko:: @ 8DDD9D4
-	.incbin "graphics/pokemon/treecko/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Grovyle:: @ 8DDD9F4
-	.incbin "graphics/pokemon/grovyle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Grovyle:: @ 8DDDE80
-	.incbin "graphics/pokemon/grovyle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Grovyle:: @ 8DDDEA8
-	.incbin "graphics/pokemon/grovyle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Grovyle:: @ 8DDE1E4
-	.incbin "graphics/pokemon/grovyle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Grovyle:: @ 8DDE20C
-	.incbin "graphics/pokemon/grovyle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Grovyle:: @ 8DDE60C
-	.incbin "graphics/pokemon/grovyle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sceptile:: @ 8DDE62C
-	.incbin "graphics/pokemon/sceptile/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sceptile:: @ 8DDEB30
-	.incbin "graphics/pokemon/sceptile/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sceptile:: @ 8DDEB58
-	.incbin "graphics/pokemon/sceptile/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sceptile:: @ 8DDEF54
-	.incbin "graphics/pokemon/sceptile/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sceptile:: @ 8DDEF7C
-	.incbin "graphics/pokemon/sceptile/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sceptile:: @ 8DDF37C
-	.incbin "graphics/pokemon/sceptile/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Torchic:: @ 8DDF39C
-	.incbin "graphics/pokemon/torchic/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Torchic:: @ 8DDF638
-	.incbin "graphics/pokemon/torchic/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Torchic:: @ 8DDF660
-	.incbin "graphics/pokemon/torchic/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Torchic:: @ 8DDF938
-	.incbin "graphics/pokemon/torchic/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Torchic:: @ 8DDF960
-	.incbin "graphics/pokemon/torchic/icon.4bpp"
-
-	.align 2
-gMonFootprint_Torchic:: @ 8DDFD60
-	.incbin "graphics/pokemon/torchic/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Combusken:: @ 8DDFD80
-	.incbin "graphics/pokemon/combusken/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Combusken:: @ 8DE016C
-	.incbin "graphics/pokemon/combusken/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Combusken:: @ 8DE0194
-	.incbin "graphics/pokemon/combusken/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Combusken:: @ 8DE0564
-	.incbin "graphics/pokemon/combusken/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Combusken:: @ 8DE058C
-	.incbin "graphics/pokemon/combusken/icon.4bpp"
-
-	.align 2
-gMonFootprint_Combusken:: @ 8DE098C
-	.incbin "graphics/pokemon/combusken/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Blaziken:: @ 8DE09AC
-	.incbin "graphics/pokemon/blaziken/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Blaziken:: @ 8DE0E24
-	.incbin "graphics/pokemon/blaziken/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Blaziken:: @ 8DE0E4C
-	.incbin "graphics/pokemon/blaziken/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Blaziken:: @ 8DE1228
-	.incbin "graphics/pokemon/blaziken/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Blaziken:: @ 8DE1250
-	.incbin "graphics/pokemon/blaziken/icon.4bpp"
-
-	.align 2
-gMonFootprint_Blaziken:: @ 8DE1650
-	.incbin "graphics/pokemon/blaziken/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mudkip:: @ 8DE1670
-	.incbin "graphics/pokemon/mudkip/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mudkip:: @ 8DE1928
-	.incbin "graphics/pokemon/mudkip/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mudkip:: @ 8DE1950
-	.incbin "graphics/pokemon/mudkip/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mudkip:: @ 8DE1C30
-	.incbin "graphics/pokemon/mudkip/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mudkip:: @ 8DE1C58
-	.incbin "graphics/pokemon/mudkip/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mudkip:: @ 8DE2058
-	.incbin "graphics/pokemon/mudkip/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Marshtomp:: @ 8DE2078
-	.incbin "graphics/pokemon/marshtomp/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Marshtomp:: @ 8DE2400
-	.incbin "graphics/pokemon/marshtomp/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Marshtomp:: @ 8DE2428
-	.incbin "graphics/pokemon/marshtomp/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Marshtomp:: @ 8DE27D8
-	.incbin "graphics/pokemon/marshtomp/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Marshtomp:: @ 8DE2800
-	.incbin "graphics/pokemon/marshtomp/icon.4bpp"
-
-	.align 2
-gMonFootprint_Marshtomp:: @ 8DE2C00
-	.incbin "graphics/pokemon/marshtomp/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Swampert:: @ 8DE2C20
-	.incbin "graphics/pokemon/swampert/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Swampert:: @ 8DE319C
-	.incbin "graphics/pokemon/swampert/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Swampert:: @ 8DE31C4
-	.incbin "graphics/pokemon/swampert/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Swampert:: @ 8DE3578
-	.incbin "graphics/pokemon/swampert/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Swampert:: @ 8DE35A0
-	.incbin "graphics/pokemon/swampert/icon.4bpp"
-
-	.align 2
-gMonFootprint_Swampert:: @ 8DE39A0
-	.incbin "graphics/pokemon/swampert/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Poochyena:: @ 8DE39C0
-	.incbin "graphics/pokemon/poochyena/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Poochyena:: @ 8DE3C88
-	.incbin "graphics/pokemon/poochyena/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Poochyena:: @ 8DE3CB0
-	.incbin "graphics/pokemon/poochyena/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Poochyena:: @ 8DE3FDC
-	.incbin "graphics/pokemon/poochyena/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Poochyena:: @ 8DE4004
-	.incbin "graphics/pokemon/poochyena/icon.4bpp"
-
-	.align 2
-gMonFootprint_Poochyena:: @ 8DE4404
-	.incbin "graphics/pokemon/poochyena/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mightyena:: @ 8DE4424
-	.incbin "graphics/pokemon/mightyena/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mightyena:: @ 8DE485C
-	.incbin "graphics/pokemon/mightyena/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mightyena:: @ 8DE4884
-	.incbin "graphics/pokemon/mightyena/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mightyena:: @ 8DE4BFC
-	.incbin "graphics/pokemon/mightyena/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mightyena:: @ 8DE4C24
-	.incbin "graphics/pokemon/mightyena/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mightyena:: @ 8DE5024
-	.incbin "graphics/pokemon/mightyena/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Zigzagoon:: @ 8DE5044
-	.incbin "graphics/pokemon/zigzagoon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Zigzagoon:: @ 8DE5414
-	.incbin "graphics/pokemon/zigzagoon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Zigzagoon:: @ 8DE543C
-	.incbin "graphics/pokemon/zigzagoon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Zigzagoon:: @ 8DE577C
-	.incbin "graphics/pokemon/zigzagoon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Zigzagoon:: @ 8DE57A4
-	.incbin "graphics/pokemon/zigzagoon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Zigzagoon:: @ 8DE5BA4
-	.incbin "graphics/pokemon/zigzagoon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Linoone:: @ 8DE5BC4
-	.incbin "graphics/pokemon/linoone/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Linoone:: @ 8DE5F34
-	.incbin "graphics/pokemon/linoone/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Linoone:: @ 8DE5F5C
-	.incbin "graphics/pokemon/linoone/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Linoone:: @ 8DE6230
-	.incbin "graphics/pokemon/linoone/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Linoone:: @ 8DE6258
-	.incbin "graphics/pokemon/linoone/icon.4bpp"
-
-	.align 2
-gMonFootprint_Linoone:: @ 8DE6658
-	.incbin "graphics/pokemon/linoone/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wurmple:: @ 8DE6678
-	.incbin "graphics/pokemon/wurmple/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wurmple:: @ 8DE6900
-	.incbin "graphics/pokemon/wurmple/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wurmple:: @ 8DE6928
-	.incbin "graphics/pokemon/wurmple/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wurmple:: @ 8DE6B74
-	.incbin "graphics/pokemon/wurmple/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wurmple:: @ 8DE6B9C
-	.incbin "graphics/pokemon/wurmple/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wurmple:: @ 8DE6F9C
-	.incbin "graphics/pokemon/wurmple/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Silcoon:: @ 8DE6FBC
-	.incbin "graphics/pokemon/silcoon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Silcoon:: @ 8DE723C
-	.incbin "graphics/pokemon/silcoon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Silcoon:: @ 8DE7264
-	.incbin "graphics/pokemon/silcoon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Silcoon:: @ 8DE7480
-	.incbin "graphics/pokemon/silcoon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Silcoon:: @ 8DE74A8
-	.incbin "graphics/pokemon/silcoon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Silcoon:: @ 8DE78A8
-	.incbin "graphics/pokemon/silcoon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Beautifly:: @ 8DE78C8
-	.incbin "graphics/pokemon/beautifly/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Beautifly:: @ 8DE7C20
-	.incbin "graphics/pokemon/beautifly/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Beautifly:: @ 8DE7C48
-	.incbin "graphics/pokemon/beautifly/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Beautifly:: @ 8DE7FF8
-	.incbin "graphics/pokemon/beautifly/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Beautifly:: @ 8DE8020
-	.incbin "graphics/pokemon/beautifly/icon.4bpp"
-
-	.align 2
-gMonFootprint_Beautifly:: @ 8DE8420
-	.incbin "graphics/pokemon/beautifly/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cascoon:: @ 8DE8440
-	.incbin "graphics/pokemon/cascoon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cascoon:: @ 8DE86AC
-	.incbin "graphics/pokemon/cascoon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cascoon:: @ 8DE86D4
-	.incbin "graphics/pokemon/cascoon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cascoon:: @ 8DE88E4
-	.incbin "graphics/pokemon/cascoon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cascoon:: @ 8DE890C
-	.incbin "graphics/pokemon/cascoon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cascoon:: @ 8DE8D0C
-	.incbin "graphics/pokemon/cascoon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dustox:: @ 8DE8D2C
-	.incbin "graphics/pokemon/dustox/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dustox:: @ 8DE9094
-	.incbin "graphics/pokemon/dustox/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dustox:: @ 8DE90BC
-	.incbin "graphics/pokemon/dustox/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dustox:: @ 8DE9314
-	.incbin "graphics/pokemon/dustox/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dustox:: @ 8DE933C
-	.incbin "graphics/pokemon/dustox/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dustox:: @ 8DE973C
-	.incbin "graphics/pokemon/dustox/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lotad:: @ 8DE975C
-	.incbin "graphics/pokemon/lotad/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lotad:: @ 8DE99BC
-	.incbin "graphics/pokemon/lotad/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lotad:: @ 8DE99E4
-	.incbin "graphics/pokemon/lotad/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lotad:: @ 8DE9CCC
-	.incbin "graphics/pokemon/lotad/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lotad:: @ 8DE9CF4
-	.incbin "graphics/pokemon/lotad/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lotad:: @ 8DEA0F4
-	.incbin "graphics/pokemon/lotad/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lombre:: @ 8DEA114
-	.incbin "graphics/pokemon/lombre/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lombre:: @ 8DEA42C
-	.incbin "graphics/pokemon/lombre/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lombre:: @ 8DEA454
-	.incbin "graphics/pokemon/lombre/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lombre:: @ 8DEA750
-	.incbin "graphics/pokemon/lombre/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lombre:: @ 8DEA778
-	.incbin "graphics/pokemon/lombre/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lombre:: @ 8DEAB78
-	.incbin "graphics/pokemon/lombre/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ludicolo:: @ 8DEAB98
-	.incbin "graphics/pokemon/ludicolo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ludicolo:: @ 8DEB07C
-	.incbin "graphics/pokemon/ludicolo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ludicolo:: @ 8DEB0A4
-	.incbin "graphics/pokemon/ludicolo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ludicolo:: @ 8DEB3A0
-	.incbin "graphics/pokemon/ludicolo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ludicolo:: @ 8DEB3C8
-	.incbin "graphics/pokemon/ludicolo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ludicolo:: @ 8DEB7C8
-	.incbin "graphics/pokemon/ludicolo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Seedot:: @ 8DEB7E8
-	.incbin "graphics/pokemon/seedot/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Seedot:: @ 8DEBA7C
-	.incbin "graphics/pokemon/seedot/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Seedot:: @ 8DEBAA4
-	.incbin "graphics/pokemon/seedot/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Seedot:: @ 8DEBD84
-	.incbin "graphics/pokemon/seedot/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Seedot:: @ 8DEBDAC
-	.incbin "graphics/pokemon/seedot/icon.4bpp"
-
-	.align 2
-gMonFootprint_Seedot:: @ 8DEC1AC
-	.incbin "graphics/pokemon/seedot/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nuzleaf:: @ 8DEC1CC
-	.incbin "graphics/pokemon/nuzleaf/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nuzleaf:: @ 8DEC4B8
-	.incbin "graphics/pokemon/nuzleaf/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nuzleaf:: @ 8DEC4E0
-	.incbin "graphics/pokemon/nuzleaf/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nuzleaf:: @ 8DEC7A8
-	.incbin "graphics/pokemon/nuzleaf/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nuzleaf:: @ 8DEC7D0
-	.incbin "graphics/pokemon/nuzleaf/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nuzleaf:: @ 8DECBD0
-	.incbin "graphics/pokemon/nuzleaf/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shiftry:: @ 8DECBF0
-	.incbin "graphics/pokemon/shiftry/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shiftry:: @ 8DED0AC
-	.incbin "graphics/pokemon/shiftry/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shiftry:: @ 8DED0D4
-	.incbin "graphics/pokemon/shiftry/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shiftry:: @ 8DED398
-	.incbin "graphics/pokemon/shiftry/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shiftry:: @ 8DED3C0
-	.incbin "graphics/pokemon/shiftry/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shiftry:: @ 8DED7C0
-	.incbin "graphics/pokemon/shiftry/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nincada:: @ 8DED7E0
-	.incbin "graphics/pokemon/nincada/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nincada:: @ 8DEDA80
-	.incbin "graphics/pokemon/nincada/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nincada:: @ 8DEDAA8
-	.incbin "graphics/pokemon/nincada/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nincada:: @ 8DEDD60
-	.incbin "graphics/pokemon/nincada/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nincada:: @ 8DEDD88
-	.incbin "graphics/pokemon/nincada/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nincada:: @ 8DEE188
-	.incbin "graphics/pokemon/nincada/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ninjask:: @ 8DEE1A8
-	.incbin "graphics/pokemon/ninjask/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ninjask:: @ 8DEE518
-	.incbin "graphics/pokemon/ninjask/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ninjask:: @ 8DEE540
-	.incbin "graphics/pokemon/ninjask/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ninjask:: @ 8DEE90C
-	.incbin "graphics/pokemon/ninjask/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ninjask:: @ 8DEE934
-	.incbin "graphics/pokemon/ninjask/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ninjask:: @ 8DEED34
-	.incbin "graphics/pokemon/ninjask/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shedinja:: @ 8DEED54
-	.incbin "graphics/pokemon/shedinja/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shedinja:: @ 8DEF074
-	.incbin "graphics/pokemon/shedinja/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shedinja:: @ 8DEF09C
-	.incbin "graphics/pokemon/shedinja/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shedinja:: @ 8DEF43C
-	.incbin "graphics/pokemon/shedinja/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shedinja:: @ 8DEF464
-	.incbin "graphics/pokemon/shedinja/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shedinja:: @ 8DEF864
-	.incbin "graphics/pokemon/shedinja/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Taillow:: @ 8DEF884
-	.incbin "graphics/pokemon/taillow/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Taillow:: @ 8DEFADC
-	.incbin "graphics/pokemon/taillow/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Taillow:: @ 8DEFB04
-	.incbin "graphics/pokemon/taillow/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Taillow:: @ 8DEFD24
-	.incbin "graphics/pokemon/taillow/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Taillow:: @ 8DEFD4C
-	.incbin "graphics/pokemon/taillow/icon.4bpp"
-
-	.align 2
-gMonFootprint_Taillow:: @ 8DF014C
-	.incbin "graphics/pokemon/taillow/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Swellow:: @ 8DF016C
-	.incbin "graphics/pokemon/swellow/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Swellow:: @ 8DF0530
-	.incbin "graphics/pokemon/swellow/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Swellow:: @ 8DF0558
-	.incbin "graphics/pokemon/swellow/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Swellow:: @ 8DF0890
-	.incbin "graphics/pokemon/swellow/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Swellow:: @ 8DF08B8
-	.incbin "graphics/pokemon/swellow/icon.4bpp"
-
-	.align 2
-gMonFootprint_Swellow:: @ 8DF0CB8
-	.incbin "graphics/pokemon/swellow/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shroomish:: @ 8DF0CD8
-	.incbin "graphics/pokemon/shroomish/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shroomish:: @ 8DF0F40
-	.incbin "graphics/pokemon/shroomish/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shroomish:: @ 8DF0F68
-	.incbin "graphics/pokemon/shroomish/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shroomish:: @ 8DF1248
-	.incbin "graphics/pokemon/shroomish/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shroomish:: @ 8DF1270
-	.incbin "graphics/pokemon/shroomish/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shroomish:: @ 8DF1670
-	.incbin "graphics/pokemon/shroomish/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Breloom:: @ 8DF1690
-	.incbin "graphics/pokemon/breloom/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Breloom:: @ 8DF1A78
-	.incbin "graphics/pokemon/breloom/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Breloom:: @ 8DF1AA0
-	.incbin "graphics/pokemon/breloom/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Breloom:: @ 8DF1E80
-	.incbin "graphics/pokemon/breloom/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Breloom:: @ 8DF1EA8
-	.incbin "graphics/pokemon/breloom/icon.4bpp"
-
-	.align 2
-gMonFootprint_Breloom:: @ 8DF22A8
-	.incbin "graphics/pokemon/breloom/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Spinda:: @ 8DF22C8
-	.incbin "graphics/pokemon/spinda/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Spinda:: @ 8DF25C8
-	.incbin "graphics/pokemon/spinda/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Spinda:: @ 8DF25F0
-	.incbin "graphics/pokemon/spinda/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Spinda:: @ 8DF292C
-	.incbin "graphics/pokemon/spinda/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Spinda:: @ 8DF2954
-	.incbin "graphics/pokemon/spinda/icon.4bpp"
-
-	.align 2
-gMonFootprint_Spinda:: @ 8DF2D54
-	.incbin "graphics/pokemon/spinda/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wingull:: @ 8DF2D74
-	.incbin "graphics/pokemon/wingull/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wingull:: @ 8DF2FB0
-	.incbin "graphics/pokemon/wingull/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wingull:: @ 8DF2FD8
-	.incbin "graphics/pokemon/wingull/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wingull:: @ 8DF3328
-	.incbin "graphics/pokemon/wingull/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wingull:: @ 8DF3350
-	.incbin "graphics/pokemon/wingull/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wingull:: @ 8DF3750
-	.incbin "graphics/pokemon/wingull/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Pelipper:: @ 8DF3770
-	.incbin "graphics/pokemon/pelipper/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Pelipper:: @ 8DF3B08
-	.incbin "graphics/pokemon/pelipper/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Pelipper:: @ 8DF3B30
-	.incbin "graphics/pokemon/pelipper/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Pelipper:: @ 8DF3EB0
-	.incbin "graphics/pokemon/pelipper/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Pelipper:: @ 8DF3ED8
-	.incbin "graphics/pokemon/pelipper/icon.4bpp"
-
-	.align 2
-gMonFootprint_Pelipper:: @ 8DF42D8
-	.incbin "graphics/pokemon/pelipper/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Surskit:: @ 8DF42F8
-	.incbin "graphics/pokemon/surskit/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Surskit:: @ 8DF4504
-	.incbin "graphics/pokemon/surskit/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Surskit:: @ 8DF452C
-	.incbin "graphics/pokemon/surskit/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Surskit:: @ 8DF4764
-	.incbin "graphics/pokemon/surskit/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Surskit:: @ 8DF478C
-	.incbin "graphics/pokemon/surskit/icon.4bpp"
-
-	.align 2
-gMonFootprint_Surskit:: @ 8DF4B8C
-	.incbin "graphics/pokemon/surskit/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Masquerain:: @ 8DF4BAC
-	.incbin "graphics/pokemon/masquerain/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Masquerain:: @ 8DF4F48
-	.incbin "graphics/pokemon/masquerain/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Masquerain:: @ 8DF4F70
-	.incbin "graphics/pokemon/masquerain/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Masquerain:: @ 8DF52C8
-	.incbin "graphics/pokemon/masquerain/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Masquerain:: @ 8DF52F0
-	.incbin "graphics/pokemon/masquerain/icon.4bpp"
-
-	.align 2
-gMonFootprint_Masquerain:: @ 8DF56F0
-	.incbin "graphics/pokemon/masquerain/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wailmer:: @ 8DF5710
-	.incbin "graphics/pokemon/wailmer/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wailmer:: @ 8DF59F0
-	.incbin "graphics/pokemon/wailmer/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wailmer:: @ 8DF5A18
-	.incbin "graphics/pokemon/wailmer/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wailmer:: @ 8DF5BFC
-	.incbin "graphics/pokemon/wailmer/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wailmer:: @ 8DF5C24
-	.incbin "graphics/pokemon/wailmer/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wailmer:: @ 8DF6024
-	.incbin "graphics/pokemon/wailmer/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wailord:: @ 8DF6044
-	.incbin "graphics/pokemon/wailord/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wailord:: @ 8DF6408
-	.incbin "graphics/pokemon/wailord/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wailord:: @ 8DF6430
-	.incbin "graphics/pokemon/wailord/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wailord:: @ 8DF6648
-	.incbin "graphics/pokemon/wailord/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wailord:: @ 8DF6670
-	.incbin "graphics/pokemon/wailord/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wailord:: @ 8DF6A70
-	.incbin "graphics/pokemon/wailord/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Skitty:: @ 8DF6A90
-	.incbin "graphics/pokemon/skitty/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Skitty:: @ 8DF6D90
-	.incbin "graphics/pokemon/skitty/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Skitty:: @ 8DF6DB8
-	.incbin "graphics/pokemon/skitty/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Skitty:: @ 8DF7100
-	.incbin "graphics/pokemon/skitty/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Skitty:: @ 8DF7128
-	.incbin "graphics/pokemon/skitty/icon.4bpp"
-
-	.align 2
-gMonFootprint_Skitty:: @ 8DF7528
-	.incbin "graphics/pokemon/skitty/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Delcatty:: @ 8DF7548
-	.incbin "graphics/pokemon/delcatty/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Delcatty:: @ 8DF78D4
-	.incbin "graphics/pokemon/delcatty/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Delcatty:: @ 8DF78FC
-	.incbin "graphics/pokemon/delcatty/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Delcatty:: @ 8DF7C98
-	.incbin "graphics/pokemon/delcatty/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Delcatty:: @ 8DF7CC0
-	.incbin "graphics/pokemon/delcatty/icon.4bpp"
-
-	.align 2
-gMonFootprint_Delcatty:: @ 8DF80C0
-	.incbin "graphics/pokemon/delcatty/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kecleon:: @ 8DF80E0
-	.incbin "graphics/pokemon/kecleon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kecleon:: @ 8DF8460
-	.incbin "graphics/pokemon/kecleon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kecleon:: @ 8DF8488
-	.incbin "graphics/pokemon/kecleon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kecleon:: @ 8DF8860
-	.incbin "graphics/pokemon/kecleon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kecleon:: @ 8DF8888
-	.incbin "graphics/pokemon/kecleon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kecleon:: @ 8DF8C88
-	.incbin "graphics/pokemon/kecleon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Baltoy:: @ 8DF8CA8
-	.incbin "graphics/pokemon/baltoy/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Baltoy:: @ 8DF8ECC
-	.incbin "graphics/pokemon/baltoy/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Baltoy:: @ 8DF8EEC
-	.incbin "graphics/pokemon/baltoy/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Baltoy:: @ 8DF9194
-	.incbin "graphics/pokemon/baltoy/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Baltoy:: @ 8DF91B4
-	.incbin "graphics/pokemon/baltoy/icon.4bpp"
-
-	.align 2
-gMonFootprint_Baltoy:: @ 8DF95B4
-	.incbin "graphics/pokemon/baltoy/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Claydol:: @ 8DF95D4
-	.incbin "graphics/pokemon/claydol/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Claydol:: @ 8DF998C
-	.incbin "graphics/pokemon/claydol/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Claydol:: @ 8DF99B4
-	.incbin "graphics/pokemon/claydol/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Claydol:: @ 8DF9D88
-	.incbin "graphics/pokemon/claydol/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Claydol:: @ 8DF9DB0
-	.incbin "graphics/pokemon/claydol/icon.4bpp"
-
-	.align 2
-gMonFootprint_Claydol:: @ 8DFA1B0
-	.incbin "graphics/pokemon/claydol/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Nosepass:: @ 8DFA1D0
-	.incbin "graphics/pokemon/nosepass/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Nosepass:: @ 8DFA49C
-	.incbin "graphics/pokemon/nosepass/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Nosepass:: @ 8DFA4C4
-	.incbin "graphics/pokemon/nosepass/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Nosepass:: @ 8DFA764
-	.incbin "graphics/pokemon/nosepass/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Nosepass:: @ 8DFA78C
-	.incbin "graphics/pokemon/nosepass/icon.4bpp"
-
-	.align 2
-gMonFootprint_Nosepass:: @ 8DFAB8C
-	.incbin "graphics/pokemon/nosepass/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Torkoal:: @ 8DFABAC
-	.incbin "graphics/pokemon/torkoal/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Torkoal:: @ 8DFB058
-	.incbin "graphics/pokemon/torkoal/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Torkoal:: @ 8DFB080
-	.incbin "graphics/pokemon/torkoal/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Torkoal:: @ 8DFB348
-	.incbin "graphics/pokemon/torkoal/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Torkoal:: @ 8DFB370
-	.incbin "graphics/pokemon/torkoal/icon.4bpp"
-
-	.align 2
-gMonFootprint_Torkoal:: @ 8DFB770
-	.incbin "graphics/pokemon/torkoal/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sableye:: @ 8DFB790
-	.incbin "graphics/pokemon/sableye/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sableye:: @ 8DFBA64
-	.incbin "graphics/pokemon/sableye/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sableye:: @ 8DFBA8C
-	.incbin "graphics/pokemon/sableye/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sableye:: @ 8DFBDB4
-	.incbin "graphics/pokemon/sableye/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sableye:: @ 8DFBDDC
-	.incbin "graphics/pokemon/sableye/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sableye:: @ 8DFC1DC
-	.incbin "graphics/pokemon/sableye/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Barboach:: @ 8DFC1FC
-	.incbin "graphics/pokemon/barboach/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Barboach:: @ 8DFC48C
-	.incbin "graphics/pokemon/barboach/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Barboach:: @ 8DFC4B4
-	.incbin "graphics/pokemon/barboach/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Barboach:: @ 8DFC744
-	.incbin "graphics/pokemon/barboach/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Barboach:: @ 8DFC76C
-	.incbin "graphics/pokemon/barboach/icon.4bpp"
-
-	.align 2
-gMonFootprint_Barboach:: @ 8DFCB6C
-	.incbin "graphics/pokemon/barboach/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Whiscash:: @ 8DFCB8C
-	.incbin "graphics/pokemon/whiscash/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Whiscash:: @ 8DFCF04
-	.incbin "graphics/pokemon/whiscash/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Whiscash:: @ 8DFCF2C
-	.incbin "graphics/pokemon/whiscash/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Whiscash:: @ 8DFD278
-	.incbin "graphics/pokemon/whiscash/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Whiscash:: @ 8DFD2A0
-	.incbin "graphics/pokemon/whiscash/icon.4bpp"
-
-	.align 2
-gMonFootprint_Whiscash:: @ 8DFD6A0
-	.incbin "graphics/pokemon/whiscash/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Luvdisc:: @ 8DFD6C0
-	.incbin "graphics/pokemon/luvdisc/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Luvdisc:: @ 8DFD880
-	.incbin "graphics/pokemon/luvdisc/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Luvdisc:: @ 8DFD8A4
-	.incbin "graphics/pokemon/luvdisc/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Luvdisc:: @ 8DFDA78
-	.incbin "graphics/pokemon/luvdisc/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Luvdisc:: @ 8DFDA9C
-	.incbin "graphics/pokemon/luvdisc/icon.4bpp"
-
-	.align 2
-gMonFootprint_Luvdisc:: @ 8DFDE9C
-	.incbin "graphics/pokemon/luvdisc/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Corphish:: @ 8DFDEBC
-	.incbin "graphics/pokemon/corphish/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Corphish:: @ 8DFE218
-	.incbin "graphics/pokemon/corphish/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Corphish:: @ 8DFE240
-	.incbin "graphics/pokemon/corphish/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Corphish:: @ 8DFE55C
-	.incbin "graphics/pokemon/corphish/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Corphish:: @ 8DFE584
-	.incbin "graphics/pokemon/corphish/icon.4bpp"
-
-	.align 2
-gMonFootprint_Corphish:: @ 8DFE984
-	.incbin "graphics/pokemon/corphish/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Crawdaunt:: @ 8DFE9A4
-	.incbin "graphics/pokemon/crawdaunt/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Crawdaunt:: @ 8DFEE34
-	.incbin "graphics/pokemon/crawdaunt/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Crawdaunt:: @ 8DFEE5C
-	.incbin "graphics/pokemon/crawdaunt/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Crawdaunt:: @ 8DFF240
-	.incbin "graphics/pokemon/crawdaunt/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Crawdaunt:: @ 8DFF268
-	.incbin "graphics/pokemon/crawdaunt/icon.4bpp"
-
-	.align 2
-gMonFootprint_Crawdaunt:: @ 8DFF668
-	.incbin "graphics/pokemon/crawdaunt/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Feebas:: @ 8DFF688
-	.incbin "graphics/pokemon/feebas/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Feebas:: @ 8DFF914
-	.incbin "graphics/pokemon/feebas/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Feebas:: @ 8DFF93C
-	.incbin "graphics/pokemon/feebas/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Feebas:: @ 8DFFC74
-	.incbin "graphics/pokemon/feebas/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Feebas:: @ 8DFFC9C
-	.incbin "graphics/pokemon/feebas/icon.4bpp"
-
-	.align 2
-gMonFootprint_Feebas:: @ 8E0009C
-	.incbin "graphics/pokemon/feebas/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Milotic:: @ 8E000BC
-	.incbin "graphics/pokemon/milotic/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Milotic:: @ 8E0054C
-	.incbin "graphics/pokemon/milotic/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Milotic:: @ 8E00574
-	.incbin "graphics/pokemon/milotic/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Milotic:: @ 8E00868
-	.incbin "graphics/pokemon/milotic/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Milotic:: @ 8E00890
-	.incbin "graphics/pokemon/milotic/icon.4bpp"
-
-	.align 2
-gMonFootprint_Milotic:: @ 8E00C90
-	.incbin "graphics/pokemon/milotic/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Carvanha:: @ 8E00CB0
-	.incbin "graphics/pokemon/carvanha/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Carvanha:: @ 8E00FDC
-	.incbin "graphics/pokemon/carvanha/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Carvanha:: @ 8E01004
-	.incbin "graphics/pokemon/carvanha/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Carvanha:: @ 8E01314
-	.incbin "graphics/pokemon/carvanha/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Carvanha:: @ 8E0133C
-	.incbin "graphics/pokemon/carvanha/icon.4bpp"
-
-	.align 2
-gMonFootprint_Carvanha:: @ 8E0173C
-	.incbin "graphics/pokemon/carvanha/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sharpedo:: @ 8E0175C
-	.incbin "graphics/pokemon/sharpedo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sharpedo:: @ 8E01AEC
-	.incbin "graphics/pokemon/sharpedo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sharpedo:: @ 8E01B14
-	.incbin "graphics/pokemon/sharpedo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sharpedo:: @ 8E01E6C
-	.incbin "graphics/pokemon/sharpedo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sharpedo:: @ 8E01E94
-	.incbin "graphics/pokemon/sharpedo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sharpedo:: @ 8E02294
-	.incbin "graphics/pokemon/sharpedo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Trapinch:: @ 8E022B4
-	.incbin "graphics/pokemon/trapinch/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Trapinch:: @ 8E024D0
-	.incbin "graphics/pokemon/trapinch/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Trapinch:: @ 8E024F8
-	.incbin "graphics/pokemon/trapinch/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Trapinch:: @ 8E02718
-	.incbin "graphics/pokemon/trapinch/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Trapinch:: @ 8E02740
-	.incbin "graphics/pokemon/trapinch/icon.4bpp"
-
-	.align 2
-gMonFootprint_Trapinch:: @ 8E02B40
-	.incbin "graphics/pokemon/trapinch/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Vibrava:: @ 8E02B60
-	.incbin "graphics/pokemon/vibrava/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Vibrava:: @ 8E02ED0
-	.incbin "graphics/pokemon/vibrava/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Vibrava:: @ 8E02EF8
-	.incbin "graphics/pokemon/vibrava/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Vibrava:: @ 8E03170
-	.incbin "graphics/pokemon/vibrava/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Vibrava:: @ 8E03198
-	.incbin "graphics/pokemon/vibrava/icon.4bpp"
-
-	.align 2
-gMonFootprint_Vibrava:: @ 8E03598
-	.incbin "graphics/pokemon/vibrava/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Flygon:: @ 8E035B8
-	.incbin "graphics/pokemon/flygon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Flygon:: @ 8E03AA8
-	.incbin "graphics/pokemon/flygon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Flygon:: @ 8E03AD0
-	.incbin "graphics/pokemon/flygon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Flygon:: @ 8E03F0C
-	.incbin "graphics/pokemon/flygon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Flygon:: @ 8E03F34
-	.incbin "graphics/pokemon/flygon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Flygon:: @ 8E04334
-	.incbin "graphics/pokemon/flygon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Makuhita:: @ 8E04354
-	.incbin "graphics/pokemon/makuhita/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Makuhita:: @ 8E0466C
-	.incbin "graphics/pokemon/makuhita/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Makuhita:: @ 8E04694
-	.incbin "graphics/pokemon/makuhita/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Makuhita:: @ 8E04984
-	.incbin "graphics/pokemon/makuhita/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Makuhita:: @ 8E049A8
-	.incbin "graphics/pokemon/makuhita/icon.4bpp"
-
-	.align 2
-gMonFootprint_Makuhita:: @ 8E04DA8
-	.incbin "graphics/pokemon/makuhita/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Hariyama:: @ 8E04DC8
-	.incbin "graphics/pokemon/hariyama/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Hariyama:: @ 8E05278
-	.incbin "graphics/pokemon/hariyama/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Hariyama:: @ 8E052A0
-	.incbin "graphics/pokemon/hariyama/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Hariyama:: @ 8E05680
-	.incbin "graphics/pokemon/hariyama/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Hariyama:: @ 8E056A8
-	.incbin "graphics/pokemon/hariyama/icon.4bpp"
-
-	.align 2
-gMonFootprint_Hariyama:: @ 8E05AA8
-	.incbin "graphics/pokemon/hariyama/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Electrike:: @ 8E05AC8
-	.incbin "graphics/pokemon/electrike/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Electrike:: @ 8E05D58
-	.incbin "graphics/pokemon/electrike/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Electrike:: @ 8E05D80
-	.incbin "graphics/pokemon/electrike/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Electrike:: @ 8E0600C
-	.incbin "graphics/pokemon/electrike/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Electrike:: @ 8E06034
-	.incbin "graphics/pokemon/electrike/icon.4bpp"
-
-	.align 2
-gMonFootprint_Electrike:: @ 8E06434
-	.incbin "graphics/pokemon/electrike/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Manectric:: @ 8E06454
-	.incbin "graphics/pokemon/manectric/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Manectric:: @ 8E06784
-	.incbin "graphics/pokemon/manectric/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Manectric:: @ 8E067AC
-	.incbin "graphics/pokemon/manectric/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Manectric:: @ 8E069D8
-	.incbin "graphics/pokemon/manectric/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Manectric:: @ 8E06A00
-	.incbin "graphics/pokemon/manectric/icon.4bpp"
-
-	.align 2
-gMonFootprint_Manectric:: @ 8E06E00
-	.incbin "graphics/pokemon/manectric/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Numel:: @ 8E06E20
-	.incbin "graphics/pokemon/numel/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Numel:: @ 8E070F0
-	.incbin "graphics/pokemon/numel/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Numel:: @ 8E07118
-	.incbin "graphics/pokemon/numel/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Numel:: @ 8E073D4
-	.incbin "graphics/pokemon/numel/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Numel:: @ 8E073FC
-	.incbin "graphics/pokemon/numel/icon.4bpp"
-
-	.align 2
-gMonFootprint_Numel:: @ 8E077FC
-	.incbin "graphics/pokemon/numel/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Camerupt:: @ 8E0781C
-	.incbin "graphics/pokemon/camerupt/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Camerupt:: @ 8E07C34
-	.incbin "graphics/pokemon/camerupt/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Camerupt:: @ 8E07C5C
-	.incbin "graphics/pokemon/camerupt/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Camerupt:: @ 8E07F20
-	.incbin "graphics/pokemon/camerupt/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Camerupt:: @ 8E07F48
-	.incbin "graphics/pokemon/camerupt/icon.4bpp"
-
-	.align 2
-gMonFootprint_Camerupt:: @ 8E08348
-	.incbin "graphics/pokemon/camerupt/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Spheal:: @ 8E08368
-	.incbin "graphics/pokemon/spheal/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Spheal:: @ 8E085DC
-	.incbin "graphics/pokemon/spheal/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Spheal:: @ 8E08604
-	.incbin "graphics/pokemon/spheal/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Spheal:: @ 8E08800
-	.incbin "graphics/pokemon/spheal/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Spheal:: @ 8E08828
-	.incbin "graphics/pokemon/spheal/icon.4bpp"
-
-	.align 2
-gMonFootprint_Spheal:: @ 8E08C28
-	.incbin "graphics/pokemon/spheal/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Sealeo:: @ 8E08C48
-	.incbin "graphics/pokemon/sealeo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Sealeo:: @ 8E08FC8
-	.incbin "graphics/pokemon/sealeo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Sealeo:: @ 8E08FF0
-	.incbin "graphics/pokemon/sealeo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Sealeo:: @ 8E0926C
-	.incbin "graphics/pokemon/sealeo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Sealeo:: @ 8E09294
-	.incbin "graphics/pokemon/sealeo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Sealeo:: @ 8E09694
-	.incbin "graphics/pokemon/sealeo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Walrein:: @ 8E096B4
-	.incbin "graphics/pokemon/walrein/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Walrein:: @ 8E09B54
-	.incbin "graphics/pokemon/walrein/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Walrein:: @ 8E09B7C
-	.incbin "graphics/pokemon/walrein/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Walrein:: @ 8E09F04
-	.incbin "graphics/pokemon/walrein/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Walrein:: @ 8E09F2C
-	.incbin "graphics/pokemon/walrein/icon.4bpp"
-
-	.align 2
-gMonFootprint_Walrein:: @ 8E0A32C
-	.incbin "graphics/pokemon/walrein/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cacnea:: @ 8E0A34C
-	.incbin "graphics/pokemon/cacnea/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cacnea:: @ 8E0A65C
-	.incbin "graphics/pokemon/cacnea/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cacnea:: @ 8E0A684
-	.incbin "graphics/pokemon/cacnea/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cacnea:: @ 8E0A9E4
-	.incbin "graphics/pokemon/cacnea/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cacnea:: @ 8E0AA0C
-	.incbin "graphics/pokemon/cacnea/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cacnea:: @ 8E0AE0C
-	.incbin "graphics/pokemon/cacnea/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cacturne:: @ 8E0AE2C
-	.incbin "graphics/pokemon/cacturne/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cacturne:: @ 8E0B264
-	.incbin "graphics/pokemon/cacturne/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cacturne:: @ 8E0B28C
-	.incbin "graphics/pokemon/cacturne/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cacturne:: @ 8E0B58C
-	.incbin "graphics/pokemon/cacturne/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cacturne:: @ 8E0B5B4
-	.incbin "graphics/pokemon/cacturne/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cacturne:: @ 8E0B9B4
-	.incbin "graphics/pokemon/cacturne/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Snorunt:: @ 8E0B9D4
-	.incbin "graphics/pokemon/snorunt/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Snorunt:: @ 8E0BC98
-	.incbin "graphics/pokemon/snorunt/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Snorunt:: @ 8E0BCC0
-	.incbin "graphics/pokemon/snorunt/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Snorunt:: @ 8E0BFA4
-	.incbin "graphics/pokemon/snorunt/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Snorunt:: @ 8E0BFCC
-	.incbin "graphics/pokemon/snorunt/icon.4bpp"
-
-	.align 2
-gMonFootprint_Snorunt:: @ 8E0C3CC
-	.incbin "graphics/pokemon/snorunt/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Glalie:: @ 8E0C3EC
-	.incbin "graphics/pokemon/glalie/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Glalie:: @ 8E0C7B4
-	.incbin "graphics/pokemon/glalie/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Glalie:: @ 8E0C7DC
-	.incbin "graphics/pokemon/glalie/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Glalie:: @ 8E0CB8C
-	.incbin "graphics/pokemon/glalie/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Glalie:: @ 8E0CBB4
-	.incbin "graphics/pokemon/glalie/icon.4bpp"
-
-	.align 2
-gMonFootprint_Glalie:: @ 8E0CFB4
-	.incbin "graphics/pokemon/glalie/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lunatone:: @ 8E0CFD4
-	.incbin "graphics/pokemon/lunatone/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lunatone:: @ 8E0D2FC
-	.incbin "graphics/pokemon/lunatone/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lunatone:: @ 8E0D324
-	.incbin "graphics/pokemon/lunatone/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lunatone:: @ 8E0D67C
-	.incbin "graphics/pokemon/lunatone/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lunatone:: @ 8E0D6A4
-	.incbin "graphics/pokemon/lunatone/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lunatone:: @ 8E0DAA4
-	.incbin "graphics/pokemon/lunatone/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Solrock:: @ 8E0DAC4
-	.incbin "graphics/pokemon/solrock/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Solrock:: @ 8E0DF10
-	.incbin "graphics/pokemon/solrock/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Solrock:: @ 8E0DF38
-	.incbin "graphics/pokemon/solrock/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Solrock:: @ 8E0E324
-	.incbin "graphics/pokemon/solrock/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Solrock:: @ 8E0E34C
-	.incbin "graphics/pokemon/solrock/icon.4bpp"
-
-	.align 2
-gMonFootprint_Solrock:: @ 8E0E74C
-	.incbin "graphics/pokemon/solrock/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Azurill:: @ 8E0E76C
-	.incbin "graphics/pokemon/azurill/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Azurill:: @ 8E0EA34
-	.incbin "graphics/pokemon/azurill/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Azurill:: @ 8E0EA5C
-	.incbin "graphics/pokemon/azurill/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Azurill:: @ 8E0ED74
-	.incbin "graphics/pokemon/azurill/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Azurill:: @ 8E0ED9C
-	.incbin "graphics/pokemon/azurill/icon.4bpp"
-
-	.align 2
-gMonFootprint_Azurill:: @ 8E0F19C
-	.incbin "graphics/pokemon/azurill/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Spoink:: @ 8E0F1BC
-	.incbin "graphics/pokemon/spoink/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Spoink:: @ 8E0F428
-	.incbin "graphics/pokemon/spoink/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Spoink:: @ 8E0F450
-	.incbin "graphics/pokemon/spoink/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Spoink:: @ 8E0F690
-	.incbin "graphics/pokemon/spoink/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Spoink:: @ 8E0F6B8
-	.incbin "graphics/pokemon/spoink/icon.4bpp"
-
-	.align 2
-gMonFootprint_Spoink:: @ 8E0FAB8
-	.incbin "graphics/pokemon/spoink/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Grumpig:: @ 8E0FAD8
-	.incbin "graphics/pokemon/grumpig/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Grumpig:: @ 8E0FE94
-	.incbin "graphics/pokemon/grumpig/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Grumpig:: @ 8E0FEBC
-	.incbin "graphics/pokemon/grumpig/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Grumpig:: @ 8E1021C
-	.incbin "graphics/pokemon/grumpig/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Grumpig:: @ 8E10244
-	.incbin "graphics/pokemon/grumpig/icon.4bpp"
-
-	.align 2
-gMonFootprint_Grumpig:: @ 8E10644
-	.incbin "graphics/pokemon/grumpig/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Plusle:: @ 8E10664
-	.incbin "graphics/pokemon/plusle/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Plusle:: @ 8E108F0
-	.incbin "graphics/pokemon/plusle/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Plusle:: @ 8E10918
-	.incbin "graphics/pokemon/plusle/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Plusle:: @ 8E10BD0
-	.incbin "graphics/pokemon/plusle/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Plusle:: @ 8E10BF8
-	.incbin "graphics/pokemon/plusle/icon.4bpp"
-
-	.align 2
-gMonFootprint_Plusle:: @ 8E10FF8
-	.incbin "graphics/pokemon/plusle/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Minun:: @ 8E11018
-	.incbin "graphics/pokemon/minun/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Minun:: @ 8E11280
-	.incbin "graphics/pokemon/minun/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Minun:: @ 8E112A8
-	.incbin "graphics/pokemon/minun/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Minun:: @ 8E11570
-	.incbin "graphics/pokemon/minun/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Minun:: @ 8E11598
-	.incbin "graphics/pokemon/minun/icon.4bpp"
-
-	.align 2
-gMonFootprint_Minun:: @ 8E11998
-	.incbin "graphics/pokemon/minun/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Mawile:: @ 8E119B8
-	.incbin "graphics/pokemon/mawile/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Mawile:: @ 8E11D74
-	.incbin "graphics/pokemon/mawile/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Mawile:: @ 8E11D9C
-	.incbin "graphics/pokemon/mawile/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Mawile:: @ 8E1219C
-	.incbin "graphics/pokemon/mawile/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Mawile:: @ 8E121C4
-	.incbin "graphics/pokemon/mawile/icon.4bpp"
-
-	.align 2
-gMonFootprint_Mawile:: @ 8E125C4
-	.incbin "graphics/pokemon/mawile/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Meditite:: @ 8E125E4
-	.incbin "graphics/pokemon/meditite/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Meditite:: @ 8E1289C
-	.incbin "graphics/pokemon/meditite/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Meditite:: @ 8E128C4
-	.incbin "graphics/pokemon/meditite/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Meditite:: @ 8E12B8C
-	.incbin "graphics/pokemon/meditite/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Meditite:: @ 8E12BB0
-	.incbin "graphics/pokemon/meditite/icon.4bpp"
-
-	.align 2
-gMonFootprint_Meditite:: @ 8E12FB0
-	.incbin "graphics/pokemon/meditite/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Medicham:: @ 8E12FD0
-	.incbin "graphics/pokemon/medicham/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Medicham:: @ 8E13300
-	.incbin "graphics/pokemon/medicham/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Medicham:: @ 8E13328
-	.incbin "graphics/pokemon/medicham/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Medicham:: @ 8E13660
-	.incbin "graphics/pokemon/medicham/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Medicham:: @ 8E13688
-	.incbin "graphics/pokemon/medicham/icon.4bpp"
-
-	.align 2
-gMonFootprint_Medicham:: @ 8E13A88
-	.incbin "graphics/pokemon/medicham/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Swablu:: @ 8E13AA8
-	.incbin "graphics/pokemon/swablu/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Swablu:: @ 8E13D80
-	.incbin "graphics/pokemon/swablu/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Swablu:: @ 8E13DA8
-	.incbin "graphics/pokemon/swablu/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Swablu:: @ 8E14160
-	.incbin "graphics/pokemon/swablu/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Swablu:: @ 8E14188
-	.incbin "graphics/pokemon/swablu/icon.4bpp"
-
-	.align 2
-gMonFootprint_Swablu:: @ 8E14588
-	.incbin "graphics/pokemon/swablu/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Altaria:: @ 8E145A8
-	.incbin "graphics/pokemon/altaria/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Altaria:: @ 8E14984
-	.incbin "graphics/pokemon/altaria/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Altaria:: @ 8E149AC
-	.incbin "graphics/pokemon/altaria/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Altaria:: @ 8E14D24
-	.incbin "graphics/pokemon/altaria/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Altaria:: @ 8E14D4C
-	.incbin "graphics/pokemon/altaria/icon.4bpp"
-
-	.align 2
-gMonFootprint_Altaria:: @ 8E1514C
-	.incbin "graphics/pokemon/altaria/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Wynaut:: @ 8E1516C
-	.incbin "graphics/pokemon/wynaut/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Wynaut:: @ 8E15404
-	.incbin "graphics/pokemon/wynaut/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Wynaut:: @ 8E1542C
-	.incbin "graphics/pokemon/wynaut/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Wynaut:: @ 8E156BC
-	.incbin "graphics/pokemon/wynaut/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Wynaut:: @ 8E156E4
-	.incbin "graphics/pokemon/wynaut/icon.4bpp"
-
-	.align 2
-gMonFootprint_Wynaut:: @ 8E15AE4
-	.incbin "graphics/pokemon/wynaut/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Duskull:: @ 8E15B04
-	.incbin "graphics/pokemon/duskull/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Duskull:: @ 8E15DF4
-	.incbin "graphics/pokemon/duskull/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Duskull:: @ 8E15E1C
-	.incbin "graphics/pokemon/duskull/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Duskull:: @ 8E160CC
-	.incbin "graphics/pokemon/duskull/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Duskull:: @ 8E160F4
-	.incbin "graphics/pokemon/duskull/icon.4bpp"
-
-	.align 2
-gMonFootprint_Duskull:: @ 8E164F4
-	.incbin "graphics/pokemon/duskull/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Dusclops:: @ 8E16514
-	.incbin "graphics/pokemon/dusclops/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Dusclops:: @ 8E168B4
-	.incbin "graphics/pokemon/dusclops/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Dusclops:: @ 8E168DC
-	.incbin "graphics/pokemon/dusclops/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Dusclops:: @ 8E16BC8
-	.incbin "graphics/pokemon/dusclops/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Dusclops:: @ 8E16BF0
-	.incbin "graphics/pokemon/dusclops/icon.4bpp"
-
-	.align 2
-gMonFootprint_Dusclops:: @ 8E16FF0
-	.incbin "graphics/pokemon/dusclops/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Roselia:: @ 8E17010
-	.incbin "graphics/pokemon/roselia/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Roselia:: @ 8E1737C
-	.incbin "graphics/pokemon/roselia/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Roselia:: @ 8E173A4
-	.incbin "graphics/pokemon/roselia/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Roselia:: @ 8E1776C
-	.incbin "graphics/pokemon/roselia/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Roselia:: @ 8E17794
-	.incbin "graphics/pokemon/roselia/icon.4bpp"
-
-	.align 2
-gMonFootprint_Roselia:: @ 8E17B94
-	.incbin "graphics/pokemon/roselia/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Slakoth:: @ 8E17BB4
-	.incbin "graphics/pokemon/slakoth/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Slakoth:: @ 8E17E9C
-	.incbin "graphics/pokemon/slakoth/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Slakoth:: @ 8E17EC4
-	.incbin "graphics/pokemon/slakoth/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Slakoth:: @ 8E181AC
-	.incbin "graphics/pokemon/slakoth/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Slakoth:: @ 8E181D4
-	.incbin "graphics/pokemon/slakoth/icon.4bpp"
-
-	.align 2
-gMonFootprint_Slakoth:: @ 8E185D4
-	.incbin "graphics/pokemon/slakoth/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Vigoroth:: @ 8E185F4
-	.incbin "graphics/pokemon/vigoroth/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Vigoroth:: @ 8E189F0
-	.incbin "graphics/pokemon/vigoroth/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Vigoroth:: @ 8E18A18
-	.incbin "graphics/pokemon/vigoroth/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Vigoroth:: @ 8E18CE0
-	.incbin "graphics/pokemon/vigoroth/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Vigoroth:: @ 8E18D08
-	.incbin "graphics/pokemon/vigoroth/icon.4bpp"
-
-	.align 2
-gMonFootprint_Vigoroth:: @ 8E19108
-	.incbin "graphics/pokemon/vigoroth/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Slaking:: @ 8E19128
-	.incbin "graphics/pokemon/slaking/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Slaking:: @ 8E195FC
-	.incbin "graphics/pokemon/slaking/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Slaking:: @ 8E19624
-	.incbin "graphics/pokemon/slaking/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Slaking:: @ 8E199E8
-	.incbin "graphics/pokemon/slaking/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Slaking:: @ 8E19A10
-	.incbin "graphics/pokemon/slaking/icon.4bpp"
-
-	.align 2
-gMonFootprint_Slaking:: @ 8E19E10
-	.incbin "graphics/pokemon/slaking/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gulpin:: @ 8E19E30
-	.incbin "graphics/pokemon/gulpin/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gulpin:: @ 8E1A048
-	.incbin "graphics/pokemon/gulpin/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gulpin:: @ 8E1A070
-	.incbin "graphics/pokemon/gulpin/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gulpin:: @ 8E1A2F4
-	.incbin "graphics/pokemon/gulpin/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gulpin:: @ 8E1A31C
-	.incbin "graphics/pokemon/gulpin/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gulpin:: @ 8E1A71C
-	.incbin "graphics/pokemon/gulpin/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Swalot:: @ 8E1A73C
-	.incbin "graphics/pokemon/swalot/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Swalot:: @ 8E1AA80
-	.incbin "graphics/pokemon/swalot/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Swalot:: @ 8E1AAA8
-	.incbin "graphics/pokemon/swalot/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Swalot:: @ 8E1ADF0
-	.incbin "graphics/pokemon/swalot/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Swalot:: @ 8E1AE18
-	.incbin "graphics/pokemon/swalot/icon.4bpp"
-
-	.align 2
-gMonFootprint_Swalot:: @ 8E1B218
-	.incbin "graphics/pokemon/swalot/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Tropius:: @ 8E1B238
-	.incbin "graphics/pokemon/tropius/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Tropius:: @ 8E1B7B0
-	.incbin "graphics/pokemon/tropius/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Tropius:: @ 8E1B7D8
-	.incbin "graphics/pokemon/tropius/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Tropius:: @ 8E1BAFC
-	.incbin "graphics/pokemon/tropius/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Tropius:: @ 8E1BB24
-	.incbin "graphics/pokemon/tropius/icon.4bpp"
-
-	.align 2
-gMonFootprint_Tropius:: @ 8E1BF24
-	.incbin "graphics/pokemon/tropius/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Whismur:: @ 8E1BF44
-	.incbin "graphics/pokemon/whismur/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Whismur:: @ 8E1C1D8
-	.incbin "graphics/pokemon/whismur/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Whismur:: @ 8E1C200
-	.incbin "graphics/pokemon/whismur/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Whismur:: @ 8E1C470
-	.incbin "graphics/pokemon/whismur/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Whismur:: @ 8E1C498
-	.incbin "graphics/pokemon/whismur/icon.4bpp"
-
-	.align 2
-gMonFootprint_Whismur:: @ 8E1C898
-	.incbin "graphics/pokemon/whismur/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Loudred:: @ 8E1C8B8
-	.incbin "graphics/pokemon/loudred/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Loudred:: @ 8E1CD30
-	.incbin "graphics/pokemon/loudred/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Loudred:: @ 8E1CD58
-	.incbin "graphics/pokemon/loudred/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Loudred:: @ 8E1D0C8
-	.incbin "graphics/pokemon/loudred/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Loudred:: @ 8E1D0F0
-	.incbin "graphics/pokemon/loudred/icon.4bpp"
-
-	.align 2
-gMonFootprint_Loudred:: @ 8E1D4F0
-	.incbin "graphics/pokemon/loudred/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Exploud:: @ 8E1D510
-	.incbin "graphics/pokemon/exploud/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Exploud:: @ 8E1DA78
-	.incbin "graphics/pokemon/exploud/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Exploud:: @ 8E1DAA0
-	.incbin "graphics/pokemon/exploud/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Exploud:: @ 8E1DEAC
-	.incbin "graphics/pokemon/exploud/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Exploud:: @ 8E1DED4
-	.incbin "graphics/pokemon/exploud/icon.4bpp"
-
-	.align 2
-gMonFootprint_Exploud:: @ 8E1E2D4
-	.incbin "graphics/pokemon/exploud/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Clamperl:: @ 8E1E2F4
-	.incbin "graphics/pokemon/clamperl/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Clamperl:: @ 8E1E5CC
-	.incbin "graphics/pokemon/clamperl/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Clamperl:: @ 8E1E5F4
-	.incbin "graphics/pokemon/clamperl/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Clamperl:: @ 8E1E888
-	.incbin "graphics/pokemon/clamperl/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Clamperl:: @ 8E1E8B0
-	.incbin "graphics/pokemon/clamperl/icon.4bpp"
-
-	.align 2
-gMonFootprint_Clamperl:: @ 8E1ECB0
-	.incbin "graphics/pokemon/clamperl/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Huntail:: @ 8E1ECD0
-	.incbin "graphics/pokemon/huntail/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Huntail:: @ 8E1F09C
-	.incbin "graphics/pokemon/huntail/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Huntail:: @ 8E1F0C4
-	.incbin "graphics/pokemon/huntail/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Huntail:: @ 8E1F418
-	.incbin "graphics/pokemon/huntail/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Huntail:: @ 8E1F440
-	.incbin "graphics/pokemon/huntail/icon.4bpp"
-
-	.align 2
-gMonFootprint_Huntail:: @ 8E1F840
-	.incbin "graphics/pokemon/huntail/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gorebyss:: @ 8E1F860
-	.incbin "graphics/pokemon/gorebyss/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gorebyss:: @ 8E1FB70
-	.incbin "graphics/pokemon/gorebyss/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gorebyss:: @ 8E1FB98
-	.incbin "graphics/pokemon/gorebyss/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gorebyss:: @ 8E1FE80
-	.incbin "graphics/pokemon/gorebyss/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gorebyss:: @ 8E1FEA8
-	.incbin "graphics/pokemon/gorebyss/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gorebyss:: @ 8E202A8
-	.incbin "graphics/pokemon/gorebyss/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Absol:: @ 8E202C8
-	.incbin "graphics/pokemon/absol/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Absol:: @ 8E206F8
-	.incbin "graphics/pokemon/absol/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Absol:: @ 8E20720
-	.incbin "graphics/pokemon/absol/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Absol:: @ 8E20A80
-	.incbin "graphics/pokemon/absol/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Absol:: @ 8E20AA8
-	.incbin "graphics/pokemon/absol/icon.4bpp"
-
-	.align 2
-gMonFootprint_Absol:: @ 8E20EA8
-	.incbin "graphics/pokemon/absol/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shuppet:: @ 8E20EC8
-	.incbin "graphics/pokemon/shuppet/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shuppet:: @ 8E21100
-	.incbin "graphics/pokemon/shuppet/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shuppet:: @ 8E21128
-	.incbin "graphics/pokemon/shuppet/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shuppet:: @ 8E213C0
-	.incbin "graphics/pokemon/shuppet/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shuppet:: @ 8E213E8
-	.incbin "graphics/pokemon/shuppet/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shuppet:: @ 8E217E8
-	.incbin "graphics/pokemon/shuppet/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Banette:: @ 8E21808
-	.incbin "graphics/pokemon/banette/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Banette:: @ 8E21ABC
-	.incbin "graphics/pokemon/banette/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Banette:: @ 8E21AE4
-	.incbin "graphics/pokemon/banette/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Banette:: @ 8E21D60
-	.incbin "graphics/pokemon/banette/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Banette:: @ 8E21D88
-	.incbin "graphics/pokemon/banette/icon.4bpp"
-
-	.align 2
-gMonFootprint_Banette:: @ 8E22188
-	.incbin "graphics/pokemon/banette/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Seviper:: @ 8E221A8
-	.incbin "graphics/pokemon/seviper/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Seviper:: @ 8E225C8
-	.incbin "graphics/pokemon/seviper/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Seviper:: @ 8E225F0
-	.incbin "graphics/pokemon/seviper/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Seviper:: @ 8E22A7C
-	.incbin "graphics/pokemon/seviper/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Seviper:: @ 8E22AA4
-	.incbin "graphics/pokemon/seviper/icon.4bpp"
-
-	.align 2
-gMonFootprint_Seviper:: @ 8E22EA4
-	.incbin "graphics/pokemon/seviper/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Zangoose:: @ 8E22EC4
-	.incbin "graphics/pokemon/zangoose/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Zangoose:: @ 8E23290
-	.incbin "graphics/pokemon/zangoose/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Zangoose:: @ 8E232B8
-	.incbin "graphics/pokemon/zangoose/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Zangoose:: @ 8E2362C
-	.incbin "graphics/pokemon/zangoose/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Zangoose:: @ 8E23654
-	.incbin "graphics/pokemon/zangoose/icon.4bpp"
-
-	.align 2
-gMonFootprint_Zangoose:: @ 8E23A54
-	.incbin "graphics/pokemon/zangoose/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Relicanth:: @ 8E23A74
-	.incbin "graphics/pokemon/relicanth/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Relicanth:: @ 8E23E08
-	.incbin "graphics/pokemon/relicanth/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Relicanth:: @ 8E23E30
-	.incbin "graphics/pokemon/relicanth/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Relicanth:: @ 8E24188
-	.incbin "graphics/pokemon/relicanth/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Relicanth:: @ 8E241B0
-	.incbin "graphics/pokemon/relicanth/icon.4bpp"
-
-	.align 2
-gMonFootprint_Relicanth:: @ 8E245B0
-	.incbin "graphics/pokemon/relicanth/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Aron:: @ 8E245D0
-	.incbin "graphics/pokemon/aron/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Aron:: @ 8E247B8
-	.incbin "graphics/pokemon/aron/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Aron:: @ 8E247E0
-	.incbin "graphics/pokemon/aron/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Aron:: @ 8E24A08
-	.incbin "graphics/pokemon/aron/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Aron:: @ 8E24A30
-	.incbin "graphics/pokemon/aron/icon.4bpp"
-
-	.align 2
-gMonFootprint_Aron:: @ 8E24E30
-	.incbin "graphics/pokemon/aron/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lairon:: @ 8E24E50
-	.incbin "graphics/pokemon/lairon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lairon:: @ 8E2521C
-	.incbin "graphics/pokemon/lairon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lairon:: @ 8E25244
-	.incbin "graphics/pokemon/lairon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lairon:: @ 8E25530
-	.incbin "graphics/pokemon/lairon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lairon:: @ 8E25558
-	.incbin "graphics/pokemon/lairon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lairon:: @ 8E25958
-	.incbin "graphics/pokemon/lairon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Aggron:: @ 8E25978
-	.incbin "graphics/pokemon/aggron/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Aggron:: @ 8E25EF4
-	.incbin "graphics/pokemon/aggron/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Aggron:: @ 8E25F1C
-	.incbin "graphics/pokemon/aggron/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Aggron:: @ 8E26344
-	.incbin "graphics/pokemon/aggron/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Aggron:: @ 8E2636C
-	.incbin "graphics/pokemon/aggron/icon.4bpp"
-
-	.align 2
-gMonFootprint_Aggron:: @ 8E2676C
-	.incbin "graphics/pokemon/aggron/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Castform:: @ 8E2678C
-	.incbin "graphics/pokemon/castform/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Castform:: @ 8E27214
-	.incbin "graphics/pokemon/castform/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Castform:: @ 8E27294
-	.incbin "graphics/pokemon/castform/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Castform:: @ 8E27C50
-	.incbin "graphics/pokemon/castform/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Castform:: @ 8E27CCC
-	.incbin "graphics/pokemon/castform/icon.4bpp"
-
-	.align 2
-gMonFootprint_Castform:: @ 8E280CC
-	.incbin "graphics/pokemon/castform/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Volbeat:: @ 8E280EC
-	.incbin "graphics/pokemon/volbeat/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Volbeat:: @ 8E2847C
-	.incbin "graphics/pokemon/volbeat/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Volbeat:: @ 8E284A4
-	.incbin "graphics/pokemon/volbeat/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Volbeat:: @ 8E28804
-	.incbin "graphics/pokemon/volbeat/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Volbeat:: @ 8E2882C
-	.incbin "graphics/pokemon/volbeat/icon.4bpp"
-
-	.align 2
-gMonFootprint_Volbeat:: @ 8E28C2C
-	.incbin "graphics/pokemon/volbeat/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Illumise:: @ 8E28C4C
-	.incbin "graphics/pokemon/illumise/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Illumise:: @ 8E28FC0
-	.incbin "graphics/pokemon/illumise/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Illumise:: @ 8E28FE8
-	.incbin "graphics/pokemon/illumise/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Illumise:: @ 8E29304
-	.incbin "graphics/pokemon/illumise/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Illumise:: @ 8E2932C
-	.incbin "graphics/pokemon/illumise/icon.4bpp"
-
-	.align 2
-gMonFootprint_Illumise:: @ 8E2972C
-	.incbin "graphics/pokemon/illumise/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Lileep:: @ 8E2974C
-	.incbin "graphics/pokemon/lileep/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Lileep:: @ 8E29A90
-	.incbin "graphics/pokemon/lileep/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Lileep:: @ 8E29AB8
-	.incbin "graphics/pokemon/lileep/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Lileep:: @ 8E29DFC
-	.incbin "graphics/pokemon/lileep/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Lileep:: @ 8E29E24
-	.incbin "graphics/pokemon/lileep/icon.4bpp"
-
-	.align 2
-gMonFootprint_Lileep:: @ 8E2A224
-	.incbin "graphics/pokemon/lileep/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Cradily:: @ 8E2A244
-	.incbin "graphics/pokemon/cradily/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Cradily:: @ 8E2A660
-	.incbin "graphics/pokemon/cradily/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Cradily:: @ 8E2A688
-	.incbin "graphics/pokemon/cradily/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Cradily:: @ 8E2AA84
-	.incbin "graphics/pokemon/cradily/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Cradily:: @ 8E2AAAC
-	.incbin "graphics/pokemon/cradily/icon.4bpp"
-
-	.align 2
-gMonFootprint_Cradily:: @ 8E2AEAC
-	.incbin "graphics/pokemon/cradily/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Anorith:: @ 8E2AECC
-	.incbin "graphics/pokemon/anorith/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Anorith:: @ 8E2B1F0
-	.incbin "graphics/pokemon/anorith/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Anorith:: @ 8E2B218
-	.incbin "graphics/pokemon/anorith/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Anorith:: @ 8E2B460
-	.incbin "graphics/pokemon/anorith/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Anorith:: @ 8E2B488
-	.incbin "graphics/pokemon/anorith/icon.4bpp"
-
-	.align 2
-gMonFootprint_Anorith:: @ 8E2B888
-	.incbin "graphics/pokemon/anorith/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Armaldo:: @ 8E2B8A8
-	.incbin "graphics/pokemon/armaldo/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Armaldo:: @ 8E2BE28
-	.incbin "graphics/pokemon/armaldo/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Armaldo:: @ 8E2BE50
-	.incbin "graphics/pokemon/armaldo/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Armaldo:: @ 8E2C288
-	.incbin "graphics/pokemon/armaldo/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Armaldo:: @ 8E2C2B0
-	.incbin "graphics/pokemon/armaldo/icon.4bpp"
-
-	.align 2
-gMonFootprint_Armaldo:: @ 8E2C6B0
-	.incbin "graphics/pokemon/armaldo/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Ralts:: @ 8E2C6D0
-	.incbin "graphics/pokemon/ralts/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Ralts:: @ 8E2C900
-	.incbin "graphics/pokemon/ralts/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Ralts:: @ 8E2C928
-	.incbin "graphics/pokemon/ralts/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Ralts:: @ 8E2CB64
-	.incbin "graphics/pokemon/ralts/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Ralts:: @ 8E2CB8C
-	.incbin "graphics/pokemon/ralts/icon.4bpp"
-
-	.align 2
-gMonFootprint_Ralts:: @ 8E2CF8C
-	.incbin "graphics/pokemon/ralts/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kirlia:: @ 8E2CFAC
-	.incbin "graphics/pokemon/kirlia/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kirlia:: @ 8E2D2A8
-	.incbin "graphics/pokemon/kirlia/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kirlia:: @ 8E2D2D0
-	.incbin "graphics/pokemon/kirlia/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kirlia:: @ 8E2D644
-	.incbin "graphics/pokemon/kirlia/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kirlia:: @ 8E2D66C
-	.incbin "graphics/pokemon/kirlia/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kirlia:: @ 8E2DA6C
-	.incbin "graphics/pokemon/kirlia/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Gardevoir:: @ 8E2DA8C
-	.incbin "graphics/pokemon/gardevoir/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Gardevoir:: @ 8E2DE08
-	.incbin "graphics/pokemon/gardevoir/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Gardevoir:: @ 8E2DE30
-	.incbin "graphics/pokemon/gardevoir/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Gardevoir:: @ 8E2E164
-	.incbin "graphics/pokemon/gardevoir/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Gardevoir:: @ 8E2E18C
-	.incbin "graphics/pokemon/gardevoir/icon.4bpp"
-
-	.align 2
-gMonFootprint_Gardevoir:: @ 8E2E58C
-	.incbin "graphics/pokemon/gardevoir/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Bagon:: @ 8E2E5AC
-	.incbin "graphics/pokemon/bagon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Bagon:: @ 8E2E824
-	.incbin "graphics/pokemon/bagon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Bagon:: @ 8E2E84C
-	.incbin "graphics/pokemon/bagon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Bagon:: @ 8E2EB34
-	.incbin "graphics/pokemon/bagon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Bagon:: @ 8E2EB5C
-	.incbin "graphics/pokemon/bagon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Bagon:: @ 8E2EF5C
-	.incbin "graphics/pokemon/bagon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Shelgon:: @ 8E2EF7C
-	.incbin "graphics/pokemon/shelgon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Shelgon:: @ 8E2F280
-	.incbin "graphics/pokemon/shelgon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Shelgon:: @ 8E2F2A8
-	.incbin "graphics/pokemon/shelgon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Shelgon:: @ 8E2F590
-	.incbin "graphics/pokemon/shelgon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Shelgon:: @ 8E2F5B8
-	.incbin "graphics/pokemon/shelgon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Shelgon:: @ 8E2F9B8
-	.incbin "graphics/pokemon/shelgon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Salamence:: @ 8E2F9D8
-	.incbin "graphics/pokemon/salamence/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Salamence:: @ 8E2FE3C
-	.incbin "graphics/pokemon/salamence/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Salamence:: @ 8E2FE64
-	.incbin "graphics/pokemon/salamence/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Salamence:: @ 8E30148
-	.incbin "graphics/pokemon/salamence/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Salamence:: @ 8E30170
-	.incbin "graphics/pokemon/salamence/icon.4bpp"
-
-	.align 2
-gMonFootprint_Salamence:: @ 8E30570
-	.incbin "graphics/pokemon/salamence/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Beldum:: @ 8E30590
-	.incbin "graphics/pokemon/beldum/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Beldum:: @ 8E30800
-	.incbin "graphics/pokemon/beldum/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Beldum:: @ 8E30828
-	.incbin "graphics/pokemon/beldum/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Beldum:: @ 8E30B18
-	.incbin "graphics/pokemon/beldum/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Beldum:: @ 8E30B40
-	.incbin "graphics/pokemon/beldum/icon.4bpp"
-
-	.align 2
-gMonFootprint_Beldum:: @ 8E30F40
-	.incbin "graphics/pokemon/beldum/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Metang:: @ 8E30F60
-	.incbin "graphics/pokemon/metang/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Metang:: @ 8E313BC
-	.incbin "graphics/pokemon/metang/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Metang:: @ 8E313E4
-	.incbin "graphics/pokemon/metang/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Metang:: @ 8E31708
-	.incbin "graphics/pokemon/metang/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Metang:: @ 8E31730
-	.incbin "graphics/pokemon/metang/icon.4bpp"
-
-	.align 2
-gMonFootprint_Metang:: @ 8E31B30
-	.incbin "graphics/pokemon/metang/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Metagross:: @ 8E31B50
-	.incbin "graphics/pokemon/metagross/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Metagross:: @ 8E31FB4
-	.incbin "graphics/pokemon/metagross/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Metagross:: @ 8E31FDC
-	.incbin "graphics/pokemon/metagross/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Metagross:: @ 8E322A8
-	.incbin "graphics/pokemon/metagross/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Metagross:: @ 8E322D0
-	.incbin "graphics/pokemon/metagross/icon.4bpp"
-
-	.align 2
-gMonFootprint_Metagross:: @ 8E326D0
-	.incbin "graphics/pokemon/metagross/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Regirock:: @ 8E326F0
-	.incbin "graphics/pokemon/regirock/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Regirock:: @ 8E32BAC
-	.incbin "graphics/pokemon/regirock/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Regirock:: @ 8E32BD4
-	.incbin "graphics/pokemon/regirock/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Regirock:: @ 8E33020
-	.incbin "graphics/pokemon/regirock/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Regirock:: @ 8E33048
-	.incbin "graphics/pokemon/regirock/icon.4bpp"
-
-	.align 2
-gMonFootprint_Regirock:: @ 8E33448
-	.incbin "graphics/pokemon/regirock/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Regice:: @ 8E33468
-	.incbin "graphics/pokemon/regice/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Regice:: @ 8E338B0
-	.incbin "graphics/pokemon/regice/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Regice:: @ 8E338D8
-	.incbin "graphics/pokemon/regice/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Regice:: @ 8E33BC8
-	.incbin "graphics/pokemon/regice/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Regice:: @ 8E33BF0
-	.incbin "graphics/pokemon/regice/icon.4bpp"
-
-	.align 2
-gMonFootprint_Regice:: @ 8E33FF0
-	.incbin "graphics/pokemon/regice/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Registeel:: @ 8E34010
-	.incbin "graphics/pokemon/registeel/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Registeel:: @ 8E34498
-	.incbin "graphics/pokemon/registeel/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Registeel:: @ 8E344C0
-	.incbin "graphics/pokemon/registeel/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Registeel:: @ 8E347F8
-	.incbin "graphics/pokemon/registeel/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Registeel:: @ 8E34820
-	.incbin "graphics/pokemon/registeel/icon.4bpp"
-
-	.align 2
-gMonFootprint_Registeel:: @ 8E34C20
-	.incbin "graphics/pokemon/registeel/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Kyogre:: @ 8E34C40
-	.incbin "graphics/pokemon/kyogre/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Kyogre:: @ 8E350B0
-	.incbin "graphics/pokemon/kyogre/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Kyogre:: @ 8E350D8
-	.incbin "graphics/pokemon/kyogre/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Kyogre:: @ 8E35350
-	.incbin "graphics/pokemon/kyogre/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Kyogre:: @ 8E35378
-	.incbin "graphics/pokemon/kyogre/icon.4bpp"
-
-	.align 2
-gMonFootprint_Kyogre:: @ 8E35778
-	.incbin "graphics/pokemon/kyogre/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Groudon:: @ 8E35798
-	.incbin "graphics/pokemon/groudon/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Groudon:: @ 8E35D2C
-	.incbin "graphics/pokemon/groudon/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Groudon:: @ 8E35D54
-	.incbin "graphics/pokemon/groudon/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Groudon:: @ 8E361BC
-	.incbin "graphics/pokemon/groudon/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Groudon:: @ 8E361E4
-	.incbin "graphics/pokemon/groudon/icon.4bpp"
-
-	.align 2
-gMonFootprint_Groudon:: @ 8E365E4
-	.incbin "graphics/pokemon/groudon/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Rayquaza:: @ 8E36604
-	.incbin "graphics/pokemon/rayquaza/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Rayquaza:: @ 8E36B14
-	.incbin "graphics/pokemon/rayquaza/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Rayquaza:: @ 8E36B3C
-	.incbin "graphics/pokemon/rayquaza/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Rayquaza:: @ 8E36E74
-	.incbin "graphics/pokemon/rayquaza/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Rayquaza:: @ 8E36E9C
-	.incbin "graphics/pokemon/rayquaza/icon.4bpp"
-
-	.align 2
-gMonFootprint_Rayquaza:: @ 8E3729C
-	.incbin "graphics/pokemon/rayquaza/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Latias:: @ 8E372BC
-	.incbin "graphics/pokemon/latias/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Latias:: @ 8E376E0
-	.incbin "graphics/pokemon/latias/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Latias:: @ 8E37708
-	.incbin "graphics/pokemon/latias/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Latias:: @ 8E37A04
-	.incbin "graphics/pokemon/latias/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Latias:: @ 8E37A2C
-	.incbin "graphics/pokemon/latias/icon.4bpp"
-
-	.align 2
-gMonFootprint_Latias:: @ 8E37E2C
-	.incbin "graphics/pokemon/latias/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Latios:: @ 8E37E4C
-	.incbin "graphics/pokemon/latios/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Latios:: @ 8E382A0
-	.incbin "graphics/pokemon/latios/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Latios:: @ 8E382C8
-	.incbin "graphics/pokemon/latios/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Latios:: @ 8E38628
-	.incbin "graphics/pokemon/latios/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Latios:: @ 8E38650
-	.incbin "graphics/pokemon/latios/icon.4bpp"
-
-	.align 2
-gMonFootprint_Latios:: @ 8E38A50
-	.incbin "graphics/pokemon/latios/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Jirachi:: @ 8E38A70
-	.incbin "graphics/pokemon/jirachi/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Jirachi:: @ 8E38D7C
-	.incbin "graphics/pokemon/jirachi/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Jirachi:: @ 8E38DA4
-	.incbin "graphics/pokemon/jirachi/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Jirachi:: @ 8E39144
-	.incbin "graphics/pokemon/jirachi/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Jirachi:: @ 8E3916C
-	.incbin "graphics/pokemon/jirachi/icon.4bpp"
-
-	.align 2
-gMonFootprint_Jirachi:: @ 8E3956C
-	.incbin "graphics/pokemon/jirachi/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Deoxys:: @ 8E3958C
-	.ifdef FIRERED
-	.incbin "graphics/pokemon/deoxys/front.4bpp.lz"
-	.else
-	.ifdef LEAFGREEN
-	.incbin "graphics/pokemon/deoxys/front_def.4bpp.lz"
-	.endif
-	.endif
-
-	.align 2
-gMonPalette_Deoxys:: @ 8E39D48
-	.incbin "graphics/pokemon/deoxys/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Deoxys:: @ 8E39D70
-	.ifdef FIRERED
-	.incbin "graphics/pokemon/deoxys/back.4bpp.lz"
-	.else
-	.ifdef LEAFGREEN
-	.incbin "graphics/pokemon/deoxys/back_def.4bpp.lz"
-	.endif
-	.endif
-
-	.align 2
-gMonShinyPalette_Deoxys:: @ 8E3A360
-	.incbin "graphics/pokemon/deoxys/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Deoxys:: @ 8E3A388
-	.incbin "graphics/pokemon/deoxys/icon.4bpp"
-	@ Referenced as part of the same array as normal deoxys
-	.ifdef FIRERED
-	.incbin "graphics/pokemon/deoxys/icon_attack.4bpp"
-	.else
-	.ifdef LEAFGREEN
-	.incbin "graphics/pokemon/deoxys/icon_defense.4bpp"
-	.endif
-	.endif
-
-	.align 2
-gMonFootprint_Deoxys:: @ 8E3AB88
-	.incbin "graphics/pokemon/deoxys/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Chimecho:: @ 8E3ABA8
-	.incbin "graphics/pokemon/chimecho/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Chimecho:: @ 8E3ADF4
-	.incbin "graphics/pokemon/chimecho/normal.gbapal.lz"
-
-	.align 2
-gMonBackPic_Chimecho:: @ 8E3AE1C
-	.incbin "graphics/pokemon/chimecho/back.4bpp.lz"
-
-	.align 2
-gMonShinyPalette_Chimecho:: @ 8E3B090
-	.incbin "graphics/pokemon/chimecho/shiny.gbapal.lz"
-
-	.align 2
-gMonIcon_Chimecho:: @ 8E3B0B8
-	.incbin "graphics/pokemon/chimecho/icon.4bpp"
-
-	.align 2
-gMonFootprint_Chimecho:: @ 8E3B4B8
-	.incbin "graphics/pokemon/chimecho/footprint.1bpp"
-
-	.align 2
-gMonFrontPic_Egg:: @ 8E3B4D8
-	.incbin "graphics/pokemon/egg/front.4bpp.lz"
-
-	.align 2
-gMonPalette_Egg:: @ 8E3B68C
-	.incbin "graphics/pokemon/egg/normal.gbapal.lz"
-
-	.align 2
-gMonFrontPic_UnownB:: @ 8E3B6AC
-	.incbin "graphics/pokemon/unown/b/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownB:: @ 8E3B884
-	.incbin "graphics/pokemon/unown/b/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownB:: @ 8E3BA88
-	.incbin "graphics/pokemon/unown/b/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownC:: @ 8E3BE88
-	.incbin "graphics/pokemon/unown/c/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownC:: @ 8E3C09C
-	.incbin "graphics/pokemon/unown/c/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownC:: @ 8E3C348
-	.incbin "graphics/pokemon/unown/c/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownD:: @ 8E3C748
-	.incbin "graphics/pokemon/unown/d/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownD:: @ 8E3C940
-	.incbin "graphics/pokemon/unown/d/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownD:: @ 8E3CB98
-	.incbin "graphics/pokemon/unown/d/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownE:: @ 8E3CF98
-	.incbin "graphics/pokemon/unown/e/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownE:: @ 8E3D150
-	.incbin "graphics/pokemon/unown/e/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownE:: @ 8E3D350
-	.incbin "graphics/pokemon/unown/e/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownF:: @ 8E3D750
-	.incbin "graphics/pokemon/unown/f/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownF:: @ 8E3D944
-	.incbin "graphics/pokemon/unown/f/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownF:: @ 8E3DB60
-	.incbin "graphics/pokemon/unown/f/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownG:: @ 8E3DF60
-	.incbin "graphics/pokemon/unown/g/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownG:: @ 8E3E13C
-	.incbin "graphics/pokemon/unown/g/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownG:: @ 8E3E388
-	.incbin "graphics/pokemon/unown/g/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownH:: @ 8E3E788
-	.incbin "graphics/pokemon/unown/h/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownH:: @ 8E3E9CC
-	.incbin "graphics/pokemon/unown/h/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownH:: @ 8E3EC90
-	.incbin "graphics/pokemon/unown/h/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownI:: @ 8E3F090
-	.incbin "graphics/pokemon/unown/i/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownI:: @ 8E3F228
-	.incbin "graphics/pokemon/unown/i/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownI:: @ 8E3F3D0
-	.incbin "graphics/pokemon/unown/i/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownJ:: @ 8E3F7D0
-	.incbin "graphics/pokemon/unown/j/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownJ:: @ 8E3F994
-	.incbin "graphics/pokemon/unown/j/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownJ:: @ 8E3FB7C
-	.incbin "graphics/pokemon/unown/j/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownK:: @ 8E3FF7C
-	.incbin "graphics/pokemon/unown/k/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownK:: @ 8E4014C
-	.incbin "graphics/pokemon/unown/k/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownK:: @ 8E40344
-	.incbin "graphics/pokemon/unown/k/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownL:: @ 8E40744
-	.incbin "graphics/pokemon/unown/l/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownL:: @ 8E408F4
-	.incbin "graphics/pokemon/unown/l/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownL:: @ 8E40AC8
-	.incbin "graphics/pokemon/unown/l/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownM:: @ 8E40EC8
-	.incbin "graphics/pokemon/unown/m/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownM:: @ 8E410EC
-	.incbin "graphics/pokemon/unown/m/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownM:: @ 8E41394
-	.incbin "graphics/pokemon/unown/m/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownN:: @ 8E41794
-	.incbin "graphics/pokemon/unown/n/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownN:: @ 8E4198C
-	.incbin "graphics/pokemon/unown/n/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownN:: @ 8E41BF8
-	.incbin "graphics/pokemon/unown/n/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownO:: @ 8E41FF8
-	.incbin "graphics/pokemon/unown/o/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownO:: @ 8E42230
-	.incbin "graphics/pokemon/unown/o/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownO:: @ 8E424F0
-	.incbin "graphics/pokemon/unown/o/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownP:: @ 8E428F0
-	.incbin "graphics/pokemon/unown/p/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownP:: @ 8E42A90
-	.incbin "graphics/pokemon/unown/p/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownP:: @ 8E42C54
-	.incbin "graphics/pokemon/unown/p/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownQ:: @ 8E43054
-	.incbin "graphics/pokemon/unown/q/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownQ:: @ 8E43208
-	.incbin "graphics/pokemon/unown/q/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownQ:: @ 8E433D4
-	.incbin "graphics/pokemon/unown/q/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownR:: @ 8E437D4
-	.incbin "graphics/pokemon/unown/r/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownR:: @ 8E43978
-	.incbin "graphics/pokemon/unown/r/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownR:: @ 8E43B40
-	.incbin "graphics/pokemon/unown/r/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownS:: @ 8E43F40
-	.incbin "graphics/pokemon/unown/s/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownS:: @ 8E44128
-	.incbin "graphics/pokemon/unown/s/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownS:: @ 8E4437C
-	.incbin "graphics/pokemon/unown/s/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownT:: @ 8E4477C
-	.incbin "graphics/pokemon/unown/t/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownT:: @ 8E4492C
-	.incbin "graphics/pokemon/unown/t/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownT:: @ 8E44AE0
-	.incbin "graphics/pokemon/unown/t/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownU:: @ 8E44EE0
-	.incbin "graphics/pokemon/unown/u/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownU:: @ 8E450F8
-	.incbin "graphics/pokemon/unown/u/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownU:: @ 8E4534C
-	.incbin "graphics/pokemon/unown/u/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownV:: @ 8E4574C
-	.incbin "graphics/pokemon/unown/v/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownV:: @ 8E45930
-	.incbin "graphics/pokemon/unown/v/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownV:: @ 8E45B60
-	.incbin "graphics/pokemon/unown/v/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownW:: @ 8E45F60
-	.incbin "graphics/pokemon/unown/w/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownW:: @ 8E46134
-	.incbin "graphics/pokemon/unown/w/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownW:: @ 8E46338
-	.incbin "graphics/pokemon/unown/w/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownX:: @ 8E46738
-	.incbin "graphics/pokemon/unown/x/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownX:: @ 8E468FC
-	.incbin "graphics/pokemon/unown/x/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownX:: @ 8E46AEC
-	.incbin "graphics/pokemon/unown/x/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownY:: @ 8E46EEC
-	.incbin "graphics/pokemon/unown/y/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownY:: @ 8E470C4
-	.incbin "graphics/pokemon/unown/y/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownY:: @ 8E472B8
-	.incbin "graphics/pokemon/unown/y/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownZ:: @ 8E476B8
-	.incbin "graphics/pokemon/unown/z/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownZ:: @ 8E47868
-	.incbin "graphics/pokemon/unown/z/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownZ:: @ 8E47A44
-	.incbin "graphics/pokemon/unown/z/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownExclamationMark:: @ 8E47E44
-	.incbin "graphics/pokemon/unown/exclamation_mark/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownExclamationMark:: @ 8E47FD4
-	.incbin "graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownExclamationMark:: @ 8E4819C
-	.incbin "graphics/pokemon/unown/exclamation_mark/icon.4bpp"
-
-	.align 2
-gMonFrontPic_UnownQuestionMark:: @ 8E4859C
-	.incbin "graphics/pokemon/unown/question_mark/front.4bpp.lz"
-
-	.align 2
-gMonBackPic_UnownQuestionMark:: @ 8E48758
-	.incbin "graphics/pokemon/unown/question_mark/back.4bpp.lz"
-
-	.align 2
-gMonIcon_UnownQuestionMark:: @ 8E48958
-	.incbin "graphics/pokemon/unown/question_mark/icon.4bpp"
-
-	.align 2
-gTrainerFrontPic_AquaLeaderArchie:: @ 8E48D58
-	.incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaLeaderArchie:: @ 8E49094
-	.incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaGruntM:: @ 8E490BC
-	.incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaGruntM:: @ 8E4941C
-	.incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaGruntF:: @ 8E49444
-	.incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaGruntF:: @ 8E49780
-	.incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSAromaLady:: @ 8E497A8
-	.incbin "graphics/trainers/front_pics/rs_aroma_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSAromaLady:: @ 8E49A6C
-	.incbin "graphics/trainers/palettes/rs_aroma_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSRuinManiac:: @ 8E49A94
-	.incbin "graphics/trainers/front_pics/rs_ruin_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSRuinManiac:: @ 8E49E30
-	.incbin "graphics/trainers/palettes/rs_ruin_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Interviewer:: @ 8E49E58
-	.incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Interviewer:: @ 8E4A2FC
-	.incbin "graphics/trainers/palettes/interviewer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSTuberF:: @ 8E4A324
-	.incbin "graphics/trainers/front_pics/rs_tuber_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSTuberF:: @ 8E4A5C8
-	.incbin "graphics/trainers/palettes/rs_tuber_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_TuberM:: @ 8E4A5F0
-	.incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_TuberM:: @ 8E4A87C
-	.incbin "graphics/trainers/palettes/tuber_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSCooltrainerM:: @ 8E4A8A4
-	.incbin "graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSCooltrainerM:: @ 8E4AB8C
-	.incbin "graphics/trainers/palettes/rs_cool_trainer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSCooltrainerF:: @ 8E4ABB4
-	.incbin "graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSCooltrainerF:: @ 8E4AEC8
-	.incbin "graphics/trainers/palettes/rs_cool_trainer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_HexManiac:: @ 8E4AEF0
-	.incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_HexManiac:: @ 8E4B25C
-	.incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSLady:: @ 8E4B284
-	.incbin "graphics/trainers/front_pics/rs_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSLady:: @ 8E4B638
-	.incbin "graphics/trainers/palettes/rs_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBeauty:: @ 8E4B660
-	.incbin "graphics/trainers/front_pics/rs_beauty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBeauty:: @ 8E4B948
-	.incbin "graphics/trainers/palettes/rs_beauty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RichBoy:: @ 8E4B970
-	.incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RichBoy:: @ 8E4BC24
-	.incbin "graphics/trainers/palettes/rich_boy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokeManiac:: @ 8E4BC4C
-	.incbin "graphics/trainers/front_pics/rs_pokemaniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokeManiac:: @ 8E4BFBC
-	.incbin "graphics/trainers/palettes/rs_pokemaniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSwimmerM:: @ 8E4BFE4
-	.incbin "graphics/trainers/front_pics/rs_swimmer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSwimmerM:: @ 8E4C2A4
-	.incbin "graphics/trainers/palettes/rs_swimmer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBlackBelt:: @ 8E4C2CC
-	.incbin "graphics/trainers/front_pics/rs_black_belt_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBlackBelt:: @ 8E4C630
-	.incbin "graphics/trainers/palettes/rs_black_belt.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Guitarist:: @ 8E4C658
-	.incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Guitarist:: @ 8E4C9DC
-	.incbin "graphics/trainers/palettes/guitarist.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Kindler:: @ 8E4CA04
-	.incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Kindler:: @ 8E4CD70
-	.incbin "graphics/trainers/palettes/kindler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSCamper:: @ 8E4CD98
-	.incbin "graphics/trainers/front_pics/rs_camper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSCamper:: @ 8E4D080
-	.incbin "graphics/trainers/palettes/rs_camper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BugManiac:: @ 8E4D0A8
-	.incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BugManiac:: @ 8E4D4F8
-	.incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPsychicM:: @ 8E4D520
-	.incbin "graphics/trainers/front_pics/rs_psychic_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPsychicM:: @ 8E4D84C
-	.incbin "graphics/trainers/palettes/rs_psychic_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPsychicF:: @ 8E4D874
-	.incbin "graphics/trainers/front_pics/rs_psychic_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPsychicF:: @ 8E4DB9C
-	.incbin "graphics/trainers/palettes/rs_psychic_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSGentleman:: @ 8E4DBC4
-	.incbin "graphics/trainers/front_pics/rs_gentleman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSGentleman:: @ 8E4DEC4
-	.incbin "graphics/trainers/palettes/rs_gentleman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourSidney:: @ 8E4DEEC
-	.incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourSidney:: @ 8E4E220
-	.incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourPhoebe:: @ 8E4E248
-	.incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourPhoebe:: @ 8E4E548
-	.incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderRoxanne:: @ 8E4E570
-	.incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderRoxanne:: @ 8E4E85C
-	.incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBrawly:: @ 8E4E884
-	.incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBrawly:: @ 8E4EC18
-	.incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderTateAndLiza:: @ 8E4EC40
-	.incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderTateAndLiza:: @ 8E4F084
-	.incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SchoolKidM:: @ 8E4F0AC
-	.incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SchoolKidM:: @ 8E4F36C
-	.incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SchoolKidF:: @ 8E4F394
-	.incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SchoolKidF:: @ 8E4F630
-	.incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SrAndJr:: @ 8E4F658
-	.incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SrAndJr:: @ 8E4FAC8
-	.incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokefanM:: @ 8E4FAF0
-	.incbin "graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokefanM:: @ 8E4FEAC
-	.incbin "graphics/trainers/palettes/pokefan_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokefanF:: @ 8E4FED4
-	.incbin "graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokefanF:: @ 8E502A0
-	.incbin "graphics/trainers/palettes/pokefan_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ExpertM:: @ 8E502C8
-	.incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ExpertM:: @ 8E50608
-	.incbin "graphics/trainers/palettes/expert_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ExpertF:: @ 8E50630
-	.incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ExpertF:: @ 8E5094C
-	.incbin "graphics/trainers/palettes/expert_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSYoungster:: @ 8E50974
-	.incbin "graphics/trainers/front_pics/rs_youngster_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSYoungster:: @ 8E50C1C
-	.incbin "graphics/trainers/palettes/rs_youngster.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ChampionSteven:: @ 8E50C44
-	.incbin "graphics/trainers/front_pics/champion_steven_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ChampionSteven:: @ 8E50F7C
-	.incbin "graphics/trainers/palettes/champion_steven.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSFisherman:: @ 8E50FA4
-	.incbin "graphics/trainers/front_pics/rs_fisherman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSFisherman:: @ 8E51388
-	.incbin "graphics/trainers/palettes/rs_fisherman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CyclingTriathleteM:: @ 8E513B0
-	.incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CyclingTriathleteM:: @ 8E517C0
-	.incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CyclingTriathleteF:: @ 8E517E8
-	.incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CyclingTriathleteF:: @ 8E51BF4
-	.incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RunningTriathleteM:: @ 8E51C1C
-	.incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RunningTriathleteM:: @ 8E51ED4
-	.incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RunningTriathleteF:: @ 8E51EFC
-	.incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RunningTriathleteF:: @ 8E521A0
-	.incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmingTriathleteM:: @ 8E521C8
-	.incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmingTriathleteM:: @ 8E524F4
-	.incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmingTriathleteF:: @ 8E5251C
-	.incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmingTriathleteF:: @ 8E527F8
-	.incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_DragonTamer:: @ 8E52820
-	.incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_DragonTamer:: @ 8E52B74
-	.incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBirdKeeper:: @ 8E52B9C
-	.incbin "graphics/trainers/front_pics/rs_bird_keeper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBirdKeeper:: @ 8E52ED4
-	.incbin "graphics/trainers/palettes/rs_bird_keeper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_NinjaBoy:: @ 8E52EFC
-	.incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_NinjaBoy:: @ 8E531D8
-	.incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BattleGirl:: @ 8E53200
-	.incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BattleGirl:: @ 8E53520
-	.incbin "graphics/trainers/palettes/battle_girl.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ParasolLady:: @ 8E53548
-	.incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ParasolLady:: @ 8E53880
-	.incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSwimmerF:: @ 8E538A8
-	.incbin "graphics/trainers/front_pics/rs_swimmer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSwimmerF:: @ 8E53B78
-	.incbin "graphics/trainers/palettes/rs_swimmer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPicnicker:: @ 8E53BA0
-	.incbin "graphics/trainers/front_pics/rs_picnicker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPicnicker:: @ 8E53E80
-	.incbin "graphics/trainers/palettes/rs_picnicker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSTwins:: @ 8E53EA8
-	.incbin "graphics/trainers/front_pics/rs_twins_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSTwins:: @ 8E5426C
-	.incbin "graphics/trainers/palettes/rs_twins.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSailor:: @ 8E54294
-	.incbin "graphics/trainers/front_pics/rs_sailor_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSailor:: @ 8E54644
-	.incbin "graphics/trainers/palettes/rs_sailor.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Collector:: @ 8E5466C
-	.incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Collector:: @ 8E54A70
-	.incbin "graphics/trainers/palettes/collector.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Wally:: @ 8E54A98
-	.incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Wally:: @ 8E54D68
-	.incbin "graphics/trainers/palettes/wally.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBrendan1:: @ 8E54D90
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBrendan1:: @ 8E550A4
-	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSMay1:: @ 8E550CC
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSMay1:: @ 8E553CC
-	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonBreederM:: @ 8E553F4
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonBreederM:: @ 8E55724
-	.incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokemonBreederF:: @ 8E5574C
-	.incbin "graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokemonBreederF:: @ 8E55A80
-	.incbin "graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokemonRangerM:: @ 8E55AA8
-	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokemonRangerM:: @ 8E55DF0
-	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokemonRangerF:: @ 8E55E18
-	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokemonRangerF:: @ 8E5614C
-	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaLeaderMaxie:: @ 8E56174
-	.incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaLeaderMaxie:: @ 8E56468
-	.incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaGruntM:: @ 8E56490
-	.incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaGruntM:: @ 8E56810
-	.incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaGruntF:: @ 8E56838
-	.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaGruntF:: @ 8E56BC4
-	.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSLass:: @ 8E56BEC
-	.incbin "graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSLass:: @ 8E56EC4
-	.incbin "graphics/trainers/palettes/rs_lass.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBugCatcher:: @ 8E56EEC
-	.incbin "graphics/trainers/front_pics/rs_bug_catcher_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBugCatcher:: @ 8E57218
-	.incbin "graphics/trainers/palettes/rs_bug_catcher.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSHiker:: @ 8E57240
-	.incbin "graphics/trainers/front_pics/rs_hiker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSHiker:: @ 8E576C0
-	.incbin "graphics/trainers/palettes/rs_hiker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSYoungCouple:: @ 8E576E8
-	.incbin "graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSYoungCouple:: @ 8E57AA8
-	.incbin "graphics/trainers/palettes/rs_young_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_OldCouple:: @ 8E57AD0
-	.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_OldCouple:: @ 8E57FE0
-	.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSisAndBro:: @ 8E58008
-	.incbin "graphics/trainers/front_pics/rs_sis_and_bro_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSisAndBro:: @ 8E58454
-	.incbin "graphics/trainers/palettes/rs_sis_and_bro.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaAdminM:: @ 8E5847C
-	.incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaAdminM:: @ 8E58830
-	.incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaAdminF:: @ 8E58858
-	.incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaAdminF:: @ 8E58C1C
-	.incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaAdminM:: @ 8E58C44
-	.incbin "graphics/trainers/front_pics/magma_admin_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaAdminM:: @ 8E5901C
-	.incbin "graphics/trainers/palettes/magma_admin_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaAdminF:: @ 8E59044
-	.incbin "graphics/trainers/front_pics/magma_admin_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaAdminF:: @ 8E593F4
-	.incbin "graphics/trainers/palettes/magma_admin_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWattson:: @ 8E5941C
-	.incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWattson:: @ 8E59764
-	.incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderFlannery:: @ 8E5978C
-	.incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderFlannery:: @ 8E59B0C
-	.incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderNorman:: @ 8E59B34
-	.incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderNorman:: @ 8E59E70
-	.incbin "graphics/trainers/palettes/leader_norman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWinona:: @ 8E59E98
-	.incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWinona:: @ 8E5A218
-	.incbin "graphics/trainers/palettes/leader_winona.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWallace:: @ 8E5A240
-	.incbin "graphics/trainers/front_pics/leader_wallace_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWallace:: @ 8E5A5B8
-	.incbin "graphics/trainers/palettes/leader_wallace.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourGlacia:: @ 8E5A5E0
-	.incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourGlacia:: @ 8E5A964
-	.incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourDrake:: @ 8E5A98C
-	.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourDrake:: @ 8E5AD34
-	.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Youngster:: @ 8E5AD5C
-	.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Youngster:: @ 8E5AFFC
-	.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BugCatcher:: @ 8E5B024
-	.incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BugCatcher:: @ 8E5B36C
-	.incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Lass:: @ 8E5B394
-	.incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Lass:: @ 8E5B680
-	.incbin "graphics/trainers/palettes/lass.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Sailor:: @ 8E5B6A8
-	.incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Sailor:: @ 8E5B9C8
-	.incbin "graphics/trainers/palettes/sailor.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Camper:: @ 8E5B9F0
-	.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Camper:: @ 8E5BCD0
-	.incbin "graphics/trainers/palettes/camper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Picnicker:: @ 8E5BCF8
-	.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Picnicker:: @ 8E5BFE0
-	.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokeManiac:: @ 8E5C008
-	.incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokeManiac:: @ 8E5C3C4
-	.incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SuperNerd:: @ 8E5C3EC
-	.incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SuperNerd:: @ 8E5C704
-	.incbin "graphics/trainers/palettes/super_nerd.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Hiker:: @ 8E5C72C
-	.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Hiker:: @ 8E5CB9C
-	.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Biker:: @ 8E5CBC4
-	.incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Biker:: @ 8E5D12C
-	.incbin "graphics/trainers/palettes/biker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Burglar:: @ 8E5D154
-	.incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Burglar:: @ 8E5D4A0
-	.incbin "graphics/trainers/palettes/burglar.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Engineer:: @ 8E5D4C8
-	.incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Engineer:: @ 8E5D8D4
-	.incbin "graphics/trainers/palettes/engineer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Fisherman:: @ 8E5D8FC
-	.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Fisherman:: @ 8E5DCA8
-	.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmerM:: @ 8E5DCD0
-	.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmerM:: @ 8E5DFA8
-	.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CueBall:: @ 8E5DFD0
-	.incbin "graphics/trainers/front_pics/cue_ball_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CueBall:: @ 8E5E598
-	.incbin "graphics/trainers/palettes/cue_ball.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Gamer:: @ 8E5E5C0
-	.incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Gamer:: @ 8E5E954
-	.incbin "graphics/trainers/palettes/gamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Beauty:: @ 8E5E97C
-	.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Beauty:: @ 8E5ECD8
-	.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmerF:: @ 8E5ED00
-	.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmerF:: @ 8E5EFEC
-	.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PsychicM:: @ 8E5F014
-	.incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PsychicM:: @ 8E5F374
-	.incbin "graphics/trainers/palettes/psychic_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Rocker:: @ 8E5F39C
-	.incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Rocker:: @ 8E5F7F8
-	.incbin "graphics/trainers/palettes/rocker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Juggler:: @ 8E5F820
-	.incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Juggler:: @ 8E5FC5C
-	.incbin "graphics/trainers/palettes/juggler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Tamer:: @ 8E5FC84
-	.incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Tamer:: @ 8E60038
-	.incbin "graphics/trainers/palettes/tamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BirdKeeper:: @ 8E60060
-	.incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BirdKeeper:: @ 8E60424
-	.incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BlackBelt:: @ 8E6044C
-	.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BlackBelt:: @ 8E6086C
-	.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Rival1:: @ 8E60894
-	.incbin "graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Rival1:: @ 8E60B4C
-	.incbin "graphics/trainers/palettes/rival_1.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Scientist:: @ 8E60B74
-	.incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Scientist:: @ 8E60F50
-	.incbin "graphics/trainers/palettes/scientist.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderGiovanni:: @ 8E60F78
-	.incbin "graphics/trainers/front_pics/leader_giovanni_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderGiovanni:: @ 8E61288
-	.incbin "graphics/trainers/palettes/leader_giovanni.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RocketGruntM:: @ 8E612B0
-	.incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RocketGruntM:: @ 8E615E4
-	.incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CooltrainerM:: @ 8E6160C
-	.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CooltrainerM:: @ 8E618DC
-	.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CooltrainerF:: @ 8E61904
-	.incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CooltrainerF:: @ 8E61C1C
-	.incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourLorelei:: @ 8E61C44
-	.incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourLorelei:: @ 8E61F70
-	.incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourBruno:: @ 8E61F98
-	.incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourBruno:: @ 8E623E4
-	.incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourAgatha:: @ 8E6240C
-	.incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourAgatha:: @ 8E62728
-	.incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourLance:: @ 8E62750
-	.incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourLance:: @ 8E62B18
-	.incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBrock:: @ 8E62B40
-	.incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBrock:: @ 8E62E8C
-	.incbin "graphics/trainers/palettes/leader_brock.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderMisty:: @ 8E62EB4
-	.incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderMisty:: @ 8E631B4
-	.incbin "graphics/trainers/palettes/leader_misty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderLtSurge:: @ 8E631DC
-	.incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderLtSurge:: @ 8E6356C
-	.incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderErika:: @ 8E63594
-	.incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderErika:: @ 8E63888
-	.incbin "graphics/trainers/palettes/leader_erika.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderKoga:: @ 8E638B0
-	.incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderKoga:: @ 8E63C18
-	.incbin "graphics/trainers/palettes/leader_koga.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBlaine:: @ 8E63C40
-	.incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBlaine:: @ 8E6404C
-	.incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderSabrina:: @ 8E64074
-	.incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderSabrina:: @ 8E6437C
-	.incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Gentleman:: @ 8E643A4
-	.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Gentleman:: @ 8E646DC
-	.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Rival2:: @ 8E64704
-	.incbin "graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Rival2:: @ 8E649F8
-	.incbin "graphics/trainers/palettes/rival_2.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ChampionRival:: @ 8E64A20
-	.incbin "graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ChampionRival:: @ 8E64D1C
-	.incbin "graphics/trainers/palettes/champion_rival.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Channeler:: @ 8E64D44
-	.incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Channeler:: @ 8E6511C
-	.incbin "graphics/trainers/palettes/channeler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Twins:: @ 8E65144
-	.incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Twins:: @ 8E65494
-	.incbin "graphics/trainers/palettes/twins.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CoolCouple:: @ 8E654BC
-	.incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CoolCouple:: @ 8E6599C
-	.incbin "graphics/trainers/palettes/cool_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_YoungCouple:: @ 8E659C4
-	.incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_YoungCouple:: @ 8E65E10
-	.incbin "graphics/trainers/palettes/young_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CrushKin:: @ 8E65E38
-	.incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CrushKin:: @ 8E663D8
-	.incbin "graphics/trainers/palettes/crush_kin.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SisAndBro:: @ 8E66400
-	.incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SisAndBro:: @ 8E66860
-	.incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ProfessorOak:: @ 8E66888
-	.incbin "graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ProfessorOak:: @ 8E66BF4
-	.incbin "graphics/trainers/palettes/professor_oak.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBrendan2:: @ 8E66C1C
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBrendan2:: @ 8E66F30
-	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSMay2:: @ 8E66F58
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSMay2:: @ 8E67258
-	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Red:: @ 8E67280
-	.incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Red:: @ 8E6758C
-	.incbin "graphics/trainers/palettes/red.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Leaf:: @ 8E675B4
-	.incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Leaf:: @ 8E678F0
-	.incbin "graphics/trainers/palettes/leaf.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RocketGruntF:: @ 8E67918
-	.incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RocketGruntF:: @ 8E67C30
-	.incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PsychicF:: @ 8E67C58
-	.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PsychicF:: @ 8E67FF8
-	.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CrushGirl:: @ 8E68020
-	.incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CrushGirl:: @ 8E6832C
-	.incbin "graphics/trainers/palettes/crush_girl.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_TuberF:: @ 8E68354
-	.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_TuberF:: @ 8E68658
-	.incbin "graphics/trainers/palettes/tuber_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonBreederF:: @ 8E68680
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonBreederF:: @ 8E689C0
-	.incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonRangerM:: @ 8E689E8
-	.incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonRangerM:: @ 8E68D48
-	.incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonRangerF:: @ 8E68D70
-	.incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonRangerF:: @ 8E690A4
-	.incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AromaLady:: @ 8E690CC
-	.incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AromaLady:: @ 8E6941C
-	.incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RuinManiac:: @ 8E69444
-	.incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RuinManiac:: @ 8E69850
-	.incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Lady:: @ 8E69878
-	.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Lady:: @ 8E69BA0
-	.incbin "graphics/trainers/palettes/lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Painter:: @ 8E69BC8
-	.incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Painter:: @ 8E69E94
-	.incbin "graphics/trainers/palettes/painter.gbapal.lz"
-
-	.align 2
-gTrainerBackPic_Red:: @ 8E69EBC
-	.incbin "graphics/trainers/back_pics/red_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Leaf:: @ 8E6C6BC
-	.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Pokedude:: @ 8E6EEBC
-	.incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_OldMan:: @ 8E70EBC
-	.incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_RSBrendan:: @ 8E72EBC
-	.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_RSMay:: @ 8E74EBC
-	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
-
-	.align 2
-gTrainerPalette_RedBackPic:: @ 8E76EBC
-	.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerPalette_LeafBackPic:: @ 8E76EE4
-	.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerPalette_PokedudeBackPic:: @ 8E76F0C
-	.incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerPalette_OldManBackPic:: @ 8E76F34
-	.incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz"
-
-	.align 2
-gMonIcon_QuestionMark:: @ 8E76F5C
-	.incbin "graphics/pokemon/circled_question_mark/icon.4bpp"
-
-	.align 2
-gMonFootprint_QuestionMark:: @ 8E7735C
-	.incbin "graphics/pokemon/circled_question_mark/footprint.1bpp"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C
-	.incbin "graphics/battle_transitions/vs_frame.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_frame_tilemap:: @ 8E77464
-	.incbin "graphics/battle_transitions/vs_frame.bin.lz"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_frame_palette:: @ 8E77570
-	.incbin "graphics/battle_transitions/vs_frame.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_sheet:: @ 8E77598
-	.incbin "graphics/battle_transitions/vs.4bpp.lz" @from ruby
-
-	.align 2
-gFile_graphics_battle_terrain_plain_palette_palette:: @ 8E777A8
-	.incbin "graphics/battle_terrain/plain/palette.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_tiles_sheet:: @ 8E777E4
-	.incbin "graphics/battle_terrain/building/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_battle_frontier_palette:: @ 8E77D90
-	.incbin "graphics/battle_terrain/stadium/battle_frontier.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_map_tilemap:: @ 8E77DCC
-	.incbin "graphics/battle_terrain/building/map.bin.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_tiles_sheet:: @ 8E7807C
-	.incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_map_tilemap:: @ 8E78684
-	.incbin "graphics/battle_terrain/stadium/map.bin.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_palette_palette:: @ 8E78934
-	.incbin "graphics/battle_terrain/building/palette.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_water_kyogre_palette:: @ 8E78974
-	.incbin "graphics/battle_terrain/water/kyogre.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_cave_groudon_palette:: @ 8E789B0
-	.incbin "graphics/battle_terrain/cave/groudon.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_palette2_palette:: @ 8E78A08
-	.incbin "graphics/battle_terrain/building/palette2.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_palette3_palette:: @ 8E78A44
-	.incbin "graphics/battle_terrain/building/palette3.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette1_palette:: @ 8E78A80
-	.incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette2_palette:: @ 8E78AE0
-	.incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette3_palette:: @ 8E78B4C
-	.incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette4_palette:: @ 8E78B9C
-	.incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette5_palette:: @ 8E78BE4
-	.incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette6_palette:: @ 8E78C28
-	.incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette7_palette:: @ 8E78C78
-	.incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" @from ruby
-
-	.align 2
-gFile_graphics_battle_terrain_building_anim_tiles_sheet:: @ 8E78CB4
-	.incbin "graphics/battle_terrain/building/anim_tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_anim_map_tilemap:: @ 8E790C4
-	.incbin "graphics/battle_terrain/building/anim_map.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_FlyingDirt:: @ 8E791E8
-	.incbin "graphics/battle_anims/sprites/261.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap:: @ 8E79354
-	.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz"
-
-	.align 2
-gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0
-	.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC
-	.incbin "graphics/battle_anims/sprites/261.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_MetalSoundWaves:: @ 8E79A24
-	.incbin "graphics/battle_anims/sprites/260.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_MetalSoundWaves:: @ 8E79BE0
-	.incbin "graphics/battle_anims/sprites/260.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Ice:: @ 8E79BF8
-	.incbin "graphics/battle_anims/backgrounds/15.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Ice:: @ 8E7A568
-	.incbin "graphics/battle_anims/backgrounds/15.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Ice:: @ 8E7A58C
-	.incbin "graphics/battle_anims/backgrounds/15.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_IcicleSpear:: @ 8E7A784
-	.incbin "graphics/battle_anims/sprites/262.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_IcicleSpear:: @ 8E7A858
-	.incbin "graphics/battle_anims/sprites/262.gbapal.lz"
-
-	.align 2
-gContestNextTurnGfx:: @ 8E7A880
-	.incbin "graphics/contest/next_turn.4bpp.lz"
-
-	.align 2
-gFile_graphics_contest_nextturn_numbers:: @ 8E7A8DC
-	.incbin "graphics/contest/next_turn_numbers.4bpp"
-
-	.align 2
-gFile_graphics_contest_nextturn_random:: @ 8E7A95C
-	.incbin "graphics/contest/next_turn_random.4bpp"
-
-	.align 2
-gBattleAnimSpriteGfx_GlowyRedOrb:: @ 8E7A97C
-	.incbin "graphics/battle_anims/sprites/264.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GlowyRedOrb:: @ 8E7A99C
-	.incbin "graphics/battle_anims/sprites/264.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_GlowyGreenOrb:: @ 8E7A9B4
-	.incbin "graphics/battle_anims/sprites/265.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_SleepPowder:: @ 8E7A9CC
-	.incbin "graphics/battle_anims/sprites/067.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_StunSpore:: @ 8E7A9EC
-	.incbin "graphics/battle_anims/sprites/068.gbapal.lz"
-
-	.align 2
-gContestApplauseGfx:: @ 8E7AA0C
-	.incbin "graphics/contest/applause.4bpp.lz"
-	
-	.align 2
-gFile_graphics_contest_applause_meter:: @ 8E7AB38
-	.incbin "graphics/contest/applause_meter.4bpp"
-
-	.align 2
-gFile_graphics_contest_nextturn:: @ 8E7ABB8
-	.incbin "graphics/contest/next_turn.gbapal"
-
-	.align 2
-gBattleAnimSpriteGfx_Splash:: @ 8E7ABD8
-	.incbin "graphics/battle_anims/sprites/272.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Splash:: @ 8E7ADF4
-	.incbin "graphics/battle_anims/sprites/272.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SweatBead:: @ 8E7AE18
-	.incbin "graphics/battle_anims/sprites/273.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Pokeblock:: @ 8E7AE40
-	.incbin "graphics/battle_anims/sprites/269.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Pokeblock:: @ 8E7AE94
-	.incbin "graphics/battle_anims/sprites/269.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Gem1:: @ 8E7AEAC
-	.incbin "graphics/battle_anims/sprites/274.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Gem2:: @ 8E7B02C
-	.incbin "graphics/battle_anims/sprites/275.4bpp.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Gem3:: @ 8E7B198
-	.incbin "graphics/battle_anims/sprites/276.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Gem1:: @ 8E7B300
-	.incbin "graphics/battle_anims/sprites/274.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_InAir:: @ 8E7B328
-	.incbin "graphics/battle_anims/backgrounds/17.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_InAir:: @ 8E7B484
-	.incbin "graphics/battle_anims/backgrounds/17.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_InAir:: @ 8E7B4AC
-	.incbin "graphics/battle_anims/backgrounds/17.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Protect:: @ 8E7B694
-	.incbin "graphics/battle_anims/sprites/280.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Protect:: @ 8E7BA90
-	.incbin "graphics/battle_anims/sprites/280.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_anims_backgrounds_water_muddy_palette:: @ 8E7BAB0
-	.incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_interface_enemy_mon_shadow_sheet:: @ 8E7BAD4
-	.incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04
-	.incbin "graphics/battle_interface/ball_status_bar.4bpp.lz"
-	
-	.align 2
-gMonIcon_Egg:: @ 8E7BB88
-	.incbin "graphics/pokemon/egg/icon.4bpp"
-
-	.align 2
-gBattleAnimBgImage_Ghost:: @ 8E7BF88
-	.incbin "graphics/battle_anims/backgrounds/02.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Ghost:: @ 8E7CC50
-	.incbin "graphics/battle_anims/backgrounds/02.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Ghost:: @ 8E7CC6C
-	.incbin "graphics/battle_anims/backgrounds/02.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhipHit:: @ 8E7CF60
-	.incbin "graphics/battle_anims/sprites/287.gbapal.lz"
-
-	.align 2
-gBattleAnimBgPalette_Solarbeam:: @ 8E7CF88
-	.incbin "graphics/battle_anims/backgrounds/24.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_E7CFB0_tilemap:: @ 8E7CFB0
-	.incbin "graphics/unknown/unknown_E7CFB0.bin.lz"
-
-	.align 2
-gFile_graphics_berry_blender_center_sheet:: @ 8E7D4AC
-	.incbin "graphics/berry_blender/center.8bpp.lz"
-
-	.align 2
-gFile_graphics_berry_blender_outer_sheet:: @ 8E7DCCC
-	.incbin "graphics/berry_blender/outer.4bpp.lz"
-
-	.align 2
-gFile_graphics_berry_blender_outer_map_tilemap:: @ 8E7E700
-	.incbin "graphics/berry_blender/outer_map.bin.lz"
-
-	.align 2
-gBattleAnimBgPalette_Cosmic:: @ 8E7EA14
-	.incbin "graphics/battle_anims/backgrounds/16.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Cosmic:: @ 8E7EA3C
-	.incbin "graphics/battle_anims/backgrounds/16.4bpp.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Cosmic:: @ 8E7EC9C
-	.incbin "graphics/battle_anims/backgrounds/16.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_SlamHit2:: @ 8E7EDD8
-	.incbin "graphics/battle_anims/sprites/277.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_SlamHit2:: @ 8E7EE00
-	.incbin "graphics/battle_anims/sprites/277.4bpp.lz"
-
-	.align 2
-gBattleAnimFogTilemap:: @ 8E7F1F4
-	.incbin "graphics/battle_anims/backgrounds/fog.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_WeatherBall:: @ 8E7F36C
-	.incbin "graphics/battle_anims/sprites/283.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WeatherBall:: @ 8E7F388
-	.incbin "graphics/battle_anims/sprites/283.4bpp.lz"
-
-	.align 2
-gBattleAnimBgTilemap_ScaryFacePlayer:: @ 8E7F4AC
-	.incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_ScaryFaceOpponent:: @ 8E7F690
-	.incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"
-
-	.align 2
-gBattleAnimBgTilemap_ScaryFaceContest:: @ 8E7F874
-	.incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Hail:: @ 8E7FA58
-	.incbin "graphics/battle_anims/sprites/263.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Hail:: @ 8E7FA98
-	.incbin "graphics/battle_anims/sprites/263.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_GreenSpike:: @ 8E7FAB0
-	.incbin "graphics/battle_anims/sprites/266.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_GreenSpike:: @ 8E7FAF0
-	.incbin "graphics/battle_anims/sprites/266.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhiteCircleOfLight:: @ 8E7FB08
-	.incbin "graphics/battle_anims/sprites/267.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_GlowyBlueOrb:: @ 8E7FB20
-	.incbin "graphics/battle_anims/sprites/268.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Recycle:: @ 8E7FB38
-	.incbin "graphics/battle_anims/sprites/278.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Recycle:: @ 8E7FD44
-	.incbin "graphics/battle_anims/sprites/278.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_RedParticles:: @ 8E7FD60
-	.incbin "graphics/battle_anims/sprites/279.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_RedParticles:: @ 8E7FDAC
-	.incbin "graphics/battle_anims/sprites/279.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_DirtMound:: @ 8E7FDC8
-	.incbin "graphics/battle_anims/sprites/281.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_DirtMound:: @ 8E7FF50
-	.incbin "graphics/battle_anims/sprites/281.gbapal.lz"
-
-	.align 2
-gBattleAnimBgImage_Fissure:: @ 8E7FF70
-	.incbin "graphics/battle_anims/backgrounds/21.4bpp.lz"
-
-	.align 2
-gBattleAnimBgPalette_Fissure:: @ 8E80264
-	.incbin "graphics/battle_anims/backgrounds/21.gbapal.lz"
-
-	.align 2
-gBattleAnimBgTilemap_Fissure:: @ 8E80280
-	.incbin "graphics/battle_anims/backgrounds/21.bin.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Bird:: @ 8E8056C
-	.incbin "graphics/battle_anims/sprites/284.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Bird:: @ 8E808E8
-	.incbin "graphics/battle_anims/sprites/284.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_CrossImpact:: @ 8E80904
-	.incbin "graphics/battle_anims/sprites/285.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_CrossImpact:: @ 8E809A4
-	.incbin "graphics/battle_anims/sprites/285.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_anims_backgrounds_water_sheet:: @ 8E809CC
-	.incbin "graphics/battle_anims/backgrounds/water.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_anims_backgrounds_water_palette:: @ 8E81CEC
-	.incbin "graphics/battle_anims/backgrounds/water.gbapal.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_E81D14_tilemap:: @ 8E81D14
-	.incbin "graphics/unknown/unknown_E81D14.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_E81FE4_tilemap:: @ 8E81FE4
-	.incbin "graphics/unknown/unknown_E81FE4.bin.lz"
-
-	.align 2
-gFile_graphics_unknown_unknown_E822B8_tilemap:: @ 8E822B8
-	.incbin "graphics/unknown/unknown_E822B8.bin.lz"
-
-	.align 2
-gBattleAnimSpritePal_Slash2:: @ 8E825AC
-	.incbin "graphics/battle_anims/sprites/286.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WhiteShadow:: @ 8E825D4
-	.incbin "graphics/battle_anims/sprites/188.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhiteShadow:: @ 8E826E8
-	.incbin "graphics/battle_anims/sprites/188.gbapal.lz"
-
-	.align 2
-gPartyMenuBg_Gfx:: @ 8E82700
-	.incbin "graphics/interface/party_menu_misc.4bpp.lz"
-
-	.align 2
-gPartyMenuBg_Pal:: @ 8E829C8
-	.incbin "graphics/interface/party_menu_misc.gbapal.lz"
-
-	.align 2
-gPartyMenuBg_Tilemap:: @ 8E82AB0
-	.incbin "graphics/interface/party_menu_misc.bin.lz"
-
-	.align 2
-gPartyMenuPokeball_Gfx:: @ 8E82BE8
-	.incbin "graphics/interface/party_menu_pokeball.4bpp.lz"
-
-	.align 2
-gPartyMenuPokeballSmall_Gfx:: @ 8E82D68
-	.incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz"
-
-	.align 2
-gPartyMenuPokeball_Pal:: @ 8E82E7C
-	.incbin "graphics/interface/party_menu_pokeball.gbapal.lz"
-
-	.align 2
-gStatusGfx_Icons:: @ 8E82EA0
-	.incbin "graphics/interface/status_icons.4bpp.lz"
-
-	.align 2
-gStatusPal_Icons:: @ 8E830A4
-	.incbin "graphics/interface/status_icons.gbapal.lz"
-
-	.align 2
-gUnknown_8E830CC:: @ 8E830CC
-	.incbin "graphics/item_menu/bag_tiles.4bpp.lz" @ bag tiles
-
-    .align 2
-gUnknown_8E832C0:: @ 8E832C0
-	.incbin "graphics/item_menu/bag_tilemap1.bin.lz" @ bag menu
-
-    .align 2
-gUnknown_8E83444:: @ 8E83444
-	.incbin "graphics/item_menu/bag_tilemap2.bin.lz" @ PC deposit items
-
-    .align 2
-gBagBgPalette:: @ 8E835B4
-	.incbin "graphics/item_menu/bag_pal1.gbapal.lz" @ palette 1 (Boy + misc Pal)
-
-    .align 2
-gBagBgPalette_FemaleOverride:: @ 8E83604
-	.incbin "graphics/item_menu/bag_pal2.gbapal.lz" @ palette 2 (Girl)
-
-gUnknown_8E8362C:: @ 8E8362C
-	.incbin "graphics/interface/unk_8E8362C.4bpp.lz"
-
-gUnknown_8E83DBC:: @ 8E83DBC
-	.incbin "graphics/interface/unk_8E83DBC.4bpp.lz"
-
-gUnknown_8E84560:: @ 8E84560
-	.incbin "graphics/interface/unk_8E84560.gbapal.lz"
-	
-	.align 2
-gFile_graphics_interface_bag_swap_sheet:: @ 8E84588
-	.incbin "graphics/interface/bag_swap.4bpp.lz"
-
-	.align 2
-gFile_graphics_interface_bag_swap_palette:: @ 8E845C8
-	.incbin "graphics/interface/bag_swap.gbapal.lz"
-
-	.align 2
-gUnknown_8E845D8:: @ 8E845D8
-	.incbin "graphics/tm_case/unk_8E845D8.4bpp.lz"
-
-gUnknown_8E84A24:: @ 8E84A24
-	.incbin "graphics/tm_case/unk_8E84A24.bin.lz"
-
-gUnknown_8E84B70:: @ 8E84B70
-	.incbin "graphics/tm_case/unk_8E84B70.bin.lz"
-
-gUnknown_8E84CB0:: @ 8E84CB0
-	.incbin "graphics/tm_case/unk_8E84CB0.gbapal.lz"
-
-gUnknown_8E84D20:: @ 8E84D20
-	.incbin "graphics/tm_case/unk_8E84D20.gbapal.lz"
-	
-gTMCase_TMSpriteGfx:: @ 8E84D90
-	.incbin "graphics/tm_case/unk_8E84D90.4bpp.lz"
-
-gUnknown_8E84F20:: @ 8E84F20
-	.incbin "graphics/tm_case/unk_8E84F20.gbapal.lz"
-
-gUnknown_8E85068:: @ 8E85068
-	.incbin "graphics/tm_case/unk_8E85068.gbapal.lz"
-
-gItemPcTiles:: @ 8E85090
-	.incbin "graphics/item_pc/unk_8E85090.4bpp.lz"
-
-gItemPcBgPals:: @ 8E85408
-	.incbin "graphics/item_pc/unk_8E85408.gbapal.lz"
-
-gItemPcTilemap:: @ 8E85458
-	.incbin "graphics/item_pc/unk_8E85458.bin.lz"
-
-gBerryPouchSpriteTiles:: @ 8E8560C
-	.incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz"
-
-gBerryPouchBgGfx:: @ 8E859D0
-	.incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz"
-
-gBerryPouchBgPals:: @ 8E85BA4
-	.incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz"
-
-gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4
-	.incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz"
-
-gBerryPouchSpritePalette:: @ 8E85C1C
-	.incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz"
-
-gBerryPouchBg1Tilemap:: @ 8E85C44
-	.incbin "graphics/berry_pouch/unk_8E85C44.bin.lz"
-
-gBuyMenuFrame_Gfx:: @ 8E85DC8
-	.incbin "graphics/shop_menu/shop_menu.4bpp.lz"
-
-gBuyMenuFrame_Tilemap:: @ 8E85EFC
-	.incbin "graphics/shop_menu/shop_tilemap.bin"
-
-gBuyMenuFrame_TmHmTilemap:: @ 8E86038
-	.incbin "graphics/shop_menu/shop_tm_hm_tilemap.bin"
-
-gBuyMenuFrame_Pal:: @ 8E86170
-	.incbin "graphics/shop_menu/shop_menu.gbapal.lz"
-
-gUnknown_8E861A8:: @ 8E861A8
-	.incbin "graphics/unknown/unknown_E861A8.bin.lz" @ hmm what is this.
-
-gUnknown_8E86240:: @ 8E86240
-	.incbin "graphics/teachy_tv/tiles.4bpp.lz"
-
-gUnknown_8E86BE8:: @ 8E86BE8
-	.incbin "graphics/teachy_tv/bg1_tilemap.bin.lz"
-
-gUnknown_8E86D6C:: @ 8E86D6C
-	.incbin "graphics/teachy_tv/bg2_tilemap.bin.lz"
-
-gUnknown_8E86F98:: @ 8E86F98
-	.incbin "graphics/teachy_tv/palettes.gbapal.lz"
-
-gUnknown_8E87010:: @ 8E87010
-	.incbin "graphics/unknown/unknown_E87010.gbapal.lz"
-	
-	@ THIS IS ITEM ICONS
-	.align 2
-gFile_graphics_items_icons_question_mark_sheet:: @ 8E87028
-	.incbin "graphics/items/icons/question_mark.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_question_mark_palette:: @ 8E870A0
-	.incbin "graphics/items/icon_palettes/question_mark.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_return_to_field_arrow_sheet:: @ 8E870B4
-	.incbin "graphics/items/icons/return_to_field_arrow.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_return_to_field_arrow_palette:: @ 8E8713C
-	.incbin "graphics/items/icon_palettes/return_to_field_arrow.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_master_ball_sheet:: @ 8E87154
-	.incbin "graphics/items/icons/master_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_master_ball_palette:: @ 8E87224
-	.incbin "graphics/items/icon_palettes/master_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_ultra_ball_sheet:: @ 8E8724C
-	.incbin "graphics/items/icons/ultra_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ultra_ball_palette:: @ 8E8730C
-	.incbin "graphics/items/icon_palettes/ultra_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_great_ball_sheet:: @ 8E87334
-	.incbin "graphics/items/icons/great_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_great_ball_palette:: @ 8E87404
-	.incbin "graphics/items/icon_palettes/great_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_poke_ball_sheet:: @ 8E8742C
-	.incbin "graphics/items/icons/poke_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_poke_ball_palette:: @ 8E874DC
-	.incbin "graphics/items/icon_palettes/poke_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_safari_ball_sheet:: @ 8E87500
-	.incbin "graphics/items/icons/safari_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_safari_ball_palette:: @ 8E875D0
-	.incbin "graphics/items/icon_palettes/safari_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_net_ball_sheet:: @ 8E875F8
-	.incbin "graphics/items/icons/net_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_net_ball_palette:: @ 8E876CC
-	.incbin "graphics/items/icon_palettes/net_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_dive_ball_sheet:: @ 8E876F0
-	.incbin "graphics/items/icons/dive_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dive_ball_palette:: @ 8E877B8
-	.incbin "graphics/items/icon_palettes/dive_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_nest_ball_sheet:: @ 8E877DC
-	.incbin "graphics/items/icons/nest_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_nest_ball_palette:: @ 8E878A0
-	.incbin "graphics/items/icon_palettes/nest_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_repeat_ball_sheet:: @ 8E878C8
-	.incbin "graphics/items/icons/repeat_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_repeat_ball_palette:: @ 8E8798C
-	.incbin "graphics/items/icon_palettes/repeat_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_timer_ball_sheet:: @ 8E879B4
-	.incbin "graphics/items/icons/timer_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_luxury_ball_sheet:: @ 8E87A7C
-	.incbin "graphics/items/icons/luxury_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_luxury_ball_palette:: @ 8E87B38
-	.incbin "graphics/items/icon_palettes/luxury_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_premier_ball_sheet:: @ 8E87B60
-	.incbin "graphics/items/icons/premier_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_potion_sheet:: @ 8E87C04
-	.incbin "graphics/items/icons/potion.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_potion_palette:: @ 8E87CCC
-	.incbin "graphics/items/icon_palettes/potion.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_antidote_sheet:: @ 8E87CF0
-	.incbin "graphics/items/icons/antidote.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_antidote_palette:: @ 8E87DA0
-	.incbin "graphics/items/icon_palettes/antidote.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_burn_heal_palette:: @ 8E87DC4
-	.incbin "graphics/items/icon_palettes/burn_heal.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ice_heal_palette:: @ 8E87DE8
-	.incbin "graphics/items/icon_palettes/ice_heal.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_status_heal_sheet:: @ 8E87E0C
-	.incbin "graphics/items/icons/status_heal.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_awakening_palette:: @ 8E87EBC
-	.incbin "graphics/items/icon_palettes/awakening.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_paralyze_heal_palette:: @ 8E87EE0
-	.incbin "graphics/items/icon_palettes/paralyze_heal.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_large_potion_sheet:: @ 8E87F04
-	.incbin "graphics/items/icons/large_potion.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_full_restore_palette:: @ 8E87FE8
-	.incbin "graphics/items/icon_palettes/full_restore.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_max_potion_palette:: @ 8E8800C
-	.incbin "graphics/items/icon_palettes/max_potion.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_hyper_potion_palette:: @ 8E88030
-	.incbin "graphics/items/icon_palettes/hyper_potion.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_super_potion_palette:: @ 8E88054
-	.incbin "graphics/items/icon_palettes/super_potion.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_full_heal_sheet:: @ 8E88078
-	.incbin "graphics/items/icons/full_heal.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_full_heal_palette:: @ 8E88120
-	.incbin "graphics/items/icon_palettes/full_heal.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_revive_sheet:: @ 8E88148
-	.incbin "graphics/items/icons/revive.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_max_revive_sheet:: @ 8E881A4
-	.incbin "graphics/items/icons/max_revive.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_revive_palette:: @ 8E88270
-	.incbin "graphics/items/icon_palettes/revive.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_fresh_water_sheet:: @ 8E8828C
-	.incbin "graphics/items/icons/fresh_water.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fresh_water_palette:: @ 8E8833C
-	.incbin "graphics/items/icon_palettes/fresh_water.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_soda_pop_sheet:: @ 8E88360
-	.incbin "graphics/items/icons/soda_pop.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_soda_pop_palette:: @ 8E883F4
-	.incbin "graphics/items/icon_palettes/soda_pop.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lemonade_sheet:: @ 8E8841C
-	.incbin "graphics/items/icons/lemonade.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lemonade_palette:: @ 8E884DC
-	.incbin "graphics/items/icon_palettes/lemonade.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_moomoo_milk_sheet:: @ 8E88504
-	.incbin "graphics/items/icons/moomoo_milk.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_moomoo_milk_palette:: @ 8E885B4
-	.incbin "graphics/items/icon_palettes/moomoo_milk.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_powder_sheet:: @ 8E885DC
-	.incbin "graphics/items/icons/powder.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_energy_powder_palette:: @ 8E88668
-	.incbin "graphics/items/icon_palettes/energy_powder.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_energy_root_sheet:: @ 8E88688
-	.incbin "graphics/items/icons/energy_root.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_energy_root_palette:: @ 8E88754
-	.incbin "graphics/items/icon_palettes/energy_root.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_heal_powder_palette:: @ 8E88770
-	.incbin "graphics/items/icon_palettes/heal_powder.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_revival_herb_sheet:: @ 8E88790
-	.incbin "graphics/items/icons/revival_herb.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_revival_herb_palette:: @ 8E88860
-	.incbin "graphics/items/icon_palettes/revival_herb.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_ether_sheet:: @ 8E88880
-	.incbin "graphics/items/icons/ether.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ether_palette:: @ 8E88940
-	.incbin "graphics/items/icon_palettes/ether.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_max_ether_palette:: @ 8E88964
-	.incbin "graphics/items/icon_palettes/max_ether.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_elixir_palette:: @ 8E88988
-	.incbin "graphics/items/icon_palettes/elixir.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_max_elixir_palette:: @ 8E889AC
-	.incbin "graphics/items/icon_palettes/max_elixir.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lava_cookie_sheet:: @ 8E889D0
-	.incbin "graphics/items/icons/lava_cookie.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lava_cookie_and_letter_palette:: @ 8E88A9C
-	.incbin "graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_flute_sheet:: @ 8E88AC0
-	.incbin "graphics/items/icons/flute.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_blue_flute_palette:: @ 8E88B74
-	.incbin "graphics/items/icon_palettes/blue_flute.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_yellow_flute_palette:: @ 8E88B98
-	.incbin "graphics/items/icon_palettes/yellow_flute.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_red_flute_palette:: @ 8E88BBC
-	.incbin "graphics/items/icon_palettes/red_flute.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_black_flute_palette:: @ 8E88BE0
-	.incbin "graphics/items/icon_palettes/black_flute.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_white_flute_palette:: @ 8E88C04
-	.incbin "graphics/items/icon_palettes/white_flute.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_berry_juice_sheet:: @ 8E88C28
-	.incbin "graphics/items/icons/berry_juice.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_berry_juice_palette:: @ 8E88D08
-	.incbin "graphics/items/icon_palettes/berry_juice.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_sacred_ash_sheet:: @ 8E88D30
-	.incbin "graphics/items/icons/sacred_ash.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_sacred_ash_palette:: @ 8E88DF0
-	.incbin "graphics/items/icon_palettes/sacred_ash.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_shoal_salt_palette:: @ 8E88E14
-	.incbin "graphics/items/icon_palettes/shoal_salt.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_shoal_shell_sheet:: @ 8E88E34
-	.incbin "graphics/items/icons/shoal_shell.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_shell_palette:: @ 8E88F28
-	.incbin "graphics/items/icon_palettes/shell.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_shard_sheet:: @ 8E88F50
-	.incbin "graphics/items/icons/shard.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_red_shard_palette:: @ 8E88FAC
-	.incbin "graphics/items/icon_palettes/red_shard.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_blue_shard_palette:: @ 8E88FC4
-	.incbin "graphics/items/icon_palettes/blue_shard.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_yellow_shard_palette:: @ 8E88FDC
-	.incbin "graphics/items/icon_palettes/yellow_shard.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_green_shard_palette:: @ 8E88FF4
-	.incbin "graphics/items/icon_palettes/green_shard.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_hp_up_sheet:: @ 8E8900C
-	.incbin "graphics/items/icons/hp_up.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_hp_up_palette:: @ 8E890C4
-	.incbin "graphics/items/icon_palettes/hp_up.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_vitamin_sheet:: @ 8E890EC
-	.incbin "graphics/items/icons/vitamin.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_protein_palette:: @ 8E8919C
-	.incbin "graphics/items/icon_palettes/protein.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_iron_palette:: @ 8E891C4
-	.incbin "graphics/items/icon_palettes/iron.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_carbos_palette:: @ 8E891EC
-	.incbin "graphics/items/icon_palettes/carbos.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_calcium_palette:: @ 8E89214
-	.incbin "graphics/items/icon_palettes/calcium.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_rare_candy_sheet:: @ 8E8923C
-	.incbin "graphics/items/icons/rare_candy.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_rare_candy_palette:: @ 8E89300
-	.incbin "graphics/items/icon_palettes/rare_candy.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pp_up_sheet:: @ 8E8931C
-	.incbin "graphics/items/icons/pp_up.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pp_up_palette:: @ 8E893CC
-	.incbin "graphics/items/icon_palettes/pp_up.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_zinc_palette:: @ 8E893F4
-	.incbin "graphics/items/icon_palettes/zinc.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pp_max_sheet:: @ 8E8941C
-	.incbin "graphics/items/icons/pp_max.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pp_max_palette:: @ 8E894C4
-	.incbin "graphics/items/icon_palettes/pp_max.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_guard_spec_palette:: @ 8E894EC
-	.incbin "graphics/items/icon_palettes/guard_spec.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dire_hit_palette:: @ 8E89510
-	.incbin "graphics/items/icon_palettes/dire_hit.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_x_attack_palette:: @ 8E89534
-	.incbin "graphics/items/icon_palettes/x_attack.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_battle_stat_item_sheet:: @ 8E89558
-	.incbin "graphics/items/icons/battle_stat_item.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_x_defend_palette:: @ 8E8963C
-	.incbin "graphics/items/icon_palettes/x_defend.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_x_speed_palette:: @ 8E89660
-	.incbin "graphics/items/icon_palettes/x_speed.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_x_accuracy_palette:: @ 8E89684
-	.incbin "graphics/items/icon_palettes/x_accuracy.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_x_special_palette:: @ 8E896A8
-	.incbin "graphics/items/icon_palettes/x_special.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_poke_doll_sheet:: @ 8E896CC
-	.incbin "graphics/items/icons/poke_doll.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_poke_doll_palette:: @ 8E897BC
-	.incbin "graphics/items/icon_palettes/poke_doll.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_fluffy_tail_sheet:: @ 8E897D8
-	.incbin "graphics/items/icons/fluffy_tail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fluffy_tail_palette:: @ 8E898C8
-	.incbin "graphics/items/icon_palettes/fluffy_tail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_repel_sheet:: @ 8E898EC
-	.incbin "graphics/items/icons/repel.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_super_repel_palette:: @ 8E8998C
-	.incbin "graphics/items/icon_palettes/super_repel.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_max_repel_palette:: @ 8E899B4
-	.incbin "graphics/items/icon_palettes/max_repel.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_escape_rope_sheet:: @ 8E899DC
-	.incbin "graphics/items/icons/escape_rope.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_escape_rope_palette:: @ 8E89A90
-	.incbin "graphics/items/icon_palettes/escape_rope.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_repel_palette:: @ 8E89AB4
-	.incbin "graphics/items/icon_palettes/repel.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_sun_stone_sheet:: @ 8E89ADC
-	.incbin "graphics/items/icons/sun_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_sun_stone_palette:: @ 8E89BD4
-	.incbin "graphics/items/icon_palettes/sun_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_moon_stone_sheet:: @ 8E89BF0
-	.incbin "graphics/items/icons/moon_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_moon_stone_palette:: @ 8E89CC4
-	.incbin "graphics/items/icon_palettes/moon_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_fire_stone_sheet:: @ 8E89CE4
-	.incbin "graphics/items/icons/fire_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fire_stone_palette:: @ 8E89DD8
-	.incbin "graphics/items/icon_palettes/fire_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_thunder_stone_sheet:: @ 8E89E00
-	.incbin "graphics/items/icons/thunder_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_thunder_stone_palette:: @ 8E89EE8
-	.incbin "graphics/items/icon_palettes/thunder_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_water_stone_sheet:: @ 8E89F08
-	.incbin "graphics/items/icons/water_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_water_stone_palette:: @ 8E89FE8
-	.incbin "graphics/items/icon_palettes/water_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_leaf_stone_sheet:: @ 8E8A00C
-	.incbin "graphics/items/icons/leaf_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_leaf_stone_palette:: @ 8E8A100
-	.incbin "graphics/items/icon_palettes/leaf_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tiny_mushroom_sheet:: @ 8E8A128
-	.incbin "graphics/items/icons/tiny_mushroom.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_big_mushroom_sheet:: @ 8E8A1A8
-	.incbin "graphics/items/icons/big_mushroom.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mushroom_palette:: @ 8E8A260
-	.incbin "graphics/items/icon_palettes/mushroom.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pearl_sheet:: @ 8E8A284
-	.incbin "graphics/items/icons/pearl.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pearl_palette:: @ 8E8A300
-	.incbin "graphics/items/icon_palettes/pearl.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_big_pearl_sheet:: @ 8E8A328
-	.incbin "graphics/items/icons/big_pearl.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_stardust_sheet:: @ 8E8A3E0
-	.incbin "graphics/items/icons/stardust.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_star_palette:: @ 8E8A4A0
-	.incbin "graphics/items/icon_palettes/star.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_star_piece_sheet:: @ 8E8A4C4
-	.incbin "graphics/items/icons/star_piece.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_nugget_sheet:: @ 8E8A548
-	.incbin "graphics/items/icons/nugget.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_nugget_palette:: @ 8E8A5D4
-	.incbin "graphics/items/icon_palettes/nugget.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_heart_scale_sheet:: @ 8E8A5F4
-	.incbin "graphics/items/icons/heart_scale.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_heart_scale_palette:: @ 8E8A694
-	.incbin "graphics/items/icon_palettes/heart_scale.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_orange_mail_sheet:: @ 8E8A6B0
-	.incbin "graphics/items/icons/orange_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_orange_mail_palette:: @ 8E8A784
-	.incbin "graphics/items/icon_palettes/orange_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_harbor_mail_sheet:: @ 8E8A7A4
-	.incbin "graphics/items/icons/harbor_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_harbor_mail_palette:: @ 8E8A86C
-	.incbin "graphics/items/icon_palettes/harbor_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_glitter_mail_sheet:: @ 8E8A88C
-	.incbin "graphics/items/icons/glitter_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_glitter_mail_palette:: @ 8E8A968
-	.incbin "graphics/items/icon_palettes/glitter_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_mech_mail_sheet:: @ 8E8A990
-	.incbin "graphics/items/icons/mech_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mech_mail_palette:: @ 8E8AA6C
-	.incbin "graphics/items/icon_palettes/mech_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_wood_mail_sheet:: @ 8E8AA8C
-	.incbin "graphics/items/icons/wood_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_wood_mail_palette:: @ 8E8AB6C
-	.incbin "graphics/items/icon_palettes/wood_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_wave_mail_sheet:: @ 8E8AB8C
-	.incbin "graphics/items/icons/wave_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_wave_mail_palette:: @ 8E8AC64
-	.incbin "graphics/items/icon_palettes/wave_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_bead_mail_sheet:: @ 8E8AC84
-	.incbin "graphics/items/icons/bead_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_bead_mail_palette:: @ 8E8AD44
-	.incbin "graphics/items/icon_palettes/bead_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_shadow_mail_sheet:: @ 8E8AD64
-	.incbin "graphics/items/icons/shadow_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_shadow_mail_palette:: @ 8E8AE38
-	.incbin "graphics/items/icon_palettes/shadow_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tropic_mail_sheet:: @ 8E8AE5C
-	.incbin "graphics/items/icons/tropic_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_tropic_mail_palette:: @ 8E8AF40
-	.incbin "graphics/items/icon_palettes/tropic_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_dream_mail_sheet:: @ 8E8AF64
-	.incbin "graphics/items/icons/dream_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dream_mail_palette:: @ 8E8B044
-	.incbin "graphics/items/icon_palettes/dream_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_fab_mail_sheet:: @ 8E8B064
-	.incbin "graphics/items/icons/fab_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fab_mail_palette:: @ 8E8B12C
-	.incbin "graphics/items/icon_palettes/fab_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_retro_mail_sheet:: @ 8E8B148
-	.incbin "graphics/items/icons/retro_mail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_retro_mail_palette:: @ 8E8B1E0
-	.incbin "graphics/items/icon_palettes/retro_mail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_cheri_berry_sheet:: @ 8E8B200
-	.incbin "graphics/items/icons/cheri_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_cheri_berry_palette:: @ 8E8B2E8
-	.incbin "graphics/items/icon_palettes/cheri_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_chesto_berry_sheet:: @ 8E8B310
-	.incbin "graphics/items/icons/chesto_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_chesto_berry_palette:: @ 8E8B3D0
-	.incbin "graphics/items/icon_palettes/chesto_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pecha_berry_sheet:: @ 8E8B3F4
-	.incbin "graphics/items/icons/pecha_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pecha_berry_palette:: @ 8E8B4B4
-	.incbin "graphics/items/icon_palettes/pecha_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_rawst_berry_sheet:: @ 8E8B4D8
-	.incbin "graphics/items/icons/rawst_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_rawst_berry_palette:: @ 8E8B5BC
-	.incbin "graphics/items/icon_palettes/rawst_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_aspear_berry_sheet:: @ 8E8B5E0
-	.incbin "graphics/items/icons/aspear_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_aspear_berry_palette:: @ 8E8B6C8
-	.incbin "graphics/items/icon_palettes/aspear_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_leppa_berry_sheet:: @ 8E8B6EC
-	.incbin "graphics/items/icons/leppa_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_leppa_berry_palette:: @ 8E8B7A4
-	.incbin "graphics/items/icon_palettes/leppa_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_oran_berry_sheet:: @ 8E8B7C8
-	.incbin "graphics/items/icons/oran_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_oran_berry_palette:: @ 8E8B88C
-	.incbin "graphics/items/icon_palettes/oran_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_persim_berry_sheet:: @ 8E8B8B0
-	.incbin "graphics/items/icons/persim_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_persim_berry_palette:: @ 8E8B984
-	.incbin "graphics/items/icon_palettes/persim_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lum_berry_sheet:: @ 8E8B9A8
-	.incbin "graphics/items/icons/lum_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lum_berry_palette:: @ 8E8BA60
-	.incbin "graphics/items/icon_palettes/lum_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_sitrus_berry_sheet:: @ 8E8BA7C
-	.incbin "graphics/items/icons/sitrus_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_sitrus_berry_palette:: @ 8E8BB48
-	.incbin "graphics/items/icon_palettes/sitrus_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_figy_berry_sheet:: @ 8E8BB6C
-	.incbin "graphics/items/icons/figy_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_figy_berry_palette:: @ 8E8BC34
-	.incbin "graphics/items/icon_palettes/figy_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_wiki_berry_sheet:: @ 8E8BC58
-	.incbin "graphics/items/icons/wiki_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_wiki_berry_palette:: @ 8E8BD3C
-	.incbin "graphics/items/icon_palettes/wiki_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_mago_berry_sheet:: @ 8E8BD60
-	.incbin "graphics/items/icons/mago_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mago_berry_palette:: @ 8E8BE1C
-	.incbin "graphics/items/icon_palettes/mago_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_aguav_berry_sheet:: @ 8E8BE40
-	.incbin "graphics/items/icons/aguav_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_aguav_berry_palette:: @ 8E8BF2C
-	.incbin "graphics/items/icon_palettes/aguav_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_iapapa_berry_sheet:: @ 8E8BF4C
-	.incbin "graphics/items/icons/iapapa_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_iapapa_berry_palette:: @ 8E8C034
-	.incbin "graphics/items/icon_palettes/iapapa_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_razz_berry_sheet:: @ 8E8C058
-	.incbin "graphics/items/icons/razz_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_razz_berry_palette:: @ 8E8C138
-	.incbin "graphics/items/icon_palettes/razz_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_bluk_berry_sheet:: @ 8E8C15C
-	.incbin "graphics/items/icons/bluk_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_bluk_berry_palette:: @ 8E8C24C
-	.incbin "graphics/items/icon_palettes/bluk_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_nanab_berry_sheet:: @ 8E8C270
-	.incbin "graphics/items/icons/nanab_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_nanab_berry_palette:: @ 8E8C354
-	.incbin "graphics/items/icon_palettes/nanab_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_wepear_berry_sheet:: @ 8E8C378
-	.incbin "graphics/items/icons/wepear_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_wepear_berry_palette:: @ 8E8C440
-	.incbin "graphics/items/icon_palettes/wepear_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pinap_berry_sheet:: @ 8E8C45C
-	.incbin "graphics/items/icons/pinap_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pinap_berry_palette:: @ 8E8C550
-	.incbin "graphics/items/icon_palettes/pinap_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pomeg_berry_sheet:: @ 8E8C574
-	.incbin "graphics/items/icons/pomeg_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pomeg_berry_palette:: @ 8E8C628
-	.incbin "graphics/items/icon_palettes/pomeg_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_kelpsy_berry_sheet:: @ 8E8C64C
-	.incbin "graphics/items/icons/kelpsy_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_kelpsy_berry_palette:: @ 8E8C71C
-	.incbin "graphics/items/icon_palettes/kelpsy_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_qualot_berry_sheet:: @ 8E8C73C
-	.incbin "graphics/items/icons/qualot_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_qualot_berry_palette:: @ 8E8C808
-	.incbin "graphics/items/icon_palettes/qualot_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_hondew_berry_sheet:: @ 8E8C82C
-	.incbin "graphics/items/icons/hondew_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_hondew_berry_palette:: @ 8E8C90C
-	.incbin "graphics/items/icon_palettes/hondew_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_grepa_berry_sheet:: @ 8E8C930
-	.incbin "graphics/items/icons/grepa_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_grepa_berry_palette:: @ 8E8C9E4
-	.incbin "graphics/items/icon_palettes/grepa_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tamato_berry_sheet:: @ 8E8CA08
-	.incbin "graphics/items/icons/tamato_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_tamato_berry_palette:: @ 8E8CAE4
-	.incbin "graphics/items/icon_palettes/tamato_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_cornn_berry_sheet:: @ 8E8CB08
-	.incbin "graphics/items/icons/cornn_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_cornn_berry_palette:: @ 8E8CBF4
-	.incbin "graphics/items/icon_palettes/cornn_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_magost_berry_sheet:: @ 8E8CC1C
-	.incbin "graphics/items/icons/magost_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_magost_berry_palette:: @ 8E8CCC4
-	.incbin "graphics/items/icon_palettes/magost_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_rabuta_berry_sheet:: @ 8E8CCE8
-	.incbin "graphics/items/icons/rabuta_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_rabuta_berry_palette:: @ 8E8CDE4
-	.incbin "graphics/items/icon_palettes/rabuta_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_nomel_berry_sheet:: @ 8E8CE08
-	.incbin "graphics/items/icons/nomel_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_nomel_berry_palette:: @ 8E8CEAC
-	.incbin "graphics/items/icon_palettes/nomel_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_spelon_berry_sheet:: @ 8E8CEC8
-	.incbin "graphics/items/icons/spelon_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_spelon_berry_palette:: @ 8E8CF8C
-	.incbin "graphics/items/icon_palettes/spelon_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pamtre_berry_sheet:: @ 8E8CFAC
-	.incbin "graphics/items/icons/pamtre_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pamtre_berry_palette:: @ 8E8D08C
-	.incbin "graphics/items/icon_palettes/pamtre_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_watmel_berry_sheet:: @ 8E8D0B4
-	.incbin "graphics/items/icons/watmel_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_watmel_berry_palette:: @ 8E8D1C4
-	.incbin "graphics/items/icon_palettes/watmel_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_durin_berry_sheet:: @ 8E8D1E8
-	.incbin "graphics/items/icons/durin_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_durin_berry_palette:: @ 8E8D2EC
-	.incbin "graphics/items/icon_palettes/durin_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_belue_berry_sheet:: @ 8E8D310
-	.incbin "graphics/items/icons/belue_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_belue_berry_palette:: @ 8E8D3F4
-	.incbin "graphics/items/icon_palettes/belue_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_liechi_berry_sheet:: @ 8E8D418
-	.incbin "graphics/items/icons/liechi_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_liechi_berry_palette:: @ 8E8D4F8
-	.incbin "graphics/items/icon_palettes/liechi_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_ganlon_berry_sheet:: @ 8E8D518
-	.incbin "graphics/items/icons/ganlon_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ganlon_berry_palette:: @ 8E8D5F8
-	.incbin "graphics/items/icon_palettes/ganlon_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_salac_berry_sheet:: @ 8E8D618
-	.incbin "graphics/items/icons/salac_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_salac_berry_palette:: @ 8E8D700
-	.incbin "graphics/items/icon_palettes/salac_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_petaya_berry_sheet:: @ 8E8D720
-	.incbin "graphics/items/icons/petaya_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_petaya_berry_palette:: @ 8E8D818
-	.incbin "graphics/items/icon_palettes/petaya_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_apicot_berry_sheet:: @ 8E8D83C
-	.incbin "graphics/items/icons/apicot_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_apicot_berry_palette:: @ 8E8D8F4
-	.incbin "graphics/items/icon_palettes/apicot_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lansat_berry_sheet:: @ 8E8D91C
-	.incbin "graphics/items/icons/lansat_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lansat_berry_palette:: @ 8E8D9FC
-	.incbin "graphics/items/icon_palettes/lansat_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_starf_berry_sheet:: @ 8E8DA20
-	.incbin "graphics/items/icons/starf_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_starf_berry_palette:: @ 8E8DAF0
-	.incbin "graphics/items/icon_palettes/starf_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_enigma_berry_sheet:: @ 8E8DB14
-	.incbin "graphics/items/icons/enigma_berry.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_enigma_berry_palette:: @ 8E8DBE0
-	.incbin "graphics/items/icon_palettes/enigma_berry.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_bright_powder_sheet:: @ 8E8DC00
-	.incbin "graphics/items/icons/bright_powder.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_bright_powder_palette:: @ 8E8DCBC
-	.incbin "graphics/items/icon_palettes/bright_powder.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_in_battle_herb_sheet:: @ 8E8DCDC
-	.incbin "graphics/items/icons/in_battle_herb.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_white_herb_palette:: @ 8E8DD88
-	.incbin "graphics/items/icon_palettes/white_herb.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_macho_brace_sheet:: @ 8E8DDA8
-	.incbin "graphics/items/icons/macho_brace.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_macho_brace_palette:: @ 8E8DE94
-	.incbin "graphics/items/icon_palettes/macho_brace.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_exp_share_sheet:: @ 8E8DEBC
-	.incbin "graphics/items/icons/exp_share.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_exp_share_palette:: @ 8E8DFA8
-	.incbin "graphics/items/icon_palettes/exp_share.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_quick_claw_sheet:: @ 8E8DFD0
-	.incbin "graphics/items/icons/quick_claw.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_quick_claw_palette:: @ 8E8E068
-	.incbin "graphics/items/icon_palettes/quick_claw.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_soothe_bell_sheet:: @ 8E8E088
-	.incbin "graphics/items/icons/soothe_bell.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_soothe_bell_palette:: @ 8E8E14C
-	.incbin "graphics/items/icon_palettes/soothe_bell.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mental_herb_palette:: @ 8E8E170
-	.incbin "graphics/items/icon_palettes/mental_herb.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_choice_band_sheet:: @ 8E8E190
-	.incbin "graphics/items/icons/choice_band.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_choice_band_palette:: @ 8E8E27C
-	.incbin "graphics/items/icon_palettes/choice_band.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_kings_rock_sheet:: @ 8E8E2A4
-	.incbin "graphics/items/icons/kings_rock.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_kings_rock_palette:: @ 8E8E394
-	.incbin "graphics/items/icon_palettes/kings_rock.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_silver_powder_sheet:: @ 8E8E3B0
-	.incbin "graphics/items/icons/silver_powder.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_silver_powder_palette:: @ 8E8E43C
-	.incbin "graphics/items/icon_palettes/silver_powder.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_amulet_coin_sheet:: @ 8E8E460
-	.incbin "graphics/items/icons/amulet_coin.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_amulet_coin_palette:: @ 8E8E4F8
-	.incbin "graphics/items/icon_palettes/amulet_coin.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_cleanse_tag_sheet:: @ 8E8E51C
-	.incbin "graphics/items/icons/cleanse_tag.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_cleanse_tag_palette:: @ 8E8E5C0
-	.incbin "graphics/items/icon_palettes/cleanse_tag.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_soul_dew_sheet:: @ 8E8E5E0
-	.incbin "graphics/items/icons/soul_dew.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_soul_dew_palette:: @ 8E8E674
-	.incbin "graphics/items/icon_palettes/soul_dew.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_deep_sea_tooth_sheet:: @ 8E8E694
-	.incbin "graphics/items/icons/deep_sea_tooth.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_deep_sea_tooth_palette:: @ 8E8E748
-	.incbin "graphics/items/icon_palettes/deep_sea_tooth.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_deep_sea_scale_sheet:: @ 8E8E76C
-	.incbin "graphics/items/icons/deep_sea_scale.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_deep_sea_scale_palette:: @ 8E8E814
-	.incbin "graphics/items/icon_palettes/deep_sea_scale.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_smoke_ball_sheet:: @ 8E8E834
-	.incbin "graphics/items/icons/smoke_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_smoke_ball_palette:: @ 8E8E8EC
-	.incbin "graphics/items/icon_palettes/smoke_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_everstone_sheet:: @ 8E8E910
-	.incbin "graphics/items/icons/everstone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_everstone_palette:: @ 8E8E9C4
-	.incbin "graphics/items/icon_palettes/everstone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_focus_band_sheet:: @ 8E8E9E0
-	.incbin "graphics/items/icons/focus_band.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_focus_band_palette:: @ 8E8EAD0
-	.incbin "graphics/items/icon_palettes/focus_band.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lucky_egg_sheet:: @ 8E8EAF8
-	.incbin "graphics/items/icons/lucky_egg.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lucky_egg_palette:: @ 8E8EB80
-	.incbin "graphics/items/icon_palettes/lucky_egg.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_scope_lens_sheet:: @ 8E8EB98
-	.incbin "graphics/items/icons/scope_lens.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_scope_lens_palette:: @ 8E8EC98
-	.incbin "graphics/items/icon_palettes/scope_lens.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_metal_coat_sheet:: @ 8E8ECC0
-	.incbin "graphics/items/icons/metal_coat.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_metal_coat_palette:: @ 8E8ED7C
-	.incbin "graphics/items/icon_palettes/metal_coat.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_leftovers_sheet:: @ 8E8ED9C
-	.incbin "graphics/items/icons/leftovers.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_leftovers_palette:: @ 8E8EE40
-	.incbin "graphics/items/icon_palettes/leftovers.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_dragon_scale_sheet:: @ 8E8EE64
-	.incbin "graphics/items/icons/dragon_scale.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dragon_scale_palette:: @ 8E8EF18
-	.incbin "graphics/items/icon_palettes/dragon_scale.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_light_ball_sheet:: @ 8E8EF38
-	.incbin "graphics/items/icons/light_ball.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_light_ball_palette:: @ 8E8EFCC
-	.incbin "graphics/items/icon_palettes/light_ball.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_soft_sand_sheet:: @ 8E8EFF0
-	.incbin "graphics/items/icons/soft_sand.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_soft_sand_palette:: @ 8E8F0AC
-	.incbin "graphics/items/icon_palettes/soft_sand.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_hard_stone_sheet:: @ 8E8F0CC
-	.incbin "graphics/items/icons/hard_stone.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_hard_stone_palette:: @ 8E8F180
-	.incbin "graphics/items/icon_palettes/hard_stone.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_miracle_seed_sheet:: @ 8E8F1A4
-	.incbin "graphics/items/icons/miracle_seed.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_miracle_seed_palette:: @ 8E8F254
-	.incbin "graphics/items/icon_palettes/miracle_seed.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_black_glasses_sheet:: @ 8E8F270
-	.incbin "graphics/items/icons/black_glasses.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_black_type_enhancing_item_palette:: @ 8E8F2F8
-	.incbin "graphics/items/icon_palettes/black_type_enhancing_item.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_black_belt_sheet:: @ 8E8F310
-	.incbin "graphics/items/icons/black_belt.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_magnet_sheet:: @ 8E8F3D8
-	.incbin "graphics/items/icons/magnet.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_magnet_palette:: @ 8E8F488
-	.incbin "graphics/items/icon_palettes/magnet.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_mystic_water_sheet:: @ 8E8F4B0
-	.incbin "graphics/items/icons/mystic_water.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mystic_water_palette:: @ 8E8F548
-	.incbin "graphics/items/icon_palettes/mystic_water.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_sharp_beak_sheet:: @ 8E8F568
-	.incbin "graphics/items/icons/sharp_beak.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_sharp_beak_palette:: @ 8E8F624
-	.incbin "graphics/items/icon_palettes/sharp_beak.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_poison_barb_sheet:: @ 8E8F644
-	.incbin "graphics/items/icons/poison_barb.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_poison_barb_palette:: @ 8E8F6CC
-	.incbin "graphics/items/icon_palettes/poison_barb.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_never_melt_ice_sheet:: @ 8E8F6EC
-	.incbin "graphics/items/icons/never_melt_ice.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_never_melt_ice_palette:: @ 8E8F7B8
-	.incbin "graphics/items/icon_palettes/never_melt_ice.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_spell_tag_sheet:: @ 8E8F7D4
-	.incbin "graphics/items/icons/spell_tag.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_spell_tag_palette:: @ 8E8F874
-	.incbin "graphics/items/icon_palettes/spell_tag.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_twisted_spoon_sheet:: @ 8E8F894
-	.incbin "graphics/items/icons/twisted_spoon.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_twisted_spoon_palette:: @ 8E8F934
-	.incbin "graphics/items/icon_palettes/twisted_spoon.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_charcoal_sheet:: @ 8E8F94C
-	.incbin "graphics/items/icons/charcoal.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_charcoal_palette:: @ 8E8FA1C
-	.incbin "graphics/items/icon_palettes/charcoal.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_dragon_fang_sheet:: @ 8E8FA38
-	.incbin "graphics/items/icons/dragon_fang.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dragon_fang_palette:: @ 8E8FAEC
-	.incbin "graphics/items/icon_palettes/dragon_fang.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_silk_scarf_sheet:: @ 8E8FB0C
-	.incbin "graphics/items/icons/silk_scarf.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_silk_scarf_palette:: @ 8E8FC14
-	.incbin "graphics/items/icon_palettes/silk_scarf.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_up_grade_sheet:: @ 8E8FC34
-	.incbin "graphics/items/icons/up_grade.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_up_grade_palette:: @ 8E8FCF0
-	.incbin "graphics/items/icon_palettes/up_grade.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_shell_bell_sheet:: @ 8E8FD18
-	.incbin "graphics/items/icons/shell_bell.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_sea_incense_sheet:: @ 8E8FDF8
-	.incbin "graphics/items/icons/sea_incense.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_sea_incense_palette:: @ 8E8FEE0
-	.incbin "graphics/items/icon_palettes/sea_incense.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lax_incense_sheet:: @ 8E8FF08
-	.incbin "graphics/items/icons/lax_incense.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lax_incense_palette:: @ 8E8FFF0
-	.incbin "graphics/items/icon_palettes/lax_incense.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lucky_punch_sheet:: @ 8E90018
-	.incbin "graphics/items/icons/lucky_punch.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_lucky_punch_palette:: @ 8E900DC
-	.incbin "graphics/items/icon_palettes/lucky_punch.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_metal_powder_sheet:: @ 8E900FC
-	.incbin "graphics/items/icons/metal_powder.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_metal_powder_palette:: @ 8E901BC
-	.incbin "graphics/items/icon_palettes/metal_powder.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_thick_club_sheet:: @ 8E901E0
-	.incbin "graphics/items/icons/thick_club.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_thick_club_palette:: @ 8E90274
-	.incbin "graphics/items/icon_palettes/thick_club.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_stick_sheet:: @ 8E90290
-	.incbin "graphics/items/icons/stick.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_stick_palette:: @ 8E90330
-	.incbin "graphics/items/icon_palettes/stick.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_scarf_sheet:: @ 8E90354
-	.incbin "graphics/items/icons/scarf.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_red_scarf_palette:: @ 8E90420
-	.incbin "graphics/items/icon_palettes/red_scarf.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_blue_scarf_palette:: @ 8E9043C
-	.incbin "graphics/items/icon_palettes/blue_scarf.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pink_scarf_palette:: @ 8E90458
-	.incbin "graphics/items/icon_palettes/pink_scarf.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_green_scarf_palette:: @ 8E90474
-	.incbin "graphics/items/icon_palettes/green_scarf.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_yellow_scarf_palette:: @ 8E90490
-	.incbin "graphics/items/icon_palettes/yellow_scarf.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_mach_bike_sheet:: @ 8E904AC
-	.incbin "graphics/items/icons/mach_bike.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mach_bike_palette:: @ 8E905B4
-	.incbin "graphics/items/icon_palettes/mach_bike.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_coin_case_sheet:: @ 8E905D8
-	.incbin "graphics/items/icons/coin_case.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_coin_case_palette:: @ 8E90698
-	.incbin "graphics/items/icon_palettes/coin_case.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_itemfinder_sheet:: @ 8E906B8
-	.incbin "graphics/items/icons/itemfinder.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_itemfinder_palette:: @ 8E90774
-	.incbin "graphics/items/icon_palettes/itemfinder.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_old_rod_sheet:: @ 8E9079C
-	.incbin "graphics/items/icons/old_rod.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_old_rod_palette:: @ 8E90848
-	.incbin "graphics/items/icon_palettes/old_rod.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_good_rod_sheet:: @ 8E9086C
-	.incbin "graphics/items/icons/good_rod.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_good_rod_palette:: @ 8E90908
-	.incbin "graphics/items/icon_palettes/good_rod.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_super_rod_sheet:: @ 8E90930
-	.incbin "graphics/items/icons/super_rod.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_super_rod_palette:: @ 8E909E0
-	.incbin "graphics/items/icon_palettes/super_rod.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_ss_ticket_sheet:: @ 8E90A08
-	.incbin "graphics/items/icons/ss_ticket.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ss_ticket_palette:: @ 8E90A9C
-	.incbin "graphics/items/icon_palettes/ss_ticket.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_contest_pass_sheet:: @ 8E90AB4
-	.incbin "graphics/items/icons/contest_pass.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_contest_pass_palette:: @ 8E90B60
-	.incbin "graphics/items/icon_palettes/contest_pass.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_wailmer_pail_sheet:: @ 8E90B88
-	.incbin "graphics/items/icons/wailmer_pail.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_wailmer_pail_palette:: @ 8E90C54
-	.incbin "graphics/items/icon_palettes/wailmer_pail.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_devon_goods_sheet:: @ 8E90C78
-	.incbin "graphics/items/icons/devon_goods.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_devon_goods_palette:: @ 8E90D20
-	.incbin "graphics/items/icon_palettes/devon_goods.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_soot_sack_sheet:: @ 8E90D3C
-	.incbin "graphics/items/icons/soot_sack.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_soot_sack_palette:: @ 8E90E14
-	.incbin "graphics/items/icon_palettes/soot_sack.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_basement_key_sheet:: @ 8E90E3C
-	.incbin "graphics/items/icons/basement_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_old_key_palette:: @ 8E90EE4
-	.incbin "graphics/items/icon_palettes/old_key.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_acro_bike_sheet:: @ 8E90F0C
-	.incbin "graphics/items/icons/acro_bike.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_acro_bike_palette:: @ 8E91008
-	.incbin "graphics/items/icon_palettes/acro_bike.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_pokeblock_case_sheet:: @ 8E91028
-	.incbin "graphics/items/icons/pokeblock_case.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_pokeblock_case_palette:: @ 8E91110
-	.incbin "graphics/items/icon_palettes/pokeblock_case.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_letter_sheet:: @ 8E91138
-	.incbin "graphics/items/icons/letter.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_eon_ticket_sheet:: @ 8E911B8
-	.incbin "graphics/items/icons/eon_ticket.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_eon_ticket_palette:: @ 8E91254
-	.incbin "graphics/items/icon_palettes/eon_ticket.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_orb_sheet:: @ 8E91278
-	.incbin "graphics/items/icons/orb.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_red_orb_palette:: @ 8E91330
-	.incbin "graphics/items/icon_palettes/red_orb.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_blue_orb_palette:: @ 8E9134C
-	.incbin "graphics/items/icon_palettes/blue_orb.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_scanner_sheet:: @ 8E91368
-	.incbin "graphics/items/icons/scanner.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_scanner_palette:: @ 8E91430
-	.incbin "graphics/items/icon_palettes/scanner.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_go_goggles_sheet:: @ 8E91454
-	.incbin "graphics/items/icons/go_goggles.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_go_goggles_palette:: @ 8E91508
-	.incbin "graphics/items/icon_palettes/go_goggles.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_meteorite_sheet:: @ 8E91528
-	.incbin "graphics/items/icons/meteorite.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_meteorite_palette:: @ 8E91608
-	.incbin "graphics/items/icon_palettes/meteorite.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_room1_key_sheet:: @ 8E91628
-	.incbin "graphics/items/icons/room1_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_room2_key_sheet:: @ 8E916E0
-	.incbin "graphics/items/icons/room2_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_room4_key_sheet:: @ 8E9179C
-	.incbin "graphics/items/icons/room4_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_room6_key_sheet:: @ 8E9185C
-	.incbin "graphics/items/icons/room6_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_storage_key_sheet:: @ 8E91918
-	.incbin "graphics/items/icons/storage_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_root_fossil_sheet:: @ 8E919C0
-	.incbin "graphics/items/icons/root_fossil.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_hoenn_fossil_palette:: @ 8E91ACC
-	.incbin "graphics/items/icon_palettes/hoenn_fossil.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_claw_fossil_sheet:: @ 8E91AF4
-	.incbin "graphics/items/icons/claw_fossil.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_devon_scope_sheet:: @ 8E91BE4
-	.incbin "graphics/items/icons/devon_scope.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_devon_scope_palette:: @ 8E91CA0
-	.incbin "graphics/items/icon_palettes/devon_scope.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tm_sheet:: @ 8E91CC8
-	.incbin "graphics/items/icons/tm.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fighting_tm_hm_palette:: @ 8E91DC4
-	.incbin "graphics/items/icon_palettes/fighting_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dragon_tm_hm_palette:: @ 8E91DEC
-	.incbin "graphics/items/icon_palettes/dragon_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_water_tm_hm_palette:: @ 8E91E14
-	.incbin "graphics/items/icon_palettes/water_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_psychic_tm_hm_palette:: @ 8E91E3C
-	.incbin "graphics/items/icon_palettes/psychic_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_normal_tm_hm_palette:: @ 8E91E64
-	.incbin "graphics/items/icon_palettes/normal_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_poison_tm_hm_palette:: @ 8E91E8C
-	.incbin "graphics/items/icon_palettes/poison_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ice_tm_hm_palette:: @ 8E91EB4
-	.incbin "graphics/items/icon_palettes/ice_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_grass_tm_hm_palette:: @ 8E91EDC
-	.incbin "graphics/items/icon_palettes/grass_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fire_tm_hm_palette:: @ 8E91F04
-	.incbin "graphics/items/icon_palettes/fire_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_dark_tm_hm_palette:: @ 8E91F2C
-	.incbin "graphics/items/icon_palettes/dark_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_steel_tm_hm_palette:: @ 8E91F54
-	.incbin "graphics/items/icon_palettes/steel_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_electric_tm_hm_palette:: @ 8E91F7C
-	.incbin "graphics/items/icon_palettes/electric_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ground_tm_hm_palette:: @ 8E91FA4
-	.incbin "graphics/items/icon_palettes/ground_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ghost_tm_hm_palette:: @ 8E91FCC
-	.incbin "graphics/items/icon_palettes/ghost_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_rock_tm_hm_palette:: @ 8E91FF4
-	.incbin "graphics/items/icon_palettes/rock_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_flying_tm_hm_palette:: @ 8E9201C
-	.incbin "graphics/items/icon_palettes/flying_tm_hm.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_oaks_parcel_sheet:: @ 8E92044
-	.incbin "graphics/items/icons/oaks_parcel.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_oaks_parcel_palette:: @ 8E920FC
-	.incbin "graphics/items/icon_palettes/oaks_parcel.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_poke_flute_sheet:: @ 8E9211C
-	.incbin "graphics/items/icons/poke_flute.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_poke_flute_palette:: @ 8E921E0
-	.incbin "graphics/items/icon_palettes/poke_flute.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_secret_key_sheet:: @ 8E92208
-	.incbin "graphics/items/icons/secret_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_secret_key_palette:: @ 8E922D4
-	.incbin "graphics/items/icon_palettes/secret_key.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_bike_voucher_sheet:: @ 8E922FC
-	.incbin "graphics/items/icons/bike_voucher.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_bike_voucher_palette:: @ 8E9239C
-	.incbin "graphics/items/icon_palettes/bike_voucher.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_gold_teeth_sheet:: @ 8E923BC
-	.incbin "graphics/items/icons/gold_teeth.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_gold_teeth_palette:: @ 8E924A8
-	.incbin "graphics/items/icon_palettes/gold_teeth.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_old_amber_sheet:: @ 8E924CC
-	.incbin "graphics/items/icons/old_amber.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_old_amber_palette:: @ 8E925AC
-	.incbin "graphics/items/icon_palettes/old_amber.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_card_key_sheet:: @ 8E925D0
-	.incbin "graphics/items/icons/card_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_card_key_palette:: @ 8E92678
-	.incbin "graphics/items/icon_palettes/card_key.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_lift_key_sheet:: @ 8E92698
-	.incbin "graphics/items/icons/lift_key.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_key_palette:: @ 8E92754
-	.incbin "graphics/items/icon_palettes/key.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_helix_fossil_sheet:: @ 8E92774
-	.incbin "graphics/items/icons/helix_fossil.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_kanto_fossil_palette:: @ 8E92868
-	.incbin "graphics/items/icon_palettes/kanto_fossil.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_dome_fossil_sheet:: @ 8E92888
-	.incbin "graphics/items/icons/dome_fossil.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icons_silph_scope_sheet:: @ 8E92978
-	.incbin "graphics/items/icons/silph_scope.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_silph_scope_palette:: @ 8E92A4C
-	.incbin "graphics/items/icon_palettes/silph_scope.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_bicycle_sheet:: @ 8E92A70
-	.incbin "graphics/items/icons/bicycle.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_bicycle_palette:: @ 8E92B74
-	.incbin "graphics/items/icon_palettes/bicycle.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_town_map_sheet:: @ 8E92B94
-	.incbin "graphics/items/icons/town_map.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_town_map_palette:: @ 8E92C50
-	.incbin "graphics/items/icon_palettes/town_map.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_vs_seeker_sheet:: @ 8E92C78
-	.incbin "graphics/items/icons/vs_seeker.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_vs_seeker_palette:: @ 8E92D40
-	.incbin "graphics/items/icon_palettes/vs_seeker.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_fame_checker_sheet:: @ 8E92D60
-	.incbin "graphics/items/icons/fame_checker.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_fame_checker_palette:: @ 8E92E18
-	.incbin "graphics/items/icon_palettes/fame_checker.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tm_case_sheet:: @ 8E92E3C
-	.incbin "graphics/items/icons/tm_case.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_tm_case_palette:: @ 8E92F00
-	.incbin "graphics/items/icon_palettes/tm_case.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_berry_pouch_sheet:: @ 8E92F28
-	.incbin "graphics/items/icons/berry_pouch.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_berry_pouch_palette:: @ 8E93028
-	.incbin "graphics/items/icon_palettes/berry_pouch.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_teachy_tv_sheet:: @ 8E93050
-	.incbin "graphics/items/icons/teachy_tv.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_teachy_tv_palette:: @ 8E93148
-	.incbin "graphics/items/icon_palettes/teachy_tv.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tri_pass_sheet:: @ 8E93170
-	.incbin "graphics/items/icons/tri_pass.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_tri_pass_palette:: @ 8E93214
-	.incbin "graphics/items/icon_palettes/tri_pass.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_rainbow_pass_sheet:: @ 8E93234
-	.incbin "graphics/items/icons/rainbow_pass.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_rainbow_pass_palette:: @ 8E932DC
-	.incbin "graphics/items/icon_palettes/rainbow_pass.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_tea_sheet:: @ 8E93304
-	.incbin "graphics/items/icons/tea.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_tea_palette:: @ 8E933CC
-	.incbin "graphics/items/icon_palettes/tea.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_mystic_ticket_sheet:: @ 8E933F0
-	.incbin "graphics/items/icons/mystic_ticket.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_mystic_ticket_palette:: @ 8E93488
-	.incbin "graphics/items/icon_palettes/mystic_ticket.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_aurora_ticket_sheet:: @ 8E934A8
-	.incbin "graphics/items/icons/aurora_ticket.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_aurora_ticket_palette:: @ 8E93544
-	.incbin "graphics/items/icon_palettes/aurora_ticket.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_powder_jar_sheet:: @ 8E93568
-	.incbin "graphics/items/icons/powder_jar.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_powder_jar_palette:: @ 8E93608
-	.incbin "graphics/items/icon_palettes/powder_jar.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_ruby_palette:: @ 8E93630
-	.incbin "graphics/items/icon_palettes/ruby.gbapal.lz"
-
-	.align 2
-gFile_graphics_items_icons_gem_sheet:: @ 8E93658
-	.incbin "graphics/items/icons/gem.4bpp.lz"
-
-	.align 2
-gFile_graphics_items_icon_palettes_sapphire_palette:: @ 8E93720
-	.incbin "graphics/items/icon_palettes/sapphire.gbapal.lz"
-
-	.align 2
-gBattleAnimSpritePal_Shock3:: @ 8E93748
-	.incbin "graphics/battle_anims/sprites/282.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Shock3:: @ 8E93770
-	.incbin "graphics/battle_anims/sprites/282.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhiteFeather:: @ 8E93958
-	.incbin "graphics/battle_anims/sprites/270.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WhiteFeather:: @ 8E93974
-	.incbin "graphics/battle_anims/sprites/270.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sparkle6:: @ 8E93A9C
-	.incbin "graphics/battle_anims/sprites/271.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sparkle6:: @ 8E93AB4
-	.incbin "graphics/battle_anims/sprites/271.4bpp.lz"
-
-	.align 2
-gGhostPalette:: @ 8E93B14
-	.incbin "graphics/pokemon/ghost/front.gbapal.lz"
-
-	.align 2
-gGhostFrontPic:: @ 8E93B38
-	.incbin "graphics/pokemon/ghost/front.4bpp.lz"
-
-gFile_graphics_mail_orange_palette_pal:: @ 8E93EA0
-	.incbin "graphics/mail/orange/palette.gbapal"
-
-gFile_graphics_mail_harbor_palette_pal:: @ 8E93EC0
-	.incbin "graphics/mail/harbor/palette.gbapal"
-
-gFile_graphics_mail_glitter_palette_pal:: @ 8E93EE0
-	.incbin "graphics/mail/glitter/palette.gbapal"
-
-gFile_graphics_mail_mech_palette_pal:: @ 8E93F00
-	.incbin "graphics/mail/mech/palette.gbapal"
-
-gFile_graphics_mail_wood_palette_pal:: @ 8E93F20
-	.incbin "graphics/mail/wood/palette.gbapal"
-
-gFile_graphics_mail_wave_palette_pal:: @ 8E93F40
-	.incbin "graphics/mail/wave/palette.gbapal"
-
-gFile_graphics_mail_bead_palette_pal:: @ 8E93F60
-	.incbin "graphics/mail/bead/palette.gbapal"
-
-gFile_graphics_mail_shadow_palette_pal:: @ 8E93F80
-	.incbin "graphics/mail/shadow/palette.gbapal"
-
-gFile_graphics_mail_tropic_palette_pal:: @ 8E93FA0
-	.incbin "graphics/mail/tropic/palette.gbapal"
-
-gFile_graphics_mail_dream_palette_pal:: @ 8E93FC0
-	.incbin "graphics/mail/dream/palette.gbapal"
-
-gFile_graphics_mail_fab_palette_pal:: @ 8E93FE0
-	.incbin "graphics/mail/fab/palette.gbapal"
-
-gFile_graphics_mail_retro_palette_pal:: @ 8E94000
-	.incbin "graphics/mail/retro/palette.gbapal"
-
-	.align 2
-gFile_graphics_mail_orange_tiles_sheet:: @ 8E94020
-	.incbin "graphics/mail/orange/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_harbor_tiles_sheet:: @ 8E941C0
-	.incbin "graphics/mail/harbor/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_glitter_tiles_sheet:: @ 8E942FC
-	.incbin "graphics/mail/glitter/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_mech_tiles_sheet:: @ 8E9450C
-	.incbin "graphics/mail/mech/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_wood_tiles_sheet:: @ 8E945E4
-	.incbin "graphics/mail/wood/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_wave_tiles_sheet:: @ 8E947DC
-	.incbin "graphics/mail/wave/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_bead_tiles_sheet:: @ 8E9495C
-	.incbin "graphics/mail/bead/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_shadow_tiles_sheet:: @ 8E94A04
-	.incbin "graphics/mail/shadow/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_tropic_tiles_sheet:: @ 8E94B94
-	.incbin "graphics/mail/tropic/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_dream_tiles_sheet:: @ 8E94CD4
-	.incbin "graphics/mail/dream/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_fab_tiles_sheet:: @ 8E94E3C
-	.incbin "graphics/mail/fab/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_retro_tiles_sheet:: @ 8E94F8C
-	.incbin "graphics/mail/retro/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_orange_map_tilemap:: @ 8E9522C
-	.incbin "graphics/mail/orange/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_harbor_map_tilemap:: @ 8E95304
-	.incbin "graphics/mail/harbor/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_glitter_map_tilemap:: @ 8E953E4
-	.incbin "graphics/mail/glitter/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_mech_map_tilemap:: @ 8E954F0
-	.incbin "graphics/mail/mech/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_wood_map_tilemap:: @ 8E955CC
-	.incbin "graphics/mail/wood/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_wave_map_tilemap:: @ 8E956BC
-	.incbin "graphics/mail/wave/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_bead_map_tilemap:: @ 8E9579C
-	.incbin "graphics/mail/bead/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_shadow_map_tilemap:: @ 8E9587C
-	.incbin "graphics/mail/shadow/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_tropic_map_tilemap:: @ 8E95988
-	.incbin "graphics/mail/tropic/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_dream_map_tilemap:: @ 8E95A78
-	.incbin "graphics/mail/dream/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_fab_map_tilemap:: @ 8E95B70
-	.incbin "graphics/mail/fab/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88
-	.incbin "graphics/mail/retro/map.bin.lz"
-
-	.align 2
-gFireRedMenuElements1_Pal:: @ 8E95D9C
-	.incbin "graphics/interface/dex_caught_pokeball.gbapal"
-
-gFireRedMenuElements2_Pal:: @ 8E95DBC
-	.incbin "graphics/interface/pokemon_types.gbapal"
-
-gFireRedMenuElements_Gfx:: @ 8E95DDC
-	.incbin "graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp"
-
-gUnknown_8E97DDC:: @ 8E97DDC
-	.incbin "graphics/interface/learn_move.gbapal"
-
-gUnknown_8E97DFC:: @ 8E97DFC
-	.incbin "graphics/interface/learn_move.4bpp.lz"
-
-gUnknown_8E97EC4:: @ 8E97EC4
-	.incbin "graphics/interface/learn_move.bin.lz"
-
-gUnknown_8E97FE4:: @ 8E97FE4
-	.incbin "graphics/interface/naming_screen_8E97FE4.gbapal" @ TODO: Find the image this goes with
-
-gUnknown_8E98004:: @ 8E98004
-	.incbin "graphics/interface/naming_screen_8E98004.gbapal"
-
-gUnknown_8E98024:: @ 8E98024
-	.incbin "graphics/interface/naming_screen_8E98024.gbapal"
-
-gUnknown_8E98044:: @ 8E98044
-	.incbin "graphics/interface/naming_screen_8E98044.gbapal"
-
-gUnknown_8E98064:: @ 8E98064
-	.incbin "graphics/interface/naming_screen_8E98064.gbapal"
-
-gUnknown_8E98084:: @ 8E98084
-	.incbin "graphics/interface/naming_screen_8E98084.gbapal"
-
-gUnknown_8E980A4:: @ 8E980A4
-	.incbin "graphics/interface/naming_screen_8E980A4.gbapal"
-
-gUnknown_8E980C4:: @ 8E980C4
-	.incbin "graphics/interface/naming_screen_8E980C4.gbapal"
-
-gUnknown_8E980E4:: @ 8E980E4
-	.incbin "graphics/interface/naming_screen_menu.4bpp.lz"
-
-gUnknown_8E982BC:: @ 8E982BC
-	.incbin "graphics/interface/naming_screen_menu.bin.lz"
-
-gUnknown_8E98398:: @ 8E98398
-	.incbin "graphics/interface/naming_screen_E98398.bin.lz"
-
-gUnknown_8E98458:: @ 8E98458
-	.incbin "graphics/interface/naming_screen_E98458.bin.lz"
-
-gUnknown_8E98518:: @ 8E98518
-	.incbin "graphics/interface/naming_screen_E98518.bin.lz"
-	
-gUnknown_8E985D8:: @ 8E985D8
-	.incbin "graphics/interface/naming_screen_8E985D8.4bpp"
-
-gUnknown_8E98858:: @ 8E98858
-	.incbin "graphics/interface/naming_screen_8E98858.4bpp"
-
-gUnknown_8E98A38:: @ 8E98A38
-    .incbin "graphics/interface/naming_screen_8E98A38.4bpp"
-
-gUnknown_8E98C18:: @ 8E98C18
-    .incbin "graphics/interface/naming_screen_8E98C18.4bpp"
-
-gUnknown_8E98CB8:: @ 8E98CB8
-    .incbin "graphics/interface/naming_screen_8E98CB8.4bpp"
-
-gUnknown_8E98D58:: @ 8E98D58
-    .incbin "graphics/interface/naming_screen_8E98D58.4bpp"
-
-gUnknown_8E98DF8:: @ 8E98DF8
-    .incbin "graphics/interface/naming_screen_8E98DF8.4bpp"
-
-gUnknown_8E98E98:: @ 8E98E98
-    .incbin "graphics/interface/naming_screen_8E98E98.4bpp"
-
-gUnknown_8E98F38:: @ 8E98F38
-    .incbin "graphics/interface/naming_screen_8E98F38.4bpp"
-
-gUnknown_8E98FD8:: @ 8E98FD8
-    .incbin "graphics/interface/naming_screen_8E98FD8.4bpp"
-
-gUnknown_8E990D8:: @ 8E990D8
-    .incbin "graphics/interface/naming_screen_8E990D8.4bpp"
-
-gUnknown_8E990F8:: @ 8E990F8
-    .incbin "graphics/interface/naming_screen_8E990F8.4bpp"
-
-gUnknown_8E99118:: @ 8E99118
-	.incbin "graphics/tm_case/unk_8E99118.4bpp"
-
-gFireRedTrainerCard_Pal:: @ 8E99198
-	.incbin "graphics/trainer_card/0star.gbapal"
-
-gFireRedTrainerCard_Gfx:: @ 8E991F8
-	.incbin "graphics/trainer_card/card.4bpp.lz"
-
-gEmeraldTrainerCard_Pal:: @ 8E9986C
-	.incbin "graphics/trainer_card/0star_em.gbapal"
-
-gEmeraldTrainerCard_Gfx:: @ 8E998CC
-	.incbin "graphics/trainer_card/card_em.4bpp.lz"
-
-gUnknown_8E99D8C:: @ 8E99D8C
-	.incbin "graphics/link_rfu/unk_8E99DAC.gbapal"
-
-gUnknown_8E99DAC:: @ 8E99DAC
-	.incbin "graphics/link_rfu/unk_8E99DAC.4bpp.lz"
-
-gUnknown_8E99E74:: @ 8E99E74
-	.incbin "graphics/link_rfu/unk_8E99E74.bin.lz"
-
-gUnknown_8E99F24:: @ 8E99F24
-	.incbin "graphics/link_rfu/unk_8E9A168.gbapal"
-
-gUnknown_8E99F44:: @ 8E99F44
-	.incbin "graphics/link_rfu/unk_8E99F44.4bpp.lz"
-
-gUnknown_8E9A168:: @ 8E9A168
-	.incbin "graphics/link_rfu/unk_8E9A168.4bpp.lz"
-
-gUnknown_8E9A460:: @ 8E9A460
-	.incbin "graphics/interface/trainer_memo.4bpp.lz"
-
-gUnknown_8E9B310:: @ 8E9B310
-	.incbin "graphics/interface/trainer_memo_pal1.gbapal"
-
-gUnknown_8E9B3B0:: @ 8E9B3B0    
-    .incbin "graphics/interface/trainer_memo_pal2.gbapal"
-
-gUnknown_8E9B3D0:: @ 8E9B3D0
-	.incbin "graphics/interface/trainer_memo_pal3.gbapal"
-
-gUnknown_8E9B3F0:: @ 8E9B3F0
-	.incbin "graphics/interface/summary_exp_bar.4bpp.lz"
-
-gUnknown_8E9B4B8:: @ 8E9B4B8
-	.incbin "graphics/interface/summary_hp_bar.4bpp.lz"
-
-gUnknown_8E9B578:: @ 8E9B578
-	.incbin "graphics/interface/summary_exp_bar.gbapal" @ hp bar uses this too
-
-gUnknown_8E9B598:: @ 8E9B598
-	.incbin "graphics/interface/trainer_memo.bin.lz"
-
-gUnknown_8E9B750:: @ 8E9B750
-	.incbin "graphics/interface/trainer_memo_2.bin.lz"
-
-gUnknown_8E9B950:: @ 8E9B950
-	.incbin "graphics/interface/trainer_memo_3.bin.lz"
-
-gUnknown_8E9BA9C:: @ 8E9BA9C
-	.incbin "graphics/interface/trainer_memo_4.bin.lz"
-
-gUnknown_8E9BBCC:: @ 8E9BBCC
-	.incbin "graphics/interface/trainer_memo_5.bin.lz"
-
-gUnknown_8E9BD08:: @ 8E9BD08
-	.incbin "graphics/unknown/unknown_E9BD08.gbapal" @ might be an alternate unused palette of the link_rfu gfx below.
-
-gUnknown_8E9BD28:: @ 8E9BD28
-	.incbin "graphics/interface/link_rfu_frame.4bpp.lz"
-
-gUnknown_8E9BF28:: @ 8E9BF28
-	.incbin "graphics/interface/link_rfu_frame.gbapal"
-
-gUnknown_8E9BF48:: @ 8E9BF48
-	.incbin "graphics/interface/link_rfu_status.4bpp.lz"
-
-gUnknown_8E9C14C:: @ 8E9C14C
-	.incbin "graphics/interface/pokedex_abc.gbapal"
-
-gUnknown_8E9C16C:: @ 8E9C16C
-	.incbin "graphics/interface/pokedex_abc.4bpp.lz"
-
-gUnknown_8E9C3D8:: @ 8E9C3D8
-	.incbin "graphics/interface/box_tiles_pal1.gbapal"
-
-gUnknown_8E9C3F8:: @ 8E9C3F8
-	.incbin "graphics/interface/box_tiles_pal2.gbapal"
-
-gUnknown_8E9C418:: @ 8E9C418
-	.incbin "graphics/interface/box_tiles_pal3.gbapal"
-
-gUnknown_8E9C438:: @ 8E9C438
-	.incbin "graphics/interface/box_tiles.4bpp.lz"
-
-gUnknown_8E9CAEC:: @ 8E9CAEC
-	.incbin "graphics/unknown/unknown_E9CAEC.bin.lz"
-
-gUnknown_8E9CB9C:: @ 8E9CB9C
-	.incbin "graphics/misc/markings2.gbapal"
-
-gUnknown_8E9CBBC:: @ 8E9CBBC
-	.incbin "graphics/misc/markings2.4bpp"
-
-gTradeMenu_Pal:: @ 8E9CEDC
-	.incbin "graphics/trade/menu.gbapal"
-
-gTradeButtons_Pal:: @ E9CF3C
-	.incbin "graphics/trade/unknown_DDB444.gbapal"
-
-gTradeMenu_Gfx:: @ 8E9CF5C
-	.incbin "graphics/trade/menu.4bpp"
-
-gTradeButtons_Gfx:: @ E9E1DC
-	.incbin "graphics/trade/buttons.4bpp"
-
-gUnknown_8E9E9DC:: @ E9E9DC
-	.incbin "graphics/unused/unused_DDCEE4.bin"
-
-gUnknown_8E9E9FC:: @ 8E9E9FC
-	.incbin "graphics/trade/unknown_DDCF04.bin"
-
-gTradeMenuMonBox_Tilemap:: @ 8E9F1FC
-	.incbin "graphics/trade/menu_mon_box.bin"
-
-gFameCheckerBgPals:: @ 8E9F220
-	.incbin "data/graphics/fame_checker_bg.gbapal"
-
-gFameCheckerBgTiles:: @ 8E9F260
-	.incbin "data/graphics/fame_checker_bg.4bpp"
-
-gFameCheckerBg3Tilemap:: @ 8EA0700
-	.incbin "data/graphics/fame_checker_tilemap3.bin"
-
-gFameCheckerBg2Tilemap:: @ 8EA0F00
-	.incbin "data/graphics/fame_checker_tilemap2.bin"
-
-gLinkMiscMenu_Pal:: @ 8EA1700
-	.incbin "graphics/interface/union_room_chat.gbapal"
-
-gLinkMiscMenu_Gfx:: @ 8EA1720
-	.incbin "graphics/interface/union_room_chat.4bpp.lz"
-
-gLinkMiscMenu_Tilemap:: @ 8EA1958
-	.incbin "graphics/interface/union_room_chat.bin.lz"
-
-gUnionRoomChatIcons:: @ 8EA1A50
-	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_General:: @ 8EA1B68
-	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
-
-gTilesetTiles_General:: @ 8EA1D68
-	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
-
-gBerryFixGameboy_Pal:: @ 8EA463C
-	.incbin "graphics/berry_fix/gba_small.gbapal"
-
-gBerryFixGameboy_Gfx:: @ 8EA467C
-	.incbin "graphics/berry_fix/gba_small.4bpp.lz"
-
-gBerryFixGameboy_Tilemap:: @ 8EA52B8
-	.incbin "graphics/berry_fix/gba_small.bin.lz"
-
-gBerryFixGameboyLogo_Pal:: @ 8EA5604
-	.incbin "graphics/berry_fix/logo.gbapal"
-
-gBerryFixGameboyLogo_Gfx:: @ 8EA5664
-	.incbin "graphics/berry_fix/logo.4bpp.lz"
-
-gBerryFixGameboyLogo_Tilemap:: @ 8EA60C8
-	.incbin "graphics/berry_fix/logo.bin.lz"
-
-gBerryFixGbaTransfer_Pal:: @ 8EA63C8
-	.incbin "graphics/berry_fix/gba_transfer.gbapal"
-
-gBerryFixGbaTransfer_Gfx:: @ 8EA6408
-	.incbin "graphics/berry_fix/gba_transfer.4bpp.lz"
-
-gBerryFixGbaTransfer_Tilemap:: @ 8EA7028
-	.incbin "graphics/berry_fix/gba_transfer.bin.lz"
-
-gBerryFixGbaTransferHighlight_Pal:: @ 8EA72E0
-	.incbin "graphics/berry_fix/gba_transfer_highlight.gbapal"
-
-gBerryFixGbaTransferHighlight_Gfx:: @ 8EA7320
-	.incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz"
-
-gBerryFixGbaTransferHighlight_Tilemap:: @ 8EA8118
-	.incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz"
-
-gBerryFixGbaTransferError_Pal:: @ 8EA83C8
-	.incbin "graphics/berry_fix/gba_transfer_error.gbapal"
-
-gBerryFixGbaTransferError_Gfx:: @ 8EA8408
-	.incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz"
-
-gBerryFixGbaTransferError_Tilemap:: @ 8EA8CC8
-	.incbin "graphics/berry_fix/gba_transfer_error.bin.lz"
-
-gBerryFixWindow_Pal:: @ 8EA8F00
-	.incbin "graphics/berry_fix/window.gbapal"
-
-gBerryFixWindow_Gfx:: @ 8EA8F40
-	.incbin "graphics/berry_fix/window.4bpp.lz"
-
-gBerryFixWindow_Tilemap:: @ 8EA9588
-	.incbin "graphics/berry_fix/window.bin.lz"
-
-	.align 2
-gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_GenericBuilding1:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_DepartmentStore:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
-
-
-gTilesetTiles_DepartmentStore:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
-
-gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
-	.incbin "graphics/interface/union_room_chat_panel.gbapal"
-
-gUnionRoomChatPanelBgTiles:: @ 8EAAA10
-	.incbin "graphics/interface/union_room_chat_panel.4bpp.lz"
-
-gUnionRoomChatPanelBgMap:: @ 8EAAA6C
-	.incbin "graphics/interface/union_room_chat_panel.bin.lz"
-
-gCreditsMonBackdropPals:: @ 8EAAB18
-	.incbin "graphics/credits/charizard.gbapal"
-	.incbin "graphics/credits/venusaur.gbapal"
-	.incbin "graphics/credits/blastoise.gbapal"
-	.incbin "graphics/credits/pikachu.gbapal"
-
-gCreditsPokeballBgGfxTiles:: @ 8EAAB98
-	.incbin "graphics/credits/unk_8EAAB98.4bpp.lz"
-
-gCreditsPokeballBgGfxMap:: @ 8EAB30C
-	.incbin "graphics/credits/unk_8EAB30C.bin.lz"
-
-	@ title_screen
-	.ifdef FIRERED
-gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4
-	.incbin "graphics/title_screen/unk_8eab6c4.gbapal"
-
-gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4
-	.incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz"
-
-gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390
-	.incbin "graphics/title_screen/unk_8ead390.bin.lz"
-
-gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8
-	.incbin "graphics/title_screen/unk_8ead5e8.gbapal"
-
-gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608
-	.incbin "graphics/title_screen/unk_8ead608.4bpp.lz"
-
-gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4
-	.incbin "graphics/title_screen/unk_8eadee4.bin.lz"
-
-gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094
-	.incbin "graphics/title_screen/unk_8eae094.gbapal"
-	.else
-	.ifdef LEAFGREEN
-gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4
-	.incbin "graphics/title_screen/unk_lg_8eab744.gbapal"
-
-gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4
-	.incbin "graphics/title_screen/unk_lg_8eab944.8bpp.lz"
-
-gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390
-	.incbin "graphics/title_screen/unk_lg_8ead508.bin.lz"
-
-gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8
-	.incbin "graphics/title_screen/unk_lg_8ead768.gbapal"
-
-gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608
-	.incbin "graphics/title_screen/unk_lg_8ead788.4bpp.lz"
-
-gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4
-	.incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz"
-
-gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094
-	.incbin "graphics/title_screen/unk_lg_8eae388.gbapal"
-	.endif
-	.endif
-
-gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4
-	.incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz"
-
-gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374
-	.incbin "graphics/title_screen/unk_8eae374.bin.lz"
-
-	.ifdef FIRERED
-gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488
-	.incbin "graphics/title_screen/unk_8eae488.gbapal"
-	.else
-	.ifdef LEAFGREEN
-gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488
-	.incbin "graphics/title_screen/unk_lg_8eae77c.gbapal"
-	.endif
-	.endif
-
-gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8
-	.incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz"
-
-gCreditsAllRightsReservedGfxPal:: @ 8EAE528
-	.incbin "graphics/credits/unk_8EAE548.gbapal"
-
-gCreditsAllRightsReservedGfxTiles:: @ 8EAE548
-	.incbin "graphics/credits/unk_8EAE548.4bpp.lz"
-
-gCreditsAllRightsReservedGfxMap:: @ 8EAE900
-	.incbin "graphics/credits/unk_8EAE548.bin.lz"
-
-gUnknown_8EAEA00:: @ 8EAEA00
-	.incbin "graphics/link/gba.gbapal"
-
-gTradeGba2_Pal:: @ 8EAEA20
-	.incbin "graphics/link/gba_pal2.gbapal"
-
-gTradeGba_Gfx:: @ 8EAEA80
-	.incbin "graphics/link/gba.4bpp"
-
-gUnknown_8EAFE80:: @ 8EAFE80
-    .incbin "graphics/interface/blank2.gbapal"
-
-gUnknown_8EAFEA0:: @ 8EAFEA0
-	.incbin "graphics/berry_crush/berry_crush.gbapal"
-
-gUnknown_8EAFF60:: @ 8EAFF60    
-    .incbin "graphics/unknown/unknown_EAFF60.gbapal" @ seems to be unused. Loaded palette for above is 0xC0 so this is unused.
-
-gUnknown_8EAFFC0:: @ 8EAFFC0
-	.incbin "graphics/berry_crush/berry_crush.4bpp.lz"
-
-gUnknown_8EB0ADC:: @ 8EB0ADC
-	.incbin "graphics/berry_crush/data_EB0ADC.bin.lz" @ TODO: What is this?
-
-	@ EOF
diff --git a/data/map_events.s b/data/map_events.s
index ce4d9efc3..62bd63b2e 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -10,7 +10,6 @@
 #include "constants/vars.h"
 #include "constants/weather.h"
 @#include "constants/trainer_hill.h"
-#include "constants/object_events.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"
     .include "constants/item_data_constants.inc"
diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json
index d9d80e7e9..b2f6c9186 100644
--- a/data/maps/BattleColosseum_2P/map.json
+++ b/data/maps/BattleColosseum_2P/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 9,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index 5f8c86d9c..77bbc7ec0 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_METEORITE",
+      "graphics_id": "OBJ_EVENT_GFX_METEORITE",
       "x": 15,
       "y": 12,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 15,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index d58a16b85..e2e75550a 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -10,7 +10,7 @@ BirthIsland_Exterior_OnReturnToField:: @ 8165213
 
 BirthIsland_Exterior_OnTransition:: @ 8165217
 	setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_DEOXYS_N
 	setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
 	setvar VAR_DEOXYS_INTERACTION_NUM, 0
 	call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
index dfc063ad9..7f5ad6124 100644
--- a/data/maps/BirthIsland_Harbor/map.json
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 7753d987f..f635220e1 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 48,
       "y": 15,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 38,
       "y": 14,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH",
+      "graphics_id": "OBJ_EVENT_GFX_POLIWRATH",
       "x": 36,
       "y": 14,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 11,
       "y": 18,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 18,
       "y": 22,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 30,
       "y": 24,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 26,
       "y": 19,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 38,
       "y": 31,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 9,
       "y": 30,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 52,
       "y": 22,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 40,
       "y": 35,
       "elevation": 0,
@@ -170,7 +170,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 25,
       "y": 10,
       "elevation": 3,
@@ -183,8 +183,9 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65375",
-      "x": 65529,
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
+      "x": -7,
       "y": 21,
       "elevation": 7,
       "movement_type": "MOVEMENT_TYPE_NONE",
@@ -196,7 +197,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -209,7 +210,7 @@
       "flag": "FLAG_HIDE_CELADON_CITY_ETHER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 47,
       "y": 24,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
index 264fd2aa6..6887e5d59 100644
--- a/data/maps/CeladonCity_Condominiums_1F/map.json
+++ b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MEOWTH",
+      "graphics_id": "OBJ_EVENT_GFX_MEOWTH",
       "x": 1,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY",
+      "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY",
       "x": 5,
       "y": 13,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F",
       "x": 5,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 2,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
index 89d78d255..90cded248 100644
--- a/data/maps/CeladonCity_Condominiums_3F/map.json
+++ b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 0,
       "y": 10,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 3,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 4,
       "y": 10,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 0,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
index 4b7c69e3a..a8aa69f77 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
       "elevation": 0,
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
index beb73045e..fa5630be8 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 6,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
index 31cf48f57..39b0f530b 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 5,
       "y": 10,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 8,
       "elevation": 0,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 11,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
index 4948847ef..ac47d8ac5 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 11,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 4,
       "y": 9,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 1,
       "y": 9,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 9,
       "y": 14,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
index 298d207c2..5d6cdb416 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 6,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 10,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 3,
       "y": 13,
       "elevation": 0,
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
index b2b31ef7f..5746f8363 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 11,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 1,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
index 861954bd3..7fed112f3 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 9,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 5,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
index 1733a8f35..063e7e74a 100644
--- a/data/maps/CeladonCity_GameCorner/map.json
+++ b/data/maps/CeladonCity_GameCorner/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 1,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 4,
       "y": 7,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 10,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 7,
       "y": 8,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 13,
       "y": 7,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 16,
       "y": 10,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index c206f38b4..9032cd053 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -257,8 +257,8 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
 	setfieldeffectarg 2, 14
-	dofieldeffect FLDEFF_UNK_40
-	waitfieldeffect FLDEFF_UNK_40  @ Smile icon?
+	dofieldeffect FLDEFF_SMILEY_FACE_ICON
+	waitfieldeffect FLDEFF_SMILEY_FACE_ICON
 	specialvar VAR_RESULT, Special_GetRandomSlotMachine
 	playslotmachine VAR_RESULT
 	releaseall
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
index 9dcaf101a..298855844 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 6,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 2,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
index ac88b5869..230a033bb 100644
--- a/data/maps/CeladonCity_Gym/map.json
+++ b/data/maps/CeladonCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 11,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 9,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 10,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ERIKA",
+      "graphics_id": "OBJ_EVENT_GFX_ERIKA",
       "x": 6,
       "y": 4,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 8,
       "y": 7,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 9,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
index 964db9cab..66d15f518 100644
--- a/data/maps/CeladonCity_Hotel/map.json
+++ b/data/maps/CeladonCity_Hotel/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 3,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 2,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
index 37231d091..6201d5b3a 100644
--- a/data/maps/CeladonCity_House1/map.json
+++ b/data/maps/CeladonCity_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 2,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 8,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
index 58df64cf8..301f33056 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 12,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json
index 88dab9bec..83ded878c 100644
--- a/data/maps/CeladonCity_PokemonCenter_2F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
index b84bbabd6..7d6df6b05 100644
--- a/data/maps/CeladonCity_Restaurant/map.json
+++ b/data/maps/CeladonCity_Restaurant/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 12,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 11,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 2,
       "elevation": 0,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 3,
       "y": 7,
       "elevation": 0,
diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
index beadaeab9..ee32088bc 100644
--- a/data/maps/CeruleanCave_1F/map.json
+++ b/data/maps/CeruleanCave_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 16,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 25,
       "y": 5,
       "elevation": 4,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 21,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 21,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 20,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 14,
       "y": 20,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 11,
       "y": 21,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 18,
       "elevation": 3,
diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
index 1390abd3d..a19dac4e7 100644
--- a/data/maps/CeruleanCave_2F/map.json
+++ b/data/maps/CeruleanCave_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 18,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 29,
       "y": 16,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 33,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 10,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 9,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 25,
       "y": 11,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 28,
       "y": 20,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 30,
       "y": 20,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 13,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 23,
       "y": 16,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 6,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 12,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
index 7dccb782c..cb873d731 100644
--- a/data/maps/CeruleanCave_B1F/map.json
+++ b/data/maps/CeruleanCave_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 31,
       "y": 9,
       "elevation": 4,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 32,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MEWTWO",
+      "graphics_id": "OBJ_EVENT_GFX_MEWTWO",
       "x": 7,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_MEWTWO"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 37,
       "y": 1,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 38,
       "y": 2,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 35,
       "y": 1,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 37,
       "y": 4,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 35,
       "y": 5,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 1,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 6,
       "y": 1,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 3,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
index 087f39320..b9e7f6106 100644
--- a/data/maps/CeruleanCity/map.json
+++ b/data/maps/CeruleanCity/map.json
@@ -37,7 +37,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 31,
       "y": 12,
       "elevation": 3,
@@ -50,7 +50,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 33,
       "y": 6,
       "elevation": 3,
@@ -63,7 +63,7 @@
       "flag": "FLAG_HIDE_CERULEAN_ROCKET"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 16,
       "y": 21,
       "elevation": 3,
@@ -76,7 +76,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 9,
       "y": 23,
       "elevation": 3,
@@ -89,7 +89,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO",
+      "graphics_id": "OBJ_EVENT_GFX_SLOWBRO",
       "x": 32,
       "y": 29,
       "elevation": 3,
@@ -102,7 +102,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 33,
       "y": 29,
       "elevation": 3,
@@ -115,7 +115,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 34,
       "y": 22,
       "elevation": 3,
@@ -128,7 +128,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 22,
       "y": 0,
       "elevation": 3,
@@ -141,7 +141,7 @@
       "flag": "FLAG_HIDE_CERULEAN_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 26,
       "y": 32,
       "elevation": 3,
@@ -154,7 +154,8 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 50,
       "y": 18,
       "elevation": 10,
@@ -167,7 +168,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 12,
       "y": 30,
       "elevation": 3,
@@ -180,7 +181,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 1,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json
index 4bf7375b8..1db90cc0f 100644
--- a/data/maps/CeruleanCity_BikeShop/map.json
+++ b/data/maps/CeruleanCity_BikeShop/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 9,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json
index afe882548..551bc0d9a 100644
--- a/data/maps/CeruleanCity_Gym/map.json
+++ b/data/maps/CeruleanCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 10,
       "y": 12,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 4,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MISTY",
+      "graphics_id": "OBJ_EVENT_GFX_MISTY",
       "x": 8,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 16,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json
index 0b1d03a40..7233d7c66 100644
--- a/data/maps/CeruleanCity_House1/map.json
+++ b/data/maps/CeruleanCity_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json
index 69d20876a..8a36a82d3 100644
--- a/data/maps/CeruleanCity_House2/map.json
+++ b/data/maps/CeruleanCity_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 1,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 7,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json
index 33095af54..c9f6bd1b4 100644
--- a/data/maps/CeruleanCity_House3/map.json
+++ b/data/maps/CeruleanCity_House3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 7,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json
index 9c5a61b63..ea03d11d8 100644
--- a/data/maps/CeruleanCity_House4/map.json
+++ b/data/maps/CeruleanCity_House4/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 5,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json
index eae14c1e4..a1b7d870d 100644
--- a/data/maps/CeruleanCity_House5/map.json
+++ b/data/maps/CeruleanCity_House5/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 7,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json
index e247e3cd4..05bdb8773 100644
--- a/data/maps/CeruleanCity_Mart/map.json
+++ b/data/maps/CeruleanCity_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 9,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 1,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
index dac0de4b5..fc302635f 100644
--- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
index 7eb69e6a4..e12bbcad6 100644
--- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json
+++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
index 0c8fe0ac6..bd9c57435 100644
--- a/data/maps/CinnabarIsland/map.json
+++ b/data/maps/CinnabarIsland/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 11,
       "y": 11,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BILL",
+      "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 20,
       "y": 7,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_HIDE_CINNABAR_BILL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 23,
       "y": 7,
       "elevation": 1,
diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json
index 1afa900b9..efa247390 100644
--- a/data/maps/CinnabarIsland_Gym/map.json
+++ b/data/maps/CinnabarIsland_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 25,
       "y": 11,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 25,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 17,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 16,
       "y": 11,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 16,
       "y": 18,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 4,
       "y": 19,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 4,
       "y": 11,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLAINE",
+      "graphics_id": "OBJ_EVENT_GFX_BLAINE",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 24,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json
index a02302367..67e4406ca 100644
--- a/data/maps/CinnabarIsland_Mart/map.json
+++ b/data/maps/CinnabarIsland_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 8,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
index 06ecc5419..eb919ff85 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 2,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BILL",
+      "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 11,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
index c4bcde4e4..455c51e9e 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
index 4f446c65e..cd8a2df15 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 2,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
index cefc5bcc4..4fc85fce5 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 11,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 12,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
index 68d681613..e2f26713d 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 4,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
index 54015fcc3..38688647e 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 10,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json
index 4427d4d17..9cf4e3093 100644
--- a/data/maps/DiglettsCave_NorthEntrance/map.json
+++ b/data/maps/DiglettsCave_NorthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json
index 591a998e3..77475f33c 100644
--- a/data/maps/DiglettsCave_SouthEntrance/map.json
+++ b/data/maps/DiglettsCave_SouthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json
index 46eb15806..cf40eae9e 100644
--- a/data/maps/FiveIsland/map.json
+++ b/data/maps/FiveIsland/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 8,
       "y": 5,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 16,
       "y": 10,
       "elevation": 3,
@@ -53,7 +53,8 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 32,
       "y": 9,
       "elevation": 4,
diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json
index bfbcfd8f6..4cbf533e1 100644
--- a/data/maps/FiveIsland_Harbor/map.json
+++ b/data/maps/FiveIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json
index 8e8e974ba..d75fa598d 100644
--- a/data/maps/FiveIsland_House1/map.json
+++ b/data/maps/FiveIsland_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 10,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json
index a97c387d8..2a3c96e0c 100644
--- a/data/maps/FiveIsland_House2/map.json
+++ b/data/maps/FiveIsland_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json
index fa79e4245..43b8fe08c 100644
--- a/data/maps/FiveIsland_LostCave_Room1/map.json
+++ b/data/maps/FiveIsland_LostCave_Room1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 5,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json
index f1c963b0e..fcd1d90d6 100644
--- a/data/maps/FiveIsland_LostCave_Room10/map.json
+++ b/data/maps/FiveIsland_LostCave_Room10/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_LOST_CAVE_SELPHY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json
index 50ecf922f..77cb971ab 100644
--- a/data/maps/FiveIsland_LostCave_Room11/map.json
+++ b/data/maps/FiveIsland_LostCave_Room11/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json
index 5a8fef3d2..f5aeb1378 100644
--- a/data/maps/FiveIsland_LostCave_Room12/map.json
+++ b/data/maps/FiveIsland_LostCave_Room12/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json
index fc2dd61bf..b5c855413 100644
--- a/data/maps/FiveIsland_LostCave_Room13/map.json
+++ b/data/maps/FiveIsland_LostCave_Room13/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json
index 84cddd2ea..2e920267d 100644
--- a/data/maps/FiveIsland_LostCave_Room14/map.json
+++ b/data/maps/FiveIsland_LostCave_Room14/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json
index 2035f850e..844d47ac4 100644
--- a/data/maps/FiveIsland_LostCave_Room4/map.json
+++ b/data/maps/FiveIsland_LostCave_Room4/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 6,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json
index ea727f86d..6546c6e5a 100644
--- a/data/maps/FiveIsland_Meadow/map.json
+++ b/data/maps/FiveIsland_Meadow/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_F",
       "x": 18,
       "y": 18,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 17,
       "y": 5,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 27,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 8,
       "y": 9,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 19,
       "y": 12,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 11,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 22,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json
index 68694d602..34edad014 100644
--- a/data/maps/FiveIsland_MemorialPillar/map.json
+++ b/data/maps/FiveIsland_MemorialPillar/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 8,
       "y": 44,
       "elevation": 4,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 12,
       "y": 6,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 14,
       "y": 17,
       "elevation": 3,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 17,
       "y": 31,
       "elevation": 3,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 47,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json
index 31986b11c..5bb403d1c 100644
--- a/data/maps/FiveIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 4,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json
index 975a71c51..4ff0f3a83 100644
--- a/data/maps/FiveIsland_PokemonCenter_2F/map.json
+++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json
index 868b8cda7..ecb514ff8 100644
--- a/data/maps/FiveIsland_ResortGorgeous/map.json
+++ b/data/maps/FiveIsland_ResortGorgeous/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 44,
       "y": 10,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 33,
       "y": 12,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 12,
       "y": 10,
       "elevation": 3,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 23,
       "y": 9,
       "elevation": 3,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 33,
       "y": 8,
       "elevation": 3,
@@ -87,7 +87,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 33,
       "y": 3,
       "elevation": 3,
@@ -100,7 +100,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 56,
       "y": 7,
       "elevation": 1,
@@ -113,7 +113,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 39,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json
index 4ab961ce8..2c2563031 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/map.json
+++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index 96ff51d8c..6d6f5b7bc 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 15,
       "y": 11,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 17,
       "y": 15,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_F",
       "x": 27,
       "y": 16,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 25,
       "y": 11,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_F",
       "x": 6,
       "y": 6,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 27,
       "y": 4,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 8,
       "y": 25,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 3,
       "elevation": 0,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 16,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json
index 78bfa06b4..627ee6b87 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/map.json
+++ b/data/maps/FiveIsland_WaterLabyrinth/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 14,
       "y": 11,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 9,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index 9a31449a1..ed72da60f 100644
--- a/data/maps/FourIsland/map.json
+++ b/data/maps/FourIsland/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 16,
       "y": 13,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_DODUO",
+      "graphics_id": "OBJ_EVENT_GFX_DODUO",
       "x": 12,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F",
       "x": 13,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M",
       "x": 14,
       "y": 7,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
+      "graphics_id": "OBJ_EVENT_GFX_PSYDUCK",
       "x": 17,
       "y": 9,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 26,
       "y": 19,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 11,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 6,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 32,
       "y": 19,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 8,
       "y": 25,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 36,
       "y": 13,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 31,
       "y": 21,
       "elevation": 3,
diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json
index 0c7760b98..6cd0223da 100644
--- a/data/maps/FourIsland_Harbor/map.json
+++ b/data/maps/FourIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
index 55889c185..3d4984879 100644
--- a/data/maps/FourIsland_House1/map.json
+++ b/data/maps/FourIsland_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 8,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 9,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json
index b9ec87bc0..b83419325 100644
--- a/data/maps/FourIsland_House2/map.json
+++ b/data/maps/FourIsland_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json
index 7ecb022f9..5e126761e 100644
--- a/data/maps/FourIsland_IcefallCave_1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 16,
       "elevation": 3,
diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json
index c07a00e61..e93a3457a 100644
--- a/data/maps/FourIsland_IcefallCave_B1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 10,
       "y": 14,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 21,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
index f542cbfd9..c534c48f2 100644
--- a/data/maps/FourIsland_IcefallCave_Back/map.json
+++ b/data/maps/FourIsland_IcefallCave_Back/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 14,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 13,
       "y": 14,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
+      "graphics_id": "OBJ_EVENT_GFX_LORELEI",
       "x": 12,
       "y": 16,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 10,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
index 0b447056c..7dbe72a88 100644
--- a/data/maps/FourIsland_LoreleisHouse/map.json
+++ b/data/maps/FourIsland_LoreleisHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
+      "graphics_id": "OBJ_EVENT_GFX_LORELEI",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF",
+      "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF",
       "x": 0,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEEL",
+      "graphics_id": "OBJ_EVENT_GFX_SEEL",
       "x": 10,
       "y": 3,
       "elevation": 0,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
+      "graphics_id": "OBJ_EVENT_GFX_PIKACHU",
       "x": 9,
       "y": 3,
       "elevation": 0,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE",
+      "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO",
+      "graphics_id": "OBJ_EVENT_GFX_SLOWBRO",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
+      "graphics_id": "OBJ_EVENT_GFX_PSYDUCK",
       "x": 6,
       "y": 4,
       "elevation": 0,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MEOWTH",
+      "graphics_id": "OBJ_EVENT_GFX_MEOWTH",
       "x": 9,
       "y": 4,
       "elevation": 0,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
+      "graphics_id": "OBJ_EVENT_GFX_CHANSEY",
       "x": 10,
       "y": 4,
       "elevation": 0,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
+      "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF",
       "x": 0,
       "y": 3,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F",
       "x": 0,
       "y": 5,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M",
       "x": 1,
       "y": 5,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT",
+      "graphics_id": "OBJ_EVENT_GFX_PIDGEOT",
       "x": 9,
       "y": 0,
       "elevation": 3,
@@ -185,7 +185,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FEAROW",
+      "graphics_id": "OBJ_EVENT_GFX_FEAROW",
       "x": 10,
       "y": 0,
       "elevation": 3,
@@ -198,7 +198,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL",
+      "graphics_id": "OBJ_EVENT_GFX_LAPRAS_DOLL",
       "x": 9,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json
index 901bcf22d..f5820fef9 100644
--- a/data/maps/FourIsland_Mart/map.json
+++ b/data/maps/FourIsland_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 6,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 8,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json
index f5a0751ae..a8bf5fa97 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 2,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json
index 9818ab609..b6cdf9483 100644
--- a/data/maps/FourIsland_PokemonCenter_2F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json
index 3d380f53c..b026f7030 100644
--- a/data/maps/FourIsland_PokemonDayCare/map.json
+++ b/data/maps/FourIsland_PokemonDayCare/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 2,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
index 5aeab97b9..da9946432 100644
--- a/data/maps/FuchsiaCity/map.json
+++ b/data/maps/FuchsiaCity/map.json
@@ -32,7 +32,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 37,
       "y": 17,
       "elevation": 3,
@@ -45,7 +45,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE",
+      "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE",
       "x": 36,
       "y": 15,
       "elevation": 3,
@@ -58,7 +58,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VOLTORB",
+      "graphics_id": "OBJ_EVENT_GFX_VOLTORB",
       "x": 33,
       "y": 8,
       "elevation": 3,
@@ -71,7 +71,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 33,
       "y": 11,
       "elevation": 3,
@@ -84,7 +84,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
+      "graphics_id": "OBJ_EVENT_GFX_CHANSEY",
       "x": 39,
       "y": 8,
       "elevation": 3,
@@ -97,7 +97,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 14,
       "y": 15,
       "elevation": 3,
@@ -110,7 +110,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LAPRAS",
+      "graphics_id": "OBJ_EVENT_GFX_LAPRAS",
       "x": 12,
       "y": 20,
       "elevation": 1,
@@ -123,7 +123,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 36,
       "y": 20,
       "elevation": 3,
@@ -136,7 +136,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 8,
       "y": 8,
       "elevation": 1,
@@ -149,7 +149,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_KANGASKHAN",
+      "graphics_id": "OBJ_EVENT_GFX_KANGASKHAN",
       "x": 16,
       "y": 9,
       "elevation": 3,
@@ -162,7 +162,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 30,
       "y": 10,
       "elevation": 3,
@@ -175,7 +175,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 21,
       "y": 13,
       "elevation": 3,
@@ -188,7 +188,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 32,
       "y": 16,
       "elevation": 3,
@@ -201,7 +201,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 24,
       "y": 22,
       "elevation": 3,
@@ -214,7 +214,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 15,
       "y": 11,
       "elevation": 3,
@@ -227,7 +227,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 40,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
index 5f0875db8..ee144bf4c 100644
--- a/data/maps/FuchsiaCity/scripts.inc
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -9,11 +9,11 @@ FuchsiaCity_OnTransition:: @ 8166D7B
 	end
 
 FuchsicaCity_EventScript_SetOmanyteGfx:: @ 8166D91
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OMANYTE
 	return
 
 FuchsiaCity_EventScript_SetKabutoGfx:: @ 8166D97
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_KABUTO
 	return
 
 FuchsiaCity_EventScript_LittleBoy:: @ 8166D9D
diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json
index c07403503..c14782953 100644
--- a/data/maps/FuchsiaCity_Gym/map.json
+++ b/data/maps/FuchsiaCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 12,
       "y": 16,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 2,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 11,
       "y": 11,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 13,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,
       "y": 6,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 2,
       "y": 16,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_KOGA",
+      "graphics_id": "OBJ_EVENT_GFX_KOGA",
       "x": 7,
       "y": 13,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 11,
       "y": 19,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json
index a45861216..f54074598 100644
--- a/data/maps/FuchsiaCity_House1/map.json
+++ b/data/maps/FuchsiaCity_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 1,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 2,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json
index b90a8e3cc..2d6516978 100644
--- a/data/maps/FuchsiaCity_House2/map.json
+++ b/data/maps/FuchsiaCity_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json
index 8454ca7de..ac3b1ce35 100644
--- a/data/maps/FuchsiaCity_House3/map.json
+++ b/data/maps/FuchsiaCity_House3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json
index 6b8a28db2..64f2bfc92 100644
--- a/data/maps/FuchsiaCity_Mart/map.json
+++ b/data/maps/FuchsiaCity_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 9,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
index 7df358659..253b544ce 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 13,
       "y": 3,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 4,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
index c2a20fb9e..c6069c491 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
index d10098769..b0e5ce5db 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 7,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 1,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json
index fc65b8308..eb5d1c326 100644
--- a/data/maps/FuchsiaCity_SafariZone_Office/map.json
+++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 12,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 10,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json
index f6333f402..bf130d7e2 100644
--- a/data/maps/FuchsiaCity_WardensHouse/map.json
+++ b/data/maps/FuchsiaCity_WardensHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 11,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json
index 70c8e240c..1512276d4 100644
--- a/data/maps/IndigoPlateau_Exterior/map.json
+++ b/data/maps/IndigoPlateau_Exterior/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 11,
       "y": 6,
       "elevation": 0,
@@ -35,7 +35,7 @@
       "flag": "FLAG_HIDE_CREDITS_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
+      "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 11,
       "y": 6,
       "elevation": 0,
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
index ff5e1b0ca..ec32e96ec 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 0,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 13,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 14,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 23,
       "y": 13,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 16,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
index 6eeb47d03..eaea7e788 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json
index c3e98f4e9..5205e43e0 100644
--- a/data/maps/LavenderTown/map.json
+++ b/data/maps/LavenderTown/map.json
@@ -32,7 +32,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 19,
       "y": 10,
       "elevation": 3,
@@ -45,7 +45,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 12,
       "y": 12,
       "elevation": 3,
@@ -58,7 +58,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 10,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json
index 23f767cad..79217f6b3 100644
--- a/data/maps/LavenderTown_House1/map.json
+++ b/data/maps/LavenderTown_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUBONE",
+      "graphics_id": "OBJ_EVENT_GFX_CUBONE",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json
index 0318b07a8..cdd978063 100644
--- a/data/maps/LavenderTown_House2/map.json
+++ b/data/maps/LavenderTown_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json
index 44e4fdb2f..8b80604c0 100644
--- a/data/maps/LavenderTown_Mart/map.json
+++ b/data/maps/LavenderTown_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 9,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 9,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json
index 955d6f37c..7a5413d63 100644
--- a/data/maps/LavenderTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 5,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 14,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json
index 0605f499a..89034ca3e 100644
--- a/data/maps/LavenderTown_PokemonCenter_2F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
index e292b44e4..14781ded3 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI",
+      "graphics_id": "OBJ_EVENT_GFX_MR_FUJI",
       "x": 3,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_POKEHOUSE_FUJI"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORINO",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORINO",
       "x": 1,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
+      "graphics_id": "OBJ_EVENT_GFX_PSYDUCK",
       "x": 9,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 9,
       "y": 5,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 7,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index fcdf6edb2..2ffa70dbb 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 29,
       "y": 45,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 41,
       "y": 40,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 42,
       "y": 40,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 22,
       "y": 35,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 15,
       "y": 28,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 14,
       "y": 42,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 29,
       "y": 41,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 30,
       "y": 42,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 22,
       "y": 45,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 17,
       "y": 46,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 36,
       "y": 14,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 34,
       "y": 14,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 36,
       "y": 15,
       "elevation": 3,
@@ -185,7 +185,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 35,
       "y": 14,
       "elevation": 3,
@@ -198,7 +198,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 35,
       "y": 17,
       "elevation": 3,
@@ -211,7 +211,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 39,
       "elevation": 3,
@@ -224,7 +224,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 19,
       "y": 40,
       "elevation": 3,
@@ -237,7 +237,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 13,
       "y": 6,
       "elevation": 3,
@@ -250,7 +250,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 38,
       "y": 10,
       "elevation": 3,
@@ -263,7 +263,7 @@
       "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 48,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json
index e0f972558..3f6153369 100644
--- a/data/maps/MtEmber_RubyPath_1F/map.json
+++ b/data/maps/MtEmber_RubyPath_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 11,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 23,
       "y": 16,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 20,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 19,
       "y": 7,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 21,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json
index 46362d54e..5a9ed2ccc 100644
--- a/data/maps/MtEmber_RubyPath_B1F/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 1,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 1,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 3,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 14,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
index 11ec64838..c7d4e2f34 100644
--- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json
index 29d74a5a6..4c83d7a9b 100644
--- a/data/maps/MtEmber_RubyPath_B2F/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 9,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 12,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 1,
       "y": 8,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 5,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
index 47e9c1c87..375c6beb5 100644
--- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 6,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json
index 698499402..29f75c76d 100644
--- a/data/maps/MtEmber_RubyPath_B3F/map.json
+++ b/data/maps/MtEmber_RubyPath_B3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 10,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 26,
       "y": 12,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 28,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 3,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 6,
       "y": 6,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 6,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 5,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 15,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json
index 2d0964a1d..ccd53263e 100644
--- a/data/maps/MtEmber_RubyPath_B5F/map.json
+++ b/data/maps/MtEmber_RubyPath_B5F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_RUBY",
+      "graphics_id": "OBJ_EVENT_GFX_RUBY",
       "x": 7,
       "y": 7,
       "elevation": 0,
diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json
index 3545b5ba2..286baa86a 100644
--- a/data/maps/MtEmber_Summit/map.json
+++ b/data/maps/MtEmber_Summit/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MOLTRES",
+      "graphics_id": "OBJ_EVENT_GFX_MOLTRES",
       "x": 9,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_MOLTRES"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 10,
       "y": 12,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 9,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 11,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json
index 02496f3e9..9698a5529 100644
--- a/data/maps/MtEmber_SummitPath_2F/map.json
+++ b/data/maps/MtEmber_SummitPath_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 40,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 19,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 23,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 21,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 38,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 35,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 34,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 26,
       "elevation": 3,
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index f5b829469..4bfd935f9 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 20,
       "y": 26,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 36,
       "y": 30,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 30,
       "y": 35,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 33,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 7,
       "y": 26,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 13,
       "y": 17,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 7,
       "y": 10,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 22,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 35,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_MT_MOON_1F_TM09"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 26,
       "y": 32,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_HIDE_MT_MOON_1F_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 42,
       "y": 35,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 44,
       "y": 21,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 2,
       "elevation": 3,
@@ -185,7 +185,7 @@
       "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 42,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index f0a3ba3a9..2dfe5c967 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FOSSIL",
+      "graphics_id": "OBJ_EVENT_GFX_FOSSIL",
       "x": 13,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_DOME_FOSSIL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FOSSIL",
+      "graphics_id": "OBJ_EVENT_GFX_FOSSIL",
       "x": 14,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_HELIX_FOSSIL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 13,
       "y": 11,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 37,
       "y": 21,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 12,
       "y": 20,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 35,
       "y": 12,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 18,
       "y": 27,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 30,
       "y": 26,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 35,
       "y": 5,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_MT_MOON_B2F_TM46"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 24,
       "y": 6,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 11,
       "elevation": 3,
diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json
index 98d1145fc..ee229f592 100644
--- a/data/maps/NavelRock_Base/map.json
+++ b/data/maps/NavelRock_Base/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LUGIA",
+      "graphics_id": "OBJ_EVENT_GFX_LUGIA",
       "x": 10,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
index 796f67e5f..cb4f1b2e3 100644
--- a/data/maps/NavelRock_Harbor/map.json
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
index 3c2f599d5..db1f961b4 100644
--- a/data/maps/NavelRock_Summit/map.json
+++ b/data/maps/NavelRock_Summit/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HO_OH",
+      "graphics_id": "OBJ_EVENT_GFX_HO_OH",
       "x": 9,
       "y": 6,
       "elevation": 0,
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
index 06d8b7c6d..0fa530aa2 100644
--- a/data/maps/OneIsland/map.json
+++ b/data/maps/OneIsland/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BILL",
+      "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 12,
       "y": 16,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_BILL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 16,
       "y": 12,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 13,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json
index a505aa5d0..fd3210c7e 100644
--- a/data/maps/OneIsland_Harbor/map.json
+++ b/data/maps/OneIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json
index 8ef48b424..6a8f21cfc 100644
--- a/data/maps/OneIsland_House1/map.json
+++ b/data/maps/OneIsland_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 4,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 7,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json
index bb9b1da3f..c9ce2a7b0 100644
--- a/data/maps/OneIsland_House2/map.json
+++ b/data/maps/OneIsland_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 9,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
index 01e5b92e7..83aa1eadc 100644
--- a/data/maps/OneIsland_KindleRoad/map.json
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 11,
       "y": 32,
       "elevation": 1,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_LAND",
       "x": 17,
       "y": 132,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 7,
       "y": 39,
       "elevation": 1,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 19,
       "y": 79,
       "elevation": 3,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 15,
       "y": 25,
       "elevation": 3,
@@ -87,7 +87,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 9,
       "y": 53,
       "elevation": 3,
@@ -100,7 +100,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 18,
       "y": 105,
       "elevation": 4,
@@ -113,7 +113,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 16,
       "y": 64,
       "elevation": 3,
@@ -126,7 +126,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 11,
       "y": 64,
       "elevation": 3,
@@ -139,7 +139,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 11,
       "y": 89,
       "elevation": 3,
@@ -152,7 +152,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 9,
       "y": 108,
       "elevation": 3,
@@ -165,7 +165,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 8,
       "y": 68,
       "elevation": 3,
@@ -178,7 +178,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 9,
       "y": 68,
       "elevation": 3,
@@ -191,7 +191,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 8,
       "y": 104,
       "elevation": 3,
@@ -204,7 +204,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 11,
       "y": 95,
       "elevation": 3,
@@ -217,7 +217,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 12,
       "y": 96,
       "elevation": 3,
@@ -230,7 +230,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 95,
       "elevation": 3,
@@ -243,7 +243,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 105,
       "elevation": 3,
@@ -256,7 +256,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 75,
       "elevation": 3,
@@ -269,7 +269,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 84,
       "elevation": 3,
@@ -282,7 +282,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 74,
       "elevation": 3,
@@ -295,7 +295,7 @@
       "flag": "FLAG_TEMP_1B"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 73,
       "elevation": 3,
@@ -308,7 +308,7 @@
       "flag": "FLAG_TEMP_1C"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 111,
       "elevation": 4,
@@ -321,7 +321,7 @@
       "flag": "FLAG_TEMP_1D"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 86,
       "elevation": 3,
@@ -334,7 +334,7 @@
       "flag": "FLAG_TEMP_1E"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 110,
       "elevation": 3,
@@ -347,7 +347,7 @@
       "flag": "FLAG_TEMP_1F"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 18,
       "y": 112,
       "elevation": 4,
@@ -360,7 +360,7 @@
       "flag": "FLAG_TEMP_11"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 15,
       "y": 70,
       "elevation": 3,
@@ -373,7 +373,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 103,
       "elevation": 3,
@@ -386,7 +386,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 114,
       "elevation": 4,
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
index 0a50424cb..3472ab348 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 11,
       "y": 13,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 15,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 20,
       "y": 7,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 10,
       "y": 5,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 11,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json
index 07d68dfc1..08df3284c 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BILL",
+      "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CELIO",
+      "graphics_id": "OBJ_EVENT_GFX_CELIO",
       "x": 15,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 3,
       "y": 7,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 7,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json
index 5b20f3609..33bafe5f8 100644
--- a/data/maps/OneIsland_PokemonCenter_2F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json
index 2198e9b44..33eaf4781 100644
--- a/data/maps/OneIsland_TreasureBeach/map.json
+++ b/data/maps/OneIsland_TreasureBeach/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 8,
       "y": 11,
       "elevation": 1,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 13,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 054580b13..32d501c67 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 3,
       "y": 10,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 13,
       "y": 17,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
+      "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 10,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json
index f4d46bac8..48822f5bb 100644
--- a/data/maps/PalletTown_GarysHouse/map.json
+++ b/data/maps/PalletTown_GarysHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_DAISY",
+      "graphics_id": "OBJ_EVENT_GFX_DAISY",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TOWN_MAP",
+      "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP",
       "x": 6,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json
index f4e7cc175..b6d8afc36 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/map.json
+++ b/data/maps/PalletTown_PlayersHouse_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MOM",
+      "graphics_id": "OBJ_EVENT_GFX_MOM",
       "x": 8,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
index 4e72c8909..ce27f53a8 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/map.json
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 3,
       "y": 11,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 2,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 11,
       "y": 10,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
+      "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 6,
       "y": 3,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 8,
       "y": 4,
       "elevation": 0,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_BULBASAUR_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 4,
       "elevation": 0,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_SQUIRTLE_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 10,
       "y": 4,
       "elevation": 0,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_CHARMANDER_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_RIVAL_IN_LAB"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POKEDEX",
+      "graphics_id": "OBJ_EVENT_GFX_POKEDEX",
       "x": 4,
       "y": 1,
       "elevation": 0,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_POKEDEX"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POKEDEX",
+      "graphics_id": "OBJ_EVENT_GFX_POKEDEX",
       "x": 5,
       "y": 1,
       "elevation": 0,
diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json
index fb235f0c5..63d974e60 100644
--- a/data/maps/PewterCity/map.json
+++ b/data/maps/PewterCity/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 6,
       "y": 15,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 33,
       "y": 17,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 21,
       "y": 28,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 33,
       "y": 27,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 42,
       "y": 20,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 30,
       "y": 5,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 46,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json
index 45c972196..c5009c369 100644
--- a/data/maps/PewterCity_Gym/map.json
+++ b/data/maps/PewterCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BROCK",
+      "graphics_id": "OBJ_EVENT_GFX_BROCK",
       "x": 6,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 3,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 12,
       "elevation": 3,
diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json
index ca16f11a1..29c5ad3db 100644
--- a/data/maps/PewterCity_House1/map.json
+++ b/data/maps/PewterCity_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
+      "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M",
       "x": 6,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json
index 27fb0810c..5f22bc1d4 100644
--- a/data/maps/PewterCity_House2/map.json
+++ b/data/maps/PewterCity_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 3,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 5,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json
index 77983d9f3..233f0db8e 100644
--- a/data/maps/PewterCity_Mart/map.json
+++ b/data/maps/PewterCity_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 8,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 6,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json
index ced7102e2..ab2389c02 100644
--- a/data/maps/PewterCity_Museum_1F/map.json
+++ b/data/maps/PewterCity_Museum_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 16,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 21,
       "y": 3,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_AMBER",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_AMBER",
       "x": 22,
       "y": 3,
       "elevation": 0,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_OLD_AMBER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 26,
       "y": 4,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 26,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json
index c7e1c8d8d..cce062e6d 100644
--- a/data/maps/PewterCity_Museum_2F/map.json
+++ b/data/maps/PewterCity_Museum_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 10,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 0,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 15,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 16,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json
index e4858844c..61886cddc 100644
--- a/data/maps/PewterCity_PokemonCenter_1F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
+      "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 1,
       "y": 2,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 13,
       "y": 2,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 10,
       "y": 7,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 14,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json
index 445b86eb3..b7ab4725e 100644
--- a/data/maps/PewterCity_PokemonCenter_2F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json
index 68dd0db42..f6434eed8 100644
--- a/data/maps/PokemonLeague_AgathasRoom/map.json
+++ b/data/maps/PokemonLeague_AgathasRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_AGATHA",
+      "graphics_id": "OBJ_EVENT_GFX_AGATHA",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json
index 6153f4808..e7e98233f 100644
--- a/data/maps/PokemonLeague_BrunosRoom/map.json
+++ b/data/maps/PokemonLeague_BrunosRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BRUNO",
+      "graphics_id": "OBJ_EVENT_GFX_BRUNO",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json
index f8e9422c3..c6dd72917 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/map.json
+++ b/data/maps/PokemonLeague_ChampionsRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
+      "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 6,
       "y": 15,
       "elevation": 0,
diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json
index 16c9d05ec..7ae0b20ed 100644
--- a/data/maps/PokemonLeague_HallOfFame/map.json
+++ b/data/maps/PokemonLeague_HallOfFame/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
+      "graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
       "x": 6,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json
index 332ed15b8..5ec8fbcc0 100644
--- a/data/maps/PokemonLeague_LancesRoom/map.json
+++ b/data/maps/PokemonLeague_LancesRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LANCE",
+      "graphics_id": "OBJ_EVENT_GFX_LANCE",
       "x": 6,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json
index d308c7975..a46b2b859 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/map.json
+++ b/data/maps/PokemonLeague_LoreleisRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
+      "graphics_id": "OBJ_EVENT_GFX_LORELEI",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index da4e01f1e..f3d8d7d17 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 22,
       "y": 24,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 29,
       "y": 32,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 22,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 27,
       "y": 15,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 8,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index 3701da351..17f1847ed 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 5,
       "y": 23,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 36,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 23,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 35,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index e3d599d9f..368d261db 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 7,
       "y": 13,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 22,
       "y": 13,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 19,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 32,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index c4a876461..37cd7c276 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 6,
       "y": 21,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 20,
       "y": 25,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 34,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 23,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 29,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json
index 0b6d23cd3..1630baa5a 100644
--- a/data/maps/PokemonTower_1F/map.json
+++ b/data/maps/PokemonTower_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 18,
       "y": 13,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 18,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 15,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 7,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 8,
       "y": 12,
       "elevation": 3,
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
index 0d9b51490..22242eeb3 100644
--- a/data/maps/PokemonTower_2F/map.json
+++ b/data/maps/PokemonTower_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 16,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_TOWER_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 3,
       "y": 7,
       "elevation": 0,
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
index 8f234e935..1f06677f1 100644
--- a/data/maps/PokemonTower_3F/map.json
+++ b/data/maps/PokemonTower_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 10,
       "y": 14,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 9,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 12,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 13,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
index 47ee6cc43..d6792d545 100644
--- a/data/maps/PokemonTower_4F/map.json
+++ b/data/maps/PokemonTower_4F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 17,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 4,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 11,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 8,
       "y": 11,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 16,
       "elevation": 3,
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index a1f0fc109..d421948e2 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 11,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 19,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 7,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 11,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 12,
       "y": 8,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 6,
       "y": 16,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
index 7ef95333a..ef6aa1f39 100644
--- a/data/maps/PokemonTower_6F/map.json
+++ b/data/maps/PokemonTower_6F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 13,
       "y": 10,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 18,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 9,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 15,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 15,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index e01c53116..eb5d6675a 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI",
+      "graphics_id": "OBJ_EVENT_GFX_MR_FUJI",
       "x": 11,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_TOWER_FUJI"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 9,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_TOWER_ROCKET_1"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 13,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_TOWER_ROCKET_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 9,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json
index 18099fc15..70004aaa3 100644
--- a/data/maps/PowerPlant/map.json
+++ b/data/maps/PowerPlant/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 27,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 40,
       "y": 22,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_POWER_PLANT_TM17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 46,
       "y": 37,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_POWER_PLANT_TM25"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 45,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 26,
       "y": 22,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ZAPDOS",
+      "graphics_id": "OBJ_EVENT_GFX_ZAPDOS",
       "x": 5,
       "y": 11,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_ZAPDOS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 36,
       "y": 5,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 30,
       "y": 38,
       "elevation": 3,
diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json
index 0a1f10925..b57d12d1c 100644
--- a/data/maps/RecordCenter/map.json
+++ b/data/maps/RecordCenter/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 10,
       "y": 5,
       "elevation": 0,
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index 6bb68f578..52ae9407e 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 26,
       "y": 28,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 39,
       "y": 27,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 45,
       "y": 24,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 20,
       "y": 17,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 5,
       "y": 20,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 7,
       "y": 5,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 27,
       "y": 10,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 37,
       "y": 5,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 33,
       "y": 22,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 22,
       "y": 22,
       "elevation": 3,
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index bebd68148..6d172a9f6 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 5,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 11,
       "y": 15,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 36,
       "y": 11,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 41,
       "y": 5,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 23,
       "y": 23,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 15,
       "y": 33,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 29,
       "y": 35,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 2,
       "y": 29,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 37,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 2,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 1,
       "y": 20,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 1,
       "y": 22,
       "elevation": 3,
@@ -185,7 +185,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 23,
       "elevation": 3,
@@ -198,7 +198,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 2,
       "y": 23,
       "elevation": 3,
@@ -211,7 +211,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 39,
       "y": 26,
       "elevation": 3,
@@ -224,7 +224,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 42,
       "y": 26,
       "elevation": 3,
@@ -237,7 +237,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 43,
       "y": 28,
       "elevation": 3,
@@ -250,7 +250,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 45,
       "y": 30,
       "elevation": 3,
@@ -263,7 +263,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 45,
       "y": 33,
       "elevation": 3,
@@ -276,7 +276,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 25,
       "y": 1,
       "elevation": 3,
@@ -289,7 +289,7 @@
       "flag": "FLAG_TEMP_1B"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 27,
       "y": 4,
       "elevation": 3,
@@ -302,7 +302,7 @@
       "flag": "FLAG_TEMP_1C"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 23,
       "y": 2,
       "elevation": 3,
@@ -315,7 +315,7 @@
       "flag": "FLAG_TEMP_1D"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 26,
       "y": 2,
       "elevation": 3,
@@ -328,7 +328,7 @@
       "flag": "FLAG_TEMP_1E"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 24,
       "y": 7,
       "elevation": 3,
@@ -341,7 +341,7 @@
       "flag": "FLAG_TEMP_1F"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 27,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index b80daf9d5..87a45d250 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 4,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 24,
       "y": 12,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 6,
       "y": 32,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 10,
       "y": 22,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 21,
       "y": 27,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 16,
       "elevation": 0,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 22,
       "elevation": 3,
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index 5daefa002..e2693393a 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 20,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 15,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 7,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 0,
       "y": 14,
       "elevation": 3,
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index 984757f1e..b6c4f9ab9 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 19,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 2,
       "y": 20,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 19,
       "y": 14,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 14,
       "y": 24,
       "elevation": 3,
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index bd38e3b71..234dce9e6 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI",
+      "graphics_id": "OBJ_EVENT_GFX_GIOVANNI",
       "x": 19,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 20,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SILPH_SCOPE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 2,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_LIFT_KEY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 19,
       "y": 14,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 16,
       "y": 14,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 6,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 14,
       "elevation": 0,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 6,
       "y": 23,
       "elevation": 0,
diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json
index d8af63766..fab0ef1f1 100644
--- a/data/maps/Route1/map.json
+++ b/data/maps/Route1/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 6,
       "y": 28,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 19,
       "y": 16,
       "elevation": 3,
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
index df387492a..7c44db6d9 100644
--- a/data/maps/Route10/map.json
+++ b/data/maps/Route10/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 7,
       "y": 60,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 4,
       "y": 62,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 15,
       "y": 70,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 4,
       "y": 68,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 13,
       "y": 44,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 9,
       "y": 27,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 10,
       "y": 20,
       "elevation": 0,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 10,
       "y": 22,
       "elevation": 0,
@@ -131,7 +131,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 10,
       "y": 24,
       "elevation": 0,
@@ -144,7 +144,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 10,
       "y": 26,
       "elevation": 0,
diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json
index 3003e5115..203ae9295 100644
--- a/data/maps/Route10_PokemonCenter_1F/map.json
+++ b/data/maps/Route10_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 2,
       "y": 3,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 12,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json
index f9aae8494..4222d144e 100644
--- a/data/maps/Route10_PokemonCenter_2F/map.json
+++ b/data/maps/Route10_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index b77d1d7d3..f7d261a8e 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 19,
       "y": 8,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 16,
       "y": 17,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 31,
       "y": 8,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 28,
       "y": 10,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 38,
       "y": 15,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 50,
       "y": 4,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 42,
       "y": 8,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 50,
       "y": 14,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 57,
       "y": 16,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 32,
       "y": 18,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 42,
       "y": 12,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_HIDE_ROUTE11_X_DEFEND"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 63,
       "y": 13,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 13,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json
index 9b8a3e36a..1746a2d9f 100644
--- a/data/maps/Route11_EastEntrance_1F/map.json
+++ b/data/maps/Route11_EastEntrance_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 4,
       "y": 10,
       "elevation": 0,
diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json
index 6a38e9aad..5ac6eb2d3 100644
--- a/data/maps/Route11_EastEntrance_2F/map.json
+++ b/data/maps/Route11_EastEntrance_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 7,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 2,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index 656116cc2..c46c45f2f 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -32,7 +32,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 17,
       "y": 32,
       "elevation": 3,
@@ -45,7 +45,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 9,
       "y": 40,
       "elevation": 3,
@@ -58,7 +58,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 16,
       "y": 47,
       "elevation": 3,
@@ -71,7 +71,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 13,
       "y": 59,
       "elevation": 3,
@@ -84,7 +84,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SNORLAX",
+      "graphics_id": "OBJ_EVENT_GFX_SNORLAX",
       "x": 14,
       "y": 70,
       "elevation": 3,
@@ -97,7 +97,7 @@
       "flag": "FLAG_HIDE_ROUTE_12_SNORLAX"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 13,
       "y": 92,
       "elevation": 3,
@@ -110,7 +110,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 10,
       "y": 99,
       "elevation": 3,
@@ -123,7 +123,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 18,
       "y": 108,
       "elevation": 3,
@@ -136,7 +136,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 11,
       "y": 100,
       "elevation": 3,
@@ -149,7 +149,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 36,
       "elevation": 3,
@@ -162,7 +162,7 @@
       "flag": "FLAG_HIDE_ROUTE12_TM48"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 101,
       "elevation": 3,
@@ -175,7 +175,7 @@
       "flag": "FLAG_HIDE_ROUTE12_IRON"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 19,
       "y": 64,
       "elevation": 3,
@@ -188,7 +188,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 19,
       "y": 63,
       "elevation": 3,
@@ -201,7 +201,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 12,
       "y": 111,
       "elevation": 3,
diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json
index feab7038d..557dcb00c 100644
--- a/data/maps/Route12_FishingHouse/map.json
+++ b/data/maps/Route12_FishingHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json
index cbbd3261b..c4b7818db 100644
--- a/data/maps/Route12_NorthEntrance_1F/map.json
+++ b/data/maps/Route12_NorthEntrance_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 1,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json
index ff83df1b3..220589706 100644
--- a/data/maps/Route12_NorthEntrance_2F/map.json
+++ b/data/maps/Route12_NorthEntrance_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 7,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index 8386e6996..cd56c9244 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 62,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 63,
       "y": 12,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 54,
       "y": 11,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 42,
       "y": 7,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 43,
       "y": 7,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 35,
       "y": 10,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 29,
       "y": 11,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 9,
       "y": 14,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 16,
       "y": 5,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 14,
       "y": 8,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 44,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json
index 13259af36..76c96e56c 100644
--- a/data/maps/Route14/map.json
+++ b/data/maps/Route14/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 7,
       "y": 37,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 18,
       "y": 35,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 10,
       "y": 14,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 16,
       "y": 16,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 7,
       "y": 31,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 7,
       "y": 34,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 8,
       "y": 9,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 7,
       "y": 6,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 10,
       "y": 37,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 18,
       "y": 47,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 7,
       "y": 26,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 12,
       "y": 35,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 1,
       "y": 47,
       "elevation": 3,
@@ -196,7 +196,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 13,
       "y": 51,
       "elevation": 3,
@@ -209,7 +209,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 12,
       "y": 51,
       "elevation": 3,
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index bc368ca01..ef6dee02a 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 22,
       "y": 13,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AAD67",
+      "script": "Route15_EventScript_Yazmin",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 31,
       "y": 12,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "Route15_EventScript_1AACEB",
+      "script": "Route15_EventScript_Edwin",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 37,
       "y": 14,
       "elevation": 3,
@@ -62,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route15_EventScript_1AAD29",
+      "script": "Route15_EventScript_Chester",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 44,
       "y": 13,
       "elevation": 3,
@@ -75,11 +75,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AADA5",
+      "script": "Route15_EventScript_Kindra",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 50,
       "y": 12,
       "elevation": 3,
@@ -88,11 +88,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route15_EventScript_1AACAD",
+      "script": "Route15_EventScript_Olivia",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 59,
       "y": 12,
       "elevation": 3,
@@ -101,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route15_EventScript_1AAC31",
+      "script": "Route15_EventScript_Alex",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 63,
       "y": 13,
       "elevation": 3,
@@ -114,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AABF3",
+      "script": "Route15_EventScript_Ernest",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 52,
       "y": 8,
       "elevation": 3,
@@ -127,11 +127,11 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AADE3",
+      "script": "Route15_EventScript_Becky",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 54,
       "y": 12,
       "elevation": 3,
@@ -140,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route15_EventScript_1AAC6F",
+      "script": "Route15_EventScript_Grace",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 28,
       "y": 6,
       "elevation": 3,
@@ -153,11 +153,11 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AAE21",
+      "script": "Route15_EventScript_Celia",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 20,
       "y": 6,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_HIDE_ROUTE15_TM18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 39,
       "y": 7,
       "elevation": 3,
@@ -179,11 +179,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AAEA5",
+      "script": "Route15_EventScript_Ron",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 40,
       "y": 7,
       "elevation": 3,
@@ -192,11 +192,12 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route15_EventScript_1AAE5F",
+      "script": "Route15_EventScript_Mya",
       "flag": "0"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 73,
       "y": 7,
       "elevation": 13,
@@ -232,7 +233,7 @@
       "x": 41,
       "y": 11,
       "elevation": 0,
-      "script": "Route15_EventScript_1680DC"
+      "script": "Route15_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc
index 40890250c..85d24e49b 100644
--- a/data/maps/Route15/scripts.inc
+++ b/data/maps/Route15/scripts.inc
@@ -1,6 +1,6 @@
 Route15_MapScripts:: @ 81680DB
 	.byte 0
 
-Route15_EventScript_1680DC:: @ 81680DC
-	msgbox gUnknown_8186A77, MSGBOX_SIGN
+Route15_EventScript_RouteSign:: @ 81680DC
+	msgbox Route15_Text_RouteSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc
index 33c60e7dc..be3e38e6c 100644
--- a/data/maps/Route15/text.inc
+++ b/data/maps/Route15/text.inc
@@ -1,154 +1,154 @@
-Text_18650B:: @ 818650B
+Route15_Text_KindraIntro:: @ 818650B
     .string "I just got some POKéMON in trades.\n"
     .string "Can I try them out on you?$"
 
-Text_186549:: @ 8186549
+Route15_Text_KindraDefeat:: @ 8186549
     .string "Not good enough!$"
 
-Text_18655A:: @ 818655A
+Route15_Text_KindraPostBattle:: @ 818655A
     .string "You can't change the nickname of\n"
     .string "any POKéMON you get in a trade.\p"
     .string "Only the Original TRAINER can get\n"
     .string "the nickname changed.$"
 
-Text_1865D3:: @ 81865D3
+Route15_Text_BeckyIntro:: @ 81865D3
     .string "You look gentle, so I think I can\n"
     .string "beat you.\p"
     .string "I'll give it a go!$"
 
-Text_186612:: @ 8186612
+Route15_Text_BeckyDefeat:: @ 8186612
     .string "No, wrong!$"
 
-Text_18661D:: @ 818661D
+Route15_Text_BeckyPostBattle:: @ 818661D
     .string "I'm afraid of BIKERS. They look so\n"
     .string "ugly and mean!$"
 
-Text_18664F:: @ 818664F
+Route15_Text_EdwinIntro:: @ 818664F
     .string "When I whistle, I can summon bird\n"
     .string "POKéMON.$"
 
-Text_18667A:: @ 818667A
+Route15_Text_EdwinDefeat:: @ 818667A
     .string "Ow!\n"
     .string "That's tragic!$"
 
-Text_18668D:: @ 818668D
+Route15_Text_EdwinPostBattle:: @ 818668D
     .string "Maybe I'm not cut out for battles.\n"
     .string "I'm not the right type, I guess.$"
 
-Text_1866D1:: @ 81866D1
+Route15_Text_ChesterIntro:: @ 81866D1
     .string "Hmm? My birds are shivering!\n"
     .string "You're good, aren't you?$"
 
-Text_186707:: @ 8186707
+Route15_Text_ChesterDefeat:: @ 8186707
     .string "Just as I thought!$"
 
-Text_18671A:: @ 818671A
+Route15_Text_ChesterPostBattle:: @ 818671A
     .string "This is so obvious, you should know\n"
     .string "this, but…\p"
     .string "Moves like EARTHQUAKE and FISSURE\n"
     .string "have no effect on bird POKéMON.$"
 
-Text_18678B:: @ 818678B
+Route15_Text_GraceIntro:: @ 818678B
     .string "Oh, you're a little cutie!\n"
     .string "So like a darling POKéMON!$"
 
-Text_1867C1:: @ 81867C1
+Route15_Text_GraceDefeat:: @ 81867C1
     .string "You looked so cute, too!$"
 
-Text_1867DA:: @ 81867DA
+Route15_Text_GracePostBattle:: @ 81867DA
     .string "I forgive you.\n"
     .string "I can take it.\l"
     .string "I'm a big girl now.$"
 
-Text_18680C:: @ 818680C
+Route15_Text_OliviaIntro:: @ 818680C
     .string "I raise POKéMON for protection\n"
     .string "because I live alone.$"
 
-Text_186841:: @ 8186841
+Route15_Text_OliviaDefeat:: @ 8186841
     .string "POKéMON isn't about winning or\n"
     .string "losing for me.$"
 
-Text_18686F:: @ 818686F
+Route15_Text_OliviaPostBattle:: @ 818686F
     .string "I love having my POKéMON greet me\n"
     .string "when I get home.\p"
     .string "It's so reassuring.$"
 
-Text_1868B6:: @ 81868B6
+Route15_Text_ErnestIntro:: @ 81868B6
     .string "Hey, kid! C'mon!\n"
     .string "I just got these off some loser!$"
 
-Text_1868E8:: @ 81868E8
+Route15_Text_ErnestDefeat:: @ 81868E8
     .string "Why not?$"
 
-Text_1868F1:: @ 81868F1
+Route15_Text_ErnestPostBattle:: @ 81868F1
     .string "Life's too short.\n"
     .string "It's cool to live as an outlaw.\l"
     .string "TEAM ROCKET RULES!$"
 
-Text_186936:: @ 8186936
+Route15_Text_AlexIntro:: @ 8186936
     .string "Fork over all your cash when you\n"
     .string "lose to me, kid!$"
 
-Text_186968:: @ 8186968
+Route15_Text_AlexDefeat:: @ 8186968
     .string "That can't be true!$"
 
-Text_18697C:: @ 818697C
+Route15_Text_AlexPostBattle:: @ 818697C
     .string "I was just joking about the money.\n"
     .string "Don't take me all serious.$"
 
-Text_1869BA:: @ 81869BA
+Route15_Text_CeliaIntro:: @ 81869BA
     .string "What's cool and happening?\n"
     .string "Trading POKéMON!$"
 
-Text_1869E6:: @ 81869E6
+Route15_Text_CeliaDefeat:: @ 81869E6
     .string "I said trade!$"
 
-Text_1869F4:: @ 81869F4
+Route15_Text_CeliaPostBattle:: @ 81869F4
     .string "I trade POKéMON with my friends\n"
     .string "all the time.$"
 
-Text_186A22:: @ 8186A22
+Route15_Text_YazminIntro:: @ 8186A22
     .string "Want to play with my POKéMON?$"
 
-Text_186A40:: @ 8186A40
+Route15_Text_YazminDefeat:: @ 8186A40
     .string "I was too impatient!$"
 
-Text_186A55:: @ 8186A55
+Route15_Text_YazminPostBattle:: @ 8186A55
     .string "I'll go train with weaker people.$"
 
-gUnknown_8186A77:: @ 8186A77
+Route15_Text_RouteSign:: @ 8186A77
     .string "ROUTE 15\n"
     .string "West to FUCHSIA CITY$"
 
-Text_186A95:: @ 8186A95
+Route15_Text_MyaIntro:: @ 8186A95
     .string "MYA: You're perfect.\n"
     .string "Help me train my little brother?$"
 
-Text_186ACB:: @ 8186ACB
+Route15_Text_MyaDefeat:: @ 8186ACB
     .string "MYA: RON, you have to focus!\n"
     .string "Concentrate on what you're doing!$"
 
-Text_186B0A:: @ 8186B0A
+Route15_Text_MyaPostBattle:: @ 8186B0A
     .string "MYA: Okay, we'll turn it up.\n"
     .string "I'll add to our training menu!$"
 
-Text_186B46:: @ 8186B46
+Route15_Text_MyaNotEnoughMons:: @ 8186B46
     .string "MYA: Do you want to challenge us?\n"
     .string "You'll need two POKéMON, though.$"
 
-Text_186B89:: @ 8186B89
+Route15_Text_RonIntro:: @ 8186B89
     .string "RON: My sister gets scary when we\n"
     .string "lose.$"
 
-Text_186BB1:: @ 8186BB1
+Route15_Text_RonDefeat:: @ 8186BB1
     .string "RON: Oh, no, no…\n"
     .string "Sis, I'm sorry!$"
 
-Text_186BD2:: @ 8186BD2
+Route15_Text_RonPostBattle:: @ 8186BD2
     .string "RON: Oh, bleah…\n"
     .string "I wish I had a nice sister…$"
 
-Text_186BFE:: @ 8186BFE
+Route15_Text_RonNotEnoughMons:: @ 8186BFE
     .string "RON: Did you want to battle with\n"
     .string "my sister and me?\p"
     .string "You need two POKéMON, then.$"
diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json
index 0959512a2..fb1f9cacd 100644
--- a/data/maps/Route15_WestEntrance_1F/map.json
+++ b/data/maps/Route15_WestEntrance_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route15_WestEntrance_1F_EventScript_170089",
+      "script": "Route15_WestEntrance_1F_EventScript_Guard",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc
index 9f753e6c9..222be2356 100644
--- a/data/maps/Route15_WestEntrance_1F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_1F/scripts.inc
@@ -1,6 +1,6 @@
 Route15_WestEntrance_1F_MapScripts:: @ 8170088
 	.byte 0
 
-Route15_WestEntrance_1F_EventScript_170089:: @ 8170089
-	msgbox gUnknown_819F560, MSGBOX_NPC
+Route15_WestEntrance_1F_EventScript_Guard:: @ 8170089
+	msgbox Route15_WestEntrance_1F_Text_OaksAideCameByHere, MSGBOX_NPC
 	end
diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc
index e843e10a8..6cdbe8a2a 100644
--- a/data/maps/Route15_WestEntrance_1F/text.inc
+++ b/data/maps/Route15_WestEntrance_1F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819F560:: @ 819F560
+Route15_WestEntrance_1F_Text_OaksAideCameByHere:: @ 819F560
     .string "Are you the kid who's working on\n"
     .string "a POKéDEX?\p"
     .string "PROF. OAK's AIDE came by here.$"
diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json
index 1d21cd2b1..8317b4d84 100644
--- a/data/maps/Route15_WestEntrance_2F/map.json
+++ b/data/maps/Route15_WestEntrance_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route15_WestEntrance_2F_EventScript_1700B9",
+      "script": "Route15_WestEntrance_2F_EventScript_Aide",
       "flag": "0"
     }
   ],
@@ -45,14 +45,14 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "Route15_WestEntrance_2F_EventScript_170093"
+      "script": "Route15_WestEntrance_2F_EventScript_LeftBinoculars"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "Route15_WestEntrance_2F_EventScript_1700B0"
+      "script": "Route15_WestEntrance_2F_EventScript_RightBinoculars"
     }
   ]
 }
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
index 088a65876..851ceb07f 100644
--- a/data/maps/Route15_WestEntrance_2F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -1,9 +1,11 @@
+.equ REQUIRED_CAUGHT_MONS, 50
+
 Route15_WestEntrance_2F_MapScripts:: @ 8170092
 	.byte 0
 
-Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
+Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093
 	lockall
-	msgbox gUnknown_819F79C
+	msgbox Route15_WestEntrance_2F_Text_LargeShiningBird
 	drawmonpic SPECIES_ARTICUNO, 10, 3
 	delay 20
 	waitbuttonpress
@@ -13,40 +15,40 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
 	releaseall
 	end
 
-Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0
-	msgbox gUnknown_819F7F8, MSGBOX_SIGN
+Route15_WestEntrance_2F_EventScript_RightBinoculars:: @ 81700B0
+	msgbox Route15_WestEntrance_2F_Text_SmallIslandOnHorizon, MSGBOX_SIGN
 	end
 
-Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
+Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9
 	lock
 	faceplayer
-	call EventScript_170145
-	goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B
-	msgbox gUnknown_819F5AB, MSGBOX_YESNO
+	call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
+	goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare
+	msgbox Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
-	call EventScript_170145
-	compare VAR_0x8006, 50
+	call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
+	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
 	goto_if_lt Aide_EventScript_HaventCaughtEnough
-	msgbox gUnknown_819F6AA
+	msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo
 	checkitemspace ITEM_EXP_SHARE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq Aide_EventScript_NoRoomForItem
-	giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
+	giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE
 	setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
-	msgbox gUnknown_819F71F
+	msgbox Route15_WestEntrance_2F_Text_ExplainExpShare
 	release
 	end
 
-EventScript_17013B:: @ 817013B
-	msgbox gUnknown_819F71F
+Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare:: @ 817013B
+	msgbox Route15_WestEntrance_2F_Text_ExplainExpShare
 	release
 	end
 
-EventScript_170145:: @ 8170145
-	getnumberstring 0, 50
+Route15_WestEntrance_2F_EventScript_GetAideRequestInfo:: @ 8170145
+	getnumberstring 0, REQUIRED_CAUGHT_MONS
 	getitemname 1, ITEM_EXP_SHARE
 	return
diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc
index e5518b8e2..c3c9866eb 100644
--- a/data/maps/Route15_WestEntrance_2F/text.inc
+++ b/data/maps/Route15_WestEntrance_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819F5AB:: @ 819F5AB
+Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: @ 819F5AB
     .string "Hi! Remember me?\n"
     .string "I'm one of PROF. OAK's AIDES.\p"
     .string "If your POKéDEX has complete data\n"
@@ -10,30 +10,30 @@ gUnknown_819F5AB:: @ 819F5AB
     .string "Have you gathered data on at least\n"
     .string "{STR_VAR_1} kinds of POKéMON?$"
 
-gUnknown_819F6AA:: @ 819F6AA
+Route15_WestEntrance_2F_Text_GreatHereYouGo:: @ 819F6AA
     .string "Great! You have caught or owned\n"
     .string "{STR_VAR_3} kinds of POKéMON!\p"
     .string "Congratulations!\n"
     .string "Here you go!$"
 
-gUnknown_819F6FD:: @ 819F6FD
+Route15_WestEntrance_2F_Text_ReceivedItemFromAide:: @ 819F6FD
     .string "{PLAYER} received the {STR_VAR_2}\n"
     .string "from the AIDE.$"
 
-gUnknown_819F71F:: @ 819F71F
+Route15_WestEntrance_2F_Text_ExplainExpShare:: @ 819F71F
     .string "EXP. SHARE is an item to be held\n"
     .string "by a POKéMON.\p"
     .string "The POKéMON will receive a share\n"
     .string "of the EXP. Points without having\l"
     .string "to battle.$"
 
-gUnknown_819F79C:: @ 819F79C
+Route15_WestEntrance_2F_Text_LargeShiningBird:: @ 819F79C
     .string "Let's see what the binoculars have\n"
     .string "to show…\p"
     .string "A large, shining bird is flying\n"
     .string "toward the sea.$"
 
-gUnknown_819F7F8:: @ 819F7F8
+Route15_WestEntrance_2F_Text_SmallIslandOnHorizon:: @ 819F7F8
     .string "Let's see what the binoculars have\n"
     .string "to show…\p"
     .string "It looks like a small island on\n"
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index 0dd47cbc6..b88cbe12c 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 16,
       "y": 12,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAEEB",
+      "script": "Route16_EventScript_Lao",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 14,
       "y": 14,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAFA5",
+      "script": "Route16_EventScript_Koji",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 12,
       "y": 12,
       "elevation": 3,
@@ -62,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAFE3",
+      "script": "Route16_EventScript_Luke",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 8,
       "y": 12,
       "elevation": 3,
@@ -75,11 +75,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAF67",
+      "script": "Route16_EventScript_Ruben",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 10,
       "y": 14,
       "elevation": 3,
@@ -88,11 +88,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAF29",
+      "script": "Route16_EventScript_Hideo",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 6,
       "y": 14,
       "elevation": 3,
@@ -101,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AB021",
+      "script": "Route16_EventScript_Camron",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 41,
       "y": 11,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 30,
       "y": 5,
       "elevation": 3,
@@ -127,11 +127,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AB0A5",
+      "script": "Route16_EventScript_Lea",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 31,
       "y": 5,
       "elevation": 3,
@@ -140,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AB05F",
+      "script": "Route16_EventScript_Jed",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SNORLAX",
+      "graphics_id": "OBJ_EVENT_GFX_SNORLAX",
       "x": 31,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 1d7c6657c..27a5efccc 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -14,18 +14,18 @@ Route16_EventScript_RemoveSnorlax:: @ 81680FF
 
 Route16_OnTransition:: @ 8168103
 	compare VAR_MAP_SCENE_ROUTE16, 1
-	call_if_eq Route16_EventScript_EnterCyclingRoad
+	call_if_eq Route16_OnTransitionCyclingRoad
 	end
 
-Route16_EventScript_EnterCyclingRoad:: @ 816810F
+Route16_OnTransitionCyclingRoad:: @ 816810F
 	setflag FLAG_SYS_ON_CYCLING_ROAD
 	return
 
 Route16_OnWarp:: @ 8168113
-	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad
+	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad
 	.2byte 0
 
-Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D
+Route16_OnWarpCyclingRoad:: @ 816811D
 	special Special_ForcePlayerOntoBike
 	end
 
diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc
index 5131934b1..ca3507cc7 100644
--- a/data/maps/Route16/text.inc
+++ b/data/maps/Route16/text.inc
@@ -1,66 +1,66 @@
-Text_186C4D:: @ 8186C4D
+Route16_Text_LaoIntro:: @ 8186C4D
     .string "What do you want?$"
 
-Text_186C5F:: @ 8186C5F
+Route16_Text_LaoDefeat:: @ 8186C5F
     .string "Don't you dare laugh!$"
 
-Text_186C75:: @ 8186C75
+Route16_Text_LaoPostBattle:: @ 8186C75
     .string "We like just hanging here.\n"
     .string "What's it to you?$"
 
-Text_186CA2:: @ 8186CA2
+Route16_Text_KojiIntro:: @ 8186CA2
     .string "Nice BIKE!\n"
     .string "Hand it over!$"
 
-Text_186CBB:: @ 8186CBB
+Route16_Text_KojiDefeat:: @ 8186CBB
     .string "Knockout!$"
 
-Text_186CC5:: @ 8186CC5
+Route16_Text_KojiPostBattle:: @ 8186CC5
     .string "Forget it, who needs your BIKE!$"
 
-Text_186CE5:: @ 8186CE5
+Route16_Text_LukeIntro:: @ 8186CE5
     .string "Come out and play, little mouse!$"
 
-Text_186D06:: @ 8186D06
+Route16_Text_LukeDefeat:: @ 8186D06
     .string "You little rat!$"
 
-Text_186D16:: @ 8186D16
+Route16_Text_LukePostBattle:: @ 8186D16
     .string "I hate losing!\n"
     .string "Get out of my face!$"
 
-Text_186D39:: @ 8186D39
+Route16_Text_HideoIntro:: @ 8186D39
     .string "Hey, you just bumped me!$"
 
-Text_186D52:: @ 8186D52
+Route16_Text_HideoDefeat:: @ 8186D52
     .string "Kaboom!$"
 
-Text_186D5A:: @ 8186D5A
+Route16_Text_HideoPostBattle:: @ 8186D5A
     .string "We'll always be hanging around here\n"
     .string "even if you don't like it.\p"
     .string "You can detour to VERMILION from\n"
     .string "FUCHSIA going along the coast.$"
 
-Text_186DD9:: @ 8186DD9
+Route16_Text_CamronIntro:: @ 8186DD9
     .string "I'm feeling hungry and mean!\n"
     .string "I need a punching bag!$"
 
-Text_186E0D:: @ 8186E0D
+Route16_Text_CamronDefeat:: @ 8186E0D
     .string "Bad, bad, bad!$"
 
-Text_186E1C:: @ 8186E1C
+Route16_Text_CamronPostBattle:: @ 8186E1C
     .string "If I'm going to have POKéMON, they\n"
     .string "may as well be ferocious.\p"
     .string "I'd use them to leave my enemies\n"
     .string "in tatters.$"
 
-Text_186E86:: @ 8186E86
+Route16_Text_RubenIntro:: @ 8186E86
     .string "Hey, there!\n"
     .string "Let's have ourselves a good time!$"
 
-Text_186EB4:: @ 8186EB4
+Route16_Text_RubenDefeat:: @ 8186EB4
     .string "Don't make me mad!$"
 
-Text_186EC7:: @ 8186EC7
+Route16_Text_RubenPostBattle:: @ 8186EC7
     .string "I get my kicks by harassing people\n"
     .string "with my stinking POKéMON.\p"
     .string "They're great for startling people.\n"
@@ -78,35 +78,35 @@ Route16_Text_RouteSign:: @ 8186F98
     .string "ROUTE 16\n"
     .string "CELADON CITY - FUCHSIA CITY$"
 
-Text_186FBD:: @ 8186FBD
+Route16_Text_JedIntro:: @ 8186FBD
     .string "JED: Our love knows no bounds.\n"
     .string "We're in love and we show it!$"
 
-Text_186FFA:: @ 8186FFA
+Route16_Text_JedDefeat:: @ 8186FFA
     .string "JED: Oh, no!\n"
     .string "My love has seen me as a loser!$"
 
-Text_187027:: @ 8187027
+Route16_Text_JedPostBattle:: @ 8187027
     .string "JED: Listen, LEA.\n"
     .string "You need to focus less on me.$"
 
-Text_187057:: @ 8187057
+Route16_Text_JedNotEnoughMons:: @ 8187057
     .string "JED: You have just one POKéMON?\n"
     .string "Is there no love in your heart?$"
 
-Text_187097:: @ 8187097
+Route16_Text_LeaIntro:: @ 8187097
     .string "LEA: Sometimes, the intensity of\n"
     .string "our love scares me.$"
 
-Text_1870CC:: @ 81870CC
+Route16_Text_LeaDefeat:: @ 81870CC
     .string "LEA: Ohh! But JED looks cool\n"
     .string "even in a loss!$"
 
-Text_1870F9:: @ 81870F9
+Route16_Text_LeaPostBattle:: @ 81870F9
     .string "LEA: Ehehe, I'm sorry.\n"
     .string "JED is so cool.$"
 
-Text_187120:: @ 8187120
+Route16_Text_LeaNotEnoughMons:: @ 8187120
     .string "LEA: Oh, you don't have two\n"
     .string "POKéMON with you?\p"
     .string "Doesn't it feel lonely for you or\n"
diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json
index dc0d416f4..3421f6eba 100644
--- a/data/maps/Route16_House/map.json
+++ b/data/maps/Route16_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -25,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_House_EventScript_17014F",
+      "script": "Route16_House_EventScript_Woman",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FEAROW",
+      "graphics_id": "OBJ_EVENT_GFX_FEAROW",
       "x": 9,
       "y": 3,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_House_EventScript_1701AF",
+      "script": "Route16_House_EventScript_Fearow",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc
index 94ed9b932..baf6fcc32 100644
--- a/data/maps/Route16_House/scripts.inc
+++ b/data/maps/Route16_House/scripts.inc
@@ -1,36 +1,36 @@
 Route16_House_MapScripts:: @ 817014E
 	.byte 0
 
-Route16_House_EventScript_17014F:: @ 817014F
+Route16_House_EventScript_Woman:: @ 817014F
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_HM02, EventScript_1701A5
-	msgbox gUnknown_819F851
+	goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02
+	msgbox Route16_House_Text_FoundMySecretRetreat
 	checkitemspace ITEM_HM02, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_17019B
-	giveitem_msg gUnknown_819F8C0, ITEM_HM02
-	msgbox gUnknown_819F8E0
+	goto_if_eq Route16_House_EventScript_NoRoomForHM02
+	giveitem_msg Route16_House_Text_ReceivedHM02FromGirl, ITEM_HM02
+	msgbox Route16_House_Text_ExplainHM02
 	setflag FLAG_GOT_HM02
 	release
 	end
 
-EventScript_17019B:: @ 817019B
-	msgbox gUnknown_819F92D
+Route16_House_EventScript_NoRoomForHM02:: @ 817019B
+	msgbox Route16_House_Text_DontHaveAnyRoomForThis
 	release
 	end
 
-EventScript_1701A5:: @ 81701A5
-	msgbox gUnknown_819F8E0
+Route16_House_EventScript_AlreadyGotHM02:: @ 81701A5
+	msgbox Route16_House_Text_ExplainHM02
 	release
 	end
 
-Route16_House_EventScript_1701AF:: @ 81701AF
+Route16_House_EventScript_Fearow:: @ 81701AF
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_FEAROW, 0
-	msgbox gUnknown_819F94F
+	msgbox Route16_House_Text_Fearow
 	waitmoncry
 	release
 	end
diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc
index 136cf9604..2cdfe38d9 100644
--- a/data/maps/Route16_House/text.inc
+++ b/data/maps/Route16_House/text.inc
@@ -1,21 +1,21 @@
-gUnknown_819F851:: @ 819F851
+Route16_House_Text_FoundMySecretRetreat:: @ 819F851
     .string "Oh, dear.\n"
     .string "You've found my secret retreat.\p"
     .string "Please don't tell anyone I'm here.\n"
     .string "I'll make it up to you with this!$"
 
-gUnknown_819F8C0:: @ 819F8C0
+Route16_House_Text_ReceivedHM02FromGirl:: @ 819F8C0
     .string "{PLAYER} received HM02\n"
     .string "from the girl.$"
 
-gUnknown_819F8E0:: @ 819F8E0
+Route16_House_Text_ExplainHM02:: @ 819F8E0
     .string "HM02 is FLY.\n"
     .string "It's a wonderfully convenient move.\p"
     .string "Please, put it to good use.$"
 
-gUnknown_819F92D:: @ 819F92D
+Route16_House_Text_DontHaveAnyRoomForThis:: @ 819F92D
     .string "You don't have any room for this.$"
 
-gUnknown_819F94F:: @ 819F94F
+Route16_House_Text_Fearow:: @ 819F94F
     .string "FEAROW: Kyueen!$"
 
diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json
index b9425a4a6..515800a2c 100644
--- a/data/maps/Route16_NorthEntrance_1F/map.json
+++ b/data/maps/Route16_NorthEntrance_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -25,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1701DB",
+      "script": "Route16_NorthEntrance_1F_EventScript_Guard",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1702B5",
+      "script": "Route16_NorthEntrance_1F_EventScript_OldMan",
       "flag": "0"
     }
   ],
@@ -87,7 +87,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 1,
-      "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+      "script": "EventScript_SetExitingCyclingRoad"
     },
     {
       "type": "trigger",
@@ -96,7 +96,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+      "script": "EventScript_SetEnteringCyclingRoad"
     },
     {
       "type": "trigger",
@@ -105,7 +105,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1701E4"
+      "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop"
     },
     {
       "type": "trigger",
@@ -114,7 +114,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1701F0"
+      "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop"
     },
     {
       "type": "trigger",
@@ -123,7 +123,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+      "script": "EventScript_SetEnteringCyclingRoad"
     },
     {
       "type": "trigger",
@@ -132,7 +132,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+      "script": "EventScript_SetEnteringCyclingRoad"
     },
     {
       "type": "trigger",
@@ -141,7 +141,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 1,
-      "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+      "script": "EventScript_SetExitingCyclingRoad"
     },
     {
       "type": "trigger",
@@ -150,7 +150,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 1,
-      "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+      "script": "EventScript_SetExitingCyclingRoad"
     },
     {
       "type": "trigger",
@@ -159,7 +159,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_1701FC"
+      "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid"
     },
     {
       "type": "trigger",
@@ -168,7 +168,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_170208"
+      "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom"
     },
     {
       "type": "trigger",
@@ -177,7 +177,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route16_NorthEntrance_1F_EventScript_170214"
+      "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc
index a99a1ec18..d00ba5805 100644
--- a/data/maps/Route16_NorthEntrance_1F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc
@@ -4,115 +4,115 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2
 
 Route16_NorthEntrance_1F_OnTransition:: @ 81701C8
 	clearflag FLAG_SYS_ON_CYCLING_ROAD
-	call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5
+	call_if_set FLAG_GOT_BICYCLE, Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger
 	end
 
-EventScript_1701D5:: @ 81701D5
+Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 81701D5
 	setvar VAR_TEMP_1, 1
 	return
 
-Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB
-	msgbox gUnknown_819F98B, MSGBOX_NPC
+Route16_NorthEntrance_1F_EventScript_Guard:: @ 81701DB
+	msgbox Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse, MSGBOX_NPC
 	end
 
-Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 81701E4
 	lockall
 	setvar VAR_0x8008, 0
-	goto EventScript_170220
+	goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81701F0
 	lockall
 	setvar VAR_0x8008, 1
-	goto EventScript_170220
+	goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81701FC
 	lockall
 	setvar VAR_0x8008, 2
-	goto EventScript_170220
+	goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 8170208
 	lockall
 	setvar VAR_0x8008, 3
-	goto EventScript_170220
+	goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 8170214
 	lockall
 	setvar VAR_0x8008, 4
-	goto EventScript_170220
+	goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-EventScript_170220:: @ 8170220
+Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: @ 8170220
 	textcolor 0
-	msgbox gUnknown_819F9CC
+	msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
 	compare VAR_0x8008, 1
-	call_if_eq EventScript_170279
+	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
 	compare VAR_0x8008, 2
-	call_if_eq EventScript_170284
+	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid
 	compare VAR_0x8008, 3
-	call_if_eq EventScript_17028F
+	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
 	compare VAR_0x8008, 4
-	call_if_eq EventScript_17029A
-	msgbox gUnknown_819F95F
+	call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom
+	msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3
+	applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_170279:: @ 8170279
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 8170279
+	applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp
 	waitmovement 0
 	return
 
-EventScript_170284:: @ 8170284
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 8170284
+	applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2
 	waitmovement 0
 	return
 
-EventScript_17028F:: @ 817028F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 817028F
+	applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3
 	waitmovement 0
 	return
 
-EventScript_17029A:: @ 817029A
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 817029A
+	applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4
 	waitmovement 0
 	return
 
-Movement_1702A5:: @ 81702A5
+Route16_NorthEntrance_1F_Movement_WalkUp:: @ 81702A5
 	walk_up
 	step_end
 
-Movement_1702A7:: @ 81702A7
+Route16_NorthEntrance_1F_Movement_WalkUp2:: @ 81702A7
 	walk_up
 	walk_up
 	step_end
 
-Movement_1702AA:: @ 81702AA
+Route16_NorthEntrance_1F_Movement_WalkUp3:: @ 81702AA
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-Movement_1702AE:: @ 81702AE
+Route16_NorthEntrance_1F_Movement_WalkUp4:: @ 81702AE
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-Movement_1702B3:: @ 81702B3
+Route16_NorthEntrance_1F_Movement_WalkRight:: @ 81702B3
 	walk_right
 	step_end
 
-Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5
-	msgbox gUnknown_819F9E8, MSGBOX_NPC
+Route16_NorthEntrance_1F_EventScript_OldMan:: @ 81702B5
+	msgbox Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort, MSGBOX_NPC
 	end
diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc
index 8cc60117c..156e93bfa 100644
--- a/data/maps/Route16_NorthEntrance_1F/text.inc
+++ b/data/maps/Route16_NorthEntrance_1F/text.inc
@@ -1,16 +1,16 @@
-gUnknown_819F95F:: @ 819F95F
+Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad:: @ 819F95F
     .string "No pedestrians are allowed on\n"
     .string "CYCLING ROAD!$"
 
-gUnknown_819F98B:: @ 819F98B
+Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse:: @ 819F98B
     .string "CYCLING ROAD is a downhill course\n"
     .string "by the sea. It's a great ride.$"
 
-gUnknown_819F9CC:: @ 819F9CC
+Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp:: @ 819F9CC
     .string "Excuse me!\n"
     .string "Wait up, please!$"
 
-gUnknown_819F9E8:: @ 819F9E8
+Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort:: @ 819F9E8
     .string "How'd you get in?\n"
     .string "Good effort!$"
 
diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json
index 551fb5e7a..103929172 100644
--- a/data/maps/Route16_NorthEntrance_2F/map.json
+++ b/data/maps/Route16_NorthEntrance_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 6,
       "y": 3,
       "elevation": 3,
@@ -25,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_NorthEntrance_2F_EventScript_1702BF",
+      "script": "Route16_NorthEntrance_2F_EventScript_LittleBoy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -38,11 +38,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_NorthEntrance_2F_EventScript_1702C8",
+      "script": "Route16_NorthEntrance_2F_EventScript_LittleGirl",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 10,
       "y": 6,
       "elevation": 0,
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route16_NorthEntrance_2F_EventScript_1702E3",
+      "script": "Route16_NorthEntrance_2F_EventScript_Aide",
       "flag": "0"
     }
   ],
@@ -71,14 +71,14 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "Route16_NorthEntrance_2F_EventScript_1702D1"
+      "script": "Route16_NorthEntrance_2F_EventScript_LeftBinoculars"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "Route16_NorthEntrance_2F_EventScript_1702DA"
+      "script": "Route16_NorthEntrance_2F_EventScript_RightBinoculars"
     }
   ]
 }
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc
index 7ccba34c8..0843978f2 100644
--- a/data/maps/Route16_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc
@@ -1,52 +1,54 @@
+.equ REQUIRED_CAUGHT_MONS, 40
+
 Route16_NorthEntrance_2F_MapScripts:: @ 81702BE
 	.byte 0
 
-Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF
-	msgbox gUnknown_819FA07, MSGBOX_NPC
+Route16_NorthEntrance_2F_EventScript_LittleBoy:: @ 81702BF
+	msgbox Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend, MSGBOX_NPC
 	end
 
-Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8
-	msgbox gUnknown_819FA41, MSGBOX_NPC
+Route16_NorthEntrance_2F_EventScript_LittleGirl:: @ 81702C8
+	msgbox Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes, MSGBOX_NPC
 	end
 
-Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1
-	msgbox gUnknown_819FA6F, MSGBOX_SIGN
+Route16_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 81702D1
+	msgbox Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore, MSGBOX_SIGN
 	end
 
-Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA
-	msgbox gUnknown_819FAB9, MSGBOX_SIGN
+Route16_NorthEntrance_2F_EventScript_RightBinoculars:: @ 81702DA
+	msgbox Route16_NorthEntrance_2F_Text_LongPathOverWater, MSGBOX_SIGN
 	end
 
-Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
+Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3
 	lock
 	faceplayer
-	call EventScript_17036F
-	goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365
-	msgbox gUnknown_819FB0E, MSGBOX_YESNO
+	call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
+	goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin
+	msgbox Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
-	call EventScript_17036F
-	compare VAR_0x8006, 40
+	call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
+	compare VAR_0x8006, REQUIRED_CAUGHT_MONS
 	goto_if_lt Aide_EventScript_HaventCaughtEnough
-	msgbox gUnknown_819FC15
+	msgbox Route16_NorthEntrance_2F_Text_GreatHereYouGo
 	checkitemspace ITEM_AMULET_COIN, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq Aide_EventScript_NoRoomForItem
-	giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
+	giveitem_msg Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide, ITEM_AMULET_COIN
 	setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
-	msgbox gUnknown_819FC93
+	msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin
 	release
 	end
 
-EventScript_170365:: @ 8170365
-	msgbox gUnknown_819FC93
+Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin:: @ 8170365
+	msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin
 	release
 	end
 
-EventScript_17036F:: @ 817036F
-	getnumberstring 0, 40
+Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo:: @ 817036F
+	getnumberstring 0, REQUIRED_CAUGHT_MONS
 	getitemname 1, ITEM_AMULET_COIN
 	return
diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc
index 4839bfe8a..37c518fb4 100644
--- a/data/maps/Route16_NorthEntrance_2F/text.inc
+++ b/data/maps/Route16_NorthEntrance_2F/text.inc
@@ -1,23 +1,23 @@
-gUnknown_819FA07:: @ 819FA07
+Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend:: @ 819FA07
     .string "I'm on a relaxing ride on my new\n"
     .string "bike with my girlfriend.$"
 
-gUnknown_819FA41:: @ 819FA41
+Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes:: @ 819FA41
     .string "We're going riding together on our\n"
     .string "new bikes.$"
 
-gUnknown_819FA6F:: @ 819FA6F
+Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore:: @ 819FA6F
     .string "Let's see what the binoculars have\n"
     .string "to show…\p"
     .string "It's the CELADON DEPT. STORE!$"
 
-gUnknown_819FAB9:: @ 819FAB9
+Route16_NorthEntrance_2F_Text_LongPathOverWater:: @ 819FAB9
     .string "Let's see what the binoculars have\n"
     .string "to show…\p"
     .string "There's a long path over water far\n"
     .string "away.$"
 
-gUnknown_819FB0E:: @ 819FB0E
+Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: @ 819FB0E
     .string "Hi! Remember me?\n"
     .string "I'm one of PROF. OAK's AIDES.\p"
     .string "If your POKéDEX has complete data\n"
@@ -29,17 +29,17 @@ gUnknown_819FB0E:: @ 819FB0E
     .string "Have you gathered data on at least\n"
     .string "40 kinds of POKéMON?$"
 
-gUnknown_819FC15:: @ 819FC15
+Route16_NorthEntrance_2F_Text_GreatHereYouGo:: @ 819FC15
     .string "Great! You have caught or owned\n"
     .string "{STR_VAR_3} kinds of POKéMON!\p"
     .string "Congratulations!\n"
     .string "Here you go!$"
 
-gUnknown_819FC68:: @ 819FC68
+Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide:: @ 819FC68
     .string "{PLAYER} received the AMULET COIN\n"
     .string "from the AIDE.$"
 
-gUnknown_819FC93:: @ 819FC93
+Route16_NorthEntrance_2F_Text_ExplainAmuletCoin:: @ 819FC93
     .string "An AMULET COIN is an item to be\n"
     .string "held by a POKéMON.\p"
     .string "If the POKéMON appears in a winning\n"
diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json
index 1afe3a6bf..43ec14e88 100644
--- a/data/maps/Route17/map.json
+++ b/data/maps/Route17/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 4,
       "y": 18,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 6,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB319",
+      "script": "Route17_EventScript_Virgil",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 11,
       "y": 15,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 5,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB221",
+      "script": "Route17_EventScript_Isaiah",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 15,
       "y": 24,
       "elevation": 3,
@@ -62,11 +62,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB1E3",
+      "script": "Route17_EventScript_Raul",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 18,
       "y": 41,
       "elevation": 3,
@@ -75,11 +75,11 @@
       "movement_range_y": 5,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB129",
+      "script": "Route17_EventScript_Nikolas",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 7,
       "y": 38,
       "elevation": 3,
@@ -88,11 +88,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "Route17_EventScript_1AB0EB",
+      "script": "Route17_EventScript_Billy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 2,
       "y": 61,
       "elevation": 3,
@@ -101,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route17_EventScript_1AB29D",
+      "script": "Route17_EventScript_Jamal",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 21,
       "y": 61,
       "elevation": 3,
@@ -114,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route17_EventScript_1AB25F",
+      "script": "Route17_EventScript_Zeek",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 18,
       "y": 94,
       "elevation": 3,
@@ -127,11 +127,11 @@
       "movement_range_y": 5,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB2DB",
+      "script": "Route17_EventScript_Corey",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 16,
       "y": 134,
       "elevation": 3,
@@ -140,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB1A5",
+      "script": "Route17_EventScript_William",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 4,
       "y": 116,
       "elevation": 3,
@@ -153,7 +153,7 @@
       "movement_range_y": 5,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route17_EventScript_1AB167",
+      "script": "Route17_EventScript_Jaxon",
       "flag": "0"
     }
   ],
@@ -165,42 +165,42 @@
       "x": 12,
       "y": 97,
       "elevation": 0,
-      "script": "Route17_EventScript_1681DB"
+      "script": "Route17_EventScript_RouteSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 12,
       "y": 83,
       "elevation": 0,
-      "script": "Route17_EventScript_1681D2"
+      "script": "Route17_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 12,
       "y": 68,
       "elevation": 0,
-      "script": "Route17_EventScript_1681C9"
+      "script": "Route17_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 12,
       "y": 53,
       "elevation": 0,
-      "script": "Route17_EventScript_1681C0"
+      "script": "Route17_EventScript_ItemsNotice"
     },
     {
       "type": "bg_event_type_0",
       "x": 12,
       "y": 125,
       "elevation": 3,
-      "script": "Route17_EventScript_1681E4"
+      "script": "Route17_EventScript_BallsNotice"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 157,
       "elevation": 0,
-      "script": "Route17_EventScript_1681ED"
+      "script": "Route17_EventScript_CyclingRoadSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc
index 8633ab23e..787e68e04 100644
--- a/data/maps/Route17/scripts.inc
+++ b/data/maps/Route17/scripts.inc
@@ -1,26 +1,26 @@
 Route17_MapScripts:: @ 81681BF
 	.byte 0
 
-Route17_EventScript_1681C0:: @ 81681C0
-	msgbox gUnknown_81874E4, MSGBOX_SIGN
+Route17_EventScript_ItemsNotice:: @ 81681C0
+	msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681C9:: @ 81681C9
-	msgbox gUnknown_8187512, MSGBOX_SIGN
+Route17_EventScript_TrainerTips1:: @ 81681C9
+	msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681D2:: @ 81681D2
-	msgbox gUnknown_818757B, MSGBOX_SIGN
+Route17_EventScript_TrainerTips2:: @ 81681D2
+	msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681DB:: @ 81681DB
-	msgbox gUnknown_81875BE, MSGBOX_SIGN
+Route17_EventScript_RouteSign:: @ 81681DB
+	msgbox Route17_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681E4:: @ 81681E4
-	msgbox gUnknown_81875E3, MSGBOX_SIGN
+Route17_EventScript_BallsNotice:: @ 81681E4
+	msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN
 	end
 
-Route17_EventScript_1681ED:: @ 81681ED
-	msgbox gUnknown_8187622, MSGBOX_SIGN
+Route17_EventScript_CyclingRoadSign:: @ 81681ED
+	msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc
index eff5f0726..21d7978a3 100644
--- a/data/maps/Route17/text.inc
+++ b/data/maps/Route17/text.inc
@@ -1,131 +1,131 @@
-Text_18717E:: @ 818717E
+Route17_Text_RaulIntro:: @ 818717E
     .string "There's no getting rich quick in\n"
     .string "battling kids.$"
 
-Text_1871AE:: @ 81871AE
+Route17_Text_RaulDefeat:: @ 81871AE
     .string "Burned out!$"
 
-Text_1871BA:: @ 81871BA
+Route17_Text_RaulPostBattle:: @ 81871BA
     .string "You can find good stuff lying\n"
     .string "around on CYCLING ROAD.\p"
     .string "There's good money in picking them\n"
     .string "up and selling them.$"
 
-Text_187228:: @ 8187228
+Route17_Text_IsaiahIntro:: @ 8187228
     .string "I'm mighty proud of my bod, kiddo.\n"
     .string "Come on!$"
 
-Text_187254:: @ 8187254
+Route17_Text_IsaiahDefeat:: @ 8187254
     .string "Whoo!$"
 
-Text_18725A:: @ 818725A
+Route17_Text_IsaiahPostBattle:: @ 818725A
     .string "I could belly-bump you outta\n"
     .string "here!$"
 
-Text_18727D:: @ 818727D
+Route17_Text_VirgilIntro:: @ 818727D
     .string "You heading to FUCHSIA?$"
 
-Text_187295:: @ 8187295
+Route17_Text_VirgilDefeat:: @ 8187295
     .string "Crash and burn!$"
 
-Text_1872A5:: @ 81872A5
+Route17_Text_VirgilPostBattle:: @ 81872A5
     .string "I love racing downhill!$"
 
-Text_1872BD:: @ 81872BD
+Route17_Text_BillyIntro:: @ 81872BD
     .string "We're BIKERS!\n"
     .string "We rule the roads, man!$"
 
-Text_1872E3:: @ 81872E3
+Route17_Text_BillyDefeat:: @ 81872E3
     .string "Smoked!$"
 
-Text_1872EB:: @ 81872EB
+Route17_Text_BillyPostBattle:: @ 81872EB
     .string "Are you looking for adventure?$"
 
-Text_18730A:: @ 818730A
+Route17_Text_NikolasIntro:: @ 818730A
     .string "Let VOLTORB electrify you!$"
 
-Text_187325:: @ 8187325
+Route17_Text_NikolasDefeat:: @ 8187325
     .string "Grounded out!$"
 
-Text_187333:: @ 8187333
+Route17_Text_NikolasPostBattle:: @ 8187333
     .string "I got my VOLTORB at the abandoned\n"
     .string "POWER PLANT.$"
 
-Text_187362:: @ 8187362
+Route17_Text_ZeekIntro:: @ 8187362
     .string "I leveled up my POKéMON, but it\n"
     .string "won't evolve. Why?$"
 
-Text_187395:: @ 8187395
+Route17_Text_ZeekDefeat:: @ 8187395
     .string "Why, you!$"
 
-Text_18739F:: @ 818739F
+Route17_Text_ZeekPostBattle:: @ 818739F
     .string "Maybe some POKéMON need element\n"
     .string "STONES to evolve.$"
 
-Text_1873D1:: @ 81873D1
+Route17_Text_JamalIntro:: @ 81873D1
     .string "I need a little exercise!$"
 
-Text_1873EB:: @ 81873EB
+Route17_Text_JamalDefeat:: @ 81873EB
     .string "Whew!\n"
     .string "Good workout!$"
 
-Text_1873FF:: @ 81873FF
+Route17_Text_JamalPostBattle:: @ 81873FF
     .string "I'm sure I lost weight there!$"
 
-Text_18741D:: @ 818741D
+Route17_Text_CoreyIntro:: @ 818741D
     .string "Be a rebel!$"
 
-Text_187429:: @ 8187429
+Route17_Text_CoreyDefeat:: @ 8187429
     .string "Aaaargh!$"
 
-Text_187432:: @ 8187432
+Route17_Text_CoreyPostBattle:: @ 8187432
     .string "Be ready to fight for your beliefs!$"
 
-Text_187456:: @ 8187456
+Route17_Text_JaxonIntro:: @ 8187456
     .string "Nice BIKE!\n"
     .string "How's it handle?$"
 
-Text_187472:: @ 8187472
+Route17_Text_JaxonDefeat:: @ 8187472
     .string "Shoot!$"
 
-Text_187479:: @ 8187479
+Route17_Text_JaxonPostBattle:: @ 8187479
     .string "The slope makes it hard to steer.$"
 
-Text_18749B:: @ 818749B
+Route17_Text_WilliamIntro:: @ 818749B
     .string "Get lost, kid!\n"
     .string "I'm bushed!$"
 
-Text_1874B6:: @ 81874B6
+Route17_Text_WilliamDefeat:: @ 81874B6
     .string "Are you satisfied?$"
 
-Text_1874C9:: @ 81874C9
+Route17_Text_WilliamPostBattle:: @ 81874C9
     .string "I need to catch a few z's!$"
 
-gUnknown_81874E4:: @ 81874E4
+Route17_Text_WatchOutForDiscardedItems:: @ 81874E4
     .string "It's a notice.\p"
     .string "Watch out for discarded items.$"
 
-gUnknown_8187512:: @ 8187512
+Route17_Text_SameSpeciesGrowDifferentRates:: @ 8187512
     .string "TRAINER TIPS\p"
     .string "All POKéMON are unique.\p"
     .string "Even POKéMON of the same species\n"
     .string "and level grow at different rates.$"
 
-gUnknown_818757B:: @ 818757B
+Route17_Text_PressBToStayInPlace:: @ 818757B
     .string "TRAINER TIPS\p"
     .string "Press the B Button to stay in place\n"
     .string "while on a slope.$"
 
-gUnknown_81875BE:: @ 81875BE
+Route17_Text_RouteSign:: @ 81875BE
     .string "ROUTE 17\n"
     .string "CELADON CITY - FUCHSIA CITY$"
 
-gUnknown_81875E3:: @ 81875E3
+Route17_Text_DontThrowGameThrowBalls:: @ 81875E3
     .string "It's a notice!\p"
     .string "Don't throw the game, throw POKé\n"
     .string "BALLS instead!$"
 
-gUnknown_8187622:: @ 8187622
+Route17_Text_CyclingRoadSign:: @ 8187622
     .string "CYCLING ROAD\n"
     .string "Slope ends here!$"
 
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json
index 6dd7673de..6976a7570 100644
--- a/data/maps/Route18/map.json
+++ b/data/maps/Route18/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 46,
       "y": 14,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route18_EventScript_1AB3D3",
+      "script": "Route18_EventScript_Jacob",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 41,
       "y": 15,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route18_EventScript_1AB395",
+      "script": "Route18_EventScript_Ramiro",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 39,
       "y": 12,
       "elevation": 3,
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "Route18_EventScript_1AB357",
+      "script": "Route18_EventScript_Wilton",
       "flag": "0"
     }
   ],
@@ -89,14 +89,14 @@
       "x": 37,
       "y": 7,
       "elevation": 0,
-      "script": "Route18_EventScript_168228"
+      "script": "Route18_EventScript_CyclingRoadSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 52,
       "y": 7,
       "elevation": 0,
-      "script": "Route18_EventScript_16821F"
+      "script": "Route18_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc
index 25fda03c2..43d2b029e 100644
--- a/data/maps/Route18/scripts.inc
+++ b/data/maps/Route18/scripts.inc
@@ -5,25 +5,25 @@ Route18_MapScripts:: @ 81681F6
 
 Route18_OnTransition:: @ 8168201
 	compare VAR_MAP_SCENE_ROUTE16, 1
-	call_if_eq EventScript_16820D
+	call_if_eq Route18_OnTransitionCyclingRoad
 	end
 
-EventScript_16820D:: @ 816820D
+Route18_OnTransitionCyclingRoad:: @ 816820D
 	setflag FLAG_SYS_ON_CYCLING_ROAD
 	return
 
 Route18_OnWarp:: @ 8168211
-	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B
+	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route18_OnWarpCyclingRoad
 	.2byte 0
 
-EventScript_16821B:: @ 816821B
+Route18_OnWarpCyclingRoad:: @ 816821B
 	special Special_ForcePlayerOntoBike
 	end
 
-Route18_EventScript_16821F:: @ 816821F
-	msgbox gUnknown_8187757, MSGBOX_SIGN
+Route18_EventScript_RouteSign:: @ 816821F
+	msgbox Route18_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route18_EventScript_168228:: @ 8168228
-	msgbox gUnknown_818777C, MSGBOX_SIGN
+Route18_EventScript_CyclingRoadSign:: @ 8168228
+	msgbox Route18_Text_CyclingRoadSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc
index c22a6360a..107804cfb 100644
--- a/data/maps/Route18/text.inc
+++ b/data/maps/Route18/text.inc
@@ -1,40 +1,40 @@
-Text_187640:: @ 8187640
+Route18_Text_WiltonIntro:: @ 8187640
     .string "I always check every grassy area\n"
     .string "for new POKéMON.$"
 
-Text_187672:: @ 8187672
+Route18_Text_WiltonDefeat:: @ 8187672
     .string "Tch!$"
 
-Text_187677:: @ 8187677
+Route18_Text_WiltonPostBattle:: @ 8187677
     .string "I wish I had a BIKE!$"
 
-Text_18768C:: @ 818768C
+Route18_Text_RamiroIntro:: @ 818768C
     .string "Kurukkoo!\n"
     .string "How do you like my birdcall?$"
 
-Text_1876B3:: @ 81876B3
+Route18_Text_RamiroDefeat:: @ 81876B3
     .string "I had to bug you!$"
 
-Text_1876C5:: @ 81876C5
+Route18_Text_RamiroPostBattle:: @ 81876C5
     .string "I collect sea POKéMON on weekends\n"
     .string "because the sea is so close.$"
 
-Text_187704:: @ 8187704
+Route18_Text_JacobIntro:: @ 8187704
     .string "This is my turf!\n"
     .string "Get out of here!$"
 
-Text_187726:: @ 8187726
+Route18_Text_JacobDefeat:: @ 8187726
     .string "Darn!$"
 
-Text_18772C:: @ 818772C
+Route18_Text_JacobPostBattle:: @ 818772C
     .string "This is my fave area for catching\n"
     .string "POKéMON.$"
 
-gUnknown_8187757:: @ 8187757
+Route18_Text_RouteSign:: @ 8187757
     .string "ROUTE 18\n"
     .string "CELADON CITY - FUCHSIA CITY$"
 
-gUnknown_818777C:: @ 818777C
+Route18_Text_CyclingRoadSign:: @ 818777C
     .string "CYCLING ROAD\n"
     .string "No pedestrians permitted!$"
 
diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json
index 741c391f7..c7c04b124 100644
--- a/data/maps/Route18_EastEntrance_1F/map.json
+++ b/data/maps/Route18_EastEntrance_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_170391",
+      "script": "Route18_EastEntrance_1F_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -60,7 +60,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+      "script": "EventScript_SetEnteringCyclingRoad"
     },
     {
       "type": "trigger",
@@ -69,7 +69,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_17039A"
+      "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop"
     },
     {
       "type": "trigger",
@@ -78,7 +78,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1703A6"
+      "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop"
     },
     {
       "type": "trigger",
@@ -87,7 +87,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1703B2"
+      "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid"
     },
     {
       "type": "trigger",
@@ -96,7 +96,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1703BE"
+      "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom"
     },
     {
       "type": "trigger",
@@ -105,7 +105,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1703CA"
+      "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom"
     },
     {
       "type": "trigger",
@@ -114,7 +114,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 1,
-      "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+      "script": "EventScript_SetExitingCyclingRoad"
     },
     {
       "type": "trigger",
@@ -123,7 +123,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 1,
-      "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+      "script": "EventScript_SetExitingCyclingRoad"
     },
     {
       "type": "trigger",
@@ -132,7 +132,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 1,
-      "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+      "script": "EventScript_SetExitingCyclingRoad"
     },
     {
       "type": "trigger",
@@ -141,7 +141,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+      "script": "EventScript_SetEnteringCyclingRoad"
     },
     {
       "type": "trigger",
@@ -150,7 +150,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE16",
       "var_value": 0,
-      "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+      "script": "EventScript_SetEnteringCyclingRoad"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc
index e49eb285f..0a6b3b56f 100644
--- a/data/maps/Route18_EastEntrance_1F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_1F/scripts.inc
@@ -4,111 +4,111 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378
 
 Route18_EastEntrance_1F_OnTransition:: @ 817037E
 	clearflag FLAG_SYS_ON_CYCLING_ROAD
-	call_if_set FLAG_GOT_BICYCLE, EventScript_17038B
+	call_if_set FLAG_GOT_BICYCLE, Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger
 	end
 
-EventScript_17038B:: @ 817038B
+Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 817038B
 	setvar VAR_TEMP_1, 1
 	return
 
-Route18_EastEntrance_1F_EventScript_170391:: @ 8170391
-	msgbox gUnknown_819FD3A, MSGBOX_NPC
+Route18_EastEntrance_1F_EventScript_Guard:: @ 8170391
+	msgbox Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere, MSGBOX_NPC
 	end
 
-Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 817039A
 	lockall
 	setvar VAR_0x8008, 0
-	goto EventScript_1703D6
+	goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81703A6
 	lockall
 	setvar VAR_0x8008, 1
-	goto EventScript_1703D6
+	goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81703B2
 	lockall
 	setvar VAR_0x8008, 2
-	goto EventScript_1703D6
+	goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 81703BE
 	lockall
 	setvar VAR_0x8008, 3
-	goto EventScript_1703D6
+	goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 81703CA
 	lockall
 	setvar VAR_0x8008, 4
-	goto EventScript_1703D6
+	goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
 	end
 
-EventScript_1703D6:: @ 81703D6
+Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: @ 81703D6
 	textcolor 0
-	msgbox gUnknown_819FD60
+	msgbox Route18_EastEntrance_1F_Text_ExcuseMe
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
 	compare VAR_0x8008, 1
-	call_if_eq EventScript_17042F
+	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
 	compare VAR_0x8008, 2
-	call_if_eq EventScript_17043A
+	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid
 	compare VAR_0x8008, 3
-	call_if_eq EventScript_170445
+	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
 	compare VAR_0x8008, 4
-	call_if_eq EventScript_170450
-	msgbox gUnknown_819FD0C
+	call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom
+	msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170469
+	applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_17042F:: @ 817042F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 817042F
+	applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp
 	waitmovement 0
 	return
 
-EventScript_17043A:: @ 817043A
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 817043A
+	applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2
 	waitmovement 0
 	return
 
-EventScript_170445:: @ 8170445
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170460
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 8170445
+	applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3
 	waitmovement 0
 	return
 
-EventScript_170450:: @ 8170450
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170464
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 8170450
+	applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4
 	waitmovement 0
 	return
 
-Movement_17045B:: @ 817045B
+Route18_EastEntrance_1F_Movement_WalkUp:: @ 817045B
 	walk_up
 	step_end
 
-Movement_17045D:: @ 817045D
+Route18_EastEntrance_1F_Movement_WalkUp2:: @ 817045D
 	walk_up
 	walk_up
 	step_end
 
-Movement_170460:: @ 8170460
+Route18_EastEntrance_1F_Movement_WalkUp3:: @ 8170460
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-Movement_170464:: @ 8170464
+Route18_EastEntrance_1F_Movement_WalkUp4:: @ 8170464
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-Movement_170469:: @ 8170469
+Route18_EastEntrance_1F_Movement_WalkRight:: @ 8170469
 	walk_right
 	step_end
diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc
index 5de293cba..9551d993f 100644
--- a/data/maps/Route18_EastEntrance_1F/text.inc
+++ b/data/maps/Route18_EastEntrance_1F/text.inc
@@ -1,11 +1,11 @@
-gUnknown_819FD0C:: @ 819FD0C
+Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad:: @ 819FD0C
     .string "You need a BICYCLE to go out on\n"
     .string "CYCLING ROAD!$"
 
-gUnknown_819FD3A:: @ 819FD3A
+Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere:: @ 819FD3A
     .string "CYCLING ROAD is all uphill from\n"
     .string "here.$"
 
-gUnknown_819FD60:: @ 819FD60
+Route18_EastEntrance_1F_Text_ExcuseMe:: @ 819FD60
     .string "Excuse me!$"
 
diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json
index 052fe0215..c5c7b0853 100644
--- a/data/maps/Route18_EastEntrance_2F/map.json
+++ b/data/maps/Route18_EastEntrance_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route18_EastEntrance_2F_EventScript_17047E",
+      "script": "Route18_EastEntrance_2F_EventScript_Haden",
       "flag": "0"
     }
   ],
@@ -45,14 +45,14 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "Route18_EastEntrance_2F_EventScript_17046C"
+      "script": "Route18_EastEntrance_2F_EventScript_LeftBinoculars"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "Route18_EastEntrance_2F_EventScript_170475"
+      "script": "Route18_EastEntrance_2F_EventScript_RightBinoculars"
     }
   ]
 }
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc
index ed29859ab..910f238e4 100644
--- a/data/maps/Route18_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_2F/scripts.inc
@@ -1,47 +1,47 @@
 Route18_EastEntrance_2F_MapScripts:: @ 817046B
 	.byte 0
 
-Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C
-	msgbox gUnknown_819FD6B, MSGBOX_SIGN
+Route18_EastEntrance_2F_EventScript_LeftBinoculars:: @ 817046C
+	msgbox Route18_EastEntrance_2F_Text_PalletTownInWest, MSGBOX_SIGN
 	end
 
-Route18_EastEntrance_2F_EventScript_170475:: @ 8170475
-	msgbox gUnknown_819FDB3, MSGBOX_SIGN
+Route18_EastEntrance_2F_EventScript_RightBinoculars:: @ 8170475
+	msgbox Route18_EastEntrance_2F_Text_PeopleSwimming, MSGBOX_SIGN
 	end
 
-Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
+Route18_EastEntrance_2F_EventScript_Haden:: @ 817047E
 	lock
 	faceplayer
 	setvar VAR_0x8008, INGAME_TRADE_LICKITUNG
 	call EventScript_GetInGameTradeSpeciesInfo
-	goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0
+	goto_if_set FLAG_DID_MARC_TRADE, Route18_EastEntrance_2F_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1704D8
+	goto_if_eq Route18_EastEntrance_2F_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
 	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge EventScript_1704D8
+	goto_if_ge Route18_EastEntrance_2F_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne EventScript_1704E2
+	goto_if_ne Route18_EastEntrance_2F_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MARC_TRADE
 	release
 	end
 
-EventScript_1704D8:: @ 81704D8
+Route18_EastEntrance_2F_EventScript_DeclineTrade:: @ 81704D8
 	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
-EventScript_1704E2:: @ 81704E2
+Route18_EastEntrance_2F_EventScript_NotRequestedMon:: @ 81704E2
 	getspeciesname 0, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
-EventScript_1704F0:: @ 81704F0
+Route18_EastEntrance_2F_EventScript_AlreadyTraded:: @ 81704F0
 	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end
diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc
index 8a479371c..aac533f71 100644
--- a/data/maps/Route18_EastEntrance_2F/text.inc
+++ b/data/maps/Route18_EastEntrance_2F/text.inc
@@ -1,9 +1,9 @@
-gUnknown_819FD6B:: @ 819FD6B
+Route18_EastEntrance_2F_Text_PalletTownInWest:: @ 819FD6B
     .string "Let's see what the binoculars have\n"
     .string "to show…\p"
     .string "PALLET TOWN is in the west.$"
 
-gUnknown_819FDB3:: @ 819FDB3
+Route18_EastEntrance_2F_Text_PeopleSwimming:: @ 819FDB3
     .string "Let's see what the binoculars have\n"
     .string "to show…\p"
     .string "There are people swimming.$"
diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
index abb670524..d8f35ad21 100644
--- a/data/maps/Route19/map.json
+++ b/data/maps/Route19/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 15,
       "y": 10,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB44F",
+      "script": "Route19_EventScript_Reece",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB411",
+      "script": "Route19_EventScript_Richard",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 12,
       "y": 17,
       "elevation": 1,
@@ -62,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB547",
+      "script": "Route19_EventScript_Tony",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 18,
       "y": 33,
       "elevation": 1,
@@ -75,11 +75,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB48D",
+      "script": "Route19_EventScript_Matthew",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 8,
       "y": 27,
       "elevation": 1,
@@ -88,11 +88,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB4CB",
+      "script": "Route19_EventScript_Douglas",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 16,
       "y": 22,
       "elevation": 1,
@@ -101,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "Route19_EventScript_1AB509",
+      "script": "Route19_EventScript_David",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 11,
       "y": 47,
       "elevation": 1,
@@ -114,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB585",
+      "script": "Route19_EventScript_Axle",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 14,
       "y": 48,
       "elevation": 1,
@@ -127,11 +127,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB601",
+      "script": "Route19_EventScript_Alice",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 12,
       "y": 49,
       "elevation": 1,
@@ -140,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB63F",
+      "script": "Route19_EventScript_Connie",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 9,
       "y": 48,
       "elevation": 1,
@@ -153,11 +153,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB5C3",
+      "script": "Route19_EventScript_Anya",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 8,
       "y": 41,
       "elevation": 1,
@@ -166,11 +166,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB67D",
+      "script": "Route19_EventScript_Lia",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
       "x": 9,
       "y": 41,
       "elevation": 1,
@@ -179,7 +179,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB6C3",
+      "script": "Route19_EventScript_Luc",
       "flag": "0"
     }
   ],
@@ -191,7 +191,7 @@
       "x": 13,
       "y": 12,
       "elevation": 0,
-      "script": "Route19_EventScript_168232"
+      "script": "Route19_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc
index 16d6e4669..10b361e83 100644
--- a/data/maps/Route19/scripts.inc
+++ b/data/maps/Route19/scripts.inc
@@ -1,6 +1,6 @@
 Route19_MapScripts:: @ 8168231
 	.byte 0
 
-Route19_EventScript_168232:: @ 8168232
-	msgbox gUnknown_8187C06, MSGBOX_SIGN
+Route19_EventScript_RouteSign:: @ 8168232
+	msgbox Route19_Text_RouteSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc
index 7d399f364..a414146b4 100644
--- a/data/maps/Route19/text.inc
+++ b/data/maps/Route19/text.inc
@@ -1,154 +1,154 @@
-Text_1877A3:: @ 81877A3
+Route19_Text_RichardIntro:: @ 81877A3
     .string "I have to exercise and warm up\n"
     .string "before going out for a swim.$"
 
-Text_1877DF:: @ 81877DF
+Route19_Text_RichardDefeat:: @ 81877DF
     .string "All warmed up!$"
 
-Text_1877EE:: @ 81877EE
+Route19_Text_RichardPostBattle:: @ 81877EE
     .string "Thanks, kid!\n"
     .string "I'm ready for a swim.$"
 
-Text_187811:: @ 8187811
+Route19_Text_ReeceIntro:: @ 8187811
     .string "Wait! Slow down!\n"
     .string "You'll have a heart attack!$"
 
-Text_18783E:: @ 818783E
+Route19_Text_ReeceDefeat:: @ 818783E
     .string "Ooh!\n"
     .string "That's chilly!$"
 
-Text_187852:: @ 8187852
+Route19_Text_ReecePostBattle:: @ 8187852
     .string "Watch out for TENTACOOL.\n"
     .string "They sting so painfully.$"
 
-Text_187884:: @ 8187884
+Route19_Text_MatthewIntro:: @ 8187884
     .string "I love swimming!\n"
     .string "What about you?$"
 
-Text_1878A5:: @ 81878A5
+Route19_Text_MatthewDefeat:: @ 81878A5
     .string "Belly flop!$"
 
-Text_1878B1:: @ 81878B1
+Route19_Text_MatthewPostBattle:: @ 81878B1
     .string "I can beat even marine POKéMON\n"
     .string "at swimming.$"
 
-Text_1878DD:: @ 81878DD
+Route19_Text_DouglasIntro:: @ 81878DD
     .string "What's beyond the horizon?$"
 
-Text_1878F8:: @ 81878F8
+Route19_Text_DouglasDefeat:: @ 81878F8
     .string "Glub!$"
 
-Text_1878FE:: @ 81878FE
+Route19_Text_DouglasPostBattle:: @ 81878FE
     .string "I see a couple of islands over\n"
     .string "yonder!$"
 
-Text_187925:: @ 8187925
+Route19_Text_DavidIntro:: @ 8187925
     .string "I tried diving for POKéMON, but it\n"
     .string "was a no-go.$"
 
-Text_187955:: @ 8187955
+Route19_Text_DavidDefeat:: @ 8187955
     .string "Help!$"
 
-Text_18795B:: @ 818795B
+Route19_Text_DavidPostBattle:: @ 818795B
     .string "I guess you have to fish for sea\n"
     .string "POKéMON.$"
 
-Text_187985:: @ 8187985
+Route19_Text_TonyIntro:: @ 8187985
     .string "I look at the sea to forget all\n"
     .string "the bad things that happened.$"
 
-Text_1879C3:: @ 81879C3
+Route19_Text_TonyDefeat:: @ 81879C3
     .string "Ooh!\n"
     .string "Traumatic!$"
 
-Text_1879D3:: @ 81879D3
+Route19_Text_TonyPostBattle:: @ 81879D3
     .string "I'm looking at the sea to forget\n"
     .string "the bad thing that happened!$"
 
-Text_187A11:: @ 8187A11
+Route19_Text_AnyaIntro:: @ 8187A11
     .string "Oh, I just love your ride!\n"
     .string "Can I have it if I win?$"
 
-Text_187A44:: @ 8187A44
+Route19_Text_AnyaDefeat:: @ 8187A44
     .string "Oh! I lost!$"
 
-Text_187A50:: @ 8187A50
+Route19_Text_AnyaPostBattle:: @ 8187A50
     .string "It's still a long way to go to\n"
     .string "SEAFOAM ISLANDS…\p"
     .string "I want to go back to FUCHSIA…$"
 
-Text_187A9E:: @ 8187A9E
+Route19_Text_AliceIntro:: @ 8187A9E
     .string "Swimming's great!\n"
     .string "Sunburns aren't!$"
 
-Text_187AC1:: @ 8187AC1
+Route19_Text_AliceDefeat:: @ 8187AC1
     .string "Shocker!$"
 
-Text_187ACA:: @ 8187ACA
+Route19_Text_AlicePostBattle:: @ 8187ACA
     .string "My boyfriend wanted to swim to\n"
     .string "SEAFOAM ISLANDS.$"
 
-Text_187AFA:: @ 8187AFA
+Route19_Text_AxleIntro:: @ 8187AFA
     .string "Ahoy, there!\n"
     .string "These waters are treacherous!$"
 
-Text_187B25:: @ 8187B25
+Route19_Text_AxleDefeat:: @ 8187B25
     .string "Ooh!\n"
     .string "Dangerous!$"
 
-Text_187B35:: @ 8187B35
+Route19_Text_AxlePostBattle:: @ 8187B35
     .string "M-my legs! They cramped up!\n"
     .string "Glub, glub…$"
 
-Text_187B5D:: @ 8187B5D
+Route19_Text_ConnieIntro:: @ 8187B5D
     .string "I swam here with my friends…\n"
     .string "I'm tired…$"
 
-Text_187B85:: @ 8187B85
+Route19_Text_ConnieDefeat:: @ 8187B85
     .string "I'm exhausted…$"
 
-Text_187B94:: @ 8187B94
+Route19_Text_ConniePostBattle:: @ 8187B94
     .string "If I were to ride a POKéMON on\n"
     .string "the sea, I'd like a LAPRAS.\p"
     .string "LAPRAS is so big, I bet it\n"
     .string "would keep me dry on water.$"
 
-gUnknown_8187C06:: @ 8187C06
+Route19_Text_RouteSign:: @ 8187C06
     .string "SEA ROUTE 19\n"
     .string "FUCHSIA CITY - SEAFOAM ISLANDS$"
 
-Text_187C32:: @ 8187C32
+Route19_Text_LiaIntro:: @ 8187C32
     .string "LIA: I'm looking after my brother.\n"
     .string "He just became a TRAINER.$"
 
-Text_187C6F:: @ 8187C6F
+Route19_Text_LiaDefeat:: @ 8187C6F
     .string "LIA: That's no way to treat my\n"
     .string "little brother!$"
 
-Text_187C9E:: @ 8187C9E
+Route19_Text_LiaPostBattle:: @ 8187C9E
     .string "LIA: Do you have a younger\n"
     .string "brother?\p"
     .string "I hope you're teaching him all\n"
     .string "sorts of things.$"
 
-Text_187CF2:: @ 8187CF2
+Route19_Text_LiaNotEnoughMons:: @ 8187CF2
     .string "LIA: I want to battle together\n"
     .string "with my little brother.\p"
     .string "Don't you have two POKéMON?$"
 
-Text_187D45:: @ 8187D45
+Route19_Text_LucIntro:: @ 8187D45
     .string "LUC: My big sis taught me how\n"
     .string "to swim and train POKéMON.$"
 
-Text_187D7E:: @ 8187D7E
+Route19_Text_LucDefeat:: @ 8187D7E
     .string "LUC: Oh, wow!\n"
     .string "Someone tougher than my big sis!$"
 
-Text_187DAD:: @ 8187DAD
+Route19_Text_LucPostBattle:: @ 8187DAD
     .string "LUC: My big sis is strong and nice.\n"
     .string "I think she's awesome!$"
 
-Text_187DE8:: @ 8187DE8
+Route19_Text_LucNotEnoughMons:: @ 8187DE8
     .string "LUC: I don't want to if I can't\n"
     .string "battle you with my big sis.\p"
     .string "Don't you have two POKéMON?$"
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index 008be4a9f..720b484d8 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 16,
       "y": 62,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 15,
       "y": 69,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 11,
       "y": 13,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 18,
       "y": 26,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 54,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_HIDE_ROUTE2_ETHER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 64,
       "elevation": 3,
@@ -105,7 +105,8 @@
       "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 6,
       "y": 85,
       "elevation": 8,
diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json
index e97d95544..04f110847 100644
--- a/data/maps/Route20/map.json
+++ b/data/maps/Route20/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 8,
       "y": 11,
       "elevation": 1,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route20_EventScript_1AB83F",
+      "script": "Route20_EventScript_Melissa",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 16,
       "y": 14,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route20_EventScript_1AB8F9",
+      "script": "Route20_EventScript_Missy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 34,
       "y": 7,
       "elevation": 1,
@@ -62,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route20_EventScript_1AB801",
+      "script": "Route20_EventScript_Nora",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 43,
       "y": 9,
       "elevation": 3,
@@ -75,11 +75,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route20_EventScript_1AB8BB",
+      "script": "Route20_EventScript_Roger",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 23,
       "y": 10,
       "elevation": 1,
@@ -88,11 +88,11 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route20_EventScript_1AB747",
+      "script": "Route20_EventScript_Dean",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 73,
       "y": 16,
       "elevation": 3,
@@ -101,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route20_EventScript_1AB937",
+      "script": "Route20_EventScript_Irene",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 111,
       "y": 9,
       "elevation": 1,
@@ -114,11 +114,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route20_EventScript_1AB709",
+      "script": "Route20_EventScript_Barry",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 106,
       "y": 11,
       "elevation": 1,
@@ -127,11 +127,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route20_EventScript_1AB785",
+      "script": "Route20_EventScript_Darrin",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 93,
       "y": 10,
       "elevation": 1,
@@ -140,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "Route20_EventScript_1AB87D",
+      "script": "Route20_EventScript_Shirley",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 54,
       "y": 11,
       "elevation": 1,
@@ -153,11 +153,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route20_EventScript_1AB7C3",
+      "script": "Route20_EventScript_Tiffany",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 69,
       "y": 3,
       "elevation": 3,
@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route20_EventScript_1ACE36",
+      "script": "Route20_EventScript_Camper",
       "flag": "0"
     }
   ],
@@ -193,14 +193,14 @@
       "x": 68,
       "y": 14,
       "elevation": 0,
-      "script": "Route20_EventScript_168280"
+      "script": "Route20_EventScript_SeafoamIslandsSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 64,
       "y": 8,
       "elevation": 0,
-      "script": "Route20_EventScript_168280"
+      "script": "Route20_EventScript_SeafoamIslandsSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc
index a034c3610..7ef352f82 100644
--- a/data/maps/Route20/scripts.inc
+++ b/data/maps/Route20/scripts.inc
@@ -3,11 +3,11 @@ Route20_MapScripts:: @ 816823B
 	.byte 0
 
 Route20_OnTransition:: @ 8168241
-	call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254
-	call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D
+	call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB3F
+	call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB4F
 	end
 
-EventScript_168254:: @ 8168254
+Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254
 	clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1
 	clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2
 	setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1
@@ -18,7 +18,7 @@ EventScript_168254:: @ 8168254
 	setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2
 	return
 
-EventScript_16826D:: @ 816826D
+Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D
 	clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3
 	clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4
 	clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5
@@ -27,6 +27,6 @@ EventScript_16826D:: @ 816826D
 	setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
 	return
 
-Route20_EventScript_168280:: @ 8168280
-	msgbox gUnknown_81882D1, MSGBOX_SIGN
+Route20_EventScript_SeafoamIslandsSign:: @ 8168280
+	msgbox Route20_Text_SeafoamIslands, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc
index 3abceaeba..5ca372ef6 100644
--- a/data/maps/Route20/text.inc
+++ b/data/maps/Route20/text.inc
@@ -1,119 +1,119 @@
-Text_187E40:: @ 8187E40
+Route20_Text_BarryIntro:: @ 8187E40
     .string "The water is shallow here.\n"
     .string "There are many people swimming.$"
 
-Text_187E7B:: @ 8187E7B
+Route20_Text_BarryDefeat:: @ 8187E7B
     .string "Splash!$"
 
-Text_187E83:: @ 8187E83
+Route20_Text_BarryPostBattle:: @ 8187E83
     .string "I wish I could ride my POKéMON.\n"
     .string "I bet you're not tired.$"
 
-Text_187EBB:: @ 8187EBB
+Route20_Text_ShirleyIntro:: @ 8187EBB
     .string "SEAFOAM is a quiet getaway.\n"
     .string "I'm vacationing here.$"
 
-Text_187EED:: @ 8187EED
+Route20_Text_ShirleyDefeat:: @ 8187EED
     .string "Quit it!$"
 
-Text_187EF6:: @ 8187EF6
+Route20_Text_ShirleyPostBattle:: @ 8187EF6
     .string "There's a huge cavern underneath\n"
     .string "this island.$"
 
-Text_187F24:: @ 8187F24
+Route20_Text_TiffanyIntro:: @ 8187F24
     .string "I love floating with the fishes\n"
     .string "here among the waves.$"
 
-Text_187F5A:: @ 8187F5A
+Route20_Text_TiffanyDefeat:: @ 8187F5A
     .string "Yowch!$"
 
-Text_187F61:: @ 8187F61
+Route20_Text_TiffanyPostBattle:: @ 8187F61
     .string "Want to float with me?$"
 
-Text_187F78:: @ 8187F78
+Route20_Text_IreneIntro:: @ 8187F78
     .string "Are you on vacation, too?$"
 
-Text_187F92:: @ 8187F92
+Route20_Text_IreneDefeat:: @ 8187F92
     .string "No mercy at all!$"
 
-Text_187FA3:: @ 8187FA3
+Route20_Text_IrenePostBattle:: @ 8187FA3
     .string "SEAFOAM used to be a single island\n"
     .string "in the distant past.$"
 
-Text_187FDB:: @ 8187FDB
+Route20_Text_DeanIntro:: @ 8187FDB
     .string "Check out my buff physique!$"
 
-Text_187FF7:: @ 8187FF7
+Route20_Text_DeanDefeat:: @ 8187FF7
     .string "Wimpy!$"
 
-Text_187FFE:: @ 8187FFE
+Route20_Text_DeanPostBattle:: @ 8187FFE
     .string "I should've been buffing up my\n"
     .string "POKéMON, not me!$"
 
-Text_18802E:: @ 818802E
+Route20_Text_DarrinIntro:: @ 818802E
     .string "Why are you riding a POKéMON?\n"
     .string "Can't you swim?$"
 
-Text_18805C:: @ 818805C
+Route20_Text_DarrinDefeat:: @ 818805C
     .string "Ouch!\n"
     .string "Torpedoed!$"
 
-Text_18806D:: @ 818806D
+Route20_Text_DarrinPostBattle:: @ 818806D
     .string "Riding a POKéMON sure looks fun!$"
 
-Text_18808E:: @ 818808E
+Route20_Text_RogerIntro:: @ 818808E
     .string "I rode my bird POKéMON here.$"
 
-Text_1880AB:: @ 81880AB
+Route20_Text_RogerDefeat:: @ 81880AB
     .string "Oh, no!\n"
     .string "Now what am I to do?$"
 
-Text_1880C8:: @ 81880C8
+Route20_Text_RogerPostBattle:: @ 81880C8
     .string "My birds are exhausted.\n"
     .string "They can't FLY me back!$"
 
-Text_1880F8:: @ 81880F8
+Route20_Text_NoraIntro:: @ 81880F8
     .string "My boyfriend gave me big pearls.$"
 
-Text_188119:: @ 8188119
+Route20_Text_NoraDefeat:: @ 8188119
     .string "Oh, no!\n"
     .string "My pearls were in them!$"
 
-Text_188139:: @ 8188139
+Route20_Text_NoraPostBattle:: @ 8188139
     .string "Will my pearls grow bigger inside\n"
     .string "CLOYSTER?$"
 
-Text_188165:: @ 8188165
+Route20_Text_MissyIntro:: @ 8188165
     .string "I swam here from CINNABAR ISLAND.\n"
     .string "It wasn't easy, I tell you.$"
 
-Text_1881A3:: @ 81881A3
+Route20_Text_MissyDefeat:: @ 81881A3
     .string "I'm so disappointed!$"
 
-Text_1881B8:: @ 81881B8
+Route20_Text_MissyPostBattle:: @ 81881B8
     .string "POKéMON have taken over an\n"
     .string "abandoned mansion on CINNABAR.\p"
     .string "They call it the POKéMON MANSION\n"
     .string "now.$"
 
-Text_188218:: @ 8188218
+Route20_Text_MelissaIntro:: @ 8188218
     .string "CINNABAR, in the west, has a LAB\n"
     .string "for POKéMON.\p"
     .string "My daddy works there.$"
 
-Text_18825C:: @ 818825C
+Route20_Text_MelissaDefeat:: @ 818825C
     .string "Wait!\n"
     .string "You're supposed to wait!$"
 
-Text_18827B:: @ 818827B
+Route20_Text_MelissaPostBattle:: @ 818827B
     .string "CINNABAR is a volcanic island.\p"
     .string "I heard it rose out of the sea\n"
     .string "when a volcano erupted.$"
 
-gUnknown_81882D1:: @ 81882D1
+Route20_Text_SeafoamIslands:: @ 81882D1
     .string "SEAFOAM ISLANDS$"
 
-Text_1882E1:: @ 81882E1
+Route20_Text_MistyTrainsHere:: @ 81882E1
     .string "Strong TRAINERS and WATER POKéMON\n"
     .string "are common sights in these parts.\p"
     .string "They say that MISTY of the\n"
diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json
index 06767be42..05b91c5d3 100644
--- a/data/maps/Route21_North/map.json
+++ b/data/maps/Route21_North/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 7,
       "y": 27,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route21_North_EventScript_1AB975",
+      "script": "Route21_North_EventScript_Ronald",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 16,
       "y": 26,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route21_North_EventScript_1AB9F1",
+      "script": "Route21_North_EventScript_Wade",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 12,
       "y": 44,
       "elevation": 1,
@@ -62,11 +62,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route21_North_EventScript_1ABA6D",
+      "script": "Route21_North_EventScript_Spencer",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 14,
       "y": 35,
       "elevation": 1,
@@ -75,11 +75,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route21_North_EventScript_1ABB65",
+      "script": "Route21_North_EventScript_Lil",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
       "x": 15,
       "y": 35,
       "elevation": 1,
@@ -88,13 +88,14 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route21_North_EventScript_1ABBAB",
+      "script": "Route21_North_EventScript_Ian",
       "flag": "0"
     },
     {
-      "graphics_id": "65307",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
+      "in_connection": true,
       "x": 13,
-      "y": 65533,
+      "y": -3,
       "elevation": 2,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc
index ad1ec12d3..67b93c175 100644
--- a/data/maps/Route21_North/text.inc
+++ b/data/maps/Route21_North/text.inc
@@ -1,42 +1,49 @@
-Text_18835A:: @ 818835A
+Route21_North_Text_RonaldIntro:: @ 818835A
 	.string "You want to know if the fish are\n"
 	.string "biting?$"
 
-Text_188383:: @ 8188383
+Route21_North_Text_RonaldDefeat:: @ 8188383
 	.string "Dang!$"
 
-Text_188389:: @ 8188389
+Route21_North_Text_RonaldPostBattle:: @ 8188389
 	.string "I can't catch anything good.\n"
 	.string "Not one good POKéMON to be had!$"
 
-Text_1883C6:: @ 81883C6
+Route21_North_Text_WadeIntro:: @ 81883C6
 	.string "I got a big haul!\n"
 	.string "Wanna go for it?$"
 
-Text_1883E9:: @ 81883E9
+Route21_North_Text_WadeDefeat:: @ 81883E9
 	.string "Heheh, MAGIKARP just don't make\n"
 	.string "the grade, do they?$"
 
-Text_18841D:: @ 818841D
+Route21_North_Text_WadePostBattle:: @ 818841D
 	.string "I seem to only catch MAGIKARP!$"
 
-Text_18843C:: @ 818843C
+Route21_North_Text_SpencerIntro:: @ 818843C
 	.string "The sea cleanses my body and soul!$"
 
-Text_18845F:: @ 818845F
+Route21_North_Text_SpencerDefeat:: @ 818845F
 	.string "Ayah!$"
 
-Text_188465:: @ 8188465
+Route21_North_Text_SpencerPostBattle:: @ 8188465
 	.string "The sea is great and all, but I\n"
 	.string "like the mountains, too.$"
 
-Text_18849E:: @ 818849E
+@ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1.
+@ This trainer wasnt used in Gen 3 so their text goes unused/untranslated
+@ English translations from RB are listed
+
+@ "What's wrong with me swimming?"
+Route21_North_Text_CueBallIntro:: @ 818849E
 	.string "おれだって　たまには\n"
 	.string "およぎに　くるぜ！$"
 
-Text_1884B3:: @ 81884B3
+@ "Cheap shot!"
+Route21_North_Text_CueBallDefeat:: @ 81884B3
 	.string "ぐわわ！$"
 
-Text_1884B8:: @ 81884B8
+@ "I look like what? A studded inner tube? Get lost!"
+Route21_North_Text_CueBallPostBattle:: @ 81884B8
 	.string "うきやすそう　だと？\n"
 	.string "うるせー　おおきな　おせわだッ！$"
diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json
index ef022d513..8e9398b68 100644
--- a/data/maps/Route21_South/map.json
+++ b/data/maps/Route21_South/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 11,
       "y": 8,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route21_South_EventScript_1AB9B3",
+      "script": "Route21_South_EventScript_Claude",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 14,
       "y": 15,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route21_South_EventScript_1ABA2F",
+      "script": "Route21_South_EventScript_Nolan",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 15,
       "y": 24,
       "elevation": 1,
@@ -62,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route21_South_EventScript_1ABAAB",
+      "script": "Route21_South_EventScript_Jack",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 15,
       "y": 38,
       "elevation": 1,
@@ -75,11 +75,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route21_South_EventScript_1ABAE9",
+      "script": "Route21_South_EventScript_Jerome",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 10,
       "y": 29,
       "elevation": 1,
@@ -88,7 +88,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route21_South_EventScript_1ABB27",
+      "script": "Route21_South_EventScript_Roland",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc
index 8700006ef..255c1eaed 100644
--- a/data/maps/Route21_South/text.inc
+++ b/data/maps/Route21_South/text.inc
@@ -1,87 +1,87 @@
-Text_1884D4:: @ 81884D4
+Route21_South_Text_JackIntro:: @ 81884D4
 	.string "I caught my POKéMON at sea.$"
 
-Text_1884F0:: @ 81884F0
+Route21_South_Text_JackDefeat:: @ 81884F0
 	.string "Diver!!\n"
 	.string "Down!!$"
 
-Text_1884FF:: @ 81884FF
+Route21_South_Text_JackPostBattle:: @ 81884FF
 	.string "Where'd you catch your POKéMON?$"
 
-Text_18851F:: @ 818851F
+Route21_South_Text_JeromeIntro:: @ 818851F
 	.string "Right now, I'm in a triathlon meet.$"
 
-Text_188543:: @ 8188543
+Route21_South_Text_JeromeDefeat:: @ 8188543
 	.string "Pant…\n"
 	.string "Pant… Pant…$"
 
-Text_188555:: @ 8188555
+Route21_South_Text_JeromePostBattle:: @ 8188555
 	.string "I'm beat! But, I still have the\n"
 	.string "bike race and marathon left!$"
 
-Text_188592:: @ 8188592
+Route21_South_Text_RolandIntro:: @ 8188592
 	.string "Ahh!\n"
 	.string "Feel the sun and the wind!$"
 
-Text_1885B2:: @ 81885B2
+Route21_South_Text_RolandDefeat:: @ 81885B2
 	.string "Yow!\n"
 	.string "I lost!$"
 
-Text_1885BF:: @ 81885BF
+Route21_South_Text_RolandPostBattle:: @ 81885BF
 	.string "I'm sunburnt to a crisp!$"
 
-Text_1885D8:: @ 81885D8
+Route21_South_Text_ClaudeIntro:: @ 81885D8
 	.string "Hey, don't scare away the fish!$"
 
-Text_1885F8:: @ 81885F8
+Route21_South_Text_ClaudeDefeat:: @ 81885F8
 	.string "Sorry! I'm just so frustrated from\n"
 	.string "not catching anything.$"
 
-Text_188632:: @ 8188632
+Route21_South_Text_ClaudePostBattle:: @ 8188632
 	.string "Sheesh, I haven't caught a thing.\n"
 	.string "Could this place actually be a\l"
 	.string "giant pool or something?$"
 
-Text_18868C:: @ 818868C
+Route21_South_Text_NolanIntro:: @ 818868C
 	.string "Keep me company till I get a hit.$"
 
-Text_1886AE:: @ 81886AE
+Route21_South_Text_NolanDefeat:: @ 81886AE
 	.string "That burned some time.$"
 
-Text_1886C5:: @ 81886C5
+Route21_South_Text_NolanPostBattle:: @ 81886C5
 	.string "Oh wait!\n"
 	.string "I got a bite! Yeah!$"
 
-Text_1886E2:: @ 81886E2
+Route21_North_Text_LilIntro:: @ 81886E2
 	.string "LIL: Huh? A battle?\n"
 	.string "IAN, can't you do it alone?$"
 
-Text_188712:: @ 8188712
+Route21_North_Text_LilDefeat:: @ 8188712
 	.string "LIL: Oh, see?\n"
 	.string "We lost. Happy now?$"
 
-Text_188734:: @ 8188734
+Route21_North_Text_LilPostBattle:: @ 8188734
 	.string "LIL: I'm tired.\n"
 	.string "Can't we go home already?$"
 
-Text_18875E:: @ 818875E
+Route21_North_Text_LilNotEnoughMons:: @ 818875E
 	.string "LIL: Huh? A battle?\n"
 	.string "I can't be bothered to do it alone.\l"
 	.string "Bring two POKéMON, won't you?$"
 
-Text_1887B4:: @ 81887B4
+Route21_North_Text_IanIntro:: @ 81887B4
 	.string "IAN: My sis doesn't get enough\n"
 	.string "exercise, so I made her come.$"
 
-Text_1887F1:: @ 81887F1
+Route21_North_Text_IanDefeat:: @ 81887F1
 	.string "IAN: Awww, Sis!\n"
 	.string "Get it together!$"
 
-Text_188812:: @ 8188812
+Route21_North_Text_IanPostBattle:: @ 8188812
 	.string "IAN: Come on, Sis!\p"
 	.string "You're not going to lose weight\n"
 	.string "like this!$"
 
-Text_188850:: @ 8188850
+Route21_North_Text_IanNotEnoughMons:: @ 8188850
 	.string "IAN: We want a two-on-two battle.\n"
 	.string "So can you bring two POKéMON?$"
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index 41aedc6e0..b4da63654 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 25,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json
index 20414c25f..7e5e18115 100644
--- a/data/maps/Route22_NorthEntrance/map.json
+++ b/data/maps/Route22_NorthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 8,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json
index 145f20cf3..aeaa87f85 100644
--- a/data/maps/Route23/map.json
+++ b/data/maps/Route23/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 15,
       "y": 149,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 8,
       "y": 140,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 14,
       "y": 123,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 16,
       "y": 112,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 10,
       "y": 94,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 14,
       "y": 61,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 35,
       "elevation": 3,
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index 5fa15ddb3..a12005d3f 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 12,
       "y": 15,
       "elevation": 3,
@@ -36,11 +36,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route24_EventScript_168620",
+      "script": "Route24_EventScript_Rocket",
       "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 12,
       "y": 19,
       "elevation": 3,
@@ -49,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route24_EventScript_1A972D",
+      "script": "Route24_EventScript_Ethan",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 10,
       "y": 22,
       "elevation": 3,
@@ -62,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route24_EventScript_1A9673",
+      "script": "Route24_EventScript_Reli",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 12,
       "y": 25,
       "elevation": 3,
@@ -75,11 +75,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route24_EventScript_1A95F7",
+      "script": "Route24_EventScript_Timmy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 10,
       "y": 28,
       "elevation": 3,
@@ -88,11 +88,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route24_EventScript_1A96B1",
+      "script": "Route24_EventScript_Ali",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 12,
       "y": 31,
       "elevation": 3,
@@ -101,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route24_EventScript_1A9635",
+      "script": "Route24_EventScript_Cale",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 5,
       "y": 21,
       "elevation": 3,
@@ -114,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "Route24_EventScript_1A96EF",
+      "script": "Route24_EventScript_Shane",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 4,
       "elevation": 3,
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE24",
       "var_value": 0,
-      "script": "Route24_EventScript_168660"
+      "script": "Route24_EventScript_RocketTriggerLeft"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE24",
       "var_value": 0,
-      "script": "Route24_EventScript_16866C"
+      "script": "Route24_EventScript_RocketTriggerRight"
     }
   ],
   "bg_events": [
diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc
index e30913e52..7a22f64e8 100644
--- a/data/maps/Route24/scripts.inc
+++ b/data/maps/Route24/scripts.inc
@@ -1,103 +1,105 @@
+.equ LOCALID_ROCKET, 1
+
 Route24_MapScripts:: @ 816861F
 	.byte 0
 
-Route24_EventScript_168620:: @ 8168620
+Route24_EventScript_Rocket:: @ 8168620
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_ROUTE24, 1
-	goto_if_eq EventScript_168656
-	msgbox gUnknown_8188C3C
+	goto_if_eq Route24_EventScript_RocketPostBattle
+	msgbox Route24_Text_JustEarnedFabulousPrize
 	checkitemspace ITEM_NUGGET, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16864C
-	call EventScript_1686B9
+	goto_if_eq Route24_EventScript_NoRoomForNugget
+	call Route24_EventScript_BattleRocket
 	release
 	end
 
-EventScript_16864C:: @ 816864C
-	msgbox gUnknown_8188CC2
+Route24_EventScript_NoRoomForNugget:: @ 816864C
+	msgbox Route24_Text_YouDontHaveAnyRoom
 	release
 	end
 
-EventScript_168656:: @ 8168656
-	msgbox gUnknown_8188DF1
+Route24_EventScript_RocketPostBattle:: @ 8168656
+	msgbox Route24_Text_YoudBecomeTopRocketLeader
 	release
 	end
 
-Route24_EventScript_168660:: @ 8168660
+Route24_EventScript_RocketTriggerLeft:: @ 8168660
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_168678
+	goto Route24_EventScript_RocketTrigger
 	end
 
-Route24_EventScript_16866C:: @ 816866C
+Route24_EventScript_RocketTriggerRight:: @ 816866C
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_168678
+	goto Route24_EventScript_RocketTrigger
 	end
 
-EventScript_168678:: @ 8168678
+Route24_EventScript_RocketTrigger:: @ 8168678
 	textcolor 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_1686FD
+	call_if_eq Route24_EventScript_RocketApproachPlayer
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_168708
+	call_if_eq Route24_EventScript_RocketMotionToPlayer
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_8188C3C
+	msgbox Route24_Text_JustEarnedFabulousPrize
 	checkitemspace ITEM_NUGGET, 1
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_168713
-	call EventScript_1686B9
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger
+	call Route24_EventScript_BattleRocket
 	releaseall
 	end
 
-EventScript_1686B9:: @ 81686B9
-	giveitem_msg gUnknown_8188C93, ITEM_NUGGET
-	message Text_188CDB
+Route24_EventScript_BattleRocket:: @ 81686B9
+	giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET
+	message Route24_Text_JoinTeamRocket
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	setvar VAR_LAST_TALKED, 1
-	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC
-	msgbox gUnknown_8188DF1
+	setvar VAR_LAST_TALKED, LOCALID_ROCKET
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat
+	msgbox Route24_Text_YoudBecomeTopRocketLeader
 	setvar VAR_MAP_SCENE_ROUTE24, 1
 	return
 
-EventScript_1686FD:: @ 81686FD
-	applymovement 1, Movement_16873E
+Route24_EventScript_RocketApproachPlayer:: @ 81686FD
+	applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer
 	waitmovement 0
 	return
 
-EventScript_168708:: @ 8168708
-	applymovement 1, Movement_WalkInPlaceFastestLeft
+Route24_EventScript_RocketMotionToPlayer:: @ 8168708
+	applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_168713:: @ 8168713
-	msgbox gUnknown_8188CC2
+Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713
+	msgbox Route24_Text_YouDontHaveAnyRoom
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_168743
+	applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
 	waitmovement 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_168733
+	call_if_eq Route24_EventScript_RocketWalkBackToPos
 	release
 	end
 
-EventScript_168733:: @ 8168733
-	applymovement 1, Movement_168740
+Route24_EventScript_RocketWalkBackToPos:: @ 8168733
+	applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos
 	waitmovement 0
 	return
 
-Movement_16873E:: @ 816873E
+Route24_Movement_RocketApproachPlayer:: @ 816873E
 	walk_left
 	step_end
 
-Movement_168740:: @ 8168740
+Route24_Movement_RocketWalkBackToPos:: @ 8168740
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-Movement_168743:: @ 8168743
+Route24_Movement_WalkDown:: @ 8168743
 	walk_down
 	step_end
diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc
index 04ef64ea5..7b9d09e6f 100644
--- a/data/maps/Route24/text.inc
+++ b/data/maps/Route24/text.inc
@@ -1,16 +1,16 @@
-gUnknown_8188C3C:: @ 8188C3C
+Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C
     .string "Congratulations! You beat our\n"
     .string "five contest TRAINERS!\p"
     .string "You just earned a fabulous prize!$"
 
-gUnknown_8188C93:: @ 8188C93
+Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93
     .string "{PLAYER} received a NUGGET\n"
     .string "from the mystery TRAINER!$"
 
-gUnknown_8188CC2:: @ 8188CC2
+Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2
     .string "You don't have any room!$"
 
-Text_188CDB:: @ 8188CDB
+Route24_Text_JoinTeamRocket:: @ 8188CDB
     .string "By the way, how would you like to\n"
     .string "join TEAM ROCKET?\p"
     .string "We're a group of professional\n"
@@ -23,13 +23,78 @@ Text_188CDB:: @ 8188CDB
     .string "I'll make you an offer you can't\n"
     .string "refuse!$"
 
-Text_188DDC:: @ 8188DDC
+Route24_Text_RocketDefeat:: @ 8188DDC
     .string "Arrgh!\n"
     .string "You are good!$"
 
-gUnknown_8188DF1:: @ 8188DF1
+Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1
     .string "With your ability, you'd become\n"
     .string "a top leader in TEAM ROCKET.\p"
     .string "Come on, think of the opportunity!\n"
     .string "Don't let this chance go to waste.$"
 
+Route24_Text_ShaneIntro:: @ 8188E74
+    .string "I saw your feat from the grass!$"
+
+Route24_Text_ShaneDefeat:: @ 8188E94
+    .string "I thought not!$"
+
+Route24_Text_ShanePostBattle:: @ 8188EA3
+    .string "I hid because the people on the\n"
+    .string "bridge frightened me.$"
+
+Route24_Text_EthanIntro:: @ 8188ED9
+    .string "Okay! I'm No. 5!\n"
+    .string "I'll stomp you!$"
+
+Route24_Text_EthanDefeat:: @ 8188EFA
+    .string "Whoa!\n"
+    .string "Too much!$"
+
+Route24_Text_EthanPostBattle:: @ 8188F0A
+    .string "I did my best. I have no regrets!$"
+
+Route24_Text_ReliIntro:: @ 8188F2C
+    .string "I'm No. 4!\n"
+    .string "Getting tired?$"
+
+Route24_Text_ReliDefeat:: @ 8188F46
+    .string "I lost, too!$"
+
+Route24_Text_ReliPostBattle:: @ 8188F53
+    .string "I did my best, so I've no regrets!$"
+
+Route24_Text_TimmyIntro:: @ 8188F76
+    .string "Here's No. 3!\n"
+    .string "I won't be easy!$"
+
+Route24_Text_TimmyDefeat:: @ 8188F95
+    .string "Ow!\n"
+    .string "Stomped flat!$"
+
+Route24_Text_TimmyPostBattle:: @ 8188FA7
+    .string "I did my best. I have no regrets!$"
+
+Route24_Text_AliIntro:: @ 8188FC9
+    .string "I'm second!\n"
+    .string "Now it's serious!$"
+
+Route24_Text_AliDefeat:: @ 8188FE7
+    .string "How could I lose?$"
+
+Route24_Text_AliPostBattle:: @ 8188FF9
+    .string "I did my best. I have no regrets!$"
+
+Route24_Text_CaleIntro:: @ 818901B
+    .string "People call this the NUGGET\n"
+    .string "BRIDGE!\p"
+    .string "Beat us five TRAINERS and win\n"
+    .string "a fabulous prize!\p"
+    .string "Think you got what it takes?$"
+
+Route24_Text_CaleDefeat:: @ 818908C
+    .string "Whoo!\n"
+    .string "Good stuff!$"
+
+Route24_Text_CalePostBattle:: @ 818909E
+    .string "I did my best. I have no regrets!$"
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index 88d68ca07..eee743a54 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 11,
       "y": 4,
       "elevation": 3,
@@ -31,11 +31,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "Route25_EventScript_1A98A1",
+      "script": "Route25_EventScript_Franklin",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 18,
       "y": 2,
       "elevation": 3,
@@ -44,11 +44,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route25_EventScript_1A976B",
+      "script": "Route25_EventScript_Joey",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 17,
       "y": 7,
       "elevation": 3,
@@ -57,11 +57,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route25_EventScript_1A991D",
+      "script": "Route25_EventScript_Wayne",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 22,
       "y": 4,
       "elevation": 3,
@@ -70,11 +70,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route25_EventScript_1A97A9",
+      "script": "Route25_EventScript_Dan",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 22,
       "y": 8,
       "elevation": 3,
@@ -83,11 +83,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route25_EventScript_1A9825",
+      "script": "Route25_EventScript_Kelsey",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 27,
       "y": 9,
       "elevation": 3,
@@ -96,11 +96,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route25_EventScript_1A98DF",
+      "script": "Route25_EventScript_Nob",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 28,
       "y": 4,
       "elevation": 3,
@@ -109,11 +109,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route25_EventScript_1A995B",
+      "script": "Route25_EventScript_Flint",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 36,
       "y": 4,
       "elevation": 3,
@@ -122,11 +122,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "Route25_EventScript_1A97E7",
+      "script": "Route25_EventScript_Chad",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 42,
       "y": 5,
       "elevation": 3,
@@ -135,11 +135,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route25_EventScript_1A9863",
+      "script": "Route25_EventScript_Haley",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 26,
       "y": 2,
       "elevation": 3,
@@ -152,7 +152,7 @@
       "flag": "FLAG_HIDE_ROUTE25_TM43"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 30,
       "y": 3,
       "elevation": 3,
@@ -165,7 +165,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 49,
       "y": 10,
       "elevation": 3,
@@ -174,11 +174,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route25_EventScript_1ACE4F",
+      "script": "Route25_EventScript_Beauty",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 49,
       "y": 11,
       "elevation": 3,
@@ -187,7 +187,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route25_EventScript_16874F",
+      "script": "Route25_EventScript_Man",
       "flag": "0"
     }
   ],
@@ -207,7 +207,7 @@
       "x": 48,
       "y": 4,
       "elevation": 0,
-      "script": "Route25_EventScript_168746"
+      "script": "Route25_EventScript_SeaCottageSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc
index d214cdbf6..4dc03b3e9 100644
--- a/data/maps/Route25/scripts.inc
+++ b/data/maps/Route25/scripts.inc
@@ -1,10 +1,10 @@
 Route25_MapScripts:: @ 8168745
 	.byte 0
 
-Route25_EventScript_168746:: @ 8168746
-	msgbox gUnknown_818954C, MSGBOX_SIGN
+Route25_EventScript_SeaCottageSign:: @ 8168746
+	msgbox Route25_Text_SeaCottageSign, MSGBOX_SIGN
 	end
 
-Route25_EventScript_16874F:: @ 816874F
-	msgbox gUnknown_81895C2, MSGBOX_NPC
+Route25_EventScript_Man:: @ 816874F
+	msgbox Route25_Text_AreYouHereAlone, MSGBOX_NPC
 	end
diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc
index cdc124108..56bf3df94 100644
--- a/data/maps/Route25/text.inc
+++ b/data/maps/Route25/text.inc
@@ -1,184 +1,118 @@
-Text_188E74:: @ 8188E74
-    .string "I saw your feat from the grass!$"
-
-Text_188E94:: @ 8188E94
-    .string "I thought not!$"
-
-Text_188EA3:: @ 8188EA3
-    .string "I hid because the people on the\n"
-    .string "bridge frightened me.$"
-
-Text_188ED9:: @ 8188ED9
-    .string "Okay! I'm No. 5!\n"
-    .string "I'll stomp you!$"
-
-Text_188EFA:: @ 8188EFA
-    .string "Whoa!\n"
-    .string "Too much!$"
-
-Text_188F0A:: @ 8188F0A
-    .string "I did my best. I have no regrets!$"
-
-Text_188F2C:: @ 8188F2C
-    .string "I'm No. 4!\n"
-    .string "Getting tired?$"
-
-Text_188F46:: @ 8188F46
-    .string "I lost, too!$"
-
-Text_188F53:: @ 8188F53
-    .string "I did my best, so I've no regrets!$"
-
-Text_188F76:: @ 8188F76
-    .string "Here's No. 3!\n"
-    .string "I won't be easy!$"
-
-Text_188F95:: @ 8188F95
-    .string "Ow!\n"
-    .string "Stomped flat!$"
-
-Text_188FA7:: @ 8188FA7
-    .string "I did my best. I have no regrets!$"
-
-Text_188FC9:: @ 8188FC9
-    .string "I'm second!\n"
-    .string "Now it's serious!$"
-
-Text_188FE7:: @ 8188FE7
-    .string "How could I lose?$"
-
-Text_188FF9:: @ 8188FF9
-    .string "I did my best. I have no regrets!$"
-
-Text_18901B:: @ 818901B
-    .string "People call this the NUGGET\n"
-    .string "BRIDGE!\p"
-    .string "Beat us five TRAINERS and win\n"
-    .string "a fabulous prize!\p"
-    .string "Think you got what it takes?$"
-
-Text_18908C:: @ 818908C
-    .string "Whoo!\n"
-    .string "Good stuff!$"
-
-Text_18909E:: @ 818909E
-    .string "I did my best. I have no regrets!$"
-
-Text_1890C0:: @ 81890C0
+Route25_Text_JoeyIntro:: @ 81890C0
     .string "Local TRAINERS come here to\n"
     .string "practice.$"
 
-Text_1890E6:: @ 81890E6
+Route25_Text_JoeyDefeat:: @ 81890E6
     .string "You're decent.$"
 
-Text_1890F5:: @ 81890F5
+Route25_Text_JoeyPostBattle:: @ 81890F5
     .string "All POKéMON have weaknesses.\n"
     .string "Even the strongest ones.\p"
     .string "That's why it's best to raise\n"
     .string "POKéMON of different types.$"
 
-Text_189165:: @ 8189165
+Route25_Text_DanIntro:: @ 8189165
     .string "Dad took me to a great party on\n"
     .string "the S.S. ANNE at VERMILION CITY.$"
 
-Text_1891A6:: @ 81891A6
+Route25_Text_DanDefeat:: @ 81891A6
     .string "I'm not mad!$"
 
-Text_1891B3:: @ 81891B3
+Route25_Text_DanPostBattle:: @ 81891B3
     .string "On the S.S. ANNE, I saw TRAINERS\n"
     .string "from around the world.$"
 
-Text_1891EB:: @ 81891EB
+Route25_Text_FlintIntro:: @ 81891EB
     .string "I'm a cool guy.\n"
     .string "I've got a girlfriend!$"
 
-Text_189212:: @ 8189212
+Route25_Text_FlintDefeat:: @ 8189212
     .string "Aww, darn…$"
 
-Text_18921D:: @ 818921D
+Route25_Text_FlintPostBattle:: @ 818921D
     .string "Oh, well.\n"
     .string "My girlfriend will cheer me up.$"
 
-Text_189247:: @ 8189247
+Route25_Text_KelseyIntro:: @ 8189247
     .string "Hi!\n"
     .string "My boyfriend is cool!$"
 
-Text_189261:: @ 8189261
+Route25_Text_KelseyDefeat:: @ 8189261
     .string "My conditioning isn't the best…$"
 
-Text_189281:: @ 8189281
+Route25_Text_KelseyPostBattle:: @ 8189281
     .string "I wish my boyfriend was as good\n"
     .string "as you.$"
 
-Text_1892A9:: @ 81892A9
+Route25_Text_ChadIntro:: @ 81892A9
     .string "I had this feeling…\n"
     .string "I knew I had to battle you!$"
 
-Text_1892D9:: @ 81892D9
+Route25_Text_ChadDefeat:: @ 81892D9
     .string "I knew I'd lose, too!$"
 
-Text_1892EF:: @ 81892EF
+Route25_Text_ChadPostBattle:: @ 81892EF
     .string "If your POKéMON gets confused,\n"
     .string "switch it out.\p"
     .string "That's a good tactic.$"
 
-Text_189333:: @ 8189333
+Route25_Text_HaleyIntro:: @ 8189333
     .string "My friend has many cute POKéMON.\n"
     .string "I'm so jealous!$"
 
-Text_189364:: @ 8189364
+Route25_Text_HaleyDefeat:: @ 8189364
     .string "I'm not so jealous!$"
 
-Text_189378:: @ 8189378
+Route25_Text_HaleyPostBattle:: @ 8189378
     .string "You came from MT. MOON?\n"
     .string "May I have a CLEFAIRY?$"
 
-Text_1893A7:: @ 81893A7
+Route25_Text_FranklinIntro:: @ 81893A7
     .string "I just got down from MT. MOON,\n"
     .string "but I've still got gas in the tank!$"
 
-Text_1893EA:: @ 81893EA
+Route25_Text_FranklinDefeat:: @ 81893EA
     .string "You worked hard!$"
 
-Text_1893FB:: @ 81893FB
+Route25_Text_FranklinPostBattle:: @ 81893FB
     .string "Drat!\n"
     .string "A ZUBAT bit me back in that cave.$"
 
-Text_189423:: @ 8189423
+Route25_Text_NobIntro:: @ 8189423
     .string "I'm off to see a POKéMANIAC's\n"
     .string "collection at the cape.$"
 
-Text_189459:: @ 8189459
+Route25_Text_NobDefeat:: @ 8189459
     .string "You done got me, and real good,\n"
     .string "too!$"
 
-Text_18947E:: @ 818947E
+Route25_Text_NobPostBattle:: @ 818947E
     .string "The POKéMANIAC sure lives up to\n"
     .string "his name.\p"
     .string "His collection includes many rare\n"
     .string "species of POKéMON.$"
 
-Text_1894DE:: @ 81894DE
+Route25_Text_WayneIntro:: @ 81894DE
     .string "You're going to see BILL?\n"
     .string "First, we battle!$"
 
-Text_18950A:: @ 818950A
+Route25_Text_WayneDefeat:: @ 818950A
     .string "You're something.$"
 
-Text_18951C:: @ 818951C
+Route25_Text_WaynePostBattle:: @ 818951C
     .string "The trail below is a shortcut to\n"
     .string "CERULEAN CITY.$"
 
-gUnknown_818954C:: @ 818954C
+Route25_Text_SeaCottageSign:: @ 818954C
     .string "SEA COTTAGE\n"
     .string "BILL lives here!$"
 
-Text_189569:: @ 8189569
+Route25_Text_MistyHighHopesAboutThisPlace:: @ 8189569
     .string "This cape is a famous date spot.\p"
     .string "MISTY, the GYM LEADER, has high\n"
     .string "hopes about this place.$"
 
-gUnknown_81895C2:: @ 81895C2
+Route25_Text_AreYouHereAlone:: @ 81895C2
     .string "Hello, are you here alone?\p"
     .string "If you're out at CERULEAN's cape…\n"
     .string "Well, it should be as a couple.$"
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json
index 8e4ac79c6..e8ac1df8d 100644
--- a/data/maps/Route25_SeaCottage/map.json
+++ b/data/maps/Route25_SeaCottage/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BILL",
+      "graphics_id": "OBJ_EVENT_GFX_BILL",
       "x": 7,
       "y": 5,
       "elevation": 3,
@@ -25,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route25_SeaCottage_EventScript_17054B",
+      "script": "Route25_SeaCottage_EventScript_Bill",
       "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY",
+      "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route25_SeaCottage_EventScript_17054B",
+      "script": "Route25_SeaCottage_EventScript_Bill",
       "flag": "FLAG_HIDE_BILL_CLEFAIRY"
     }
   ],
@@ -72,7 +72,7 @@
       "x": 4,
       "y": 5,
       "elevation": 0,
-      "script": "Route25_SeaCottage_EventScript_1706DD"
+      "script": "Route25_SeaCottage_EventScript_Computer"
     }
   ]
 }
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
index ed5aca2c8..57c724c29 100644
--- a/data/maps/Route25_SeaCottage/scripts.inc
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -1,143 +1,150 @@
+.equ LOCALID_BILL_HUMAN,    1
+.equ LOCALID_BILL_CLEFAIRY, 2
+
+.equ BILL_IN_TELEPORTER,     FLAG_TEMP_2
+.equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3
+
 Route25_SeaCottage_MapScripts:: @ 8170523
 	map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition
 	.byte 0
 
 Route25_SeaCottage_OnTransition:: @ 8170529
-	call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C
-	call_if_set FLAG_GOT_SS_TICKET, EventScript_170547
+	call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill
+	call_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket
 	end
 
-EventScript_17053C:: @ 817053C
+Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C
 	clearflag FLAG_HIDE_BILL_CLEFAIRY
-	setobjectxyperm 1, 3, 3
+	setobjectxyperm LOCALID_BILL_HUMAN, 3, 3
 	return
 
-EventScript_170547:: @ 8170547
-	setflag FLAG_TEMP_3
+Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: @ 8170547
+	setflag RETURN_AFTER_SS_TICKET
 	return
 
-Route25_SeaCottage_EventScript_17054B:: @ 817054B
+Route25_SeaCottage_EventScript_Bill:: @ 817054B
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_3, EventScript_1706C8
-	goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640
-	goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A
+	goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_BillGoLookAtPC
+	goto_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_BillGoToSSAnne
+	goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_BillGiveSSTicket
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_170580
+	goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq EventScript_17058E
+	goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpFemale
 	end
 
-EventScript_170580:: @ 8170580
-	msgbox gUnknown_819FDFA, MSGBOX_YESNO
-	goto EventScript_17059C
+Route25_SeaCottage_EventScript_BillAskForHelpMale:: @ 8170580
+	msgbox Route25_SeaCottage_Text_ImBillHelpMeOutPal, MSGBOX_YESNO
+	goto Route25_SeaCottage_EventScript_BillAskForHelp
 	end
 
-EventScript_17058E:: @ 817058E
-	msgbox gUnknown_819FEE6, MSGBOX_YESNO
-	goto EventScript_17059C
+Route25_SeaCottage_EventScript_BillAskForHelpFemale:: @ 817058E
+	msgbox Route25_SeaCottage_Text_ImBillHelpMeOutLady, MSGBOX_YESNO
+	goto Route25_SeaCottage_EventScript_BillAskForHelp
 	end
 
-EventScript_17059C:: @ 817059C
+Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C
 	compare VAR_RESULT, NO
-	call_if_eq EventScript_170600
-	msgbox gUnknown_819FFD3
+	call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBill
+	msgbox Route25_SeaCottage_Text_RunCellSeparationOnPC
 	closemessage
 	delay 10
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_17062A
+	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_170635
+	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_170635
+	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_170635
+	call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
 	opendoor 10, 3
 	waitdooranim
-	applymovement 2, Movement_1706DB
+	applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter
 	waitmovement 0
-	removeobject 2
+	removeobject LOCALID_BILL_CLEFAIRY
 	playse SE_C_MAKU_D
 	closedoor 10, 3
 	waitdooranim
-	setflag FLAG_TEMP_2
+	setflag BILL_IN_TELEPORTER
 	release
 	end
 
-EventScript_170600:: @ 8170600
+@ Just returns after message, execution continues as if player had said yes
+Route25_SeaCottage_EventScript_DeclineHelpBill:: @ 8170600
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EventScript_170618
+	call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq EventScript_170621
+	call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillFemale
 	return
 
-EventScript_170618:: @ 8170618
-	msgbox gUnknown_81A0035
+Route25_SeaCottage_EventScript_DeclineHelpBillMale:: @ 8170618
+	msgbox Route25_SeaCottage_Text_NoPleaseChief
 	return
 
-EventScript_170621:: @ 8170621
-	msgbox gUnknown_81A00B6
+Route25_SeaCottage_EventScript_DeclineHelpBillFemale:: @ 8170621
+	msgbox Route25_SeaCottage_Text_NoPleaseBeautiful
 	return
 
-EventScript_17062A:: @ 817062A
-	applymovement 2, Movement_1706D5
+Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth:: @ 817062A
+	applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporterSouth
 	waitmovement 0
 	return
 
-EventScript_170635:: @ 8170635
-	applymovement 2, Movement_1706D2
+Route25_SeaCottage_EventScript_BillWalkToTeleporter:: @ 8170635
+	applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporter
 	waitmovement 0
 	return
 
-EventScript_170640:: @ 8170640
-	msgbox gUnknown_81A02CF
+Route25_SeaCottage_EventScript_BillGoToSSAnne:: @ 8170640
+	msgbox Route25_SeaCottage_Text_SSAnnePartyYouGoInstead
 	release
 	end
 
-EventScript_17064A:: @ 817064A
+Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A
 	famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EventScript_1706AC
+	call_if_eq Route25_SeaCottage_EventScript_BillThanksMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq EventScript_1706B5
+	call_if_eq Route25_SeaCottage_EventScript_BillThanksFemale
 	checkitemspace ITEM_SS_TICKET, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1706BE
-	giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5
+	goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket
+	giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5
 	setflag FLAG_GOT_SS_TICKET_DUP
 	setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET
 	setflag FLAG_GOT_SS_TICKET
 	setflag FLAG_SYS_NOT_SOMEONES_PC
-	goto EventScript_170640
+	goto Route25_SeaCottage_EventScript_BillGoToSSAnne
 	end
 
-EventScript_1706AC:: @ 81706AC
-	msgbox gUnknown_81A013B
+Route25_SeaCottage_EventScript_BillThanksMale:: @ 81706AC
+	msgbox Route25_SeaCottage_Text_ThanksBudTakeThis
 	return
 
-EventScript_1706B5:: @ 81706B5
-	msgbox gUnknown_81A01E4
+Route25_SeaCottage_EventScript_BillThanksFemale:: @ 81706B5
+	msgbox Route25_SeaCottage_Text_ThanksLadyTakeThis
 	return
 
-EventScript_1706BE:: @ 81706BE
-	msgbox gUnknown_81A02B4
+Route25_SeaCottage_EventScript_NoRoomForSSTicket:: @ 81706BE
+	msgbox Route25_SeaCottage_Text_YouveGotTooMuchStuff
 	release
 	end
 
-EventScript_1706C8:: @ 81706C8
-	msgbox gUnknown_81A03AB
+Route25_SeaCottage_EventScript_BillGoLookAtPC:: @ 81706C8
+	msgbox Route25_SeaCottage_Text_CheckOutRareMonsOnPC
 	release
 	end
 
-Movement_1706D2:: @ 81706D2
+Route25_SeaCottage_Movement_BillWalkToTeleporter:: @ 81706D2
 	walk_up
 	walk_up
 	step_end
 
-Movement_1706D5:: @ 81706D5
+Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: @ 81706D5
 	walk_right
 	walk_up
 	walk_up
@@ -145,85 +152,85 @@ Movement_1706D5:: @ 81706D5
 	walk_in_place_fastest_up
 	step_end
 
-Movement_1706DB:: @ 81706DB
+Route25_SeaCottage_Movement_BillEnterTeleporter:: @ 81706DB
 	walk_up
 	step_end
 
-Route25_SeaCottage_EventScript_1706DD:: @ 81706DD
+Route25_SeaCottage_EventScript_Computer:: @ 81706DD
 	lockall
-	goto_if_set FLAG_TEMP_3, EventScript_1707CA
-	goto_if_set FLAG_TEMP_2, EventScript_1706FA
-	msgbox gUnknown_81A0402
+	goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_OpenBillsMonList
+	goto_if_set BILL_IN_TELEPORTER, Route25_SeaCottage_EventScript_RunCellSeparator
+	msgbox Route25_SeaCottage_Text_TeleporterIsDisplayed
 	releaseall
 	end
 
-EventScript_1706FA:: @ 81706FA
+Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA
 	fadeoutbgm 0
-	msgbox gUnknown_81A042D
+	msgbox Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator
 	closemessage
-	clearflag FLAG_TEMP_2
+	clearflag BILL_IN_TELEPORTER
 	setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
 	special SpawnCameraObject
-	applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE
+	applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters
 	waitmovement 0
 	delay 35
 	playse SE_PIN
 	waitse
 	setvar VAR_0x8004, 0
-	special sub_809C4A8
+	special AnimateTeleporterHousing
 	delay 10
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
 	setvar VAR_0x8004, 1
-	special sub_809C4A8
+	special AnimateTeleporterHousing
 	playse SE_TK_WARPIN
-	special sub_809C5FC
+	special AnimateTeleporterCable
 	waitse
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
-	call EventScript_1707B6
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+	call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
 	opendoor 3, 3
 	waitdooranim
 	fadeinbgm 0
-	addobject 1
+	addobject LOCALID_BILL_HUMAN
 	clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE
 	delay 50
 	playfanfare MUS_FANFA1
-	applymovement 1, Movement_170888
+	applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter
 	waitmovement 0
 	waitfanfare
-	applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3
+	applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters
 	waitmovement 0
 	playse SE_C_MAKU_D
 	closedoor 3, 3
 	waitdooranim
-	applymovement 1, Movement_170881
+	applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom
 	waitmovement 0
 	special RemoveCameraObject
 	releaseall
 	end
 
-EventScript_1707B6:: @ 81707B6
+Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6
 	playse SE_BOWA
 	waitse
 	delay 20
 	return
 
-Movement_1707BE:: @ 81707BE
+Route25_SeaCottage_Movement_CameraPanToTeleporters:: @ 81707BE
 	walk_up
 	walk_up
 	walk_right
 	walk_right
 	step_end
 
-Movement_1707C3:: @ 81707C3
+Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: @ 81707C3
 	delay_16
 	delay_16
 	walk_down
@@ -232,65 +239,65 @@ Movement_1707C3:: @ 81707C3
 	walk_left
 	step_end
 
-EventScript_1707CA:: @ 81707CA
-	msgbox gUnknown_81A045B
-	goto EventScript_1707D8
+Route25_SeaCottage_EventScript_OpenBillsMonList:: @ 81707CA
+	msgbox Route25_SeaCottage_Text_BillsFavoriteMonList
+	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
-EventScript_1707D8:: @ 81707D8
-	message Text_1A0479
+Route25_SeaCottage_EventScript_BillsMonList:: @ 81707D8
+	message Route25_SeaCottage_Text_SeeWhichMon
 	waitmessage
 	multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_17082B
-	case 1, EventScript_170840
-	case 2, EventScript_170855
-	case 3, EventScript_17086A
-	case 4, EventScript_17087F
-	case 127, EventScript_17087F
+	case 0, Route25_SeaCottage_EventScript_ViewEevee
+	case 1, Route25_SeaCottage_EventScript_ViewFlareon
+	case 2, Route25_SeaCottage_EventScript_ViewJolteon
+	case 3, Route25_SeaCottage_EventScript_ViewVaporeon
+	case 4, Route25_SeaCottage_EventScript_ExitBillsMonList
+	case 127, Route25_SeaCottage_EventScript_ExitBillsMonList
 	end
 
-EventScript_17082B:: @ 817082B
+Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B
 	drawmonpic SPECIES_EEVEE, 10, 3
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_EEVEE
 	special Special_SetSeenMon
-	goto EventScript_1707D8
+	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
-EventScript_170840:: @ 8170840
+Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840
 	drawmonpic SPECIES_FLAREON, 10, 3
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_FLAREON
 	special Special_SetSeenMon
-	goto EventScript_1707D8
+	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
-EventScript_170855:: @ 8170855
+Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855
 	drawmonpic SPECIES_JOLTEON, 10, 3
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_JOLTEON
 	special Special_SetSeenMon
-	goto EventScript_1707D8
+	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
-EventScript_17086A:: @ 817086A
+Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A
 	drawmonpic SPECIES_VAPOREON, 10, 3
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_VAPOREON
 	special Special_SetSeenMon
-	goto EventScript_1707D8
+	goto Route25_SeaCottage_EventScript_BillsMonList
 	end
 
-EventScript_17087F:: @ 817087F
+Route25_SeaCottage_EventScript_ExitBillsMonList:: @ 817087F
 	releaseall
 	end
 
-Movement_170881:: @ 8170881
+Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: @ 8170881
 	walk_right
 	walk_right
 	walk_right
@@ -299,6 +306,6 @@ Movement_170881:: @ 8170881
 	walk_down
 	step_end
 
-Movement_170888:: @ 8170888
+Route25_SeaCottage_Movement_BillExitTeleporter:: @ 8170888
 	walk_down
 	step_end
diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc
index 6ecacdd89..9fd189426 100644
--- a/data/maps/Route25_SeaCottage/text.inc
+++ b/data/maps/Route25_SeaCottage/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819FDFA:: @ 819FDFA
+Route25_SeaCottage_Text_ImBillHelpMeOutPal:: @ 819FDFA
     .string "Hiya! I'm a POKéMON…\n"
     .string "…No I'm not!\p"
     .string "Call me BILL!\n"
@@ -11,7 +11,7 @@ gUnknown_819FDFA:: @ 819FDFA
     .string "So, how about it?\n"
     .string "Help me out here!$"
 
-gUnknown_819FEE6:: @ 819FEE6
+Route25_SeaCottage_Text_ImBillHelpMeOutLady:: @ 819FEE6
     .string "Hiya! I'm a POKéMON…\n"
     .string "…No I'm not!\p"
     .string "Call me BILL!\n"
@@ -24,13 +24,13 @@ gUnknown_819FEE6:: @ 819FEE6
     .string "So, how about it?\n"
     .string "Help me out here!$"
 
-gUnknown_819FFD3:: @ 819FFD3
+Route25_SeaCottage_Text_RunCellSeparationOnPC:: @ 819FFD3
     .string "Wait till I get inside the\n"
     .string "TELEPORTER.\p"
     .string "When I do, go to my PC and run\n"
     .string "the Cell Separation System.$"
 
-gUnknown_81A0035:: @ 81A0035
+Route25_SeaCottage_Text_NoPleaseChief:: @ 81A0035
     .string "No!?\n"
     .string "Now don't be so cold!\p"
     .string "Come on, you gotta help a guy in\n"
@@ -40,7 +40,7 @@ gUnknown_81A0035:: @ 81A0035
     .string "Okay?\l"
     .string "All right!$"
 
-gUnknown_81A00B6:: @ 81A00B6
+Route25_SeaCottage_Text_NoPleaseBeautiful:: @ 81A00B6
     .string "No!?\n"
     .string "Now don't be so cold!\p"
     .string "Come on, you gotta help a guy in\n"
@@ -50,7 +50,7 @@ gUnknown_81A00B6:: @ 81A00B6
     .string "Okay?\l"
     .string "All right!$"
 
-gUnknown_81A013B:: @ 81A013B
+Route25_SeaCottage_Text_ThanksBudTakeThis:: @ 81A013B
     .string "BILL: Yeehah!\n"
     .string "Thanks, bud! I owe you one!\p"
     .string "So, did you come to see my\n"
@@ -60,7 +60,7 @@ gUnknown_81A013B:: @ 81A013B
     .string "I've got to thank you…\n"
     .string "Oh, here, maybe this'll do.$"
 
-gUnknown_81A01E4:: @ 81A01E4
+Route25_SeaCottage_Text_ThanksLadyTakeThis:: @ 81A01E4
     .string "BILL: Yeehah!\n"
     .string "Thanks, lady! I owe you one!\p"
     .string "So, did you come to see my\n"
@@ -70,14 +70,14 @@ gUnknown_81A01E4:: @ 81A01E4
     .string "I've got to thank you…\n"
     .string "Oh, here, maybe this'll do.$"
 
-gUnknown_81A028E:: @ 81A028E
+Route25_SeaCottage_Text_ReceivedSSTicketFromBill:: @ 81A028E
     .string "{PLAYER} received an S.S. TICKET\n"
     .string "from BILL.$"
 
-gUnknown_81A02B4:: @ 81A02B4
+Route25_SeaCottage_Text_YouveGotTooMuchStuff:: @ 81A02B4
     .string "You've got too much stuff!$"
 
-gUnknown_81A02CF:: @ 81A02CF
+Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: @ 81A02CF
     .string "That cruise ship S.S. ANNE is in\n"
     .string "VERMILION CITY.\p"
     .string "I hear there are lots of TRAINERS\n"
@@ -87,22 +87,22 @@ gUnknown_81A02CF:: @ 81A02CF
     .string "Why don't you go instead of me?\n"
     .string "Go on and have a good time.$"
 
-gUnknown_81A03AB:: @ 81A03AB
+Route25_SeaCottage_Text_CheckOutRareMonsOnPC:: @ 81A03AB
     .string "BILL: Feel like checking out some\n"
     .string "of my rare POKéMON on my PC?\p"
     .string "Go on, check out my PC.$"
 
-gUnknown_81A0402:: @ 81A0402
+Route25_SeaCottage_Text_TeleporterIsDisplayed:: @ 81A0402
     .string "TELEPORTER is displayed on the PC\n"
     .string "monitor.$"
 
-gUnknown_81A042D:: @ 81A042D
+Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator:: @ 81A042D
     .string "{PLAYER} initiated the TELEPORTER's\n"
     .string "Cell Separator.$"
 
-gUnknown_81A045B:: @ 81A045B
+Route25_SeaCottage_Text_BillsFavoriteMonList:: @ 81A045B
     .string "BILL's favorite POKéMON list!$"
 
-Text_1A0479:: @ 81A0479
+Route25_SeaCottage_Text_SeeWhichMon:: @ 81A0479
     .string "Which POKéMON do you want to see?$"
 
diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json
index 613f1d207..cb8c744ba 100644
--- a/data/maps/Route2_EastBuilding/map.json
+++ b/data/maps/Route2_EastBuilding/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 4,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 10,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json
index fdf66afb1..c47eeaf4a 100644
--- a/data/maps/Route2_House/map.json
+++ b/data/maps/Route2_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 4,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 7,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
index 478b3045e..c6d71095c 100644
--- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 4,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 10,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
index 17e756798..0e749a29f 100644
--- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 4,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json
index 7651e395a..1dbccf3ac 100644
--- a/data/maps/Route3/map.json
+++ b/data/maps/Route3/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 70,
       "y": 13,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 40,
       "y": 11,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 32,
       "y": 6,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 30,
       "y": 3,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 25,
       "y": 4,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 29,
       "y": 10,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 19,
       "y": 9,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 12,
       "y": 6,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 17,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index 13edbec1b..fc4c4b53c 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 9,
       "y": 8,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 75,
       "y": 3,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 67,
       "y": 5,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_HIDE_ROUTE4_TM05"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 15,
       "y": 14,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 47,
       "y": 3,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 50,
       "y": 3,
       "elevation": 3,
@@ -105,7 +105,8 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65321",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
+      "in_connection": true,
       "x": 109,
       "y": 3,
       "elevation": 12,
diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json
index 5797e4600..b3f5a6740 100644
--- a/data/maps/Route4_PokemonCenter_1F/map.json
+++ b/data/maps/Route4_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 4,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
+      "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD",
       "x": 12,
       "y": 6,
       "elevation": 0,
diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json
index a71194174..2f8269dd9 100644
--- a/data/maps/Route4_PokemonCenter_2F/map.json
+++ b/data/maps/Route4_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json
index 826c71624..502a50bd9 100644
--- a/data/maps/Route5_PokemonDayCare/map.json
+++ b/data/maps/Route5_PokemonDayCare/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json
index 5896d1664..94572a962 100644
--- a/data/maps/Route5_SouthEntrance/map.json
+++ b/data/maps/Route5_SouthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 1,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index 4ff0dc898..349f35369 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 3,
       "y": 16,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 12,
       "y": 21,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 13,
       "y": 21,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 20,
       "y": 25,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 13,
       "y": 32,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 13,
       "y": 33,
       "elevation": 3,
diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json
index 40dd5c985..e13267a19 100644
--- a/data/maps/Route6_NorthEntrance/map.json
+++ b/data/maps/Route6_NorthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 7,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index e935d2d28..09de5c2b8 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -27,8 +27,9 @@
   ],
   "object_events": [
     {
-      "graphics_id": "65375",
-      "x": 65528,
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
+      "x": -8,
       "y": 12,
       "elevation": 10,
       "movement_type": "MOVEMENT_TYPE_NONE",
diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json
index a311c8eee..21c5d82a6 100644
--- a/data/maps/Route7_EastEntrance/map.json
+++ b/data/maps/Route7_EastEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 144ae1d3f..6da585949 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 62,
       "y": 14,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 55,
       "y": 15,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 51,
       "y": 6,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 29,
       "y": 3,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 29,
       "y": 4,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 29,
       "y": 5,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 29,
       "y": 6,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 21,
       "y": 3,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 9,
       "y": 6,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 33,
       "y": 15,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 47,
       "y": 12,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 40,
       "y": 3,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 41,
       "y": 3,
       "elevation": 3,
@@ -196,7 +196,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 14,
       "y": 16,
       "elevation": 3,
@@ -209,7 +209,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 24,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json
index fc6c97792..b0ebba722 100644
--- a/data/maps/Route8_WestEntrance/map.json
+++ b/data/maps/Route8_WestEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json
index 123be8d5a..7fbff394d 100644
--- a/data/maps/Route9/map.json
+++ b/data/maps/Route9/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 14,
       "y": 10,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 20,
       "y": 17,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 61,
       "y": 16,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 26,
       "y": 7,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 26,
       "y": 1,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 49,
       "y": 7,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 53,
       "y": 2,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 60,
       "y": 9,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 36,
       "y": 6,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 2,
       "y": 8,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 17,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_HIDE_ROUTE9_TM40"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 65,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json
index 87d778a25..6aa5b3093 100644
--- a/data/maps/SSAnne_1F_Corridor/map.json
+++ b/data/maps/SSAnne_1F_Corridor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 18,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 12,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json
index d018cc7a4..620977574 100644
--- a/data/maps/SSAnne_1F_Room1/map.json
+++ b/data/maps/SSAnne_1F_Room1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 2,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json
index 765612f48..28c48fec7 100644
--- a/data/maps/SSAnne_1F_Room2/map.json
+++ b/data/maps/SSAnne_1F_Room2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 0,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json
index e518ae50e..1d5bbe3fa 100644
--- a/data/maps/SSAnne_1F_Room3/map.json
+++ b/data/maps/SSAnne_1F_Room3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 3,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF",
+      "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 0,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json
index c11aa16b5..c4a4350e2 100644
--- a/data/maps/SSAnne_1F_Room4/map.json
+++ b/data/maps/SSAnne_1F_Room4/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 2,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json
index 51935aea2..8c35b38af 100644
--- a/data/maps/SSAnne_1F_Room5/map.json
+++ b/data/maps/SSAnne_1F_Room5/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 2,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json
index d6f0a1b44..3966857b9 100644
--- a/data/maps/SSAnne_1F_Room6/map.json
+++ b/data/maps/SSAnne_1F_Room6/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 3,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json
index 315d49099..7f0e7b733 100644
--- a/data/maps/SSAnne_1F_Room7/map.json
+++ b/data/maps/SSAnne_1F_Room7/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json
index bb2df92ce..d355cfc4f 100644
--- a/data/maps/SSAnne_2F_Corridor/map.json
+++ b/data/maps/SSAnne_2F_Corridor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 30,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SS_ANNE_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 2,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json
index 6fbbde902..7ddd88682 100644
--- a/data/maps/SSAnne_2F_Room1/map.json
+++ b/data/maps/SSAnne_2F_Room1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 1,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json
index 1692afc23..8d53e1c37 100644
--- a/data/maps/SSAnne_2F_Room2/map.json
+++ b/data/maps/SSAnne_2F_Room2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 1,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 3,
       "elevation": 0,
diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json
index 05ac70a4f..4143d53e5 100644
--- a/data/maps/SSAnne_2F_Room3/map.json
+++ b/data/maps/SSAnne_2F_Room3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 3,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json
index 116380880..fcbb580ae 100644
--- a/data/maps/SSAnne_2F_Room4/map.json
+++ b/data/maps/SSAnne_2F_Room4/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 0,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json
index ca0c68072..b1994b17a 100644
--- a/data/maps/SSAnne_2F_Room5/map.json
+++ b/data/maps/SSAnne_2F_Room5/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 3,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json
index fe00765ab..2e5f08349 100644
--- a/data/maps/SSAnne_2F_Room6/map.json
+++ b/data/maps/SSAnne_2F_Room6/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 1,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json
index fa9ad902a..5f3ed8cab 100644
--- a/data/maps/SSAnne_3F_Corridor/map.json
+++ b/data/maps/SSAnne_3F_Corridor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 10,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json
index 25286e3cc..ef9ccb433 100644
--- a/data/maps/SSAnne_B1F_Room1/map.json
+++ b/data/maps/SSAnne_B1F_Room1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 3,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json
index bac380ea3..da783844a 100644
--- a/data/maps/SSAnne_B1F_Room2/map.json
+++ b/data/maps/SSAnne_B1F_Room2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
index e4fecec84..9c2d514d1 100644
--- a/data/maps/SSAnne_B1F_Room3/map.json
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json
index b72b8f2dd..eca95aa31 100644
--- a/data/maps/SSAnne_B1F_Room4/map.json
+++ b/data/maps/SSAnne_B1F_Room4/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 3,
       "y": 3,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 2,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json
index 9f258f534..c19d4c7a0 100644
--- a/data/maps/SSAnne_B1F_Room5/map.json
+++ b/data/maps/SSAnne_B1F_Room5/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MACHOKE",
+      "graphics_id": "OBJ_EVENT_GFX_MACHOKE",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 2,
       "elevation": 0,
diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json
index a87171f61..a514df616 100644
--- a/data/maps/SSAnne_CaptainsOffice/map.json
+++ b/data/maps/SSAnne_CaptainsOffice/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAPTAIN",
+      "graphics_id": "OBJ_EVENT_GFX_CAPTAIN",
       "x": 5,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json
index be784748a..3ad57f09b 100644
--- a/data/maps/SSAnne_Deck/map.json
+++ b/data/maps/SSAnne_Deck/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 12,
       "y": 10,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 14,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 13,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 6,
       "y": 9,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 11,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json
index c37b2ac5c..b3805c4f6 100644
--- a/data/maps/SSAnne_Exterior/map.json
+++ b/data/maps/SSAnne_Exterior/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SS_ANNE",
+      "graphics_id": "OBJ_EVENT_GFX_SS_ANNE",
       "x": 30,
       "y": 16,
       "elevation": 1,
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index d97f89317..d5ab6e972 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 1,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 6,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 10,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 8,
       "y": 9,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 14,
       "y": 5,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 14,
       "y": 7,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
+      "graphics_id": "OBJ_EVENT_GFX_CHEF",
       "x": 14,
       "y": 9,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json
index cc2bd0e60..2b14d57d6 100644
--- a/data/maps/SafariZone_Center/map.json
+++ b/data/maps/SafariZone_Center/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 24,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json
index fd3453ef3..7f82c3533 100644
--- a/data/maps/SafariZone_Center_RestHouse/map.json
+++ b/data/maps/SafariZone_Center_RestHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 3,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 7,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json
index a7d35c6fa..a36d24a0e 100644
--- a/data/maps/SafariZone_East/map.json
+++ b/data/maps/SafariZone_East/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 13,
       "y": 12,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 37,
       "y": 15,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 31,
       "y": 18,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 36,
       "y": 17,
       "elevation": 4,
diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json
index 12e13fbaa..4871abfde 100644
--- a/data/maps/SafariZone_East_RestHouse/map.json
+++ b/data/maps/SafariZone_East_RestHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 6,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 7,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index a4a73f8e2..4c1a7049b 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 33,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 28,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 29,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json
index 98ac35b33..daf988506 100644
--- a/data/maps/SafariZone_North_RestHouse/map.json
+++ b/data/maps/SafariZone_North_RestHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 3,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 7,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 11,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json
index cac992d41..9843d280f 100644
--- a/data/maps/SafariZone_SecretHouse/map.json
+++ b/data/maps/SafariZone_SecretHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json
index 451f7e96d..d7b77f4bc 100644
--- a/data/maps/SafariZone_West/map.json
+++ b/data/maps/SafariZone_West/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 28,
       "y": 14,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 13,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 16,
       "y": 27,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 27,
       "y": 24,
       "elevation": 3,
diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json
index 4119d0714..f9da1257b 100644
--- a/data/maps/SafariZone_West_RestHouse/map.json
+++ b/data/maps/SafariZone_West_RestHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 3,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 2,
       "y": 2,
       "elevation": 0,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 7,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index bfd629e91..5b61ffdd0 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -38,7 +38,7 @@
   "connections_no_include": true,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 22,
       "y": 15,
       "elevation": 3,
@@ -51,7 +51,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 26,
       "y": 16,
       "elevation": 3,
@@ -64,7 +64,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 46,
       "y": 13,
       "elevation": 3,
@@ -77,7 +77,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 27,
       "y": 22,
       "elevation": 3,
@@ -90,7 +90,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 25,
       "y": 33,
       "elevation": 3,
@@ -103,7 +103,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 34,
       "y": 31,
       "elevation": 3,
@@ -116,7 +116,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 30,
       "y": 39,
       "elevation": 3,
@@ -129,7 +129,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 48,
       "y": 24,
       "elevation": 3,
@@ -142,7 +142,7 @@
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 37,
       "y": 32,
       "elevation": 3,
@@ -155,7 +155,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 21,
       "y": 23,
       "elevation": 3,
@@ -168,7 +168,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 39,
       "y": 16,
       "elevation": 3,
@@ -181,7 +181,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 44,
       "y": 22,
       "elevation": 3,
@@ -194,7 +194,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT",
+      "graphics_id": "OBJ_EVENT_GFX_PIDGEOT",
       "x": 45,
       "y": 22,
       "elevation": 3,
@@ -207,7 +207,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 32,
       "y": 39,
       "elevation": 3,
@@ -220,7 +220,7 @@
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 47,
       "y": 24,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json
index 9ae377f7c..949574481 100644
--- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 8,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 3,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
+      "graphics_id": "OBJ_EVENT_GFX_CHANSEY",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json
index 9460fd5ca..77b75f09d 100644
--- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_DODUO",
+      "graphics_id": "OBJ_EVENT_GFX_DODUO",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
+      "graphics_id": "OBJ_EVENT_GFX_PIKACHU",
       "x": 4,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
+      "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 9,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
index 8f747efd5..1d2e8e575 100644
--- a/data/maps/SaffronCity_Dojo/map.json
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 11,
       "y": 10,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 1,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 11,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 1,
       "y": 8,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 6,
       "y": 5,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json
index 24dd19564..d29379fc3 100644
--- a/data/maps/SaffronCity_Gym/map.json
+++ b/data/maps/SaffronCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 24,
       "y": 18,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 24,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 14,
       "y": 2,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 4,
       "y": 10,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 4,
       "y": 18,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SABRINA",
+      "graphics_id": "OBJ_EVENT_GFX_SABRINA",
       "x": 14,
       "y": 11,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 24,
       "y": 10,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 15,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json
index df8e80208..02cef3897 100644
--- a/data/maps/SaffronCity_House/map.json
+++ b/data/maps/SaffronCity_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIDGEY",
+      "graphics_id": "OBJ_EVENT_GFX_PIDGEY",
       "x": 0,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
+      "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD",
       "x": 5,
       "y": 4,
       "elevation": 0,
diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json
index 31374c459..64142a6c4 100644
--- a/data/maps/SaffronCity_Mart/map.json
+++ b/data/maps/SaffronCity_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 1,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 9,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json
index 62047365a..8cf965e59 100644
--- a/data/maps/SaffronCity_MrPsychicsHouse/map.json
+++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 7,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
index 0744a0812..de944ec7c 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 9,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json
index aeb3b40b6..4a28fd488 100644
--- a/data/maps/SaffronCity_PokemonCenter_2F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
index 764ae5897..cd96e018c 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 7,
       "y": 13,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 6,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 3,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 3,
       "y": 12,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 9,
       "y": 11,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 7,
       "y": 12,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 9,
       "y": 12,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 5,
       "y": 11,
       "elevation": 3,
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
index fd9c6ca25..518817209 100644
--- a/data/maps/SeafoamIslands_1F/map.json
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 22,
       "y": 12,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 32,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
index 528d46ae9..6091f5d8c 100644
--- a/data/maps/SeafoamIslands_B1F/map.json
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 22,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 30,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 19,
       "y": 18,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 24,
       "y": 14,
       "elevation": 4,
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
index 5c7219195..b602137cc 100644
--- a/data/maps/SeafoamIslands_B2F/map.json
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 22,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 30,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json
index 02f2224ff..fb01fff9c 100644
--- a/data/maps/SeafoamIslands_B3F/map.json
+++ b/data/maps/SeafoamIslands_B3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 23,
       "y": 8,
       "elevation": 1,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 24,
       "y": 8,
       "elevation": 1,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 12,
       "y": 16,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 13,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 9,
       "y": 16,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
index eae9e0c51..b1f1f6908 100644
--- a/data/maps/SeafoamIslands_B4F/map.json
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 18,
       "elevation": 1,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 9,
       "y": 18,
       "elevation": 1,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ARTICUNO",
+      "graphics_id": "OBJ_EVENT_GFX_ARTICUNO",
       "x": 9,
       "y": 2,
       "elevation": 4,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_ARTICUNO"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 22,
       "y": 19,
       "elevation": 4,
diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
index 065d2935d..c71782405 100644
--- a/data/maps/SevenIsland/map.json
+++ b/data/maps/SevenIsland/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 7,
       "y": 18,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 15,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json
index 2a82fa1c1..5c1a8726a 100644
--- a/data/maps/SevenIsland_Harbor/map.json
+++ b/data/maps/SevenIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json
index 1251e6366..052d7fa31 100644
--- a/data/maps/SevenIsland_House_Room1/map.json
+++ b/data/maps/SevenIsland_House_Room1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json
index 6309618e5..063535b54 100644
--- a/data/maps/SevenIsland_House_Room2/map.json
+++ b/data/maps/SevenIsland_House_Room2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 6,
       "y": 5,
       "elevation": 0,
diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json
index 8d1fcf724..16ff19533 100644
--- a/data/maps/SevenIsland_Mart/map.json
+++ b/data/maps/SevenIsland_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 9,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 5,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json
index e1bb2ec18..522d68473 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 11,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json
index e4249d7d5..5e9642ebb 100644
--- a/data/maps/SevenIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index b051ac85d..b9c1bc77e 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
       "x": 13,
       "y": 43,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 13,
       "y": 36,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 3,
       "y": 35,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 3,
       "y": 36,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 7,
       "y": 56,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 11,
       "y": 63,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 14,
       "y": 13,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 14,
       "y": 14,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 3,
       "y": 41,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 13,
       "y": 47,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 44,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 12,
       "y": 47,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 15,
       "y": 46,
       "elevation": 3,
@@ -196,7 +196,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 16,
       "y": 47,
       "elevation": 3,
@@ -209,7 +209,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 17,
       "y": 47,
       "elevation": 3,
@@ -222,7 +222,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 11,
       "y": 31,
       "elevation": 3,
@@ -235,7 +235,7 @@
       "flag": "FLAG_TEMP_1B"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 45,
       "elevation": 3,
@@ -248,7 +248,7 @@
       "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 38,
       "elevation": 3,
@@ -261,7 +261,7 @@
       "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 23,
       "elevation": 3,
@@ -274,7 +274,7 @@
       "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 8,
       "y": 26,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
index f235bf795..75c09cc6f 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 12,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 3,
       "y": 34,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,
       "y": 34,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 11,
       "y": 26,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 10,
       "y": 26,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 11,
       "y": 17,
       "elevation": 5,
@@ -105,9 +105,10 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65321",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
+      "in_connection": true,
       "x": 7,
-      "y": 65534,
+      "y": -2,
       "elevation": 1,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
index d58fdc0ce..9dd436790 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 2,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
+      "graphics_id": "OBJ_EVENT_GFX_CHANSEY",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 6,
       "y": 4,
       "elevation": 0,
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
index fee7f725a..a27961b23 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 7,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 6,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 9,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 10,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 10,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 9,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json
index 9955ca74f..37d70540c 100644
--- a/data/maps/SevenIsland_TanobyRuins/map.json
+++ b/data/maps/SevenIsland_TanobyRuins/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 35,
       "y": 7,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 121,
       "y": 11,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 85,
       "y": 8,
       "elevation": 3,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 85,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
index be28ff7b0..29095ad7e 100644
--- a/data/maps/SevenIsland_TrainerTower/map.json
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 56,
       "y": 26,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 56,
       "y": 29,
       "elevation": 3,
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index df2883596..0e04a2f1c 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 2,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 10,
       "y": 17,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 0,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 15,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 15,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index ad4efd4f0..458446a43 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 9,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 11,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI",
+      "graphics_id": "OBJ_EVENT_GFX_GIOVANNI",
       "x": 6,
       "y": 11,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 16,
       "y": 12,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 16,
       "y": 18,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 2,
       "y": 19,
       "elevation": 3,
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
index 68748ef13..59c9bf374 100644
--- a/data/maps/SilphCo_1F/map.json
+++ b/data/maps/SilphCo_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 3,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index 249c2faea..e3fb80764 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 29,
       "y": 12,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 28,
       "y": 18,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 20,
       "y": 14,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 5,
       "y": 19,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 4,
       "elevation": 0,
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index 9a0439095..ffe70afbf 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 25,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 31,
       "y": 13,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 4,
       "y": 12,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 8,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index 63bdff97e..080e2649c 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 33,
       "y": 16,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 10,
       "y": 19,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 14,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 11,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 12,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 13,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 30,
       "y": 18,
       "elevation": 0,
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index c1890a062..0da89c2b1 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 35,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 23,
       "y": 13,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 16,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 11,
       "y": 6,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 9,
       "y": 21,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 9,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 18,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_5F_TM01"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 22,
       "y": 21,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 2,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index 5c27ff76a..c895f1d4b 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 21,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 23,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 24,
       "y": 9,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 22,
       "y": 13,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 14,
       "y": 9,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 16,
       "y": 12,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 9,
       "y": 11,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 14,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 17,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 18,
       "y": 17,
       "elevation": 3,
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index ef3630954..261335452 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 0,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 24,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 24,
       "y": 15,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 13,
       "y": 4,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 13,
       "y": 14,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 9,
       "y": 14,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 3,
       "y": 13,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 0,
       "y": 12,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 30,
       "y": 11,
       "elevation": 3,
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index db566d2dd..1f5ed77ca 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 28,
       "y": 5,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 10,
       "y": 17,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_M",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 24,
       "y": 8,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_SILPH_CO_8F_IRON"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 29,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index f8bbd2b69..7cbb1c15d 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 26,
       "y": 16,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 15,
       "y": 18,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 2,
       "y": 16,
       "elevation": 0,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 1,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json
index e26f7bf49..ec8c1ffe3 100644
--- a/data/maps/SixIsland/map.json
+++ b/data/maps/SixIsland/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 10,
       "y": 15,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 15,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
index 19782a330..5ae17361a 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAPPHIRE",
+      "graphics_id": "OBJ_EVENT_GFX_SAPPHIRE",
       "x": 7,
       "y": 7,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_SAPPHIRE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 5,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json
index 35d4cfb3f..ff6ad2c51 100644
--- a/data/maps/SixIsland_GreenPath/map.json
+++ b/data/maps/SixIsland_GreenPath/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 11,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json
index feb7ada29..e303ff025 100644
--- a/data/maps/SixIsland_Harbor/map.json
+++ b/data/maps/SixIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json
index 67f1d4f31..2747a0cf0 100644
--- a/data/maps/SixIsland_House/map.json
+++ b/data/maps/SixIsland_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 7,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json
index b366a1d17..e208da76c 100644
--- a/data/maps/SixIsland_Mart/map.json
+++ b/data/maps/SixIsland_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
       "x": 8,
       "y": 3,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 7,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json
index 3498c7f3f..14828c8eb 100644
--- a/data/maps/SixIsland_OutcastIsland/map.json
+++ b/data/maps/SixIsland_OutcastIsland/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 9,
       "y": 24,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 12,
       "y": 15,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 13,
       "y": 34,
       "elevation": 1,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 14,
       "y": 61,
       "elevation": 1,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 10,
       "y": 44,
       "elevation": 1,
@@ -87,7 +87,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
       "x": 11,
       "y": 44,
       "elevation": 1,
@@ -100,7 +100,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 16,
       "elevation": 3,
diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json
index 8354730a5..e0d100f6c 100644
--- a/data/maps/SixIsland_PatternBush/map.json
+++ b/data/maps/SixIsland_PatternBush/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 48,
       "y": 15,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 51,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 12,
       "y": 13,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 37,
       "y": 23,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 32,
       "y": 5,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 52,
       "y": 20,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 8,
       "y": 21,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 39,
       "y": 6,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
+      "graphics_id": "OBJ_EVENT_GFX_CAMPER",
       "x": 3,
       "y": 9,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 19,
       "y": 24,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 30,
       "y": 19,
       "elevation": 3,
diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json
index 2d14e64af..c866b4299 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
+      "graphics_id": "OBJ_EVENT_GFX_BLUE",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 13,
       "y": 3,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 12,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json
index ce44fdfd2..5150e22fb 100644
--- a/data/maps/SixIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
index 5020e7380..f800f0d0d 100644
--- a/data/maps/SixIsland_RuinValley/map.json
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 24,
       "y": 25,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 32,
       "y": 11,
       "elevation": 5,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 33,
       "y": 16,
       "elevation": 5,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 31,
       "y": 24,
       "elevation": 5,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 14,
       "y": 10,
       "elevation": 5,
@@ -87,7 +87,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 21,
       "y": 29,
       "elevation": 5,
@@ -100,7 +100,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 17,
       "y": 10,
       "elevation": 5,
@@ -113,7 +113,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 17,
       "y": 12,
       "elevation": 5,
@@ -126,7 +126,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 18,
       "y": 11,
       "elevation": 5,
@@ -139,7 +139,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 33,
       "elevation": 3,
@@ -152,7 +152,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 34,
       "elevation": 3,
@@ -165,7 +165,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 41,
       "y": 32,
       "elevation": 3,
@@ -178,7 +178,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 41,
       "y": 33,
       "elevation": 3,
@@ -191,7 +191,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 42,
       "y": 33,
       "elevation": 3,
@@ -204,7 +204,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 33,
       "elevation": 3,
@@ -217,7 +217,7 @@
       "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 19,
       "y": 11,
       "elevation": 5,
@@ -230,7 +230,7 @@
       "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 43,
       "y": 32,
       "elevation": 3,
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
index befdd7949..97e30aa5c 100644
--- a/data/maps/SixIsland_WaterPath/map.json
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -32,7 +32,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 12,
       "y": 13,
       "elevation": 3,
@@ -45,7 +45,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 11,
       "y": 52,
       "elevation": 3,
@@ -58,7 +58,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 13,
       "y": 35,
       "elevation": 1,
@@ -71,7 +71,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 15,
       "y": 45,
       "elevation": 1,
@@ -84,7 +84,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 6,
       "y": 21,
       "elevation": 3,
@@ -97,7 +97,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 7,
       "y": 21,
       "elevation": 3,
@@ -110,7 +110,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 11,
       "y": 76,
       "elevation": 3,
@@ -123,7 +123,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 19,
       "elevation": 0,
@@ -136,7 +136,7 @@
       "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 87,
       "elevation": 3,
diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json
index c65f54deb..84a650469 100644
--- a/data/maps/SixIsland_WaterPath_House1/map.json
+++ b/data/maps/SixIsland_WaterPath_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 3,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json
index e53676524..9dcdbd976 100644
--- a/data/maps/SixIsland_WaterPath_House2/map.json
+++ b/data/maps/SixIsland_WaterPath_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 7,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index f9ed4394b..9ccf2b29d 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 7,
       "y": 24,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 8,
       "y": 23,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 8,
       "y": 24,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 9,
       "y": 23,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 9,
       "y": 24,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 10,
       "y": 22,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 10,
       "y": 24,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 11,
       "y": 23,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 20,
       "y": 7,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 18,
       "y": 17,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_ZINC"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 15,
       "y": 7,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 14,
       "y": 14,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_DODUO",
+      "graphics_id": "OBJ_EVENT_GFX_DODUO",
       "x": 15,
       "y": 14,
       "elevation": 3,
@@ -196,7 +196,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 15,
       "y": 31,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index ce8a868ef..446dc2074 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 12,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 19,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 23,
       "y": 17,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 38,
       "y": 23,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 44,
       "y": 23,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 44,
       "y": 29,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 16,
       "y": 43,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 17,
       "y": 39,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 14,
       "y": 39,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 11,
       "y": 39,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "FLAG_TEMP_1B"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 27,
       "y": 11,
       "elevation": 3,
@@ -185,7 +185,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 43,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json
index fa674ecd9..e4e05fb76 100644
--- a/data/maps/ThreeIsland_BondBridge/map.json
+++ b/data/maps/ThreeIsland_BondBridge/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 27,
       "y": 10,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 68,
       "y": 10,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_F",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_F",
       "x": 33,
       "y": 13,
       "elevation": 3,
@@ -61,7 +61,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_F",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_F",
       "x": 50,
       "y": 11,
       "elevation": 3,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 36,
       "y": 4,
       "elevation": 1,
@@ -87,7 +87,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 77,
       "y": 5,
       "elevation": 3,
@@ -100,7 +100,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 78,
       "y": 5,
       "elevation": 3,
@@ -113,7 +113,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 72,
       "y": 8,
       "elevation": 3,
@@ -126,7 +126,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 86,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json
index 3570c9e17..dca4bacd8 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/map.json
+++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 23,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json
index 7bd2aa8e5..5864be00c 100644
--- a/data/maps/ThreeIsland_Harbor/map.json
+++ b/data/maps/ThreeIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json
index 7d7384735..2174a571d 100644
--- a/data/maps/ThreeIsland_House1/map.json
+++ b/data/maps/ThreeIsland_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 3,
       "y": 4,
       "elevation": 0,
diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json
index 2ba098fd0..a2fc4f7e3 100644
--- a/data/maps/ThreeIsland_House2/map.json
+++ b/data/maps/ThreeIsland_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 7,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json
index 0de23d4a8..684e06a68 100644
--- a/data/maps/ThreeIsland_House3/map.json
+++ b/data/maps/ThreeIsland_House3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 8,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json
index 6a45fb357..c8aae0640 100644
--- a/data/maps/ThreeIsland_House4/map.json
+++ b/data/maps/ThreeIsland_House4/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 6,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json
index a774260f0..209fca3f8 100644
--- a/data/maps/ThreeIsland_House5/map.json
+++ b/data/maps/ThreeIsland_House5/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 2,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json
index 7a89a37b1..84c4d70c5 100644
--- a/data/maps/ThreeIsland_Mart/map.json
+++ b/data/maps/ThreeIsland_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
+      "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 2,
       "y": 7,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 6,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
index 070879098..65c74d9d8 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 12,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 3,
       "y": 4,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 11,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
index 4941fe37a..7ee060727 100644
--- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json
index 10469dc61..40b6fab36 100644
--- a/data/maps/ThreeIsland_Port/map.json
+++ b/data/maps/ThreeIsland_Port/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 14,
       "y": 9,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 8,
       "y": 8,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 13,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
index f4c54c987..8e740b6c0 100644
--- a/data/maps/TradeCenter/map.json
+++ b/data/maps/TradeCenter/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 9,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json
index 20d83f19f..f8f793a1f 100644
--- a/data/maps/TrainerTower_1F/map.json
+++ b/data/maps/TrainerTower_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 11,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 10,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json
index 9d60b2650..aa02b2212 100644
--- a/data/maps/TrainerTower_2F/map.json
+++ b/data/maps/TrainerTower_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json
index a53c516b8..5dcbb119d 100644
--- a/data/maps/TrainerTower_3F/map.json
+++ b/data/maps/TrainerTower_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json
index 04378d0a4..b040ed8cb 100644
--- a/data/maps/TrainerTower_4F/map.json
+++ b/data/maps/TrainerTower_4F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json
index 569eaf978..45c0cf33c 100644
--- a/data/maps/TrainerTower_5F/map.json
+++ b/data/maps/TrainerTower_5F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json
index 128bb457a..23c4ff2bd 100644
--- a/data/maps/TrainerTower_6F/map.json
+++ b/data/maps/TrainerTower_6F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json
index 62e1bbe84..e6cb51f97 100644
--- a/data/maps/TrainerTower_7F/map.json
+++ b/data/maps/TrainerTower_7F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json
index 125751b98..2becc2697 100644
--- a/data/maps/TrainerTower_8F/map.json
+++ b/data/maps/TrainerTower_8F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "FLAG_TEMP_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_TEMP_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_TEMP_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_TEMP_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 11,
       "y": 10,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json
index da2cdb07f..e0ee44722 100644
--- a/data/maps/TrainerTower_Lobby/map.json
+++ b/data/maps/TrainerTower_Lobby/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 4,
       "y": 9,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 14,
       "y": 9,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 11,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 12,
       "y": 13,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 2,
       "y": 12,
       "elevation": 3,
diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json
index 985f2f186..c4ced59b3 100644
--- a/data/maps/TrainerTower_Roof/map.json
+++ b/data/maps/TrainerTower_Roof/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE",
       "x": 9,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index 20dd0f53e..668886176 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -22,7 +22,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 28,
       "y": 4,
       "elevation": 3,
@@ -35,7 +35,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 31,
       "y": 6,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
+      "graphics_id": "OBJ_EVENT_GFX_BEAUTY",
       "x": 30,
       "y": 11,
       "elevation": 3,
@@ -61,7 +61,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 26,
       "y": 5,
       "elevation": 3,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 27,
       "y": 6,
       "elevation": 3,
@@ -87,7 +87,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 30,
       "y": 16,
       "elevation": 3,
@@ -100,7 +100,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 39,
       "y": 16,
       "elevation": 3,
@@ -113,7 +113,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 37,
       "y": 12,
       "elevation": 3,
@@ -126,7 +126,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 24,
       "y": 12,
       "elevation": 3,
diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json
index 5de5be5fa..fbe574cdc 100644
--- a/data/maps/TwoIsland_CapeBrink_House/map.json
+++ b/data/maps/TwoIsland_CapeBrink_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
+      "graphics_id": "OBJ_EVENT_GFX_CHANNELER",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json
index 694c644f3..076ea39f7 100644
--- a/data/maps/TwoIsland_Harbor/map.json
+++ b/data/maps/TwoIsland_Harbor/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
+      "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json
index da5033107..2f45c143f 100644
--- a/data/maps/TwoIsland_House/map.json
+++ b/data/maps/TwoIsland_House/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 7,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
index f8c3e8446..d15bc7d3b 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/map.json
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 5,
       "y": 5,
       "elevation": 1,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BIKER",
+      "graphics_id": "OBJ_EVENT_GFX_BIKER",
       "x": 5,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 6,
       "y": 5,
       "elevation": 1,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json
index 96da34e0b..7001ab1cc 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
+      "graphics_id": "OBJ_EVENT_GFX_GBA_KID",
       "x": 11,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json
index 726bcfe11..24dcc7a4a 100644
--- a/data/maps/TwoIsland_PokemonCenter_2F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json
index eee3d31bf..7e24aa5c8 100644
--- a/data/maps/UndergroundPath_EastEntrance/map.json
+++ b/data/maps/UndergroundPath_EastEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json
index 6052b6192..e5514fc1f 100644
--- a/data/maps/UndergroundPath_NorthEntrance/map.json
+++ b/data/maps/UndergroundPath_NorthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 5,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json
index ec8a01a32..70ec3cd4e 100644
--- a/data/maps/UndergroundPath_SouthEntrance/map.json
+++ b/data/maps/UndergroundPath_SouthEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json
index 6fae45cf2..4f5ee081a 100644
--- a/data/maps/UndergroundPath_WestEntrance/map.json
+++ b/data/maps/UndergroundPath_WestEntrance/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 5,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
index f46654c7b..cfc872f08 100644
--- a/data/maps/UnionRoom/map.json
+++ b/data/maps/UnionRoom/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
       "x": 3,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 1,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_7",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_7",
       "x": 7,
       "y": 8,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_6",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_6",
       "x": 1,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_5",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_5",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_4",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_4",
       "x": 13,
       "y": 4,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 13,
       "y": 8,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 4,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
index faf8f70f5..52e167ea7 100644
--- a/data/maps/VermilionCity/map.json
+++ b/data/maps/VermilionCity/map.json
@@ -27,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 22,
       "y": 11,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 17,
       "y": 9,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2",
       "x": 36,
       "y": 10,
       "elevation": 0,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MACHOP",
+      "graphics_id": "OBJ_EVENT_GFX_MACHOP",
       "x": 35,
       "y": 11,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 31,
       "y": 30,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 24,
       "y": 33,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 19,
       "y": 24,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
       "x": 25,
       "y": 7,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json
index 4b0325bc1..eab43a7f5 100644
--- a/data/maps/VermilionCity_Gym/map.json
+++ b/data/maps/VermilionCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LT_SURGE",
+      "graphics_id": "OBJ_EVENT_GFX_LT_SURGE",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 2,
       "y": 11,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
+      "graphics_id": "OBJ_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 13,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 4,
       "y": 17,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 7,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json
index 6ec3be3f9..2e1269e8d 100644
--- a/data/maps/VermilionCity_House1/map.json
+++ b/data/maps/VermilionCity_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
+      "graphics_id": "OBJ_EVENT_GFX_FISHER",
       "x": 4,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json
index c22ef4744..4b8cd7cdd 100644
--- a/data/maps/VermilionCity_House2/map.json
+++ b/data/maps/VermilionCity_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json
index fdbb6bd3e..c5cd83671 100644
--- a/data/maps/VermilionCity_House3/map.json
+++ b/data/maps/VermilionCity_House3/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIDGEY",
+      "graphics_id": "OBJ_EVENT_GFX_PIDGEY",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
+      "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD",
       "x": 6,
       "y": 4,
       "elevation": 0,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 2,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json
index dfff61410..415d0eb48 100644
--- a/data/maps/VermilionCity_Mart/map.json
+++ b/data/maps/VermilionCity_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 9,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json
index 595761c4f..74feb74fb 100644
--- a/data/maps/VermilionCity_PokemonCenter_1F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 4,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 6,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json
index 00e7ce529..fdc77b9a7 100644
--- a/data/maps/VermilionCity_PokemonCenter_2F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json
index 521e0c99f..4bf91321f 100644
--- a/data/maps/VermilionCity_PokemonFanClub/map.json
+++ b/data/maps/VermilionCity_PokemonFanClub/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 5,
       "y": 4,
       "elevation": 4,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
+      "graphics_id": "OBJ_EVENT_GFX_WORKER_F",
       "x": 6,
       "y": 4,
       "elevation": 4,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
+      "graphics_id": "OBJ_EVENT_GFX_PIKACHU",
       "x": 7,
       "y": 6,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SEEL",
+      "graphics_id": "OBJ_EVENT_GFX_SEEL",
       "x": 4,
       "y": 6,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 4,
       "y": 5,
       "elevation": 0,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 7,
       "y": 5,
       "elevation": 0,
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 21d57ae5e..f6c6811d1 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 14,
       "y": 6,
       "elevation": 4,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 3,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 14,
       "y": 1,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 7,
       "y": 18,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 4,
       "y": 12,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 16,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index 764f448aa..184187cf3 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
+      "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 20,
       "y": 11,
       "elevation": 4,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 31,
       "y": 16,
       "elevation": 4,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 26,
       "y": 6,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKER",
       "x": 36,
       "y": 5,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 6,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 40,
       "y": 7,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 25,
       "y": 13,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 14,
       "y": 13,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 8,
       "y": 7,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 6,
       "y": 17,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 33,
       "y": 19,
       "elevation": 3,
@@ -172,7 +172,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 40,
       "y": 9,
       "elevation": 3,
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index a5985e5fc..76ea5245c 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 40,
       "y": 7,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 21,
       "y": 5,
       "elevation": 4,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 10,
       "y": 17,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 11,
       "y": 16,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 38,
       "y": 7,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 9,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 19,
       "y": 15,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 33,
       "y": 18,
       "elevation": 0,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 35,
       "y": 13,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
+      "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER",
       "x": 32,
       "y": 5,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 38,
       "y": 13,
       "elevation": 3,
@@ -159,7 +159,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
       "x": 39,
       "y": 13,
       "elevation": 3,
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index d9895c6b0..616e511ee 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -32,7 +32,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 8,
       "y": 26,
       "elevation": 3,
@@ -45,7 +45,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 11,
       "y": 24,
       "elevation": 3,
@@ -58,7 +58,7 @@
       "flag": "FLAG_TEMP_11"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
       "x": 34,
       "y": 11,
       "elevation": 3,
@@ -71,7 +71,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 21,
       "y": 6,
       "elevation": 3,
@@ -84,7 +84,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
       "x": 20,
       "y": 12,
       "elevation": 3,
@@ -97,7 +97,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 33,
       "y": 26,
       "elevation": 3,
@@ -110,7 +110,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 16,
       "y": 22,
       "elevation": 3,
@@ -123,7 +123,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
       "x": 18,
       "y": 5,
       "elevation": 3,
@@ -136,7 +136,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index 4fb140b24..9e4f8f5c7 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -17,17 +17,17 @@ ViridianCity_OnTransition:: @ 81658D9
 	end
 
 ViridianCity_EventScript_SetOldManNormal:: @ 8165909
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1
 	return
 
 ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1
 	setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8
 	setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND
 	return
 
 ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN
 	setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11
 	setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN
 	return
diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json
index f1188d2c0..0cc83f420 100644
--- a/data/maps/ViridianCity_Gym/map.json
+++ b/data/maps/ViridianCity_Gym/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 12,
       "y": 10,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 11,
       "y": 14,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 10,
       "y": 10,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_MAN",
       "x": 2,
       "y": 21,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
+      "graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
       "x": 3,
       "y": 11,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI",
+      "graphics_id": "OBJ_EVENT_GFX_GIOVANNI",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
       "x": 13,
       "y": 7,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
+      "graphics_id": "OBJ_EVENT_GFX_GYM_GUY",
       "x": 16,
       "y": 20,
       "elevation": 3,
diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json
index 29f185b71..0b6247f93 100644
--- a/data/maps/ViridianCity_House1/map.json
+++ b/data/maps/ViridianCity_House1/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SPEAROW",
+      "graphics_id": "OBJ_EVENT_GFX_SPEAROW",
       "x": 6,
       "y": 6,
       "elevation": 3,
diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json
index b5e65bbad..c770669e5 100644
--- a/data/maps/ViridianCity_House2/map.json
+++ b/data/maps/ViridianCity_House2/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_LASS",
+      "graphics_id": "OBJ_EVENT_GFX_LASS",
       "x": 4,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json
index 7b3de99b6..d650bfda6 100644
--- a/data/maps/ViridianCity_Mart/map.json
+++ b/data/maps/ViridianCity_Mart/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
+      "graphics_id": "OBJ_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
       "x": 9,
       "y": 5,
       "elevation": 3,
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json
index 780087d1b..d46b11f2c 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 4,
       "y": 7,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 2,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json
index 967493db5..76084ff0a 100644
--- a/data/maps/ViridianCity_PokemonCenter_2F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 8a92127ae..a11b85a94 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -16,7 +16,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 29,
       "y": 58,
       "elevation": 3,
@@ -29,7 +29,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 45,
       "y": 58,
       "elevation": 3,
@@ -42,7 +42,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 47,
       "y": 45,
       "elevation": 3,
@@ -55,7 +55,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 47,
       "y": 29,
       "elevation": 3,
@@ -68,7 +68,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 7,
       "y": 22,
       "elevation": 3,
@@ -81,7 +81,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 41,
       "elevation": 3,
@@ -94,7 +94,7 @@
       "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 40,
       "y": 21,
       "elevation": 3,
@@ -107,7 +107,7 @@
       "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 21,
       "y": 34,
       "elevation": 3,
@@ -120,7 +120,7 @@
       "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 43,
       "y": 6,
       "elevation": 3,
@@ -133,7 +133,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 16,
       "y": 5,
       "elevation": 3,
@@ -146,7 +146,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 49,
       "y": 60,
       "elevation": 3,
diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s
deleted file mode 100644
index 8f37f94e0..000000000
--- a/data/pokemon_jump.s
+++ /dev/null
@@ -1,438 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_846AFE8:: @ 846AFE8
-	.incbin "graphics/misc/unk_846B008.gbapal"
-
-gUnknown_846B008:: @ 846B008
-	.incbin "graphics/misc/unk_846B008.4bpp.lz"
-
-gUnknown_846B42C:: @ 846B42C
-	obj_tiles gUnknown_846B008, 0x0c00, 0x2000
-	null_obj_tiles
-
-gUnknown_846B43C:: @ 846B43C
-	obj_pal gUnknown_846AFE8, 0x2000
-	null_obj_pal
-
-gUnknown_846B44C:: @ 846B44C
-	obj_image_anim_frame 0x00, 0
-	obj_image_anim_end
-
-gUnknown_846B454:: @ 846B454
-	obj_image_anim_frame 0x10, 0
-	obj_image_anim_end
-
-gUnknown_846B45C:: @ 846B45C
-	obj_image_anim_frame 0x20, 0
-	obj_image_anim_end
-
-gUnknown_846B464:: @ 846B464
-	obj_image_anim_frame 0x40, 0
-	obj_image_anim_end
-
-gUnknown_846B46C:: @ 846B46C
-	obj_image_anim_frame 0x30, 0
-	obj_image_anim_end
-
-gUnknown_846B474:: @ 846B474
-	obj_image_anim_frame 0x50, 0
-	obj_image_anim_end
-
-gUnknown_846B47C::
-	.4byte gUnknown_846B44C
-	.4byte gUnknown_846B454
-	.4byte gUnknown_846B45C
-	.4byte gUnknown_846B464
-	.4byte gUnknown_846B46C
-	.4byte gUnknown_846B474
-
-gUnknown_846B494:: @ 846B494
-	spr_template 0x2000, 0x2000, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846B4AC:: @ 846B4AC
-	@ This is a 2D array with one row.
-	@ Why this was done this way is beyond me.
-	@ The data that follow this row are not at all function pointers.
-	.4byte sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34
-
-gUnknown_846B4BC:: @ 846B4BC
-	.2byte 0x0001, 0x0002, 0x0004, 0x0001, 0x0007, 0x0000, 0x000a, 0x0001, 0x000b, 0x0001, 0x000d, 0x0001, 0x000e, 0x0001, 0x0013, 0x0001
-	.2byte 0x0014, 0x0001, 0x0019, 0x0000, 0x001b, 0x0000, 0x001d, 0x0000, 0x0020, 0x0000, 0x0023, 0x0000, 0x0025, 0x0000, 0x0027, 0x0002
-	.2byte 0x002b, 0x0002, 0x002e, 0x0001, 0x0034, 0x0000, 0x0036, 0x0002, 0x0038, 0x0001, 0x003a, 0x0001, 0x003c, 0x0002, 0x0045, 0x0002
-	.2byte 0x005a, 0x0001, 0x0062, 0x0001, 0x0066, 0x0002, 0x0068, 0x0000, 0x0084, 0x0002, 0x0085, 0x0000, 0x008a, 0x0001, 0x008c, 0x0001
-	.2byte 0x0098, 0x0002, 0x009b, 0x0001, 0x009e, 0x0000, 0x00a7, 0x0001, 0x00ac, 0x0000, 0x00ad, 0x0000, 0x00ae, 0x0002, 0x00af, 0x0002
-	.2byte 0x00b3, 0x0000, 0x00b6, 0x0002, 0x00b7, 0x0002, 0x00bf, 0x0002, 0x00c2, 0x0002, 0x00cc, 0x0002, 0x00d1, 0x0000, 0x00d5, 0x0002
-	.2byte 0x00d8, 0x0000, 0x00da, 0x0002, 0x00dc, 0x0000, 0x00e4, 0x0001, 0x00e7, 0x0000, 0x00e9, 0x0000, 0x00ec, 0x0001, 0x00ee, 0x0002
-	.2byte 0x00ef, 0x0001, 0x00f0, 0x0001, 0x00f6, 0x0001, 0x0115, 0x0001, 0x0118, 0x0002, 0x011b, 0x0000, 0x011c, 0x0000, 0x011e, 0x0001
-	.2byte 0x0120, 0x0000, 0x0121, 0x0000, 0x0122, 0x0001, 0x0123, 0x0002, 0x0125, 0x0002, 0x0127, 0x0002, 0x012a, 0x0001, 0x0188, 0x0000
-	.2byte 0x0189, 0x0000, 0x0137, 0x0002, 0x0132, 0x0002, 0x012d, 0x0001, 0x0172, 0x0000, 0x015e, 0x0002, 0x013b, 0x0000, 0x0142, 0x0000
-	.2byte 0x0163, 0x0000, 0x017e, 0x0001, 0x0164, 0x0002, 0x0151, 0x0001, 0x0161, 0x0001, 0x0162, 0x0001, 0x0182, 0x0000, 0x0183, 0x0000
-	.2byte 0x016b, 0x0002, 0x016f, 0x0002, 0x0153, 0x0002, 0x0141, 0x0002, 0x015f, 0x0000, 0x014c, 0x0002, 0x0158, 0x0002, 0x0186, 0x0001
-	.2byte 0x0168, 0x0000, 0x015a, 0x0000, 0x0175, 0x0001, 0x018b, 0x0001
-
-gUnknown_846B64C:: @ 846B64C
-	.4byte sub_8148344
-	.4byte sub_81483D0
-	.4byte sub_8148464
-	.4byte sub_81484D0
-	.4byte sub_81485C8
-	.4byte sub_81486C4
-	.4byte sub_8148760
-	.4byte sub_81487B4
-	.4byte sub_814881C
-
-gUnknown_846B670:: @ 846B670
-	.4byte sub_8148398
-	.4byte sub_8148418
-	.4byte sub_81484B0
-	.4byte sub_814856C
-	.4byte sub_8148664
-	.4byte sub_8148724
-	.4byte sub_8148760
-	.4byte sub_8148800
-	.4byte sub_814881C
-
-gUnknown_846B694:: @ 846B694
-	.2byte 0x001a, 0x001f, 0x0024, 0x0029, 0x002e, 0x0033, 0x0038, 0x003d
-
-gUnknown_846B6A4:: @ 846B6A4
-	.2byte 0x0000, 0x0001, 0x0001, 0x0002
-
-gUnknown_846B6AC:: @ 846B6AC
-	.2byte 0x0058, 0x005f, 0x00dd, 0x00fe
-
-gUnknown_846B6B4:: @ 846B6B4
-	.byte 0xfd, 0xfa, 0xf8, 0xf6, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe9, 0xea, 0xec, 0xee, 0xef, 0xf1, 0xf3, 0xf5, 0xf8, 0xfa, 0xfc
-	.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfa, 0xf7, 0xf5, 0xf2, 0xf0, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe3, 0xe2, 0xe2, 0xe4
-	.byte 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5, 0xe6, 0xe7, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2
-	.byte 0xf4, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_846B744:: @ 846B744
-	.4byte 0, 0, 50, 100, 200, 500
-
-gUnknown_846B75C:: @ 846B75C
-	.2byte 0x008a, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092, 0x0093
-
-gUnknown_846B76C:: @ 846B76C
-	.4byte  5000, 1
-	.4byte  8000, 2
-	.4byte 12000, 3
-	.4byte 16000, 4
-	.4byte 20000, 5
-
-gUnknown_846B794:: @ 846B794 gbapal
-	.incbin "graphics/link_games/unk_846B794.gbapal"
-
-gUnknown_846B7B4:: @ 846B7B4 gbapal
-	.incbin "graphics/link_games/unk_846B7B4.gbapal"
-
-gUnknown_846B7D4:: @ 846B7D4 4bpp.lz
-	.incbin "graphics/link_games/unk_846B7D4.4bpp.lz"
-
-gUnknown_846BA00:: @ 846BA00 bin.lz
-	.incbin "graphics/link_games/unk_846BA00.bin.lz"
-
-gUnknown_846BBB0:: @ 846BBB0 gbapal
-	.incbin "graphics/link_games/unk_846BBB0.gbapal"
-
-gUnknown_846BBD0:: @ 846BBD0 4bpp.lz
-	.incbin "graphics/link_games/unk_846BBD0.4bpp.lz"
-
-gUnknown_846C520:: @ 846C520 bin.lz
-	.incbin "graphics/link_games/unk_846C520.bin.lz"
-
-gUnknown_846C8D8:: @ 846C8D8 gbapal
-	.incbin "graphics/link_games/unk_846C8D8.gbapal"
-
-gUnknown_846C8F8:: @ 846C8F8 4bpp.lz
-	.incbin "graphics/link_games/unk_846C8F8.4bpp.lz"
-
-gUnknown_846D3A8:: @ 846D3A8 bin.lz
-	.incbin "graphics/link_games/unk_846D3A8.bin.lz"
-
-gUnknown_846D8D4:: @ 846D8D4
-	.4byte 0x000001b0
-	@ {
-	@ 	.bg = 0,
-	@ 	.charBaseIndex = 0,
-	@ 	.mapBaseIndex = 27,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 0,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000025e6
-	@ {
-	@ 	.bg = 2,
-	@ 	.charBaseIndex = 1,
-	@ 	.mapBaseIndex = 30,
-	@ 	.screenSize = 2,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 2,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000016c9
-	@ {
-	@ 	.bg = 1,
-	@ 	.charBaseIndex = 2,
-	@ 	.mapBaseIndex = 12,
-	@ 	.screenSize = 3,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 1,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000031df
-	@ {
-	@ 	.bg = 3,
-	@ 	.charBaseIndex = 3,
-	@ 	.mapBaseIndex = 29,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 3,
-	@ 	.baseTile = 0x0000
-	@ }
-
-gUnknown_846D8E4:: @ 846D8E4
-	.byte 0, 19, 0, 6, 2, 2
-	.2byte 0x0013
-	.byte 0, 8, 0, 6, 2, 2
-	.2byte 0x001f
-	.byte 255, 0, 0, 0, 0, 0
-	.2byte 0x0000
-
-gUnknown_846D8FC:: @ 846D8FC
-	.4byte 0, sub_8149DC8
-	.4byte 1, sub_8149F64
-	.4byte 2, sub_8149FD0
-	.4byte 3, sub_814A03C
-	.4byte 4, sub_814A0C8
-	.4byte 5, sub_814A174
-	.4byte 6, sub_814A218
-	.4byte 7, sub_814A264
-	.4byte 9, sub_814A3AC
-	.4byte 8, sub_814A308
-
-gUnknown_846D94C:: @ 846D94C
-	.string "IES$"
-
-gUnknown_846D950:: @ 846D950
-	.byte 0x00, 0x02, 0x03
-
-gUnknown_846D953:: @ 846D953
-	.byte 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-
-gUnknown_846D960:: @ 846D960
-	obj_tiles gUnknown_8479688, 0, 800
-
-gUnknown_846D968:: @ 846D968
-	obj_pal gUnknown_8479668, 800
-
-gUnknown_846D970::
-	.2byte 0x0006, 0x0008, 0x0010, 0x0008
-
-gUnknown_846D978::
-	.2byte 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008
-
-gUnknown_846D984::
-	.2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006
-
-gUnknown_846D994::
-	.2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
-
-gUnknown_846D9A8:: @ 846D9A8
-	.4byte gUnknown_846D970
-	.4byte gUnknown_846D978
-	.4byte gUnknown_846D984
-	.4byte gUnknown_846D994
-
-gUnknown_846D9B8::
-	.2byte 0x0058, 0x0098
-
-gUnknown_846D9BC::
-	.2byte 0x0058, 0x0078, 0x0098
-
-gUnknown_846D9C2::
-	.2byte 0x0038, 0x0058, 0x0098, 0x00b8
-
-gUnknown_846D9CA::
-	.2byte 0x0038, 0x0058, 0x0078, 0x0098, 0x00b8
-
-gUnknown_846D9D4:: @ 846D9D4
-	.4byte gUnknown_846D9B8
-	.4byte gUnknown_846D9BC
-	.4byte gUnknown_846D9C2
-	.4byte gUnknown_846D9CA
-
-gUnknown_846D9E4:: @ gbapal
-	.incbin "graphics/link_games/unk_846D9E4.gbapal"
-
-gUnknown_846DA04:: @ gbapal
-	.incbin "graphics/link_games/unk_846DA04.gbapal"
-
-gUnknown_846DA24:: @ 4bpp.lz
-	.incbin "graphics/link_games/unk_846DA24.4bpp.lz"
-
-gUnknown_846DB44:: @ 4bpp.lz
-	.incbin "graphics/link_games/unk_846DB44.4bpp.lz"
-
-gUnknown_846DD18:: @ 4bpp.lz
-	.incbin "graphics/link_games/unk_846DD18.4bpp.lz"
-
-gUnknown_846DE48:: @ 4bpp.lz
-	.incbin "graphics/link_games/unk_846DE48.4bpp.lz"
-
-gUnknown_846DF44:: @ 4bpp.lz
-	.incbin "graphics/link_games/unk_846DF44.4bpp.lz"
-
-gUnknown_846E0B0:: @ 846E0B0
-	obj_tiles gUnknown_846DA24, 0x0600, 5
-	obj_tiles gUnknown_846DB44, 0x0c00, 6
-	obj_tiles gUnknown_846DD18, 0x0600, 7
-	obj_tiles gUnknown_846DE48, 0x0600, 8
-	obj_tiles gUnknown_846DF44, 0x0200, 10
-
-gUnknown_846E0D8:: @ 846E0D8
-	obj_pal gUnknown_846D9E4, 5
-	obj_pal gUnknown_846DA04, 6
-
-gUnknown_846E0E8:: @ 846E0E8
-	spr_template 0, 0, gUnknown_846E170, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846E100:: @ 846E100
-	.2byte 0x0060, 0x0060, 0x0060, 0x0072, 0x0078, 0x0078, 0x0078, 0x0072, 0x0060, 0x0060, 0x0046, 0x0050, 0x0060, 0x0072, 0x0078, 0x0080
-	.2byte 0x0078, 0x0072, 0x0060, 0x0050, 0x0032, 0x0048, 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048, 0x002a, 0x0048
-	.2byte 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048
-
-gUnknown_846E150:: @ 846E150
-	.2byte 0x0010, 0x0028, 0x0048, 0x0068, 0x0088, 0x00a8, 0x00c8, 0x00e0
-
-gUnknown_846E160:: @ 846E160
-	.4byte gUnknown_846E220
-	.4byte gUnknown_846E238
-	.4byte gUnknown_846E250
-	.4byte gUnknown_846E268
-
-gUnknown_846E170::
-	.4byte 0xc0000000, 0x00000800
-
-gUnknown_846E178::
-	.4byte 0x80008000, 0x00000800
-
-gUnknown_846E180::
-	.4byte 0x80000000, 0x00000800
-
-gUnknown_846E188::
-	.4byte 0x80004000, 0x00000800
-
-gUnknown_846E190::
-	obj_image_anim_frame 0x0000, 1
-	obj_image_anim_end
-
-gUnknown_846E198::
-	obj_image_anim_frame 0x0008, 1
-	obj_image_anim_end
-
-gUnknown_846E1A0::
-	obj_image_anim_frame 0x0010, 1
-	obj_image_anim_end
-
-gUnknown_846E1A8::
-	obj_image_anim_frame 0x0018, 1
-	obj_image_anim_end
-
-gUnknown_846E1B0::
-	obj_image_anim_frame 0x0020, 1
-	obj_image_anim_end
-
-gUnknown_846E1B8::
-	obj_image_anim_frame 0x0028, 1
-	obj_image_anim_end
-
-gUnknown_846E1C0::
-	obj_image_anim_frame 0x0000, 1
-	obj_image_anim_end
-
-gUnknown_846E1C8::
-	obj_image_anim_frame 0x0010, 1
-	obj_image_anim_end
-
-gUnknown_846E1D0::
-	obj_image_anim_frame 0x0020, 1
-	obj_image_anim_end
-
-gUnknown_846E1D8::
-	obj_image_anim_frame 0x0030, 1
-	obj_image_anim_end
-
-gUnknown_846E1E0::
-	obj_image_anim_frame 0x0040, 1
-	obj_image_anim_end
-
-gUnknown_846E1E8::
-	obj_image_anim_frame 0x0050, 1
-	obj_image_anim_end
-
-gUnknown_846E1F0::
-	.4byte gUnknown_846E190
-	.4byte gUnknown_846E198
-	.4byte gUnknown_846E1A0
-	.4byte gUnknown_846E1A8
-	.4byte gUnknown_846E1B0
-	.4byte gUnknown_846E1B8
-
-gUnknown_846E208::
-	.4byte gUnknown_846E1C0
-	.4byte gUnknown_846E1C8
-	.4byte gUnknown_846E1D0
-	.4byte gUnknown_846E1D8
-	.4byte gUnknown_846E1E0
-	.4byte gUnknown_846E1E8
-
-gUnknown_846E220::
-	spr_template 5, 5, gUnknown_846E178, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846E238::
-	spr_template 6, 5, gUnknown_846E180, gUnknown_846E208, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846E250::
-	spr_template 7, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846E268::
-	spr_template 8, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846E280::
-	.4byte 0x40000000, 0x00000400
-
-gUnknown_846E288::
-	obj_image_anim_frame 0x0000, 0
-	obj_image_anim_end
-
-gUnknown_846E290::
-	obj_image_anim_frame 0x0000, 4
-	obj_image_anim_frame 0x0004, 4
-	obj_image_anim_frame 0x0008, 4
-	obj_image_anim_frame 0x000c, 4
-	obj_image_anim_loop 1
-	obj_image_anim_frame 0x0000, 4
-	obj_image_anim_end
-
-gUnknown_846E2AC::
-	.4byte gUnknown_846E288
-	.4byte gUnknown_846E290
-
-gUnknown_846E2B4:: @ 846E2B4
-	spr_template 10, 5, gUnknown_846E280, gUnknown_846E2AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_846E2CC:: @ 846E2CC
-	.byte 0, 1, 1, 28, 9, 15
-	.2byte 0x0001
-
-gUnknown_846E2D4:: @ 846E2D4
-	.4byte gUnknown_841CB78
-	.4byte gUnknown_841CB88
-	.4byte gUnknown_841CB94
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 67d34232c..c844cc115 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -59,19 +59,19 @@ PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C
 	releaseall
 	end
 
-Route20_EventScript_1ACE36:: @ 81ACE36
+Route20_EventScript_Camper:: @ 81ACE36
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 3
-	msgbox Text_1882E1
+	msgbox Route20_Text_MistyTrainsHere
 	release
 	end
 
-Route25_EventScript_1ACE4F:: @ 81ACE4F
+Route25_EventScript_Beauty:: @ 81ACE4F
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 4
-	msgbox Text_189569
+	msgbox Route25_Text_MistyHighHopesAboutThisPlace
 	release
 	end
 
diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc
index 3d5f60008..8b38ec600 100644
--- a/data/scripts/trainers.inc
+++ b/data/scripts/trainers.inc
@@ -115,199 +115,199 @@ Route4_EventScript_CrissyRematch:: @ 81A95E0
 	msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route24_EventScript_1A95F7:: @ 81A95F7
-	trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95
+Route24_EventScript_Timmy:: @ 81A95F7
+	trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyIntro, Route24_Text_TimmyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A961E
-	msgbox Text_188FA7, MSGBOX_AUTOCLOSE
+	goto_if_eq Route24_EventScript_TimmyRematch
+	msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A961E:: @ 81A961E
-	trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Text_1C3657, Text_188F95
-	msgbox Text_188FA7, MSGBOX_AUTOCLOSE
+Route24_EventScript_TimmyRematch:: @ 81A961E
+	trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyRematchIntro, Route24_Text_TimmyDefeat
+	msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route24_EventScript_1A9635:: @ 81A9635
-	trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C
+Route24_EventScript_Cale:: @ 81A9635
+	trainerbattle_single TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleIntro, Route24_Text_CaleDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A965C
-	msgbox Text_18909E, MSGBOX_AUTOCLOSE
+	goto_if_eq Route24_EventScript_CaleRematch
+	msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A965C:: @ 81A965C
-	trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Text_1C36DA, Text_18908C
-	msgbox Text_18909E, MSGBOX_AUTOCLOSE
+Route24_EventScript_CaleRematch:: @ 81A965C
+	trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleRematchIntro, Route24_Text_CaleDefeat
+	msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route24_EventScript_1A9673:: @ 81A9673
-	trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46
+Route24_EventScript_Reli:: @ 81A9673
+	trainerbattle_single TRAINER_LASS_RELI, Route24_Text_ReliIntro, Route24_Text_ReliDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A969A
-	msgbox Text_188F53, MSGBOX_AUTOCLOSE
+	goto_if_eq Route24_EventScript_ReliRematch
+	msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A969A:: @ 81A969A
-	trainerbattle_rematch TRAINER_LASS_RELI, Text_1C3624, Text_188F46
-	msgbox Text_188F53, MSGBOX_AUTOCLOSE
+Route24_EventScript_ReliRematch:: @ 81A969A
+	trainerbattle_rematch TRAINER_LASS_RELI, Route24_Text_ReliRematchIntro, Route24_Text_ReliDefeat
+	msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route24_EventScript_1A96B1:: @ 81A96B1
-	trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7
+Route24_EventScript_Ali:: @ 81A96B1
+	trainerbattle_single TRAINER_LASS_ALI, Route24_Text_AliIntro, Route24_Text_AliDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A96D8
-	msgbox Text_188FF9, MSGBOX_AUTOCLOSE
+	goto_if_eq Route24_EventScript_AliRematch
+	msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A96D8:: @ 81A96D8
-	trainerbattle_rematch TRAINER_LASS_ALI, Text_1C3685, Text_188FE7
-	msgbox Text_188FF9, MSGBOX_AUTOCLOSE
+Route24_EventScript_AliRematch:: @ 81A96D8
+	trainerbattle_rematch TRAINER_LASS_ALI, Route24_Text_AliRematchIntro, Route24_Text_AliDefeat
+	msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route24_EventScript_1A96EF:: @ 81A96EF
-	trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94
+Route24_EventScript_Shane:: @ 81A96EF
+	trainerbattle_single TRAINER_CAMPER_SHANE, Route24_Text_ShaneIntro, Route24_Text_ShaneDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A9716
-	msgbox Text_188EA3, MSGBOX_AUTOCLOSE
+	goto_if_eq Route24_EventScript_ShaneRematch
+	msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A9716:: @ 81A9716
-	trainerbattle_rematch TRAINER_CAMPER_SHANE, Text_1C35EE, Text_188E94
-	msgbox Text_188EA3, MSGBOX_AUTOCLOSE
+Route24_EventScript_ShaneRematch:: @ 81A9716
+	trainerbattle_rematch TRAINER_CAMPER_SHANE, Route24_Text_ShaneRematchIntro, Route24_Text_ShaneDefeat
+	msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route24_EventScript_1A972D:: @ 81A972D
-	trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA
+Route24_EventScript_Ethan:: @ 81A972D
+	trainerbattle_single TRAINER_CAMPER_ETHAN, Route24_Text_EthanIntro, Route24_Text_EthanDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A9754
-	msgbox Text_188F0A, MSGBOX_AUTOCLOSE
+	goto_if_eq Route24_EventScript_EthanRematch
+	msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A9754:: @ 81A9754
-	trainerbattle_rematch TRAINER_CAMPER_ETHAN, Text_1C360E, Text_188EFA
-	msgbox Text_188F0A, MSGBOX_AUTOCLOSE
+Route24_EventScript_EthanRematch:: @ 81A9754
+	trainerbattle_rematch TRAINER_CAMPER_ETHAN, Route24_Text_EthanRematchIntro, Route24_Text_EthanDefeat
+	msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A976B:: @ 81A976B
-	trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6
+Route25_EventScript_Joey:: @ 81A976B
+	trainerbattle_single TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyIntro, Route25_Text_JoeyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A9792
-	msgbox Text_1890F5, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_JoeyRematch
+	msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A9792:: @ 81A9792
-	trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Text_1C33E7, Text_1890E6
-	msgbox Text_1890F5, MSGBOX_AUTOCLOSE
+Route25_EventScript_JoeyRematch:: @ 81A9792
+	trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyRematchIntro, Route25_Text_JoeyDefeat
+	msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A97A9:: @ 81A97A9
-	trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6
+Route25_EventScript_Dan:: @ 81A97A9
+	trainerbattle_single TRAINER_YOUNGSTER_DAN, Route25_Text_DanIntro, Route25_Text_DanDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A97D0
-	msgbox Text_1891B3, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_DanRematch
+	msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A97D0:: @ 81A97D0
-	trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Text_1C3404, Text_1891A6
-	msgbox Text_1891B3, MSGBOX_AUTOCLOSE
+Route25_EventScript_DanRematch:: @ 81A97D0
+	trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Route25_Text_DanRematchIntro, Route25_Text_DanDefeat
+	msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A97E7:: @ 81A97E7
-	trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9
+Route25_EventScript_Chad:: @ 81A97E7
+	trainerbattle_single TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadIntro, Route25_Text_ChadDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A980E
-	msgbox Text_1892EF, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_ChadRematch
+	msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A980E:: @ 81A980E
-	trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Text_1C34D4, Text_1892D9
-	msgbox Text_1892EF, MSGBOX_AUTOCLOSE
+Route25_EventScript_ChadRematch:: @ 81A980E
+	trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadRematchIntro, Route25_Text_ChadDefeat
+	msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A9825:: @ 81A9825
-	trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261
+Route25_EventScript_Kelsey:: @ 81A9825
+	trainerbattle_single TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyIntro, Route25_Text_KelseyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A984C
-	msgbox Text_189281, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_KelseyRematch
+	msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A984C:: @ 81A984C
-	trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Text_1C349C, Text_189261
-	msgbox Text_189281, MSGBOX_AUTOCLOSE
+Route25_EventScript_KelseyRematch:: @ 81A984C
+	trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyRematchIntro, Route25_Text_KelseyDefeat
+	msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A9863:: @ 81A9863
-	trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364
+Route25_EventScript_Haley:: @ 81A9863
+	trainerbattle_single TRAINER_LASS_HALEY, Route25_Text_HaleyIntro, Route25_Text_HaleyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A988A
-	msgbox Text_189378, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_HaleyRematch
+	msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A988A:: @ 81A988A
-	trainerbattle_rematch TRAINER_LASS_HALEY, Text_1C350A, Text_189364
-	msgbox Text_189378, MSGBOX_AUTOCLOSE
+Route25_EventScript_HaleyRematch:: @ 81A988A
+	trainerbattle_rematch TRAINER_LASS_HALEY, Route25_Text_HaleyRematchIntro, Route25_Text_HaleyDefeat
+	msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A98A1:: @ 81A98A1
-	trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA
+Route25_EventScript_Franklin:: @ 81A98A1
+	trainerbattle_single TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinIntro, Route25_Text_FranklinDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A98C8
-	msgbox Text_1893FB, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_FranklinRematch
+	msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A98C8:: @ 81A98C8
-	trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Text_1C353B, Text_1893EA
-	msgbox Text_1893FB, MSGBOX_AUTOCLOSE
+Route25_EventScript_FranklinRematch:: @ 81A98C8
+	trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinRematchIntro, Route25_Text_FranklinDefeat
+	msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A98DF:: @ 81A98DF
-	trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459
+Route25_EventScript_Nob:: @ 81A98DF
+	trainerbattle_single TRAINER_HIKER_NOB, Route25_Text_NobIntro, Route25_Text_NobDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A9906
-	msgbox Text_18947E, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_NobRematch
+	msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A9906:: @ 81A9906
-	trainerbattle_rematch TRAINER_HIKER_NOB, Text_1C357E, Text_189459
-	msgbox Text_18947E, MSGBOX_AUTOCLOSE
+Route25_EventScript_NobRematch:: @ 81A9906
+	trainerbattle_rematch TRAINER_HIKER_NOB, Route25_Text_NobRematchIntro, Route25_Text_NobDefeat
+	msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A991D:: @ 81A991D
-	trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A
+Route25_EventScript_Wayne:: @ 81A991D
+	trainerbattle_single TRAINER_HIKER_WAYNE, Route25_Text_WayneIntro, Route25_Text_WayneDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A9944
-	msgbox Text_18951C, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_WayneRematch
+	msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A9944:: @ 81A9944
-	trainerbattle_rematch TRAINER_HIKER_WAYNE, Text_1C35BC, Text_18950A
-	msgbox Text_18951C, MSGBOX_AUTOCLOSE
+Route25_EventScript_WayneRematch:: @ 81A9944
+	trainerbattle_rematch TRAINER_HIKER_WAYNE, Route25_Text_WayneRematchIntro, Route25_Text_WayneDefeat
+	msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route25_EventScript_1A995B:: @ 81A995B
-	trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212
+Route25_EventScript_Flint:: @ 81A995B
+	trainerbattle_single TRAINER_CAMPER_FLINT, Route25_Text_FlintIntro, Route25_Text_FlintDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1A9982
-	msgbox Text_18921D, MSGBOX_AUTOCLOSE
+	goto_if_eq Route25_EventScript_FlintRematch
+	msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1A9982:: @ 81A9982
-	trainerbattle_rematch TRAINER_CAMPER_FLINT, Text_1C3445, Text_189212
-	msgbox Text_18921D, MSGBOX_AUTOCLOSE
+Route25_EventScript_FlintRematch:: @ 81A9982
+	trainerbattle_rematch TRAINER_CAMPER_FLINT, Route25_Text_FlintRematchIntro, Route25_Text_FlintDefeat
+	msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 Route6_EventScript_Keigo:: @ 81A9999
@@ -1285,849 +1285,849 @@ Route14_EventScript_JanRematch:: @ 81AABD8
 	msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AABF3:: @ 81AABF3
-	trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8
+Route15_EventScript_Ernest:: @ 81AABF3
+	trainerbattle_single TRAINER_BIKER_ERNEST, Route15_Text_ErnestIntro, Route15_Text_ErnestDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAC1A
-	msgbox Text_1868F1, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_ErnestRematch
+	msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAC1A:: @ 81AAC1A
-	trainerbattle_rematch TRAINER_BIKER_ERNEST, Text_1C27E7, Text_1868E8
-	msgbox Text_1868F1, MSGBOX_AUTOCLOSE
+Route15_EventScript_ErnestRematch:: @ 81AAC1A
+	trainerbattle_rematch TRAINER_BIKER_ERNEST, Route15_Text_ErnestRematchIntro, Route15_Text_ErnestDefeat
+	msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAC31:: @ 81AAC31
-	trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968
+Route15_EventScript_Alex:: @ 81AAC31
+	trainerbattle_single TRAINER_BIKER_ALEX, Route15_Text_AlexIntro, Route15_Text_AlexDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAC58
-	msgbox Text_18697C, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_AlexRematch
+	msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAC58:: @ 81AAC58
-	trainerbattle_rematch TRAINER_BIKER_ALEX, Text_1C2814, Text_186968
-	msgbox Text_18697C, MSGBOX_AUTOCLOSE
+Route15_EventScript_AlexRematch:: @ 81AAC58
+	trainerbattle_rematch TRAINER_BIKER_ALEX, Route15_Text_AlexRematchIntro, Route15_Text_AlexDefeat
+	msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAC6F:: @ 81AAC6F
-	trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1
+Route15_EventScript_Grace:: @ 81AAC6F
+	trainerbattle_single TRAINER_BEAUTY_GRACE, Route15_Text_GraceIntro, Route15_Text_GraceDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAC96
-	msgbox Text_1867DA, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_GraceRematch
+	msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAC96:: @ 81AAC96
-	trainerbattle_rematch TRAINER_BEAUTY_GRACE, Text_1C2753, Text_1867C1
-	msgbox Text_1867DA, MSGBOX_AUTOCLOSE
+Route15_EventScript_GraceRematch:: @ 81AAC96
+	trainerbattle_rematch TRAINER_BEAUTY_GRACE, Route15_Text_GraceRematchIntro, Route15_Text_GraceDefeat
+	msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AACAD:: @ 81AACAD
-	trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841
+Route15_EventScript_Olivia:: @ 81AACAD
+	trainerbattle_single TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaIntro, Route15_Text_OliviaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AACD4
-	msgbox Text_18686F, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_OliviaRematch
+	msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AACD4:: @ 81AACD4
-	trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Text_1C279D, Text_186841
-	msgbox Text_18686F, MSGBOX_AUTOCLOSE
+Route15_EventScript_OliviaRematch:: @ 81AACD4
+	trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaRematchIntro, Route15_Text_OliviaDefeat
+	msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AACEB:: @ 81AACEB
-	trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A
+Route15_EventScript_Edwin:: @ 81AACEB
+	trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinIntro, Route15_Text_EdwinDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAD12
-	msgbox Text_18668D, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_EdwinRematch
+	msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAD12:: @ 81AAD12
-	trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Text_1C26D3, Text_18667A
-	msgbox Text_18668D, MSGBOX_AUTOCLOSE
+Route15_EventScript_EdwinRematch:: @ 81AAD12
+	trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinRematchIntro, Route15_Text_EdwinDefeat
+	msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAD29:: @ 81AAD29
-	trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707
+Route15_EventScript_Chester:: @ 81AAD29
+	trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterIntro, Route15_Text_ChesterDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAD50
-	msgbox Text_18671A, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_ChesterRematch
+	msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAD50:: @ 81AAD50
-	trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Text_1C2717, Text_186707
-	msgbox Text_18671A, MSGBOX_AUTOCLOSE
+Route15_EventScript_ChesterRematch:: @ 81AAD50
+	trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterRematchIntro, Route15_Text_ChesterDefeat
+	msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAD67:: @ 81AAD67
-	trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40
+Route15_EventScript_Yazmin:: @ 81AAD67
+	trainerbattle_single TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminIntro, Route15_Text_YazminDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAD8E
-	msgbox Text_186A55, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_YazminRematch
+	msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAD8E:: @ 81AAD8E
-	trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Text_1C287D, Text_186A40
-	msgbox Text_186A55, MSGBOX_AUTOCLOSE
+Route15_EventScript_YazminRematch:: @ 81AAD8E
+	trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminRematchIntro, Route15_Text_YazminDefeat
+	msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AADA5:: @ 81AADA5
-	trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549
+Route15_EventScript_Kindra:: @ 81AADA5
+	trainerbattle_single TRAINER_PICNICKER_KINDRA, Route15_Text_KindraIntro, Route15_Text_KindraDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AADCC
-	msgbox Text_18655A, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_KindraRematch
+	msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AADCC:: @ 81AADCC
-	trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Text_1C2650, Text_186549
-	msgbox Text_18655A, MSGBOX_AUTOCLOSE
+Route15_EventScript_KindraRematch:: @ 81AADCC
+	trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Route15_Text_KindraRematchIntro, Route15_Text_KindraDefeat
+	msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AADE3:: @ 81AADE3
-	trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612
+Route15_EventScript_Becky:: @ 81AADE3
+	trainerbattle_single TRAINER_PICNICKER_BECKY, Route15_Text_BeckyIntro, Route15_Text_BeckyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAE0A
-	msgbox Text_18661D, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_BeckyRematch
+	msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAE0A:: @ 81AAE0A
-	trainerbattle_rematch TRAINER_PICNICKER_BECKY, Text_1C268D, Text_186612
-	msgbox Text_18661D, MSGBOX_AUTOCLOSE
+Route15_EventScript_BeckyRematch:: @ 81AAE0A
+	trainerbattle_rematch TRAINER_PICNICKER_BECKY, Route15_Text_BeckyRematchIntro, Route15_Text_BeckyDefeat
+	msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAE21:: @ 81AAE21
-	trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6
+Route15_EventScript_Celia:: @ 81AAE21
+	trainerbattle_single TRAINER_PICNICKER_CELIA, Route15_Text_CeliaIntro, Route15_Text_CeliaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAE48
-	msgbox Text_1869F4, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_CeliaRematch
+	msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAE48:: @ 81AAE48
-	trainerbattle_rematch TRAINER_PICNICKER_CELIA, Text_1C2846, Text_1869E6
-	msgbox Text_1869F4, MSGBOX_AUTOCLOSE
+Route15_EventScript_CeliaRematch:: @ 81AAE48
+	trainerbattle_rematch TRAINER_PICNICKER_CELIA, Route15_Text_CeliaRematchIntro, Route15_Text_CeliaDefeat
+	msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAE5F:: @ 81AAE5F
-	trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46
+Route15_EventScript_Mya:: @ 81AAE5F
+	trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAE8A
-	msgbox Text_186B0A, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_MyaRematch
+	msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAE8A:: @ 81AAE8A
-	trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28A1, Text_186ACB, Text_186B46
-	msgbox Text_186B0A, MSGBOX_AUTOCLOSE
+Route15_EventScript_MyaRematch:: @ 81AAE8A
+	trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaRematchIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons
+	msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route15_EventScript_1AAEA5:: @ 81AAEA5
-	trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE
+Route15_EventScript_Ron:: @ 81AAEA5
+	trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAED0
-	msgbox Text_186BD2, MSGBOX_AUTOCLOSE
+	goto_if_eq Route15_EventScript_RonRematch
+	msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAED0:: @ 81AAED0
-	trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Text_1C28EC, Text_186BB1, Text_186BFE
-	msgbox Text_186BD2, MSGBOX_AUTOCLOSE
+Route15_EventScript_RonRematch:: @ 81AAED0
+	trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonRematchIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons
+	msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AAEEB:: @ 81AAEEB
-	trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F
+Route16_EventScript_Lao:: @ 81AAEEB
+	trainerbattle_single TRAINER_BIKER_LAO, Route16_Text_LaoIntro, Route16_Text_LaoDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAF12
-	msgbox Text_186C75, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_LaoRematch
+	msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAF12:: @ 81AAF12
-	trainerbattle_rematch TRAINER_BIKER_LAO, Text_1C2913, Text_186C5F
-	msgbox Text_186C75, MSGBOX_AUTOCLOSE
+Route16_EventScript_LaoRematch:: @ 81AAF12
+	trainerbattle_rematch TRAINER_BIKER_LAO, Route16_Text_LaoRematchIntro, Route16_Text_LaoDefeat
+	msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AAF29:: @ 81AAF29
-	trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52
+Route16_EventScript_Hideo:: @ 81AAF29
+	trainerbattle_single TRAINER_BIKER_HIDEO, Route16_Text_HideoIntro, Route16_Text_HideoDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAF50
-	msgbox Text_186D5A, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_HideoRematch
+	msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAF50:: @ 81AAF50
-	trainerbattle_rematch TRAINER_BIKER_HIDEO, Text_1C297B, Text_186D52
-	msgbox Text_186D5A, MSGBOX_AUTOCLOSE
+Route16_EventScript_HideoRematch:: @ 81AAF50
+	trainerbattle_rematch TRAINER_BIKER_HIDEO, Route16_Text_HideoRematchIntro, Route16_Text_HideoDefeat
+	msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AAF67:: @ 81AAF67
-	trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4
+Route16_EventScript_Ruben:: @ 81AAF67
+	trainerbattle_single TRAINER_BIKER_RUBEN, Route16_Text_RubenIntro, Route16_Text_RubenDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAF8E
-	msgbox Text_186EC7, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_RubenRematch
+	msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAF8E:: @ 81AAF8E
-	trainerbattle_rematch TRAINER_BIKER_RUBEN, Text_1C29EB, Text_186EB4
-	msgbox Text_186EC7, MSGBOX_AUTOCLOSE
+Route16_EventScript_RubenRematch:: @ 81AAF8E
+	trainerbattle_rematch TRAINER_BIKER_RUBEN, Route16_Text_RubenRematchIntro, Route16_Text_RubenDefeat
+	msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AAFA5:: @ 81AAFA5
-	trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB
+Route16_EventScript_Koji:: @ 81AAFA5
+	trainerbattle_single TRAINER_CUE_BALL_KOJI, Route16_Text_KojiIntro, Route16_Text_KojiDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AAFCC
-	msgbox Text_186CC5, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_KojiRematch
+	msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AAFCC:: @ 81AAFCC
-	trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Text_1C2925, Text_186CBB
-	msgbox Text_186CC5, MSGBOX_AUTOCLOSE
+Route16_EventScript_KojiRematch:: @ 81AAFCC
+	trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Route16_Text_KojiRematchIntro, Route16_Text_KojiDefeat
+	msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AAFE3:: @ 81AAFE3
-	trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06
+Route16_EventScript_Luke:: @ 81AAFE3
+	trainerbattle_single TRAINER_CUE_BALL_LUKE, Route16_Text_LukeIntro, Route16_Text_LukeDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB00A
-	msgbox Text_186D16, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_LukeRematch
+	msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB00A:: @ 81AB00A
-	trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Text_1C2944, Text_186D06
-	msgbox Text_186D16, MSGBOX_AUTOCLOSE
+Route16_EventScript_LukeRematch:: @ 81AB00A
+	trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Route16_Text_LukeRematchIntro, Route16_Text_LukeDefeat
+	msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AB021:: @ 81AB021
-	trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D
+Route16_EventScript_Camron:: @ 81AB021
+	trainerbattle_single TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronIntro, Route16_Text_CamronDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB048
-	msgbox Text_186E1C, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_CamronRematch
+	msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB048:: @ 81AB048
-	trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Text_1C29B0, Text_186E0D
-	msgbox Text_186E1C, MSGBOX_AUTOCLOSE
+Route16_EventScript_CamronRematch:: @ 81AB048
+	trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronRematchIntro, Route16_Text_CamronDefeat
+	msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AB05F:: @ 81AB05F
-	trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057
+Route16_EventScript_Jed:: @ 81AB05F
+	trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB08A
-	msgbox Text_187027, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_JedRematch
+	msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB08A:: @ 81AB08A
-	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A19, Text_186FFA, Text_187057
-	msgbox Text_187027, MSGBOX_AUTOCLOSE
+Route16_EventScript_JedRematch:: @ 81AB08A
+	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedRematchIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons
+	msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route16_EventScript_1AB0A5:: @ 81AB0A5
-	trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120
+Route16_EventScript_Lea:: @ 81AB0A5
+	trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB0D0
-	msgbox Text_1870F9, MSGBOX_AUTOCLOSE
+	goto_if_eq Route16_EventScript_LeaRematch
+	msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB0D0:: @ 81AB0D0
-	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_1C2A53, Text_1870CC, Text_187120
-	msgbox Text_1870F9, MSGBOX_AUTOCLOSE
+Route16_EventScript_LeaRematch:: @ 81AB0D0
+	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaRematchIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons
+	msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB0EB:: @ 81AB0EB
-	trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3
+Route17_EventScript_Billy:: @ 81AB0EB
+	trainerbattle_single TRAINER_BIKER_BILLY, Route17_Text_BillyIntro, Route17_Text_BillyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB112
-	msgbox Text_1872EB, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_BillyRematch
+	msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB112:: @ 81AB112
-	trainerbattle_rematch TRAINER_BIKER_BILLY, Text_1C2B06, Text_1872E3
-	msgbox Text_1872EB, MSGBOX_AUTOCLOSE
+Route17_EventScript_BillyRematch:: @ 81AB112
+	trainerbattle_rematch TRAINER_BIKER_BILLY, Route17_Text_BillyRematchIntro, Route17_Text_BillyDefeat
+	msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB129:: @ 81AB129
-	trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325
+Route17_EventScript_Nikolas:: @ 81AB129
+	trainerbattle_single TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasIntro, Route17_Text_NikolasDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB150
-	msgbox Text_187333, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_NikolasRematch
+	msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB150:: @ 81AB150
-	trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Text_1C2B2C, Text_187325
-	msgbox Text_187333, MSGBOX_AUTOCLOSE
+Route17_EventScript_NikolasRematch:: @ 81AB150
+	trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasRematchIntro, Route17_Text_NikolasDefeat
+	msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB167:: @ 81AB167
-	trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472
+Route17_EventScript_Jaxon:: @ 81AB167
+	trainerbattle_single TRAINER_BIKER_JAXON, Route17_Text_JaxonIntro, Route17_Text_JaxonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB18E
-	msgbox Text_187479, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_JaxonRematch
+	msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB18E:: @ 81AB18E
-	trainerbattle_rematch TRAINER_BIKER_JAXON, Text_1C2BE6, Text_187472
-	msgbox Text_187479, MSGBOX_AUTOCLOSE
+Route17_EventScript_JaxonRematch:: @ 81AB18E
+	trainerbattle_rematch TRAINER_BIKER_JAXON, Route17_Text_JaxonRematchIntro, Route17_Text_JaxonDefeat
+	msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB1A5:: @ 81AB1A5
-	trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6
+Route17_EventScript_William:: @ 81AB1A5
+	trainerbattle_single TRAINER_BIKER_WILLIAM, Route17_Text_WilliamIntro, Route17_Text_WilliamDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB1CC
-	msgbox Text_1874C9, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_WilliamRematch
+	msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB1CC:: @ 81AB1CC
-	trainerbattle_rematch TRAINER_BIKER_WILLIAM, Text_1C2C10, Text_1874B6
-	msgbox Text_1874C9, MSGBOX_AUTOCLOSE
+Route17_EventScript_WilliamRematch:: @ 81AB1CC
+	trainerbattle_rematch TRAINER_BIKER_WILLIAM, Route17_Text_WilliamRematchIntro, Route17_Text_WilliamDefeat
+	msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB1E3:: @ 81AB1E3
-	trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE
+Route17_EventScript_Raul:: @ 81AB1E3
+	trainerbattle_single TRAINER_CUE_BALL_RAUL, Route17_Text_RaulIntro, Route17_Text_RaulDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB20A
-	msgbox Text_1871BA, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_RaulRematch
+	msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB20A:: @ 81AB20A
-	trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Text_1C2A88, Text_1871AE
-	msgbox Text_1871BA, MSGBOX_AUTOCLOSE
+Route17_EventScript_RaulRematch:: @ 81AB20A
+	trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Route17_Text_RaulRematchIntro, Route17_Text_RaulDefeat
+	msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB221:: @ 81AB221
-	trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254
+Route17_EventScript_Isaiah:: @ 81AB221
+	trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahIntro, Route17_Text_IsaiahDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB248
-	msgbox Text_18725A, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_IsaiahRematch
+	msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB248:: @ 81AB248
-	trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Text_1C2AC4, Text_187254
-	msgbox Text_18725A, MSGBOX_AUTOCLOSE
+Route17_EventScript_IsaiahRematch:: @ 81AB248
+	trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahRematchIntro, Route17_Text_IsaiahDefeat
+	msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB25F:: @ 81AB25F
-	trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395
+Route17_EventScript_Zeek:: @ 81AB25F
+	trainerbattle_single TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekIntro, Route17_Text_ZeekDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB286
-	msgbox Text_18739F, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_ZeekRematch
+	msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB286:: @ 81AB286
-	trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Text_1C2B5E, Text_187395
-	msgbox Text_18739F, MSGBOX_AUTOCLOSE
+Route17_EventScript_ZeekRematch:: @ 81AB286
+	trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekRematchIntro, Route17_Text_ZeekDefeat
+	msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB29D:: @ 81AB29D
-	trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB
+Route17_EventScript_Jamal:: @ 81AB29D
+	trainerbattle_single TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalIntro, Route17_Text_JamalDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB2C4
-	msgbox Text_1873FF, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_JamalRematch
+	msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB2C4:: @ 81AB2C4
-	trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Text_1C2B9C, Text_1873EB
-	msgbox Text_1873FF, MSGBOX_AUTOCLOSE
+Route17_EventScript_JamalRematch:: @ 81AB2C4
+	trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalRematchIntro, Route17_Text_JamalDefeat
+	msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB2DB:: @ 81AB2DB
-	trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429
+Route17_EventScript_Corey:: @ 81AB2DB
+	trainerbattle_single TRAINER_CUE_BALL_COREY, Route17_Text_CoreyIntro, Route17_Text_CoreyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB302
-	msgbox Text_187432, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_CoreyRematch
+	msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB302:: @ 81AB302
-	trainerbattle_rematch TRAINER_CUE_BALL_COREY, Text_1C2BDA, Text_187429
-	msgbox Text_187432, MSGBOX_AUTOCLOSE
+Route17_EventScript_CoreyRematch:: @ 81AB302
+	trainerbattle_rematch TRAINER_CUE_BALL_COREY, Route17_Text_CoreyRematchIntro, Route17_Text_CoreyDefeat
+	msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route17_EventScript_1AB319:: @ 81AB319
-	trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295
+Route17_EventScript_Virgil:: @ 81AB319
+	trainerbattle_single TRAINER_BIKER_VIRGIL, Route17_Text_VirgilIntro, Route17_Text_VirgilDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB340
-	msgbox Text_1872A5, MSGBOX_AUTOCLOSE
+	goto_if_eq Route17_EventScript_VirgilRematch
+	msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB340:: @ 81AB340
-	trainerbattle_rematch TRAINER_BIKER_VIRGIL, Text_1C2AF0, Text_187295
-	msgbox Text_1872A5, MSGBOX_AUTOCLOSE
+Route17_EventScript_VirgilRematch:: @ 81AB340
+	trainerbattle_rematch TRAINER_BIKER_VIRGIL, Route17_Text_VirgilRematchIntro, Route17_Text_VirgilDefeat
+	msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route18_EventScript_1AB357:: @ 81AB357
-	trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672
+Route18_EventScript_Wilton:: @ 81AB357
+	trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonIntro, Route18_Text_WiltonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB37E
-	msgbox Text_187677, MSGBOX_AUTOCLOSE
+	goto_if_eq Route18_EventScript_WiltonRematch
+	msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB37E:: @ 81AB37E
-	trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Text_1C2C2B, Text_187672
-	msgbox Text_187677, MSGBOX_AUTOCLOSE
+Route18_EventScript_WiltonRematch:: @ 81AB37E
+	trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonRematchIntro, Route18_Text_WiltonDefeat
+	msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route18_EventScript_1AB395:: @ 81AB395
-	trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3
+Route18_EventScript_Ramiro:: @ 81AB395
+	trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroIntro, Route18_Text_RamiroDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB3BC
-	msgbox Text_1876C5, MSGBOX_AUTOCLOSE
+	goto_if_eq Route18_EventScript_RamiroRematch
+	msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB3BC:: @ 81AB3BC
-	trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Text_1C2C7B, Text_1876B3
-	msgbox Text_1876C5, MSGBOX_AUTOCLOSE
+Route18_EventScript_RamiroRematch:: @ 81AB3BC
+	trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroRematchIntro, Route18_Text_RamiroDefeat
+	msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route18_EventScript_1AB3D3:: @ 81AB3D3
-	trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726
+Route18_EventScript_Jacob:: @ 81AB3D3
+	trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobIntro, Route18_Text_JacobDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB3FA
-	msgbox Text_18772C, MSGBOX_AUTOCLOSE
+	goto_if_eq Route18_EventScript_JacobRematch
+	msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB3FA:: @ 81AB3FA
-	trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Text_1C2CA8, Text_187726
-	msgbox Text_18772C, MSGBOX_AUTOCLOSE
+Route18_EventScript_JacobRematch:: @ 81AB3FA
+	trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobRematchIntro, Route18_Text_JacobDefeat
+	msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB411:: @ 81AB411
-	trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF
+Route19_EventScript_Richard:: @ 81AB411
+	trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardIntro, Route19_Text_RichardDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB438
-	msgbox Text_1877EE, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_RichardRematch
+	msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB438:: @ 81AB438
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Text_1C2CEE, Text_1877DF
-	msgbox Text_1877EE, MSGBOX_AUTOCLOSE
+Route19_EventScript_RichardRematch:: @ 81AB438
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardRematchIntro, Route19_Text_RichardDefeat
+	msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB44F:: @ 81AB44F
-	trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E
+Route19_EventScript_Reece:: @ 81AB44F
+	trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceIntro, Route19_Text_ReeceDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB476
-	msgbox Text_187852, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_ReeceRematch
+	msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB476:: @ 81AB476
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Text_1C2D19, Text_18783E
-	msgbox Text_187852, MSGBOX_AUTOCLOSE
+Route19_EventScript_ReeceRematch:: @ 81AB476
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceRematchIntro, Route19_Text_ReeceDefeat
+	msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB48D:: @ 81AB48D
-	trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5
+Route19_EventScript_Matthew:: @ 81AB48D
+	trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewIntro, Route19_Text_MatthewDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB4B4
-	msgbox Text_1878B1, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_MatthewRematch
+	msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB4B4:: @ 81AB4B4
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Text_1C2D4B, Text_1878A5
-	msgbox Text_1878B1, MSGBOX_AUTOCLOSE
+Route19_EventScript_MatthewRematch:: @ 81AB4B4
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewRematchIntro, Route19_Text_MatthewDefeat
+	msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB4CB:: @ 81AB4CB
-	trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8
+Route19_EventScript_Douglas:: @ 81AB4CB
+	trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasIntro, Route19_Text_DouglasDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB4F2
-	msgbox Text_1878FE, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_DouglasRematch
+	msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB4F2:: @ 81AB4F2
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Text_1C2D7D, Text_1878F8
-	msgbox Text_1878FE, MSGBOX_AUTOCLOSE
+Route19_EventScript_DouglasRematch:: @ 81AB4F2
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasRematchIntro, Route19_Text_DouglasDefeat
+	msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB509:: @ 81AB509
-	trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955
+Route19_EventScript_David:: @ 81AB509
+	trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidIntro, Route19_Text_DavidDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB530
-	msgbox Text_18795B, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_DavidRematch
+	msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB530:: @ 81AB530
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Text_1C2DA7, Text_187955
-	msgbox Text_18795B, MSGBOX_AUTOCLOSE
+Route19_EventScript_DavidRematch:: @ 81AB530
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidRematchIntro, Route19_Text_DavidDefeat
+	msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB547:: @ 81AB547
-	trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3
+Route19_EventScript_Tony:: @ 81AB547
+	trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyIntro, Route19_Text_TonyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB56E
-	msgbox Text_1879D3, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_TonyRematch
+	msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB56E:: @ 81AB56E
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Text_1C2DE9, Text_1879C3
-	msgbox Text_1879D3, MSGBOX_AUTOCLOSE
+Route19_EventScript_TonyRematch:: @ 81AB56E
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyRematchIntro, Route19_Text_TonyDefeat
+	msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB585:: @ 81AB585
-	trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25
+Route19_EventScript_Axle:: @ 81AB585
+	trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleIntro, Route19_Text_AxleDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB5AC
-	msgbox Text_187B35, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_AxleRematch
+	msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB5AC:: @ 81AB5AC
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Text_1C2EC0, Text_187B25
-	msgbox Text_187B35, MSGBOX_AUTOCLOSE
+Route19_EventScript_AxleRematch:: @ 81AB5AC
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleRematchIntro, Route19_Text_AxleDefeat
+	msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB5C3:: @ 81AB5C3
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44
+Route19_EventScript_Anya:: @ 81AB5C3
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaIntro, Route19_Text_AnyaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB5EA
-	msgbox Text_187A50, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_AnyaRematch
+	msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB5EA:: @ 81AB5EA
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Text_1C2E4A, Text_187A44
-	msgbox Text_187A50, MSGBOX_AUTOCLOSE
+Route19_EventScript_AnyaRematch:: @ 81AB5EA
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaRematchIntro, Route19_Text_AnyaDefeat
+	msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB601:: @ 81AB601
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1
+Route19_EventScript_Alice:: @ 81AB601
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceIntro, Route19_Text_AliceDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB628
-	msgbox Text_187ACA, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_AliceRematch
+	msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB628:: @ 81AB628
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Text_1C2E9D, Text_187AC1
-	msgbox Text_187ACA, MSGBOX_AUTOCLOSE
+Route19_EventScript_AliceRematch:: @ 81AB628
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceRematchIntro, Route19_Text_AliceDefeat
+	msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB63F:: @ 81AB63F
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85
+Route19_EventScript_Connie:: @ 81AB63F
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieIntro, Route19_Text_ConnieDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB666
-	msgbox Text_187B94, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_ConnieRematch
+	msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB666:: @ 81AB666
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Text_1C2EFC, Text_187B85
-	msgbox Text_187B94, MSGBOX_AUTOCLOSE
+Route19_EventScript_ConnieRematch:: @ 81AB666
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieRematchIntro, Route19_Text_ConnieDefeat
+	msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB67D:: @ 81AB67D
-	trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2
+Route19_EventScript_Lia:: @ 81AB67D
+	trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB6A8
-	msgbox Text_187C9E, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_LiaRematch
+	msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB6A8:: @ 81AB6A8
-	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2F41, Text_187C6F, Text_187CF2
-	msgbox Text_187C9E, MSGBOX_AUTOCLOSE
+Route19_EventScript_LiaRematch:: @ 81AB6A8
+	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaRematchIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons
+	msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route19_EventScript_1AB6C3:: @ 81AB6C3
-	trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8
+Route19_EventScript_Luc:: @ 81AB6C3
+	trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB6EE
-	msgbox Text_187DAD, MSGBOX_AUTOCLOSE
+	goto_if_eq Route19_EventScript_LucRematch
+	msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB6EE:: @ 81AB6EE
-	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_1C2FAE, Text_187D7E, Text_187DE8
-	msgbox Text_187DAD, MSGBOX_AUTOCLOSE
+Route19_EventScript_LucRematch:: @ 81AB6EE
+	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucRematchIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons
+	msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB709:: @ 81AB709
-	trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B
+Route20_EventScript_Barry:: @ 81AB709
+	trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryIntro, Route20_Text_BarryDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB730
-	msgbox Text_187E83, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_BarryRematch
+	msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB730:: @ 81AB730
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Text_1C2FF3, Text_187E7B
-	msgbox Text_187E83, MSGBOX_AUTOCLOSE
+Route20_EventScript_BarryRematch:: @ 81AB730
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryRematchIntro, Route20_Text_BarryDefeat
+	msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB747:: @ 81AB747
-	trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7
+Route20_EventScript_Dean:: @ 81AB747
+	trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanIntro, Route20_Text_DeanDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB76E
-	msgbox Text_187FFE, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_DeanRematch
+	msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB76E:: @ 81AB76E
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Text_1C30B0, Text_187FF7
-	msgbox Text_187FFE, MSGBOX_AUTOCLOSE
+Route20_EventScript_DeanRematch:: @ 81AB76E
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanRematchIntro, Route20_Text_DeanDefeat
+	msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB785:: @ 81AB785
-	trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C
+Route20_EventScript_Darrin:: @ 81AB785
+	trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinIntro, Route20_Text_DarrinDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB7AC
-	msgbox Text_18806D, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_DarrinRematch
+	msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB7AC:: @ 81AB7AC
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Text_1C30ED, Text_18805C
-	msgbox Text_18806D, MSGBOX_AUTOCLOSE
+Route20_EventScript_DarrinRematch:: @ 81AB7AC
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinRematchIntro, Route20_Text_DarrinDefeat
+	msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB7C3:: @ 81AB7C3
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A
+Route20_EventScript_Tiffany:: @ 81AB7C3
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyIntro, Route20_Text_TiffanyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB7EA
-	msgbox Text_187F61, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_TiffanyRematch
+	msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB7EA:: @ 81AB7EA
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Text_1C305F, Text_187F5A
-	msgbox Text_187F61, MSGBOX_AUTOCLOSE
+Route20_EventScript_TiffanyRematch:: @ 81AB7EA
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyRematchIntro, Route20_Text_TiffanyDefeat
+	msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB801:: @ 81AB801
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119
+Route20_EventScript_Nora:: @ 81AB801
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraIntro, Route20_Text_NoraDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB828
-	msgbox Text_188139, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_NoraRematch
+	msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB828:: @ 81AB828
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Text_1C3149, Text_188119
-	msgbox Text_188139, MSGBOX_AUTOCLOSE
+Route20_EventScript_NoraRematch:: @ 81AB828
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraRematchIntro, Route20_Text_NoraDefeat
+	msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB83F:: @ 81AB83F
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C
+Route20_EventScript_Melissa:: @ 81AB83F
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaIntro, Route20_Text_MelissaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB866
-	msgbox Text_18827B, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_MelissaRematch
+	msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB866:: @ 81AB866
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Text_1C31C4, Text_18825C
-	msgbox Text_18827B, MSGBOX_AUTOCLOSE
+Route20_EventScript_MelissaRematch:: @ 81AB866
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaRematchIntro, Route20_Text_MelissaDefeat
+	msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB87D:: @ 81AB87D
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED
+Route20_EventScript_Shirley:: @ 81AB87D
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyIntro, Route20_Text_ShirleyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB8A4
-	msgbox Text_187EF6, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_ShirleyRematch
+	msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB8A4:: @ 81AB8A4
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_1C302E, Text_187EED
-	msgbox Text_187EF6, MSGBOX_AUTOCLOSE
+Route20_EventScript_ShirleyRematch:: @ 81AB8A4
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyRematchIntro, Route20_Text_ShirleyDefeat
+	msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB8BB:: @ 81AB8BB
-	trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB
+Route20_EventScript_Roger:: @ 81AB8BB
+	trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerIntro, Route20_Text_RogerDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB8E2
-	msgbox Text_1880C8, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_RogerRematch
+	msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB8E2:: @ 81AB8E2
-	trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Text_1C312C, Text_1880AB
-	msgbox Text_1880C8, MSGBOX_AUTOCLOSE
+Route20_EventScript_RogerRematch:: @ 81AB8E2
+	trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerRematchIntro, Route20_Text_RogerDefeat
+	msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB8F9:: @ 81AB8F9
-	trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3
+Route20_EventScript_Missy:: @ 81AB8F9
+	trainerbattle_single TRAINER_PICNICKER_MISSY, Route20_Text_MissyIntro, Route20_Text_MissyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB920
-	msgbox Text_1881B8, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_MissyRematch
+	msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB920:: @ 81AB920
-	trainerbattle_rematch TRAINER_PICNICKER_MISSY, Text_1C3185, Text_1881A3
-	msgbox Text_1881B8, MSGBOX_AUTOCLOSE
+Route20_EventScript_MissyRematch:: @ 81AB920
+	trainerbattle_rematch TRAINER_PICNICKER_MISSY, Route20_Text_MissyRematchIntro, Route20_Text_MissyDefeat
+	msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route20_EventScript_1AB937:: @ 81AB937
-	trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92
+Route20_EventScript_Irene:: @ 81AB937
+	trainerbattle_single TRAINER_PICNICKER_IRENE, Route20_Text_IreneIntro, Route20_Text_IreneDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB95E
-	msgbox Text_187FA3, MSGBOX_AUTOCLOSE
+	goto_if_eq Route20_EventScript_IreneRematch
+	msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB95E:: @ 81AB95E
-	trainerbattle_rematch TRAINER_PICNICKER_IRENE, Text_1C3095, Text_187F92
-	msgbox Text_187FA3, MSGBOX_AUTOCLOSE
+Route20_EventScript_IreneRematch:: @ 81AB95E
+	trainerbattle_rematch TRAINER_PICNICKER_IRENE, Route20_Text_IreneRematchIntro, Route20_Text_IreneDefeat
+	msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_North_EventScript_1AB975:: @ 81AB975
-	trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383
+Route21_North_EventScript_Ronald:: @ 81AB975
+	trainerbattle_single TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldIntro, Route21_North_Text_RonaldDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB99C
-	msgbox Text_188389, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_North_EventScript_RonaldRematch
+	msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB99C:: @ 81AB99C
-	trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Text_1C3208, Text_188383
-	msgbox Text_188389, MSGBOX_AUTOCLOSE
+Route21_North_EventScript_RonaldRematch:: @ 81AB99C
+	trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldRematchIntro, Route21_North_Text_RonaldDefeat
+	msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_South_EventScript_1AB9B3:: @ 81AB9B3
-	trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8
+Route21_South_EventScript_Claude:: @ 81AB9B3
+	trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeIntro, Route21_South_Text_ClaudeDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AB9DA
-	msgbox Text_188632, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_South_EventScript_ClaudeRematch
+	msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AB9DA:: @ 81AB9DA
-	trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Text_1C331D, Text_1885F8
-	msgbox Text_188632, MSGBOX_AUTOCLOSE
+Route21_South_EventScript_ClaudeRematch:: @ 81AB9DA
+	trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeRematchIntro, Route21_South_Text_ClaudeDefeat
+	msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_North_EventScript_1AB9F1:: @ 81AB9F1
-	trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9
+Route21_North_EventScript_Wade:: @ 81AB9F1
+	trainerbattle_single TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeIntro, Route21_North_Text_WadeDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABA18
-	msgbox Text_18841D, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_North_EventScript_WadeRematch
+	msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABA18:: @ 81ABA18
-	trainerbattle_rematch TRAINER_FISHERMAN_WADE, Text_1C3231, Text_1883E9
-	msgbox Text_18841D, MSGBOX_AUTOCLOSE
+Route21_North_EventScript_WadeRematch:: @ 81ABA18
+	trainerbattle_rematch TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeRematchIntro, Route21_North_Text_WadeDefeat
+	msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_South_EventScript_1ABA2F:: @ 81ABA2F
-	trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE
+Route21_South_EventScript_Nolan:: @ 81ABA2F
+	trainerbattle_single TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanIntro, Route21_South_Text_NolanDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABA56
-	msgbox Text_1886C5, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_South_EventScript_NolanRematch
+	msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABA56:: @ 81ABA56
-	trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Text_1C3356, Text_1886AE
-	msgbox Text_1886C5, MSGBOX_AUTOCLOSE
+Route21_South_EventScript_NolanRematch:: @ 81ABA56
+	trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanRematchIntro, Route21_South_Text_NolanDefeat
+	msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_North_EventScript_1ABA6D:: @ 81ABA6D
-	trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F
+Route21_North_EventScript_Spencer:: @ 81ABA6D
+	trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerIntro, Route21_North_Text_SpencerDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABA94
-	msgbox Text_188465, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_North_EventScript_SpencerRematch
+	msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABA94:: @ 81ABA94
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Text_1C3264, Text_18845F
-	msgbox Text_188465, MSGBOX_AUTOCLOSE
+Route21_North_EventScript_SpencerRematch:: @ 81ABA94
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerRematchIntro, Route21_North_Text_SpencerDefeat
+	msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_South_EventScript_1ABAAB:: @ 81ABAAB
-	trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0
+Route21_South_EventScript_Jack:: @ 81ABAAB
+	trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackIntro, Route21_South_Text_JackDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABAD2
-	msgbox Text_1884FF, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_South_EventScript_JackRematch
+	msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABAD2:: @ 81ABAD2
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Text_1C3298, Text_1884F0
-	msgbox Text_1884FF, MSGBOX_AUTOCLOSE
+Route21_South_EventScript_JackRematch:: @ 81ABAD2
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackRematchIntro, Route21_South_Text_JackDefeat
+	msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_South_EventScript_1ABAE9:: @ 81ABAE9
-	trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543
+Route21_South_EventScript_Jerome:: @ 81ABAE9
+	trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeIntro, Route21_South_Text_JeromeDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABB10
-	msgbox Text_188555, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_South_EventScript_JeromeRematch
+	msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABB10:: @ 81ABB10
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Text_1C32D3, Text_188543
-	msgbox Text_188555, MSGBOX_AUTOCLOSE
+Route21_South_EventScript_JeromeRematch:: @ 81ABB10
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeRematchIntro, Route21_South_Text_JeromeDefeat
+	msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_South_EventScript_1ABB27:: @ 81ABB27
-	trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2
+Route21_South_EventScript_Roland:: @ 81ABB27
+	trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandIntro, Route21_South_Text_RolandDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABB4E
-	msgbox Text_1885BF, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_South_EventScript_RolandRematch
+	msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABB4E:: @ 81ABB4E
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Text_1C32FD, Text_1885B2
-	msgbox Text_1885BF, MSGBOX_AUTOCLOSE
+Route21_South_EventScript_RolandRematch:: @ 81ABB4E
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandRematchIntro, Route21_South_Text_RolandDefeat
+	msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_North_EventScript_1ABB65:: @ 81ABB65
-	trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E
+Route21_North_EventScript_Lil:: @ 81ABB65
+	trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABB90
-	msgbox Text_188734, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_North_EventScript_LilRematch
+	msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABB90:: @ 81ABB90
-	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C3378, Text_188712, Text_18875E
-	msgbox Text_188734, MSGBOX_AUTOCLOSE
+Route21_North_EventScript_LilRematch:: @ 81ABB90
+	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilRematchIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons
+	msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route21_North_EventScript_1ABBAB:: @ 81ABBAB
-	trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850
+Route21_North_EventScript_Ian:: @ 81ABBAB
+	trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ABBD6
-	msgbox Text_188812, MSGBOX_AUTOCLOSE
+	goto_if_eq Route21_North_EventScript_IanRematch
+	msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ABBD6:: @ 81ABBD6
-	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1C33AE, Text_1887F1, Text_188850
-	msgbox Text_188812, MSGBOX_AUTOCLOSE
+Route21_North_EventScript_IanRematch:: @ 81ABBD6
+	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanRematchIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons
+	msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1
diff --git a/data/smokescreen.s b/data/smokescreen.s
index 49b13847b..e30e23b0d 100644
--- a/data/smokescreen.s
+++ b/data/smokescreen.s
@@ -4,10 +4,10 @@
 	.align 2
 
 gSmokescreenImpactSpriteSheet:: @ 825098C
-	obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019
+	obj_tiles gSmokescreenImpactTiles, 0x0180, 55019
 
 gSmokescreenImpactSpritePalette:: @ 8250994
-	obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019
+	obj_pal gSmokescreenImpactPalette, 55019
 
 gOamData_835099C::
 	.4byte 0x40000000, 0x00000400
diff --git a/data/specials.inc b/data/specials.inc
index 4ed38160d..19ea756a7 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -445,9 +445,9 @@ gSpecials:: @ 815FD60
 	def_special Special_BrailleCursorToggle
 	def_special Script_ResetUnionRoomTrade
 	def_special Special_PlayerPartyContainsSpeciesWithPlayerID
-	def_special sub_809C4A8
+	def_special AnimateTeleporterHousing
 	def_special IsDodrioInParty
-	def_special sub_809C5FC
+	def_special AnimateTeleporterCable
 	def_special Special_InitElevatorFloorSelectMenuPos
 	def_special Special_ComputeLoreleiDollCollection
 	def_special Special_LoopWingFlapSound
diff --git a/data/strings.s b/data/strings.s
index f595170ff..1d56d6be7 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3289,46 +3289,46 @@ gString_Help:: @ 841CB49
 gString_HelpSystem_ClearTo8:: @ 841CB4E
 	.string "{CLEAR_TO 8}$"
 
-gUnknown_841CB52:: @ 841CB52
+gText_SpacePoints2:: @ 841CB52
 	.string " points$"
 
-gUnknown_841CB5A:: @ 841CB5A
+gText_SpaceTimes3:: @ 841CB5A
 	.string " time(s)$"
 
-gUnknown_841CB63:: @ 841CB63
+gText_PkmnJumpRecords:: @ 841CB63
 	.string "POKéMON JUMP RECORDS$"
 
-gUnknown_841CB78::
+gText_JumpsInARow::
 	.string "Jumps in a row:$"
 
-gUnknown_841CB88::
+gText_BestScore2::
 	.string "Best score:$"
 
-gUnknown_841CB94::
+gText_ExcellentsInARow::
 	.string "EXCELLENTS in a row:$"
 
-gUnknown_841CBA9:: @ 841CBA9
+gText_AwesomeWonF701F700:: @ 841CBA9
 	.string "Awesome score! You've\n"
 	.string "won {DYNAMIC 01} {DYNAMIC 00}!$"
 
-gUnknown_841CBCA:: @ 841CBCA
+gText_FilledStorageSpace2:: @ 841CBCA
 	.string "There's no room left now.$"
 
-gUnknown_841CBE4:: @ 841CBE4
+gText_CantHoldMore:: @ 841CBE4
 	.string "You can't hold any more!$"
 
-gUnknown_841CBFD:: @ 841CBFD
+gText_WantToPlayAgain2:: @ 841CBFD
 	.string "Want to play again?$"
 
-gUnknown_841CC11:: @ 841CC11
+gText_SomeoneDroppedOut2:: @ 841CC11
 	.string "Somebody dropped out.\n"
 	.string "The link will be canceled.$"
 
-gUnknown_841CC42:: @ 841CC42
+gText_SavingDontTurnOffPower:: @ 841CC42
 	.string "SAVING…\n"
 	.string "DON'T TURN OFF THE POWER.$"
 
-gUnknown_841CC64:: @ 841CC64
+gText_CommunicationStandby4:: @ 841CC64
 	.string "Communication standby…$"
 
 	.string "SAVING...\n"
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index 1d3d373af..6c13146c8 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -367,339 +367,339 @@ Route14_Text_JanRematchIntro:: @ 81C261B
 	.string "JAN: KIRI, here we go!\n"
 	.string "Let's win for sure this time!$"
 
-Text_1C2650:: @ 81C2650
+Route15_Text_KindraRematchIntro:: @ 81C2650
 	.string "I'm going to keep battling with the\n"
 	.string "POKéMON I got in trades.$"
 
-Text_1C268D:: @ 81C268D
+Route15_Text_BeckyRematchIntro:: @ 81C268D
 	.string "You look gentle, so I think I can\n"
 	.string "beat you.\p"
 	.string "I'll give it one more go!$"
 
-Text_1C26D3:: @ 81C26D3
+Route15_Text_EdwinRematchIntro:: @ 81C26D3
 	.string "When I whistle, bird POKéMON\n"
 	.string "gather around.\p"
 	.string "They're amazingly cute!$"
 
-Text_1C2717:: @ 81C2717
+Route15_Text_ChesterRematchIntro:: @ 81C2717
 	.string "Hmm? My birds are shivering!\n"
 	.string "Wait, aren't you that TRAINER…$"
 
-Text_1C2753:: @ 81C2753
+Route15_Text_GraceRematchIntro:: @ 81C2753
 	.string "Oh, you're a little cutie!\n"
 	.string "So like a darling POKéMON!\l"
 	.string "I remember you now!$"
 
-Text_1C279D:: @ 81C279D
+Route15_Text_OliviaRematchIntro:: @ 81C279D
 	.string "I raise POKéMON for protection\n"
 	.string "because I live alone.\p"
 	.string "That hasn't changed.$"
 
-Text_1C27E7:: @ 81C27E7
+Route15_Text_ErnestRematchIntro:: @ 81C27E7
 	.string "Hey, kid! C'mon!\n"
 	.string "I got these off some loser!$"
 
-Text_1C2814:: @ 81C2814
+Route15_Text_AlexRematchIntro:: @ 81C2814
 	.string "Fork over all your cash when you\n"
 	.string "lose to me, kid!$"
 
-Text_1C2846:: @ 81C2846
+Route15_Text_CeliaRematchIntro:: @ 81C2846
 	.string "What's cool and happening?\n"
 	.string "Trading POKéMON, of course.$"
 
-Text_1C287D:: @ 81C287D
+Route15_Text_YazminRematchIntro:: @ 81C287D
 	.string "Want to play with my POKéMON\n"
 	.string "again?$"
 
-Text_1C28A1:: @ 81C28A1
+Route15_Text_MyaRematchIntro:: @ 81C28A1
 	.string "MYA: Hi, we keep meeting,\n"
 	.string "don't we?\p"
 	.string "Help me train my little brother\n"
 	.string "again?$"
 
-Text_1C28EC:: @ 81C28EC
+Route15_Text_RonRematchIntro:: @ 81C28EC
 	.string "RON: My sister's gotten more\n"
 	.string "powerful…$"
 
-Text_1C2913:: @ 81C2913
+Route16_Text_LaoRematchIntro:: @ 81C2913
 	.string "What do you want?$"
 
-Text_1C2925:: @ 81C2925
+Route16_Text_KojiRematchIntro:: @ 81C2925
 	.string "Nice BIKE!\n"
 	.string "Hand it over quick!$"
 
-Text_1C2944:: @ 81C2944
+Route16_Text_LukeRematchIntro:: @ 81C2944
 	.string "Come out and play, little mouse.\n"
 	.string "I'll treat you right!$"
 
-Text_1C297B:: @ 81C297B
+Route16_Text_HideoRematchIntro:: @ 81C297B
 	.string "Hey, wait a second!\n"
 	.string "Don't call me and then run away!$"
 
-Text_1C29B0:: @ 81C29B0
+Route16_Text_CamronRematchIntro:: @ 81C29B0
 	.string "I'm feeling hungry and mean!\n"
 	.string "I really need a punching bag!$"
 
-Text_1C29EB:: @ 81C29EB
+Route16_Text_RubenRematchIntro:: @ 81C29EB
 	.string "Hey, there!\n"
 	.string "We'll have ourselves a good time!$"
 
-Text_1C2A19:: @ 81C2A19
+Route16_Text_JedRematchIntro:: @ 81C2A19
 	.string "JED: Are you here to see our\n"
 	.string "love, which knows no bounds?$"
 
-Text_1C2A53:: @ 81C2A53
+Route16_Text_LeaRematchIntro:: @ 81C2A53
 	.string "LEA: Sometimes, the intensity of\n"
 	.string "our love scares me.$"
 
-Text_1C2A88:: @ 81C2A88
+Route17_Text_RaulRematchIntro:: @ 81C2A88
 	.string "I told you, there's no getting rich\n"
 	.string "quick in battling kids.$"
 
-Text_1C2AC4:: @ 81C2AC4
+Route17_Text_IsaiahRematchIntro:: @ 81C2AC4
 	.string "I'm mighty proud of my bod, kiddo.\n"
 	.string "Come on!$"
 
-Text_1C2AF0:: @ 81C2AF0
+Route17_Text_VirgilRematchIntro:: @ 81C2AF0
 	.string "You out for a stroll?$"
 
-Text_1C2B06:: @ 81C2B06
+Route17_Text_BillyRematchIntro:: @ 81C2B06
 	.string "We're BIKERS!\n"
 	.string "We rule the roads, man!$"
 
-Text_1C2B2C:: @ 81C2B2C
+Route17_Text_NikolasRematchIntro:: @ 81C2B2C
 	.string "VOLTORB's going to seriously\n"
 	.string "electrify you today!$"
 
-Text_1C2B5E:: @ 81C2B5E
+Route17_Text_ZeekRematchIntro:: @ 81C2B5E
 	.string "I leveled up my POKéMON, but it\n"
 	.string "absolutely won't evolve. Why?$"
 
-Text_1C2B9C:: @ 81C2B9C
+Route17_Text_JamalRematchIntro:: @ 81C2B9C
 	.string "Gaah! I really need to exercise\n"
 	.string "and seriously trim some flab!$"
 
-Text_1C2BDA:: @ 81C2BDA
+Route17_Text_CoreyRematchIntro:: @ 81C2BDA
 	.string "Be a rebel!$"
 
-Text_1C2BE6:: @ 81C2BE6
+Route17_Text_JaxonRematchIntro:: @ 81C2BE6
 	.string "Yep, that's a nice BIKE!\n"
 	.string "How's it handle?$"
 
-Text_1C2C10:: @ 81C2C10
+Route17_Text_WilliamRematchIntro:: @ 81C2C10
 	.string "Get lost, kid!\n"
 	.string "I'm bushed!$"
 
-Text_1C2C2B:: @ 81C2C2B
+Route18_Text_WiltonRematchIntro:: @ 81C2C2B
 	.string "I've been checking every grassy\n"
 	.string "area for new POKéMON.\p"
 	.string "But it's not always easy…$"
 
-Text_1C2C7B:: @ 81C2C7B
+Route18_Text_RamiroRematchIntro:: @ 81C2C7B
 	.string "Koorukukukoo!\n"
 	.string "Is my birdcall getting better?$"
 
-Text_1C2CA8:: @ 81C2CA8
+Route18_Text_JacobRematchIntro:: @ 81C2CA8
 	.string "I warned you before, this is my\n"
 	.string "turf!\p"
 	.string "I don't want you coming around.$"
 
-Text_1C2CEE:: @ 81C2CEE
+Route19_Text_RichardRematchIntro:: @ 81C2CEE
 	.string "I'm almost warmed up to go\n"
 	.string "out for a swim.$"
 
-Text_1C2D19:: @ 81C2D19
+Route19_Text_ReeceRematchIntro:: @ 81C2D19
 	.string "Wait! Slow down!\n"
 	.string "What if you have a heart attack?$"
 
-Text_1C2D4B:: @ 81C2D4B
+Route19_Text_MatthewRematchIntro:: @ 81C2D4B
 	.string "I love swimming!\n"
 	.string "I guess you're the surfing type.$"
 
-Text_1C2D7D:: @ 81C2D7D
+Route19_Text_DouglasRematchIntro:: @ 81C2D7D
 	.string "What's beyond the horizon?\n"
 	.string "Have you seen?$"
 
-Text_1C2DA7:: @ 81C2DA7
+Route19_Text_DavidRematchIntro:: @ 81C2DA7
 	.string "I tried diving for POKéMON again,\n"
 	.string "but it was a no-go like before.$"
 
-Text_1C2DE9:: @ 81C2DE9
+Route19_Text_TonyRematchIntro:: @ 81C2DE9
 	.string "I look at the sea to forget all\n"
 	.string "the bad things that happened.\p"
 	.string "…Like losing to you the last time!$"
 
-Text_1C2E4A:: @ 81C2E4A
+Route19_Text_AnyaRematchIntro:: @ 81C2E4A
 	.string "You always get to ride your\n"
 	.string "POKéMON…\p"
 	.string "It looks so relaxing.\n"
 	.string "Can I have it if I win?$"
 
-Text_1C2E9D:: @ 81C2E9D
+Route19_Text_AliceRematchIntro:: @ 81C2E9D
 	.string "Swimming's great!\n"
 	.string "Sunburns aren't!$"
 
-Text_1C2EC0:: @ 81C2EC0
+Route19_Text_AxleRematchIntro:: @ 81C2EC0
 	.string "These waters are treacherous!\n"
 	.string "You shouldn't come back here!$"
 
-Text_1C2EFC:: @ 81C2EFC
+Route19_Text_ConnieRematchIntro:: @ 81C2EFC
 	.string "I swam here with my friends…\n"
 	.string "I'm tired…\l"
 	.string "Must we really battle again?$"
 
-Text_1C2F41:: @ 81C2F41
+Route19_Text_LiaRematchIntro:: @ 81C2F41
 	.string "LIA: You know my brother just\n"
 	.string "became a TRAINER, right?\p"
 	.string "I want to make him better, so I\n"
 	.string "need your help again.$"
 
-Text_1C2FAE:: @ 81C2FAE
+Route19_Text_LucRematchIntro:: @ 81C2FAE
 	.string "LUC: My big sis taught me all\n"
 	.string "about POKéMON.\p"
 	.string "I wonder if I'm better?$"
 
-Text_1C2FF3:: @ 81C2FF3
+Route20_Text_BarryRematchIntro:: @ 81C2FF3
 	.string "The water is shallow here.\n"
 	.string "There are many people swimming.$"
 
-Text_1C302E:: @ 81C302E
+Route20_Text_ShirleyRematchIntro:: @ 81C302E
 	.string "Are you jealous that I'm\n"
 	.string "vacationing on SEAFOAM?$"
 
-Text_1C305F:: @ 81C305F
+Route20_Text_TiffanyRematchIntro:: @ 81C305F
 	.string "I love floating with the fishes\n"
 	.string "here among the waves.$"
 
-Text_1C3095:: @ 81C3095
+Route20_Text_IreneRematchIntro:: @ 81C3095
 	.string "Were you on vacation, too?$"
 
-Text_1C30B0:: @ 81C30B0
+Route20_Text_DeanRematchIntro:: @ 81C30B0
 	.string "Check out my physique!\p"
 	.string "It's even more buff than ever\n"
 	.string "before!$"
 
-Text_1C30ED:: @ 81C30ED
+Route20_Text_DarrinRematchIntro:: @ 81C30ED
 	.string "Why are you riding a POKéMON?\n"
 	.string "Haven't you learned to swim yet?$"
 
-Text_1C312C:: @ 81C312C
+Route20_Text_RogerRematchIntro:: @ 81C312C
 	.string "I rode my bird POKéMON here.$"
 
-Text_1C3149:: @ 81C3149
+Route20_Text_NoraRematchIntro:: @ 81C3149
 	.string "My boyfriend gave me big pearls.\n"
 	.string "And, they've grown bigger!$"
 
-Text_1C3185:: @ 81C3185
+Route20_Text_MissyRematchIntro:: @ 81C3185
 	.string "I swam here from CINNABAR ISLAND.\n"
 	.string "It wasn't easy, like I said.$"
 
-Text_1C31C4:: @ 81C31C4
+Route20_Text_MelissaRematchIntro:: @ 81C31C4
 	.string "CINNABAR, in the west, has a LAB\n"
 	.string "for POKéMON.\p"
 	.string "My daddy works there.$"
 
-Text_1C3208:: @ 81C3208
+Route21_North_Text_RonaldRematchIntro:: @ 81C3208
 	.string "You want to know if the fish are\n"
 	.string "biting?$"
 
-Text_1C3231:: @ 81C3231
+Route21_North_Text_WadeRematchIntro:: @ 81C3231
 	.string "I got a big haul again!\n"
 	.string "Wanna go for it once more?$"
 
-Text_1C3264:: @ 81C3264
+Route21_North_Text_SpencerRematchIntro:: @ 81C3264
 	.string "The sea cleanses my body and soul!$"
 
 Text_1C3287:: @ 81C3287
 	.string "きょうも　およぎに\n"
 	.string "きちまったぜ$"
 
-Text_1C3298:: @ 81C3298
+Route21_South_Text_JackRematchIntro:: @ 81C3298
 	.string "I caught my POKéMON at sea.\n"
 	.string "And that's where I train them.$"
 
-Text_1C32D3:: @ 81C32D3
+Route21_South_Text_JeromeRematchIntro:: @ 81C32D3
 	.string "Right now, I'm in another triathlon\n"
 	.string "meet!$"
 
-Text_1C32FD:: @ 81C32FD
+Route21_South_Text_RolandRematchIntro:: @ 81C32FD
 	.string "Ahh!\n"
 	.string "Feel the sun and the wind!$"
 
-Text_1C331D:: @ 81C331D
+Route21_South_Text_ClaudeRematchIntro:: @ 81C331D
 	.string "Hey, cut it out already.\n"
 	.string "You always scare away the fish!$"
 
-Text_1C3356:: @ 81C3356
+Route21_South_Text_NolanRematchIntro:: @ 81C3356
 	.string "Keep me company till I get a hit.$"
 
-Text_1C3378:: @ 81C3378
+Route21_North_Text_LilRematchIntro:: @ 81C3378
 	.string "LIL: Huh? A battle again?\n"
 	.string "IAN, can't you do it alone?$"
 
-Text_1C33AE:: @ 81C33AE
+Route21_North_Text_IanRematchIntro:: @ 81C33AE
 	.string "IAN: My sis is still a slob.\n"
 	.string "Help me get her into shape!$"
 
-Text_1C33E7:: @ 81C33E7
+Route25_Text_JoeyRematchIntro:: @ 81C33E7
 	.string "I won't lose while I'm here!$"
 
-Text_1C3404:: @ 81C3404
+Route25_Text_DanRematchIntro:: @ 81C3404
 	.string "Dad took me to a great party on\n"
 	.string "the S.S. ANNE at VERMILION CITY.$"
 
-Text_1C3445:: @ 81C3445
+Route25_Text_FlintRematchIntro:: @ 81C3445
 	.string "I'm a cool guy.\n"
 	.string "I've got a girlfriend!\p"
 	.string "I'll show her how cool I am for\n"
 	.string "sure this time!$"
 
-Text_1C349C:: @ 81C349C
+Route25_Text_KelseyRematchIntro:: @ 81C349C
 	.string "Hi!\n"
 	.string "My boyfriend is cool!\l"
 	.string "My conditioning's good today!$"
 
-Text_1C34D4:: @ 81C34D4
+Route25_Text_ChadRematchIntro:: @ 81C34D4
 	.string "I had this feeling…\n"
 	.string "I knew I had to battle you again!$"
 
-Text_1C350A:: @ 81C350A
+Route25_Text_HaleyRematchIntro:: @ 81C350A
 	.string "My friend has many cute POKéMON.\n"
 	.string "I'm so jealous!$"
 
-Text_1C353B:: @ 81C353B
+Route25_Text_FranklinRematchIntro:: @ 81C353B
 	.string "I just trained up on MT. MOON,\n"
 	.string "but I've still got gas in the tank!$"
 
-Text_1C357E:: @ 81C357E
+Route25_Text_NobRematchIntro:: @ 81C357E
 	.string "A POKéMANIAC lives on the cape.\n"
 	.string "Have you seen his collection?$"
 
-Text_1C35BC:: @ 81C35BC
+Route25_Text_WayneRematchIntro:: @ 81C35BC
 	.string "You're going to see BILL again?\n"
 	.string "First, we battle!$"
 
-Text_1C35EE:: @ 81C35EE
+Route24_Text_ShaneRematchIntro:: @ 81C35EE
 	.string "I saw your feat from the grass!$"
 
-Text_1C360E:: @ 81C360E
+Route24_Text_EthanRematchIntro:: @ 81C360E
 	.string "Okay!\n"
 	.string "I'll stomp you!$"
 
-Text_1C3624:: @ 81C3624
+Route24_Text_ReliRematchIntro:: @ 81C3624
 	.string "You always look so busy…\n"
 	.string "Aren't you getting tired?$"
 
-Text_1C3657:: @ 81C3657
+Route24_Text_TimmyRematchIntro:: @ 81C3657
 	.string "You really must love coming to\n"
 	.string "NUGGET BRIDGE.$"
 
-Text_1C3685:: @ 81C3685
+Route24_Text_AliRematchIntro:: @ 81C3685
 	.string "The time we battled…\p"
 	.string "Even though I was the second in\n"
 	.string "line, I was the best, wasn't I?$"
 
-Text_1C36DA:: @ 81C36DA
+Route24_Text_CaleRematchIntro:: @ 81C36DA
 	.string "People call this the NUGGET\n"
 	.string "BRIDGE!\p"
 	.string "You've already beaten us, so you're\n"
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index 6fc9a48f6..46ccee45b 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -4,16 +4,16 @@ gTilesetTiles_PalletTown:: @ 826D37C
 
 	.align 2
 gTilesetPalettes_PalletTown:: @ 826D7C0
-	.incbin "data/tilesets/secondary/pallet_town/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pallet_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pallet_town/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pallet_town/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pallet_town/palettes/12.gbapal"
@@ -27,16 +27,16 @@ gTilesetTiles_ViridianCity:: @ 826D9C0
 
 	.align 2
 gTilesetPalettes_ViridianCity:: @ 826DFC0
-	.incbin "data/tilesets/secondary/viridian_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/viridian_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/viridian_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/viridian_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/viridian_city/palettes/12.gbapal"
@@ -50,16 +50,16 @@ gTilesetTiles_PewterCity:: @ 826E1C0
 
 	.align 2
 gTilesetPalettes_PewterCity:: @ 826EAB8
-	.incbin "data/tilesets/secondary/pewter_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pewter_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pewter_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pewter_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pewter_city/palettes/12.gbapal"
@@ -73,16 +73,16 @@ gTilesetTiles_CeruleanCity:: @ 826ECB8
 
 	.align 2
 gTilesetPalettes_CeruleanCity:: @ 826F4B8
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_city/palettes/12.gbapal"
@@ -96,16 +96,16 @@ gTilesetTiles_LavenderTown:: @ 826F6B8
 
 	.align 2
 gTilesetPalettes_LavenderTown:: @ 8270438
-	.incbin "data/tilesets/secondary/lavender_town/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/lavender_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/lavender_town/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/lavender_town/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/lavender_town/palettes/12.gbapal"
@@ -119,16 +119,16 @@ gTilesetTiles_VermilionCity:: @ 8270638
 
 	.align 2
 gTilesetPalettes_VermilionCity:: @ 8270DA0
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/vermilion_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/vermilion_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/vermilion_city/palettes/12.gbapal"
@@ -142,16 +142,16 @@ gTilesetTiles_CeladonCity:: @ 8270FA0
 
 	.align 2
 gTilesetPalettes_CeladonCity:: @ 8271C74
-	.incbin "data/tilesets/secondary/celadon_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/celadon_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/celadon_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/celadon_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/celadon_city/palettes/12.gbapal"
@@ -165,16 +165,16 @@ gTilesetTiles_FuchsiaCity:: @ 8271E74
 
 	.align 2
 gTilesetPalettes_FuchsiaCity:: @ 8272A5C
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/fuchsia_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/fuchsia_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/fuchsia_city/palettes/12.gbapal"
@@ -188,16 +188,16 @@ gTilesetTiles_CinnabarIsland:: @ 8272C5C
 
 	.align 2
 gTilesetPalettes_CinnabarIsland:: @ 8273358
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_island/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cinnabar_island/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cinnabar_island/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cinnabar_island/palettes/12.gbapal"
@@ -211,16 +211,16 @@ gTilesetTiles_IndigoPlateau:: @ 8273558
 
 	.align 2
 gTilesetPalettes_IndigoPlateau:: @ 82742D0
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/indigo_plateau/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/indigo_plateau/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/indigo_plateau/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/indigo_plateau/palettes/12.gbapal"
@@ -234,16 +234,16 @@ gTilesetTiles_SaffronCity:: @ 82744D0
 
 	.align 2
 gTilesetPalettes_SaffronCity:: @ 8275094
-	.incbin "data/tilesets/secondary/saffron_city/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/saffron_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/saffron_city/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/saffron_city/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/saffron_city/palettes/12.gbapal"
@@ -257,16 +257,16 @@ gTilesetTiles_Building:: @ Building
 
 	.align 2
 gTilesetPalettes_Building:: @ Building
-	.incbin "data/tilesets/primary/building/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/building/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/00.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/01.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/02.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/03.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/04.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/05.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/06.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/07.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/08.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/09.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/10.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/11.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/12.gbapal"
@@ -280,16 +280,16 @@ gTilesetTiles_Mart:: @ 8277894
 
 	.align 2
 gTilesetPalettes_Mart:: @ 8277A5C
-	.incbin "data/tilesets/secondary/mart/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/mart/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/mart/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/mart/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/mart/palettes/12.gbapal"
@@ -303,16 +303,16 @@ gTilesetTiles_PokemonCenter:: @ 8277C5C
 
 	.align 2
 gTilesetPalettes_PokemonCenter:: @ 8278CC4
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_center/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal"
@@ -326,16 +326,16 @@ gTilesetTiles_Cave:: @ 8278EC4
 
 	.align 2
 gTilesetPalettes_Cave:: @ 827A1A8
-	.incbin "data/tilesets/secondary/cave/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/12.gbapal"
@@ -349,16 +349,16 @@ gTilesetTiles_Dummy1:: @ 827A3A8
 
 	.align 2
 gTilesetPalettes_Dummy1:: @ 827A3B8
-	.incbin "data/tilesets/secondary/dummy1/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/dummy1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal"
@@ -372,16 +372,16 @@ gTilesetTiles_Museum:: @ 827A5B8
 
 	.align 2
 gTilesetPalettes_Museum:: @ 827AE14
-	.incbin "data/tilesets/secondary/museum/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/museum/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/museum/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/museum/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/museum/palettes/12.gbapal"
@@ -395,16 +395,16 @@ gTilesetTiles_CableClub:: @ 827B014
 
 	.align 2
 gTilesetPalettes_CableClub:: @ 827FF14
-	.incbin "data/tilesets/secondary/cable_club/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cable_club/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal"
@@ -418,16 +418,16 @@ gTilesetTiles_BikeShop:: @ 8280114
 
 	.align 2
 gTilesetPalettes_BikeShop:: @ 82804EC
-	.incbin "data/tilesets/secondary/bike_shop/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/bike_shop/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal"
@@ -441,16 +441,16 @@ gTilesetTiles_Lab:: @ 82806EC
 
 	.align 2
 gTilesetPalettes_Lab:: @ 8280D00
-	.incbin "data/tilesets/secondary/lab/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/lab/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/12.gbapal"
@@ -464,16 +464,16 @@ gTilesetTiles_HoennBuilding:: @ 8280F00
 
 	.align 2
 gTilesetPalettes_HoennBuilding:: @ 82823A4
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/hoenn_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/hoenn_building/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/hoenn_building/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/hoenn_building/palettes/12.gbapal"
@@ -487,16 +487,16 @@ gTilesetTiles_GameCorner:: @ 82825A4
 
 	.align 2
 gTilesetPalettes_GameCorner:: @ 8282FBC
-	.incbin "data/tilesets/secondary/game_corner/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/game_corner/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/game_corner/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/game_corner/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/game_corner/palettes/12.gbapal"
@@ -510,16 +510,16 @@ gTilesetTiles_PewterGym:: @ 82831BC
 
 	.align 2
 gTilesetPalettes_PewterGym:: @ 82839B0
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pewter_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pewter_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pewter_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pewter_gym/palettes/12.gbapal"
@@ -533,16 +533,16 @@ gTilesetTiles_CeruleanGym:: @ 8283BB0
 
 	.align 2
 gTilesetPalettes_CeruleanGym:: @ 8283FF8
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_gym/palettes/12.gbapal"
@@ -556,16 +556,16 @@ gTilesetTiles_VermilionGym:: @ 82841F8
 
 	.align 2
 gTilesetPalettes_VermilionGym:: @ 82849B8
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/vermilion_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/vermilion_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/vermilion_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/vermilion_gym/palettes/12.gbapal"
@@ -579,16 +579,16 @@ gTilesetTiles_CeladonGym:: @ 8284BB8
 
 	.align 2
 gTilesetPalettes_CeladonGym:: @ 8285150
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/celadon_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/celadon_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/celadon_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/celadon_gym/palettes/12.gbapal"
@@ -602,16 +602,16 @@ gTilesetTiles_FuchsiaGym:: @ 8285350
 
 	.align 2
 gTilesetPalettes_FuchsiaGym:: @ 82857A4
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/12.gbapal"
@@ -625,16 +625,16 @@ gTilesetTiles_SaffronGym:: @ 82859A4
 
 	.align 2
 gTilesetPalettes_SaffronGym:: @ 8285D90
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/saffron_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/saffron_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/saffron_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/saffron_gym/palettes/12.gbapal"
@@ -648,16 +648,16 @@ gTilesetTiles_CinnabarGym:: @ 8285F90
 
 	.align 2
 gTilesetPalettes_CinnabarGym:: @ 82865D4
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/12.gbapal"
@@ -671,16 +671,16 @@ gTilesetTiles_ViridianGym:: @ 82867D4
 
 	.align 2
 gTilesetPalettes_ViridianGym:: @ 8286BC8
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/viridian_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/viridian_gym/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/viridian_gym/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/viridian_gym/palettes/12.gbapal"
@@ -694,16 +694,16 @@ gTilesetTiles_SSAnne:: @ 8286DC8
 
 	.align 2
 gTilesetPalettes_SSAnne:: @ 8287B80
-	.incbin "data/tilesets/secondary/ss_anne/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/ss_anne/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/ss_anne/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/ss_anne/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/ss_anne/palettes/12.gbapal"
@@ -717,16 +717,16 @@ gTilesetTiles_Dummy2:: @ 8287D80
 
 	.align 2
 gTilesetPalettes_Dummy2:: @ 8287D94
-	.incbin "data/tilesets/secondary/dummy2/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/dummy2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal"
@@ -740,16 +740,16 @@ gTilesetTiles_ViridianForest:: @ 8287F94
 
 	.align 2
 gTilesetPalettes_ViridianForest:: @ 8288444
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/viridian_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/viridian_forest/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/viridian_forest/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/viridian_forest/palettes/12.gbapal"
@@ -763,16 +763,16 @@ gTilesetTiles_UnusedGatehouse1:: @ 8288644
 
 	.align 2
 gTilesetPalettes_UnusedGatehouse1:: @ 8288C60
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal"
@@ -786,16 +786,16 @@ gTilesetTiles_RockTunnel:: @ 8288E60
 
 	.align 2
 gTilesetPalettes_RockTunnel:: @ 8289FC8
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/rock_tunnel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/rock_tunnel/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/rock_tunnel/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/rock_tunnel/palettes/12.gbapal"
@@ -809,16 +809,16 @@ gTilesetTiles_DiglettsCave:: @ 828A1C8
 
 	.align 2
 gTilesetPalettes_DiglettsCave:: @ 828B250
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/digletts_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/digletts_cave/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/digletts_cave/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/digletts_cave/palettes/12.gbapal"
@@ -832,16 +832,16 @@ gTilesetTiles_SeafoamIslands:: @ 828B450
 
 	.align 2
 gTilesetPalettes_SeafoamIslands:: @ 828CAA0
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/seafoam_islands/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/seafoam_islands/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/seafoam_islands/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/seafoam_islands/palettes/12.gbapal"
@@ -855,16 +855,16 @@ gTilesetTiles_UnusedGatehouse2:: @ 828CCA0
 
 	.align 2
 gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal"
@@ -878,16 +878,16 @@ gTilesetTiles_CeruleanCave:: @ 828D4BC
 
 	.align 2
 gTilesetPalettes_CeruleanCave:: @ 828E3A4
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/cerulean_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_cave/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_cave/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/cerulean_cave/palettes/12.gbapal"
@@ -901,16 +901,16 @@ gTilesetTiles_GenericBuilding2:: @ 828E5A4
 
 	.align 2
 gTilesetPalettes_GenericBuilding2:: @ 828EC70
-	.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
@@ -924,16 +924,16 @@ gTilesetTiles_PowerPlant:: @ 828EE70
 
 	.align 2
 gTilesetPalettes_PowerPlant:: @ 828F378
-	.incbin "data/tilesets/secondary/power_plant/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/power_plant/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/power_plant/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/power_plant/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/power_plant/palettes/12.gbapal"
@@ -947,16 +947,16 @@ gTilesetTiles_SeaCottage:: @ 828F578
 
 	.align 2
 gTilesetPalettes_SeaCottage:: @ 828F9D8
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/sea_cottage/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/sea_cottage/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/sea_cottage/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/sea_cottage/palettes/12.gbapal"
@@ -970,16 +970,16 @@ gTilesetTiles_SilphCo:: @ 828FBD8
 
 	.align 2
 gTilesetPalettes_SilphCo:: @ 8290DD0
-	.incbin "data/tilesets/secondary/condominiums/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/condominiums/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/condominiums/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/condominiums/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/condominiums/palettes/12.gbapal"
@@ -993,16 +993,16 @@ gTilesetTiles_UndergroundPath:: @ 8290FD0
 
 	.align 2
 gTilesetPalettes_UndergroundPath:: @ 8291274
-	.incbin "data/tilesets/secondary/underground_path/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/underground_path/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/underground_path/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/underground_path/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/underground_path/palettes/12.gbapal"
@@ -1016,16 +1016,16 @@ gTilesetTiles_PokemonTower:: @ 8291474
 
 	.align 2
 gTilesetPalettes_PokemonTower:: @ 8291AFC
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_tower/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_tower/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_tower/palettes/12.gbapal"
@@ -1039,16 +1039,16 @@ gTilesetTiles_SafariZoneBuilding:: @ 8291CFC
 
 	.align 2
 gTilesetPalettes_SafariZoneBuilding:: @ 82920F0
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/safari_zone_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/safari_zone_building/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/safari_zone_building/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/safari_zone_building/palettes/12.gbapal"
@@ -1062,16 +1062,16 @@ gTilesetTiles_PokemonMansion:: @ 82922F0
 
 	.align 2
 gTilesetPalettes_PokemonMansion:: @ 8292FF0
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/12.gbapal"
@@ -1085,16 +1085,16 @@ gTilesetTiles_RestaurantHotel:: @ 82931F0
 
 	.align 2
 gTilesetPalettes_RestaurantHotel:: @ 8293660
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/12.gbapal"
@@ -1108,16 +1108,16 @@ gTilesetTiles_School:: @ 8293860
 
 	.align 2
 gTilesetPalettes_School:: @ 8293B0C
-	.incbin "data/tilesets/secondary/school/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/school/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/school/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/school/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/school/palettes/12.gbapal"
@@ -1131,16 +1131,16 @@ gTilesetTiles_FanClubDaycare:: @ 8293D0C
 
 	.align 2
 gTilesetPalettes_FanClubDaycare:: @ 8294144
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/12.gbapal"
@@ -1154,16 +1154,16 @@ gTilesetTiles_BurgledHouse:: @ 8294344
 
 	.align 2
 gTilesetPalettes_BurgledHouse:: @ 8294D08
-	.incbin "data/tilesets/secondary/burgled_house/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/burgled_house/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/burgled_house/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/burgled_house/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/burgled_house/palettes/12.gbapal"
@@ -1177,16 +1177,16 @@ gTilesetTiles_Dummy3:: @ 8294F08
 
 	.align 2
 gTilesetPalettes_Dummy3:: @ 8294F18
-	.incbin "data/tilesets/secondary/dummy3/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/dummy3/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal"
@@ -1200,16 +1200,16 @@ gTilesetTiles_Dummy4:: @ 8295118
 
 	.align 2
 gTilesetPalettes_Dummy4:: @ 829512C
-	.incbin "data/tilesets/secondary/dummy4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/dummy4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal"
@@ -1223,16 +1223,16 @@ gTilesetTiles_MtEmber:: @ 829532C
 
 	.align 2
 gTilesetPalettes_MtEmber:: @ 82967D4
-	.incbin "data/tilesets/secondary/mt_ember/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/mt_ember/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/mt_ember/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/mt_ember/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/mt_ember/palettes/12.gbapal"
@@ -1246,16 +1246,16 @@ gTilesetTiles_BerryForest:: @ 82969D4
 
 	.align 2
 gTilesetPalettes_BerryForest:: @ 8296E90
-	.incbin "data/tilesets/secondary/berry_forest/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/berry_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/berry_forest/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/berry_forest/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/berry_forest/palettes/12.gbapal"
@@ -1269,16 +1269,16 @@ gTilesetTiles_NavelRock:: @ 8297090
 
 	.align 2
 gTilesetPalettes_NavelRock:: @ 82983BC
-	.incbin "data/tilesets/secondary/navel_rock/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/navel_rock/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal"
@@ -1292,16 +1292,16 @@ gTilesetTiles_TanobyRuins:: @ 82985BC
 
 	.align 2
 gTilesetPalettes_TanobyRuins:: @ 8298970
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/12.gbapal"
@@ -1315,16 +1315,16 @@ gTilesetTiles_SeviiIslands123:: @ 8298B70
 
 	.align 2
 gTilesetPalettes_SeviiIslands123:: @ 8299AA4
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/12.gbapal"
@@ -1338,16 +1338,16 @@ gTilesetTiles_SeviiIslands45:: @ 8299CA4
 
 	.align 2
 gTilesetPalettes_SeviiIslands45:: @ 829AB04
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/12.gbapal"
@@ -1361,16 +1361,16 @@ gTilesetTiles_SeviiIslands67:: @ 829AD04
 
 	.align 2
 gTilesetPalettes_SeviiIslands67:: @ 829BD64
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/12.gbapal"
@@ -1384,16 +1384,16 @@ gTilesetTiles_TrainerTower:: @ 829BF64
 
 	.align 2
 gTilesetPalettes_TrainerTower:: @ 829CEE4
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/trainer_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/trainer_tower/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/trainer_tower/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/trainer_tower/palettes/12.gbapal"
@@ -1407,16 +1407,16 @@ gTilesetTiles_IslandHarbor:: @ 829D0E4
 
 	.align 2
 gTilesetPalettes_IslandHarbor:: @ 829D894
-	.incbin "data/tilesets/secondary/island_harbor/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/island_harbor/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal"
@@ -1430,16 +1430,16 @@ gTilesetTiles_PokemonLeague:: @ 829DA94
 
 	.align 2
 gTilesetPalettes_PokemonLeague:: @ 829EA50
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/pokemon_league/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_league/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_league/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_league/palettes/12.gbapal"
@@ -1453,16 +1453,16 @@ gTilesetTiles_HallOfFame:: @ 829EC50
 
 	.align 2
 gTilesetPalettes_HallOfFame:: @ 829F4C8
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/hall_of_fame/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/00.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/01.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/02.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/03.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/04.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/05.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/06.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/07.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/08.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/09.gbapal"
 	.incbin "data/tilesets/secondary/hall_of_fame/palettes/10.gbapal"
 	.incbin "data/tilesets/secondary/hall_of_fame/palettes/11.gbapal"
 	.incbin "data/tilesets/secondary/hall_of_fame/palettes/12.gbapal"
diff --git a/data/tilesets/primary/building/palettes/0.pal b/data/tilesets/primary/building/palettes/00.pal
index 3b6416376..3b6416376 100644
--- a/data/tilesets/primary/building/palettes/0.pal
+++ b/data/tilesets/primary/building/palettes/00.pal
diff --git a/data/tilesets/primary/building/palettes/1.pal b/data/tilesets/primary/building/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/primary/building/palettes/1.pal
+++ b/data/tilesets/primary/building/palettes/01.pal
diff --git a/data/tilesets/primary/building/palettes/2.pal b/data/tilesets/primary/building/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/primary/building/palettes/2.pal
+++ b/data/tilesets/primary/building/palettes/02.pal
diff --git a/data/tilesets/primary/building/palettes/3.pal b/data/tilesets/primary/building/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/primary/building/palettes/3.pal
+++ b/data/tilesets/primary/building/palettes/03.pal
diff --git a/data/tilesets/primary/building/palettes/4.pal b/data/tilesets/primary/building/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/primary/building/palettes/4.pal
+++ b/data/tilesets/primary/building/palettes/04.pal
diff --git a/data/tilesets/primary/building/palettes/5.pal b/data/tilesets/primary/building/palettes/05.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/primary/building/palettes/5.pal
+++ b/data/tilesets/primary/building/palettes/05.pal
diff --git a/data/tilesets/primary/building/palettes/6.pal b/data/tilesets/primary/building/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/primary/building/palettes/6.pal
+++ b/data/tilesets/primary/building/palettes/06.pal
diff --git a/data/tilesets/primary/building/palettes/7.pal b/data/tilesets/primary/building/palettes/07.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/building/palettes/7.pal
+++ b/data/tilesets/primary/building/palettes/07.pal
diff --git a/data/tilesets/primary/building/palettes/8.pal b/data/tilesets/primary/building/palettes/08.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/building/palettes/8.pal
+++ b/data/tilesets/primary/building/palettes/08.pal
diff --git a/data/tilesets/primary/building/palettes/9.pal b/data/tilesets/primary/building/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/building/palettes/9.pal
+++ b/data/tilesets/primary/building/palettes/09.pal
diff --git a/data/tilesets/primary/general/palettes/0.pal b/data/tilesets/primary/general/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/primary/general/palettes/0.pal
+++ b/data/tilesets/primary/general/palettes/00.pal
diff --git a/data/tilesets/primary/general/palettes/1.pal b/data/tilesets/primary/general/palettes/01.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/primary/general/palettes/1.pal
+++ b/data/tilesets/primary/general/palettes/01.pal
diff --git a/data/tilesets/primary/general/palettes/2.pal b/data/tilesets/primary/general/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/primary/general/palettes/2.pal
+++ b/data/tilesets/primary/general/palettes/02.pal
diff --git a/data/tilesets/primary/general/palettes/3.pal b/data/tilesets/primary/general/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/primary/general/palettes/3.pal
+++ b/data/tilesets/primary/general/palettes/03.pal
diff --git a/data/tilesets/primary/general/palettes/4.pal b/data/tilesets/primary/general/palettes/04.pal
index 9b094a6aa..9b094a6aa 100644
--- a/data/tilesets/primary/general/palettes/4.pal
+++ b/data/tilesets/primary/general/palettes/04.pal
diff --git a/data/tilesets/primary/general/palettes/5.pal b/data/tilesets/primary/general/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/primary/general/palettes/5.pal
+++ b/data/tilesets/primary/general/palettes/05.pal
diff --git a/data/tilesets/primary/general/palettes/6.pal b/data/tilesets/primary/general/palettes/06.pal
index cdf41b298..cdf41b298 100644
--- a/data/tilesets/primary/general/palettes/6.pal
+++ b/data/tilesets/primary/general/palettes/06.pal
diff --git a/data/tilesets/primary/general/palettes/7.pal b/data/tilesets/primary/general/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/general/palettes/7.pal
+++ b/data/tilesets/primary/general/palettes/07.pal
diff --git a/data/tilesets/primary/general/palettes/8.pal b/data/tilesets/primary/general/palettes/08.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/general/palettes/8.pal
+++ b/data/tilesets/primary/general/palettes/08.pal
diff --git a/data/tilesets/primary/general/palettes/9.pal b/data/tilesets/primary/general/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/general/palettes/9.pal
+++ b/data/tilesets/primary/general/palettes/09.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/00.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/berry_forest/palettes/0.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/00.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/01.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/berry_forest/palettes/1.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/01.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/berry_forest/palettes/2.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/02.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/03.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/berry_forest/palettes/3.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/03.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/berry_forest/palettes/4.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/04.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/berry_forest/palettes/5.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/05.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/berry_forest/palettes/6.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/06.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/berry_forest/palettes/7.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/07.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/08.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/berry_forest/palettes/8.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/08.pal
diff --git a/data/tilesets/secondary/berry_forest/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/09.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/berry_forest/palettes/9.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/09.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/00.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/bike_shop/palettes/0.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/00.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/01.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/bike_shop/palettes/1.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/01.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/02.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/bike_shop/palettes/2.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/02.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/03.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/bike_shop/palettes/3.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/03.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/bike_shop/palettes/4.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/04.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/bike_shop/palettes/5.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/05.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/bike_shop/palettes/6.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/06.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/07.pal
index a71b8fee2..a71b8fee2 100644
--- a/data/tilesets/secondary/bike_shop/palettes/7.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/07.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/08.pal
index 0a666a9c9..0a666a9c9 100644
--- a/data/tilesets/secondary/bike_shop/palettes/8.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/08.pal
diff --git a/data/tilesets/secondary/bike_shop/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/09.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/bike_shop/palettes/9.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/09.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/00.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/burgled_house/palettes/0.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/00.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/burgled_house/palettes/1.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/01.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/burgled_house/palettes/2.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/02.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/burgled_house/palettes/3.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/03.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/burgled_house/palettes/4.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/04.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/05.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/burgled_house/palettes/5.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/05.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/burgled_house/palettes/6.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/06.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/07.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/burgled_house/palettes/7.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/07.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/08.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/burgled_house/palettes/8.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/08.pal
diff --git a/data/tilesets/secondary/burgled_house/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/burgled_house/palettes/9.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/09.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/00.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/0.pal
+++ b/data/tilesets/secondary/cable_club/palettes/00.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/01.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/1.pal
+++ b/data/tilesets/secondary/cable_club/palettes/01.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/02.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/2.pal
+++ b/data/tilesets/secondary/cable_club/palettes/02.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/03.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/3.pal
+++ b/data/tilesets/secondary/cable_club/palettes/03.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/4.pal
+++ b/data/tilesets/secondary/cable_club/palettes/04.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/5.pal
+++ b/data/tilesets/secondary/cable_club/palettes/05.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cable_club/palettes/6.pal
+++ b/data/tilesets/secondary/cable_club/palettes/06.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/07.pal
index 00ca6903f..00ca6903f 100644
--- a/data/tilesets/secondary/cable_club/palettes/7.pal
+++ b/data/tilesets/secondary/cable_club/palettes/07.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/08.pal
index 43d6db90d..43d6db90d 100644
--- a/data/tilesets/secondary/cable_club/palettes/8.pal
+++ b/data/tilesets/secondary/cable_club/palettes/08.pal
diff --git a/data/tilesets/secondary/cable_club/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/09.pal
index 87857607f..87857607f 100644
--- a/data/tilesets/secondary/cable_club/palettes/9.pal
+++ b/data/tilesets/secondary/cable_club/palettes/09.pal
diff --git a/data/tilesets/secondary/cave/palettes/0.pal b/data/tilesets/secondary/cave/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/cave/palettes/0.pal
+++ b/data/tilesets/secondary/cave/palettes/00.pal
diff --git a/data/tilesets/secondary/cave/palettes/1.pal b/data/tilesets/secondary/cave/palettes/01.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/cave/palettes/1.pal
+++ b/data/tilesets/secondary/cave/palettes/01.pal
diff --git a/data/tilesets/secondary/cave/palettes/2.pal b/data/tilesets/secondary/cave/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/cave/palettes/2.pal
+++ b/data/tilesets/secondary/cave/palettes/02.pal
diff --git a/data/tilesets/secondary/cave/palettes/3.pal b/data/tilesets/secondary/cave/palettes/03.pal
index ef7460f41..ef7460f41 100644
--- a/data/tilesets/secondary/cave/palettes/3.pal
+++ b/data/tilesets/secondary/cave/palettes/03.pal
diff --git a/data/tilesets/secondary/cave/palettes/4.pal b/data/tilesets/secondary/cave/palettes/04.pal
index e83c6b367..e83c6b367 100644
--- a/data/tilesets/secondary/cave/palettes/4.pal
+++ b/data/tilesets/secondary/cave/palettes/04.pal
diff --git a/data/tilesets/secondary/cave/palettes/5.pal b/data/tilesets/secondary/cave/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/cave/palettes/5.pal
+++ b/data/tilesets/secondary/cave/palettes/05.pal
diff --git a/data/tilesets/secondary/cave/palettes/6.pal b/data/tilesets/secondary/cave/palettes/06.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/cave/palettes/6.pal
+++ b/data/tilesets/secondary/cave/palettes/06.pal
diff --git a/data/tilesets/secondary/cave/palettes/7.pal b/data/tilesets/secondary/cave/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/cave/palettes/7.pal
+++ b/data/tilesets/secondary/cave/palettes/07.pal
diff --git a/data/tilesets/secondary/cave/palettes/8.pal b/data/tilesets/secondary/cave/palettes/08.pal
index 1c8d33fac..1c8d33fac 100644
--- a/data/tilesets/secondary/cave/palettes/8.pal
+++ b/data/tilesets/secondary/cave/palettes/08.pal
diff --git a/data/tilesets/secondary/cave/palettes/9.pal b/data/tilesets/secondary/cave/palettes/09.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/cave/palettes/9.pal
+++ b/data/tilesets/secondary/cave/palettes/09.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/00.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/celadon_city/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/00.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/01.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/celadon_city/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/01.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/celadon_city/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/02.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/03.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/celadon_city/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/03.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/celadon_city/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/04.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/celadon_city/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/05.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/celadon_city/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/06.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/07.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/celadon_city/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/07.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/08.pal
index 86930c1d1..86930c1d1 100644
--- a/data/tilesets/secondary/celadon_city/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/08.pal
diff --git a/data/tilesets/secondary/celadon_city/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/09.pal
index 5dc82505a..5dc82505a 100644
--- a/data/tilesets/secondary/celadon_city/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/09.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/01.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/02.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/03.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/07.pal
index 9d84ecaba..9d84ecaba 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/08.pal
index 085c49344..085c49344 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/celadon_gym/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/09.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/celadon_gym/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/00.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/00.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/01.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/02.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/03.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/04.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/05.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/06.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/07.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/08.pal
index db2216a05..db2216a05 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/08.pal
diff --git a/data/tilesets/secondary/cerulean_cave/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/09.pal
index c1a5d4f29..c1a5d4f29 100644
--- a/data/tilesets/secondary/cerulean_cave/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/09.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/00.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/01.pal
index 31a636983..31a636983 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/01.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/02.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/03.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/03.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/04.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/04.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/05.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/05.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/06.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/06.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/07.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/08.pal
index ae3dd3f0d..ae3dd3f0d 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/08.pal
diff --git a/data/tilesets/secondary/cerulean_city/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/09.pal
index 3ed18e08f..3ed18e08f 100644
--- a/data/tilesets/secondary/cerulean_city/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/09.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/00.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/01.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/02.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/03.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/07.pal
index aac016a72..aac016a72 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/08.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/cerulean_gym/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/09.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/cerulean_gym/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/01.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/02.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/03.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/07.pal
index 5b659ef1b..5b659ef1b 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/08.pal
index f5a4ee678..f5a4ee678 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/cinnabar_gym/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/09.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/00.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/00.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/01.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/01.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/02.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/03.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/04.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/05.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/06.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/07.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/08.pal
index f734cd166..f734cd166 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/08.pal
diff --git a/data/tilesets/secondary/cinnabar_island/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/09.pal
index ca26d1b08..ca26d1b08 100644
--- a/data/tilesets/secondary/cinnabar_island/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/09.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/00.pal
index 5867e5ba6..5867e5ba6 100644
--- a/data/tilesets/secondary/condominiums/palettes/0.pal
+++ b/data/tilesets/secondary/condominiums/palettes/00.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/condominiums/palettes/1.pal
+++ b/data/tilesets/secondary/condominiums/palettes/01.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/condominiums/palettes/2.pal
+++ b/data/tilesets/secondary/condominiums/palettes/02.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/condominiums/palettes/3.pal
+++ b/data/tilesets/secondary/condominiums/palettes/03.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/condominiums/palettes/4.pal
+++ b/data/tilesets/secondary/condominiums/palettes/04.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/05.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/condominiums/palettes/5.pal
+++ b/data/tilesets/secondary/condominiums/palettes/05.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/condominiums/palettes/6.pal
+++ b/data/tilesets/secondary/condominiums/palettes/06.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/07.pal
index 35987db53..35987db53 100644
--- a/data/tilesets/secondary/condominiums/palettes/7.pal
+++ b/data/tilesets/secondary/condominiums/palettes/07.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/08.pal
index 7f33e006f..7f33e006f 100644
--- a/data/tilesets/secondary/condominiums/palettes/8.pal
+++ b/data/tilesets/secondary/condominiums/palettes/08.pal
diff --git a/data/tilesets/secondary/condominiums/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/09.pal
index 75022050d..75022050d 100644
--- a/data/tilesets/secondary/condominiums/palettes/9.pal
+++ b/data/tilesets/secondary/condominiums/palettes/09.pal
diff --git a/data/tilesets/secondary/department_store/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/department_store/palettes/0.pal
+++ b/data/tilesets/secondary/department_store/palettes/00.pal
diff --git a/data/tilesets/secondary/department_store/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/01.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/department_store/palettes/1.pal
+++ b/data/tilesets/secondary/department_store/palettes/01.pal
diff --git a/data/tilesets/secondary/department_store/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/department_store/palettes/2.pal
+++ b/data/tilesets/secondary/department_store/palettes/02.pal
diff --git a/data/tilesets/secondary/department_store/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/department_store/palettes/3.pal
+++ b/data/tilesets/secondary/department_store/palettes/03.pal
diff --git a/data/tilesets/secondary/department_store/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/department_store/palettes/4.pal
+++ b/data/tilesets/secondary/department_store/palettes/04.pal
diff --git a/data/tilesets/secondary/department_store/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/department_store/palettes/5.pal
+++ b/data/tilesets/secondary/department_store/palettes/05.pal
diff --git a/data/tilesets/secondary/department_store/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/06.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/department_store/palettes/6.pal
+++ b/data/tilesets/secondary/department_store/palettes/06.pal
diff --git a/data/tilesets/secondary/department_store/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/07.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/department_store/palettes/7.pal
+++ b/data/tilesets/secondary/department_store/palettes/07.pal
diff --git a/data/tilesets/secondary/department_store/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/08.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/department_store/palettes/8.pal
+++ b/data/tilesets/secondary/department_store/palettes/08.pal
diff --git a/data/tilesets/secondary/department_store/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/09.pal
index dd18b9d07..dd18b9d07 100644
--- a/data/tilesets/secondary/department_store/palettes/9.pal
+++ b/data/tilesets/secondary/department_store/palettes/09.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/00.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/0.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/00.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/1.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/01.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/2.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/02.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/3.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/03.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/4.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/04.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/5.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/05.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/6.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/06.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/7.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/07.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/08.pal
index 74cbc54c6..74cbc54c6 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/8.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/08.pal
diff --git a/data/tilesets/secondary/digletts_cave/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/09.pal
index def7acffc..def7acffc 100644
--- a/data/tilesets/secondary/digletts_cave/palettes/9.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/09.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/00.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/0.pal
+++ b/data/tilesets/secondary/dummy1/palettes/00.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/01.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/1.pal
+++ b/data/tilesets/secondary/dummy1/palettes/01.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/02.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/2.pal
+++ b/data/tilesets/secondary/dummy1/palettes/02.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/03.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/3.pal
+++ b/data/tilesets/secondary/dummy1/palettes/03.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/4.pal
+++ b/data/tilesets/secondary/dummy1/palettes/04.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/5.pal
+++ b/data/tilesets/secondary/dummy1/palettes/05.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/6.pal
+++ b/data/tilesets/secondary/dummy1/palettes/06.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/07.pal
index 4172436d0..4172436d0 100644
--- a/data/tilesets/secondary/dummy1/palettes/7.pal
+++ b/data/tilesets/secondary/dummy1/palettes/07.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/08.pal
index 7fd087b3b..7fd087b3b 100644
--- a/data/tilesets/secondary/dummy1/palettes/8.pal
+++ b/data/tilesets/secondary/dummy1/palettes/08.pal
diff --git a/data/tilesets/secondary/dummy1/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/09.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy1/palettes/9.pal
+++ b/data/tilesets/secondary/dummy1/palettes/09.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/00.pal
index 0fd74602e..0fd74602e 100644
--- a/data/tilesets/secondary/dummy2/palettes/0.pal
+++ b/data/tilesets/secondary/dummy2/palettes/00.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/01.pal
index 3c6e40c2e..3c6e40c2e 100644
--- a/data/tilesets/secondary/dummy2/palettes/1.pal
+++ b/data/tilesets/secondary/dummy2/palettes/01.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/02.pal
index 4c41030f6..4c41030f6 100644
--- a/data/tilesets/secondary/dummy2/palettes/2.pal
+++ b/data/tilesets/secondary/dummy2/palettes/02.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/03.pal
index 5665ddc22..5665ddc22 100644
--- a/data/tilesets/secondary/dummy2/palettes/3.pal
+++ b/data/tilesets/secondary/dummy2/palettes/03.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/04.pal
index d8051b7ba..d8051b7ba 100644
--- a/data/tilesets/secondary/dummy2/palettes/4.pal
+++ b/data/tilesets/secondary/dummy2/palettes/04.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/05.pal
index 4e684594c..4e684594c 100644
--- a/data/tilesets/secondary/dummy2/palettes/5.pal
+++ b/data/tilesets/secondary/dummy2/palettes/05.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/dummy2/palettes/6.pal
+++ b/data/tilesets/secondary/dummy2/palettes/06.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/07.pal
index 2064b3bd2..2064b3bd2 100644
--- a/data/tilesets/secondary/dummy2/palettes/7.pal
+++ b/data/tilesets/secondary/dummy2/palettes/07.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/08.pal
index 42a3483c0..42a3483c0 100644
--- a/data/tilesets/secondary/dummy2/palettes/8.pal
+++ b/data/tilesets/secondary/dummy2/palettes/08.pal
diff --git a/data/tilesets/secondary/dummy2/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/09.pal
index b06dfbda7..b06dfbda7 100644
--- a/data/tilesets/secondary/dummy2/palettes/9.pal
+++ b/data/tilesets/secondary/dummy2/palettes/09.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/dummy3/palettes/0.pal
+++ b/data/tilesets/secondary/dummy3/palettes/00.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/dummy3/palettes/1.pal
+++ b/data/tilesets/secondary/dummy3/palettes/01.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/dummy3/palettes/2.pal
+++ b/data/tilesets/secondary/dummy3/palettes/02.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/dummy3/palettes/3.pal
+++ b/data/tilesets/secondary/dummy3/palettes/03.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/dummy3/palettes/4.pal
+++ b/data/tilesets/secondary/dummy3/palettes/04.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/dummy3/palettes/5.pal
+++ b/data/tilesets/secondary/dummy3/palettes/05.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/dummy3/palettes/6.pal
+++ b/data/tilesets/secondary/dummy3/palettes/06.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/dummy3/palettes/7.pal
+++ b/data/tilesets/secondary/dummy3/palettes/07.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/08.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/dummy3/palettes/8.pal
+++ b/data/tilesets/secondary/dummy3/palettes/08.pal
diff --git a/data/tilesets/secondary/dummy3/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/09.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/dummy3/palettes/9.pal
+++ b/data/tilesets/secondary/dummy3/palettes/09.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/dummy4/palettes/0.pal
+++ b/data/tilesets/secondary/dummy4/palettes/00.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/dummy4/palettes/1.pal
+++ b/data/tilesets/secondary/dummy4/palettes/01.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/dummy4/palettes/2.pal
+++ b/data/tilesets/secondary/dummy4/palettes/02.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/dummy4/palettes/3.pal
+++ b/data/tilesets/secondary/dummy4/palettes/03.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/dummy4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy4/palettes/04.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/dummy4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy4/palettes/05.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/dummy4/palettes/6.pal
+++ b/data/tilesets/secondary/dummy4/palettes/06.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/dummy4/palettes/7.pal
+++ b/data/tilesets/secondary/dummy4/palettes/07.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/08.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/dummy4/palettes/8.pal
+++ b/data/tilesets/secondary/dummy4/palettes/08.pal
diff --git a/data/tilesets/secondary/dummy4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/09.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/dummy4/palettes/9.pal
+++ b/data/tilesets/secondary/dummy4/palettes/09.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/00.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/00.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/01.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/01.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/02.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/02.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/03.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/03.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/04.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/05.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/06.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/07.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/07.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/08.pal
index 4b7de8012..4b7de8012 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/08.pal
diff --git a/data/tilesets/secondary/fan_club_daycare/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/09.pal
index 8fe0861de..8fe0861de 100644
--- a/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/09.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/00.pal
index 5fb8bdb01..5fb8bdb01 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/00.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/01.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/01.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/02.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/03.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/03.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/04.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/05.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/06.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/07.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/08.pal
index 8a0a9a1e0..8a0a9a1e0 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/08.pal
diff --git a/data/tilesets/secondary/fuchsia_city/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/09.pal
index d39bbb454..d39bbb454 100644
--- a/data/tilesets/secondary/fuchsia_city/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/09.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/07.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/08.pal
index 1873ad439..1873ad439 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/fuchsia_gym/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/game_corner/palettes/0.pal
+++ b/data/tilesets/secondary/game_corner/palettes/00.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/game_corner/palettes/1.pal
+++ b/data/tilesets/secondary/game_corner/palettes/01.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/game_corner/palettes/2.pal
+++ b/data/tilesets/secondary/game_corner/palettes/02.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/game_corner/palettes/3.pal
+++ b/data/tilesets/secondary/game_corner/palettes/03.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/game_corner/palettes/4.pal
+++ b/data/tilesets/secondary/game_corner/palettes/04.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/game_corner/palettes/5.pal
+++ b/data/tilesets/secondary/game_corner/palettes/05.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/game_corner/palettes/6.pal
+++ b/data/tilesets/secondary/game_corner/palettes/06.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/07.pal
index b3612e537..b3612e537 100644
--- a/data/tilesets/secondary/game_corner/palettes/7.pal
+++ b/data/tilesets/secondary/game_corner/palettes/07.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/08.pal
index e58f94305..e58f94305 100644
--- a/data/tilesets/secondary/game_corner/palettes/8.pal
+++ b/data/tilesets/secondary/game_corner/palettes/08.pal
diff --git a/data/tilesets/secondary/game_corner/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/09.pal
index 75f1d81b5..75f1d81b5 100644
--- a/data/tilesets/secondary/game_corner/palettes/9.pal
+++ b/data/tilesets/secondary/game_corner/palettes/09.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/generic_building1/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/00.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/01.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/generic_building1/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/01.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/02.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/generic_building1/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/02.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/03.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/generic_building1/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/03.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/generic_building1/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/04.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/generic_building1/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/05.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/generic_building1/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/06.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/07.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/generic_building1/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/07.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/08.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/generic_building1/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/08.pal
diff --git a/data/tilesets/secondary/generic_building1/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/generic_building1/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/09.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/generic_building2/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/00.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/generic_building2/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/01.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/generic_building2/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/02.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/generic_building2/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/03.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/generic_building2/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/04.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/generic_building2/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/05.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/generic_building2/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/06.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/07.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/generic_building2/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/07.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/08.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/generic_building2/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/08.pal
diff --git a/data/tilesets/secondary/generic_building2/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/09.pal
index 25d5d7019..25d5d7019 100644
--- a/data/tilesets/secondary/generic_building2/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/09.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/00.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/0.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/00.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/1.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/01.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/2.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/02.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/3.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/03.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/4.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/04.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/05.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/5.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/05.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/6.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/06.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/07.pal
index f0c97cf87..f0c97cf87 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/7.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/07.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/08.pal
index 33b52bbbd..33b52bbbd 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/8.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/08.pal
diff --git a/data/tilesets/secondary/hall_of_fame/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/09.pal
index 3a2cf3b7a..3a2cf3b7a 100644
--- a/data/tilesets/secondary/hall_of_fame/palettes/9.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/09.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/00.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/0.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/00.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/01.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/1.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/01.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/02.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/2.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/02.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/03.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/3.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/03.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/4.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/04.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/5.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/05.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/6.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/06.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/07.pal
index 533778712..533778712 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/7.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/07.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/08.pal
index 0b01f1a0f..0b01f1a0f 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/8.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/08.pal
diff --git a/data/tilesets/secondary/hoenn_building/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/09.pal
index 371e5a211..371e5a211 100644
--- a/data/tilesets/secondary/hoenn_building/palettes/9.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/09.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/0.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/00.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/01.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/1.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/01.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/2.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/02.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/03.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/3.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/03.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/04.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/4.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/04.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/05.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/5.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/05.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/06.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/6.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/06.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/7.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/07.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/08.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/8.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/08.pal
diff --git a/data/tilesets/secondary/indigo_plateau/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/09.pal
index 3ff6139ac..3ff6139ac 100644
--- a/data/tilesets/secondary/indigo_plateau/palettes/9.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/09.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/island_harbor/palettes/0.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/00.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/01.pal
index 22eb1667c..22eb1667c 100644
--- a/data/tilesets/secondary/island_harbor/palettes/1.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/01.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/island_harbor/palettes/2.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/02.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/island_harbor/palettes/3.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/03.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/04.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/island_harbor/palettes/4.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/04.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/island_harbor/palettes/5.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/05.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/06.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/island_harbor/palettes/6.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/06.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/island_harbor/palettes/7.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/07.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/08.pal
index 5c1251024..5c1251024 100644
--- a/data/tilesets/secondary/island_harbor/palettes/8.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/08.pal
diff --git a/data/tilesets/secondary/island_harbor/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/09.pal
index c25501332..c25501332 100644
--- a/data/tilesets/secondary/island_harbor/palettes/9.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/09.pal
diff --git a/data/tilesets/secondary/lab/palettes/0.pal b/data/tilesets/secondary/lab/palettes/00.pal
index 9fc16da3b..9fc16da3b 100644
--- a/data/tilesets/secondary/lab/palettes/0.pal
+++ b/data/tilesets/secondary/lab/palettes/00.pal
diff --git a/data/tilesets/secondary/lab/palettes/1.pal b/data/tilesets/secondary/lab/palettes/01.pal
index 76403e6d6..76403e6d6 100644
--- a/data/tilesets/secondary/lab/palettes/1.pal
+++ b/data/tilesets/secondary/lab/palettes/01.pal
diff --git a/data/tilesets/secondary/lab/palettes/2.pal b/data/tilesets/secondary/lab/palettes/02.pal
index b1ecd71dc..b1ecd71dc 100644
--- a/data/tilesets/secondary/lab/palettes/2.pal
+++ b/data/tilesets/secondary/lab/palettes/02.pal
diff --git a/data/tilesets/secondary/lab/palettes/3.pal b/data/tilesets/secondary/lab/palettes/03.pal
index 43d9b60e3..43d9b60e3 100644
--- a/data/tilesets/secondary/lab/palettes/3.pal
+++ b/data/tilesets/secondary/lab/palettes/03.pal
diff --git a/data/tilesets/secondary/lab/palettes/4.pal b/data/tilesets/secondary/lab/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/lab/palettes/4.pal
+++ b/data/tilesets/secondary/lab/palettes/04.pal
diff --git a/data/tilesets/secondary/lab/palettes/5.pal b/data/tilesets/secondary/lab/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/lab/palettes/5.pal
+++ b/data/tilesets/secondary/lab/palettes/05.pal
diff --git a/data/tilesets/secondary/lab/palettes/6.pal b/data/tilesets/secondary/lab/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/lab/palettes/6.pal
+++ b/data/tilesets/secondary/lab/palettes/06.pal
diff --git a/data/tilesets/secondary/lab/palettes/7.pal b/data/tilesets/secondary/lab/palettes/07.pal
index 3d7f8bd89..3d7f8bd89 100644
--- a/data/tilesets/secondary/lab/palettes/7.pal
+++ b/data/tilesets/secondary/lab/palettes/07.pal
diff --git a/data/tilesets/secondary/lab/palettes/8.pal b/data/tilesets/secondary/lab/palettes/08.pal
index 7fce49d06..7fce49d06 100644
--- a/data/tilesets/secondary/lab/palettes/8.pal
+++ b/data/tilesets/secondary/lab/palettes/08.pal
diff --git a/data/tilesets/secondary/lab/palettes/9.pal b/data/tilesets/secondary/lab/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/lab/palettes/9.pal
+++ b/data/tilesets/secondary/lab/palettes/09.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/lavender_town/palettes/0.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/00.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/lavender_town/palettes/1.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/01.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/lavender_town/palettes/2.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/02.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/lavender_town/palettes/3.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/03.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/04.pal
index 07dcd957c..07dcd957c 100644
--- a/data/tilesets/secondary/lavender_town/palettes/4.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/04.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/lavender_town/palettes/5.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/05.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/06.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/lavender_town/palettes/6.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/06.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/lavender_town/palettes/7.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/07.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/08.pal
index 376749664..376749664 100644
--- a/data/tilesets/secondary/lavender_town/palettes/8.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/08.pal
diff --git a/data/tilesets/secondary/lavender_town/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/09.pal
index 82b469a66..82b469a66 100644
--- a/data/tilesets/secondary/lavender_town/palettes/9.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/09.pal
diff --git a/data/tilesets/secondary/mart/palettes/0.pal b/data/tilesets/secondary/mart/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/mart/palettes/0.pal
+++ b/data/tilesets/secondary/mart/palettes/00.pal
diff --git a/data/tilesets/secondary/mart/palettes/1.pal b/data/tilesets/secondary/mart/palettes/01.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/mart/palettes/1.pal
+++ b/data/tilesets/secondary/mart/palettes/01.pal
diff --git a/data/tilesets/secondary/mart/palettes/2.pal b/data/tilesets/secondary/mart/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/mart/palettes/2.pal
+++ b/data/tilesets/secondary/mart/palettes/02.pal
diff --git a/data/tilesets/secondary/mart/palettes/3.pal b/data/tilesets/secondary/mart/palettes/03.pal
index e1b56cd57..e1b56cd57 100644
--- a/data/tilesets/secondary/mart/palettes/3.pal
+++ b/data/tilesets/secondary/mart/palettes/03.pal
diff --git a/data/tilesets/secondary/mart/palettes/4.pal b/data/tilesets/secondary/mart/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/mart/palettes/4.pal
+++ b/data/tilesets/secondary/mart/palettes/04.pal
diff --git a/data/tilesets/secondary/mart/palettes/5.pal b/data/tilesets/secondary/mart/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/mart/palettes/5.pal
+++ b/data/tilesets/secondary/mart/palettes/05.pal
diff --git a/data/tilesets/secondary/mart/palettes/6.pal b/data/tilesets/secondary/mart/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/mart/palettes/6.pal
+++ b/data/tilesets/secondary/mart/palettes/06.pal
diff --git a/data/tilesets/secondary/mart/palettes/7.pal b/data/tilesets/secondary/mart/palettes/07.pal
index 0a07057ec..0a07057ec 100644
--- a/data/tilesets/secondary/mart/palettes/7.pal
+++ b/data/tilesets/secondary/mart/palettes/07.pal
diff --git a/data/tilesets/secondary/mart/palettes/8.pal b/data/tilesets/secondary/mart/palettes/08.pal
index 06fcc911b..06fcc911b 100644
--- a/data/tilesets/secondary/mart/palettes/8.pal
+++ b/data/tilesets/secondary/mart/palettes/08.pal
diff --git a/data/tilesets/secondary/mart/palettes/9.pal b/data/tilesets/secondary/mart/palettes/09.pal
index ea018609b..ea018609b 100644
--- a/data/tilesets/secondary/mart/palettes/9.pal
+++ b/data/tilesets/secondary/mart/palettes/09.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/00.pal
index 30ff4070a..30ff4070a 100644
--- a/data/tilesets/secondary/mt_ember/palettes/0.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/00.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/01.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/mt_ember/palettes/1.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/01.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/mt_ember/palettes/2.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/02.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/03.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/mt_ember/palettes/3.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/03.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/04.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/mt_ember/palettes/4.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/04.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/05.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/mt_ember/palettes/5.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/05.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/06.pal
index 32afdccbb..32afdccbb 100644
--- a/data/tilesets/secondary/mt_ember/palettes/6.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/06.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/07.pal
index fa9d5d633..fa9d5d633 100644
--- a/data/tilesets/secondary/mt_ember/palettes/7.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/07.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/08.pal
index f4a797b87..f4a797b87 100644
--- a/data/tilesets/secondary/mt_ember/palettes/8.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/08.pal
diff --git a/data/tilesets/secondary/mt_ember/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/09.pal
index 0a2109195..0a2109195 100644
--- a/data/tilesets/secondary/mt_ember/palettes/9.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/09.pal
diff --git a/data/tilesets/secondary/museum/palettes/0.pal b/data/tilesets/secondary/museum/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/museum/palettes/0.pal
+++ b/data/tilesets/secondary/museum/palettes/00.pal
diff --git a/data/tilesets/secondary/museum/palettes/1.pal b/data/tilesets/secondary/museum/palettes/01.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/museum/palettes/1.pal
+++ b/data/tilesets/secondary/museum/palettes/01.pal
diff --git a/data/tilesets/secondary/museum/palettes/2.pal b/data/tilesets/secondary/museum/palettes/02.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/museum/palettes/2.pal
+++ b/data/tilesets/secondary/museum/palettes/02.pal
diff --git a/data/tilesets/secondary/museum/palettes/3.pal b/data/tilesets/secondary/museum/palettes/03.pal
index 1520bed0b..1520bed0b 100644
--- a/data/tilesets/secondary/museum/palettes/3.pal
+++ b/data/tilesets/secondary/museum/palettes/03.pal
diff --git a/data/tilesets/secondary/museum/palettes/4.pal b/data/tilesets/secondary/museum/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/museum/palettes/4.pal
+++ b/data/tilesets/secondary/museum/palettes/04.pal
diff --git a/data/tilesets/secondary/museum/palettes/5.pal b/data/tilesets/secondary/museum/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/museum/palettes/5.pal
+++ b/data/tilesets/secondary/museum/palettes/05.pal
diff --git a/data/tilesets/secondary/museum/palettes/6.pal b/data/tilesets/secondary/museum/palettes/06.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/museum/palettes/6.pal
+++ b/data/tilesets/secondary/museum/palettes/06.pal
diff --git a/data/tilesets/secondary/museum/palettes/7.pal b/data/tilesets/secondary/museum/palettes/07.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/museum/palettes/7.pal
+++ b/data/tilesets/secondary/museum/palettes/07.pal
diff --git a/data/tilesets/secondary/museum/palettes/8.pal b/data/tilesets/secondary/museum/palettes/08.pal
index 223737ab6..223737ab6 100644
--- a/data/tilesets/secondary/museum/palettes/8.pal
+++ b/data/tilesets/secondary/museum/palettes/08.pal
diff --git a/data/tilesets/secondary/museum/palettes/9.pal b/data/tilesets/secondary/museum/palettes/09.pal
index 6de173f90..6de173f90 100644
--- a/data/tilesets/secondary/museum/palettes/9.pal
+++ b/data/tilesets/secondary/museum/palettes/09.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/navel_rock/palettes/0.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/00.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/navel_rock/palettes/1.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/01.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/navel_rock/palettes/2.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/02.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/navel_rock/palettes/3.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/03.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/navel_rock/palettes/4.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/04.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/navel_rock/palettes/5.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/05.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/navel_rock/palettes/6.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/06.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/07.pal
index 364379ad9..364379ad9 100644
--- a/data/tilesets/secondary/navel_rock/palettes/7.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/07.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/08.pal
index 102aaaf2c..102aaaf2c 100644
--- a/data/tilesets/secondary/navel_rock/palettes/8.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/08.pal
diff --git a/data/tilesets/secondary/navel_rock/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/09.pal
index 91329f82e..91329f82e 100644
--- a/data/tilesets/secondary/navel_rock/palettes/9.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/09.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/00.pal
index 42246e9ea..42246e9ea 100644
--- a/data/tilesets/secondary/pallet_town/palettes/0.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/00.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/01.pal
index 28db536cb..28db536cb 100644
--- a/data/tilesets/secondary/pallet_town/palettes/1.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/01.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/02.pal
index 937cec4da..937cec4da 100644
--- a/data/tilesets/secondary/pallet_town/palettes/2.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/02.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/03.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/pallet_town/palettes/3.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/03.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/04.pal
index cde020d4e..cde020d4e 100644
--- a/data/tilesets/secondary/pallet_town/palettes/4.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/04.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/05.pal
index bdcc7b8ed..bdcc7b8ed 100644
--- a/data/tilesets/secondary/pallet_town/palettes/5.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/05.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pallet_town/palettes/6.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/06.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/pallet_town/palettes/7.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/07.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/08.pal
index dcecb9c40..dcecb9c40 100644
--- a/data/tilesets/secondary/pallet_town/palettes/8.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/08.pal
diff --git a/data/tilesets/secondary/pallet_town/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/09.pal
index 90bb77517..90bb77517 100644
--- a/data/tilesets/secondary/pallet_town/palettes/9.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/09.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/00.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/pewter_city/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/00.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/01.pal
index 60de8c7ad..60de8c7ad 100644
--- a/data/tilesets/secondary/pewter_city/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/01.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/pewter_city/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/02.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/03.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/pewter_city/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/03.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/pewter_city/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/04.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/pewter_city/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/05.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/pewter_city/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/06.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/pewter_city/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/07.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/08.pal
index d404706ab..d404706ab 100644
--- a/data/tilesets/secondary/pewter_city/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/08.pal
diff --git a/data/tilesets/secondary/pewter_city/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/09.pal
index cacf892a6..cacf892a6 100644
--- a/data/tilesets/secondary/pewter_city/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/09.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/00.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/05.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/07.pal
index 34c0ddd17..34c0ddd17 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/08.pal
index 77e03a48c..77e03a48c 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/pewter_gym/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/09.pal
index ef91ae987..ef91ae987 100644
--- a/data/tilesets/secondary/pewter_gym/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/00.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/01.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/02.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/03.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/04.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/05.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/06.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/07.pal
index 27ca86ca3..27ca86ca3 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/07.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/08.pal
index 6b6a0f25f..6b6a0f25f 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/08.pal
diff --git a/data/tilesets/secondary/pokemon_center/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/09.pal
index 4b279ecf9..4b279ecf9 100644
--- a/data/tilesets/secondary/pokemon_center/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/09.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/00.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/00.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/01.pal
index fc945ef6c..fc945ef6c 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/01.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/02.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/03.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/04.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/05.pal
index 34ef2f2d2..34ef2f2d2 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/05.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/06.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/07.pal
index 6528f9f75..6528f9f75 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/07.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/08.pal
index 6b56cd49e..6b56cd49e 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/08.pal
diff --git a/data/tilesets/secondary/pokemon_league/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/09.pal
index 5c2ed43a0..5c2ed43a0 100644
--- a/data/tilesets/secondary/pokemon_league/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/09.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/00.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/00.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/01.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/01.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/02.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/02.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/03.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/03.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/04.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/04.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/05.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/05.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/06.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/07.pal
index 4d22869cd..4d22869cd 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/07.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/08.pal
index 2a9d791a4..2a9d791a4 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/08.pal
diff --git a/data/tilesets/secondary/pokemon_mansion/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/09.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/09.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/00.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/00.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/01.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/01.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/02.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/02.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/03.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/03.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/04.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/05.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/06.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/07.pal
index 241a2678c..241a2678c 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/07.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/08.pal
index ebd9e912c..ebd9e912c 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/08.pal
diff --git a/data/tilesets/secondary/pokemon_tower/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/09.pal
index 51daf6701..51daf6701 100644
--- a/data/tilesets/secondary/pokemon_tower/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/09.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/power_plant/palettes/0.pal
+++ b/data/tilesets/secondary/power_plant/palettes/00.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/01.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/power_plant/palettes/1.pal
+++ b/data/tilesets/secondary/power_plant/palettes/01.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/02.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/power_plant/palettes/2.pal
+++ b/data/tilesets/secondary/power_plant/palettes/02.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/03.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/power_plant/palettes/3.pal
+++ b/data/tilesets/secondary/power_plant/palettes/03.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/power_plant/palettes/4.pal
+++ b/data/tilesets/secondary/power_plant/palettes/04.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/power_plant/palettes/5.pal
+++ b/data/tilesets/secondary/power_plant/palettes/05.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/06.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/power_plant/palettes/6.pal
+++ b/data/tilesets/secondary/power_plant/palettes/06.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/07.pal
index b69e6cfa4..b69e6cfa4 100644
--- a/data/tilesets/secondary/power_plant/palettes/7.pal
+++ b/data/tilesets/secondary/power_plant/palettes/07.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/08.pal
index 3cada9fa1..3cada9fa1 100644
--- a/data/tilesets/secondary/power_plant/palettes/8.pal
+++ b/data/tilesets/secondary/power_plant/palettes/08.pal
diff --git a/data/tilesets/secondary/power_plant/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/09.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/power_plant/palettes/9.pal
+++ b/data/tilesets/secondary/power_plant/palettes/09.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/00.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/01.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/01.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/02.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/02.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/03.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/03.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/04.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/05.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/06.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/06.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/07.pal
index 5e3bac102..5e3bac102 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/07.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/08.pal
index 2257c0006..2257c0006 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/08.pal
diff --git a/data/tilesets/secondary/restaurant_hotel/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/09.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/09.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/0.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/00.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/1.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/01.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/2.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/02.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/3.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/03.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/4.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/04.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/5.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/05.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/6.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/06.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/7.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/07.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/08.pal
index 34a637b1a..34a637b1a 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/8.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/08.pal
diff --git a/data/tilesets/secondary/rock_tunnel/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/09.pal
index f10a94f7c..f10a94f7c 100644
--- a/data/tilesets/secondary/rock_tunnel/palettes/9.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/09.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/00.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/0.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/00.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/1.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/01.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/02.pal
index ddec077d0..ddec077d0 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/2.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/02.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/03.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/3.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/03.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/4.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/04.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/05.pal
index 9de0ef422..9de0ef422 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/5.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/05.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/6.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/06.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/7.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/07.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/08.pal
index eed6dbc35..eed6dbc35 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/8.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/08.pal
diff --git a/data/tilesets/secondary/safari_zone_building/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/09.pal
index e9b93cfd2..e9b93cfd2 100644
--- a/data/tilesets/secondary/safari_zone_building/palettes/9.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/09.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/00.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/saffron_city/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/00.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/01.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/saffron_city/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/01.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/saffron_city/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/02.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/03.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/saffron_city/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/03.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/saffron_city/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/04.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/saffron_city/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/05.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/saffron_city/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/06.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/saffron_city/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/07.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/08.pal
index b1e168855..b1e168855 100644
--- a/data/tilesets/secondary/saffron_city/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/08.pal
diff --git a/data/tilesets/secondary/saffron_city/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/09.pal
index 7a88fdbbf..7a88fdbbf 100644
--- a/data/tilesets/secondary/saffron_city/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/09.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/01.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/02.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/03.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/07.pal
index c66eaedff..c66eaedff 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/08.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/saffron_gym/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/saffron_gym/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/school/palettes/0.pal b/data/tilesets/secondary/school/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/school/palettes/0.pal
+++ b/data/tilesets/secondary/school/palettes/00.pal
diff --git a/data/tilesets/secondary/school/palettes/1.pal b/data/tilesets/secondary/school/palettes/01.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/school/palettes/1.pal
+++ b/data/tilesets/secondary/school/palettes/01.pal
diff --git a/data/tilesets/secondary/school/palettes/2.pal b/data/tilesets/secondary/school/palettes/02.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/school/palettes/2.pal
+++ b/data/tilesets/secondary/school/palettes/02.pal
diff --git a/data/tilesets/secondary/school/palettes/3.pal b/data/tilesets/secondary/school/palettes/03.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/school/palettes/3.pal
+++ b/data/tilesets/secondary/school/palettes/03.pal
diff --git a/data/tilesets/secondary/school/palettes/4.pal b/data/tilesets/secondary/school/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/school/palettes/4.pal
+++ b/data/tilesets/secondary/school/palettes/04.pal
diff --git a/data/tilesets/secondary/school/palettes/5.pal b/data/tilesets/secondary/school/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/school/palettes/5.pal
+++ b/data/tilesets/secondary/school/palettes/05.pal
diff --git a/data/tilesets/secondary/school/palettes/6.pal b/data/tilesets/secondary/school/palettes/06.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/school/palettes/6.pal
+++ b/data/tilesets/secondary/school/palettes/06.pal
diff --git a/data/tilesets/secondary/school/palettes/7.pal b/data/tilesets/secondary/school/palettes/07.pal
index 6c1a5b096..6c1a5b096 100644
--- a/data/tilesets/secondary/school/palettes/7.pal
+++ b/data/tilesets/secondary/school/palettes/07.pal
diff --git a/data/tilesets/secondary/school/palettes/8.pal b/data/tilesets/secondary/school/palettes/08.pal
index 1557a55f0..1557a55f0 100644
--- a/data/tilesets/secondary/school/palettes/8.pal
+++ b/data/tilesets/secondary/school/palettes/08.pal
diff --git a/data/tilesets/secondary/school/palettes/9.pal b/data/tilesets/secondary/school/palettes/09.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/school/palettes/9.pal
+++ b/data/tilesets/secondary/school/palettes/09.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/00.pal
index ed708dd79..ed708dd79 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/0.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/00.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/01.pal
index 4d2b48991..4d2b48991 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/1.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/01.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/02.pal
index 878c13c95..878c13c95 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/2.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/02.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/03.pal
index bed4c20c3..bed4c20c3 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/3.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/03.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/04.pal
index b77ba3e87..b77ba3e87 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/4.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/04.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/05.pal
index 74a2a9ed0..74a2a9ed0 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/5.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/05.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/6.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/06.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/07.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/7.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/07.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/08.pal
index 370a3d2db..370a3d2db 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/8.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/08.pal
diff --git a/data/tilesets/secondary/sea_cottage/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/09.pal
index 1193cc807..1193cc807 100644
--- a/data/tilesets/secondary/sea_cottage/palettes/9.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/09.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/0.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/00.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/1.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/01.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/2.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/02.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/3.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/03.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/4.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/04.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/5.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/05.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/06.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/6.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/06.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/07.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/7.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/07.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/08.pal
index d96f3f0fc..d96f3f0fc 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/8.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/08.pal
diff --git a/data/tilesets/secondary/seafoam_islands/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/09.pal
index 1a1dc881b..1a1dc881b 100644
--- a/data/tilesets/secondary/seafoam_islands/palettes/9.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/09.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/00.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/01.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/01.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/02.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/03.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/04.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/04.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/05.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/05.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/06.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/06.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/07.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/08.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/08.pal
diff --git a/data/tilesets/secondary/sevii_islands_123/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/09.pal
index b66fdcdbf..b66fdcdbf 100644
--- a/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/09.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/00.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/01.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/01.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/02.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/03.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/04.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/04.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/05.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/05.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/06.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/06.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/07.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/08.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/08.pal
diff --git a/data/tilesets/secondary/sevii_islands_45/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/09.pal
index 5ac617b25..5ac617b25 100644
--- a/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/09.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/00.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/01.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/01.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/02.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/03.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/04.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/04.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/05.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/06.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/06.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/07.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/07.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/08.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/08.pal
diff --git a/data/tilesets/secondary/sevii_islands_67/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/09.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/09.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/00.pal
index 28232d99e..28232d99e 100644
--- a/data/tilesets/secondary/ss_anne/palettes/0.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/00.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/01.pal
index b43532470..b43532470 100644
--- a/data/tilesets/secondary/ss_anne/palettes/1.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/01.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/02.pal
index e267ae90e..e267ae90e 100644
--- a/data/tilesets/secondary/ss_anne/palettes/2.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/02.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/03.pal
index 503f22878..503f22878 100644
--- a/data/tilesets/secondary/ss_anne/palettes/3.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/03.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/04.pal
index cdf1b6190..cdf1b6190 100644
--- a/data/tilesets/secondary/ss_anne/palettes/4.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/04.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/05.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/ss_anne/palettes/5.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/05.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/06.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/ss_anne/palettes/6.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/06.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/07.pal
index e9848a1c0..e9848a1c0 100644
--- a/data/tilesets/secondary/ss_anne/palettes/7.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/07.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/08.pal
index b5c80c8f4..b5c80c8f4 100644
--- a/data/tilesets/secondary/ss_anne/palettes/8.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/08.pal
diff --git a/data/tilesets/secondary/ss_anne/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/09.pal
index b66b2399a..b66b2399a 100644
--- a/data/tilesets/secondary/ss_anne/palettes/9.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/09.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/00.pal
index 83b30fc17..83b30fc17 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/00.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/01.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/02.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/03.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/04.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/05.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/05.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/06.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/07.pal
index dfa779635..dfa779635 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/07.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/08.pal
index fd7d8a9d7..fd7d8a9d7 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/08.pal
diff --git a/data/tilesets/secondary/tanoby_ruins/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/09.pal
index 0d43d6ef9..0d43d6ef9 100644
--- a/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/09.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/00.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/0.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/00.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/1.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/01.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/2.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/02.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/3.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/03.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/4.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/04.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/05.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/5.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/05.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/6.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/06.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/07.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/7.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/07.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/08.pal
index 317213c42..317213c42 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/8.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/08.pal
diff --git a/data/tilesets/secondary/trainer_tower/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/09.pal
index 19dc9a47e..19dc9a47e 100644
--- a/data/tilesets/secondary/trainer_tower/palettes/9.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/09.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/00.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/underground_path/palettes/0.pal
+++ b/data/tilesets/secondary/underground_path/palettes/00.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/01.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/underground_path/palettes/1.pal
+++ b/data/tilesets/secondary/underground_path/palettes/01.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/02.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/underground_path/palettes/2.pal
+++ b/data/tilesets/secondary/underground_path/palettes/02.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/03.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/underground_path/palettes/3.pal
+++ b/data/tilesets/secondary/underground_path/palettes/03.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/04.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/underground_path/palettes/4.pal
+++ b/data/tilesets/secondary/underground_path/palettes/04.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/05.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/underground_path/palettes/5.pal
+++ b/data/tilesets/secondary/underground_path/palettes/05.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/06.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/underground_path/palettes/6.pal
+++ b/data/tilesets/secondary/underground_path/palettes/06.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/07.pal
index 23e995640..23e995640 100644
--- a/data/tilesets/secondary/underground_path/palettes/7.pal
+++ b/data/tilesets/secondary/underground_path/palettes/07.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/08.pal
index 3ce3570a1..3ce3570a1 100644
--- a/data/tilesets/secondary/underground_path/palettes/8.pal
+++ b/data/tilesets/secondary/underground_path/palettes/08.pal
diff --git a/data/tilesets/secondary/underground_path/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/09.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/underground_path/palettes/9.pal
+++ b/data/tilesets/secondary/underground_path/palettes/09.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/00.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/01.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/02.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/03.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/04.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/05.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/06.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/06.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/07.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/07.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/08.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/08.pal
diff --git a/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/09.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/00.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/01.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/02.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/03.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/04.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/05.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/06.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/06.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/07.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/07.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/08.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/08.pal
diff --git a/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/09.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/00.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/01.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/01.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/02.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/03.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/03.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/04.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/04.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/05.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/05.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/06.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/06.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/07.pal
index 17b1a0ed2..17b1a0ed2 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/07.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/08.pal
index 7179b91bd..7179b91bd 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/08.pal
diff --git a/data/tilesets/secondary/vermilion_city/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/09.pal
index 746dac7da..746dac7da 100644
--- a/data/tilesets/secondary/vermilion_city/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/09.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/01.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/02.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/03.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/07.pal
index efd64bcc5..efd64bcc5 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/08.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/vermilion_gym/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/vermilion_gym/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/09.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/00.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/viridian_city/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/00.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/01.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/viridian_city/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/01.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/02.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/viridian_city/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/02.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/03.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/viridian_city/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/03.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/04.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/viridian_city/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/04.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/05.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/viridian_city/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/05.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/06.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/viridian_city/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/06.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/07.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/viridian_city/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/07.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/08.pal
index 219129eba..219129eba 100644
--- a/data/tilesets/secondary/viridian_city/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/08.pal
diff --git a/data/tilesets/secondary/viridian_city/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/09.pal
index 0aa2b58dc..0aa2b58dc 100644
--- a/data/tilesets/secondary/viridian_city/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/09.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/00.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/00.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/01.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/01.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/02.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/02.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/03.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/03.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/04.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/04.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/05.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/05.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/06.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/06.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/07.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/07.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/08.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/08.pal
diff --git a/data/tilesets/secondary/viridian_forest/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/09.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/viridian_forest/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/09.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/00.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/00.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/01.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/01.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/02.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/02.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/03.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/03.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/04.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/04.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/05.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/05.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/06.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/07.pal
index f55e52fe2..f55e52fe2 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/07.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/08.pal
index 3a7dbc274..3a7dbc274 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/08.pal
diff --git a/data/tilesets/secondary/viridian_gym/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/09.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/viridian_gym/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/09.pal
diff --git a/data/trainer_see.s b/data/trainer_see.s
deleted file mode 100644
index 3014d8ba0..000000000
--- a/data/trainer_see.s
+++ /dev/null
@@ -1,97 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83C6AC8::
-	.incbin "graphics/object_events/emoticons.4bpp"
-
-gUnknown_83C7248:: @ 83C7248
-	.4byte IsTrainerInRangeSouth
-	.4byte IsTrainerInRangeNorth
-	.4byte IsTrainerInRangeWest
-	.4byte IsTrainerInRangeEast
-
-gUnknown_83C7258:: @ 83C7258
-	.4byte sub_8081F34
-	.4byte sub_8081F38
-	.4byte sub_8081F90
-	.4byte sub_8081FD0
-	.4byte sub_808202C
-	.4byte sub_80820BC
-	.4byte sub_8082100
-	.4byte sub_8082134
-	.4byte sub_8082150
-	.4byte sub_8082184
-	.4byte sub_80821DC
-	.4byte sub_8082250
-	.4byte sub_808226C
-	.4byte sub_80822CC
-	.4byte sub_808237C
-
-gUnknown_83C7294:: @ 83C7294
-	.4byte sub_8082150
-	.4byte sub_8082184
-	.4byte sub_80821DC
-	.4byte sub_8082250
-
-gOamData_83C72A4::
-	.4byte 0x40000000, 0x00000400
-
-gSpriteImages_83C72AC::
-	.4byte gUnknown_83C6AC8 + 0x000, 0x80
-	.4byte gUnknown_83C6AC8 + 0x080, 0x80
-	.4byte gUnknown_83C6AC8 + 0x100, 0x80
-	.4byte gUnknown_83C6AC8 + 0x300, 0x80
-	.4byte gUnknown_83C6AC8 + 0x380, 0x80
-	.4byte gUnknown_83C6AC8 + 0x400, 0x80
-	.4byte gUnknown_83C6AC8 + 0x180, 0x80
-	.4byte gUnknown_83C6AC8 + 0x200, 0x80
-	.4byte gUnknown_83C6AC8 + 0x280, 0x80
-	.4byte gUnknown_83C6AC8 + 0x480, 0x80
-	.4byte gUnknown_83C6AC8 + 0x500, 0x80
-	.4byte gUnknown_83C6AC8 + 0x580, 0x80
-	.4byte gUnknown_83C6AC8 + 0x600, 0x80
-	.4byte gUnknown_83C6AC8 + 0x680, 0x80
-	.4byte gUnknown_83C6AC8 + 0x700, 0x80
-
-gAnimCmd_83C7324::
-	obj_image_anim_frame 0x0000, 0x0004
-	obj_image_anim_frame 0x0001, 0x0004
-	obj_image_anim_frame 0x0002, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7334::
-	obj_image_anim_frame 0x0006, 0x0004
-	obj_image_anim_frame 0x0007, 0x0004
-	obj_image_anim_frame 0x0008, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7344::
-	obj_image_anim_frame 0x0003, 0x0004
-	obj_image_anim_frame 0x0004, 0x0004
-	obj_image_anim_frame 0x0005, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7354::
-	obj_image_anim_frame 0x0009, 0x0004
-	obj_image_anim_frame 0x000a, 0x0004
-	obj_image_anim_frame 0x000b, 0x0034
-	obj_image_anim_end
-
-gAnimCmd_83C7364::
-	obj_image_anim_frame 0x000c, 0x0004
-	obj_image_anim_frame 0x000d, 0x0004
-	obj_image_anim_frame 0x000e, 0x0034
-	obj_image_anim_end
-
-gSpriteAnimTable_83C7374::
-	.4byte gAnimCmd_83C7324
-    .4byte gAnimCmd_83C7334
-    .4byte gAnimCmd_83C7344
-    .4byte gAnimCmd_83C7354
-    .4byte gAnimCmd_83C7364
-
-gUnknown_83C7388:: @ 83C7388
-	spr_template 65535, 65535, gOamData_83C72A4, gSpriteAnimTable_83C7374, gSpriteImages_83C72AC, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably