Extract data from trainer card

2 files changed, 189 insertions, 108 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 8733869b5..c1ca77035 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -5142,7 +5142,7 @@ gUnknown_08DE0644:: @ 8DE0644
 
 	.align 2
 gUnknown_08DE07C8:: @ 8DE07C8
-	.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal)
+	.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
 
 	.align 2
 gUnknown_08DE08C8:: @ 8DE08C8
diff --git a/data/trainer_card.s b/data/trainer_card.s
index 08bf4d8fa..f57973200 100644
--- a/data/trainer_card.s
+++ b/data/trainer_card.s
@@ -2,7 +2,6 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-	.align 2, 0
 
 .macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4
 	.4byte \text1
@@ -13,71 +12,100 @@
 	.2byte \short4
 .endm
 
+	.align 2
 gUnknown_0856F018:: @ 856F018
-	 .incbin "baserom.gba", 0x56f018, 0x194
+	.incbin "graphics/trainer_card/stickers_fr.4bpp.lz"
+
+	.align 2
+gUnknown_0856F18C:: @ 856F18C
+	.incbin "graphics/trainer_card/unknown_56F18C.gbapal"
 
+	.align 2
 gEmeraldTrainerCard1Star_Pal:: @ 856F1AC
-	 .incbin "baserom.gba", 0x56f1ac, 0x60
+	.incbin "graphics/trainer_card/one_star.gbapal"
 
+	.align 2
 gFireRedTrainerCard1Star_Pal:: @ 856F20C
-	 .incbin "baserom.gba", 0x56f20c, 0x60
+	.incbin "graphics/trainer_card/one_star_fr.gbapal"
 
+	.align 2
 gEmeraldTrainerCard2Star_Pal:: @ 856F26C
-	 .incbin "baserom.gba", 0x56f26c, 0x60
+	.incbin "graphics/trainer_card/two_stars.gbapal"
 
+	.align 2
 gFireRedTrainerCard2Star_Pal:: @ 856F2CC
-	 .incbin "baserom.gba", 0x56f2cc, 0x60
+	.incbin "graphics/trainer_card/two_stars_fr.gbapal"
 
+	.align 2
 gEmeraldTrainerCard3Star_Pal:: @ 856F32C
-	 .incbin "baserom.gba", 0x56f32c, 0x60
+	.incbin "graphics/trainer_card/three_stars.gbapal"
 
+	.align 2
 gFireRedTrainerCard3Star_Pal:: @ 856F38C
-	 .incbin "baserom.gba", 0x56f38c, 0x60
+	.incbin "graphics/trainer_card/three_stars_fr.gbapal"
 
+	.align 2
 gEmeraldTrainerCard4Star_Pal:: @ 856F3EC
-	 .incbin "baserom.gba", 0x56f3ec, 0x60
+	.incbin "graphics/trainer_card/four_stars.gbapal"
 
+	.align 2
 gFireRedTrainerCard4Star_Pal:: @ 856F44C
-	 .incbin "baserom.gba", 0x56f44c, 0x60
+	.incbin "graphics/trainer_card/four_stars_fr.gbapal"
 
+	.align 2
 gUnknown_0856F4AC:: @ 856F4AC
-	.incbin "baserom.gba", 0x56f4ac, 0x20
+	.incbin "graphics/trainer_card/female_bg.gbapal"
 
+	.align 2
 gUnknown_0856F4CC:: @ 856F4CC
-	.incbin "baserom.gba", 0x56f4cc, 0x20
+	.incbin "graphics/trainer_card/female_bg_fr.gbapal"
 
+	.align 2
 gUnknown_0856F4EC:: @ 856F4EC
-	.incbin "baserom.gba", 0x56f4ec, 0x20
+	.incbin "graphics/trainer_card/badges.gbapal"
 
+	.align 2
 gUnknown_0856F50C:: @ 856F50C
-	.incbin "baserom.gba", 0x56f50c, 0x20
+	.incbin "graphics/trainer_card/badges_fr.gbapal"
 
+	.align 2
 gUnknown_0856F52C:: @ 856F52C
-	.incbin "baserom.gba", 0x56f52c, 0x20
+	.incbin "graphics/trainer_card/gold.gbapal"
 
+	.align 2
 gUnknown_0856F54C:: @ 856F54C
-	.incbin "baserom.gba", 0x56f54c, 0x20
+	.incbin "graphics/trainer_card/stickers_fr1.gbapal"
 
+	.align 2
 gUnknown_0856F56C:: @ 856F56C
-	.incbin "baserom.gba", 0x56f56c, 0x20
+	.incbin "graphics/trainer_card/stickers_fr2.gbapal"
 
+	.align 2
 gUnknown_0856F58C:: @ 856F58C
-	.incbin "baserom.gba", 0x56f58c, 0x20
+	.incbin "graphics/trainer_card/stickers_fr3.gbapal"
 
+	.align 2
 gUnknown_0856F5AC:: @ 856F5AC
-	.incbin "baserom.gba", 0x56f5ac, 0x20
+	.incbin "graphics/trainer_card/stickers_fr4.gbapal"
 
+	.align 2
 gUnknown_0856F5CC:: @ 856F5CC
-	.incbin "baserom.gba", 0x56f5cc, 0x248
+	.incbin "graphics/trainer_card/badges.4bpp.lz"
 
+	.align 2
 gUnknown_0856F814:: @ 856F814
-	.incbin "baserom.gba", 0x56f814, 0x2a0
+	.incbin "graphics/trainer_card/badges_fr.4bpp.lz"
 
+	.align 2
 gUnknown_0856FAB4:: @ 856FAB4
-	.incbin "baserom.gba", 0x56fab4, 0x10
+	.4byte 0x000025b0, 0x000001d9, 0x000031e2, 0x003011f3
 
+	.align 2
 gUnknown_0856FAC4:: @ 856FAC4
-	.incbin "baserom.gba", 0x56fac4, 0x20
+	window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0253
+	window_template 0x01, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001
+	window_template 0x03, 0x13, 0x05, 0x09, 0x0a, 0x08, 0x0150
+	null_window_template
 
 	.align 2
 gEmeraldTrainerCardStarPals:: @ 856FAE4
@@ -96,20 +124,21 @@ gFireRedTrainerCardStarPals:: @ 856FAF8
 	.4byte gFireRedTrainerCard4Star_Pal
 
 gUnknown_0856FB0C:: @ 856FB0C
-	.incbin "baserom.gba", 0x56fb0c, 0x3
+	.byte 0x00, 0x02, 0x03
 
 gUnknown_0856FB0F:: @ 856FB0F
-	 .incbin "baserom.gba", 0x56fb0f, 0x3
+	.byte 0x00, 0x04, 0x05
 
 gUnknown_0856FB12:: @ 856FB12
-	 .incbin "baserom.gba", 0x56fb12, 0x6
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 gUnknown_0856FB18:: @ 856FB18
-	.incbin "baserom.gba", 0x56fb18, 0x8
+	.byte 0x0d, 0x04, 0x0d, 0x04, 0x01, 0x00, 0x01, 0x00
 
 gUnknown_0856FB20:: @ 856FB20
-	.incbin "baserom.gba", 0x56fb20, 0x8
+	.byte 0x4e, 0x4f, 0x50, 0x51, 0x3c, 0x3f
 
+	.align 2
 gUnknown_0856FB28:: @ 856FB28
 	.4byte sub_80C4998
 	.4byte sub_80C49D8
@@ -118,182 +147,233 @@ gUnknown_0856FB28:: @ 856FB28
 	.4byte sub_80C4C84
 	.4byte sub_80C4DB0
 
+	.align 2
 gUnknown_0856FB40:: @ 856FB40
 	.4byte gUnknown_0856FB0C
 	.4byte gUnknown_0856FB12
 
 gUnknown_0856FB48:: @ 856FB48
-	.incbin "baserom.gba", 0x56fb48, 0x2
+	.byte 0x71, 0x68
 
 gUnknown_0856FB4A:: @ 856FB4A
-	.incbin "baserom.gba", 0x56fb4a, 0x2
+	.byte 0x81, 0x78
 
 gUnknown_0856FB4C:: @ 856FB4C
-	.incbin "baserom.gba", 0x56fb4c, 0x9
+	.byte 0xfd, 0x02, 0xf0, 0xfd, 0x03, 0xf0, 0xfd, 0x04, 0xff
 
 gUnknown_0856FB55:: @ 856FB55
-	.incbin "baserom.gba", 0x56fb55, 0x2
+	.byte 0x08, 0x10
 
 gUnknown_0856FB57:: @ 856FB57
-	.incbin "baserom.gba", 0x56fb57, 0x5
+	.byte 0xd8, 0xd8
 
+	.align 2
 gUnknown_0856FB5C:: @ 856FB5C
 	.4byte gText_LinkBattles
 	.4byte gText_LinkCableBattles
 	.4byte gText_LinkBattles
 
 gUnknown_0856FB68:: @ 856FB68
-	.incbin "baserom.gba", 0x56fb68, 0x6
+	.byte 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a
 
 gUnknown_0856FB6E:: @ 856FB6E
-	.incbin "baserom.gba", 0x56fb6e, 0x6
+	.byte 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14
 
 gUnknown_0856FB74:: @ 856FB74
-	.incbin "baserom.gba", 0x56fb74, 0x4
+	.byte 0x0b, 0x0c, 0x0d, 0x0e
 
 gUnknown_0856FB78:: @ 856FB78
-	 .incbin "baserom.gba", 0x56fb78, 0x4
+	.byte 0x07, 0x07
 
+	.align 2
 gUnknown_0856FB7C:: @ 856FB7C
-	 .incbin "baserom.gba", 0x56fb7c, 0x20
+	.incbin "graphics/frontier_pass/map_heads.gbapal"
 
+	.align 2
 gUnknown_0856FB9C:: @ 856FB9C
-	 .incbin "baserom.gba", 0x56fb9c, 0x20
+	.incbin "graphics/frontier_pass/map_heads_female.gbapal"
 
+	.align 2
 gUnknown_0856FBBC:: @ 856FBBC
-	 .incbin "baserom.gba", 0x56fbbc, 0xFEC
+	.incbin "graphics/frontier_pass/map_screen.4bpp.lz"
 
-	 .align 2
+	.align 2
 gFrontierPassCursor_Gfx:: @ 8570BA8
-	 .incbin "graphics/frontier_pass/cursor.4bpp.lz"
+	.incbin "graphics/frontier_pass/cursor.4bpp.lz"
 
+	.align 2
 gUnknown_08570C44:: @ 8570C44
-	 .incbin "baserom.gba", 0x570c44, 0xBC
+	.incbin "graphics/frontier_pass/map_heads.4bpp.lz"
 
-	 .align 2
+	.align 2
 gFrontierPassMapCursor_Gfx:: @ 8570D00
-	 .incbin "graphics/frontier_pass/map_cursor.4bpp.lz"
+	.incbin "graphics/frontier_pass/map_cursor.4bpp.lz"
 
+	.align 2
 gUnknown_08570E00:: @ 8570E00
-	.incbin "baserom.gba", 0x570e00, 0x260
+	.incbin "graphics/frontier_pass/map_screen.bin.lz"
 
+	.align 2
 gUnknown_08571060:: @ 8571060
-	.incbin "baserom.gba", 0x571060, 0x260
+	.incbin "graphics/frontier_pass/small_map_and_card.bin.lz"
+
+	.align 2
+gUnknown_08571298:: @ 8571298
+	.incbin "graphics/frontier_pass/unknown_571298.bin"
 
+	.align 2
 gUnknown_085712C0:: @ 85712C0
-	.incbin "baserom.gba", 0x5712c0, 0x38
+	.incbin "graphics/frontier_pass/record_frame.bin.lz"
 
+	.align 2
 gUnknown_085712F8:: @ 85712F8
-	.incbin "baserom.gba", 0x5712f8, 0xe8
+	.incbin "graphics/frontier_pass/small_map_and_card_affine.bin.lz"
 
 gUnknown_085713E0:: @ 85713E0
-	.incbin "baserom.gba", 0x5713e0, 0x8
+	.2byte 0x00d8, 0x0020, 0x00d8, 0x0080
 
+	.align 2
 gUnknown_085713E8:: @ 85713E8
-	.incbin "baserom.gba", 0x5713e8, 0xc
+	.4byte 0x000011f8, 0x000021e1, 0x00000bd6
 
+	.align 2
 gUnknown_085713F4:: @ 85713F4
-	.incbin "baserom.gba", 0x5713f4, 0xc
+	.4byte 0x000001f8, 0x000011e1, 0x000021d2
 
+	.align 2
 gUnknown_08571400:: @ 8571400
-	.incbin "baserom.gba", 0x571400, 0x28
+	window_template 0x00, 0x02, 0x03, 0x0c, 0x03, 0x0f, 0x0001
+	window_template 0x00, 0x02, 0x0a, 0x0c, 0x03, 0x0f, 0x0026
+	window_template 0x00, 0x02, 0x0d, 0x0c, 0x04, 0x0f, 0x004b
+	window_template 0x00, 0x00, 0x12, 0x1e, 0x03, 0x0f, 0x007c
+	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
 
+	.align 2
 gUnknown_08571428:: @ 8571428
-	.incbin "baserom.gba", 0x571428, 0x20
+	window_template 0x00, 0x00, 0x01, 0x0f, 0x05, 0x0f, 0x0001
+	window_template 0x00, 0x14, 0x01, 0x0a, 0x0e, 0x0f, 0x004d
+	window_template 0x00, 0x02, 0x10, 0x1a, 0x04, 0x0f, 0x00da
+	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
 
 gUnknown_08571448:: @ 8571448
-	.incbin "baserom.gba", 0x571448, 0x3
+	.byte 0x00, 0x02, 0x03
 
 gUnknown_0857144B:: @ 857144B
-	.incbin "baserom.gba", 0x57144b, 0x3
+	.byte 0x00, 0x01, 0x09
 
 gUnknown_0857144E:: @ 857144E
-	.incbin "baserom.gba", 0x57144e, 0x6
+	.byte 0x00, 0x04, 0x05
 
+	.align 2
 gUnknown_08571454:: @ 8571454
-	.incbin "baserom.gba", 0x571454, 0x68
+    .2byte 0x001c, 0x004c, 0x0084, 0x00dc, 0x0054, 0x0084, 0x0084, 0x00dc, 0x0050, 0x0066, 0x0014, 0x006c, 0x0000, 0x0010, 0x0098, 0x00f0
+    .2byte 0x006c, 0x0086, 0x0014, 0x006c, 0x0018, 0x0030, 0x0014, 0x006c, 0x0032, 0x0042, 0x0014, 0x0024, 0x0042, 0x0052, 0x0020, 0x0030
+    .2byte 0x0032, 0x0042, 0x002c, 0x003c, 0x0042, 0x0052, 0x0038, 0x0048, 0x0032, 0x0042, 0x0044, 0x0054, 0x0042, 0x0052, 0x0050, 0x0060
+    .2byte 0x0032, 0x0042, 0x005c, 0x006c
 
+	.align 2
 gUnknown_085714BC:: @ 85714BC
 	obj_tiles gFrontierPassCursor_Gfx, 0x100, 0
 	obj_tiles gFrontierPassMapCursor_Gfx, 0x400, 1
 	obj_tiles gFrontierPassMedals_Gfx, 0x380, 2
 
+	.align 2
 gUnknown_085714D4:: @ 85714D4
 	obj_tiles gUnknown_08570C44, 0x100, 4
 	null_obj_tiles
 
+	.align 2
 gUnknown_085714E4:: @ 85714E4
-	 obj_pal gFrontierPassCursor_Pal, 0
-	 obj_pal gFrontierPassMapCursor_Pal, 1
-	 obj_pal gFrontierPassMedalsSilver_Pal, 2
-	 obj_pal gFrontierPassMedalsGold_Pal, 3
-	 obj_pal gUnknown_0856FB7C, 4
-	 obj_pal gUnknown_0856FB9C, 5
-	 null_obj_pal
+	obj_pal gFrontierPassCursor_Pal, 0
+	obj_pal gFrontierPassMapCursor_Pal, 1
+	obj_pal gFrontierPassMedalsSilver_Pal, 2
+	obj_pal gFrontierPassMedalsGold_Pal, 3
+	obj_pal gUnknown_0856FB7C, 4
+	obj_pal gUnknown_0856FB9C, 5
+	null_obj_pal
 
-	 @ this doesnt look like its part of the same table.
-	 .4byte 0x0, 0xFFFF
+	.align 2
+gSpriteAnim_857151C:: @ 857151C
+	.2byte 0x0000, 0x0000, 0xffff, 0x0000
 
-gUnknown_08571524:: @ 8571524
-	 .incbin "baserom.gba", 0x571524, 0x8
+	.align 2
+gSpriteAnim_8571524:: @ 8571524
+	.2byte 0x0000, 0x0000, 0xffff, 0x0000
 
-gUnknown_0857152C:: @ 857152C
-	 .incbin "baserom.gba", 0x57152c, 0x8
+	.align 2
+gSpriteAnim_857152C:: @ 857152C
+	.2byte 0x0004, 0x0000, 0xffff, 0x0000
 
-gUnknown_08571534:: @ 8571534
-	 .incbin "baserom.gba", 0x571534, 0x8
+	.align 2
+gSpriteAnim_8571534:: @ 8571534
+	.2byte 0x0008, 0x0000, 0xffff, 0x0000
 
-gUnknown_0857153C:: @ 857153C
-	 .incbin "baserom.gba", 0x57153c, 0x8
+	.align 2
+gSpriteAnim_857153C:: @ 857153C
+	.2byte 0x000c, 0x0000, 0xffff, 0x0000
 
-gUnknown_08571544:: @ 8571544
-	 .incbin "baserom.gba", 0x571544, 0x8
+	.align 2
+gSpriteAnim_8571544:: @ 8571544
+	.2byte 0x0010, 0x0000, 0xffff, 0x0000
 
-gUnknown_0857154C:: @ 857154C
-	 .incbin "baserom.gba", 0x57154c, 0x8
+	.align 2
+gSpriteAnim_857154C:: @ 857154C
+	.2byte 0x0014, 0x0000, 0xffff, 0x0000
 
-gUnknown_08571554:: @ 8571554
-	 .incbin "baserom.gba", 0x571554, 0x8
+	.align 2
+gSpriteAnim_8571554:: @ 8571554
+	.2byte 0x0018, 0x0000, 0xffff, 0x0000
 
-gUnknown_0857155C:: @ 857155C
-	 .incbin "baserom.gba", 0x57155c, 0xC
+	.align 2
+gSpriteAnim_857155C:: @ 857155C
+	.2byte 0x0000, 0x002d, 0x0008, 0x002d, 0xfffe, 0x0000
 
-gUnknown_08571568:: @ 8571568
-	 .incbin "baserom.gba", 0x571568, 0xC
+	.align 2
+gSpriteAnim_8571568:: @ 8571568
+	.2byte 0x0010, 0x002d, 0x0018, 0x002d, 0xfffe, 0x0000
 
-gUnknown_08571574:: @ 8571574
-	 .4byte gUnknown_08571524
-	 .4byte gUnknown_0857152C
+	.align 2
+gSpriteAnimTable_08571574:: @ 8571574
+	.4byte gSpriteAnim_8571524
+	.4byte gSpriteAnim_857152C
 
-gUnknown_0857157C:: @ 857157C
-	.4byte gUnknown_08571524 
-	.4byte gUnknown_0857152C
-	.4byte gUnknown_08571534
-	.4byte gUnknown_0857153C
-	.4byte gUnknown_08571544
-	.4byte gUnknown_0857154C
-	.4byte gUnknown_08571554
+	.align 2
+gSpriteAnimTable_0857157C:: @ 857157C
+	.4byte gSpriteAnim_8571524 
+	.4byte gSpriteAnim_857152C
+	.4byte gSpriteAnim_8571534
+	.4byte gSpriteAnim_857153C
+	.4byte gSpriteAnim_8571544
+	.4byte gSpriteAnim_857154C
+	.4byte gSpriteAnim_8571554
 
-gUnknown_08571598:: @ 8571598
-	 .4byte gUnknown_0857155C
-	 .4byte gUnknown_08571568
+	.align 2
+gSpriteAnimTable_08571598:: @ 8571598
+	.4byte gSpriteAnim_857155C
+	.4byte gSpriteAnim_8571568
 
-gUnknown_085715A0:: @ 85715A0
-	 .incbin "baserom.gba", 0x5715a0, 0x10
+	.align 2
+gSpriteAffineAnim_085715A0:: @ 85715A0
+	.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
 
-gUnknown_085715B0:: @ 85715B0
-	 .4byte gUnknown_085715A0
+	.align 2
+gSpriteAffineAnimTable_085715B0:: @ 85715B0
+	.4byte gSpriteAffineAnim_085715A0
 
+	.align 2
 gUnknown_085715B4:: @ 85715B4
-	spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0, 0, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 1, 1, gUnknown_08524934, gSpriteAnimTable_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_085715E4:: @ 85715E4
-	spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 2, 2, gUnknown_0852490C, gSpriteAnimTable_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_085715FC:: @ 85715FC
-	spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
+	spr_template 4, 4, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
 
+	.align 2
 gUnknown_08571614:: @ 8571614
 	.4byte gUnknown_085EDA96
 	.4byte gUnknown_085ED932
@@ -311,6 +391,7 @@ gUnknown_08571614:: @ 8571614
 	.4byte gUnknown_085EDA78
 	.4byte gUnknown_085ED931
 
+	.align 2
 gUnknown_08571650:: @ 8571650
 	unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0
 	unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0