Merge branch 'master' into mail

2 files changed, 210 insertions, 31 deletions

diff --git a/data/data.s b/data/data.s
index fd4b9d274..1010190f3 100644
--- a/data/data.s
+++ b/data/data.s
@@ -2,61 +2,240 @@
 #include "constants/trainer_classes.h"
 #include "constants/songs.h"
 #include "constants/region_map.h"
-	.set NULL, 0
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
 	.section .rodata
 
 	.align 2
 gUnknown_8234698:: @ 8234698
-	.incbin "baserom.gba", 0x234698, 0x20
+	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
-	.incbin "baserom.gba", 0x2346B8, 0x20
+	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
-	.incbin "baserom.gba", 0x2346D8, 0x20
+	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
-	.incbin "baserom.gba", 0x2346F8, 0x20
+	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
-	.incbin "baserom.gba", 0x234718, 0x28
+	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
-	.incbin "baserom.gba", 0x234740, 0x28
+	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
-	.incbin "baserom.gba", 0x234768, 0x20
+	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
-	.incbin "baserom.gba", 0x234788, 0x20
+	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
-	.incbin "baserom.gba", 0x2347A8, 0x20
+	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
-	.incbin "baserom.gba", 0x2347C8, 0x20
+	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
 
-gUnknown_82347E8:: @ 82347E8
-	.incbin "baserom.gba", 0x2347E8, 0xE0
+	.align 2
+gSpriteAffineAnim_82347F8:: @ 82347F8
+	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
+	obj_rot_scal_anim_end
 
-gUnknown_82348C8:: @ 82348C8
-	.incbin "baserom.gba", 0x2348C8, 0x24
+	.align 2
+gSpriteAffineAnim_8234808:: @ 8234808
+	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
+	obj_rot_scal_anim_end
 
-gUnknown_82348EC:: @ 82348EC
-	.incbin "baserom.gba", 0x2348EC, 0x58
+	.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
 
-gUnknown_8234944:: @ 8234944
-	.incbin "baserom.gba", 0x234944, 0x58
+	.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
 
-gUnknown_823499C:: @ 823499C
-	.incbin "baserom.gba", 0x23499C, 0x20
+	.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
 
-gUnknown_82349BC:: @ 82349BC
-	.incbin "baserom.gba", 0x2349BC, 0x10
+	.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
 
-gMonFrontPicCoords:: @ 82349CC
-	.incbin "baserom.gba", 0x2349CC, 0x6E0
+	.section .rodata.82350AC
 
 gMonFrontPicTable:: @ 82350AC
 	.incbin "baserom.gba", 0x2350AC, 0xE8
diff --git a/data/graphics.s b/data/graphics.s
index f9a16b94d..78c955d0f 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13398,27 +13398,27 @@ gFile_graphics_trainers_palettes_painter:: @ 8E69E94
 	.incbin "graphics/trainers/palettes/painter.gbapal.lz"
 
 	.align 2
-gFile_graphics_trainers_back_pics_red_back_pic:: @ 8E69EBC
+gTrainerBackPic_Red:: @ 8E69EBC
 	.incbin "graphics/trainers/back_pics/red_back_pic.4bpp"
 
 	.align 2
-gFile_graphics_trainers_back_pics_leaf_back_pic:: @ 8E6C6BC
+gTrainerBackPic_Leaf:: @ 8E6C6BC
 	.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
 
 	.align 2
-gFile_graphics_trainers_back_pics_pokedude_back_pic:: @ 8E6EEBC
+gTrainerBackPic_PokeDude:: @ 8E6EEBC
 	.incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp"
 
 	.align 2
-gFile_graphics_trainers_back_pics_old_man_back_pic:: @ 8E70EBC
+gTrainerBackPic_OldMan:: @ 8E70EBC
 	.incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp"
 
 	.align 2
-gFile_graphics_trainers_back_pics_ruby_sapphire_brendan_back_pic:: @ 8E72EBC
+gTrainerBackPic_RubySapphireBrendan:: @ 8E72EBC
 	.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
 
 	.align 2
-gFile_graphics_trainers_back_pics_ruby_sapphire_may_back_pic:: @ 8E74EBC
+gTrainerBackPic_RubySapphireMay:: @ 8E74EBC
 	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
 
 	.align 2