Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen

3 files changed, 21 insertions, 213 deletions

diff --git a/data/graphics.s b/data/graphics.s
index c5eae9753..570b73636 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16218,16 +16218,16 @@ gUnknown_8E990F8:: @ 8E990F8
 gUnknown_8E99118:: @ 8E99118
 	.incbin "graphics/tm_case/unk_8E99118.4bpp"
 
-gUnknown_8E99198::
+gFireRedTrainerCard_Pal:: @ 8E99198
 	.incbin "graphics/trainer_card/0star.gbapal"
 
-gUnknown_8E991F8:: @ 8E991F8
+gFireRedTrainerCard_Gfx:: @ 8E991F8
 	.incbin "graphics/trainer_card/card.4bpp.lz"
 
-gUnknown_8E9986C:: @ 8E9986C
+gEmeraldTrainerCard_Pal:: @ 8E9986C
 	.incbin "graphics/trainer_card/0star_em.gbapal"
 
-gUnknown_8E998CC:: @ 8E998CC
+gEmeraldTrainerCard_Gfx:: @ 8E998CC
 	.incbin "graphics/trainer_card/card_em.4bpp.lz"
 
 gUnknown_8E99D8C:: @ 8E99D8C
diff --git a/data/strings.s b/data/strings.s
index 1725f16e6..710942f58 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -2846,61 +2846,61 @@ gUnknown_8419CB9:: @ 8419CB9
 	.string "HM moves can't be\n"
 	.string "forgotten now.$"
 
-gUnknown_8419CDA:: @ 8419CDA
+gText_TrainerCardName:: @ 8419CDA
 	.string "NAME: $"
 
-gUnknown_8419CE1:: @ 8419CE1
+gText_TrainerCardIDNo:: @ 8419CE1
 	.string "IDNo.$"
 
-gUnknown_8419CE7:: @ 8419CE7
+gText_TrainerCardMoney:: @ 8419CE7
 	.string "MONEY$"
 
-gUnknown_8419CED:: @ 8419CED
+gText_TrainerCardYen:: @ 8419CED
 	.string "¥$"
 
-gUnknown_8419CEF:: @ 8419CEF
+gText_TrainerCardPokedex:: @ 8419CEF
 	.string "POKéDEX$"
 
-gUnknown_8419CF7:: @ 8419CF7
+gText_TrainerCardNull:: @ 8419CF7
 	.string "$"
 
-gUnknown_8419CF8:: @ 8419CF8
+gText_Colon2:: @ 8419CF8
 	.string ":$"
 
 gUnknown_8419CFA:: @ 0x8419CFA
 	.string "てん$"
 
-gUnknown_8419CFD:: @ 8419CFD
+gText_TrainerCardTime:: @ 8419CFD
 	.string "TIME$"
 
 gUnknown_8419D02:: @ 0x8419D02
 	.string "ゲ-ムポイント$"
 
-gUnknown_8419D0A:: @ 8419D0A
+gText_Var1sTrainerCard:: @ 8419D0A
 	.string "'s TRAINER CARD$"
 
-gUnknown_8419D1A:: @ 8419D1A
+gText_HallOfFameDebut:: @ 8419D1A
 	.string "HALL OF FAME DEBUT  $"
 
-gUnknown_8419D2F:: @ 0x8419D2F
+gText_LinkBattles:: @ 0x8419D2F
 	.string "LINK BATTLES$"
 
-gUnknown_8419D3C:: @ 0x8419D3C
+gText_LinkCableBattles:: @ 0x8419D3C
 	.string "LINK CABLE BATTLES$"
 
-gUnknown_8419D4F:: @ 8419D4F
+gText_WinLossRatio:: @ 8419D4F
 	.string "W:{CLEAR_TO 0x30}L:$"
 
-gUnknown_8419D57:: @ 8419D57
+gText_PokemonTrades:: @ 8419D57
 	.string "POKéMON TRADES$"
 
-gUnknown_8419D66:: @ 8419D66
+gText_UnionRoomTradesBattles:: @ 8419D66
 	.string "UNION TRADES & BATTLES$"
 
-gUnknown_8419D7D:: @ 8419D7D
+gText_BerryCrushes:: @ 8419D7D
 	.string "BERRY CRUSH$"
 
-gUnknown_8419D89:: @ 8419D89
+gText_WaitingTrainerFinishReading:: @ 8419D89
 	.string "Waiting for the other TRAINER to\n"
 	.string "finish reading your TRAINER CARD.$"
 
diff --git a/data/trainer_card.s b/data/trainer_card.s
deleted file mode 100644
index de35fa192..000000000
--- a/data/trainer_card.s
+++ /dev/null
@@ -1,192 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83CC368:: @ 83CC368
-	.incbin "baserom.gba", 0x3CC368, 0x174
-
-gUnknown_83CC4DC:: @ 83CC4DC
-	.incbin "baserom.gba", 0x3CC4DC, 0x214
-
-gUnknown_83CC6F0:: @ 83CC6F0
-	.incbin "baserom.gba", 0x3CC6F0, 0x1B8
-
-gUnknown_83CC8A8:: @ 83CC8A8
-	.incbin "baserom.gba", 0x3CC8A8, 0xDC
-
-gUnknown_83CC984:: @ 83CC984
-	.incbin "baserom.gba", 0x3CC984, 0x12C
-
-gUnknown_83CCAB0:: @ 83CCAB0
-	.incbin "baserom.gba", 0x3CCAB0, 0x1F4
-
-gUnknown_83CCCA4:: @ 83CCCA4
-	.incbin "baserom.gba", 0x3CCCA4, 0x18C
-
-gUnknown_83CCE30:: @ 83CCE30
-	.incbin "baserom.gba", 0x3CCE30, 0x98
-
-gUnknown_83CCEC8:: @ 83CCEC8
-	.incbin "baserom.gba", 0x3CCEC8, 0xB8
-
-gUnknown_83CCF80:: @ 83CCF80
-    .incbin "baserom.gba", 0x3CCF80, 0x60
-    
-gUnknown_83CCFE0:: @ 83CCFE0
-    .incbin "baserom.gba", 0x3CCFE0, 0x60
-
-gUnknown_83CD040:: @ 83CD040
-    .incbin "baserom.gba", 0x3CD040, 0x60
-
-gUnknown_83CD0A0:: @ 83CD0A0
-    .incbin "baserom.gba", 0x3CD0A0, 0x60
-
-gUnknown_83CD100:: @ 83CD100
-    .incbin "baserom.gba", 0x3CD100, 0x60
-
-gUnknown_83CD160:: @ 83CD160  
-    .incbin "baserom.gba", 0x3CD160, 0x60
-
-gUnknown_83CD1C0:: @ 83CD1C0
-    .incbin "baserom.gba", 0x3CD1C0, 0x60
-
-gUnknown_83CD220:: @ 83CD220
-    .incbin "baserom.gba", 0x3CD220, 0x60
-
-gUnknown_83CD280:: @ 83CD280
-	.incbin "baserom.gba", 0x3CD280, 0x20
-
-gUnknown_83CD2A0:: @ 83CD2A0
-	.incbin "baserom.gba", 0x3CD2A0, 0x20
-
-gUnknown_83CD2C0:: @ 83CD2C0
-	.incbin "baserom.gba", 0x3CD2C0, 0x20
-
-gUnknown_83CD2E0:: @ 83CD2E0
-	.incbin "baserom.gba", 0x3CD2E0, 0x20
-
-gUnknown_83CD300:: @ 83CD300
-	.incbin "baserom.gba", 0x3CD300, 0x20
-
-gUnknown_83CD320:: @ 83CD320
-	.incbin "baserom.gba", 0x3CD320, 0x20
-
-gUnknown_83CD340:: @ 83CD340
-	.incbin "baserom.gba", 0x3CD340, 0x20
-
-gUnknown_83CD360:: @ 83CD360
-	.incbin "baserom.gba", 0x3CD360, 0x20
-
-gUnknown_83CD380:: @ 83CD380
-	.incbin "baserom.gba", 0x3CD380, 0x268
-
-gUnknown_83CD5E8:: @ 83CD5E8
-	.incbin "baserom.gba", 0x3CD5E8, 0x2A0
-
-gUnknown_83CD888:: @ 83CD888
-	.incbin "baserom.gba", 0x3CD888, 0x10
-
-gUnknown_83CD898:: @ 83CD898
-	.incbin "baserom.gba", 0x3CD898, 0x20
-
-gUnknown_83CD8B8:: @ 83CD8B8
-    .word gUnknown_8E9986C
-    .word gUnknown_83CCF80
-    .word gUnknown_83CD040
-    .word gUnknown_83CD100
-    .word gUnknown_83CD1C0
-
-gUnknown_83CD8CC:: @ 83CD8CC
-    .word gUnknown_8E99198
-    .word gUnknown_83CCFE0
-    .word gUnknown_83CD0A0
-    .word gUnknown_83CD160
-    .word gUnknown_83CD220
-
-gUnknown_83CD8E0:: @ 83CD8E0
-	.incbin "baserom.gba", 0x3CD8E0, 0x3
-
-gUnknown_83CD8E3:: @ 83CD8E3
-	.incbin "baserom.gba", 0x3CD8E3, 0x6
-
-gUnknown_83CD8E9:: @ 83CD8E9
-	.incbin "baserom.gba", 0x3CD8E9, 0x3
-
-gUnknown_83CD8EC:: @ 83CD8EC
-	.incbin "baserom.gba", 0x3CD8EC, 0x8
-
-gUnknown_83CD8F4:: @ 83CD8F4
-	.incbin "baserom.gba", 0x3CD8F4, 0x4
-
-gUnknown_83CD8F8:: @ 83CD8F8
-	.incbin "baserom.gba", 0x3CD8F8, 0x10
-
-gUnknown_83CD908:: @ 83CD908
-	.incbin "baserom.gba", 0x3CD908, 0x18
-
-gUnknown_83CD920:: @ 83CD920
-	.incbin "baserom.gba", 0x3CD920, 0x2
-
-gUnknown_83CD922:: @ 83CD922
-	.incbin "baserom.gba", 0x3CD922, 0x2
-
-gUnknown_83CD924:: @ 83CD924
-	.incbin "baserom.gba", 0x3CD924, 0x2
-
-gUnknown_83CD926:: @ 83CD926
-	.incbin "baserom.gba", 0x3CD926, 0x2
-
-gUnknown_83CD928:: @ 83CD928
-	.incbin "baserom.gba", 0x3CD928, 0x8
-
-gUnknown_83CD930:: @ 83CD930
-	.incbin "baserom.gba", 0x3CD930, 0x2
-
-gUnknown_83CD932:: @ 83CD932
-	.incbin "baserom.gba", 0x3CD932, 0x2
-
-gUnknown_83CD934:: @ 83CD934
-	.incbin "baserom.gba", 0x3CD934, 0x2
-
-gUnknown_83CD936:: @ 83CD936
-	.incbin "baserom.gba", 0x3CD936, 0x2
-
-gUnknown_83CD938:: @ 83CD938
-	.incbin "baserom.gba", 0x3CD938, 0x2
-
-gUnknown_83CD93A:: @ 83CD93A
-	.incbin "baserom.gba", 0x3CD93A, 0x2
-
-gUnknown_83CD93C:: @ 83CD93C
-	.incbin "baserom.gba", 0x3CD93C, 0x2
-
-gUnknown_83CD93E:: @ 83CD93E
-	.incbin "baserom.gba", 0x3CD93E, 0x2
-
-gUnknown_83CD940:: @ 83CD940
-	.incbin "baserom.gba", 0x3CD940, 0x4
-
-gUnknown_83CD944:: @ 83CD944
-	.incbin "baserom.gba", 0x3CD944, 0x8
-
-gUnknown_83CD94C:: @ 83CD94C
-	.incbin "baserom.gba", 0x3CD94C, 0x6
-
-gUnknown_83CD952:: @ 83CD952
-	.incbin "baserom.gba", 0x3CD952, 0x6
-
-gUnknown_83CD958:: @ 83CD958
-	.incbin "baserom.gba", 0x3CD958, 0x4
-
-gUnknown_83CD95C:: @ 83CD95C
-	.incbin "baserom.gba", 0x3CD95C, 0x4
-
-gUnknown_83CD960:: @ 83CD960
-	.incbin "baserom.gba", 0x3CD960, 0x60
-
-gUnknown_83CD9C0:: @ 83CD9C0
-	.incbin "baserom.gba", 0x3CD9C0, 0x60