Move gTradePlatform_Tilemap to header and change to u32

pret · Jan 10, 2025 · a92d54b · a92d54b
1 parent 1c765d1
commit a92d54b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/include/trade.h b/include/trade.h
@@ -7,6 +7,7 @@
 extern struct Mail gTradeMail[PARTY_SIZE];
 extern u8 gSelectedTradeMonPositions[2];
 
+extern const u32 gTradePlatform_Tilemap[];
 extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate;
 
 s32 GetGameProgressForLinkTrade(void);

diff --git a/src/data/trade.h b/src/data/trade.h
@@ -635,7 +635,7 @@ static const u8 sLinkMonGlow_Gfx[] = INCBIN_U8("graphics/trade/link_mon_glow.4bp
 static const u8 sLinkMonShadow_Gfx[] = INCBIN_U8("graphics/trade/link_mon_shadow.4bpp");
 static const u8 sCableEnd_Gfx[] = INCBIN_U8("graphics/trade/cable_end.4bpp");
 static const u8 sGbaScreen_Gfx[] = INCBIN_U8("graphics/trade/gba_screen.4bpp");
-const u16 gTradePlatform_Tilemap[] = INCBIN_U16("graphics/trade/platform.bin");
+const u32 gTradePlatform_Tilemap[] = INCBIN_U32("graphics/trade/platform.bin");
 static const u8 sGbaAffine_Gfx[] = INCBIN_U8("graphics/trade/gba_affine.8bpp"); // Only the gfx for when the GBA is zooming in/out
 static const u8 sEmptyGfx[64] = {};
 static const u8 sGbaAffineMapCable[] = INCBIN_U8("graphics/trade/gba_affine_map_cable.bin");

diff --git a/src/egg_hatch.c b/src/egg_hatch.c
@@ -33,6 +33,7 @@
 #include "naming_screen.h"
 #include "pokemon_storage_system.h"
 #include "field_screen_effect.h"
+#include "trade.h"
 #include "data.h"
 #include "battle.h" // to get rid of later
 #include "constants/rgb.h"
@@ -62,7 +63,6 @@ struct EggHatchData
     u8 textColor[3];
 };
 
-extern const u32 gTradePlatform_Tilemap[];
 extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NicknameHatchPrompt[];