Merge branch 'master' into battle

1 files changed, 4 insertions, 347 deletions

diff --git a/data/data.s b/data/data.s
index 2bc219d7b..72c9374b9 100644
--- a/data/data.s
+++ b/data/data.s
@@ -1,311 +1,17 @@
 #include "constants/region_map.h"
 #include "constants/trainer_classes.h"
 #include "constants/songs.h"
+#include "constants/flags.h"
 #include "constants/region_map.h"
+#include "constants/maps.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
-
-	.align 2
-gUnknown_8234698:: @ 8234698
-	obj_frame_tiles gHeap + 0x8000, 0x800
-	obj_frame_tiles gHeap + 0x8800, 0x800
-	obj_frame_tiles gHeap + 0x9000, 0x800
-	obj_frame_tiles gHeap + 0x9800, 0x800
-
-	.align 2
-gUnknown_82346B8:: @ 82346B8
-	obj_frame_tiles gHeap + 0xA000, 0x800
-	obj_frame_tiles gHeap + 0xA800, 0x800
-	obj_frame_tiles gHeap + 0xB000, 0x800
-	obj_frame_tiles gHeap + 0xB800, 0x800
-
-	.align 2
-gUnknown_82346D8:: @ 82346D8
-	obj_frame_tiles gHeap + 0xC000, 0x800
-	obj_frame_tiles gHeap + 0xC800, 0x800
-	obj_frame_tiles gHeap + 0xD000, 0x800
-	obj_frame_tiles gHeap + 0xD800, 0x800
-
-	.align 2
-gUnknown_82346F8:: @ 82346F8
-	obj_frame_tiles gHeap + 0xE000, 0x800
-	obj_frame_tiles gHeap + 0xE800, 0x800
-	obj_frame_tiles gHeap + 0xF000, 0x800
-	obj_frame_tiles gHeap + 0xF800, 0x800
-
-	.align 2
-gUnknown_8234718:: @ 8234718
-	obj_frame_tiles gTrainerBackPic_Red, 0x0800
-	obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800
-	obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800
-	obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800
-	obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800
-
-	.align 2
-gUnknown_8234740:: @ 8234740
-	obj_frame_tiles gTrainerBackPic_Leaf, 0x0800
-	obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800
-	obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800
-	obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800
-	obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800
-
-	.align 2
-gUnknown_8234768:: @ 8234768
-	obj_frame_tiles gTrainerBackPic_PokeDude, 0x0800
-	obj_frame_tiles gTrainerBackPic_PokeDude + 0x0800, 0x0800
-	obj_frame_tiles gTrainerBackPic_PokeDude + 0x1000, 0x0800
-	obj_frame_tiles gTrainerBackPic_PokeDude + 0x1800, 0x0800
-
-	.align 2
-gUnknown_8234788:: @ 8234788
-	obj_frame_tiles gTrainerBackPic_OldMan, 0x0800
-	obj_frame_tiles gTrainerBackPic_OldMan + 0x0800, 0x0800
-	obj_frame_tiles gTrainerBackPic_OldMan + 0x1000, 0x0800
-	obj_frame_tiles gTrainerBackPic_OldMan + 0x1800, 0x0800
-
-	.align 2
-gUnknown_82347A8:: @ 82347A8
-	obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800
-	obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800
-	obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800
-	obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800
-
-	.align 2
-gUnknown_82347C8:: @ 82347C8
-	obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800
-	obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800
-	obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800
-	obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800
-
-	.align 2
-gSpriteAnim_82347E8:: @ 82347E8
-	obj_image_anim_frame 0, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82347F0:: @ 82347F0
-	obj_image_anim_frame 3, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAffineAnim_82347F8:: @ 82347F8
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234808:: @ 8234808
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234818:: @ 8234818‬
-	obj_rot_scal_anim_frame 0x28, 0x28, 0, 0
-	obj_rot_scal_anim_frame 0x12, 0x12, 0, 12
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234830:: @ 8234830
-	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 18
-	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 15
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234848:: @ 8234848
-	obj_rot_scal_anim_frame 0xA0, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFC, 0x0, 0, 8
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnim_8234868:: @ 8234868
-	obj_rot_scal_anim_frame 0x2, 0x2, 0, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234878:: @ 8234878
-	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234888:: @ 8234888
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 9
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_82348A0:: @ 82348A0
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 63
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_82348B0:: @ 82348B0
-	obj_rot_scal_anim_frame 0x0, 0x0, -3, 5
-	obj_rot_scal_anim_frame 0x0, 0x0, 3, 5
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_82348C8:: @ 82348C8
-	.4byte gSpriteAffineAnim_82347F8
-	.4byte gSpriteAffineAnim_8234818
-	.4byte gSpriteAffineAnim_8234830
-	.4byte gSpriteAffineAnim_8234848
-	.4byte gSpriteAffineAnim_8234868
-	.4byte gSpriteAffineAnim_8234878
-	.4byte gSpriteAffineAnim_82348A0
-	.4byte gSpriteAffineAnim_82348B0
-	.4byte gSpriteAffineAnim_8234888
-
-	.align 2
-gSpriteAffineAnim_82348EC:: @ 82348EC
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 4, 63
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_82348FC:: @ 82348FC
-	obj_rot_scal_anim_frame 0x0, 0x0, 3, 5
-	obj_rot_scal_anim_frame 0x0, 0x0, -3, 5
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234914:: @ 8234914
-	obj_rot_scal_anim_frame 0x0, 0x0, -5, 20
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 20
-	obj_rot_scal_anim_frame 0x0, 0x0, 5, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8234934:: @ 8234934
-	obj_rot_scal_anim_frame 0x0, 0x0, 9, 110
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8234944:: @ 8234944
-	.4byte gSpriteAffineAnim_82347F8
-	.4byte gSpriteAffineAnim_8234818
-	.4byte gSpriteAffineAnim_8234830
-	.4byte gSpriteAffineAnim_8234848
-	.4byte gSpriteAffineAnim_8234868
-	.4byte gSpriteAffineAnim_8234878
-	.4byte gSpriteAffineAnim_82348EC
-	.4byte gSpriteAffineAnim_82348FC
-	.4byte gSpriteAffineAnim_8234914
-	.4byte gSpriteAffineAnim_8234888
-	.4byte gSpriteAffineAnim_8234934
-
-	.align 2
-gSpriteAffineAnimTable_82349470:: @ 82349470
-	.4byte gSpriteAffineAnim_8234808
-	.4byte gSpriteAffineAnim_8234818
-	.4byte gSpriteAffineAnim_8234830
-	.4byte gSpriteAffineAnim_8234848
-	.4byte gSpriteAffineAnim_8234868
-	.4byte gSpriteAffineAnim_8234878
-	.4byte gSpriteAffineAnim_82348EC
-	.4byte gSpriteAffineAnim_82348FC
-	.4byte gSpriteAffineAnim_8234914
-	.4byte gSpriteAffineAnim_8234888
-	.4byte gSpriteAffineAnim_8234934
-
-	.align 2
-gSpriteAnim_823499C:: @ 823499C
-	obj_image_anim_frame 0, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82349A4:: @ 82349A4
-	obj_image_anim_frame 1, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82349AC:: @ 82349AC
-	obj_image_anim_frame 2, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82349B4:: @ 82349B4
-	obj_image_anim_frame 3, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82349BC:: @ 82349BC
-	.4byte gSpriteAnim_823499C
-	.4byte gSpriteAnim_82349A4
-	.4byte gSpriteAnim_82349AC
-	.4byte gSpriteAnim_82349B4
-
-	.section .rodata.82350AC
-
-gMonFrontPicTable:: @ 82350AC
-	.incbin "baserom.gba", 0x2350AC, 0xE8
-
-gUnknown_8235194:: @ 8235194
-	.incbin "baserom.gba", 0x235194, 0xCD8
-
-gMonBackPicCoords:: @ 8235E6C
-	.incbin "baserom.gba", 0x235E6C, 0x6E0
-
-gMonBackPicTable:: @ 823654C
-	.incbin "baserom.gba", 0x23654C, 0xDC0
-
-gMonPaletteTable:: @ 823730C
-	.incbin "baserom.gba", 0x23730C, 0xE8
-
-gUnknown_82373F4:: @ 82373F4
-	.incbin "baserom.gba", 0x2373F4, 0xCD8
-
-gMonShinyPaletteTable:: @ 82380CC
-	.incbin "baserom.gba", 0x2380CC, 0x1010
-
-gTrainerFrontAnimsPtrTable:: @ 82390DC
-	.incbin "baserom.gba", 0x2390DC, 0x250
-
-gTrainerFrontPicCoords:: @ 823932C
-	.incbin "baserom.gba", 0x23932C, 0x250
-
-gTrainerFrontPicTable:: @ 823957C
-	.incbin "baserom.gba", 0x23957C, 0x4A0
-
-gTrainerFrontPicPaletteTable:: @ 8239A1C
-	.incbin "baserom.gba", 0x239A1C, 0x558
-
-gTrainerBackAnimsPtrTable:: @ 8239F74
-	.incbin "baserom.gba", 0x239F74, 0x18
-
-gTrainerBackPicCoords:: @ 8239F8C
-	.incbin "baserom.gba", 0x239F8C, 0x18
-
-gTrainerBackPicTable:: @ 8239FA4
-	.incbin "baserom.gba", 0x239FA4, 0x30
-
-gTrainerBackPicPaletteTable:: @ 8239FD4
-	.incbin "baserom.gba", 0x239FD4, 0x30
-
-gEnemyMonElevation:: @ 823A004
-	.incbin "baserom.gba", 0x23A004, 0x4554
-
-gTrainerClassNames:: @ 823E558
-	.include "data/text/trainer_class_names.inc"
-
 	.align 2, 0
-gTrainers:: @ 823EAD8
-	.incbin "baserom.gba", 0x23EAC8, 0x7418
-
-gSpeciesNames:: @ 8245EE0
-	.include "data/text/species_names.inc"
 
-gMoveNames:: @ 8247094
-	.incbin "baserom.gba", 0x247094, 0xF97
-
-gUnknown_824802B:: @ 824802B
-	.incbin "baserom.gba", 0x24802B, 0xD
-
-gUnknown_8248038:: @ 8248038
-	.incbin "baserom.gba", 0x248038, 0x186
-
-gUnknown_82481BE:: @ 82481BE
-	.incbin "baserom.gba", 0x2481BE, 0x12A
+gUnknown_824829C:: @ 824829C
+	.incbin "baserom.gba", 0x24829C, 0x4c
 
 gUnknown_82482E8:: @ 82482E8
 	.incbin "baserom.gba", 0x2482E8, 0x18
@@ -594,52 +300,3 @@ gUnknown_826D1E4:: @ 826D1E4
 
 gUnknown_826D250:: @ 826D250
 	.incbin "baserom.gba", 0x26D250, 0x44
-
-gUnknown_826D294:: @ 826D294
-	.incbin "baserom.gba", 0x26D294, 0xA
-
-gUnknown_826D29E:: @ 826D29E
-	.incbin "baserom.gba", 0x26D29E, 0x12
-
-gUnknown_826D2B0:: @ 826D2B0
-	.incbin "baserom.gba", 0x26D2B0, 0x28
-
-gDirectionToVectors:: @ 826D2D8
-	.4byte  0,  0
-	.4byte  0,  1
-	.4byte  0, -1
-	.4byte -1,  0
-	.4byte  1,  0
-	.4byte -1,  1
-	.4byte  1,  1
-	.4byte -1, -1
-	.4byte  1, -1
-
-gUnknown_826D320:: @ 826D320
-	.incbin "baserom.gba", 0x26D320, 0x10
-
-gUnknown_826D330:: @ 826D330
-	.incbin "baserom.gba", 0x26D330, 0xC
-
-gUnknown_826D33C:: @ 826D33C
-	.4byte sub_8058684
-	.4byte sub_80586A4
-	.4byte sub_80586A8
-
-gUnknown_826D348:: @ 826D348
-	.4byte sub_80586C8
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586C8
-	.4byte sub_80586C8
-	.4byte sub_8058734
-	.4byte sub_8058734
-	.4byte sub_8058734
-	.4byte sub_8058734
-
-gUnknown_826D374:: @ 826D374
-	.4byte sub_805874C
-	.4byte sub_8058754
-