4 files changed, 0 insertions, 1655 deletions
diff --git a/data/pokenav.s b/data/pokenav.s
deleted file mode 100644
index 006d49eaf..000000000
--- a/data/pokenav.s
+++ /dev/null
@@ -1,947 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-
-
-
-
-
-
-	.align 2
-gUnknown_083E31B0:: @ 83E31B0
-	.4byte PCText_CheckMap
-	.4byte PCText_CheckPoke
-	.4byte PCText_CheckTrainer
-	.4byte PCText_CheckRibbons
-	.4byte PCText_PutAwayNav
-	.4byte PCText_NoRibbonWin
-	.4byte PCText_NoTrainers
-
-	.align 2
-gUnknown_083E31CC:: @ 83E31CC
-	.4byte PCText_CheckParty
-	.4byte PCText_CheckPokeAll
-	.4byte PCText_ReturnToNav
-
-	.align 2
-gUnknown_083E31D8:: @ 83E31D8
-	.4byte PCText_FindCool
-	.4byte PCText_FindBeauty
-	.4byte PCText_FindCute
-	.4byte PCText_FindSmart
-	.4byte PCText_FindTough
-	.4byte PCText_ReturnToCondition
-
-	.align 2
-gPokenavCityMaps:: @ 83E31F0
-	.4byte gPokenavCityMap_Littleroot_0, NULL
-	.4byte gPokenavCityMap_Oldale_0, NULL
-	.4byte gPokenavCityMap_Dewford_0, NULL
-	.4byte gPokenavCityMap_Lavaridge_0, NULL
-	.4byte gPokenavCityMap_Fallarbor_0, NULL
-	.4byte gPokenavCityMap_Verdanturf_0, NULL
-	.4byte gPokenavCityMap_Pacifidlog_0, NULL
-	.4byte gPokenavCityMap_Petalburg_0, NULL
-	.4byte gPokenavCityMap_Slateport_0, gPokenavCityMap_Slateport_1
-	.4byte gPokenavCityMap_Mauville_0, gPokenavCityMap_Mauville_1
-	.4byte gPokenavCityMap_Rustboro_0, gPokenavCityMap_Rustboro_1
-	.4byte gPokenavCityMap_Fortree_0, NULL
-	.4byte gPokenavCityMap_Lilycove_0, gPokenavCityMap_Lilycove_1
-	.4byte gPokenavCityMap_Mossdeep_0, gPokenavCityMap_Mossdeep_1
-	.4byte gPokenavCityMap_Sootopolis_0, NULL
-	.4byte gPokenavCityMap_EverGrande_0, gPokenavCityMap_EverGrande_1
-
-	.align 2
-gUnknown_083E3270:: @ 83E3270
-	.4byte sub_80F0A24
-	.4byte sub_80F0A24
-	.4byte sub_80F0A74
-
-	.align 2
-gPokenavIconPalette::
-	.incbin "graphics/pokenav/icon.gbapal"
-
-	.align 2
-gUnknown_083E329C:: @ 83E329C
-	.incbin "graphics/pokenav/icon.4bpp.lz"
-
-	.align 2
-gPokenavPokeballTiles::
-	.incbin "graphics/pokenav/pokeball.4bpp"
-
-	.align 2
-gUnknown_083E3780: @ 83E3780
-	.incbin "graphics/pokenav/83E3780.4bpp"
-
-	.align 2
-gPokenavSparkle_Pal::
-	.incbin "graphics/pokenav/sparkle.gbapal"
-
-	.align 2
-gPokenavSparkle_Gfx::
-	.incbin "graphics/pokenav/sparkle.4bpp"
-
-	.align 2
-gPokenavUpDownArrows_Gfx::
-	.incbin "graphics/pokenav/arrows.4bpp"
-
-	.align 2
-gUnknown_083E3BC0:: @ 83E3BC0
-	.incbin "graphics/pokenav/83E3BC0.bin"
-
-	.align 2
-gTiles_083E3BE0::
-	.incbin "graphics/unknown/unknown_3E3BE0.4bpp"
-
-	.align 2
-gUnknown_083E3C60:: @ 83E3C60
-	.incbin "graphics/misc/ribbons_cool.gbapal"
-	.incbin "graphics/misc/ribbons_beauty.gbapal"
-	.incbin "graphics/misc/ribbons_cute.gbapal"
-	.incbin "graphics/misc/ribbons_smart.gbapal"
-	.incbin "graphics/misc/ribbons_tough.gbapal"
-
-	.align 2
-gUnknown_083E3D00:: @ 83E3D00
-	.incbin "graphics/misc/ribbons_full.4bpp.lz"
-
-	.align 2
-PokenavBlueLightPalette:
-	.incbin "graphics/pokenav/blue_light.gbapal"
-
-	.align 2
-PokenavBlueLightTiles:
-	.incbin "graphics/pokenav/blue_light.4bpp"
-
-	.align 2
-Palette_3E42D8: @ 83E42D8
-	.incbin "graphics/pokenav/83E42D8.gbapal"
-
-	.align 1
-gUnknown_083E42F8:: @ 83E42F8
-	.2byte  0x408
-	.2byte  0x408
-	.2byte  0x507
-	.2byte  0x507
-	.2byte  0x606
-	.2byte  0x606
-	.2byte  0x805
-	.2byte  0x805
-	.2byte  0xA04
-	.2byte  0xA04
-	.2byte  0xC03
-	.2byte  0xC03
-	.2byte  0xE02
-	.2byte  0xE02
-	.2byte 0x1000
-	.2byte 0x1000
-
-	.align 2
-gOamData_83E4318:: @ 83E4318
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_83E4320:: @ 83E4320
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4328:: @ 83E4328
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4330:: @ 83E4330
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4338:: @ 83E4338
-	obj_image_anim_frame 24, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4340:: @ 83E4340
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4348:: @ 83E4348
-	obj_image_anim_frame 40, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4350:: @ 83E4350
-	obj_image_anim_frame 48, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4358:: @ 83E4358
-	obj_image_anim_frame 56, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4360:: @ 83E4360
-	obj_image_anim_frame 64, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4368:: @ 83E4368
-	obj_image_anim_frame 72, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4370:: @ 83E4370
-	obj_image_anim_frame 80, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4378:: @ 83E4378
-	obj_image_anim_frame 88, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4380:: @ 83E4380
-	obj_image_anim_frame 96, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4388:: @ 83E4388
-	obj_image_anim_frame 104, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4390:: @ 83E4390
-	obj_image_anim_frame 112, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4398:: @ 83E4398
-	obj_image_anim_frame 120, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43A0:: @ 83E43A0
-	obj_image_anim_frame 128, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43A8:: @ 83E43A8
-	obj_image_anim_frame 136, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43B0:: @ 83E43B0
-	obj_image_anim_frame 144, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43B8:: @ 83E43B8
-	obj_image_anim_frame 152, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43C0:: @ 83E43C0
-	obj_image_anim_frame 160, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43C8:: @ 83E43C8
-	obj_image_anim_frame 168, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43D0:: @ 83E43D0
-	obj_image_anim_frame 176, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E43D8:: @ 83E43D8
-	obj_image_anim_frame 184, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83E43E0:: @ 83E43E0
-	.4byte gSpriteAnim_83E4320
-	.4byte gSpriteAnim_83E4328
-	.4byte gSpriteAnim_83E4330
-	.4byte gSpriteAnim_83E4338
-	.4byte gSpriteAnim_83E4340
-	.4byte gSpriteAnim_83E4348
-	.4byte gSpriteAnim_83E4350
-	.4byte gSpriteAnim_83E4358
-	.4byte gSpriteAnim_83E4360
-	.4byte gSpriteAnim_83E4368
-	.4byte gSpriteAnim_83E4370
-	.4byte gSpriteAnim_83E4378
-	.4byte gSpriteAnim_83E4380
-	.4byte gSpriteAnim_83E4388
-	.4byte gSpriteAnim_83E4390
-	.4byte gSpriteAnim_83E4398
-	.4byte gSpriteAnim_83E43A0
-	.4byte gSpriteAnim_83E43A8
-	.4byte gSpriteAnim_83E43B0
-	.4byte gSpriteAnim_83E43B8
-	.4byte gSpriteAnim_83E43C0
-	.4byte gSpriteAnim_83E43C8
-	.4byte gSpriteAnim_83E43D0
-	.4byte gSpriteAnim_83E43D8
-
-	.align 2
-gSpriteAffineAnim_83E4440:: @ 83E4440
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 16
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83E4450:: @ 83E4450
-	.4byte gSpriteAffineAnim_83E4440
-
-	.align 2
-gSpriteTemplate_83E4454:: @ 83E4454
-	spr_template 0, 0, gOamData_83E4318, gSpriteAnimTable_83E43E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteSheet_PokenavBlueLight:: @ 83E446C
-	obj_tiles PokenavBlueLightTiles, 0x100, 25
-
-	.align 2
-gSpritePalette_PokenavBlueLight:: @ 83E4474
-	obj_pal PokenavBlueLightPalette, 17
-
-	.align 2
-gOamData_83E447C:: @ 83E447C
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_83E4484:: @ 83E4484
-	spr_template 25, 17, gOamData_83E447C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2654
-
-gUnknown_083E449C:: @ 83E449C
-	obj_pal gPokenavMenuOptions3_Pal, 2
-	obj_pal gPokenavCondition5_Pal, 3
-	obj_pal 0x0, 0
-
-	.align 2
-gOamData_83E44B4:: @ 83E44B4
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_83E44BC:: @ 83E44BC
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E44C4:: @ 83E44C4
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E44CC:: @ 83E44CC
-	obj_image_anim_frame 64, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83E44D4:: @ 83E44D4
-	.4byte gSpriteAnim_83E44BC
-	.4byte gSpriteAnim_83E44C4
-	.4byte gSpriteAnim_83E44CC
-
-	.align 2
-gSpriteTemplate_83E44E0:: @ 83E44E0
-	spr_template 1, 2, gOamData_83E44B4, gSpriteAnimTable_83E44D4, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC
-
-	.align 2
-gSpriteTemplate_83E44F8:: @ 83E44F8
-	spr_template 1, 3, gOamData_83E44B4, gSpriteAnimTable_83E44D4, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC
-
-	.align 2
-gOamData_83E4510:: @ 83E4510
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_83E4518:: @ 83E4518
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4520:: @ 83E4520
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83E4528:: @ 83E4528
-	.4byte gSpriteAnim_83E4518
-	.4byte gSpriteAnim_83E4520
-
-	.align 2
-gSpriteTemplate_83E4530:: @ 83E4530
-	spr_template 2, 2, gOamData_83E4510, gSpriteAnimTable_83E4528, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC
-
-	.align 2
-gSpriteTemplate_83E4548:: @ 83E4548
-	spr_template 2, 3, gOamData_83E4510, gSpriteAnimTable_83E4528, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC
-
-	.align 2
-gOamData_83E4560:: @ 83E4560
-	.2byte 0x0000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gUnknown_083E4568:: @ 83E4568
-	obj_tiles NULL, 0x800, 6
-
-	.align 2
-gSpriteTemplate_83E4570:: @ 83E4570
-	spr_template 6, 6, gOamData_83E4560, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2E00
-
-	.align 2
-gUnknown_083E4588:: @ 83E4588
-	obj_pal NULL, 6
-
-	.align 2
-gUnknown_083E4590:: @ 83E4590
-	obj_tiles gPokenavArrow_Gfx, 0x40, 9
-	obj_tiles gPokenavUpDownArrows_Gfx, 0x80, 10
-	null_obj_tiles
-
-	.align 2
-gUnknown_083E45A8:: @ 83E45A8
-	obj_pal gPokenavArrowsPalette, 9
-
-	.align 2
-gOamData_83E45B0:: @ 83E45B0
-	.2byte 0x8000
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gSpriteTemplate_83E45B8:: @ 83E45B8
-	spr_template 9, 9, gOamData_83E45B0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F3190
-
-	.align 2
-gSpriteAnim_83E45D0:: @ 83E45D0
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E45D8:: @ 83E45D8
-	obj_image_anim_frame 2, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83E45E0:: @ 83E45E0
-	.4byte gSpriteAnim_83E45D0
-	.4byte gSpriteAnim_83E45D8
-
-	.align 2
-gOamData_83E45E8:: @ 83E45E8
-	.2byte 0x4000
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gSpriteTemplate_83E45F0:: @ 83E45F0
-	spr_template 10, 9, gOamData_83E45E8, gSpriteAnimTable_83E45E0, NULL, gDummySpriteAffineAnimTable, sub_80F31AC
-
-	.align 2
-gOamData_83E4608:: @ 83E4608
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0800
-
-	.align 2
-gSpriteAnim_83E4610:: @ 83E4610
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83E4618:: @ 83E4618
-	obj_image_anim_frame 4, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83E4620:: @ 83E4620
-	.4byte gSpriteAnim_83E4610
-	.4byte gSpriteAnim_83E4618
-
-	.align 2
-gUnknown_083E4628:: @ 83E4628
-	obj_tiles gPokenavPokeballTiles, 0x100, 3
-	obj_tiles gUnknown_083E3780, 0x20, 4
-	obj_tiles gPokenavConditionMenuCancel_Gfx, 0x100, 5
-	null_obj_tiles
-
-	.align 2
-gUnknown_083E4648:: @ 83E4648
-	obj_pal gPokenavConditionPokeball_Pal, 4
-	obj_pal gPokenavCondition4_Pal, 5
-	.space 8
-
-	.align 2
-gSpriteTemplate_83E4660:: @ 83E4660
-	spr_template 3, 4, gOamData_83E4608, gSpriteAnimTable_83E4620, NULL, gDummySpriteAffineAnimTable, sub_80F3328
-
-	.align 1
-gUnknown_083E4678:: @ 83E4678
-	.incbin "graphics/pokenav/83E4678.gbapal"
-
-	.align 2
-gPokenavRibbonsIconGfx:: @ 83E4698
-	.2byte  0, 0
-	.2byte  1, 0
-	.2byte  2, 0
-	.2byte  3, 0
-	.2byte  4, 0
-	.2byte  1, 1
-	.2byte  2, 1
-	.2byte  3, 1
-	.2byte  4, 1
-	.2byte  1, 2
-	.2byte  2, 2
-	.2byte  3, 2
-	.2byte  4, 2
-	.2byte  1, 3
-	.2byte  2, 3
-	.2byte  3, 3
-	.2byte  4, 3
-	.2byte  1, 4
-	.2byte  2, 4
-	.2byte  3, 4
-	.2byte  4, 4
-	.2byte  5, 0
-	.2byte  6, 0
-	.2byte  7, 1
-	.2byte  8, 2
-	.2byte  9, 1
-	.2byte  9, 3
-	.2byte  9, 4
-	.2byte 10, 3
-	.2byte 10, 4
-	.2byte 11, 0
-	.2byte 11, 1
-
-	.align 2
-gOamData_83E4718:: @ 83E4718
-	.2byte 0x0100
-	.2byte 0x8000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAffineAnim_83E4720:: @ 83E4720
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83E4730:: @ 83E4730
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 4
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83E4748:: @ 83E4748
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFE0, 0xFFE0, 0, 4
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83E4760:: @ 83E4760
-	.4byte gSpriteAffineAnim_83E4720
-	.4byte gSpriteAffineAnim_83E4730
-	.4byte gSpriteAffineAnim_83E4748
-
-	.align 2
-gSpriteTemplate_83E476C:: @ 83E476C
-	spr_template 11, 10, gOamData_83E4718, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83E4760, SpriteCallbackDummy
-
-	.align 2
-gUnknown_083E4784:: @ 83E4784
-	obj_tiles gPokenavSparkle_Gfx, 896, 0x0017
-
-	.align 2
-gUnknown_083E478C:: @ 83E478C
-	obj_pal gPokenavSparkle_Pal, 0x000f
-
-	.align 2
-gUnknown_083E4794:: @ 83E4794
-	.2byte   0, -35
-	.2byte  20, -28
-	.2byte  33, -10
-	.2byte  33,  10
-	.2byte  20,  28
-	.2byte   0,  35
-	.2byte -20,  28
-	.2byte -33,  10
-	.2byte -33, -10
-	.2byte -20, -28
-
-	.align 2
-gOamData_83E47BC:: @ 83E47BC
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_83E47C4:: @ 83E47C4
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 20, 5
-	obj_image_anim_frame 24, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83E47E4:: @ 83E47E4
-	.4byte gSpriteAnim_83E47C4
-	.4byte gSpriteAnim_83E47C4 + 0x8
-	.4byte gSpriteAnim_83E47C4 + 0x10
-	.4byte gSpriteAnim_83E47C4 + 0x18
-
-	@ unused?
-	.4byte gSpriteAnim_83E47C4 + 0x20
-	.4byte gSpriteAnim_83E47C4 + 0x28
-	.4byte gSpriteAnim_83E47C4 + 0x30
-
-	.align 2
-gSpriteTemplate_83E4800:: @ 83E4800
-	spr_template 23, 15, gOamData_83E47BC, gSpriteAnimTable_83E47E4, NULL, gDummySpriteAffineAnimTable, sub_80F3E9C
-
-	.align 2
-gUnknown_083E4818:: @ 83E4818
-	obj_pal gPokenavIconPalette, 16
-
-	.align 2
-gSpriteAnim_83E4820:: @ 83E4820
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 16, 12
-	obj_image_anim_frame 32, 12
-	obj_image_anim_frame 48, 12
-	obj_image_anim_frame 64, 12
-	obj_image_anim_frame 80, 12
-	obj_image_anim_frame 96, 12
-	obj_image_anim_frame 112, 12
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83E4844:: @ 83E4844
-	.4byte gSpriteAnim_83E4820
-
-	.align 2
-gOamData_83E4848:: @ 83E4848
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0000
-
-	.align 2
-gSpriteTemplate_83E4850:: @ 83E4850
-	spr_template 24, 16, gOamData_83E4848, gSpriteAnimTable_83E4844, NULL, gDummySpriteAffineAnimTable, sub_80F4138
-
-	.align 2
-gUnknown_083E4868:: @ 83E4868
-	obj_pal Palette_3E42D8, 18
-
-	.align 2
-gOamData_83E4870:: @ 83E4870
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0C00
-
-	.align 2
-gSpriteTemplate_83E4878:: @ 83E4878
-	spr_template 26, 18, gOamData_83E4870, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_083E4890:: @ 83E4890
-	.byte  4
-	.byte  5
-	.byte  6
-	.byte  7
-	.byte  8
-	.byte  9
-	.byte  9
-	.byte 10
-	.byte 10
-	.byte 11
-	.byte 11
-	.byte 12
-	.byte 12
-	.byte 13
-	.byte 13
-	.byte 13
-	.byte 13
-	.byte 14
-	.byte 14
-	.byte 14
-	.byte 14
-	.byte 15
-	.byte 15
-	.byte 15
-	.byte 15
-	.byte 16
-	.byte 16
-	.byte 16
-	.byte 16
-	.byte 16
-	.byte 16
-	.byte 17
-	.byte 17
-	.byte 17
-	.byte 17
-	.byte 17
-	.byte 17
-	.byte 18
-	.byte 18
-	.byte 18
-	.byte 18
-	.byte 18
-	.byte 18
-	.byte 19
-	.byte 19
-	.byte 19
-	.byte 19
-	.byte 19
-	.byte 19
-	.byte 19
-	.byte 19
-	.byte 20
-	.byte 20
-	.byte 20
-	.byte 20
-	.byte 20
-	.byte 20
-	.byte 20
-	.byte 20
-	.byte 21
-	.byte 21
-	.byte 21
-	.byte 21
-	.byte 21
-	.byte 21
-	.byte 21
-	.byte 21
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 22
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 23
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 24
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 25
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 26
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 27
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 28
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 29
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 30
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 31
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 32
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 33
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 34
-	.byte 35
-
-	.align 2
-gUnknown_083E4990:: @ 83E4990
-	.4byte REG_WIN0H
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-
-	.align 1
-gUnknown_083E499C:: @ 83E499C
-	.2byte 0x43
-	.2byte 0x32
-	.2byte 0x33
-	.2byte 0x34
-	.2byte 0x35
-	.2byte 0x36
-	.2byte 0x44
-	.2byte 0x45
-	.2byte 0x46
-	.2byte 0x47
-	.2byte 0x48
-	.2byte 0x49
-	.2byte 0x4A
-	.2byte 0x4B
-	.2byte 0x4C
-	.2byte 0x4D
-	.2byte 0x4E
diff --git a/data/text/gift_ribbon_descriptions.inc b/data/text/gift_ribbon_descriptions.inc
deleted file mode 100644
index 798d291b9..000000000
--- a/data/text/gift_ribbon_descriptions.inc
+++ /dev/null
@@ -1,207 +0,0 @@
-gGiftRibbonDescriptionPart1_2003RegionalTourney:
-	.string "2003 REGIONAL TOURNEY$"
-
-gGiftRibbonDescriptionPart2_Champion:
-	.string "CHAMPION RIBBON$"
-
-gGiftRibbonDescriptionPart1_2003NationalTourney:
-	.string "2003 NATIONAL TOURNEY$"
-
-gGiftRibbonDescriptionPart1_2003GlobalCup:
-	.string "2003 GLOBAL CUP$"
-
-gGiftRibbonDescriptionPart2_RunnerUp:
-	.string "Runner-up RIBBON$"
-
-gGiftRibbonDescriptionPart2_Semifinalist:
-	.string "Semifinalist RIBBON$"
-
-gGiftRibbonDescriptionPart1_2004RegionalTourney:
-	.string "2004 REGIONAL TOURNEY$"
-
-gGiftRibbonDescriptionPart1_2004NationalTourney:
-	.string "2004 NATIONAL TOURNEY$"
-
-gGiftRibbonDescriptionPart1_2004GlobalCup:
-	.string "2004 GLOBAL CUP$"
-
-gGiftRibbonDescriptionPart1_2005RegionalTourney:
-	.string "2005 REGIONAL TOURNEY$"
-
-gGiftRibbonDescriptionPart1_2005NationalTourney:
-	.string "2005 NATIONAL TOURNEY$"
-
-gGiftRibbonDescriptionPart1_2005GlobalCup:
-	.string "2005 GLOBAL CUP$"
-
-gGiftRibbonDescriptionPart1_PokemonBattleCup:
-	.string "POKéMON BATTLE CUP$"
-
-gGiftRibbonDescriptionPart2_Participation:
-	.string "Participation RIBBON$"
-
-gGiftRibbonDescriptionPart1_PokemonLeague:
-	.string "POKéMON LEAGUE$"
-
-gGiftRibbonDescriptionPart1_AdvanceCup:
-	.string "ADVANCE CUP$"
-
-gGiftRibbonDescriptionPart1_PokemonTournament:
-	.string "POKéMON Tournament$"
-
-gGiftRibbonDescriptionPart2_Participation2:
-	.string "Participation RIBBON$"
-
-gGiftRibbonDescriptionPart1_PokemonEvent:
-	.string "POKéMON Event$"
-
-gGiftRibbonDescriptionPart1_PokemonFestival:
-	.string "POKéMON Festival$"
-
-gGiftRibbonDescriptionPart1_DifficultyClearing:
-	.string "Difficulty-clearing$"
-
-gGiftRibbonDescriptionPart2_Commemorative:
-	.string "Commemorative RIBBON$"
-
-gGiftRibbonDescriptionPart1_ClearingAllDifficulties:
-	.string "RIBBON awarded for$"
-
-gGiftRibbonDescriptionPart2_ClearingAllDifficulties:
-	.string "clearing all difficulties.$"
-
-gGiftRibbonDescriptionPart1_100StraightWin:
-	.string "100-straight Win$"
-
-gGiftRibbonDescriptionPart1_DarknessTower:
-	.string "DARKNESS TOWER Clear$"
-
-gGiftRibbonDescriptionPart1_RedTower:
-	.string "RED TOWER Clear$"
-
-gGiftRibbonDescriptionPart1_BlackironTower:
-	.string "BLACKIRON TOWER Clear$"
-
-gGiftRibbonDescriptionPart1_FinalTower:
-	.string "FINAL TOWER Clear$"
-
-gGiftRibbonDescriptionPart1_LegendMaking:
-	.string "Legend-making$"
-
-gGiftRibbonDescriptionPart1_PokemonCenterTokyo:
-	.string "POKéMON CENTER TOKYO$"
-
-gGiftRibbonDescriptionPart1_PokemonCenterOsaka:
-	.string "POKéMON CENTER OSAKA$"
-
-gGiftRibbonDescriptionPart1_PokemonCenterNagoya:
-	.string "POKéMON CENTER NAGOYA$"
-
-gGiftRibbonDescriptionPart1_PokemonCenterNY:
-	.string "POKéMON CENTER NY$"
-
-gGiftRibbonDescriptionPart1_SummerHolidays:
-	.string "Summer Holidays RIBBON$"
-
-gGiftRibbonDescriptionPart2_EmptyString:
-	.string "$"
-
-gGiftRibbonDescriptionPart1_WinterHolidays:
-	.string "Winter Holidays RIBBON$"
-
-gGiftRibbonDescriptionPart1_SpringHolidays:
-	.string "Spring Holidays RIBBON$"
-
-gGiftRibbonDescriptionPart1_Evergreen:
-	.string "Evergreen RIBBON$"
-
-gGiftRibbonDescriptionPart1_SpecialHoliday:
-	.string "Special Holiday RIBBON$"
-
-gGiftRibbonDescriptionPart1_HardWorker:
-	.string "Hard Worker RIBBON$"
-
-gGiftRibbonDescriptionPart1_LotsOfFriends:
-	.string "Lots of Friends RIBBON$"
-
-gGiftRibbonDescriptionPart1_FullOfEnergy:
-	.string "Full of Energy RIBBON$"
-
-gGiftRibbonDescriptionPart1_LovedPokemon:
-	.string "A commemorative RIBBON$"
-
-gGiftRibbonDescriptionPart2_LovedPokemon:
-	.string "for a loved POKéMON.$"
-
-gGiftRibbonDescriptionPart1_LoveForPokemon:
-	.string "RIBBON that shows$"
-
-gGiftRibbonDescriptionPart2_LoveForPokemon:
-	.string "love for POKéMON.$"
-
-	.align 2
-gGiftRibbonDescriptions:: @ 83E158C
-	.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2004RegionalTourney,   gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2004NationalTourney,   gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2004GlobalCup,         gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2004RegionalTourney,   gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2004NationalTourney,   gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2004GlobalCup,         gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2004RegionalTourney,   gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2004NationalTourney,   gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2004GlobalCup,         gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2005RegionalTourney,   gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2005NationalTourney,   gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2005GlobalCup,         gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_2005RegionalTourney,   gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2005NationalTourney,   gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2005GlobalCup,         gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_2005RegionalTourney,   gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2005NationalTourney,   gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_2005GlobalCup,         gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_PokemonBattleCup,      gGiftRibbonDescriptionPart2_Participation
-	.4byte gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_PokemonLeague,         gGiftRibbonDescriptionPart2_Participation
-	.4byte gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_Champion
-	.4byte gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_RunnerUp
-	.4byte gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_Semifinalist
-	.4byte gGiftRibbonDescriptionPart1_AdvanceCup,            gGiftRibbonDescriptionPart2_Participation
-	.4byte gGiftRibbonDescriptionPart1_PokemonTournament,     gGiftRibbonDescriptionPart2_Participation2
-	.4byte gGiftRibbonDescriptionPart1_PokemonEvent,          gGiftRibbonDescriptionPart2_Participation2
-	.4byte gGiftRibbonDescriptionPart1_PokemonFestival,       gGiftRibbonDescriptionPart2_Participation2
-	.4byte gGiftRibbonDescriptionPart1_DifficultyClearing,    gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_ClearingAllDifficulties, gGiftRibbonDescriptionPart2_ClearingAllDifficulties
-	.4byte gGiftRibbonDescriptionPart1_100StraightWin,        gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_DarknessTower,         gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_RedTower,              gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_BlackironTower,        gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_FinalTower,            gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_LegendMaking,          gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_PokemonCenterTokyo,    gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_PokemonCenterOsaka,    gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_PokemonCenterNagoya,   gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_PokemonCenterNY,       gGiftRibbonDescriptionPart2_Commemorative
-	.4byte gGiftRibbonDescriptionPart1_SummerHolidays,        gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_WinterHolidays,        gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_SpringHolidays,        gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_Evergreen,             gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_SpecialHoliday,        gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_HardWorker,            gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_LotsOfFriends,         gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_FullOfEnergy,          gGiftRibbonDescriptionPart2_EmptyString
-	.4byte gGiftRibbonDescriptionPart1_LovedPokemon,          gGiftRibbonDescriptionPart2_LovedPokemon
-	.4byte gGiftRibbonDescriptionPart1_LoveForPokemon,        gGiftRibbonDescriptionPart2_LoveForPokemon
diff --git a/data/text/ribbon_descriptions.inc b/data/text/ribbon_descriptions.inc
deleted file mode 100644
index ebbfc34ff..000000000
--- a/data/text/ribbon_descriptions.inc
+++ /dev/null
@@ -1,84 +0,0 @@
-gRibbonDescriptionPart1_Champion:
-	.string "CHAMPION-beating, HALL$"
-
-gRibbonDescriptionPart2_Champion:
-	.string "OF FAME Member RIBBON$"
-
-gRibbonDescriptionPart1_CoolContest:
-	.string "COOL CONTEST$"
-
-gRibbonDescriptionPart1_BeautyContest:
-	.string "BEAUTY CONTEST$"
-
-gRibbonDescriptionPart1_CuteContest:
-	.string "CUTE CONTEST$"
-
-gRibbonDescriptionPart1_SmartContest:
-	.string "SMART CONTEST$"
-
-gRibbonDescriptionPart1_ToughContest:
-	.string "TOUGH CONTEST$"
-
-gRibbonDescriptionPart2_NormalRank:
-	.string "Normal Rank winner!$"
-
-gRibbonDescriptionPart2_SuperRank:
-	.string "Super Rank winner!$"
-
-gRibbonDescriptionPart2_HyperRank:
-	.string "Hyper Rank winner!$"
-
-gRibbonDescriptionPart2_MasterRank:
-	.string "Master Rank winner!$"
-
-gRibbonDescriptionPart1_Winning:
-	.string "RIBBON for clearing LV50$"
-
-gRibbonDescriptionPart2_Winning:
-	.string "at the BATTLE TOWER.$"
-
-gRibbonDescriptionPart1_Victory:
-	.string "Won for clearing LV100$"
-
-gRibbonDescriptionPart2_Victory:
-	.string "at the BATTLE TOWER.$"
-
-gRibbonDescriptionPart1_Artist:
-	.string "RIBBON for being chosen$"
-
-gRibbonDescriptionPart2_Artist:
-	.string "as a super sketch model.$"
-
-gRibbonDescriptionPart1_Effort:
-	.string "RIBBON awarded for$"
-
-gRibbonDescriptionPart2_Effort:
-	.string "being a hard worker.$"
-
-	.align 2
-gRibbonDescriptions:: @ 83E113C
-	.4byte gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion
-	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank
-	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_SuperRank
-	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_HyperRank
-	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_MasterRank
-	.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank
-	.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank
-	.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank
-	.4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank
-	.4byte gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_NormalRank
-	.4byte gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_SuperRank
-	.4byte gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_HyperRank
-	.4byte gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_MasterRank
-	.4byte gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_NormalRank
-	.4byte gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_SuperRank
-	.4byte gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_HyperRank
-	.4byte gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_MasterRank
-	.4byte gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_NormalRank
-	.4byte gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_SuperRank
-	.4byte gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_HyperRank
-	.4byte gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_MasterRank
-	.4byte gRibbonDescriptionPart1_Winning,       gRibbonDescriptionPart2_Winning
-	.4byte gRibbonDescriptionPart1_Victory,       gRibbonDescriptionPart2_Victory
-	.4byte gRibbonDescriptionPart1_Artist,        gRibbonDescriptionPart2_Artist
-	.4byte gRibbonDescriptionPart1_Effort,        gRibbonDescriptionPart2_Effort
diff --git a/data/text/trainer_eye_descriptions.inc b/data/text/trainer_eye_descriptions.inc
deleted file mode 100644
index 9e20ea8cc..000000000
--- a/data/text/trainer_eye_descriptions.inc
+++ /dev/null
@@ -1,417 +0,0 @@
-TrainerEyeDescription_0:
-	.string "Becalm fighting emotions.$"
-	.string "Fragrant GRASS POKéMON$"
-	.string "Soothing aromas make the$"
-	.string "body and mind healthy.$"
-TrainerEyeDescription_1:
-	.string "Overwhelm with power!$"
-	.string "Craggy ROCK POKéMON$"
-	.string "In search of ancient lore,$"
-	.string "I travel the world.$"
-TrainerEyeDescription_2:
-	.string "I'm going to try hard!$"
-	.string "Good swimmer POKéMON$"
-	.string "I wish I could swim without$"
-	.string "using an inner tube.$"
-TrainerEyeDescription_3:
-	.string "I don't know. I'll try hard.$"
-	.string "WATER POKéMON are buddies.$"
-	.string "It's not like I can't swim.$"
-	.string "I just like my inner tube.$"
-TrainerEyeDescription_4:
-	.string "We split our duties.$"
-	.string "We like friendly POKéMON.$"
-	.string "We enjoy POKéMON together$"
-	.string "as sister and brother.$"
-TrainerEyeDescription_5:
-	.string "Exploit the foe's weakness.$"
-	.string "Balance is crucial.$"
-	.string "My goal is to become the$"
-	.string "POKéMON CHAMPION.$"
-TrainerEyeDescription_6:
-	.string "Upset the opponent.$"
-	.string "Type doesn't matter.$"
-	.string "I'm a top student at the$"
-	.string "TRAINER'S SCHOOL.$"
-TrainerEyeDescription_7:
-	.string "Slow, steady suffering$"
-	.string "Scary to meet at night.$"
-	.string "I see things that others$"
-	.string "can't see...$"
-TrainerEyeDescription_8:
-	.string "Anything to win.$"
-	.string "Gorgeous type!$"
-	.string "I have a pool specially for$"
-	.string "my POKéMON at home.$"
-TrainerEyeDescription_9:
-	.string "I'll lead you astray.$"
-	.string "Cute, of course.$"
-	.string "I love the SAFARI ZONE.$"
-	.string "I seem to end up there.$"
-TrainerEyeDescription_10:
-	.string "Strategy? Who needs it?$"
-	.string "I spent big money on it!$"
-	.string "I, being rich, sleep in a$"
-	.string "custom POKéMON bed.$"
-TrainerEyeDescription_11:
-	.string "Wrestle down with power.$"
-	.string "Took all night to catch...$"
-	.string "Big, burly, and buff$"
-	.string "POKéMON are the best...$"
-TrainerEyeDescription_12:
-	.string "Ram at full speed!$"
-	.string "Funky WATER type!$"
-	.string "If I can't be out swimming,$"
-	.string "I'll be pumping weights.$"
-TrainerEyeDescription_13:
-	.string "Grand slam pummeling!$"
-	.string "FIGHTING type$"
-	.string "Not to brag, but I can bust$"
-	.string "ten roof tiles!$"
-TrainerEyeDescription_14:
-	.string "I'll electrify you!$"
-	.string "They're ELECTRIC!$"
-	.string "I want to make people cry$"
-	.string "with songs from my heart.$"
-TrainerEyeDescription_15:
-	.string "Burn it all down!$"
-	.string "Burn-inducing POKéMON$"
-	.string "When you light a campfire,$"
-	.string "be sure there's some water.$"
-TrainerEyeDescription_16:
-	.string "Hang in and be tenacious!$"
-	.string "I'll raise any POKéMON.$"
-	.string "POKéMON raised in the wild$"
-	.string "grow strong!$"
-TrainerEyeDescription_17:
-	.string "Our love lets us prevail.$"
-	.string "We've had them for years.$"
-	.string "Married 50 years, we've$"
-	.string "devotedly raised POKéMON.$"
-TrainerEyeDescription_18:
-	.string "Attack in waves!$"
-	.string "BUG POKéMON are cool.$"
-	.string "I go into the forest every$"
-	.string "day to catch BUG POKéMON.$"
-TrainerEyeDescription_19:
-	.string "Daze and confuse!$"
-	.string "Ones with weird powers.$"
-	.string "I can see through exactly$"
-	.string "what you're thinking!$"
-TrainerEyeDescription_20:
-	.string "Battle at full power.$"
-	.string "POKéMON of many mysteries$"
-	.string "When we spoke, I was really$"
-	.string "using telepathy.$"
-TrainerEyeDescription_21:
-	.string "Calm and collected.$"
-	.string "POKéMON of distinction$"
-	.string "We enjoy a spot of tea$"
-	.string "every day. It's imported.$"
-TrainerEyeDescription_22:
-	.string "I use my head to battle.$"
-	.string "I love any kind of POKéMON!$"
-	.string "My daddy gives me spending$"
-	.string "money if I ace a test.$"
-TrainerEyeDescription_23:
-	.string "My knowledge rules!$"
-	.string "Any smart POKéMON!$"
-	.string "I want to be a POKéMON$"
-	.string "researcher in the future.$"
-TrainerEyeDescription_24:
-	.string "We talk it over first.$"
-	.string "POKéMON that we both like.$"
-	.string "We're senior and junior$"
-	.string "students into POKéMON!$"
-TrainerEyeDescription_25:
-	.string "Go for it, my dears!$"
-	.string "I have no likes or dislikes.$"
-	.string "While out shopping for$"
-	.string "supper, I battle too.$"
-TrainerEyeDescription_26:
-	.string "I battle with love!$"
-	.string "A POKéMON raised with love!$"
-	.string "It's important to build$"
-	.string "trust with your POKéMON.$"
-TrainerEyeDescription_27:
-	.string "I see through your moves!$"
-	.string "The essence of FIGHTING.$"
-	.string "I'm not ready to give way$"
-	.string "to the young yet!$"
-TrainerEyeDescription_28:
-	.string "Attack while defending$"
-	.string "The FIGHTING type$"
-	.string "Being old, I have my own$"
-	.string "style of battling.$"
-TrainerEyeDescription_29:
-	.string "I do what I can.$"
-	.string "I use different types.$"
-	.string "I'm going to keep working$"
-	.string "until I beat a GYM LEADER.$"
-TrainerEyeDescription_30:
-	.string "I battle patiently.$"
-	.string "WATER POKéMON to battle!$"
-	.string "I'm the world's only guy to$"
-	.string "catch a huge POKéMON!$"
-TrainerEyeDescription_31:
-	.string "Defense is crucial.$"
-	.string "My POKéMON is solid.$"
-	.string "I started this for dieting,$"
-	.string "but I got right into it.$"
-TrainerEyeDescription_32:
-	.string "Push and push again!$"
-	.string "The strength of STEEL$"
-	.string "If you're sweating, get$"
-	.string "fluids into you regularly.$"
-TrainerEyeDescription_33:
-	.string "Exploit the environment!$"
-	.string "All hail the WATER type!$"
-	.string "I won't be beaten by some$"
-	.string "beach bum SWIMMER!$"
-TrainerEyeDescription_34:
-	.string "All-out offensive!$"
-	.string "WATER POKéMON rule!$"
-	.string "I must swim over 6 miles$"
-	.string "every day.$"
-TrainerEyeDescription_35:
-	.string "Speed above all!$"
-	.string "I use a speedy POKéMON.$"
-	.string "A marathon is a challenge$"
-	.string "against your own self.$"
-TrainerEyeDescription_36:
-	.string "Strike before stricken!$"
-	.string "A fast-running POKéMON!$"
-	.string "If you ran and ran, you'd$"
-	.string "become one with the wind.$"
-TrainerEyeDescription_37:
-	.string "It's about POKéMON power!$"
-	.string "See the power of DRAGONS!$"
-	.string "I'll become legendary as the$"
-	.string "strongest one day!$"
-TrainerEyeDescription_38:
-	.string "I'll show you my technique!$"
-	.string "Elegantly wheeling BIRDS$"
-	.string "My BIRD POKéMON, deliver my$"
-	.string "love to that girl!$"
-TrainerEyeDescription_39:
-	.string "You'll suffer from poison!$"
-	.string "Poisonous POKéMON$"
-	.string "I undertake training so$"
-	.string "that I may become a ninja.$"
-TrainerEyeDescription_40:
-	.string "The first strike wins!$"
-	.string "Speedy FIGHTING type$"
-	.string "If my POKéMON lose,$"
-	.string "I'll carry on the fight!$"
-TrainerEyeDescription_41:
-	.string "Go, go, my POKéMON!$"
-	.string "I'll raise anything.$"
-	.string "UV rays are your skin's$"
-	.string "enemy. Get protected.$"
-TrainerEyeDescription_42:
-	.string "No mercy!$"
-	.string "Cute WATER POKéMON$"
-	.string "I have too many fans.$"
-	.string "I was interviewed on TV.$"
-TrainerEyeDescription_43:
-	.string "I think about this & that.$"
-	.string "I like all POKéMON.$"
-	.string "What lies beyond that$"
-	.string "yonder hill?$"
-TrainerEyeDescription_44:
-	.string "We battle together!$"
-	.string "We train together!$"
-	.string "We like the same POKéMON,$"
-	.string "but different desserts.$"
-TrainerEyeDescription_45:
-	.string "I force things with power!$"
-	.string "WATER and FIGHTING types$"
-	.string "Seamen are rough spirits!$"
-	.string "Any complaints?$"
-TrainerEyeDescription_46:
-	.string "Protect POKéMON from harm.$"
-	.string "I love rare POKéMON.$"
-	.string "I want to collect all the$"
-	.string "world's rare POKéMON.$"
-TrainerEyeDescription_47:
-	.string "I count on power.$"
-	.string "POKéMON are my children.$"
-	.string "It takes knowledge and$"
-	.string "love to raise POKéMON.$"
-TrainerEyeDescription_48:
-	.string "Full-on attack!$"
-	.string "Anything. I'll raise it.$"
-	.string "I give them {POKEBLOCK}S for$"
-	.string "going after CONTEST titles.$"
-TrainerEyeDescription_49:
-	.string "I believe in my POKéMON.$"
-	.string "I like strong POKéMON.$"
-	.string "I'm training for rescue$"
-	.string "work with my POKéMON.$"
-TrainerEyeDescription_50:
-	.string "I attack in waves.$"
-	.string "Different types$"
-	.string "Those who destroy nature$"
-	.string "must never be forgiven!$"
-TrainerEyeDescription_51:
-	.string "I'll show you some guts!$"
-	.string "Cute POKéMON are my faves!$"
-	.string "After a battle, I always$"
-	.string "bathe with my POKéMON.$"
-TrainerEyeDescription_52:
-	.string "Lightning-fast attack!$"
-	.string "BUG POKéMON are number 1!$"
-	.string "If you want to catch BUG$"
-	.string "POKéMON, wake up early.$"
-TrainerEyeDescription_53:
-	.string "I battle with power.$"
-	.string "Hard-bodied POKéMON$"
-	.string "I've been planning a month$"
-	.string "for today's hike.$"
-TrainerEyeDescription_54:
-	.string "Lovey-dovey strategy!$"
-	.string "Lovey-dovey POKéMON!$"
-	.string "We're lovey-dovey!$"
-	.string "Forever lovey-dovey!$"
-TrainerEyeDescription_55:
-	.string "We let it all hang out.$"
-	.string "The 1st POKéMON I caught.$"
-	.string "POKéMON and I have grown$"
-	.string "stronger together.$"
-TrainerEyeDescription_56:
-	.string "ROCK-type power attack$"
-	.string "Rock-solid types are good.$"
-	.string "Through battling, I want to$"
-	.string "learn all about POKéMON.$"
-TrainerEyeDescription_57:
-	.string "Direct physical action!$"
-	.string "FIGHTING POKéMON rule!$"
-	.string "The world awaits me as the$"
-	.string "next big wave!$"
-TrainerEyeDescription_58:
-	.string "I choose to electrify.$"
-	.string "Get shocked by electricity!$"
-	.string "Wahahahaha! The secret to$"
-	.string "health is laughter!$"
-TrainerEyeDescription_59:
-	.string "Battle aggressively.$"
-	.string "Burn with passion!$"
-	.string "Wash away daily fatigue in$"
-	.string "hot springs completely!$"
-TrainerEyeDescription_60:
-	.string "I flexibly adapt my style.$"
-	.string "Grown in a balanced manner.$"
-	.string "POKéMON are my life.$"
-	.string "My chosen path is harsh...$"
-TrainerEyeDescription_61:
-	.string "I take advantage of speed.$"
-	.string "Graceful sky dancers$"
-	.string "I can see the ebb and flow$"
-	.string "of the winds.$"
-TrainerEyeDescription_62:
-	.string "We battle in cooperation.$"
-	.string "Always friendly POKéMON.$"
-	.string "We understand each other,$"
-	.string "and we understand others.$"
-TrainerEyeDescription_63:
-	.string "Dignity and respect$"
-	.string "I prefer POKéMON of grace.$"
-	.string "Aquatic illusions best suit$"
-	.string "my distinctive elegance.$"
-TrainerEyeDescription_64:
-	.string "Offense over defense$"
-	.string "The DARK side's beauties$"
-	.string "You can talk all you want -$"
-	.string "might is right!$"
-TrainerEyeDescription_65:
-	.string "Confuse and confound$"
-	.string "There's nothing definite.$"
-	.string "I wonder how my grandma at$"
-	.string "MT. PYRE is doing?$"
-TrainerEyeDescription_66:
-	.string "I use items for help.$"
-	.string "Flaming passion in icy cold!$"
-	.string "The ICE type can be better$"
-	.string "trained in this hot land.$"
-TrainerEyeDescription_67:
-	.string "Harness strong abilities.$"
-	.string "The raw power of DRAGONS!$"
-	.string "I live to battle every day$"
-	.string "to learn about POKéMON.$"
-TrainerEyeDescription_68:
-	.string "Pick on the foe's weakness.$"
-	.string "The ultimate STEEL POKéMON$"
-	.string "When it comes down to it,$"
-	.string "I'm still the strongest!$"
-
-	.align 2
-gTrainerEyeDescriptions:: @ 83E309C
-	.4byte TrainerEyeDescription_0
-	.4byte TrainerEyeDescription_1
-	.4byte TrainerEyeDescription_2
-	.4byte TrainerEyeDescription_3
-	.4byte TrainerEyeDescription_4
-	.4byte TrainerEyeDescription_5
-	.4byte TrainerEyeDescription_6
-	.4byte TrainerEyeDescription_7
-	.4byte TrainerEyeDescription_8
-	.4byte TrainerEyeDescription_9
-	.4byte TrainerEyeDescription_10
-	.4byte TrainerEyeDescription_11
-	.4byte TrainerEyeDescription_12
-	.4byte TrainerEyeDescription_13
-	.4byte TrainerEyeDescription_14
-	.4byte TrainerEyeDescription_15
-	.4byte TrainerEyeDescription_16
-	.4byte TrainerEyeDescription_17
-	.4byte TrainerEyeDescription_18
-	.4byte TrainerEyeDescription_19
-	.4byte TrainerEyeDescription_20
-	.4byte TrainerEyeDescription_21
-	.4byte TrainerEyeDescription_22
-	.4byte TrainerEyeDescription_23
-	.4byte TrainerEyeDescription_24
-	.4byte TrainerEyeDescription_25
-	.4byte TrainerEyeDescription_26
-	.4byte TrainerEyeDescription_27
-	.4byte TrainerEyeDescription_28
-	.4byte TrainerEyeDescription_29
-	.4byte TrainerEyeDescription_30
-	.4byte TrainerEyeDescription_31
-	.4byte TrainerEyeDescription_32
-	.4byte TrainerEyeDescription_33
-	.4byte TrainerEyeDescription_34
-	.4byte TrainerEyeDescription_35
-	.4byte TrainerEyeDescription_36
-	.4byte TrainerEyeDescription_37
-	.4byte TrainerEyeDescription_38
-	.4byte TrainerEyeDescription_39
-	.4byte TrainerEyeDescription_40
-	.4byte TrainerEyeDescription_41
-	.4byte TrainerEyeDescription_42
-	.4byte TrainerEyeDescription_43
-	.4byte TrainerEyeDescription_44
-	.4byte TrainerEyeDescription_45
-	.4byte TrainerEyeDescription_46
-	.4byte TrainerEyeDescription_47
-	.4byte TrainerEyeDescription_48
-	.4byte TrainerEyeDescription_49
-	.4byte TrainerEyeDescription_50
-	.4byte TrainerEyeDescription_51
-	.4byte TrainerEyeDescription_52
-	.4byte TrainerEyeDescription_53
-	.4byte TrainerEyeDescription_54
-	.4byte TrainerEyeDescription_55
-	.4byte TrainerEyeDescription_56
-	.4byte TrainerEyeDescription_57
-	.4byte TrainerEyeDescription_58
-	.4byte TrainerEyeDescription_59
-	.4byte TrainerEyeDescription_60
-	.4byte TrainerEyeDescription_61
-	.4byte TrainerEyeDescription_62
-	.4byte TrainerEyeDescription_63
-	.4byte TrainerEyeDescription_64
-	.4byte TrainerEyeDescription_65
-	.4byte TrainerEyeDescription_66
-	.4byte TrainerEyeDescription_67
-	.4byte TrainerEyeDescription_68