leafgreen match .text

5 files changed, 186 insertions, 167 deletions

diff --git a/src/main.c b/src/main.c
index 6d50e5fd3..c96e4cc3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,13 +55,6 @@ static void VCountIntr(void);
 static void SerialIntr(void);
 static void IntrDummy(void);
 
-#if defined(FIRERED)
-#define GAME_VERSION VERSION_FIRE_RED
-#elif defined(LEAFGREEN)
-#define GAME_VERSION VERSION_LEAF_GREEN
-#else
-#error unknown version
-#endif
 const u8 gGameVersion = GAME_VERSION;
 
 const u8 gGameLanguage = GAME_LANGUAGE;
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 9a91ca28f..68b651ced 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -145,7 +145,7 @@ static void sub_8141BA0(u8 a0);
 static void sub_8141BE4(void);
 static void sub_8141C30(u8, u8);
 
-/*static*/ const u8 gUnknown_8464890[][2] = {
+static const u8 gUnknown_8464890[][2] = {
     {0x00, 0x03},
     {0x00, 0x06},
     {0x03, 0x06},
@@ -167,7 +167,7 @@ static void sub_8141C30(u8, u8);
     {0x04, 0x06}
 };
 
-/*static*/ const u8 gUnknown_84648AE[][3] = {
+static const u8 gUnknown_84648AE[][3] = {
     {0x00, 0x03, 0x06}, // top row
     {0x01, 0x04, 0x07}, // middle row
     {0x02, 0x05, 0x08}, // bottom row
@@ -175,7 +175,7 @@ static void sub_8141C30(u8, u8);
     {0x02, 0x04, 0x06}  // bl-tr
 };
 
-/*static*/ const u8 gUnknown_84648BD[][4] = {
+static const u8 gUnknown_84648BD[][4] = {
     {0x00, 0x04, 0x08, 0x03}, // tl-br
     {0x00, 0x03, 0x06, 0x02}, // top row
     {0x01, 0x04, 0x07, 0x01}, // middle row
@@ -183,7 +183,7 @@ static void sub_8141C30(u8, u8);
     {0x02, 0x04, 0x06, 0x03}  // bl-tr
 };
 
-/*static*/ const u16 gUnknown_84648D2[][7] = {
+static const u16 gUnknown_84648D2[][7] = {
     {0x1fa1, 0x2eab, 0x3630, 0x39f3, 0x3bd4, 0x3bfc, 0x0049},
     {0x1f97, 0x2ea2, 0x3627, 0x39e9, 0x3bca, 0x3bf8, 0x0049},
     {0x1f91, 0x2e9b, 0x3620, 0x39e3, 0x3bc4, 0x3bf4, 0x0049},
@@ -192,13 +192,13 @@ static void sub_8141C30(u8, u8);
     {0x1fc9, 0x2efc, 0x3696, 0x3a63, 0x3c49, 0x3c8b, 0x0073},
 };
 
-/*static*/ const u8 gUnknown_8464926[][21] = {
+static const u8 gUnknown_8464926[][21] = {
     {0x00, 0x03, 0x04, 0x01, 0x02, 0x06, 0x02, 0x05, 0x00, 0x06, 0x03, 0x01, 0x04, 0x02, 0x06, 0x00, 0x05, 0x02, 0x01, 0x06, 0x02},
     {0x00, 0x05, 0x04, 0x03, 0x01, 0x05, 0x04, 0x03, 0x02, 0x05, 0x04, 0x03, 0x00, 0x05, 0x04, 0x01, 0x03, 0x06, 0x05, 0x03, 0x04},
     {0x00, 0x03, 0x06, 0x05, 0x02, 0x03, 0x06, 0x05, 0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x05, 0x06, 0x01},
 };
 
-/*static*/ const u16 gUnknown_8464966[] = {
+static const u16 gUnknown_8464966[] = {
       0,
       2,
       6,
@@ -208,32 +208,32 @@ static void sub_8141C30(u8, u8);
     300
 };
 
-/*static*/ const u16 gUnknown_8464974[] = INCBIN_U16("graphics/slot_machine/unk_8464974.gbapal");
-/*static*/ const u16 gUnknown_8464994[] = INCBIN_U16("graphics/slot_machine/unk_8464994.gbapal");
-/*static*/ const u16 gUnknown_84649B4[] = INCBIN_U16("graphics/slot_machine/unk_84649b4.gbapal");
-/*static*/ const u16 gUnknown_84649D4[] = INCBIN_U16("graphics/slot_machine/unk_84649d4.gbapal");
-/*static*/ const u16 gUnknown_84649F4[] = INCBIN_U16("graphics/slot_machine/unk_84649f4.gbapal");
+static const u16 gUnknown_8464974[] = INCBIN_U16("graphics/slot_machine/unk_8464974.gbapal");
+static const u16 gUnknown_8464994[] = INCBIN_U16("graphics/slot_machine/unk_8464994.gbapal");
+static const u16 gUnknown_84649B4[] = INCBIN_U16("graphics/slot_machine/unk_84649b4.gbapal");
+static const u16 gUnknown_84649D4[] = INCBIN_U16("graphics/slot_machine/unk_84649d4.gbapal");
+static const u16 gUnknown_84649F4[] = INCBIN_U16("graphics/slot_machine/unk_84649f4.gbapal");
 #if defined(FIRERED)
-/*static*/ const u32 gUnknown_8464A14[] = INCBIN_U32("graphics/slot_machine/unk_8464a14.4bpp.lz");
+static const u32 gUnknown_8464A14[] = INCBIN_U32("graphics/slot_machine/unk_8464a14.4bpp.lz");
 #elif defined(LEAFGREEN)
-/*static*/ const u32 gUnknown_8464A14[] = INCBIN_U32("graphics/slot_machine/unk_lg_8464434.4bpp.lz");
+static const u32 gUnknown_8464A14[] = INCBIN_U32("graphics/slot_machine/unk_lg_8464434.4bpp.lz");
 #endif
-/*static*/ const u16 gUnknown_846504C[] = INCBIN_U16("graphics/slot_machine/unk_846504c.gbapal");
+static const u16 gUnknown_846504C[] = INCBIN_U16("graphics/slot_machine/unk_846504c.gbapal");
 #if defined(FIRERED)
-/*static*/ const u32 gUnknown_846506C[] = INCBIN_U32("graphics/slot_machine/unk_846506c.4bpp.lz");
+static const u32 gUnknown_846506C[] = INCBIN_U32("graphics/slot_machine/unk_846506c.4bpp.lz");
 #elif defined(LEAFGREEN)
-/*static*/ const u32 gUnknown_846506C[] = INCBIN_U32("graphics/slot_machine/unk_lg_8464a3c.4bpp.lz");
+static const u32 gUnknown_846506C[] = INCBIN_U32("graphics/slot_machine/unk_lg_8464a3c.4bpp.lz");
 #endif
-/*static*/ const u16 gUnknown_8465524[] = INCBIN_U16("graphics/slot_machine/unk_8465524.gbapal");
-/*static*/ const u32 gUnknown_8465544[] = INCBIN_U32("graphics/slot_machine/unk_8465544.4bpp.lz");
+static const u16 gUnknown_8465524[] = INCBIN_U16("graphics/slot_machine/unk_8465524.gbapal");
+static const u32 gUnknown_8465544[] = INCBIN_U32("graphics/slot_machine/unk_8465544.4bpp.lz");
 
-/*static*/ const struct CompressedSpriteSheet gUnknown_84655B0[] = {
+static const struct CompressedSpriteSheet gUnknown_84655B0[] = {
     {(const void *)gUnknown_8464A14, 0xe00, 0},
     {(const void *)gUnknown_846506C, 0xc00, 1},
     {(const void *)gUnknown_8465544, 0x280, 2},
 };
 
-/*static*/ const struct SpritePalette gUnknown_84655C8[] = {
+static const struct SpritePalette gUnknown_84655C8[] = {
     {gUnknown_8464974, 0},
     {gUnknown_8464994, 1},
     {gUnknown_84649B4, 2},
@@ -244,7 +244,7 @@ static void sub_8141C30(u8, u8);
     {NULL}
 };
 
-/*static*/ const u16 gUnknown_8465608[] = {
+static const u16 gUnknown_8465608[] = {
     2,
     2,
     0,
@@ -254,7 +254,7 @@ static void sub_8141C30(u8, u8);
     3
 };
 
-/*static*/ const u16 gUnknown_8465616[] = {
+static const u16 gUnknown_8465616[] = {
     0x0120, 0x011f, 0x011e, 0x011d, 0x011c, 0x011b, 0x011a, 0x0119, 0x0118, 0x0117, 0x0116, 0x0115, 0x0114, 0x0113, 0x0112, 0x0111,
     0x0110, 0x010f, 0x010e, 0x010d, 0x010c, 0x010b, 0x010a, 0x0109, 0x0108, 0x0107, 0x0106, 0x0105, 0x0104, 0x0103, 0x0102, 0x0101,
     0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100,
@@ -263,13 +263,13 @@ static void sub_8141C30(u8, u8);
     0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011a, 0x011b, 0x011c, 0x011d, 0x011e, 0x011f, 0x0120
 };
 
-/*static*/ const u8 gUnknown_84656D6[] = {
+static const u8 gUnknown_84656D6[] = {
     0x10, 0x10, 0x10, 0x10, 0x0f, 0x0e, 0x0d, 0x0d, 0x0c, 0x0b, 0x0a, 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06, 0x05, 0x04, 0x04, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x09, 0x09, 0x0a, 0x0b, 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f
 };
 
-/*static*/ const struct OamData gUnknown_8465738 = {
+static const struct OamData gUnknown_8465738 = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -285,67 +285,67 @@ static void sub_8141C30(u8, u8);
     .affineParam = 0
 };
 
-/*static*/ const union AnimCmd gUnknown_8465740[] = {
+static const union AnimCmd gUnknown_8465740[] = {
     ANIMCMD_FRAME(0x00, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465748[] = {
+static const union AnimCmd gUnknown_8465748[] = {
     ANIMCMD_FRAME(0x10, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465750[] = {
+static const union AnimCmd gUnknown_8465750[] = {
     ANIMCMD_FRAME(0x20, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465758[] = {
+static const union AnimCmd gUnknown_8465758[] = {
     ANIMCMD_FRAME(0x30, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465760[] = {
+static const union AnimCmd gUnknown_8465760[] = {
     ANIMCMD_FRAME(0x40, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465768[] = {
+static const union AnimCmd gUnknown_8465768[] = {
     ANIMCMD_FRAME(0x50, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465770[] = {
+static const union AnimCmd gUnknown_8465770[] = {
     ANIMCMD_FRAME(0x60, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465778[] = {
+static const union AnimCmd gUnknown_8465778[] = {
     ANIMCMD_FRAME(0x20, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465780[] = {
+static const union AnimCmd gUnknown_8465780[] = {
     ANIMCMD_FRAME(0x30, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465788[] = {
+static const union AnimCmd gUnknown_8465788[] = {
     ANIMCMD_FRAME(0x40, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465790[] = {
+static const union AnimCmd gUnknown_8465790[] = {
     ANIMCMD_FRAME(0x50, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465798[] = {
+static const union AnimCmd gUnknown_8465798[] = {
     ANIMCMD_FRAME(0x60, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd *const gUnknown_84657A0[] = {
+static const union AnimCmd *const gUnknown_84657A0[] = {
     gUnknown_8465740,
     gUnknown_8465748,
     gUnknown_8465750,
@@ -360,20 +360,20 @@ static void sub_8141C30(u8, u8);
     gUnknown_8465798
 };
 
-/*static*/ const union AffineAnimCmd gUnknown_84657D0[] = {
+static const union AffineAnimCmd gUnknown_84657D0[] = {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 1),
     AFFINEANIMCMD_END
 };
 
-/*static*/ const union AffineAnimCmd *const gUnknown_84657E0[] = {
+static const union AffineAnimCmd *const gUnknown_84657E0[] = {
     gUnknown_84657D0
 };
 
-/*static*/ const struct SpriteTemplate gUnknown_84657E4 = {
+static const struct SpriteTemplate gUnknown_84657E4 = {
     0, 0, &gUnknown_8465738, gUnknown_84657A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 };
 
-/*static*/ const struct OamData gUnknown_84657FC = {
+static const struct OamData gUnknown_84657FC = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -389,57 +389,57 @@ static void sub_8141C30(u8, u8);
     .affineParam = 0
 };
 
-/*static*/ const union AnimCmd gUnknown_8465804[] = {
+static const union AnimCmd gUnknown_8465804[] = {
     ANIMCMD_FRAME(0x00, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_846580C[] = {
+static const union AnimCmd gUnknown_846580C[] = {
     ANIMCMD_FRAME(0x02, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465814[] = {
+static const union AnimCmd gUnknown_8465814[] = {
     ANIMCMD_FRAME(0x04, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_846581C[] = {
+static const union AnimCmd gUnknown_846581C[] = {
     ANIMCMD_FRAME(0x06, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465824[] = {
+static const union AnimCmd gUnknown_8465824[] = {
     ANIMCMD_FRAME(0x08, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_846582C[] = {
+static const union AnimCmd gUnknown_846582C[] = {
     ANIMCMD_FRAME(0x0a, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465834[] = {
+static const union AnimCmd gUnknown_8465834[] = {
     ANIMCMD_FRAME(0x0c, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_846583C[] = {
+static const union AnimCmd gUnknown_846583C[] = {
     ANIMCMD_FRAME(0x0e, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_8465844[] = {
+static const union AnimCmd gUnknown_8465844[] = {
     ANIMCMD_FRAME(0x10, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_846584C[] = {
+static const union AnimCmd gUnknown_846584C[] = {
     ANIMCMD_FRAME(0x12, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd *const gUnknown_8465854[] = {
+static const union AnimCmd *const gUnknown_8465854[] = {
     gUnknown_8465804,
     gUnknown_846580C,
     gUnknown_8465814,
@@ -452,11 +452,11 @@ static void sub_8141C30(u8, u8);
     gUnknown_846584C
 };
 
-/*static*/ const struct SpriteTemplate gUnknown_846587C = {
+static const struct SpriteTemplate gUnknown_846587C = {
     2, 6, &gUnknown_84657FC, gUnknown_8465854, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 };
 
-/*static*/ const struct OamData gUnknown_8465894 = {
+static const struct OamData gUnknown_8465894 = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -472,37 +472,37 @@ static void sub_8141C30(u8, u8);
     .affineParam = 0
 };
 
-/*static*/ const union AnimCmd gUnknown_846589C[] = {
+static const union AnimCmd gUnknown_846589C[] = {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_END
 };
 
-/*static*/ const union AnimCmd gUnknown_84658A4[] = {
+static const union AnimCmd gUnknown_84658A4[] = {
     ANIMCMD_FRAME( 0, 24),
     ANIMCMD_FRAME(16, 24),
     ANIMCMD_JUMP(0)
 };
 
-/*static*/ const union AnimCmd gUnknown_84658B0[] = {
+static const union AnimCmd gUnknown_84658B0[] = {
     ANIMCMD_FRAME(32, 28),
     ANIMCMD_FRAME(48, 28),
     ANIMCMD_JUMP(0)
 };
 
-/*static*/ const union AnimCmd gUnknown_84658BC[] = {
+static const union AnimCmd gUnknown_84658BC[] = {
     ANIMCMD_FRAME(64, 12),
     ANIMCMD_FRAME(80, 12),
     ANIMCMD_JUMP(0)
 };
 
-/*static*/ const union AnimCmd *const gUnknown_84658C8[] = {
+static const union AnimCmd *const gUnknown_84658C8[] = {
     gUnknown_846589C,
     gUnknown_84658A4,
     gUnknown_84658B0,
     gUnknown_84658BC
 };
 
-/*static*/ const struct SpriteTemplate gUnknown_84658D8 = {
+static const struct SpriteTemplate gUnknown_84658D8 = {
     1, 5, &gUnknown_8465894, gUnknown_84658C8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 };
 
@@ -525,33 +525,33 @@ bool8 (*const gUnknown_84658F0[])(u8 *, struct SlotMachineSetupTaskData *) = {
     sub_8141764
 };
 
-/*static*/ const u16 gUnknown_8465930[] = INCBIN_U16("graphics/slot_machine/unk_8465930.gbapal");
-/*static*/ const u16 gUnknown_8465950[] = INCBIN_U16("graphics/slot_machine/unk_8465950.gbapal");
-/*static*/ const u16 gUnknown_8465970[] = INCBIN_U16("graphics/slot_machine/unk_8465970.gbapal");
-/*static*/ const u16 gUnknown_8465990[] = INCBIN_U16("graphics/slot_machine/unk_8465990.gbapal");
-/*static*/ const u16 gUnknown_84659B0[] = INCBIN_U16("graphics/slot_machine/unk_84659b0.gbapal");
+static const u16 gUnknown_8465930[] = INCBIN_U16("graphics/slot_machine/unk_8465930.gbapal");
+static const u16 gUnknown_8465950[] = INCBIN_U16("graphics/slot_machine/unk_8465950.gbapal");
+static const u16 gUnknown_8465970[] = INCBIN_U16("graphics/slot_machine/unk_8465970.gbapal");
+static const u16 gUnknown_8465990[] = INCBIN_U16("graphics/slot_machine/unk_8465990.gbapal");
+static const u16 gUnknown_84659B0[] = INCBIN_U16("graphics/slot_machine/unk_84659b0.gbapal");
 #if defined(FIRERED)
-/*static*/ const u32 gUnknown_84659D0[] = INCBIN_U32("graphics/slot_machine/unk_84659d0.4bpp.lz");
-/*static*/ const u32 gUnknown_84661D4[] = INCBIN_U32("graphics/slot_machine/unk_84661d4.bin.lz");
+static const u32 gUnknown_84659D0[] = INCBIN_U32("graphics/slot_machine/unk_84659d0.4bpp.lz");
+static const u32 gUnknown_84661D4[] = INCBIN_U32("graphics/slot_machine/unk_84661d4.bin.lz");
 #elif defined(LEAFGREEN)
-/*static*/ const u32 gUnknown_84659D0[] = INCBIN_U32("graphics/slot_machine/unk_lg_846535c.4bpp.lz");
-/*static*/ const u32 gUnknown_84661D4[] = INCBIN_U32("graphics/slot_machine/unk_lg_8465ab8.bin.lz");
+static const u32 gUnknown_84659D0[] = INCBIN_U32("graphics/slot_machine/unk_lg_846535c.4bpp.lz");
+static const u32 gUnknown_84661D4[] = INCBIN_U32("graphics/slot_machine/unk_lg_8465ab8.bin.lz");
 #endif
-/*static*/ const u16 gUnknown_84664BC[] = INCBIN_U16("graphics/slot_machine/unk_84664bc.gbapal");
-/*static*/ const u16 gUnknown_84664DC[] = INCBIN_U16("graphics/slot_machine/unk_84664dc.gbapal","graphics/slot_machine/unk_84664fc.gbapal", "graphics/slot_machine/unk_846651c.gbapal");
-/*static*/ const u32 gUnknown_846653C[] = INCBIN_U32("graphics/slot_machine/unk_846653c.4bpp.lz");
-/*static*/ const u16 gUnknown_84665C0[] = INCBIN_U16("graphics/slot_machine/unk_84665c0.gbapal");
-/*static*/ const u16 gUnknown_84665E0[] = INCBIN_U16("graphics/slot_machine/unk_84665e0.gbapal");
-/*static*/ const u16 gUnknown_8466600[] = INCBIN_U16("graphics/slot_machine/unk_8466600.gbapal");
+static const u16 gUnknown_84664BC[] = INCBIN_U16("graphics/slot_machine/unk_84664bc.gbapal");
+static const u16 gUnknown_84664DC[] = INCBIN_U16("graphics/slot_machine/unk_84664dc.gbapal","graphics/slot_machine/unk_84664fc.gbapal", "graphics/slot_machine/unk_846651c.gbapal");
+static const u32 gUnknown_846653C[] = INCBIN_U32("graphics/slot_machine/unk_846653c.4bpp.lz");
+static const u16 gUnknown_84665C0[] = INCBIN_U16("graphics/slot_machine/unk_84665c0.gbapal");
+static const u16 gUnknown_84665E0[] = INCBIN_U16("graphics/slot_machine/unk_84665e0.gbapal");
+static const u16 gUnknown_8466600[] = INCBIN_U16("graphics/slot_machine/unk_8466600.gbapal");
 #if defined(FIRERED)
-/*static*/ const u32 gUnknown_8466620[] = INCBIN_U32("graphics/slot_machine/unk_8466620.4bpp.lz");
-/*static*/ const u32 gUnknown_8466998[] = INCBIN_U32("graphics/slot_machine/unk_8466998.bin.lz");
+static const u32 gUnknown_8466620[] = INCBIN_U32("graphics/slot_machine/unk_8466620.4bpp.lz");
+static const u32 gUnknown_8466998[] = INCBIN_U32("graphics/slot_machine/unk_8466998.bin.lz");
 #elif defined(LEAFGREEN)
-/*static*/ const u32 gUnknown_8466620[] = INCBIN_U32("graphics/slot_machine/unk_lg_8465f00.4bpp.lz");
-/*static*/ const u32 gUnknown_8466998[] = INCBIN_U32("graphics/slot_machine/unk_lg_8466278.bin.lz");
+static const u32 gUnknown_8466620[] = INCBIN_U32("graphics/slot_machine/unk_lg_8465f00.4bpp.lz");
+static const u32 gUnknown_8466998[] = INCBIN_U32("graphics/slot_machine/unk_lg_8466278.bin.lz");
 #endif
 
-/*static*/ const struct BgTemplate gUnknown_8466B10[] = {
+static const struct BgTemplate gUnknown_8466B10[] = {
     {
         .bg = 0,
         .charBaseIndex = 0,
@@ -587,7 +587,7 @@ bool8 (*const gUnknown_84658F0[])(u8 *, struct SlotMachineSetupTaskData *) = {
     }
 };
 
-/*static*/ const struct WindowTemplate gUnknown_8466B20[] = {
+static const struct WindowTemplate gUnknown_8466B20[] = {
     {
         .bg = 0,
         .tilemapLeft = 5,
@@ -608,27 +608,27 @@ bool8 (*const gUnknown_84658F0[])(u8 *, struct SlotMachineSetupTaskData *) = {
     DUMMY_WIN_TEMPLATE
 };
 
-/*static*/ const u16 gUnknown_8466B38[] = {
+static const u16 gUnknown_8466B38[] = {
     0x00a4, 0x00a5, 0x00a6, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00e7, 0x012c, 0x014c, 0x0191, 0x01b1, 0x01f6, 0x0216, 0x0217, 0x0218, 0x0219, 0x0237, 0x0238, 0x0239
 };
 
-/*static*/ const u16 gUnknown_8466B60[] = {
+static const u16 gUnknown_8466B60[] = {
     0x00e4, 0x00e5, 0x00e6, 0x00f7, 0x00f8, 0x00f9, 0x0104, 0x0105, 0x0106, 0x0107, 0x010c, 0x0111, 0x0116, 0x0117, 0x0118, 0x0119, 0x0124, 0x0125, 0x0126, 0x0137, 0x0138, 0x0139
 };
 
-/*static*/ const u16 gUnknown_8466B8C[] = {
+static const u16 gUnknown_8466B8C[] = {
     0x0144, 0x0145, 0x0146, 0x0157, 0x0158, 0x0159, 0x0164, 0x0165, 0x0166, 0x0167, 0x016c, 0x0171, 0x0176, 0x0177, 0x0178, 0x0179, 0x0184, 0x0185, 0x0186, 0x0197, 0x0198, 0x0199
 };
 
-/*static*/ const u16 gUnknown_8466BB8[] = {
+static const u16 gUnknown_8466BB8[] = {
     0x01a4, 0x01a5, 0x01a6, 0x01b7, 0x01b8, 0x01b9, 0x01c4, 0x01c5, 0x01c6, 0x01c7, 0x01cc, 0x01d1, 0x01d6, 0x01d7, 0x01d8, 0x01d9, 0x01e4, 0x01e5, 0x01e6, 0x01f7, 0x01f8, 0x01f9
 };
 
-/*static*/ const u16 gUnknown_8466BE4[] = {
+static const u16 gUnknown_8466BE4[] = {
     0x0204, 0x0205, 0x0206, 0x0224, 0x0225, 0x0226, 0x01e7, 0x0207, 0x018c, 0x01ac, 0x0131, 0x0151, 0x00d6, 0x00f6, 0x00b7, 0x00b8, 0x00b9, 0x00d7, 0x00d8, 0x00d9
 };
 
-/*static*/ const struct UnkStruct_8466C0C gUnknown_8466C0C[] = {
+static const struct UnkStruct_8466C0C gUnknown_8466C0C[] = {
     { gUnknown_8466B38, NELEMS(gUnknown_8466B38) },
     { gUnknown_8466B60, NELEMS(gUnknown_8466B60) },
     { gUnknown_8466B8C, NELEMS(gUnknown_8466B8C) },
@@ -636,9 +636,9 @@ bool8 (*const gUnknown_84658F0[])(u8 *, struct SlotMachineSetupTaskData *) = {
     { gUnknown_8466BE4, NELEMS(gUnknown_8466BE4) }
 };
 
-/*static*/ const u8 gUnknown_8466C34[2] = {2, 4};
+static const u8 gUnknown_8466C34[2] = {2, 4};
 
-/*static*/ const struct WindowTemplate gUnknown_8466C38 = {
+static const struct WindowTemplate gUnknown_8466C38 = {
     .bg = 0,
     .tilemapLeft = 19,
     .tilemapTop = 9,
@@ -648,7 +648,7 @@ bool8 (*const gUnknown_84658F0[])(u8 *, struct SlotMachineSetupTaskData *) = {
     .baseBlock = 0x9F
 };
 
-/*static*/ const u16 gUnknown_8466C40[][4] = {
+static const u16 gUnknown_8466C40[][4] = {
     {0x0229, 0x022a, 0x0249, 0x024a},
     {0x022e, 0x022f, 0x024e, 0x024f},
     {0x0233, 0x0234, 0x0253, 0x0254}
diff --git a/src/string_util.c b/src/string_util.c
index d5b5202df..ccef95f71 100644
--- a/src/string_util.c
+++ b/src/string_util.c
@@ -405,37 +405,65 @@ static u8 *ExpandPlaceholder_RivalName(void)
 
 static u8 *ExpandPlaceholder_Version(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Ruby;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Sapphire;
+#endif
 }
 
 static u8 *ExpandPlaceholder_Magma(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Magma;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Aqua;
+#endif
 }
 
 static u8 *ExpandPlaceholder_Aqua(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Aqua;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Magma;
+#endif
 }
 
 static u8 *ExpandPlaceholder_Maxie(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Maxie;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Archie;
+#endif
 }
 
 static u8 *ExpandPlaceholder_Archie(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Archie;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Maxie;
+#endif
 }
 
 static u8 *ExpandPlaceholder_Groudon(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Groudon;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Kyogre;
+#endif
 }
 
 static u8 *ExpandPlaceholder_Kyogre(void)
 {
+#if defined(FIRERED)
     return gExpandedPlaceholder_Kyogre;
+#elif defined(LEAFGREEN)
+    return gExpandedPlaceholder_Groudon;
+#endif
 }
 
 u8 *GetExpandedPlaceholder(u32 id)
diff --git a/src/title_screen.c b/src/title_screen.c
index be43d49cb..7bf8a0699 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -1006,7 +1006,7 @@ static void Task_FlameOrLeafSpawner(u8 taskId)
 
 static void CreateFlameOrLeafSprite(s32 y0, s32 x1, s32 y1)
 {
-    u8 spriteId = CreateSprite(&sSpriteTemplate_FlameOrLeaf_State0, 0xF0, y0, 0);
+    u8 spriteId = CreateSprite(&sSpriteTemplate_FlameOrLeaf_State1, 0xF0, y0, 0);
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].data[0] = 0xF00;
@@ -1036,7 +1036,7 @@ static void sub_LG_8079844(void)
     u8 spriteId;
     for (i = 0; i < 4; i++)
     {
-        spriteId = CreateSprite(&sUnknownEmptySprite, 0x100 + 0x28 * i, gUnknown_LG_83BFA10[i], 0xFF);
+        spriteId = CreateSprite(&sSpriteTemplate_FlameOrLeaf_State0, 0x100 + 0x28 * i, gUnknown_LG_83BFA10[i], 0xFF);
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].data[7] = i;
@@ -1066,12 +1066,12 @@ static void Task_FlameOrLeafSpawner(u8 taskId)
         {
             data[1] = 0;
             data[2] = (TitleScreen_rand(taskId, 3) % 6) + 6;
-            rval = TitleScreen_rand(taskId, 3) % 48;
+            rval = TitleScreen_rand(taskId, 3) % 30;
             r6 = 16;
             if (rval >= 6)
             {
                 r6 = 48;
-                if (rval < 18)
+                if (rval < 12)
                     r6 = 24;
             }
             r4 = (TitleScreen_rand(taskId, 3) % 4) - 2;
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 766935244..e4778f5ed 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -528,7 +528,7 @@ static void Task_TrainerCard(u8 taskId)
             PutTrainerCardWindow(1);
             sTrainerCardDataPtr->var_7BCE = FALSE;
         }
-        
+
         if (JOY_NEW(A_BUTTON))
         {
             HelpSystem_SetSomeVariable2(11);
@@ -748,13 +748,13 @@ static u8 GetTrainerStarCount(struct TrainerCard *trainerCard)
 
     if (trainerCard->hofDebutHours != 0 || trainerCard->hofDebutMinutes != 0 || trainerCard->hofDebutSeconds != 0)
         stars++;
-    
+
     if (trainerCard->caughtAllHoenn)
         stars++;
-    
+
     if (trainerCard->battleTowerStraightWins > 49)
         stars++;
-    
+
     if (trainerCard->hasAllPaintings)
         stars++;
 
@@ -765,7 +765,7 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType)
 {
     u32 playTime;
     u8 i;
-    
+
     trainerCard->gender = gSaveBlock2Ptr->playerGender;
     trainerCard->playTimeHours = gSaveBlock2Ptr->playTimeHours;
     trainerCard->playTimeMinutes = gSaveBlock2Ptr->playTimeMinutes;
@@ -793,12 +793,12 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType)
     trainerCard->linkBattleWins = GetCappedGameStat(GAME_STAT_LINK_BATTLE_WINS, 9999);
     trainerCard->linkBattleLosses = GetCappedGameStat(GAME_STAT_LINK_BATTLE_LOSSES, 9999);
     trainerCard->pokemonTrades = GetCappedGameStat(GAME_STAT_POKEMON_TRADES, 0xFFFF);
-    
+
     trainerCard->battleTowerWins = 0;
     trainerCard->battleTowerStraightWins = 0;
     trainerCard->contestsWithFriends = 0;
     trainerCard->pokeblocksWithFriends = 0;
-    
+
     trainerCard->hasAllPaintings = FALSE;
 
     trainerCard->money = GetMoney(&gSaveBlock1Ptr->money);
@@ -817,10 +817,10 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType)
         trainerCard->stars = 0;
         if (trainerCard->hofDebutHours != 0 || (trainerCard->hofDebutMinutes != 0 || trainerCard->hofDebutSeconds != 0))
             trainerCard->stars = cardType;
-        
+
         if (HasAllKantoMons())
             trainerCard->stars++;
-        
+
         if (HasAllMons())
             trainerCard->stars++;
     }
@@ -829,46 +829,46 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType)
 void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCard)
 {
     u8 id = 0;
-    
-    trainerCard->version = VERSION_FIRE_RED;
+
+    trainerCard->version = GAME_VERSION;
     SetPlayerCardData(trainerCard, CARD_TYPE_EMERALD);
     if (GetCardType() != CARD_TYPE_FRLG)
         return;
-    
+
     trainerCard->stars = id;
     if (trainerCard->hofDebutHours != 0 || trainerCard->hofDebutMinutes != 0 || trainerCard->hofDebutSeconds != 0)
         trainerCard->stars = 1;
-    
+
     trainerCard->caughtAllHoenn = HasAllKantoMons();
     trainerCard->hasAllMons = HasAllMons();
     trainerCard->berriesPicked = gSaveBlock2Ptr->berryPick.berriesPicked;
     trainerCard->jumpsInRow = gSaveBlock2Ptr->pokeJump.jumpsInRow;
-    
+
     trainerCard->berryCrushPoints = GetCappedGameStat(GAME_STAT_BERRY_CRUSH_POINTS, 0xFFFF);
     trainerCard->unionRoomNum = GetCappedGameStat(GAME_STAT_NUM_UNION_ROOM_BATTLES, 0xFFFF);
     trainerCard->var_4C = TRUE;
-    
+
     if (trainerCard->caughtAllHoenn)
         trainerCard->stars++;
-    
+
     if (trainerCard->hasAllMons)
         trainerCard->stars++;
-    
+
     if (trainerCard->berriesPicked >= 200 && trainerCard->jumpsInRow >= 200)
         trainerCard->stars++;
-    
+
     id = ((u16)trainerCard->trainerId) % 8;
     if (trainerCard->gender == FEMALE)
         trainerCard->var_4F = sLinkTrainerCardFacilityClasses[1][id];
     else
         trainerCard->var_4F = sLinkTrainerCardFacilityClasses[0][id];
-        
+
     trainerCard->var_50[0] = VarGet(VAR_HOF_BRAG_STATE);
     trainerCard->var_50[1] = VarGet(VAR_EGG_BRAG_STATE);
     trainerCard->var_50[2] = VarGet(VAR_LINK_WIN_BRAG_STATE);
-    
+
     trainerCard->var_4E = VarGet(VAR_TRAINER_CARD_MON_ICON_TINT_IDX);
-    
+
     trainerCard->monSpecies[0] = MailSpeciesToIconSpecies(VarGet(VAR_TRAINER_CARD_MON_ICON_1));
     trainerCard->monSpecies[1] = MailSpeciesToIconSpecies(VarGet(VAR_TRAINER_CARD_MON_ICON_2));
     trainerCard->monSpecies[2] = MailSpeciesToIconSpecies(VarGet(VAR_TRAINER_CARD_MON_ICON_3));
@@ -881,7 +881,7 @@ static void SetDataFromTrainerCard(void)
 {
     u32 badgeFlag;
     u8 i;
-    
+
     sTrainerCardDataPtr->hasPokedex = FALSE;
     sTrainerCardDataPtr->hasHofResult = FALSE;
     sTrainerCardDataPtr->hasLinkResults = FALSE;
@@ -889,19 +889,19 @@ static void SetDataFromTrainerCard(void)
     sTrainerCardDataPtr->var_E = FALSE;
     sTrainerCardDataPtr->var_F = FALSE;
     sTrainerCardDataPtr->hasTrades = FALSE;
-    
+
     memset(&sTrainerCardDataPtr->hasBadge, FALSE, BADGE_COUNT);
     if (sTrainerCardDataPtr->trainerCard.hasPokedex)
         sTrainerCardDataPtr->hasPokedex++;
-    
+
     if (sTrainerCardDataPtr->trainerCard.hofDebutHours != 0
      || sTrainerCardDataPtr->trainerCard.hofDebutMinutes != 0
      || sTrainerCardDataPtr->trainerCard.hofDebutSeconds != 0)
         sTrainerCardDataPtr->hasHofResult++;
-    
+
     if (sTrainerCardDataPtr->trainerCard.linkBattleWins != 0 || sTrainerCardDataPtr->trainerCard.linkBattleLosses != 0)
         sTrainerCardDataPtr->hasLinkResults++;
-    
+
     if (sTrainerCardDataPtr->trainerCard.pokemonTrades != 0)
         sTrainerCardDataPtr->hasTrades++;
 
@@ -937,7 +937,7 @@ static void sub_8089BD8(u16 arg0)
 
     if (quotient <= 4)
         quotient = 0;
-    
+
     sTrainerCardDataPtr->var_456 = quotient;
     SetGpuReg(REG_OFFSET_BLDY, sTrainerCardDataPtr->var_456);
     SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(sTrainerCardDataPtr->var_7BCC, 160 - sTrainerCardDataPtr->var_7BCC));
@@ -1042,7 +1042,7 @@ static bool8 PrintAllOnCardPage1(void)
     sTrainerCardDataPtr->printState++;
     return FALSE;
 }
- 
+
 static bool8 PrintStringsOnCardPage2(void)
 {
     switch (sTrainerCardDataPtr->printState)
@@ -1093,7 +1093,7 @@ static void PrintNameOnCard(void)
 {
     u8 buffer[2][32];
     u8* txtPtr;
-    
+
     txtPtr = StringCopy(buffer[0], gText_TrainerCardName);
     txtPtr = buffer[1];
     StringCopy(txtPtr, sTrainerCardDataPtr->trainerCard.playerName);
@@ -1101,12 +1101,12 @@ static void PrintNameOnCard(void)
     StringAppend(buffer[0], txtPtr);
     AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardPlayerNameXPositions[sTrainerCardDataPtr->cardType], sTrainerCardPlayerNameYPositions[sTrainerCardDataPtr->cardType], sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, buffer[0]);
 }
-    
+
 static void PrintIdOnCard(void)
 {
     u8 buffer[32];
     u8* txtPtr;
-    
+
     txtPtr = StringCopy(buffer, gText_TrainerCardIDNo);
     ConvertIntToDecimalStringN(txtPtr, sTrainerCardDataPtr->trainerCard.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5);
     AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardIdXPositions[sTrainerCardDataPtr->cardType], sTrainerCardIdYPositions[sTrainerCardDataPtr->cardType], sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, buffer);
@@ -1146,7 +1146,7 @@ static void PrintPokedexOnCard(void)
 {
     u8 buffer[10];
     u8 x;
-    
+
     if (FlagGet(FLAG_SYS_POKEDEX_GET))
     {
         ConvertIntToDecimalStringN(buffer, sTrainerCardDataPtr->trainerCard.caughtMonsCount, 0, 3);
@@ -1183,22 +1183,22 @@ static void PrintTimeOnCard(void)
 
     if (hours > 999)
         hours = 999;
-    
+
     if (minutes > 59)
         minutes = 59;
-    
+
     FillWindowPixelRect(1, PIXEL_FILL(0), sTrainerCardTimeHoursXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], 50, 12);
     if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
         AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 88, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, gText_TrainerCardTime);
     else
         AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 89, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, gText_TrainerCardTime);
-    
+
     ConvertIntToDecimalStringN(buffer, hours, STR_CONV_MODE_RIGHT_ALIGN, 3);
     AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeHoursXPositions[sTrainerCardDataPtr->cardType],
         sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, buffer);
     AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeHoursYPositions[sTrainerCardDataPtr->cardType],
         sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors[sTrainerCardDataPtr->var_7], TEXT_SPEED_FF, gText_Colon2);
-    
+
     ConvertIntToDecimalStringN(buffer, minutes, STR_CONV_MODE_LEADING_ZEROS, 2);
     AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeMinutesXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, buffer);
 }
@@ -1209,13 +1209,13 @@ static void PrintProfilePhraseOnCard(void)
     {
         AddTextPrinterParameterized3(1, 2, 10, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType],
             sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->var_19[0]);
-        
+
         AddTextPrinterParameterized3(1, 2, GetStringWidth(2, sTrainerCardDataPtr->var_19[0], 0) + 16, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType],
             sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->var_19[1]);
-            
+
         AddTextPrinterParameterized3(1, 2, 10, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType],
             sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->var_19[2]);
-            
+
         AddTextPrinterParameterized3(1, 2, GetStringWidth(2, sTrainerCardDataPtr->var_19[2], 0) + 16, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType],
             sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->var_19[3]);    
     }
@@ -1234,7 +1234,7 @@ static void PrintNameOnCard2(void)
 static void sub_808A4FC(void)
 {
     u8 x;
-    
+
     if (sTrainerCardDataPtr->cardType == CARD_TYPE_FRLG)
     {
         AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sUnknown_83CD93C[sTrainerCardDataPtr->cardType],
@@ -1243,7 +1243,7 @@ static void sub_808A4FC(void)
     else
     {    
         x = sUnknown_83CD93C[sTrainerCardDataPtr->cardType] - GetStringWidth(sTrainerCardFontIds[1], sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME], GetFontAttribute(sTrainerCardFontIds[1], FONTATTR_LETTER_SPACING));
-    
+
         AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, sUnknown_83CD93E[sTrainerCardDataPtr->cardType],
             sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME]);
     }
@@ -1253,7 +1253,7 @@ static void PrintHofTimeOnCard(void)
 {
     u8 buffer[10];
     u8* txtPtr;
-    
+
     if (sTrainerCardDataPtr->hasHofResult)
     {
         ConvertIntToDecimalStringN(buffer, sTrainerCardDataPtr->trainerCard.hofDebutHours, STR_CONV_MODE_RIGHT_ALIGN, 3);
@@ -1279,7 +1279,7 @@ static void PrintHofDebutStringOnCard(void)
 static void PrintLinkResultsNumsOnCard(void)
 {
     u8 buffer[30];
-    
+
     if (sTrainerCardDataPtr->hasLinkResults)
     {
         StringCopy(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_RECORD], sLinkTrainerCardRecordStrings[sTrainerCardDataPtr->cardType]);
@@ -1378,7 +1378,6 @@ static void TrainerCard_PrintPokemonIconsOnCard(void)
     }
 }
 
-
 static void sub_808AB10(void)
 {
     u8 i;
@@ -1398,7 +1397,7 @@ static void sub_808AB10(void)
         TintPalette_SepiaTone(sTrainerCardDataPtr->monIconPals, 96);
         break;
     }
-    
+
     LoadPalette(sTrainerCardDataPtr->monIconPals, 80, 192);
     for (i = 0; i < 6; i++)
     {
@@ -1410,7 +1409,7 @@ static void sub_808ABE0(void)
 {
     u8 i;
     u8 buffer[4];
-    
+
     memcpy(buffer, sUnknown_83CD958, sizeof(sUnknown_83CD958));
     if (sTrainerCardDataPtr->cardType == CARD_TYPE_FRLG && sTrainerCardDataPtr->trainerCard.var_4C == 1)
     {
@@ -1479,7 +1478,7 @@ static bool8 SetTrainerCardBgsAndPals(void)
         FillBgTilemapBufferRect_Palette0(3, 0, 0, 0, 32, 32);
         return TRUE;
     }
-    
+
     sTrainerCardDataPtr->bgPalLoadState++;
     return FALSE;
 }
@@ -1499,7 +1498,7 @@ static void LoadTrainerCardTilemap2(const u16* ptr)
                 dst[32 * i + j] = ptr[0];
         }
     }
-    
+
     CopyBgTilemapBufferToVram(2);
 }
 
@@ -1518,7 +1517,7 @@ static void LoadTrainerCardTilemap0(const u16* ptr)
                 dst[32 * i + j] = ptr[0];
         }
     }
-    
+
     CopyBgTilemapBufferToVram(0);
 }
 
@@ -1543,7 +1542,7 @@ static void TrainerCard_PrintStarsAndBadgesOnCard(void)
             }
         }
     }
-    
+
     CopyBgTilemapBufferToVram(3);
 }
 
@@ -1556,13 +1555,13 @@ static void sub_808B090(void)
             FillBgTilemapBufferRect(3, 141, 26, 9, 1, 1, 1);
             FillBgTilemapBufferRect(3, 157, 26, 10, 1, 1, 1);
         }
-        
+
         if (sTrainerCardDataPtr->trainerCard.berryCrushPoints)
         {
             FillBgTilemapBufferRect(3, 141, 21, 13, 1, 1, 1);
             FillBgTilemapBufferRect(3, 157, 21, 14, 1, 1, 1);
         }
-        
+
         if (sTrainerCardDataPtr->trainerCard.unionRoomNum)
         {
             FillBgTilemapBufferRect(3, 141, 27, 11, 1, 1, 1);
@@ -1577,7 +1576,7 @@ static void sub_808B090(void)
             FillBgTilemapBufferRect(3, 157, 26, 10, 1, 1, 0);
         }
     }
-    
+
     CopyBgTilemapBufferToVram(3);
 }
 
@@ -1629,7 +1628,7 @@ static bool8 sub_808B254(struct Task* task)
     {
         gScanlineEffectRegBuffers[1][i] = 0;
     }
-    
+
     task->data[0]++;
     return FALSE;
 }
@@ -1647,7 +1646,7 @@ static bool8 sub_808B294(struct Task* task)
 
     sTrainerCardDataPtr->var_7BCC = task->data[1];
     sub_8089BD8(task->data[1]);
-    
+
     r7 = task->data[1];
     r9 = 160 - r7;
     r4 = r9 - r7;
@@ -1663,7 +1662,7 @@ static bool8 sub_808B294(struct Task* task)
     {
         gScanlineEffectRegBuffers[0][i] = -i;
     }
-    
+
     for (; i < (s16)r9; i++)
     {
         var = r6 >> 16;
@@ -1671,13 +1670,13 @@ static bool8 sub_808B294(struct Task* task)
         r5 -= r10;
         gScanlineEffectRegBuffers[0][i] = var;
     }
-    
+
     var = var_24 >> 16;
     for (; i < 160; i++)
     {
         gScanlineEffectRegBuffers[0][i] = var;
     }
-    
+
     sTrainerCardDataPtr->allowDMACopy = TRUE;
     if (task->data[1] >= 77)
         task->data[0]++;
@@ -1749,7 +1748,7 @@ static bool8 sub_808B4D8(struct Task* task)
         LoadTrainerCardTilemap0(&sTrainerCardDataPtr->var_4BC);
         TrainerCard_PrintStarsAndBadgesOnCard();
     }
-    
+
     PutTrainerCardWindow(1);
     sTrainerCardDataPtr->var_8 ^= 1;
     task->data[0]++;
@@ -1771,7 +1770,7 @@ static bool8 sub_808B540(struct Task* task)
 
     sTrainerCardDataPtr->var_7BCC = task->data[1];
     sub_8089BD8(task->data[1]);
-    
+
     r7 = task->data[1];
     r9 = 160 - r7;
     r4 = r9 - r7;
@@ -1795,13 +1794,13 @@ static bool8 sub_808B540(struct Task* task)
         r5 += r10;
         gScanlineEffectRegBuffers[0][i] = var;
     }
-    
+
     var = var_24 >> 16;
     for (; i < 160; i++)
     {
         gScanlineEffectRegBuffers[0][i] = var;
     }
-    
+
     sTrainerCardDataPtr->allowDMACopy = TRUE;
     if (task->data[1] <= 0)
         task->data[0]++;
@@ -1826,7 +1825,7 @@ void ShowPlayerTrainerCard(void (*callback)(void))
         sTrainerCardDataPtr->isLink = TRUE;
     else
         sTrainerCardDataPtr->isLink = FALSE;
-    
+
     sTrainerCardDataPtr->language = GAME_LANGUAGE;
     TrainerCard_GenerateCardForLinkPlayer(&sTrainerCardDataPtr->trainerCard);
     SetMainCallback2(CB2_InitTrainerCard);
@@ -1855,7 +1854,7 @@ static void sub_808B774(void)
         sTrainerCardDataPtr->cardType = CARD_TYPE_EMERALD;
     else
         sTrainerCardDataPtr->cardType = CARD_TYPE_FRLG;
-    
+
     for (i = 0; i < 4; i++)
     {
         CopyEasyChatWord(sTrainerCardDataPtr->var_19[i], sTrainerCardDataPtr->trainerCard.var_28[i]);
@@ -1883,7 +1882,7 @@ static u8 GetCardType(void)
 static void sub_808B838(void)
 {
     u8 val = sLinkTrainerCardFrontPics[sTrainerCardDataPtr->cardType][sTrainerCardDataPtr->trainerCard.gender];
-    
+
     if (InUnionRoom() == TRUE && gReceivedRemoteLinkPlayers == 1)
     {
         val = sTrainerCardDataPtr->trainerCard.var_4F;
@@ -1929,4 +1928,3 @@ static void Unref_InitTrainerCardLink2(void (*callback)(void))
     ShowTrainerCardInLink(CARD_TYPE_FRLG, callback);
     SetMainCallback2(CB2_InitTrainerCard);
 }
-