From ce192e44f8895023b25d3a29e3aec73183eb6d3d Mon Sep 17 00:00:00 2001 From: Icedude907 <34080011+Icedude907@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:42:01 +1300 Subject: [PATCH] Moved stragglers `.lz` and `.rl` Should really have a different extension for tilemaps rather than `.bin` --- .gitignore | 2 - graphics.mk | 6 +- src/battle_transition.c | 10 +- src/battle_transition_frontier.c | 2 +- src/berry_crush.c | 6 +- src/cable_car.c | 8 +- src/contest_painting.c | 12 +- src/data/graphics/battle_terrain.h | 42 ++-- src/data/graphics/berries.h | 4 +- src/data/graphics/berry_fix.h | 12 +- src/data/graphics/intro_scene.h | 22 +- src/data/graphics/mail.h | 24 +-- src/data/graphics/rayquaza_scene.h | 28 +-- src/data/region_map/city_map_tilemaps.h | 44 ++-- src/data/trade.h | 4 +- src/data/wallpapers.h | 60 +++--- src/diploma.c | 2 +- src/dodrio_berry_picking.c | 12 +- src/evolution_scene.c | 4 +- src/fldeff_flash.c | 2 +- src/frontier_pass.c | 8 +- src/graphics.c | 236 ++++++++++----------- src/intro.c | 12 +- src/intro_credits_graphics.c | 8 +- src/link.c | 2 +- src/main_menu.c | 2 +- src/mystery_gift_view.c | 20 +- src/pokedex_area_region_map.c | 4 +- src/pokemon_jump.c | 6 +- src/pokemon_storage_system.c | 4 +- src/pokenav_conditions_gfx.c | 2 +- src/pokenav_conditions_search_results.c | 2 +- src/pokenav_match_call_gfx.c | 2 +- src/pokenav_menu_handler_gfx.c | 4 +- src/pokenav_ribbons_list.c | 2 +- src/region_map.c | 4 +- src/roulette.c | 4 +- src/starter_choose.c | 4 +- src/title_screen.c | 2 +- src/use_pokeblock.c | 4 +- src/wireless_communication_status_screen.c | 2 +- 41 files changed, 320 insertions(+), 320 deletions(-) diff --git a/.gitignore b/.gitignore index 8aada8a75ebd..5fe530e9cb50 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,6 @@ *.sa1 *.ss[0-9] *.sg1 -*.lz -*.rl tools/agbcc *.map *.bat diff --git a/graphics.mk b/graphics.mk index 244bbcdb7759..2c65bb2c825c 100644 --- a/graphics.mk +++ b/graphics.mk @@ -26,7 +26,9 @@ $(BUILD_ASSETS_DIR)/%.lz: $(BUILD_ASSETS_DIR)/% $(GFX) $< $@ $(BUILD_ASSETS_DIR)/%.rl: $(BUILD_ASSETS_DIR)/% $(GFX) $< $@ -%.lz: % +$(BUILD_ASSETS_DIR)/%.lz: % + @mkdir -p $(@D) $(GFX) $< $@ -%.rl: % +$(BUILD_ASSETS_DIR)/%.rl: % + @mkdir -p $(@D) $(GFX) $< $@ \ No newline at end of file diff --git a/src/battle_transition.c b/src/battle_transition.c index 505a4ad715f2..87151b10fe8b 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -304,9 +304,9 @@ static const u8 sUnusedLass_Gfx[] = INCBIN_U8("build/assets/graphics/battle_tran static const u32 sShrinkingBoxTileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/shrinking_box.4bpp"); static const u16 sEvilTeam_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/evil_team.gbapal"); static const u32 sTeamAqua_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/team_aqua.4bpp.lz"); -static const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz"); +static const u32 sTeamAqua_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/team_aqua.bin.lz"); static const u32 sTeamMagma_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/team_magma.4bpp.lz"); -static const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz"); +static const u32 sTeamMagma_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/team_magma.bin.lz"); static const u32 sRegis_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/regis.4bpp"); static const u16 sRegice_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/regice.gbapal"); static const u16 sRegisteel_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/registeel.gbapal"); @@ -316,9 +316,9 @@ static const u32 sRegisteel_Tilemap[] = INCBIN_U32("graphics/battle_transitions/ static const u32 sRegirock_Tilemap[] = INCBIN_U32("graphics/battle_transitions/regirock.bin"); static const u16 sUnused_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/unused.gbapal"); static const u32 sKyogre_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/kyogre.4bpp.lz"); -static const u32 sKyogre_Tilemap[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz"); +static const u32 sKyogre_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/kyogre.bin.lz"); static const u32 sGroudon_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/groudon.4bpp.lz"); -static const u32 sGroudon_Tilemap[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz"); +static const u32 sGroudon_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/groudon.bin.lz"); static const u16 sKyogre1_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/kyogre_pt1.gbapal"); static const u16 sKyogre2_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/kyogre_pt2.gbapal"); static const u16 sGroudon1_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/groudon_pt1.gbapal"); @@ -328,7 +328,7 @@ static const u32 sRayquaza_Tileset[] = INCBIN_U32("build/assets/graphics/battle_ static const u32 sRayquaza_Tilemap[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin"); static const u16 sFrontierLogo_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/frontier_logo.gbapal"); static const u32 sFrontierLogo_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_logo.4bpp.lz"); -static const u32 sFrontierLogo_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo.bin.lz"); +static const u32 sFrontierLogo_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_logo.bin.lz"); static const u16 sFrontierSquares_Palette[] = INCBIN_U16("build/assets/graphics/battle_transitions/frontier_squares_blanktiles.gbapal"); static const u32 sFrontierSquares_FilledBg_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_square_1.4bpp.lz"); static const u32 sFrontierSquares_EmptyBg_Tileset[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_square_2.4bpp.lz"); diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c index c047d26ec401..4df379a9d923 100644 --- a/src/battle_transition_frontier.c +++ b/src/battle_transition_frontier.c @@ -46,7 +46,7 @@ static bool8 CirclesSymmetricSpiralInSeq_End(struct Task *task); #define PALTAG_LOGO_CIRCLES 0x2E90 static const u32 sLogoCenter_Gfx[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_logo_center.4bpp.lz"); -static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.bin.lz"); +static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_logo_center.bin.lz"); static const u32 sLogoCircles_Gfx[] = INCBIN_U32("build/assets/graphics/battle_transitions/frontier_logo_circles.4bpp.lz"); static const u16 sLogo_Pal[] = INCBIN_U16("build/assets/graphics/battle_transitions/frontier_logo_circles.gbapal"); diff --git a/src/berry_crush.c b/src/berry_crush.c index 48f7aa6a8488..9ec2e7c3a74c 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -586,9 +586,9 @@ static const u32 sCrusherBase_Gfx[] = INCBIN_U32("build/assets/graphics/berr static const u32 sImpact_Gfx[] = INCBIN_U32("build/assets/graphics/berry_crush/impact.4bpp.lz"); static const u32 sSparkle_Gfx[] = INCBIN_U32("build/assets/graphics/berry_crush/sparkle.4bpp.lz"); static const u32 sTimerDigits_Gfx[] = INCBIN_U32("build/assets/graphics/berry_crush/timer_digits.4bpp.lz"); -static const u8 sCrusherTop_Tilemap[] = INCBIN_U8("graphics/berry_crush/crusher_top.bin.lz"); -static const u8 sContainerCap_Tilemap[] = INCBIN_U8("graphics/berry_crush/container_cap.bin.lz"); -static const u8 sBg_Tilemap[] = INCBIN_U8("graphics/berry_crush/bg.bin.lz"); +static const u8 sCrusherTop_Tilemap[] = INCBIN_U8("build/assets/graphics/berry_crush/crusher_top.bin.lz"); +static const u8 sContainerCap_Tilemap[] = INCBIN_U8("build/assets/graphics/berry_crush/container_cap.bin.lz"); +static const u8 sBg_Tilemap[] = INCBIN_U8("build/assets/graphics/berry_crush/bg.bin.lz"); // Takes the number of players - 2 and a player id and returns the // index into sPlayerCoords where that player should be seated diff --git a/src/cable_car.c b/src/cable_car.c index 8a666a536e46..534da3611ed8 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -131,11 +131,11 @@ static const struct BgTemplate sBgTemplates[4] = { }, }; -static const u16 sGround_Tilemap[] = INCBIN_U16("graphics/cable_car/ground.bin.lz"); -static const u16 sTrees_Tilemap[] = INCBIN_U16("graphics/cable_car/trees.bin.lz"); -static const u16 sBgMountains_Tilemap[] = INCBIN_U16("graphics/cable_car/bg_mountains.bin.lz"); +static const u16 sGround_Tilemap[] = INCBIN_U16("build/assets/graphics/cable_car/ground.bin.lz"); +static const u16 sTrees_Tilemap[] = INCBIN_U16("build/assets/graphics/cable_car/trees.bin.lz"); +static const u16 sBgMountains_Tilemap[] = INCBIN_U16("build/assets/graphics/cable_car/bg_mountains.bin.lz"); static const u16 sPylonTop_Tilemap[] = INCBIN_U16("graphics/cable_car/pylon_top.bin"); -static const u16 sPylonPole_Tilemap[] = INCBIN_U16("graphics/cable_car/pylon_pole.bin.lz"); +static const u16 sPylonPole_Tilemap[] = INCBIN_U16("build/assets/graphics/cable_car/pylon_pole.bin.lz"); static const struct CompressedSpriteSheet sSpriteSheets[] = { { gCableCar_Gfx, 0x800, TAG_CABLE_CAR }, diff --git a/src/contest_painting.c b/src/contest_painting.c index 2f7694ed3e9f..8a2eb15bf13e 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -76,12 +76,12 @@ static const u8 sPictureFrameTiles_Cute[] = INCBIN_U8("build/assets/graph static const u8 sPictureFrameTiles_Smart[] = INCBIN_U8("build/assets/graphics/picture_frame/smart.4bpp.rl"); static const u8 sPictureFrameTiles_Tough[] = INCBIN_U8("build/assets/graphics/picture_frame/tough.4bpp.rl"); static const u8 sPictureFrameTiles_HallLobby[] = INCBIN_U8("build/assets/graphics/picture_frame/lobby.4bpp.rl"); -static const u8 sPictureFrameTilemap_Cool[] = INCBIN_U8("graphics/picture_frame/cool_map.bin.rl"); -static const u8 sPictureFrameTilemap_Beauty[] = INCBIN_U8("graphics/picture_frame/beauty_map.bin.rl"); -static const u8 sPictureFrameTilemap_Cute[] = INCBIN_U8("graphics/picture_frame/cute_map.bin.rl"); -static const u8 sPictureFrameTilemap_Smart[] = INCBIN_U8("graphics/picture_frame/smart_map.bin.rl"); -static const u8 sPictureFrameTilemap_Tough[] = INCBIN_U8("graphics/picture_frame/tough_map.bin.rl"); -static const u8 sPictureFrameTilemap_HallLobby[] = INCBIN_U8("graphics/picture_frame/lobby_map.bin.rl"); +static const u8 sPictureFrameTilemap_Cool[] = INCBIN_U8("build/assets/graphics/picture_frame/cool_map.bin.rl"); +static const u8 sPictureFrameTilemap_Beauty[] = INCBIN_U8("build/assets/graphics/picture_frame/beauty_map.bin.rl"); +static const u8 sPictureFrameTilemap_Cute[] = INCBIN_U8("build/assets/graphics/picture_frame/cute_map.bin.rl"); +static const u8 sPictureFrameTilemap_Smart[] = INCBIN_U8("build/assets/graphics/picture_frame/smart_map.bin.rl"); +static const u8 sPictureFrameTilemap_Tough[] = INCBIN_U8("build/assets/graphics/picture_frame/tough_map.bin.rl"); +static const u8 sPictureFrameTilemap_HallLobby[] = INCBIN_U8("build/assets/graphics/picture_frame/lobby_map.bin.rl"); static const u8 *const sContestCategoryNames_Unused[] = { diff --git a/src/data/graphics/battle_terrain.h b/src/data/graphics/battle_terrain.h index ae9b26211890..cbdebe08bb5a 100644 --- a/src/data/graphics/battle_terrain.h +++ b/src/data/graphics/battle_terrain.h @@ -1,46 +1,46 @@ const u32 gBattleTerrainTiles_TallGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/tall_grass/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_TallGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/tall_grass/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_TallGrass[] = INCBIN_U32("graphics/battle_terrain/tall_grass/map.bin.lz"); +const u32 gBattleTerrainTilemap_TallGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/tall_grass/map.bin.lz"); const u32 gBattleTerrainTiles_LongGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/long_grass/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_LongGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/long_grass/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/long_grass/map.bin.lz"); +const u32 gBattleTerrainTilemap_LongGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/long_grass/map.bin.lz"); const u32 gBattleTerrainTiles_Sand[] = INCBIN_U32("build/assets/graphics/battle_terrain/sand/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_Sand[] = INCBIN_U32("build/assets/graphics/battle_terrain/sand/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/map.bin.lz"); +const u32 gBattleTerrainTilemap_Sand[] = INCBIN_U32("build/assets/graphics/battle_terrain/sand/map.bin.lz"); const u32 gBattleTerrainTiles_Underwater[] = INCBIN_U32("build/assets/graphics/battle_terrain/underwater/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_Underwater[] = INCBIN_U32("build/assets/graphics/battle_terrain/underwater/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/map.bin.lz"); +const u32 gBattleTerrainTilemap_Underwater[] = INCBIN_U32("build/assets/graphics/battle_terrain/underwater/map.bin.lz"); const u32 gBattleTerrainTiles_Water[] = INCBIN_U32("build/assets/graphics/battle_terrain/water/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_Water[] = INCBIN_U32("build/assets/graphics/battle_terrain/water/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/map.bin.lz"); +const u32 gBattleTerrainTilemap_Water[] = INCBIN_U32("build/assets/graphics/battle_terrain/water/map.bin.lz"); const u32 gBattleTerrainTiles_PondWater[] = INCBIN_U32("build/assets/graphics/battle_terrain/pond_water/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_PondWater[] = INCBIN_U32("build/assets/graphics/battle_terrain/pond_water/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_PondWater[] = INCBIN_U32("graphics/battle_terrain/pond_water/map.bin.lz"); +const u32 gBattleTerrainTilemap_PondWater[] = INCBIN_U32("build/assets/graphics/battle_terrain/pond_water/map.bin.lz"); const u32 gBattleTerrainTiles_Rock[] = INCBIN_U32("build/assets/graphics/battle_terrain/rock/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_Rock[] = INCBIN_U32("build/assets/graphics/battle_terrain/rock/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_Rock[] = INCBIN_U32("graphics/battle_terrain/rock/map.bin.lz"); +const u32 gBattleTerrainTilemap_Rock[] = INCBIN_U32("build/assets/graphics/battle_terrain/rock/map.bin.lz"); const u32 gBattleTerrainTiles_Cave[] = INCBIN_U32("build/assets/graphics/battle_terrain/cave/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_Cave[] = INCBIN_U32("build/assets/graphics/battle_terrain/cave/palette.gbapal.lz"); -const u32 gBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/map.bin.lz"); +const u32 gBattleTerrainTilemap_Cave[] = INCBIN_U32("build/assets/graphics/battle_terrain/cave/map.bin.lz"); const u32 gBattleTerrainPalette_Plain[] = INCBIN_U32("build/assets/graphics/battle_terrain/plain/palette.gbapal.lz"); const u32 gBattleTerrainTiles_Building[] = INCBIN_U32("build/assets/graphics/battle_terrain/building/tiles.4bpp.lz"); const u32 gBattleTerrainPalette_Frontier[] = INCBIN_U32("build/assets/graphics/battle_terrain/stadium/battle_frontier.gbapal.lz"); // this is also used for link battles -const u32 gBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/map.bin.lz"); +const u32 gBattleTerrainTilemap_Building[] = INCBIN_U32("build/assets/graphics/battle_terrain/building/map.bin.lz"); const u32 gBattleTerrainTiles_Stadium[] = INCBIN_U32("build/assets/graphics/battle_terrain/stadium/tiles.4bpp.lz"); -const u32 gBattleTerrainTilemap_Stadium[] = INCBIN_U32("graphics/battle_terrain/stadium/map.bin.lz"); +const u32 gBattleTerrainTilemap_Stadium[] = INCBIN_U32("build/assets/graphics/battle_terrain/stadium/map.bin.lz"); const u32 gBattleTerrainTiles_Rayquaza[] = INCBIN_U32("build/assets/graphics/battle_terrain/sky/tiles.4bpp.lz"); -const u32 gBattleTerrainTilemap_Rayquaza[] = INCBIN_U32("graphics/battle_terrain/sky/map.bin.lz"); +const u32 gBattleTerrainTilemap_Rayquaza[] = INCBIN_U32("build/assets/graphics/battle_terrain/sky/map.bin.lz"); const u32 gBattleTerrainPalette_Building[] = INCBIN_U32("build/assets/graphics/battle_terrain/building/palette.gbapal.lz"); @@ -58,31 +58,31 @@ const u32 gBattleTerrainPalette_StadiumWallace[] = INCBIN_U32("build/assets/grap const u32 gBattleTerrainPalette_Rayquaza[] = INCBIN_U32("build/assets/graphics/battle_terrain/sky/palette.gbapal.lz"); const u32 gBattleTerrainAnimTiles_TallGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/tall_grass/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_TallGrass[] = INCBIN_U32("graphics/battle_terrain/tall_grass/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_TallGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/tall_grass/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/long_grass/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/long_grass/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("build/assets/graphics/battle_terrain/long_grass/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Sand[] = INCBIN_U32("build/assets/graphics/battle_terrain/sand/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("build/assets/graphics/battle_terrain/sand/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("build/assets/graphics/battle_terrain/underwater/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("build/assets/graphics/battle_terrain/underwater/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Water[] = INCBIN_U32("build/assets/graphics/battle_terrain/water/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Water[] = INCBIN_U32("build/assets/graphics/battle_terrain/water/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_PondWater[] = INCBIN_U32("build/assets/graphics/battle_terrain/pond_water/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_PondWater[] = INCBIN_U32("graphics/battle_terrain/pond_water/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_PondWater[] = INCBIN_U32("build/assets/graphics/battle_terrain/pond_water/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Rock[] = INCBIN_U32("build/assets/graphics/battle_terrain/rock/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Rock[] = INCBIN_U32("graphics/battle_terrain/rock/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Rock[] = INCBIN_U32("build/assets/graphics/battle_terrain/rock/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Cave[] = INCBIN_U32("build/assets/graphics/battle_terrain/cave/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("build/assets/graphics/battle_terrain/cave/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Building[] = INCBIN_U32("build/assets/graphics/battle_terrain/building/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Building[] = INCBIN_U32("build/assets/graphics/battle_terrain/building/anim_map.bin.lz"); const u32 gBattleTerrainAnimTiles_Rayquaza[] = INCBIN_U32("build/assets/graphics/battle_terrain/sky/anim_tiles.4bpp.lz"); -const u32 gBattleTerrainAnimTilemap_Rayquaza[] = INCBIN_U32("graphics/battle_terrain/sky/anim_map.bin.lz"); +const u32 gBattleTerrainAnimTilemap_Rayquaza[] = INCBIN_U32("build/assets/graphics/battle_terrain/sky/anim_map.bin.lz"); diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h index c3425eec0358..a6c4018b5f00 100644 --- a/src/data/graphics/berries.h +++ b/src/data/graphics/berries.h @@ -1,8 +1,8 @@ const u32 gBerryCheck_Gfx[] = INCBIN_U32("build/assets/graphics/bag/check_berry.4bpp.lz"); const u32 gBerryCheck_Pal[] = INCBIN_U32("build/assets/graphics/bag/check_berry.gbapal.lz"); -const u32 gBerryTag_Gfx[] = INCBIN_U32("graphics/bag/berry_tag.bin.lz"); -const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/bag/berry_tag_title.bin.lz"); +const u32 gBerryTag_Gfx[] = INCBIN_U32("build/assets/graphics/bag/berry_tag.bin.lz"); +const u32 gBerryTag_Pal[] = INCBIN_U32("build/assets/graphics/bag/berry_tag_title.bin.lz"); const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("build/assets/graphics/bag/check_berry_circle.4bpp.lz"); diff --git a/src/data/graphics/berry_fix.h b/src/data/graphics/berry_fix.h index 9094a374fed4..a28ede6bc3c6 100644 --- a/src/data/graphics/berry_fix.h +++ b/src/data/graphics/berry_fix.h @@ -1,23 +1,23 @@ const u16 gBerryFixGbaConnect_Pal[] = INCBIN_U16("build/assets/graphics/berry_fix/gba_connect.gbapal"); const u32 gBerryFixGbaConnect_Gfx[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_connect.4bpp.lz"); -const u32 gBerryFixGbaConnect_Tilemap[] = INCBIN_U32("graphics/berry_fix/gba_connect.bin.lz"); +const u32 gBerryFixGbaConnect_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_connect.bin.lz"); const u16 gBerryFixGameboyLogo_Pal[] = INCBIN_U16("build/assets/graphics/berry_fix/logo.gbapal"); const u32 gBerryFixGameboyLogo_Gfx[] = INCBIN_U32("build/assets/graphics/berry_fix/logo.4bpp.lz"); -const u32 gBerryFixGameboyLogo_Tilemap[] = INCBIN_U32("graphics/berry_fix/logo.bin.lz"); +const u32 gBerryFixGameboyLogo_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_fix/logo.bin.lz"); const u16 gBerryFixGbaTransfer_Pal[] = INCBIN_U16("build/assets/graphics/berry_fix/gba_transfer.gbapal"); const u32 gBerryFixGbaTransfer_Gfx[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_transfer.4bpp.lz"); -const u32 gBerryFixGbaTransfer_Tilemap[] = INCBIN_U32("graphics/berry_fix/gba_transfer.bin.lz"); +const u32 gBerryFixGbaTransfer_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_transfer.bin.lz"); const u16 gBerryFixGbaTransferHighlight_Pal[] = INCBIN_U16("build/assets/graphics/berry_fix/gba_transfer_highlight.gbapal"); const u32 gBerryFixGbaTransferHighlight_Gfx[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_transfer_highlight.4bpp.lz"); -const u32 gBerryFixGbaTransferHighlight_Tilemap[] = INCBIN_U32("graphics/berry_fix/gba_transfer_highlight.bin.lz"); +const u32 gBerryFixGbaTransferHighlight_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_transfer_highlight.bin.lz"); const u16 gBerryFixGbaTransferError_Pal[] = INCBIN_U16("build/assets/graphics/berry_fix/gba_transfer_error.gbapal"); const u32 gBerryFixGbaTransferError_Gfx[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_transfer_error.4bpp.lz"); -const u32 gBerryFixGbaTransferError_Tilemap[] = INCBIN_U32("graphics/berry_fix/gba_transfer_error.bin.lz"); +const u32 gBerryFixGbaTransferError_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_fix/gba_transfer_error.bin.lz"); const u16 gBerryFixWindow_Pal[] = INCBIN_U16("build/assets/graphics/berry_fix/window.gbapal"); const u32 gBerryFixWindow_Gfx[] = INCBIN_U32("build/assets/graphics/berry_fix/window.4bpp.lz"); -const u32 gBerryFixWindow_Tilemap[] = INCBIN_U32("graphics/berry_fix/window.bin.lz"); +const u32 gBerryFixWindow_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_fix/window.bin.lz"); diff --git a/src/data/graphics/intro_scene.h b/src/data/graphics/intro_scene.h index 3f8f8b0c847c..f6bae132e6bf 100644 --- a/src/data/graphics/intro_scene.h +++ b/src/data/graphics/intro_scene.h @@ -14,31 +14,31 @@ const u32 gIntroBrendan_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/ const u32 gIntroMay_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/may.4bpp.lz"); const u32 gIntroGroudon_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/groudon.8bpp.lz"); -const u32 gIntroGroudon_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/groudon.bin.lz"); +const u32 gIntroGroudon_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/groudon.bin.lz"); const u32 gIntroKyogre_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/kyogre.8bpp.lz"); -const u32 gIntroKyogre_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/kyogre.bin.lz"); +const u32 gIntroKyogre_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/kyogre.bin.lz"); const u32 gIntroLegendBg_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/legend_bg.4bpp.lz"); // groudon/kyogre bg -const u32 gIntroGroudonBg_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/groudon_bg.bin.lz"); -const u32 gIntroKyogreBg_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/kyogre_bg.bin.lz"); +const u32 gIntroGroudonBg_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/groudon_bg.bin.lz"); +const u32 gIntroKyogreBg_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/kyogre_bg.bin.lz"); const u32 gIntroClouds_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/clouds.4bpp.lz"); -const u32 gIntroCloudsLeft_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds_left.bin.lz"); -const u32 gIntroCloudsRight_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds_right.bin.lz"); -const u32 gIntroCloudsSun_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/clouds_sun.bin.lz"); +const u32 gIntroCloudsLeft_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/clouds_left.bin.lz"); +const u32 gIntroCloudsRight_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/clouds_right.bin.lz"); +const u32 gIntroCloudsSun_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/clouds_sun.bin.lz"); const u32 gIntroLightning_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/lightning.4bpp.lz"); const u16 gIntroLightning_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_3/lightning.gbapal"); const u32 gIntroRayquaza_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/rayquaza.4bpp.lz"); -const u32 gIntroRayquaza_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/rayquaza.bin.lz"); +const u32 gIntroRayquaza_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/rayquaza.bin.lz"); -const u32 gIntroUnused1_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/unused_1.bin.lz"); -const u32 gIntroUnused2_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/unused_2.bin.lz"); +const u32 gIntroUnused1_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/unused_1.bin.lz"); +const u32 gIntroUnused2_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/unused_2.bin.lz"); const u32 gIntroRayquazaClouds_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/rayquaza_clouds.4bpp.lz"); -const u32 gIntroRayquazaClouds_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/rayquaza_clouds.bin.lz"); +const u32 gIntroRayquazaClouds_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/rayquaza_clouds.bin.lz"); const u32 gIntroBubbles_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/bubbles.4bpp.lz"); const u16 gIntroBubbles_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_3/bubbles.gbapal"); diff --git a/src/data/graphics/mail.h b/src/data/graphics/mail.h index b69e306cbd3d..e29f91e6a244 100644 --- a/src/data/graphics/mail.h +++ b/src/data/graphics/mail.h @@ -24,15 +24,15 @@ const u32 gMailTiles_Dream[] = INCBIN_U32("build/assets/graphics/mail/dream/tile const u32 gMailTiles_Fab[] = INCBIN_U32("build/assets/graphics/mail/fab/tiles.4bpp.lz"); const u32 gMailTiles_Retro[] = INCBIN_U32("build/assets/graphics/mail/retro/tiles.4bpp.lz"); -const u32 gMailTilemap_Orange[] = INCBIN_U32("graphics/mail/orange/map.bin.lz"); -const u32 gMailTilemap_Harbor[] = INCBIN_U32("graphics/mail/harbor/map.bin.lz"); -const u32 gMailTilemap_Glitter[] = INCBIN_U32("graphics/mail/glitter/map.bin.lz"); -const u32 gMailTilemap_Mech[] = INCBIN_U32("graphics/mail/mech/map.bin.lz"); -const u32 gMailTilemap_Wood[] = INCBIN_U32("graphics/mail/wood/map.bin.lz"); -const u32 gMailTilemap_Wave[] = INCBIN_U32("graphics/mail/wave/map.bin.lz"); -const u32 gMailTilemap_Bead[] = INCBIN_U32("graphics/mail/bead/map.bin.lz"); -const u32 gMailTilemap_Shadow[] = INCBIN_U32("graphics/mail/shadow/map.bin.lz"); -const u32 gMailTilemap_Tropic[] = INCBIN_U32("graphics/mail/tropic/map.bin.lz"); -const u32 gMailTilemap_Dream[] = INCBIN_U32("graphics/mail/dream/map.bin.lz"); -const u32 gMailTilemap_Fab[] = INCBIN_U32("graphics/mail/fab/map.bin.lz"); -const u32 gMailTilemap_Retro[] = INCBIN_U32("graphics/mail/retro/map.bin.lz"); +const u32 gMailTilemap_Orange[] = INCBIN_U32("build/assets/graphics/mail/orange/map.bin.lz"); +const u32 gMailTilemap_Harbor[] = INCBIN_U32("build/assets/graphics/mail/harbor/map.bin.lz"); +const u32 gMailTilemap_Glitter[] = INCBIN_U32("build/assets/graphics/mail/glitter/map.bin.lz"); +const u32 gMailTilemap_Mech[] = INCBIN_U32("build/assets/graphics/mail/mech/map.bin.lz"); +const u32 gMailTilemap_Wood[] = INCBIN_U32("build/assets/graphics/mail/wood/map.bin.lz"); +const u32 gMailTilemap_Wave[] = INCBIN_U32("build/assets/graphics/mail/wave/map.bin.lz"); +const u32 gMailTilemap_Bead[] = INCBIN_U32("build/assets/graphics/mail/bead/map.bin.lz"); +const u32 gMailTilemap_Shadow[] = INCBIN_U32("build/assets/graphics/mail/shadow/map.bin.lz"); +const u32 gMailTilemap_Tropic[] = INCBIN_U32("build/assets/graphics/mail/tropic/map.bin.lz"); +const u32 gMailTilemap_Dream[] = INCBIN_U32("build/assets/graphics/mail/dream/map.bin.lz"); +const u32 gMailTilemap_Fab[] = INCBIN_U32("build/assets/graphics/mail/fab/map.bin.lz"); +const u32 gMailTilemap_Retro[] = INCBIN_U32("build/assets/graphics/mail/retro/map.bin.lz"); diff --git a/src/data/graphics/rayquaza_scene.h b/src/data/graphics/rayquaza_scene.h index 28f4968cd807..62fc47d5034f 100644 --- a/src/data/graphics/rayquaza_scene.h +++ b/src/data/graphics/rayquaza_scene.h @@ -9,18 +9,18 @@ const u32 gRaySceneDuoFight_Groudon_Pal[] = INCBIN_U32("build/assets/g const u32 gRaySceneDuoFight_Kyogre_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_1/kyogre.gbapal.lz"); const u32 gRaySceneDuoFight_Clouds_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_1/clouds.4bpp.lz"); const u32 gRaySceneDuoFight_Clouds_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_1/clouds.gbapal.lz"); // pal 1 clouds, pal 2 rain -const u32 gRaySceneDuoFight_Clouds1_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds1.bin.lz"); -const u32 gRaySceneDuoFight_Clouds2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds2.bin.lz"); -const u32 gRaySceneDuoFight_Clouds3_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds3.bin.lz"); +const u32 gRaySceneDuoFight_Clouds1_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_1/clouds1.bin.lz"); +const u32 gRaySceneDuoFight_Clouds2_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_1/clouds2.bin.lz"); +const u32 gRaySceneDuoFight_Clouds3_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_1/clouds3.bin.lz"); // Scene 2 (RAY_ANIM_TAKES_FLIGHT) const u32 gRaySceneTakesFlight_Smoke_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/smoke.4bpp.lz"); const u32 gRaySceneTakesFlight_Smoke_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/smoke.gbapal.lz"); const u32 gRaySceneTakesFlight_Rayquaza_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/rayquaza.8bpp.lz"); const u32 gRaySceneTakesFlight_Rayquaza_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/rayquaza.gbapal.lz"); -const u32 gRaySceneTakesFlight_Rayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.bin.lz"); +const u32 gRaySceneTakesFlight_Rayquaza_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/rayquaza.bin.lz"); const u32 gRaySceneTakesFlight_Bg_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/bg.4bpp.lz"); // uses pal 2 of gRaySceneTakesFlight_Rayquaza_Pal -const u32 gRaySceneTakesFlight_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/bg.bin.lz"); +const u32 gRaySceneTakesFlight_Bg_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_2/bg.bin.lz"); // Scene 3 (RAY_ANIM_DESCENDS) const u32 gRaySceneDescends_Rayquaza_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_3/rayquaza.4bpp.lz"); @@ -30,17 +30,17 @@ const u32 gRaySceneDescends_RayquazaTail_Gfx[] = INCBIN_U32("build/assets/graphi const u32 gRaySceneDescends_Bg_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_3/bg.4bpp.lz"); const u32 gRaySceneDescends_Light_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_3/light.4bpp.lz"); // uses pal 2 of gRaySceneDescends_Bg_Pal const u32 gRaySceneDescends_Bg_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_3/bg.gbapal.lz"); -const u32 gRaySceneDescends_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.bin.lz"); -const u32 gRaySceneDescends_Light_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/light.bin.lz"); +const u32 gRaySceneDescends_Bg_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_3/bg.bin.lz"); +const u32 gRaySceneDescends_Light_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_3/light.bin.lz"); // Scene 4 (RAY_ANIM_CHARGES) const u32 gRaySceneCharges_Bg_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/bg.4bpp.lz"); -const u32 gRaySceneCharges_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.bin.lz"); +const u32 gRaySceneCharges_Bg_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/bg.bin.lz"); const u32 gRaySceneCharges_Streaks_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/streaks.4bpp.lz"); -const u32 gRaySceneCharges_Streaks_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/streaks.bin.lz"); +const u32 gRaySceneCharges_Streaks_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/streaks.bin.lz"); const u32 gRaySceneCharges_Rayquaza_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/rayquaza.4bpp.lz"); -const u32 gRaySceneCharges_Rayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/rayquaza.bin.lz"); -const u32 gRaySceneCharges_Orbs_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/orbs.bin.lz"); +const u32 gRaySceneCharges_Rayquaza_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/rayquaza.bin.lz"); +const u32 gRaySceneCharges_Orbs_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/orbs.bin.lz"); const u32 gRaySceneCharges_Bg_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_4/bg.gbapal.lz"); // Scene 5 (RAY_ANIM_CHASES_AWAY) @@ -56,7 +56,7 @@ const u32 gRaySceneChasesAway_Rayquaza_Pal[] = INCBIN_U32("build/assets/grap const u32 gRaySceneChasesAway_KyogreSplash_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/kyogre_splash.gbapal.lz"); const u32 gRaySceneChasesAway_Light_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/light.4bpp.lz"); const u32 gRaySceneChasesAway_Ring_Gfx[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/ring.8bpp.lz"); -const u32 gRaySceneChasesAway_Light_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/light.bin.lz"); -const u32 gRaySceneChasesAway_Bg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/bg.bin.lz"); -const u32 gRaySceneChasesAway_Ring_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/ring.bin.lz"); +const u32 gRaySceneChasesAway_Light_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/light.bin.lz"); +const u32 gRaySceneChasesAway_Bg_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/bg.bin.lz"); +const u32 gRaySceneChasesAway_Ring_Tilemap[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/ring.bin.lz"); const u32 gRaySceneChasesAway_Bg_Pal[] = INCBIN_U32("build/assets/graphics/rayquaza_scene/scene_5/bg.gbapal.lz"); diff --git a/src/data/region_map/city_map_tilemaps.h b/src/data/region_map/city_map_tilemaps.h index 11a48c15dc41..d3d08ae28818 100644 --- a/src/data/region_map/city_map_tilemaps.h +++ b/src/data/region_map/city_map_tilemaps.h @@ -1,22 +1,22 @@ -const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lavaridge_0.bin.lz"); -const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/fallarbor_0.bin.lz"); -const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/fortree_0.bin.lz"); -const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/slateport_0.bin.lz"); -const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/slateport_1.bin.lz"); -const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/rustboro_0.bin.lz"); -const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/rustboro_1.bin.lz"); -const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/pacifidlog_0.bin.lz"); -const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mauville_1.bin.lz"); -const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mauville_0.bin.lz"); -const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/oldale_0.bin.lz"); -const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lilycove_1.bin.lz"); -const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lilycove_0.bin.lz"); -const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/littleroot_0.bin.lz"); -const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/dewford_0.bin.lz"); -const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/sootopolis_0.bin.lz"); -const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/ever_grande_0.bin.lz"); -const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/ever_grande_1.bin.lz"); -const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/verdanturf_0.bin.lz"); -const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mossdeep_1.bin.lz"); -const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mossdeep_0.bin.lz"); -const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/petalburg_0.bin.lz"); +const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/lavaridge_0.bin.lz"); +const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/fallarbor_0.bin.lz"); +const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/fortree_0.bin.lz"); +const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/slateport_0.bin.lz"); +const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/slateport_1.bin.lz"); +const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/rustboro_0.bin.lz"); +const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/rustboro_1.bin.lz"); +const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/pacifidlog_0.bin.lz"); +const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/mauville_1.bin.lz"); +const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/mauville_0.bin.lz"); +const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/oldale_0.bin.lz"); +const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/lilycove_1.bin.lz"); +const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/lilycove_0.bin.lz"); +const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/littleroot_0.bin.lz"); +const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/dewford_0.bin.lz"); +const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/sootopolis_0.bin.lz"); +const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/ever_grande_0.bin.lz"); +const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/ever_grande_1.bin.lz"); +const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/verdanturf_0.bin.lz"); +const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/mossdeep_1.bin.lz"); +const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/mossdeep_0.bin.lz"); +const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_maps/petalburg_0.bin.lz"); diff --git a/src/data/trade.h b/src/data/trade.h index cb607055048c..7d10d7359dc4 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -642,12 +642,12 @@ static const u8 sGbaAffineMapCable[] = INCBIN_U8("graphics/trade/gba_affine_map_ static const u8 sGbaAffineMapWireless[] = INCBIN_U8("graphics/trade/gba_affine_map_wireless.bin"); static const u16 sGbaMapWireless[] = INCBIN_U16("graphics/trade/gba_map_wireless.bin"); static const u16 sGbaMapCable[] = INCBIN_U16("graphics/trade/gba_map_cable.bin"); -static const u32 sWirelessCloseup_Map[] = INCBIN_U32("graphics/trade/crossing_highlight_wireless.bin.lz"); +static const u32 sWirelessCloseup_Map[] = INCBIN_U32("build/assets/graphics/trade/crossing_highlight_wireless.bin.lz"); static const u16 sWirelessSignalSend_Pal[] = INCBIN_U16("build/assets/graphics/trade/wireless_signal_send.gbapal"); static const u16 sWirelessSignalRecv_Pal[] = INCBIN_U16("build/assets/graphics/trade/wireless_signal_receive.gbapal"); static const u16 sWirelessSignalNone_Pal[] = INCBIN_U16("build/assets/graphics/trade/wireless_signal_none.gbapal"); static const u32 sWirelessSignal_Gfx[] = INCBIN_U32("build/assets/graphics/trade/wireless_signal.4bpp.lz"); -static const u32 sWirelessSignal_Tilemap[] = INCBIN_U32("graphics/trade/wireless_signal.bin.lz"); +static const u32 sWirelessSignal_Tilemap[] = INCBIN_U32("build/assets/graphics/trade/wireless_signal.bin.lz"); static const struct OamData sOamData_Pokeball = { diff --git a/src/data/wallpapers.h b/src/data/wallpapers.h index af8f800cdb13..f6a4fef3135e 100644 --- a/src/data/wallpapers.h +++ b/src/data/wallpapers.h @@ -26,7 +26,7 @@ static const u16 sWallpaperPalettes_Forest[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/forest/bg.gbapal"), }; static const u32 sWallpaperTiles_Forest[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/forest/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Forest[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/forest/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Forest[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/forest/tilemap.bin.lz"); static const u16 sWallpaperPalettes_City[][16] = { @@ -34,7 +34,7 @@ static const u16 sWallpaperPalettes_City[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/city/bg.gbapal"), }; static const u32 sWallpaperTiles_City[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/city/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_City[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/city/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_City[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/city/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Desert[][16] = { @@ -42,7 +42,7 @@ static const u16 sWallpaperPalettes_Desert[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/desert/bg.gbapal"), }; static const u32 sWallpaperTiles_Desert[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/desert/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Desert[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/desert/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Desert[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/desert/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Savanna[][16] = { @@ -50,7 +50,7 @@ static const u16 sWallpaperPalettes_Savanna[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/savanna/bg.gbapal"), }; static const u32 sWallpaperTiles_Savanna[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/savanna/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Savanna[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/savanna/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Savanna[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/savanna/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Crag[][16] = { @@ -58,7 +58,7 @@ static const u16 sWallpaperPalettes_Crag[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/crag/bg.gbapal"), }; static const u32 sWallpaperTiles_Crag[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/crag/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Crag[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/crag/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Crag[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/crag/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Volcano[][16] = { @@ -66,7 +66,7 @@ static const u16 sWallpaperPalettes_Volcano[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/volcano/bg.gbapal"), }; static const u32 sWallpaperTiles_Volcano[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/volcano/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Volcano[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/volcano/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Volcano[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/volcano/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Snow[][16] = { @@ -74,7 +74,7 @@ static const u16 sWallpaperPalettes_Snow[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/snow/bg.gbapal"), }; static const u32 sWallpaperTiles_Snow[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/snow/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Snow[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/snow/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Snow[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/snow/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Cave[][16] = { @@ -82,7 +82,7 @@ static const u16 sWallpaperPalettes_Cave[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/cave/bg.gbapal"), }; static const u32 sWallpaperTiles_Cave[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/cave/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Cave[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/cave/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Cave[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/cave/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Beach[][16] = { @@ -90,7 +90,7 @@ static const u16 sWallpaperPalettes_Beach[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/beach/bg.gbapal"), }; static const u32 sWallpaperTiles_Beach[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/beach/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Beach[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/beach/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Beach[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/beach/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Seafloor[][16] = { @@ -98,7 +98,7 @@ static const u16 sWallpaperPalettes_Seafloor[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/seafloor/bg.gbapal"), }; static const u32 sWallpaperTiles_Seafloor[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/seafloor/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Seafloor[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/seafloor/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Seafloor[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/seafloor/tilemap.bin.lz"); static const u16 sWallpaperPalettes_River[][16] = { @@ -106,14 +106,14 @@ static const u16 sWallpaperPalettes_River[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/river/bg.gbapal"), }; static const u32 sWallpaperTiles_River[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/river/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_River[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/river/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_River[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/river/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Sky[][16] = { INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/sky/frame.gbapal"), INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/sky/bg.gbapal"), }; static const u32 sWallpaperTiles_Sky[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/sky/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Sky[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/sky/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Sky[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/sky/tilemap.bin.lz"); static const u16 sWallpaperPalettes_PolkaDot[][16] = { @@ -121,7 +121,7 @@ static const u16 sWallpaperPalettes_PolkaDot[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/polkadot/bg.gbapal"), }; static const u32 sWallpaperTiles_PolkaDot[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/polkadot/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_PolkaDot[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/polkadot/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_PolkaDot[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/polkadot/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Pokecenter[][16] = { @@ -129,7 +129,7 @@ static const u16 sWallpaperPalettes_Pokecenter[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/pokecenter/bg.gbapal"), }; static const u32 sWallpaperTiles_Pokecenter[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/pokecenter/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Pokecenter[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pokecenter/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Pokecenter[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/pokecenter/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Machine[][16] = { @@ -137,7 +137,7 @@ static const u16 sWallpaperPalettes_Machine[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/machine/bg.gbapal"), }; static const u32 sWallpaperTiles_Machine[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/machine/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Machine[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/machine/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Machine[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/machine/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Plain[][16] = { @@ -145,7 +145,7 @@ static const u16 sWallpaperPalettes_Plain[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/plain/bg.gbapal"), }; static const u32 sWallpaperTiles_Plain[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/plain/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/plain/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Plain[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/plain/tilemap.bin.lz"); // 12x18 tilemap static const u32 sWallpaperTilemap_Unused[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/unused.bin"); @@ -204,7 +204,7 @@ static const u16 sWallpaperPalettes_Zigzagoon[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/zigzagoon/bg.gbapal"), }; static const u32 sWallpaperTiles_Zigzagoon[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/zigzagoon/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Zigzagoon[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/zigzagoon/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Zigzagoon[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/zigzagoon/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Screen[][16] = { @@ -212,7 +212,7 @@ static const u16 sWallpaperPalettes_Screen[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/screen/bg.gbapal"), }; static const u32 sWallpaperTiles_Screen[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/screen/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Screen[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/screen/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Screen[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/screen/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Diagonal[][16] = { @@ -220,7 +220,7 @@ static const u16 sWallpaperPalettes_Diagonal[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/diagonal/bg.gbapal"), }; static const u32 sWallpaperTiles_Diagonal[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/diagonal/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Diagonal[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/diagonal/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Diagonal[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/diagonal/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Block[][16] = { @@ -228,7 +228,7 @@ static const u16 sWallpaperPalettes_Block[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/block/bg.gbapal"), }; static const u32 sWallpaperTiles_Block[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/block/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Block[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/block/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Block[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/block/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Pokecenter2[][16] = { @@ -236,7 +236,7 @@ static const u16 sWallpaperPalettes_Pokecenter2[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/pokecenter2/bg.gbapal"), }; static const u32 sWallpaperTiles_Pokecenter2[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/pokecenter2/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Pokecenter2[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pokecenter2/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Pokecenter2[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/pokecenter2/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Frame[][16] = { @@ -244,7 +244,7 @@ static const u16 sWallpaperPalettes_Frame[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/frame/bg.gbapal"), }; static const u32 sWallpaperTiles_Frame[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/frame/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Frame[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/frame/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Frame[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/frame/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Blank[][16] = { @@ -252,7 +252,7 @@ static const u16 sWallpaperPalettes_Blank[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/zigzagoon/bg.gbapal"), }; static const u32 sWallpaperTiles_Blank[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/blank/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Blank[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/blank/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Blank[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/blank/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Circles[][16] = { @@ -260,7 +260,7 @@ static const u16 sWallpaperPalettes_Circles[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/circles/bg.gbapal"), }; static const u32 sWallpaperTiles_Circles[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/circles/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Circles[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/circles/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Circles[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/circles/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Azumarill[][16] = { @@ -268,7 +268,7 @@ static const u16 sWallpaperPalettes_Azumarill[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/azumarill/bg.gbapal"), }; static const u32 sWallpaperTiles_Azumarill[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/azumarill/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Azumarill[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/azumarill/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Azumarill[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/azumarill/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Pikachu[][16] = { @@ -276,7 +276,7 @@ static const u16 sWallpaperPalettes_Pikachu[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/pikachu/bg.gbapal"), }; static const u32 sWallpaperTiles_Pikachu[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/pikachu/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Pikachu[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pikachu/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Pikachu[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/pikachu/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Legendary[][16] = { @@ -284,7 +284,7 @@ static const u16 sWallpaperPalettes_Legendary[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/legendary/bg.gbapal"), }; static const u32 sWallpaperTiles_Legendary[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/legendary/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Legendary[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/legendary/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Legendary[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/legendary/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Dusclops[][16] = { @@ -292,7 +292,7 @@ static const u16 sWallpaperPalettes_Dusclops[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/dusclops/bg.gbapal"), }; static const u32 sWallpaperTiles_Dusclops[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/dusclops/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Dusclops[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/dusclops/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Dusclops[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/dusclops/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Ludicolo[][16] = { @@ -300,7 +300,7 @@ static const u16 sWallpaperPalettes_Ludicolo[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/ludicolo/bg.gbapal"), }; static const u32 sWallpaperTiles_Ludicolo[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/ludicolo/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Ludicolo[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/ludicolo/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Ludicolo[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/ludicolo/tilemap.bin.lz"); static const u16 sWallpaperPalettes_Whiscash[][16] = { @@ -308,7 +308,7 @@ static const u16 sWallpaperPalettes_Whiscash[][16] = INCBIN_U16("build/assets/graphics/pokemon_storage/wallpapers/whiscash/bg.gbapal"), }; static const u32 sWallpaperTiles_Whiscash[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/whiscash/tiles.4bpp.lz"); -static const u32 sWallpaperTilemap_Whiscash[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/whiscash/tilemap.bin.lz"); +static const u32 sWallpaperTilemap_Whiscash[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/whiscash/tilemap.bin.lz"); static const u32 sWallpaperIcon_Aqua[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/icons/aqua.4bpp.lz"); static const u32 sWallpaperIcon_Heart[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/icons/heart.4bpp.lz"); diff --git a/src/diploma.c b/src/diploma.c index 1e9251a9049f..e5e6f63d437d 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -44,7 +44,7 @@ static const u16 sDiplomaPalettes[][16] = INCBIN_U16("build/assets/graphics/diploma/hoenn.gbapal"), }; -static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/tilemap.bin.lz"); +static const u32 sDiplomaTilemap[] = INCBIN_U32("build/assets/graphics/diploma/tilemap.bin.lz"); static const u32 sDiplomaTiles[] = INCBIN_U32("build/assets/graphics/diploma/tiles.4bpp.lz"); void CB2_ShowDiploma(void) diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 0b2c484cfef8..46edae8c8213 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -565,9 +565,9 @@ static const u32 sDuplicateGfx[] = INCBIN_U32("build/assets/graphics/dodrio_berr "build/assets/graphics/dodrio_berry_picking/status.4bpp.lz", "build/assets/graphics/dodrio_berry_picking/cloud.4bpp.lz", "build/assets/graphics/dodrio_berry_picking/dodrio.4bpp.lz", - "graphics/dodrio_berry_picking/bg.bin.lz", - "graphics/dodrio_berry_picking/tree_border_right.bin.lz", - "graphics/dodrio_berry_picking/tree_border_left.bin.lz"); + "build/assets/graphics/dodrio_berry_picking/bg.bin.lz", + "build/assets/graphics/dodrio_berry_picking/tree_border_right.bin.lz", + "build/assets/graphics/dodrio_berry_picking/tree_border_left.bin.lz"); static const u8 sBerryFallDelays[][3] = @@ -3598,9 +3598,9 @@ static const u32 sTreeBorder_Gfx[] = INCBIN_U32("build/assets/graphics/ static const u32 sStatus_Gfx[] = INCBIN_U32("build/assets/graphics/dodrio_berry_picking/status.4bpp.lz"); static const u32 sCloud_Gfx[] = INCBIN_U32("build/assets/graphics/dodrio_berry_picking/cloud.4bpp.lz"); static const u32 sDodrio_Gfx[] = INCBIN_U32("build/assets/graphics/dodrio_berry_picking/dodrio.4bpp.lz"); -static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/dodrio_berry_picking/bg.bin.lz"); -static const u32 sTreeBorderRight_Tilemap[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border_right.bin.lz"); -static const u32 sTreeBorderLeft_Tilemap[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border_left.bin.lz"); +static const u32 sBg_Tilemap[] = INCBIN_U32("build/assets/graphics/dodrio_berry_picking/bg.bin.lz"); +static const u32 sTreeBorderRight_Tilemap[] = INCBIN_U32("build/assets/graphics/dodrio_berry_picking/tree_border_right.bin.lz"); +static const u32 sTreeBorderLeft_Tilemap[] = INCBIN_U32("build/assets/graphics/dodrio_berry_picking/tree_border_left.bin.lz"); static const struct OamData sOamData_Dodrio = { diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 5247dfc818e8..e218e01a4298 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -69,8 +69,8 @@ static void RestoreBgAfterAnim(void); static const u16 sUnusedPal1[] = INCBIN_U16("build/assets/graphics/evolution_scene/unused_1.gbapal"); static const u32 sBgAnim_Gfx[] = INCBIN_U32("build/assets/graphics/evolution_scene/bg.4bpp.lz"); -static const u32 sBgAnim_Inner_Tilemap[] = INCBIN_U32("graphics/evolution_scene/bg_inner.bin.lz"); -static const u32 sBgAnim_Outer_Tilemap[] = INCBIN_U32("graphics/evolution_scene/bg_outer.bin.lz"); +static const u32 sBgAnim_Inner_Tilemap[] = INCBIN_U32("build/assets/graphics/evolution_scene/bg_inner.bin.lz"); +static const u32 sBgAnim_Outer_Tilemap[] = INCBIN_U32("build/assets/graphics/evolution_scene/bg_outer.bin.lz"); static const u16 sBgAnim_Intro_Pal[] = INCBIN_U16("build/assets/graphics/evolution_scene/bg_anim_intro.gbapal"); static const u16 sUnusedPal2[] = INCBIN_U16("build/assets/graphics/evolution_scene/unused_2.gbapal"); static const u16 sUnusedPal3[] = INCBIN_U16("build/assets/graphics/evolution_scene/unused_3.gbapal"); diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 63942b067174..30a5073b6770 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -66,7 +66,7 @@ static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("build/assets/graph static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("build/assets/graphics/cave_transition/enter.gbapal"); static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("build/assets/graphics/cave_transition/exit.gbapal"); -static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.lz"); +static const u32 sCaveTransitionTilemap[] = INCBIN_U32("build/assets/graphics/cave_transition/tilemap.bin.lz"); static const u32 sCaveTransitionTiles[] = INCBIN_U32("build/assets/graphics/cave_transition/tiles.4bpp.lz"); bool8 SetUpFieldMove_Flash(void) diff --git a/src/frontier_pass.c b/src/frontier_pass.c index ab47e6711145..fba9e52851ca 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -182,11 +182,11 @@ static const u32 sMapScreen_Gfx[] = INCBIN_U32("build/assets/grap static const u32 sCursor_Gfx[] = INCBIN_U32("build/assets/graphics/frontier_pass/cursor.4bpp.lz"); static const u32 sHeads_Gfx[] = INCBIN_U32("build/assets/graphics/frontier_pass/map_heads.4bpp.lz"); static const u32 sMapCursor_Gfx[] = INCBIN_U32("build/assets/graphics/frontier_pass/map_cursor.4bpp.lz"); -static const u32 sMapScreen_Tilemap[] = INCBIN_U32("graphics/frontier_pass/map_screen.bin.lz"); -static const u32 sMapAndCard_ZoomedOut_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card.bin.lz"); +static const u32 sMapScreen_Tilemap[] = INCBIN_U32("build/assets/graphics/frontier_pass/map_screen.bin.lz"); +static const u32 sMapAndCard_ZoomedOut_Tilemap[] = INCBIN_U32("build/assets/graphics/frontier_pass/small_map_and_card.bin.lz"); static const u32 sCardBall_Filled_Tilemap[] = INCBIN_U32("graphics/frontier_pass/card_ball_filled.bin"); // Unused -static const u32 sBattleRecord_Tilemap[] = INCBIN_U32("graphics/frontier_pass/record_frame.bin.lz"); -static const u32 sMapAndCard_Zooming_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card_affine.bin.lz"); +static const u32 sBattleRecord_Tilemap[] = INCBIN_U32("build/assets/graphics/frontier_pass/record_frame.bin.lz"); +static const u32 sMapAndCard_Zooming_Tilemap[] = INCBIN_U32("build/assets/graphics/frontier_pass/small_map_and_card_affine.bin.lz"); static const s16 sBgAffineCoords[][2] = { diff --git a/src/graphics.c b/src/graphics.c index 6632c5edc186..6818ef83fc7f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -2,7 +2,7 @@ const u32 gBattleTextboxTiles[] = INCBIN_U32("build/assets/graphics/battle_interface/textbox.4bpp.lz"); const u32 gBattleTextboxPalette[] = INCBIN_U32("build/assets/graphics/battle_interface/textbox.gbapal.lz"); -const u32 gBattleTextboxTilemap[] = INCBIN_U32("graphics/battle_interface/textbox_map.bin.lz"); +const u32 gBattleTextboxTilemap[] = INCBIN_U32("build/assets/graphics/battle_interface/textbox_map.bin.lz"); const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("build/assets/graphics/pokemon/question_mark/circled/front.4bpp.lz"); const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("build/assets/graphics/pokemon/question_mark/circled/back.4bpp.lz"); @@ -10,7 +10,7 @@ const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("build/assets/graphics/ const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("build/assets/graphics/pokemon/question_mark/circled/shiny.gbapal.lz"); const u32 gUnusedGfx_OldCharmap[] = INCBIN_U32("build/assets/graphics/unused/old_charmap.4bpp.lz"); // japanese table and bunch of stuff -const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.bin.lz"); +const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("build/assets/graphics/unused/old_charmap.bin.lz"); const u32 gUnusedPal_OldCharmap[] = INCBIN_U32("build/assets/graphics/unused/old_charmap.gbapal.lz"); const u32 gSmokescreenImpactTiles[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz"); @@ -137,7 +137,7 @@ const u32 gOldBattleInterfacePal_1_2_3[] = INCBIN_U32("build/assets/graphics/unu const u32 gOldBattleInterfacePal4[] = INCBIN_U32("build/assets/graphics/unused/old_pal4.gbapal.lz"); // 4 is by itself const u32 gOldBattleInterfacePal_5_6_7[] = INCBIN_U32("build/assets/graphics/unused/obi_palpak3.gbapal.lz"); // palettes 5-7 const u32 gOldBattleInterfaceGfx2[] = INCBIN_U32("build/assets/graphics/unused/obi2.4bpp.lz"); -const u32 gOldBattleInterfaceTilemap[] = INCBIN_U32("graphics/unused/old_battle_interface_tilemap.bin.lz"); +const u32 gOldBattleInterfaceTilemap[] = INCBIN_U32("build/assets/graphics/unused/old_battle_interface_tilemap.bin.lz"); const u32 gBattleAnimSpritePal_ClawSlash2[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/claw_slash_2.gbapal.lz"); const u32 gBattleAnimSpritePal_ClawSlash[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/claw_slash.gbapal.lz"); @@ -258,7 +258,7 @@ const u16 gBattleAnimUnused_Unknown3[] = INCBIN_U16("graphics/battle_anims/unuse const u32 gBattleAnimUnusedGfx_LineSketch2[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/line_sketch_2.8bpp.lz"); const u16 gBattleAnimUnusedPal_LineSketch2[] = INCBIN_U16("build/assets/graphics/battle_anims/unused/line_sketch_2.gbapal.lz"); -const u32 gBattleAnimUnusedTilemap_LineSketch2[] = INCBIN_U32("graphics/battle_anims/unused/line_sketch_2.bin.lz"); +const u32 gBattleAnimUnusedTilemap_LineSketch2[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/line_sketch_2.bin.lz"); const u32 gBattleAnimSpriteGfx_BlueLines[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/blue_lines.4bpp.lz"); const u32 gBattleAnimSpritePal_BlueLines[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/blue_lines.gbapal.lz"); @@ -274,7 +274,7 @@ const u32 gBattleAnimSpritePal_RedTube[] = INCBIN_U32("build/assets/graphics/bat const u32 gBattleAnimSpritePal_Amnesia[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/amnesia.gbapal.lz"); const u32 gBattleAnimSpritePal_String2[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/string_2.gbapal.lz"); -const u32 gBattleAnimUnused_Unknown4[] = INCBIN_U32("graphics/battle_anims/unused/unknown_4.bin.lz"); +const u32 gBattleAnimUnused_Unknown4[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/unknown_4.bin.lz"); const u32 gBattleAnimSpritePal_Pencil2[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/pencil_2.gbapal.lz"); const u32 gBattleAnimSpritePal_Petal[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/petal.gbapal.lz"); @@ -333,20 +333,20 @@ const u32 gBattleAnimSpritePal_WaterColumn[] = INCBIN_U32("build/assets/graphics const u32 gBattleAnimSpriteGfx_MudUnk[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/mud_unk.4bpp.lz"); const u32 gBattleAnimSpritePal_MudUnk[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/mud_unk.gbapal.lz"); -const u32 gUnusedTilemap_BlueFrame[] = INCBIN_U32("graphics/unused/blue_frame.bin.lz"); // P1, P2, P3 and P4 tilemaps? -const u32 gUnusedTilemap_RedYellowGreenFrame[] = INCBIN_U32("graphics/unused/redyellowgreen_frame.bin.lz"); +const u32 gUnusedTilemap_BlueFrame[] = INCBIN_U32("build/assets/graphics/unused/blue_frame.bin.lz"); // P1, P2, P3 and P4 tilemaps? +const u32 gUnusedTilemap_RedYellowGreenFrame[] = INCBIN_U32("build/assets/graphics/unused/redyellowgreen_frame.bin.lz"); const u32 gUnusedGfx_ColorFrames[] = INCBIN_U32("build/assets/graphics/unused/color_frames.4bpp.lz"); const u32 gUnusedPal_ColorFrames[] = INCBIN_U32("build/assets/graphics/unused/color_frames.gbapal.lz"); const u32 gBattleAnimSpriteGfx_RainDrops[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/rain_drops.4bpp.lz"); const u32 gBattleAnimUnusedGfx_WaterSplash[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/water_splash.8bpp.lz"); -const u32 gBattleAnimUnusedTilemap_WaterSplash[] = INCBIN_U32("graphics/battle_anims/unused/water_splash.bin.lz"); +const u32 gBattleAnimUnusedTilemap_WaterSplash[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/water_splash.bin.lz"); const u32 gBattleAnimUnusedPal_WaterSplash[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/water_splash.gbapal.lz"); const u32 gUnusedGfx_BasicFrame[] = INCBIN_U32("build/assets/graphics/unused/basic_frame.4bpp.lz"); const u32 gUnusedPal_BasicFrame[] = INCBIN_U32("build/assets/graphics/unused/basic_frame.gbapal.lz"); -const u32 gUnusedTilemap_BasicFrame[] = INCBIN_U32("graphics/unused/basic_frame.bin.lz"); +const u32 gUnusedTilemap_BasicFrame[] = INCBIN_U32("build/assets/graphics/unused/basic_frame.bin.lz"); // Battle Interface @@ -431,16 +431,16 @@ const u32 gBattleAnimSpriteGfx_BlueFlames2[] = INCBIN_U32("build/assets/graphics // Contest const u32 gJPContestGfx1[] = INCBIN_U32("build/assets/graphics/contest/japanese/composite_1.4bpp.lz"); const u32 gJPContestPal[] = INCBIN_U32("build/assets/graphics/contest/japanese/palette.gbapal.lz"); -const u32 gJPContestBgTilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.lz"); -const u32 gJPContestWindowsTilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz"); +const u32 gJPContestBgTilemap[] = INCBIN_U32("build/assets/graphics/contest/japanese/bg.bin.lz"); +const u32 gJPContestWindowsTilemap[] = INCBIN_U32("build/assets/graphics/contest/japanese/windows.bin.lz"); const u32 gJPContestGfx2[] = INCBIN_U32("build/assets/graphics/contest/japanese/composite_2.4bpp.lz"); const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("build/assets/graphics/contest/interface.gbapal.lz"); -const u32 gContestAudienceTilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz"); -const u32 gContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz"); -const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz"); -const u32 gJPContestAudienceTilemap[] = INCBIN_U32("graphics/contest/japanese/audience.bin.lz"); -const u32 gContestCurtainTilemap[] = INCBIN_U32("graphics/contest/curtain.bin.lz"); +const u32 gContestAudienceTilemap[] = INCBIN_U32("build/assets/graphics/contest/audience.bin.lz"); +const u32 gContestInterfaceTilemap[] = INCBIN_U32("build/assets/graphics/contest/interface.bin.lz"); +const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("build/assets/graphics/contest/japanese/interface.bin.lz"); +const u32 gJPContestAudienceTilemap[] = INCBIN_U32("build/assets/graphics/contest/japanese/audience.bin.lz"); +const u32 gContestCurtainTilemap[] = INCBIN_U32("build/assets/graphics/contest/curtain.bin.lz"); const u32 gContestInterfaceGfx[] = INCBIN_U32("build/assets/graphics/contest/interface.4bpp.lz"); const u32 gContestAudienceGfx[] = INCBIN_U32("build/assets/graphics/contest/audience.4bpp.lz"); @@ -455,9 +455,9 @@ const u32 gJPContestVoltagePal[] = INCBIN_U32("build/assets/graphics/contest/jap // Contest results const u32 gContestResults_Gfx[] = INCBIN_U32("build/assets/graphics/contest/results_screen/tiles.4bpp.lz"); -const u32 gContestResults_WinnerBanner_Tilemap[] = INCBIN_U32("graphics/contest/results_screen/winner_banner.bin.lz"); -const u32 gContestResults_Interface_Tilemap[] = INCBIN_U32("graphics/contest/results_screen/interface.bin.lz"); -const u32 gContestResults_Bg_Tilemap[] = INCBIN_U32("graphics/contest/results_screen/bg.bin.lz"); +const u32 gContestResults_WinnerBanner_Tilemap[] = INCBIN_U32("build/assets/graphics/contest/results_screen/winner_banner.bin.lz"); +const u32 gContestResults_Interface_Tilemap[] = INCBIN_U32("build/assets/graphics/contest/results_screen/interface.bin.lz"); +const u32 gContestResults_Bg_Tilemap[] = INCBIN_U32("build/assets/graphics/contest/results_screen/bg.bin.lz"); const u32 gContestResults_Pal[] = INCBIN_U32("build/assets/graphics/contest/results_screen/tiles.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/impact.4bpp.lz"); @@ -536,7 +536,7 @@ const u32 gBattleAnimSpritePal_MistCloud[] = INCBIN_U32("build/assets/graphics/b const u32 gBattleAnimUnusedGfx_Lights[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/lights.4bpp.lz"); const u32 gBattleAnimUnusedPal_Lights[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/lights.gbapal.lz"); -const u32 gBattleAnimUnusedTilemap_Lights[] = INCBIN_U32("graphics/battle_anims/unused/lights.bin.lz"); +const u32 gBattleAnimUnusedTilemap_Lights[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/lights.bin.lz"); const u32 gBattleAnimSpriteGfx_WhirlwindLines[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/whirlwind_lines.4bpp.lz"); const u32 gBattleAnimSpritePal_WhirlwindLines[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/whirlwind_lines.gbapal.lz"); @@ -571,15 +571,15 @@ const u32 gBattleAnimSpriteGfx_SparkH[] = INCBIN_U32("build/assets/graphics/batt const u32 gBattleAnimBgImage_Dark[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/dark.4bpp.lz"); const u32 gBattleAnimBgPalette_Dark[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/dark.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.bin.lz"); +const u32 gBattleAnimBgTilemap_Dark[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/dark.bin.lz"); const u32 gMetalShineGfx[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/metal_shine.4bpp.lz"); const u32 gMetalShinePalette[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/metal_shine.gbapal.lz"); -const u32 gMetalShineTilemap[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.bin.lz"); +const u32 gMetalShineTilemap[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/metal_shine.bin.lz"); const u32 gUnusedGfx_Goosuto[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/goosuto.4bpp.lz"); // ghost const u32 gUnusedPal_Goosuto[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/goosuto.gbapal.lz"); -const u32 gUnusedTilemap_Goosuto[] = INCBIN_U32("graphics/battle_anims/unused/goosuto.bin.lz"); +const u32 gUnusedTilemap_Goosuto[] = INCBIN_U32("build/assets/graphics/battle_anims/unused/goosuto.bin.lz"); const u32 gBattleAnimSpriteGfx_YellowStar[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/yellow_star.4bpp.lz"); const u32 gBattleAnimSpritePal_YellowStar[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/yellow_star.gbapal.lz"); @@ -616,7 +616,7 @@ const u32 gBattleAnimSpritePal_SphereToCube[] = INCBIN_U32("build/assets/graphic const u32 gBattleAnimBgImage_Psychic[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/psychic.4bpp.lz"); const u32 gBattleAnimBgPalette_Psychic[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/psychic.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.bin.lz"); +const u32 gBattleAnimBgTilemap_Psychic[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/psychic.bin.lz"); const u32 gBattleAnimSpriteGfx_Eye[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/eye.4bpp.lz"); const u32 gBattleAnimSpritePal_Eye[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/eye.gbapal.lz"); @@ -652,7 +652,7 @@ const u32 gBattleAnimSpriteGfx_PurpleHandOutline[] = INCBIN_U32("build/assets/gr const u32 gBattleAnimSpritePal_PurpleHandOutline[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/purple_hand_outline.gbapal.lz"); const u32 gBattleAnimMaskImage_Curse[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/curse.4bpp.lz"); -const u32 gBattleAnimMaskTilemap_Curse[] = INCBIN_U32("graphics/battle_anims/masks/curse.bin.lz"); +const u32 gBattleAnimMaskTilemap_Curse[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/curse.bin.lz"); const u32 gBattleAnimSpriteGfx_Pencil[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/pencil.4bpp.lz"); const u32 gBattleAnimSpritePal_Pencil[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/pencil.gbapal.lz"); @@ -715,7 +715,7 @@ const u32 gBattleAnimSpritePal_RedHeart[] = INCBIN_U32("build/assets/graphics/ba const u32 gBattleAnimBgImage_Attract[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/attract.4bpp.lz"); const u32 gBattleAnimBgPalette_Attract[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/attract.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Attract[] = INCBIN_U32("graphics/battle_anims/backgrounds/attract.bin.lz"); +const u32 gBattleAnimBgTilemap_Attract[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/attract.bin.lz"); const u32 gBattleAnimSpriteGfx_RedOrb[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/red_orb.4bpp.lz"); const u32 gBattleAnimSpritePal_RedOrb[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/red_orb.gbapal.lz"); @@ -766,10 +766,10 @@ const u32 gBattleAnimSpriteGfx_LetterZ[] = INCBIN_U32("build/assets/graphics/bat const u32 gBattleAnimBgPalette_Impact[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/impact.gbapal.lz"); const u32 gBattleAnimBgImage_Impact[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/impact.4bpp.lz"); -const u32 gBattleAnimBgTilemap_ImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_ImpactOpponent[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/impact_opponent.bin.lz"); -const u32 gBattleAnimBgTilemap_ImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_player.bin.lz"); -const u32 gBattleAnimBgTilemap_ImpactContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_contests.bin.lz"); +const u32 gBattleAnimBgTilemap_ImpactPlayer[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/impact_player.bin.lz"); +const u32 gBattleAnimBgTilemap_ImpactContests[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/impact_contests.bin.lz"); const u32 gBattleAnimSpriteGfx_JaggedMusicNote[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/jagged_music_note.4bpp.lz"); const u32 gBattleAnimSpritePal_JaggedMusicNote[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/jagged_music_note.gbapal.lz"); @@ -810,35 +810,35 @@ const u32 gBattleAnimBgPalette_Drill[] = INCBIN_U32("build/assets/graphics/battl const u32 gBattleAnimBgPalette_Sky[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/sky.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.bin.lz"); -const u32 gBattleAnimBgTilemap_DrillContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill_contests.bin.lz"); +const u32 gBattleAnimBgTilemap_Drill[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/drill.bin.lz"); +const u32 gBattleAnimBgTilemap_DrillContests[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/drill_contests.bin.lz"); const u32 gBattleAnimBgImage_Aurora[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/aurora.4bpp.lz"); const u32 gBattleAnimBgPalette_Aurora[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/aurora.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.bin.lz"); +const u32 gBattleAnimBgTilemap_Aurora[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/aurora.bin.lz"); -const u32 gBattleAnimBgTilemap_HighspeedOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_HighspeedOpponent[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/highspeed_opponent.bin.lz"); const u32 gBattleAnimBgPalette_Highspeed[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/highspeed.gbapal.lz"); const u32 gBattleAnimBgPalette_Bug[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/bug.gbapal.lz"); const u32 gBattleAnimBgImage_Highspeed[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/highspeed.4bpp.lz"); -const u32 gBattleAnimBgTilemap_HighspeedPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_player.bin.lz"); +const u32 gBattleAnimBgTilemap_HighspeedPlayer[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/highspeed_player.bin.lz"); const u32 gBattleAnimMaskImage_LightBeam[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/light_beam.4bpp.lz"); const u32 gBattleAnimMaskPalette_LightBeam[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/light_beam.gbapal.lz"); -const u32 gBattleAnimMaskTilemap_LightBeam[] = INCBIN_U32("graphics/battle_anims/masks/light_beam.bin.lz"); +const u32 gBattleAnimMaskTilemap_LightBeam[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/light_beam.bin.lz"); -const u32 gBattleAnimBgTilemap_GuillotineOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_opponent.bin.lz"); -const u32 gBattleAnimBgTilemap_GuillotinePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_player.bin.lz"); -const u32 gBattleAnimBgTilemap_GuillotineContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_contests.bin.lz"); +const u32 gBattleAnimBgTilemap_GuillotineOpponent[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/guillotine_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_GuillotinePlayer[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/guillotine_player.bin.lz"); +const u32 gBattleAnimBgTilemap_GuillotineContests[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/guillotine_contests.bin.lz"); const u32 gBattleAnimBgImage_Guillotine[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/guillotine.4bpp.lz"); const u32 gBattleAnimBgPalette_Guillotine[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/guillotine.gbapal.lz"); const u32 gBattleAnimBgImage_Thunder[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/thunder.4bpp.lz"); const u32 gBattleAnimBgPalette_Thunder[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/thunder.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.bin.lz"); +const u32 gBattleAnimBgTilemap_Thunder[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/thunder.bin.lz"); const u32 gBattleAnimSpriteGfx_PainSplit[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/pain_split.4bpp.lz"); const u32 gBattleAnimSpritePal_PainSplit[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/pain_split.gbapal.lz"); @@ -866,8 +866,8 @@ const u32 gBattleAnimSpriteGfx_SweatDrop[] = INCBIN_U32("build/assets/graphics/b const u32 gBattleAnimSpritePal_SweatDrop[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/sweat_drop.gbapal.lz"); const u32 gStatAnim_Gfx[] = INCBIN_U32("build/assets/graphics/battle_anims/stat_change/tiles.4bpp.lz"); -const u32 gStatAnim_Increase_Tilemap[] = INCBIN_U32("graphics/battle_anims/stat_change/increase.bin.lz"); -const u32 gStatAnim_Decrease_Tilemap[] = INCBIN_U32("graphics/battle_anims/stat_change/decrease.bin.lz"); +const u32 gStatAnim_Increase_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_anims/stat_change/increase.bin.lz"); +const u32 gStatAnim_Decrease_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_anims/stat_change/decrease.bin.lz"); const u32 gStatAnim_Defense_Pal[] = INCBIN_U32("build/assets/graphics/battle_anims/stat_change/defense.gbapal.lz"); const u32 gStatAnim_Attack_Pal[] = INCBIN_U32("build/assets/graphics/battle_anims/stat_change/attack.gbapal.lz"); const u32 gStatAnim_Accuracy_Pal[] = INCBIN_U32("build/assets/graphics/battle_anims/stat_change/accuracy.gbapal.lz"); @@ -879,7 +879,7 @@ const u32 gStatAnim_SpDefense_Pal[] = INCBIN_U32("build/assets/graphics/battl const u32 gCureBubblesGfx[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/cure_bubbles.4bpp.lz"); const u32 gCureBubblesPal[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/cure_bubbles.gbapal.lz"); -const u32 gCureBubblesTilemap[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.bin.lz"); +const u32 gCureBubblesTilemap[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/cure_bubbles.bin.lz"); const u32 gBattleAnimSpritePal_PurpleScratch[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/purple_scratch.gbapal.lz"); const u32 gBattleAnimSpriteGfx_PurpleScratch[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/purple_scratch.4bpp.lz"); @@ -894,7 +894,7 @@ const u32 gBattleAnimSpriteGfx_TagHand[] = INCBIN_U32("build/assets/graphics/bat const u32 gBattleAnimSpriteGfx_NoiseLine[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/noise_line.4bpp.lz"); const u32 UnusedLevelupAnimationGfx[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/unused_level_up.4bpp.lz"); -const u32 UnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.bin.lz"); +const u32 UnusedLevelupAnimationTilemap[] = INCBIN_U32("build/assets/graphics/battle_anims/masks/unused_level_up.bin.lz"); const u32 gBattleAnimSpriteGfx_SmallRedEye[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/small_red_eye.4bpp.lz"); const u32 gBattleAnimSpritePal_SmallRedEye[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/small_red_eye.gbapal.lz"); @@ -937,7 +937,7 @@ const u8 gMonIcon_QuestionMark[] = INCBIN_U8("build/assets/graphics/pokemon/ques const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("build/assets/graphics/pokemon/question_mark/footprint.1bpp"); const u32 gBattleVSFrame_Gfx[] = INCBIN_U32("build/assets/graphics/battle_transitions/vs_frame.4bpp.lz"); -const u32 gBattleVSFrame_Tilemap[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz"); +const u32 gBattleVSFrame_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_transitions/vs_frame.bin.lz"); const u32 gBattleVSFrame_Pal[] = INCBIN_U32("build/assets/graphics/battle_transitions/vs_frame.gbapal.lz"); const u32 gVsLettersGfx[] = INCBIN_U32("build/assets/graphics/battle_transitions/vs.4bpp.lz"); @@ -947,12 +947,12 @@ const u32 gVsLettersGfx[] = INCBIN_U32("build/assets/graphics/battle_transitions // Battle Dome const u32 gDomeTourneyTree_Gfx[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_tree.4bpp.lz"); const u32 gDomeTourneyLine_Gfx[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_line.4bpp.lz"); // the red glow mask for the tourney advancement lines -const u32 gDomeTourneyTree_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_tree.bin.lz"); -const u32 gDomeTourneyLineDown_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_down_map.bin.lz"); -const u32 gDomeTourneyLineUp_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_up_map.bin.lz"); +const u32 gDomeTourneyTree_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_tree.bin.lz"); +const u32 gDomeTourneyLineDown_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_line_down_map.bin.lz"); +const u32 gDomeTourneyLineUp_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_line_up_map.bin.lz"); const u32 gDomeTourneyInfoCard_Gfx[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_info_card.4bpp.lz"); -const u32 gDomeTourneyInfoCard_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card_tilemap.bin.lz"); -const u32 gDomeTourneyInfoCardBg_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card_bg.bin.lz"); +const u32 gDomeTourneyInfoCard_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_info_card_tilemap.bin.lz"); +const u32 gDomeTourneyInfoCardBg_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_info_card_bg.bin.lz"); const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_buttons.4bpp.lz"); // exit/cancel and pokeball buttons const u32 gDomeTourneyTree_Pal[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_tree.gbapal.lz"); const u32 gDomeTourneyTreeButtons_Pal[] = INCBIN_U32("build/assets/graphics/battle_frontier/tourney_buttons.gbapal.lz"); @@ -973,14 +973,14 @@ static const u16 sUnused0[] = {0x13F, 0x119, 0x113, 0x10E}; const u16 gBattlePyramidFloor_Pal[] = INCBIN_U16("build/assets/graphics/battle_frontier/pyramid_floor.gbapal"); -const u32 gMultiBattleIntroBg_Opponent_Tilemap[] = INCBIN_U32("graphics/battle_frontier/multi_battle_intro_bg_opponent.bin.lz"); -const u32 gMultiBattleIntroBg_Player_Tilemap[] = INCBIN_U32("graphics/battle_frontier/multi_battle_intro_bg_player.bin.lz"); +const u32 gMultiBattleIntroBg_Opponent_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin.lz"); +const u32 gMultiBattleIntroBg_Player_Tilemap[] = INCBIN_U32("build/assets/graphics/battle_frontier/multi_battle_intro_bg_player.bin.lz"); #include "data/graphics/intro_scene.h" const u32 gBattleAnimSpriteGfx_FlyingDirt[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/flying_dirt.4bpp.lz"); -const u32 gBattleAnimBgTilemap_Sandstorm[] = INCBIN_U32("graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz"); +const u32 gBattleAnimBgTilemap_Sandstorm[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz"); const u32 gBattleAnimBgImage_Sandstorm[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"); const u32 gBattleAnimSpritePal_FlyingDirt[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/flying_dirt.gbapal.lz"); @@ -990,7 +990,7 @@ const u32 gBattleAnimSpritePal_MetalSoundWaves[] = INCBIN_U32("build/assets/grap const u32 gBattleAnimBgImage_Ice[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/ice.4bpp.lz"); const u32 gBattleAnimBgPalette_Ice[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/ice.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.bin.lz"); +const u32 gBattleAnimBgTilemap_Ice[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/ice.bin.lz"); const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/icicle_spear.4bpp.lz"); const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/icicle_spear.gbapal.lz"); @@ -1026,7 +1026,7 @@ const u32 gBattleAnimSpritePal_Gem1[] = INCBIN_U32("build/assets/graphics/battle const u32 gBattleAnimBgImage_InAir[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/in_air.4bpp.lz"); const u32 gBattleAnimBgPalette_InAir[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/in_air.gbapal.lz"); -const u32 gBattleAnimBgTilemap_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.bin.lz"); +const u32 gBattleAnimBgTilemap_InAir[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/in_air.bin.lz"); const u32 gBattleAnimSpriteGfx_Protect[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/protect.4bpp.lz"); const u32 gBattleAnimSpritePal_Protect[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/protect.gbapal.lz"); @@ -1041,32 +1041,32 @@ const u8 gMonIcon_Egg[] = INCBIN_U8("build/assets/graphics/pokemon/egg/icon.4bpp const u32 gBattleAnimBgImage_Ghost[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/ghost.4bpp.lz"); const u32 gBattleAnimBgPalette_Ghost[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/ghost.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.bin.lz"); +const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/ghost.bin.lz"); const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/whip_hit.gbapal.lz"); const u32 gBattleAnimBgPalette_SolarBeam[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/solarbeam.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SolarBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.bin.lz"); // Unused +const u32 gBattleAnimBgTilemap_SolarBeam[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/solarbeam.bin.lz"); // Unused const u32 gBerryBlenderCenter_Gfx[] = INCBIN_U32("build/assets/graphics/berry_blender/center.8bpp.lz"); const u32 gBerryBlenderOuter_Gfx[] = INCBIN_U32("build/assets/graphics/berry_blender/outer.4bpp.lz"); -const u32 gBerryBlenderOuter_Tilemap[] = INCBIN_U32("graphics/berry_blender/outer_map.bin.lz"); +const u32 gBerryBlenderOuter_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_blender/outer_map.bin.lz"); const u32 gBattleAnimBgPalette_Cosmic[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/cosmic.gbapal.lz"); const u32 gBattleAnimBgImage_Cosmic[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/cosmic.4bpp.lz"); -const u32 gBattleAnimBgTilemap_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.bin.lz"); +const u32 gBattleAnimBgTilemap_Cosmic[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/cosmic.bin.lz"); const u32 gBattleAnimSpritePal_SlamHit2[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/slam_hit_2.gbapal.lz"); const u32 gBattleAnimSpriteGfx_SlamHit2[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/slam_hit_2.4bpp.lz"); -const u32 gBattleAnimFogTilemap[] = INCBIN_U32("graphics/battle_anims/backgrounds/fog.bin.lz"); +const u32 gBattleAnimFogTilemap[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/fog.bin.lz"); const u32 gBattleAnimSpritePal_WeatherBall[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/weather_ball.gbapal.lz"); const u32 gBattleAnimSpriteGfx_WeatherBall[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/weather_ball.4bpp.lz"); -const u32 gBattleAnimBgTilemap_ScaryFacePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_player.bin.lz"); -const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"); -const u32 gBattleAnimBgTilemap_ScaryFaceContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"); +const u32 gBattleAnimBgTilemap_ScaryFacePlayer[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/scary_face_player.bin.lz"); +const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_ScaryFaceContest[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"); const u32 gBattleAnimSpriteGfx_Hail[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/hail.4bpp.lz"); const u32 gBattleAnimSpritePal_Hail[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/hail.gbapal.lz"); @@ -1087,7 +1087,7 @@ const u32 gBattleAnimSpritePal_DirtMound[] = INCBIN_U32("build/assets/graphics/b const u32 gBattleAnimBgImage_Fissure[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/fissure.4bpp.lz"); const u32 gBattleAnimBgPalette_Fissure[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/fissure.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.bin.lz"); +const u32 gBattleAnimBgTilemap_Fissure[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/fissure.bin.lz"); const u32 gBattleAnimSpriteGfx_Bird[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/bird.4bpp.lz"); const u32 gBattleAnimSpritePal_Bird[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/bird.gbapal.lz"); @@ -1098,9 +1098,9 @@ const u32 gBattleAnimSpritePal_CrossImpact[] = INCBIN_U32("build/assets/graphics const u32 gBattleAnimBgImage_Surf[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/water.4bpp.lz"); const u32 gBattleAnimBgPalette_Surf[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/water.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SurfOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_opponent.bin.lz"); -const u32 gBattleAnimBgTilemap_SurfPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_player.bin.lz"); -const u32 gBattleAnimBgTilemap_SurfContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_contest.bin.lz"); +const u32 gBattleAnimBgTilemap_SurfOpponent[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/water_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_SurfPlayer[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/water_player.bin.lz"); +const u32 gBattleAnimBgTilemap_SurfContest[] = INCBIN_U32("build/assets/graphics/battle_anims/backgrounds/water_contest.bin.lz"); const u32 gBattleAnimSpritePal_Slash2[] = INCBIN_U32("build/assets/graphics/battle_anims/sprites/slash_2.gbapal.lz"); @@ -1109,7 +1109,7 @@ const u32 gBattleAnimSpritePal_WhiteShadow[] = INCBIN_U32("build/assets/graphics const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("build/assets/graphics/party_menu/bg.4bpp.lz"); const u32 gPartyMenuBg_Pal[] = INCBIN_U32("build/assets/graphics/party_menu/bg.gbapal.lz"); -const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/party_menu/bg.bin.lz"); +const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("build/assets/graphics/party_menu/bg.bin.lz"); const u32 gPartyMenuPokeball_Gfx[] = INCBIN_U32("build/assets/graphics/party_menu/pokeball.4bpp.lz"); const u32 gPartyMenuPokeballSmall_Gfx[] = INCBIN_U32("build/assets/graphics/party_menu/pokeball_small.4bpp.lz"); //unused @@ -1126,11 +1126,11 @@ const u32 gSummaryMoveSelect_Pal[] = INCBIN_U32("build/assets/graphics/summary_s const u32 gSummaryScreen_Gfx[] = INCBIN_U32("build/assets/graphics/summary_screen/tiles.4bpp.lz"); const u32 gSummaryScreen_Pal[] = INCBIN_U32("build/assets/graphics/summary_screen/tiles.gbapal.lz"); -const u32 gSummaryPage_Info_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info.bin.lz"); -const u32 gSummaryPage_Skills_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_skills.bin.lz"); -const u32 gSummaryPage_BattleMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_battle_moves.bin.lz"); -const u32 gSummaryPage_ContestMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_contest_moves.bin.lz"); -const u32 gSummaryPage_InfoEgg_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info_egg.bin.lz"); +const u32 gSummaryPage_Info_Tilemap[] = INCBIN_U32("build/assets/graphics/summary_screen/page_info.bin.lz"); +const u32 gSummaryPage_Skills_Tilemap[] = INCBIN_U32("build/assets/graphics/summary_screen/page_skills.bin.lz"); +const u32 gSummaryPage_BattleMoves_Tilemap[] = INCBIN_U32("build/assets/graphics/summary_screen/page_battle_moves.bin.lz"); +const u32 gSummaryPage_ContestMoves_Tilemap[] = INCBIN_U32("build/assets/graphics/summary_screen/page_contest_moves.bin.lz"); +const u32 gSummaryPage_InfoEgg_Tilemap[] = INCBIN_U32("build/assets/graphics/summary_screen/page_info_egg.bin.lz"); const u32 gBagMaleTiles[] = INCBIN_U32("build/assets/graphics/bag/bag_male.4bpp.lz"); const u32 gBagFemaleTiles[] = INCBIN_U32("build/assets/graphics/bag/bag_female.4bpp.lz"); @@ -1140,11 +1140,11 @@ const u32 gBagScreenMale_Pal[] = INCBIN_U32("build/assets/graphics/bag/menu_male const u32 gBagScreenFemale_Pal[] = INCBIN_U32("build/assets/graphics/bag/menu_female.gbapal.lz"); const u32 gBagScreen_Gfx[] = INCBIN_U32("build/assets/graphics/bag/menu.4bpp.lz"); -const u32 gBagScreen_GfxTileMap[] = INCBIN_U32("graphics/bag/menu.bin.lz"); +const u32 gBagScreen_GfxTileMap[] = INCBIN_U32("build/assets/graphics/bag/menu.bin.lz"); const u32 gBattlePyramidBag_Gfx[] = INCBIN_U32("build/assets/graphics/bag/bag_pyramid.4bpp.lz"); const u32 gBattlePyramidBag_Pal[] = INCBIN_U32("build/assets/graphics/bag/bag_pyramid.gbapal.lz"); // female palette is first and male is second. -const u32 gBattlePyramidBagTilemap[] = INCBIN_U32("graphics/bag/menu_pyramid.bin.lz"); +const u32 gBattlePyramidBagTilemap[] = INCBIN_U32("build/assets/graphics/bag/menu_pyramid.bin.lz"); const u32 gBattlePyramidBagInterface_Pal[] = INCBIN_U32("build/assets/graphics/bag/menu_pyramid.gbapal.lz"); const u32 gSwapLineGfx[] = INCBIN_U32("build/assets/graphics/interface/swap_line.4bpp.lz"); @@ -1152,7 +1152,7 @@ const u32 gSwapLinePal[] = INCBIN_U32("build/assets/graphics/interface/swap_line const u32 gShopMenu_Gfx[] = INCBIN_U32("build/assets/graphics/shop/menu.4bpp.lz"); const u32 gShopMenu_Pal[] = INCBIN_U32("build/assets/graphics/shop/menu.gbapal.lz"); -const u32 gShopMenu_Tilemap[] = INCBIN_U32("graphics/shop/menu.bin.lz"); +const u32 gShopMenu_Tilemap[] = INCBIN_U32("build/assets/graphics/shop/menu.bin.lz"); const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("build/assets/graphics/shop/money.4bpp.lz"); // Pokeblock @@ -1163,7 +1163,7 @@ const u32 gMenuPokeblock_Pal[] = INCBIN_U32("build/assets/graphics/pokeblock/men const u32 gMenuPokeblockDevice_Gfx[] = INCBIN_U32("build/assets/graphics/pokeblock/device.4bpp.lz"); const u32 gMenuPokeblockDevice_Pal[] = INCBIN_U32("build/assets/graphics/pokeblock/device.gbapal.lz"); -const u32 gMenuPokeblock_Tilemap[] = INCBIN_U32("graphics/pokeblock/menu.bin.lz"); +const u32 gMenuPokeblock_Tilemap[] = INCBIN_U32("build/assets/graphics/pokeblock/menu.bin.lz"); const u32 gPokeblock_Gfx[] = INCBIN_U32("build/assets/graphics/pokeblock/pokeblock.4bpp.lz"); const u32 gPokeblockRed_Pal[] = INCBIN_U32("build/assets/graphics/pokeblock/red.gbapal.lz"); @@ -1181,7 +1181,7 @@ const u32 gPokeblockBlack_Pal[] = INCBIN_U32("build/assets/graphics/pokeblock/bl const u32 gPokeblockWhite_Pal[] = INCBIN_U32("build/assets/graphics/pokeblock/white.gbapal.lz"); const u32 gPokeblockGold_Pal[] = INCBIN_U32("build/assets/graphics/pokeblock/gold.gbapal.lz"); -const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("graphics/pokeblock/feeding_bg.bin.lz"); +const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("build/assets/graphics/pokeblock/feeding_bg.bin.lz"); #include "data/graphics/berries.h" #include "data/graphics/rayquaza_scene.h" @@ -1236,19 +1236,19 @@ const u16 gPokedexBgNational_Pal[] = INCBIN_U16("build/assets/graphics/pokedex/b const u32 gPokedexMenu_Gfx[] = INCBIN_U32("build/assets/graphics/pokedex/menu.4bpp.lz"); const u32 gPokedexInterface_Gfx[] = INCBIN_U32("build/assets/graphics/pokedex/interface.4bpp.lz"); const u32 gUnused_PokedexNoBall[] = INCBIN_U32("build/assets/graphics/pokedex/noball_unused.4bpp.lz"); -const u32 gPokedexStartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/start_menu_main.bin.lz"); -const u32 gPokedexStartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/start_menu_search_results.bin.lz"); -const u32 gPokedexList_Tilemap[] = INCBIN_U32("graphics/pokedex/list.bin.lz"); -const u32 gPokedexListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/list_underlay.bin.lz"); -const u32 gPokedexSizeScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/size_screen.bin.lz"); -const u32 gPokedexScreenSelectBarMain_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_main.bin.lz"); -const u32 gPokedexScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu.bin.lz"); -const u32 gPokedexInfoScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/info_screen.bin.lz"); -const u32 gPokedexCryScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/cry_screen.bin.lz"); +const u32 gPokedexStartMenuMain_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/start_menu_main.bin.lz"); +const u32 gPokedexStartMenuSearchResults_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/start_menu_search_results.bin.lz"); +const u32 gPokedexList_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/list.bin.lz"); +const u32 gPokedexListUnderlay_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/list_underlay.bin.lz"); +const u32 gPokedexSizeScreen_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/size_screen.bin.lz"); +const u32 gPokedexScreenSelectBarMain_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/screen_select_bar_main.bin.lz"); +const u32 gPokedexScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/screen_select_bar_submenu.bin.lz"); +const u32 gPokedexInfoScreen_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/info_screen.bin.lz"); +const u32 gPokedexCryScreen_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/cry_screen.bin.lz"); const u16 gPokedexSearchMenu_Pal[] = INCBIN_U16("build/assets/graphics/pokedex/search_menu.gbapal"); const u32 gPokedexSearchMenu_Gfx[] = INCBIN_U32("build/assets/graphics/pokedex/search_menu.4bpp.lz"); -const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_national.bin.lz"); -const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz"); +const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/search_menu_national.bin.lz"); +const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/search_menu_hoenn.bin.lz"); const u16 gSummaryScreen_MoveEffect_Battle_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_battle.bin"); const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_contest.bin"); @@ -1256,7 +1256,7 @@ const u16 gSummaryScreen_MoveEffect_Cancel_Tilemap[] = INCBIN_U16("graphics/summ const u16 gIntroCopyright_Pal[] = INCBIN_U16("build/assets/graphics/intro/copyright.gbapal"); const u32 gIntroCopyright_Gfx[] = INCBIN_U32("build/assets/graphics/intro/copyright.4bpp.lz"); -const u32 gIntroCopyright_Tilemap[] = INCBIN_U32("graphics/intro/copyright.bin.lz"); +const u32 gIntroCopyright_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/copyright.bin.lz"); const u16 gPokedexAreaScreenAreaUnknown_Pal[] = INCBIN_U16("build/assets/graphics/pokedex/area_unknown.gbapal"); const u32 gPokedexAreaScreenAreaUnknown_Gfx[] = INCBIN_U32("build/assets/graphics/pokedex/area_unknown.4bpp.lz"); @@ -1286,7 +1286,7 @@ const u16 gContestResultsTitle_Tilemap[] = INCBIN_U16("graphics/contest/r const u16 gPokenavCondition_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/condition/graph.gbapal"); const u32 gPokenavCondition_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/condition/graph.4bpp.lz"); -const u32 gPokenavCondition_Tilemap[] = INCBIN_U32("graphics/pokenav/condition/graph.bin.lz"); +const u32 gPokenavCondition_Tilemap[] = INCBIN_U32("build/assets/graphics/pokenav/condition/graph.bin.lz"); const u16 gPokenavOptions_Tilemap[] = INCBIN_U16("graphics/pokenav/options/options.bin"); const u32 gPokenavOptions_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/options/options.4bpp.lz"); @@ -1294,7 +1294,7 @@ const u16 gPokenavOptions_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/opti const u16 gPokenavHeader_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/header.gbapal"); const u32 gPokenavHeader_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/header.4bpp.lz"); // TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this -const u32 gPokenavHeader_Tilemap[] = INCBIN_U32("graphics/pokenav/header.bin.lz"); +const u32 gPokenavHeader_Tilemap[] = INCBIN_U32("build/assets/graphics/pokenav/header.bin.lz"); const u16 gPokenavLeftHeader_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/left_headers/palette.gbapal"); const u32 gPokenavLeftHeaderBeauty_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/left_headers/beauty.4bpp.lz"); @@ -1312,7 +1312,7 @@ const u32 gPokenavLeftHeaderParty_Gfx[] = INCBIN_U32("build/assets/graphics/poke const u16 gPokenavMessageBox_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/message.gbapal"); const u32 gPokenavMessageBox_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/message.4bpp.lz"); -const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("graphics/pokenav/message.bin.lz"); +const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("build/assets/graphics/pokenav/message.bin.lz"); const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/region_map/zoom_tiles.gbapal"); const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/city_zoom_text.4bpp.lz"); @@ -1345,13 +1345,13 @@ const u32 gEasyChatMode_Gfx[] = INCBIN_U32("build/assets/graphics/easy_chat/mode const u16 gEasyChatMode_Pal[] = INCBIN_U16("build/assets/graphics/easy_chat/mode.gbapal"); const u32 gEasyChatWindow_Gfx[] = INCBIN_U32("build/assets/graphics/easy_chat/window.4bpp.lz"); // uses mode pal -const u32 gEasyChatWindow_Tilemap[] = INCBIN_U32("graphics/easy_chat/window.bin.lz"); +const u32 gEasyChatWindow_Tilemap[] = INCBIN_U32("build/assets/graphics/easy_chat/window.bin.lz"); const u16 gWallClockMale_Pal[] = INCBIN_U16("build/assets/graphics/wallclock/male.gbapal"); const u16 gWallClockFemale_Pal[] = INCBIN_U16("build/assets/graphics/wallclock/female.gbapal"); const u32 gWallClock_Gfx[] = INCBIN_U32("build/assets/graphics/wallclock/clock.4bpp.lz"); -const u32 gWallClockStart_Tilemap[] = INCBIN_U32("graphics/wallclock/clock_start.bin.lz"); -const u32 gWallClockView_Tilemap[] = INCBIN_U32("graphics/wallclock/clock_view.bin.lz"); +const u32 gWallClockStart_Tilemap[] = INCBIN_U32("build/assets/graphics/wallclock/clock_start.bin.lz"); +const u32 gWallClockView_Tilemap[] = INCBIN_U32("build/assets/graphics/wallclock/clock_view.bin.lz"); const u16 gUsePokeblockCondition_Pal[] = INCBIN_U16("build/assets/graphics/pokeblock/use_screen/condition.gbapal"); const u32 gUsePokeblockCondition_Gfx[] = INCBIN_U32("build/assets/graphics/pokeblock/use_screen/condition.4bpp.lz"); @@ -1362,7 +1362,7 @@ const u8 gUsePokeblockUpDown_Gfx[] = INCBIN_U8("build/assets/graphics/pokeblock/ const u16 gUsePokeblockGraph_Pal[] = INCBIN_U16("build/assets/graphics/pokeblock/use_screen/graph.gbapal"); const u32 gUsePokeblockGraph_Gfx[] = INCBIN_U32("build/assets/graphics/pokeblock/use_screen/graph.4bpp.lz"); -const u32 gUsePokeblockGraph_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/graph.bin.lz"); +const u32 gUsePokeblockGraph_Tilemap[] = INCBIN_U32("build/assets/graphics/pokeblock/use_screen/graph.bin.lz"); const u16 gUsePokeblockNatureWin_Pal[] = INCBIN_U16("build/assets/graphics/pokeblock/use_screen/nature.gbapal"); #include "data/graphics/slot_machine.h" @@ -1371,23 +1371,23 @@ const u16 gUsePokeblockNatureWin_Pal[] = INCBIN_U16("build/assets/graphics/pokeb const u16 gHoennTrainerCardGreen_Pal[] = INCBIN_U16("build/assets/graphics/trainer_card/green.gbapal"); const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("build/assets/graphics/trainer_card/tiles.4bpp.lz"); -const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz"); -const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin.lz"); -const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz"); -const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz"); +const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/bg.bin.lz"); +const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/front.bin.lz"); +const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/back.bin.lz"); +const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/front_link.bin.lz"); const u16 gKantoTrainerCardBlue_Pal[] = INCBIN_U16("build/assets/graphics/trainer_card/frlg/blue.gbapal"); const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("build/assets/graphics/trainer_card/frlg/tiles.4bpp.lz"); -const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz"); -const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz"); -const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz"); -const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz"); +const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/frlg/bg.bin.lz"); +const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/frlg/front.bin.lz"); +const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/frlg/back.bin.lz"); +const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("build/assets/graphics/trainer_card/frlg/front_link.bin.lz"); // pokemon storage system const u32 gStorageSystemMenu_Gfx[] = INCBIN_U32("build/assets/graphics/pokemon_storage/menu.4bpp.lz"); const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_storage/party_menu.gbapal"); -const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/party_menu.bin.lz"); +const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("build/assets/graphics/pokemon_storage/party_menu.bin.lz"); // naming screen @@ -1413,19 +1413,19 @@ const u32 gNamingScreenCursorFilled_Gfx[] = INCBIN_U32("build/assets/grap const u32 gNamingScreenPageSwapButton_Gfx[] = INCBIN_U32("build/assets/graphics/naming_screen/page_swap_button.4bpp"); const u32 gNamingScreenInputArrow_Gfx[] = INCBIN_U32("build/assets/graphics/naming_screen/input_arrow.4bpp"); const u32 gNamingScreenUnderscore_Gfx[] = INCBIN_U32("build/assets/graphics/naming_screen/underscore.4bpp"); -const u32 gNamingScreenBackground_Tilemap[] = INCBIN_U32("graphics/naming_screen/background.bin.lz"); -const u32 gNamingScreenKeyboardUpper_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_upper.bin.lz"); -const u32 gNamingScreenKeyboardLower_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_lower.bin.lz"); -const u32 gNamingScreenKeyboardSymbols_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_symbols.bin.lz"); +const u32 gNamingScreenBackground_Tilemap[] = INCBIN_U32("build/assets/graphics/naming_screen/background.bin.lz"); +const u32 gNamingScreenKeyboardUpper_Tilemap[] = INCBIN_U32("build/assets/graphics/naming_screen/keyboard_upper.bin.lz"); +const u32 gNamingScreenKeyboardLower_Tilemap[] = INCBIN_U32("build/assets/graphics/naming_screen/keyboard_lower.bin.lz"); +const u32 gNamingScreenKeyboardSymbols_Tilemap[] = INCBIN_U32("build/assets/graphics/naming_screen/keyboard_symbols.bin.lz"); // union room chat const u16 gUnionRoomChat_Background_Pal[] = INCBIN_U16("build/assets/graphics/union_room_chat/background.gbapal"); const u32 gUnionRoomChat_Background_Gfx[] = INCBIN_U32("build/assets/graphics/union_room_chat/background.4bpp.lz"); -const u32 gUnionRoomChat_Background_Tilemap[] = INCBIN_U32("graphics/union_room_chat/background.bin.lz"); +const u32 gUnionRoomChat_Background_Tilemap[] = INCBIN_U32("build/assets/graphics/union_room_chat/background.bin.lz"); const u16 gUnionRoomChat_InputText_Pal[] = INCBIN_U16("build/assets/graphics/union_room_chat/input_text.gbapal"); const u16 gUnionRoomChat_Keyboard_Pal[] = INCBIN_U16("build/assets/graphics/union_room_chat/keyboard.gbapal"); const u32 gUnionRoomChat_Keyboard_Gfx[] = INCBIN_U32("build/assets/graphics/union_room_chat/keyboard.4bpp.lz"); -const u32 gUnionRoomChat_Keyboard_Tilemap[] = INCBIN_U32("graphics/union_room_chat/keyboard.bin.lz"); +const u32 gUnionRoomChat_Keyboard_Tilemap[] = INCBIN_U32("build/assets/graphics/union_room_chat/keyboard.bin.lz"); const u32 gUnionRoomChat_RButtonLabels[] = INCBIN_U32("build/assets/graphics/union_room_chat/r_button_labels.4bpp.lz"); const u16 gTilesetPalettes_General[][16] = @@ -1483,7 +1483,7 @@ const u16 gWallpaperPalettes_Horizontal[][16] = }; const u32 gWallpaperTiles_Horizontal[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/horizontal/tiles.4bpp.lz"); -const u32 gWallpaperTilemap_Horizontal[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/horizontal/tilemap.bin.lz"); +const u32 gWallpaperTilemap_Horizontal[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/horizontal/tilemap.bin.lz"); const u16 gWallpaperPalettes_Ribbon[][16] = { @@ -1492,11 +1492,11 @@ const u16 gWallpaperPalettes_Ribbon[][16] = }; const u32 gWallpaperTiles_Ribbon[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/ribbon/tiles.4bpp.lz"); -const u32 gWallpaperTilemap_Ribbon[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/ribbon/tilemap.bin.lz"); +const u32 gWallpaperTilemap_Ribbon[] = INCBIN_U32("build/assets/graphics/pokemon_storage/wallpapers/ribbon/tilemap.bin.lz"); const u16 gPokenavRibbonsSummaryBg_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/ribbons/summary_bg.gbapal"); const u32 gPokenavRibbonsSummaryBg_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/ribbons/summary_bg.4bpp.lz"); -const u32 gPokenavRibbonsSummaryBg_Tilemap[] = INCBIN_U32("graphics/pokenav/ribbons/summary_bg.bin.lz"); +const u32 gPokenavRibbonsSummaryBg_Tilemap[] = INCBIN_U32("build/assets/graphics/pokenav/ribbons/summary_bg.bin.lz"); const u16 gMonIconPalettes[][16] = { @@ -1508,24 +1508,24 @@ const u16 gMonIconPalettes[][16] = const u16 gTitleScreenBgPalettes[] = INCBIN_U16("build/assets/graphics/title_screen/pokemon_logo.gbapal", "build/assets/graphics/title_screen/rayquaza_and_clouds.gbapal"); const u16 gTitleScreenEmeraldVersionPal[] = INCBIN_U16("build/assets/graphics/title_screen/emerald_version.gbapal"); -const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/clouds.bin.lz"); +const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("build/assets/graphics/title_screen/clouds.bin.lz"); const u32 gTitleScreenPokemonLogoGfx[] = INCBIN_U32("build/assets/graphics/title_screen/pokemon_logo.8bpp.lz"); const u32 gTitleScreenEmeraldVersionGfx[] = INCBIN_U32("build/assets/graphics/title_screen/emerald_version.8bpp.lz"); const u16 gTitleScreenPressStartPal[] = INCBIN_U16("build/assets/graphics/title_screen/press_start.gbapal"); const u32 gTitleScreenPressStartGfx[] = INCBIN_U32("build/assets/graphics/title_screen/press_start.4bpp.lz"); -const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/pokemon_logo.bin.lz"); +const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("build/assets/graphics/title_screen/pokemon_logo.bin.lz"); const u16 gFrontierPassBg_Pal[] = INCBIN_U16("build/assets/graphics/frontier_pass/bg.gbapal"); // 8 x 16 const u32 gFrontierPassBg_Gfx[] = INCBIN_U32("build/assets/graphics/frontier_pass/bg.4bpp.lz"); const u32 gFrontierPassMapAndCard_Gfx[] = INCBIN_U32("build/assets/graphics/frontier_pass/map_and_card.8bpp.lz"); -const u32 gFrontierPassBg_Tilemap[] = INCBIN_U32("graphics/frontier_pass/bg.bin.lz"); +const u32 gFrontierPassBg_Tilemap[] = INCBIN_U32("build/assets/graphics/frontier_pass/bg.bin.lz"); const u16 gFrontierPassCancelButton_Tilemap[] = INCBIN_U16("graphics/frontier_pass/cancel.bin"); const u16 gFrontierPassCancelButtonHighlighted_Tilemap[] = INCBIN_U16("graphics/frontier_pass/cancel_highlighted.bin"); // Berry Crush const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("build/assets/graphics/berry_crush/crusher.gbapal"); const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("build/assets/graphics/berry_crush/crusher.4bpp.lz"); -const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/text_windows.bin.lz"); +const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("build/assets/graphics/berry_crush/text_windows.bin.lz"); // random garbage at the end. static const u8 sEmpty3[0x54BAC] = {0}; diff --git a/src/intro.c b/src/intro.c index 9cd1f679b5ee..f871e0f6520e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -179,17 +179,17 @@ static const u16 sIntroDrops_Pal[] = INCBIN_U16("build/assets/graphic static const u16 sIntroLogo_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_1/logo.gbapal"); static const u32 sIntroDropsLogo_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_1/drops_logo.4bpp.lz"); static const u16 sIntro1Bg_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_1/bg.gbapal"); // 16 x 16 -static const u32 sIntro1Bg0_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg0_map.bin.lz"); -static const u32 sIntro1Bg1_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg1_map.bin.lz"); -static const u32 sIntro1Bg2_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg2_map.bin.lz"); -static const u32 sIntro1Bg3_Tilemap[] = INCBIN_U32("graphics/intro/scene_1/bg3_map.bin.lz"); +static const u32 sIntro1Bg0_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_1/bg0_map.bin.lz"); +static const u32 sIntro1Bg1_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_1/bg1_map.bin.lz"); +static const u32 sIntro1Bg2_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_1/bg2_map.bin.lz"); +static const u32 sIntro1Bg3_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_1/bg3_map.bin.lz"); static const u32 sIntro1Bg_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_1/bg.4bpp.lz"); static const u16 sIntroPokeball_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_3/pokeball.gbapal"); -static const u32 sIntroPokeball_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/pokeball_map.bin.lz"); +static const u32 sIntroPokeball_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/pokeball_map.bin.lz"); static const u32 sIntroPokeball_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/pokeball.8bpp.lz"); static const u16 sIntroStreaks_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_3/streaks.gbapal"); // Unused static const u32 sIntroStreaks_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/streaks.4bpp.lz"); // Unused -static const u32 sIntroStreaks_Tilemap[] = INCBIN_U32("graphics/intro/scene_3/streaks_map.bin.lz"); // Unused +static const u32 sIntroStreaks_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_3/streaks_map.bin.lz"); // Unused static const u16 sIntroRayquzaOrb_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_3/rayquaza_orb.gbapal"); static const u16 sIntroMisc_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_3/misc.gbapal"); // Unused static const u32 sIntroMisc_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_3/misc.4bpp.lz"); // Rayquza orb, and misc unused gfx diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index f79ea9734dc4..7afdfebb85d0 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -41,24 +41,24 @@ static const u16 sGrass_Pal[] = INCBIN_U16("build/assets/graphics/in static const u16 sGrassSunset_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/grass_sunset.gbapal"); static const u16 sGrassNight_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/grass_night.gbapal"); static const u32 sGrass_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/grass.4bpp.lz"); -static const u32 sGrass_Tilemap[] = INCBIN_U32("graphics/intro/scene_2/grass_map.bin.lz"); +static const u32 sGrass_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_2/grass_map.bin.lz"); static const u16 sCloudsBg_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/clouds_bg.gbapal"); static const u16 sCloudsBgSunset_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/clouds_bg_sunset.gbapal"); static const u32 sCloudsBg_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/clouds_bg.4bpp.lz"); -static const u32 sCloudsBg_Tilemap[] = INCBIN_U32("graphics/intro/scene_2/clouds_bg_map.bin.lz"); +static const u32 sCloudsBg_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_2/clouds_bg_map.bin.lz"); static const u16 sClouds_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/clouds.gbapal"); static const u16 sCloudsSunset_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/clouds_sunset.gbapal"); static const u32 sClouds_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/clouds.4bpp.lz"); static const u16 sTrees_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/trees.gbapal"); static const u16 sTreesSunset_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/trees_sunset.gbapal"); static const u32 sTrees_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/trees.4bpp.lz"); -static const u32 sTrees_Tilemap[] = INCBIN_U32("graphics/intro/scene_2/trees_map.bin.lz"); +static const u32 sTrees_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_2/trees_map.bin.lz"); static const u16 sTreesSmall_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/trees_small.gbapal"); static const u32 sTreesSmall_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/trees_small.4bpp.lz"); static const u16 sHouses_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/houses.gbapal"); static const u32 sHouses_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/houses.4bpp.lz"); static const u16 sHouseSilhouette_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/house_silhouette.gbapal"); -static const u32 sHouses_Tilemap[] = INCBIN_U32("graphics/intro/scene_2/houses_map.bin.lz"); +static const u32 sHouses_Tilemap[] = INCBIN_U32("build/assets/graphics/intro/scene_2/houses_map.bin.lz"); static const u32 sHouseSilhouette_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/house_silhouette.4bpp.lz"); static const u16 sBrendanCredits_Pal[] = INCBIN_U16("build/assets/graphics/intro/scene_2/brendan_credits.gbapal"); static const u32 sBrendanCredits_Gfx[] = INCBIN_U32("build/assets/graphics/intro/scene_2/brendan_credits.4bpp.lz"); diff --git a/src/link.c b/src/link.c index b288682aff7a..42e6c5006d43 100644 --- a/src/link.c +++ b/src/link.c @@ -167,7 +167,7 @@ static void SendRecvDone(void); static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("build/assets/graphics/link/wireless_display.gbapal"); static const u32 sWirelessLinkDisplayGfx[] = INCBIN_U32("build/assets/graphics/link/wireless_display.4bpp.lz"); -static const u32 sWirelessLinkDisplayTilemap[] = INCBIN_U32("graphics/link/wireless_display.bin.lz"); +static const u32 sWirelessLinkDisplayTilemap[] = INCBIN_U32("build/assets/graphics/link/wireless_display.bin.lz"); static const u16 sLinkTestDigitsPal[] = INCBIN_U16("build/assets/graphics/link/test_digits.gbapal"); static const u16 sLinkTestDigitsGfx[] = INCBIN_U16("build/assets/graphics/link/test_digits.4bpp"); static const u8 sUnusedTransparentWhite[] = _("{HIGHLIGHT TRANSPARENT}{COLOR WHITE}"); diff --git a/src/main_menu.c b/src/main_menu.c index 9d9fed162e6b..387f7cbdd3d1 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -253,7 +253,7 @@ static const u16 sBirchSpeechBgPals[][16] = { }; static const u32 sBirchSpeechShadowGfx[] = INCBIN_U32("build/assets/graphics/birch_speech/shadow.4bpp.lz"); -static const u32 sBirchSpeechBgMap[] = INCBIN_U32("graphics/birch_speech/map.bin.lz"); +static const u32 sBirchSpeechBgMap[] = INCBIN_U32("build/assets/graphics/birch_speech/map.bin.lz"); static const u16 sBirchSpeechBgGradientPal[] = INCBIN_U16("build/assets/graphics/birch_speech/bg2.gbapal"); static const u16 sBirchSpeechPlatformBlackPal[] = {RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK, RGB_BLACK}; diff --git a/src/mystery_gift_view.c b/src/mystery_gift_view.c index 15f484ddb106..49d170ae82fe 100644 --- a/src/mystery_gift_view.c +++ b/src/mystery_gift_view.c @@ -128,15 +128,15 @@ static const u16 sWonderCardBgPal6[] = INCBIN_U16("build/assets/graphics/won static const u16 sWonderCardBgPal7[] = INCBIN_U16("build/assets/graphics/wonder_card/bg7.gbapal"); static const u16 sWonderCardBgPal8[] = INCBIN_U16("build/assets/graphics/wonder_card/bg8.gbapal"); static const u32 sWonderCardBgGfx1[] = INCBIN_U32("build/assets/graphics/wonder_card/bg1.4bpp.lz"); -static const u32 sWonderCardBgTilemap1[] = INCBIN_U32("graphics/wonder_card/bg1.bin.lz"); +static const u32 sWonderCardBgTilemap1[] = INCBIN_U32("build/assets/graphics/wonder_card/bg1.bin.lz"); static const u32 sWonderCardBgGfx2[] = INCBIN_U32("build/assets/graphics/wonder_card/bg2.4bpp.lz"); -static const u32 sWonderCardBgTilemap2[] = INCBIN_U32("graphics/wonder_card/bg2.bin.lz"); +static const u32 sWonderCardBgTilemap2[] = INCBIN_U32("build/assets/graphics/wonder_card/bg2.bin.lz"); static const u32 sWonderCardBgGfx3[] = INCBIN_U32("build/assets/graphics/wonder_card/bg3.4bpp.lz"); -static const u32 sWonderCardBgTilemap3[] = INCBIN_U32("graphics/wonder_card/bg3.bin.lz"); +static const u32 sWonderCardBgTilemap3[] = INCBIN_U32("build/assets/graphics/wonder_card/bg3.bin.lz"); static const u32 sWonderCardBgGfx7[] = INCBIN_U32("build/assets/graphics/wonder_card/bg7.4bpp.lz"); -static const u32 sWonderCardBgTilemap7[] = INCBIN_U32("graphics/wonder_card/bg7.bin.lz"); +static const u32 sWonderCardBgTilemap7[] = INCBIN_U32("build/assets/graphics/wonder_card/bg7.bin.lz"); static const u32 sWonderCardBgGfx8[] = INCBIN_U32("build/assets/graphics/wonder_card/bg8.4bpp.lz"); -static const u32 sWonderCardBgTilemap8[] = INCBIN_U32("graphics/wonder_card/bg8.bin.lz"); +static const u32 sWonderCardBgTilemap8[] = INCBIN_U32("build/assets/graphics/wonder_card/bg8.bin.lz"); static const u16 sStampShadowPal1[] = INCBIN_U16("build/assets/graphics/wonder_card/stamp_shadow_1.gbapal"); static const u16 sStampShadowPal2[] = INCBIN_U16("build/assets/graphics/wonder_card/stamp_shadow_2.gbapal"); static const u16 sStampShadowPal3[] = INCBIN_U16("build/assets/graphics/wonder_card/stamp_shadow_3.gbapal"); @@ -619,15 +619,15 @@ static const u16 sWonderNewsPal1[] = INCBIN_U16("build/assets/graphics/wonde static const u16 sWonderNewsPal7[] = INCBIN_U16("build/assets/graphics/wonder_news/bg7.gbapal"); static const u16 sWonderNewsPal8[] = INCBIN_U16("build/assets/graphics/wonder_news/bg8.gbapal"); static const u32 sWonderNewsGfx1[] = INCBIN_U32("build/assets/graphics/wonder_news/bg1.4bpp.lz"); -static const u32 sWonderNewsTilemap1[] = INCBIN_U32("graphics/wonder_news/bg1.bin.lz"); +static const u32 sWonderNewsTilemap1[] = INCBIN_U32("build/assets/graphics/wonder_news/bg1.bin.lz"); static const u32 sWonderNewsGfx2[] = INCBIN_U32("build/assets/graphics/wonder_news/bg2.4bpp.lz"); -static const u32 sWonderNewsTilemap2[] = INCBIN_U32("graphics/wonder_news/bg2.bin.lz"); +static const u32 sWonderNewsTilemap2[] = INCBIN_U32("build/assets/graphics/wonder_news/bg2.bin.lz"); static const u32 sWonderNewsGfx3[] = INCBIN_U32("build/assets/graphics/wonder_news/bg3.4bpp.lz"); -static const u32 sWonderNewsTilemap3[] = INCBIN_U32("graphics/wonder_news/bg3.bin.lz"); +static const u32 sWonderNewsTilemap3[] = INCBIN_U32("build/assets/graphics/wonder_news/bg3.bin.lz"); static const u32 sWonderNewsGfx7[] = INCBIN_U32("build/assets/graphics/wonder_news/bg7.4bpp.lz"); -static const u32 sWonderNewsTilemap7[] = INCBIN_U32("graphics/wonder_news/bg7.bin.lz"); +static const u32 sWonderNewsTilemap7[] = INCBIN_U32("build/assets/graphics/wonder_news/bg7.bin.lz"); static const u32 sWonderNewsGfx8[] = INCBIN_U32("build/assets/graphics/wonder_news/bg8.4bpp.lz"); -static const u32 sWonderNewsTilemap8[] = INCBIN_U32("graphics/wonder_news/bg8.bin.lz"); +static const u32 sWonderNewsTilemap8[] = INCBIN_U32("build/assets/graphics/wonder_news/bg8.bin.lz"); static const struct WonderGraphics sNewsGraphics[NUM_WONDER_BGS] = { {.titleTextPal = 1, .bodyTextPal = 0, .tiles = sWonderNewsGfx1, .map = sWonderNewsTilemap1, .pal = sWonderNewsPal1}, diff --git a/src/pokedex_area_region_map.c b/src/pokedex_area_region_map.c index 196f1e2e6550..e70a0985504e 100644 --- a/src/pokedex_area_region_map.c +++ b/src/pokedex_area_region_map.c @@ -10,9 +10,9 @@ static EWRAM_DATA u8 *sPokedexAreaMapBgNum = NULL; static const u16 ALIGNED(4) sPokedexAreaMap_Pal[] = INCBIN_U16("build/assets/graphics/pokedex/region_map.gbapal"); static const u32 sPokedexAreaMap_Gfx[] = INCBIN_U32("build/assets/graphics/pokedex/region_map.8bpp.lz"); -static const u32 sPokedexAreaMap_Tilemap[] = INCBIN_U32("graphics/pokedex/region_map.bin.lz"); +static const u32 sPokedexAreaMap_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/region_map.bin.lz"); static const u32 sPokedexAreaMapAffine_Gfx[] = INCBIN_U32("build/assets/graphics/pokedex/region_map_affine.8bpp.lz"); -static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("graphics/pokedex/region_map_affine.bin.lz"); +static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("build/assets/graphics/pokedex/region_map_affine.bin.lz"); void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template) { diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index f35115a58453..23a98bcca403 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3047,15 +3047,15 @@ static const u16 sInterface_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_ju static const u16 sBg_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_jump/bg.gbapal"); static const u32 sBg_Gfx[] = INCBIN_U32("build/assets/graphics/pokemon_jump/bg.4bpp.lz"); -static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/bg.bin.lz"); +static const u32 sBg_Tilemap[] = INCBIN_U32("build/assets/graphics/pokemon_jump/bg.bin.lz"); static const u16 sVenusaur_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_jump/venusaur.gbapal"); static const u32 sVenusaur_Gfx[] = INCBIN_U32("build/assets/graphics/pokemon_jump/venusaur.4bpp.lz"); -static const u32 sVenusaur_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/venusaur.bin.lz"); +static const u32 sVenusaur_Tilemap[] = INCBIN_U32("build/assets/graphics/pokemon_jump/venusaur.bin.lz"); static const u16 sBonuses_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_jump/bonuses.gbapal"); static const u32 sBonuses_Gfx[] = INCBIN_U32("build/assets/graphics/pokemon_jump/bonuses.4bpp.lz"); -static const u32 sBonuses_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/bonuses.bin.lz"); +static const u32 sBonuses_Tilemap[] = INCBIN_U32("build/assets/graphics/pokemon_jump/bonuses.bin.lz"); static const struct BgTemplate sBgTemplates[] = { diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 74645e50ba92..b518d672962c 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -949,9 +949,9 @@ static const u16 sChooseBoxMenu_Pal[] = INCBIN_U16("build/assets/graphics static const u8 sChooseBoxMenuCenter_Gfx[] = INCBIN_U8("build/assets/graphics/pokemon_storage/box_selection_popup_center.4bpp"); static const u8 sChooseBoxMenuSides_Gfx[] = INCBIN_U8("build/assets/graphics/pokemon_storage/box_selection_popup_sides.4bpp"); static const u32 sScrollingBg_Gfx[] = INCBIN_U32("build/assets/graphics/pokemon_storage/scrolling_bg.4bpp.lz"); -static const u32 sScrollingBg_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.bin.lz"); +static const u32 sScrollingBg_Tilemap[] = INCBIN_U32("build/assets/graphics/pokemon_storage/scrolling_bg.bin.lz"); static const u16 sDisplayMenu_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_storage/display_menu.gbapal"); // Unused -static const u32 sDisplayMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/display_menu.bin.lz"); +static const u32 sDisplayMenu_Tilemap[] = INCBIN_U32("build/assets/graphics/pokemon_storage/display_menu.bin.lz"); static const u16 sPkmnData_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/pkmn_data.bin"); // sInterface_Pal - parts of the display frame, "PkmnData"'s normal color, Close Box static const u16 sInterface_Pal[] = INCBIN_U16("build/assets/graphics/pokemon_storage/interface.gbapal"); diff --git a/src/pokenav_conditions_gfx.c b/src/pokenav_conditions_gfx.c index 7ed72b377d7c..c3d7d9dbb969 100644 --- a/src/pokenav_conditions_gfx.c +++ b/src/pokenav_conditions_gfx.c @@ -27,7 +27,7 @@ static u8 sInitialLoadId; // Never read const u16 gConditionGraphData_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/condition/graph_data.gbapal"); const u16 gConditionText_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/condition/text.gbapal"); static const u32 sConditionGraphData_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/condition/graph_data.4bpp.lz"); -static const u32 sConditionGraphData_Tilemap[] = INCBIN_U32("graphics/pokenav/condition/graph_data.bin.lz"); +static const u32 sConditionGraphData_Tilemap[] = INCBIN_U32("build/assets/graphics/pokenav/condition/graph_data.bin.lz"); static const u16 sMonMarkings_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/condition/mon_markings.gbapal"); static const struct BgTemplate sMenuBgTemplates[3] = diff --git a/src/pokenav_conditions_search_results.c b/src/pokenav_conditions_search_results.c index 296101d73fa7..6e3bf58b06d8 100644 --- a/src/pokenav_conditions_search_results.c +++ b/src/pokenav_conditions_search_results.c @@ -79,7 +79,7 @@ static const LoopedTask sConditionSearchLoopedTaskFuncs[] = static const u16 sConditionSearchResultFramePal[] = INCBIN_U16("build/assets/graphics/pokenav/condition/search_results.gbapal"); static const u32 sConditionSearchResultTiles[] = INCBIN_U32("build/assets/graphics/pokenav/condition/search_results.4bpp.lz"); -static const u32 sConditionSearchResultTilemap[] = INCBIN_U32("graphics/pokenav/condition/search_results.bin.lz"); +static const u32 sConditionSearchResultTilemap[] = INCBIN_U32("build/assets/graphics/pokenav/condition/search_results.bin.lz"); static const u16 sListBg_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/condition/search_results_list.gbapal"); static const struct BgTemplate sConditionSearchResultBgTemplates[] = diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index 198f67267667..b4818c808f2c 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -116,7 +116,7 @@ static u32 ExitMatchCall(s32); static const u16 sMatchCallUI_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/match_call/ui.gbapal"); static const u32 sMatchCallUI_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/match_call/ui.4bpp.lz"); -static const u32 sMatchCallUI_Tilemap[] = INCBIN_U32("graphics/pokenav/match_call/ui.bin.lz"); +static const u32 sMatchCallUI_Tilemap[] = INCBIN_U32("build/assets/graphics/pokenav/match_call/ui.bin.lz"); static const u16 sOptionsCursor_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/match_call/options_cursor.gbapal"); static const u32 sOptionsCursor_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/match_call/options_cursor.4bpp.lz"); static const u16 sCallWindow_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/match_call/call_window.gbapal"); diff --git a/src/pokenav_menu_handler_gfx.c b/src/pokenav_menu_handler_gfx.c index 50d7919b2598..821c66ffeb81 100644 --- a/src/pokenav_menu_handler_gfx.c +++ b/src/pokenav_menu_handler_gfx.c @@ -101,10 +101,10 @@ static void SetMenuOptionGlow(void); static const u16 sPokenavBgDotsPal[] = INCBIN_U16("build/assets/graphics/pokenav/bg_dots.gbapal"); static const u32 sPokenavBgDotsTiles[] = INCBIN_U32("build/assets/graphics/pokenav/bg_dots.4bpp.lz"); -static const u32 sPokenavBgDotsTilemap[] = INCBIN_U32("graphics/pokenav/bg_dots.bin.lz"); +static const u32 sPokenavBgDotsTilemap[] = INCBIN_U32("build/assets/graphics/pokenav/bg_dots.bin.lz"); static const u16 sPokenavDeviceBgPal[] = INCBIN_U16("build/assets/graphics/pokenav/device_outline.gbapal"); static const u32 sPokenavDeviceBgTiles[] = INCBIN_U32("build/assets/graphics/pokenav/device_outline.4bpp.lz"); -static const u32 sPokenavDeviceBgTilemap[] = INCBIN_U32("graphics/pokenav/device_outline_map.bin.lz"); +static const u32 sPokenavDeviceBgTilemap[] = INCBIN_U32("build/assets/graphics/pokenav/device_outline_map.bin.lz"); static const u16 sMatchCallBlueLightPal[] = INCBIN_U16("build/assets/graphics/pokenav/blue_light.gbapal"); static const u32 sMatchCallBlueLightTiles[] = INCBIN_U32("build/assets/graphics/pokenav/blue_light.4bpp.lz"); diff --git a/src/pokenav_ribbons_list.c b/src/pokenav_ribbons_list.c index 7846a03e4af8..034126b42ca2 100644 --- a/src/pokenav_ribbons_list.c +++ b/src/pokenav_ribbons_list.c @@ -74,7 +74,7 @@ static const LoopedTask sMonRibbonListLoopTaskFuncs[] = static const u16 sMonRibbonListFramePal[] = INCBIN_U16("build/assets/graphics/pokenav/ribbons/list_bg.gbapal"); static const u32 sMonRibbonListFrameTiles[] = INCBIN_U32("build/assets/graphics/pokenav/ribbons/list_bg.4bpp.lz"); -static const u32 sMonRibbonListFrameTilemap[] = INCBIN_U32("graphics/pokenav/ribbons/list_bg.bin.lz"); +static const u32 sMonRibbonListFrameTilemap[] = INCBIN_U32("build/assets/graphics/pokenav/ribbons/list_bg.bin.lz"); static const u16 sMonRibbonListUi_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/ribbons/list_ui.gbapal"); static const struct BgTemplate sMonRibbonListBgTemplates[] = diff --git a/src/region_map.c b/src/region_map.c index 1b68a6922fbc..fbcade8b4817 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -121,7 +121,7 @@ static const u32 sRegionMapCursorSmallGfxLZ[] = INCBIN_U32("build/assets/graphic static const u32 sRegionMapCursorLargeGfxLZ[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/cursor_large.4bpp.lz"); static const u16 sRegionMapBg_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/region_map/map.gbapal"); static const u32 sRegionMapBg_GfxLZ[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/map.8bpp.lz"); -static const u32 sRegionMapBg_TilemapLZ[] = INCBIN_U32("graphics/pokenav/region_map/map.bin.lz"); +static const u32 sRegionMapBg_TilemapLZ[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/map.bin.lz"); static const u16 sRegionMapPlayerIcon_BrendanPal[] = INCBIN_U16("build/assets/graphics/pokenav/region_map/brendan_icon.gbapal"); static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("build/assets/graphics/pokenav/region_map/brendan_icon.4bpp"); static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("build/assets/graphics/pokenav/region_map/may_icon.gbapal"); @@ -282,7 +282,7 @@ static const u8 sMapSecIdsOffMap[] = static const u16 sRegionMapFramePal[] = INCBIN_U16("build/assets/graphics/pokenav/region_map/frame.gbapal"); static const u32 sRegionMapFrameGfxLZ[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/frame.4bpp.lz"); -static const u32 sRegionMapFrameTilemapLZ[] = INCBIN_U32("graphics/pokenav/region_map/frame.bin.lz"); +static const u32 sRegionMapFrameTilemapLZ[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/frame.bin.lz"); static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("build/assets/graphics/pokenav/region_map/fly_target_icons.gbapal"); static const u32 sFlyTargetIcons_Gfx[] = INCBIN_U32("build/assets/graphics/pokenav/region_map/fly_target_icons.4bpp.lz"); diff --git a/src/roulette.c b/src/roulette.c index bbfead6de5c3..377291ab502f 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -417,8 +417,8 @@ static void SpriteCB_Shroomish(struct Sprite *); static void SpriteCB_Taillow(struct Sprite *); static const u16 sWheel_Pal[] = INCBIN_U16("build/assets/graphics/roulette/wheel.gbapal"); // also palette for grid -static const u32 sGrid_Tilemap[] = INCBIN_U32("graphics/roulette/grid.bin.lz"); -static const u32 sWheel_Tilemap[] = INCBIN_U32("graphics/roulette/wheel.bin.lz"); +static const u32 sGrid_Tilemap[] = INCBIN_U32("build/assets/graphics/roulette/grid.bin.lz"); +static const u32 sWheel_Tilemap[] = INCBIN_U32("build/assets/graphics/roulette/wheel.bin.lz"); static const struct BgTemplate sBgTemplates[] = { // Text box diff --git a/src/starter_choose.c b/src/starter_choose.c index 1b55015c4912..2a54cfa244fa 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -54,8 +54,8 @@ static u16 sStarterLabelWindowId; const u16 gBirchBagGrass_Pal[] = INCBIN_U16("build/assets/graphics/starter_choose/tiles.gbapal"); static const u16 sPokeballSelection_Pal[] = INCBIN_U16("build/assets/graphics/starter_choose/pokeball_selection.gbapal"); static const u16 sStarterCircle_Pal[] = INCBIN_U16("build/assets/graphics/starter_choose/starter_circle.gbapal"); -const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/starter_choose/birch_bag.bin.lz"); -const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/starter_choose/birch_grass.bin.lz"); +const u32 gBirchBagTilemap[] = INCBIN_U32("build/assets/graphics/starter_choose/birch_bag.bin.lz"); +const u32 gBirchGrassTilemap[] = INCBIN_U32("build/assets/graphics/starter_choose/birch_grass.bin.lz"); const u32 gBirchBagGrass_Gfx[] = INCBIN_U32("build/assets/graphics/starter_choose/tiles.4bpp.lz"); const u32 gPokeballSelection_Gfx[] = INCBIN_U32("build/assets/graphics/starter_choose/pokeball_selection.4bpp.lz"); static const u32 sStarterCircle_Gfx[] = INCBIN_U32("build/assets/graphics/starter_choose/starter_circle.4bpp.lz"); diff --git a/src/title_screen.c b/src/title_screen.c index 331cd8fefd3a..e8d4e082c42a 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -61,7 +61,7 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite); static const u16 sUnusedUnknownPal[] = INCBIN_U16("build/assets/graphics/title_screen/unused.gbapal"); static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("build/assets/graphics/title_screen/rayquaza.4bpp.lz"); -static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz"); +static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("build/assets/graphics/title_screen/rayquaza.bin.lz"); static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("build/assets/graphics/title_screen/logo_shine.4bpp.lz"); static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("build/assets/graphics/title_screen/clouds.4bpp.lz"); diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 1858d673a79d..4ee059a6b586 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -173,8 +173,8 @@ static EWRAM_DATA struct UsePokeblockMenu *sMenu = NULL; static const u32 sMonFrame_Pal[] = INCBIN_U32("graphics/pokeblock/use_screen/mon_frame_pal.bin"); static const u32 sMonFrame_Gfx[] = INCBIN_U32("build/assets/graphics/pokeblock/use_screen/mon_frame.4bpp"); -static const u32 sMonFrame_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/mon_frame.bin.lz"); -static const u32 sGraphData_Tilemap[] = INCBIN_U32("graphics/pokeblock/use_screen/graph_data.bin.lz"); +static const u32 sMonFrame_Tilemap[] = INCBIN_U32("build/assets/graphics/pokeblock/use_screen/mon_frame.bin.lz"); +static const u32 sGraphData_Tilemap[] = INCBIN_U32("build/assets/graphics/pokeblock/use_screen/graph_data.bin.lz"); // The condition/flavors aren't listed in their normal order in this file, they're listed as shown on the graph going counter-clockwise // Normally they would go Cool/Spicy, Beauty/Dry, Cute/Sweet, Smart/Bitter, Tough/Sour (also graph order, but clockwise) diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 52c789820d88..5675ad682e7e 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -80,7 +80,7 @@ static const u16 sPalettes[][16] = { INCBIN_U16("build/assets/graphics/wireless_status_screen/anim_13.gbapal") }; static const u32 sBgTiles_Gfx[] = INCBIN_U32("build/assets/graphics/wireless_status_screen/bg.4bpp.lz"); -static const u32 sBgTiles_Tilemap[] = INCBIN_U32("graphics/wireless_status_screen/bg.bin.lz"); +static const u32 sBgTiles_Tilemap[] = INCBIN_U32("build/assets/graphics/wireless_status_screen/bg.bin.lz"); static const struct BgTemplate sBgTemplates[] = { {