From 72564da723fa46e93d41dc5ca55525cfc0d04cbf Mon Sep 17 00:00:00 2001 From: CharlesVanEeckhout Date: Tue, 24 Mar 2026 11:27:13 -0400 Subject: [PATCH 1/3] matching preproc script --- Makefile | 5 +- src/bg_clip.c | 1812 ++++++++--------- src/init_game.c | 150 +- src/soft_reset.c | 772 ++++---- src/soft_reset_input.c | 230 +-- src/sprite.c | 4234 ++++++++++++++++++++-------------------- tools/preproc.py | 269 +++ 7 files changed, 3872 insertions(+), 3600 deletions(-) create mode 100644 tools/preproc.py diff --git a/Makefile b/Makefile index 887604747..f3d14e914 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,9 @@ include make_tools.mk GBAFIX = $(TOOLS_DIR)/gbafix/gbafix PYTHON = python3 EXTRACTOR = $(PYTHON) $(TOOLS_DIR)/extractor.py -PREPROC = $(TOOLS_DIR)/preproc/preproc +PREPROC1 = $(TOOLS_DIR)/preproc/preproc +PREPROC2 = $(PYTHON) $(TOOLS_DIR)/preproc.py +PREPROC = $(PREPROC2) # Flags ASFLAGS += -mcpu=arm7tdmi @@ -246,6 +248,7 @@ $(LD_SCRIPT): linker.ld %.s: %.c $(MSG) CC $@ + bash -c 'diff --color <($(PREPROC1) $< $(PREPROCFLAGS)) <($(PREPROC2) $< $(PREPROCFLAGS))' $Q$(PREPROC) $< $(PREPROCFLAGS) | $(CPP) $(CPPFLAGS) | $(CC) -o $@ $(CFLAGS) && printf '\t.align 2, 0 @ dont insert nops\n' >> $@ src/dma.s: CFLAGS = -Werror -O1 -mthumb-interwork -fhex-asm -f2003-patch diff --git a/src/bg_clip.c b/src/bg_clip.c index b0c97bb91..fb5096df0 100644 --- a/src/bg_clip.c +++ b/src/bg_clip.c @@ -1,906 +1,906 @@ -#include "gba.h" -#include "bg_clip.h" -#include "block.h" -#include "minimap.h" -#include "connection.h" -#include "macros.h" - -#include "data/block_data.h" - -#include "constants/block.h" -#include "constants/connection.h" -#include "constants/clipdata.h" -#include "constants/game_state.h" -#include "constants/samus.h" -#include "constants/sprite.h" -#include "constants/text.h" - -#include "structs/bg_clip.h" -#include "structs/clipdata.h" -#include "structs/connection.h" -#include "structs/transparency.h" -#include "structs/game_state.h" -#include "structs/samus.h" - -/** - * @brief 5a484 | d8 | Sets the value for a BG block - * - * @param bg Background - * @param value Value - * @param yPosition Y position - * @param xPosition X position - */ -void BgClipSetBgBlockValue(u8 bg, u16 value, u16 yPosition, u16 xPosition) -{ - u16* dst; - u16 offset; - - // Write value - SET_BG_BLOCK(bg, value, xPosition, yPosition); - - // Check is on screen, no need to update the tilemap if off screen, that can be delegated to the room tilemap update functions - offset = SUB_PIXEL_TO_BLOCK(gBg1YPosition); - if (offset - 4 > yPosition) - return; - - if (yPosition > offset + 13) - return; - - offset = SUB_PIXEL_TO_BLOCK(gBg1XPosition); - if (offset - 4 > xPosition) - return; - - if (xPosition > offset + 18) - return; - - // Update tilemap - dst = (u16*)(VRAM_BASE + bg * 0x1000); - if (xPosition & 0x10) - dst = (u16*)(VRAM_BASE + 0x800 + bg * 0x1000); - - dst += MOD_AND(yPosition, 16) * 64 + MOD_AND(xPosition, 16) * 2; - - offset = value * 4; - - dst[0] = gTilemapAndClipPointers.pTilemap[offset++]; - dst[1] = gTilemapAndClipPointers.pTilemap[offset++]; - dst[32] = gTilemapAndClipPointers.pTilemap[offset++]; - dst[33] = gTilemapAndClipPointers.pTilemap[offset]; -} - -/** - * @brief 5a55c | cc | Sets the value for a BG1 block - * - * @param value Value - * @param yPosition Y position - * @param xPosition X position - */ -void BgClipSetBg1BlockValue(u16 value, u16 yPosition, u16 xPosition) -{ - u16* dst; - u16 offset; - - // Write value - SET_BG_BLOCK(1, value, xPosition, yPosition); - - // Check is on screen, no need to update the tilemap if off screen, that can be delegated to the room tilemap update functions - offset = SUB_PIXEL_TO_BLOCK(gBg1YPosition); - if (offset - 4 > yPosition) - return; - - if (yPosition > offset + 13) - return; - - offset = SUB_PIXEL_TO_BLOCK(gBg1XPosition); - if (offset - 4 > xPosition) - return; - - if (xPosition > offset + 18) - return; - - // Update tilemap - dst = (u16*)(VRAM_BASE + 0x1000); - if (xPosition & 0x10) - dst = (u16*)(VRAM_BASE + 0x1800); - - dst += MOD_AND(yPosition, 16) * 64 + MOD_AND(xPosition, 16) * 2; - - offset = value * 4; - - dst[0] = gTilemapAndClipPointers.pTilemap[offset++]; - dst[1] = gTilemapAndClipPointers.pTilemap[offset++]; - dst[32] = gTilemapAndClipPointers.pTilemap[offset++]; - dst[33] = gTilemapAndClipPointers.pTilemap[offset]; -} - -/** - * @brief 5a628 | 24 | Sets the raw value of a BG1 block - * - * @param value Block value - * @param yPosition Y Position - * @param xPosition X Position - */ -void BgClipSetRawBg1BlockValue(u32 value, u16 yPosition, u16 xPosition) -{ - SET_BG_BLOCK_(1, value, xPosition, yPosition); -} - -/** - * @brief 5a64c | 24 | Sets the value of a clipdata block - * - * @param value Block value - * @param yPosition Y Position - * @param xPosition X Position - */ -void BgClipSetClipdataBlockValue(u16 value, u16 yPosition, u16 xPosition) -{ - SET_CLIP_BLOCK_(value, xPosition, yPosition); -} - -/** - * @brief 5a670 | 58 | Calls other functions related to checking special clipdata - * - */ -void BgClipCheckTouchingSpecialClipdata(void) -{ - // Why always check for a crumble grab? - BgClipCheckGrabbingCrumbleBlock(FALSE); - - if (gSamusData.pose == SPOSE_USING_AN_ELEVATOR) - { - // Only check for transition on elevator - BgClipCheckTouchingTransitionOnElevator(); - return; - } - - if (gDisableDoorAndTanks) - return; - - if (MOD_AND(gFrameCounter8Bit, 2)) - { - // Check every 2 frames to reduce lag - BgClipCheckTouchingTransitionOrTank(); - } - else if (!gDisableClipdataChangingTransparency) - { - // Check every 2 frames to reduce lag (and if enabled) - BgClipApplyClipdataChangingTransparency(); - } - - BgClipCheckWalkingOnCrumbleBlock(); -} - -/** - * @brief 5a6c8 | a8 | Applies clipdata that changes transparency - * - */ -void BgClipApplyClipdataChangingTransparency(void) -{ - u32 clipdata; - u32 bldalpha; - u32 xPosition; - u32 yPosition; - s32 position; - - // Get X position - position = gSamusData.xPosition; - CLAMP2(position, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); - xPosition = SUB_PIXEL_TO_BLOCK_(position); - - // Get Y position - position = gSamusData.yPosition + (gSamusPhysics.hitboxTop >> 1); - CLAMP2(position, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); - yPosition = SUB_PIXEL_TO_BLOCK_(position); - - // Get clipdata - clipdata = gTilemapAndClipPointers.pClipBehaviors[GET_CLIP_BLOCK(xPosition, yPosition)]; - if (clipdata == CLIP_BEHAVIOR_NONE) - return; - - // Get bldalpha - bldalpha = BgClipGetNewBldalphaValue(clipdata, clipdata); - if (bldalpha == 0) - return; - - // Apply bldalpha - if (bldalpha == USHORT_MAX) - TransparencyUpdateBldalpha(gDefaultTransparency.evaCoef, gDefaultTransparency.evbCoef, 1, 1); - else - TransparencyUpdateBldalpha(LOW_BYTE(bldalpha), HIGH_BYTE(bldalpha), 1, 1); -} - -/** - * @brief 5a770 | 30 | Tries to get a bldalpha value based on a clipdata behavior - * - * @param clip Clipdata behavior - * @param unused Unused parameter - * @return u16 Bldalpha value (eva on first 8 bits, then evb on next 8 bits) - */ -u16 BgClipGetNewBldalphaValue(ClipBehavior clip, u16 unused) -{ - u16 bldalpha; - ClipBehavior clipdata; - - clipdata = BEHAVIOR_TO_BLDALPHA(clip); - - // Check is a bldapha change behavior (trigger transparent, opaque, brighter) - if (clipdata < BEHAVIOR_TO_BLDALPHA(CLIP_BEHAVIOR_BG0_TRIGGER_DEFAULT_TRANSPARENCY)) - { - // Fetch the correct value - bldalpha = sBldalphaValuesForClipdata[BEHAVIOR_TO_BLDALPHA(clip)]; - } - else if (clip == CLIP_BEHAVIOR_BG0_TRIGGER_DEFAULT_TRANSPARENCY) - { - // Request the default transparency to take over - bldalpha = USHORT_MAX; - } - else - { - // Not an appropriate behavior, return nothing - bldalpha = 0; - } - - return bldalpha; -} - -/** - * @brief 5a7a0 | 108 | Checks if samus is walking on a crumble block - * - */ -void BgClipCheckWalkingOnCrumbleBlock(void) -{ - u32 ignoreBlock; - s32 xOffsetLeft; - u16 checkPos; - u16 xPosition; - u16 yPosition; - s32 behavior; - u32 stopSamus; - u16 i; - - // Check falling - if (gSamusData.yVelocity < 0) - behavior = TRUE; - else - behavior = FALSE; - - if (gSamusPhysics.standingStatus == STANDING_NOT_IN_CONTROL) - behavior++; - - if (behavior) - return; - - // Get max position to check for crumble blocks - behavior = gSamusData.xPosition + gSamusPhysics.hitboxRight; - - checkPos = (u32)behavior / BLOCK_SIZE; - if (checkPos > gBgPointersAndDimensions.clipdataWidth) - checkPos = gBgPointersAndDimensions.clipdataWidth; - - // Get positions - behavior = gSamusData.xPosition + gSamusPhysics.hitboxLeft; - if (behavior < 0) - behavior = 0; - - xPosition = (u32)behavior / BLOCK_SIZE; - - behavior = gSamusData.yPosition + gSamusPhysics.hitboxBottom; - yPosition = (u32)(behavior + 2) / BLOCK_SIZE; - - if (yPosition > gBgPointersAndDimensions.clipdataHeight) - yPosition = gBgPointersAndDimensions.clipdataHeight; - - // Loop from current position to the check position - for (i = xPosition; i <= checkPos; i++) - { - // Get clipdata behavior - behavior = gTilemapAndClipPointers.pClipBehaviors[GET_CLIP_BLOCK(i, yPosition)]; - - if (behavior == CLIP_BEHAVIOR_CRUMBLE_BLOCK) - { - // Check if speedboosting to not directly destroy the floor under samus, allows to run over crumble blocks - behavior = FALSE; - if ((gSamusData.pose == SPOSE_RUNNING || gSamusData.pose == SPOSE_ROLLING) && gSamusData.speedboostingShinesparking) - behavior = TRUE; - - // Store block - BlockStoreBrokenReformBlock(BLOCK_TYPE_CRUMBLE, i, yPosition, behavior); - } - else if (behavior == CLIP_BEHAVIOR_SLOW_CRUMBLE_BLOCK) - { - // Store block - if (BlockStoreBrokenReformBlock(BLOCK_TYPE_SLOW_CRUMBLE, i, yPosition, TRUE)) - { - // Set "crumbling" graphics for the block - BgClipSetBg1BlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, i); - BgClipSetClipdataBlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, i); - } - } - } -} - -/** - * @brief 5a8a8 | c4 | Checks if samus is touching a transition during an elevator - * - */ -void BgClipCheckTouchingTransitionOnElevator(void) -{ - u32 goingDown; - s32 position; - u16 xPosition; - u16 yPosition; - s32 onTransition; - u16 behavior; - - // Get direction - if (gSamusData.elevatorDirection ^ KEY_UP) - goingDown = TRUE; - else - goingDown = FALSE; - - // Get X position - position = gSamusData.xPosition; - CLAMP2(position, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); - - xPosition = (u32)position / BLOCK_SIZE; - - // Get Y position - if (!goingDown) - { - position = gSamusData.yPosition + gSamusPhysics.hitboxBottom + BLOCK_SIZE * 2; - } - else - { - position = gSamusData.yPosition + gSamusPhysics.hitboxTop - BLOCK_SIZE * 2; - } - - behavior = position; - if (position < 0) - behavior = 0; - else if (behavior > BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)) - behavior = BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight); - - yPosition = behavior / BLOCK_SIZE; - - // Get clipdata behavior - position = GET_CLIP_BLOCK(xPosition, yPosition); - behavior = gTilemapAndClipPointers.pClipBehaviors[position]; - - // Check is the correct transition type (up if going up, down if going down) - position = FALSE; - if (!goingDown) - { - if (behavior == CLIP_BEHAVIOR_VERTICAL_UP_TRANSITION) - position = TRUE; - } - else - { - if (behavior == CLIP_BEHAVIOR_VERTICAL_DOWN_TRANSITION) - position = TRUE; - } - - if (!position) - return; - - // Check transition - if (!ConnectionCheckAreaConnection(yPosition, xPosition)) - { - ConnectionCheckEnterDoor(yPosition, xPosition); - } -} - -/** - * @brief 5a96c | 420 | Checks if samus is touching a transition or a tank - * - */ -void BgClipCheckTouchingTransitionOrTank(void) -{ - s32 behaviors[4]; // (right, center), (left, center), (center, bottom), (center, top) - s32 yPositions[3]; // center, bottom, top - s32 xPositions[3]; // right, left, center - s32 i; - s32 j; - s32 isFirstTank; - - // Get X positions - // On the right - j = DIV_SHIFT(gSamusPhysics.hitboxRight, 2) + gSamusData.xPosition; - CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); - xPositions[0] = SUB_PIXEL_TO_BLOCK_(j); - - // On the left - j = DIV_SHIFT(gSamusPhysics.hitboxLeft, 2) + gSamusData.xPosition; - CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); - xPositions[1] = SUB_PIXEL_TO_BLOCK_(j); - - // Center - j = gSamusData.xPosition; - CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); - xPositions[2] = SUB_PIXEL_TO_BLOCK_(j); - - // Get Y positions - // Center - j = DIV_SHIFT(gSamusPhysics.hitboxTop, 2) + gSamusData.yPosition; - CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); - yPositions[0] = SUB_PIXEL_TO_BLOCK_(j); - - // Bottom - j = DIV_SHIFT(gSamusPhysics.hitboxTop, 4) + gSamusData.yPosition; - CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); - yPositions[1] = SUB_PIXEL_TO_BLOCK_(j); - - // Top - j = DIV_SHIFT(gSamusPhysics.hitboxTop, 4) + DIV_SHIFT(gSamusPhysics.hitboxTop, 2) + gSamusData.yPosition; - CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); - yPositions[2] = SUB_PIXEL_TO_BLOCK_(j); - - // Get clipdata behaviors on the X axis - for (i = 0; i < ARRAY_SIZE(xPositions) - 1; i++) - { - j = GET_CLIP_BLOCK(xPositions[i], yPositions[0]); - behaviors[i] = gTilemapAndClipPointers.pClipBehaviors[j]; - } - - // Get clipdata behaviors on the y axis - for (i = 0; i < ARRAY_SIZE(yPositions) - 1; i++) - { - j = GET_CLIP_BLOCK(xPositions[2], yPositions[i + 1]); - behaviors[i + 2] = gTilemapAndClipPointers.pClipBehaviors[j]; - } - - // Check if at least one behavior was found - if ((behaviors[0] | behaviors[1] | behaviors[2] | behaviors[3]) == CLIP_BEHAVIOR_NONE) - return; - - // Check for transition clipdata - j = -1; - // If touching a horizontal door from the right - if (behaviors[0] == CLIP_BEHAVIOR_DOOR_TRANSITION) - j = 0; - // If touching a horizontal door from the left - else if (behaviors[1] == CLIP_BEHAVIOR_DOOR_TRANSITION) - j = 1; - // If touching a vertical door from the bottom - else if (behaviors[2] == CLIP_BEHAVIOR_VERTICAL_UP_TRANSITION) - j = 2; - // If touching a vertical door from the top - else if (behaviors[3] == CLIP_BEHAVIOR_VERTICAL_DOWN_TRANSITION) - j = 3; - - // If room transition - if (j + 1 != 0) - { - // Check for door - if (!ConnectionCheckEnterDoor(yPositions[sBlockTouchOffsets[j][0]], xPositions[sBlockTouchOffsets[j][1]])) - { - ConnectionCheckAreaConnection(yPositions[sBlockTouchOffsets[j][0]], xPositions[sBlockTouchOffsets[j][1]]); - } - return; - } - - // Abort if already collecting a tank - if (gCollectingTank) - return; - - isFirstTank = FALSE; - - for (j = ARRAY_SIZE(behaviors) - 1; j >= 0; j--) - { - // No behavior, continue - if (behaviors[j] == 0) - continue; - - // Not a tank behavior, continue - if (BEHAVIOR_TO_TANK(behaviors[j]) > (u32)BEHAVIOR_TO_TANK(CLIP_BEHAVIOR_UNDERWATER_POWER_BOMB_TANK)) - continue; - - // Get item type - i = sTankBehaviors[BEHAVIOR_TO_TANK(behaviors[j])].itemType; - - // Check is an item (hidden tanks not broken aren't tanks yet) - if (i != ITEM_TYPE_NONE) - { - // Check the tile is explored - if (MinimapCheckIsTileExplored(xPositions[sBlockTouchOffsets[j][1]], yPositions[sBlockTouchOffsets[j][0]])) - { - // Set flag and stop samus - gCollectingTank = TRUE; - gPreventMovementTimer = SAMUS_ITEM_PMT; - - // Set last tank collected data - gLastTankCollected.behavior = behaviors[j]; - gLastTankCollected.xPosition = xPositions[sBlockTouchOffsets[j][1]]; - gLastTankCollected.yPosition = yPositions[sBlockTouchOffsets[j][0]]; - - // Apply tank : - // Check not above max (max number of tanks * increase amount + starting) >= current max + increase - // Check if it's not first tank of that type (except for energy) - // Apply increment to max and current - - if (i == ITEM_TYPE_MISSILE) - { - if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].missile * sTankIncreaseAmount[gDifficulty].missile + sStartingHealthAmmo.missile >= gEquipment.maxMissiles + sTankIncreaseAmount[gDifficulty].missile) - { - if (gEquipment.maxMissiles == 0) - isFirstTank = TRUE; - - gEquipment.maxMissiles += sTankIncreaseAmount[gDifficulty].missile; - gEquipment.currentMissiles += sTankIncreaseAmount[gDifficulty].missile; - } - } - else if (i == ITEM_TYPE_ENERGY) - { - if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].energy * sTankIncreaseAmount[gDifficulty].energy + sStartingHealthAmmo.energy >= gEquipment.maxEnergy + sTankIncreaseAmount[gDifficulty].energy) - { - gEquipment.maxEnergy += sTankIncreaseAmount[gDifficulty].energy; - gEquipment.currentEnergy = gEquipment.maxEnergy; - } - } - else if (i == ITEM_TYPE_SUPER_MISSILE) - { - if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].superMissile * sTankIncreaseAmount[gDifficulty].superMissile + sStartingHealthAmmo.superMissile >= gEquipment.maxSuperMissiles + sTankIncreaseAmount[gDifficulty].superMissile) - { - if (gEquipment.maxSuperMissiles == 0) - isFirstTank = TRUE; - - gEquipment.maxSuperMissiles += sTankIncreaseAmount[gDifficulty].superMissile; - gEquipment.currentSuperMissiles += sTankIncreaseAmount[gDifficulty].superMissile; - } - } - else if (i == ITEM_TYPE_POWER_BOMB) - { - if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].powerBomb * sTankIncreaseAmount[gDifficulty].powerBomb + sStartingHealthAmmo.powerBomb >= gEquipment.maxPowerBombs + sTankIncreaseAmount[gDifficulty].powerBomb) - { - if (gEquipment.maxPowerBombs == 0) - isFirstTank = TRUE; - - gEquipment.maxPowerBombs += sTankIncreaseAmount[gDifficulty].powerBomb; - gEquipment.currentPowerBombs += sTankIncreaseAmount[gDifficulty].powerBomb; - } - } - - // Spawn the message banner - i = sTankBehaviors[BEHAVIOR_TO_TANK(behaviors[j])].messageId + isFirstTank; - if (i != MESSAGE_NONE) - { - SpriteSpawnPrimary(PSPRITE_MESSAGE_BANNER, i, SPRITE_GFX_SLOT_SPECIAL, - gSamusData.yPosition, gSamusData.xPosition, 0); - } - } - } - - // Collecting a tank, abort - if (gCollectingTank) - break; - } -} - -/** - * @brief 5ad8c | 60 | Finishes the collection of a tank - * - */ -void BgClipFinishCollectingTank(void) -{ - u32 clipdata; - u32 tank; - - gCollectingTank = FALSE; - - // Get tank type - tank = BEHAVIOR_TO_TANK(gLastTankCollected.behavior); - if (sTankBehaviors[tank].itemType == ITEM_TYPE_NONE) - return; - - // Get clip - if (sTankBehaviors[tank].underwater) - clipdata = CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_WATER; - else - clipdata = CLIPDATA_TILEMAP_AIR; - - // Set bg1 and clipdata - BgClipSetBg1BlockValue(0, gLastTankCollected.yPosition, gLastTankCollected.xPosition); - BgClipSetClipdataBlockValue(clipdata, gLastTankCollected.yPosition, gLastTankCollected.xPosition); - - // Register item - BgClipSetItemAsCollected(gLastTankCollected.xPosition, gLastTankCollected.yPosition, sTankBehaviors[tank].itemType); - - // Update minimap - MinimapUpdateForCollectedItem(gLastTankCollected.xPosition, gLastTankCollected.yPosition); -} - -/** - * @brief 5adec | 30 | Finishes the collection of an ability - * - */ -void BgClipFinishCollectingAbility(void) -{ - // Register item - BgClipSetItemAsCollected(SUB_PIXEL_TO_BLOCK(gSamusData.xPosition), SUB_PIXEL_TO_BLOCK(gSamusData.yPosition), ITEM_TYPE_ABILITY); - - // Update minimap - MinimapUpdateForCollectedItem(SUB_PIXEL_TO_BLOCK(gSamusData.xPosition), SUB_PIXEL_TO_BLOCK(gSamusData.yPosition)); -} - -/** - * @brief 5ae1c | 104 | Checks if samus is grabbing a crumble block - * - * @param dontDestroy Don't destroy block flag - */ -void BgClipCheckGrabbingCrumbleBlock(u8 dontDestroy) -{ - u8 setPose; - s32 yOffset; - s32 xOffset; - u16 yPosition; - u16 xPosition; - u16 behavior; - - if (gSamusPhysics.standingStatus != STANDING_HANGING) - return; - - setPose = FALSE; - yOffset = -(BLOCK_SIZE + HALF_BLOCK_SIZE + EIGHTH_BLOCK_SIZE + PIXEL_SIZE); - if (gSamusData.direction & KEY_RIGHT) - xOffset = HALF_BLOCK_SIZE; - else - xOffset = -HALF_BLOCK_SIZE; - - if (gSamusData.pose != SPOSE_HANGING_ON_LEDGE && gSamusData.pose != SPOSE_GRABBING_A_LEDGE_SUITLESS) - xOffset = -xOffset; - - if (!dontDestroy) - { - // Get position - xPosition = SUB_PIXEL_TO_BLOCK((u32)(gSamusData.xPosition + xOffset)); - yPosition = SUB_PIXEL_TO_BLOCK((u32)(gSamusData.yPosition + yOffset)); - - // Get behavior - behavior = gTilemapAndClipPointers.pClipBehaviors[GET_CLIP_BLOCK(xPosition, yPosition)]; - - // Check is crumble - if (behavior == CLIP_BEHAVIOR_CRUMBLE_BLOCK) - { - // Destroy block - if (BlockStoreBrokenReformBlock(BLOCK_TYPE_CRUMBLE, xPosition, yPosition, FALSE)) - setPose = TRUE; - } - else if (behavior == CLIP_BEHAVIOR_SLOW_CRUMBLE_BLOCK) - { - // Destroy block - if (BlockStoreBrokenReformBlock(BLOCK_TYPE_SLOW_CRUMBLE, xPosition, yPosition, TRUE)) - { - BgClipSetBg1BlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, xPosition); - BgClipSetClipdataBlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, xPosition); - setPose = FALSE; - } - } - } - - if (!setPose) - { - if (!(ClipdataProcessForSamus(gSamusData.yPosition + yOffset, gSamusData.xPosition + xOffset) & CLIPDATA_TYPE_SOLID_FLAG)) - setPose = TRUE; - } - - // Set - if (setPose) - SamusSetPose(SPOSE_MID_AIR_REQUEST); -} - -/** - * @brief 5af20 | 180 | Checks if a hatch should open depending on the Ccaa - * - * @param xPosition X Position - * @param yPosition Y Position - * @return u32 Hatch opening action - */ -HatchOpeningAction BgClipCheckOpeningHatch(u16 xPosition, u16 yPosition) -{ - s32 i; - HatchOpeningAction action; - - #ifdef BUGFIX - action = HATCH_OPENING_ACTION_NOT_OPENING; - #endif // BUGFIX - - for (i = 0; i < MAX_AMOUNT_OF_HATCHES; i++) - { - if (!gHatchData[i].exists || gHatchData[i].state != HATCH_STATE_CLOSED) - continue; - - action = HATCH_OPENING_ACTION_NOT_OPENING; - - // Check touches hatch and hatch is weak - if (gHatchData[i].xPosition == xPosition && gHatchData[i].yPosition <= yPosition && - yPosition <= gHatchData[i].yPosition + (HATCH_VERTICAL_SIZE - 1) && - sHatchBehaviors[gHatchData[i].type][0] & - sClipdataAffectingActionDamageTypes[gCurrentClipdataAffectingAction]) - { - // Increase hits - gHatchData[i].hits++; - action = HATCH_OPENING_ACTION_OPENING; - - // Check for a special action - if (gHatchData[i].type == HATCH_LOCKED) - { - // Check hatches are unlocked - if (!gHatchesState.unlocking) - action = HATCH_OPENING_ACTION_LOCKED; - } - else if (gHatchData[i].type == HATCH_LOCKED_NAVIGATION) - { - if (!gHatchesState.navigationDoorsUnlocking) - action = HATCH_OPENING_ACTION_LOCKED; - } - else if (gHatchData[i].type == HATCH_MISSILE) - { - // Check instantly open - if (sClipdataAffectingActionDamageTypes[gCurrentClipdataAffectingAction] & CAA_DAMAGE_TYPE_SUPER_MISSILE) - gHatchData[i].hits = sHatchBehaviors[HATCH_MISSILE][1]; // Set max health - } - } - - if (action != HATCH_OPENING_ACTION_NOT_OPENING) - { - if (action == HATCH_OPENING_ACTION_OPENING) - { - // Check enough hits - if (gHatchData[i].hits >= sHatchBehaviors[gHatchData[i].type][1]) - { - // Unlock - gHatchData[i].flashingTimer = FALSE; - gHatchData[i].state = TRUE; - - // Set hatch as opened - if (gHatchData[i].type >= HATCH_MISSILE) - ConnectionSetHatchAsOpened(HATCH_ACTION_SETTING_SOURCE_AND_DESTINATION, gHatchData[i].sourceDoor); - else - ConnectionSetHatchAsOpened(HATCH_ACTION_SETTING_SOURCE, gHatchData[i].sourceDoor); - } - else - { - // Set flashing - gHatchData[i].flashingTimer = 1; - } - } - else - { - gHatchData[i].hits = 0; // Locked, reset - } - - gHatchData[i].hitTimer = 0; - break; - } - } - - return action; -} - -/** - * @brief 5b0a0 | 74 | Registers a collected item in the save - * - * @param xPosition X position - * @param yPosition Y position - * @param type Item type - */ -void BgClipSetItemAsCollected(u16 xPosition, u16 yPosition, u8 type) -{ - u8 overLimit; - s32 i; - u8* pItem; - s32 limit; - - if (gCurrentArea >= MAX_AMOUNT_OF_AREAS) - return; - - i = gCurrentArea; - limit = MAX_AMOUNT_OF_ITEMS_PER_AREA; - overLimit = TRUE; - pItem = (u8*)gItemsCollected[i]; - - // Find empty slot - for (i = 0; i < limit; i++, pItem += 4) - { - if (pItem[0] == UCHAR_MAX) - { - overLimit = FALSE; - break; - } - } - - if (!overLimit) - { - // Set data - *pItem++ = gCurrentRoom; - *pItem++ = type; - *pItem++ = xPosition; - *pItem++ = yPosition; - - // Increase number of items - gNumberOfItemsCollected[gCurrentArea]++; - } -} - -/** - * @brief 5b114 | c4 | Removes the collected tanks of a room - * - */ -void BgClipRemoveCollectedTanks(void) -{ - struct ItemInfo* pItem; - s32 i; - s32 limit; - s32 position; - u32 behavior; - u32 temp; - - if (gPauseScreenFlag != PAUSE_SCREEN_NONE) - return; - - if (gCurrentArea >= MAX_AMOUNT_OF_AREAS) - return; - - i = gCurrentArea; - limit = MAX_AMOUNT_OF_ITEMS_PER_AREA; - pItem = gItemsCollected[i]; - - for (i = 0; i < limit; i++, pItem++) - { - if (pItem->room == UCHAR_MAX) - return; - - // Check is in the room and exists - if (pItem->room == gCurrentRoom && pItem->type >= ITEM_TYPE_NONE) - { - // Get offset - position = gBgPointersAndDimensions.clipdataWidth * pItem->yPosition + pItem->xPosition; - - // Get behavior - behavior = gTilemapAndClipPointers.pClipBehaviors[gBgPointersAndDimensions.pClipDecomp[position]]; - - if (behavior == CLIP_BEHAVIOR_UNDERWATER_ENERGY_TANK || - behavior == CLIP_BEHAVIOR_UNDERWATER_MISSILE_TANK || - behavior == CLIP_BEHAVIOR_UNDERWATER_SUPER_MISSILE_TANK || - behavior == CLIP_BEHAVIOR_UNDERWATER_POWER_BOMB_TANK) - { - // Underwater - gBgPointersAndDimensions.pClipDecomp[position] = CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_WATER; - gBgPointersAndDimensions.backgrounds[1].pDecomp[position] = 0; - } - else - { - // Normal - gBgPointersAndDimensions.pClipDecomp[position] = 0; - gBgPointersAndDimensions.backgrounds[1].pDecomp[position] = 0; - } - } - } -} - -/** - * @brief 5b1d8 | 74 | Calls the BgClipSetBgBlockValue on every block of the glass - * - * @param stage Breaking stage - */ -void BgClipCallMotherBrainUpdateGlass(u8 stage) -{ - u16 i; - u16 j; - - // Check in the mother brain room - if (gCurrentArea != AREA_TOURIAN) - return; - - if (gCurrentRoom != 4) - return; - - // Loop on every tile of the glass - for (i = 0; i < ARRAY_SIZE(sMotherBrainGlassBreakingBaseTilemapValues); i++) // Y - { - for (j = 0; j < 7; j++) // X - { - // Fetch the correct tile value, and the correct positions - BgClipSetBgBlockValue(0, sMotherBrainGlassBreakingBaseTilemapValues[stage] + i * 16 + j, i + 13, j + 4); - } - } -} +#include "gba.h" +#include "bg_clip.h" +#include "block.h" +#include "minimap.h" +#include "connection.h" +#include "macros.h" + +#include "data/block_data.h" + +#include "constants/block.h" +#include "constants/connection.h" +#include "constants/clipdata.h" +#include "constants/game_state.h" +#include "constants/samus.h" +#include "constants/sprite.h" +#include "constants/text.h" + +#include "structs/bg_clip.h" +#include "structs/clipdata.h" +#include "structs/connection.h" +#include "structs/transparency.h" +#include "structs/game_state.h" +#include "structs/samus.h" + +/** + * @brief 5a484 | d8 | Sets the value for a BG block + * + * @param bg Background + * @param value Value + * @param yPosition Y position + * @param xPosition X position + */ +void BgClipSetBgBlockValue(u8 bg, u16 value, u16 yPosition, u16 xPosition) +{ + u16* dst; + u16 offset; + + // Write value + SET_BG_BLOCK(bg, value, xPosition, yPosition); + + // Check is on screen, no need to update the tilemap if off screen, that can be delegated to the room tilemap update functions + offset = SUB_PIXEL_TO_BLOCK(gBg1YPosition); + if (offset - 4 > yPosition) + return; + + if (yPosition > offset + 13) + return; + + offset = SUB_PIXEL_TO_BLOCK(gBg1XPosition); + if (offset - 4 > xPosition) + return; + + if (xPosition > offset + 18) + return; + + // Update tilemap + dst = (u16*)(VRAM_BASE + bg * 0x1000); + if (xPosition & 0x10) + dst = (u16*)(VRAM_BASE + 0x800 + bg * 0x1000); + + dst += MOD_AND(yPosition, 16) * 64 + MOD_AND(xPosition, 16) * 2; + + offset = value * 4; + + dst[0] = gTilemapAndClipPointers.pTilemap[offset++]; + dst[1] = gTilemapAndClipPointers.pTilemap[offset++]; + dst[32] = gTilemapAndClipPointers.pTilemap[offset++]; + dst[33] = gTilemapAndClipPointers.pTilemap[offset]; +} + +/** + * @brief 5a55c | cc | Sets the value for a BG1 block + * + * @param value Value + * @param yPosition Y position + * @param xPosition X position + */ +void BgClipSetBg1BlockValue(u16 value, u16 yPosition, u16 xPosition) +{ + u16* dst; + u16 offset; + + // Write value + SET_BG_BLOCK(1, value, xPosition, yPosition); + + // Check is on screen, no need to update the tilemap if off screen, that can be delegated to the room tilemap update functions + offset = SUB_PIXEL_TO_BLOCK(gBg1YPosition); + if (offset - 4 > yPosition) + return; + + if (yPosition > offset + 13) + return; + + offset = SUB_PIXEL_TO_BLOCK(gBg1XPosition); + if (offset - 4 > xPosition) + return; + + if (xPosition > offset + 18) + return; + + // Update tilemap + dst = (u16*)(VRAM_BASE + 0x1000); + if (xPosition & 0x10) + dst = (u16*)(VRAM_BASE + 0x1800); + + dst += MOD_AND(yPosition, 16) * 64 + MOD_AND(xPosition, 16) * 2; + + offset = value * 4; + + dst[0] = gTilemapAndClipPointers.pTilemap[offset++]; + dst[1] = gTilemapAndClipPointers.pTilemap[offset++]; + dst[32] = gTilemapAndClipPointers.pTilemap[offset++]; + dst[33] = gTilemapAndClipPointers.pTilemap[offset]; +} + +/** + * @brief 5a628 | 24 | Sets the raw value of a BG1 block + * + * @param value Block value + * @param yPosition Y Position + * @param xPosition X Position + */ +void BgClipSetRawBg1BlockValue(u32 value, u16 yPosition, u16 xPosition) +{ + SET_BG_BLOCK_(1, value, xPosition, yPosition); +} + +/** + * @brief 5a64c | 24 | Sets the value of a clipdata block + * + * @param value Block value + * @param yPosition Y Position + * @param xPosition X Position + */ +void BgClipSetClipdataBlockValue(u16 value, u16 yPosition, u16 xPosition) +{ + SET_CLIP_BLOCK_(value, xPosition, yPosition); +} + +/** + * @brief 5a670 | 58 | Calls other functions related to checking special clipdata + * + */ +void BgClipCheckTouchingSpecialClipdata(void) +{ + // Why always check for a crumble grab? + BgClipCheckGrabbingCrumbleBlock(FALSE); + + if (gSamusData.pose == SPOSE_USING_AN_ELEVATOR) + { + // Only check for transition on elevator + BgClipCheckTouchingTransitionOnElevator(); + return; + } + + if (gDisableDoorAndTanks) + return; + + if (MOD_AND(gFrameCounter8Bit, 2)) + { + // Check every 2 frames to reduce lag + BgClipCheckTouchingTransitionOrTank(); + } + else if (!gDisableClipdataChangingTransparency) + { + // Check every 2 frames to reduce lag (and if enabled) + BgClipApplyClipdataChangingTransparency(); + } + + BgClipCheckWalkingOnCrumbleBlock(); +} + +/** + * @brief 5a6c8 | a8 | Applies clipdata that changes transparency + * + */ +void BgClipApplyClipdataChangingTransparency(void) +{ + u32 clipdata; + u32 bldalpha; + u32 xPosition; + u32 yPosition; + s32 position; + + // Get X position + position = gSamusData.xPosition; + CLAMP2(position, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); + xPosition = SUB_PIXEL_TO_BLOCK_(position); + + // Get Y position + position = gSamusData.yPosition + (gSamusPhysics.hitboxTop >> 1); + CLAMP2(position, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); + yPosition = SUB_PIXEL_TO_BLOCK_(position); + + // Get clipdata + clipdata = gTilemapAndClipPointers.pClipBehaviors[GET_CLIP_BLOCK(xPosition, yPosition)]; + if (clipdata == CLIP_BEHAVIOR_NONE) + return; + + // Get bldalpha + bldalpha = BgClipGetNewBldalphaValue(clipdata, clipdata); + if (bldalpha == 0) + return; + + // Apply bldalpha + if (bldalpha == USHORT_MAX) + TransparencyUpdateBldalpha(gDefaultTransparency.evaCoef, gDefaultTransparency.evbCoef, 1, 1); + else + TransparencyUpdateBldalpha(LOW_BYTE(bldalpha), HIGH_BYTE(bldalpha), 1, 1); +} + +/** + * @brief 5a770 | 30 | Tries to get a bldalpha value based on a clipdata behavior + * + * @param clip Clipdata behavior + * @param unused Unused parameter + * @return u16 Bldalpha value (eva on first 8 bits, then evb on next 8 bits) + */ +u16 BgClipGetNewBldalphaValue(ClipBehavior clip, u16 unused) +{ + u16 bldalpha; + ClipBehavior clipdata; + + clipdata = BEHAVIOR_TO_BLDALPHA(clip); + + // Check is a bldapha change behavior (trigger transparent, opaque, brighter) + if (clipdata < BEHAVIOR_TO_BLDALPHA(CLIP_BEHAVIOR_BG0_TRIGGER_DEFAULT_TRANSPARENCY)) + { + // Fetch the correct value + bldalpha = sBldalphaValuesForClipdata[BEHAVIOR_TO_BLDALPHA(clip)]; + } + else if (clip == CLIP_BEHAVIOR_BG0_TRIGGER_DEFAULT_TRANSPARENCY) + { + // Request the default transparency to take over + bldalpha = USHORT_MAX; + } + else + { + // Not an appropriate behavior, return nothing + bldalpha = 0; + } + + return bldalpha; +} + +/** + * @brief 5a7a0 | 108 | Checks if samus is walking on a crumble block + * + */ +void BgClipCheckWalkingOnCrumbleBlock(void) +{ + u32 ignoreBlock; + s32 xOffsetLeft; + u16 checkPos; + u16 xPosition; + u16 yPosition; + s32 behavior; + u32 stopSamus; + u16 i; + + // Check falling + if (gSamusData.yVelocity < 0) + behavior = TRUE; + else + behavior = FALSE; + + if (gSamusPhysics.standingStatus == STANDING_NOT_IN_CONTROL) + behavior++; + + if (behavior) + return; + + // Get max position to check for crumble blocks + behavior = gSamusData.xPosition + gSamusPhysics.hitboxRight; + + checkPos = (u32)behavior / BLOCK_SIZE; + if (checkPos > gBgPointersAndDimensions.clipdataWidth) + checkPos = gBgPointersAndDimensions.clipdataWidth; + + // Get positions + behavior = gSamusData.xPosition + gSamusPhysics.hitboxLeft; + if (behavior < 0) + behavior = 0; + + xPosition = (u32)behavior / BLOCK_SIZE; + + behavior = gSamusData.yPosition + gSamusPhysics.hitboxBottom; + yPosition = (u32)(behavior + 2) / BLOCK_SIZE; + + if (yPosition > gBgPointersAndDimensions.clipdataHeight) + yPosition = gBgPointersAndDimensions.clipdataHeight; + + // Loop from current position to the check position + for (i = xPosition; i <= checkPos; i++) + { + // Get clipdata behavior + behavior = gTilemapAndClipPointers.pClipBehaviors[GET_CLIP_BLOCK(i, yPosition)]; + + if (behavior == CLIP_BEHAVIOR_CRUMBLE_BLOCK) + { + // Check if speedboosting to not directly destroy the floor under samus, allows to run over crumble blocks + behavior = FALSE; + if ((gSamusData.pose == SPOSE_RUNNING || gSamusData.pose == SPOSE_ROLLING) && gSamusData.speedboostingShinesparking) + behavior = TRUE; + + // Store block + BlockStoreBrokenReformBlock(BLOCK_TYPE_CRUMBLE, i, yPosition, behavior); + } + else if (behavior == CLIP_BEHAVIOR_SLOW_CRUMBLE_BLOCK) + { + // Store block + if (BlockStoreBrokenReformBlock(BLOCK_TYPE_SLOW_CRUMBLE, i, yPosition, TRUE)) + { + // Set "crumbling" graphics for the block + BgClipSetBg1BlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, i); + BgClipSetClipdataBlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, i); + } + } + } +} + +/** + * @brief 5a8a8 | c4 | Checks if samus is touching a transition during an elevator + * + */ +void BgClipCheckTouchingTransitionOnElevator(void) +{ + u32 goingDown; + s32 position; + u16 xPosition; + u16 yPosition; + s32 onTransition; + u16 behavior; + + // Get direction + if (gSamusData.elevatorDirection ^ KEY_UP) + goingDown = TRUE; + else + goingDown = FALSE; + + // Get X position + position = gSamusData.xPosition; + CLAMP2(position, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); + + xPosition = (u32)position / BLOCK_SIZE; + + // Get Y position + if (!goingDown) + { + position = gSamusData.yPosition + gSamusPhysics.hitboxBottom + BLOCK_SIZE * 2; + } + else + { + position = gSamusData.yPosition + gSamusPhysics.hitboxTop - BLOCK_SIZE * 2; + } + + behavior = position; + if (position < 0) + behavior = 0; + else if (behavior > BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)) + behavior = BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight); + + yPosition = behavior / BLOCK_SIZE; + + // Get clipdata behavior + position = GET_CLIP_BLOCK(xPosition, yPosition); + behavior = gTilemapAndClipPointers.pClipBehaviors[position]; + + // Check is the correct transition type (up if going up, down if going down) + position = FALSE; + if (!goingDown) + { + if (behavior == CLIP_BEHAVIOR_VERTICAL_UP_TRANSITION) + position = TRUE; + } + else + { + if (behavior == CLIP_BEHAVIOR_VERTICAL_DOWN_TRANSITION) + position = TRUE; + } + + if (!position) + return; + + // Check transition + if (!ConnectionCheckAreaConnection(yPosition, xPosition)) + { + ConnectionCheckEnterDoor(yPosition, xPosition); + } +} + +/** + * @brief 5a96c | 420 | Checks if samus is touching a transition or a tank + * + */ +void BgClipCheckTouchingTransitionOrTank(void) +{ + s32 behaviors[4]; // (right, center), (left, center), (center, bottom), (center, top) + s32 yPositions[3]; // center, bottom, top + s32 xPositions[3]; // right, left, center + s32 i; + s32 j; + s32 isFirstTank; + + // Get X positions + // On the right + j = DIV_SHIFT(gSamusPhysics.hitboxRight, 2) + gSamusData.xPosition; + CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); + xPositions[0] = SUB_PIXEL_TO_BLOCK_(j); + + // On the left + j = DIV_SHIFT(gSamusPhysics.hitboxLeft, 2) + gSamusData.xPosition; + CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); + xPositions[1] = SUB_PIXEL_TO_BLOCK_(j); + + // Center + j = gSamusData.xPosition; + CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataWidth)); + xPositions[2] = SUB_PIXEL_TO_BLOCK_(j); + + // Get Y positions + // Center + j = DIV_SHIFT(gSamusPhysics.hitboxTop, 2) + gSamusData.yPosition; + CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); + yPositions[0] = SUB_PIXEL_TO_BLOCK_(j); + + // Bottom + j = DIV_SHIFT(gSamusPhysics.hitboxTop, 4) + gSamusData.yPosition; + CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); + yPositions[1] = SUB_PIXEL_TO_BLOCK_(j); + + // Top + j = DIV_SHIFT(gSamusPhysics.hitboxTop, 4) + DIV_SHIFT(gSamusPhysics.hitboxTop, 2) + gSamusData.yPosition; + CLAMP2(j, 0, BLOCK_TO_SUB_PIXEL(gBgPointersAndDimensions.clipdataHeight)); + yPositions[2] = SUB_PIXEL_TO_BLOCK_(j); + + // Get clipdata behaviors on the X axis + for (i = 0; i < ARRAY_SIZE(xPositions) - 1; i++) + { + j = GET_CLIP_BLOCK(xPositions[i], yPositions[0]); + behaviors[i] = gTilemapAndClipPointers.pClipBehaviors[j]; + } + + // Get clipdata behaviors on the y axis + for (i = 0; i < ARRAY_SIZE(yPositions) - 1; i++) + { + j = GET_CLIP_BLOCK(xPositions[2], yPositions[i + 1]); + behaviors[i + 2] = gTilemapAndClipPointers.pClipBehaviors[j]; + } + + // Check if at least one behavior was found + if ((behaviors[0] | behaviors[1] | behaviors[2] | behaviors[3]) == CLIP_BEHAVIOR_NONE) + return; + + // Check for transition clipdata + j = -1; + // If touching a horizontal door from the right + if (behaviors[0] == CLIP_BEHAVIOR_DOOR_TRANSITION) + j = 0; + // If touching a horizontal door from the left + else if (behaviors[1] == CLIP_BEHAVIOR_DOOR_TRANSITION) + j = 1; + // If touching a vertical door from the bottom + else if (behaviors[2] == CLIP_BEHAVIOR_VERTICAL_UP_TRANSITION) + j = 2; + // If touching a vertical door from the top + else if (behaviors[3] == CLIP_BEHAVIOR_VERTICAL_DOWN_TRANSITION) + j = 3; + + // If room transition + if (j + 1 != 0) + { + // Check for door + if (!ConnectionCheckEnterDoor(yPositions[sBlockTouchOffsets[j][0]], xPositions[sBlockTouchOffsets[j][1]])) + { + ConnectionCheckAreaConnection(yPositions[sBlockTouchOffsets[j][0]], xPositions[sBlockTouchOffsets[j][1]]); + } + return; + } + + // Abort if already collecting a tank + if (gCollectingTank) + return; + + isFirstTank = FALSE; + + for (j = ARRAY_SIZE(behaviors) - 1; j >= 0; j--) + { + // No behavior, continue + if (behaviors[j] == 0) + continue; + + // Not a tank behavior, continue + if (BEHAVIOR_TO_TANK(behaviors[j]) > (u32)BEHAVIOR_TO_TANK(CLIP_BEHAVIOR_UNDERWATER_POWER_BOMB_TANK)) + continue; + + // Get item type + i = sTankBehaviors[BEHAVIOR_TO_TANK(behaviors[j])].itemType; + + // Check is an item (hidden tanks not broken aren't tanks yet) + if (i != ITEM_TYPE_NONE) + { + // Check the tile is explored + if (MinimapCheckIsTileExplored(xPositions[sBlockTouchOffsets[j][1]], yPositions[sBlockTouchOffsets[j][0]])) + { + // Set flag and stop samus + gCollectingTank = TRUE; + gPreventMovementTimer = SAMUS_ITEM_PMT; + + // Set last tank collected data + gLastTankCollected.behavior = behaviors[j]; + gLastTankCollected.xPosition = xPositions[sBlockTouchOffsets[j][1]]; + gLastTankCollected.yPosition = yPositions[sBlockTouchOffsets[j][0]]; + + // Apply tank : + // Check not above max (max number of tanks * increase amount + starting) >= current max + increase + // Check if it's not first tank of that type (except for energy) + // Apply increment to max and current + + if (i == ITEM_TYPE_MISSILE) + { + if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].missile * sTankIncreaseAmount[gDifficulty].missile + sStartingHealthAmmo.missile >= gEquipment.maxMissiles + sTankIncreaseAmount[gDifficulty].missile) + { + if (gEquipment.maxMissiles == 0) + isFirstTank = TRUE; + + gEquipment.maxMissiles += sTankIncreaseAmount[gDifficulty].missile; + gEquipment.currentMissiles += sTankIncreaseAmount[gDifficulty].missile; + } + } + else if (i == ITEM_TYPE_ENERGY) + { + if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].energy * sTankIncreaseAmount[gDifficulty].energy + sStartingHealthAmmo.energy >= gEquipment.maxEnergy + sTankIncreaseAmount[gDifficulty].energy) + { + gEquipment.maxEnergy += sTankIncreaseAmount[gDifficulty].energy; + gEquipment.currentEnergy = gEquipment.maxEnergy; + } + } + else if (i == ITEM_TYPE_SUPER_MISSILE) + { + if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].superMissile * sTankIncreaseAmount[gDifficulty].superMissile + sStartingHealthAmmo.superMissile >= gEquipment.maxSuperMissiles + sTankIncreaseAmount[gDifficulty].superMissile) + { + if (gEquipment.maxSuperMissiles == 0) + isFirstTank = TRUE; + + gEquipment.maxSuperMissiles += sTankIncreaseAmount[gDifficulty].superMissile; + gEquipment.currentSuperMissiles += sTankIncreaseAmount[gDifficulty].superMissile; + } + } + else if (i == ITEM_TYPE_POWER_BOMB) + { + if (sNumberOfTanksPerArea[MAX_AMOUNT_OF_AREAS - 1].powerBomb * sTankIncreaseAmount[gDifficulty].powerBomb + sStartingHealthAmmo.powerBomb >= gEquipment.maxPowerBombs + sTankIncreaseAmount[gDifficulty].powerBomb) + { + if (gEquipment.maxPowerBombs == 0) + isFirstTank = TRUE; + + gEquipment.maxPowerBombs += sTankIncreaseAmount[gDifficulty].powerBomb; + gEquipment.currentPowerBombs += sTankIncreaseAmount[gDifficulty].powerBomb; + } + } + + // Spawn the message banner + i = sTankBehaviors[BEHAVIOR_TO_TANK(behaviors[j])].messageId + isFirstTank; + if (i != MESSAGE_NONE) + { + SpriteSpawnPrimary(PSPRITE_MESSAGE_BANNER, i, SPRITE_GFX_SLOT_SPECIAL, + gSamusData.yPosition, gSamusData.xPosition, 0); + } + } + } + + // Collecting a tank, abort + if (gCollectingTank) + break; + } +} + +/** + * @brief 5ad8c | 60 | Finishes the collection of a tank + * + */ +void BgClipFinishCollectingTank(void) +{ + u32 clipdata; + u32 tank; + + gCollectingTank = FALSE; + + // Get tank type + tank = BEHAVIOR_TO_TANK(gLastTankCollected.behavior); + if (sTankBehaviors[tank].itemType == ITEM_TYPE_NONE) + return; + + // Get clip + if (sTankBehaviors[tank].underwater) + clipdata = CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_WATER; + else + clipdata = CLIPDATA_TILEMAP_AIR; + + // Set bg1 and clipdata + BgClipSetBg1BlockValue(0, gLastTankCollected.yPosition, gLastTankCollected.xPosition); + BgClipSetClipdataBlockValue(clipdata, gLastTankCollected.yPosition, gLastTankCollected.xPosition); + + // Register item + BgClipSetItemAsCollected(gLastTankCollected.xPosition, gLastTankCollected.yPosition, sTankBehaviors[tank].itemType); + + // Update minimap + MinimapUpdateForCollectedItem(gLastTankCollected.xPosition, gLastTankCollected.yPosition); +} + +/** + * @brief 5adec | 30 | Finishes the collection of an ability + * + */ +void BgClipFinishCollectingAbility(void) +{ + // Register item + BgClipSetItemAsCollected(SUB_PIXEL_TO_BLOCK(gSamusData.xPosition), SUB_PIXEL_TO_BLOCK(gSamusData.yPosition), ITEM_TYPE_ABILITY); + + // Update minimap + MinimapUpdateForCollectedItem(SUB_PIXEL_TO_BLOCK(gSamusData.xPosition), SUB_PIXEL_TO_BLOCK(gSamusData.yPosition)); +} + +/** + * @brief 5ae1c | 104 | Checks if samus is grabbing a crumble block + * + * @param dontDestroy Don't destroy block flag + */ +void BgClipCheckGrabbingCrumbleBlock(u8 dontDestroy) +{ + u8 setPose; + s32 yOffset; + s32 xOffset; + u16 yPosition; + u16 xPosition; + u16 behavior; + + if (gSamusPhysics.standingStatus != STANDING_HANGING) + return; + + setPose = FALSE; + yOffset = -(BLOCK_SIZE + HALF_BLOCK_SIZE + EIGHTH_BLOCK_SIZE + PIXEL_SIZE); + if (gSamusData.direction & KEY_RIGHT) + xOffset = HALF_BLOCK_SIZE; + else + xOffset = -HALF_BLOCK_SIZE; + + if (gSamusData.pose != SPOSE_HANGING_ON_LEDGE && gSamusData.pose != SPOSE_GRABBING_A_LEDGE_SUITLESS) + xOffset = -xOffset; + + if (!dontDestroy) + { + // Get position + xPosition = SUB_PIXEL_TO_BLOCK((u32)(gSamusData.xPosition + xOffset)); + yPosition = SUB_PIXEL_TO_BLOCK((u32)(gSamusData.yPosition + yOffset)); + + // Get behavior + behavior = gTilemapAndClipPointers.pClipBehaviors[GET_CLIP_BLOCK(xPosition, yPosition)]; + + // Check is crumble + if (behavior == CLIP_BEHAVIOR_CRUMBLE_BLOCK) + { + // Destroy block + if (BlockStoreBrokenReformBlock(BLOCK_TYPE_CRUMBLE, xPosition, yPosition, FALSE)) + setPose = TRUE; + } + else if (behavior == CLIP_BEHAVIOR_SLOW_CRUMBLE_BLOCK) + { + // Destroy block + if (BlockStoreBrokenReformBlock(BLOCK_TYPE_SLOW_CRUMBLE, xPosition, yPosition, TRUE)) + { + BgClipSetBg1BlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, xPosition); + BgClipSetClipdataBlockValue(CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_SOLID, yPosition, xPosition); + setPose = FALSE; + } + } + } + + if (!setPose) + { + if (!(ClipdataProcessForSamus(gSamusData.yPosition + yOffset, gSamusData.xPosition + xOffset) & CLIPDATA_TYPE_SOLID_FLAG)) + setPose = TRUE; + } + + // Set + if (setPose) + SamusSetPose(SPOSE_MID_AIR_REQUEST); +} + +/** + * @brief 5af20 | 180 | Checks if a hatch should open depending on the Ccaa + * + * @param xPosition X Position + * @param yPosition Y Position + * @return u32 Hatch opening action + */ +HatchOpeningAction BgClipCheckOpeningHatch(u16 xPosition, u16 yPosition) +{ + s32 i; + HatchOpeningAction action; + + #ifdef BUGFIX + action = HATCH_OPENING_ACTION_NOT_OPENING; + #endif // BUGFIX + + for (i = 0; i < MAX_AMOUNT_OF_HATCHES; i++) + { + if (!gHatchData[i].exists || gHatchData[i].state != HATCH_STATE_CLOSED) + continue; + + action = HATCH_OPENING_ACTION_NOT_OPENING; + + // Check touches hatch and hatch is weak + if (gHatchData[i].xPosition == xPosition && gHatchData[i].yPosition <= yPosition && + yPosition <= gHatchData[i].yPosition + (HATCH_VERTICAL_SIZE - 1) && + sHatchBehaviors[gHatchData[i].type][0] & + sClipdataAffectingActionDamageTypes[gCurrentClipdataAffectingAction]) + { + // Increase hits + gHatchData[i].hits++; + action = HATCH_OPENING_ACTION_OPENING; + + // Check for a special action + if (gHatchData[i].type == HATCH_LOCKED) + { + // Check hatches are unlocked + if (!gHatchesState.unlocking) + action = HATCH_OPENING_ACTION_LOCKED; + } + else if (gHatchData[i].type == HATCH_LOCKED_NAVIGATION) + { + if (!gHatchesState.navigationDoorsUnlocking) + action = HATCH_OPENING_ACTION_LOCKED; + } + else if (gHatchData[i].type == HATCH_MISSILE) + { + // Check instantly open + if (sClipdataAffectingActionDamageTypes[gCurrentClipdataAffectingAction] & CAA_DAMAGE_TYPE_SUPER_MISSILE) + gHatchData[i].hits = sHatchBehaviors[HATCH_MISSILE][1]; // Set max health + } + } + + if (action != HATCH_OPENING_ACTION_NOT_OPENING) + { + if (action == HATCH_OPENING_ACTION_OPENING) + { + // Check enough hits + if (gHatchData[i].hits >= sHatchBehaviors[gHatchData[i].type][1]) + { + // Unlock + gHatchData[i].flashingTimer = FALSE; + gHatchData[i].state = TRUE; + + // Set hatch as opened + if (gHatchData[i].type >= HATCH_MISSILE) + ConnectionSetHatchAsOpened(HATCH_ACTION_SETTING_SOURCE_AND_DESTINATION, gHatchData[i].sourceDoor); + else + ConnectionSetHatchAsOpened(HATCH_ACTION_SETTING_SOURCE, gHatchData[i].sourceDoor); + } + else + { + // Set flashing + gHatchData[i].flashingTimer = 1; + } + } + else + { + gHatchData[i].hits = 0; // Locked, reset + } + + gHatchData[i].hitTimer = 0; + break; + } + } + + return action; +} + +/** + * @brief 5b0a0 | 74 | Registers a collected item in the save + * + * @param xPosition X position + * @param yPosition Y position + * @param type Item type + */ +void BgClipSetItemAsCollected(u16 xPosition, u16 yPosition, u8 type) +{ + u8 overLimit; + s32 i; + u8* pItem; + s32 limit; + + if (gCurrentArea >= MAX_AMOUNT_OF_AREAS) + return; + + i = gCurrentArea; + limit = MAX_AMOUNT_OF_ITEMS_PER_AREA; + overLimit = TRUE; + pItem = (u8*)gItemsCollected[i]; + + // Find empty slot + for (i = 0; i < limit; i++, pItem += 4) + { + if (pItem[0] == UCHAR_MAX) + { + overLimit = FALSE; + break; + } + } + + if (!overLimit) + { + // Set data + *pItem++ = gCurrentRoom; + *pItem++ = type; + *pItem++ = xPosition; + *pItem++ = yPosition; + + // Increase number of items + gNumberOfItemsCollected[gCurrentArea]++; + } +} + +/** + * @brief 5b114 | c4 | Removes the collected tanks of a room + * + */ +void BgClipRemoveCollectedTanks(void) +{ + struct ItemInfo* pItem; + s32 i; + s32 limit; + s32 position; + u32 behavior; + u32 temp; + + if (gPauseScreenFlag != PAUSE_SCREEN_NONE) + return; + + if (gCurrentArea >= MAX_AMOUNT_OF_AREAS) + return; + + i = gCurrentArea; + limit = MAX_AMOUNT_OF_ITEMS_PER_AREA; + pItem = gItemsCollected[i]; + + for (i = 0; i < limit; i++, pItem++) + { + if (pItem->room == UCHAR_MAX) + return; + + // Check is in the room and exists + if (pItem->room == gCurrentRoom && pItem->type >= ITEM_TYPE_NONE) + { + // Get offset + position = gBgPointersAndDimensions.clipdataWidth * pItem->yPosition + pItem->xPosition; + + // Get behavior + behavior = gTilemapAndClipPointers.pClipBehaviors[gBgPointersAndDimensions.pClipDecomp[position]]; + + if (behavior == CLIP_BEHAVIOR_UNDERWATER_ENERGY_TANK || + behavior == CLIP_BEHAVIOR_UNDERWATER_MISSILE_TANK || + behavior == CLIP_BEHAVIOR_UNDERWATER_SUPER_MISSILE_TANK || + behavior == CLIP_BEHAVIOR_UNDERWATER_POWER_BOMB_TANK) + { + // Underwater + gBgPointersAndDimensions.pClipDecomp[position] = CLIPDATA_TILEMAP_FLAG | CLIPDATA_TILEMAP_WATER; + gBgPointersAndDimensions.backgrounds[1].pDecomp[position] = 0; + } + else + { + // Normal + gBgPointersAndDimensions.pClipDecomp[position] = 0; + gBgPointersAndDimensions.backgrounds[1].pDecomp[position] = 0; + } + } + } +} + +/** + * @brief 5b1d8 | 74 | Calls the BgClipSetBgBlockValue on every block of the glass + * + * @param stage Breaking stage + */ +void BgClipCallMotherBrainUpdateGlass(u8 stage) +{ + u16 i; + u16 j; + + // Check in the mother brain room + if (gCurrentArea != AREA_TOURIAN) + return; + + if (gCurrentRoom != 4) + return; + + // Loop on every tile of the glass + for (i = 0; i < ARRAY_SIZE(sMotherBrainGlassBreakingBaseTilemapValues); i++) // Y + { + for (j = 0; j < 7; j++) // X + { + // Fetch the correct tile value, and the correct positions + BgClipSetBgBlockValue(0, sMotherBrainGlassBreakingBaseTilemapValues[stage] + i * 16 + j, i + 13, j + 4); + } + } +} diff --git a/src/init_game.c b/src/init_game.c index 61b9e2d72..c0f54d91e 100644 --- a/src/init_game.c +++ b/src/init_game.c @@ -1,75 +1,75 @@ -#include "init_game.h" - -#include "callbacks.h" - -#include "gba.h" -#include "io.h" -#include "soft_reset_input.h" -#include "types.h" -#include "menus/boot_debug.h" - -#include "constants/game_state.h" -#include "structs/audio.h" -#include "structs/game_state.h" - -void InitializeGame(void) -{ - WRITE_16(REG_DISPCNT, DCNT_BLANK); - WRITE_16(REG_IME, FALSE); - WRITE_16(REG_DISPSTAT, 0); - - DMA3_FILL_32(0, EWRAM_BASE, EWRAM_SIZE); - DMA3_FILL_32(0, IWRAM_BASE, IWRAM_SIZE - 0x200); - - ClearGfxRam(); - LoadInterruptCode(); - CallbackSetVblank(SoftResetVBlankCallback); - SramRead_All(); - InitializeAudio(); - #ifdef BUGFIX - SramRead_SoundMode(); - FileSelectApplyStereo(); - #endif // BUGFIX - - WRITE_16(REG_IE, IF_VBLANK | IF_DMA2 | IF_GAMEPAK); - WRITE_16(REG_DISPSTAT, DSTAT_IF_VBLANK); - WRITE_16(REG_WAITCNT, WAIT_SRAM_4CYCLES | WAIT_BANK0_3CYCLES - | WAIT_BANK0_SUBSEQUENT_1CYCLE - | WAIT_BANK1_3CYCLES | WAIT_BANK1_SUBSEQUENT_1CYCLE - | WAIT_BANK2_3CYCLES | WAIT_BANK2_SUBSEQUENT_1CYCLE - | WAIT_GAMEPACK_CGB); - - gSubGameMode1 = 0; - gSubGameMode2 = 0; - gDebugMode = FALSE; - - gButtonInput = KEY_NONE; - gPreviousButtonInput = KEY_NONE; - gChangedInput = KEY_NONE; - - UpdateInput(); - - if (gChangedInput == (KEY_L | KEY_R)) - { - gMainGameMode = GM_ERASE_SRAM; - } - else - { - #ifdef DEBUG - BootDebugReadSram(); - gMainGameMode = gDebugMode ? GM_DEBUG_MENU : GM_SOFT_RESET; - #else // !DEBUG - gMainGameMode = GM_SOFT_RESET; - #endif // DEBUG - } - - gButtonInput = KEY_NONE; - gPreviousButtonInput = KEY_NONE; - gChangedInput = KEY_NONE; - - gDisableSoftReset = FALSE; - gStereoFlag = FALSE; - - WRITE_16(REG_IF, USHORT_MAX); - WRITE_16(REG_IME, TRUE); -} +#include "init_game.h" + +#include "callbacks.h" + +#include "gba.h" +#include "io.h" +#include "soft_reset_input.h" +#include "types.h" +#include "menus/boot_debug.h" + +#include "constants/game_state.h" +#include "structs/audio.h" +#include "structs/game_state.h" + +void InitializeGame(void) +{ + WRITE_16(REG_DISPCNT, DCNT_BLANK); + WRITE_16(REG_IME, FALSE); + WRITE_16(REG_DISPSTAT, 0); + + DMA3_FILL_32(0, EWRAM_BASE, EWRAM_SIZE); + DMA3_FILL_32(0, IWRAM_BASE, IWRAM_SIZE - 0x200); + + ClearGfxRam(); + LoadInterruptCode(); + CallbackSetVblank(SoftResetVBlankCallback); + SramRead_All(); + InitializeAudio(); + #ifdef BUGFIX + SramRead_SoundMode(); + FileSelectApplyStereo(); + #endif // BUGFIX + + WRITE_16(REG_IE, IF_VBLANK | IF_DMA2 | IF_GAMEPAK); + WRITE_16(REG_DISPSTAT, DSTAT_IF_VBLANK); + WRITE_16(REG_WAITCNT, WAIT_SRAM_4CYCLES | WAIT_BANK0_3CYCLES + | WAIT_BANK0_SUBSEQUENT_1CYCLE + | WAIT_BANK1_3CYCLES | WAIT_BANK1_SUBSEQUENT_1CYCLE + | WAIT_BANK2_3CYCLES | WAIT_BANK2_SUBSEQUENT_1CYCLE + | WAIT_GAMEPACK_CGB); + + gSubGameMode1 = 0; + gSubGameMode2 = 0; + gDebugMode = FALSE; + + gButtonInput = KEY_NONE; + gPreviousButtonInput = KEY_NONE; + gChangedInput = KEY_NONE; + + UpdateInput(); + + if (gChangedInput == (KEY_L | KEY_R)) + { + gMainGameMode = GM_ERASE_SRAM; + } + else + { + #ifdef DEBUG + BootDebugReadSram(); + gMainGameMode = gDebugMode ? GM_DEBUG_MENU : GM_SOFT_RESET; + #else // !DEBUG + gMainGameMode = GM_SOFT_RESET; + #endif // DEBUG + } + + gButtonInput = KEY_NONE; + gPreviousButtonInput = KEY_NONE; + gChangedInput = KEY_NONE; + + gDisableSoftReset = FALSE; + gStereoFlag = FALSE; + + WRITE_16(REG_IF, USHORT_MAX); + WRITE_16(REG_IME, TRUE); +} diff --git a/src/soft_reset.c b/src/soft_reset.c index b466eb411..1d066cc98 100644 --- a/src/soft_reset.c +++ b/src/soft_reset.c @@ -1,386 +1,386 @@ -#include "soft_reset.h" -#include "gba.h" -#include "callbacks.h" - -#include "data/shortcut_pointers.h" -#include "data/menus/language_select_data.h" - -#include "constants/cutscene.h" -#include "constants/audio.h" -#include "constants/menus/pause_screen.h" - -#include "structs/menus/language_select.h" -#include "structs/display.h" -#include "structs/game_state.h" -#include "structs/cutscene.h" - -#ifdef REGION_EU -static void LanguageSelectChangeHighlight(u8 highlight, u8 language); -static void LanguageSelectUpdateHighlightAnimation(struct LanguageColorAnimation* pAnim); -static u32 LanguageSelectHandler(void); -#endif // REGION_EU - -/** - * @brief 7ef9c | 54 | Main loop for a soft reset - * - * @return u32 bool, ended - */ -u32 SoftResetHandler(void) -{ - switch (gSubGameMode1) - { - case 0: - SoftResetInit(); - #ifdef REGION_EU - if (LANGUAGE_SELECT_DATA.loadLanguageSelect) - gSubGameMode1 = 3; - else - gSubGameMode1++; - #else // !REGION_EU - gSubGameMode1++; - #endif // REGION_EU - break; - - case 1: - if (gWrittenToBldy_NonGameplay - 4 < 1) - gWrittenToBldy_NonGameplay = 0; - else - gWrittenToBldy_NonGameplay -= 4; - - if (gWrittenToBldy_NonGameplay == 0) - gSubGameMode1++; - break; - - case 2: - return TRUE; - - #ifdef REGION_EU - - case 3: - if (gWrittenToBldy_NonGameplay - 2 <= 0) - gWrittenToBldy_NonGameplay = 0; - else - gWrittenToBldy_NonGameplay -= 2; - - if (gWrittenToBldy_NonGameplay == 0) - { - LANGUAGE_SELECT_DATA.bldcnt = UCHAR_MAX; - gSubGameMode1 = 4; - } - - LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); - break; - - case 4: - if (LanguageSelectHandler()) - { - LANGUAGE_SELECT_DATA.timer = 0; - LANGUAGE_SELECT_DATA.languageAnimation.interval = DELTA_TIME; - gSubGameMode1++; - } - - LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); - break; - - case 5: - APPLY_DELTA_TIME_INC(LANGUAGE_SELECT_DATA.timer); - if (LANGUAGE_SELECT_DATA.timer > CONVERT_SECONDS(1.f)) - gSubGameMode1++; - - LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); - break; - - case 6: - if (gWrittenToBldy_NonGameplay + 2 > 0xF) - gWrittenToBldy_NonGameplay = 0x10; - else - gWrittenToBldy_NonGameplay += 2; - - if (gWrittenToBldy_NonGameplay == 0x10) - gSubGameMode1 = 2; - - LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); - break; - - case 7: - case 8: - SoftResetInit(); - if (LANGUAGE_SELECT_DATA.loadLanguageSelect) - gSubGameMode1 = 3; - else - gSubGameMode1 = 2; - break; - - #endif // REGION_EU - } - - return FALSE; -} - -#ifdef REGION_EU - -/** - * @brief Changes the highlight of a language on the language select menu - * - * @param highlight Whether to highlight the language - * @param language The language to change - */ -static void LanguageSelectChangeHighlight(u8 highlight, u8 language) -{ - u16 i; - u16* dst1; - u16* dst2; - - dst2 = VRAM_BASE + 0xF800; - dst1 = dst2 + sLanguageSelectLanguageTileTableOffsets[language - LANGUAGE_ENGLISH]; - dst2 = dst1 + 0x20; - - if (highlight) - { - i = 0; - while (i < 16) - { - *dst1 &= 0x3FF; - *dst2 &= 0x3FF; - i++; - dst1++; - dst2++; - } - } - else - { - i = 0; - while (i < 16) - { - *dst1 |= 0xF000; - *dst2 |= 0xF000; - i++; - dst1++; - dst2++; - } - } -} - -/** - * @brief Updates the highlighted language palette in the language select menu - * - * @param pAnim Pointer to LanguageColorAnimation data - */ -static void LanguageSelectUpdateHighlightAnimation(struct LanguageColorAnimation* pAnim) -{ - if (pAnim->timer != 0) - { - pAnim->timer--; - return; - } - - pAnim->timer = pAnim->interval; - pAnim->index++; - - if (pAnim->index > 13) - pAnim->index = 0; - - DmaTransfer(3, sLanguageSelectBgPal + sLanguageTextAnimationPaletteRows[pAnim->index] * PAL_ROW, PALRAM_BASE, PAL_ROW, 16); -} - -/** - * @brief Main routine for language select menu - * - * @return u32 bool, language selected - */ -static u32 LanguageSelectHandler(void) -{ - s32 language; - - CheckForMaintainedInput(MAINTAINED_INPUT_SPEED_SLOW); - - if (gChangedInput & (KEY_A | KEY_START)) - { - if (INVALID_EU_LANGUAGE(LANGUAGE_SELECT_DATA.selectedLanguage)) - { - // Select English by default - LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_ENGLISH; - LanguageSelectChangeHighlight(TRUE, LANGUAGE_SELECT_DATA.selectedLanguage); - - for (language = LANGUAGE_ENGLISH + 1; language < LANGUAGE_COUNT; language++) - { - LanguageSelectChangeHighlight(FALSE, language); - } - - return FALSE; - } - - if (LANGUAGE_SELECT_DATA.selectedLanguage != gLanguage) - { - gLanguage = LANGUAGE_SELECT_DATA.selectedLanguage; - SramWrite_Language(); - } - - SoundPlay(SOUND_ACCEPT_CONFIRM_MENU); - FadeMusic(CONVERT_SECONDS(1.f)); - return TRUE; - } - - language = 0; - - if (gChangedInput & KEY_UP) - { - if (LANGUAGE_SELECT_DATA.selectedLanguage > LANGUAGE_ENGLISH) - { - language = LANGUAGE_SELECT_DATA.selectedLanguage; - LANGUAGE_SELECT_DATA.selectedLanguage = language - 1; - } - else - { - language = LANGUAGE_ENGLISH; - LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_COUNT - 1; - } - } - else if (gChangedInput & KEY_DOWN) - { - if (LANGUAGE_SELECT_DATA.selectedLanguage < LANGUAGE_COUNT - 1) - { - language = LANGUAGE_SELECT_DATA.selectedLanguage; - LANGUAGE_SELECT_DATA.selectedLanguage = language + 1; - } - else - { - language = LANGUAGE_COUNT - 1; - LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_ENGLISH; - } - } - - if (language == 0) - return FALSE; - - SoundPlay(SOUND_SUB_MENU_CURSOR); - LanguageSelectChangeHighlight(FALSE, language); - LanguageSelectChangeHighlight(TRUE, LANGUAGE_SELECT_DATA.selectedLanguage); - return FALSE; -} - -#endif // REGION_EU - -/** - * @brief 7eff0 | 110 | Initializes a soft reset - * - */ -void SoftResetInit(void) -{ - // Non-EU regions presumably use the CutsceneData struct for non-gameplay RAM, - // since the offsets for bldcnt and dispcnt line up - - CallbackSetVblank(SoftResetVBlank_Empty); - - #ifdef REGION_EU - BitFill(3, 0, &gNonGameplayRam, sizeof(gNonGameplayRam), 32); - #else // !REGION_EU - DMA3_FILL_32(0, &gNonGameplayRam, sizeof(gNonGameplayRam)); - #endif - - #ifdef REGION_EU - if (gSubGameMode1 == 0) - WRITE_16(REG_BLDCNT, LANGUAGE_SELECT_DATA.bldcnt = BLDCNT_SCREEN_FIRST_TARGET | BLDCNT_BRIGHTNESS_INCREASE_EFFECT); - else - WRITE_16(REG_BLDCNT, LANGUAGE_SELECT_DATA.bldcnt = UCHAR_MAX); - #else // !REGION_EU - WRITE_16(REG_BLDCNT, CUTSCENE_DATA.bldcnt = BLDCNT_SCREEN_FIRST_TARGET | BLDCNT_BRIGHTNESS_INCREASE_EFFECT); - #endif - - WRITE_16(REG_BLDY, gWrittenToBldy_NonGameplay = BLDY_MAX_VALUE); - #ifdef REGION_EU - WRITE_16(REG_DISPCNT, LANGUAGE_SELECT_DATA.dispcnt = 0); - #else // !REGION_EU - WRITE_16(REG_DISPCNT, CUTSCENE_DATA.dispcnt = 0); - #endif // REGION_EU - - gNextOamSlot = 0; - ClearGfxRam(); - ResetFreeOam(); - - gOamXOffset_NonGameplay = gOamYOffset_NonGameplay = 0; - #ifndef REGION_EU - SET_BACKDROP_COLOR(COLOR_BLACK); - #endif // !REGION_EU - gSubGameMode3 = 0; - - gBg0HOFS_NonGameplay = gBg0VOFS_NonGameplay = 0; - gBg1HOFS_NonGameplay = gBg1VOFS_NonGameplay = 0; - gBg2HOFS_NonGameplay = gBg2VOFS_NonGameplay = 0; - gBg3HOFS_NonGameplay = gBg3VOFS_NonGameplay = 0; - - WRITE_16(REG_BG0HOFS, 0); - WRITE_16(REG_BG0VOFS, 0); - WRITE_16(REG_BG1HOFS, 0); - WRITE_16(REG_BG1VOFS, 0); - WRITE_16(REG_BG2HOFS, 0); - WRITE_16(REG_BG2VOFS, 0); - WRITE_16(REG_BG3HOFS, 0); - WRITE_16(REG_BG3VOFS, 0); - - #ifdef REGION_EU - LANGUAGE_SELECT_DATA.selectedLanguage = gLanguage; - - if (INVALID_EU_LANGUAGE(LANGUAGE_SELECT_DATA.selectedLanguage)) - { - LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_ENGLISH; - LANGUAGE_SELECT_DATA.loadLanguageSelect = TRUE; - } - else - { - LANGUAGE_SELECT_DATA.loadLanguageSelect = gSubGameMode1 == 7; - } - - if (LANGUAGE_SELECT_DATA.loadLanguageSelect) - { - LANGUAGE_SELECT_DATA.languageAnimation = sInitialLanguageColorAnimation; - - DMA3_COPY_16(sLanguageSelectBgPal, PALRAM_BASE, COLORS_IN_PAL); - SET_BACKDROP_COLOR(COLOR_BLACK); - - LZ77UncompVram(sLanguageSelectGfx, VRAM_BASE); - LZ77UncompVram(sLanguageSelectTileTable, VRAM_BASE + 0xF800); - - LanguageSelectChangeHighlight(TRUE, LANGUAGE_SELECT_DATA.selectedLanguage); - - WRITE_16(REG_BG0CNT, 0); - WRITE_16(REG_BG2CNT, 0); - WRITE_16(REG_BG1CNT, 0); - WRITE_16(REG_BG3CNT, 0x1F03); - LANGUAGE_SELECT_DATA.dispcnt = 0x800; - } - else - { - SET_BACKDROP_COLOR(COLOR_BLACK); - LANGUAGE_SELECT_DATA.dispcnt = 0; - } - - WRITE_16(REG_DISPCNT, LANGUAGE_SELECT_DATA.dispcnt); - #else // !REGION_EU - WRITE_16(REG_DISPCNT, CUTSCENE_DATA.dispcnt = 0); - #endif // REGION_EU - - CallbackSetVblank(SoftResetVBlank); -} - -/** - * @brief 7f100 | 14 | V-blank code for a soft reset - * - */ -void SoftResetVBlank(void) -{ - WRITE_16(REG_BLDY, gWrittenToBldy_NonGameplay); - - #ifdef REGION_EU - WRITE_16(REG_BLDCNT, LANGUAGE_SELECT_DATA.bldcnt); - #endif // REGION_EU -} - -/** - * @brief 7f114 | c | Empty v-blank for a soft reset - * - */ -void SoftResetVBlank_Empty(void) -{ - vu8 c = 0; -} +#include "soft_reset.h" +#include "gba.h" +#include "callbacks.h" + +#include "data/shortcut_pointers.h" +#include "data/menus/language_select_data.h" + +#include "constants/cutscene.h" +#include "constants/audio.h" +#include "constants/menus/pause_screen.h" + +#include "structs/menus/language_select.h" +#include "structs/display.h" +#include "structs/game_state.h" +#include "structs/cutscene.h" + +#ifdef REGION_EU +static void LanguageSelectChangeHighlight(u8 highlight, u8 language); +static void LanguageSelectUpdateHighlightAnimation(struct LanguageColorAnimation* pAnim); +static u32 LanguageSelectHandler(void); +#endif // REGION_EU + +/** + * @brief 7ef9c | 54 | Main loop for a soft reset + * + * @return u32 bool, ended + */ +u32 SoftResetHandler(void) +{ + switch (gSubGameMode1) + { + case 0: + SoftResetInit(); + #ifdef REGION_EU + if (LANGUAGE_SELECT_DATA.loadLanguageSelect) + gSubGameMode1 = 3; + else + gSubGameMode1++; + #else // !REGION_EU + gSubGameMode1++; + #endif // REGION_EU + break; + + case 1: + if (gWrittenToBldy_NonGameplay - 4 < 1) + gWrittenToBldy_NonGameplay = 0; + else + gWrittenToBldy_NonGameplay -= 4; + + if (gWrittenToBldy_NonGameplay == 0) + gSubGameMode1++; + break; + + case 2: + return TRUE; + + #ifdef REGION_EU + + case 3: + if (gWrittenToBldy_NonGameplay - 2 <= 0) + gWrittenToBldy_NonGameplay = 0; + else + gWrittenToBldy_NonGameplay -= 2; + + if (gWrittenToBldy_NonGameplay == 0) + { + LANGUAGE_SELECT_DATA.bldcnt = UCHAR_MAX; + gSubGameMode1 = 4; + } + + LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); + break; + + case 4: + if (LanguageSelectHandler()) + { + LANGUAGE_SELECT_DATA.timer = 0; + LANGUAGE_SELECT_DATA.languageAnimation.interval = DELTA_TIME; + gSubGameMode1++; + } + + LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); + break; + + case 5: + APPLY_DELTA_TIME_INC(LANGUAGE_SELECT_DATA.timer); + if (LANGUAGE_SELECT_DATA.timer > CONVERT_SECONDS(1.f)) + gSubGameMode1++; + + LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); + break; + + case 6: + if (gWrittenToBldy_NonGameplay + 2 > 0xF) + gWrittenToBldy_NonGameplay = 0x10; + else + gWrittenToBldy_NonGameplay += 2; + + if (gWrittenToBldy_NonGameplay == 0x10) + gSubGameMode1 = 2; + + LanguageSelectUpdateHighlightAnimation(&LANGUAGE_SELECT_DATA.languageAnimation); + break; + + case 7: + case 8: + SoftResetInit(); + if (LANGUAGE_SELECT_DATA.loadLanguageSelect) + gSubGameMode1 = 3; + else + gSubGameMode1 = 2; + break; + + #endif // REGION_EU + } + + return FALSE; +} + +#ifdef REGION_EU + +/** + * @brief Changes the highlight of a language on the language select menu + * + * @param highlight Whether to highlight the language + * @param language The language to change + */ +static void LanguageSelectChangeHighlight(u8 highlight, u8 language) +{ + u16 i; + u16* dst1; + u16* dst2; + + dst2 = VRAM_BASE + 0xF800; + dst1 = dst2 + sLanguageSelectLanguageTileTableOffsets[language - LANGUAGE_ENGLISH]; + dst2 = dst1 + 0x20; + + if (highlight) + { + i = 0; + while (i < 16) + { + *dst1 &= 0x3FF; + *dst2 &= 0x3FF; + i++; + dst1++; + dst2++; + } + } + else + { + i = 0; + while (i < 16) + { + *dst1 |= 0xF000; + *dst2 |= 0xF000; + i++; + dst1++; + dst2++; + } + } +} + +/** + * @brief Updates the highlighted language palette in the language select menu + * + * @param pAnim Pointer to LanguageColorAnimation data + */ +static void LanguageSelectUpdateHighlightAnimation(struct LanguageColorAnimation* pAnim) +{ + if (pAnim->timer != 0) + { + pAnim->timer--; + return; + } + + pAnim->timer = pAnim->interval; + pAnim->index++; + + if (pAnim->index > 13) + pAnim->index = 0; + + DmaTransfer(3, sLanguageSelectBgPal + sLanguageTextAnimationPaletteRows[pAnim->index] * PAL_ROW, PALRAM_BASE, PAL_ROW, 16); +} + +/** + * @brief Main routine for language select menu + * + * @return u32 bool, language selected + */ +static u32 LanguageSelectHandler(void) +{ + s32 language; + + CheckForMaintainedInput(MAINTAINED_INPUT_SPEED_SLOW); + + if (gChangedInput & (KEY_A | KEY_START)) + { + if (INVALID_EU_LANGUAGE(LANGUAGE_SELECT_DATA.selectedLanguage)) + { + // Select English by default + LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_ENGLISH; + LanguageSelectChangeHighlight(TRUE, LANGUAGE_SELECT_DATA.selectedLanguage); + + for (language = LANGUAGE_ENGLISH + 1; language < LANGUAGE_COUNT; language++) + { + LanguageSelectChangeHighlight(FALSE, language); + } + + return FALSE; + } + + if (LANGUAGE_SELECT_DATA.selectedLanguage != gLanguage) + { + gLanguage = LANGUAGE_SELECT_DATA.selectedLanguage; + SramWrite_Language(); + } + + SoundPlay(SOUND_ACCEPT_CONFIRM_MENU); + FadeMusic(CONVERT_SECONDS(1.f)); + return TRUE; + } + + language = 0; + + if (gChangedInput & KEY_UP) + { + if (LANGUAGE_SELECT_DATA.selectedLanguage > LANGUAGE_ENGLISH) + { + language = LANGUAGE_SELECT_DATA.selectedLanguage; + LANGUAGE_SELECT_DATA.selectedLanguage = language - 1; + } + else + { + language = LANGUAGE_ENGLISH; + LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_COUNT - 1; + } + } + else if (gChangedInput & KEY_DOWN) + { + if (LANGUAGE_SELECT_DATA.selectedLanguage < LANGUAGE_COUNT - 1) + { + language = LANGUAGE_SELECT_DATA.selectedLanguage; + LANGUAGE_SELECT_DATA.selectedLanguage = language + 1; + } + else + { + language = LANGUAGE_COUNT - 1; + LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_ENGLISH; + } + } + + if (language == 0) + return FALSE; + + SoundPlay(SOUND_SUB_MENU_CURSOR); + LanguageSelectChangeHighlight(FALSE, language); + LanguageSelectChangeHighlight(TRUE, LANGUAGE_SELECT_DATA.selectedLanguage); + return FALSE; +} + +#endif // REGION_EU + +/** + * @brief 7eff0 | 110 | Initializes a soft reset + * + */ +void SoftResetInit(void) +{ + // Non-EU regions presumably use the CutsceneData struct for non-gameplay RAM, + // since the offsets for bldcnt and dispcnt line up + + CallbackSetVblank(SoftResetVBlank_Empty); + + #ifdef REGION_EU + BitFill(3, 0, &gNonGameplayRam, sizeof(gNonGameplayRam), 32); + #else // !REGION_EU + DMA3_FILL_32(0, &gNonGameplayRam, sizeof(gNonGameplayRam)); + #endif + + #ifdef REGION_EU + if (gSubGameMode1 == 0) + WRITE_16(REG_BLDCNT, LANGUAGE_SELECT_DATA.bldcnt = BLDCNT_SCREEN_FIRST_TARGET | BLDCNT_BRIGHTNESS_INCREASE_EFFECT); + else + WRITE_16(REG_BLDCNT, LANGUAGE_SELECT_DATA.bldcnt = UCHAR_MAX); + #else // !REGION_EU + WRITE_16(REG_BLDCNT, CUTSCENE_DATA.bldcnt = BLDCNT_SCREEN_FIRST_TARGET | BLDCNT_BRIGHTNESS_INCREASE_EFFECT); + #endif + + WRITE_16(REG_BLDY, gWrittenToBldy_NonGameplay = BLDY_MAX_VALUE); + #ifdef REGION_EU + WRITE_16(REG_DISPCNT, LANGUAGE_SELECT_DATA.dispcnt = 0); + #else // !REGION_EU + WRITE_16(REG_DISPCNT, CUTSCENE_DATA.dispcnt = 0); + #endif // REGION_EU + + gNextOamSlot = 0; + ClearGfxRam(); + ResetFreeOam(); + + gOamXOffset_NonGameplay = gOamYOffset_NonGameplay = 0; + #ifndef REGION_EU + SET_BACKDROP_COLOR(COLOR_BLACK); + #endif // !REGION_EU + gSubGameMode3 = 0; + + gBg0HOFS_NonGameplay = gBg0VOFS_NonGameplay = 0; + gBg1HOFS_NonGameplay = gBg1VOFS_NonGameplay = 0; + gBg2HOFS_NonGameplay = gBg2VOFS_NonGameplay = 0; + gBg3HOFS_NonGameplay = gBg3VOFS_NonGameplay = 0; + + WRITE_16(REG_BG0HOFS, 0); + WRITE_16(REG_BG0VOFS, 0); + WRITE_16(REG_BG1HOFS, 0); + WRITE_16(REG_BG1VOFS, 0); + WRITE_16(REG_BG2HOFS, 0); + WRITE_16(REG_BG2VOFS, 0); + WRITE_16(REG_BG3HOFS, 0); + WRITE_16(REG_BG3VOFS, 0); + + #ifdef REGION_EU + LANGUAGE_SELECT_DATA.selectedLanguage = gLanguage; + + if (INVALID_EU_LANGUAGE(LANGUAGE_SELECT_DATA.selectedLanguage)) + { + LANGUAGE_SELECT_DATA.selectedLanguage = LANGUAGE_ENGLISH; + LANGUAGE_SELECT_DATA.loadLanguageSelect = TRUE; + } + else + { + LANGUAGE_SELECT_DATA.loadLanguageSelect = gSubGameMode1 == 7; + } + + if (LANGUAGE_SELECT_DATA.loadLanguageSelect) + { + LANGUAGE_SELECT_DATA.languageAnimation = sInitialLanguageColorAnimation; + + DMA3_COPY_16(sLanguageSelectBgPal, PALRAM_BASE, COLORS_IN_PAL); + SET_BACKDROP_COLOR(COLOR_BLACK); + + LZ77UncompVram(sLanguageSelectGfx, VRAM_BASE); + LZ77UncompVram(sLanguageSelectTileTable, VRAM_BASE + 0xF800); + + LanguageSelectChangeHighlight(TRUE, LANGUAGE_SELECT_DATA.selectedLanguage); + + WRITE_16(REG_BG0CNT, 0); + WRITE_16(REG_BG2CNT, 0); + WRITE_16(REG_BG1CNT, 0); + WRITE_16(REG_BG3CNT, 0x1F03); + LANGUAGE_SELECT_DATA.dispcnt = 0x800; + } + else + { + SET_BACKDROP_COLOR(COLOR_BLACK); + LANGUAGE_SELECT_DATA.dispcnt = 0; + } + + WRITE_16(REG_DISPCNT, LANGUAGE_SELECT_DATA.dispcnt); + #else // !REGION_EU + WRITE_16(REG_DISPCNT, CUTSCENE_DATA.dispcnt = 0); + #endif // REGION_EU + + CallbackSetVblank(SoftResetVBlank); +} + +/** + * @brief 7f100 | 14 | V-blank code for a soft reset + * + */ +void SoftResetVBlank(void) +{ + WRITE_16(REG_BLDY, gWrittenToBldy_NonGameplay); + + #ifdef REGION_EU + WRITE_16(REG_BLDCNT, LANGUAGE_SELECT_DATA.bldcnt); + #endif // REGION_EU +} + +/** + * @brief 7f114 | c | Empty v-blank for a soft reset + * + */ +void SoftResetVBlank_Empty(void) +{ + vu8 c = 0; +} diff --git a/src/soft_reset_input.c b/src/soft_reset_input.c index 061045988..78951e46c 100644 --- a/src/soft_reset_input.c +++ b/src/soft_reset_input.c @@ -1,115 +1,115 @@ -#include "soft_reset_input.h" -#include "gba.h" -#include "macros.h" -#include "menus/boot_debug.h" - -#include "constants/game_state.h" -#include "structs/audio.h" -#include "structs/game_state.h" - -#include "data/menus/language_select_data.h" - -#define SOFT_RESET_KEYS (KEY_A | KEY_B | KEY_START | KEY_SELECT) - -/** - * @brief 7c4 | c | Removed code for V-Blank during soft reset - * - */ -void SoftResetVBlankCallback(void) -{ - /* probably left over from some debugging code */ - volatile u8 c = 0; -} - -/** - * @brief 7d0 | 34 | Checks for soft reset conditions - * - */ -void SoftResetCheck(void) -{ - if (gMainGameMode == GM_START_SOFT_RESET) - return; - - if (gDisableSoftReset) - return; - - if ((gButtonInput & SOFT_RESET_KEYS) == SOFT_RESET_KEYS) - gMainGameMode = GM_START_SOFT_RESET; -} - -/** - * @brief 804 | 108 | Prepares game and register states for a soft reset - * - */ -void SoftReset(void) -{ - #ifdef REGION_EU - s32 tmp; - #endif // REGION_EU - - HazeTransferAndDeactivate(); - RestartSound(); - - WRITE_16(REG_IME, FALSE); - WRITE_16(REG_IE, 0); - WRITE_16(REG_DISPSTAT, 0); - SET_BACKDROP_COLOR(COLOR_BLACK); - WRITE_16(REG_DISPCNT, 0); - WRITE_16(REG_BLDY, BLDY_MAX_VALUE); - WRITE_16(REG_BLDCNT, BLDCNT_SCREEN_FIRST_TARGET | BLDCNT_BRIGHTNESS_DECREASE_EFFECT); - - DMA3_FILL_32(0, EWRAM_BASE, EWRAM_SIZE); - DMA3_FILL_32(0, IWRAM_BASE, IWRAM_SIZE - 0x200); - - ClearGfxRam(); - LoadInterruptCode(); - CallbackSetVblank(SoftResetVBlankCallback); - SramRead_All(); - InitializeAudio(); - #ifdef BUGFIX - SramRead_SoundMode(); - FileSelectApplyStereo(); - #endif // BUGFIX - - WRITE_16(REG_IE, IF_VBLANK | IF_DMA2 | IF_GAMEPAK); - WRITE_16(REG_DISPSTAT, DSTAT_IF_VBLANK); - - #ifdef DEBUG - BootDebugReadSram(); - gMainGameMode = gDebugMode ? GM_DEBUG_MENU : GM_INTRO; - #else // !DEBUG - gMainGameMode = GM_INTRO; - #endif // DEBUG - - gSubGameMode1 = 0; - gSubGameMode2 = 0; - gResetGame = FALSE; - gStereoFlag = 0; - - #ifdef REGION_EU - #ifdef DEBUG - if (gMainGameMode == GM_INTRO) - #endif // DEBUG - { - if (INVALID_EU_LANGUAGE(gLanguage)) - { - gMainGameMode = GM_SOFT_RESET; - gSubGameMode1 = sLanguageSelectGameModeSub1Values[1]; - } - } - #endif // REGION_EU - - gButtonInput = KEY_NONE; - gPreviousButtonInput = KEY_NONE; - gChangedInput = KEY_NONE; - - WRITE_16(REG_IF, USHORT_MAX); - // TODO: Find a better way to get a match here - #if defined(REGION_EU) && !defined(REGION_EU_BETA) - // Written this way to produce matching ASM - tmp = TRUE; - WRITE_16(REG_IME, tmp); - #else // !REGION_EU || REGION_EU_BETA - WRITE_16(REG_IME, TRUE); - #endif // REGION_EU && !REGION_EU_BETA -} +#include "soft_reset_input.h" +#include "gba.h" +#include "macros.h" +#include "menus/boot_debug.h" + +#include "constants/game_state.h" +#include "structs/audio.h" +#include "structs/game_state.h" + +#include "data/menus/language_select_data.h" + +#define SOFT_RESET_KEYS (KEY_A | KEY_B | KEY_START | KEY_SELECT) + +/** + * @brief 7c4 | c | Removed code for V-Blank during soft reset + * + */ +void SoftResetVBlankCallback(void) +{ + /* probably left over from some debugging code */ + volatile u8 c = 0; +} + +/** + * @brief 7d0 | 34 | Checks for soft reset conditions + * + */ +void SoftResetCheck(void) +{ + if (gMainGameMode == GM_START_SOFT_RESET) + return; + + if (gDisableSoftReset) + return; + + if ((gButtonInput & SOFT_RESET_KEYS) == SOFT_RESET_KEYS) + gMainGameMode = GM_START_SOFT_RESET; +} + +/** + * @brief 804 | 108 | Prepares game and register states for a soft reset + * + */ +void SoftReset(void) +{ + #ifdef REGION_EU + s32 tmp; + #endif // REGION_EU + + HazeTransferAndDeactivate(); + RestartSound(); + + WRITE_16(REG_IME, FALSE); + WRITE_16(REG_IE, 0); + WRITE_16(REG_DISPSTAT, 0); + SET_BACKDROP_COLOR(COLOR_BLACK); + WRITE_16(REG_DISPCNT, 0); + WRITE_16(REG_BLDY, BLDY_MAX_VALUE); + WRITE_16(REG_BLDCNT, BLDCNT_SCREEN_FIRST_TARGET | BLDCNT_BRIGHTNESS_DECREASE_EFFECT); + + DMA3_FILL_32(0, EWRAM_BASE, EWRAM_SIZE); + DMA3_FILL_32(0, IWRAM_BASE, IWRAM_SIZE - 0x200); + + ClearGfxRam(); + LoadInterruptCode(); + CallbackSetVblank(SoftResetVBlankCallback); + SramRead_All(); + InitializeAudio(); + #ifdef BUGFIX + SramRead_SoundMode(); + FileSelectApplyStereo(); + #endif // BUGFIX + + WRITE_16(REG_IE, IF_VBLANK | IF_DMA2 | IF_GAMEPAK); + WRITE_16(REG_DISPSTAT, DSTAT_IF_VBLANK); + + #ifdef DEBUG + BootDebugReadSram(); + gMainGameMode = gDebugMode ? GM_DEBUG_MENU : GM_INTRO; + #else // !DEBUG + gMainGameMode = GM_INTRO; + #endif // DEBUG + + gSubGameMode1 = 0; + gSubGameMode2 = 0; + gResetGame = FALSE; + gStereoFlag = 0; + + #ifdef REGION_EU + #ifdef DEBUG + if (gMainGameMode == GM_INTRO) + #endif // DEBUG + { + if (INVALID_EU_LANGUAGE(gLanguage)) + { + gMainGameMode = GM_SOFT_RESET; + gSubGameMode1 = sLanguageSelectGameModeSub1Values[1]; + } + } + #endif // REGION_EU + + gButtonInput = KEY_NONE; + gPreviousButtonInput = KEY_NONE; + gChangedInput = KEY_NONE; + + WRITE_16(REG_IF, USHORT_MAX); + // TODO: Find a better way to get a match here + #if defined(REGION_EU) && !defined(REGION_EU_BETA) + // Written this way to produce matching ASM + tmp = TRUE; + WRITE_16(REG_IME, tmp); + #else // !REGION_EU || REGION_EU_BETA + WRITE_16(REG_IME, TRUE); + #endif // REGION_EU && !REGION_EU_BETA +} diff --git a/src/sprite.c b/src/sprite.c index c4cef44d6..29b499d31 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -1,2117 +1,2117 @@ -#include "sprite.h" -#include "sprite_debris.h" -#include "syscalls.h" -#include "gba.h" -#include "macros.h" -#include "fixed_point.h" -#include "sprites_ai/sprites.h" - -#include "data/generic_data.h" -#include "data/sprite_data.h" -#include "data/sprites/unused_sprites.h" -#include "data/sprites/charge_beam.h" -#include "data/sprites/deorem.h" -#include "data/sprites/dragon.h" -#include "data/sprites/elevator_pad.h" -#include "data/sprites/enemy_drop.h" -#include "data/sprites/geruta.h" -#include "data/sprites/hive.h" -#include "data/sprites/imago_cocoon.h" -#include "data/sprites/map_station.h" -#include "data/sprites/metroid.h" -#include "data/sprites/message_banner.h" -#include "data/sprites/zoomer.h" -#include "data/sprites/zeela.h" -#include "data/sprites/ripper.h" -#include "data/sprites/zeb.h" -#include "data/sprites/skree.h" -#include "data/sprites/morph_ball.h" -#include "data/sprites/chozo_statue.h" -#include "data/sprites/sova.h" -#include "data/sprites/multiviola.h" -#include "data/sprites/squeept.h" -#include "data/sprites/reo.h" -#include "data/sprites/gunship.h" -#include "data/sprites/skultera.h" -#include "data/sprites/dessgeega.h" -#include "data/sprites/waver.h" -#include "data/sprites/power_grip.h" -#include "data/sprites/imago_larva.h" -#include "data/sprites/morph_ball_launcher.h" -#include "data/sprites/space_pirate.h" -#include "data/sprites/gamet.h" -#include "data/sprites/zebbo.h" -#include "data/sprites/worker_robot.h" -#include "data/sprites/parasite.h" -#include "data/sprites/piston.h" -#include "data/sprites/ridley.h" -#include "data/sprites/security_gate.h" -#include "data/sprites/zipline_generator.h" -#include "data/sprites/polyp.h" -#include "data/sprites/rinka.h" -#include "data/sprites/viola.h" -#include "data/sprites/geron_norfair.h" -#include "data/sprites/holtz.h" -#include "data/sprites/gekitai_machine.h" -#include "data/sprites/ruins_test.h" -#include "data/sprites/save_platform.h" -#include "data/sprites/kraid.h" -#include "data/sprites/ripper2.h" -#include "data/sprites/mella.h" -#include "data/sprites/atomic.h" -#include "data/sprites/area_banner.h" -#include "data/sprites/mother_brain.h" -#include "data/sprites/acid_worm.h" -#include "data/sprites/escape_ship.h" -#include "data/sprites/sidehopper.h" -#include "data/sprites/geega.h" -#include "data/sprites/zebetite_and_cannon.h" -#include "data/sprites/zipline.h" -#include "data/sprites/imago_larva_right_side.h" -#include "data/sprites/tangle_vine.h" -#include "data/sprites/imago.h" -#include "data/sprites/crocomire.h" -#include "data/sprites/geron.h" -#include "data/sprites/glass_tube.h" -#include "data/sprites/save_platform_chozodia.h" -#include "data/sprites/baristute.h" -#include "data/sprites/elevator_statue.h" -#include "data/sprites/rising_chozo_pillar.h" -#include "data/sprites/security_laser.h" -#include "data/sprites/boss_statues.h" -#include "data/sprites/searchlight_eye.h" -#include "data/sprites/steam.h" -#include "data/sprites/unknown_item_block.h" -#include "data/sprites/unknown_item_chozo_statue.h" -#include "data/sprites/gadora.h" -#include "data/sprites/searchlight.h" -#include "data/sprites/space_pirate_carrying_power_bomb.h" -#include "data/sprites/falling_chozo_pillar.h" -#include "data/sprites/mecha_ridley.h" -#include "data/sprites/escape_gate.h" -#include "data/spriteset.h" - -#include "constants/game_state.h" -#include "constants/connection.h" -#include "constants/sprite.h" -#include "constants/particle.h" - -#include "structs/bg_clip.h" -#include "structs/game_state.h" -#include "structs/room.h" -#include "structs/samus.h" - -#define MAX_AMOUNT_OF_SPRITESET 114 - -static Func_T sPrimarySpritesAIPointers[PSPRITE_COUNT] = { - [PSPRITE_UNUSED0] = UnusedSprites, - [PSPRITE_UNUSED1] = UnusedSprites, - [PSPRITE_UNUSED2] = UnusedSprites, - [PSPRITE_UNUSED3] = UnusedSprites, - [PSPRITE_UNUSED4] = UnusedSprites, - [PSPRITE_UNUSED5] = UnusedSprites, - [PSPRITE_UNUSED6] = UnusedSprites, - [PSPRITE_UNUSED7] = UnusedSprites, - [PSPRITE_UNUSED8] = UnusedSprites, - [PSPRITE_UNUSED9] = UnusedSprites, - [PSPRITE_UNUSED10] = UnusedSprites, - [PSPRITE_UNUSED11] = UnusedSprites, - [PSPRITE_UNUSED12] = UnusedSprites, - [PSPRITE_UNUSED13] = UnusedSprites, - [PSPRITE_UNUSED14] = UnusedSprites, - [PSPRITE_UNUSED15] = UnusedSprites, - [PSPRITE_UNUSED16] = UnusedSprites, - [PSPRITE_MESSAGE_BANNER] = MessageBanner, - [PSPRITE_ZOOMER_YELLOW] = Zoomer, - [PSPRITE_ZOOMER_RED] = Zoomer, - [PSPRITE_ZEELA] = Zeela, - [PSPRITE_ZEELA_RED] = Zeela, - [PSPRITE_RIPPER_BROWN] = Ripper, - [PSPRITE_RIPPER_PURPLE] = Ripper, - [PSPRITE_ZEB] = Zeb, - [PSPRITE_ZEB_BLUE] = Zeb, - [PSPRITE_LARGE_ENERGY_DROP] = EnemyDrop, - [PSPRITE_SMALL_ENERGY_DROP] = EnemyDrop, - [PSPRITE_MISSILE_DROP] = EnemyDrop, - [PSPRITE_SUPER_MISSILE_DROP] = EnemyDrop, - [PSPRITE_POWER_BOMB_DROP] = EnemyDrop, - [PSPRITE_SKREE_GREEN] = Skree, - [PSPRITE_SKREE_BLUE] = Skree, - [PSPRITE_MORPH_BALL] = MorphBall, - [PSPRITE_CHOZO_STATUE_LONG_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_LONG] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_ICE_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_ICE] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_WAVE_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_WAVE] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_BOMB_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_BOMB] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_SPEEDBOOSTER_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_SPEEDBOOSTER] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_HIGH_JUMP_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_HIGH_JUMP] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_SCREW_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_SCREW] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_VARIA_HINT] = ChozoStatue, - [PSPRITE_CHOZO_STATUE_VARIA] = ChozoStatue, - [PSPRITE_SOVA_PURPLE] = Sova, - [PSPRITE_SOVA_ORANGE] = Sova, - [PSPRITE_MULTIVIOLA] = Multiviola, - [PSPRITE_MULTIPLE_LARGE_ENERGY] = EnemyDrop, - [PSPRITE_GERUTA_RED] = Geruta, - [PSPRITE_GERUTA_GREEN] = Geruta, - [PSPRITE_SQUEEPT] = Squeept, - [PSPRITE_SQUEEPT_UNUSED] = Squeept, - [PSPRITE_MAP_STATION] = MapStation, - [PSPRITE_DRAGON] = Dragon, - [PSPRITE_DRAGON_UNUSED] = Dragon, - [PSPRITE_ZIPLINE] = Zipline, - [PSPRITE_ZIPLINE_BUTTON] = ZiplineButton, - [PSPRITE_REO_GREEN_WINGS] = Reo, - [PSPRITE_REO_PURPLE_WINGS] = Reo, - [PSPRITE_GUNSHIP] = Gunship, - [PSPRITE_DEOREM_FIRST_LOCATION] = Deorem, - [PSPRITE_DEOREM_SECOND_LOCATION] = Deorem, - [PSPRITE_CHARGE_BEAM] = ChargeBeam, - [PSPRITE_SKULTERA] = Skultera, - [PSPRITE_DESSGEEGA] = Dessgeega, - [PSPRITE_DESSGEEGA_AFTER_LONG_BEAM] = Dessgeega, - [PSPRITE_WAVER] = Waver, - [PSPRITE_WAVER_UNUSED] = Waver, - [PSPRITE_MELLOW] = Mellow, - [PSPRITE_HIVE] = Hive, - [PSPRITE_POWER_GRIP] = PowerGrip, - [PSPRITE_IMAGO_LARVA_RIGHT] = ImagoLarva, - [PSPRITE_MORPH_BALL_LAUNCHER] = MorphBallLauncher, - [PSPRITE_IMAGO_COCOON] = ImagoCocoon, - [PSPRITE_ELEVATOR_PAD] = ElevatorPad, - [PSPRITE_SPACE_PIRATE] = SpacePirate, - [PSPRITE_SPACE_PIRATE_WAITING1] = SpacePirate, - [PSPRITE_SPACE_PIRATE_WAITING2] = SpacePirate, - [PSPRITE_SPACE_PIRATE_WAITING3] = SpacePirate, - [PSPRITE_SPACE_PIRATE2] = SpacePirate, - [PSPRITE_GAMET_BLUE_SINGLE] = Gamet, - [PSPRITE_GAMET_RED_SINGLE] = Gamet, - [PSPRITE_CHOZO_STATUE_GRAVITY] = UnknownItemChozoStatue, - [PSPRITE_CHOZO_STATUE_SPACE_JUMP] = UnknownItemChozoStatue, - [PSPRITE_SECURITY_GATE_DEFAULT_OPEN] = SecurityGateDefaultOpen, - [PSPRITE_ZEBBO_GREEN] = Zebbo, - [PSPRITE_ZEBBO_YELLOW] = Zebbo, - [PSPRITE_WORKER_ROBOT] = WorkerRobot, - [PSPRITE_PARASITE_MULTIPLE] = ParasiteMultiple, - [PSPRITE_PARASITE] = Parasite, - [PSPRITE_PISTON] = Piston, - [PSPRITE_RIDLEY] = Ridley, - [PSPRITE_SECURITY_GATE_DEFAULT_CLOSED] = SecurityGateDefaultClosed, - [PSPRITE_ZIPLINE_GENERATOR] = ZiplineGenerator, - [PSPRITE_METROID] = Metroid, - [PSPRITE_FROZEN_METROID] = Metroid, - [PSPRITE_RINKA_ORANGE] = Rinka, - [PSPRITE_POLYP] = Polyp, - [PSPRITE_VIOLA_BLUE] = Viola, - [PSPRITE_VIOLA_ORANGE] = Viola, - [PSPRITE_GERON_NORFAIR] = GeronNorfair, - [PSPRITE_HOLTZ] = Holtz, - [PSPRITE_GEKITAI_MACHINE] = GekitaiMachine, - [PSPRITE_RUINS_TEST] = RuinsTest, - [PSPRITE_SAVE_PLATFORM] = SavePlatform, - [PSPRITE_KRAID] = Kraid, - [PSPRITE_IMAGO_COCOON_AFTER_FIGHT] = ImagoCocoonAfterFight, - [PSPRITE_RIPPERII] = Ripper2, - [PSPRITE_MELLA] = Mella, - [PSPRITE_ATOMIC] = Atomic, - [PSPRITE_AREA_BANNER] = AreaBanner, - [PSPRITE_MOTHER_BRAIN] = MotherBrain, - [PSPRITE_FAKE_POWER_BOMB_EVENT_TRIGGER] = FakePowerBombEventTrigger, - [PSPRITE_ACID_WORM] = AcidWorm, - [PSPRITE_ESCAPE_SHIP] = EscapeShip, - [PSPRITE_SIDEHOPPER] = Sidehopper, - [PSPRITE_GEEGA] = Geega, - [PSPRITE_GEEGA_WHITE] = Geega, - [PSPRITE_RINKA_MOTHER_BRAIN] = RinkaMotherBrain, - [PSPRITE_ZEBETITE_ONE_AND_THREE] = Zebetite, - [PSPRITE_CANNON] = Cannon, - [PSPRITE_IMAGO_LARVA_RIGHT_SIDE] = ImagoLarvaRightSide, - [PSPRITE_TANGLE_VINE_TALL] = TangleVineTall, - [PSPRITE_TANGLE_VINE_MEDIUM] = TangleVineMedium, - [PSPRITE_TANGLE_VINE_CURVED] = TangleVineCurved, - [PSPRITE_TANGLE_VINE_SHORT] = TangleVineShort, - [PSPRITE_MELLOW_SWARM] = MellowSwarm, - [PSPRITE_MELLOW_SWARM_HEALTH_BASED] = MellowSwarm, - [PSPRITE_IMAGO] = Imago, - [PSPRITE_ZEBETITE_TWO_AND_FOUR] = Zebetite, - [PSPRITE_CANNON2] = Cannon, - [PSPRITE_CANNON3] = Cannon, - [PSPRITE_CROCOMIRE] = Crocomire, - [PSPRITE_IMAGO_LARVA_LEFT] = ImagoLarva, - [PSPRITE_GERON_BRINSTAR_ROOM_15] = Geron, - [PSPRITE_GERON_BRINSTAR_ROOM_1C] = Geron, - [PSPRITE_GERON_VARIA1] = Geron, - [PSPRITE_GERON_VARIA2] = Geron, - [PSPRITE_GERON_VARIA3] = Geron, - [PSPRITE_GLASS_TUBE] = GlassTube, - [PSPRITE_SAVE_PLATFORM_CHOZODIA] = SavePlatformChozodia, - [PSPRITE_BARISTUTE] = Baristute, - [PSPRITE_CHOZO_STATUE_PLASMA_BEAM] = UnknownItemChozoStatue, - [PSPRITE_KRAID_ELEVATOR_STATUE] = KraidElevatorStatue, - [PSPRITE_RIDLEY_ELEVATOR_STATUE] = RidleyElevatorStatue, - [PSPRITE_RISING_CHOZO_PILLAR] = RisingChozoPillar, - [PSPRITE_SECURITY_LASER_VERTICAL] = SecurityLaser, - [PSPRITE_SECURITY_LASER_HORIZONTAL] = SecurityLaser, - [PSPRITE_SECURITY_LASER_VERTICAL2] = SecurityLaser, - [PSPRITE_SECURITY_LASER_HORIZONTAL2] = SecurityLaser, - [PSPRITE_LOCK_UNLOCK_METROID_DOORS_UNUSED] = MetroidDoorLock, - [PSPRITE_GAMET_BLUE_LEADER] = Gamet, - [PSPRITE_GAMET_BLUE_FOLLOWER] = Gamet, - [PSPRITE_GEEGA_LEADER] = Geega, - [PSPRITE_GEEGA_FOLLOWER] = Geega, - [PSPRITE_ZEBBO_GREEN_LEADER] = Zebbo, - [PSPRITE_ZEBBO_GREEN_FOLLOWER] = Zebbo, - [PSPRITE_KRAID_STATUE] = KraidStatue, - [PSPRITE_RIDLEY_STATUE] = RidleyStatue, - [PSPRITE_RINKA_GREEN] = Rinka, - [PSPRITE_SEARCHLIGHT_EYE] = SearchlightEye, - [PSPRITE_SEARCHLIGHT_EYE2] = SearchlightEye, - [PSPRITE_STEAM_LARGE] = Steam, - [PSPRITE_STEAM_SMALL] = Steam, - [PSPRITE_PLASMA_BEAM_BLOCK] = UnknownItemBlock, - [PSPRITE_GRAVITY_SUIT_BLOCK] = UnknownItemBlock, - [PSPRITE_SPACE_JUMP_BLOCK] = UnknownItemBlock, - [PSPRITE_GADORA_KRAID] = Gadora, - [PSPRITE_GADORA_RIDLEY] = Gadora, - [PSPRITE_SEARCHLIGHT] = Searchlight, - [PSPRITE_SEARCHLIGHT2] = Searchlight, - [PSPRITE_SEARCHLIGHT3] = Searchlight, - [PSPRITE_SEARCHLIGHT4] = Searchlight, - [PSPRITE_MAYBE_SEARCHLIGHT_TRIGGER] = PrimarySpriteB3, - [PSPRITE_DISCOVERED_IMAGO_PASSAGE_EVENT_TRIGGER] = EventTriggerDiscoveredImagoPassage, - [PSPRITE_FAKE_POWER_BOMB] = FakePowerBomb, - [PSPRITE_SPACE_PIRATE_CARRYING_POWER_BOMB] = SpacePirateCarryingPowerBomb, - [PSPRITE_TANGLE_VINE_RED_GARUTA] = TangleVineRedGeruta, - [PSPRITE_TANGLE_VINE_GERUTA] = TangleVineGeruta, - [PSPRITE_TANGLE_VINE_LARVA_RIGHT] = TangleVineLarvaRight, - [PSPRITE_TANGLE_VINE_LARVA_LEFT] = TangleVineLarvaLeft, - [PSPRITE_WATER_DROP] = WaterDrop, - [PSPRITE_FALLING_CHOZO_PILLAR] = FallingChozoPillar, - [PSPRITE_MECHA_RIDLEY] = MechaRidley, - [PSPRITE_EXPLOSION_ZEBES_ESCAPE] = ExplosionZebesEscape, - [PSPRITE_STEAM_LARGE_DIAGONAL_UP] = SteamDiagonal, - [PSPRITE_STEAM_SMALL_DIAGONAL_UP] = SteamDiagonal, - [PSPRITE_STEAM_LARGE_DIAGONAL_DOWN] = SteamDiagonal, - [PSPRITE_STEAM_SMALL_DIAGONAL_DOWN] = SteamDiagonal, - [PSPRITE_BARISTUTE_KRAID_UPPER] = Baristute, - [PSPRITE_ESCAPE_GATE1] = EscapeGate, - [PSPRITE_ESCAPE_GATE2] = EscapeGate, - [PSPRITE_BLACK_SPACE_PIRATE] = BlackSpacePirate, - [PSPRITE_ESCAPE_SHIP_SPACE_PIRATE] = EscapeShipSpacePirate, - [PSPRITE_BARISTUTE_KRAID_LOWER] = Baristute, - [PSPRITE_RINKA_MOTHER_BRAIN2] = RinkaMotherBrain, - [PSPRITE_RINKA_MOTHER_BRAIN3] = RinkaMotherBrain, - [PSPRITE_RINKA_MOTHER_BRAIN4] = RinkaMotherBrain, - [PSPRITE_RINKA_MOTHER_BRAIN5] = RinkaMotherBrain, - [PSPRITE_RINKA_MOTHER_BRAIN6] = RinkaMotherBrain -}; - -static const u32* sSpritesGraphicsPointers[PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_COUNT)] = { - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_UNUSED16)] = sUnusedSpritesGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MESSAGE_BANNER)] = sMessageBannerGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_YELLOW)] = sZoomerGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_RED)] = sZoomerGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA_RED)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_BROWN)] = sRipperBrownGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_PURPLE)] = sRipperPurpleGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB)] = sZebPinkGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB_BLUE)] = sZebBlueGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LARGE_ENERGY_DROP)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SMALL_ENERGY_DROP)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MISSILE_DROP)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SUPER_MISSILE_DROP)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_BOMB_DROP)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_GREEN)] = sSkreeGreenGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_BLUE)] = sSkreeBlueGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL)] = sMorphBallGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG_HINT)] = sChozoStatueLongBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG)] = sChozoStatueLongBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE_HINT)] = sChozoStatueIceBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE)] = sChozoStatueIceBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE_HINT)] = sChozoStatueWaveBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE)] = sChozoStatueWaveBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB_HINT)] = sChozoStatueBombsGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB)] = sChozoStatueBombsGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER_HINT)] = sChozoStatueSpeedboosterGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER)] = sChozoStatueSpeedboosterGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP_HINT)] = sChozoStatueHighJumpGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP)] = sChozoStatueHighJumpGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW_HINT)] = sChozoStatueScrewAttackGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW)] = sChozoStatueScrewAttackGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA_HINT)] = sChozoStatueVariaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA)] = sChozoStatueVariaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_PURPLE)] = sSovaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_ORANGE)] = sSovaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIVIOLA)] = sMultiviolaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIPLE_LARGE_ENERGY)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_RED)] = sGerutaRedGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_GREEN)] = sGerutaGreenGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT)] = sSqueeptGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT_UNUSED)] = sSqueeptGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAP_STATION)] = sMapStationGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON)] = sDragonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON_UNUSED)] = sDragonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE)] = sZiplineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_BUTTON)] = sZiplineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_GREEN_WINGS)] = sReoGreenWingsGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_PURPLE_WINGS)] = sReoPurpleWingsGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GUNSHIP)] = sGunshipGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_FIRST_LOCATION)] = sDeoremGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_SECOND_LOCATION)] = sDeoremGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHARGE_BEAM)] = sChargeBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKULTERA)] = sSkulteraGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA)] = sDessgeegaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA_AFTER_LONG_BEAM)] = sDessgeegaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER)] = sWaverGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER_UNUSED)] = sWaverGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW)] = sHiveGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HIVE)] = sHiveGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_GRIP)] = sPowerGripGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT)] = sImagoLarvaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL_LAUNCHER)] = sMorphBallLauncherGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON)] = sImagoCocoonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ELEVATOR_PAD)] = sElevatorPadGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING1)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING2)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING3)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE2)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_SINGLE)] = sGametBlueGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_RED_SINGLE)] = sGametRedGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_GRAVITY)] = sChozoStatueGravitySuitGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPACE_JUMP)] = sChozoStatueSpaceJumpGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_OPEN)] = sSecurityGateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN)] = sZebboGreenGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_YELLOW)] = sZebboYellowGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WORKER_ROBOT)] = sWorkerRobotGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE_MULTIPLE)] = sParasiteGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE)] = sParasiteGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PISTON)] = sPistonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY)] = sRidleyGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_CLOSED)] = sSecurityGateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_GENERATOR)] = sZiplineGeneratorGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_METROID)] = sMetroidGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FROZEN_METROID)] = sMetroidGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_ORANGE)] = sRinkaOrangeGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POLYP)] = sPolypGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_BLUE)] = sViolaBlueGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_ORANGE)] = sViolaOrangeGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_NORFAIR)] = sGeronNorfairGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HOLTZ)] = sHoltzGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEKITAI_MACHINE)] = sGekitaiMachineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RUINS_TEST)] = sRuinsTestGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM)] = sSavePlatformGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID)] = sKraidGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON_AFTER_FIGHT)] = sImagoCocoonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPERII)] = sRipper2Gfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLA)] = sMellaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ATOMIC)] = sAtomicGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_AREA_BANNER)] = sAreaBannerGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MOTHER_BRAIN)] = sMotherBrainGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB_EVENT_TRIGGER)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ACID_WORM)] = sAcidWormGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP)] = sEscapeShipGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SIDEHOPPER)] = sSidehopperGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA)] = sGeegaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_WHITE)] = sGeegaWhiteGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_ONE_AND_THREE)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT_SIDE)] = sImagoLarvaRightSideGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_TALL)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_MEDIUM)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_CURVED)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_SHORT)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM)] = sHiveGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM_HEALTH_BASED)] = sHiveGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO)] = sImagoGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_TWO_AND_FOUR)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON2)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON3)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CROCOMIRE)] = sCrocomireGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_LEFT)] = sImagoLarvaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_15)] = sGeronGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_1C)] = sGeronGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA1)] = sGeronGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA2)] = sGeronGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA3)] = sGeronGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GLASS_TUBE)] = sGlassTubeGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM_CHOZODIA)] = sSavePlatformChozodiaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE)] = sBaristuteGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_PLASMA_BEAM)] = sChozoStatuePlasmaBeamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_ELEVATOR_STATUE)] = sElevatorStatuesGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_ELEVATOR_STATUE)] = sElevatorStatuesGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RISING_CHOZO_PILLAR)] = sRisingChozoPillarGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL)] = sSecurityLaserGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL)] = sSecurityLaserGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL2)] = sSecurityLaserGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL2)] = sSecurityLaserGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LOCK_UNLOCK_METROID_DOORS_UNUSED)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_LEADER)] = sGametBlueGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_FOLLOWER)] = sGametBlueGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_LEADER)] = sGeegaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_FOLLOWER)] = sGeegaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_LEADER)] = sZebboGreenGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_FOLLOWER)] = sZebboGreenGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_STATUE)] = sBossStatuesGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_STATUE)] = sBossStatuesGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_GREEN)] = sRinkaGreenGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE)] = sSearchlightEyeGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE2)] = sSearchlightEyeGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE)] = sSteamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL)] = sSteamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PLASMA_BEAM_BLOCK)] = sPlasmaBeamBlockGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GRAVITY_SUIT_BLOCK)] = sGravityBlockGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_JUMP_BLOCK)] = sSpaceJumpBlockGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_KRAID)] = sGadoraGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_RIDLEY)] = sGadoraGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT)] = sSearchlightGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT2)] = sSearchlightGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT3)] = sSearchlightGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT4)] = sSearchlightGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAYBE_SEARCHLIGHT_TRIGGER)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DISCOVERED_IMAGO_PASSAGE_EVENT_TRIGGER)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB)] = sFakePowerBombGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_CARRYING_POWER_BOMB)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_RED_GARUTA)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_GERUTA)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_RIGHT)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_LEFT)] = sTangleVineGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WATER_DROP)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FALLING_CHOZO_PILLAR)] = sFallingChozoPillarGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MECHA_RIDLEY)] = sMechaRidleyGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_EXPLOSION_ZEBES_ESCAPE)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_UP)] = sSteamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_UP)] = sSteamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_DOWN)] = sSteamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_DOWN)] = sSteamGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_UPPER)] = sBaristuteGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE1)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE2)] = sZeelaGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BLACK_SPACE_PIRATE)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP_SPACE_PIRATE)] = sSpacePirateGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_LOWER)] = sBaristuteGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN2)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN3)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN4)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN5)] = sRinkaZebetiteAndCannonGfx, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN6)] = sRinkaZebetiteAndCannonGfx -}; - -static const u16* sSpritesPalettePointers[PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_COUNT)] = { - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_UNUSED16)] = sUnusedSpritesPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MESSAGE_BANNER)] = sMessageBannerPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_YELLOW)] = sZoomerPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_RED)] = sZoomerPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA_RED)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_BROWN)] = sRipperBrownPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_PURPLE)] = sRipperPurplePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB)] = sZebPinkPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB_BLUE)] = sZebBluePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LARGE_ENERGY_DROP)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SMALL_ENERGY_DROP)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MISSILE_DROP)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SUPER_MISSILE_DROP)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_BOMB_DROP)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_GREEN)] = sSkreeGreenPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_BLUE)] = sSkreeBluePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL)] = sMorphBallPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG_HINT)] = sChozoStatueLongBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG)] = sChozoStatueLongBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE_HINT)] = sChozoStatueIceBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE)] = sChozoStatueIceBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE_HINT)] = sChozoStatueWaveBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE)] = sChozoStatueWaveBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB_HINT)] = sChozoStatueBombsPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB)] = sChozoStatueBombsPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER_HINT)] = sChozoStatueSpeedboosterPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER)] = sChozoStatueSpeedboosterPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP_HINT)] = sChozoStatueHighJumpPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP)] = sChozoStatueHighJumpPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW_HINT)] = sChozoStatueScrewAttackPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW)] = sChozoStatueScrewAttackPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA_HINT)] = sChozoStatueVariaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA)] = sChozoStatueVariaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_PURPLE)] = sSovaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_ORANGE)] = sSovaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIVIOLA)] = sMultiviolaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIPLE_LARGE_ENERGY)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_RED)] = sGerutaRedPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_GREEN)] = sGerutaGreenPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT)] = sSqueeptPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT_UNUSED)] = sSqueeptPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAP_STATION)] = sMapStationPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON)] = sDragonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON_UNUSED)] = sDragonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE)] = sZiplinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_BUTTON)] = sZiplinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_GREEN_WINGS)] = sReoGreenWingsPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_PURPLE_WINGS)] = sReoPurpleWingsPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GUNSHIP)] = sGunshipPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_FIRST_LOCATION)] = sDeoremPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_SECOND_LOCATION)] = sDeoremPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHARGE_BEAM)] = sChargeBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKULTERA)] = sSkulteraPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA)] = sDessgeegaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA_AFTER_LONG_BEAM)] = sDessgeegaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER)] = sWaverPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER_UNUSED)] = sWaverPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW)] = sHivePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HIVE)] = sHivePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_GRIP)] = sPowerGripPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT)] = sImagoLarvaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL_LAUNCHER)] = sMorphBallLauncherPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON)] = sImagoCocoonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ELEVATOR_PAD)] = sElevatorPadPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING1)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING2)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING3)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE2)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_SINGLE)] = sGametBluePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_RED_SINGLE)] = sGametRedPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_GRAVITY)] = sChozoStatueGravitySuitPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPACE_JUMP)] = sChozoStatueSpaceJumpPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_OPEN)] = sSecurityGatePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN)] = sZebboGreenPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_YELLOW)] = sZebboYellowPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WORKER_ROBOT)] = sWorkerRobotPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE_MULTIPLE)] = sParasitePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE)] = sParasitePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PISTON)] = sPistonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY)] = sRidleyPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_CLOSED)] = sSecurityGatePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_GENERATOR)] = sZiplineGeneratorPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_METROID)] = sMetroidPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FROZEN_METROID)] = sMetroidPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_ORANGE)] = sRinkaOrangePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POLYP)] = sPolypPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_BLUE)] = sViolaBluePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_ORANGE)] = sViolaOrangePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_NORFAIR)] = sGeronNorfairPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HOLTZ)] = sHoltzPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEKITAI_MACHINE)] = sGekitaiMachinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RUINS_TEST)] = sRuinsTestPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM)] = sSavePlatformPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID)] = sKraidPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON_AFTER_FIGHT)] = sImagoCocoonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPERII)] = sRipper2Pal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLA)] = sMellaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ATOMIC)] = sAtomicPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_AREA_BANNER)] = sAreaBannerPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MOTHER_BRAIN)] = sMotherBrainPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB_EVENT_TRIGGER)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ACID_WORM)] = sAcidWormPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP)] = sEscapeShipPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SIDEHOPPER)] = sSidehopperPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA)] = sGeegaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_WHITE)] = sGeegaWhitePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_ONE_AND_THREE)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT_SIDE)] = sImagoLarvaRightSidePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_TALL)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_MEDIUM)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_CURVED)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_SHORT)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM)] = sHivePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM_HEALTH_BASED)] = sHivePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO)] = sImagoPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_TWO_AND_FOUR)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON2)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON3)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CROCOMIRE)] = sCrocomirePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_LEFT)] = sImagoLarvaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_15)] = sGeronPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_1C)] = sGeronPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA1)] = sGeronPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA2)] = sGeronPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA3)] = sGeronPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GLASS_TUBE)] = sGlassTubePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM_CHOZODIA)] = sSavePlatformChozodiaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE)] = sBaristutePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_PLASMA_BEAM)] = sChozoStatuePlasmaBeamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_ELEVATOR_STATUE)] = sElevatorStatuesPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_ELEVATOR_STATUE)] = sElevatorStatuesPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RISING_CHOZO_PILLAR)] = sRisingChozoPillarPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL)] = sSecurityLaserPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL)] = sSecurityLaserPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL2)] = sSecurityLaserPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL2)] = sSecurityLaserPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LOCK_UNLOCK_METROID_DOORS_UNUSED)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_LEADER)] = sGametBluePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_FOLLOWER)] = sGametBluePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_LEADER)] = sGeegaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_FOLLOWER)] = sGeegaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_LEADER)] = sZebboGreenPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_FOLLOWER)] = sZebboGreenPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_STATUE)] = sBossStatuesPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_STATUE)] = sBossStatuesPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_GREEN)] = sRinkaGreenPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE)] = sSearchlightEyePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE2)] = sSearchlightEyePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE)] = sSteamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL)] = sSteamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PLASMA_BEAM_BLOCK)] = sPlasmaBeamBlockPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GRAVITY_SUIT_BLOCK)] = sGravityBlockPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_JUMP_BLOCK)] = sSpaceJumpBlockPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_KRAID)] = sGadoraPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_RIDLEY)] = sGadoraPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT)] = sSearchlightPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT2)] = sSearchlightPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT3)] = sSearchlightPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT4)] = sSearchlightPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAYBE_SEARCHLIGHT_TRIGGER)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DISCOVERED_IMAGO_PASSAGE_EVENT_TRIGGER)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB)] = sFakePowerBombPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_CARRYING_POWER_BOMB)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_RED_GARUTA)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_GERUTA)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_RIGHT)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_LEFT)] = sTangleVinePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WATER_DROP)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FALLING_CHOZO_PILLAR)] = sFallingChozoPillarPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MECHA_RIDLEY)] = sMechaRidleyPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_EXPLOSION_ZEBES_ESCAPE)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_UP)] = sSteamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_UP)] = sSteamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_DOWN)] = sSteamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_DOWN)] = sSteamPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_UPPER)] = sBaristutePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE1)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE2)] = sZeelaPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BLACK_SPACE_PIRATE)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP_SPACE_PIRATE)] = sSpacePiratePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_LOWER)] = sBaristutePal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN2)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN3)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN4)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN5)] = sRinkaZebetiteAndCannonPal, - [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN6)] = sRinkaZebetiteAndCannonPal -}; - -static Func_T sSecondarySpritesAIPointers[SSPRITE_COUNT] = { - [SSPRITE_CHOZO_BALL] = ChozoBall, - [SSPRITE_CHOZO_STATUE_PART] = ChozoStatuePart, - [SSPRITE_CHOZO_STATUE_REFILL] = ChozoStatueRefill, - [SSPRITE_KRAID_PART] = KraidPart, - [SSPRITE_CHOZO_STATUE_MOVEMENT] = ChozoStatueMovement, - [SSPRITE_CHARGE_BEAM_GLOW] = ChargeBeamGlow, - [SSPRITE_WINGED_RIPPER] = WingedRipper, - [SSPRITE_MULTIVIOLA_UNUSED] = MultiviolaUnused, - [SSPRITE_DRAGON_FIREBALL] = DragonFireball, - [SSPRITE_DEOREM_SEGMENT] = DeoremSegment, - [SSPRITE_DEOREM_EYE] = DeoremEye, - [SSPRITE_DEOREM_THORN] = DeoremThorn, - [SSPRITE_SKREE_EXPLOSION] = SkreeExplosion, - [SSPRITE_SAVE_PLATFORM_PART] = SavePlatformPart, - [SSPRITE_SAVE_YES_NO_CURSOR] = SaveYesNoCursor, - [SSPRITE_BLUE_SKREE_EXPLOSION] = SkreeExplosion, - [SSPRITE_ZEELA_EYES] = ZeelaEyes, - [SSPRITE_HIVE_ROOTS] = HiveRoots, - [SSPRITE_IMAGO_LARVA_PART] = ImagoLarvaPart, - [SSPRITE_MORPH_BALL_OUTSIDE] = MorphBallOutside, - [SSPRITE_IMAGO_COCOON_VINE] = ImagoCocoonVine, - [SSPRITE_IMAGO_COCOON_SPORE] = ImagoCocoonSpore, - [SSPRITE_SPACE_PIRATE_LASER] = SpacePirateLaser, - [SSPRITE_RIDLEY_PART] = RidleyPart, - [SSPRITE_RIDLEY_TAIL] = RidleyTail, - [SSPRITE_SEARCHLIGHT_EYE_BEAM] = SearchlightEyeBeam, - [SSPRITE_METROID_SHELL] = MetroidShell, - [SSPRITE_POLYP_PROJECTILE] = PolypProjectile, - [SSPRITE_KRAID_SPIKE] = KraidSpike, - [SSPRITE_KRAID_NAIL] = KraidNail, - [SSPRITE_ZIPLINE_GENERATOR_PART] = ZiplineGeneratorPart, - [SSPRITE_ATOMIC_ELECTRICITY] = AtomicElectricity, - [SSPRITE_MOTHER_BRAIN_PART] = MotherBrainPart, - [SSPRITE_RIDLEY_FIREBALL] = RidleyFireball, - [SSPRITE_UNKNOWN_ITEM_CHOZO_STATUE_PART] = UnknownItemChozoStatuePart, - [SSPRITE_UNKNOWN_ITEM_CHOZO_STATUE_REFILL] = UnknownItemChozoStatueRefill, - [SSPRITE_MORPH_BALL_LAUNCHER_PART] = MorphBallLauncherPart, - [SSPRITE_ACID_WORM_PART] = AcidWormPart, - [SSPRITE_ACID_WORM_SPIT] = AcidWormSpit, - [SSPRITE_CANNON_BULLET] = CannonBullet, - [SSPRITE_CROCOMIRE_PART] = CrocomirePart, - [SSPRITE_IMAGO_PART] = ImagoPart, - [SSPRITE_DEFEATED_IMAGO_COCOON] = DefeatedImagoCocoon, - [SSPRITE_IMAGO_CEILING_VINE] = ImagoCocoonCeilingVine, - [SSPRITE_SEARCHLIGHT_EYE_BEAM2] = SearchlightEyeBeam, - [SSPRITE_TANGLE_VINE_GERUTA_PART] = TangleVineGerutaPart, - [SSPRITE_CHOZODIA_SAVE_PLATFORM_PART] = SavePlatformChozodiaPart, - [SSPRITE_IMAGO_NEEDLE] = ImagoNeedle, - [SSPRITE_ELEVATOR_STATUE_DEBRIS] = ElevatorStatueDebris, - [SSPRITE_IMAGO_DAMAGED_STINGER] = ImagoDamagedStinger, - [SSPRITE_GUNSHIP_PART] = GunshipPart, - [SSPRITE_IMAGO_EGG] = ImagoEgg, - [SSPRITE_MAP_STATION_PART] = MapStationPart, - [SSPRITE_CHOZO_PILLAR_PLATFORM] = ChozoPillarPlatform, - [SSPRITE_GADORA_EYE] = GadoraEye, - [SSPRITE_GADORA_BEAM] = GadoraBeam, - [SSPRITE_UNKNOWN_ITEM_BLOCK_LIGHT] = UnknownItemBlockLight, - [SSPRITE_SEARCHLIGHT_EYE_PROJECTILE] = SearchlightEyeProjectile, - [SSPRITE_CHOZO_PILLAR_PLATFORM_SHADOW] = ChozoPillarPlatformShadow, - [SSPRITE_RUINS_TEST_SYMBOL] = RuinsTestSymbol, - [SSPRITE_RUINS_TEST_SAMUS_REFLECTION_START] = RuinsTestSamusReflectionStart, - [SSPRITE_RUINS_TEST_REFLECTION_COVER] = RuinsTestReflectionCover, - [SSPRITE_RUINS_TEST_GHOST_OUTLINE] = RuinsTestGhostOutline, - [SSPRITE_RUINS_TEST_GHOST] = RuinsTestGhost, - [SSPRITE_RUINS_TEST_SHOOTABLE_SYMBOL] = RuinsTestShootableSymbol, - [SSPRITE_RUINS_TEST_SAMUS_REFLECTION_END] = RuinsTestSamusReflectionEnd, - [SSPRITE_RUINS_TEST_LIGHTNING] = RuinsTestLightning, - [SSPRITE_RIDLEY_BIG_FIREBALL] = RidleyFireball, - [SSPRITE_MECHA_RIDLEY_PART] = MechaRidleyPart, - [SSPRITE_ESCAPE_SHIP_PART] = EscapeShipPart, - [SSPRITE_POWER_GRIP_GLOW] = PowerGripGlow, - [SSPRITE_MECHA_RIDLEY_LASER] = MechaRidleyLaser, - [SSPRITE_MECHA_RIDLEY_MISSILE] = MechaRidleyMissile, - [SSPRITE_MECHA_RIDLEY_FIREBALL] = MechaRidleyFireball, - [SSPRITE_MOTHER_BRAIN_BEAM] = MotherBrainBeam, - [SSPRITE_MOTHER_BRAIN_BLOCK] = MotherBrainBlock, - [SSPRITE_MOTHER_BRAIN_GLASS_BREAKING] = MotherBrainGlassBreaking -}; - -static const u8* sSpritesetPointers[MAX_AMOUNT_OF_SPRITESET] = { - sSpriteset0, - sSpriteset1, - sSpriteset2, - sSpriteset3, - sSpriteset4, - sSpriteset5, - sSpriteset6, - sSpriteset7, - sSpriteset8, - sSpriteset9, - sSpriteset10, - sSpriteset11, - sSpriteset12, - sSpriteset13, - sSpriteset14, - sSpriteset15, - sSpriteset16, - sSpriteset17, - sSpriteset18, - sSpriteset19, - sSpriteset20, - sSpriteset21, - sSpriteset22, - sSpriteset23, - sSpriteset24, - sSpriteset25, - sSpriteset26, - sSpriteset27, - sSpriteset28, - sSpriteset29, - sSpriteset30, - sSpriteset31, - sSpriteset32, - sSpriteset33, - sSpriteset34, - sSpriteset35, - sSpriteset36, - sSpriteset37, - sSpriteset38, - sSpriteset39, - sSpriteset40, - sSpriteset41, - sSpriteset42, - sSpriteset43, - sSpriteset44, - sSpriteset45, - sSpriteset46, - sSpriteset47, - sSpriteset48, - sSpriteset49, - sSpriteset50, - sSpriteset51, - sSpriteset52, - sSpriteset53, - sSpriteset54, - sSpriteset55, - sSpriteset56, - sSpriteset57, - sSpriteset58, - sSpriteset59, - sSpriteset60, - sSpriteset61, - sSpriteset62, - sSpriteset63, - sSpriteset64, - sSpriteset65, - sSpriteset66, - sSpriteset67, - sSpriteset68, - sSpriteset69, - sSpriteset70, - sSpriteset71, - sSpriteset72, - sSpriteset73, - sSpriteset74, - sSpriteset75, - sSpriteset76, - sSpriteset77, - sSpriteset78, - sSpriteset79, - sSpriteset80, - sSpriteset81, - sSpriteset82, - sSpriteset83, - sSpriteset84, - sSpriteset85, - sSpriteset86, - sSpriteset87, - sSpriteset88, - sSpriteset89, - sSpriteset90, - sSpriteset91, - sSpriteset92, - sSpriteset93, - sSpriteset94, - sSpriteset95, - sSpriteset96, - sSpriteset97, - sSpriteset98, - sSpriteset99, - sSpriteset100, - sSpriteset101, - sSpriteset102, - sSpriteset103, - sSpriteset104, - sSpriteset105, - sSpriteset106, - sSpriteset107, - sSpriteset108, - sSpriteset109, - sSpriteset110, - sSpriteset111, - sSpriteset112, - sSpriteset113 -}; - -/** - * cf00 | 42c | Main routine that updates all the sprites - * - */ -void SpriteUpdate(void) -{ - u16 rngParam1; - u16 rngParam2; - u8 count; - struct SpriteData* pCurrent; - - pCurrent = &gCurrentSprite; - rngParam1 = gFrameCounter8Bit; - rngParam2 = gFrameCounter16Bit / 16; - - if (gSubGameMode1 == SUB_GAME_MODE_PLAYING) - { - // In normal gameplay - - SpriteDebrisProcessAll(); - - if (!SpriteUtilCheckStopSpritesPose()) - { - // Samus is able, update sprites normally - - // Check collision - SpriteUtilSamusAndSpriteCollision(); - - for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) - { - if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) - continue; - - // Transfer sprite to current - DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); - - // Update random number - gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); - - // Update stun timer - SpriteUtilUpdateStunTimer(pCurrent); - - // Call AI - if (pCurrent->properties & SP_SECONDARY_SPRITE) - sSecondarySpritesAIPointers[pCurrent->spriteId](); - else - sPrimarySpritesAIPointers[pCurrent->spriteId](); - - // Check update sprite info if still alive - if (pCurrent->status & SPRITE_STATUS_EXISTS) - { - SpriteUtilSamusStandingOnSprite(pCurrent); - SpriteUpdateAnimation(pCurrent); - SpriteCheckOnScreen(pCurrent); - } - - // Transfer current back to array - DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); - } - - // Update alarm - DecrementChozodiaAlarm(); - - if (gParasiteRelated != 0) - gParasiteRelated--; - } - else - { - // Samus isn't able, still update sprites but only on some conditions - - for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) - { - if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) - continue; - - if (gSpriteData[count].pose == SPRITE_POSE_UNINITIALIZED || gSpriteData[count].properties & SP_ALWAYS_ACTIVE) - { - // Only update sprites to initialize them or if they have the always active flag - - // Transfer sprite to current - DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); - - // Update random number - gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); - - // Update stun timer - SpriteUtilUpdateStunTimer(pCurrent); - - // Call AI - if (pCurrent->properties & SP_SECONDARY_SPRITE) - sSecondarySpritesAIPointers[pCurrent->spriteId](); - else - sPrimarySpritesAIPointers[pCurrent->spriteId](); - - // Check update sprite info if still alive - if (pCurrent->status & SPRITE_STATUS_EXISTS) - { - SpriteUtilSamusStandingOnSprite(pCurrent); - SpriteUpdateAnimation(pCurrent); - SpriteCheckOnScreen(pCurrent); - } - - // Transfer current back to array - DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); - } - else - { - // Only check if on screen - - // Transfer sprite to current - DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); - - SpriteCheckOnScreen(pCurrent); - - // Transfer current back to array - DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); - } - } - } - } - else if (gSubGameMode1 == SUB_GAME_MODE_NO_CLIP) - { - // In debug no-clip, update sprites normally but don't check for collision - for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) - { - if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) - continue; - - // Transfer sprite to current - DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); - - // Update random number - gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); - - // Update stun timer - SpriteUtilUpdateStunTimer(pCurrent); - - // Call AI - if (pCurrent->properties & SP_SECONDARY_SPRITE) - sSecondarySpritesAIPointers[pCurrent->spriteId](); - else - sPrimarySpritesAIPointers[pCurrent->spriteId](); - - // Check update sprite info if still alive - if (pCurrent->status & SPRITE_STATUS_EXISTS) - { - SpriteUtilSamusStandingOnSprite(pCurrent); - SpriteUpdateAnimation(pCurrent); - SpriteCheckOnScreen(pCurrent); - } - - // Transfer current back to array - DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); - } - - // Update alarm - DecrementChozodiaAlarm(); - - if (gParasiteRelated != 0) - APPLY_DELTA_TIME_DEC(gParasiteRelated); - } - else - { - // Any other sub game mode - for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) - { - if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) - continue; - - // Transfer sprite to current - DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); - - // Update random number - gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); - - // Only call init code - if (pCurrent->pose == SPRITE_POSE_UNINITIALIZED) - { - // Call AI - if (pCurrent->properties & SP_SECONDARY_SPRITE) - sSecondarySpritesAIPointers[pCurrent->spriteId](); - else - sPrimarySpritesAIPointers[pCurrent->spriteId](); - } - - // Check update sprite info if still alive - if (pCurrent->status & SPRITE_STATUS_EXISTS) - SpriteCheckOnScreen(pCurrent); - - // Transfer current back to array - DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); - } - } -} - -/** - * d32c | 40 | Updates the animation related info of a sprite - * - * @param pSprite Sprite data pointer - */ -void SpriteUpdateAnimation(struct SpriteData* pSprite) -{ - // Don't update the animation if freezed - if (pSprite->freezeTimer != 0) - return; - - // Update adc - APPLY_DELTA_TIME_INC(pSprite->animationDurationCounter); - - // Check reached the end of the current frame - if (pSprite->pOam[pSprite->currentAnimationFrame].timer < pSprite->animationDurationCounter) - { - // Advance to next frame - pSprite->animationDurationCounter = 1; - pSprite->currentAnimationFrame++; - - // Reached the end, set caf to 0 to loop back the animation - if (pSprite->pOam[pSprite->currentAnimationFrame].timer == 0) - pSprite->currentAnimationFrame = 0; - } -} - -/** - * @brief d36c | c4 | Draws all high-priority sprites based on the draw order - * - */ -void SpriteDrawAll_HighPriority(void) -{ - struct SpriteData* pSprite; - s32 i; - s32 drawOrder; - u32 drawStatus; - u32 checkStatus; - u32 notPlaying; - - if (gSubGameMode1 == SUB_GAME_MODE_PLAYING) - notPlaying = FALSE; - else - notPlaying = TRUE; - - checkStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_HIGH_PRIORITY; - drawStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_HIGH_PRIORITY; - - for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) - { - // Sprite doesn't exists or isn't drawn - if ((gSpriteData[i].status & checkStatus) != drawStatus) - { - gSpriteDrawOrder[i] = 0; - continue; - } - - // Check is lower draw order - if (gSpriteData[i].drawOrder >= 9) - { - gSpriteDrawOrder[i] = 0; - continue; - } - - // Check is playing - if (!notPlaying) - { - gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; - continue; - } - - // Don't draw sprites that have an absolute position if not in game - if (!(gSpriteData[i].properties & SP_ABSOLUTE_POSITION)) - gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; - else - gSpriteDrawOrder[i] = 0; - } - - // Apply draw order and draw sprites - for (drawOrder = 1; drawOrder < 9; drawOrder++) - { - for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++) - { - if (gSpriteDrawOrder[i] == drawOrder) - SpriteDraw(pSprite, i); - } - } -} - -/** - * @brief d430 | 8c | Draws all medium-priority sprites based on the draw order - * - */ -void SpriteDrawAll_MediumPriority(void) -{ - struct SpriteData* pSprite; - s32 i; - s32 drawOrder; - u32 drawStatus; - u32 checkStatus; - - checkStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_HIGH_PRIORITY; - drawStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN; - - SpriteDebrisDrawAll(); - - for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) - { - // Sprite doesn't exists or isn't drawn - if ((gSpriteData[i].status & checkStatus) != drawStatus) - { - gSpriteDrawOrder[i] = 0; - continue; - } - - // Check is lower draw order - if (gSpriteData[i].drawOrder < 9) - gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; - else - gSpriteDrawOrder[i] = 0; - } - - // Apply draw order and draw sprites - for (drawOrder = 1; drawOrder < 9; drawOrder++) - { - for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++) - { - if (gSpriteDrawOrder[i] == drawOrder) - SpriteDraw(pSprite, i); - } - } -} - -/** - * @brief d4bc | 88 | Draws the sprites that have a draw order between 9 and 16 - * - */ -void SpriteDrawAll_LowPriority(void) -{ - struct SpriteData* pSprite; - s32 i; - s32 drawOrder; - u32 drawStatus; - u32 checkStatus; - - checkStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_HIGH_PRIORITY; - drawStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN; - - for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) - { - // Sprite doesn't exists or isn't drawn - if ((gSpriteData[i].status & checkStatus) != drawStatus) - { - gSpriteDrawOrder[i] = 0; - continue; - } - - // Check is upper draw order - if (gSpriteData[i].drawOrder >= 9) - gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; - else - gSpriteDrawOrder[i] = 0; - } - - // Apply draw order and draw sprites - for (drawOrder = 9; drawOrder < 17; drawOrder++) - { - for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++) - { - if (gSpriteDrawOrder[i] == drawOrder) - SpriteDraw(pSprite, i); - } - } -} - -/** - * @brief d544 | 890 | Draws a sprite - * - * @param pSprite Sprite data pointer - * @param slot Ram slot - */ -void SpriteDraw(struct SpriteData* pSprite, s32 slot) -{ - const u16* src; - u16* dst; - u8 prevSlot; - u16 part1; - u16 part2; - - u32 shape; - u32 size; - - u16 dy; - u16 dmy; - - s16 actualY; - s16 actualX; - s16 yScaling; - s16 xScaling; - s32 y; - s32 x; - s32 unk_2; - s32 unk_3; - s32 tmpX; - s32 tmpY; - s32 scaledX; - s32 scaledY; - - u16 rotationScalingSingle; - s32 i; - u16 partCount; - - u32 yOffset; - u32 xOffset; - - u16 xFlip; - u16 doubleSize; - u16 alphaBlending; - u16 mosaic; - u16 yFlip; - u32 bgPriority; - u32 paletteRow; - u32 gfxOffset; - u16 xPosition; - u16 yPosition; - u16 rotation; - u16 scaling; - - u8 offset; - - prevSlot = gNextOamSlot; - src = pSprite->pOam[pSprite->currentAnimationFrame].pFrame; - partCount = *src++; - - if (partCount + prevSlot >= OAM_BUFFER_DATA_SIZE) - return; - - dst = (u16*)(gOamData + prevSlot); - yPosition = SUB_PIXEL_TO_PIXEL_(pSprite->yPosition) - SUB_PIXEL_TO_PIXEL(gBg1YPosition); - xPosition = SUB_PIXEL_TO_PIXEL_(pSprite->xPosition) - SUB_PIXEL_TO_PIXEL(gBg1XPosition); - - // Shortcuts for status - xFlip = pSprite->status & SPRITE_STATUS_X_FLIP; - rotationScalingSingle = pSprite->status & SPRITE_STATUS_ROTATION_SCALING_SINGLE; - doubleSize = pSprite->status & SPRITE_STATUS_DOUBLE_SIZE; - alphaBlending = pSprite->status & SPRITE_STATUS_ALPHA_BLENDING; - yFlip = pSprite->status & SPRITE_STATUS_Y_FLIP; - - // Get graphical data - // Palette offset by spriteset slot - paletteRow = pSprite->spritesetGfxSlot + pSprite->paletteRow; - // Gfx slot, scale to 2 rows of 8x8 tiles in VRAM - gfxOffset = pSprite->spritesetGfxSlot * 64; - bgPriority = pSprite->bgPriority; - - if (gSamusOnTopOfBackgrounds && bgPriority != 0) - bgPriority--; - - if (pSprite->properties & SP_ABSOLUTE_POSITION) - { - yPosition = pSprite->yPosition; - xPosition = pSprite->xPosition; - } - - if (!(pSprite->status & SPRITE_STATUS_ROTATION_SCALING_WHOLE)) - { - for (i = 0; i < partCount; i++) - { - // Raw copy - part1 = *src++; - *dst++ = part1; - part2 = *src++; - *dst++ = part2; - *dst++ = *src++; - - // Apply position - gOamData[prevSlot + i].split.y = part1 + yPosition; - gOamData[prevSlot + i].split.x = part2 + xPosition; - - // Apply graphics - gOamData[prevSlot + i].split.priority = bgPriority; - // Add palette row and gfx offset - gOamData[prevSlot + i].split.paletteNum += paletteRow; - gOamData[prevSlot + i].split.tileNum += gfxOffset; - - if (xFlip) - { - // Enable X flip - gOamData[prevSlot + i].split.xFlip ^= TRUE; - - shape = gOamData[prevSlot + i].split.shape; - size = gOamData[prevSlot + i].split.size; - offset = sOamXFlipOffsets[shape][size]; - - // Properly offset x position - gOamData[prevSlot + i].split.x = xPosition - (part2 + offset * 8); - } - - if (yFlip) - { - // Enable Y flip - gOamData[prevSlot + i].split.yFlip ^= TRUE; - shape = gOamData[prevSlot + i].split.shape; - size = gOamData[prevSlot + i].split.size; - offset = sOamYFlipOffsets[shape][size]; - - // Properly offset x position - gOamData[prevSlot + i].split.y = yPosition - (part1 + offset * 8); - } - - // Rotates and scales objects at their centers independently if SS_ROTATE_SCALE_INDIVIDUAL is set - // Breaks if any of the objects are flipped (not the sprite status) - if (rotationScalingSingle) - { - if (doubleSize) - { - // Rotation scaling and double size - gOamData[prevSlot + i].split.affineMode = 3; - } - else - { - // Rotation scaling - gOamData[prevSlot + i].split.affineMode = 1; - } - - // In this affine mode, X/Y flip are part of the matrix num, so this is just doing matrixNum = slot - gOamData[prevSlot + i].split.yFlip = slot >> 4; - gOamData[prevSlot + i].split.xFlip = slot >> 3; - gOamData[prevSlot + i].split.matrixNum = slot; - } - - if (alphaBlending) - { - // Semi transparent - gOamData[prevSlot + i].split.objMode = OAM_OBJ_MODE_SEMI_TRANSPARENT; - } - - dst++; - } - - // Update next oam slot - gNextOamSlot = partCount + prevSlot; - - if (rotationScalingSingle) - { - rotation = pSprite->rotation; - scaling = pSprite->scaling; - - // Rotation matrix (column major mode) : - // [ cos / scaling, -sin / scaling ] - // [ sin / scaling, cos / scaling ] - - // If x flipped, then negate scaling on the first column to manually flip the sprite since flipping - // isn't supported by hardware when affine transformation is enabled - if (xFlip) - { - gOamData[slot * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(-scaling)); - gOamData[slot * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(-scaling)); - } - else - { - gOamData[slot * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); - gOamData[slot * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(scaling)); - } - - gOamData[slot * 4 + 2].all.affineParam = FixedMultiplication(-SIN(rotation), FixedInverse(scaling)); - gOamData[slot * 4 + 3].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); - } - } - else - { - rotation = pSprite->rotation; - scaling = pSprite->scaling; - - mosaic = pSprite->status & SPRITE_STATUS_MOSAIC; - - yPosition += BLOCK_SIZE; - xPosition += BLOCK_SIZE; - - for (i = 0; i < partCount; i++) - { - // Raw copy - part1 = *src++; - *dst++ = part1; - part2 = *src++; - *dst++ = part2; - *dst++ = *src++; - - // Apply graphics - gOamData[prevSlot + i].split.priority = bgPriority; - // Add palette row and gfx offset - gOamData[prevSlot + i].split.paletteNum += paletteRow; - gOamData[prevSlot + i].split.tileNum += gfxOffset; - - // Rotates and scales the whole sprite, ignores flip - shape = gOamData[prevSlot + i].split.shape; - size = gOamData[prevSlot + i].split.size; - - // Get center relative to top-left corner of object - yOffset = sOamYFlipOffsets[shape][size]; - yOffset = PIXEL_TO_SUB_PIXEL(yOffset); - xOffset = sOamXFlipOffsets[shape][size]; - xOffset = PIXEL_TO_SUB_PIXEL(xOffset); - - // Get current positions - y = (s16)MOD_AND(part1 + yPosition, 256); - x = (s16)MOD_AND(part2 + xPosition, 512); - - // Get center of object relative to the sprite's position - tmpY = (s16)(y - yPosition + yOffset); - tmpX = (s16)(x - xPosition + xOffset); - - // Apply scaling - tmpX = (s16)(Q_8_8_TO_S16_DIV(tmpX * scaling) - tmpX); - tmpY = (s16)(Q_8_8_TO_S16_DIV(tmpY * scaling) - tmpY); - - x = (s16)(x + tmpX); - y = (s16)(y + tmpY); - - // Offset to 0;0 temporarly to apply the rotation - unk_2 = (s16)(x - xPosition + xOffset); - unk_3 = (s16)(y - yPosition + yOffset); - - // Rotation matrix - x = Q_8_8_TO_S16(unk_2 * COS(rotation) - unk_3 * SIN(rotation)); - y = Q_8_8_TO_S16(unk_2 * SIN(rotation) + unk_3 * COS(rotation)); - - // Offset it back to top-left corner - if (doubleSize) - { - x = (s16)(x - xOffset * 2); - y = (s16)(y - yOffset * 2); - } - else - { - x = (s16)(x - xOffset); - y = (s16)(y - yOffset); - } - - // Rotated position + position - gOamData[prevSlot + i].split.y = MOD_AND(y + yPosition - BLOCK_SIZE, 256); - gOamData[prevSlot + i].split.x = MOD_AND(x + xPosition - BLOCK_SIZE, 512); - - if (doubleSize) - { - // Rotation scaling and double size - gOamData[prevSlot + i].split.affineMode = 3; - } - else - { - // Rotation scaling - gOamData[prevSlot + i].split.affineMode = 1; - } - - // Select proper matrix: mosaic flag doesn't enable mosaic and instead chooses between one of the two matrix slots - if (mosaic) - { - if (gOamData[prevSlot + i].split.xFlip) - { - gOamData[prevSlot + i].split.x--; - gOamData[prevSlot + i].split.yFlip = 29 >> 4; - gOamData[prevSlot + i].split.xFlip = 29 >> 3; - gOamData[prevSlot + i].split.matrixNum = 29; - } - else - { - gOamData[prevSlot + i].split.yFlip = 28 >> 4; - gOamData[prevSlot + i].split.xFlip = 28 >> 3; - gOamData[prevSlot + i].split.matrixNum = 28; - } - } - else - { - if (gOamData[prevSlot + i].split.xFlip) - { - gOamData[prevSlot + i].split.x--; - gOamData[prevSlot + i].split.yFlip = 31 >> 4; - gOamData[prevSlot + i].split.xFlip = 31 >> 3; - gOamData[prevSlot + i].split.matrixNum = 31; - } - else - { - gOamData[prevSlot + i].split.yFlip = 30 >> 4; - gOamData[prevSlot + i].split.xFlip = 30 >> 3; - gOamData[prevSlot + i].split.matrixNum = 30; - } - } - - if (alphaBlending) - { - // Semi transparent - gOamData[prevSlot + i].split.objMode = OAM_OBJ_MODE_SEMI_TRANSPARENT; - } - - dst++; - } - - // Update next oam slot - gNextOamSlot = partCount + prevSlot; - - // Setup matrices for normal and x flip - - // [ cos / scaling, -sin / scaling ] - // [ sin / scaling, cos / scaling ] - // and - // [ cos / -scaling, -sin / scaling ] - // [ sin / -scaling, cos / scaling ] - dy = FixedMultiplication(-SIN(rotation), FixedInverse(scaling)); - dmy = FixedMultiplication(COS(rotation), FixedInverse(scaling)); - - if (mosaic) - { - gOamData[28 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); - gOamData[28 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(scaling)); - gOamData[28 * 4 + 2].all.affineParam = dy; - gOamData[28 * 4 + 3].all.affineParam = dmy; - - gOamData[29 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(-scaling)); - gOamData[29 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(-scaling)); - gOamData[29 * 4 + 2].all.affineParam = dy; - gOamData[29 * 4 + 3].all.affineParam = dmy; - } - else - { - gOamData[30 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); - gOamData[30 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(scaling)); - gOamData[30 * 4 + 2].all.affineParam = dy; - gOamData[30 * 4 + 3].all.affineParam = dmy; - - gOamData[31 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(-scaling)); - gOamData[31 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(-scaling)); - gOamData[31 * 4 + 2].all.affineParam = dy; - gOamData[31 * 4 + 3].all.affineParam = dmy; - } - } -} - -/** - * @brief ddd4 | 150 | Checks if a sprite is on screen - * - * @param pSprite Sprite data pointer - */ -void SpriteCheckOnScreen(struct SpriteData* pSprite) -{ - u16 bgBaseY; - u16 bgBaseX; - u16 bgXRange; - u16 bgYRange; - - u16 spriteY; - u16 spriteX; - u16 spriteYRange; - u16 spriteXRange; - u16 spriteTop; - u16 spriteBottom; - u16 spriteLeft; - u16 spriteRight; - - u32 drawOffset; - - // Don't bother checking if the sprite has an absolute position - if (pSprite->properties & SP_ABSOLUTE_POSITION) - return; - - bgBaseY = gBg1YPosition; - bgBaseX = gBg1XPosition; - - spriteY = pSprite->yPosition; - spriteX = pSprite->xPosition; - - bgYRange = bgBaseY + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); - spriteYRange = spriteY + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); - spriteBottom = bgYRange - PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceBottom); - drawOffset = PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceTop) + SCREEN_SIZE_Y_SUB_PIXEL; - spriteTop = bgYRange + drawOffset; - - bgXRange = bgBaseX + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); - spriteXRange = spriteX + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); - spriteLeft = bgXRange - PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceHorizontal); - drawOffset = PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceHorizontal) + SCREEN_SIZE_X_SUB_PIXEL; - spriteRight = bgXRange + drawOffset; - - if (spriteLeft < spriteXRange && spriteXRange < spriteRight && spriteBottom < spriteYRange && spriteYRange < spriteTop) - { - pSprite->status |= SPRITE_STATUS_ONSCREEN; - return; - } - - pSprite->status &= ~SPRITE_STATUS_ONSCREEN; - - if (pSprite->properties & SP_KILL_OFF_SCREEN) - { - // todo: screen size - bgYRange = bgBaseY + BLOCK_SIZE * 10; - spriteYRange = spriteY + BLOCK_SIZE * 10; - spriteBottom = bgYRange - BLOCK_SIZE * 9; - spriteTop = bgYRange + BLOCK_SIZE * 19; - - bgXRange = bgBaseX + BLOCK_SIZE * 10; - spriteXRange = spriteX + BLOCK_SIZE * 10; - spriteLeft = bgXRange - BLOCK_SIZE * 9; - spriteRight = bgXRange + BLOCK_SIZE * 24; - - if (spriteLeft >= spriteXRange || spriteXRange >= spriteRight || spriteBottom >= spriteYRange || spriteYRange >= spriteTop) - { - // Off range, kill sprite - pSprite->status = 0; - } - } -} - -/** - * @brief df24 | 4c | Calls : SpriteClearData, SpriteLoadSpriteset, - * EscapeCheckReloadGraphics, SpriteUtilInitLocationText, SpriteLoadRoomSprites - * and SpawnWaitingPirates - * - */ -void SpriteLoadAllData(void) -{ - if (gPauseScreenFlag != PAUSE_SCREEN_NONE) - { - // Don't load sprites if psf was active, this indirectly means that the room was already loaded before - return; - } - - // Check reset alarm timer - if (gSubGameMode3 == 0 && !gIsLoadingFile) - gAlarmTimer = 0; - - // Clear - SpriteClearData(); - - // Load spriteset - SpriteLoadSpriteset(); - - // Setup special sprites - EscapeCheckReloadGraphics(); - SpriteUtilInitLocationText(); - - // Load current room sprites - SpriteLoadRoomSprites(); - SpawnWaitingPirates(); - - gParasiteRelated = 0; -} - -/** - * @brief df84 | 100 | Loads a spriteset - * - */ -void SpriteLoadSpriteset(void) -{ - s32 i; - s32 j; - s32 spriteset; - u32 spriteId; - u32 gfxSlot; - u32 prevGfxSlot; - u16 nbrRows; - - s32 ctrl_1; - s32 ctrl_2; - - for (i = 0; i < MAX_AMOUNT_OF_SPRITE_TYPES; i++) - { - gSpritesetSpritesId[i] = PSPRITE_UNUSED16; - gSpritesetGfxSlots[i] = 0; - } - - prevGfxSlot = UCHAR_MAX; - spriteset = gSpriteset; - if (spriteset >= MAX_AMOUNT_OF_SPRITESET - 1) - { - if (gCurrentArea > AREA_TEST) - spriteset = MAX_AMOUNT_OF_SPRITESET - 1; - else - spriteset = 0; - } - - for (j = 0, i = 0; i < MAX_AMOUNT_OF_SPRITE_TYPES; i++) - { - spriteId = sSpritesetPointers[spriteset][j * 2 + 0]; - gfxSlot = sSpritesetPointers[spriteset][j * 2 + 1]; - - j++; - - if (spriteId == PSPRITE_UNUSED0) - { - break; - EMPTY_DO_WHILE // Needed to produce matching ASM. - } - - gSpritesetSpritesId[i] = spriteId; - gSpritesetGfxSlots[i] = MOD_AND(gfxSlot, 8); - - if (gfxSlot == prevGfxSlot) - continue; - - prevGfxSlot = gfxSlot; - if (gfxSlot == 8) - continue; - - spriteId = PSPRITE_OFFSET_FOR_GRAPHICS(spriteId); - - LZ77UncompVram(sSpritesGraphicsPointers[spriteId], VRAM_BASE + 0x14000 + gfxSlot * 2048); - - ctrl_1 = ((u8*)sSpritesGraphicsPointers[spriteId])[1]; - ctrl_2 = ((u8*)sSpritesGraphicsPointers[spriteId])[2] << 8; - DMA3_COPY_16(sSpritesPalettePointers[spriteId], PALRAM_OBJ + 8 * PAL_ROW_SIZE + gfxSlot * 32, (ctrl_1 | ctrl_2) / 2048 << 4); - } -} - -/** - * e084 | 2c | Loads the graphics in VRAM for a new sprite - * - * @param spriteId Sprite ID - * @param row Spriteset Graphics Row - */ -void SpriteLoadGfx(u8 spriteId, u8 row) -{ - spriteId = PSPRITE_OFFSET_FOR_GRAPHICS(spriteId); - - LZ77UncompVram(sSpritesGraphicsPointers[spriteId], VRAM_BASE + 0x14000 + (row * 0x800)); -} - -/** - * e0b0 | 40 | Loads the palette in PALRAM for a new sprite - * - * @param spriteId Sprite ID - * @param row Palette Row - * @param len Length (in rows) - */ -void SpriteLoadPal(u8 spriteId, u8 row, u8 len) -{ - spriteId = PSPRITE_OFFSET_FOR_GRAPHICS(spriteId); - - DMA3_COPY_16(sSpritesPalettePointers[spriteId], PALRAM_OBJ + 8 * PAL_ROW_SIZE + (row * 16 * sizeof(u16)), len * 16); -} - -/** - * @brief e0f0 | 44 | Clears the sprite data (including debris) - * - */ -void SpriteClearData(void) -{ - s32 i; - - // Clear sprites - for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) - { - gSpriteData[i].status = 0; - gSpriteData[i].standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; - gSpriteData[i].roomSlot = UCHAR_MAX; - } - - // Clear debris - for (i = 0; i < MAX_AMOUNT_OF_SPRITE_DEBRIS; i++) - gSpriteDebris[i].exists = FALSE; -} - -/** - * @brief e134 | 48 | Loads the sprites of the current room - * - */ -void SpriteLoadRoomSprites(void) -{ - u8 i; - u8 y; - u8 x; - u8 slot; - - for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) - { - /* - 0 | Y position - 1 | X position - 2 | Spriteset slot - */ - y = gCurrentRoomEntry.pEnemyRoomData[i * ENEMY_ROOM_DATA_SIZE + 0]; - - // Terminator - if (y == UCHAR_MAX) - break; - - x = gCurrentRoomEntry.pEnemyRoomData[i * ENEMY_ROOM_DATA_SIZE + 1]; - slot = gCurrentRoomEntry.pEnemyRoomData[i * ENEMY_ROOM_DATA_SIZE + 2]; - SpriteInitPrimary(slot, y, x, i); - } -} - -/** - * @brief e17c | dc | Initializes a primary sprite with the values in parameters - * - * @param spritesetSlot Spriteset slot/properties - * @param yPosition Y Position (blocks) - * @param xPosition X Position (blocks) - * @param roomSlot Room Slot - */ -void SpriteInitPrimary(u8 spritesetSlot, u16 yPosition, u16 xPosition, u8 roomSlot) -{ - u8 ramSlot; - struct SpriteData* pSprite; - - // Try to find an empty slot - for (ramSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; ramSlot++, pSprite++) - { - if (pSprite->status & SPRITE_STATUS_EXISTS) - continue; - - // Found empty slot, mark exists - pSprite->status = SPRITE_STATUS_EXISTS; - - // Get 7 first bits of the spriteset slot - spritesetSlot = MOD_AND(spritesetSlot, 128); - - // A spriteset slot value that's above MAX_AMOUNT_OF_SPRITE_TYPES + 1 means the spriteset should be used - if (spritesetSlot > MAX_AMOUNT_OF_SPRITE_TYPES + 1) - { - spritesetSlot--; - - // Modulo to not overflow the next array access - spritesetSlot = MOD_AND(spritesetSlot, MAX_AMOUNT_OF_SPRITE_TYPES + 1); - - // Fetch the gfx slot and the sprite id - pSprite->spritesetGfxSlot = gSpritesetGfxSlots[spritesetSlot]; - pSprite->spriteId = gSpritesetSpritesId[spritesetSlot]; - } - else - { - // Don't use the spriteset, directly write to sprite id and use first gfx slot - pSprite->spritesetGfxSlot = 0; - pSprite->spriteId = spritesetSlot - 1; - } - - pSprite->properties = 0; - - // Convert block position to sub pixel such that the new position is in the bottom middle of the block in sub pixels - pSprite->yPosition = BLOCK_TO_SUB_PIXEL(yPosition) + BLOCK_SIZE; - pSprite->xPosition = BLOCK_TO_SUB_PIXEL(xPosition) + HALF_BLOCK_SIZE; - pSprite->roomSlot = roomSlot; - - pSprite->bgPriority = 2; - pSprite->drawOrder = 4; - pSprite->pose = SPRITE_POSE_UNINITIALIZED; - pSprite->health = 0; - pSprite->invincibilityStunFlashTimer = 0; - - pSprite->paletteRow = 0; - pSprite->frozenPaletteRowOffset = 0; - pSprite->absolutePaletteRow = 0; - - pSprite->ignoreSamusCollisionTimer = DELTA_TIME; - pSprite->primarySpriteRamSlot = ramSlot; - pSprite->freezeTimer = 0; - pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; - break; - } -} - -/** - * e258 | c4 | Spawns a new secondary sprite with the given parameters - * - * @param spriteId The ID of the sprite to spawn - * @param partNumber Part number - * @param gfxSlot The sprite graphics slot (usually the same as the primary sprite) - * @param ramSlot The RAM slot of the secondary sprite's parent - * @param yPosition Y Position - * @param xPosition X Position - * @param statusToAdd Additional status flags (default are Exists, On Screen and Not Drawn) - * @return The assigned RAM slot of the spawned sprite, 0xFF is the sprite couldn't spawn - */ -u8 SpriteSpawnSecondary(u8 spriteId, u8 partNumber, u8 gfxSlot, u8 ramSlot, u16 yPosition, u16 xPosition, u16 statusToAdd) -{ - u8 newSlot; - struct SpriteData* pSprite; - - // Try to find an empty slot - for (newSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; newSlot++, pSprite++) - { - if (pSprite->status & SPRITE_STATUS_EXISTS) - continue; - - pSprite->status = statusToAdd | (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN); - pSprite->properties = SP_SECONDARY_SPRITE; - - pSprite->spritesetGfxSlot = gfxSlot; - pSprite->spriteId = spriteId; - pSprite->yPosition = yPosition; - pSprite->xPosition = xPosition; - pSprite->roomSlot = partNumber; - - pSprite->bgPriority = 2; - pSprite->drawOrder = 4; - - pSprite->pose = SPRITE_POSE_UNINITIALIZED; - pSprite->health = 0; - pSprite->invincibilityStunFlashTimer = 0; - - pSprite->paletteRow = 0; - pSprite->frozenPaletteRowOffset = 0; - pSprite->absolutePaletteRow = 0; - - pSprite->ignoreSamusCollisionTimer = 1 * DELTA_TIME; - - pSprite->primarySpriteRamSlot = ramSlot; - - pSprite->freezeTimer = 0; - pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; - - return newSlot; - } - - return UCHAR_MAX; -} - -/** - * e31c | b8 | Spawns a new primary sprite with the given parameters - * - * @param spriteId The ID of the sprite to spawn - * @param partNumber Part number - * @param gfxSlot The sprite graphics slot - * @param yPosition Y Position - * @param xPosition X Position - * @param statusToAdd Additional status flags (default are Exists, On Screen and Not Drawn) - * @return The assigned RAM slot of the spawned sprite, 0xFF if the sprite couldn't spawn - */ -u8 SpriteSpawnPrimary(u8 spriteId, u8 partNumber, u8 gfxSlot, u16 yPosition, u16 xPosition, u16 statusToAdd) -{ - u8 newSlot; - struct SpriteData* pSprite; - - // Try to find an empty slot - for (newSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; newSlot++, pSprite++) - { - if (pSprite->status & SPRITE_STATUS_EXISTS) - continue; - - pSprite->status = statusToAdd | (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN); - pSprite->properties = 0; - - pSprite->spritesetGfxSlot = gfxSlot; - pSprite->spriteId = spriteId; - pSprite->yPosition = yPosition; - pSprite->xPosition = xPosition; - pSprite->roomSlot = partNumber; - - pSprite->bgPriority = 2; - pSprite->drawOrder = 4; - - pSprite->pose = SPRITE_POSE_UNINITIALIZED; - pSprite->health = 0; - pSprite->invincibilityStunFlashTimer = 0; - - pSprite->paletteRow = 0; - pSprite->frozenPaletteRowOffset = 0; - pSprite->absolutePaletteRow = 0; - - pSprite->ignoreSamusCollisionTimer = DELTA_TIME; - - pSprite->primarySpriteRamSlot = newSlot; - - pSprite->freezeTimer = 0; - pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; - - return newSlot; - } - - return UCHAR_MAX; -} - -/** - * e3d4 | b8 | Spawns a new primary sprite with the given parameters (used only for the drops and the followers sprite) - * - * @param spriteId The ID of the sprite to spawn - * @param partNumber The room slot - * @param gfxSlot The sprite graphics slot - * @param ramSlot The RAM slot of the sprite's parent - * @param yPosition Y Position - * @param xPosition X Position - * @param statusToAdd Additional status flags (default are Exists, On Screen and Not Drawn) - * @return The assigned RAM slot of the spawned sprite, 0xFF is the sprite couldn't spawn - */ -u8 SpriteSpawnDropFollowers(u8 spriteId, u8 partNumber, u8 gfxSlot, u8 ramSlot, u16 yPosition, u16 xPosition, u16 statusToAdd) -{ - u8 newSlot; - struct SpriteData* pSprite; - - // Try to find an empty slot - for (newSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; newSlot++, pSprite++) - { - if (pSprite->status & SPRITE_STATUS_EXISTS) - continue; - - pSprite->status = statusToAdd | (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN); - pSprite->properties = 0; - - pSprite->spritesetGfxSlot = gfxSlot; - pSprite->spriteId = spriteId; - pSprite->yPosition = yPosition; - pSprite->xPosition = xPosition; - pSprite->roomSlot = partNumber; - - pSprite->bgPriority = 2; - pSprite->drawOrder = 4; - - pSprite->pose = SPRITE_POSE_UNINITIALIZED; - pSprite->health = 0; - pSprite->invincibilityStunFlashTimer = 0; - - pSprite->paletteRow = 0; - pSprite->frozenPaletteRowOffset = 0; - pSprite->absolutePaletteRow = 0; - - pSprite->ignoreSamusCollisionTimer = DELTA_TIME; - - pSprite->primarySpriteRamSlot = ramSlot; - - pSprite->freezeTimer = 0; - pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; - - return newSlot; - } - - return UCHAR_MAX; -} +#include "sprite.h" +#include "sprite_debris.h" +#include "syscalls.h" +#include "gba.h" +#include "macros.h" +#include "fixed_point.h" +#include "sprites_ai/sprites.h" + +#include "data/generic_data.h" +#include "data/sprite_data.h" +#include "data/sprites/unused_sprites.h" +#include "data/sprites/charge_beam.h" +#include "data/sprites/deorem.h" +#include "data/sprites/dragon.h" +#include "data/sprites/elevator_pad.h" +#include "data/sprites/enemy_drop.h" +#include "data/sprites/geruta.h" +#include "data/sprites/hive.h" +#include "data/sprites/imago_cocoon.h" +#include "data/sprites/map_station.h" +#include "data/sprites/metroid.h" +#include "data/sprites/message_banner.h" +#include "data/sprites/zoomer.h" +#include "data/sprites/zeela.h" +#include "data/sprites/ripper.h" +#include "data/sprites/zeb.h" +#include "data/sprites/skree.h" +#include "data/sprites/morph_ball.h" +#include "data/sprites/chozo_statue.h" +#include "data/sprites/sova.h" +#include "data/sprites/multiviola.h" +#include "data/sprites/squeept.h" +#include "data/sprites/reo.h" +#include "data/sprites/gunship.h" +#include "data/sprites/skultera.h" +#include "data/sprites/dessgeega.h" +#include "data/sprites/waver.h" +#include "data/sprites/power_grip.h" +#include "data/sprites/imago_larva.h" +#include "data/sprites/morph_ball_launcher.h" +#include "data/sprites/space_pirate.h" +#include "data/sprites/gamet.h" +#include "data/sprites/zebbo.h" +#include "data/sprites/worker_robot.h" +#include "data/sprites/parasite.h" +#include "data/sprites/piston.h" +#include "data/sprites/ridley.h" +#include "data/sprites/security_gate.h" +#include "data/sprites/zipline_generator.h" +#include "data/sprites/polyp.h" +#include "data/sprites/rinka.h" +#include "data/sprites/viola.h" +#include "data/sprites/geron_norfair.h" +#include "data/sprites/holtz.h" +#include "data/sprites/gekitai_machine.h" +#include "data/sprites/ruins_test.h" +#include "data/sprites/save_platform.h" +#include "data/sprites/kraid.h" +#include "data/sprites/ripper2.h" +#include "data/sprites/mella.h" +#include "data/sprites/atomic.h" +#include "data/sprites/area_banner.h" +#include "data/sprites/mother_brain.h" +#include "data/sprites/acid_worm.h" +#include "data/sprites/escape_ship.h" +#include "data/sprites/sidehopper.h" +#include "data/sprites/geega.h" +#include "data/sprites/zebetite_and_cannon.h" +#include "data/sprites/zipline.h" +#include "data/sprites/imago_larva_right_side.h" +#include "data/sprites/tangle_vine.h" +#include "data/sprites/imago.h" +#include "data/sprites/crocomire.h" +#include "data/sprites/geron.h" +#include "data/sprites/glass_tube.h" +#include "data/sprites/save_platform_chozodia.h" +#include "data/sprites/baristute.h" +#include "data/sprites/elevator_statue.h" +#include "data/sprites/rising_chozo_pillar.h" +#include "data/sprites/security_laser.h" +#include "data/sprites/boss_statues.h" +#include "data/sprites/searchlight_eye.h" +#include "data/sprites/steam.h" +#include "data/sprites/unknown_item_block.h" +#include "data/sprites/unknown_item_chozo_statue.h" +#include "data/sprites/gadora.h" +#include "data/sprites/searchlight.h" +#include "data/sprites/space_pirate_carrying_power_bomb.h" +#include "data/sprites/falling_chozo_pillar.h" +#include "data/sprites/mecha_ridley.h" +#include "data/sprites/escape_gate.h" +#include "data/spriteset.h" + +#include "constants/game_state.h" +#include "constants/connection.h" +#include "constants/sprite.h" +#include "constants/particle.h" + +#include "structs/bg_clip.h" +#include "structs/game_state.h" +#include "structs/room.h" +#include "structs/samus.h" + +#define MAX_AMOUNT_OF_SPRITESET 114 + +static Func_T sPrimarySpritesAIPointers[PSPRITE_COUNT] = { + [PSPRITE_UNUSED0] = UnusedSprites, + [PSPRITE_UNUSED1] = UnusedSprites, + [PSPRITE_UNUSED2] = UnusedSprites, + [PSPRITE_UNUSED3] = UnusedSprites, + [PSPRITE_UNUSED4] = UnusedSprites, + [PSPRITE_UNUSED5] = UnusedSprites, + [PSPRITE_UNUSED6] = UnusedSprites, + [PSPRITE_UNUSED7] = UnusedSprites, + [PSPRITE_UNUSED8] = UnusedSprites, + [PSPRITE_UNUSED9] = UnusedSprites, + [PSPRITE_UNUSED10] = UnusedSprites, + [PSPRITE_UNUSED11] = UnusedSprites, + [PSPRITE_UNUSED12] = UnusedSprites, + [PSPRITE_UNUSED13] = UnusedSprites, + [PSPRITE_UNUSED14] = UnusedSprites, + [PSPRITE_UNUSED15] = UnusedSprites, + [PSPRITE_UNUSED16] = UnusedSprites, + [PSPRITE_MESSAGE_BANNER] = MessageBanner, + [PSPRITE_ZOOMER_YELLOW] = Zoomer, + [PSPRITE_ZOOMER_RED] = Zoomer, + [PSPRITE_ZEELA] = Zeela, + [PSPRITE_ZEELA_RED] = Zeela, + [PSPRITE_RIPPER_BROWN] = Ripper, + [PSPRITE_RIPPER_PURPLE] = Ripper, + [PSPRITE_ZEB] = Zeb, + [PSPRITE_ZEB_BLUE] = Zeb, + [PSPRITE_LARGE_ENERGY_DROP] = EnemyDrop, + [PSPRITE_SMALL_ENERGY_DROP] = EnemyDrop, + [PSPRITE_MISSILE_DROP] = EnemyDrop, + [PSPRITE_SUPER_MISSILE_DROP] = EnemyDrop, + [PSPRITE_POWER_BOMB_DROP] = EnemyDrop, + [PSPRITE_SKREE_GREEN] = Skree, + [PSPRITE_SKREE_BLUE] = Skree, + [PSPRITE_MORPH_BALL] = MorphBall, + [PSPRITE_CHOZO_STATUE_LONG_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_LONG] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_ICE_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_ICE] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_WAVE_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_WAVE] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_BOMB_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_BOMB] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_SPEEDBOOSTER_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_SPEEDBOOSTER] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_HIGH_JUMP_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_HIGH_JUMP] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_SCREW_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_SCREW] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_VARIA_HINT] = ChozoStatue, + [PSPRITE_CHOZO_STATUE_VARIA] = ChozoStatue, + [PSPRITE_SOVA_PURPLE] = Sova, + [PSPRITE_SOVA_ORANGE] = Sova, + [PSPRITE_MULTIVIOLA] = Multiviola, + [PSPRITE_MULTIPLE_LARGE_ENERGY] = EnemyDrop, + [PSPRITE_GERUTA_RED] = Geruta, + [PSPRITE_GERUTA_GREEN] = Geruta, + [PSPRITE_SQUEEPT] = Squeept, + [PSPRITE_SQUEEPT_UNUSED] = Squeept, + [PSPRITE_MAP_STATION] = MapStation, + [PSPRITE_DRAGON] = Dragon, + [PSPRITE_DRAGON_UNUSED] = Dragon, + [PSPRITE_ZIPLINE] = Zipline, + [PSPRITE_ZIPLINE_BUTTON] = ZiplineButton, + [PSPRITE_REO_GREEN_WINGS] = Reo, + [PSPRITE_REO_PURPLE_WINGS] = Reo, + [PSPRITE_GUNSHIP] = Gunship, + [PSPRITE_DEOREM_FIRST_LOCATION] = Deorem, + [PSPRITE_DEOREM_SECOND_LOCATION] = Deorem, + [PSPRITE_CHARGE_BEAM] = ChargeBeam, + [PSPRITE_SKULTERA] = Skultera, + [PSPRITE_DESSGEEGA] = Dessgeega, + [PSPRITE_DESSGEEGA_AFTER_LONG_BEAM] = Dessgeega, + [PSPRITE_WAVER] = Waver, + [PSPRITE_WAVER_UNUSED] = Waver, + [PSPRITE_MELLOW] = Mellow, + [PSPRITE_HIVE] = Hive, + [PSPRITE_POWER_GRIP] = PowerGrip, + [PSPRITE_IMAGO_LARVA_RIGHT] = ImagoLarva, + [PSPRITE_MORPH_BALL_LAUNCHER] = MorphBallLauncher, + [PSPRITE_IMAGO_COCOON] = ImagoCocoon, + [PSPRITE_ELEVATOR_PAD] = ElevatorPad, + [PSPRITE_SPACE_PIRATE] = SpacePirate, + [PSPRITE_SPACE_PIRATE_WAITING1] = SpacePirate, + [PSPRITE_SPACE_PIRATE_WAITING2] = SpacePirate, + [PSPRITE_SPACE_PIRATE_WAITING3] = SpacePirate, + [PSPRITE_SPACE_PIRATE2] = SpacePirate, + [PSPRITE_GAMET_BLUE_SINGLE] = Gamet, + [PSPRITE_GAMET_RED_SINGLE] = Gamet, + [PSPRITE_CHOZO_STATUE_GRAVITY] = UnknownItemChozoStatue, + [PSPRITE_CHOZO_STATUE_SPACE_JUMP] = UnknownItemChozoStatue, + [PSPRITE_SECURITY_GATE_DEFAULT_OPEN] = SecurityGateDefaultOpen, + [PSPRITE_ZEBBO_GREEN] = Zebbo, + [PSPRITE_ZEBBO_YELLOW] = Zebbo, + [PSPRITE_WORKER_ROBOT] = WorkerRobot, + [PSPRITE_PARASITE_MULTIPLE] = ParasiteMultiple, + [PSPRITE_PARASITE] = Parasite, + [PSPRITE_PISTON] = Piston, + [PSPRITE_RIDLEY] = Ridley, + [PSPRITE_SECURITY_GATE_DEFAULT_CLOSED] = SecurityGateDefaultClosed, + [PSPRITE_ZIPLINE_GENERATOR] = ZiplineGenerator, + [PSPRITE_METROID] = Metroid, + [PSPRITE_FROZEN_METROID] = Metroid, + [PSPRITE_RINKA_ORANGE] = Rinka, + [PSPRITE_POLYP] = Polyp, + [PSPRITE_VIOLA_BLUE] = Viola, + [PSPRITE_VIOLA_ORANGE] = Viola, + [PSPRITE_GERON_NORFAIR] = GeronNorfair, + [PSPRITE_HOLTZ] = Holtz, + [PSPRITE_GEKITAI_MACHINE] = GekitaiMachine, + [PSPRITE_RUINS_TEST] = RuinsTest, + [PSPRITE_SAVE_PLATFORM] = SavePlatform, + [PSPRITE_KRAID] = Kraid, + [PSPRITE_IMAGO_COCOON_AFTER_FIGHT] = ImagoCocoonAfterFight, + [PSPRITE_RIPPERII] = Ripper2, + [PSPRITE_MELLA] = Mella, + [PSPRITE_ATOMIC] = Atomic, + [PSPRITE_AREA_BANNER] = AreaBanner, + [PSPRITE_MOTHER_BRAIN] = MotherBrain, + [PSPRITE_FAKE_POWER_BOMB_EVENT_TRIGGER] = FakePowerBombEventTrigger, + [PSPRITE_ACID_WORM] = AcidWorm, + [PSPRITE_ESCAPE_SHIP] = EscapeShip, + [PSPRITE_SIDEHOPPER] = Sidehopper, + [PSPRITE_GEEGA] = Geega, + [PSPRITE_GEEGA_WHITE] = Geega, + [PSPRITE_RINKA_MOTHER_BRAIN] = RinkaMotherBrain, + [PSPRITE_ZEBETITE_ONE_AND_THREE] = Zebetite, + [PSPRITE_CANNON] = Cannon, + [PSPRITE_IMAGO_LARVA_RIGHT_SIDE] = ImagoLarvaRightSide, + [PSPRITE_TANGLE_VINE_TALL] = TangleVineTall, + [PSPRITE_TANGLE_VINE_MEDIUM] = TangleVineMedium, + [PSPRITE_TANGLE_VINE_CURVED] = TangleVineCurved, + [PSPRITE_TANGLE_VINE_SHORT] = TangleVineShort, + [PSPRITE_MELLOW_SWARM] = MellowSwarm, + [PSPRITE_MELLOW_SWARM_HEALTH_BASED] = MellowSwarm, + [PSPRITE_IMAGO] = Imago, + [PSPRITE_ZEBETITE_TWO_AND_FOUR] = Zebetite, + [PSPRITE_CANNON2] = Cannon, + [PSPRITE_CANNON3] = Cannon, + [PSPRITE_CROCOMIRE] = Crocomire, + [PSPRITE_IMAGO_LARVA_LEFT] = ImagoLarva, + [PSPRITE_GERON_BRINSTAR_ROOM_15] = Geron, + [PSPRITE_GERON_BRINSTAR_ROOM_1C] = Geron, + [PSPRITE_GERON_VARIA1] = Geron, + [PSPRITE_GERON_VARIA2] = Geron, + [PSPRITE_GERON_VARIA3] = Geron, + [PSPRITE_GLASS_TUBE] = GlassTube, + [PSPRITE_SAVE_PLATFORM_CHOZODIA] = SavePlatformChozodia, + [PSPRITE_BARISTUTE] = Baristute, + [PSPRITE_CHOZO_STATUE_PLASMA_BEAM] = UnknownItemChozoStatue, + [PSPRITE_KRAID_ELEVATOR_STATUE] = KraidElevatorStatue, + [PSPRITE_RIDLEY_ELEVATOR_STATUE] = RidleyElevatorStatue, + [PSPRITE_RISING_CHOZO_PILLAR] = RisingChozoPillar, + [PSPRITE_SECURITY_LASER_VERTICAL] = SecurityLaser, + [PSPRITE_SECURITY_LASER_HORIZONTAL] = SecurityLaser, + [PSPRITE_SECURITY_LASER_VERTICAL2] = SecurityLaser, + [PSPRITE_SECURITY_LASER_HORIZONTAL2] = SecurityLaser, + [PSPRITE_LOCK_UNLOCK_METROID_DOORS_UNUSED] = MetroidDoorLock, + [PSPRITE_GAMET_BLUE_LEADER] = Gamet, + [PSPRITE_GAMET_BLUE_FOLLOWER] = Gamet, + [PSPRITE_GEEGA_LEADER] = Geega, + [PSPRITE_GEEGA_FOLLOWER] = Geega, + [PSPRITE_ZEBBO_GREEN_LEADER] = Zebbo, + [PSPRITE_ZEBBO_GREEN_FOLLOWER] = Zebbo, + [PSPRITE_KRAID_STATUE] = KraidStatue, + [PSPRITE_RIDLEY_STATUE] = RidleyStatue, + [PSPRITE_RINKA_GREEN] = Rinka, + [PSPRITE_SEARCHLIGHT_EYE] = SearchlightEye, + [PSPRITE_SEARCHLIGHT_EYE2] = SearchlightEye, + [PSPRITE_STEAM_LARGE] = Steam, + [PSPRITE_STEAM_SMALL] = Steam, + [PSPRITE_PLASMA_BEAM_BLOCK] = UnknownItemBlock, + [PSPRITE_GRAVITY_SUIT_BLOCK] = UnknownItemBlock, + [PSPRITE_SPACE_JUMP_BLOCK] = UnknownItemBlock, + [PSPRITE_GADORA_KRAID] = Gadora, + [PSPRITE_GADORA_RIDLEY] = Gadora, + [PSPRITE_SEARCHLIGHT] = Searchlight, + [PSPRITE_SEARCHLIGHT2] = Searchlight, + [PSPRITE_SEARCHLIGHT3] = Searchlight, + [PSPRITE_SEARCHLIGHT4] = Searchlight, + [PSPRITE_MAYBE_SEARCHLIGHT_TRIGGER] = PrimarySpriteB3, + [PSPRITE_DISCOVERED_IMAGO_PASSAGE_EVENT_TRIGGER] = EventTriggerDiscoveredImagoPassage, + [PSPRITE_FAKE_POWER_BOMB] = FakePowerBomb, + [PSPRITE_SPACE_PIRATE_CARRYING_POWER_BOMB] = SpacePirateCarryingPowerBomb, + [PSPRITE_TANGLE_VINE_RED_GARUTA] = TangleVineRedGeruta, + [PSPRITE_TANGLE_VINE_GERUTA] = TangleVineGeruta, + [PSPRITE_TANGLE_VINE_LARVA_RIGHT] = TangleVineLarvaRight, + [PSPRITE_TANGLE_VINE_LARVA_LEFT] = TangleVineLarvaLeft, + [PSPRITE_WATER_DROP] = WaterDrop, + [PSPRITE_FALLING_CHOZO_PILLAR] = FallingChozoPillar, + [PSPRITE_MECHA_RIDLEY] = MechaRidley, + [PSPRITE_EXPLOSION_ZEBES_ESCAPE] = ExplosionZebesEscape, + [PSPRITE_STEAM_LARGE_DIAGONAL_UP] = SteamDiagonal, + [PSPRITE_STEAM_SMALL_DIAGONAL_UP] = SteamDiagonal, + [PSPRITE_STEAM_LARGE_DIAGONAL_DOWN] = SteamDiagonal, + [PSPRITE_STEAM_SMALL_DIAGONAL_DOWN] = SteamDiagonal, + [PSPRITE_BARISTUTE_KRAID_UPPER] = Baristute, + [PSPRITE_ESCAPE_GATE1] = EscapeGate, + [PSPRITE_ESCAPE_GATE2] = EscapeGate, + [PSPRITE_BLACK_SPACE_PIRATE] = BlackSpacePirate, + [PSPRITE_ESCAPE_SHIP_SPACE_PIRATE] = EscapeShipSpacePirate, + [PSPRITE_BARISTUTE_KRAID_LOWER] = Baristute, + [PSPRITE_RINKA_MOTHER_BRAIN2] = RinkaMotherBrain, + [PSPRITE_RINKA_MOTHER_BRAIN3] = RinkaMotherBrain, + [PSPRITE_RINKA_MOTHER_BRAIN4] = RinkaMotherBrain, + [PSPRITE_RINKA_MOTHER_BRAIN5] = RinkaMotherBrain, + [PSPRITE_RINKA_MOTHER_BRAIN6] = RinkaMotherBrain +}; + +static const u32* sSpritesGraphicsPointers[PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_COUNT)] = { + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_UNUSED16)] = sUnusedSpritesGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MESSAGE_BANNER)] = sMessageBannerGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_YELLOW)] = sZoomerGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_RED)] = sZoomerGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA_RED)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_BROWN)] = sRipperBrownGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_PURPLE)] = sRipperPurpleGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB)] = sZebPinkGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB_BLUE)] = sZebBlueGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LARGE_ENERGY_DROP)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SMALL_ENERGY_DROP)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MISSILE_DROP)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SUPER_MISSILE_DROP)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_BOMB_DROP)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_GREEN)] = sSkreeGreenGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_BLUE)] = sSkreeBlueGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL)] = sMorphBallGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG_HINT)] = sChozoStatueLongBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG)] = sChozoStatueLongBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE_HINT)] = sChozoStatueIceBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE)] = sChozoStatueIceBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE_HINT)] = sChozoStatueWaveBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE)] = sChozoStatueWaveBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB_HINT)] = sChozoStatueBombsGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB)] = sChozoStatueBombsGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER_HINT)] = sChozoStatueSpeedboosterGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER)] = sChozoStatueSpeedboosterGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP_HINT)] = sChozoStatueHighJumpGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP)] = sChozoStatueHighJumpGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW_HINT)] = sChozoStatueScrewAttackGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW)] = sChozoStatueScrewAttackGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA_HINT)] = sChozoStatueVariaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA)] = sChozoStatueVariaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_PURPLE)] = sSovaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_ORANGE)] = sSovaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIVIOLA)] = sMultiviolaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIPLE_LARGE_ENERGY)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_RED)] = sGerutaRedGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_GREEN)] = sGerutaGreenGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT)] = sSqueeptGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT_UNUSED)] = sSqueeptGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAP_STATION)] = sMapStationGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON)] = sDragonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON_UNUSED)] = sDragonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE)] = sZiplineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_BUTTON)] = sZiplineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_GREEN_WINGS)] = sReoGreenWingsGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_PURPLE_WINGS)] = sReoPurpleWingsGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GUNSHIP)] = sGunshipGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_FIRST_LOCATION)] = sDeoremGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_SECOND_LOCATION)] = sDeoremGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHARGE_BEAM)] = sChargeBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKULTERA)] = sSkulteraGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA)] = sDessgeegaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA_AFTER_LONG_BEAM)] = sDessgeegaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER)] = sWaverGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER_UNUSED)] = sWaverGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW)] = sHiveGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HIVE)] = sHiveGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_GRIP)] = sPowerGripGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT)] = sImagoLarvaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL_LAUNCHER)] = sMorphBallLauncherGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON)] = sImagoCocoonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ELEVATOR_PAD)] = sElevatorPadGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING1)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING2)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING3)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE2)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_SINGLE)] = sGametBlueGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_RED_SINGLE)] = sGametRedGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_GRAVITY)] = sChozoStatueGravitySuitGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPACE_JUMP)] = sChozoStatueSpaceJumpGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_OPEN)] = sSecurityGateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN)] = sZebboGreenGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_YELLOW)] = sZebboYellowGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WORKER_ROBOT)] = sWorkerRobotGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE_MULTIPLE)] = sParasiteGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE)] = sParasiteGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PISTON)] = sPistonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY)] = sRidleyGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_CLOSED)] = sSecurityGateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_GENERATOR)] = sZiplineGeneratorGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_METROID)] = sMetroidGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FROZEN_METROID)] = sMetroidGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_ORANGE)] = sRinkaOrangeGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POLYP)] = sPolypGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_BLUE)] = sViolaBlueGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_ORANGE)] = sViolaOrangeGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_NORFAIR)] = sGeronNorfairGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HOLTZ)] = sHoltzGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEKITAI_MACHINE)] = sGekitaiMachineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RUINS_TEST)] = sRuinsTestGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM)] = sSavePlatformGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID)] = sKraidGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON_AFTER_FIGHT)] = sImagoCocoonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPERII)] = sRipper2Gfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLA)] = sMellaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ATOMIC)] = sAtomicGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_AREA_BANNER)] = sAreaBannerGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MOTHER_BRAIN)] = sMotherBrainGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB_EVENT_TRIGGER)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ACID_WORM)] = sAcidWormGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP)] = sEscapeShipGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SIDEHOPPER)] = sSidehopperGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA)] = sGeegaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_WHITE)] = sGeegaWhiteGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_ONE_AND_THREE)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT_SIDE)] = sImagoLarvaRightSideGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_TALL)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_MEDIUM)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_CURVED)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_SHORT)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM)] = sHiveGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM_HEALTH_BASED)] = sHiveGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO)] = sImagoGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_TWO_AND_FOUR)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON2)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON3)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CROCOMIRE)] = sCrocomireGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_LEFT)] = sImagoLarvaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_15)] = sGeronGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_1C)] = sGeronGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA1)] = sGeronGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA2)] = sGeronGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA3)] = sGeronGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GLASS_TUBE)] = sGlassTubeGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM_CHOZODIA)] = sSavePlatformChozodiaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE)] = sBaristuteGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_PLASMA_BEAM)] = sChozoStatuePlasmaBeamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_ELEVATOR_STATUE)] = sElevatorStatuesGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_ELEVATOR_STATUE)] = sElevatorStatuesGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RISING_CHOZO_PILLAR)] = sRisingChozoPillarGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL)] = sSecurityLaserGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL)] = sSecurityLaserGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL2)] = sSecurityLaserGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL2)] = sSecurityLaserGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LOCK_UNLOCK_METROID_DOORS_UNUSED)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_LEADER)] = sGametBlueGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_FOLLOWER)] = sGametBlueGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_LEADER)] = sGeegaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_FOLLOWER)] = sGeegaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_LEADER)] = sZebboGreenGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_FOLLOWER)] = sZebboGreenGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_STATUE)] = sBossStatuesGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_STATUE)] = sBossStatuesGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_GREEN)] = sRinkaGreenGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE)] = sSearchlightEyeGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE2)] = sSearchlightEyeGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE)] = sSteamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL)] = sSteamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PLASMA_BEAM_BLOCK)] = sPlasmaBeamBlockGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GRAVITY_SUIT_BLOCK)] = sGravityBlockGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_JUMP_BLOCK)] = sSpaceJumpBlockGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_KRAID)] = sGadoraGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_RIDLEY)] = sGadoraGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT)] = sSearchlightGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT2)] = sSearchlightGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT3)] = sSearchlightGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT4)] = sSearchlightGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAYBE_SEARCHLIGHT_TRIGGER)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DISCOVERED_IMAGO_PASSAGE_EVENT_TRIGGER)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB)] = sFakePowerBombGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_CARRYING_POWER_BOMB)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_RED_GARUTA)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_GERUTA)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_RIGHT)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_LEFT)] = sTangleVineGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WATER_DROP)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FALLING_CHOZO_PILLAR)] = sFallingChozoPillarGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MECHA_RIDLEY)] = sMechaRidleyGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_EXPLOSION_ZEBES_ESCAPE)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_UP)] = sSteamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_UP)] = sSteamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_DOWN)] = sSteamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_DOWN)] = sSteamGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_UPPER)] = sBaristuteGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE1)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE2)] = sZeelaGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BLACK_SPACE_PIRATE)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP_SPACE_PIRATE)] = sSpacePirateGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_LOWER)] = sBaristuteGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN2)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN3)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN4)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN5)] = sRinkaZebetiteAndCannonGfx, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN6)] = sRinkaZebetiteAndCannonGfx +}; + +static const u16* sSpritesPalettePointers[PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_COUNT)] = { + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_UNUSED16)] = sUnusedSpritesPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MESSAGE_BANNER)] = sMessageBannerPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_YELLOW)] = sZoomerPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZOOMER_RED)] = sZoomerPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEELA_RED)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_BROWN)] = sRipperBrownPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPER_PURPLE)] = sRipperPurplePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB)] = sZebPinkPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEB_BLUE)] = sZebBluePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LARGE_ENERGY_DROP)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SMALL_ENERGY_DROP)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MISSILE_DROP)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SUPER_MISSILE_DROP)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_BOMB_DROP)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_GREEN)] = sSkreeGreenPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKREE_BLUE)] = sSkreeBluePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL)] = sMorphBallPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG_HINT)] = sChozoStatueLongBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_LONG)] = sChozoStatueLongBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE_HINT)] = sChozoStatueIceBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_ICE)] = sChozoStatueIceBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE_HINT)] = sChozoStatueWaveBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_WAVE)] = sChozoStatueWaveBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB_HINT)] = sChozoStatueBombsPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_BOMB)] = sChozoStatueBombsPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER_HINT)] = sChozoStatueSpeedboosterPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPEEDBOOSTER)] = sChozoStatueSpeedboosterPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP_HINT)] = sChozoStatueHighJumpPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_HIGH_JUMP)] = sChozoStatueHighJumpPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW_HINT)] = sChozoStatueScrewAttackPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SCREW)] = sChozoStatueScrewAttackPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA_HINT)] = sChozoStatueVariaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_VARIA)] = sChozoStatueVariaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_PURPLE)] = sSovaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SOVA_ORANGE)] = sSovaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIVIOLA)] = sMultiviolaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MULTIPLE_LARGE_ENERGY)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_RED)] = sGerutaRedPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERUTA_GREEN)] = sGerutaGreenPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT)] = sSqueeptPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SQUEEPT_UNUSED)] = sSqueeptPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAP_STATION)] = sMapStationPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON)] = sDragonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DRAGON_UNUSED)] = sDragonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE)] = sZiplinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_BUTTON)] = sZiplinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_GREEN_WINGS)] = sReoGreenWingsPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_REO_PURPLE_WINGS)] = sReoPurpleWingsPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GUNSHIP)] = sGunshipPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_FIRST_LOCATION)] = sDeoremPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DEOREM_SECOND_LOCATION)] = sDeoremPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHARGE_BEAM)] = sChargeBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SKULTERA)] = sSkulteraPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA)] = sDessgeegaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DESSGEEGA_AFTER_LONG_BEAM)] = sDessgeegaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER)] = sWaverPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WAVER_UNUSED)] = sWaverPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW)] = sHivePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HIVE)] = sHivePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POWER_GRIP)] = sPowerGripPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT)] = sImagoLarvaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MORPH_BALL_LAUNCHER)] = sMorphBallLauncherPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON)] = sImagoCocoonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ELEVATOR_PAD)] = sElevatorPadPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING1)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING2)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_WAITING3)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE2)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_SINGLE)] = sGametBluePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_RED_SINGLE)] = sGametRedPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_GRAVITY)] = sChozoStatueGravitySuitPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_SPACE_JUMP)] = sChozoStatueSpaceJumpPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_OPEN)] = sSecurityGatePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN)] = sZebboGreenPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_YELLOW)] = sZebboYellowPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WORKER_ROBOT)] = sWorkerRobotPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE_MULTIPLE)] = sParasitePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PARASITE)] = sParasitePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PISTON)] = sPistonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY)] = sRidleyPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_GATE_DEFAULT_CLOSED)] = sSecurityGatePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZIPLINE_GENERATOR)] = sZiplineGeneratorPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_METROID)] = sMetroidPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FROZEN_METROID)] = sMetroidPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_ORANGE)] = sRinkaOrangePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_POLYP)] = sPolypPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_BLUE)] = sViolaBluePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_VIOLA_ORANGE)] = sViolaOrangePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_NORFAIR)] = sGeronNorfairPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_HOLTZ)] = sHoltzPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEKITAI_MACHINE)] = sGekitaiMachinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RUINS_TEST)] = sRuinsTestPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM)] = sSavePlatformPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID)] = sKraidPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_COCOON_AFTER_FIGHT)] = sImagoCocoonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIPPERII)] = sRipper2Pal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLA)] = sMellaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ATOMIC)] = sAtomicPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_AREA_BANNER)] = sAreaBannerPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MOTHER_BRAIN)] = sMotherBrainPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB_EVENT_TRIGGER)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ACID_WORM)] = sAcidWormPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP)] = sEscapeShipPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SIDEHOPPER)] = sSidehopperPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA)] = sGeegaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_WHITE)] = sGeegaWhitePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_ONE_AND_THREE)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_RIGHT_SIDE)] = sImagoLarvaRightSidePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_TALL)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_MEDIUM)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_CURVED)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_SHORT)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM)] = sHivePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MELLOW_SWARM_HEALTH_BASED)] = sHivePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO)] = sImagoPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBETITE_TWO_AND_FOUR)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON2)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CANNON3)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CROCOMIRE)] = sCrocomirePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_IMAGO_LARVA_LEFT)] = sImagoLarvaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_15)] = sGeronPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_BRINSTAR_ROOM_1C)] = sGeronPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA1)] = sGeronPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA2)] = sGeronPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GERON_VARIA3)] = sGeronPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GLASS_TUBE)] = sGlassTubePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SAVE_PLATFORM_CHOZODIA)] = sSavePlatformChozodiaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE)] = sBaristutePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_CHOZO_STATUE_PLASMA_BEAM)] = sChozoStatuePlasmaBeamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_ELEVATOR_STATUE)] = sElevatorStatuesPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_ELEVATOR_STATUE)] = sElevatorStatuesPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RISING_CHOZO_PILLAR)] = sRisingChozoPillarPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL)] = sSecurityLaserPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL)] = sSecurityLaserPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_VERTICAL2)] = sSecurityLaserPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SECURITY_LASER_HORIZONTAL2)] = sSecurityLaserPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_LOCK_UNLOCK_METROID_DOORS_UNUSED)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_LEADER)] = sGametBluePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GAMET_BLUE_FOLLOWER)] = sGametBluePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_LEADER)] = sGeegaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GEEGA_FOLLOWER)] = sGeegaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_LEADER)] = sZebboGreenPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ZEBBO_GREEN_FOLLOWER)] = sZebboGreenPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_KRAID_STATUE)] = sBossStatuesPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RIDLEY_STATUE)] = sBossStatuesPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_GREEN)] = sRinkaGreenPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE)] = sSearchlightEyePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT_EYE2)] = sSearchlightEyePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE)] = sSteamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL)] = sSteamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_PLASMA_BEAM_BLOCK)] = sPlasmaBeamBlockPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GRAVITY_SUIT_BLOCK)] = sGravityBlockPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_JUMP_BLOCK)] = sSpaceJumpBlockPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_KRAID)] = sGadoraPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_GADORA_RIDLEY)] = sGadoraPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT)] = sSearchlightPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT2)] = sSearchlightPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT3)] = sSearchlightPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SEARCHLIGHT4)] = sSearchlightPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MAYBE_SEARCHLIGHT_TRIGGER)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_DISCOVERED_IMAGO_PASSAGE_EVENT_TRIGGER)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FAKE_POWER_BOMB)] = sFakePowerBombPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_SPACE_PIRATE_CARRYING_POWER_BOMB)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_RED_GARUTA)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_GERUTA)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_RIGHT)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_TANGLE_VINE_LARVA_LEFT)] = sTangleVinePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_WATER_DROP)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_FALLING_CHOZO_PILLAR)] = sFallingChozoPillarPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_MECHA_RIDLEY)] = sMechaRidleyPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_EXPLOSION_ZEBES_ESCAPE)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_UP)] = sSteamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_UP)] = sSteamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_LARGE_DIAGONAL_DOWN)] = sSteamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_STEAM_SMALL_DIAGONAL_DOWN)] = sSteamPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_UPPER)] = sBaristutePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE1)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_GATE2)] = sZeelaPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BLACK_SPACE_PIRATE)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_ESCAPE_SHIP_SPACE_PIRATE)] = sSpacePiratePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_BARISTUTE_KRAID_LOWER)] = sBaristutePal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN2)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN3)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN4)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN5)] = sRinkaZebetiteAndCannonPal, + [PSPRITE_OFFSET_FOR_GRAPHICS(PSPRITE_RINKA_MOTHER_BRAIN6)] = sRinkaZebetiteAndCannonPal +}; + +static Func_T sSecondarySpritesAIPointers[SSPRITE_COUNT] = { + [SSPRITE_CHOZO_BALL] = ChozoBall, + [SSPRITE_CHOZO_STATUE_PART] = ChozoStatuePart, + [SSPRITE_CHOZO_STATUE_REFILL] = ChozoStatueRefill, + [SSPRITE_KRAID_PART] = KraidPart, + [SSPRITE_CHOZO_STATUE_MOVEMENT] = ChozoStatueMovement, + [SSPRITE_CHARGE_BEAM_GLOW] = ChargeBeamGlow, + [SSPRITE_WINGED_RIPPER] = WingedRipper, + [SSPRITE_MULTIVIOLA_UNUSED] = MultiviolaUnused, + [SSPRITE_DRAGON_FIREBALL] = DragonFireball, + [SSPRITE_DEOREM_SEGMENT] = DeoremSegment, + [SSPRITE_DEOREM_EYE] = DeoremEye, + [SSPRITE_DEOREM_THORN] = DeoremThorn, + [SSPRITE_SKREE_EXPLOSION] = SkreeExplosion, + [SSPRITE_SAVE_PLATFORM_PART] = SavePlatformPart, + [SSPRITE_SAVE_YES_NO_CURSOR] = SaveYesNoCursor, + [SSPRITE_BLUE_SKREE_EXPLOSION] = SkreeExplosion, + [SSPRITE_ZEELA_EYES] = ZeelaEyes, + [SSPRITE_HIVE_ROOTS] = HiveRoots, + [SSPRITE_IMAGO_LARVA_PART] = ImagoLarvaPart, + [SSPRITE_MORPH_BALL_OUTSIDE] = MorphBallOutside, + [SSPRITE_IMAGO_COCOON_VINE] = ImagoCocoonVine, + [SSPRITE_IMAGO_COCOON_SPORE] = ImagoCocoonSpore, + [SSPRITE_SPACE_PIRATE_LASER] = SpacePirateLaser, + [SSPRITE_RIDLEY_PART] = RidleyPart, + [SSPRITE_RIDLEY_TAIL] = RidleyTail, + [SSPRITE_SEARCHLIGHT_EYE_BEAM] = SearchlightEyeBeam, + [SSPRITE_METROID_SHELL] = MetroidShell, + [SSPRITE_POLYP_PROJECTILE] = PolypProjectile, + [SSPRITE_KRAID_SPIKE] = KraidSpike, + [SSPRITE_KRAID_NAIL] = KraidNail, + [SSPRITE_ZIPLINE_GENERATOR_PART] = ZiplineGeneratorPart, + [SSPRITE_ATOMIC_ELECTRICITY] = AtomicElectricity, + [SSPRITE_MOTHER_BRAIN_PART] = MotherBrainPart, + [SSPRITE_RIDLEY_FIREBALL] = RidleyFireball, + [SSPRITE_UNKNOWN_ITEM_CHOZO_STATUE_PART] = UnknownItemChozoStatuePart, + [SSPRITE_UNKNOWN_ITEM_CHOZO_STATUE_REFILL] = UnknownItemChozoStatueRefill, + [SSPRITE_MORPH_BALL_LAUNCHER_PART] = MorphBallLauncherPart, + [SSPRITE_ACID_WORM_PART] = AcidWormPart, + [SSPRITE_ACID_WORM_SPIT] = AcidWormSpit, + [SSPRITE_CANNON_BULLET] = CannonBullet, + [SSPRITE_CROCOMIRE_PART] = CrocomirePart, + [SSPRITE_IMAGO_PART] = ImagoPart, + [SSPRITE_DEFEATED_IMAGO_COCOON] = DefeatedImagoCocoon, + [SSPRITE_IMAGO_CEILING_VINE] = ImagoCocoonCeilingVine, + [SSPRITE_SEARCHLIGHT_EYE_BEAM2] = SearchlightEyeBeam, + [SSPRITE_TANGLE_VINE_GERUTA_PART] = TangleVineGerutaPart, + [SSPRITE_CHOZODIA_SAVE_PLATFORM_PART] = SavePlatformChozodiaPart, + [SSPRITE_IMAGO_NEEDLE] = ImagoNeedle, + [SSPRITE_ELEVATOR_STATUE_DEBRIS] = ElevatorStatueDebris, + [SSPRITE_IMAGO_DAMAGED_STINGER] = ImagoDamagedStinger, + [SSPRITE_GUNSHIP_PART] = GunshipPart, + [SSPRITE_IMAGO_EGG] = ImagoEgg, + [SSPRITE_MAP_STATION_PART] = MapStationPart, + [SSPRITE_CHOZO_PILLAR_PLATFORM] = ChozoPillarPlatform, + [SSPRITE_GADORA_EYE] = GadoraEye, + [SSPRITE_GADORA_BEAM] = GadoraBeam, + [SSPRITE_UNKNOWN_ITEM_BLOCK_LIGHT] = UnknownItemBlockLight, + [SSPRITE_SEARCHLIGHT_EYE_PROJECTILE] = SearchlightEyeProjectile, + [SSPRITE_CHOZO_PILLAR_PLATFORM_SHADOW] = ChozoPillarPlatformShadow, + [SSPRITE_RUINS_TEST_SYMBOL] = RuinsTestSymbol, + [SSPRITE_RUINS_TEST_SAMUS_REFLECTION_START] = RuinsTestSamusReflectionStart, + [SSPRITE_RUINS_TEST_REFLECTION_COVER] = RuinsTestReflectionCover, + [SSPRITE_RUINS_TEST_GHOST_OUTLINE] = RuinsTestGhostOutline, + [SSPRITE_RUINS_TEST_GHOST] = RuinsTestGhost, + [SSPRITE_RUINS_TEST_SHOOTABLE_SYMBOL] = RuinsTestShootableSymbol, + [SSPRITE_RUINS_TEST_SAMUS_REFLECTION_END] = RuinsTestSamusReflectionEnd, + [SSPRITE_RUINS_TEST_LIGHTNING] = RuinsTestLightning, + [SSPRITE_RIDLEY_BIG_FIREBALL] = RidleyFireball, + [SSPRITE_MECHA_RIDLEY_PART] = MechaRidleyPart, + [SSPRITE_ESCAPE_SHIP_PART] = EscapeShipPart, + [SSPRITE_POWER_GRIP_GLOW] = PowerGripGlow, + [SSPRITE_MECHA_RIDLEY_LASER] = MechaRidleyLaser, + [SSPRITE_MECHA_RIDLEY_MISSILE] = MechaRidleyMissile, + [SSPRITE_MECHA_RIDLEY_FIREBALL] = MechaRidleyFireball, + [SSPRITE_MOTHER_BRAIN_BEAM] = MotherBrainBeam, + [SSPRITE_MOTHER_BRAIN_BLOCK] = MotherBrainBlock, + [SSPRITE_MOTHER_BRAIN_GLASS_BREAKING] = MotherBrainGlassBreaking +}; + +static const u8* sSpritesetPointers[MAX_AMOUNT_OF_SPRITESET] = { + sSpriteset0, + sSpriteset1, + sSpriteset2, + sSpriteset3, + sSpriteset4, + sSpriteset5, + sSpriteset6, + sSpriteset7, + sSpriteset8, + sSpriteset9, + sSpriteset10, + sSpriteset11, + sSpriteset12, + sSpriteset13, + sSpriteset14, + sSpriteset15, + sSpriteset16, + sSpriteset17, + sSpriteset18, + sSpriteset19, + sSpriteset20, + sSpriteset21, + sSpriteset22, + sSpriteset23, + sSpriteset24, + sSpriteset25, + sSpriteset26, + sSpriteset27, + sSpriteset28, + sSpriteset29, + sSpriteset30, + sSpriteset31, + sSpriteset32, + sSpriteset33, + sSpriteset34, + sSpriteset35, + sSpriteset36, + sSpriteset37, + sSpriteset38, + sSpriteset39, + sSpriteset40, + sSpriteset41, + sSpriteset42, + sSpriteset43, + sSpriteset44, + sSpriteset45, + sSpriteset46, + sSpriteset47, + sSpriteset48, + sSpriteset49, + sSpriteset50, + sSpriteset51, + sSpriteset52, + sSpriteset53, + sSpriteset54, + sSpriteset55, + sSpriteset56, + sSpriteset57, + sSpriteset58, + sSpriteset59, + sSpriteset60, + sSpriteset61, + sSpriteset62, + sSpriteset63, + sSpriteset64, + sSpriteset65, + sSpriteset66, + sSpriteset67, + sSpriteset68, + sSpriteset69, + sSpriteset70, + sSpriteset71, + sSpriteset72, + sSpriteset73, + sSpriteset74, + sSpriteset75, + sSpriteset76, + sSpriteset77, + sSpriteset78, + sSpriteset79, + sSpriteset80, + sSpriteset81, + sSpriteset82, + sSpriteset83, + sSpriteset84, + sSpriteset85, + sSpriteset86, + sSpriteset87, + sSpriteset88, + sSpriteset89, + sSpriteset90, + sSpriteset91, + sSpriteset92, + sSpriteset93, + sSpriteset94, + sSpriteset95, + sSpriteset96, + sSpriteset97, + sSpriteset98, + sSpriteset99, + sSpriteset100, + sSpriteset101, + sSpriteset102, + sSpriteset103, + sSpriteset104, + sSpriteset105, + sSpriteset106, + sSpriteset107, + sSpriteset108, + sSpriteset109, + sSpriteset110, + sSpriteset111, + sSpriteset112, + sSpriteset113 +}; + +/** + * cf00 | 42c | Main routine that updates all the sprites + * + */ +void SpriteUpdate(void) +{ + u16 rngParam1; + u16 rngParam2; + u8 count; + struct SpriteData* pCurrent; + + pCurrent = &gCurrentSprite; + rngParam1 = gFrameCounter8Bit; + rngParam2 = gFrameCounter16Bit / 16; + + if (gSubGameMode1 == SUB_GAME_MODE_PLAYING) + { + // In normal gameplay + + SpriteDebrisProcessAll(); + + if (!SpriteUtilCheckStopSpritesPose()) + { + // Samus is able, update sprites normally + + // Check collision + SpriteUtilSamusAndSpriteCollision(); + + for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) + { + if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) + continue; + + // Transfer sprite to current + DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); + + // Update random number + gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); + + // Update stun timer + SpriteUtilUpdateStunTimer(pCurrent); + + // Call AI + if (pCurrent->properties & SP_SECONDARY_SPRITE) + sSecondarySpritesAIPointers[pCurrent->spriteId](); + else + sPrimarySpritesAIPointers[pCurrent->spriteId](); + + // Check update sprite info if still alive + if (pCurrent->status & SPRITE_STATUS_EXISTS) + { + SpriteUtilSamusStandingOnSprite(pCurrent); + SpriteUpdateAnimation(pCurrent); + SpriteCheckOnScreen(pCurrent); + } + + // Transfer current back to array + DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); + } + + // Update alarm + DecrementChozodiaAlarm(); + + if (gParasiteRelated != 0) + gParasiteRelated--; + } + else + { + // Samus isn't able, still update sprites but only on some conditions + + for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) + { + if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) + continue; + + if (gSpriteData[count].pose == SPRITE_POSE_UNINITIALIZED || gSpriteData[count].properties & SP_ALWAYS_ACTIVE) + { + // Only update sprites to initialize them or if they have the always active flag + + // Transfer sprite to current + DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); + + // Update random number + gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); + + // Update stun timer + SpriteUtilUpdateStunTimer(pCurrent); + + // Call AI + if (pCurrent->properties & SP_SECONDARY_SPRITE) + sSecondarySpritesAIPointers[pCurrent->spriteId](); + else + sPrimarySpritesAIPointers[pCurrent->spriteId](); + + // Check update sprite info if still alive + if (pCurrent->status & SPRITE_STATUS_EXISTS) + { + SpriteUtilSamusStandingOnSprite(pCurrent); + SpriteUpdateAnimation(pCurrent); + SpriteCheckOnScreen(pCurrent); + } + + // Transfer current back to array + DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); + } + else + { + // Only check if on screen + + // Transfer sprite to current + DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); + + SpriteCheckOnScreen(pCurrent); + + // Transfer current back to array + DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); + } + } + } + } + else if (gSubGameMode1 == SUB_GAME_MODE_NO_CLIP) + { + // In debug no-clip, update sprites normally but don't check for collision + for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) + { + if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) + continue; + + // Transfer sprite to current + DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); + + // Update random number + gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); + + // Update stun timer + SpriteUtilUpdateStunTimer(pCurrent); + + // Call AI + if (pCurrent->properties & SP_SECONDARY_SPRITE) + sSecondarySpritesAIPointers[pCurrent->spriteId](); + else + sPrimarySpritesAIPointers[pCurrent->spriteId](); + + // Check update sprite info if still alive + if (pCurrent->status & SPRITE_STATUS_EXISTS) + { + SpriteUtilSamusStandingOnSprite(pCurrent); + SpriteUpdateAnimation(pCurrent); + SpriteCheckOnScreen(pCurrent); + } + + // Transfer current back to array + DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); + } + + // Update alarm + DecrementChozodiaAlarm(); + + if (gParasiteRelated != 0) + APPLY_DELTA_TIME_DEC(gParasiteRelated); + } + else + { + // Any other sub game mode + for (count = 0; count < MAX_AMOUNT_OF_SPRITES; count++) + { + if (!(gSpriteData[count].status & SPRITE_STATUS_EXISTS)) + continue; + + // Transfer sprite to current + DMA3_COPY_16(&gSpriteData[count], &gCurrentSprite, sizeof(struct SpriteData) / 2); + + // Update random number + gSpriteRng = ARRAY_ACCESS(sSpriteRandomNumberTable, rngParam1 + count + rngParam2 + pCurrent->xPosition + pCurrent->yPosition); + + // Only call init code + if (pCurrent->pose == SPRITE_POSE_UNINITIALIZED) + { + // Call AI + if (pCurrent->properties & SP_SECONDARY_SPRITE) + sSecondarySpritesAIPointers[pCurrent->spriteId](); + else + sPrimarySpritesAIPointers[pCurrent->spriteId](); + } + + // Check update sprite info if still alive + if (pCurrent->status & SPRITE_STATUS_EXISTS) + SpriteCheckOnScreen(pCurrent); + + // Transfer current back to array + DMA3_COPY_16(&gCurrentSprite, &gSpriteData[count], sizeof(struct SpriteData) / 2); + } + } +} + +/** + * d32c | 40 | Updates the animation related info of a sprite + * + * @param pSprite Sprite data pointer + */ +void SpriteUpdateAnimation(struct SpriteData* pSprite) +{ + // Don't update the animation if freezed + if (pSprite->freezeTimer != 0) + return; + + // Update adc + APPLY_DELTA_TIME_INC(pSprite->animationDurationCounter); + + // Check reached the end of the current frame + if (pSprite->pOam[pSprite->currentAnimationFrame].timer < pSprite->animationDurationCounter) + { + // Advance to next frame + pSprite->animationDurationCounter = 1; + pSprite->currentAnimationFrame++; + + // Reached the end, set caf to 0 to loop back the animation + if (pSprite->pOam[pSprite->currentAnimationFrame].timer == 0) + pSprite->currentAnimationFrame = 0; + } +} + +/** + * @brief d36c | c4 | Draws all high-priority sprites based on the draw order + * + */ +void SpriteDrawAll_HighPriority(void) +{ + struct SpriteData* pSprite; + s32 i; + s32 drawOrder; + u32 drawStatus; + u32 checkStatus; + u32 notPlaying; + + if (gSubGameMode1 == SUB_GAME_MODE_PLAYING) + notPlaying = FALSE; + else + notPlaying = TRUE; + + checkStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_HIGH_PRIORITY; + drawStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_HIGH_PRIORITY; + + for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) + { + // Sprite doesn't exists or isn't drawn + if ((gSpriteData[i].status & checkStatus) != drawStatus) + { + gSpriteDrawOrder[i] = 0; + continue; + } + + // Check is lower draw order + if (gSpriteData[i].drawOrder >= 9) + { + gSpriteDrawOrder[i] = 0; + continue; + } + + // Check is playing + if (!notPlaying) + { + gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; + continue; + } + + // Don't draw sprites that have an absolute position if not in game + if (!(gSpriteData[i].properties & SP_ABSOLUTE_POSITION)) + gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; + else + gSpriteDrawOrder[i] = 0; + } + + // Apply draw order and draw sprites + for (drawOrder = 1; drawOrder < 9; drawOrder++) + { + for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++) + { + if (gSpriteDrawOrder[i] == drawOrder) + SpriteDraw(pSprite, i); + } + } +} + +/** + * @brief d430 | 8c | Draws all medium-priority sprites based on the draw order + * + */ +void SpriteDrawAll_MediumPriority(void) +{ + struct SpriteData* pSprite; + s32 i; + s32 drawOrder; + u32 drawStatus; + u32 checkStatus; + + checkStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_HIGH_PRIORITY; + drawStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN; + + SpriteDebrisDrawAll(); + + for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) + { + // Sprite doesn't exists or isn't drawn + if ((gSpriteData[i].status & checkStatus) != drawStatus) + { + gSpriteDrawOrder[i] = 0; + continue; + } + + // Check is lower draw order + if (gSpriteData[i].drawOrder < 9) + gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; + else + gSpriteDrawOrder[i] = 0; + } + + // Apply draw order and draw sprites + for (drawOrder = 1; drawOrder < 9; drawOrder++) + { + for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++) + { + if (gSpriteDrawOrder[i] == drawOrder) + SpriteDraw(pSprite, i); + } + } +} + +/** + * @brief d4bc | 88 | Draws the sprites that have a draw order between 9 and 16 + * + */ +void SpriteDrawAll_LowPriority(void) +{ + struct SpriteData* pSprite; + s32 i; + s32 drawOrder; + u32 drawStatus; + u32 checkStatus; + + checkStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_HIGH_PRIORITY; + drawStatus = SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN; + + for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) + { + // Sprite doesn't exists or isn't drawn + if ((gSpriteData[i].status & checkStatus) != drawStatus) + { + gSpriteDrawOrder[i] = 0; + continue; + } + + // Check is upper draw order + if (gSpriteData[i].drawOrder >= 9) + gSpriteDrawOrder[i] = gSpriteData[i].drawOrder; + else + gSpriteDrawOrder[i] = 0; + } + + // Apply draw order and draw sprites + for (drawOrder = 9; drawOrder < 17; drawOrder++) + { + for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++) + { + if (gSpriteDrawOrder[i] == drawOrder) + SpriteDraw(pSprite, i); + } + } +} + +/** + * @brief d544 | 890 | Draws a sprite + * + * @param pSprite Sprite data pointer + * @param slot Ram slot + */ +void SpriteDraw(struct SpriteData* pSprite, s32 slot) +{ + const u16* src; + u16* dst; + u8 prevSlot; + u16 part1; + u16 part2; + + u32 shape; + u32 size; + + u16 dy; + u16 dmy; + + s16 actualY; + s16 actualX; + s16 yScaling; + s16 xScaling; + s32 y; + s32 x; + s32 unk_2; + s32 unk_3; + s32 tmpX; + s32 tmpY; + s32 scaledX; + s32 scaledY; + + u16 rotationScalingSingle; + s32 i; + u16 partCount; + + u32 yOffset; + u32 xOffset; + + u16 xFlip; + u16 doubleSize; + u16 alphaBlending; + u16 mosaic; + u16 yFlip; + u32 bgPriority; + u32 paletteRow; + u32 gfxOffset; + u16 xPosition; + u16 yPosition; + u16 rotation; + u16 scaling; + + u8 offset; + + prevSlot = gNextOamSlot; + src = pSprite->pOam[pSprite->currentAnimationFrame].pFrame; + partCount = *src++; + + if (partCount + prevSlot >= OAM_BUFFER_DATA_SIZE) + return; + + dst = (u16*)(gOamData + prevSlot); + yPosition = SUB_PIXEL_TO_PIXEL_(pSprite->yPosition) - SUB_PIXEL_TO_PIXEL(gBg1YPosition); + xPosition = SUB_PIXEL_TO_PIXEL_(pSprite->xPosition) - SUB_PIXEL_TO_PIXEL(gBg1XPosition); + + // Shortcuts for status + xFlip = pSprite->status & SPRITE_STATUS_X_FLIP; + rotationScalingSingle = pSprite->status & SPRITE_STATUS_ROTATION_SCALING_SINGLE; + doubleSize = pSprite->status & SPRITE_STATUS_DOUBLE_SIZE; + alphaBlending = pSprite->status & SPRITE_STATUS_ALPHA_BLENDING; + yFlip = pSprite->status & SPRITE_STATUS_Y_FLIP; + + // Get graphical data + // Palette offset by spriteset slot + paletteRow = pSprite->spritesetGfxSlot + pSprite->paletteRow; + // Gfx slot, scale to 2 rows of 8x8 tiles in VRAM + gfxOffset = pSprite->spritesetGfxSlot * 64; + bgPriority = pSprite->bgPriority; + + if (gSamusOnTopOfBackgrounds && bgPriority != 0) + bgPriority--; + + if (pSprite->properties & SP_ABSOLUTE_POSITION) + { + yPosition = pSprite->yPosition; + xPosition = pSprite->xPosition; + } + + if (!(pSprite->status & SPRITE_STATUS_ROTATION_SCALING_WHOLE)) + { + for (i = 0; i < partCount; i++) + { + // Raw copy + part1 = *src++; + *dst++ = part1; + part2 = *src++; + *dst++ = part2; + *dst++ = *src++; + + // Apply position + gOamData[prevSlot + i].split.y = part1 + yPosition; + gOamData[prevSlot + i].split.x = part2 + xPosition; + + // Apply graphics + gOamData[prevSlot + i].split.priority = bgPriority; + // Add palette row and gfx offset + gOamData[prevSlot + i].split.paletteNum += paletteRow; + gOamData[prevSlot + i].split.tileNum += gfxOffset; + + if (xFlip) + { + // Enable X flip + gOamData[prevSlot + i].split.xFlip ^= TRUE; + + shape = gOamData[prevSlot + i].split.shape; + size = gOamData[prevSlot + i].split.size; + offset = sOamXFlipOffsets[shape][size]; + + // Properly offset x position + gOamData[prevSlot + i].split.x = xPosition - (part2 + offset * 8); + } + + if (yFlip) + { + // Enable Y flip + gOamData[prevSlot + i].split.yFlip ^= TRUE; + shape = gOamData[prevSlot + i].split.shape; + size = gOamData[prevSlot + i].split.size; + offset = sOamYFlipOffsets[shape][size]; + + // Properly offset x position + gOamData[prevSlot + i].split.y = yPosition - (part1 + offset * 8); + } + + // Rotates and scales objects at their centers independently if SS_ROTATE_SCALE_INDIVIDUAL is set + // Breaks if any of the objects are flipped (not the sprite status) + if (rotationScalingSingle) + { + if (doubleSize) + { + // Rotation scaling and double size + gOamData[prevSlot + i].split.affineMode = 3; + } + else + { + // Rotation scaling + gOamData[prevSlot + i].split.affineMode = 1; + } + + // In this affine mode, X/Y flip are part of the matrix num, so this is just doing matrixNum = slot + gOamData[prevSlot + i].split.yFlip = slot >> 4; + gOamData[prevSlot + i].split.xFlip = slot >> 3; + gOamData[prevSlot + i].split.matrixNum = slot; + } + + if (alphaBlending) + { + // Semi transparent + gOamData[prevSlot + i].split.objMode = OAM_OBJ_MODE_SEMI_TRANSPARENT; + } + + dst++; + } + + // Update next oam slot + gNextOamSlot = partCount + prevSlot; + + if (rotationScalingSingle) + { + rotation = pSprite->rotation; + scaling = pSprite->scaling; + + // Rotation matrix (column major mode) : + // [ cos / scaling, -sin / scaling ] + // [ sin / scaling, cos / scaling ] + + // If x flipped, then negate scaling on the first column to manually flip the sprite since flipping + // isn't supported by hardware when affine transformation is enabled + if (xFlip) + { + gOamData[slot * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(-scaling)); + gOamData[slot * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(-scaling)); + } + else + { + gOamData[slot * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); + gOamData[slot * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(scaling)); + } + + gOamData[slot * 4 + 2].all.affineParam = FixedMultiplication(-SIN(rotation), FixedInverse(scaling)); + gOamData[slot * 4 + 3].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); + } + } + else + { + rotation = pSprite->rotation; + scaling = pSprite->scaling; + + mosaic = pSprite->status & SPRITE_STATUS_MOSAIC; + + yPosition += BLOCK_SIZE; + xPosition += BLOCK_SIZE; + + for (i = 0; i < partCount; i++) + { + // Raw copy + part1 = *src++; + *dst++ = part1; + part2 = *src++; + *dst++ = part2; + *dst++ = *src++; + + // Apply graphics + gOamData[prevSlot + i].split.priority = bgPriority; + // Add palette row and gfx offset + gOamData[prevSlot + i].split.paletteNum += paletteRow; + gOamData[prevSlot + i].split.tileNum += gfxOffset; + + // Rotates and scales the whole sprite, ignores flip + shape = gOamData[prevSlot + i].split.shape; + size = gOamData[prevSlot + i].split.size; + + // Get center relative to top-left corner of object + yOffset = sOamYFlipOffsets[shape][size]; + yOffset = PIXEL_TO_SUB_PIXEL(yOffset); + xOffset = sOamXFlipOffsets[shape][size]; + xOffset = PIXEL_TO_SUB_PIXEL(xOffset); + + // Get current positions + y = (s16)MOD_AND(part1 + yPosition, 256); + x = (s16)MOD_AND(part2 + xPosition, 512); + + // Get center of object relative to the sprite's position + tmpY = (s16)(y - yPosition + yOffset); + tmpX = (s16)(x - xPosition + xOffset); + + // Apply scaling + tmpX = (s16)(Q_8_8_TO_S16_DIV(tmpX * scaling) - tmpX); + tmpY = (s16)(Q_8_8_TO_S16_DIV(tmpY * scaling) - tmpY); + + x = (s16)(x + tmpX); + y = (s16)(y + tmpY); + + // Offset to 0;0 temporarly to apply the rotation + unk_2 = (s16)(x - xPosition + xOffset); + unk_3 = (s16)(y - yPosition + yOffset); + + // Rotation matrix + x = Q_8_8_TO_S16(unk_2 * COS(rotation) - unk_3 * SIN(rotation)); + y = Q_8_8_TO_S16(unk_2 * SIN(rotation) + unk_3 * COS(rotation)); + + // Offset it back to top-left corner + if (doubleSize) + { + x = (s16)(x - xOffset * 2); + y = (s16)(y - yOffset * 2); + } + else + { + x = (s16)(x - xOffset); + y = (s16)(y - yOffset); + } + + // Rotated position + position + gOamData[prevSlot + i].split.y = MOD_AND(y + yPosition - BLOCK_SIZE, 256); + gOamData[prevSlot + i].split.x = MOD_AND(x + xPosition - BLOCK_SIZE, 512); + + if (doubleSize) + { + // Rotation scaling and double size + gOamData[prevSlot + i].split.affineMode = 3; + } + else + { + // Rotation scaling + gOamData[prevSlot + i].split.affineMode = 1; + } + + // Select proper matrix: mosaic flag doesn't enable mosaic and instead chooses between one of the two matrix slots + if (mosaic) + { + if (gOamData[prevSlot + i].split.xFlip) + { + gOamData[prevSlot + i].split.x--; + gOamData[prevSlot + i].split.yFlip = 29 >> 4; + gOamData[prevSlot + i].split.xFlip = 29 >> 3; + gOamData[prevSlot + i].split.matrixNum = 29; + } + else + { + gOamData[prevSlot + i].split.yFlip = 28 >> 4; + gOamData[prevSlot + i].split.xFlip = 28 >> 3; + gOamData[prevSlot + i].split.matrixNum = 28; + } + } + else + { + if (gOamData[prevSlot + i].split.xFlip) + { + gOamData[prevSlot + i].split.x--; + gOamData[prevSlot + i].split.yFlip = 31 >> 4; + gOamData[prevSlot + i].split.xFlip = 31 >> 3; + gOamData[prevSlot + i].split.matrixNum = 31; + } + else + { + gOamData[prevSlot + i].split.yFlip = 30 >> 4; + gOamData[prevSlot + i].split.xFlip = 30 >> 3; + gOamData[prevSlot + i].split.matrixNum = 30; + } + } + + if (alphaBlending) + { + // Semi transparent + gOamData[prevSlot + i].split.objMode = OAM_OBJ_MODE_SEMI_TRANSPARENT; + } + + dst++; + } + + // Update next oam slot + gNextOamSlot = partCount + prevSlot; + + // Setup matrices for normal and x flip + + // [ cos / scaling, -sin / scaling ] + // [ sin / scaling, cos / scaling ] + // and + // [ cos / -scaling, -sin / scaling ] + // [ sin / -scaling, cos / scaling ] + dy = FixedMultiplication(-SIN(rotation), FixedInverse(scaling)); + dmy = FixedMultiplication(COS(rotation), FixedInverse(scaling)); + + if (mosaic) + { + gOamData[28 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); + gOamData[28 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(scaling)); + gOamData[28 * 4 + 2].all.affineParam = dy; + gOamData[28 * 4 + 3].all.affineParam = dmy; + + gOamData[29 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(-scaling)); + gOamData[29 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(-scaling)); + gOamData[29 * 4 + 2].all.affineParam = dy; + gOamData[29 * 4 + 3].all.affineParam = dmy; + } + else + { + gOamData[30 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(scaling)); + gOamData[30 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(scaling)); + gOamData[30 * 4 + 2].all.affineParam = dy; + gOamData[30 * 4 + 3].all.affineParam = dmy; + + gOamData[31 * 4 + 0].all.affineParam = FixedMultiplication(COS(rotation), FixedInverse(-scaling)); + gOamData[31 * 4 + 1].all.affineParam = FixedMultiplication(SIN(rotation), FixedInverse(-scaling)); + gOamData[31 * 4 + 2].all.affineParam = dy; + gOamData[31 * 4 + 3].all.affineParam = dmy; + } + } +} + +/** + * @brief ddd4 | 150 | Checks if a sprite is on screen + * + * @param pSprite Sprite data pointer + */ +void SpriteCheckOnScreen(struct SpriteData* pSprite) +{ + u16 bgBaseY; + u16 bgBaseX; + u16 bgXRange; + u16 bgYRange; + + u16 spriteY; + u16 spriteX; + u16 spriteYRange; + u16 spriteXRange; + u16 spriteTop; + u16 spriteBottom; + u16 spriteLeft; + u16 spriteRight; + + u32 drawOffset; + + // Don't bother checking if the sprite has an absolute position + if (pSprite->properties & SP_ABSOLUTE_POSITION) + return; + + bgBaseY = gBg1YPosition; + bgBaseX = gBg1XPosition; + + spriteY = pSprite->yPosition; + spriteX = pSprite->xPosition; + + bgYRange = bgBaseY + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); + spriteYRange = spriteY + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); + spriteBottom = bgYRange - PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceBottom); + drawOffset = PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceTop) + SCREEN_SIZE_Y_SUB_PIXEL; + spriteTop = bgYRange + drawOffset; + + bgXRange = bgBaseX + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); + spriteXRange = spriteX + BLOCK_TO_SUB_PIXEL(CEIL(SCREEN_SIZE_X_BLOCKS / 2)); + spriteLeft = bgXRange - PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceHorizontal); + drawOffset = PIXEL_TO_SUB_PIXEL(pSprite->drawDistanceHorizontal) + SCREEN_SIZE_X_SUB_PIXEL; + spriteRight = bgXRange + drawOffset; + + if (spriteLeft < spriteXRange && spriteXRange < spriteRight && spriteBottom < spriteYRange && spriteYRange < spriteTop) + { + pSprite->status |= SPRITE_STATUS_ONSCREEN; + return; + } + + pSprite->status &= ~SPRITE_STATUS_ONSCREEN; + + if (pSprite->properties & SP_KILL_OFF_SCREEN) + { + // todo: screen size + bgYRange = bgBaseY + BLOCK_SIZE * 10; + spriteYRange = spriteY + BLOCK_SIZE * 10; + spriteBottom = bgYRange - BLOCK_SIZE * 9; + spriteTop = bgYRange + BLOCK_SIZE * 19; + + bgXRange = bgBaseX + BLOCK_SIZE * 10; + spriteXRange = spriteX + BLOCK_SIZE * 10; + spriteLeft = bgXRange - BLOCK_SIZE * 9; + spriteRight = bgXRange + BLOCK_SIZE * 24; + + if (spriteLeft >= spriteXRange || spriteXRange >= spriteRight || spriteBottom >= spriteYRange || spriteYRange >= spriteTop) + { + // Off range, kill sprite + pSprite->status = 0; + } + } +} + +/** + * @brief df24 | 4c | Calls : SpriteClearData, SpriteLoadSpriteset, + * EscapeCheckReloadGraphics, SpriteUtilInitLocationText, SpriteLoadRoomSprites + * and SpawnWaitingPirates + * + */ +void SpriteLoadAllData(void) +{ + if (gPauseScreenFlag != PAUSE_SCREEN_NONE) + { + // Don't load sprites if psf was active, this indirectly means that the room was already loaded before + return; + } + + // Check reset alarm timer + if (gSubGameMode3 == 0 && !gIsLoadingFile) + gAlarmTimer = 0; + + // Clear + SpriteClearData(); + + // Load spriteset + SpriteLoadSpriteset(); + + // Setup special sprites + EscapeCheckReloadGraphics(); + SpriteUtilInitLocationText(); + + // Load current room sprites + SpriteLoadRoomSprites(); + SpawnWaitingPirates(); + + gParasiteRelated = 0; +} + +/** + * @brief df84 | 100 | Loads a spriteset + * + */ +void SpriteLoadSpriteset(void) +{ + s32 i; + s32 j; + s32 spriteset; + u32 spriteId; + u32 gfxSlot; + u32 prevGfxSlot; + u16 nbrRows; + + s32 ctrl_1; + s32 ctrl_2; + + for (i = 0; i < MAX_AMOUNT_OF_SPRITE_TYPES; i++) + { + gSpritesetSpritesId[i] = PSPRITE_UNUSED16; + gSpritesetGfxSlots[i] = 0; + } + + prevGfxSlot = UCHAR_MAX; + spriteset = gSpriteset; + if (spriteset >= MAX_AMOUNT_OF_SPRITESET - 1) + { + if (gCurrentArea > AREA_TEST) + spriteset = MAX_AMOUNT_OF_SPRITESET - 1; + else + spriteset = 0; + } + + for (j = 0, i = 0; i < MAX_AMOUNT_OF_SPRITE_TYPES; i++) + { + spriteId = sSpritesetPointers[spriteset][j * 2 + 0]; + gfxSlot = sSpritesetPointers[spriteset][j * 2 + 1]; + + j++; + + if (spriteId == PSPRITE_UNUSED0) + { + break; + EMPTY_DO_WHILE // Needed to produce matching ASM. + } + + gSpritesetSpritesId[i] = spriteId; + gSpritesetGfxSlots[i] = MOD_AND(gfxSlot, 8); + + if (gfxSlot == prevGfxSlot) + continue; + + prevGfxSlot = gfxSlot; + if (gfxSlot == 8) + continue; + + spriteId = PSPRITE_OFFSET_FOR_GRAPHICS(spriteId); + + LZ77UncompVram(sSpritesGraphicsPointers[spriteId], VRAM_BASE + 0x14000 + gfxSlot * 2048); + + ctrl_1 = ((u8*)sSpritesGraphicsPointers[spriteId])[1]; + ctrl_2 = ((u8*)sSpritesGraphicsPointers[spriteId])[2] << 8; + DMA3_COPY_16(sSpritesPalettePointers[spriteId], PALRAM_OBJ + 8 * PAL_ROW_SIZE + gfxSlot * 32, (ctrl_1 | ctrl_2) / 2048 << 4); + } +} + +/** + * e084 | 2c | Loads the graphics in VRAM for a new sprite + * + * @param spriteId Sprite ID + * @param row Spriteset Graphics Row + */ +void SpriteLoadGfx(u8 spriteId, u8 row) +{ + spriteId = PSPRITE_OFFSET_FOR_GRAPHICS(spriteId); + + LZ77UncompVram(sSpritesGraphicsPointers[spriteId], VRAM_BASE + 0x14000 + (row * 0x800)); +} + +/** + * e0b0 | 40 | Loads the palette in PALRAM for a new sprite + * + * @param spriteId Sprite ID + * @param row Palette Row + * @param len Length (in rows) + */ +void SpriteLoadPal(u8 spriteId, u8 row, u8 len) +{ + spriteId = PSPRITE_OFFSET_FOR_GRAPHICS(spriteId); + + DMA3_COPY_16(sSpritesPalettePointers[spriteId], PALRAM_OBJ + 8 * PAL_ROW_SIZE + (row * 16 * sizeof(u16)), len * 16); +} + +/** + * @brief e0f0 | 44 | Clears the sprite data (including debris) + * + */ +void SpriteClearData(void) +{ + s32 i; + + // Clear sprites + for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) + { + gSpriteData[i].status = 0; + gSpriteData[i].standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; + gSpriteData[i].roomSlot = UCHAR_MAX; + } + + // Clear debris + for (i = 0; i < MAX_AMOUNT_OF_SPRITE_DEBRIS; i++) + gSpriteDebris[i].exists = FALSE; +} + +/** + * @brief e134 | 48 | Loads the sprites of the current room + * + */ +void SpriteLoadRoomSprites(void) +{ + u8 i; + u8 y; + u8 x; + u8 slot; + + for (i = 0; i < MAX_AMOUNT_OF_SPRITES; i++) + { + /* + 0 | Y position + 1 | X position + 2 | Spriteset slot + */ + y = gCurrentRoomEntry.pEnemyRoomData[i * ENEMY_ROOM_DATA_SIZE + 0]; + + // Terminator + if (y == UCHAR_MAX) + break; + + x = gCurrentRoomEntry.pEnemyRoomData[i * ENEMY_ROOM_DATA_SIZE + 1]; + slot = gCurrentRoomEntry.pEnemyRoomData[i * ENEMY_ROOM_DATA_SIZE + 2]; + SpriteInitPrimary(slot, y, x, i); + } +} + +/** + * @brief e17c | dc | Initializes a primary sprite with the values in parameters + * + * @param spritesetSlot Spriteset slot/properties + * @param yPosition Y Position (blocks) + * @param xPosition X Position (blocks) + * @param roomSlot Room Slot + */ +void SpriteInitPrimary(u8 spritesetSlot, u16 yPosition, u16 xPosition, u8 roomSlot) +{ + u8 ramSlot; + struct SpriteData* pSprite; + + // Try to find an empty slot + for (ramSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; ramSlot++, pSprite++) + { + if (pSprite->status & SPRITE_STATUS_EXISTS) + continue; + + // Found empty slot, mark exists + pSprite->status = SPRITE_STATUS_EXISTS; + + // Get 7 first bits of the spriteset slot + spritesetSlot = MOD_AND(spritesetSlot, 128); + + // A spriteset slot value that's above MAX_AMOUNT_OF_SPRITE_TYPES + 1 means the spriteset should be used + if (spritesetSlot > MAX_AMOUNT_OF_SPRITE_TYPES + 1) + { + spritesetSlot--; + + // Modulo to not overflow the next array access + spritesetSlot = MOD_AND(spritesetSlot, MAX_AMOUNT_OF_SPRITE_TYPES + 1); + + // Fetch the gfx slot and the sprite id + pSprite->spritesetGfxSlot = gSpritesetGfxSlots[spritesetSlot]; + pSprite->spriteId = gSpritesetSpritesId[spritesetSlot]; + } + else + { + // Don't use the spriteset, directly write to sprite id and use first gfx slot + pSprite->spritesetGfxSlot = 0; + pSprite->spriteId = spritesetSlot - 1; + } + + pSprite->properties = 0; + + // Convert block position to sub pixel such that the new position is in the bottom middle of the block in sub pixels + pSprite->yPosition = BLOCK_TO_SUB_PIXEL(yPosition) + BLOCK_SIZE; + pSprite->xPosition = BLOCK_TO_SUB_PIXEL(xPosition) + HALF_BLOCK_SIZE; + pSprite->roomSlot = roomSlot; + + pSprite->bgPriority = 2; + pSprite->drawOrder = 4; + pSprite->pose = SPRITE_POSE_UNINITIALIZED; + pSprite->health = 0; + pSprite->invincibilityStunFlashTimer = 0; + + pSprite->paletteRow = 0; + pSprite->frozenPaletteRowOffset = 0; + pSprite->absolutePaletteRow = 0; + + pSprite->ignoreSamusCollisionTimer = DELTA_TIME; + pSprite->primarySpriteRamSlot = ramSlot; + pSprite->freezeTimer = 0; + pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; + break; + } +} + +/** + * e258 | c4 | Spawns a new secondary sprite with the given parameters + * + * @param spriteId The ID of the sprite to spawn + * @param partNumber Part number + * @param gfxSlot The sprite graphics slot (usually the same as the primary sprite) + * @param ramSlot The RAM slot of the secondary sprite's parent + * @param yPosition Y Position + * @param xPosition X Position + * @param statusToAdd Additional status flags (default are Exists, On Screen and Not Drawn) + * @return The assigned RAM slot of the spawned sprite, 0xFF is the sprite couldn't spawn + */ +u8 SpriteSpawnSecondary(u8 spriteId, u8 partNumber, u8 gfxSlot, u8 ramSlot, u16 yPosition, u16 xPosition, u16 statusToAdd) +{ + u8 newSlot; + struct SpriteData* pSprite; + + // Try to find an empty slot + for (newSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; newSlot++, pSprite++) + { + if (pSprite->status & SPRITE_STATUS_EXISTS) + continue; + + pSprite->status = statusToAdd | (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN); + pSprite->properties = SP_SECONDARY_SPRITE; + + pSprite->spritesetGfxSlot = gfxSlot; + pSprite->spriteId = spriteId; + pSprite->yPosition = yPosition; + pSprite->xPosition = xPosition; + pSprite->roomSlot = partNumber; + + pSprite->bgPriority = 2; + pSprite->drawOrder = 4; + + pSprite->pose = SPRITE_POSE_UNINITIALIZED; + pSprite->health = 0; + pSprite->invincibilityStunFlashTimer = 0; + + pSprite->paletteRow = 0; + pSprite->frozenPaletteRowOffset = 0; + pSprite->absolutePaletteRow = 0; + + pSprite->ignoreSamusCollisionTimer = 1 * DELTA_TIME; + + pSprite->primarySpriteRamSlot = ramSlot; + + pSprite->freezeTimer = 0; + pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; + + return newSlot; + } + + return UCHAR_MAX; +} + +/** + * e31c | b8 | Spawns a new primary sprite with the given parameters + * + * @param spriteId The ID of the sprite to spawn + * @param partNumber Part number + * @param gfxSlot The sprite graphics slot + * @param yPosition Y Position + * @param xPosition X Position + * @param statusToAdd Additional status flags (default are Exists, On Screen and Not Drawn) + * @return The assigned RAM slot of the spawned sprite, 0xFF if the sprite couldn't spawn + */ +u8 SpriteSpawnPrimary(u8 spriteId, u8 partNumber, u8 gfxSlot, u16 yPosition, u16 xPosition, u16 statusToAdd) +{ + u8 newSlot; + struct SpriteData* pSprite; + + // Try to find an empty slot + for (newSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; newSlot++, pSprite++) + { + if (pSprite->status & SPRITE_STATUS_EXISTS) + continue; + + pSprite->status = statusToAdd | (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN); + pSprite->properties = 0; + + pSprite->spritesetGfxSlot = gfxSlot; + pSprite->spriteId = spriteId; + pSprite->yPosition = yPosition; + pSprite->xPosition = xPosition; + pSprite->roomSlot = partNumber; + + pSprite->bgPriority = 2; + pSprite->drawOrder = 4; + + pSprite->pose = SPRITE_POSE_UNINITIALIZED; + pSprite->health = 0; + pSprite->invincibilityStunFlashTimer = 0; + + pSprite->paletteRow = 0; + pSprite->frozenPaletteRowOffset = 0; + pSprite->absolutePaletteRow = 0; + + pSprite->ignoreSamusCollisionTimer = DELTA_TIME; + + pSprite->primarySpriteRamSlot = newSlot; + + pSprite->freezeTimer = 0; + pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; + + return newSlot; + } + + return UCHAR_MAX; +} + +/** + * e3d4 | b8 | Spawns a new primary sprite with the given parameters (used only for the drops and the followers sprite) + * + * @param spriteId The ID of the sprite to spawn + * @param partNumber The room slot + * @param gfxSlot The sprite graphics slot + * @param ramSlot The RAM slot of the sprite's parent + * @param yPosition Y Position + * @param xPosition X Position + * @param statusToAdd Additional status flags (default are Exists, On Screen and Not Drawn) + * @return The assigned RAM slot of the spawned sprite, 0xFF is the sprite couldn't spawn + */ +u8 SpriteSpawnDropFollowers(u8 spriteId, u8 partNumber, u8 gfxSlot, u8 ramSlot, u16 yPosition, u16 xPosition, u16 statusToAdd) +{ + u8 newSlot; + struct SpriteData* pSprite; + + // Try to find an empty slot + for (newSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; newSlot++, pSprite++) + { + if (pSprite->status & SPRITE_STATUS_EXISTS) + continue; + + pSprite->status = statusToAdd | (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_NOT_DRAWN); + pSprite->properties = 0; + + pSprite->spritesetGfxSlot = gfxSlot; + pSprite->spriteId = spriteId; + pSprite->yPosition = yPosition; + pSprite->xPosition = xPosition; + pSprite->roomSlot = partNumber; + + pSprite->bgPriority = 2; + pSprite->drawOrder = 4; + + pSprite->pose = SPRITE_POSE_UNINITIALIZED; + pSprite->health = 0; + pSprite->invincibilityStunFlashTimer = 0; + + pSprite->paletteRow = 0; + pSprite->frozenPaletteRowOffset = 0; + pSprite->absolutePaletteRow = 0; + + pSprite->ignoreSamusCollisionTimer = DELTA_TIME; + + pSprite->primarySpriteRamSlot = ramSlot; + + pSprite->freezeTimer = 0; + pSprite->standingOnSprite = SAMUS_STANDING_ON_SPRITE_OFF; + + return newSlot; + } + + return UCHAR_MAX; +} diff --git a/tools/preproc.py b/tools/preproc.py new file mode 100644 index 000000000..b9bf832f4 --- /dev/null +++ b/tools/preproc.py @@ -0,0 +1,269 @@ +import argparse +import re +import bisect + +""" +Takes in a C file and charmap file as input. +Converts INCBIN, INCTEXT and SHIFT_JIS macro calls to immediate array inits. +Outputs processed C file to stdout. +""" + +SHIFT_JIS_FULL_TO_HALF_DICT = { + '。': '｡', + '「': '｢', + '、': '､', + '・': '･', + 'ヲ': 'ｦ', + 'ァ': 'ｧ', + 'ィ': 'ｨ', + 'ゥ': 'ｩ', + 'ェ': 'ｪ', + 'ォ': 'ｫ', + 'ャ': 'ｬ', + 'ュ': 'ｭ', + 'ョ': 'ｮ', + 'ッ': 'ｯ', + 'ー': 'ｰ', + 'ア': 'ｱ', + 'イ': 'ｲ', + 'ウ': 'ｳ', + 'エ': 'ｴ', + 'オ': 'ｵ', + 'カ': 'ｶ', + 'キ': 'ｷ', + 'ク': 'ｸ', + 'ケ': 'ｹ', + 'コ': 'ｺ', + 'サ': 'ｻ', + 'シ': 'ｼ', + 'ス': 'ｽ', + 'セ': 'ｾ', + 'ソ': 'ｿ', + 'タ': 'ﾀ', + 'チ': 'ﾁ', + 'ツ': 'ﾂ', + 'テ': 'ﾃ', + 'ト': 'ﾄ', + 'ナ': 'ﾅ', + 'ニ': 'ﾆ', + 'ヌ': 'ﾇ', + 'ネ': 'ﾈ', + 'ノ': 'ﾉ', + 'ハ': 'ﾊ', + 'ヒ': 'ﾋ', + 'フ': 'ﾌ', + 'ヘ': 'ﾍ', + 'ホ': 'ﾎ', + 'マ': 'ﾏ', + 'ミ': 'ﾐ', + 'ム': 'ﾑ', + 'メ': 'ﾒ', + 'モ': 'ﾓ', + 'ヤ': 'ﾔ', + 'ユ': 'ﾕ', + 'ヨ': 'ﾖ', + 'ラ': 'ﾗ', + 'リ': 'ﾘ', + 'ル': 'ﾙ', + 'レ': 'ﾚ', + 'ロ': 'ﾛ', + 'ワ': 'ﾜ', + 'ン': 'ﾝ', + # Katakana with dakuten and handakuten + "ガ": "ｶﾞ", + "ギ": "ｷﾞ", + "グ": "ｸﾞ", + "ゲ": "ｹﾞ", + "ゴ": "ｺﾞ", + "ザ": "ｻﾞ", + "ジ": "ｼﾞ", + "ズ": "ｽﾞ", + "ゼ": "ｾﾞ", + "ゾ": "ｿﾞ", + "ダ": "ﾀﾞ", + "ヂ": "ﾁﾞ", + "ヅ": "ﾂﾞ", + "デ": "ﾃﾞ", + "ド": "ﾄﾞ", + "バ": "ﾊﾞ", + "ビ": "ﾋﾞ", + "ブ": "ﾌﾞ", + "ベ": "ﾍﾞ", + "ボ": "ﾎﾞ", + "パ": "ﾊﾟ", + "ピ": "ﾋﾟ", + "プ": "ﾌﾟ", + "ペ": "ﾍﾟ", + "ポ": "ﾎﾟ", +} + + +class CharMap: + def __init__(self, charmapfile_content): + self.symbol_dict = {} + self.symbol_dict_keys = [] + for line in charmapfile_content.split("\n"): + line = line.split("@")[0].strip() + if line == "": + continue + line = line.split("=") + charmap_ids = ["0x"+s for s in line[-1].strip().split(" ")] + charmap_symbol = "=".join(line[:-1]).strip() + if len(charmap_symbol) > 1 and charmap_symbol.startswith("'") and charmap_symbol.endswith("'"): + charmap_symbol = charmap_symbol[1:-1] + if charmap_symbol == "\\'": + charmap_symbol = "'" + else: + charmap_symbol = "{" + charmap_symbol + "}" + self.symbol_dict[charmap_symbol] = charmap_ids + bisect.insort(self.symbol_dict_keys, charmap_symbol) + + def get_entry(self, text): + b = bisect.bisect(self.symbol_dict_keys, text) + key = self.symbol_dict_keys[b-1] + if not text.startswith(key): + key = self.symbol_dict_keys[b] + if text[0] == "{" and text.startswith(key[:-1] + "("): + param = int(text[len(key):].split(")}", 1)[0]) + return ([f"0x{int(v[2:], 16) + param:04X}" for v in self.symbol_dict[key]], text.find(")}")+2) + raise IndexError("cannot find symbol in charmap for text " + text) + return (self.symbol_dict[key], len(key)) + + def convert_string(self, text): + out = [] + while len(text) > 0: + charmap_ids, symbol_length = self.get_entry(text) + out += charmap_ids + text = text[symbol_length:] + return out + + +""" +"INCBIN_S8", "INCBIN_U8", "_INCBIN_S8", "_INCBIN_U8", +"INCBIN_S16", "INCBIN_U16", "_INCBIN_S16", "_INCBIN_U16", +"INCBIN_S32", "INCBIN_U32", "_INCBIN_S32", "_INCBIN_U32" + +INCBIN = curly brackets, _INCBIN = no curly brackets +U = unsigned (signed is never used, so not implemented) +8, 16 or 32 bits integer +""" +def convert_incbin(ic): + REGEX_INCBIN = re.compile(r'_?INCBIN_U(8|16|32)+\(\".+\"\)') + out = "" + while True: + m = REGEX_INCBIN.search(ic) + if m is None: + break + mstr = m[0] + is_brackets = mstr[0] != '_' + size = int(m[1]) // 8 + + incbinfile = mstr.removeprefix("_")[10+len(m[1]):-2] + + try: + with open(incbinfile, "rb") as f: + incbinfile_bytes = f.read() + except FileNotFoundError: + incbinfile_bytes = bytes() + filesize = len(incbinfile_bytes) + if filesize % size != 0: + raise Exception(f"Size {size} doesn't evenly divide file size {filesize}.") + + incbinfile_values = [] + for i in range(0, len(incbinfile_bytes), size): + value = 0 + for j in range(size): + value += incbinfile_bytes[i+j] << (j*8) + incbinfile_values.append(str(value) + "u,") + incbin_converted = "".join(incbinfile_values) + if is_brackets: + incbin_converted = "{" + incbin_converted + "}" + + out += ic[:m.start()] + incbin_converted + ic = ic[m.end():] + return out + ic + + +""" +"INCTEXT" + +curly brackets +text +""" +def convert_inctext(ic, charmap): + REGEX_INCTEXT = re.compile(r'INCTEXT\(\".+\"\)') + out = "" + while True: + m = REGEX_INCTEXT.search(ic) + if m is None: + break + mstr = m[0] + + inctext = mstr[9:-2] + + inctext_ids = charmap.convert_string(inctext) + inctext_converted = "{ " + ", ".join(inctext_ids) + ", CHAR_TERMINATOR }" + + out += ic[:m.start()] + inctext_converted + ic = ic[m.end():] + return out + ic + + +""" +"SHIFT_JIS" + +curly brackets +text +""" +def convert_shift_jis(ic): + REGEX_SHIFT_JIS = re.compile(r'SHIFT_JIS\(\".+\"\)') + out = "" + while True: + m = REGEX_SHIFT_JIS.search(ic) + if m is None: + break + mstr = m[0] + + inctext = mstr[11:-2] + + # turn full width combined characters into half width decomposed characters + inctext_half = "" + for c in inctext: + if c in SHIFT_JIS_FULL_TO_HALF_DICT: + c = SHIFT_JIS_FULL_TO_HALF_DICT[c] + inctext_half += c + + inctext_ids = [f"0x{b:04X}" for b in inctext_half.encode('shift_jis')] + inctext_converted = "{ " + ", ".join(inctext_ids) + ", }" + + out += ic[:m.start()] + inctext_converted + ic = ic[m.end():] + return out + ic + + +def preproc(infile, charmapfile): + with open(infile, "r") as f: + infile_content = f.read() + + with open(charmapfile, "r") as f: + charmapfile_content = f.read() + charmap = CharMap(charmapfile_content) + + infile_content = convert_incbin(infile_content) + infile_content = convert_inctext(infile_content, charmap) + infile_content = convert_shift_jis(infile_content) + + print(infile_content, end="") + + +def main(): + ap = argparse.ArgumentParser() + ap.add_argument('infile', help='Input C file') + ap.add_argument('charmapfile', help='Input charmap file') + args = ap.parse_args() + + preproc(args.infile, args.charmapfile) + + +if __name__ == "__main__": + main() From 4d8945cbb0726e51e20d009aa1a914d416a3f552 Mon Sep 17 00:00:00 2001 From: CharlesVanEeckhout Date: Tue, 24 Mar 2026 20:56:04 -0400 Subject: [PATCH 2/3] remove old preproc --- Makefile | 5 +- make_tools.mk | 2 +- tools/preproc.py | 8 +- tools/preproc/.gitignore | 1 - tools/preproc/LICENSE | 19 -- tools/preproc/Makefile | 36 --- tools/preproc/asm_file.cpp | 435 -------------------------- tools/preproc/asm_file.h | 73 ----- tools/preproc/c_file.cpp | 483 ---------------------------- tools/preproc/c_file.h | 61 ---- tools/preproc/char_util.h | 71 ----- tools/preproc/charmap.cpp | 414 ------------------------ tools/preproc/charmap.h | 64 ---- tools/preproc/preproc.cpp | 164 ---------- tools/preproc/preproc.h | 54 ---- tools/preproc/string_parser.cpp | 536 -------------------------------- tools/preproc/string_parser.h | 56 ---- tools/preproc/utf8.cpp | 92 ------ tools/preproc/utf8.h | 34 -- 19 files changed, 6 insertions(+), 2602 deletions(-) delete mode 100644 tools/preproc/.gitignore delete mode 100644 tools/preproc/LICENSE delete mode 100644 tools/preproc/Makefile delete mode 100644 tools/preproc/asm_file.cpp delete mode 100644 tools/preproc/asm_file.h delete mode 100644 tools/preproc/c_file.cpp delete mode 100644 tools/preproc/c_file.h delete mode 100644 tools/preproc/char_util.h delete mode 100644 tools/preproc/charmap.cpp delete mode 100644 tools/preproc/charmap.h delete mode 100644 tools/preproc/preproc.cpp delete mode 100644 tools/preproc/preproc.h delete mode 100644 tools/preproc/string_parser.cpp delete mode 100644 tools/preproc/string_parser.h delete mode 100644 tools/preproc/utf8.cpp delete mode 100644 tools/preproc/utf8.h diff --git a/Makefile b/Makefile index f3d14e914..c293c917a 100644 --- a/Makefile +++ b/Makefile @@ -99,9 +99,7 @@ include make_tools.mk GBAFIX = $(TOOLS_DIR)/gbafix/gbafix PYTHON = python3 EXTRACTOR = $(PYTHON) $(TOOLS_DIR)/extractor.py -PREPROC1 = $(TOOLS_DIR)/preproc/preproc -PREPROC2 = $(PYTHON) $(TOOLS_DIR)/preproc.py -PREPROC = $(PREPROC2) +PREPROC = $(PYTHON) $(TOOLS_DIR)/preproc.py # Flags ASFLAGS += -mcpu=arm7tdmi @@ -248,7 +246,6 @@ $(LD_SCRIPT): linker.ld %.s: %.c $(MSG) CC $@ - bash -c 'diff --color <($(PREPROC1) $< $(PREPROCFLAGS)) <($(PREPROC2) $< $(PREPROCFLAGS))' $Q$(PREPROC) $< $(PREPROCFLAGS) | $(CPP) $(CPPFLAGS) | $(CC) -o $@ $(CFLAGS) && printf '\t.align 2, 0 @ dont insert nops\n' >> $@ src/dma.s: CFLAGS = -Werror -O1 -mthumb-interwork -fhex-asm -f2003-patch diff --git a/make_tools.mk b/make_tools.mk index ee7c5715f..a40368512 100644 --- a/make_tools.mk +++ b/make_tools.mk @@ -11,7 +11,7 @@ MAKEFLAGS += --no-print-directory TOOLS_DIR := tools # Tool executables to build -TOOLS := gbafix preproc +TOOLS := gbafix TOOLDIRS := $(TOOLS:%=$(TOOLS_DIR)/%) diff --git a/tools/preproc.py b/tools/preproc.py index b9bf832f4..a3a8f845d 100644 --- a/tools/preproc.py +++ b/tools/preproc.py @@ -174,8 +174,8 @@ def convert_incbin(ic): value = 0 for j in range(size): value += incbinfile_bytes[i+j] << (j*8) - incbinfile_values.append(str(value) + "u,") - incbin_converted = "".join(incbinfile_values) + incbinfile_values.append(str(value) + "u") + incbin_converted = ",".join(incbinfile_values) if is_brackets: incbin_converted = "{" + incbin_converted + "}" @@ -202,7 +202,7 @@ def convert_inctext(ic, charmap): inctext = mstr[9:-2] inctext_ids = charmap.convert_string(inctext) - inctext_converted = "{ " + ", ".join(inctext_ids) + ", CHAR_TERMINATOR }" + inctext_converted = "{" + ",".join(inctext_ids) + ",CHAR_TERMINATOR}" out += ic[:m.start()] + inctext_converted ic = ic[m.end():] @@ -234,7 +234,7 @@ def convert_shift_jis(ic): inctext_half += c inctext_ids = [f"0x{b:04X}" for b in inctext_half.encode('shift_jis')] - inctext_converted = "{ " + ", ".join(inctext_ids) + ", }" + inctext_converted = "{" + ",".join(inctext_ids) + "}" out += ic[:m.start()] + inctext_converted ic = ic[m.end():] diff --git a/tools/preproc/.gitignore b/tools/preproc/.gitignore deleted file mode 100644 index eb3470879..000000000 --- a/tools/preproc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -preproc diff --git a/tools/preproc/LICENSE b/tools/preproc/LICENSE deleted file mode 100644 index 534d15349..000000000 --- a/tools/preproc/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2016 YamaArashi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile deleted file mode 100644 index 8ce883b13..000000000 --- a/tools/preproc/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -CXX ?= g++ -RM ?= rm -f -ifeq ($(V),1) - Q = - MSG = @: -else - Q = @ - MSG = @echo " " -endif - -CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror - -SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \ - utf8.cpp - -HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \ - utf8.h - -ifeq ($(OS),Windows_NT) -EXE := .exe -else -EXE := -endif - -.PHONY: all clean - -all: preproc$(EXE) - @: - -preproc$(EXE): $(SRCS) $(HEADERS) - $(MSG) CXX $@ - $Q$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) - -clean: - $(MSG) RM preproc$(EXE) - $Q$(RM) preproc preproc.exe diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp deleted file mode 100644 index 6733eace3..000000000 --- a/tools/preproc/asm_file.cpp +++ /dev/null @@ -1,435 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#include -#include -#include -#include "preproc.h" -#include "asm_file.h" -#include "char_util.h" -#include "utf8.h" -#include "string_parser.h" - -AsmFile::AsmFile(std::string filename) : m_filename(filename) -{ - FILE *fp = std::fopen(filename.c_str(), "rb"); - - if (fp == NULL) - FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); - - std::fseek(fp, 0, SEEK_END); - - m_size = std::ftell(fp); - - if (m_size < 0) - FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); - - m_buffer = new char[m_size + 1]; - - std::rewind(fp); - - if (std::fread(m_buffer, m_size, 1, fp) != 1) - FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); - - m_buffer[m_size] = 0; - - std::fclose(fp); - - m_pos = 0; - m_lineNum = 1; - m_lineStart = 0; - - RemoveComments(); -} - -AsmFile::AsmFile(AsmFile&& other) : m_filename(std::move(other.m_filename)) -{ - m_buffer = other.m_buffer; - m_pos = other.m_pos; - m_size = other.m_size; - m_lineNum = other.m_lineNum; - m_lineStart = other.m_lineStart; - - other.m_buffer = nullptr; -} - -AsmFile::~AsmFile() -{ - delete[] m_buffer; -} - -// Removes comments to simplify further processing. -// It stops upon encountering a null character, -// which may or may not be the end of file marker. -// If it's not, the error will be caught later. -void AsmFile::RemoveComments() -{ - long pos = 0; - char stringChar = 0; - - for (;;) - { - if (m_buffer[pos] == 0) - return; - - if (stringChar != 0) - { - if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == stringChar) - { - pos += 2; - } - else - { - if (m_buffer[pos] == stringChar) - stringChar = 0; - pos++; - } - } - else if (m_buffer[pos] == '@' && (pos == 0 || m_buffer[pos - 1] != '\\')) - { - while (m_buffer[pos] != '\n' && m_buffer[pos] != 0) - m_buffer[pos++] = ' '; - } - else if (m_buffer[pos] == '/' && m_buffer[pos + 1] == '*') - { - m_buffer[pos++] = ' '; - m_buffer[pos++] = ' '; - - for (;;) - { - if (m_buffer[pos] == 0) - return; - - if (m_buffer[pos] == '*' && m_buffer[pos + 1] == '/') - { - m_buffer[pos++] = ' '; - m_buffer[pos++] = ' '; - break; - } - else - { - if (m_buffer[pos] != '\n') - m_buffer[pos] = ' '; - pos++; - } - } - } - else - { - if (m_buffer[pos] == '"' || m_buffer[pos] == '\'') - stringChar = m_buffer[pos]; - pos++; - } - } -} - -// Checks if we're at a particular directive and if so, consumes it. -// Returns whether the directive was found. -bool AsmFile::CheckForDirective(std::string name) -{ - long i; - long length = static_cast(name.length()); - - for (i = 0; i < length && m_pos + i < m_size; i++) - if (name[i] != m_buffer[m_pos + i]) - return false; - - if (i < length) - return false; - - m_pos += length; - - return true; -} - -// Checks if we're at a known directive and if so, consumes it. -// Returns which directive was found. -Directive AsmFile::GetDirective() -{ - SkipWhitespace(); - - if (CheckForDirective(".include")) - return Directive::Include; - else if (CheckForDirective(".string")) - return Directive::String; - else if (CheckForDirective(".braille")) - return Directive::Braille; - else - return Directive::Unknown; -} - -// Checks if we're at label that ends with '::'. -// Returns the name if so and an empty string if not. -std::string AsmFile::GetGlobalLabel() -{ - long start = m_pos; - long pos = m_pos; - - if (IsIdentifierStartingChar(m_buffer[pos])) - { - pos++; - - while (IsIdentifierChar(m_buffer[pos])) - pos++; - } - - if (m_buffer[pos] == ':' && m_buffer[pos + 1] == ':') - { - m_pos = pos + 2; - ExpectEmptyRestOfLine(); - return std::string(&m_buffer[start], pos - start); - } - - return std::string(); -} - -// Skips tabs and spaces. -void AsmFile::SkipWhitespace() -{ - while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') - m_pos++; -} - -// Reads include path. -std::string AsmFile::ReadPath() -{ - SkipWhitespace(); - - if (m_buffer[m_pos] != '"') - RaiseError("expected file path"); - - m_pos++; - - int length = 0; - long startPos = m_pos; - - while (m_buffer[m_pos] != '"') - { - unsigned char c = m_buffer[m_pos++]; - - if (c == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF in include string"); - else - RaiseError("unexpected null character in include string"); - } - - if (!IsAsciiPrintable(c)) - RaiseError("unexpected character '\\x%02X' in include string", c); - - // Don't bother allowing any escape sequences. - if (c == '\\') - { - c = m_buffer[m_pos]; - RaiseError("unexpected escape '\\%c' in include string", c); - } - - length++; - - if (length > kMaxPath) - RaiseError("path is too long"); - } - - m_pos++; // Go past the right quote. - - ExpectEmptyRestOfLine(); - - return std::string(&m_buffer[startPos], length); -} - -// Reads a charmap string. -int AsmFile::ReadString(unsigned char* s) -{ - return 0; -} - -void AsmFile::VerifyStringLength(int length) -{ - if (length == kMaxStringLength) - RaiseError("mapped string longer than %d bytes", kMaxStringLength); -} - -int AsmFile::ReadBraille(unsigned char* s) -{ - return 0; -} - -// If we're at a comma, consumes it. -// Returns whether a comma was found. -bool AsmFile::ConsumeComma() -{ - if (m_buffer[m_pos] == ',') - { - m_pos++; - return true; - } - - return false; -} - -// Converts digit character to numerical value. -static int ConvertDigit(char c, int radix) -{ - int digit; - - if (c >= '0' && c <= '9') - digit = c - '0'; - else if (c >= 'A' && c <= 'F') - digit = 10 + c - 'A'; - else if (c >= 'a' && c <= 'f') - digit = 10 + c - 'a'; - else - return -1; - - return (digit < radix) ? digit : -1; -} - -// Reads an integer. If the integer is greater than maxValue, it returns -1. -int AsmFile::ReadPadLength() -{ - if (!IsAsciiDigit(m_buffer[m_pos])) - RaiseError("expected integer"); - - int radix = 10; - - if (m_buffer[m_pos] == '0' && m_buffer[m_pos + 1] == 'x') - { - radix = 16; - m_pos += 2; - } - - unsigned n = 0; - int digit; - - while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) - { - n = n * radix + digit; - - if (n > kMaxStringLength) - RaiseError("pad length greater than maximum length (%d)", kMaxStringLength); - - m_pos++; - } - - return n; -} - -// Outputs the current line and moves to the next one. -void AsmFile::OutputLine() -{ - while (m_buffer[m_pos] != '\n' && m_buffer[m_pos] != 0) - m_pos++; - - if (m_buffer[m_pos] == 0) - { - if (m_pos >= m_size) - { - RaiseWarning("file doesn't end with newline"); - puts(&m_buffer[m_lineStart]); - } - else - { - RaiseError("unexpected null character"); - } - } - else - { - m_buffer[m_pos] = 0; - puts(&m_buffer[m_lineStart]); - m_buffer[m_pos] = '\n'; - m_pos++; - m_lineStart = m_pos; - m_lineNum++; - } -} - -// Asserts that the rest of the line is empty and moves to the next one. -void AsmFile::ExpectEmptyRestOfLine() -{ - SkipWhitespace(); - - if (m_buffer[m_pos] == 0) - { - if (m_pos >= m_size) - RaiseWarning("file doesn't end with newline"); - else - RaiseError("unexpected null character"); - } - else if (m_buffer[m_pos] == '\n') - { - m_pos++; - m_lineStart = m_pos; - m_lineNum++; - } - else if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n') - { - m_pos += 2; - m_lineStart = m_pos; - m_lineNum++; - } - else - { - RaiseError("junk at end of line"); - } -} - -// Checks if we're at the end of the file. -bool AsmFile::IsAtEnd() -{ - return (m_pos >= m_size); -} - -// Output the current location to set gas's logical file and line numbers. -void AsmFile::OutputLocation() -{ - std::printf("# %ld \"%s\"\n", m_lineNum, m_filename.c_str()); -} - -// Reports a diagnostic message. -void AsmFile::ReportDiagnostic(const char* type, const char* format, std::va_list args) -{ - const int bufferSize = 1024; - char buffer[bufferSize]; - std::vsnprintf(buffer, bufferSize, format, args); - std::fprintf(stderr, "%s:%ld: %s: %s\n", m_filename.c_str(), m_lineNum, type, buffer); -} - -#define DO_REPORT(type) \ -do \ -{ \ - std::va_list args; \ - va_start(args, format); \ - ReportDiagnostic(type, format, args); \ - va_end(args); \ -} while (0) - -// Reports an error diagnostic and terminates the program. -void AsmFile::RaiseError(const char* format, ...) -{ - DO_REPORT("error"); - std::exit(1); -} - -// Reports a warning diagnostic. -void AsmFile::RaiseWarning(const char* format, ...) -{ - DO_REPORT("warning"); -} diff --git a/tools/preproc/asm_file.h b/tools/preproc/asm_file.h deleted file mode 100644 index 29435f76a..000000000 --- a/tools/preproc/asm_file.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef ASM_FILE_H -#define ASM_FILE_H - -#include -#include -#include -#include "preproc.h" - -enum class Directive -{ - Include, - String, - Braille, - Unknown -}; - -class AsmFile -{ -public: - AsmFile(std::string filename); - AsmFile(AsmFile&& other); - AsmFile(const AsmFile&) = delete; - ~AsmFile(); - Directive GetDirective(); - std::string GetGlobalLabel(); - std::string ReadPath(); - int ReadString(unsigned char* s); - int ReadBraille(unsigned char* s); - bool IsAtEnd(); - void OutputLine(); - void OutputLocation(); - -private: - char* m_buffer; - long m_pos; - long m_size; - long m_lineNum; - long m_lineStart; - std::string m_filename; - - bool ConsumeComma(); - int ReadPadLength(); - void RemoveComments(); - bool CheckForDirective(std::string name); - void SkipWhitespace(); - void ExpectEmptyRestOfLine(); - void ReportDiagnostic(const char* type, const char* format, std::va_list args); - void RaiseError(const char* format, ...); - void RaiseWarning(const char* format, ...); - void VerifyStringLength(int length); -}; - -#endif // ASM_FILE_H diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp deleted file mode 100644 index b39a3f986..000000000 --- a/tools/preproc/c_file.cpp +++ /dev/null @@ -1,483 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#include -#include -#include -#include -#include -#include -#include -#include "preproc.h" -#include "c_file.h" -#include "char_util.h" -#include "utf8.h" -#include "string_parser.h" - -CFile::CFile(const char * filenameCStr, bool isStdin) -{ - FILE *fp; - - if (isStdin) { - fp = stdin; - m_filename = std::string{"/"}.append(filenameCStr); - } else { - fp = std::fopen(filenameCStr, "rb"); - m_filename = std::string(filenameCStr); - } - - std::string& filename = m_filename; - - if (fp == NULL) - FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); - - m_size = 0; - m_buffer = (char *)malloc(CHUNK_SIZE + 1); - if (m_buffer == NULL) { - FATAL_ERROR("Failed to allocate memory to process file \"%s\"!", filename.c_str()); - } - - std::size_t numAllocatedBytes = CHUNK_SIZE + 1; - std::size_t bufferOffset = 0; - std::size_t count; - - while ((count = std::fread(m_buffer + bufferOffset, 1, CHUNK_SIZE, fp)) != 0) { - if (!std::ferror(fp)) { - m_size += count; - - if (std::feof(fp)) { - break; - } - - numAllocatedBytes += CHUNK_SIZE; - bufferOffset += CHUNK_SIZE; - m_buffer = (char *)realloc(m_buffer, numAllocatedBytes); - if (m_buffer == NULL) { - FATAL_ERROR("Failed to allocate memory to process file \"%s\"!", filename.c_str()); - } - } else { - FATAL_ERROR("Failed to read \"%s\". (error: %s)", filename.c_str(), std::strerror(errno)); - } - } - - m_buffer[m_size] = 0; - - std::fclose(fp); - - m_pos = 0; - m_lineNum = 1; - m_isStdin = isStdin; -} - -CFile::CFile(CFile&& other) : m_filename(std::move(other.m_filename)) -{ - m_buffer = other.m_buffer; - m_pos = other.m_pos; - m_size = other.m_size; - m_lineNum = other.m_lineNum; - m_isStdin = other.m_isStdin; - - other.m_buffer = NULL; -} - -CFile::~CFile() -{ - free(m_buffer); -} - -void CFile::Preproc() -{ - char stringChar = 0; - - while (m_pos < m_size) - { - if (stringChar) - { - if (m_buffer[m_pos] == stringChar) - { - std::putchar(stringChar); - m_pos++; - stringChar = 0; - } - else if (m_buffer[m_pos] == '\\' && m_buffer[m_pos + 1] == stringChar) - { - std::putchar('\\'); - std::putchar(stringChar); - m_pos += 2; - } - else - { - if (m_buffer[m_pos] == '\n') - m_lineNum++; - std::putchar(m_buffer[m_pos]); - m_pos++; - } - } - else - { - TryConvertString(); - TryConvertIncbin(); - - if (m_pos >= m_size) - break; - - char c = m_buffer[m_pos++]; - - std::putchar(c); - - if (c == '\n') - m_lineNum++; - else if (c == '"') - stringChar = '"'; - else if (c == '\'') - stringChar = '\''; - } - } -} - -bool CFile::ConsumeHorizontalWhitespace() -{ - if (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') - { - m_pos++; - return true; - } - - return false; -} - -bool CFile::ConsumeNewline() -{ - if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n') - { - m_pos += 2; - m_lineNum++; - std::putchar('\n'); - return true; - } - - if (m_buffer[m_pos] == '\n') - { - m_pos++; - m_lineNum++; - std::putchar('\n'); - return true; - } - - return false; -} - -void CFile::SkipWhitespace() -{ - while (ConsumeHorizontalWhitespace() || ConsumeNewline()) - ; -} - -void CFile::TryConvertString() -{ - long oldPos = m_pos; - long oldLineNum = m_lineNum; - bool noTerminator = false; - - // printf("%c", m_buffer[m_pos]); - std::string identifier("INCTEXT"); - std::string shiftJisIdentifier("SHIFT_JIS"); - - bool isShiftJis = CheckIdentifier(shiftJisIdentifier); - bool isText = CheckIdentifier(identifier); - - if ((!isText && !isShiftJis) || (m_pos > 0 && IsIdentifierChar(m_buffer[m_pos - 1]))) - return; - - m_pos += isText ? identifier.size() : shiftJisIdentifier.size(); - - if (m_buffer[m_pos] == '_') - { - noTerminator = true; - m_pos++; - } - - SkipWhitespace(); - - if (m_buffer[m_pos] != '(') - { - m_pos = oldPos; - m_lineNum = oldLineNum; - return; - } - - m_pos++; - - SkipWhitespace(); - - std::printf("{ "); - - while (1) - { - SkipWhitespace(); - - if (m_buffer[m_pos] == '"') - { - unsigned short s[kMaxStringLength]; - int length; - StringParser stringParser(m_buffer, m_size); - - try - { - if (isText) - m_pos += stringParser.ParseString(m_pos, s, length); - else if (isShiftJis) - m_pos += stringParser.ParseShiftJis(m_pos, s, length); - } - catch (std::runtime_error& e) - { - RaiseError(e.what()); - } - - // printf("\n\n%d ; %s\n\n", length, s); - for (int i = 0; i < length; i++) - printf("0x%04X, ", s[i]); - } - else if (m_buffer[m_pos] == ')') - { - m_pos++; - break; - } - else - { - if (m_pos >= m_size) - RaiseError("unexpected EOF"); - if (IsAsciiPrintable(m_buffer[m_pos])) - RaiseError("unexpected character '%c'", m_buffer[m_pos]); - else - RaiseError("unexpected character '\\x%02X'", m_buffer[m_pos]); - } - } - - if (noTerminator || isShiftJis) - std::printf(" }"); - else - std::printf("CHAR_TERMINATOR }"); -} - -bool CFile::CheckIdentifier(const std::string& ident) -{ - unsigned int i; - - for (i = 0; i < ident.length() && m_pos + i < (unsigned)m_size; i++) - if (ident[i] != m_buffer[m_pos + i]) - return false; - - return (i == ident.length()); -} - -std::unique_ptr CFile::ReadWholeFile(const std::string& path, int& size) -{ - FILE* fp = std::fopen(path.c_str(), "rb"); - - if (fp == nullptr) - { - // Some instances of INCBIN can be within #ifdef regions where the condition is not met, - // so it's reasonable that the file may not exist. Only raise a warning and return an empty - // file to continue parsing. - RaiseWarning("Failed to open \"%s\" for reading.\n", path.c_str()); - size = 0; - return {}; - } - - std::fseek(fp, 0, SEEK_END); - - size = std::ftell(fp); - - std::unique_ptr buffer = std::unique_ptr(new unsigned char[size]); - - std::rewind(fp); - - if (std::fread(buffer.get(), size, 1, fp) != 1) - RaiseError("Failed to read \"%s\".\n", path.c_str()); - - std::fclose(fp); - - return buffer; -} - -int ExtractData(const std::unique_ptr& buffer, int offset, int size) -{ - switch (size) - { - case 1: - return buffer[offset]; - case 2: - return (buffer[offset + 1] << 8) - | buffer[offset]; - case 4: - return (buffer[offset + 3] << 24) - | (buffer[offset + 2] << 16) - | (buffer[offset + 1] << 8) - | buffer[offset]; - default: - FATAL_ERROR("Invalid size passed to ExtractData.\n"); - } -} - -void CFile::TryConvertIncbin() -{ - std::string idents[6 * 2] = { - "INCBIN_S8", "INCBIN_U8", "_INCBIN_S8", "_INCBIN_U8", "INCBIN_S16", "INCBIN_U16", - "_INCBIN_S16", "_INCBIN_U16", "INCBIN_S32", "INCBIN_U32", "_INCBIN_S32", "_INCBIN_U32" - }; - int incbinType = -1; - - for (int i = 0; i < 6 * 2; i++) - { - if (CheckIdentifier(idents[i])) - { - incbinType = i; - break; - } - } - - if (incbinType == -1) - return; - - int size = 1 << (incbinType / 4); - bool isSigned = ((incbinType % 4) == 0); - bool hasBrackets = (idents[incbinType][0] != '_'); - - long oldPos = m_pos; - long oldLineNum = m_lineNum; - - m_pos += idents[incbinType].length(); - - SkipWhitespace(); - - if (m_buffer[m_pos] != '(') - { - m_pos = oldPos; - m_lineNum = oldLineNum; - return; - } - - m_pos++; - - if (hasBrackets) - std::printf("{"); - - while (true) - { - SkipWhitespace(); - - if (m_buffer[m_pos] != '"') - RaiseError("expected double quote"); - - m_pos++; - - int startPos = m_pos; - - while (m_buffer[m_pos] != '"') - { - if (m_buffer[m_pos] == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF in path string"); - else - RaiseError("unexpected null character in path string"); - } - - if (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n') - RaiseError("unexpected end of line character in path string"); - - if (m_buffer[m_pos] == '\\') - RaiseError("unexpected escape in path string"); - - m_pos++; - } - - std::string path(&m_buffer[startPos], m_pos - startPos); - - m_pos++; - - int fileSize; - std::unique_ptr buffer = ReadWholeFile(path, fileSize); - - if ((fileSize % size) != 0) - RaiseError("Size %d doesn't evenly divide file size %d.\n", size, fileSize); - - int count = fileSize / size; - int offset = 0; - - for (int i = 0; i < count; i++) - { - int data = ExtractData(buffer, offset, size); - offset += size; - - if (isSigned) - std::printf("%d,", data); - else - std::printf("%uu,", data); - } - - SkipWhitespace(); - - if (m_buffer[m_pos] != ',') - break; - - m_pos++; - } - - if (m_buffer[m_pos] != ')') - RaiseError("expected ')'"); - - m_pos++; - - if (hasBrackets) - std::printf("}"); -} - -// Reports a diagnostic message. -void CFile::ReportDiagnostic(const char* type, const char* format, std::va_list args) -{ - const int bufferSize = 1024; - char buffer[bufferSize]; - std::vsnprintf(buffer, bufferSize, format, args); - std::fprintf(stderr, "%s:%ld: %s: %s\n", m_filename.c_str(), m_lineNum, type, buffer); -} - -#define DO_REPORT(type) \ -do \ -{ \ - std::va_list args; \ - va_start(args, format); \ - ReportDiagnostic(type, format, args); \ - va_end(args); \ -} while (0) - -// Reports an error diagnostic and terminates the program. -void CFile::RaiseError(const char* format, ...) -{ - DO_REPORT("error"); - std::exit(1); -} - -// Reports a warning diagnostic. -void CFile::RaiseWarning(const char* format, ...) -{ - DO_REPORT("warning"); -} diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h deleted file mode 100644 index 49e633a18..000000000 --- a/tools/preproc/c_file.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef C_FILE_H -#define C_FILE_H - -#include -#include -#include -#include -#include "preproc.h" - -class CFile -{ -public: - CFile(const char * filenameCStr, bool isStdin); - CFile(CFile&& other); - CFile(const CFile&) = delete; - ~CFile(); - void Preproc(); - -private: - char* m_buffer; - long m_pos; - long m_size; - long m_lineNum; - std::string m_filename; - bool m_isStdin; - - bool ConsumeHorizontalWhitespace(); - bool ConsumeNewline(); - void SkipWhitespace(); - void TryConvertString(); - std::unique_ptr ReadWholeFile(const std::string& path, int& size); - bool CheckIdentifier(const std::string& ident); - void TryConvertIncbin(); - void ReportDiagnostic(const char* type, const char* format, std::va_list args); - void RaiseError(const char* format, ...); - void RaiseWarning(const char* format, ...); -}; - -#define CHUNK_SIZE 4096 - -#endif // C_FILE_H diff --git a/tools/preproc/char_util.h b/tools/preproc/char_util.h deleted file mode 100644 index 02a6e1ceb..000000000 --- a/tools/preproc/char_util.h +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef CHAR_UTIL_H -#define CHAR_UTIL_H - -#include -#include - -inline bool IsAscii(unsigned char c) -{ - return (c < 128); -} - -inline bool IsAsciiAlpha(unsigned char c) -{ - return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); -} - -inline bool IsAsciiDigit(unsigned char c) -{ - return (c >= '0' && c <= '9'); -} - -inline bool IsAsciiHexDigit(unsigned char c) -{ - return ((c >= '0' && c <= '9') - || (c >= 'a' && c <= 'f') - || (c >= 'A' && c <= 'F')); -} - -inline bool IsAsciiAlphanum(unsigned char c) -{ - return (IsAsciiAlpha(c) || IsAsciiDigit(c)); -} - -inline bool IsAsciiPrintable(unsigned char c) -{ - return (c >= ' ' && c <= '~'); -} - -// Returns whether the character can start a C identifier or the identifier of a "{FOO}" constant in strings. -inline bool IsIdentifierStartingChar(unsigned char c) -{ - return IsAsciiAlpha(c) || c == '_'; -} - -// Returns whether the character can be used in a C identifier or the identifier of a "{FOO}" constant in strings. -inline bool IsIdentifierChar(unsigned char c) -{ - return IsAsciiAlphanum(c) || c == '_'; -} - -#endif // CHAR_UTIL_H diff --git a/tools/preproc/charmap.cpp b/tools/preproc/charmap.cpp deleted file mode 100644 index 75f186555..000000000 --- a/tools/preproc/charmap.cpp +++ /dev/null @@ -1,414 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#include -#include -#include -#include "preproc.h" -#include "charmap.h" -#include "char_util.h" -#include "utf8.h" - -enum LhsType -{ - Char, - Escape, - Constant, - None -}; - -struct Lhs -{ - LhsType type; - std::string name; - std::int32_t code; -}; - -class CharmapReader -{ -public: - CharmapReader(std::string filename); - CharmapReader(const CharmapReader&) = delete; - ~CharmapReader(); - Lhs ReadLhs(); - void ExpectEqualsSign(); - std::string ReadSequence(); - void ExpectEmptyRestOfLine(); - void RaiseError(const char* format, ...); - -private: - char* m_buffer; - long m_pos; - long m_size; - long m_lineNum; - std::string m_filename; - - void RemoveComments(); - std::string ReadConstant(); - void SkipWhitespace(); - bool AcceptNewline(); -}; - -CharmapReader::CharmapReader(std::string filename) : m_filename(filename) -{ - FILE *fp = std::fopen(filename.c_str(), "rb"); - - if (fp == NULL) - FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); - - std::fseek(fp, 0, SEEK_END); - - m_size = std::ftell(fp); - - if (m_size < 0) - FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); - - m_buffer = new char[m_size + 1]; - - std::rewind(fp); - - if (std::fread(m_buffer, m_size, 1, fp) != 1) - FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); - - m_buffer[m_size] = 0; - - std::fclose(fp); - - m_pos = 0; - m_lineNum = 1; - - RemoveComments(); -} - -CharmapReader::~CharmapReader() -{ - delete[] m_buffer; -} - -Lhs CharmapReader::ReadLhs() -{ - Lhs lhs; - - for (;;) - { - SkipWhitespace(); - - if (!AcceptNewline()) - break; - } - - if (m_buffer[m_pos] == '\'') - { - m_pos++; - - bool isEscape = (m_buffer[m_pos] == '\\'); - - if (isEscape) - { - m_pos++; - } - - unsigned char c = m_buffer[m_pos]; - - if (c == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF in UTF-8 character literal"); - else - RaiseError("unexpected null character in UTF-8 character literal"); - } - - if (IsAscii(c) && !IsAsciiPrintable(c)) - RaiseError("unexpected character U+%X in UTF-8 character literal", c); - - UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); - std::int32_t code = unicodeChar.code; - - if (code == -1) - RaiseError("invalid encoding in UTF-8 character literal"); - - m_pos += unicodeChar.encodingLength; - - if (m_buffer[m_pos] != '\'') - RaiseError("unterminated character literal"); - - m_pos++; - - lhs.code = code; - - if (isEscape) - { - if (code >= 128) - RaiseError("escapes using non-ASCII characters are invalid"); - - switch (code) - { - case '\'': - lhs.type = LhsType::Char; - break; - case '\\': - lhs.type = LhsType::Char; - case '"': - RaiseError("cannot escape double quote"); - break; - default: - lhs.type = LhsType::Escape; - } - } - else - { - if (code == '\'') - RaiseError("empty character literal"); - - lhs.type = LhsType::Char; - } - } - else if (IsIdentifierStartingChar(m_buffer[m_pos])) - { - lhs.type = LhsType::Constant; - lhs.name = ReadConstant(); - } - else if (m_buffer[m_pos] == '\r') - { - RaiseError("only Unix-style LF newlines are supported"); - } - else if (m_buffer[m_pos] == 0) - { - if (m_pos < m_size) - RaiseError("unexpected null character"); - lhs.type = LhsType::None; - } - else - { - RaiseError("junk at start of line"); - } - - return lhs; -} - -void CharmapReader::ExpectEqualsSign() -{ - SkipWhitespace(); - - if (m_buffer[m_pos] != '=') - RaiseError("expected equals sign"); - - m_pos++; -} - -static unsigned int ConvertHexDigit(char c) -{ - unsigned int digit = 0; - - if (c >= '0' && c <= '9') - digit = c - '0'; - else if (c >= 'A' && c <= 'F') - digit = 10 + c - 'A'; - else if (c >= 'a' && c <= 'f') - digit = 10 + c - 'a'; - - return digit; -} - -std::string CharmapReader::ReadSequence() -{ - SkipWhitespace(); - - long startPos = m_pos; - - unsigned int length = 0; - - while (IsAsciiHexDigit(m_buffer[m_pos]) && IsAsciiHexDigit(m_buffer[m_pos + 1])) - { - m_pos += 2; - length++; - - if (length > kMaxCharmapSequenceLength) - RaiseError("byte sequence too long (max is %lu bytes)", kMaxCharmapSequenceLength); - - SkipWhitespace(); - } - - if (IsAsciiHexDigit(m_buffer[m_pos])) - RaiseError("each byte must have 2 hex digits"); - - if (length == 0) - RaiseError("expected byte sequence"); - - std::string sequence; - sequence.reserve(length); - - m_pos = startPos; - - for (unsigned int i = 0; i < length; i++) - { - unsigned int digit1 = ConvertHexDigit(m_buffer[m_pos]); - unsigned int digit2 = ConvertHexDigit(m_buffer[m_pos + 1]); - unsigned char byte = digit1 * 16 + digit2; - sequence += byte; - - m_pos += 2; - SkipWhitespace(); - } - - return sequence; -} - -void CharmapReader::ExpectEmptyRestOfLine() -{ - SkipWhitespace(); - - if (m_buffer[m_pos] == 0) - { - if (m_pos < m_size) - RaiseError("unexpected null character"); - } - else if (!AcceptNewline()) - { - RaiseError("junk at end of line"); - } -} - -void CharmapReader::RaiseError(const char* format, ...) -{ - const int bufferSize = 1024; - char buffer[bufferSize]; - - std::va_list args; - va_start(args, format); - std::vsnprintf(buffer, bufferSize, format, args); - va_end(args); - - std::fprintf(stderr, "%s:%ld: error: %s\n", m_filename.c_str(), m_lineNum, buffer); - - std::exit(1); -} - -void CharmapReader::RemoveComments() -{ - long pos = 0; - bool inString = false; - - for (;;) - { - if (m_buffer[pos] == 0) - return; - - if (inString) - { - if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == '\'') - { - pos += 2; - } - else - { - if (m_buffer[pos] == '\'') - inString = false; - pos++; - } - } - else if (m_buffer[pos] == '@') - { - while (m_buffer[pos] != '\n' && m_buffer[pos] != 0) - m_buffer[pos++] = ' '; - } - else - { - if (m_buffer[pos] == '\'') - inString = true; - pos++; - } - } -} - -std::string CharmapReader::ReadConstant() -{ - long startPos = m_pos; - - while (IsIdentifierChar(m_buffer[m_pos])) - m_pos++; - - return std::string(&m_buffer[startPos], m_pos - startPos); -} - -void CharmapReader::SkipWhitespace() -{ - while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') - m_pos++; -} - -bool CharmapReader::AcceptNewline() -{ - if (m_buffer[m_pos] == '\r') - { - if (m_buffer[m_pos + 1] != '\n') - RaiseError("expected line feed (LF) after carriage return (CR)"); - m_pos += 2; - } - else if (m_buffer[m_pos] == '\n') - { - m_pos++; - } - else - { - return false; - } - - m_lineNum++; - return true; -} - -Charmap::Charmap(std::string filename) -{ - CharmapReader reader(filename); - - for (;;) - { - Lhs lhs = reader.ReadLhs(); - - if (lhs.type == LhsType::None) - return; - - reader.ExpectEqualsSign(); - - std::string sequence = reader.ReadSequence(); - - switch (lhs.type) - { - case LhsType::Char: - if (m_chars.find(lhs.code) != m_chars.end()) - reader.RaiseError("redefining char"); - m_chars[lhs.code] = sequence; - break; - case LhsType::Escape: - if (m_escapes[lhs.code].length() != 0) - reader.RaiseError("redefining escape"); - m_escapes[lhs.code] = sequence; - break; - case LhsType::Constant: - if (m_constants.find(lhs.name) != m_constants.end()) - reader.RaiseError("redefining constant"); - m_constants[lhs.name] = sequence; - break; - } - - reader.ExpectEmptyRestOfLine(); - } -} diff --git a/tools/preproc/charmap.h b/tools/preproc/charmap.h deleted file mode 100644 index 0d752ac99..000000000 --- a/tools/preproc/charmap.h +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef CHARMAP_H -#define CHARMAP_H - -#include -#include -#include -#include - -class Charmap -{ -public: - Charmap(std::string filename); - - std::string Char(std::int32_t code) - { - auto it = m_chars.find(code); - - if (it == m_chars.end()) - return std::string(); - - return it->second; - } - - std::string Escape(unsigned char code) - { - return m_escapes[code]; - } - - std::string Constant(std::string identifier) - { - auto it = m_constants.find(identifier); - - if (it == m_constants.end()) - return std::string(); - - return it->second; - } -private: - std::map m_chars; - std::string m_escapes[128]; - std::map m_constants; -}; - -#endif // CHARMAP_H diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp deleted file mode 100644 index 12928f359..000000000 --- a/tools/preproc/preproc.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#include -#include -#include "preproc.h" -#include "asm_file.h" -#include "c_file.h" -#include "charmap.h" - -Charmap* g_charmap; - -void PrintAsmBytes(unsigned char *s, int length) -{ - if (length > 0) - { - std::printf("\t.byte "); - for (int i = 0; i < length; i++) - { - std::printf("0x%02X", s[i]); - - if (i < length - 1) - std::printf(", "); - } - std::putchar('\n'); - } -} - -void PreprocAsmFile(std::string filename) -{ - std::stack stack; - - stack.push(AsmFile(filename)); - - for (;;) - { - while (stack.top().IsAtEnd()) - { - stack.pop(); - - if (stack.empty()) - return; - else - stack.top().OutputLocation(); - } - - Directive directive = stack.top().GetDirective(); - - switch (directive) - { - case Directive::Include: - stack.push(AsmFile(stack.top().ReadPath())); - stack.top().OutputLocation(); - break; - case Directive::String: - { - unsigned char s[kMaxStringLength]; - int length = stack.top().ReadString(s); - PrintAsmBytes(s, length); - break; - } - case Directive::Braille: - { - unsigned char s[kMaxStringLength]; - int length = stack.top().ReadBraille(s); - PrintAsmBytes(s, length); - break; - } - case Directive::Unknown: - { - std::string globalLabel = stack.top().GetGlobalLabel(); - - if (globalLabel.length() != 0) - { - const char *s = globalLabel.c_str(); - std::printf("%s: ; .global %s\n", s, s); - } - else - { - stack.top().OutputLine(); - } - - break; - } - } - } -} - -void PreprocCFile(const char * filename, bool isStdin) -{ - CFile cFile(filename, isStdin); - cFile.Preproc(); -} - -char* GetFileExtension(char* filename) -{ - char* extension = filename; - - while (*extension != 0) - extension++; - - while (extension > filename && *extension != '.') - extension--; - - if (extension == filename) - return nullptr; - - extension++; - - if (*extension == 0) - return nullptr; - - return extension; -} - -int main(int argc, char **argv) -{ - if (argc < 3 || argc > 4) - { - std::fprintf(stderr, "Usage: %s SRC_FILE CHARMAP_FILE [-i]\nwhere -i denotes if input is from stdin\n", argv[0]); - return 1; - } - - g_charmap = new Charmap(argv[2]); - - char* extension = GetFileExtension(argv[1]); - - if (!extension) - FATAL_ERROR("\"%s\" has no file extension.\n", argv[1]); - - if ((extension[0] == 's') && extension[1] == 0) - PreprocAsmFile(argv[1]); - else if ((extension[0] == 'c' || extension[0] == 'i') && extension[1] == 0) { - if (argc == 4) { - if (argv[3][0] == '-' && argv[3][1] == 'i' && argv[3][2] == '\0') { - PreprocCFile(argv[1], true); - } else { - FATAL_ERROR("unknown argument flag \"%s\".\n", argv[3]); - } - } else { - PreprocCFile(argv[1], false); - } - } else - FATAL_ERROR("\"%s\" has an unknown file extension of \"%s\".\n", argv[1], extension); - - return 0; -} \ No newline at end of file diff --git a/tools/preproc/preproc.h b/tools/preproc/preproc.h deleted file mode 100644 index 515f64e07..000000000 --- a/tools/preproc/preproc.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef PREPROC_H -#define PREPROC_H - -#include -#include -#include "charmap.h" - -#ifdef _MSC_VER - -#define FATAL_ERROR(format, ...) \ -do \ -{ \ - std::fprintf(stderr, format, __VA_ARGS__); \ - std::exit(1); \ -} while (0) - -#else - -#define FATAL_ERROR(format, ...) \ -do \ -{ \ - std::fprintf(stderr, format, ##__VA_ARGS__); \ - std::exit(1); \ -} while (0) - -#endif // _MSC_VER - -const int kMaxPath = 256; -const int kMaxStringLength = 1024; -const unsigned long kMaxCharmapSequenceLength = 16; - -extern Charmap* g_charmap; - -#endif // PREPROC_H diff --git a/tools/preproc/string_parser.cpp b/tools/preproc/string_parser.cpp deleted file mode 100644 index c7fb992fa..000000000 --- a/tools/preproc/string_parser.cpp +++ /dev/null @@ -1,536 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#include -#include -#include -#include -#include -#include "preproc.h" -#include "string_parser.h" -#include "char_util.h" -#include "utf8.h" - -struct ShiftJisData -{ -public: - const char* text; - std::array code; - - constexpr ShiftJisData(const char* t, std::array&& c) : text(t), code(c) {}; -}; - -static constexpr std::array kShiftJisMap = { - ShiftJisData("。", { 0xA1, 0x00 }), - ShiftJisData("「", { 0xA2, 0x00 }), - ShiftJisData("」", { 0xA3, 0x00 }), - ShiftJisData("、", { 0xA4, 0x00 }), - ShiftJisData("・", { 0xA5, 0x00 }), - ShiftJisData("ヲ", { 0xA6, 0x00 }), - ShiftJisData("ァ", { 0xA7, 0x00 }), - ShiftJisData("ィ", { 0xA8, 0x00 }), - ShiftJisData("ゥ", { 0xA9, 0x00 }), - ShiftJisData("ェ", { 0xAA, 0x00 }), - ShiftJisData("ォ", { 0xAB, 0x00 }), - ShiftJisData("ャ", { 0xAC, 0x00 }), - ShiftJisData("ュ", { 0xAD, 0x00 }), - ShiftJisData("ョ", { 0xAE, 0x00 }), - ShiftJisData("ッ", { 0xAF, 0x00 }), - ShiftJisData("ー", { 0xB0, 0x00 }), - ShiftJisData("ア", { 0xB1, 0x00 }), - ShiftJisData("イ", { 0xB2, 0x00 }), - ShiftJisData("ウ", { 0xB3, 0x00 }), - ShiftJisData("エ", { 0xB4, 0x00 }), - ShiftJisData("オ", { 0xB5, 0x00 }), - ShiftJisData("カ", { 0xB6, 0x00 }), - ShiftJisData("キ", { 0xB7, 0x00 }), - ShiftJisData("ク", { 0xB8, 0x00 }), - ShiftJisData("ケ", { 0xB9, 0x00 }), - ShiftJisData("コ", { 0xBA, 0x00 }), - ShiftJisData("サ", { 0xBB, 0x00 }), - ShiftJisData("シ", { 0xBC, 0x00 }), - ShiftJisData("ス", { 0xBD, 0x00 }), - ShiftJisData("セ", { 0xBE, 0x00 }), - ShiftJisData("ソ", { 0xBF, 0x00 }), - ShiftJisData("タ", { 0xC0, 0x00 }), - ShiftJisData("チ", { 0xC1, 0x00 }), - ShiftJisData("ツ", { 0xC2, 0x00 }), - ShiftJisData("テ", { 0xC3, 0x00 }), - ShiftJisData("ト", { 0xC4, 0x00 }), - ShiftJisData("ナ", { 0xC5, 0x00 }), - ShiftJisData("ニ", { 0xC6, 0x00 }), - ShiftJisData("ヌ", { 0xC7, 0x00 }), - ShiftJisData("ネ", { 0xC8, 0x00 }), - ShiftJisData("ノ", { 0xC9, 0x00 }), - ShiftJisData("ハ", { 0xCA, 0x00 }), - ShiftJisData("ヒ", { 0xCB, 0x00 }), - ShiftJisData("フ", { 0xCC, 0x00 }), - ShiftJisData("ヘ", { 0xCD, 0x00 }), - ShiftJisData("ホ", { 0xCE, 0x00 }), - ShiftJisData("マ", { 0xCF, 0x00 }), - ShiftJisData("ミ", { 0xD0, 0x00 }), - ShiftJisData("ム", { 0xD1, 0x00 }), - ShiftJisData("メ", { 0xD2, 0x00 }), - ShiftJisData("モ", { 0xD3, 0x00 }), - ShiftJisData("ヤ", { 0xD4, 0x00 }), - ShiftJisData("ユ", { 0xD5, 0x00 }), - ShiftJisData("ヨ", { 0xD6, 0x00 }), - ShiftJisData("ラ", { 0xD7, 0x00 }), - ShiftJisData("リ", { 0xD8, 0x00 }), - ShiftJisData("ル", { 0xD9, 0x00 }), - ShiftJisData("レ", { 0xDA, 0x00 }), - ShiftJisData("ロ", { 0xDB, 0x00 }), - ShiftJisData("ワ", { 0xDC, 0x00 }), - ShiftJisData("ン", { 0xDD, 0x00 }), - // Katakana with dakuten and handakuten - ShiftJisData("ガ", { 0xB6, 0xDE }), - ShiftJisData("ギ", { 0xB7, 0xDE }), - ShiftJisData("グ", { 0xB8, 0xDE }), - ShiftJisData("ゲ", { 0xB9, 0xDE }), - ShiftJisData("ゴ", { 0xBA, 0xDE }), - ShiftJisData("ザ", { 0xBB, 0xDE }), - ShiftJisData("ジ", { 0xBC, 0xDE }), - ShiftJisData("ズ", { 0xBD, 0xDE }), - ShiftJisData("ゼ", { 0xBE, 0xDE }), - ShiftJisData("ゾ", { 0xBF, 0xDE }), - ShiftJisData("ダ", { 0xC0, 0xDE }), - ShiftJisData("ヂ", { 0xC1, 0xDE }), - ShiftJisData("ヅ", { 0xC2, 0xDE }), - ShiftJisData("デ", { 0xC3, 0xDE }), - ShiftJisData("ド", { 0xC4, 0xDE }), - ShiftJisData("バ", { 0xCA, 0xDE }), - ShiftJisData("ビ", { 0xCB, 0xDE }), - ShiftJisData("ブ", { 0xCC, 0xDE }), - ShiftJisData("ベ", { 0xCD, 0xDE }), - ShiftJisData("ボ", { 0xCE, 0xDE }), - ShiftJisData("パ", { 0xCA, 0xDF }), - ShiftJisData("ピ", { 0xCB, 0xDF }), - ShiftJisData("プ", { 0xCC, 0xDF }), - ShiftJisData("ペ", { 0xCD, 0xDF }), - ShiftJisData("ポ", { 0xCE, 0xDF }) -}; - -static std::array FindShiftJisCharacter(const int code) -{ - for (const ShiftJisData& it : kShiftJisMap) - { - if (DecodeUtf8(it.text).code == code) - { - return it.code; - } - } - - printf("--- Couldn't find character %x ---", code); - return {}; -} - -// Reads a charmap char or escape sequence. -std::string StringParser::ReadCharOrEscape() -{ - std::string sequence; - - bool isEscape = (m_buffer[m_pos] == '\\'); - - if (isEscape) - { - m_pos++; - - if (m_buffer[m_pos] == '"') - { - sequence = g_charmap->Char('"'); - - if (sequence.length() == 0) - RaiseError("no mapping exists for double quote"); - - return sequence; - } - else if (m_buffer[m_pos] == '\\') - { - sequence = g_charmap->Char('\\'); - - if (sequence.length() == 0) - RaiseError("no mapping exists for backslash"); - - return sequence; - } - } - - unsigned char c = m_buffer[m_pos]; - - if (c == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF in UTF-8 string"); - else - RaiseError("unexpected null character in UTF-8 string"); - } - - if (IsAscii(c) && !IsAsciiPrintable(c)) - RaiseError("unexpected character U+%X in UTF-8 string", c); - - UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); - m_pos += unicodeChar.encodingLength; - std::int32_t code = unicodeChar.code; - - if (code == -1) - RaiseError("invalid encoding in UTF-8 string"); - - if (isEscape && code >= 128) - RaiseError("escapes using non-ASCII characters are invalid"); - - sequence = isEscape ? g_charmap->Escape(code) : g_charmap->Char(code); - - if (sequence.length() == 0) - { - if (isEscape) - RaiseError("unknown escape '\\%c'", code); - else - RaiseError("unknown character U+%X", code); - } - - return sequence; -} - -// Reads a charmap constant, i.e. "{FOO}". -std::string StringParser::ReadBracketedConstants() -{ - std::string totalSequence; - - m_pos++; // Assume we're on the left curly bracket. - - while (m_buffer[m_pos] != '}') - { - SkipWhitespace(); - - if (IsIdentifierStartingChar(m_buffer[m_pos])) - { - long startPos = m_pos; - - m_pos++; - - while (IsIdentifierChar(m_buffer[m_pos])) - m_pos++; - - std::string txt = std::string(&m_buffer[startPos], m_pos - startPos); - std::string sequence = g_charmap->Constant(txt); - - if (sequence.length() == 0) - { - m_buffer[m_pos] = 0; - RaiseError("unknown constant '%s'", &m_buffer[startPos]); - } - - if (m_buffer[m_pos] == '(') - { - m_pos++; // ( - - Integer integer = ReadInteger(); - - unsigned short mask = sequence[0] << 8 | (sequence[1] & 0xFF); - - mask |= integer.value; - - sequence[0] = mask >> 8; - sequence[1] = mask; - - m_pos++; // ) - } - - totalSequence += sequence; - } - else if (IsAsciiDigit(m_buffer[m_pos])) - { - Integer integer = ReadInteger(); - - switch (integer.size) - { - case 1: - totalSequence += (unsigned char)integer.value; - break; - case 2: - totalSequence += (unsigned char)integer.value; - totalSequence += (unsigned char)(integer.value >> 8); - break; - case 4: - totalSequence += (unsigned char)integer.value; - totalSequence += (unsigned char)(integer.value >> 8); - totalSequence += (unsigned char)(integer.value >> 16); - totalSequence += (unsigned char)(integer.value >> 24); - break; - } - } - else if (m_buffer[m_pos] == 0) - { - if (m_pos >= m_size) - RaiseError("unexpected EOF after left curly bracket"); - else - RaiseError("unexpected null character within curly brackets"); - } - else - { - if (IsAsciiPrintable(m_buffer[m_pos])) - RaiseError("unexpected character '%c' within curly brackets", m_buffer[m_pos]); - else - RaiseError("unexpected character '\\x%02X' within curly brackets", m_buffer[m_pos]); - } - } - - m_pos++; // Go past the right curly bracket. - - return totalSequence; -} - -// Reads a charmap string. -int StringParser::ParseString(long srcPos, unsigned short* dest, int& destLength) -{ - m_pos = srcPos; - - if (m_buffer[m_pos] != '"') - RaiseError("expected UTF-8 string literal"); - - long start = m_pos; - - m_pos++; - - destLength = 0; - - while (m_buffer[m_pos] != '"') - { - std::string sequence = (m_buffer[m_pos] == '{') ? ReadBracketedConstants() : ReadCharOrEscape(); - - for (size_t i = 0; i < sequence.size(); i += 2) - { - if (destLength == kMaxStringLength) - RaiseError("mapped string longer than %d bytes", kMaxStringLength); - - unsigned int c; - if (sequence[i] == 0) - c = sequence[i + 1] & 0xFF; - else - c = sequence[i] << 8 | (sequence[i + 1] & 0xFF); - - dest[destLength++] = c; - } - } - - m_pos++; // Go past the right quote. - - return m_pos - start; -} - -int StringParser::ParseShiftJis(long srcPos, unsigned short* dest, int& destLength) -{ - m_pos = srcPos; - - if (m_buffer[m_pos] != '"') - RaiseError("expected UTF-8 string literal"); - - long start = m_pos; - - m_pos++; - - destLength = 0; - - while (m_buffer[m_pos] != '"') - { - UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); - m_pos += unicodeChar.encodingLength; - std::int32_t code = unicodeChar.code; - - if (IsAscii(code)) - { - dest[destLength++] = code; - continue; - } - - const std::array encoded = FindShiftJisCharacter(code); - for (const unsigned char c : encoded) - { - if (c == 0) - break; - - dest[destLength++] = c; - } - } - - m_pos++; // Go past the right quote. - - return m_pos - start; -} - -void StringParser::RaiseError(const char* format, ...) -{ - const int bufferSize = 1024; - char buffer[bufferSize]; - - std::va_list args; - va_start(args, format); - std::vsnprintf(buffer, bufferSize, format, args); - va_end(args); - - throw std::runtime_error(buffer); -} - -// Converts digit character to numerical value. -static int ConvertDigit(char c, int radix) -{ - int digit; - - if (c >= '0' && c <= '9') - digit = c - '0'; - else if (c >= 'A' && c <= 'F') - digit = 10 + c - 'A'; - else if (c >= 'a' && c <= 'f') - digit = 10 + c - 'a'; - else - return -1; - - return (digit < radix) ? digit : -1; -} - -void StringParser::SkipRestOfInteger(int radix) -{ - while (ConvertDigit(m_buffer[m_pos], radix) != -1) - m_pos++; -} - -StringParser::Integer StringParser::ReadDecimal() -{ - const int radix = 10; - std::uint64_t n = 0; - int digit; - std::uint64_t max = UINT32_MAX; - long startPos = m_pos; - - while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) - { - n = n * radix + digit; - - if (n >= max) - { - SkipRestOfInteger(radix); - - std::string intLiteral(m_buffer + startPos, m_pos - startPos); - RaiseError("integer literal \"%s\" is too large", intLiteral.c_str()); - } - - m_pos++; - } - - int size; - - if (m_buffer[m_pos] == 'H') - { - if (n >= 0x10000) - { - RaiseError("%lu is too large to be a halfword", (unsigned long)n); - } - - size = 2; - m_pos++; - } - else if (m_buffer[m_pos] == 'W') - { - size = 4; - m_pos++; - } - else - { - if (n >= 0x10000) - size = 4; - else if (n >= 0x100) - size = 2; - else - size = 1; - } - - return{ static_cast(n), size }; -} - -StringParser::Integer StringParser::ReadHex() -{ - const int radix = 16; - std::uint64_t n = 0; - int digit; - std::uint64_t max = UINT32_MAX; - long startPos = m_pos; - - while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) - { - n = n * radix + digit; - - if (n >= max) - { - SkipRestOfInteger(radix); - - std::string intLiteral(m_buffer + startPos, m_pos - startPos); - RaiseError("integer literal \"%s\" is too large", intLiteral.c_str()); - } - - m_pos++; - } - - int length = m_pos - startPos; - int size = 0; - - switch (length) - { - case 2: - size = 1; - break; - case 4: - size = 2; - break; - case 8: - size = 4; - break; - default: - { - std::string intLiteral(m_buffer + startPos, m_pos - startPos); - RaiseError("hex integer literal \"0x%s\" doesn't have length of 2, 4, or 8 digits", intLiteral.c_str()); - } - } - - return{ static_cast(n), size }; -} - -StringParser::Integer StringParser::ReadInteger() -{ - if (!IsAsciiDigit(m_buffer[m_pos])) - { - // printf("\n\n\nXXXXXX\n%s\n\n\n", &m_buffer[m_pos]); - RaiseError("expected integer"); - } - - if (m_buffer[m_pos] == '0' && m_buffer[m_pos + 1] == 'x') - { - m_pos += 2; - return ReadHex(); - } - - return ReadDecimal(); -} - -// Skips tabs and spaces. -void StringParser::SkipWhitespace() -{ - while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') - m_pos++; -} diff --git a/tools/preproc/string_parser.h b/tools/preproc/string_parser.h deleted file mode 100644 index 33c7eb27d..000000000 --- a/tools/preproc/string_parser.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef STRING_PARSER_H -#define STRING_PARSER_H - -#include -#include -#include "preproc.h" - -class StringParser -{ -public: - StringParser(char* buffer, long size) : m_buffer(buffer), m_size(size), m_pos(0) {} - int ParseString(long srcPos, unsigned short* dest, int &destLength); - int ParseShiftJis(long srcPos, unsigned short* dest, int &destLength); - -private: - struct Integer - { - std::uint32_t value; - int size; - }; - - char* m_buffer; - long m_size; - long m_pos; - - Integer ReadInteger(); - Integer ReadDecimal(); - Integer ReadHex(); - std::string ReadCharOrEscape(); - std::string ReadBracketedConstants(); - void SkipWhitespace(); - void SkipRestOfInteger(int radix); - void RaiseError(const char* format, ...); -}; - -#endif // STRING_PARSER_H diff --git a/tools/preproc/utf8.cpp b/tools/preproc/utf8.cpp deleted file mode 100644 index 7facfd44e..000000000 --- a/tools/preproc/utf8.cpp +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2008-2009 Bjoern Hoehrmann -// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. -// -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#include -#include "utf8.h" - -static const unsigned char s_byteTypeTable[] = -{ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f - 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf - 8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df - 0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef - 0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff -}; - -const unsigned char s0 = 0 * 12; -const unsigned char s1 = 1 * 12; -const unsigned char s2 = 2 * 12; -const unsigned char s3 = 3 * 12; -const unsigned char s4 = 4 * 12; -const unsigned char s5 = 5 * 12; -const unsigned char s6 = 6 * 12; -const unsigned char s7 = 7 * 12; -const unsigned char s8 = 8 * 12; - -static const unsigned char s_transitionTable[] = -{ - s0,s1,s2,s3,s5,s8,s7,s1,s1,s1,s4,s6, // s0 - s1,s1,s1,s1,s1,s1,s1,s1,s1,s1,s1,s1, // s1 - s1,s0,s1,s1,s1,s1,s1,s0,s1,s0,s1,s1, // s2 - s1,s2,s1,s1,s1,s1,s1,s2,s1,s2,s1,s1, // s3 - s1,s1,s1,s1,s1,s1,s1,s2,s1,s1,s1,s1, // s4 - s1,s2,s1,s1,s1,s1,s1,s1,s1,s2,s1,s1, // s5 - s1,s1,s1,s1,s1,s1,s1,s3,s1,s3,s1,s1, // s6 - s1,s3,s1,s1,s1,s1,s1,s3,s1,s3,s1,s1, // s7 - s1,s3,s1,s1,s1,s1,s1,s1,s1,s1,s1,s1, // s8 -}; - -// Decodes UTF-8 encoded Unicode code point at "s". -UnicodeChar DecodeUtf8(const char* s) -{ - UnicodeChar unicodeChar; - int state = s0; - auto start = s; - - do - { - unsigned char byte = *s++; - int type = s_byteTypeTable[byte]; - - if (state == s0) - unicodeChar.code = (0xFF >> type) & byte; - else - unicodeChar.code = (unicodeChar.code << 6) | (byte & 0x3F); - - state = s_transitionTable[state + type]; - - if (state == s1) - { - unicodeChar.code = -1; - return unicodeChar; - } - } while (state != s0); - - unicodeChar.encodingLength = s - start; - - return unicodeChar; -} diff --git a/tools/preproc/utf8.h b/tools/preproc/utf8.h deleted file mode 100644 index 259de67c5..000000000 --- a/tools/preproc/utf8.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright(c) 2016 YamaArashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#ifndef UTF8_H -#define UTF8_H - -#include - -struct UnicodeChar -{ - std::int32_t code; - int encodingLength; -}; - -UnicodeChar DecodeUtf8(const char* s); - -#endif // UTF8_H From e70faefbf8eb7665e506abc551bb1d157901c5fb Mon Sep 17 00:00:00 2001 From: CharlesVanEeckhout Date: Thu, 26 Mar 2026 19:42:04 -0400 Subject: [PATCH 3/3] incbin -> include .inc --- .gitignore | 1 + Makefile | 2 + include/macros.h | 103 - src/data/animated_tiles_data.c | 12 +- src/data/cable_link_data.c | 8 +- src/data/chozodia_escape_data.c | 56 +- src/data/clipdata_types.c | 8 +- src/data/clipdata_types_tilemap.c | 4 +- src/data/common_pals.c | 24 +- src/data/cutscenes/before_ruins_test_data.c | 76 +- src/data/cutscenes/enter_tourian_data.c | 36 +- .../getting_fully_powered_suit_data.c | 28 +- src/data/cutscenes/kraid_rising_data.c | 60 +- src/data/cutscenes/mecha_sees_samus_data.c | 16 +- .../cutscenes/mother_brain_close_up_data.c | 78 +- src/data/cutscenes/ridley_in_space_data.c | 76 +- src/data/cutscenes/ridley_landing_data.c | 104 +- src/data/cutscenes/ridley_spawn_data.c | 44 +- src/data/cutscenes/samus_in_blue_ship_data.c | 16 +- src/data/cutscenes/statue_opening_data.c | 16 +- src/data/cutscenes/story_text_cutscene_data.c | 12 +- src/data/default_background_data.c | 24 +- src/data/ending_and_gallery_data.c | 394 ++- src/data/fusion_gallery_data.c | 260 +- src/data/hud_data.c | 212 +- src/data/intro_data.c | 68 +- src/data/menus/boot_debug_data.c | 20 +- src/data/menus/erase_sram_data.c | 72 +- src/data/menus/file_select_data.c | 118 +- src/data/menus/game_over_data.c | 44 +- src/data/menus/language_select_data.c | 12 +- src/data/menus/pause_screen_data.c | 228 +- src/data/menus/pause_screen_map_data.c | 20 +- src/data/menus/status_screen_data.c | 16 +- src/data/menus/title_screen_data.c | 80 +- src/data/nes_metroid.c | 4 +- src/data/projectile_data.c | 100 +- src/data/rooms/brinstar/bg3.c | 44 +- src/data/rooms/brinstar/brinstar_0.c | 12 +- src/data/rooms/brinstar/brinstar_1.c | 16 +- src/data/rooms/brinstar/brinstar_10.c | 12 +- src/data/rooms/brinstar/brinstar_11.c | 12 +- src/data/rooms/brinstar/brinstar_12.c | 16 +- src/data/rooms/brinstar/brinstar_13.c | 16 +- src/data/rooms/brinstar/brinstar_14.c | 12 +- src/data/rooms/brinstar/brinstar_15.c | 12 +- src/data/rooms/brinstar/brinstar_16.c | 12 +- src/data/rooms/brinstar/brinstar_17.c | 12 +- src/data/rooms/brinstar/brinstar_18.c | 12 +- src/data/rooms/brinstar/brinstar_19.c | 16 +- src/data/rooms/brinstar/brinstar_2.c | 16 +- src/data/rooms/brinstar/brinstar_20.c | 12 +- src/data/rooms/brinstar/brinstar_21.c | 16 +- src/data/rooms/brinstar/brinstar_22.c | 16 +- src/data/rooms/brinstar/brinstar_23.c | 16 +- src/data/rooms/brinstar/brinstar_24.c | 16 +- src/data/rooms/brinstar/brinstar_25.c | 12 +- src/data/rooms/brinstar/brinstar_26.c | 12 +- src/data/rooms/brinstar/brinstar_27.c | 12 +- src/data/rooms/brinstar/brinstar_28.c | 16 +- src/data/rooms/brinstar/brinstar_29.c | 16 +- src/data/rooms/brinstar/brinstar_3.c | 12 +- src/data/rooms/brinstar/brinstar_30.c | 12 +- src/data/rooms/brinstar/brinstar_31.c | 12 +- src/data/rooms/brinstar/brinstar_32.c | 12 +- src/data/rooms/brinstar/brinstar_33.c | 12 +- src/data/rooms/brinstar/brinstar_34.c | 12 +- src/data/rooms/brinstar/brinstar_35.c | 12 +- src/data/rooms/brinstar/brinstar_36.c | 12 +- src/data/rooms/brinstar/brinstar_37.c | 12 +- src/data/rooms/brinstar/brinstar_38.c | 16 +- src/data/rooms/brinstar/brinstar_39.c | 12 +- src/data/rooms/brinstar/brinstar_4.c | 12 +- src/data/rooms/brinstar/brinstar_40.c | 12 +- src/data/rooms/brinstar/brinstar_41.c | 16 +- src/data/rooms/brinstar/brinstar_5.c | 12 +- src/data/rooms/brinstar/brinstar_6.c | 16 +- src/data/rooms/brinstar/brinstar_7.c | 12 +- src/data/rooms/brinstar/brinstar_8.c | 16 +- src/data/rooms/brinstar/brinstar_9.c | 16 +- src/data/rooms/chozodia/bg3.c | 56 +- src/data/rooms/chozodia/chozodia_0.c | 16 +- src/data/rooms/chozodia/chozodia_1.c | 16 +- src/data/rooms/chozodia/chozodia_10.c | 12 +- src/data/rooms/chozodia/chozodia_11.c | 12 +- src/data/rooms/chozodia/chozodia_12.c | 12 +- src/data/rooms/chozodia/chozodia_13.c | 16 +- src/data/rooms/chozodia/chozodia_14.c | 16 +- src/data/rooms/chozodia/chozodia_15.c | 12 +- src/data/rooms/chozodia/chozodia_16.c | 16 +- src/data/rooms/chozodia/chozodia_17.c | 12 +- src/data/rooms/chozodia/chozodia_18.c | 16 +- src/data/rooms/chozodia/chozodia_19.c | 16 +- src/data/rooms/chozodia/chozodia_2.c | 16 +- src/data/rooms/chozodia/chozodia_20.c | 16 +- src/data/rooms/chozodia/chozodia_21.c | 12 +- src/data/rooms/chozodia/chozodia_22.c | 16 +- src/data/rooms/chozodia/chozodia_23.c | 16 +- src/data/rooms/chozodia/chozodia_24.c | 16 +- src/data/rooms/chozodia/chozodia_25.c | 12 +- src/data/rooms/chozodia/chozodia_26.c | 16 +- src/data/rooms/chozodia/chozodia_27.c | 12 +- src/data/rooms/chozodia/chozodia_28.c | 16 +- src/data/rooms/chozodia/chozodia_29.c | 16 +- src/data/rooms/chozodia/chozodia_3.c | 16 +- src/data/rooms/chozodia/chozodia_30.c | 16 +- src/data/rooms/chozodia/chozodia_31.c | 12 +- src/data/rooms/chozodia/chozodia_32.c | 12 +- src/data/rooms/chozodia/chozodia_33.c | 16 +- src/data/rooms/chozodia/chozodia_34.c | 16 +- src/data/rooms/chozodia/chozodia_35.c | 16 +- src/data/rooms/chozodia/chozodia_36.c | 16 +- src/data/rooms/chozodia/chozodia_37.c | 12 +- src/data/rooms/chozodia/chozodia_38.c | 12 +- src/data/rooms/chozodia/chozodia_39.c | 12 +- src/data/rooms/chozodia/chozodia_4.c | 16 +- src/data/rooms/chozodia/chozodia_40.c | 12 +- src/data/rooms/chozodia/chozodia_41.c | 8 +- src/data/rooms/chozodia/chozodia_42.c | 12 +- src/data/rooms/chozodia/chozodia_43.c | 12 +- src/data/rooms/chozodia/chozodia_44.c | 12 +- src/data/rooms/chozodia/chozodia_45.c | 12 +- src/data/rooms/chozodia/chozodia_46.c | 16 +- src/data/rooms/chozodia/chozodia_47.c | 12 +- src/data/rooms/chozodia/chozodia_48.c | 12 +- src/data/rooms/chozodia/chozodia_49.c | 12 +- src/data/rooms/chozodia/chozodia_5.c | 16 +- src/data/rooms/chozodia/chozodia_50.c | 12 +- src/data/rooms/chozodia/chozodia_51.c | 12 +- src/data/rooms/chozodia/chozodia_52.c | 12 +- src/data/rooms/chozodia/chozodia_53.c | 12 +- src/data/rooms/chozodia/chozodia_54.c | 16 +- src/data/rooms/chozodia/chozodia_55.c | 12 +- src/data/rooms/chozodia/chozodia_56.c | 16 +- src/data/rooms/chozodia/chozodia_57.c | 16 +- src/data/rooms/chozodia/chozodia_58.c | 16 +- src/data/rooms/chozodia/chozodia_59.c | 8 +- src/data/rooms/chozodia/chozodia_6.c | 16 +- src/data/rooms/chozodia/chozodia_60.c | 16 +- src/data/rooms/chozodia/chozodia_61.c | 12 +- src/data/rooms/chozodia/chozodia_62.c | 12 +- src/data/rooms/chozodia/chozodia_63.c | 12 +- src/data/rooms/chozodia/chozodia_64.c | 12 +- src/data/rooms/chozodia/chozodia_65.c | 16 +- src/data/rooms/chozodia/chozodia_66.c | 12 +- src/data/rooms/chozodia/chozodia_67.c | 16 +- src/data/rooms/chozodia/chozodia_68.c | 12 +- src/data/rooms/chozodia/chozodia_69.c | 16 +- src/data/rooms/chozodia/chozodia_7.c | 16 +- src/data/rooms/chozodia/chozodia_70.c | 16 +- src/data/rooms/chozodia/chozodia_71.c | 16 +- src/data/rooms/chozodia/chozodia_72.c | 12 +- src/data/rooms/chozodia/chozodia_73.c | 16 +- src/data/rooms/chozodia/chozodia_74.c | 12 +- src/data/rooms/chozodia/chozodia_75.c | 12 +- src/data/rooms/chozodia/chozodia_76.c | 12 +- src/data/rooms/chozodia/chozodia_77.c | 12 +- src/data/rooms/chozodia/chozodia_78.c | 12 +- src/data/rooms/chozodia/chozodia_79.c | 12 +- src/data/rooms/chozodia/chozodia_8.c | 12 +- src/data/rooms/chozodia/chozodia_80.c | 16 +- src/data/rooms/chozodia/chozodia_81.c | 16 +- src/data/rooms/chozodia/chozodia_82.c | 16 +- src/data/rooms/chozodia/chozodia_83.c | 12 +- src/data/rooms/chozodia/chozodia_84.c | 16 +- src/data/rooms/chozodia/chozodia_85.c | 12 +- src/data/rooms/chozodia/chozodia_86.c | 16 +- src/data/rooms/chozodia/chozodia_87.c | 12 +- src/data/rooms/chozodia/chozodia_88.c | 12 +- src/data/rooms/chozodia/chozodia_89.c | 12 +- src/data/rooms/chozodia/chozodia_9.c | 12 +- src/data/rooms/chozodia/chozodia_90.c | 8 +- src/data/rooms/chozodia/chozodia_91.c | 12 +- src/data/rooms/chozodia/chozodia_92.c | 12 +- src/data/rooms/chozodia/chozodia_93.c | 16 +- src/data/rooms/chozodia/chozodia_94.c | 16 +- src/data/rooms/chozodia/chozodia_95.c | 8 +- src/data/rooms/chozodia/chozodia_96.c | 16 +- src/data/rooms/chozodia/chozodia_97.c | 8 +- src/data/rooms/chozodia/chozodia_98.c | 16 +- src/data/rooms/crateria/bg3.c | 28 +- src/data/rooms/crateria/crateria_0.c | 12 +- src/data/rooms/crateria/crateria_1.c | 16 +- src/data/rooms/crateria/crateria_10.c | 12 +- src/data/rooms/crateria/crateria_11.c | 12 +- src/data/rooms/crateria/crateria_12.c | 12 +- src/data/rooms/crateria/crateria_13.c | 12 +- src/data/rooms/crateria/crateria_14.c | 12 +- src/data/rooms/crateria/crateria_15.c | 16 +- src/data/rooms/crateria/crateria_16.c | 16 +- src/data/rooms/crateria/crateria_17.c | 12 +- src/data/rooms/crateria/crateria_18.c | 12 +- src/data/rooms/crateria/crateria_19.c | 12 +- src/data/rooms/crateria/crateria_2.c | 12 +- src/data/rooms/crateria/crateria_20.c | 12 +- src/data/rooms/crateria/crateria_21.c | 12 +- src/data/rooms/crateria/crateria_3.c | 12 +- src/data/rooms/crateria/crateria_4.c | 16 +- src/data/rooms/crateria/crateria_5.c | 16 +- src/data/rooms/crateria/crateria_6.c | 12 +- src/data/rooms/crateria/crateria_7.c | 12 +- src/data/rooms/crateria/crateria_8.c | 16 +- src/data/rooms/crateria/crateria_9.c | 16 +- src/data/rooms/kraid/bg3.c | 24 +- src/data/rooms/kraid/kraid_0.c | 12 +- src/data/rooms/kraid/kraid_1.c | 32 +- src/data/rooms/kraid/kraid_10.c | 12 +- src/data/rooms/kraid/kraid_11.c | 12 +- src/data/rooms/kraid/kraid_12.c | 16 +- src/data/rooms/kraid/kraid_13.c | 16 +- src/data/rooms/kraid/kraid_14.c | 12 +- src/data/rooms/kraid/kraid_15.c | 12 +- src/data/rooms/kraid/kraid_16.c | 12 +- src/data/rooms/kraid/kraid_17.c | 16 +- src/data/rooms/kraid/kraid_18.c | 16 +- src/data/rooms/kraid/kraid_19.c | 16 +- src/data/rooms/kraid/kraid_20.c | 12 +- src/data/rooms/kraid/kraid_21.c | 12 +- src/data/rooms/kraid/kraid_22.c | 12 +- src/data/rooms/kraid/kraid_23.c | 12 +- src/data/rooms/kraid/kraid_24.c | 12 +- src/data/rooms/kraid/kraid_25.c | 12 +- src/data/rooms/kraid/kraid_26.c | 16 +- src/data/rooms/kraid/kraid_27.c | 12 +- src/data/rooms/kraid/kraid_28.c | 16 +- src/data/rooms/kraid/kraid_29.c | 16 +- src/data/rooms/kraid/kraid_3.c | 16 +- src/data/rooms/kraid/kraid_30.c | 12 +- src/data/rooms/kraid/kraid_31.c | 12 +- src/data/rooms/kraid/kraid_32.c | 12 +- src/data/rooms/kraid/kraid_33.c | 12 +- src/data/rooms/kraid/kraid_34.c | 12 +- src/data/rooms/kraid/kraid_35.c | 12 +- src/data/rooms/kraid/kraid_36.c | 12 +- src/data/rooms/kraid/kraid_37.c | 12 +- src/data/rooms/kraid/kraid_38.c | 16 +- src/data/rooms/kraid/kraid_39.c | 12 +- src/data/rooms/kraid/kraid_4.c | 16 +- src/data/rooms/kraid/kraid_40.c | 12 +- src/data/rooms/kraid/kraid_41.c | 12 +- src/data/rooms/kraid/kraid_5.c | 12 +- src/data/rooms/kraid/kraid_6.c | 16 +- src/data/rooms/kraid/kraid_7.c | 16 +- src/data/rooms/kraid/kraid_8.c | 16 +- src/data/rooms/kraid/kraid_9.c | 16 +- src/data/rooms/norfair/bg3.c | 48 +- src/data/rooms/norfair/norfair_0.c | 12 +- src/data/rooms/norfair/norfair_1.c | 28 +- src/data/rooms/norfair/norfair_10.c | 16 +- src/data/rooms/norfair/norfair_11.c | 16 +- src/data/rooms/norfair/norfair_12.c | 16 +- src/data/rooms/norfair/norfair_13.c | 16 +- src/data/rooms/norfair/norfair_14.c | 16 +- src/data/rooms/norfair/norfair_15.c | 16 +- src/data/rooms/norfair/norfair_16.c | 12 +- src/data/rooms/norfair/norfair_17.c | 12 +- src/data/rooms/norfair/norfair_18.c | 16 +- src/data/rooms/norfair/norfair_19.c | 16 +- src/data/rooms/norfair/norfair_20.c | 16 +- src/data/rooms/norfair/norfair_21.c | 16 +- src/data/rooms/norfair/norfair_22.c | 16 +- src/data/rooms/norfair/norfair_23.c | 12 +- src/data/rooms/norfair/norfair_24.c | 12 +- src/data/rooms/norfair/norfair_25.c | 16 +- src/data/rooms/norfair/norfair_26.c | 16 +- src/data/rooms/norfair/norfair_27.c | 16 +- src/data/rooms/norfair/norfair_28.c | 16 +- src/data/rooms/norfair/norfair_29.c | 16 +- src/data/rooms/norfair/norfair_3.c | 16 +- src/data/rooms/norfair/norfair_30.c | 16 +- src/data/rooms/norfair/norfair_31.c | 16 +- src/data/rooms/norfair/norfair_32.c | 16 +- src/data/rooms/norfair/norfair_33.c | 12 +- src/data/rooms/norfair/norfair_34.c | 16 +- src/data/rooms/norfair/norfair_35.c | 12 +- src/data/rooms/norfair/norfair_36.c | 8 +- src/data/rooms/norfair/norfair_37.c | 16 +- src/data/rooms/norfair/norfair_38.c | 16 +- src/data/rooms/norfair/norfair_39.c | 8 +- src/data/rooms/norfair/norfair_4.c | 16 +- src/data/rooms/norfair/norfair_40.c | 12 +- src/data/rooms/norfair/norfair_41.c | 8 +- src/data/rooms/norfair/norfair_42.c | 16 +- src/data/rooms/norfair/norfair_43.c | 16 +- src/data/rooms/norfair/norfair_44.c | 8 +- src/data/rooms/norfair/norfair_45.c | 8 +- src/data/rooms/norfair/norfair_46.c | 16 +- src/data/rooms/norfair/norfair_47.c | 12 +- src/data/rooms/norfair/norfair_48.c | 16 +- src/data/rooms/norfair/norfair_49.c | 16 +- src/data/rooms/norfair/norfair_5.c | 16 +- src/data/rooms/norfair/norfair_50.c | 12 +- src/data/rooms/norfair/norfair_51.c | 16 +- src/data/rooms/norfair/norfair_52.c | 16 +- src/data/rooms/norfair/norfair_53.c | 12 +- src/data/rooms/norfair/norfair_54.c | 16 +- src/data/rooms/norfair/norfair_55.c | 16 +- src/data/rooms/norfair/norfair_56.c | 12 +- src/data/rooms/norfair/norfair_6.c | 16 +- src/data/rooms/norfair/norfair_7.c | 16 +- src/data/rooms/norfair/norfair_8.c | 16 +- src/data/rooms/norfair/norfair_9.c | 16 +- src/data/rooms/ridley/bg3.c | 24 +- src/data/rooms/ridley/ridley_0.c | 16 +- src/data/rooms/ridley/ridley_1.c | 8 +- src/data/rooms/ridley/ridley_10.c | 12 +- src/data/rooms/ridley/ridley_11.c | 16 +- src/data/rooms/ridley/ridley_12.c | 16 +- src/data/rooms/ridley/ridley_13.c | 16 +- src/data/rooms/ridley/ridley_14.c | 16 +- src/data/rooms/ridley/ridley_15.c | 16 +- src/data/rooms/ridley/ridley_16.c | 16 +- src/data/rooms/ridley/ridley_17.c | 16 +- src/data/rooms/ridley/ridley_18.c | 16 +- src/data/rooms/ridley/ridley_19.c | 12 +- src/data/rooms/ridley/ridley_2.c | 16 +- src/data/rooms/ridley/ridley_20.c | 8 +- src/data/rooms/ridley/ridley_21.c | 12 +- src/data/rooms/ridley/ridley_22.c | 16 +- src/data/rooms/ridley/ridley_23.c | 12 +- src/data/rooms/ridley/ridley_24.c | 8 +- src/data/rooms/ridley/ridley_25.c | 8 +- src/data/rooms/ridley/ridley_26.c | 12 +- src/data/rooms/ridley/ridley_27.c | 12 +- src/data/rooms/ridley/ridley_28.c | 16 +- src/data/rooms/ridley/ridley_29.c | 12 +- src/data/rooms/ridley/ridley_3.c | 16 +- src/data/rooms/ridley/ridley_30.c | 12 +- src/data/rooms/ridley/ridley_31.c | 12 +- src/data/rooms/ridley/ridley_32.c | 12 +- src/data/rooms/ridley/ridley_4.c | 16 +- src/data/rooms/ridley/ridley_5.c | 16 +- src/data/rooms/ridley/ridley_6.c | 16 +- src/data/rooms/ridley/ridley_7.c | 16 +- src/data/rooms/ridley/ridley_8.c | 16 +- src/data/rooms/ridley/ridley_9.c | 12 +- src/data/rooms/test_rooms_data.c | 72 +- src/data/rooms/tourian/bg3.c | 24 +- src/data/rooms/tourian/tourian_0.c | 12 +- src/data/rooms/tourian/tourian_1.c | 16 +- src/data/rooms/tourian/tourian_10.c | 16 +- src/data/rooms/tourian/tourian_11.c | 8 +- src/data/rooms/tourian/tourian_12.c | 12 +- src/data/rooms/tourian/tourian_13.c | 12 +- src/data/rooms/tourian/tourian_14.c | 12 +- src/data/rooms/tourian/tourian_15.c | 12 +- src/data/rooms/tourian/tourian_16.c | 12 +- src/data/rooms/tourian/tourian_17.c | 8 +- src/data/rooms/tourian/tourian_18.c | 12 +- src/data/rooms/tourian/tourian_19.c | 12 +- src/data/rooms/tourian/tourian_2.c | 12 +- src/data/rooms/tourian/tourian_3.c | 12 +- src/data/rooms/tourian/tourian_4.c | 16 +- src/data/rooms/tourian/tourian_5.c | 16 +- src/data/rooms/tourian/tourian_6.c | 8 +- src/data/rooms/tourian/tourian_7.c | 12 +- src/data/rooms/tourian/tourian_8.c | 12 +- src/data/rooms/tourian/tourian_9.c | 16 +- src/data/samus/arm_cannon_data.c | 474 +++- src/data/samus/samus_graphics.c | 2380 ++++++++--------- src/data/samus/samus_palette_data.c | 184 +- src/data/samus_close_up_data.c | 28 +- src/data/sprites/acid_worm.c | 8 +- src/data/sprites/area_banner.c | 12 +- src/data/sprites/atomic.c | 8 +- src/data/sprites/baristute.c | 8 +- src/data/sprites/boss_statues.c | 8 +- src/data/sprites/charge_beam.c | 8 +- src/data/sprites/chozo_statue.c | 64 +- src/data/sprites/crocomire.c | 8 +- src/data/sprites/deorem.c | 8 +- src/data/sprites/dessgeega.c | 8 +- src/data/sprites/dragon.c | 8 +- src/data/sprites/elevator_pad.c | 8 +- src/data/sprites/elevator_statue.c | 8 +- src/data/sprites/escape_gate.c | 12 +- src/data/sprites/escape_ship.c | 12 +- src/data/sprites/falling_chozo_pillar.c | 8 +- src/data/sprites/gadora.c | 8 +- src/data/sprites/gamet.c | 16 +- src/data/sprites/geega.c | 16 +- src/data/sprites/gekitai_machine.c | 8 +- src/data/sprites/geron.c | 8 +- src/data/sprites/geron_norfair.c | 8 +- src/data/sprites/geruta.c | 16 +- src/data/sprites/glass_tube.c | 8 +- src/data/sprites/gunship.c | 12 +- src/data/sprites/hive.c | 8 +- src/data/sprites/holtz.c | 8 +- src/data/sprites/imago.c | 8 +- src/data/sprites/imago_cocoon.c | 8 +- src/data/sprites/imago_larva.c | 8 +- src/data/sprites/imago_larva_right_side.c | 8 +- src/data/sprites/kraid.c | 8 +- src/data/sprites/map_station.c | 8 +- src/data/sprites/mecha_ridley.c | 40 +- src/data/sprites/mella.c | 8 +- src/data/sprites/message_banner.c | 8 +- src/data/sprites/metroid.c | 12 +- src/data/sprites/morph_ball.c | 8 +- src/data/sprites/morph_ball_launcher.c | 8 +- src/data/sprites/mother_brain.c | 8 +- src/data/sprites/multiviola.c | 8 +- src/data/sprites/parasite.c | 8 +- src/data/sprites/piston.c | 8 +- src/data/sprites/polyp.c | 8 +- src/data/sprites/power_grip.c | 8 +- src/data/sprites/reo.c | 16 +- src/data/sprites/ridley.c | 8 +- src/data/sprites/rinka.c | 16 +- src/data/sprites/ripper.c | 16 +- src/data/sprites/ripper2.c | 8 +- src/data/sprites/rising_chozo_pillar.c | 8 +- src/data/sprites/ruins_test.c | 74 +- src/data/sprites/save_platform.c | 8 +- src/data/sprites/save_platform_chozodia.c | 8 +- src/data/sprites/searchlight.c | 8 +- src/data/sprites/searchlight_eye.c | 8 +- src/data/sprites/security_gate.c | 8 +- src/data/sprites/security_laser.c | 8 +- src/data/sprites/sidehopper.c | 8 +- src/data/sprites/skree.c | 16 +- src/data/sprites/skultera.c | 8 +- src/data/sprites/sova.c | 8 +- src/data/sprites/space_pirate.c | 8 +- .../space_pirate_carrying_power_bomb.c | 8 +- src/data/sprites/squeept.c | 8 +- src/data/sprites/steam.c | 8 +- src/data/sprites/tangle_vine.c | 8 +- src/data/sprites/unknown_item_block.c | 24 +- src/data/sprites/unknown_item_chozo_statue.c | 24 +- src/data/sprites/unused_sprites.c | 8 +- src/data/sprites/viola.c | 16 +- src/data/sprites/waver.c | 8 +- src/data/sprites/worker_robot.c | 8 +- src/data/sprites/zeb.c | 16 +- src/data/sprites/zebbo.c | 16 +- src/data/sprites/zebetite_and_cannon.c | 8 +- src/data/sprites/zeela.c | 8 +- src/data/sprites/zipline.c | 8 +- src/data/sprites/zipline_generator.c | 8 +- src/data/sprites/zoomer.c | 8 +- src/data/text_data.c | 4 +- src/data/tilesets/tilesets_set0.c | 44 +- src/data/tilesets/tilesets_set1.c | 196 +- src/data/tilesets/tilesets_set2.c | 88 +- src/data/tilesets/tilesets_set3.c | 164 +- src/data/tilesets/tilesets_set4.c | 88 +- src/data/tilesets/tilesets_set5.c | 68 +- src/data/tilesets/tilesets_set6.c | 104 +- src/data/tilesets/tilesets_set7.c | 304 ++- src/data/tourian_escape_data.c | 256 +- src/data/visual_effects_data.c | 4 +- tools/extractor.py | 12 +- tools/preproc.py | 47 - 455 files changed, 8606 insertions(+), 3841 deletions(-) diff --git a/.gitignore b/.gitignore index 8a1362e72..d8afb9a6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /src/**/*.s /data/* /sound/direct_sound_samples/* +/include/extracted/* *.gba *.gba.lz diff --git a/Makefile b/Makefile index c293c917a..2e7768b8f 100644 --- a/Makefile +++ b/Makefile @@ -202,6 +202,8 @@ ifeq ($(DATA),1) $Q$(RM) -r data $(MSG) RM sound/direct_sound_samples $Q$(RM) -r sound/direct_sound_samples + $(MSG) RM include/extracted + $Q$(RM) -r include/extracted endif $(MSG) RM linker.ld.pp $Q$(RM) linker.ld.pp diff --git a/include/macros.h b/include/macros.h index 4635fd563..3425d0fd1 100644 --- a/include/macros.h +++ b/include/macros.h @@ -574,109 +574,6 @@ */ #define SHIFT_JIS(x) {0} -/** - * @private - * @brief Dummy macro for preproc, do not use - * - */ -#define INCBIN(...) {0} - -/** - * @brief Includes a binary file as an array of @c u8 - * - * @param path File path - */ -#define INCBIN_U8(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c u16 - * - * @param path File path - */ -#define INCBIN_U16(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c u32 - * - * @param path File path - */ -#define INCBIN_U32(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c s8 - * - * @param path File path - */ -#define INCBIN_S8(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c s8 - * - * @param path File path - */ -#define INCBIN_S16(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c s32 - * - * @param path File path - */ -#define INCBIN_S32(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c u8 - * - * Does not add curly braces - * - * @param path File path - */ -#define _INCBIN_U8(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c u16 - * - * Does not add curly braces - * - * @param path File path - */ -#define _INCBIN_U16(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c u32 - * - * Does not add curly braces - * - * @param path File path - */ -#define _INCBIN_U32(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c s8 - * - * Does not add curly braces - * - * @param path File path - */ -#define _INCBIN_S8(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c s16 - * - * Does not add curly braces - * - * @param path File path - */ -#define _INCBIN_S16(path) INCBIN(path) - -/** - * @brief Includes a binary file as an array of @c s32 - * - * Does not add curly braces - * - * @param path File path - */ -#define _INCBIN_S32(path) INCBIN(path) - /** * @brief Shorthand to specify that something should be in the .rodata section * diff --git a/src/data/animated_tiles_data.c b/src/data/animated_tiles_data.c index e454a0166..2ab23baee 100644 --- a/src/data/animated_tiles_data.c +++ b/src/data/animated_tiles_data.c @@ -1,6 +1,12 @@ #include "data/animated_tiles_data.h" #include "macros.h" -const u8 sAnimatedTilesGfx[100 * 128] = INCBIN_U8("data/animated_tiles/tiles.gfx"); -const u8 sAnimatedTankGfx[4 * 512] = INCBIN_U8("data/animated_tiles/tanks.gfx"); -const u8 sAnimatedLiquidsGfx[12 * 512] = INCBIN_U8("data/animated_tiles/liquids.gfx"); +const u8 sAnimatedTilesGfx[100 * 128] = { + #include "extracted/data/animated_tiles/tiles.gfx.inc" +}; +const u8 sAnimatedTankGfx[4 * 512] = { + #include "extracted/data/animated_tiles/tanks.gfx.inc" +}; +const u8 sAnimatedLiquidsGfx[12 * 512] = { + #include "extracted/data/animated_tiles/liquids.gfx.inc" +}; diff --git a/src/data/cable_link_data.c b/src/data/cable_link_data.c index 06647f523..d7d7af9d0 100644 --- a/src/data/cable_link_data.c +++ b/src/data/cable_link_data.c @@ -1,5 +1,9 @@ #include "data/cable_link_data.h" #include "macros.h" -const u8 sTransferData_8754bd0[] = INCBIN_U8("data/io/754bd0.bin"); -const u8 sTransferRom[] = INCBIN_U8("data/io/rom.bin"); +const u8 sTransferData_8754bd0[] = { + #include "extracted/data/io/754bd0.bin.inc" +}; +const u8 sTransferRom[] = { + #include "extracted/data/io/rom.bin.inc" +}; diff --git a/src/data/chozodia_escape_data.c b/src/data/chozodia_escape_data.c index 7cbab987e..98369e4a4 100644 --- a/src/data/chozodia_escape_data.c +++ b/src/data/chozodia_escape_data.c @@ -2,12 +2,22 @@ #include "data/tourian_escape_data.h" #include "constants/game_state.h" -const u16 sChozodiaEscapeShipHeatingUpPal[8 * 16] = INCBIN_U16("data/chozodia_escape/ship_heating_up.pal"); -const u16 sChozodiaEscapeGroundHeatingUpPal[8 * 16] = INCBIN_U16("data/chozodia_escape/ground_heating_up.pal"); +const u16 sChozodiaEscapeShipHeatingUpPal[8 * 16] = { + #include "extracted/data/chozodia_escape/ship_heating_up.pal.inc" +}; +const u16 sChozodiaEscapeGroundHeatingUpPal[8 * 16] = { + #include "extracted/data/chozodia_escape/ground_heating_up.pal.inc" +}; -const u16 sChozodiaEscapeShipExplodingPal[9 * 16] = INCBIN_U16("data/chozodia_escape/ship_exploding.pal"); -const u16 sChozodiaEscapeMissionAccomplishedPal[16 * 16] = INCBIN_U16("data/chozodia_escape/mission_accomplished.pal"); -const u16 sChozodiaEscapeSamusInBlueShipPal[1 * 16] = INCBIN_U16("data/chozodia_escape/samus_in_blue_ship.pal"); +const u16 sChozodiaEscapeShipExplodingPal[9 * 16] = { + #include "extracted/data/chozodia_escape/ship_exploding.pal.inc" +}; +const u16 sChozodiaEscapeMissionAccomplishedPal[16 * 16] = { + #include "extracted/data/chozodia_escape/mission_accomplished.pal.inc" +}; +const u16 sChozodiaEscapeSamusInBlueShipPal[1 * 16] = { + #include "extracted/data/chozodia_escape/samus_in_blue_ship.pal.inc" +}; const u16 sChozodiaEscapeOam_ShipExterior_Frame0[OAM_DATA_SIZE(10)] = { 10, @@ -452,16 +462,34 @@ const u16 * const sChozodiaEscapeOamPointers_MissionAccomplished[LANGUAGE_COUNT] }; #endif // REGION_EU -const u32 sChozodiaEscapeCraterBackgroundGfx[5227] = INCBIN_U32("data/chozodia_escape/crater_background.gfx.lz"); -const u32 sChozodiaEscapeCraterBackgroundTileTable[418] = INCBIN_U32("data/chozodia_escape/crater_background.tt"); +const u32 sChozodiaEscapeCraterBackgroundGfx[5227] = { + #include "extracted/data/chozodia_escape/crater_background.gfx.lz.inc" +}; +const u32 sChozodiaEscapeCraterBackgroundTileTable[418] = { + #include "extracted/data/chozodia_escape/crater_background.tt.inc" +}; -const u32 sChozodiaEscapeBlueShipVeryCloseGfx[1079] = INCBIN_U32("data/chozodia_escape/blue_ship_very_close.gfx.lz"); +const u32 sChozodiaEscapeBlueShipVeryCloseGfx[1079] = { + #include "extracted/data/chozodia_escape/blue_ship_very_close.gfx.lz.inc" +}; -const u32 sChozodiaEscapeZebesBackgroundTileTable[176] = INCBIN_U32("data/chozodia_escape/zebes_background.tt"); -const u32 sChozodiaEscapeZebesAndSkyGfx[4574] = INCBIN_U32("data/chozodia_escape/zebes_and_sky.gfx.lz"); -const u32 sChozodiaEscapeZebesSkyTileTable[418] = INCBIN_U32("data/chozodia_escape/zebes_sky.tt"); +const u32 sChozodiaEscapeZebesBackgroundTileTable[176] = { + #include "extracted/data/chozodia_escape/zebes_background.tt.inc" +}; +const u32 sChozodiaEscapeZebesAndSkyGfx[4574] = { + #include "extracted/data/chozodia_escape/zebes_and_sky.gfx.lz.inc" +}; +const u32 sChozodiaEscapeZebesSkyTileTable[418] = { + #include "extracted/data/chozodia_escape/zebes_sky.tt.inc" +}; -const u32 sChozodiaEscapeSamusInBlueShipGfx[2699] = INCBIN_U32("data/chozodia_escape/samus_in_blue_ship.gfx.lz"); -const u32 sChozodiaEscapeSamusInBlueShipTileTable[368] = INCBIN_U32("data/chozodia_escape/samus_in_blue_ship.tt"); +const u32 sChozodiaEscapeSamusInBlueShipGfx[2699] = { + #include "extracted/data/chozodia_escape/samus_in_blue_ship.gfx.lz.inc" +}; +const u32 sChozodiaEscapeSamusInBlueShipTileTable[368] = { + #include "extracted/data/chozodia_escape/samus_in_blue_ship.tt.inc" +}; -const u32 sChozodiaEscapeMissionAccomplishedLettersGfx[] = INCBIN_U32("data/chozodia_escape/mission_accomplished_letters.gfx.lz"); +const u32 sChozodiaEscapeMissionAccomplishedLettersGfx[] = { + #include "extracted/data/chozodia_escape/mission_accomplished_letters.gfx.lz.inc" +}; diff --git a/src/data/clipdata_types.c b/src/data/clipdata_types.c index c9df1a069..45c79addd 100644 --- a/src/data/clipdata_types.c +++ b/src/data/clipdata_types.c @@ -200,5 +200,9 @@ const ClipBehavior sClipdataBehaviorTypes[CLIPDATA_COUNT] = { [CLIPDATA_ACID] = CLIP_BEHAVIOR_ACID }; -const u8 sCommonTilesGfx[4096] = INCBIN_U8("data/common/common_tiles.gfx"); -const u8 sCommonTilesMothershipGfx[4096] = INCBIN_U8("data/common/common_tiles_mother_ship.gfx"); +const u8 sCommonTilesGfx[4096] = { + #include "extracted/data/common/common_tiles.gfx.inc" +}; +const u8 sCommonTilesMothershipGfx[4096] = { + #include "extracted/data/common/common_tiles_mother_ship.gfx.inc" +}; diff --git a/src/data/clipdata_types_tilemap.c b/src/data/clipdata_types_tilemap.c index 196cf7c59..54529e52c 100644 --- a/src/data/clipdata_types_tilemap.c +++ b/src/data/clipdata_types_tilemap.c @@ -238,7 +238,9 @@ const u8 sClipdataCollisionTypes_Tilemap[CLIPDATA_TILEMAP_COUNT] = { [CLIPDATA_TILEMAP_NO_HATCH_DOOR_BOTTOM_RIGHT] = CLIPDATA_TYPE_DOOR, // 0xCB }; -const u16 sCommonTilemap[832] = INCBIN_U16("data/common/common_tilemap.tt"); +const u16 sCommonTilemap[832] = { + #include "extracted/data/common/common_tilemap.tt.inc" +}; const u8 sClipdataCollisionTypes_Test[CLIPDATA_TEST_COUNT] = { [CLIPDATA_TEST_AIR] = CLIPDATA_TYPE_AIR, // 0x0 diff --git a/src/data/common_pals.c b/src/data/common_pals.c index 6670cc6ef..3b78eb132 100644 --- a/src/data/common_pals.c +++ b/src/data/common_pals.c @@ -2,11 +2,23 @@ #include "macros.h" -const u16 sCommonTilesPal[1 * 16] = INCBIN_U16("data/common/common_tiles.pal"); -const u16 sDoorTransitionPal[15 * 16] = INCBIN_U16("data/common/door_transition.pal"); +const u16 sCommonTilesPal[1 * 16] = { + #include "extracted/data/common/common_tiles.pal.inc" +}; +const u16 sDoorTransitionPal[15 * 16] = { + #include "extracted/data/common/door_transition.pal.inc" +}; -const u16 sCommonTilesMotherShipPal[1 * 16] = INCBIN_U16("data/common/common_tiles_mother_ship.pal"); -const u16 sDoorTransitionMotherShipPal[15 * 16] = INCBIN_U16("data/common/door_transition_mother_ship.pal"); +const u16 sCommonTilesMotherShipPal[1 * 16] = { + #include "extracted/data/common/common_tiles_mother_ship.pal.inc" +}; +const u16 sDoorTransitionMotherShipPal[15 * 16] = { + #include "extracted/data/common/door_transition_mother_ship.pal.inc" +}; -const u16 sHatchFlashingMotherShipPal[16 * 16] = INCBIN_U16("data/common/hatch_flashing_mother_ship.pal"); -const u16 sHatchFlashingPal[16 * 16] = INCBIN_U16("data/common/hatch_flashing.pal"); +const u16 sHatchFlashingMotherShipPal[16 * 16] = { + #include "extracted/data/common/hatch_flashing_mother_ship.pal.inc" +}; +const u16 sHatchFlashingPal[16 * 16] = { + #include "extracted/data/common/hatch_flashing.pal.inc" +}; diff --git a/src/data/cutscenes/before_ruins_test_data.c b/src/data/cutscenes/before_ruins_test_data.c index d15700452..13cc619a0 100644 --- a/src/data/cutscenes/before_ruins_test_data.c +++ b/src/data/cutscenes/before_ruins_test_data.c @@ -68,24 +68,62 @@ const struct CutscenePageData sBeforeRuinsTestPageData[9] = { } }; -const u16 sBeforeRuinsTestChozoWallSidesPal[10 * 16] = INCBIN_U16("data/cutscenes/before_ruins_test/chozo_wall_sides.pal"); -const u16 sBeforeRuinsTestChozoWallPal[8 * 16] = INCBIN_U16("data/cutscenes/before_ruins_test/chozo_wall.pal"); -const u16 sBeforeRuinsTestSamusCloseUpPal[16 * 16] = INCBIN_U16("data/cutscenes/before_ruins_test/samus_close_up.pal"); +const u16 sBeforeRuinsTestChozoWallSidesPal[10 * 16] = { + #include "extracted/data/cutscenes/before_ruins_test/chozo_wall_sides.pal.inc" +}; +const u16 sBeforeRuinsTestChozoWallPal[8 * 16] = { + #include "extracted/data/cutscenes/before_ruins_test/chozo_wall.pal.inc" +}; +const u16 sBeforeRuinsTestSamusCloseUpPal[16 * 16] = { + #include "extracted/data/cutscenes/before_ruins_test/samus_close_up.pal.inc" +}; -const u32 sBeforeRuinsTestLeftSideOfChozoWallGfx[4049] = INCBIN_U32("data/cutscenes/before_ruins_test/left_side_chozo_wall.gfx.lz"); -const u32 sBeforeRuinsTestRightSideOfChozoWallGfx[3987] = INCBIN_U32("data/cutscenes/before_ruins_test/right_side_chozo_wall.gfx.lz"); -const u32 sBeforeRuinsTestChozoWallBackgroundGfx[6446] = INCBIN_U32("data/cutscenes/before_ruins_test/chozo_wall_background.gfx.lz"); -const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceGfx[1792] = INCBIN_U32("data/cutscenes/before_ruins_test/young_samus_and_grey_voice.gfx.lz"); -const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceCloseUpGfx[3818] = INCBIN_U32("data/cutscenes/before_ruins_test/young_samus_and_grey_voice_close_up.gfx.lz"); -const u32 sBeforeRuinsTestYoungSamusCloseUpGfx[2979] = INCBIN_U32("data/cutscenes/before_ruins_test/young_samus_close_up.gfx.lz"); -const u32 sBeforeRuinsTestSamusCloseUpGfx[5285] = INCBIN_U32("data/cutscenes/before_ruins_test/samus_close_up.gfx.lz"); +const u32 sBeforeRuinsTestLeftSideOfChozoWallGfx[4049] = { + #include "extracted/data/cutscenes/before_ruins_test/left_side_chozo_wall.gfx.lz.inc" +}; +const u32 sBeforeRuinsTestRightSideOfChozoWallGfx[3987] = { + #include "extracted/data/cutscenes/before_ruins_test/right_side_chozo_wall.gfx.lz.inc" +}; +const u32 sBeforeRuinsTestChozoWallBackgroundGfx[6446] = { + #include "extracted/data/cutscenes/before_ruins_test/chozo_wall_background.gfx.lz.inc" +}; +const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceGfx[1792] = { + #include "extracted/data/cutscenes/before_ruins_test/young_samus_and_grey_voice.gfx.lz.inc" +}; +const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceCloseUpGfx[3818] = { + #include "extracted/data/cutscenes/before_ruins_test/young_samus_and_grey_voice_close_up.gfx.lz.inc" +}; +const u32 sBeforeRuinsTestYoungSamusCloseUpGfx[2979] = { + #include "extracted/data/cutscenes/before_ruins_test/young_samus_close_up.gfx.lz.inc" +}; +const u32 sBeforeRuinsTestSamusCloseUpGfx[5285] = { + #include "extracted/data/cutscenes/before_ruins_test/samus_close_up.gfx.lz.inc" +}; -const u32 sBeforeRuinsTestLeftSideOfChozoWallTileTable[368] = INCBIN_U32("data/cutscenes/before_ruins_test/left_side_chozo_wall.tt"); -const u32 sBeforeRuinsTestRightSideOfChozoWallTileTable[369] = INCBIN_U32("data/cutscenes/before_ruins_test/right_side_chozo_wall.tt"); -const u32 sBeforeRuinsTestChozoWallBackgroundTileTable[551] = INCBIN_U32("data/cutscenes/before_ruins_test/chozo_wall_background.tt"); -const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceTileTable[185] = INCBIN_U32("data/cutscenes/before_ruins_test/young_samus_and_grey_voice.tt"); -const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceCloseUpTileTable[452] = INCBIN_U32("data/cutscenes/before_ruins_test/young_samus_and_grey_voice_close_up.tt"); -const u32 sBeforeRuinsTestYoungSamusCloseUpTileTable[368] = INCBIN_U32("data/cutscenes/before_ruins_test/young_samus_close_up.tt"); -const u32 sBeforeRuinsTestSamusCloseUpEyesClosedTileTable[251] = INCBIN_U32("data/cutscenes/before_ruins_test/samus_close_up_eyes_closed.tt"); -const u32 sBeforeRuinsTestSamusCloseUpEyesOpenedTileTable[232] = INCBIN_U32("data/cutscenes/before_ruins_test/samus_close_up_eyes_opened.tt"); -const u32 sBeforeRuinsTestSamusCloseUpOutlineTileTable[333] = INCBIN_U32("data/cutscenes/before_ruins_test/samus_close_up_outline.tt"); +const u32 sBeforeRuinsTestLeftSideOfChozoWallTileTable[368] = { + #include "extracted/data/cutscenes/before_ruins_test/left_side_chozo_wall.tt.inc" +}; +const u32 sBeforeRuinsTestRightSideOfChozoWallTileTable[369] = { + #include "extracted/data/cutscenes/before_ruins_test/right_side_chozo_wall.tt.inc" +}; +const u32 sBeforeRuinsTestChozoWallBackgroundTileTable[551] = { + #include "extracted/data/cutscenes/before_ruins_test/chozo_wall_background.tt.inc" +}; +const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceTileTable[185] = { + #include "extracted/data/cutscenes/before_ruins_test/young_samus_and_grey_voice.tt.inc" +}; +const u32 sBeforeRuinsTestYoungSamusAndGreyVoiceCloseUpTileTable[452] = { + #include "extracted/data/cutscenes/before_ruins_test/young_samus_and_grey_voice_close_up.tt.inc" +}; +const u32 sBeforeRuinsTestYoungSamusCloseUpTileTable[368] = { + #include "extracted/data/cutscenes/before_ruins_test/young_samus_close_up.tt.inc" +}; +const u32 sBeforeRuinsTestSamusCloseUpEyesClosedTileTable[251] = { + #include "extracted/data/cutscenes/before_ruins_test/samus_close_up_eyes_closed.tt.inc" +}; +const u32 sBeforeRuinsTestSamusCloseUpEyesOpenedTileTable[232] = { + #include "extracted/data/cutscenes/before_ruins_test/samus_close_up_eyes_opened.tt.inc" +}; +const u32 sBeforeRuinsTestSamusCloseUpOutlineTileTable[333] = { + #include "extracted/data/cutscenes/before_ruins_test/samus_close_up_outline.tt.inc" +}; diff --git a/src/data/cutscenes/enter_tourian_data.c b/src/data/cutscenes/enter_tourian_data.c index e7bcbd9dd..ad934bd39 100644 --- a/src/data/cutscenes/enter_tourian_data.c +++ b/src/data/cutscenes/enter_tourian_data.c @@ -73,12 +73,30 @@ const struct FrameData sEnterTourianOam_Empty[1] = { [0] = FRAME_DATA_TERMINATOR }; -const u16 sEnterTourianBackgroundPal[10 * 16] = INCBIN_U16("data/cutscenes/enter_tourian/background.pal"); -const u16 sEnterTourianMetroidPal[6 * 16] = INCBIN_U16("data/cutscenes/enter_tourian/metroid.pal"); -const u32 sEnterTourianBackgroundGfx[3110] = INCBIN_U32("data/cutscenes/enter_tourian/background.gfx.lz"); -const u32 sEnterTourianForegroundGfx[2483] = INCBIN_U32("data/cutscenes/enter_tourian/foreground.gfx.lz"); -const u32 sEnterTourianDeadSpacePirateGfx_1[55] = INCBIN_U32("data/cutscenes/enter_tourian/dead_space_pirate_1.gfx.lz"); -const u32 sEnterTourianDeadSpacePirateGfx_2[77] = INCBIN_U32("data/cutscenes/enter_tourian/dead_space_pirate_2.gfx.lz"); -const u32 sEnterTourianDeadSpacePirateGfx_3[32] = INCBIN_U32("data/cutscenes/enter_tourian/dead_space_pirate_3.gfx.lz"); -const u32 sEnterTourianBackgroundTileTable[385] = INCBIN_U32("data/cutscenes/enter_tourian/background.tt"); -const u32 sEnterTourianForegroundTileTable[385] = INCBIN_U32("data/cutscenes/enter_tourian/foreground.tt"); +const u16 sEnterTourianBackgroundPal[10 * 16] = { + #include "extracted/data/cutscenes/enter_tourian/background.pal.inc" +}; +const u16 sEnterTourianMetroidPal[6 * 16] = { + #include "extracted/data/cutscenes/enter_tourian/metroid.pal.inc" +}; +const u32 sEnterTourianBackgroundGfx[3110] = { + #include "extracted/data/cutscenes/enter_tourian/background.gfx.lz.inc" +}; +const u32 sEnterTourianForegroundGfx[2483] = { + #include "extracted/data/cutscenes/enter_tourian/foreground.gfx.lz.inc" +}; +const u32 sEnterTourianDeadSpacePirateGfx_1[55] = { + #include "extracted/data/cutscenes/enter_tourian/dead_space_pirate_1.gfx.lz.inc" +}; +const u32 sEnterTourianDeadSpacePirateGfx_2[77] = { + #include "extracted/data/cutscenes/enter_tourian/dead_space_pirate_2.gfx.lz.inc" +}; +const u32 sEnterTourianDeadSpacePirateGfx_3[32] = { + #include "extracted/data/cutscenes/enter_tourian/dead_space_pirate_3.gfx.lz.inc" +}; +const u32 sEnterTourianBackgroundTileTable[385] = { + #include "extracted/data/cutscenes/enter_tourian/background.tt.inc" +}; +const u32 sEnterTourianForegroundTileTable[385] = { + #include "extracted/data/cutscenes/enter_tourian/foreground.tt.inc" +}; diff --git a/src/data/cutscenes/getting_fully_powered_suit_data.c b/src/data/cutscenes/getting_fully_powered_suit_data.c index 13f0db0be..bcdfddd9e 100644 --- a/src/data/cutscenes/getting_fully_powered_suit_data.c +++ b/src/data/cutscenes/getting_fully_powered_suit_data.c @@ -344,10 +344,24 @@ const struct FrameData sGettingFullyPoweredSuitOam_SparkleAroundRing2[9] = { }; -const u16 sGettingFullyPoweredSuitPal[19 * 16] = INCBIN_U16("data/cutscenes/getting_fully_powered_suit/palette.pal"); -const u32 sGettingFullyPoweredSuitSamusGfx[2608] = INCBIN_U32("data/cutscenes/getting_fully_powered_suit/samus.gfx.lz"); -const u32 sGettingFullyPoweredSuitRingSparklesGfx[646] = INCBIN_U32("data/cutscenes/getting_fully_powered_suit/ring_sparkles.gfx.lz"); -const u32 sGettingFullyPoweredSuitSamusTileTable[387] = INCBIN_U32("data/cutscenes/getting_fully_powered_suit/samus.tt"); -const u8 sGettingFullyPoweredSuitBackgroundGfx[13872] = INCBIN_U8("data/cutscenes/getting_fully_powered_suit/background.gfx.lz"); -const u32 sGettingFullyPoweredSuitBackgroundTileTable[734] = INCBIN_U32("data/cutscenes/getting_fully_powered_suit/background.tt"); -const u16 sGettingFullyPoweredSuitRingPal[7 * 16] = INCBIN_U16("data/cutscenes/getting_fully_powered_suit/ring_palette.pal"); +const u16 sGettingFullyPoweredSuitPal[19 * 16] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/palette.pal.inc" +}; +const u32 sGettingFullyPoweredSuitSamusGfx[2608] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/samus.gfx.lz.inc" +}; +const u32 sGettingFullyPoweredSuitRingSparklesGfx[646] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/ring_sparkles.gfx.lz.inc" +}; +const u32 sGettingFullyPoweredSuitSamusTileTable[387] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/samus.tt.inc" +}; +const u8 sGettingFullyPoweredSuitBackgroundGfx[13872] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/background.gfx.lz.inc" +}; +const u32 sGettingFullyPoweredSuitBackgroundTileTable[734] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/background.tt.inc" +}; +const u16 sGettingFullyPoweredSuitRingPal[7 * 16] = { + #include "extracted/data/cutscenes/getting_fully_powered_suit/ring_palette.pal.inc" +}; diff --git a/src/data/cutscenes/kraid_rising_data.c b/src/data/cutscenes/kraid_rising_data.c index f50c0e1dd..74bc12836 100644 --- a/src/data/cutscenes/kraid_rising_data.c +++ b/src/data/cutscenes/kraid_rising_data.c @@ -212,18 +212,48 @@ const struct FrameData sKraidRisingOam_BigPuff[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u16 sKraidRisingCloseUpPal[5 * 16] = INCBIN_U16("data/cutscenes/kraid_rising/close_up.pal"); -const u16 sKraidRisingSamusPal[1 * 16] = INCBIN_U16("data/cutscenes/kraid_rising/samus.pal"); -const u16 sKraidRisingParticlesPal[1 * 16] = INCBIN_U16("data/cutscenes/kraid_rising/particles.pal"); -const u16 sKraidRisingSamusVariaPal[1 * 16] = INCBIN_U16("data/cutscenes/kraid_rising/samus_varia.pal"); -const u16 sKraidRisingRisingPal[7 * 16] = INCBIN_U16("data/cutscenes/kraid_rising/rising.pal"); -const u32 sKraidRisingKraidCloseUpGfx[3087] = INCBIN_U32("data/cutscenes/kraid_rising/close_up.gfx.lz"); -const u32 sKraidRisingOamGfx[753] = INCBIN_U32("data/cutscenes/kraid_rising/oam.gfx.lz"); -const u32 sKraidRisingKraidRisingGfx[1609] = INCBIN_U32("data/cutscenes/kraid_rising/kraid_rising.gfx.lz"); -const u32 sKraidRisingCaveBackgroundGfx[1327] = INCBIN_U32("data/cutscenes/kraid_rising/cave_background.gfx.lz"); -const u32 sKraidRisingKraidCloseUpEyesClosedTileTable[368] = INCBIN_U32("data/cutscenes/kraid_rising/kraid_close_up_eyes_closed.tt"); -const u32 sKraidRisingKraidCloseUpEyesBarelyOpenedTileTable[368] = INCBIN_U32("data/cutscenes/kraid_rising/kraid_close_up_eyes_barely_opened.tt"); -const u32 sKraidRisingKraidCloseUpEyesALittleOpenedTileTable[368] = INCBIN_U32("data/cutscenes/kraid_rising/kraid_close_up_eyes_a_little_opened.tt"); -const u32 sKraidRisingKraidCloseUpEyesOpenedTileTable[368] = INCBIN_U32("data/cutscenes/kraid_rising/kraid_close_up_eyes_opened.tt"); -const u32 sKraidRisingKraidRisingTileTable[295] = INCBIN_U32("data/cutscenes/kraid_rising/kraid_rising.tt"); -const u32 sKraidRisingCaveBackgroundTileTable[370] = INCBIN_U32("data/cutscenes/kraid_rising/cave_background.tt"); +const u16 sKraidRisingCloseUpPal[5 * 16] = { + #include "extracted/data/cutscenes/kraid_rising/close_up.pal.inc" +}; +const u16 sKraidRisingSamusPal[1 * 16] = { + #include "extracted/data/cutscenes/kraid_rising/samus.pal.inc" +}; +const u16 sKraidRisingParticlesPal[1 * 16] = { + #include "extracted/data/cutscenes/kraid_rising/particles.pal.inc" +}; +const u16 sKraidRisingSamusVariaPal[1 * 16] = { + #include "extracted/data/cutscenes/kraid_rising/samus_varia.pal.inc" +}; +const u16 sKraidRisingRisingPal[7 * 16] = { + #include "extracted/data/cutscenes/kraid_rising/rising.pal.inc" +}; +const u32 sKraidRisingKraidCloseUpGfx[3087] = { + #include "extracted/data/cutscenes/kraid_rising/close_up.gfx.lz.inc" +}; +const u32 sKraidRisingOamGfx[753] = { + #include "extracted/data/cutscenes/kraid_rising/oam.gfx.lz.inc" +}; +const u32 sKraidRisingKraidRisingGfx[1609] = { + #include "extracted/data/cutscenes/kraid_rising/kraid_rising.gfx.lz.inc" +}; +const u32 sKraidRisingCaveBackgroundGfx[1327] = { + #include "extracted/data/cutscenes/kraid_rising/cave_background.gfx.lz.inc" +}; +const u32 sKraidRisingKraidCloseUpEyesClosedTileTable[368] = { + #include "extracted/data/cutscenes/kraid_rising/kraid_close_up_eyes_closed.tt.inc" +}; +const u32 sKraidRisingKraidCloseUpEyesBarelyOpenedTileTable[368] = { + #include "extracted/data/cutscenes/kraid_rising/kraid_close_up_eyes_barely_opened.tt.inc" +}; +const u32 sKraidRisingKraidCloseUpEyesALittleOpenedTileTable[368] = { + #include "extracted/data/cutscenes/kraid_rising/kraid_close_up_eyes_a_little_opened.tt.inc" +}; +const u32 sKraidRisingKraidCloseUpEyesOpenedTileTable[368] = { + #include "extracted/data/cutscenes/kraid_rising/kraid_close_up_eyes_opened.tt.inc" +}; +const u32 sKraidRisingKraidRisingTileTable[295] = { + #include "extracted/data/cutscenes/kraid_rising/kraid_rising.tt.inc" +}; +const u32 sKraidRisingCaveBackgroundTileTable[370] = { + #include "extracted/data/cutscenes/kraid_rising/cave_background.tt.inc" +}; diff --git a/src/data/cutscenes/mecha_sees_samus_data.c b/src/data/cutscenes/mecha_sees_samus_data.c index 2b2e543ed..f7513bc17 100644 --- a/src/data/cutscenes/mecha_sees_samus_data.c +++ b/src/data/cutscenes/mecha_sees_samus_data.c @@ -273,7 +273,15 @@ const struct FrameData sMechaSeesSamusOam_OpeningEye[4] = { [3] = FRAME_DATA_TERMINATOR }; -const u32 sMechaSeesSamusMetalGfx[2382] = INCBIN_U32("data/cutscenes/mecha_sees_samus/metal.gfx.lz"); -const u32 sMechaSeesSamusCoverEyeGfx[2671] = INCBIN_U32("data/cutscenes/mecha_sees_samus/eye_cover.gfx.lz"); -const u16 sMechaSeesSamusPal[10 * 16] = INCBIN_U16("data/cutscenes/mecha_sees_samus/palette.pal"); -const u32 sMechaSeesSamusCoverMetalTileTable[368] = INCBIN_U32("data/cutscenes/mecha_sees_samus/metal.tt"); +const u32 sMechaSeesSamusMetalGfx[2382] = { + #include "extracted/data/cutscenes/mecha_sees_samus/metal.gfx.lz.inc" +}; +const u32 sMechaSeesSamusCoverEyeGfx[2671] = { + #include "extracted/data/cutscenes/mecha_sees_samus/eye_cover.gfx.lz.inc" +}; +const u16 sMechaSeesSamusPal[10 * 16] = { + #include "extracted/data/cutscenes/mecha_sees_samus/palette.pal.inc" +}; +const u32 sMechaSeesSamusCoverMetalTileTable[368] = { + #include "extracted/data/cutscenes/mecha_sees_samus/metal.tt.inc" +}; diff --git a/src/data/cutscenes/mother_brain_close_up_data.c b/src/data/cutscenes/mother_brain_close_up_data.c index be559a8eb..d3703b54a 100644 --- a/src/data/cutscenes/mother_brain_close_up_data.c +++ b/src/data/cutscenes/mother_brain_close_up_data.c @@ -366,24 +366,60 @@ const struct FrameData sMotherBrainCloseUpOam_ElevatorAnimation[4] = { [3] = FRAME_DATA_TERMINATOR }; -const u16 sMotherBrainCloseUpPal[6 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/palette.pal"); -const u16 sMotherBrainCloseUpBackgroundPal[5 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/background.pal"); -const u16 sMotherBrainCloseUpSamusPal[5 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/samus.pal"); -const u16 sMotherBrainCloseUpSamusVariaPal[5 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/samus_varia.pal"); -const u16 sMotherBrainCloseUpEyePal[2 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/eye.pal"); -const u16 sMotherBrainCloseUpBigEyePal[2 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/big_eye.pal"); - -const u32 sMotherBrainCloseUpMotherBrainGfx[2722] = INCBIN_U32("data/cutscenes/mother_brain_close_up/mother_brain.gfx.lz"); -const u32 sMotherBrainCloseUpBackgroundGfx[2422] = INCBIN_U32("data/cutscenes/mother_brain_close_up/background.gfx.lz"); -const u32 sMotherBrainCloseUpSamusGfx[2999] = INCBIN_U32("data/cutscenes/mother_brain_close_up/samus.gfx.lz"); -const u32 sMotherBrainCloseUpEyeGfx[1134] = INCBIN_U32("data/cutscenes/mother_brain_close_up/eye.gfx.lz"); -const u32 sMotherBrainCloseUpBigEyeGfx[2309] = INCBIN_U32("data/cutscenes/mother_brain_close_up/big_eye.gfx.lz"); - -const u32 sMotherBrainCloseUpMotherBrainTileTable[369] = INCBIN_U32("data/cutscenes/mother_brain_close_up/mother_brain.tt"); -const u32 sMotherBrainCloseUpBackgroundTileTable[369] = INCBIN_U32("data/cutscenes/mother_brain_close_up/background.tt"); -const u32 sMotherBrainCloseUpSamusTileTable[368] = INCBIN_U32("data/cutscenes/mother_brain_close_up/samus.tt"); -const u32 sMotherBrainCloseUpGlassTileTable[67] = INCBIN_U32("data/cutscenes/mother_brain_close_up/glass.tt"); - -const u32 sMotherBrainCloseUpTankViewGfx[3944] = INCBIN_U32("data/cutscenes/mother_brain_close_up/tank_view.gfx.lz"); -const u32 sMotherBrainCloseUpTankViewTileTable[368] = INCBIN_U32("data/cutscenes/mother_brain_close_up/tank_view.tt"); -const u16 sMotherBrainCloseUpTankViewPal[8 * 16] = INCBIN_U16("data/cutscenes/mother_brain_close_up/tank_view.pal"); +const u16 sMotherBrainCloseUpPal[6 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/palette.pal.inc" +}; +const u16 sMotherBrainCloseUpBackgroundPal[5 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/background.pal.inc" +}; +const u16 sMotherBrainCloseUpSamusPal[5 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/samus.pal.inc" +}; +const u16 sMotherBrainCloseUpSamusVariaPal[5 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/samus_varia.pal.inc" +}; +const u16 sMotherBrainCloseUpEyePal[2 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/eye.pal.inc" +}; +const u16 sMotherBrainCloseUpBigEyePal[2 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/big_eye.pal.inc" +}; + +const u32 sMotherBrainCloseUpMotherBrainGfx[2722] = { + #include "extracted/data/cutscenes/mother_brain_close_up/mother_brain.gfx.lz.inc" +}; +const u32 sMotherBrainCloseUpBackgroundGfx[2422] = { + #include "extracted/data/cutscenes/mother_brain_close_up/background.gfx.lz.inc" +}; +const u32 sMotherBrainCloseUpSamusGfx[2999] = { + #include "extracted/data/cutscenes/mother_brain_close_up/samus.gfx.lz.inc" +}; +const u32 sMotherBrainCloseUpEyeGfx[1134] = { + #include "extracted/data/cutscenes/mother_brain_close_up/eye.gfx.lz.inc" +}; +const u32 sMotherBrainCloseUpBigEyeGfx[2309] = { + #include "extracted/data/cutscenes/mother_brain_close_up/big_eye.gfx.lz.inc" +}; + +const u32 sMotherBrainCloseUpMotherBrainTileTable[369] = { + #include "extracted/data/cutscenes/mother_brain_close_up/mother_brain.tt.inc" +}; +const u32 sMotherBrainCloseUpBackgroundTileTable[369] = { + #include "extracted/data/cutscenes/mother_brain_close_up/background.tt.inc" +}; +const u32 sMotherBrainCloseUpSamusTileTable[368] = { + #include "extracted/data/cutscenes/mother_brain_close_up/samus.tt.inc" +}; +const u32 sMotherBrainCloseUpGlassTileTable[67] = { + #include "extracted/data/cutscenes/mother_brain_close_up/glass.tt.inc" +}; + +const u32 sMotherBrainCloseUpTankViewGfx[3944] = { + #include "extracted/data/cutscenes/mother_brain_close_up/tank_view.gfx.lz.inc" +}; +const u32 sMotherBrainCloseUpTankViewTileTable[368] = { + #include "extracted/data/cutscenes/mother_brain_close_up/tank_view.tt.inc" +}; +const u16 sMotherBrainCloseUpTankViewPal[8 * 16] = { + #include "extracted/data/cutscenes/mother_brain_close_up/tank_view.pal.inc" +}; diff --git a/src/data/cutscenes/ridley_in_space_data.c b/src/data/cutscenes/ridley_in_space_data.c index 60a345ac5..bdaf1b369 100644 --- a/src/data/cutscenes/ridley_in_space_data.c +++ b/src/data/cutscenes/ridley_in_space_data.c @@ -185,13 +185,27 @@ const struct OamArray sRidleyInSpaceCutsceneOam[RIDLEY_IN_SPACE_OAM_ID_COUNT] = } }; -const u32 sRidleyInSpaceShipsGfx[1565] = INCBIN_U32("data/cutscenes/ridley_in_space/ship.gfx.lz"); -const u32 sRidleyInSpaceRidleySittingGfx[3848] = INCBIN_U32("data/cutscenes/ridley_in_space/ridley_sitting.gfx.lz"); -const u32 sRidleyInSpaceShipInteriorGfx[4391] = INCBIN_U32("data/cutscenes/ridley_in_space/ship_interior.gfx.lz"); -const u32 sRidleyInSpaceRidleySuspiciousGfx[1961] = INCBIN_U32("data/cutscenes/ridley_in_space/ridley_suspicious.gfx.lz"); -const u32 sRidleyInSpaceShipInterior2Gfx[4235] = INCBIN_U32("data/cutscenes/ridley_in_space/ship_interior_2.gfx.lz"); -const u32 sRidleyInSpaceMotherShipLeavingGfx[1497] = INCBIN_U32("data/cutscenes/ridley_in_space/mother_ship_leaving.gfx.lz"); -const u32 sRidleyInSpaceSpaceBackgroundGfx[5470] = INCBIN_U32("data/cutscenes/ridley_in_space/space_background.gfx.lz"); +const u32 sRidleyInSpaceShipsGfx[1565] = { + #include "extracted/data/cutscenes/ridley_in_space/ship.gfx.lz.inc" +}; +const u32 sRidleyInSpaceRidleySittingGfx[3848] = { + #include "extracted/data/cutscenes/ridley_in_space/ridley_sitting.gfx.lz.inc" +}; +const u32 sRidleyInSpaceShipInteriorGfx[4391] = { + #include "extracted/data/cutscenes/ridley_in_space/ship_interior.gfx.lz.inc" +}; +const u32 sRidleyInSpaceRidleySuspiciousGfx[1961] = { + #include "extracted/data/cutscenes/ridley_in_space/ridley_suspicious.gfx.lz.inc" +}; +const u32 sRidleyInSpaceShipInterior2Gfx[4235] = { + #include "extracted/data/cutscenes/ridley_in_space/ship_interior_2.gfx.lz.inc" +}; +const u32 sRidleyInSpaceMotherShipLeavingGfx[1497] = { + #include "extracted/data/cutscenes/ridley_in_space/mother_ship_leaving.gfx.lz.inc" +}; +const u32 sRidleyInSpaceSpaceBackgroundGfx[5470] = { + #include "extracted/data/cutscenes/ridley_in_space/space_background.gfx.lz.inc" +}; const u16 sRidleyInSpaceOam_LeftBlueShip_Frame0[OAM_DATA_SIZE(1)] = { @@ -358,16 +372,40 @@ const struct FrameData sRidleyInSpaceOam_ShipLeavingParticleSecond[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u16 sRidleyInSpaceShipsPal[3 * 16] = INCBIN_U16("data/cutscenes/ridley_in_space/ships.pal"); -const u16 sRidleyInSpace_39d910_Pal[6 * 16] = INCBIN_U16("data/cutscenes/ridley_in_space/39d910.pal"); -const u16 sRidleyInSpaceRedAlertPal[6 * 16] = INCBIN_U16("data/cutscenes/ridley_in_space/red_alert.pal"); -const u16 sRidleyInSpaceShipInteriorPal[15 * 16] = INCBIN_U16("data/cutscenes/ridley_in_space/ship_interior.pal"); -const u16 sRidleyInSpace_39dc70_Pal[3 * 16] = INCBIN_U16("data/cutscenes/ridley_in_space/39dc70.pal"); -const u16 sRidleyInSpaceSpaceBackgroundPal[5 * 16] = INCBIN_U16("data/cutscenes/ridley_in_space/space_background.pal"); +const u16 sRidleyInSpaceShipsPal[3 * 16] = { + #include "extracted/data/cutscenes/ridley_in_space/ships.pal.inc" +}; +const u16 sRidleyInSpace_39d910_Pal[6 * 16] = { + #include "extracted/data/cutscenes/ridley_in_space/39d910.pal.inc" +}; +const u16 sRidleyInSpaceRedAlertPal[6 * 16] = { + #include "extracted/data/cutscenes/ridley_in_space/red_alert.pal.inc" +}; +const u16 sRidleyInSpaceShipInteriorPal[15 * 16] = { + #include "extracted/data/cutscenes/ridley_in_space/ship_interior.pal.inc" +}; +const u16 sRidleyInSpace_39dc70_Pal[3 * 16] = { + #include "extracted/data/cutscenes/ridley_in_space/39dc70.pal.inc" +}; +const u16 sRidleyInSpaceSpaceBackgroundPal[5 * 16] = { + #include "extracted/data/cutscenes/ridley_in_space/space_background.pal.inc" +}; -const u32 sRidleyInSpaceRidleySittingTileTable[449] = INCBIN_U32("data/cutscenes/ridley_in_space/ridley_sitting.tt"); -const u32 sRidleyInSpaceShipInteriorTileTable[559] = INCBIN_U32("data/cutscenes/ridley_in_space/ship_interior.tt"); -const u32 sRidleyInSpaceRidleySuspiciousEyesOpenTileTable[287] = INCBIN_U32("data/cutscenes/ridley_in_space/ridley_suspicious_eyes_open.tt"); -const u32 sRidleyInSpaceRidleySuspiciousEyesSquintedTileTable[287] = INCBIN_U32("data/cutscenes/ridley_in_space/ridley_suspicious_squinted_eyes.tt"); -const u32 sRidleyInSpaceShipInteriorTileTable2[385] = INCBIN_U32("data/cutscenes/ridley_in_space/ship_interior_2.tt"); -const u32 sRidleyInSpaceSpaceBackgroundTileTable[577] = INCBIN_U32("data/cutscenes/ridley_in_space/s_pace_background.tt"); +const u32 sRidleyInSpaceRidleySittingTileTable[449] = { + #include "extracted/data/cutscenes/ridley_in_space/ridley_sitting.tt.inc" +}; +const u32 sRidleyInSpaceShipInteriorTileTable[559] = { + #include "extracted/data/cutscenes/ridley_in_space/ship_interior.tt.inc" +}; +const u32 sRidleyInSpaceRidleySuspiciousEyesOpenTileTable[287] = { + #include "extracted/data/cutscenes/ridley_in_space/ridley_suspicious_eyes_open.tt.inc" +}; +const u32 sRidleyInSpaceRidleySuspiciousEyesSquintedTileTable[287] = { + #include "extracted/data/cutscenes/ridley_in_space/ridley_suspicious_squinted_eyes.tt.inc" +}; +const u32 sRidleyInSpaceShipInteriorTileTable2[385] = { + #include "extracted/data/cutscenes/ridley_in_space/ship_interior_2.tt.inc" +}; +const u32 sRidleyInSpaceSpaceBackgroundTileTable[577] = { + #include "extracted/data/cutscenes/ridley_in_space/s_pace_background.tt.inc" +}; diff --git a/src/data/cutscenes/ridley_landing_data.c b/src/data/cutscenes/ridley_landing_data.c index 7f0968742..6258c9be5 100644 --- a/src/data/cutscenes/ridley_landing_data.c +++ b/src/data/cutscenes/ridley_landing_data.c @@ -398,30 +398,82 @@ const struct FrameData sRidleyLandingOam_Rocks[5] = { -const u16 sCutscene_3a09d4_Pal[9 * 16] = INCBIN_U16("data/cutscenes/ridley_landing/3a09d4.pal"); -const u16 sCutsceneZebesPal[13 * 16] = INCBIN_U16("data/cutscenes/ridley_landing/cutscene_zebes.pal"); -const u16 sCutsceneMotherShipPal[5 * 16] = INCBIN_U16("data/cutscenes/ridley_landing/cutscene_mother_ship.pal"); -const u16 sRidleyLandingRidleyAndRocksPal[2 * 16] = INCBIN_U16("data/cutscenes/ridley_landing/objects.pal"); -const u16 sRidleyLandingSkyBackgroundPal[5 * 16] = INCBIN_U16("data/cutscenes/ridley_landing/sky_background.pal"); +const u16 sCutscene_3a09d4_Pal[9 * 16] = { + #include "extracted/data/cutscenes/ridley_landing/3a09d4.pal.inc" +}; +const u16 sCutsceneZebesPal[13 * 16] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_zebes.pal.inc" +}; +const u16 sCutsceneMotherShipPal[5 * 16] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_mother_ship.pal.inc" +}; +const u16 sRidleyLandingRidleyAndRocksPal[2 * 16] = { + #include "extracted/data/cutscenes/ridley_landing/objects.pal.inc" +}; +const u16 sRidleyLandingSkyBackgroundPal[5 * 16] = { + #include "extracted/data/cutscenes/ridley_landing/sky_background.pal.inc" +}; -const u32 sRidleyLandingZebesBackgroundGfx[3167] = INCBIN_U32("data/cutscenes/ridley_landing/zebes_background.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_1[38] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_1.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_2[59] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_2.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_3[65] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_3.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_4[88] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_4.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_5[90] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_5.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_6[97] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_6.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_7[75] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_7.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_8[40] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_8.gfx.lz"); -const u32 sRidleyLandingMotherShipGfx_9[18] = INCBIN_U32("data/cutscenes/ridley_landing/mother_ship_9.gfx.lz"); -const u32 sCutsceneZebesMotherShipBackgroundGfx[5067] = INCBIN_U32("data/cutscenes/ridley_landing/cutscene_zebes_mother_ship_background.gfx.lz"); -const u32 sCutsceneZebesGroundGfx[477] = INCBIN_U32("data/cutscenes/ridley_landing/cutscene_zebes_ground.gfx.lz"); -const u32 sCutsceneZebesRockyBackgroundGfx[1514] = INCBIN_U32("data/cutscenes/ridley_landing/cutscene_zebes_rocky_background.gfx.lz"); -const u32 sCutsceneMotherShipEscapeShipParticlesGfx[2955] = INCBIN_U32("data/cutscenes/ridley_landing/cutscene_mother_ship_escape_ship_particles.gfx.lz"); -const u32 sRidleyLandingRidleyAndRockShadowGfx[2788] = INCBIN_U32("data/cutscenes/ridley_landing/ridley_and_rock.gfx.lz"); -const u32 sRidleyLandingRidleyFlyingBackgroundGfx[2970] = INCBIN_U32("data/cutscenes/ridley_landing/ridley_flying_background.gfx.lz"); -const u32 sRidleyLandingZebesBackgroundTileTable[545] = INCBIN_U32("data/cutscenes/ridley_landing/zebes_background.tt"); -const u32 sCutsceneZebesMotherShipBackgroundTileTable[640] = INCBIN_U32("data/cutscenes/ridley_landing/cutscene_zebes_mother_ship_background.tt"); -const u32 sCutscene_3b5168_TileTable[261] = INCBIN_U32("data/cutscenes/ridley_landing/3b5168.tt"); -const u32 sCutsceneZebesGroundTileTable[111] = INCBIN_U32("data/cutscenes/ridley_landing/cutscene_zebes_ground.tt"); -const u32 sRidleyLandingRidleyFlyingBackgroundTileTable[368] = INCBIN_U32("data/cutscenes/ridley_landing/ridley_flying_background.tt"); \ No newline at end of file +const u32 sRidleyLandingZebesBackgroundGfx[3167] = { + #include "extracted/data/cutscenes/ridley_landing/zebes_background.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_1[38] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_1.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_2[59] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_2.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_3[65] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_3.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_4[88] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_4.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_5[90] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_5.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_6[97] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_6.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_7[75] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_7.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_8[40] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_8.gfx.lz.inc" +}; +const u32 sRidleyLandingMotherShipGfx_9[18] = { + #include "extracted/data/cutscenes/ridley_landing/mother_ship_9.gfx.lz.inc" +}; +const u32 sCutsceneZebesMotherShipBackgroundGfx[5067] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_zebes_mother_ship_background.gfx.lz.inc" +}; +const u32 sCutsceneZebesGroundGfx[477] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_zebes_ground.gfx.lz.inc" +}; +const u32 sCutsceneZebesRockyBackgroundGfx[1514] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_zebes_rocky_background.gfx.lz.inc" +}; +const u32 sCutsceneMotherShipEscapeShipParticlesGfx[2955] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_mother_ship_escape_ship_particles.gfx.lz.inc" +}; +const u32 sRidleyLandingRidleyAndRockShadowGfx[2788] = { + #include "extracted/data/cutscenes/ridley_landing/ridley_and_rock.gfx.lz.inc" +}; +const u32 sRidleyLandingRidleyFlyingBackgroundGfx[2970] = { + #include "extracted/data/cutscenes/ridley_landing/ridley_flying_background.gfx.lz.inc" +}; +const u32 sRidleyLandingZebesBackgroundTileTable[545] = { + #include "extracted/data/cutscenes/ridley_landing/zebes_background.tt.inc" +}; +const u32 sCutsceneZebesMotherShipBackgroundTileTable[640] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_zebes_mother_ship_background.tt.inc" +}; +const u32 sCutscene_3b5168_TileTable[261] = { + #include "extracted/data/cutscenes/ridley_landing/3b5168.tt.inc" +}; +const u32 sCutsceneZebesGroundTileTable[111] = { + #include "extracted/data/cutscenes/ridley_landing/cutscene_zebes_ground.tt.inc" +}; +const u32 sRidleyLandingRidleyFlyingBackgroundTileTable[368] = { + #include "extracted/data/cutscenes/ridley_landing/ridley_flying_background.tt.inc" +}; \ No newline at end of file diff --git a/src/data/cutscenes/ridley_spawn_data.c b/src/data/cutscenes/ridley_spawn_data.c index 486affda9..f068f0a19 100644 --- a/src/data/cutscenes/ridley_spawn_data.c +++ b/src/data/cutscenes/ridley_spawn_data.c @@ -137,14 +137,36 @@ const struct FrameData sRidleySpawnOam_RidleyFlyingAndScreaming_Unused[3] = { }; -const u16 sRidleySpawnSamusPal[3 * 16] = INCBIN_U16("data/cutscenes/ridley_spawn/samus.pal"); -const u16 sRidleySpawnSamusVariaPal[3 * 16] = INCBIN_U16("data/cutscenes/ridley_spawn/samus_varia.pal"); -const u16 sRidleySpawnBackgroundPal[13 * 16] = INCBIN_U16("data/cutscenes/ridley_spawn/background.pal"); -const u16 sRidleySpawnRidleyScreamingPal[1 * 16] = INCBIN_U16("data/cutscenes/ridley_spawn/ridley_screaming.pal"); -const u32 sRidleySpawnBackgroundGfx[2830] = INCBIN_U32("data/cutscenes/ridley_spawn/background.gfx.lz"); -const u32 sRidleySpawnSamusAndRidleyGfx[2215] = INCBIN_U32("data/cutscenes/ridley_spawn/samus_and_ridley.gfx.lz"); -const u32 sRidleySpawnSamusHelmetFaceGfx[3164] = INCBIN_U32("data/cutscenes/ridley_spawn/samus_helmet_face.gfx.lz"); -const u32 sRidleySpawnScreamingGfx[1663] = INCBIN_U32("data/cutscenes/ridley_spawn/ridley_screaming.gfx.lz"); -const u32 sRidleySpawnBackgroundTileTable[368] = INCBIN_U32("data/cutscenes/ridley_spawn/background.tt"); -const u32 sRidleySpawnSamusHelmetTileTable[368] = INCBIN_U32("data/cutscenes/ridley_spawn/samus_helmet.tt"); -const u32 sRidleySpawnSamusFaceTileTable[189] = INCBIN_U32("data/cutscenes/ridley_spawn/samus_face.tt"); +const u16 sRidleySpawnSamusPal[3 * 16] = { + #include "extracted/data/cutscenes/ridley_spawn/samus.pal.inc" +}; +const u16 sRidleySpawnSamusVariaPal[3 * 16] = { + #include "extracted/data/cutscenes/ridley_spawn/samus_varia.pal.inc" +}; +const u16 sRidleySpawnBackgroundPal[13 * 16] = { + #include "extracted/data/cutscenes/ridley_spawn/background.pal.inc" +}; +const u16 sRidleySpawnRidleyScreamingPal[1 * 16] = { + #include "extracted/data/cutscenes/ridley_spawn/ridley_screaming.pal.inc" +}; +const u32 sRidleySpawnBackgroundGfx[2830] = { + #include "extracted/data/cutscenes/ridley_spawn/background.gfx.lz.inc" +}; +const u32 sRidleySpawnSamusAndRidleyGfx[2215] = { + #include "extracted/data/cutscenes/ridley_spawn/samus_and_ridley.gfx.lz.inc" +}; +const u32 sRidleySpawnSamusHelmetFaceGfx[3164] = { + #include "extracted/data/cutscenes/ridley_spawn/samus_helmet_face.gfx.lz.inc" +}; +const u32 sRidleySpawnScreamingGfx[1663] = { + #include "extracted/data/cutscenes/ridley_spawn/ridley_screaming.gfx.lz.inc" +}; +const u32 sRidleySpawnBackgroundTileTable[368] = { + #include "extracted/data/cutscenes/ridley_spawn/background.tt.inc" +}; +const u32 sRidleySpawnSamusHelmetTileTable[368] = { + #include "extracted/data/cutscenes/ridley_spawn/samus_helmet.tt.inc" +}; +const u32 sRidleySpawnSamusFaceTileTable[189] = { + #include "extracted/data/cutscenes/ridley_spawn/samus_face.tt.inc" +}; diff --git a/src/data/cutscenes/samus_in_blue_ship_data.c b/src/data/cutscenes/samus_in_blue_ship_data.c index b6b1b905a..5e8473b6c 100644 --- a/src/data/cutscenes/samus_in_blue_ship_data.c +++ b/src/data/cutscenes/samus_in_blue_ship_data.c @@ -497,7 +497,15 @@ static const struct FrameData sSamusInBlueShipOam_Controls[11] = { [10] = FRAME_DATA_TERMINATOR }; -const u16 sSamusInBlueShipPal[9 * 16] = INCBIN_U16("data/cutscenes/samus_in_blue_ship/ship.pal"); -const u32 sSamusInBlueShipSamusGfx[3641] = INCBIN_U32("data/cutscenes/samus_in_blue_ship/samus.gfx.lz"); -const u32 sSamusInBlueShipControlsGfx[1642] = INCBIN_U32("data/cutscenes/samus_in_blue_ship/controls.gfx.lz"); -const u32 sSamusInBlueShipSamusTileTable[368] = INCBIN_U32("data/cutscenes/samus_in_blue_ship/ship.tt"); +const u16 sSamusInBlueShipPal[9 * 16] = { + #include "extracted/data/cutscenes/samus_in_blue_ship/ship.pal.inc" +}; +const u32 sSamusInBlueShipSamusGfx[3641] = { + #include "extracted/data/cutscenes/samus_in_blue_ship/samus.gfx.lz.inc" +}; +const u32 sSamusInBlueShipControlsGfx[1642] = { + #include "extracted/data/cutscenes/samus_in_blue_ship/controls.gfx.lz.inc" +}; +const u32 sSamusInBlueShipSamusTileTable[368] = { + #include "extracted/data/cutscenes/samus_in_blue_ship/ship.tt.inc" +}; diff --git a/src/data/cutscenes/statue_opening_data.c b/src/data/cutscenes/statue_opening_data.c index 57f7b4130..aa691b8cf 100644 --- a/src/data/cutscenes/statue_opening_data.c +++ b/src/data/cutscenes/statue_opening_data.c @@ -72,7 +72,15 @@ const struct OamArray sStatueOpeningOam[STATUE_OPENING_OAM_ID_COUNT] = { } }; -const u16 sStatueOpeningPal[8 * 16] = INCBIN_U16("data/cutscenes/statue_opening/palette.pal"); -const u32 sStatueOpeningRoomGfx[2357] = INCBIN_U32("data/cutscenes/statue_opening/room.gfx.lz"); -const u32 sStatueOpeningRoomTileTable[318] = INCBIN_U32("data/cutscenes/statue_opening/room.tt"); -const u32 sStatueOpening_3effc8[242] = INCBIN_U32("data/cutscenes/statue_opening/3effc8.tt"); +const u16 sStatueOpeningPal[8 * 16] = { + #include "extracted/data/cutscenes/statue_opening/palette.pal.inc" +}; +const u32 sStatueOpeningRoomGfx[2357] = { + #include "extracted/data/cutscenes/statue_opening/room.gfx.lz.inc" +}; +const u32 sStatueOpeningRoomTileTable[318] = { + #include "extracted/data/cutscenes/statue_opening/room.tt.inc" +}; +const u32 sStatueOpening_3effc8[242] = { + #include "extracted/data/cutscenes/statue_opening/3effc8.tt.inc" +}; diff --git a/src/data/cutscenes/story_text_cutscene_data.c b/src/data/cutscenes/story_text_cutscene_data.c index 34699c1fe..2754c3838 100644 --- a/src/data/cutscenes/story_text_cutscene_data.c +++ b/src/data/cutscenes/story_text_cutscene_data.c @@ -12,6 +12,12 @@ const struct CutscenePageData sStoryTextCutscenePagesData[1] = { } }; -const u32 sStoryTextCutsceneGfx_Unused[645] = INCBIN_U32("data/cutscenes/story_text/unused_letters.gfx.lz"); -const u16 sStoryTextCutscenePal[1 * 16] = INCBIN_U16("data/cutscenes/story_text/palette.pal"); -const u32 sStoryTextCutsceneTileTable[347] = INCBIN_U32("data/cutscenes/story_text/text.tt"); +const u32 sStoryTextCutsceneGfx_Unused[645] = { + #include "extracted/data/cutscenes/story_text/unused_letters.gfx.lz.inc" +}; +const u16 sStoryTextCutscenePal[1 * 16] = { + #include "extracted/data/cutscenes/story_text/palette.pal.inc" +}; +const u32 sStoryTextCutsceneTileTable[347] = { + #include "extracted/data/cutscenes/story_text/text.tt.inc" +}; diff --git a/src/data/default_background_data.c b/src/data/default_background_data.c index a795b61e6..13779ce0d 100644 --- a/src/data/default_background_data.c +++ b/src/data/default_background_data.c @@ -1,9 +1,21 @@ #include "data/default_background_data.h" #include "macros.h" -const u32 sTileset_0_Bg_Gfx[949] = INCBIN_U32("data/rooms/tileset_0_background.gfx.lz"); -const u8 sTest_Bg3[896] = INCBIN_U8("data/rooms/test_bg3.gfx.lz"); -const u8 sBackground_Empty[52] = INCBIN_U8("data/rooms/background_empty.bin"); -const u8 sDoorTransitionTilemap[184] = INCBIN_U8("data/rooms/door_transition.tm"); -const u8 sBg3_Empty[256] = INCBIN_U8("data/rooms/bg3_empty.gfx.lz"); -const u8 sTest_Bg0_0[504] = INCBIN_U8("data/rooms/test_bg0_0.gfx.lz"); +const u32 sTileset_0_Bg_Gfx[949] = { + #include "extracted/data/rooms/tileset_0_background.gfx.lz.inc" +}; +const u8 sTest_Bg3[896] = { + #include "extracted/data/rooms/test_bg3.gfx.lz.inc" +}; +const u8 sBackground_Empty[52] = { + #include "extracted/data/rooms/background_empty.bin.inc" +}; +const u8 sDoorTransitionTilemap[184] = { + #include "extracted/data/rooms/door_transition.tm.inc" +}; +const u8 sBg3_Empty[256] = { + #include "extracted/data/rooms/bg3_empty.gfx.lz.inc" +}; +const u8 sTest_Bg0_0[504] = { + #include "extracted/data/rooms/test_bg0_0.gfx.lz.inc" +}; diff --git a/src/data/ending_and_gallery_data.c b/src/data/ending_and_gallery_data.c index a0f1dd00f..48456578d 100644 --- a/src/data/ending_and_gallery_data.c +++ b/src/data/ending_and_gallery_data.c @@ -1,7 +1,9 @@ #include "data/ending_and_gallery_data.h" #include "oam.h" -const u16 sEndingImageTextPal[14 * 16] = INCBIN_U16("data/ending/image_text.pal"); +const u16 sEndingImageTextPal[14 * 16] = { + #include "extracted/data/ending/image_text.pal.inc" +}; static const u16 sEndingImageOam_LineTimer_English[OAM_DATA_SIZE(8)] = { 8, @@ -2162,25 +2164,57 @@ static const u16 sYourRateHiraganaOam_10[OAM_DATA_SIZE(1)] = { OAM_ENTRY(58, -16, OAM_DIMS_16x16, OAM_NO_FLIP, 0x154, 0, 0) }; -const u16 sCreditsCharactersPal[3 * 16] = INCBIN_U16("data/ending/credits_characters.pal"); -const u16 sCreditsChozoWallPal[15 * 16] = INCBIN_U16("data/ending/credits_chozo_wall.pal"); +const u16 sCreditsCharactersPal[3 * 16] = { + #include "extracted/data/ending/credits_characters.pal.inc" +}; +const u16 sCreditsChozoWallPal[15 * 16] = { + #include "extracted/data/ending/credits_chozo_wall.pal.inc" +}; -static const u16 sEndingImage_Palette_0[16 * 16] = INCBIN_U16("data/ending/image_0.pal"); -static const u16 sEndingImage_Palette_1[16 * 16] = INCBIN_U16("data/ending/image_1.pal"); -static const u16 sEndingImage_Palette_2[16 * 16] = INCBIN_U16("data/ending/image_2.pal"); -static const u16 sEndingImage_Palette_3[16 * 16] = INCBIN_U16("data/ending/image_3.pal"); -static const u16 sEndingImage_Palette_4[16 * 16] = INCBIN_U16("data/ending/image_4.pal"); -static const u16 sEndingImage_Palette_5[16 * 16] = INCBIN_U16("data/ending/image_5.pal"); -static const u16 sEndingImage_Palette_6[16 * 16] = INCBIN_U16("data/ending/image_6.pal"); -static const u16 sEndingImage_Palette_7[16 * 16] = INCBIN_U16("data/ending/image_7.pal"); +static const u16 sEndingImage_Palette_0[16 * 16] = { + #include "extracted/data/ending/image_0.pal.inc" +}; +static const u16 sEndingImage_Palette_1[16 * 16] = { + #include "extracted/data/ending/image_1.pal.inc" +}; +static const u16 sEndingImage_Palette_2[16 * 16] = { + #include "extracted/data/ending/image_2.pal.inc" +}; +static const u16 sEndingImage_Palette_3[16 * 16] = { + #include "extracted/data/ending/image_3.pal.inc" +}; +static const u16 sEndingImage_Palette_4[16 * 16] = { + #include "extracted/data/ending/image_4.pal.inc" +}; +static const u16 sEndingImage_Palette_5[16 * 16] = { + #include "extracted/data/ending/image_5.pal.inc" +}; +static const u16 sEndingImage_Palette_6[16 * 16] = { + #include "extracted/data/ending/image_6.pal.inc" +}; +static const u16 sEndingImage_Palette_7[16 * 16] = { + #include "extracted/data/ending/image_7.pal.inc" +}; -const u16 sEndingPosingPal[13 * 16] = INCBIN_U16("data/ending/posing.pal"); -const u16 sEndingPosingPal_White1[5 * 16] = INCBIN_U16("data/ending/posing_white_1.pal"); -const u16 sEndingPosingPal_White2[5 * 16] = INCBIN_U16("data/ending/posing_white_2.pal"); -const u16 sEndingPosingPal_White3[5 * 16] = INCBIN_U16("data/ending/posing_white_3.pal"); -const u16 sEndingPosingPal_White4[5 * 16] = INCBIN_U16("data/ending/posing_white_4.pal"); +const u16 sEndingPosingPal[13 * 16] = { + #include "extracted/data/ending/posing.pal.inc" +}; +const u16 sEndingPosingPal_White1[5 * 16] = { + #include "extracted/data/ending/posing_white_1.pal.inc" +}; +const u16 sEndingPosingPal_White2[5 * 16] = { + #include "extracted/data/ending/posing_white_2.pal.inc" +}; +const u16 sEndingPosingPal_White3[5 * 16] = { + #include "extracted/data/ending/posing_white_3.pal.inc" +}; +const u16 sEndingPosingPal_White4[5 * 16] = { + #include "extracted/data/ending/posing_white_4.pal.inc" +}; -const u16 sUnlockedOptionsPal[1 * 16] = INCBIN_U16("data/ending/unlocked_options.pal"); +const u16 sUnlockedOptionsPal[1 * 16] = { + #include "extracted/data/ending/unlocked_options.pal.inc" +}; const struct EndingImageOam sEndingImageOam_FullLines_English[ENDING_IMAGE_LINE_COUNT] = { [ENDING_IMAGE_LINE_CLEAR_TIME] = { @@ -7422,98 +7456,248 @@ const u16 * const sEndingImageOamPointers_NewRecord[LANGUAGE_COUNT] = { }; #endif // REGION_EU -const u32 sCreditsCharactersGfx[] = INCBIN_U32("data/ending/credits_characters.gfx.lz"); - -static const u32 sEndingImage_TopGfx_0[6186] = INCBIN_U32("data/ending/image_top_0.gfx.lz"); -static const u32 sEndingImage_TopTileTable_0[577] = INCBIN_U32("data/ending/image_top_0.tt"); -static const u32 sEndingImage_BottomGfx_0[3525] = INCBIN_U32("data/ending/image_bottom_0.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_0[398] = INCBIN_U32("data/ending/image_bottom_0.tt"); - -static const u32 sEndingImage_TopGfx_1[5578] = INCBIN_U32("data/ending/image_top_1.gfx.lz"); -static const u32 sEndingImage_TopTileTable_1[577] = INCBIN_U32("data/ending/image_top_1.tt"); -static const u32 sEndingImage_BottomGfx_1[3339] = INCBIN_U32("data/ending/image_bottom_1.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_1[577] = INCBIN_U32("data/ending/image_bottom_1.tt"); - -static const u32 sEndingImage_TopGfx_2[6259] = INCBIN_U32("data/ending/image_top_2.gfx.lz"); -static const u32 sEndingImage_TopTileTable_2[577] = INCBIN_U32("data/ending/image_top_2.tt"); -static const u32 sEndingImage_BottomGfx_2[3178] = INCBIN_U32("data/ending/image_bottom_2.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_2[577] = INCBIN_U32("data/ending/image_bottom_2.tt"); - -static const u32 sEndingImage_TopGfx_3[5289] = INCBIN_U32("data/ending/image_top_3.gfx.lz"); -static const u32 sEndingImage_TopTileTable_3[577] = INCBIN_U32("data/ending/image_top_3.tt"); -static const u32 sEndingImage_BottomGfx_3[2789] = INCBIN_U32("data/ending/image_bottom_3.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_3[577] = INCBIN_U32("data/ending/image_bottom_3.tt"); - -static const u32 sEndingImage_TopGfx_4[5900] = INCBIN_U32("data/ending/image_top_4.gfx.lz"); -static const u32 sEndingImage_TopTileTable_4[577] = INCBIN_U32("data/ending/image_top_4.tt"); -static const u32 sEndingImage_BottomGfx_4[3029] = INCBIN_U32("data/ending/image_bottom_4.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_4[577] = INCBIN_U32("data/ending/image_bottom_4.tt"); - -static const u32 sEndingImage_TopGfx_5[5080] = INCBIN_U32("data/ending/image_top_5.gfx.lz"); -static const u32 sEndingImage_TopTileTable_5[577] = INCBIN_U32("data/ending/image_top_5.tt"); -static const u32 sEndingImage_BottomGfx_5[3899] = INCBIN_U32("data/ending/image_bottom_5.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_5[577] = INCBIN_U32("data/ending/image_bottom_5.tt"); - -static const u32 sEndingImage_TopGfx_6[5748] = INCBIN_U32("data/ending/image_top_6.gfx.lz"); -static const u32 sEndingImage_TopTileTable_6[577] = INCBIN_U32("data/ending/image_top_6.tt"); -static const u32 sEndingImage_BottomGfx_6[2932] = INCBIN_U32("data/ending/image_bottom_6.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_6[577] = INCBIN_U32("data/ending/image_bottom_6.tt"); - -static const u32 sEndingImage_TopGfx_7[6818] = INCBIN_U32("data/ending/image_top_7.gfx.lz"); -static const u32 sEndingImage_TopTileTable_7[577] = INCBIN_U32("data/ending/image_top_7.tt"); -static const u32 sEndingImage_BottomGfx_7[3901] = INCBIN_U32("data/ending/image_bottom_7.gfx.lz"); -static const u32 sEndingImage_BottomTileTable_7[577] = INCBIN_U32("data/ending/image_bottom_7.tt"); - -const u32 sEndingImageTextEnglishGfx[803] = INCBIN_U32("data/ending/text_english.gfx.lz"); -const u32 sEndingImageTextHiraganaGfx[511] = INCBIN_U32("data/ending/text_hiragana.gfx.lz"); +const u32 sCreditsCharactersGfx[] = { + #include "extracted/data/ending/credits_characters.gfx.lz.inc" +}; + +static const u32 sEndingImage_TopGfx_0[6186] = { + #include "extracted/data/ending/image_top_0.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_0[577] = { + #include "extracted/data/ending/image_top_0.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_0[3525] = { + #include "extracted/data/ending/image_bottom_0.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_0[398] = { + #include "extracted/data/ending/image_bottom_0.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_1[5578] = { + #include "extracted/data/ending/image_top_1.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_1[577] = { + #include "extracted/data/ending/image_top_1.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_1[3339] = { + #include "extracted/data/ending/image_bottom_1.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_1[577] = { + #include "extracted/data/ending/image_bottom_1.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_2[6259] = { + #include "extracted/data/ending/image_top_2.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_2[577] = { + #include "extracted/data/ending/image_top_2.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_2[3178] = { + #include "extracted/data/ending/image_bottom_2.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_2[577] = { + #include "extracted/data/ending/image_bottom_2.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_3[5289] = { + #include "extracted/data/ending/image_top_3.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_3[577] = { + #include "extracted/data/ending/image_top_3.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_3[2789] = { + #include "extracted/data/ending/image_bottom_3.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_3[577] = { + #include "extracted/data/ending/image_bottom_3.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_4[5900] = { + #include "extracted/data/ending/image_top_4.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_4[577] = { + #include "extracted/data/ending/image_top_4.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_4[3029] = { + #include "extracted/data/ending/image_bottom_4.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_4[577] = { + #include "extracted/data/ending/image_bottom_4.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_5[5080] = { + #include "extracted/data/ending/image_top_5.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_5[577] = { + #include "extracted/data/ending/image_top_5.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_5[3899] = { + #include "extracted/data/ending/image_bottom_5.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_5[577] = { + #include "extracted/data/ending/image_bottom_5.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_6[5748] = { + #include "extracted/data/ending/image_top_6.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_6[577] = { + #include "extracted/data/ending/image_top_6.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_6[2932] = { + #include "extracted/data/ending/image_bottom_6.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_6[577] = { + #include "extracted/data/ending/image_bottom_6.tt.inc" +}; + +static const u32 sEndingImage_TopGfx_7[6818] = { + #include "extracted/data/ending/image_top_7.gfx.lz.inc" +}; +static const u32 sEndingImage_TopTileTable_7[577] = { + #include "extracted/data/ending/image_top_7.tt.inc" +}; +static const u32 sEndingImage_BottomGfx_7[3901] = { + #include "extracted/data/ending/image_bottom_7.gfx.lz.inc" +}; +static const u32 sEndingImage_BottomTileTable_7[577] = { + #include "extracted/data/ending/image_bottom_7.tt.inc" +}; + +const u32 sEndingImageTextEnglishGfx[803] = { + #include "extracted/data/ending/text_english.gfx.lz.inc" +}; +const u32 sEndingImageTextHiraganaGfx[511] = { + #include "extracted/data/ending/text_hiragana.gfx.lz.inc" +}; #ifdef REGION_EU -const u32 sEndingImageTextFrenchGfx[759] = INCBIN_U32("data/ending/text_french.gfx.lz"); -const u32 sEndingImageTextGermanGfx[726] = INCBIN_U32("data/ending/text_german.gfx.lz"); -const u32 sEndingImageTextItalianGfx[883] = INCBIN_U32("data/ending/text_italian.gfx.lz"); -const u32 sEndingImageTextSpanishGfx[773] = INCBIN_U32("data/ending/text_spanish.gfx.lz"); +const u32 sEndingImageTextFrenchGfx[759] = { + #include "extracted/data/ending/text_french.gfx.lz.inc" +}; +const u32 sEndingImageTextGermanGfx[726] = { + #include "extracted/data/ending/text_german.gfx.lz.inc" +}; +const u32 sEndingImageTextItalianGfx[883] = { + #include "extracted/data/ending/text_italian.gfx.lz.inc" +}; +const u32 sEndingImageTextSpanishGfx[773] = { + #include "extracted/data/ending/text_spanish.gfx.lz.inc" +}; #endif // REGION_EU -const u8 sEndingImageNumbersGfx_Upper[10 * 64] = INCBIN_U8("data/ending/numbers_upper.gfx"); -const u8 sEndingImageNumbersGfx_Lower[10 * 64] = INCBIN_U8("data/ending/numbers_lower.gfx"); +const u8 sEndingImageNumbersGfx_Upper[10 * 64] = { + #include "extracted/data/ending/numbers_upper.gfx.inc" +}; +const u8 sEndingImageNumbersGfx_Lower[10 * 64] = { + #include "extracted/data/ending/numbers_lower.gfx.inc" +}; -const u32 sEndingImageNumbersMiscEnglishGfx[218] = INCBIN_U32("data/ending/numbers_misc_english.gfx.lz"); +const u32 sEndingImageNumbersMiscEnglishGfx[218] = { + #include "extracted/data/ending/numbers_misc_english.gfx.lz.inc" +}; #ifdef REGION_EU -const u32 sEndingImageNumbersMiscGermanGfx[209] = INCBIN_U32("data/ending/numbers_misc_german.gfx.lz"); -const u32 sEndingImageNumbersMiscFrenchGfx[217] = INCBIN_U32("data/ending/numbers_misc_french.gfx.lz"); -const u32 sEndingImageNumbersMiscItalianGfx[208] = INCBIN_U32("data/ending/numbers_misc_italian.gfx.lz"); -const u32 sEndingImageNumbersMiscSpanishGfx[225] = INCBIN_U32("data/ending/numbers_misc_spanish.gfx.lz"); +const u32 sEndingImageNumbersMiscGermanGfx[209] = { + #include "extracted/data/ending/numbers_misc_german.gfx.lz.inc" +}; +const u32 sEndingImageNumbersMiscFrenchGfx[217] = { + #include "extracted/data/ending/numbers_misc_french.gfx.lz.inc" +}; +const u32 sEndingImageNumbersMiscItalianGfx[208] = { + #include "extracted/data/ending/numbers_misc_italian.gfx.lz.inc" +}; +const u32 sEndingImageNumbersMiscSpanishGfx[225] = { + #include "extracted/data/ending/numbers_misc_spanish.gfx.lz.inc" +}; #endif // REGION_EU -const u32 sEndingSamusPosingSpaceBackgroundGfx[2938] = INCBIN_U32("data/ending/samus_posing_space_background.gfx.lz"); -const u32 sEndingSamusPosingSpaceBackgroundTileTable[412] = INCBIN_U32("data/ending/samus_posing_space_background.tt"); -const u32 sEndingLightGfx[743] = INCBIN_U32("data/ending/ending_light.gfx.lz"); -const u32 sEndingLightTileTable[145] = INCBIN_U32("data/ending/ending_light.tt"); - -const u32 sEndingSamusPosingGfx_1[1481] = INCBIN_U32("data/ending/samus_posing_1.gfx.lz"); -const u32 sEndingSamusPosingTileTable_1[209] = INCBIN_U32("data/ending/samus_posing_1.tt"); -const u32 sEndingSamusPosingGfx_2[1562] = INCBIN_U32("data/ending/samus_posing_2.gfx.lz"); -const u32 sEndingSamusPosingTileTable_2[230] = INCBIN_U32("data/ending/samus_posing_2.tt"); -const u32 sEndingSamusPosingGfx_3[1712] = INCBIN_U32("data/ending/samus_posing_3.gfx.lz"); -const u32 sEndingSamusPosingTileTable_3[238] = INCBIN_U32("data/ending/samus_posing_3.tt"); -const u32 sEndingSamusPosingGfx_4[1692] = INCBIN_U32("data/ending/samus_posing_4.gfx.lz"); -const u32 sEndingSamusPosingTileTable_4[221] = INCBIN_U32("data/ending/samus_posing_4.tt"); -const u32 sEndingSamusPosingGfx_5[1279] = INCBIN_U32("data/ending/samus_posing_5.gfx.lz"); -const u32 sEndingSamusPosingTileTable_5[181] = INCBIN_U32("data/ending/samus_posing_5.tt"); - -const u32 sEndingSamusPosingSuitlessGfx[1167] = INCBIN_U32("data/ending/samus_posing_suitless.gfx.lz"); -const u32 sEndingSamusPosingSuitlessTileTable[135] = INCBIN_U32("data/ending/samus_posing_suitless.tt"); -const u32 sEndingSamusPosingFullSuitGfx[1557] = INCBIN_U32("data/ending/samus_posing_full_suit.gfx.lz"); -const u32 sEndingSamusPosingFullSuitTileTable[226] = INCBIN_U32("data/ending/samus_posing_full_suit.tt"); -const u32 sEndingSamusPosingHelmetOffGfx[1568] = INCBIN_U32("data/ending/samus_posing_helmet_off.gfx.lz"); -const u32 sEndingSamusPosingHelmetOffTileTable[226] = INCBIN_U32("data/ending/samus_posing_helmet_off.tt"); - -const u32 sCreditsChozoWallBackgroundGfx[7710] = INCBIN_U32("data/ending/credits_chozo_wall_background.gfx.lz"); -const u32 sCreditsChozoWallBackgroundTileTable[551] = INCBIN_U32("data/ending/credits_chozo_wall_background.tt"); -const u32 sCreditsChozoWallBottomGfx[3909] = INCBIN_U32("data/ending/credits_chozo_wall_bottom.gfx.lz"); -const u32 sCreditsChozoWallBottomTileTable[307] = INCBIN_U32("data/ending/credits_chozo_wall_bottom.tt"); -const u32 sCreditsChozoWallBottomZoomedGfx[5160] = INCBIN_U32("data/ending/credits_chozo_wall_bottom_zoomed.gfx.lz"); -const u32 sCreditsChozoWallBottomZoomedTileTable[368] = INCBIN_U32("data/ending/credits_chozo_wall_bottom_zoomed.tt"); -const u32 sCreditsChozoDrawingGfx[4770] = INCBIN_U32("data/ending/credits_chozo_drawing.gfx.lz"); -const u32 sCreditsChozoDrawingTileTable[368] = INCBIN_U32("data/ending/credits_chozo_drawing.tt"); - -const u32 sUnlockedOptionsTileTable[127] = INCBIN_U32("data/ending/unlocked_options.tt"); +const u32 sEndingSamusPosingSpaceBackgroundGfx[2938] = { + #include "extracted/data/ending/samus_posing_space_background.gfx.lz.inc" +}; +const u32 sEndingSamusPosingSpaceBackgroundTileTable[412] = { + #include "extracted/data/ending/samus_posing_space_background.tt.inc" +}; +const u32 sEndingLightGfx[743] = { + #include "extracted/data/ending/ending_light.gfx.lz.inc" +}; +const u32 sEndingLightTileTable[145] = { + #include "extracted/data/ending/ending_light.tt.inc" +}; + +const u32 sEndingSamusPosingGfx_1[1481] = { + #include "extracted/data/ending/samus_posing_1.gfx.lz.inc" +}; +const u32 sEndingSamusPosingTileTable_1[209] = { + #include "extracted/data/ending/samus_posing_1.tt.inc" +}; +const u32 sEndingSamusPosingGfx_2[1562] = { + #include "extracted/data/ending/samus_posing_2.gfx.lz.inc" +}; +const u32 sEndingSamusPosingTileTable_2[230] = { + #include "extracted/data/ending/samus_posing_2.tt.inc" +}; +const u32 sEndingSamusPosingGfx_3[1712] = { + #include "extracted/data/ending/samus_posing_3.gfx.lz.inc" +}; +const u32 sEndingSamusPosingTileTable_3[238] = { + #include "extracted/data/ending/samus_posing_3.tt.inc" +}; +const u32 sEndingSamusPosingGfx_4[1692] = { + #include "extracted/data/ending/samus_posing_4.gfx.lz.inc" +}; +const u32 sEndingSamusPosingTileTable_4[221] = { + #include "extracted/data/ending/samus_posing_4.tt.inc" +}; +const u32 sEndingSamusPosingGfx_5[1279] = { + #include "extracted/data/ending/samus_posing_5.gfx.lz.inc" +}; +const u32 sEndingSamusPosingTileTable_5[181] = { + #include "extracted/data/ending/samus_posing_5.tt.inc" +}; + +const u32 sEndingSamusPosingSuitlessGfx[1167] = { + #include "extracted/data/ending/samus_posing_suitless.gfx.lz.inc" +}; +const u32 sEndingSamusPosingSuitlessTileTable[135] = { + #include "extracted/data/ending/samus_posing_suitless.tt.inc" +}; +const u32 sEndingSamusPosingFullSuitGfx[1557] = { + #include "extracted/data/ending/samus_posing_full_suit.gfx.lz.inc" +}; +const u32 sEndingSamusPosingFullSuitTileTable[226] = { + #include "extracted/data/ending/samus_posing_full_suit.tt.inc" +}; +const u32 sEndingSamusPosingHelmetOffGfx[1568] = { + #include "extracted/data/ending/samus_posing_helmet_off.gfx.lz.inc" +}; +const u32 sEndingSamusPosingHelmetOffTileTable[226] = { + #include "extracted/data/ending/samus_posing_helmet_off.tt.inc" +}; + +const u32 sCreditsChozoWallBackgroundGfx[7710] = { + #include "extracted/data/ending/credits_chozo_wall_background.gfx.lz.inc" +}; +const u32 sCreditsChozoWallBackgroundTileTable[551] = { + #include "extracted/data/ending/credits_chozo_wall_background.tt.inc" +}; +const u32 sCreditsChozoWallBottomGfx[3909] = { + #include "extracted/data/ending/credits_chozo_wall_bottom.gfx.lz.inc" +}; +const u32 sCreditsChozoWallBottomTileTable[307] = { + #include "extracted/data/ending/credits_chozo_wall_bottom.tt.inc" +}; +const u32 sCreditsChozoWallBottomZoomedGfx[5160] = { + #include "extracted/data/ending/credits_chozo_wall_bottom_zoomed.gfx.lz.inc" +}; +const u32 sCreditsChozoWallBottomZoomedTileTable[368] = { + #include "extracted/data/ending/credits_chozo_wall_bottom_zoomed.tt.inc" +}; +const u32 sCreditsChozoDrawingGfx[4770] = { + #include "extracted/data/ending/credits_chozo_drawing.gfx.lz.inc" +}; +const u32 sCreditsChozoDrawingTileTable[368] = { + #include "extracted/data/ending/credits_chozo_drawing.tt.inc" +}; + +const u32 sUnlockedOptionsTileTable[127] = { + #include "extracted/data/ending/unlocked_options.tt.inc" +}; diff --git a/src/data/fusion_gallery_data.c b/src/data/fusion_gallery_data.c index 18ab5fa2d..ad01e3468 100644 --- a/src/data/fusion_gallery_data.c +++ b/src/data/fusion_gallery_data.c @@ -1,19 +1,45 @@ #include "data/fusion_gallery_data.h" #include "macros.h" -static const u16 sFusionGallery_Palette_0[16 * 16] = INCBIN_U16("data/fusion_gallery/image_0.pal"); -static const u16 sFusionGallery_Palette_1[16 * 16] = INCBIN_U16("data/fusion_gallery/image_1.pal"); -static const u16 sFusionGallery_Palette_2[16 * 16] = INCBIN_U16("data/fusion_gallery/image_2.pal"); -static const u16 sFusionGallery_Palette_3[16 * 16] = INCBIN_U16("data/fusion_gallery/image_3.pal"); -static const u16 sFusionGallery_Palette_4[16 * 16] = INCBIN_U16("data/fusion_gallery/image_4.pal"); -static const u16 sFusionGallery_Palette_11[16 * 16] = INCBIN_U16("data/fusion_gallery/image_11.pal"); -static const u16 sFusionGallery_Palette_12[16 * 16] = INCBIN_U16("data/fusion_gallery/image_12.pal"); -static const u16 sFusionGallery_Palette_5[16 * 16] = INCBIN_U16("data/fusion_gallery/image_5.pal"); -static const u16 sFusionGallery_Palette_6[16 * 16] = INCBIN_U16("data/fusion_gallery/image_6.pal"); -static const u16 sFusionGallery_Palette_7[16 * 16] = INCBIN_U16("data/fusion_gallery/image_7.pal"); -static const u16 sFusionGallery_Palette_8[16 * 16] = INCBIN_U16("data/fusion_gallery/image_8.pal"); -static const u16 sFusionGallery_Palette_9[16 * 16] = INCBIN_U16("data/fusion_gallery/image_9.pal"); -static const u16 sFusionGallery_Palette_10[16 * 16] = INCBIN_U16("data/fusion_gallery/image_10.pal"); +static const u16 sFusionGallery_Palette_0[16 * 16] = { + #include "extracted/data/fusion_gallery/image_0.pal.inc" +}; +static const u16 sFusionGallery_Palette_1[16 * 16] = { + #include "extracted/data/fusion_gallery/image_1.pal.inc" +}; +static const u16 sFusionGallery_Palette_2[16 * 16] = { + #include "extracted/data/fusion_gallery/image_2.pal.inc" +}; +static const u16 sFusionGallery_Palette_3[16 * 16] = { + #include "extracted/data/fusion_gallery/image_3.pal.inc" +}; +static const u16 sFusionGallery_Palette_4[16 * 16] = { + #include "extracted/data/fusion_gallery/image_4.pal.inc" +}; +static const u16 sFusionGallery_Palette_11[16 * 16] = { + #include "extracted/data/fusion_gallery/image_11.pal.inc" +}; +static const u16 sFusionGallery_Palette_12[16 * 16] = { + #include "extracted/data/fusion_gallery/image_12.pal.inc" +}; +static const u16 sFusionGallery_Palette_5[16 * 16] = { + #include "extracted/data/fusion_gallery/image_5.pal.inc" +}; +static const u16 sFusionGallery_Palette_6[16 * 16] = { + #include "extracted/data/fusion_gallery/image_6.pal.inc" +}; +static const u16 sFusionGallery_Palette_7[16 * 16] = { + #include "extracted/data/fusion_gallery/image_7.pal.inc" +}; +static const u16 sFusionGallery_Palette_8[16 * 16] = { + #include "extracted/data/fusion_gallery/image_8.pal.inc" +}; +static const u16 sFusionGallery_Palette_9[16 * 16] = { + #include "extracted/data/fusion_gallery/image_9.pal.inc" +}; +static const u16 sFusionGallery_Palette_10[16 * 16] = { + #include "extracted/data/fusion_gallery/image_10.pal.inc" +}; extern const u32 sFusionGallery_TopGfx_0[5628]; extern const u32 sFusionGallery_BottomGfx_0[3191]; @@ -187,80 +213,184 @@ const struct FusionGalleryImageEntry sFusionGalleryData[NUMBER_OF_FUSION_GALLERY } }; -static const u32 sFusionGallery_TopGfx_0[5628] = INCBIN_U32("data/fusion_gallery/image_0_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_0[3191] = INCBIN_U32("data/fusion_gallery/image_0_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_0[5628] = { + #include "extracted/data/fusion_gallery/image_0_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_0[3191] = { + #include "extracted/data/fusion_gallery/image_0_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_1[5900] = INCBIN_U32("data/fusion_gallery/image_1_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_1[2986] = INCBIN_U32("data/fusion_gallery/image_1_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_1[5900] = { + #include "extracted/data/fusion_gallery/image_1_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_1[2986] = { + #include "extracted/data/fusion_gallery/image_1_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_2[5731] = INCBIN_U32("data/fusion_gallery/image_2_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_2[3293] = INCBIN_U32("data/fusion_gallery/image_2_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_2[5731] = { + #include "extracted/data/fusion_gallery/image_2_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_2[3293] = { + #include "extracted/data/fusion_gallery/image_2_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_3[6364] = INCBIN_U32("data/fusion_gallery/image_3_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_3[3818] = INCBIN_U32("data/fusion_gallery/image_3_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_3[6364] = { + #include "extracted/data/fusion_gallery/image_3_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_3[3818] = { + #include "extracted/data/fusion_gallery/image_3_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_4[6851] = INCBIN_U32("data/fusion_gallery/image_4_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_4[3504] = INCBIN_U32("data/fusion_gallery/image_4_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_4[6851] = { + #include "extracted/data/fusion_gallery/image_4_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_4[3504] = { + #include "extracted/data/fusion_gallery/image_4_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopTileTable_0[551] = INCBIN_U32("data/fusion_gallery/image_0_top.tt"); -static const u32 sFusionGallery_BottomTileTable_0[368] = INCBIN_U32("data/fusion_gallery/image_0_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_0[551] = { + #include "extracted/data/fusion_gallery/image_0_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_0[368] = { + #include "extracted/data/fusion_gallery/image_0_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_1[551] = INCBIN_U32("data/fusion_gallery/image_1_top.tt"); -static const u32 sFusionGallery_BottomTileTable_1[368] = INCBIN_U32("data/fusion_gallery/image_1_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_1[551] = { + #include "extracted/data/fusion_gallery/image_1_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_1[368] = { + #include "extracted/data/fusion_gallery/image_1_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_2[551] = INCBIN_U32("data/fusion_gallery/image_2_top.tt"); -static const u32 sFusionGallery_BottomTileTable_2[368] = INCBIN_U32("data/fusion_gallery/image_2_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_2[551] = { + #include "extracted/data/fusion_gallery/image_2_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_2[368] = { + #include "extracted/data/fusion_gallery/image_2_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_3[551] = INCBIN_U32("data/fusion_gallery/image_3_top.tt"); -static const u32 sFusionGallery_BottomTileTable_3[369] = INCBIN_U32("data/fusion_gallery/image_3_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_3[551] = { + #include "extracted/data/fusion_gallery/image_3_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_3[369] = { + #include "extracted/data/fusion_gallery/image_3_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_4[551] = INCBIN_U32("data/fusion_gallery/image_4_top.tt"); -static const u32 sFusionGallery_BottomTileTable_4[369] = INCBIN_U32("data/fusion_gallery/image_4_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_4[551] = { + #include "extracted/data/fusion_gallery/image_4_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_4[369] = { + #include "extracted/data/fusion_gallery/image_4_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopGfx_11[5936] = INCBIN_U32("data/fusion_gallery/image_11_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_11[3930] = INCBIN_U32("data/fusion_gallery/image_11_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_11[5936] = { + #include "extracted/data/fusion_gallery/image_11_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_11[3930] = { + #include "extracted/data/fusion_gallery/image_11_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_12[5604] = INCBIN_U32("data/fusion_gallery/image_12_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_12[3582] = INCBIN_U32("data/fusion_gallery/image_12_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_12[5604] = { + #include "extracted/data/fusion_gallery/image_12_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_12[3582] = { + #include "extracted/data/fusion_gallery/image_12_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_5[6633] = INCBIN_U32("data/fusion_gallery/image_5_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_5[3277] = INCBIN_U32("data/fusion_gallery/image_5_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_5[6633] = { + #include "extracted/data/fusion_gallery/image_5_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_5[3277] = { + #include "extracted/data/fusion_gallery/image_5_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_6[6754] = INCBIN_U32("data/fusion_gallery/image_6_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_6[3419] = INCBIN_U32("data/fusion_gallery/image_6_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_6[6754] = { + #include "extracted/data/fusion_gallery/image_6_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_6[3419] = { + #include "extracted/data/fusion_gallery/image_6_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_7[6977] = INCBIN_U32("data/fusion_gallery/image_7_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_7[4372] = INCBIN_U32("data/fusion_gallery/image_7_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_7[6977] = { + #include "extracted/data/fusion_gallery/image_7_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_7[4372] = { + #include "extracted/data/fusion_gallery/image_7_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_8[6417] = INCBIN_U32("data/fusion_gallery/image_8_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_8[3919] = INCBIN_U32("data/fusion_gallery/image_8_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_8[6417] = { + #include "extracted/data/fusion_gallery/image_8_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_8[3919] = { + #include "extracted/data/fusion_gallery/image_8_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_9[6918] = INCBIN_U32("data/fusion_gallery/image_9_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_9[4360] = INCBIN_U32("data/fusion_gallery/image_9_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_9[6918] = { + #include "extracted/data/fusion_gallery/image_9_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_9[4360] = { + #include "extracted/data/fusion_gallery/image_9_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopGfx_10[5764] = INCBIN_U32("data/fusion_gallery/image_10_top.gfx.lz"); -static const u32 sFusionGallery_BottomGfx_10[2273] = INCBIN_U32("data/fusion_gallery/image_10_bottom.gfx.lz"); +static const u32 sFusionGallery_TopGfx_10[5764] = { + #include "extracted/data/fusion_gallery/image_10_top.gfx.lz.inc" +}; +static const u32 sFusionGallery_BottomGfx_10[2273] = { + #include "extracted/data/fusion_gallery/image_10_bottom.gfx.lz.inc" +}; -static const u32 sFusionGallery_TopTileTable_11[551] = INCBIN_U32("data/fusion_gallery/image_11_top.tt"); -static const u32 sFusionGallery_BottomTileTable_11[368] = INCBIN_U32("data/fusion_gallery/image_11_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_11[551] = { + #include "extracted/data/fusion_gallery/image_11_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_11[368] = { + #include "extracted/data/fusion_gallery/image_11_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_12[550] = INCBIN_U32("data/fusion_gallery/image_12_top.tt"); -static const u32 sFusionGallery_BottomTileTable_12[368] = INCBIN_U32("data/fusion_gallery/image_12_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_12[550] = { + #include "extracted/data/fusion_gallery/image_12_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_12[368] = { + #include "extracted/data/fusion_gallery/image_12_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_5[551] = INCBIN_U32("data/fusion_gallery/image_5_top.tt"); -static const u32 sFusionGallery_BottomTileTable_5[369] = INCBIN_U32("data/fusion_gallery/image_5_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_5[551] = { + #include "extracted/data/fusion_gallery/image_5_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_5[369] = { + #include "extracted/data/fusion_gallery/image_5_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_6[551] = INCBIN_U32("data/fusion_gallery/image_6_top.tt"); -static const u32 sFusionGallery_BottomTileTable_6[368] = INCBIN_U32("data/fusion_gallery/image_6_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_6[551] = { + #include "extracted/data/fusion_gallery/image_6_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_6[368] = { + #include "extracted/data/fusion_gallery/image_6_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_7[551] = INCBIN_U32("data/fusion_gallery/image_7_top.tt"); -static const u32 sFusionGallery_BottomTileTable_7[369] = INCBIN_U32("data/fusion_gallery/image_7_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_7[551] = { + #include "extracted/data/fusion_gallery/image_7_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_7[369] = { + #include "extracted/data/fusion_gallery/image_7_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_8[551] = INCBIN_U32("data/fusion_gallery/image_8_top.tt"); -static const u32 sFusionGallery_BottomTileTable_8[369] = INCBIN_U32("data/fusion_gallery/image_8_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_8[551] = { + #include "extracted/data/fusion_gallery/image_8_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_8[369] = { + #include "extracted/data/fusion_gallery/image_8_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_9[550] = INCBIN_U32("data/fusion_gallery/image_9_top.tt"); -static const u32 sFusionGallery_BottomTileTable_9[368] = INCBIN_U32("data/fusion_gallery/image_9_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_9[550] = { + #include "extracted/data/fusion_gallery/image_9_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_9[368] = { + #include "extracted/data/fusion_gallery/image_9_bottom.tt.inc" +}; -static const u32 sFusionGallery_TopTileTable_10[551] = INCBIN_U32("data/fusion_gallery/image_10_top.tt"); -static const u32 sFusionGallery_BottomTileTable_10[368] = INCBIN_U32("data/fusion_gallery/image_10_bottom.tt"); +static const u32 sFusionGallery_TopTileTable_10[551] = { + #include "extracted/data/fusion_gallery/image_10_top.tt.inc" +}; +static const u32 sFusionGallery_BottomTileTable_10[368] = { + #include "extracted/data/fusion_gallery/image_10_bottom.tt.inc" +}; diff --git a/src/data/hud_data.c b/src/data/hud_data.c index a11704d9b..cb4289929 100644 --- a/src/data/hud_data.c +++ b/src/data/hud_data.c @@ -3,66 +3,172 @@ // 32ba08 -const u16 sCommonSpritesPal[96] = INCBIN_U16("data/hud/common.pal"); -const u32 sCommonSpritesGfx[3584] = INCBIN_U32("data/hud/common.gfx"); +const u16 sCommonSpritesPal[96] = { + #include "extracted/data/hud/common.pal.inc" +}; +const u32 sCommonSpritesGfx[3584] = { + #include "extracted/data/hud/common.gfx.inc" +}; -const u8 sMissileDigitsGfx[2304] = INCBIN_U8("data/hud/missile_digits.gfx"); -const u8 sPowerBombDigitsGfx[2304] = INCBIN_U8("data/hud/power_bomb_digits.gfx"); +const u8 sMissileDigitsGfx[2304] = { + #include "extracted/data/hud/missile_digits.gfx.inc" +}; +const u8 sPowerBombDigitsGfx[2304] = { + #include "extracted/data/hud/power_bomb_digits.gfx.inc" +}; -const u8 sMissileHudGfx_Inactive[64] = INCBIN_U8("data/hud/missile_hud_inactive.gfx"); -const u8 sMissileHudGfx_Selected[64] = INCBIN_U8("data/hud/missile_hud_selected.gfx"); -const u8 sMissileHudGfx_Active[64] = INCBIN_U8("data/hud/missile_hud_active.gfx"); -const u8 sMissileHudGfx_Refill1[64] = INCBIN_U8("data/hud/missile_hud_refill_1.gfx"); -const u8 sMissileHudGfx_Refill2[64] = INCBIN_U8("data/hud/missile_hud_refill_2.gfx"); -const u8 sMissileHudGfx_Refill3[64] = INCBIN_U8("data/hud/missile_hud_refill_3.gfx"); +const u8 sMissileHudGfx_Inactive[64] = { + #include "extracted/data/hud/missile_hud_inactive.gfx.inc" +}; +const u8 sMissileHudGfx_Selected[64] = { + #include "extracted/data/hud/missile_hud_selected.gfx.inc" +}; +const u8 sMissileHudGfx_Active[64] = { + #include "extracted/data/hud/missile_hud_active.gfx.inc" +}; +const u8 sMissileHudGfx_Refill1[64] = { + #include "extracted/data/hud/missile_hud_refill_1.gfx.inc" +}; +const u8 sMissileHudGfx_Refill2[64] = { + #include "extracted/data/hud/missile_hud_refill_2.gfx.inc" +}; +const u8 sMissileHudGfx_Refill3[64] = { + #include "extracted/data/hud/missile_hud_refill_3.gfx.inc" +}; -const u8 sSuperMissileHudGfx_Inactive[64] = INCBIN_U8("data/hud/super_missile_hud_inactive.gfx"); -const u8 sSuperMissileHudGfx_Selected[64] = INCBIN_U8("data/hud/super_missile_hud_selected.gfx"); -const u8 sSuperMissileHudGfx_Active[64] = INCBIN_U8("data/hud/super_missile_hud_active.gfx"); -const u8 sSuperMissileHudGfx_Refill1[64] = INCBIN_U8("data/hud/super_missile_hud_refill_1.gfx"); -const u8 sSuperMissileHudGfx_Refill2[64] = INCBIN_U8("data/hud/super_missile_hud_refill_2.gfx"); -const u8 sSuperMissileHudGfx_Refill3[64] = INCBIN_U8("data/hud/super_missile_hud_refill_3.gfx"); +const u8 sSuperMissileHudGfx_Inactive[64] = { + #include "extracted/data/hud/super_missile_hud_inactive.gfx.inc" +}; +const u8 sSuperMissileHudGfx_Selected[64] = { + #include "extracted/data/hud/super_missile_hud_selected.gfx.inc" +}; +const u8 sSuperMissileHudGfx_Active[64] = { + #include "extracted/data/hud/super_missile_hud_active.gfx.inc" +}; +const u8 sSuperMissileHudGfx_Refill1[64] = { + #include "extracted/data/hud/super_missile_hud_refill_1.gfx.inc" +}; +const u8 sSuperMissileHudGfx_Refill2[64] = { + #include "extracted/data/hud/super_missile_hud_refill_2.gfx.inc" +}; +const u8 sSuperMissileHudGfx_Refill3[64] = { + #include "extracted/data/hud/super_missile_hud_refill_3.gfx.inc" +}; -const u8 sPowerBombHudGfx_Inactive[64] = INCBIN_U8("data/hud/power_bomb_hud_inactive.gfx"); -const u8 sPowerBombHudGfx_Selected[64] = INCBIN_U8("data/hud/power_bomb_hud_selected.gfx"); -const u8 sPowerBombHudGfx_Active[64] = INCBIN_U8("data/hud/power_bomb_hud_active.gfx"); -const u8 sPowerBombHudGfx_Refill1[64] = INCBIN_U8("data/hud/power_bomb_hud_refill_1.gfx"); -const u8 sPowerBombHudGfx_Refill2[64] = INCBIN_U8("data/hud/power_bomb_hud_refill_2.gfx"); -const u8 sPowerBombHudGfx_Refill3[64] = INCBIN_U8("data/hud/power_bomb_hud_refill_3.gfx"); +const u8 sPowerBombHudGfx_Inactive[64] = { + #include "extracted/data/hud/power_bomb_hud_inactive.gfx.inc" +}; +const u8 sPowerBombHudGfx_Selected[64] = { + #include "extracted/data/hud/power_bomb_hud_selected.gfx.inc" +}; +const u8 sPowerBombHudGfx_Active[64] = { + #include "extracted/data/hud/power_bomb_hud_active.gfx.inc" +}; +const u8 sPowerBombHudGfx_Refill1[64] = { + #include "extracted/data/hud/power_bomb_hud_refill_1.gfx.inc" +}; +const u8 sPowerBombHudGfx_Refill2[64] = { + #include "extracted/data/hud/power_bomb_hud_refill_2.gfx.inc" +}; +const u8 sPowerBombHudGfx_Refill3[64] = { + #include "extracted/data/hud/power_bomb_hud_refill_3.gfx.inc" +}; -const u8 sEnergyDigitsTensGfx[10 * 32] = INCBIN_U8("data/hud/energy_digits_tens.gfx"); -const u8 sEnergyDigitsOnesGfx[10 * 32] = INCBIN_U8("data/hud/energy_digits_ones.gfx"); -const u8 sEnergyDigitsRefill1Gfx[20 * 32] = INCBIN_U8("data/hud/energy_digits_refill_1.gfx"); -const u8 sEnergyDigitsRefill2Gfx[20 * 32] = INCBIN_U8("data/hud/energy_digits_refill_2.gfx"); -const u8 sEnergyDigitsRefill3Gfx[20 * 32] = INCBIN_U8("data/hud/energy_digits_refill_3.gfx"); +const u8 sEnergyDigitsTensGfx[10 * 32] = { + #include "extracted/data/hud/energy_digits_tens.gfx.inc" +}; +const u8 sEnergyDigitsOnesGfx[10 * 32] = { + #include "extracted/data/hud/energy_digits_ones.gfx.inc" +}; +const u8 sEnergyDigitsRefill1Gfx[20 * 32] = { + #include "extracted/data/hud/energy_digits_refill_1.gfx.inc" +}; +const u8 sEnergyDigitsRefill2Gfx[20 * 32] = { + #include "extracted/data/hud/energy_digits_refill_2.gfx.inc" +}; +const u8 sEnergyDigitsRefill3Gfx[20 * 32] = { + #include "extracted/data/hud/energy_digits_refill_3.gfx.inc" +}; -const u8 sEnergyTanksGfx_Zero[160 * 1] = INCBIN_U8("data/hud/energy_tanks_zero.gfx"); -const u8 sEnergyTanksGfx_One[160 * 2] = INCBIN_U8("data/hud/energy_tanks_one.gfx"); -const u8 sEnergyTanksGfx_Two[160 * 3] = INCBIN_U8("data/hud/energy_tanks_two.gfx"); -const u8 sEnergyTanksGfx_Three[160 * 4] = INCBIN_U8("data/hud/energy_tanks_three.gfx"); -const u8 sEnergyTanksGfx_Four[160 * 5] = INCBIN_U8("data/hud/energy_tanks_four.gfx"); -const u8 sEnergyTanksGfx_Five[160 * 6] = INCBIN_U8("data/hud/energy_tanks_five.gfx"); -const u8 sEnergyTanksGfx_Six[160 * 7] = INCBIN_U8("data/hud/energy_tanks_six.gfx"); -const u8 sEnergyTanksGfx_Seven[160 * 8] = INCBIN_U8("data/hud/energy_tanks_seven.gfx"); -const u8 sEnergyTanksGfx_Eight[160 * 9] = INCBIN_U8("data/hud/energy_tanks_eight.gfx"); -const u8 sEnergyTanksGfx_Nine[160 * 10] = INCBIN_U8("data/hud/energy_tanks_nine.gfx"); -const u8 sEnergyTanksGfx_Ten[160 * 11] = INCBIN_U8("data/hud/energy_tanks_ten.gfx"); -const u8 sEnergyTanksGfx_Eleven[160 * 12] = INCBIN_U8("data/hud/energy_tanks_eleven.gfx"); -const u8 sEnergyTanksGfx_Twelve[160 * 13] = INCBIN_U8("data/hud/energy_tanks_twelve.gfx"); +const u8 sEnergyTanksGfx_Zero[160 * 1] = { + #include "extracted/data/hud/energy_tanks_zero.gfx.inc" +}; +const u8 sEnergyTanksGfx_One[160 * 2] = { + #include "extracted/data/hud/energy_tanks_one.gfx.inc" +}; +const u8 sEnergyTanksGfx_Two[160 * 3] = { + #include "extracted/data/hud/energy_tanks_two.gfx.inc" +}; +const u8 sEnergyTanksGfx_Three[160 * 4] = { + #include "extracted/data/hud/energy_tanks_three.gfx.inc" +}; +const u8 sEnergyTanksGfx_Four[160 * 5] = { + #include "extracted/data/hud/energy_tanks_four.gfx.inc" +}; +const u8 sEnergyTanksGfx_Five[160 * 6] = { + #include "extracted/data/hud/energy_tanks_five.gfx.inc" +}; +const u8 sEnergyTanksGfx_Six[160 * 7] = { + #include "extracted/data/hud/energy_tanks_six.gfx.inc" +}; +const u8 sEnergyTanksGfx_Seven[160 * 8] = { + #include "extracted/data/hud/energy_tanks_seven.gfx.inc" +}; +const u8 sEnergyTanksGfx_Eight[160 * 9] = { + #include "extracted/data/hud/energy_tanks_eight.gfx.inc" +}; +const u8 sEnergyTanksGfx_Nine[160 * 10] = { + #include "extracted/data/hud/energy_tanks_nine.gfx.inc" +}; +const u8 sEnergyTanksGfx_Ten[160 * 11] = { + #include "extracted/data/hud/energy_tanks_ten.gfx.inc" +}; +const u8 sEnergyTanksGfx_Eleven[160 * 12] = { + #include "extracted/data/hud/energy_tanks_eleven.gfx.inc" +}; +const u8 sEnergyTanksGfx_Twelve[160 * 13] = { + #include "extracted/data/hud/energy_tanks_twelve.gfx.inc" +}; -const u8 sEnergyTanksRefillGfx_One[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_one.gfx"); -const u8 sEnergyTanksRefillGfx_Two[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_two.gfx"); -const u8 sEnergyTanksRefillGfx_Three[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_three.gfx"); -const u8 sEnergyTanksRefillGfx_Four[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_four.gfx"); -const u8 sEnergyTanksRefillGfx_Five[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_five.gfx"); -const u8 sEnergyTanksRefillGfx_Six[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_six.gfx"); -const u8 sEnergyTanksRefillGfx_Seven[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_seven.gfx"); -const u8 sEnergyTanksRefillGfx_Eight[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_eight.gfx"); -const u8 sEnergyTanksRefillGfx_Nine[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_nine.gfx"); -const u8 sEnergyTanksRefillGfx_Ten[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_ten.gfx"); -const u8 sEnergyTanksRefillGfx_Eleven[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_eleven.gfx"); -const u8 sEnergyTanksRefillGfx_Twelve[160 * 3] = INCBIN_U8("data/hud/energy_tanks_refill_twelve.gfx"); +const u8 sEnergyTanksRefillGfx_One[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_one.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Two[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_two.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Three[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_three.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Four[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_four.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Five[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_five.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Six[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_six.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Seven[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_seven.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Eight[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_eight.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Nine[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_nine.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Ten[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_ten.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Eleven[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_eleven.gfx.inc" +}; +const u8 sEnergyTanksRefillGfx_Twelve[160 * 3] = { + #include "extracted/data/hud/energy_tanks_refill_twelve.gfx.inc" +}; -const u8 sSuitlessHudChargeBarGfx[56 * 256] = INCBIN_U8("data/hud/suitless_hud_bar.gfx"); +const u8 sSuitlessHudChargeBarGfx[56 * 256] = { + #include "extracted/data/hud/suitless_hud_bar.gfx.inc" +}; // 339aa8 diff --git a/src/data/intro_data.c b/src/data/intro_data.c index 519843adc..f6b985f9a 100644 --- a/src/data/intro_data.c +++ b/src/data/intro_data.c @@ -242,11 +242,21 @@ const u16 sIntroFuzzOam[OAM_DATA_SIZE(17)] = { OAM_ENTRY(96, 0, OAM_DIMS_16x32, OAM_NO_FLIP, 0x21c, 0, 0) }; -const u16 sIntroTextAndShipPal[16 * 6] = INCBIN_U16("data/intro/text_and_ship.pal"); -const u16 sIntroPal_45f9d4[16 * 1] = INCBIN_U16("data/intro/45f9d4.pal"); -const u16 sIntroSamusInHerShipPal[16 * 5] = INCBIN_U16("data/intro/samus_in_her_ship.pal"); -const u16 sIntroViewOfZebesPal[16 * 10] = INCBIN_U16("data/intro/view_of_zebes.pal"); -const u16 sIntroMotherBrainPal[16 * 5] = INCBIN_U16("data/intro/mother_brain.pal"); +const u16 sIntroTextAndShipPal[16 * 6] = { + #include "extracted/data/intro/text_and_ship.pal.inc" +}; +const u16 sIntroPal_45f9d4[16 * 1] = { + #include "extracted/data/intro/45f9d4.pal.inc" +}; +const u16 sIntroSamusInHerShipPal[16 * 5] = { + #include "extracted/data/intro/samus_in_her_ship.pal.inc" +}; +const u16 sIntroViewOfZebesPal[16 * 10] = { + #include "extracted/data/intro/view_of_zebes.pal.inc" +}; +const u16 sIntroMotherBrainPal[16 * 5] = { + #include "extracted/data/intro/mother_brain.pal.inc" +}; const u8 sIntroFuzzRandomValues_1[64] = { @@ -446,16 +456,40 @@ const IntroTextAction sIntroDefeatTheActions[50] = { }; -const u32 sIntroTextAndShipFlyingInGfx[1310] = INCBIN_U32("data/intro/text_and_ship.gfx.lz"); -const u32 sIntroSpaceBackgroundGfx[3181] = INCBIN_U32("data/intro/space_background.gfx.lz"); -const u32 sIntroSpaceBackgroundTileTable[577] = INCBIN_U32("data/intro/space_background.tt"); -const u32 sIntroSamusInHerShipGfx[4800] = INCBIN_U32("data/intro/samus_in_her_ship.gfx.lz"); -const u32 sIntroSamusInHerShipTileTable[418] = INCBIN_U32("data/intro/samus_in_her_ship.tt"); -const u32 sIntroSamusShipViewOfZebesGfx[1224] = INCBIN_U32("data/intro/samus_ship_view_of_zebes.gfx.lz"); -const u32 sIntroViewOfZebesGfx[2986] = INCBIN_U32("data/intro/view_of_zebes.gfx.lz"); -const u32 sIntroViewOfZebesTileTable[577] = INCBIN_U32("data/intro/view_of_zebes.tt"); -const u32 sIntroMotherBrainGfx[5004] = INCBIN_U32("data/intro/mother_brain.gfx.lz"); -const u32 sIntroMotherBrainTileTable[577] = INCBIN_U32("data/intro/mother_brain.tt"); -const u32 sIntroFuzzGfx[5224] = INCBIN_U32("data/intro/fuzz.gfx.lz"); -const u32 sIntro_47920c[125] = INCBIN_U32("data/intro/47920c.tt"); +const u32 sIntroTextAndShipFlyingInGfx[1310] = { + #include "extracted/data/intro/text_and_ship.gfx.lz.inc" +}; +const u32 sIntroSpaceBackgroundGfx[3181] = { + #include "extracted/data/intro/space_background.gfx.lz.inc" +}; +const u32 sIntroSpaceBackgroundTileTable[577] = { + #include "extracted/data/intro/space_background.tt.inc" +}; +const u32 sIntroSamusInHerShipGfx[4800] = { + #include "extracted/data/intro/samus_in_her_ship.gfx.lz.inc" +}; +const u32 sIntroSamusInHerShipTileTable[418] = { + #include "extracted/data/intro/samus_in_her_ship.tt.inc" +}; +const u32 sIntroSamusShipViewOfZebesGfx[1224] = { + #include "extracted/data/intro/samus_ship_view_of_zebes.gfx.lz.inc" +}; +const u32 sIntroViewOfZebesGfx[2986] = { + #include "extracted/data/intro/view_of_zebes.gfx.lz.inc" +}; +const u32 sIntroViewOfZebesTileTable[577] = { + #include "extracted/data/intro/view_of_zebes.tt.inc" +}; +const u32 sIntroMotherBrainGfx[5004] = { + #include "extracted/data/intro/mother_brain.gfx.lz.inc" +}; +const u32 sIntroMotherBrainTileTable[577] = { + #include "extracted/data/intro/mother_brain.tt.inc" +}; +const u32 sIntroFuzzGfx[5224] = { + #include "extracted/data/intro/fuzz.gfx.lz.inc" +}; +const u32 sIntro_47920c[125] = { + #include "extracted/data/intro/47920c.tt.inc" +}; diff --git a/src/data/menus/boot_debug_data.c b/src/data/menus/boot_debug_data.c index 4943dc36f..3851893fb 100644 --- a/src/data/menus/boot_debug_data.c +++ b/src/data/menus/boot_debug_data.c @@ -5,10 +5,18 @@ #ifdef DEBUG -const u16 sBootDebug_417e38[8 * 16] = INCBIN_U16("data/menus/boot_debug/boot_debug_417e38.pal"); -const u16 sBootDebugBgPal[8 * 16] = INCBIN_U16("data/menus/boot_debug/background.pal"); -const u16 sBootDebugObjPal[3 * 16] = INCBIN_U16("data/menus/boot_debug/objects.pal"); -const u32 sBootDebugObjGfx[222] = INCBIN_U32("data/menus/boot_debug/objects.gfx.lz"); +const u16 sBootDebug_417e38[8 * 16] = { + #include "extracted/data/menus/boot_debug/boot_debug_417e38.pal.inc" +}; +const u16 sBootDebugBgPal[8 * 16] = { + #include "extracted/data/menus/boot_debug/background.pal.inc" +}; +const u16 sBootDebugObjPal[3 * 16] = { + #include "extracted/data/menus/boot_debug/objects.pal.inc" +}; +const u32 sBootDebugObjGfx[222] = { + #include "extracted/data/menus/boot_debug/objects.gfx.lz.inc" +}; static const u16 sBootDebugOam_4185D8_Frame1[OAM_DATA_SIZE(1)] = { 1, @@ -184,7 +192,9 @@ static const struct FrameData sBootDebugOam_418610[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u32 sBootDebugBgGfx[771] = INCBIN_U32("data/menus/boot_debug/background.gfx.lz"); +const u32 sBootDebugBgGfx[771] = { + #include "extracted/data/menus/boot_debug/background.gfx.lz.inc" +}; const u8 sBootDebug_CutsceneB_EscapeShip_Text[8] = SHIFT_JIS("コガタテイ"); const u8 sBootDebug_CutsceneB_MechaRidley_Text[12] = SHIFT_JIS("メカ リドリー"); diff --git a/src/data/menus/erase_sram_data.c b/src/data/menus/erase_sram_data.c index 4cddf85c4..afb8cd427 100644 --- a/src/data/menus/erase_sram_data.c +++ b/src/data/menus/erase_sram_data.c @@ -2,8 +2,12 @@ #include "macros.h" #include "constants/audio.h" -const u16 sEraseSramMenuObjectsPal[7 * 16] = INCBIN_U16("data/menus/erase_sram/objects.pal"); -const u16 sEraseSramMenuBackgroundPal[15 * 16 - 1] = INCBIN_U16("data/menus/erase_sram/background.pal"); +const u16 sEraseSramMenuObjectsPal[7 * 16] = { + #include "extracted/data/menus/erase_sram/objects.pal.inc" +}; +const u16 sEraseSramMenuBackgroundPal[15 * 16 - 1] = { + #include "extracted/data/menus/erase_sram/background.pal.inc" +}; static const u16 sEraseSramOam_ConfirmWindowNoSelected_Frame0[OAM_DATA_SIZE(17)] = { 17, @@ -329,25 +333,57 @@ static const struct FrameData sEraseSramOam_ConfirmWindowYesSelected[2] = { [1] = FRAME_DATA_TERMINATOR }; -const u32 sEraseSramMenuObjectsGfx[477] = INCBIN_U32("data/menus/erase_sram/objects.gfx.lz"); -const u32 sEraseSramMenuFirstBoxGfx[118] = INCBIN_U32("data/menus/erase_sram/first_box.gfx.lz"); +const u32 sEraseSramMenuObjectsGfx[477] = { + #include "extracted/data/menus/erase_sram/objects.gfx.lz.inc" +}; +const u32 sEraseSramMenuFirstBoxGfx[118] = { + #include "extracted/data/menus/erase_sram/first_box.gfx.lz.inc" +}; -const u32 sEraseSramMenuConfirmJapaneseGfx[245] = INCBIN_U32("data/menus/erase_sram/confirm_japanese.gfx.lz"); -const u32 sEraseSramMenuConfirmEnglishGfx[191] = INCBIN_U32("data/menus/erase_sram/confirm_english.gfx.lz"); -const u32 sEraseSramMenuConfirmFrenchGfx[209] = INCBIN_U32("data/menus/erase_sram/confirm_french.gfx.lz"); -const u32 sEraseSramMenuConfirmGermanGfx[222] = INCBIN_U32("data/menus/erase_sram/confirm_german.gfx.lz"); -const u32 sEraseSramMenuConfirmItalianGfx[201] = INCBIN_U32("data/menus/erase_sram/confirm_italian.gfx.lz"); -const u32 sEraseSramMenuConfirmSpanishGfx[204] = INCBIN_U32("data/menus/erase_sram/confirm_spanish.gfx.lz"); +const u32 sEraseSramMenuConfirmJapaneseGfx[245] = { + #include "extracted/data/menus/erase_sram/confirm_japanese.gfx.lz.inc" +}; +const u32 sEraseSramMenuConfirmEnglishGfx[191] = { + #include "extracted/data/menus/erase_sram/confirm_english.gfx.lz.inc" +}; +const u32 sEraseSramMenuConfirmFrenchGfx[209] = { + #include "extracted/data/menus/erase_sram/confirm_french.gfx.lz.inc" +}; +const u32 sEraseSramMenuConfirmGermanGfx[222] = { + #include "extracted/data/menus/erase_sram/confirm_german.gfx.lz.inc" +}; +const u32 sEraseSramMenuConfirmItalianGfx[201] = { + #include "extracted/data/menus/erase_sram/confirm_italian.gfx.lz.inc" +}; +const u32 sEraseSramMenuConfirmSpanishGfx[204] = { + #include "extracted/data/menus/erase_sram/confirm_spanish.gfx.lz.inc" +}; -const u32 sEraseSramMenuQuestionJapaneseGfx[245] = INCBIN_U32("data/menus/erase_sram/question_japanese.gfx.lz"); -const u32 sEraseSramMenuQuestionEnglishGfx[185] = INCBIN_U32("data/menus/erase_sram/question_english.gfx.lz"); -const u32 sEraseSramMenuQuestionFrenchGfx[187] = INCBIN_U32("data/menus/erase_sram/question_french.gfx.lz"); -const u32 sEraseSramMenuQuestionGermanGfx[205] = INCBIN_U32("data/menus/erase_sram/question_german.gfx.lz"); -const u32 sEraseSramMenuQuestionItalianGfx[221] = INCBIN_U32("data/menus/erase_sram/question_italian.gfx.lz"); -const u32 sEraseSramMenuQuestionSpanishGfx[208] = INCBIN_U32("data/menus/erase_sram/question_spanish.gfx.lz"); +const u32 sEraseSramMenuQuestionJapaneseGfx[245] = { + #include "extracted/data/menus/erase_sram/question_japanese.gfx.lz.inc" +}; +const u32 sEraseSramMenuQuestionEnglishGfx[185] = { + #include "extracted/data/menus/erase_sram/question_english.gfx.lz.inc" +}; +const u32 sEraseSramMenuQuestionFrenchGfx[187] = { + #include "extracted/data/menus/erase_sram/question_french.gfx.lz.inc" +}; +const u32 sEraseSramMenuQuestionGermanGfx[205] = { + #include "extracted/data/menus/erase_sram/question_german.gfx.lz.inc" +}; +const u32 sEraseSramMenuQuestionItalianGfx[221] = { + #include "extracted/data/menus/erase_sram/question_italian.gfx.lz.inc" +}; +const u32 sEraseSramMenuQuestionSpanishGfx[208] = { + #include "extracted/data/menus/erase_sram/question_spanish.gfx.lz.inc" +}; -const u32 sEraseSramMenuBoxTileTable[137] = INCBIN_U32("data/menus/erase_sram/box.tt"); -const u32 sEraseSramMenuBackgroundTileTable[368] = INCBIN_U32("data/menus/erase_sram/background.tt"); +const u32 sEraseSramMenuBoxTileTable[137] = { + #include "extracted/data/menus/erase_sram/box.tt.inc" +}; +const u32 sEraseSramMenuBackgroundTileTable[368] = { + #include "extracted/data/menus/erase_sram/background.tt.inc" +}; const EraseSramOamId sEraseSramQuestionWindowNoSelectedOamId = ERASE_SRAM_OAM_ID_QUESTION_WINDOW_NO_SELECTED; const EraseSramOamId sEraseSramQuestionWindowYesSelectedOamId = ERASE_SRAM_OAM_ID_QUESTION_WINDOW_YES_SELECTED; diff --git a/src/data/menus/file_select_data.c b/src/data/menus/file_select_data.c index 990cdb8f6..9bbed9ccb 100644 --- a/src/data/menus/file_select_data.c +++ b/src/data/menus/file_select_data.c @@ -3,9 +3,15 @@ #include "macros.h" #include "gba.h" -const u16 sFileSelectPal[7 * 16] = INCBIN_U16("data/menus/file_select/palette.pal"); -const u16 sFileSelect_4548f8[2 * 16] = INCBIN_U16("data/menus/file_select/4548f8.pal"); -const u16 sFileSelectIconsPal[6 * 16] = INCBIN_U16("data/menus/file_select/icons.pal"); +const u16 sFileSelectPal[7 * 16] = { + #include "extracted/data/menus/file_select/palette.pal.inc" +}; +const u16 sFileSelect_4548f8[2 * 16] = { + #include "extracted/data/menus/file_select/4548f8.pal.inc" +}; +const u16 sFileSelectIconsPal[6 * 16] = { + #include "extracted/data/menus/file_select/icons.pal.inc" +}; static const u16 sFileSelectOam_SamusHeadTurningOn_Frame0[OAM_DATA_SIZE(1)] = { 1, @@ -1860,41 +1866,93 @@ static const struct FrameData sOptionsOam_SmallPanel[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u32 sFileSelectChozoBackgroundGfx[2985] = INCBIN_U32("data/menus/file_select/chozo_background.gfx.lz"); +const u32 sFileSelectChozoBackgroundGfx[2985] = { + #include "extracted/data/menus/file_select/chozo_background.gfx.lz.inc" +}; #ifdef REGION_EU -const u32 sFileSelectAreaNamesGfx[331] = INCBIN_U32("data/menus/file_select/area_names.gfx.lz"); -const u32 sFileSelectBgIconsGfx[651] = INCBIN_U32("data/menus/file_select/bg_icons.gfx.lz"); +const u32 sFileSelectAreaNamesGfx[331] = { + #include "extracted/data/menus/file_select/area_names.gfx.lz.inc" +}; +const u32 sFileSelectBgIconsGfx[651] = { + #include "extracted/data/menus/file_select/bg_icons.gfx.lz.inc" +}; #else // !REGION_EU -const u32 sFileSelectCharactersGfx[1531] = INCBIN_U32("data/menus/file_select/characters.gfx.lz"); +const u32 sFileSelectCharactersGfx[1531] = { + #include "extracted/data/menus/file_select/characters.gfx.lz.inc" +}; #endif // REGION_EU -const u32 sFileSelectOptionsTextEnglishGfx[345] = INCBIN_U32("data/menus/file_select/options_text_english.gfx.lz"); -const u32 sFileSelectOptionsTextGermanGfx[] = INCBIN_U32("data/menus/file_select/options_text_german.gfx.lz"); -const u32 sFileSelectOptionsTextFrenchGfx[] = INCBIN_U32("data/menus/file_select/options_text_french.gfx.lz"); -const u32 sFileSelectOptionsTextItalianGfx[] = INCBIN_U32("data/menus/file_select/options_text_italian.gfx.lz"); -const u32 sFileSelectOptionsTextSpanishGfx[] = INCBIN_U32("data/menus/file_select/options_text_spanish.gfx.lz"); +const u32 sFileSelectOptionsTextEnglishGfx[345] = { + #include "extracted/data/menus/file_select/options_text_english.gfx.lz.inc" +}; +const u32 sFileSelectOptionsTextGermanGfx[] = { + #include "extracted/data/menus/file_select/options_text_german.gfx.lz.inc" +}; +const u32 sFileSelectOptionsTextFrenchGfx[] = { + #include "extracted/data/menus/file_select/options_text_french.gfx.lz.inc" +}; +const u32 sFileSelectOptionsTextItalianGfx[] = { + #include "extracted/data/menus/file_select/options_text_italian.gfx.lz.inc" +}; +const u32 sFileSelectOptionsTextSpanishGfx[] = { + #include "extracted/data/menus/file_select/options_text_spanish.gfx.lz.inc" +}; #ifdef REGION_EU -const u32 sFileSelectLargeTextEnglishGfx[332] = INCBIN_U32("data/menus/file_select/large_text_english.gfx.lz"); -const u32 sFileSelectLargeTextGermanGfx[391] = INCBIN_U32("data/menus/file_select/large_text_german.gfx.lz"); -const u32 sFileSelectLargeTextFrenchGfx[392] = INCBIN_U32("data/menus/file_select/large_text_french.gfx.lz"); -const u32 sFileSelectLargeTextItalianGfx[353] = INCBIN_U32("data/menus/file_select/large_text_italian.gfx.lz"); -const u32 sFileSelectLargeTextSpanishGfx[364] = INCBIN_U32("data/menus/file_select/large_text_spanish.gfx.lz"); - -const u32 sFileSelectDifficultyTextEnglishGfx[67] = INCBIN_U32("data/menus/file_select/difficulty_text_english.gfx.lz"); -const u32 sFileSelectDifficultyTextGermanGfx[70] = INCBIN_U32("data/menus/file_select/difficulty_text_german.gfx.lz"); -const u32 sFileSelectDifficultyTextFrenchGfx[71] = INCBIN_U32("data/menus/file_select/difficulty_text_french.gfx.lz"); -const u32 sFileSelectDifficultyTextItalianGfx[71] = INCBIN_U32("data/menus/file_select/difficulty_text_italian.gfx.lz"); -const u32 sFileSelectDifficultyTextSpanishGfx[70] = INCBIN_U32("data/menus/file_select/difficulty_text_spanish.gfx.lz"); +const u32 sFileSelectLargeTextEnglishGfx[332] = { + #include "extracted/data/menus/file_select/large_text_english.gfx.lz.inc" +}; +const u32 sFileSelectLargeTextGermanGfx[391] = { + #include "extracted/data/menus/file_select/large_text_german.gfx.lz.inc" +}; +const u32 sFileSelectLargeTextFrenchGfx[392] = { + #include "extracted/data/menus/file_select/large_text_french.gfx.lz.inc" +}; +const u32 sFileSelectLargeTextItalianGfx[353] = { + #include "extracted/data/menus/file_select/large_text_italian.gfx.lz.inc" +}; +const u32 sFileSelectLargeTextSpanishGfx[364] = { + #include "extracted/data/menus/file_select/large_text_spanish.gfx.lz.inc" +}; + +const u32 sFileSelectDifficultyTextEnglishGfx[67] = { + #include "extracted/data/menus/file_select/difficulty_text_english.gfx.lz.inc" +}; +const u32 sFileSelectDifficultyTextGermanGfx[70] = { + #include "extracted/data/menus/file_select/difficulty_text_german.gfx.lz.inc" +}; +const u32 sFileSelectDifficultyTextFrenchGfx[71] = { + #include "extracted/data/menus/file_select/difficulty_text_french.gfx.lz.inc" +}; +const u32 sFileSelectDifficultyTextItalianGfx[71] = { + #include "extracted/data/menus/file_select/difficulty_text_italian.gfx.lz.inc" +}; +const u32 sFileSelectDifficultyTextSpanishGfx[70] = { + #include "extracted/data/menus/file_select/difficulty_text_spanish.gfx.lz.inc" +}; #endif // REGION_EU -const u32 sFileSelectObjIconsGfx[1722] = INCBIN_U32("data/menus/file_select/obj_icons.gfx.lz"); -const u32 sFileSelectChozoBackgroundTileTable[368] = INCBIN_U32("data/menus/file_select/chozo_background.tt"); -const u32 sFileSelectMenuTileTable[] = INCBIN_U32("data/menus/file_select/menu.tt"); -const u32 sFileSelectOptionsTileTable[] = INCBIN_U32("data/menus/file_select/options.tt"); -const u32 sFileSelect3BigPanelsTileTable[233] = INCBIN_U32("data/menus/file_select/3_big_panels.tt"); -const u32 sFileSelect1Small2BigPanelsTileTable[233] = INCBIN_U32("data/menus/file_select/1_small2_big_panels.tt"); -const u32 sFileSelect2Big1SmallPanelsTileTable[230] = INCBIN_U32("data/menus/file_select/2_big1_small_panels.tt"); +const u32 sFileSelectObjIconsGfx[1722] = { + #include "extracted/data/menus/file_select/obj_icons.gfx.lz.inc" +}; +const u32 sFileSelectChozoBackgroundTileTable[368] = { + #include "extracted/data/menus/file_select/chozo_background.tt.inc" +}; +const u32 sFileSelectMenuTileTable[] = { + #include "extracted/data/menus/file_select/menu.tt.inc" +}; +const u32 sFileSelectOptionsTileTable[] = { + #include "extracted/data/menus/file_select/options.tt.inc" +}; +const u32 sFileSelect3BigPanelsTileTable[233] = { + #include "extracted/data/menus/file_select/3_big_panels.tt.inc" +}; +const u32 sFileSelect1Small2BigPanelsTileTable[233] = { + #include "extracted/data/menus/file_select/1_small2_big_panels.tt.inc" +}; +const u32 sFileSelect2Big1SmallPanelsTileTable[230] = { + #include "extracted/data/menus/file_select/2_big1_small_panels.tt.inc" +}; const struct MenuOamData sFileSelectOamData_Empty[2] = { [0] = { diff --git a/src/data/menus/game_over_data.c b/src/data/menus/game_over_data.c index 1268ce18c..25a485e72 100644 --- a/src/data/menus/game_over_data.c +++ b/src/data/menus/game_over_data.c @@ -5,17 +5,39 @@ #include "constants/game_over.h" -const u16 sGameOverMenuPal[16 * 5] = INCBIN_U16("data/menus/game_over/palette.pal"); -const u32 sGameOverTextAndBackgroundGfx[2738] = INCBIN_U32("data/menus/game_over/text_and_background.gfx.lz"); -const u32 sGameOverTextPromptEnglishGfx[333] = INCBIN_U32("data/menus/game_over/text_prompt_english.gfx.lz"); -const u32 sGameOverTextPromptHiraganaGfx[428] = INCBIN_U32("data/menus/game_over/text_prompt_hiragana.gfx.lz"); -const u32 sGameOverTextPromptGermanGfx[] = INCBIN_U32("data/menus/game_over/text_prompt_german.gfx.lz"); -const u32 sGameOverTextPromptFrenchGfx[] = INCBIN_U32("data/menus/game_over/text_prompt_french.gfx.lz"); -const u32 sGameOverTextPromptItalianGfx[] = INCBIN_U32("data/menus/game_over/text_prompt_italian.gfx.lz"); -const u32 sGameOverTextPromptSpanishGfx[] = INCBIN_U32("data/menus/game_over/text_prompt_spanish.gfx.lz"); -const u32 sGameOverBackgroundTileTable[370] = INCBIN_U32("data/menus/game_over/background.tt"); -const u32 sGameOverTextTileTable[116] = INCBIN_U32("data/menus/game_over/text.tt"); -const u32 sGameOver_454520[160] = INCBIN_U32("data/menus/game_over/454520.tt"); +const u16 sGameOverMenuPal[16 * 5] = { + #include "extracted/data/menus/game_over/palette.pal.inc" +}; +const u32 sGameOverTextAndBackgroundGfx[2738] = { + #include "extracted/data/menus/game_over/text_and_background.gfx.lz.inc" +}; +const u32 sGameOverTextPromptEnglishGfx[333] = { + #include "extracted/data/menus/game_over/text_prompt_english.gfx.lz.inc" +}; +const u32 sGameOverTextPromptHiraganaGfx[428] = { + #include "extracted/data/menus/game_over/text_prompt_hiragana.gfx.lz.inc" +}; +const u32 sGameOverTextPromptGermanGfx[] = { + #include "extracted/data/menus/game_over/text_prompt_german.gfx.lz.inc" +}; +const u32 sGameOverTextPromptFrenchGfx[] = { + #include "extracted/data/menus/game_over/text_prompt_french.gfx.lz.inc" +}; +const u32 sGameOverTextPromptItalianGfx[] = { + #include "extracted/data/menus/game_over/text_prompt_italian.gfx.lz.inc" +}; +const u32 sGameOverTextPromptSpanishGfx[] = { + #include "extracted/data/menus/game_over/text_prompt_spanish.gfx.lz.inc" +}; +const u32 sGameOverBackgroundTileTable[370] = { + #include "extracted/data/menus/game_over/background.tt.inc" +}; +const u32 sGameOverTextTileTable[116] = { + #include "extracted/data/menus/game_over/text.tt.inc" +}; +const u32 sGameOver_454520[160] = { + #include "extracted/data/menus/game_over/454520.tt.inc" +}; const struct GameOverDynamicPalette sGameOverDynamicPalette_Empty = { .timer = 0, diff --git a/src/data/menus/language_select_data.c b/src/data/menus/language_select_data.c index 1ed8fdf94..b98a5a1d0 100644 --- a/src/data/menus/language_select_data.c +++ b/src/data/menus/language_select_data.c @@ -2,9 +2,15 @@ #ifdef REGION_EU -const u16 sLanguageSelectBgPal[16 * 16] = INCBIN_U16("data/menus/language_select/background.pal"); -const u32 sLanguageSelectGfx[145] = INCBIN_U32("data/menus/language_select/background.gfx.lz"); -const u32 sLanguageSelectTileTable[95] = INCBIN_U32("data/menus/language_select/background.tt"); +const u16 sLanguageSelectBgPal[16 * 16] = { + #include "extracted/data/menus/language_select/background.pal.inc" +}; +const u32 sLanguageSelectGfx[145] = { + #include "extracted/data/menus/language_select/background.gfx.lz.inc" +}; +const u32 sLanguageSelectTileTable[95] = { + #include "extracted/data/menus/language_select/background.tt.inc" +}; const struct LanguageColorAnimation sInitialLanguageColorAnimation = { .timer = 4, diff --git a/src/data/menus/pause_screen_data.c b/src/data/menus/pause_screen_data.c index a3082abd9..7102b4c2f 100644 --- a/src/data/menus/pause_screen_data.c +++ b/src/data/menus/pause_screen_data.c @@ -9,12 +9,22 @@ #include "constants/menus/status_screen.h" -const u16 sPauseScreen_3fcef0[11 * 16] = INCBIN_U16("data/menus/pause_screen/3fcef0.pal"); -const u16 sTankIconsPal[16 * 16] = INCBIN_U16("data/menus/pause_screen/tank_icons.pal"); -const u16 sPauseScreen_3fd250[5 * 16] = INCBIN_U16("data/menus/pause_screen/3fd250.pal"); +const u16 sPauseScreen_3fcef0[11 * 16] = { + #include "extracted/data/menus/pause_screen/3fcef0.pal.inc" +}; +const u16 sTankIconsPal[16 * 16] = { + #include "extracted/data/menus/pause_screen/tank_icons.pal.inc" +}; +const u16 sPauseScreen_3fd250[5 * 16] = { + #include "extracted/data/menus/pause_screen/3fd250.pal.inc" +}; -const u16 sMinimapAnimatedPalette[1 * 16] = INCBIN_U16("data/menus/pause_screen/minimap_animated.pal"); -const u16 sSamusWireframePal[4 * 16] = INCBIN_U16("data/menus/pause_screen/samus_wireframe.pal"); +const u16 sMinimapAnimatedPalette[1 * 16] = { + #include "extracted/data/menus/pause_screen/minimap_animated.pal.inc" +}; +const u16 sSamusWireframePal[4 * 16] = { + #include "extracted/data/menus/pause_screen/samus_wireframe.pal.inc" +}; static const u16 sSamusIconOam_Suit_Frame0[OAM_DATA_SIZE(1)] = { @@ -2780,65 +2790,159 @@ static const struct FrameData sMiscOam_DebugSamusHeadAndArrows[2] = { }; -const u32 sMotifBehindWireframeSamusGfx[278] = INCBIN_U32("data/menus/pause_screen/motif_behind_wireframe_samus.gfx.lz"); -const u32 sPauseScreenHudGfx[1404] = INCBIN_U32("data/menus/pause_screen/pause_screen_hud.gfx.lz"); -const u32 sMinimapLettersGfx[60] = INCBIN_U32("data/menus/pause_screen/minimap_letters.gfx.lz"); +const u32 sMotifBehindWireframeSamusGfx[278] = { + #include "extracted/data/menus/pause_screen/motif_behind_wireframe_samus.gfx.lz.inc" +}; +const u32 sPauseScreenHudGfx[1404] = { + #include "extracted/data/menus/pause_screen/pause_screen_hud.gfx.lz.inc" +}; +const u32 sMinimapLettersGfx[60] = { + #include "extracted/data/menus/pause_screen/minimap_letters.gfx.lz.inc" +}; -const u32 sMenuNamesJapaneseGfx[92] = INCBIN_U32("data/menus/pause_screen/menu_names_japanese.gfx.lz"); -const u32 sEquipmentNamesJapaneseGfx[384] = INCBIN_U32("data/menus/pause_screen/equipment_names_japanese.gfx.lz"); +const u32 sMenuNamesJapaneseGfx[92] = { + #include "extracted/data/menus/pause_screen/menu_names_japanese.gfx.lz.inc" +}; +const u32 sEquipmentNamesJapaneseGfx[384] = { + #include "extracted/data/menus/pause_screen/equipment_names_japanese.gfx.lz.inc" +}; -const u32 sTankIconsGfx[1786] = INCBIN_U32("data/menus/pause_screen/tank_icons.gfx.lz"); +const u32 sTankIconsGfx[1786] = { + #include "extracted/data/menus/pause_screen/tank_icons.gfx.lz.inc" +}; -const u32 sMapScreenAreaNamesEnglishGfx[216] = INCBIN_U32("data/menus/pause_screen/map_screen_area_names_english.gfx.lz"); -const u32 sMapScreenUnknownItemsNamesJapaneseGfx[65] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_japanese.gfx.lz"); -const u32 sMapScreenChozoStatueAreaNamesEnglishGfx[152] = INCBIN_U32("data/menus/pause_screen/map_screen_chozo_statue_area_names_english.gfx.lz"); +const u32 sMapScreenAreaNamesEnglishGfx[216] = { + #include "extracted/data/menus/pause_screen/map_screen_area_names_english.gfx.lz.inc" +}; +const u32 sMapScreenUnknownItemsNamesJapaneseGfx[65] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_japanese.gfx.lz.inc" +}; +const u32 sMapScreenChozoStatueAreaNamesEnglishGfx[152] = { + #include "extracted/data/menus/pause_screen/map_screen_chozo_statue_area_names_english.gfx.lz.inc" +}; -const u32 sChozoHintBackgroundGfx[3618] = INCBIN_U32("data/menus/pause_screen/chozo_hint_background.gfx.lz"); +const u32 sChozoHintBackgroundGfx[3618] = { + #include "extracted/data/menus/pause_screen/chozo_hint_background.gfx.lz.inc" +}; -const u32 sBrinstarMinimap[133] = INCBIN_U32("data/menus/pause_screen/brinstar_minimap.tt"); -const u32 sKraidMinimap[121] = INCBIN_U32("data/menus/pause_screen/kraid_minimap.tt"); -const u32 sNorfairMinimap[153] = INCBIN_U32("data/menus/pause_screen/norfair_minimap.tt"); -const u32 sRidleyMinimap[120] = INCBIN_U32("data/menus/pause_screen/ridley_minimap.tt"); -const u32 sTourianMinimap[91] = INCBIN_U32("data/menus/pause_screen/tourian_minimap.tt"); -const u32 sCrateriaMinimap[114] = INCBIN_U32("data/menus/pause_screen/crateria_minimap.tt"); -const u32 sChozodiaMinimap[194] = INCBIN_U32("data/menus/pause_screen/chozodia_minimap.tt"); -const u32 sTestMinimap[78] = INCBIN_U32("data/menus/pause_screen/test_minimap.tt"); +const u32 sBrinstarMinimap[133] = { + #include "extracted/data/menus/pause_screen/brinstar_minimap.tt.inc" +}; +const u32 sKraidMinimap[121] = { + #include "extracted/data/menus/pause_screen/kraid_minimap.tt.inc" +}; +const u32 sNorfairMinimap[153] = { + #include "extracted/data/menus/pause_screen/norfair_minimap.tt.inc" +}; +const u32 sRidleyMinimap[120] = { + #include "extracted/data/menus/pause_screen/ridley_minimap.tt.inc" +}; +const u32 sTourianMinimap[91] = { + #include "extracted/data/menus/pause_screen/tourian_minimap.tt.inc" +}; +const u32 sCrateriaMinimap[114] = { + #include "extracted/data/menus/pause_screen/crateria_minimap.tt.inc" +}; +const u32 sChozodiaMinimap[194] = { + #include "extracted/data/menus/pause_screen/chozodia_minimap.tt.inc" +}; +const u32 sTestMinimap[78] = { + #include "extracted/data/menus/pause_screen/test_minimap.tt.inc" +}; -const u32 sDebugMenuTileParts[175] = INCBIN_U32("data/menus/pause_screen/debug_menu_tile_parts.tt"); -const u32 sMapScreenVisorOverlayTilemap[122] = INCBIN_U32("data/menus/pause_screen/map_screen_visor_overlay.tt"); -const u32 sMapScreenOverlayTilemap[125] = INCBIN_U32("data/menus/pause_screen/map_screen_overlay.tt"); -const u32 sWorldMapOverlayTilemap[206] = INCBIN_U32("data/menus/pause_screen/world_map_overlay.tt"); -const u32 sStatusScreenTilemap[264] = INCBIN_U32("data/menus/pause_screen/status_screen.tt"); -const u32 sEasySleepTilemap[196] = INCBIN_U32("data/menus/pause_screen/easy_sleep.tt"); -const u32 sStatusScreenBackgroundTilemap[169] = INCBIN_U32("data/menus/pause_screen/status_screen_background.tt"); -const u32 sMapScreenTextBg0TileTable[92] = INCBIN_U32("data/menus/pause_screen/map_screen_text_bg0.tt"); -const u32 sChozoHintBackgroundTileTable[577] = INCBIN_U32("data/menus/pause_screen/chozo_hint_background.tt"); +const u32 sDebugMenuTileParts[175] = { + #include "extracted/data/menus/pause_screen/debug_menu_tile_parts.tt.inc" +}; +const u32 sMapScreenVisorOverlayTilemap[122] = { + #include "extracted/data/menus/pause_screen/map_screen_visor_overlay.tt.inc" +}; +const u32 sMapScreenOverlayTilemap[125] = { + #include "extracted/data/menus/pause_screen/map_screen_overlay.tt.inc" +}; +const u32 sWorldMapOverlayTilemap[206] = { + #include "extracted/data/menus/pause_screen/world_map_overlay.tt.inc" +}; +const u32 sStatusScreenTilemap[264] = { + #include "extracted/data/menus/pause_screen/status_screen.tt.inc" +}; +const u32 sEasySleepTilemap[196] = { + #include "extracted/data/menus/pause_screen/easy_sleep.tt.inc" +}; +const u32 sStatusScreenBackgroundTilemap[169] = { + #include "extracted/data/menus/pause_screen/status_screen_background.tt.inc" +}; +const u32 sMapScreenTextBg0TileTable[92] = { + #include "extracted/data/menus/pause_screen/map_screen_text_bg0.tt.inc" +}; +const u32 sChozoHintBackgroundTileTable[577] = { + #include "extracted/data/menus/pause_screen/chozo_hint_background.tt.inc" +}; -const u32 sEquipmentNamesHiraganaGfx[411] = INCBIN_U32("data/menus/pause_screen/equipment_names_hiragana.gfx.lz"); -const u32 sEquipmentNamesEnglishGfx[380] = INCBIN_U32("data/menus/pause_screen/equipment_names_english.gfx.lz"); -const u32 sEquipmentNamesGermanGfx[] = INCBIN_U32("data/menus/pause_screen/equipment_names_german.gfx.lz"); -const u32 sEquipmentNamesFrenchGfx[] = INCBIN_U32("data/menus/pause_screen/equipment_names_french.gfx.lz"); -const u32 sEquipmentNamesItalianGfx[] = INCBIN_U32("data/menus/pause_screen/equipment_names_italian.gfx.lz"); -const u32 sEquipmentNamesSpanishGfx[] = INCBIN_U32("data/menus/pause_screen/equipment_names_spanish.gfx.lz"); +const u32 sEquipmentNamesHiraganaGfx[411] = { + #include "extracted/data/menus/pause_screen/equipment_names_hiragana.gfx.lz.inc" +}; +const u32 sEquipmentNamesEnglishGfx[380] = { + #include "extracted/data/menus/pause_screen/equipment_names_english.gfx.lz.inc" +}; +const u32 sEquipmentNamesGermanGfx[] = { + #include "extracted/data/menus/pause_screen/equipment_names_german.gfx.lz.inc" +}; +const u32 sEquipmentNamesFrenchGfx[] = { + #include "extracted/data/menus/pause_screen/equipment_names_french.gfx.lz.inc" +}; +const u32 sEquipmentNamesItalianGfx[] = { + #include "extracted/data/menus/pause_screen/equipment_names_italian.gfx.lz.inc" +}; +const u32 sEquipmentNamesSpanishGfx[] = { + #include "extracted/data/menus/pause_screen/equipment_names_spanish.gfx.lz.inc" +}; -const u32 sMapScreenAreaNamesHiraganaGfx[198] = INCBIN_U32("data/menus/pause_screen/map_screen_area_names_hiragana.gfx.lz"); +const u32 sMapScreenAreaNamesHiraganaGfx[198] = { + #include "extracted/data/menus/pause_screen/map_screen_area_names_hiragana.gfx.lz.inc" +}; -const u32 sMenuNamesHiraganaGfx[113] = INCBIN_U32("data/menus/pause_screen/menu_names_hiragana.gfx.lz"); -const u32 sMenuNamesEnglishGfx[92] = INCBIN_U32("data/menus/pause_screen/menu_names_english.gfx.lz"); -const u32 sMenuNamesGermanGfx[97] = INCBIN_U32("data/menus/pause_screen/menu_names_german.gfx.lz"); -const u32 sMenuNamesFrenchGfx[91] = INCBIN_U32("data/menus/pause_screen/menu_names_french.gfx.lz"); -const u32 sMenuNamesItalianGfx[] = INCBIN_U32("data/menus/pause_screen/menu_names_italian.gfx.lz"); -const u32 sMenuNamesSpanishGfx[] = INCBIN_U32("data/menus/pause_screen/menu_names_spanish.gfx.lz"); +const u32 sMenuNamesHiraganaGfx[113] = { + #include "extracted/data/menus/pause_screen/menu_names_hiragana.gfx.lz.inc" +}; +const u32 sMenuNamesEnglishGfx[92] = { + #include "extracted/data/menus/pause_screen/menu_names_english.gfx.lz.inc" +}; +const u32 sMenuNamesGermanGfx[97] = { + #include "extracted/data/menus/pause_screen/menu_names_german.gfx.lz.inc" +}; +const u32 sMenuNamesFrenchGfx[91] = { + #include "extracted/data/menus/pause_screen/menu_names_french.gfx.lz.inc" +}; +const u32 sMenuNamesItalianGfx[] = { + #include "extracted/data/menus/pause_screen/menu_names_italian.gfx.lz.inc" +}; +const u32 sMenuNamesSpanishGfx[] = { + #include "extracted/data/menus/pause_screen/menu_names_spanish.gfx.lz.inc" +}; -const u32 sMapScreenUnknownItemsNamesHiraganaGfx[76] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_hiragana.gfx.lz"); -const u32 sMapScreenUnknownItemsNamesEnglishGfx[65] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_english.gfx.lz"); -const u32 sMapScreenUnknownItemsNamesGermanGfx[] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_german.gfx.lz"); -const u32 sMapScreenUnknownItemsNamesFrenchGfx[] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_french.gfx.lz"); -const u32 sMapScreenUnknownItemsNamesItalianGfx[] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_italian.gfx.lz"); -const u32 sMapScreenUnknownItemsNamesSpanishGfx[] = INCBIN_U32("data/menus/pause_screen/map_screen_unknown_items_names_spanish.gfx.lz"); +const u32 sMapScreenUnknownItemsNamesHiraganaGfx[76] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_hiragana.gfx.lz.inc" +}; +const u32 sMapScreenUnknownItemsNamesEnglishGfx[65] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_english.gfx.lz.inc" +}; +const u32 sMapScreenUnknownItemsNamesGermanGfx[] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_german.gfx.lz.inc" +}; +const u32 sMapScreenUnknownItemsNamesFrenchGfx[] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_french.gfx.lz.inc" +}; +const u32 sMapScreenUnknownItemsNamesItalianGfx[] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_italian.gfx.lz.inc" +}; +const u32 sMapScreenUnknownItemsNamesSpanishGfx[] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_spanish.gfx.lz.inc" +}; -const u32 sMapScreenChozoStatueAreaNamesHiraganaGfx[154] = INCBIN_U32("data/menus/pause_screen/map_screen_chozo_statue_area_names_hiragana.gfx.lz"); +const u32 sMapScreenChozoStatueAreaNamesHiraganaGfx[154] = { + #include "extracted/data/menus/pause_screen/map_screen_chozo_statue_area_names_hiragana.gfx.lz.inc" +}; const struct MenuOamData sMenuOamData_Empty = { .yPosition = 0, @@ -4006,8 +4110,12 @@ const struct MinimapAreaName sMinimapAreaNames[10] = { } }; -const u8 sPauseScreen_40d6fc[80] = INCBIN_U8("data/menus/pause_screen/40d6fc.gfx"); -const u8 sPauseScreen_40d74c[80] = INCBIN_U8("data/menus/pause_screen/40d74c.gfx"); +const u8 sPauseScreen_40d6fc[80] = { + #include "extracted/data/menus/pause_screen/40d6fc.gfx.inc" +}; +const u8 sPauseScreen_40d74c[80] = { + #include "extracted/data/menus/pause_screen/40d74c.gfx.inc" +}; u8* const sPauseScreen_IgtAndTanksVramAddresses[IGT_AND_TANKS_VRAM_ADDRESS_COUNT] = { [IGT_AND_TANKS_VRAM_ADDRESS_ENERGY_TANKS] = VRAM_BASE + 0x16360, @@ -4232,9 +4340,15 @@ const struct Message sMessageDescription_Empty = { .messageEnded = FALSE }; -const u16 sPauseScreen_40dc90[1 * 16] = INCBIN_U16("data/menus/pause_screen/40dc90.pal"); -const u16 sPauseScreen_40dcb0[1 * 16] = INCBIN_U16("data/menus/pause_screen/40dcb0.pal"); -const u16 sPauseScreen_40dcd0[1 * 16] = INCBIN_U16("data/menus/pause_screen/40dcd0.pal"); +const u16 sPauseScreen_40dc90[1 * 16] = { + #include "extracted/data/menus/pause_screen/40dc90.pal.inc" +}; +const u16 sPauseScreen_40dcb0[1 * 16] = { + #include "extracted/data/menus/pause_screen/40dcb0.pal.inc" +}; +const u16 sPauseScreen_40dcd0[1 * 16] = { + #include "extracted/data/menus/pause_screen/40dcd0.pal.inc" +}; const u8 sPauseScreen_40dcf0[4] = { 32, 16, 16, 16 diff --git a/src/data/menus/pause_screen_map_data.c b/src/data/menus/pause_screen_map_data.c index f0949f0e8..ae0c864b6 100644 --- a/src/data/menus/pause_screen_map_data.c +++ b/src/data/menus/pause_screen_map_data.c @@ -1,8 +1,18 @@ #include "data/menus/pause_screen_map_data.h" #include "macros.h" -const u8 sMinimapTilesGfx[5120] = INCBIN_U8("data/menus/pause_screen/minimap_tiles.gfx"); -const u32 sPauseScreen_40f4c4[1792] = INCBIN_U32("data/menus/pause_screen/40f4c4.gfx"); -const u32 sMinimapTilesAreaNamesEnglishGfx[79] = INCBIN_U32("data/menus/pause_screen/minimap_tiles_area_names_english.gfx.lz"); -const u32 sMinimapTilesAreaNamesHiraganaGfx[88] = INCBIN_U32("data/menus/pause_screen/minimap_tiles_area_names_hiragana.gfx.lz"); -const u16 sMinimapTilesPal[5 * 16] = INCBIN_U16("data/menus/pause_screen/minimap_tiles.pal"); +const u8 sMinimapTilesGfx[5120] = { + #include "extracted/data/menus/pause_screen/minimap_tiles.gfx.inc" +}; +const u32 sPauseScreen_40f4c4[1792] = { + #include "extracted/data/menus/pause_screen/40f4c4.gfx.inc" +}; +const u32 sMinimapTilesAreaNamesEnglishGfx[79] = { + #include "extracted/data/menus/pause_screen/minimap_tiles_area_names_english.gfx.lz.inc" +}; +const u32 sMinimapTilesAreaNamesHiraganaGfx[88] = { + #include "extracted/data/menus/pause_screen/minimap_tiles_area_names_hiragana.gfx.lz.inc" +}; +const u16 sMinimapTilesPal[5 * 16] = { + #include "extracted/data/menus/pause_screen/minimap_tiles.pal.inc" +}; diff --git a/src/data/menus/status_screen_data.c b/src/data/menus/status_screen_data.c index 69e728ea4..1ab9c0428 100644 --- a/src/data/menus/status_screen_data.c +++ b/src/data/menus/status_screen_data.c @@ -5,8 +5,12 @@ #ifdef DEBUG -const u16 sPauseDebugEventListBgPalette[2 * 16] = INCBIN_U16("data/menus/pause_screen/pause_debug_event_list_bg.pal"); -const u32 sPauseDebugEventListTextGfx[336] = INCBIN_U32("data/menus/pause_screen/pause_debug_event_list_text.gfx.lz"); +const u16 sPauseDebugEventListBgPalette[2 * 16] = { + #include "extracted/data/menus/pause_screen/pause_debug_event_list_bg.pal.inc" +}; +const u32 sPauseDebugEventListTextGfx[336] = { + #include "extracted/data/menus/pause_screen/pause_debug_event_list_text.gfx.lz.inc" +}; const u8 sPauseDebug_Event4E_Text[32] = SHIFT_JIS("END エンド "); const u8 sPauseDebug_Event4D_Text[32] = SHIFT_JIS("BOMBGATE アキ ボムゲート "); @@ -371,8 +375,12 @@ const struct PauseDebugEnergyAmmoInfo sPauseDebugEnergyAmmoInfo[8] = { #endif // DEBUG -const u16 sStatusScreenUnknownItemsWhiteFlashingPal[6 * 16] = INCBIN_U16("data/menus/pause_screen/map_screen_unknown_items_flashing.pal"); -const u16 sStatusScreenUnknownItemsNamesFlashingPal[4 * 16] = INCBIN_U16("data/menus/pause_screen/map_screen_unknown_items_names_flashing.pal"); +const u16 sStatusScreenUnknownItemsWhiteFlashingPal[6 * 16] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_flashing.pal.inc" +}; +const u16 sStatusScreenUnknownItemsNamesFlashingPal[4 * 16] = { + #include "extracted/data/menus/pause_screen/map_screen_unknown_items_names_flashing.pal.inc" +}; const struct StatusScreenGroupPositions sStatusScreenGroupsPositions[ABILITY_GROUP_COUNT] = { [ABILITY_GROUP_BEAMS] = { diff --git a/src/data/menus/title_screen_data.c b/src/data/menus/title_screen_data.c index 766c17f18..32527bea1 100644 --- a/src/data/menus/title_screen_data.c +++ b/src/data/menus/title_screen_data.c @@ -2,11 +2,17 @@ #include "gba.h" #include "macros.h" -const u16 sTitleScreenPal[15 * 16] = INCBIN_U16("data/menus/title_screen/palette.pal"); -const u16 sTitleScreenPromptPal[5 * 16] = INCBIN_U16("data/menus/title_screen/prompt.pal"); +const u16 sTitleScreenPal[15 * 16] = { + #include "extracted/data/menus/title_screen/palette.pal.inc" +}; +const u16 sTitleScreenPromptPal[5 * 16] = { + #include "extracted/data/menus/title_screen/prompt.pal.inc" +}; #ifdef REGION_EU -const u16 sTitleScreenUnselectedMenuPal[1 * 16] = INCBIN_U16("data/menus/title_screen/unselected_menu.pal"); +const u16 sTitleScreenUnselectedMenuPal[1 * 16] = { + #include "extracted/data/menus/title_screen/unselected_menu.pal.inc" +}; #endif // REGION_EU static const u16 sTitleScreenOam_Comet_Frame0[OAM_DATA_SIZE(1)] = { @@ -143,27 +149,61 @@ static const struct FrameData sTitleScreenOam_SparkleDisappearing[6] = { [5] = FRAME_DATA_TERMINATOR }; -const u32 sTitleScreenTitleGfx[1095] = INCBIN_U32("data/menus/title_screen/title.gfx.lz"); -const u32 sTitleScreenSparklesGfx[256] = INCBIN_U32("data/menus/title_screen/sparkles.gfx.lz"); -const u32 sTitleScreenSpaceBackgroundGfx[3203] = INCBIN_U32("data/menus/title_screen/space_background.gfx.lz"); -const u32 sTitleScreenSpaceBackgroundDecorationGfx[797] = INCBIN_U32("data/menus/title_screen/space_background_decoration.gfx.lz"); -const u32 sTitleScreenSpaceAndGroundBackgroundGfx[1920] = INCBIN_U32("data/menus/title_screen/space_and_ground_background.gfx.lz"); +const u32 sTitleScreenTitleGfx[1095] = { + #include "extracted/data/menus/title_screen/title.gfx.lz.inc" +}; +const u32 sTitleScreenSparklesGfx[256] = { + #include "extracted/data/menus/title_screen/sparkles.gfx.lz.inc" +}; +const u32 sTitleScreenSpaceBackgroundGfx[3203] = { + #include "extracted/data/menus/title_screen/space_background.gfx.lz.inc" +}; +const u32 sTitleScreenSpaceBackgroundDecorationGfx[797] = { + #include "extracted/data/menus/title_screen/space_background_decoration.gfx.lz.inc" +}; +const u32 sTitleScreenSpaceAndGroundBackgroundGfx[1920] = { + #include "extracted/data/menus/title_screen/space_and_ground_background.gfx.lz.inc" +}; #ifdef REGION_EU -const u32 sTitleScreenEnglishMenuGfx_Top[85] = INCBIN_U32("data/menus/title_screen/english_menu_top.gfx.lz"); -const u32 sTitleScreenEnglishMenuGfx_Bottom[72] = INCBIN_U32("data/menus/title_screen/english_menu_bottom.gfx.lz"); -const u32 sTitleScreenGermanMenuGfx_Top[89] = INCBIN_U32("data/menus/title_screen/german_menu_top.gfx.lz"); -const u32 sTitleScreenGermanMenuGfx_Bottom[75] = INCBIN_U32("data/menus/title_screen/german_menu_bottom.gfx.lz"); -const u32 sTitleScreenFrenchMenuGfx_Top[63] = INCBIN_U32("data/menus/title_screen/french_menu_top.gfx.lz"); -const u32 sTitleScreenFrenchMenuGfx_Bottom[55] = INCBIN_U32("data/menus/title_screen/french_menu_bottom.gfx.lz"); -const u32 sTitleScreenItalianMenuGfx_Top[79] = INCBIN_U32("data/menus/title_screen/italian_menu_top.gfx.lz"); -const u32 sTitleScreenItalianMenuGfx_Bottom[62] = INCBIN_U32("data/menus/title_screen/italian_menu_bottom.gfx.lz"); -const u32 sTitleScreenSpanishMenuGfx_Top[64] = INCBIN_U32("data/menus/title_screen/spanish_menu_top.gfx.lz"); -const u32 sTitleScreenSpanishMenuGfx_Bottom[45] = INCBIN_U32("data/menus/title_screen/spanish_menu_bottom.gfx.lz"); +const u32 sTitleScreenEnglishMenuGfx_Top[85] = { + #include "extracted/data/menus/title_screen/english_menu_top.gfx.lz.inc" +}; +const u32 sTitleScreenEnglishMenuGfx_Bottom[72] = { + #include "extracted/data/menus/title_screen/english_menu_bottom.gfx.lz.inc" +}; +const u32 sTitleScreenGermanMenuGfx_Top[89] = { + #include "extracted/data/menus/title_screen/german_menu_top.gfx.lz.inc" +}; +const u32 sTitleScreenGermanMenuGfx_Bottom[75] = { + #include "extracted/data/menus/title_screen/german_menu_bottom.gfx.lz.inc" +}; +const u32 sTitleScreenFrenchMenuGfx_Top[63] = { + #include "extracted/data/menus/title_screen/french_menu_top.gfx.lz.inc" +}; +const u32 sTitleScreenFrenchMenuGfx_Bottom[55] = { + #include "extracted/data/menus/title_screen/french_menu_bottom.gfx.lz.inc" +}; +const u32 sTitleScreenItalianMenuGfx_Top[79] = { + #include "extracted/data/menus/title_screen/italian_menu_top.gfx.lz.inc" +}; +const u32 sTitleScreenItalianMenuGfx_Bottom[62] = { + #include "extracted/data/menus/title_screen/italian_menu_bottom.gfx.lz.inc" +}; +const u32 sTitleScreenSpanishMenuGfx_Top[64] = { + #include "extracted/data/menus/title_screen/spanish_menu_top.gfx.lz.inc" +}; +const u32 sTitleScreenSpanishMenuGfx_Bottom[45] = { + #include "extracted/data/menus/title_screen/spanish_menu_bottom.gfx.lz.inc" +}; #endif // REGION_EU -const u32 sTitleScreenTitleTileTable[] = INCBIN_U32("data/menus/title_screen/title.tt"); -const u32 sTitleScreenSpaceBackgroundTileTable[702] = INCBIN_U32("data/menus/title_screen/space_background.tt"); +const u32 sTitleScreenTitleTileTable[] = { + #include "extracted/data/menus/title_screen/title.tt.inc" +}; +const u32 sTitleScreenSpaceBackgroundTileTable[702] = { + #include "extracted/data/menus/title_screen/space_background.tt.inc" +}; const u8 sTitleScreenRomInfoPosition[4] = { BLOCK_SIZE * 2 + 8, BLOCK_SIZE + QUARTER_BLOCK_SIZE, 'P', 'x' diff --git a/src/data/nes_metroid.c b/src/data/nes_metroid.c index 88f341b37..86c42d1ac 100644 --- a/src/data/nes_metroid.c +++ b/src/data/nes_metroid.c @@ -31,7 +31,9 @@ const u8 sNesMetroidData_Text[18] = { '\0', '\0', '\0', '\0', '0', '1' }; -const u8 sNesMetroidData[] = INCBIN_U8("data/nes_metroid.bin"); +const u8 sNesMetroidData[] = { + #include "extracted/data/nes_metroid.bin.inc" +}; #if defined(REGION_US_BETA) static const u8 sNesMetroidDataEnd[20] = { diff --git a/src/data/projectile_data.c b/src/data/projectile_data.c index 3545dd3bd..ed4b1284c 100644 --- a/src/data/projectile_data.c +++ b/src/data/projectile_data.c @@ -532,12 +532,22 @@ const struct FrameData sParticleSuperMissileTrailOam[9] = { [8] = FRAME_DATA_TERMINATOR }; -const u16 sBeamPal[16 * 6] = INCBIN_U16("data/weapons/beams.pal"); +const u16 sBeamPal[16 * 6] = { + #include "extracted/data/weapons/beams.pal.inc" +}; -const u8 sNormalBeamGfx_Top[512] = INCBIN_U8("data/weapons/normal_beam_top.gfx"); -const u8 sNormalBeamGfx_Bottom[512] = INCBIN_U8("data/weapons/normal_beam_bottom.gfx"); -const u8 sNormalBeamGfx_Charged_Top[512] = INCBIN_U8("data/weapons/normal_beam_charged_top.gfx"); -const u8 sNormalBeamGfx_Charged_Bottom[512] = INCBIN_U8("data/weapons/normal_beam_charged_bottom.gfx"); +const u8 sNormalBeamGfx_Top[512] = { + #include "extracted/data/weapons/normal_beam_top.gfx.inc" +}; +const u8 sNormalBeamGfx_Bottom[512] = { + #include "extracted/data/weapons/normal_beam_bottom.gfx.inc" +}; +const u8 sNormalBeamGfx_Charged_Top[512] = { + #include "extracted/data/weapons/normal_beam_charged_top.gfx.inc" +}; +const u8 sNormalBeamGfx_Charged_Bottom[512] = { + #include "extracted/data/weapons/normal_beam_charged_bottom.gfx.inc" +}; static const u16 sNormalBeamOam_Horizontal_Frame0[OAM_DATA_SIZE(1)] = { 1, @@ -786,10 +796,18 @@ const struct FrameData sChargedNormalBeamOam_Horizontal_Unused[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u8 sLongBeamGfx_Top[512] = INCBIN_U8("data/weapons/long_beam_top.gfx"); -const u8 sLongBeamGfx_Bottom[512] = INCBIN_U8("data/weapons/long_beam_bottom.gfx"); -const u8 sLongBeamGfx_Charged_Top[512] = INCBIN_U8("data/weapons/long_beam_charged_top.gfx"); -const u8 sLongBeamGfx_Charged_Bottom[512] = INCBIN_U8("data/weapons/long_beam_charged_bottom.gfx"); +const u8 sLongBeamGfx_Top[512] = { + #include "extracted/data/weapons/long_beam_top.gfx.inc" +}; +const u8 sLongBeamGfx_Bottom[512] = { + #include "extracted/data/weapons/long_beam_bottom.gfx.inc" +}; +const u8 sLongBeamGfx_Charged_Top[512] = { + #include "extracted/data/weapons/long_beam_charged_top.gfx.inc" +}; +const u8 sLongBeamGfx_Charged_Bottom[512] = { + #include "extracted/data/weapons/long_beam_charged_bottom.gfx.inc" +}; static const u16 sLongBeamOam_Horizontal_Frame0[OAM_DATA_SIZE(1)] = { 1, @@ -972,10 +990,18 @@ const struct FrameData sParticleChargedLongBeamTrailOam[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u8 sIceBeamGfx_Top[512] = INCBIN_U8("data/weapons/ice_beam_top.gfx"); -const u8 sIceBeamGfx_Bottom[512] = INCBIN_U8("data/weapons/ice_beam_bottom.gfx"); -const u8 sIceBeamGfx_Charged_Top[512] = INCBIN_U8("data/weapons/ice_beam_charged_top.gfx"); -const u8 sIceBeamGfx_Charged_Bottom[512] = INCBIN_U8("data/weapons/ice_beam_charged_bottom.gfx"); +const u8 sIceBeamGfx_Top[512] = { + #include "extracted/data/weapons/ice_beam_top.gfx.inc" +}; +const u8 sIceBeamGfx_Bottom[512] = { + #include "extracted/data/weapons/ice_beam_bottom.gfx.inc" +}; +const u8 sIceBeamGfx_Charged_Top[512] = { + #include "extracted/data/weapons/ice_beam_charged_top.gfx.inc" +}; +const u8 sIceBeamGfx_Charged_Bottom[512] = { + #include "extracted/data/weapons/ice_beam_charged_bottom.gfx.inc" +}; static const u16 sIceBeamOam_Horizontal_Frame0[OAM_DATA_SIZE(1)] = { 1, @@ -1243,10 +1269,18 @@ const struct FrameData sParticleChargedIceBeamTrailOam[6] = { [5] = FRAME_DATA_TERMINATOR }; -const u8 sWaveBeamGfx_Top[512] = INCBIN_U8("data/weapons/wave_beam_top.gfx"); -const u8 sWaveBeamGfx_Bottom[512] = INCBIN_U8("data/weapons/wave_beam_bottom.gfx"); -const u8 sWaveBeamGfx_Charged_Top[512] = INCBIN_U8("data/weapons/wave_beam_charged_top.gfx"); -const u8 sWaveBeamGfx_Charged_Bottom[512] = INCBIN_U8("data/weapons/wave_beam_charged_bottom.gfx"); +const u8 sWaveBeamGfx_Top[512] = { + #include "extracted/data/weapons/wave_beam_top.gfx.inc" +}; +const u8 sWaveBeamGfx_Bottom[512] = { + #include "extracted/data/weapons/wave_beam_bottom.gfx.inc" +}; +const u8 sWaveBeamGfx_Charged_Top[512] = { + #include "extracted/data/weapons/wave_beam_charged_top.gfx.inc" +}; +const u8 sWaveBeamGfx_Charged_Bottom[512] = { + #include "extracted/data/weapons/wave_beam_charged_bottom.gfx.inc" +}; static const u16 sWaveBeamOam_Horizontal_Frame0[OAM_DATA_SIZE(1)] = { 1, @@ -2024,10 +2058,18 @@ const struct FrameData sParticleChargedWaveBeamTrailOam[5] = { [4] = FRAME_DATA_TERMINATOR }; -const u8 sPlasmaBeamGfx_Top[512] = INCBIN_U8("data/weapons/plasma_beam_top.gfx"); -const u8 sPlasmaBeamGfx_Bottom[512] = INCBIN_U8("data/weapons/plasma_beam_bottom.gfx"); -const u8 sPlasmaBeamGfx_Charged_Top[512] = INCBIN_U8("data/weapons/plasma_beam_charged_top.gfx"); -const u8 sPlasmaBeamGfx_Charged_Bottom[512] = INCBIN_U8("data/weapons/plasma_beam_charged_bottom.gfx"); +const u8 sPlasmaBeamGfx_Top[512] = { + #include "extracted/data/weapons/plasma_beam_top.gfx.inc" +}; +const u8 sPlasmaBeamGfx_Bottom[512] = { + #include "extracted/data/weapons/plasma_beam_bottom.gfx.inc" +}; +const u8 sPlasmaBeamGfx_Charged_Top[512] = { + #include "extracted/data/weapons/plasma_beam_charged_top.gfx.inc" +}; +const u8 sPlasmaBeamGfx_Charged_Bottom[512] = { + #include "extracted/data/weapons/plasma_beam_charged_bottom.gfx.inc" +}; static const u16 sPlasmaBeamOam_Horizontal_NoWave_Frame0[OAM_DATA_SIZE(1)] = { 1, @@ -2964,10 +3006,18 @@ const struct FrameData sParticleChargedFullBeamTrailOam[9] = { [8] = FRAME_DATA_TERMINATOR }; -const u8 sPistolGfx_Top[512] = INCBIN_U8("data/weapons/pistol_top.gfx"); -const u8 sPistolGfx_Bottom[512] = INCBIN_U8("data/weapons/pistol_bottom.gfx"); -const u8 sPistolGfx_Charged_Top[512] = INCBIN_U8("data/weapons/pistol_charged_top.gfx"); -const u8 sPistolGfx_Charged_Bottom[512] = INCBIN_U8("data/weapons/pistol_charged_bottom.gfx"); +const u8 sPistolGfx_Top[512] = { + #include "extracted/data/weapons/pistol_top.gfx.inc" +}; +const u8 sPistolGfx_Bottom[512] = { + #include "extracted/data/weapons/pistol_bottom.gfx.inc" +}; +const u8 sPistolGfx_Charged_Top[512] = { + #include "extracted/data/weapons/pistol_charged_top.gfx.inc" +}; +const u8 sPistolGfx_Charged_Bottom[512] = { + #include "extracted/data/weapons/pistol_charged_bottom.gfx.inc" +}; static const u16 sPistolOam_Horizontal_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/rooms/brinstar/bg3.c b/src/data/rooms/brinstar/bg3.c index 5dc92fcbf..b9154a7ec 100644 --- a/src/data/rooms/brinstar/bg3.c +++ b/src/data/rooms/brinstar/bg3.c @@ -1,24 +1,46 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_Bg3_0[1564] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_0.gfx"); +const u8 sBrinstar_Bg3_0[1564] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_0.gfx.inc" +}; -const u8 sBrinstar_Bg3_1[1600] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_1.gfx"); +const u8 sBrinstar_Bg3_1[1600] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_1.gfx.inc" +}; -const u8 sBrinstar_Bg3_2[1756] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_2.gfx"); +const u8 sBrinstar_Bg3_2[1756] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_2.gfx.inc" +}; -const u8 sBrinstar_Bg3_3[1360] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_3.gfx"); +const u8 sBrinstar_Bg3_3[1360] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_3.gfx.inc" +}; -const u8 sBrinstar_Bg3_4[1620] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_4.gfx"); +const u8 sBrinstar_Bg3_4[1620] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_4.gfx.inc" +}; -const u8 sBrinstar_Bg3_5[2168] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_5.gfx"); +const u8 sBrinstar_Bg3_5[2168] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_5.gfx.inc" +}; -const u8 sBrinstar_Bg3_6[928] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_6.gfx"); +const u8 sBrinstar_Bg3_6[928] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_6.gfx.inc" +}; -const u8 sBrinstar_Bg3_7[2020] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_7.gfx"); +const u8 sBrinstar_Bg3_7[2020] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_7.gfx.inc" +}; -const u8 sBrinstar_Bg3_8[1164] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_8.gfx"); +const u8 sBrinstar_Bg3_8[1164] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_8.gfx.inc" +}; -const u8 sBrinstar_Bg3_9[1360] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_9.gfx"); +const u8 sBrinstar_Bg3_9[1360] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_9.gfx.inc" +}; -const u8 sBrinstar_Bg3_10[1200] = INCBIN_U8("data/rooms/brinstar/brinstar_bg3_10.gfx"); +const u8 sBrinstar_Bg3_10[1200] = { + #include "extracted/data/rooms/brinstar/brinstar_bg3_10.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_0.c b/src/data/rooms/brinstar/brinstar_0.c index a0231430b..ebfd1b0ca 100644 --- a/src/data/rooms/brinstar/brinstar_0.c +++ b/src/data/rooms/brinstar/brinstar_0.c @@ -27,9 +27,13 @@ const u8 sBrinstar_0_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_0_Clipdata[311] = INCBIN_U8("data/rooms/brinstar/brinstar_0_clipdata.gfx"); +const u8 sBrinstar_0_Clipdata[311] = { + #include "extracted/data/rooms/brinstar/brinstar_0_clipdata.gfx.inc" +}; -const u8 sBrinstar_0_Bg2[124] = INCBIN_U8("data/rooms/brinstar/brinstar_0_bg2.gfx"); +const u8 sBrinstar_0_Bg2[124] = { + #include "extracted/data/rooms/brinstar/brinstar_0_bg2.gfx.inc" +}; const u8 sBrinstar_0_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 22, 27, SPRITESET_IDX(4), @@ -43,7 +47,9 @@ const u8 sBrinstar_0_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_0_Bg1[1328] = INCBIN_U8("data/rooms/brinstar/brinstar_0_bg1.gfx"); +const u8 sBrinstar_0_Bg1[1328] = { + #include "extracted/data/rooms/brinstar/brinstar_0_bg1.gfx.inc" +}; const u8 sBrinstar_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 22, 27, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_1.c b/src/data/rooms/brinstar/brinstar_1.c index 1ea9a07cb..1a6990a4b 100644 --- a/src/data/rooms/brinstar/brinstar_1.c +++ b/src/data/rooms/brinstar/brinstar_1.c @@ -27,9 +27,13 @@ const u8 sBrinstar_1_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_1_Clipdata[317] = INCBIN_U8("data/rooms/brinstar/brinstar_1_clipdata.gfx"); +const u8 sBrinstar_1_Clipdata[317] = { + #include "extracted/data/rooms/brinstar/brinstar_1_clipdata.gfx.inc" +}; -const u8 sBrinstar_1_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_1_bg2.gfx"); +const u8 sBrinstar_1_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_1_bg2.gfx.inc" +}; const u8 sBrinstar_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 16, 6, SPRITESET_IDX(5), @@ -49,7 +53,9 @@ const u8 sBrinstar_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_1_Bg1[1142] = INCBIN_U8("data/rooms/brinstar/brinstar_1_bg1.gfx"); +const u8 sBrinstar_1_Bg1[1142] = { + #include "extracted/data/rooms/brinstar/brinstar_1_bg1.gfx.inc" +}; const u8 sBrinstar_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 16, 9, SPRITESET_IDX(0), @@ -62,5 +68,7 @@ const u8 sBrinstar_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_1_Bg0[232] = INCBIN_U8("data/rooms/brinstar/brinstar_1_bg0.gfx"); +const u8 sBrinstar_1_Bg0[232] = { + #include "extracted/data/rooms/brinstar/brinstar_1_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_10.c b/src/data/rooms/brinstar/brinstar_10.c index a7b2ed277..6969dd61c 100644 --- a/src/data/rooms/brinstar/brinstar_10.c +++ b/src/data/rooms/brinstar/brinstar_10.c @@ -13,11 +13,17 @@ const u8 sBrinstar_5_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_10_Clipdata[91] = INCBIN_U8("data/rooms/brinstar/brinstar_10_clipdata.gfx"); +const u8 sBrinstar_10_Clipdata[91] = { + #include "extracted/data/rooms/brinstar/brinstar_10_clipdata.gfx.inc" +}; -const u8 sBrinstar_10_Bg2[260] = INCBIN_U8("data/rooms/brinstar/brinstar_10_bg2.gfx"); +const u8 sBrinstar_10_Bg2[260] = { + #include "extracted/data/rooms/brinstar/brinstar_10_bg2.gfx.inc" +}; -const u8 sBrinstar_10_Bg1[678] = INCBIN_U8("data/rooms/brinstar/brinstar_10_bg1.gfx"); +const u8 sBrinstar_10_Bg1[678] = { + #include "extracted/data/rooms/brinstar/brinstar_10_bg1.gfx.inc" +}; const u8 sBrinstar_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 8, 16, SPRITESET_IDX(1), diff --git a/src/data/rooms/brinstar/brinstar_11.c b/src/data/rooms/brinstar/brinstar_11.c index a99b48678..3f41dfe6a 100644 --- a/src/data/rooms/brinstar/brinstar_11.c +++ b/src/data/rooms/brinstar/brinstar_11.c @@ -13,11 +13,17 @@ const u8 sBrinstar_6_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sBrinstar_11_Clipdata[108] = INCBIN_U8("data/rooms/brinstar/brinstar_11_clipdata.gfx"); +const u8 sBrinstar_11_Clipdata[108] = { + #include "extracted/data/rooms/brinstar/brinstar_11_clipdata.gfx.inc" +}; -const u8 sBrinstar_11_Bg2[122] = INCBIN_U8("data/rooms/brinstar/brinstar_11_bg2.gfx"); +const u8 sBrinstar_11_Bg2[122] = { + #include "extracted/data/rooms/brinstar/brinstar_11_bg2.gfx.inc" +}; -const u8 sBrinstar_11_Bg1[280] = INCBIN_U8("data/rooms/brinstar/brinstar_11_bg1.gfx"); +const u8 sBrinstar_11_Bg1[280] = { + #include "extracted/data/rooms/brinstar/brinstar_11_bg1.gfx.inc" +}; const u8 sBrinstar_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 9, SPRITESET_IDX(2), diff --git a/src/data/rooms/brinstar/brinstar_12.c b/src/data/rooms/brinstar/brinstar_12.c index 59ad3236f..c8ae9782c 100644 --- a/src/data/rooms/brinstar/brinstar_12.c +++ b/src/data/rooms/brinstar/brinstar_12.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_12_Clipdata[379] = INCBIN_U8("data/rooms/brinstar/brinstar_12_clipdata.gfx"); +const u8 sBrinstar_12_Clipdata[379] = { + #include "extracted/data/rooms/brinstar/brinstar_12_clipdata.gfx.inc" +}; -const u8 sBrinstar_12_Bg2[337] = INCBIN_U8("data/rooms/brinstar/brinstar_12_bg2.gfx"); +const u8 sBrinstar_12_Bg2[337] = { + #include "extracted/data/rooms/brinstar/brinstar_12_bg2.gfx.inc" +}; -const u8 sBrinstar_12_Bg1[1226] = INCBIN_U8("data/rooms/brinstar/brinstar_12_bg1.gfx"); +const u8 sBrinstar_12_Bg1[1226] = { + #include "extracted/data/rooms/brinstar/brinstar_12_bg1.gfx.inc" +}; const u8 sBrinstar_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 3, 13, SPRITESET_IDX(1), @@ -15,5 +21,7 @@ const u8 sBrinstar_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_12_Bg0[203] = INCBIN_U8("data/rooms/brinstar/brinstar_12_bg0.gfx"); +const u8 sBrinstar_12_Bg0[203] = { + #include "extracted/data/rooms/brinstar/brinstar_12_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_13.c b/src/data/rooms/brinstar/brinstar_13.c index a3f523afa..c0782b362 100644 --- a/src/data/rooms/brinstar/brinstar_13.c +++ b/src/data/rooms/brinstar/brinstar_13.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_13_Clipdata[206] = INCBIN_U8("data/rooms/brinstar/brinstar_13_clipdata.gfx"); +const u8 sBrinstar_13_Clipdata[206] = { + #include "extracted/data/rooms/brinstar/brinstar_13_clipdata.gfx.inc" +}; -const u8 sBrinstar_13_Bg2[78] = INCBIN_U8("data/rooms/brinstar/brinstar_13_bg2.gfx"); +const u8 sBrinstar_13_Bg2[78] = { + #include "extracted/data/rooms/brinstar/brinstar_13_bg2.gfx.inc" +}; -const u8 sBrinstar_13_Bg1[520] = INCBIN_U8("data/rooms/brinstar/brinstar_13_bg1.gfx"); +const u8 sBrinstar_13_Bg1[520] = { + #include "extracted/data/rooms/brinstar/brinstar_13_bg1.gfx.inc" +}; const u8 sBrinstar_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 2, 8, SPRITESET_IDX(3), @@ -18,5 +24,7 @@ const u8 sBrinstar_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_13_Bg0[220] = INCBIN_U8("data/rooms/brinstar/brinstar_13_bg0.gfx"); +const u8 sBrinstar_13_Bg0[220] = { + #include "extracted/data/rooms/brinstar/brinstar_13_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_14.c b/src/data/rooms/brinstar/brinstar_14.c index 677b4f5bc..d0f54ab0a 100644 --- a/src/data/rooms/brinstar/brinstar_14.c +++ b/src/data/rooms/brinstar/brinstar_14.c @@ -20,11 +20,17 @@ const u8 sBrinstar_7_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_14_Clipdata[212] = INCBIN_U8("data/rooms/brinstar/brinstar_14_clipdata.gfx"); +const u8 sBrinstar_14_Clipdata[212] = { + #include "extracted/data/rooms/brinstar/brinstar_14_clipdata.gfx.inc" +}; -const u8 sBrinstar_14_Bg2[38] = INCBIN_U8("data/rooms/brinstar/brinstar_14_bg2.gfx"); +const u8 sBrinstar_14_Bg2[38] = { + #include "extracted/data/rooms/brinstar/brinstar_14_bg2.gfx.inc" +}; -const u8 sBrinstar_14_Bg1[532] = INCBIN_U8("data/rooms/brinstar/brinstar_14_bg1.gfx"); +const u8 sBrinstar_14_Bg1[532] = { + #include "extracted/data/rooms/brinstar/brinstar_14_bg1.gfx.inc" +}; const u8 sBrinstar_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 3, 9, SPRITESET_IDX(1), diff --git a/src/data/rooms/brinstar/brinstar_15.c b/src/data/rooms/brinstar/brinstar_15.c index 8efc4ff40..c9b78b79c 100644 --- a/src/data/rooms/brinstar/brinstar_15.c +++ b/src/data/rooms/brinstar/brinstar_15.c @@ -27,11 +27,17 @@ const u8 sBrinstar_8_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_15_Clipdata[287] = INCBIN_U8("data/rooms/brinstar/brinstar_15_clipdata.gfx"); +const u8 sBrinstar_15_Clipdata[287] = { + #include "extracted/data/rooms/brinstar/brinstar_15_clipdata.gfx.inc" +}; -const u8 sBrinstar_15_Bg2[78] = INCBIN_U8("data/rooms/brinstar/brinstar_15_bg2.gfx"); +const u8 sBrinstar_15_Bg2[78] = { + #include "extracted/data/rooms/brinstar/brinstar_15_bg2.gfx.inc" +}; -const u8 sBrinstar_15_Bg1[975] = INCBIN_U8("data/rooms/brinstar/brinstar_15_bg1.gfx"); +const u8 sBrinstar_15_Bg1[975] = { + #include "extracted/data/rooms/brinstar/brinstar_15_bg1.gfx.inc" +}; const u8 sBrinstar_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 5, 7, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_16.c b/src/data/rooms/brinstar/brinstar_16.c index 3e9334cd5..ac258ec1e 100644 --- a/src/data/rooms/brinstar/brinstar_16.c +++ b/src/data/rooms/brinstar/brinstar_16.c @@ -20,11 +20,17 @@ const u8 sBrinstar_9_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_16_Clipdata[191] = INCBIN_U8("data/rooms/brinstar/brinstar_16_clipdata.gfx"); +const u8 sBrinstar_16_Clipdata[191] = { + #include "extracted/data/rooms/brinstar/brinstar_16_clipdata.gfx.inc" +}; -const u8 sBrinstar_16_Bg2[40] = INCBIN_U8("data/rooms/brinstar/brinstar_16_bg2.gfx"); +const u8 sBrinstar_16_Bg2[40] = { + #include "extracted/data/rooms/brinstar/brinstar_16_bg2.gfx.inc" +}; -const u8 sBrinstar_16_Bg1[514] = INCBIN_U8("data/rooms/brinstar/brinstar_16_bg1.gfx"); +const u8 sBrinstar_16_Bg1[514] = { + #include "extracted/data/rooms/brinstar/brinstar_16_bg1.gfx.inc" +}; const u8 sBrinstar_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 2, 4, SPRITESET_IDX(5), diff --git a/src/data/rooms/brinstar/brinstar_17.c b/src/data/rooms/brinstar/brinstar_17.c index f0eed0172..9aa7306a0 100644 --- a/src/data/rooms/brinstar/brinstar_17.c +++ b/src/data/rooms/brinstar/brinstar_17.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_17_Clipdata[71] = INCBIN_U8("data/rooms/brinstar/brinstar_17_clipdata.gfx"); +const u8 sBrinstar_17_Clipdata[71] = { + #include "extracted/data/rooms/brinstar/brinstar_17_clipdata.gfx.inc" +}; -const u8 sBrinstar_17_Bg2[89] = INCBIN_U8("data/rooms/brinstar/brinstar_17_bg2.gfx"); +const u8 sBrinstar_17_Bg2[89] = { + #include "extracted/data/rooms/brinstar/brinstar_17_bg2.gfx.inc" +}; -const u8 sBrinstar_17_Bg1[265] = INCBIN_U8("data/rooms/brinstar/brinstar_17_bg1.gfx"); +const u8 sBrinstar_17_Bg1[265] = { + #include "extracted/data/rooms/brinstar/brinstar_17_bg1.gfx.inc" +}; const u8 sBrinstar_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 4, 14, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_18.c b/src/data/rooms/brinstar/brinstar_18.c index 59c00845f..92a118b46 100644 --- a/src/data/rooms/brinstar/brinstar_18.c +++ b/src/data/rooms/brinstar/brinstar_18.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_18_Clipdata[52] = INCBIN_U8("data/rooms/brinstar/brinstar_18_clipdata.gfx"); +const u8 sBrinstar_18_Clipdata[52] = { + #include "extracted/data/rooms/brinstar/brinstar_18_clipdata.gfx.inc" +}; -const u8 sBrinstar_18_Bg2[172] = INCBIN_U8("data/rooms/brinstar/brinstar_18_bg2.gfx"); +const u8 sBrinstar_18_Bg2[172] = { + #include "extracted/data/rooms/brinstar/brinstar_18_bg2.gfx.inc" +}; -const u8 sBrinstar_18_Bg1[135] = INCBIN_U8("data/rooms/brinstar/brinstar_18_bg1.gfx"); +const u8 sBrinstar_18_Bg1[135] = { + #include "extracted/data/rooms/brinstar/brinstar_18_bg1.gfx.inc" +}; const u8 sBrinstar_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 6, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_19.c b/src/data/rooms/brinstar/brinstar_19.c index 5fcd9e3bf..35f6a5e91 100644 --- a/src/data/rooms/brinstar/brinstar_19.c +++ b/src/data/rooms/brinstar/brinstar_19.c @@ -1,9 +1,13 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_19_Clipdata[325] = INCBIN_U8("data/rooms/brinstar/brinstar_19_clipdata.gfx"); +const u8 sBrinstar_19_Clipdata[325] = { + #include "extracted/data/rooms/brinstar/brinstar_19_clipdata.gfx.inc" +}; -const u8 sBrinstar_19_Bg2[42] = INCBIN_U8("data/rooms/brinstar/brinstar_19_bg2.gfx"); +const u8 sBrinstar_19_Bg2[42] = { + #include "extracted/data/rooms/brinstar/brinstar_19_bg2.gfx.inc" +}; const u8 sBrinstar_19_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 3, 16, SPRITESET_IDX(0), @@ -15,7 +19,9 @@ const u8 sBrinstar_19_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_19_Bg1[935] = INCBIN_U8("data/rooms/brinstar/brinstar_19_bg1.gfx"); +const u8 sBrinstar_19_Bg1[935] = { + #include "extracted/data/rooms/brinstar/brinstar_19_bg1.gfx.inc" +}; const u8 sBrinstar_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 3, 13, SPRITESET_IDX(1), @@ -25,5 +31,7 @@ const u8 sBrinstar_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_19_Bg0[274] = INCBIN_U8("data/rooms/brinstar/brinstar_19_bg0.gfx"); +const u8 sBrinstar_19_Bg0[274] = { + #include "extracted/data/rooms/brinstar/brinstar_19_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_2.c b/src/data/rooms/brinstar/brinstar_2.c index f93658f1e..49d03068c 100644 --- a/src/data/rooms/brinstar/brinstar_2.c +++ b/src/data/rooms/brinstar/brinstar_2.c @@ -20,7 +20,9 @@ const u8 sBrinstar_2_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_2_Clipdata[122] = INCBIN_U8("data/rooms/brinstar/brinstar_2_clipdata.gfx"); +const u8 sBrinstar_2_Clipdata[122] = { + #include "extracted/data/rooms/brinstar/brinstar_2_clipdata.gfx.inc" +}; const u8 sBrinstar_2_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 2, 19, SPRITESET_IDX(0), @@ -32,7 +34,9 @@ const u8 sBrinstar_2_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_2_Bg2[108] = INCBIN_U8("data/rooms/brinstar/brinstar_2_bg2.gfx"); +const u8 sBrinstar_2_Bg2[108] = { + #include "extracted/data/rooms/brinstar/brinstar_2_bg2.gfx.inc" +}; const u8 sBrinstar_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 2, 19, SPRITESET_IDX(0), @@ -42,7 +46,9 @@ const u8 sBrinstar_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_2_Bg1[653] = INCBIN_U8("data/rooms/brinstar/brinstar_2_bg1.gfx"); +const u8 sBrinstar_2_Bg1[653] = { + #include "extracted/data/rooms/brinstar/brinstar_2_bg1.gfx.inc" +}; const u8 sBrinstar_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 2, 19, SPRITESET_IDX(0), @@ -52,5 +58,7 @@ const u8 sBrinstar_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_2_Bg0[128] = INCBIN_U8("data/rooms/brinstar/brinstar_2_bg0.gfx"); +const u8 sBrinstar_2_Bg0[128] = { + #include "extracted/data/rooms/brinstar/brinstar_2_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_20.c b/src/data/rooms/brinstar/brinstar_20.c index 1ac747ee3..d149199d1 100644 --- a/src/data/rooms/brinstar/brinstar_20.c +++ b/src/data/rooms/brinstar/brinstar_20.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_20_Clipdata[336] = INCBIN_U8("data/rooms/brinstar/brinstar_20_clipdata.gfx"); +const u8 sBrinstar_20_Clipdata[336] = { + #include "extracted/data/rooms/brinstar/brinstar_20_clipdata.gfx.inc" +}; -const u8 sBrinstar_20_Bg2[211] = INCBIN_U8("data/rooms/brinstar/brinstar_20_bg2.gfx"); +const u8 sBrinstar_20_Bg2[211] = { + #include "extracted/data/rooms/brinstar/brinstar_20_bg2.gfx.inc" +}; -const u8 sBrinstar_20_Bg1[1163] = INCBIN_U8("data/rooms/brinstar/brinstar_20_bg1.gfx"); +const u8 sBrinstar_20_Bg1[1163] = { + #include "extracted/data/rooms/brinstar/brinstar_20_bg1.gfx.inc" +}; const u8 sBrinstar_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 16, 4, SPRITESET_IDX(2), diff --git a/src/data/rooms/brinstar/brinstar_21.c b/src/data/rooms/brinstar/brinstar_21.c index 01c11fc0b..032271582 100644 --- a/src/data/rooms/brinstar/brinstar_21.c +++ b/src/data/rooms/brinstar/brinstar_21.c @@ -20,9 +20,13 @@ const u8 sBrinstar_10_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_21_Clipdata[241] = INCBIN_U8("data/rooms/brinstar/brinstar_21_clipdata.gfx"); +const u8 sBrinstar_21_Clipdata[241] = { + #include "extracted/data/rooms/brinstar/brinstar_21_clipdata.gfx.inc" +}; -const u8 sBrinstar_21_Bg2[174] = INCBIN_U8("data/rooms/brinstar/brinstar_21_bg2.gfx"); +const u8 sBrinstar_21_Bg2[174] = { + #include "extracted/data/rooms/brinstar/brinstar_21_bg2.gfx.inc" +}; const u8 sBrinstar_21_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 8, 64, SPRITESET_IDX(3), @@ -36,7 +40,9 @@ const u8 sBrinstar_21_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_21_Bg1[1038] = INCBIN_U8("data/rooms/brinstar/brinstar_21_bg1.gfx"); +const u8 sBrinstar_21_Bg1[1038] = { + #include "extracted/data/rooms/brinstar/brinstar_21_bg1.gfx.inc" +}; const u8 sBrinstar_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 8, 64, SPRITESET_IDX(3), @@ -45,5 +51,7 @@ const u8 sBrinstar_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_21_Bg0[394] = INCBIN_U8("data/rooms/brinstar/brinstar_21_bg0.gfx"); +const u8 sBrinstar_21_Bg0[394] = { + #include "extracted/data/rooms/brinstar/brinstar_21_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_22.c b/src/data/rooms/brinstar/brinstar_22.c index 009249578..48ac17b50 100644 --- a/src/data/rooms/brinstar/brinstar_22.c +++ b/src/data/rooms/brinstar/brinstar_22.c @@ -20,9 +20,13 @@ const u8 sBrinstar_11_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_22_Clipdata[172] = INCBIN_U8("data/rooms/brinstar/brinstar_22_clipdata.gfx"); +const u8 sBrinstar_22_Clipdata[172] = { + #include "extracted/data/rooms/brinstar/brinstar_22_clipdata.gfx.inc" +}; -const u8 sBrinstar_22_Bg2[50] = INCBIN_U8("data/rooms/brinstar/brinstar_22_bg2.gfx"); +const u8 sBrinstar_22_Bg2[50] = { + #include "extracted/data/rooms/brinstar/brinstar_22_bg2.gfx.inc" +}; const u8 sBrinstar_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 4, 10, SPRITESET_IDX(0), @@ -36,7 +40,9 @@ const u8 sBrinstar_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_22_Bg1[611] = INCBIN_U8("data/rooms/brinstar/brinstar_22_bg1.gfx"); +const u8 sBrinstar_22_Bg1[611] = { + #include "extracted/data/rooms/brinstar/brinstar_22_bg1.gfx.inc" +}; const u8 sBrinstar_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 5, 11, SPRITESET_IDX(0), @@ -44,5 +50,7 @@ const u8 sBrinstar_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_22_Bg0[93] = INCBIN_U8("data/rooms/brinstar/brinstar_22_bg0.gfx"); +const u8 sBrinstar_22_Bg0[93] = { + #include "extracted/data/rooms/brinstar/brinstar_22_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_23.c b/src/data/rooms/brinstar/brinstar_23.c index 6416a5be4..db6fdc633 100644 --- a/src/data/rooms/brinstar/brinstar_23.c +++ b/src/data/rooms/brinstar/brinstar_23.c @@ -20,11 +20,17 @@ const u8 sBrinstar_12_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_23_Clipdata[312] = INCBIN_U8("data/rooms/brinstar/brinstar_23_clipdata.gfx"); +const u8 sBrinstar_23_Clipdata[312] = { + #include "extracted/data/rooms/brinstar/brinstar_23_clipdata.gfx.inc" +}; -const u8 sBrinstar_23_Bg2[82] = INCBIN_U8("data/rooms/brinstar/brinstar_23_bg2.gfx"); +const u8 sBrinstar_23_Bg2[82] = { + #include "extracted/data/rooms/brinstar/brinstar_23_bg2.gfx.inc" +}; -const u8 sBrinstar_23_Bg1[732] = INCBIN_U8("data/rooms/brinstar/brinstar_23_bg1.gfx"); +const u8 sBrinstar_23_Bg1[732] = { + #include "extracted/data/rooms/brinstar/brinstar_23_bg1.gfx.inc" +}; const u8 sBrinstar_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { 2, 15, SPRITESET_IDX(6), @@ -46,5 +52,7 @@ const u8 sBrinstar_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_23_Bg0[669] = INCBIN_U8("data/rooms/brinstar/brinstar_23_bg0.gfx"); +const u8 sBrinstar_23_Bg0[669] = { + #include "extracted/data/rooms/brinstar/brinstar_23_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_24.c b/src/data/rooms/brinstar/brinstar_24.c index 216132614..4276bab4b 100644 --- a/src/data/rooms/brinstar/brinstar_24.c +++ b/src/data/rooms/brinstar/brinstar_24.c @@ -20,11 +20,17 @@ const u8 sBrinstar_13_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_24_Clipdata[118] = INCBIN_U8("data/rooms/brinstar/brinstar_24_clipdata.gfx"); +const u8 sBrinstar_24_Clipdata[118] = { + #include "extracted/data/rooms/brinstar/brinstar_24_clipdata.gfx.inc" +}; -const u8 sBrinstar_24_Bg2[140] = INCBIN_U8("data/rooms/brinstar/brinstar_24_bg2.gfx"); +const u8 sBrinstar_24_Bg2[140] = { + #include "extracted/data/rooms/brinstar/brinstar_24_bg2.gfx.inc" +}; -const u8 sBrinstar_24_Bg1[417] = INCBIN_U8("data/rooms/brinstar/brinstar_24_bg1.gfx"); +const u8 sBrinstar_24_Bg1[417] = { + #include "extracted/data/rooms/brinstar/brinstar_24_bg1.gfx.inc" +}; const u8 sBrinstar_24_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 34, SPRITESET_IDX(0), @@ -34,5 +40,7 @@ const u8 sBrinstar_24_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_24_Bg0[300] = INCBIN_U8("data/rooms/brinstar/brinstar_24_bg0.gfx"); +const u8 sBrinstar_24_Bg0[300] = { + #include "extracted/data/rooms/brinstar/brinstar_24_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_25.c b/src/data/rooms/brinstar/brinstar_25.c index a0805020a..a88ed3383 100644 --- a/src/data/rooms/brinstar/brinstar_25.c +++ b/src/data/rooms/brinstar/brinstar_25.c @@ -20,11 +20,17 @@ const u8 sBrinstar_14_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_25_Clipdata[91] = INCBIN_U8("data/rooms/brinstar/brinstar_25_clipdata.gfx"); +const u8 sBrinstar_25_Clipdata[91] = { + #include "extracted/data/rooms/brinstar/brinstar_25_clipdata.gfx.inc" +}; -const u8 sBrinstar_25_Bg2[286] = INCBIN_U8("data/rooms/brinstar/brinstar_25_bg2.gfx"); +const u8 sBrinstar_25_Bg2[286] = { + #include "extracted/data/rooms/brinstar/brinstar_25_bg2.gfx.inc" +}; -const u8 sBrinstar_25_Bg1[247] = INCBIN_U8("data/rooms/brinstar/brinstar_25_bg1.gfx"); +const u8 sBrinstar_25_Bg1[247] = { + #include "extracted/data/rooms/brinstar/brinstar_25_bg1.gfx.inc" +}; const u8 sBrinstar_25_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 21, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_26.c b/src/data/rooms/brinstar/brinstar_26.c index 3e69af80f..2d1008b08 100644 --- a/src/data/rooms/brinstar/brinstar_26.c +++ b/src/data/rooms/brinstar/brinstar_26.c @@ -13,11 +13,17 @@ const u8 sBrinstar_15_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sBrinstar_26_Clipdata[108] = INCBIN_U8("data/rooms/brinstar/brinstar_26_clipdata.gfx"); +const u8 sBrinstar_26_Clipdata[108] = { + #include "extracted/data/rooms/brinstar/brinstar_26_clipdata.gfx.inc" +}; -const u8 sBrinstar_26_Bg2[166] = INCBIN_U8("data/rooms/brinstar/brinstar_26_bg2.gfx"); +const u8 sBrinstar_26_Bg2[166] = { + #include "extracted/data/rooms/brinstar/brinstar_26_bg2.gfx.inc" +}; -const u8 sBrinstar_26_Bg1[340] = INCBIN_U8("data/rooms/brinstar/brinstar_26_bg1.gfx"); +const u8 sBrinstar_26_Bg1[340] = { + #include "extracted/data/rooms/brinstar/brinstar_26_bg1.gfx.inc" +}; const u8 sBrinstar_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 9, SPRITESET_IDX(2), diff --git a/src/data/rooms/brinstar/brinstar_27.c b/src/data/rooms/brinstar/brinstar_27.c index c2ce1676e..84533460c 100644 --- a/src/data/rooms/brinstar/brinstar_27.c +++ b/src/data/rooms/brinstar/brinstar_27.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_27_Clipdata[52] = INCBIN_U8("data/rooms/brinstar/brinstar_27_clipdata.gfx"); +const u8 sBrinstar_27_Clipdata[52] = { + #include "extracted/data/rooms/brinstar/brinstar_27_clipdata.gfx.inc" +}; -const u8 sBrinstar_27_Bg2[156] = INCBIN_U8("data/rooms/brinstar/brinstar_27_bg2.gfx"); +const u8 sBrinstar_27_Bg2[156] = { + #include "extracted/data/rooms/brinstar/brinstar_27_bg2.gfx.inc" +}; -const u8 sBrinstar_27_Bg1[141] = INCBIN_U8("data/rooms/brinstar/brinstar_27_bg1.gfx"); +const u8 sBrinstar_27_Bg1[141] = { + #include "extracted/data/rooms/brinstar/brinstar_27_bg1.gfx.inc" +}; const u8 sBrinstar_27_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 6, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_28.c b/src/data/rooms/brinstar/brinstar_28.c index cb8be054f..54351d39c 100644 --- a/src/data/rooms/brinstar/brinstar_28.c +++ b/src/data/rooms/brinstar/brinstar_28.c @@ -1,7 +1,9 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_28_Clipdata[213] = INCBIN_U8("data/rooms/brinstar/brinstar_28_clipdata.gfx"); +const u8 sBrinstar_28_Clipdata[213] = { + #include "extracted/data/rooms/brinstar/brinstar_28_clipdata.gfx.inc" +}; const u8 sBrinstar_28_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 3, 83, SPRITESET_IDX(6), @@ -19,7 +21,9 @@ const u8 sBrinstar_28_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_28_Bg2[107] = INCBIN_U8("data/rooms/brinstar/brinstar_28_bg2.gfx"); +const u8 sBrinstar_28_Bg2[107] = { + #include "extracted/data/rooms/brinstar/brinstar_28_bg2.gfx.inc" +}; const u8 sBrinstar_28_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 5, 58, SPRITESET_IDX(1), @@ -32,7 +36,9 @@ const u8 sBrinstar_28_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_28_Bg1[746] = INCBIN_U8("data/rooms/brinstar/brinstar_28_bg1.gfx"); +const u8 sBrinstar_28_Bg1[746] = { + #include "extracted/data/rooms/brinstar/brinstar_28_bg1.gfx.inc" +}; const u8 sBrinstar_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 3, 10, SPRITESET_IDX(2), @@ -48,5 +54,7 @@ const u8 sBrinstar_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_28_Bg0[94] = INCBIN_U8("data/rooms/brinstar/brinstar_28_bg0.gfx"); +const u8 sBrinstar_28_Bg0[94] = { + #include "extracted/data/rooms/brinstar/brinstar_28_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_29.c b/src/data/rooms/brinstar/brinstar_29.c index 6176eea2c..311735f6f 100644 --- a/src/data/rooms/brinstar/brinstar_29.c +++ b/src/data/rooms/brinstar/brinstar_29.c @@ -20,15 +20,23 @@ const u8 sBrinstar_16_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_29_Clipdata[113] = INCBIN_U8("data/rooms/brinstar/brinstar_29_clipdata.gfx"); +const u8 sBrinstar_29_Clipdata[113] = { + #include "extracted/data/rooms/brinstar/brinstar_29_clipdata.gfx.inc" +}; -const u8 sBrinstar_29_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_29_bg2.gfx"); +const u8 sBrinstar_29_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_29_bg2.gfx.inc" +}; -const u8 sBrinstar_29_Bg1[287] = INCBIN_U8("data/rooms/brinstar/brinstar_29_bg1.gfx"); +const u8 sBrinstar_29_Bg1[287] = { + #include "extracted/data/rooms/brinstar/brinstar_29_bg1.gfx.inc" +}; const u8 sBrinstar_29_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_29_Bg0[357] = INCBIN_U8("data/rooms/brinstar/brinstar_29_bg0.gfx"); +const u8 sBrinstar_29_Bg0[357] = { + #include "extracted/data/rooms/brinstar/brinstar_29_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_3.c b/src/data/rooms/brinstar/brinstar_3.c index f3af2762d..d4fc9e077 100644 --- a/src/data/rooms/brinstar/brinstar_3.c +++ b/src/data/rooms/brinstar/brinstar_3.c @@ -1,9 +1,13 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_3_Clipdata[775] = INCBIN_U8("data/rooms/brinstar/brinstar_3_clipdata.gfx"); +const u8 sBrinstar_3_Clipdata[775] = { + #include "extracted/data/rooms/brinstar/brinstar_3_clipdata.gfx.inc" +}; -const u8 sBrinstar_3_Bg2[139] = INCBIN_U8("data/rooms/brinstar/brinstar_3_bg2.gfx"); +const u8 sBrinstar_3_Bg2[139] = { + #include "extracted/data/rooms/brinstar/brinstar_3_bg2.gfx.inc" +}; const u8 sBrinstar_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 11, 11, SPRITESET_IDX(1), @@ -21,7 +25,9 @@ const u8 sBrinstar_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_3_Bg1[3530] = INCBIN_U8("data/rooms/brinstar/brinstar_3_bg1.gfx"); +const u8 sBrinstar_3_Bg1[3530] = { + #include "extracted/data/rooms/brinstar/brinstar_3_bg1.gfx.inc" +}; const u8 sBrinstar_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 11, 11, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_30.c b/src/data/rooms/brinstar/brinstar_30.c index aa65f526d..8d3017412 100644 --- a/src/data/rooms/brinstar/brinstar_30.c +++ b/src/data/rooms/brinstar/brinstar_30.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_30_Clipdata[76] = INCBIN_U8("data/rooms/brinstar/brinstar_30_clipdata.gfx"); +const u8 sBrinstar_30_Clipdata[76] = { + #include "extracted/data/rooms/brinstar/brinstar_30_clipdata.gfx.inc" +}; -const u8 sBrinstar_30_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_30_bg2.gfx"); +const u8 sBrinstar_30_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_30_bg2.gfx.inc" +}; -const u8 sBrinstar_30_Bg1[220] = INCBIN_U8("data/rooms/brinstar/brinstar_30_bg1.gfx"); +const u8 sBrinstar_30_Bg1[220] = { + #include "extracted/data/rooms/brinstar/brinstar_30_bg1.gfx.inc" +}; const u8 sBrinstar_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 11, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_31.c b/src/data/rooms/brinstar/brinstar_31.c index ce400134a..3706914e6 100644 --- a/src/data/rooms/brinstar/brinstar_31.c +++ b/src/data/rooms/brinstar/brinstar_31.c @@ -13,11 +13,17 @@ const u8 sBrinstar_17_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_31_Clipdata[136] = INCBIN_U8("data/rooms/brinstar/brinstar_31_clipdata.gfx"); +const u8 sBrinstar_31_Clipdata[136] = { + #include "extracted/data/rooms/brinstar/brinstar_31_clipdata.gfx.inc" +}; -const u8 sBrinstar_31_Bg2[95] = INCBIN_U8("data/rooms/brinstar/brinstar_31_bg2.gfx"); +const u8 sBrinstar_31_Bg2[95] = { + #include "extracted/data/rooms/brinstar/brinstar_31_bg2.gfx.inc" +}; -const u8 sBrinstar_31_Bg1[408] = INCBIN_U8("data/rooms/brinstar/brinstar_31_bg1.gfx"); +const u8 sBrinstar_31_Bg1[408] = { + #include "extracted/data/rooms/brinstar/brinstar_31_bg1.gfx.inc" +}; const u8 sBrinstar_31_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 10, 10, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_32.c b/src/data/rooms/brinstar/brinstar_32.c index 6884a17d6..90a88fa7b 100644 --- a/src/data/rooms/brinstar/brinstar_32.c +++ b/src/data/rooms/brinstar/brinstar_32.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_32_Clipdata[54] = INCBIN_U8("data/rooms/brinstar/brinstar_32_clipdata.gfx"); +const u8 sBrinstar_32_Clipdata[54] = { + #include "extracted/data/rooms/brinstar/brinstar_32_clipdata.gfx.inc" +}; -const u8 sBrinstar_32_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_32_bg2.gfx"); +const u8 sBrinstar_32_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_32_bg2.gfx.inc" +}; -const u8 sBrinstar_32_Bg1[190] = INCBIN_U8("data/rooms/brinstar/brinstar_32_bg1.gfx"); +const u8 sBrinstar_32_Bg1[190] = { + #include "extracted/data/rooms/brinstar/brinstar_32_bg1.gfx.inc" +}; const u8 sBrinstar_32_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 6, 5, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_33.c b/src/data/rooms/brinstar/brinstar_33.c index 380b8d465..d93cc0aff 100644 --- a/src/data/rooms/brinstar/brinstar_33.c +++ b/src/data/rooms/brinstar/brinstar_33.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_33_Clipdata[71] = INCBIN_U8("data/rooms/brinstar/brinstar_33_clipdata.gfx"); +const u8 sBrinstar_33_Clipdata[71] = { + #include "extracted/data/rooms/brinstar/brinstar_33_clipdata.gfx.inc" +}; -const u8 sBrinstar_33_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_33_bg2.gfx"); +const u8 sBrinstar_33_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_33_bg2.gfx.inc" +}; -const u8 sBrinstar_33_Bg1[211] = INCBIN_U8("data/rooms/brinstar/brinstar_33_bg1.gfx"); +const u8 sBrinstar_33_Bg1[211] = { + #include "extracted/data/rooms/brinstar/brinstar_33_bg1.gfx.inc" +}; const u8 sBrinstar_33_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_34.c b/src/data/rooms/brinstar/brinstar_34.c index 70c5b0bbf..956fa9f49 100644 --- a/src/data/rooms/brinstar/brinstar_34.c +++ b/src/data/rooms/brinstar/brinstar_34.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_34_Clipdata[69] = INCBIN_U8("data/rooms/brinstar/brinstar_34_clipdata.gfx"); +const u8 sBrinstar_34_Clipdata[69] = { + #include "extracted/data/rooms/brinstar/brinstar_34_clipdata.gfx.inc" +}; -const u8 sBrinstar_34_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_34_bg2.gfx"); +const u8 sBrinstar_34_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_34_bg2.gfx.inc" +}; -const u8 sBrinstar_34_Bg1[213] = INCBIN_U8("data/rooms/brinstar/brinstar_34_bg1.gfx"); +const u8 sBrinstar_34_Bg1[213] = { + #include "extracted/data/rooms/brinstar/brinstar_34_bg1.gfx.inc" +}; const u8 sBrinstar_34_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 10, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_35.c b/src/data/rooms/brinstar/brinstar_35.c index 68b056c88..c91b1138f 100644 --- a/src/data/rooms/brinstar/brinstar_35.c +++ b/src/data/rooms/brinstar/brinstar_35.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_35_Clipdata[123] = INCBIN_U8("data/rooms/brinstar/brinstar_35_clipdata.gfx"); +const u8 sBrinstar_35_Clipdata[123] = { + #include "extracted/data/rooms/brinstar/brinstar_35_clipdata.gfx.inc" +}; -const u8 sBrinstar_35_Bg2[58] = INCBIN_U8("data/rooms/brinstar/brinstar_35_bg2.gfx"); +const u8 sBrinstar_35_Bg2[58] = { + #include "extracted/data/rooms/brinstar/brinstar_35_bg2.gfx.inc" +}; -const u8 sBrinstar_35_Bg1[482] = INCBIN_U8("data/rooms/brinstar/brinstar_35_bg1.gfx"); +const u8 sBrinstar_35_Bg1[482] = { + #include "extracted/data/rooms/brinstar/brinstar_35_bg1.gfx.inc" +}; const u8 sBrinstar_35_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 5, 7, SPRITESET_IDX(1), diff --git a/src/data/rooms/brinstar/brinstar_36.c b/src/data/rooms/brinstar/brinstar_36.c index be9a6a6da..70feed438 100644 --- a/src/data/rooms/brinstar/brinstar_36.c +++ b/src/data/rooms/brinstar/brinstar_36.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_36_Clipdata[70] = INCBIN_U8("data/rooms/brinstar/brinstar_36_clipdata.gfx"); +const u8 sBrinstar_36_Clipdata[70] = { + #include "extracted/data/rooms/brinstar/brinstar_36_clipdata.gfx.inc" +}; -const u8 sBrinstar_36_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_36_bg2.gfx"); +const u8 sBrinstar_36_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_36_bg2.gfx.inc" +}; -const u8 sBrinstar_36_Bg1[215] = INCBIN_U8("data/rooms/brinstar/brinstar_36_bg1.gfx"); +const u8 sBrinstar_36_Bg1[215] = { + #include "extracted/data/rooms/brinstar/brinstar_36_bg1.gfx.inc" +}; const u8 sBrinstar_36_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 10, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_37.c b/src/data/rooms/brinstar/brinstar_37.c index 0e3b79539..2165170e1 100644 --- a/src/data/rooms/brinstar/brinstar_37.c +++ b/src/data/rooms/brinstar/brinstar_37.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_37_Clipdata[52] = INCBIN_U8("data/rooms/brinstar/brinstar_37_clipdata.gfx"); +const u8 sBrinstar_37_Clipdata[52] = { + #include "extracted/data/rooms/brinstar/brinstar_37_clipdata.gfx.inc" +}; -const u8 sBrinstar_37_Bg2[168] = INCBIN_U8("data/rooms/brinstar/brinstar_37_bg2.gfx"); +const u8 sBrinstar_37_Bg2[168] = { + #include "extracted/data/rooms/brinstar/brinstar_37_bg2.gfx.inc" +}; -const u8 sBrinstar_37_Bg1[137] = INCBIN_U8("data/rooms/brinstar/brinstar_37_bg1.gfx"); +const u8 sBrinstar_37_Bg1[137] = { + #include "extracted/data/rooms/brinstar/brinstar_37_bg1.gfx.inc" +}; const u8 sBrinstar_37_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 12, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_38.c b/src/data/rooms/brinstar/brinstar_38.c index 6e0915511..af632fb67 100644 --- a/src/data/rooms/brinstar/brinstar_38.c +++ b/src/data/rooms/brinstar/brinstar_38.c @@ -20,9 +20,13 @@ const u8 sBrinstar_18_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_38_Clipdata[153] = INCBIN_U8("data/rooms/brinstar/brinstar_38_clipdata.gfx"); +const u8 sBrinstar_38_Clipdata[153] = { + #include "extracted/data/rooms/brinstar/brinstar_38_clipdata.gfx.inc" +}; -const u8 sBrinstar_38_Bg2[102] = INCBIN_U8("data/rooms/brinstar/brinstar_38_bg2.gfx"); +const u8 sBrinstar_38_Bg2[102] = { + #include "extracted/data/rooms/brinstar/brinstar_38_bg2.gfx.inc" +}; const u8 sBrinstar_38_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 3, 15, SPRITESET_IDX(1), @@ -34,7 +38,9 @@ const u8 sBrinstar_38_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_38_Bg1[578] = INCBIN_U8("data/rooms/brinstar/brinstar_38_bg1.gfx"); +const u8 sBrinstar_38_Bg1[578] = { + #include "extracted/data/rooms/brinstar/brinstar_38_bg1.gfx.inc" +}; const u8 sBrinstar_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 3, 19, SPRITESET_IDX(1), @@ -44,5 +50,7 @@ const u8 sBrinstar_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_38_Bg0[213] = INCBIN_U8("data/rooms/brinstar/brinstar_38_bg0.gfx"); +const u8 sBrinstar_38_Bg0[213] = { + #include "extracted/data/rooms/brinstar/brinstar_38_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_39.c b/src/data/rooms/brinstar/brinstar_39.c index 15cdc4bfc..ab1308be9 100644 --- a/src/data/rooms/brinstar/brinstar_39.c +++ b/src/data/rooms/brinstar/brinstar_39.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_39_Clipdata[78] = INCBIN_U8("data/rooms/brinstar/brinstar_39_clipdata.gfx"); +const u8 sBrinstar_39_Clipdata[78] = { + #include "extracted/data/rooms/brinstar/brinstar_39_clipdata.gfx.inc" +}; -const u8 sBrinstar_39_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_39_bg2.gfx"); +const u8 sBrinstar_39_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_39_bg2.gfx.inc" +}; -const u8 sBrinstar_39_Bg1[216] = INCBIN_U8("data/rooms/brinstar/brinstar_39_bg1.gfx"); +const u8 sBrinstar_39_Bg1[216] = { + #include "extracted/data/rooms/brinstar/brinstar_39_bg1.gfx.inc" +}; const u8 sBrinstar_39_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_4.c b/src/data/rooms/brinstar/brinstar_4.c index fa1cd1bf1..614a12143 100644 --- a/src/data/rooms/brinstar/brinstar_4.c +++ b/src/data/rooms/brinstar/brinstar_4.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_4_Clipdata[142] = INCBIN_U8("data/rooms/brinstar/brinstar_4_clipdata.gfx"); +const u8 sBrinstar_4_Clipdata[142] = { + #include "extracted/data/rooms/brinstar/brinstar_4_clipdata.gfx.inc" +}; -const u8 sBrinstar_4_Bg2[128] = INCBIN_U8("data/rooms/brinstar/brinstar_4_bg2.gfx"); +const u8 sBrinstar_4_Bg2[128] = { + #include "extracted/data/rooms/brinstar/brinstar_4_bg2.gfx.inc" +}; -const u8 sBrinstar_4_Bg1[544] = INCBIN_U8("data/rooms/brinstar/brinstar_4_bg1.gfx"); +const u8 sBrinstar_4_Bg1[544] = { + #include "extracted/data/rooms/brinstar/brinstar_4_bg1.gfx.inc" +}; const u8 sBrinstar_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 3, 9, SPRITESET_IDX(2), diff --git a/src/data/rooms/brinstar/brinstar_40.c b/src/data/rooms/brinstar/brinstar_40.c index 17274421c..0fabac8bd 100644 --- a/src/data/rooms/brinstar/brinstar_40.c +++ b/src/data/rooms/brinstar/brinstar_40.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_40_Clipdata[93] = INCBIN_U8("data/rooms/brinstar/brinstar_40_clipdata.gfx"); +const u8 sBrinstar_40_Clipdata[93] = { + #include "extracted/data/rooms/brinstar/brinstar_40_clipdata.gfx.inc" +}; -const u8 sBrinstar_40_Bg2[14] = INCBIN_U8("data/rooms/brinstar/brinstar_40_bg2.gfx"); +const u8 sBrinstar_40_Bg2[14] = { + #include "extracted/data/rooms/brinstar/brinstar_40_bg2.gfx.inc" +}; -const u8 sBrinstar_40_Bg1[236] = INCBIN_U8("data/rooms/brinstar/brinstar_40_bg1.gfx"); +const u8 sBrinstar_40_Bg1[236] = { + #include "extracted/data/rooms/brinstar/brinstar_40_bg1.gfx.inc" +}; const u8 sBrinstar_40_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 8, 10, SPRITESET_IDX(2), diff --git a/src/data/rooms/brinstar/brinstar_41.c b/src/data/rooms/brinstar/brinstar_41.c index 86fcb2e5e..19ce4adcd 100644 --- a/src/data/rooms/brinstar/brinstar_41.c +++ b/src/data/rooms/brinstar/brinstar_41.c @@ -1,9 +1,13 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_41_Clipdata[214] = INCBIN_U8("data/rooms/brinstar/brinstar_41_clipdata.gfx"); +const u8 sBrinstar_41_Clipdata[214] = { + #include "extracted/data/rooms/brinstar/brinstar_41_clipdata.gfx.inc" +}; -const u8 sBrinstar_41_Bg2[100] = INCBIN_U8("data/rooms/brinstar/brinstar_41_bg2.gfx"); +const u8 sBrinstar_41_Bg2[100] = { + #include "extracted/data/rooms/brinstar/brinstar_41_bg2.gfx.inc" +}; const u8 sBrinstar_41_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(18)] = { 1, 4, SPRITESET_IDX(5), @@ -26,7 +30,9 @@ const u8 sBrinstar_41_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(18)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_41_Bg1[765] = INCBIN_U8("data/rooms/brinstar/brinstar_41_bg1.gfx"); +const u8 sBrinstar_41_Bg1[765] = { + #include "extracted/data/rooms/brinstar/brinstar_41_bg1.gfx.inc" +}; const u8 sBrinstar_41_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { 1, 4, SPRITESET_IDX(5), @@ -48,4 +54,6 @@ const u8 sBrinstar_41_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_41_Bg0[48] = INCBIN_U8("data/rooms/brinstar/brinstar_41_bg0.gfx"); +const u8 sBrinstar_41_Bg0[48] = { + #include "extracted/data/rooms/brinstar/brinstar_41_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_5.c b/src/data/rooms/brinstar/brinstar_5.c index 72bbae664..63248ae73 100644 --- a/src/data/rooms/brinstar/brinstar_5.c +++ b/src/data/rooms/brinstar/brinstar_5.c @@ -1,11 +1,17 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_5_Clipdata[52] = INCBIN_U8("data/rooms/brinstar/brinstar_5_clipdata.gfx"); +const u8 sBrinstar_5_Clipdata[52] = { + #include "extracted/data/rooms/brinstar/brinstar_5_clipdata.gfx.inc" +}; -const u8 sBrinstar_5_Bg2[145] = INCBIN_U8("data/rooms/brinstar/brinstar_5_bg2.gfx"); +const u8 sBrinstar_5_Bg2[145] = { + #include "extracted/data/rooms/brinstar/brinstar_5_bg2.gfx.inc" +}; -const u8 sBrinstar_5_Bg1[141] = INCBIN_U8("data/rooms/brinstar/brinstar_5_bg1.gfx"); +const u8 sBrinstar_5_Bg1[141] = { + #include "extracted/data/rooms/brinstar/brinstar_5_bg1.gfx.inc" +}; const u8 sBrinstar_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 6, SPRITESET_IDX(0), diff --git a/src/data/rooms/brinstar/brinstar_6.c b/src/data/rooms/brinstar/brinstar_6.c index 4bac2e354..8123c59c5 100644 --- a/src/data/rooms/brinstar/brinstar_6.c +++ b/src/data/rooms/brinstar/brinstar_6.c @@ -1,15 +1,23 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_6_Clipdata[52] = INCBIN_U8("data/rooms/brinstar/brinstar_6_clipdata.gfx"); +const u8 sBrinstar_6_Clipdata[52] = { + #include "extracted/data/rooms/brinstar/brinstar_6_clipdata.gfx.inc" +}; -const u8 sBrinstar_6_Bg2[91] = INCBIN_U8("data/rooms/brinstar/brinstar_6_bg2.gfx"); +const u8 sBrinstar_6_Bg2[91] = { + #include "extracted/data/rooms/brinstar/brinstar_6_bg2.gfx.inc" +}; -const u8 sBrinstar_6_Bg1[188] = INCBIN_U8("data/rooms/brinstar/brinstar_6_bg1.gfx"); +const u8 sBrinstar_6_Bg1[188] = { + #include "extracted/data/rooms/brinstar/brinstar_6_bg1.gfx.inc" +}; const u8 sBrinstar_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_6_Bg0[186] = INCBIN_U8("data/rooms/brinstar/brinstar_6_bg0.gfx"); +const u8 sBrinstar_6_Bg0[186] = { + #include "extracted/data/rooms/brinstar/brinstar_6_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_7.c b/src/data/rooms/brinstar/brinstar_7.c index f446d9857..5ac905874 100644 --- a/src/data/rooms/brinstar/brinstar_7.c +++ b/src/data/rooms/brinstar/brinstar_7.c @@ -1,9 +1,13 @@ #include "data/rooms/brinstar_rooms_data.h" #include "macros.h" -const u8 sBrinstar_7_Clipdata[692] = INCBIN_U8("data/rooms/brinstar/brinstar_7_clipdata.gfx"); +const u8 sBrinstar_7_Clipdata[692] = { + #include "extracted/data/rooms/brinstar/brinstar_7_clipdata.gfx.inc" +}; -const u8 sBrinstar_7_Bg2[] = INCBIN_U8("data/rooms/brinstar/brinstar_7_bg2.gfx"); +const u8 sBrinstar_7_Bg2[] = { + #include "extracted/data/rooms/brinstar/brinstar_7_bg2.gfx.inc" +}; const u8 sBrinstar_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(19)] = { 12, 5, SPRITESET_IDX(2), @@ -27,7 +31,9 @@ const u8 sBrinstar_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(19)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_7_Bg1[] = INCBIN_U8("data/rooms/brinstar/brinstar_7_bg1.gfx"); +const u8 sBrinstar_7_Bg1[] = { + #include "extracted/data/rooms/brinstar/brinstar_7_bg1.gfx.inc" +}; const u8 sBrinstar_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(18)] = { 6, 10, SPRITESET_IDX(5), diff --git a/src/data/rooms/brinstar/brinstar_8.c b/src/data/rooms/brinstar/brinstar_8.c index 353b69bee..9d385b26c 100644 --- a/src/data/rooms/brinstar/brinstar_8.c +++ b/src/data/rooms/brinstar/brinstar_8.c @@ -20,9 +20,13 @@ const u8 sBrinstar_3_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_8_Clipdata[143] = INCBIN_U8("data/rooms/brinstar/brinstar_8_clipdata.gfx"); +const u8 sBrinstar_8_Clipdata[143] = { + #include "extracted/data/rooms/brinstar/brinstar_8_clipdata.gfx.inc" +}; -const u8 sBrinstar_8_Bg2[196] = INCBIN_U8("data/rooms/brinstar/brinstar_8_bg2.gfx"); +const u8 sBrinstar_8_Bg2[196] = { + #include "extracted/data/rooms/brinstar/brinstar_8_bg2.gfx.inc" +}; const u8 sBrinstar_8_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 6, 25, SPRITESET_IDX(2), @@ -33,7 +37,9 @@ const u8 sBrinstar_8_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_8_Bg1[407] = INCBIN_U8("data/rooms/brinstar/brinstar_8_bg1.gfx"); +const u8 sBrinstar_8_Bg1[407] = { + #include "extracted/data/rooms/brinstar/brinstar_8_bg1.gfx.inc" +}; const u8 sBrinstar_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 9, SPRITESET_IDX(0), @@ -41,5 +47,7 @@ const u8 sBrinstar_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_8_Bg0[205] = INCBIN_U8("data/rooms/brinstar/brinstar_8_bg0.gfx"); +const u8 sBrinstar_8_Bg0[205] = { + #include "extracted/data/rooms/brinstar/brinstar_8_bg0.gfx.inc" +}; diff --git a/src/data/rooms/brinstar/brinstar_9.c b/src/data/rooms/brinstar/brinstar_9.c index c60269a03..0ae9f999e 100644 --- a/src/data/rooms/brinstar/brinstar_9.c +++ b/src/data/rooms/brinstar/brinstar_9.c @@ -20,20 +20,28 @@ const u8 sBrinstar_4_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sBrinstar_9_Clipdata[313] = INCBIN_U8("data/rooms/brinstar/brinstar_9_clipdata.gfx"); +const u8 sBrinstar_9_Clipdata[313] = { + #include "extracted/data/rooms/brinstar/brinstar_9_clipdata.gfx.inc" +}; -const u8 sBrinstar_9_Bg2[247] = INCBIN_U8("data/rooms/brinstar/brinstar_9_bg2.gfx"); +const u8 sBrinstar_9_Bg2[247] = { + #include "extracted/data/rooms/brinstar/brinstar_9_bg2.gfx.inc" +}; const u8 sBrinstar_9_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 1, 69, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_9_Bg1[1389] = INCBIN_U8("data/rooms/brinstar/brinstar_9_bg1.gfx"); +const u8 sBrinstar_9_Bg1[1389] = { + #include "extracted/data/rooms/brinstar/brinstar_9_bg1.gfx.inc" +}; const u8 sBrinstar_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sBrinstar_9_Bg0[172] = INCBIN_U8("data/rooms/brinstar/brinstar_9_bg0.gfx"); +const u8 sBrinstar_9_Bg0[172] = { + #include "extracted/data/rooms/brinstar/brinstar_9_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/bg3.c b/src/data/rooms/chozodia/bg3.c index 169b3832c..3e3ff9312 100644 --- a/src/data/rooms/chozodia/bg3.c +++ b/src/data/rooms/chozodia/bg3.c @@ -1,31 +1,59 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sCrateria_Bg3_6[1500] = INCBIN_U8("data/rooms/chozodia/crateria_bg3_6.gfx"); +const u8 sCrateria_Bg3_6[1500] = { + #include "extracted/data/rooms/chozodia/crateria_bg3_6.gfx.inc" +}; -const u8 sChozodia_Bg3_0[1488] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_0.gfx"); +const u8 sChozodia_Bg3_0[1488] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_0.gfx.inc" +}; -const u8 sChozodia_Bg3_1[1156] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_1.gfx"); +const u8 sChozodia_Bg3_1[1156] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_1.gfx.inc" +}; -const u8 sChozodia_Bg3_2[1712] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_2.gfx"); +const u8 sChozodia_Bg3_2[1712] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_2.gfx.inc" +}; -const u8 sChozodia_Bg3_3[1600] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_3.gfx"); +const u8 sChozodia_Bg3_3[1600] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_3.gfx.inc" +}; -const u8 sChozodia_DarkSpotlight_Bg0[356] = INCBIN_U8("data/rooms/chozodia/chozodia_dark_spotlight_bg0.gfx"); +const u8 sChozodia_DarkSpotlight_Bg0[356] = { + #include "extracted/data/rooms/chozodia/chozodia_dark_spotlight_bg0.gfx.inc" +}; -const u8 sChozodia_Bg3_4[1468] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_4.gfx"); +const u8 sChozodia_Bg3_4[1468] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_4.gfx.inc" +}; -const u8 sChozodia_10_Bg0[320] = INCBIN_U8("data/rooms/chozodia/chozodia_10_bg0.gfx"); +const u8 sChozodia_10_Bg0[320] = { + #include "extracted/data/rooms/chozodia/chozodia_10_bg0.gfx.inc" +}; -const u8 sChozodia_Bg3_5[848] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_5.gfx"); +const u8 sChozodia_Bg3_5[848] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_5.gfx.inc" +}; -const u8 sChozodia_Bg3_6[1064] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_6.gfx"); +const u8 sChozodia_Bg3_6[1064] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_6.gfx.inc" +}; -const u8 sChozodia_Bg3_7[788] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_7.gfx"); +const u8 sChozodia_Bg3_7[788] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_7.gfx.inc" +}; -const u8 sChozodia_Bg3_8[1364] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_8.gfx"); +const u8 sChozodia_Bg3_8[1364] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_8.gfx.inc" +}; -const u8 sChozodia_Bg3_9[1040] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_9.gfx"); +const u8 sChozodia_Bg3_9[1040] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_9.gfx.inc" +}; -const u8 sChozodia_Bg3_10[676] = INCBIN_U8("data/rooms/chozodia/chozodia_bg3_10.gfx"); +const u8 sChozodia_Bg3_10[676] = { + #include "extracted/data/rooms/chozodia/chozodia_bg3_10.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_0.c b/src/data/rooms/chozodia/chozodia_0.c index 4c2220350..2ac3a680e 100644 --- a/src/data/rooms/chozodia/chozodia_0.c +++ b/src/data/rooms/chozodia/chozodia_0.c @@ -1,15 +1,23 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_0_Clipdata[139] = INCBIN_U8("data/rooms/chozodia/chozodia_0_clipdata.gfx"); +const u8 sChozodia_0_Clipdata[139] = { + #include "extracted/data/rooms/chozodia/chozodia_0_clipdata.gfx.inc" +}; -const u8 sChozodia_0_Bg2[116] = INCBIN_U8("data/rooms/chozodia/chozodia_0_bg2.gfx"); +const u8 sChozodia_0_Bg2[116] = { + #include "extracted/data/rooms/chozodia/chozodia_0_bg2.gfx.inc" +}; -const u8 sChozodia_0_Bg1[808] = INCBIN_U8("data/rooms/chozodia/chozodia_0_bg1.gfx"); +const u8 sChozodia_0_Bg1[808] = { + #include "extracted/data/rooms/chozodia/chozodia_0_bg1.gfx.inc" +}; const u8 sChozodia_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_0_Bg0[14] = INCBIN_U8("data/rooms/chozodia/chozodia_0_bg0.gfx"); +const u8 sChozodia_0_Bg0[14] = { + #include "extracted/data/rooms/chozodia/chozodia_0_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_1.c b/src/data/rooms/chozodia/chozodia_1.c index 98551dcc9..940f1a907 100644 --- a/src/data/rooms/chozodia/chozodia_1.c +++ b/src/data/rooms/chozodia/chozodia_1.c @@ -1,15 +1,23 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_1_Clipdata[198] = INCBIN_U8("data/rooms/chozodia/chozodia_1_clipdata.gfx"); +const u8 sChozodia_1_Clipdata[198] = { + #include "extracted/data/rooms/chozodia/chozodia_1_clipdata.gfx.inc" +}; -const u8 sChozodia_1_Bg2[172] = INCBIN_U8("data/rooms/chozodia/chozodia_1_bg2.gfx"); +const u8 sChozodia_1_Bg2[172] = { + #include "extracted/data/rooms/chozodia/chozodia_1_bg2.gfx.inc" +}; -const u8 sChozodia_1_Bg1[1007] = INCBIN_U8("data/rooms/chozodia/chozodia_1_bg1.gfx"); +const u8 sChozodia_1_Bg1[1007] = { + #include "extracted/data/rooms/chozodia/chozodia_1_bg1.gfx.inc" +}; const u8 sChozodia_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_1_Bg0[16] = INCBIN_U8("data/rooms/chozodia/chozodia_1_bg0.gfx"); +const u8 sChozodia_1_Bg0[16] = { + #include "extracted/data/rooms/chozodia/chozodia_1_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_10.c b/src/data/rooms/chozodia/chozodia_10.c index ba22cd789..aa9cee0e3 100644 --- a/src/data/rooms/chozodia/chozodia_10.c +++ b/src/data/rooms/chozodia/chozodia_10.c @@ -20,11 +20,17 @@ const u8 sChozodia_6_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_10_Clipdata[122] = INCBIN_U8("data/rooms/chozodia/chozodia_10_clipdata.gfx"); +const u8 sChozodia_10_Clipdata[122] = { + #include "extracted/data/rooms/chozodia/chozodia_10_clipdata.gfx.inc" +}; -const u8 sChozodia_10_Bg2[178] = INCBIN_U8("data/rooms/chozodia/chozodia_10_bg2.gfx"); +const u8 sChozodia_10_Bg2[178] = { + #include "extracted/data/rooms/chozodia/chozodia_10_bg2.gfx.inc" +}; -const u8 sChozodia_10_Bg1[465] = INCBIN_U8("data/rooms/chozodia/chozodia_10_bg1.gfx"); +const u8 sChozodia_10_Bg1[465] = { + #include "extracted/data/rooms/chozodia/chozodia_10_bg1.gfx.inc" +}; const u8 sChozodia_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 7, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_11.c b/src/data/rooms/chozodia/chozodia_11.c index 10a8ce44e..5130aa060 100644 --- a/src/data/rooms/chozodia/chozodia_11.c +++ b/src/data/rooms/chozodia/chozodia_11.c @@ -13,11 +13,17 @@ const u8 sChozodia_7_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_11_Clipdata[95] = INCBIN_U8("data/rooms/chozodia/chozodia_11_clipdata.gfx"); +const u8 sChozodia_11_Clipdata[95] = { + #include "extracted/data/rooms/chozodia/chozodia_11_clipdata.gfx.inc" +}; -const u8 sChozodia_11_Bg2_Unused[14] = INCBIN_U8("data/rooms/chozodia/chozodia_11_bg2_unused.gfx"); +const u8 sChozodia_11_Bg2_Unused[14] = { + #include "extracted/data/rooms/chozodia/chozodia_11_bg2_unused.gfx.inc" +}; -const u8 sChozodia_11_Bg1[221] = INCBIN_U8("data/rooms/chozodia/chozodia_11_bg1.gfx"); +const u8 sChozodia_11_Bg1[221] = { + #include "extracted/data/rooms/chozodia/chozodia_11_bg1.gfx.inc" +}; const u8 sChozodia_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 4, 7, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_12.c b/src/data/rooms/chozodia/chozodia_12.c index 5d301abc3..be5481439 100644 --- a/src/data/rooms/chozodia/chozodia_12.c +++ b/src/data/rooms/chozodia/chozodia_12.c @@ -20,11 +20,17 @@ const u8 sChozodia_8_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_12_Clipdata[276] = INCBIN_U8("data/rooms/chozodia/chozodia_12_clipdata.gfx"); +const u8 sChozodia_12_Clipdata[276] = { + #include "extracted/data/rooms/chozodia/chozodia_12_clipdata.gfx.inc" +}; -const u8 sChozodia_12_Bg2[372] = INCBIN_U8("data/rooms/chozodia/chozodia_12_bg2.gfx"); +const u8 sChozodia_12_Bg2[372] = { + #include "extracted/data/rooms/chozodia/chozodia_12_bg2.gfx.inc" +}; -const u8 sChozodia_12_Bg1[684] = INCBIN_U8("data/rooms/chozodia/chozodia_12_bg1.gfx"); +const u8 sChozodia_12_Bg1[684] = { + #include "extracted/data/rooms/chozodia/chozodia_12_bg1.gfx.inc" +}; const u8 sChozodia_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 40, 8, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_13.c b/src/data/rooms/chozodia/chozodia_13.c index 97b83d69f..2ff98c342 100644 --- a/src/data/rooms/chozodia/chozodia_13.c +++ b/src/data/rooms/chozodia/chozodia_13.c @@ -41,7 +41,9 @@ const u8 sChozodia_9_Scrolls[SCROLL_DATA_SIZE(5)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_13_Clipdata[680] = INCBIN_U8("data/rooms/chozodia/chozodia_13_clipdata.gfx"); +const u8 sChozodia_13_Clipdata[680] = { + #include "extracted/data/rooms/chozodia/chozodia_13_clipdata.gfx.inc" +}; const u8 sChozodia_13_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 15, 20, SPRITESET_IDX(4), @@ -50,7 +52,9 @@ const u8 sChozodia_13_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_13_Bg2[1468] = INCBIN_U8("data/rooms/chozodia/chozodia_13_bg2.gfx"); +const u8 sChozodia_13_Bg2[1468] = { + #include "extracted/data/rooms/chozodia/chozodia_13_bg2.gfx.inc" +}; const u8 sChozodia_13_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 23, 9, SPRITESET_IDX(4), @@ -63,7 +67,9 @@ const u8 sChozodia_13_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_13_Bg1[1694] = INCBIN_U8("data/rooms/chozodia/chozodia_13_bg1.gfx"); +const u8 sChozodia_13_Bg1[1694] = { + #include "extracted/data/rooms/chozodia/chozodia_13_bg1.gfx.inc" +}; const u8 sChozodia_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 80, 19, SPRITESET_IDX(0), @@ -71,5 +77,7 @@ const u8 sChozodia_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_13_Bg0[187] = INCBIN_U8("data/rooms/chozodia/chozodia_13_bg0.gfx"); +const u8 sChozodia_13_Bg0[187] = { + #include "extracted/data/rooms/chozodia/chozodia_13_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_14.c b/src/data/rooms/chozodia/chozodia_14.c index fe1109e96..869a376d6 100644 --- a/src/data/rooms/chozodia/chozodia_14.c +++ b/src/data/rooms/chozodia/chozodia_14.c @@ -20,9 +20,13 @@ const u8 sChozodia_10_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_14_Clipdata[286] = INCBIN_U8("data/rooms/chozodia/chozodia_14_clipdata.gfx"); +const u8 sChozodia_14_Clipdata[286] = { + #include "extracted/data/rooms/chozodia/chozodia_14_clipdata.gfx.inc" +}; -const u8 sChozodia_14_Bg2[368] = INCBIN_U8("data/rooms/chozodia/chozodia_14_bg2.gfx"); +const u8 sChozodia_14_Bg2[368] = { + #include "extracted/data/rooms/chozodia/chozodia_14_bg2.gfx.inc" +}; const u8 sChozodia_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 10, 6, SPRITESET_IDX(5), @@ -33,7 +37,9 @@ const u8 sChozodia_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_14_Bg1[776] = INCBIN_U8("data/rooms/chozodia/chozodia_14_bg1.gfx"); +const u8 sChozodia_14_Bg1[776] = { + #include "extracted/data/rooms/chozodia/chozodia_14_bg1.gfx.inc" +}; const u8 sChozodia_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 10, 6, SPRITESET_IDX(5), @@ -41,5 +47,7 @@ const u8 sChozodia_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_14_Bg0[185] = INCBIN_U8("data/rooms/chozodia/chozodia_14_bg0.gfx"); +const u8 sChozodia_14_Bg0[185] = { + #include "extracted/data/rooms/chozodia/chozodia_14_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_15.c b/src/data/rooms/chozodia/chozodia_15.c index 9571b8dc5..9b86869e8 100644 --- a/src/data/rooms/chozodia/chozodia_15.c +++ b/src/data/rooms/chozodia/chozodia_15.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_15_Clipdata[81] = INCBIN_U8("data/rooms/chozodia/chozodia_15_clipdata.gfx"); +const u8 sChozodia_15_Clipdata[81] = { + #include "extracted/data/rooms/chozodia/chozodia_15_clipdata.gfx.inc" +}; -const u8 sChozodia_15_Bg1[173] = INCBIN_U8("data/rooms/chozodia/chozodia_15_bg1.gfx"); +const u8 sChozodia_15_Bg1[173] = { + #include "extracted/data/rooms/chozodia/chozodia_15_bg1.gfx.inc" +}; const u8 sChozodia_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_15_Bg0[44] = INCBIN_U8("data/rooms/chozodia/chozodia_15_bg0.gfx"); +const u8 sChozodia_15_Bg0[44] = { + #include "extracted/data/rooms/chozodia/chozodia_15_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_16.c b/src/data/rooms/chozodia/chozodia_16.c index 35b2f9431..e20500c88 100644 --- a/src/data/rooms/chozodia/chozodia_16.c +++ b/src/data/rooms/chozodia/chozodia_16.c @@ -1,7 +1,9 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_16_Clipdata[302] = INCBIN_U8("data/rooms/chozodia/chozodia_16_clipdata.gfx"); +const u8 sChozodia_16_Clipdata[302] = { + #include "extracted/data/rooms/chozodia/chozodia_16_clipdata.gfx.inc" +}; const u8 sChozodia_16_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 6, 4, SPRITESET_IDX(8), @@ -16,7 +18,9 @@ const u8 sChozodia_16_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_16_Bg2[214] = INCBIN_U8("data/rooms/chozodia/chozodia_16_bg2.gfx"); +const u8 sChozodia_16_Bg2[214] = { + #include "extracted/data/rooms/chozodia/chozodia_16_bg2.gfx.inc" +}; const u8 sChozodia_16_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 4, SPRITESET_IDX(8), @@ -26,7 +30,9 @@ const u8 sChozodia_16_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_16_Bg1[438] = INCBIN_U8("data/rooms/chozodia/chozodia_16_bg1.gfx"); +const u8 sChozodia_16_Bg1[438] = { + #include "extracted/data/rooms/chozodia/chozodia_16_bg1.gfx.inc" +}; const u8 sChozodia_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 6, 4, SPRITESET_IDX(8), @@ -38,5 +44,7 @@ const u8 sChozodia_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_16_Bg0[16] = INCBIN_U8("data/rooms/chozodia/chozodia_16_bg0.gfx"); +const u8 sChozodia_16_Bg0[16] = { + #include "extracted/data/rooms/chozodia/chozodia_16_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_17.c b/src/data/rooms/chozodia/chozodia_17.c index 3444e3cd7..64bc4933c 100644 --- a/src/data/rooms/chozodia/chozodia_17.c +++ b/src/data/rooms/chozodia/chozodia_17.c @@ -13,16 +13,22 @@ const u8 sChozodia_11_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_17_Clipdata[145] = INCBIN_U8("data/rooms/chozodia/chozodia_17_clipdata.gfx"); +const u8 sChozodia_17_Clipdata[145] = { + #include "extracted/data/rooms/chozodia/chozodia_17_clipdata.gfx.inc" +}; -const u8 sChozodia_17_Bg2[271] = INCBIN_U8("data/rooms/chozodia/chozodia_17_bg2.gfx"); +const u8 sChozodia_17_Bg2[271] = { + #include "extracted/data/rooms/chozodia/chozodia_17_bg2.gfx.inc" +}; const u8 sChozodia_17_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 16, 9, SPRITESET_IDX(2), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_17_Bg1[364] = INCBIN_U8("data/rooms/chozodia/chozodia_17_bg1.gfx"); +const u8 sChozodia_17_Bg1[364] = { + #include "extracted/data/rooms/chozodia/chozodia_17_bg1.gfx.inc" +}; const u8 sChozodia_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 16, 9, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_18.c b/src/data/rooms/chozodia/chozodia_18.c index 39f6f9692..ea2843c3c 100644 --- a/src/data/rooms/chozodia/chozodia_18.c +++ b/src/data/rooms/chozodia/chozodia_18.c @@ -13,7 +13,9 @@ const u8 sChozodia_12_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_18_Clipdata[402] = INCBIN_U8("data/rooms/chozodia/chozodia_18_clipdata.gfx"); +const u8 sChozodia_18_Clipdata[402] = { + #include "extracted/data/rooms/chozodia/chozodia_18_clipdata.gfx.inc" +}; const u8 sChozodia_18_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 13, 31, SPRITESET_IDX(4), @@ -28,7 +30,9 @@ const u8 sChozodia_18_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_18_Bg2[14] = INCBIN_U8("data/rooms/chozodia/chozodia_18_bg2.gfx"); +const u8 sChozodia_18_Bg2[14] = { + #include "extracted/data/rooms/chozodia/chozodia_18_bg2.gfx.inc" +}; const u8 sChozodia_18_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 20, 46, SPRITESET_IDX(1), @@ -48,7 +52,9 @@ const u8 sChozodia_18_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_18_Bg1[949] = INCBIN_U8("data/rooms/chozodia/chozodia_18_bg1.gfx"); +const u8 sChozodia_18_Bg1[949] = { + #include "extracted/data/rooms/chozodia/chozodia_18_bg1.gfx.inc" +}; const u8 sChozodia_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(23)] = { 18, 12, SPRITESET_IDX(8), @@ -76,5 +82,7 @@ const u8 sChozodia_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(23)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_18_Bg0[17] = INCBIN_U8("data/rooms/chozodia/chozodia_18_bg0.gfx"); +const u8 sChozodia_18_Bg0[17] = { + #include "extracted/data/rooms/chozodia/chozodia_18_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_19.c b/src/data/rooms/chozodia/chozodia_19.c index c1fad35bf..8e80aebce 100644 --- a/src/data/rooms/chozodia/chozodia_19.c +++ b/src/data/rooms/chozodia/chozodia_19.c @@ -13,16 +13,24 @@ const u8 sChozodia_13_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sChozodia_19_Clipdata[165] = INCBIN_U8("data/rooms/chozodia/chozodia_19_clipdata.gfx"); +const u8 sChozodia_19_Clipdata[165] = { + #include "extracted/data/rooms/chozodia/chozodia_19_clipdata.gfx.inc" +}; -const u8 sChozodia_19_Bg2[395] = INCBIN_U8("data/rooms/chozodia/chozodia_19_bg2.gfx"); +const u8 sChozodia_19_Bg2[395] = { + #include "extracted/data/rooms/chozodia/chozodia_19_bg2.gfx.inc" +}; -const u8 sChozodia_19_Bg1[371] = INCBIN_U8("data/rooms/chozodia/chozodia_19_bg1.gfx"); +const u8 sChozodia_19_Bg1[371] = { + #include "extracted/data/rooms/chozodia/chozodia_19_bg1.gfx.inc" +}; const u8 sChozodia_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 12, 13, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_19_Bg0[185] = INCBIN_U8("data/rooms/chozodia/chozodia_19_bg0.gfx"); +const u8 sChozodia_19_Bg0[185] = { + #include "extracted/data/rooms/chozodia/chozodia_19_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_2.c b/src/data/rooms/chozodia/chozodia_2.c index 5b63625d1..2b2162c06 100644 --- a/src/data/rooms/chozodia/chozodia_2.c +++ b/src/data/rooms/chozodia/chozodia_2.c @@ -13,11 +13,17 @@ const u8 sChozodia_0_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_2_Clipdata[251] = INCBIN_U8("data/rooms/chozodia/chozodia_2_clipdata.gfx"); +const u8 sChozodia_2_Clipdata[251] = { + #include "extracted/data/rooms/chozodia/chozodia_2_clipdata.gfx.inc" +}; -const u8 sChozodia_2_Bg2[314] = INCBIN_U8("data/rooms/chozodia/chozodia_2_bg2.gfx"); +const u8 sChozodia_2_Bg2[314] = { + #include "extracted/data/rooms/chozodia/chozodia_2_bg2.gfx.inc" +}; -const u8 sChozodia_2_Bg1[778] = INCBIN_U8("data/rooms/chozodia/chozodia_2_bg1.gfx"); +const u8 sChozodia_2_Bg1[778] = { + #include "extracted/data/rooms/chozodia/chozodia_2_bg1.gfx.inc" +}; const u8 sChozodia_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 9, 23, SPRITESET_IDX(0), @@ -26,5 +32,7 @@ const u8 sChozodia_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_2_Bg0[23] = INCBIN_U8("data/rooms/chozodia/chozodia_2_bg0.gfx"); +const u8 sChozodia_2_Bg0[23] = { + #include "extracted/data/rooms/chozodia/chozodia_2_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_20.c b/src/data/rooms/chozodia/chozodia_20.c index 5d8dfbcbf..f6dadfac7 100644 --- a/src/data/rooms/chozodia/chozodia_20.c +++ b/src/data/rooms/chozodia/chozodia_20.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_20_Clipdata[412] = INCBIN_U8("data/rooms/chozodia/chozodia_20_clipdata.gfx"); +const u8 sChozodia_20_Clipdata[412] = { + #include "extracted/data/rooms/chozodia/chozodia_20_clipdata.gfx.inc" +}; -const u8 sChozodia_20_Bg2[741] = INCBIN_U8("data/rooms/chozodia/chozodia_20_bg2.gfx"); +const u8 sChozodia_20_Bg2[741] = { + #include "extracted/data/rooms/chozodia/chozodia_20_bg2.gfx.inc" +}; -const u8 sChozodia_20_Bg1[977] = INCBIN_U8("data/rooms/chozodia/chozodia_20_bg1.gfx"); +const u8 sChozodia_20_Bg1[977] = { + #include "extracted/data/rooms/chozodia/chozodia_20_bg1.gfx.inc" +}; const u8 sChozodia_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 16, 9, SPRITESET_IDX(0), @@ -13,5 +19,7 @@ const u8 sChozodia_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_20_Bg0[885] = INCBIN_U8("data/rooms/chozodia/chozodia_20_bg0.gfx"); +const u8 sChozodia_20_Bg0[885] = { + #include "extracted/data/rooms/chozodia/chozodia_20_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_21.c b/src/data/rooms/chozodia/chozodia_21.c index 31ddd19a0..2b8a0451f 100644 --- a/src/data/rooms/chozodia/chozodia_21.c +++ b/src/data/rooms/chozodia/chozodia_21.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_21_Clipdata[89] = INCBIN_U8("data/rooms/chozodia/chozodia_21_clipdata.gfx"); +const u8 sChozodia_21_Clipdata[89] = { + #include "extracted/data/rooms/chozodia/chozodia_21_clipdata.gfx.inc" +}; -const u8 sChozodia_21_Bg1[199] = INCBIN_U8("data/rooms/chozodia/chozodia_21_bg1.gfx"); +const u8 sChozodia_21_Bg1[199] = { + #include "extracted/data/rooms/chozodia/chozodia_21_bg1.gfx.inc" +}; const u8 sChozodia_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_21_Bg0[46] = INCBIN_U8("data/rooms/chozodia/chozodia_21_bg0.gfx"); +const u8 sChozodia_21_Bg0[46] = { + #include "extracted/data/rooms/chozodia/chozodia_21_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_22.c b/src/data/rooms/chozodia/chozodia_22.c index 4a021a471..06dfe686b 100644 --- a/src/data/rooms/chozodia/chozodia_22.c +++ b/src/data/rooms/chozodia/chozodia_22.c @@ -13,9 +13,13 @@ const u8 sChozodia_14_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_22_Clipdata[100] = INCBIN_U8("data/rooms/chozodia/chozodia_22_clipdata.gfx"); +const u8 sChozodia_22_Clipdata[100] = { + #include "extracted/data/rooms/chozodia/chozodia_22_clipdata.gfx.inc" +}; -const u8 sChozodia_22_Bg2[271] = INCBIN_U8("data/rooms/chozodia/chozodia_22_bg2.gfx"); +const u8 sChozodia_22_Bg2[271] = { + #include "extracted/data/rooms/chozodia/chozodia_22_bg2.gfx.inc" +}; const u8 sChozodia_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 16, 2, SPRITESET_IDX(1), @@ -23,11 +27,15 @@ const u8 sChozodia_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_22_Bg1[224] = INCBIN_U8("data/rooms/chozodia/chozodia_22_bg1.gfx"); +const u8 sChozodia_22_Bg1[224] = { + #include "extracted/data/rooms/chozodia/chozodia_22_bg1.gfx.inc" +}; const u8 sChozodia_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_22_Bg0[95] = INCBIN_U8("data/rooms/chozodia/chozodia_22_bg0.gfx"); +const u8 sChozodia_22_Bg0[95] = { + #include "extracted/data/rooms/chozodia/chozodia_22_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_23.c b/src/data/rooms/chozodia/chozodia_23.c index 9c6963c3b..f10b449b0 100644 --- a/src/data/rooms/chozodia/chozodia_23.c +++ b/src/data/rooms/chozodia/chozodia_23.c @@ -20,11 +20,17 @@ const u8 sChozodia_15_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_23_Clipdata[401] = INCBIN_U8("data/rooms/chozodia/chozodia_23_clipdata.gfx"); +const u8 sChozodia_23_Clipdata[401] = { + #include "extracted/data/rooms/chozodia/chozodia_23_clipdata.gfx.inc" +}; -const u8 sChozodia_23_Bg2[401] = INCBIN_U8("data/rooms/chozodia/chozodia_23_bg2.gfx"); +const u8 sChozodia_23_Bg2[401] = { + #include "extracted/data/rooms/chozodia/chozodia_23_bg2.gfx.inc" +}; -const u8 sChozodia_23_Bg1[1441] = INCBIN_U8("data/rooms/chozodia/chozodia_23_bg1.gfx"); +const u8 sChozodia_23_Bg1[1441] = { + #include "extracted/data/rooms/chozodia/chozodia_23_bg1.gfx.inc" +}; const u8 sChozodia_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 16, 38, SPRITESET_IDX(2), @@ -33,5 +39,7 @@ const u8 sChozodia_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_23_Bg0[15] = INCBIN_U8("data/rooms/chozodia/chozodia_23_bg0.gfx"); +const u8 sChozodia_23_Bg0[15] = { + #include "extracted/data/rooms/chozodia/chozodia_23_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_24.c b/src/data/rooms/chozodia/chozodia_24.c index ad21376c1..508e714a6 100644 --- a/src/data/rooms/chozodia/chozodia_24.c +++ b/src/data/rooms/chozodia/chozodia_24.c @@ -20,15 +20,23 @@ const u8 sChozodia_16_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_24_Clipdata[145] = INCBIN_U8("data/rooms/chozodia/chozodia_24_clipdata.gfx"); +const u8 sChozodia_24_Clipdata[145] = { + #include "extracted/data/rooms/chozodia/chozodia_24_clipdata.gfx.inc" +}; -const u8 sChozodia_24_Bg2[256] = INCBIN_U8("data/rooms/chozodia/chozodia_24_bg2.gfx"); +const u8 sChozodia_24_Bg2[256] = { + #include "extracted/data/rooms/chozodia/chozodia_24_bg2.gfx.inc" +}; -const u8 sChozodia_24_Bg1[300] = INCBIN_U8("data/rooms/chozodia/chozodia_24_bg1.gfx"); +const u8 sChozodia_24_Bg1[300] = { + #include "extracted/data/rooms/chozodia/chozodia_24_bg1.gfx.inc" +}; const u8 sChozodia_24_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_24_Bg0[62] = INCBIN_U8("data/rooms/chozodia/chozodia_24_bg0.gfx"); +const u8 sChozodia_24_Bg0[62] = { + #include "extracted/data/rooms/chozodia/chozodia_24_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_25.c b/src/data/rooms/chozodia/chozodia_25.c index 3b6c765ab..ce52249e2 100644 --- a/src/data/rooms/chozodia/chozodia_25.c +++ b/src/data/rooms/chozodia/chozodia_25.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_25_Clipdata[215] = INCBIN_U8("data/rooms/chozodia/chozodia_25_clipdata.gfx"); +const u8 sChozodia_25_Clipdata[215] = { + #include "extracted/data/rooms/chozodia/chozodia_25_clipdata.gfx.inc" +}; -const u8 sChozodia_25_Bg2[868] = INCBIN_U8("data/rooms/chozodia/chozodia_25_bg2.gfx"); +const u8 sChozodia_25_Bg2[868] = { + #include "extracted/data/rooms/chozodia/chozodia_25_bg2.gfx.inc" +}; -const u8 sChozodia_25_Bg1[902] = INCBIN_U8("data/rooms/chozodia/chozodia_25_bg1.gfx"); +const u8 sChozodia_25_Bg1[902] = { + #include "extracted/data/rooms/chozodia/chozodia_25_bg1.gfx.inc" +}; const u8 sChozodia_25_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 5, 21, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_26.c b/src/data/rooms/chozodia/chozodia_26.c index 0539d0fe6..2464fdbdb 100644 --- a/src/data/rooms/chozodia/chozodia_26.c +++ b/src/data/rooms/chozodia/chozodia_26.c @@ -20,11 +20,17 @@ const u8 sChozodia_17_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_26_Clipdata[147] = INCBIN_U8("data/rooms/chozodia/chozodia_26_clipdata.gfx"); +const u8 sChozodia_26_Clipdata[147] = { + #include "extracted/data/rooms/chozodia/chozodia_26_clipdata.gfx.inc" +}; -const u8 sChozodia_26_Bg2[105] = INCBIN_U8("data/rooms/chozodia/chozodia_26_bg2.gfx"); +const u8 sChozodia_26_Bg2[105] = { + #include "extracted/data/rooms/chozodia/chozodia_26_bg2.gfx.inc" +}; -const u8 sChozodia_26_Bg1[706] = INCBIN_U8("data/rooms/chozodia/chozodia_26_bg1.gfx"); +const u8 sChozodia_26_Bg1[706] = { + #include "extracted/data/rooms/chozodia/chozodia_26_bg1.gfx.inc" +}; const u8 sChozodia_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 14, 42, SPRITESET_IDX(0), @@ -32,5 +38,7 @@ const u8 sChozodia_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_26_Bg0[111] = INCBIN_U8("data/rooms/chozodia/chozodia_26_bg0.gfx"); +const u8 sChozodia_26_Bg0[111] = { + #include "extracted/data/rooms/chozodia/chozodia_26_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_27.c b/src/data/rooms/chozodia/chozodia_27.c index 5800ddd7d..e57186256 100644 --- a/src/data/rooms/chozodia/chozodia_27.c +++ b/src/data/rooms/chozodia/chozodia_27.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_27_Clipdata[85] = INCBIN_U8("data/rooms/chozodia/chozodia_27_clipdata.gfx"); +const u8 sChozodia_27_Clipdata[85] = { + #include "extracted/data/rooms/chozodia/chozodia_27_clipdata.gfx.inc" +}; -const u8 sChozodia_27_Bg1[198] = INCBIN_U8("data/rooms/chozodia/chozodia_27_bg1.gfx"); +const u8 sChozodia_27_Bg1[198] = { + #include "extracted/data/rooms/chozodia/chozodia_27_bg1.gfx.inc" +}; const u8 sChozodia_27_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_27_Bg0[43] = INCBIN_U8("data/rooms/chozodia/chozodia_27_bg0.gfx"); +const u8 sChozodia_27_Bg0[43] = { + #include "extracted/data/rooms/chozodia/chozodia_27_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_28.c b/src/data/rooms/chozodia/chozodia_28.c index 0252e47f2..553fb4306 100644 --- a/src/data/rooms/chozodia/chozodia_28.c +++ b/src/data/rooms/chozodia/chozodia_28.c @@ -13,7 +13,9 @@ const u8 sChozodia_18_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_28_Clipdata[506] = INCBIN_U8("data/rooms/chozodia/chozodia_28_clipdata.gfx"); +const u8 sChozodia_28_Clipdata[506] = { + #include "extracted/data/rooms/chozodia/chozodia_28_clipdata.gfx.inc" +}; const u8 sChozodia_28_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 16, 13, SPRITESET_IDX(0), @@ -25,7 +27,9 @@ const u8 sChozodia_28_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_28_Bg2[326] = INCBIN_U8("data/rooms/chozodia/chozodia_28_bg2.gfx"); +const u8 sChozodia_28_Bg2[326] = { + #include "extracted/data/rooms/chozodia/chozodia_28_bg2.gfx.inc" +}; const u8 sChozodia_28_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 14, 10, SPRITESET_IDX(4), @@ -42,7 +46,9 @@ const u8 sChozodia_28_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_28_Bg1[854] = INCBIN_U8("data/rooms/chozodia/chozodia_28_bg1.gfx"); +const u8 sChozodia_28_Bg1[854] = { + #include "extracted/data/rooms/chozodia/chozodia_28_bg1.gfx.inc" +}; const u8 sChozodia_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 14, 10, SPRITESET_IDX(4), @@ -56,5 +62,7 @@ const u8 sChozodia_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_28_Bg0[16] = INCBIN_U8("data/rooms/chozodia/chozodia_28_bg0.gfx"); +const u8 sChozodia_28_Bg0[16] = { + #include "extracted/data/rooms/chozodia/chozodia_28_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_29.c b/src/data/rooms/chozodia/chozodia_29.c index 12460ea06..3b20a65da 100644 --- a/src/data/rooms/chozodia/chozodia_29.c +++ b/src/data/rooms/chozodia/chozodia_29.c @@ -20,9 +20,13 @@ const u8 sChozodia_19_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_29_Clipdata[335] = INCBIN_U8("data/rooms/chozodia/chozodia_29_clipdata.gfx"); +const u8 sChozodia_29_Clipdata[335] = { + #include "extracted/data/rooms/chozodia/chozodia_29_clipdata.gfx.inc" +}; -const u8 sChozodia_29_Bg2[385] = INCBIN_U8("data/rooms/chozodia/chozodia_29_bg2.gfx"); +const u8 sChozodia_29_Bg2[385] = { + #include "extracted/data/rooms/chozodia/chozodia_29_bg2.gfx.inc" +}; const u8 sChozodia_29_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 9, 40, SPRITESET_IDX(0), @@ -34,12 +38,16 @@ const u8 sChozodia_29_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_29_Bg1[964] = INCBIN_U8("data/rooms/chozodia/chozodia_29_bg1.gfx"); +const u8 sChozodia_29_Bg1[964] = { + #include "extracted/data/rooms/chozodia/chozodia_29_bg1.gfx.inc" +}; const u8 sChozodia_29_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 15, 41, SPRITESET_IDX(2), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_29_Bg0[159] = INCBIN_U8("data/rooms/chozodia/chozodia_29_bg0.gfx"); +const u8 sChozodia_29_Bg0[159] = { + #include "extracted/data/rooms/chozodia/chozodia_29_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_3.c b/src/data/rooms/chozodia/chozodia_3.c index 87a2c7069..35d5cfad9 100644 --- a/src/data/rooms/chozodia/chozodia_3.c +++ b/src/data/rooms/chozodia/chozodia_3.c @@ -20,11 +20,17 @@ const u8 sChozodia_1_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_3_Clipdata[258] = INCBIN_U8("data/rooms/chozodia/chozodia_3_clipdata.gfx"); +const u8 sChozodia_3_Clipdata[258] = { + #include "extracted/data/rooms/chozodia/chozodia_3_clipdata.gfx.inc" +}; -const u8 sChozodia_3_Bg2[370] = INCBIN_U8("data/rooms/chozodia/chozodia_3_bg2.gfx"); +const u8 sChozodia_3_Bg2[370] = { + #include "extracted/data/rooms/chozodia/chozodia_3_bg2.gfx.inc" +}; -const u8 sChozodia_3_Bg1[725] = INCBIN_U8("data/rooms/chozodia/chozodia_3_bg1.gfx"); +const u8 sChozodia_3_Bg1[725] = { + #include "extracted/data/rooms/chozodia/chozodia_3_bg1.gfx.inc" +}; const u8 sChozodia_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 6, 2, SPRITESET_IDX(1), @@ -37,5 +43,7 @@ const u8 sChozodia_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_3_Bg0[17] = INCBIN_U8("data/rooms/chozodia/chozodia_3_bg0.gfx"); +const u8 sChozodia_3_Bg0[17] = { + #include "extracted/data/rooms/chozodia/chozodia_3_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_30.c b/src/data/rooms/chozodia/chozodia_30.c index a55979be4..881e3f136 100644 --- a/src/data/rooms/chozodia/chozodia_30.c +++ b/src/data/rooms/chozodia/chozodia_30.c @@ -13,11 +13,17 @@ const u8 sChozodia_20_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_30_Clipdata[293] = INCBIN_U8("data/rooms/chozodia/chozodia_30_clipdata.gfx"); +const u8 sChozodia_30_Clipdata[293] = { + #include "extracted/data/rooms/chozodia/chozodia_30_clipdata.gfx.inc" +}; -const u8 sChozodia_30_Bg2[184] = INCBIN_U8("data/rooms/chozodia/chozodia_30_bg2.gfx"); +const u8 sChozodia_30_Bg2[184] = { + #include "extracted/data/rooms/chozodia/chozodia_30_bg2.gfx.inc" +}; -const u8 sChozodia_30_Bg1[828] = INCBIN_U8("data/rooms/chozodia/chozodia_30_bg1.gfx"); +const u8 sChozodia_30_Bg1[828] = { + #include "extracted/data/rooms/chozodia/chozodia_30_bg1.gfx.inc" +}; const u8 sChozodia_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 17, 15, SPRITESET_IDX(7), @@ -27,5 +33,7 @@ const u8 sChozodia_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_30_Bg0[26] = INCBIN_U8("data/rooms/chozodia/chozodia_30_bg0.gfx"); +const u8 sChozodia_30_Bg0[26] = { + #include "extracted/data/rooms/chozodia/chozodia_30_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_31.c b/src/data/rooms/chozodia/chozodia_31.c index 31da20b97..dae017770 100644 --- a/src/data/rooms/chozodia/chozodia_31.c +++ b/src/data/rooms/chozodia/chozodia_31.c @@ -20,11 +20,17 @@ const u8 sChozodia_21_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_31_Clipdata[276] = INCBIN_U8("data/rooms/chozodia/chozodia_31_clipdata.gfx"); +const u8 sChozodia_31_Clipdata[276] = { + #include "extracted/data/rooms/chozodia/chozodia_31_clipdata.gfx.inc" +}; -const u8 sChozodia_31_Bg2[177] = INCBIN_U8("data/rooms/chozodia/chozodia_31_bg2.gfx"); +const u8 sChozodia_31_Bg2[177] = { + #include "extracted/data/rooms/chozodia/chozodia_31_bg2.gfx.inc" +}; -const u8 sChozodia_31_Bg1[987] = INCBIN_U8("data/rooms/chozodia/chozodia_31_bg1.gfx"); +const u8 sChozodia_31_Bg1[987] = { + #include "extracted/data/rooms/chozodia/chozodia_31_bg1.gfx.inc" +}; const u8 sChozodia_31_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 12, 14, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_32.c b/src/data/rooms/chozodia/chozodia_32.c index 2cc4b4e03..a9e1c2280 100644 --- a/src/data/rooms/chozodia/chozodia_32.c +++ b/src/data/rooms/chozodia/chozodia_32.c @@ -34,11 +34,17 @@ const u8 sChozodia_22_Scrolls[SCROLL_DATA_SIZE(4)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_32_Clipdata[251] = INCBIN_U8("data/rooms/chozodia/chozodia_32_clipdata.gfx"); +const u8 sChozodia_32_Clipdata[251] = { + #include "extracted/data/rooms/chozodia/chozodia_32_clipdata.gfx.inc" +}; -const u8 sChozodia_32_Bg2[265] = INCBIN_U8("data/rooms/chozodia/chozodia_32_bg2.gfx"); +const u8 sChozodia_32_Bg2[265] = { + #include "extracted/data/rooms/chozodia/chozodia_32_bg2.gfx.inc" +}; -const u8 sChozodia_32_Bg1[972] = INCBIN_U8("data/rooms/chozodia/chozodia_32_bg1.gfx"); +const u8 sChozodia_32_Bg1[972] = { + #include "extracted/data/rooms/chozodia/chozodia_32_bg1.gfx.inc" +}; const u8 sChozodia_32_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 6, 17, SPRITESET_IDX(4), diff --git a/src/data/rooms/chozodia/chozodia_33.c b/src/data/rooms/chozodia/chozodia_33.c index beeaf567a..33d8f0b02 100644 --- a/src/data/rooms/chozodia/chozodia_33.c +++ b/src/data/rooms/chozodia/chozodia_33.c @@ -13,15 +13,23 @@ const u8 sChozodia_23_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_33_Clipdata[80] = INCBIN_U8("data/rooms/chozodia/chozodia_33_clipdata.gfx"); +const u8 sChozodia_33_Clipdata[80] = { + #include "extracted/data/rooms/chozodia/chozodia_33_clipdata.gfx.inc" +}; -const u8 sChozodia_33_Bg2[66] = INCBIN_U8("data/rooms/chozodia/chozodia_33_bg2.gfx"); +const u8 sChozodia_33_Bg2[66] = { + #include "extracted/data/rooms/chozodia/chozodia_33_bg2.gfx.inc" +}; -const u8 sChozodia_33_Bg1[273] = INCBIN_U8("data/rooms/chozodia/chozodia_33_bg1.gfx"); +const u8 sChozodia_33_Bg1[273] = { + #include "extracted/data/rooms/chozodia/chozodia_33_bg1.gfx.inc" +}; const u8 sChozodia_33_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_33_Bg0[44] = INCBIN_U8("data/rooms/chozodia/chozodia_33_bg0.gfx"); +const u8 sChozodia_33_Bg0[44] = { + #include "extracted/data/rooms/chozodia/chozodia_33_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_34.c b/src/data/rooms/chozodia/chozodia_34.c index a9333e6cd..7fa0951f4 100644 --- a/src/data/rooms/chozodia/chozodia_34.c +++ b/src/data/rooms/chozodia/chozodia_34.c @@ -27,9 +27,13 @@ const u8 sChozodia_24_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_34_Clipdata[221] = INCBIN_U8("data/rooms/chozodia/chozodia_34_clipdata.gfx"); +const u8 sChozodia_34_Clipdata[221] = { + #include "extracted/data/rooms/chozodia/chozodia_34_clipdata.gfx.inc" +}; -const u8 sChozodia_34_Bg2[224] = INCBIN_U8("data/rooms/chozodia/chozodia_34_bg2.gfx"); +const u8 sChozodia_34_Bg2[224] = { + #include "extracted/data/rooms/chozodia/chozodia_34_bg2.gfx.inc" +}; const u8 sChozodia_34_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 18, 24, SPRITESET_IDX(3), @@ -39,12 +43,16 @@ const u8 sChozodia_34_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_34_Bg1[922] = INCBIN_U8("data/rooms/chozodia/chozodia_34_bg1.gfx"); +const u8 sChozodia_34_Bg1[922] = { + #include "extracted/data/rooms/chozodia/chozodia_34_bg1.gfx.inc" +}; const u8 sChozodia_34_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 24, 26, SPRITESET_IDX(4), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_34_Bg0[42] = INCBIN_U8("data/rooms/chozodia/chozodia_34_bg0.gfx"); +const u8 sChozodia_34_Bg0[42] = { + #include "extracted/data/rooms/chozodia/chozodia_34_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_35.c b/src/data/rooms/chozodia/chozodia_35.c index 73b7d6841..770131ffb 100644 --- a/src/data/rooms/chozodia/chozodia_35.c +++ b/src/data/rooms/chozodia/chozodia_35.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_35_Clipdata[121] = INCBIN_U8("data/rooms/chozodia/chozodia_35_clipdata.gfx"); +const u8 sChozodia_35_Clipdata[121] = { + #include "extracted/data/rooms/chozodia/chozodia_35_clipdata.gfx.inc" +}; -const u8 sChozodia_35_Bg2[312] = INCBIN_U8("data/rooms/chozodia/chozodia_35_bg2.gfx"); +const u8 sChozodia_35_Bg2[312] = { + #include "extracted/data/rooms/chozodia/chozodia_35_bg2.gfx.inc" +}; -const u8 sChozodia_35_Bg1[492] = INCBIN_U8("data/rooms/chozodia/chozodia_35_bg1.gfx"); +const u8 sChozodia_35_Bg1[492] = { + #include "extracted/data/rooms/chozodia/chozodia_35_bg1.gfx.inc" +}; const u8 sChozodia_35_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 5, 2, SPRITESET_IDX(1), @@ -16,5 +22,7 @@ const u8 sChozodia_35_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_35_Bg0[53] = INCBIN_U8("data/rooms/chozodia/chozodia_35_bg0.gfx"); +const u8 sChozodia_35_Bg0[53] = { + #include "extracted/data/rooms/chozodia/chozodia_35_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_36.c b/src/data/rooms/chozodia/chozodia_36.c index b40ed0084..1ab1414b3 100644 --- a/src/data/rooms/chozodia/chozodia_36.c +++ b/src/data/rooms/chozodia/chozodia_36.c @@ -1,15 +1,23 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_36_Clipdata[519] = INCBIN_U8("data/rooms/chozodia/chozodia_36_clipdata.gfx"); +const u8 sChozodia_36_Clipdata[519] = { + #include "extracted/data/rooms/chozodia/chozodia_36_clipdata.gfx.inc" +}; -const u8 sChozodia_36_Bg2[125] = INCBIN_U8("data/rooms/chozodia/chozodia_36_bg2.gfx"); +const u8 sChozodia_36_Bg2[125] = { + #include "extracted/data/rooms/chozodia/chozodia_36_bg2.gfx.inc" +}; -const u8 sChozodia_36_Bg1[1607] = INCBIN_U8("data/rooms/chozodia/chozodia_36_bg1.gfx"); +const u8 sChozodia_36_Bg1[1607] = { + #include "extracted/data/rooms/chozodia/chozodia_36_bg1.gfx.inc" +}; const u8 sChozodia_36_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_36_Bg0[458] = INCBIN_U8("data/rooms/chozodia/chozodia_36_bg0.gfx"); +const u8 sChozodia_36_Bg0[458] = { + #include "extracted/data/rooms/chozodia/chozodia_36_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_37.c b/src/data/rooms/chozodia/chozodia_37.c index d3f2d6769..e4ca9f134 100644 --- a/src/data/rooms/chozodia/chozodia_37.c +++ b/src/data/rooms/chozodia/chozodia_37.c @@ -1,9 +1,13 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_37_Clipdata[147] = INCBIN_U8("data/rooms/chozodia/chozodia_37_clipdata.gfx"); +const u8 sChozodia_37_Clipdata[147] = { + #include "extracted/data/rooms/chozodia/chozodia_37_clipdata.gfx.inc" +}; -const u8 sChozodia_37_Bg2[208] = INCBIN_U8("data/rooms/chozodia/chozodia_37_bg2.gfx"); +const u8 sChozodia_37_Bg2[208] = { + #include "extracted/data/rooms/chozodia/chozodia_37_bg2.gfx.inc" +}; const u8 sChozodia_37_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 8, 2, SPRITESET_IDX(1), @@ -11,7 +15,9 @@ const u8 sChozodia_37_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_37_Bg1[462] = INCBIN_U8("data/rooms/chozodia/chozodia_37_bg1.gfx"); +const u8 sChozodia_37_Bg1[462] = { + #include "extracted/data/rooms/chozodia/chozodia_37_bg1.gfx.inc" +}; const u8 sChozodia_37_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_38.c b/src/data/rooms/chozodia/chozodia_38.c index e482c3477..6f6256abd 100644 --- a/src/data/rooms/chozodia/chozodia_38.c +++ b/src/data/rooms/chozodia/chozodia_38.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_38_Clipdata[161] = INCBIN_U8("data/rooms/chozodia/chozodia_38_clipdata.gfx"); +const u8 sChozodia_38_Clipdata[161] = { + #include "extracted/data/rooms/chozodia/chozodia_38_clipdata.gfx.inc" +}; -const u8 sChozodia_38_Bg2[202] = INCBIN_U8("data/rooms/chozodia/chozodia_38_bg2.gfx"); +const u8 sChozodia_38_Bg2[202] = { + #include "extracted/data/rooms/chozodia/chozodia_38_bg2.gfx.inc" +}; -const u8 sChozodia_38_Bg1[459] = INCBIN_U8("data/rooms/chozodia/chozodia_38_bg1.gfx"); +const u8 sChozodia_38_Bg1[459] = { + #include "extracted/data/rooms/chozodia/chozodia_38_bg1.gfx.inc" +}; const u8 sChozodia_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_39.c b/src/data/rooms/chozodia/chozodia_39.c index c5e3fd0e1..89fff9e01 100644 --- a/src/data/rooms/chozodia/chozodia_39.c +++ b/src/data/rooms/chozodia/chozodia_39.c @@ -27,11 +27,17 @@ const u8 sChozodia_25_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_39_Clipdata[432] = INCBIN_U8("data/rooms/chozodia/chozodia_39_clipdata.gfx"); +const u8 sChozodia_39_Clipdata[432] = { + #include "extracted/data/rooms/chozodia/chozodia_39_clipdata.gfx.inc" +}; -const u8 sChozodia_39_Bg2[677] = INCBIN_U8("data/rooms/chozodia/chozodia_39_bg2.gfx"); +const u8 sChozodia_39_Bg2[677] = { + #include "extracted/data/rooms/chozodia/chozodia_39_bg2.gfx.inc" +}; -const u8 sChozodia_39_Bg1[1598] = INCBIN_U8("data/rooms/chozodia/chozodia_39_bg1.gfx"); +const u8 sChozodia_39_Bg1[1598] = { + #include "extracted/data/rooms/chozodia/chozodia_39_bg1.gfx.inc" +}; const u8 sChozodia_39_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 8, 61, SPRITESET_IDX(4), diff --git a/src/data/rooms/chozodia/chozodia_4.c b/src/data/rooms/chozodia/chozodia_4.c index 41010bb7e..85ededa66 100644 --- a/src/data/rooms/chozodia/chozodia_4.c +++ b/src/data/rooms/chozodia/chozodia_4.c @@ -1,21 +1,29 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_4_Clipdata[90] = INCBIN_U8("data/rooms/chozodia/chozodia_4_clipdata.gfx"); +const u8 sChozodia_4_Clipdata[90] = { + #include "extracted/data/rooms/chozodia/chozodia_4_clipdata.gfx.inc" +}; -const u8 sChozodia_4_Bg2[26] = INCBIN_U8("data/rooms/chozodia/chozodia_4_bg2.gfx"); +const u8 sChozodia_4_Bg2[26] = { + #include "extracted/data/rooms/chozodia/chozodia_4_bg2.gfx.inc" +}; const u8 sChozodia_4_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_4_Bg1[204] = INCBIN_U8("data/rooms/chozodia/chozodia_4_bg1.gfx"); +const u8 sChozodia_4_Bg1[204] = { + #include "extracted/data/rooms/chozodia/chozodia_4_bg1.gfx.inc" +}; const u8 sChozodia_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_4_Bg0[44] = INCBIN_U8("data/rooms/chozodia/chozodia_4_bg0.gfx"); +const u8 sChozodia_4_Bg0[44] = { + #include "extracted/data/rooms/chozodia/chozodia_4_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_40.c b/src/data/rooms/chozodia/chozodia_40.c index e6f58bbbc..d627e2f1c 100644 --- a/src/data/rooms/chozodia/chozodia_40.c +++ b/src/data/rooms/chozodia/chozodia_40.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_40_Clipdata[116] = INCBIN_U8("data/rooms/chozodia/chozodia_40_clipdata.gfx"); +const u8 sChozodia_40_Clipdata[116] = { + #include "extracted/data/rooms/chozodia/chozodia_40_clipdata.gfx.inc" +}; -const u8 sChozodia_40_Bg1[199] = INCBIN_U8("data/rooms/chozodia/chozodia_40_bg1.gfx"); +const u8 sChozodia_40_Bg1[199] = { + #include "extracted/data/rooms/chozodia/chozodia_40_bg1.gfx.inc" +}; const u8 sChozodia_40_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_40_Bg0[43] = INCBIN_U8("data/rooms/chozodia/chozodia_40_bg0.gfx"); +const u8 sChozodia_40_Bg0[43] = { + #include "extracted/data/rooms/chozodia/chozodia_40_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_41.c b/src/data/rooms/chozodia/chozodia_41.c index e110a608c..d999cd76a 100644 --- a/src/data/rooms/chozodia/chozodia_41.c +++ b/src/data/rooms/chozodia/chozodia_41.c @@ -27,9 +27,13 @@ const u8 sChozodia_26_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_41_Clipdata[895] = INCBIN_U8("data/rooms/chozodia/chozodia_41_clipdata.gfx"); +const u8 sChozodia_41_Clipdata[895] = { + #include "extracted/data/rooms/chozodia/chozodia_41_clipdata.gfx.inc" +}; -const u8 sChozodia_41_Bg1[1632] = INCBIN_U8("data/rooms/chozodia/chozodia_41_bg1.gfx"); +const u8 sChozodia_41_Bg1[1632] = { + #include "extracted/data/rooms/chozodia/chozodia_41_bg1.gfx.inc" +}; const u8 sChozodia_41_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 28, 23, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_42.c b/src/data/rooms/chozodia/chozodia_42.c index c38abed67..dfcff942d 100644 --- a/src/data/rooms/chozodia/chozodia_42.c +++ b/src/data/rooms/chozodia/chozodia_42.c @@ -27,11 +27,17 @@ const u8 sChozodia_27_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_42_Clipdata[184] = INCBIN_U8("data/rooms/chozodia/chozodia_42_clipdata.gfx"); +const u8 sChozodia_42_Clipdata[184] = { + #include "extracted/data/rooms/chozodia/chozodia_42_clipdata.gfx.inc" +}; -const u8 sChozodia_42_Bg2[569] = INCBIN_U8("data/rooms/chozodia/chozodia_42_bg2.gfx"); +const u8 sChozodia_42_Bg2[569] = { + #include "extracted/data/rooms/chozodia/chozodia_42_bg2.gfx.inc" +}; -const u8 sChozodia_42_Bg1[305] = INCBIN_U8("data/rooms/chozodia/chozodia_42_bg1.gfx"); +const u8 sChozodia_42_Bg1[305] = { + #include "extracted/data/rooms/chozodia/chozodia_42_bg1.gfx.inc" +}; const u8 sChozodia_42_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 25, 24, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_43.c b/src/data/rooms/chozodia/chozodia_43.c index 8a45acf49..1157b30f9 100644 --- a/src/data/rooms/chozodia/chozodia_43.c +++ b/src/data/rooms/chozodia/chozodia_43.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_43_Clipdata[105] = INCBIN_U8("data/rooms/chozodia/chozodia_43_clipdata.gfx"); +const u8 sChozodia_43_Clipdata[105] = { + #include "extracted/data/rooms/chozodia/chozodia_43_clipdata.gfx.inc" +}; -const u8 sChozodia_43_Bg2[184] = INCBIN_U8("data/rooms/chozodia/chozodia_43_bg2.gfx"); +const u8 sChozodia_43_Bg2[184] = { + #include "extracted/data/rooms/chozodia/chozodia_43_bg2.gfx.inc" +}; -const u8 sChozodia_43_Bg1[276] = INCBIN_U8("data/rooms/chozodia/chozodia_43_bg1.gfx"); +const u8 sChozodia_43_Bg1[276] = { + #include "extracted/data/rooms/chozodia/chozodia_43_bg1.gfx.inc" +}; const u8 sChozodia_43_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 6, 2, SPRITESET_IDX(1), diff --git a/src/data/rooms/chozodia/chozodia_44.c b/src/data/rooms/chozodia/chozodia_44.c index 5ee994081..2b99c4fb2 100644 --- a/src/data/rooms/chozodia/chozodia_44.c +++ b/src/data/rooms/chozodia/chozodia_44.c @@ -13,9 +13,13 @@ const u8 sChozodia_28_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_44_Clipdata[136] = INCBIN_U8("data/rooms/chozodia/chozodia_44_clipdata.gfx"); +const u8 sChozodia_44_Clipdata[136] = { + #include "extracted/data/rooms/chozodia/chozodia_44_clipdata.gfx.inc" +}; -const u8 sChozodia_44_Bg2[221] = INCBIN_U8("data/rooms/chozodia/chozodia_44_bg2.gfx"); +const u8 sChozodia_44_Bg2[221] = { + #include "extracted/data/rooms/chozodia/chozodia_44_bg2.gfx.inc" +}; const u8 sChozodia_44_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 6, 4, SPRITESET_IDX(3), @@ -24,7 +28,9 @@ const u8 sChozodia_44_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_44_Bg1[344] = INCBIN_U8("data/rooms/chozodia/chozodia_44_bg1.gfx"); +const u8 sChozodia_44_Bg1[344] = { + #include "extracted/data/rooms/chozodia/chozodia_44_bg1.gfx.inc" +}; const u8 sChozodia_44_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 6, 4, SPRITESET_IDX(3), diff --git a/src/data/rooms/chozodia/chozodia_45.c b/src/data/rooms/chozodia/chozodia_45.c index 2f6bc605d..02a25fa79 100644 --- a/src/data/rooms/chozodia/chozodia_45.c +++ b/src/data/rooms/chozodia/chozodia_45.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_45_Clipdata[60] = INCBIN_U8("data/rooms/chozodia/chozodia_45_clipdata.gfx"); +const u8 sChozodia_45_Clipdata[60] = { + #include "extracted/data/rooms/chozodia/chozodia_45_clipdata.gfx.inc" +}; -const u8 sChozodia_45_Bg2[184] = INCBIN_U8("data/rooms/chozodia/chozodia_45_bg2.gfx"); +const u8 sChozodia_45_Bg2[184] = { + #include "extracted/data/rooms/chozodia/chozodia_45_bg2.gfx.inc" +}; -const u8 sChozodia_45_Bg1[264] = INCBIN_U8("data/rooms/chozodia/chozodia_45_bg1.gfx"); +const u8 sChozodia_45_Bg1[264] = { + #include "extracted/data/rooms/chozodia/chozodia_45_bg1.gfx.inc" +}; const u8 sChozodia_45_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_46.c b/src/data/rooms/chozodia/chozodia_46.c index cb361fe1b..ec6c2759b 100644 --- a/src/data/rooms/chozodia/chozodia_46.c +++ b/src/data/rooms/chozodia/chozodia_46.c @@ -1,16 +1,24 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_46_Clipdata[83] = INCBIN_U8("data/rooms/chozodia/chozodia_46_clipdata.gfx"); +const u8 sChozodia_46_Clipdata[83] = { + #include "extracted/data/rooms/chozodia/chozodia_46_clipdata.gfx.inc" +}; -const u8 sChozodia_46_Bg2[230] = INCBIN_U8("data/rooms/chozodia/chozodia_46_bg2.gfx"); +const u8 sChozodia_46_Bg2[230] = { + #include "extracted/data/rooms/chozodia/chozodia_46_bg2.gfx.inc" +}; -const u8 sChozodia_46_Bg1[207] = INCBIN_U8("data/rooms/chozodia/chozodia_46_bg1.gfx"); +const u8 sChozodia_46_Bg1[207] = { + #include "extracted/data/rooms/chozodia/chozodia_46_bg1.gfx.inc" +}; const u8 sChozodia_46_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(4), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_46_Bg0[66] = INCBIN_U8("data/rooms/chozodia/chozodia_46_bg0.gfx"); +const u8 sChozodia_46_Bg0[66] = { + #include "extracted/data/rooms/chozodia/chozodia_46_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_47.c b/src/data/rooms/chozodia/chozodia_47.c index a6f8f5c0a..eda47b0fe 100644 --- a/src/data/rooms/chozodia/chozodia_47.c +++ b/src/data/rooms/chozodia/chozodia_47.c @@ -13,9 +13,13 @@ const u8 sChozodia_29_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_47_Clipdata[149] = INCBIN_U8("data/rooms/chozodia/chozodia_47_clipdata.gfx"); +const u8 sChozodia_47_Clipdata[149] = { + #include "extracted/data/rooms/chozodia/chozodia_47_clipdata.gfx.inc" +}; -const u8 sChozodia_47_Bg1[316] = INCBIN_U8("data/rooms/chozodia/chozodia_47_bg1.gfx"); +const u8 sChozodia_47_Bg1[316] = { + #include "extracted/data/rooms/chozodia/chozodia_47_bg1.gfx.inc" +}; const u8 sChozodia_47_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 14, 7, SPRITESET_IDX(8), @@ -28,5 +32,7 @@ const u8 sChozodia_47_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_47_Bg0[17] = INCBIN_U8("data/rooms/chozodia/chozodia_47_bg0.gfx"); +const u8 sChozodia_47_Bg0[17] = { + #include "extracted/data/rooms/chozodia/chozodia_47_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_48.c b/src/data/rooms/chozodia/chozodia_48.c index 7dbc30ab4..4742cfb8d 100644 --- a/src/data/rooms/chozodia/chozodia_48.c +++ b/src/data/rooms/chozodia/chozodia_48.c @@ -27,16 +27,22 @@ const u8 sChozodia_30_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_48_Clipdata[282] = INCBIN_U8("data/rooms/chozodia/chozodia_48_clipdata.gfx"); +const u8 sChozodia_48_Clipdata[282] = { + #include "extracted/data/rooms/chozodia/chozodia_48_clipdata.gfx.inc" +}; -const u8 sChozodia_48_Bg2[902] = INCBIN_U8("data/rooms/chozodia/chozodia_48_bg2.gfx"); +const u8 sChozodia_48_Bg2[902] = { + #include "extracted/data/rooms/chozodia/chozodia_48_bg2.gfx.inc" +}; const u8 sChozodia_48_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 26, 23, SPRITESET_IDX(2), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_48_Bg1[1155] = INCBIN_U8("data/rooms/chozodia/chozodia_48_bg1.gfx"); +const u8 sChozodia_48_Bg1[1155] = { + #include "extracted/data/rooms/chozodia/chozodia_48_bg1.gfx.inc" +}; const u8 sChozodia_48_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 26, 23, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_49.c b/src/data/rooms/chozodia/chozodia_49.c index bbf3cfe4d..e7215df7a 100644 --- a/src/data/rooms/chozodia/chozodia_49.c +++ b/src/data/rooms/chozodia/chozodia_49.c @@ -13,11 +13,17 @@ const u8 sChozodia_31_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sChozodia_49_Clipdata[129] = INCBIN_U8("data/rooms/chozodia/chozodia_49_clipdata.gfx"); +const u8 sChozodia_49_Clipdata[129] = { + #include "extracted/data/rooms/chozodia/chozodia_49_clipdata.gfx.inc" +}; -const u8 sChozodia_49_Bg2[255] = INCBIN_U8("data/rooms/chozodia/chozodia_49_bg2.gfx"); +const u8 sChozodia_49_Bg2[255] = { + #include "extracted/data/rooms/chozodia/chozodia_49_bg2.gfx.inc" +}; -const u8 sChozodia_49_Bg1[327] = INCBIN_U8("data/rooms/chozodia/chozodia_49_bg1.gfx"); +const u8 sChozodia_49_Bg1[327] = { + #include "extracted/data/rooms/chozodia/chozodia_49_bg1.gfx.inc" +}; const u8 sChozodia_49_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 6, 5, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_5.c b/src/data/rooms/chozodia/chozodia_5.c index b1c258b26..3b5028ec5 100644 --- a/src/data/rooms/chozodia/chozodia_5.c +++ b/src/data/rooms/chozodia/chozodia_5.c @@ -27,11 +27,17 @@ const u8 sChozodia_2_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_5_Clipdata[231] = INCBIN_U8("data/rooms/chozodia/chozodia_5_clipdata.gfx"); +const u8 sChozodia_5_Clipdata[231] = { + #include "extracted/data/rooms/chozodia/chozodia_5_clipdata.gfx.inc" +}; -const u8 sChozodia_5_Bg2[413] = INCBIN_U8("data/rooms/chozodia/chozodia_5_bg2.gfx"); +const u8 sChozodia_5_Bg2[413] = { + #include "extracted/data/rooms/chozodia/chozodia_5_bg2.gfx.inc" +}; -const u8 sChozodia_5_Bg1[552] = INCBIN_U8("data/rooms/chozodia/chozodia_5_bg1.gfx"); +const u8 sChozodia_5_Bg1[552] = { + #include "extracted/data/rooms/chozodia/chozodia_5_bg1.gfx.inc" +}; const u8 sChozodia_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 9, SPRITESET_IDX(0), @@ -41,5 +47,7 @@ const u8 sChozodia_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_5_Bg0[127] = INCBIN_U8("data/rooms/chozodia/chozodia_5_bg0.gfx"); +const u8 sChozodia_5_Bg0[127] = { + #include "extracted/data/rooms/chozodia/chozodia_5_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_50.c b/src/data/rooms/chozodia/chozodia_50.c index 4db6851a1..75efdcafc 100644 --- a/src/data/rooms/chozodia/chozodia_50.c +++ b/src/data/rooms/chozodia/chozodia_50.c @@ -13,11 +13,17 @@ const u8 sChozodia_32_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_50_Clipdata[69] = INCBIN_U8("data/rooms/chozodia/chozodia_50_clipdata.gfx"); +const u8 sChozodia_50_Clipdata[69] = { + #include "extracted/data/rooms/chozodia/chozodia_50_clipdata.gfx.inc" +}; -const u8 sChozodia_50_Bg2[193] = INCBIN_U8("data/rooms/chozodia/chozodia_50_bg2.gfx"); +const u8 sChozodia_50_Bg2[193] = { + #include "extracted/data/rooms/chozodia/chozodia_50_bg2.gfx.inc" +}; -const u8 sChozodia_50_Bg1[171] = INCBIN_U8("data/rooms/chozodia/chozodia_50_bg1.gfx"); +const u8 sChozodia_50_Bg1[171] = { + #include "extracted/data/rooms/chozodia/chozodia_50_bg1.gfx.inc" +}; const u8 sChozodia_50_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_51.c b/src/data/rooms/chozodia/chozodia_51.c index e6f6fc643..ca857fd64 100644 --- a/src/data/rooms/chozodia/chozodia_51.c +++ b/src/data/rooms/chozodia/chozodia_51.c @@ -1,9 +1,13 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_51_Clipdata[449] = INCBIN_U8("data/rooms/chozodia/chozodia_51_clipdata.gfx"); +const u8 sChozodia_51_Clipdata[449] = { + #include "extracted/data/rooms/chozodia/chozodia_51_clipdata.gfx.inc" +}; -const u8 sChozodia_51_Bg2[1632] = INCBIN_U8("data/rooms/chozodia/chozodia_51_bg2.gfx"); +const u8 sChozodia_51_Bg2[1632] = { + #include "extracted/data/rooms/chozodia/chozodia_51_bg2.gfx.inc" +}; const u8 sChozodia_51_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 7, 21, SPRITESET_IDX(5), @@ -16,7 +20,9 @@ const u8 sChozodia_51_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_51_Bg1[999] = INCBIN_U8("data/rooms/chozodia/chozodia_51_bg1.gfx"); +const u8 sChozodia_51_Bg1[999] = { + #include "extracted/data/rooms/chozodia/chozodia_51_bg1.gfx.inc" +}; const u8 sChozodia_51_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 7, 21, SPRITESET_IDX(5), diff --git a/src/data/rooms/chozodia/chozodia_52.c b/src/data/rooms/chozodia/chozodia_52.c index 3be934077..a1ac57a9c 100644 --- a/src/data/rooms/chozodia/chozodia_52.c +++ b/src/data/rooms/chozodia/chozodia_52.c @@ -13,16 +13,22 @@ const u8 sChozodia_33_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_52_Clipdata[215] = INCBIN_U8("data/rooms/chozodia/chozodia_52_clipdata.gfx"); +const u8 sChozodia_52_Clipdata[215] = { + #include "extracted/data/rooms/chozodia/chozodia_52_clipdata.gfx.inc" +}; -const u8 sChozodia_52_Bg2[231] = INCBIN_U8("data/rooms/chozodia/chozodia_52_bg2.gfx"); +const u8 sChozodia_52_Bg2[231] = { + #include "extracted/data/rooms/chozodia/chozodia_52_bg2.gfx.inc" +}; const u8 sChozodia_52_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 21, 4, SPRITESET_IDX(3), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_52_Bg1[482] = INCBIN_U8("data/rooms/chozodia/chozodia_52_bg1.gfx"); +const u8 sChozodia_52_Bg1[482] = { + #include "extracted/data/rooms/chozodia/chozodia_52_bg1.gfx.inc" +}; const u8 sChozodia_52_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 9, 4, SPRITESET_IDX(3), diff --git a/src/data/rooms/chozodia/chozodia_53.c b/src/data/rooms/chozodia/chozodia_53.c index 6f1f235d3..21094af0f 100644 --- a/src/data/rooms/chozodia/chozodia_53.c +++ b/src/data/rooms/chozodia/chozodia_53.c @@ -13,9 +13,13 @@ const u8 sChozodia_34_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_53_Clipdata[162] = INCBIN_U8("data/rooms/chozodia/chozodia_53_clipdata.gfx"); +const u8 sChozodia_53_Clipdata[162] = { + #include "extracted/data/rooms/chozodia/chozodia_53_clipdata.gfx.inc" +}; -const u8 sChozodia_53_Bg2[495] = INCBIN_U8("data/rooms/chozodia/chozodia_53_bg2.gfx"); +const u8 sChozodia_53_Bg2[495] = { + #include "extracted/data/rooms/chozodia/chozodia_53_bg2.gfx.inc" +}; const u8 sChozodia_53_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 16, 23, SPRITESET_IDX(5), @@ -23,7 +27,9 @@ const u8 sChozodia_53_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_53_Bg1[561] = INCBIN_U8("data/rooms/chozodia/chozodia_53_bg1.gfx"); +const u8 sChozodia_53_Bg1[561] = { + #include "extracted/data/rooms/chozodia/chozodia_53_bg1.gfx.inc" +}; const u8 sChozodia_53_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 16, 23, SPRITESET_IDX(5), diff --git a/src/data/rooms/chozodia/chozodia_54.c b/src/data/rooms/chozodia/chozodia_54.c index f0747b44c..1fe67dcf6 100644 --- a/src/data/rooms/chozodia/chozodia_54.c +++ b/src/data/rooms/chozodia/chozodia_54.c @@ -20,15 +20,23 @@ const u8 sChozodia_35_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_54_Clipdata[406] = INCBIN_U8("data/rooms/chozodia/chozodia_54_clipdata.gfx"); +const u8 sChozodia_54_Clipdata[406] = { + #include "extracted/data/rooms/chozodia/chozodia_54_clipdata.gfx.inc" +}; -const u8 sChozodia_54_Bg2[14] = INCBIN_U8("data/rooms/chozodia/chozodia_54_bg2.gfx"); +const u8 sChozodia_54_Bg2[14] = { + #include "extracted/data/rooms/chozodia/chozodia_54_bg2.gfx.inc" +}; -const u8 sChozodia_54_Bg1[1428] = INCBIN_U8("data/rooms/chozodia/chozodia_54_bg1.gfx"); +const u8 sChozodia_54_Bg1[1428] = { + #include "extracted/data/rooms/chozodia/chozodia_54_bg1.gfx.inc" +}; const u8 sChozodia_54_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_54_Bg0[475] = INCBIN_U8("data/rooms/chozodia/chozodia_54_bg0.gfx"); +const u8 sChozodia_54_Bg0[475] = { + #include "extracted/data/rooms/chozodia/chozodia_54_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_55.c b/src/data/rooms/chozodia/chozodia_55.c index 752a62f89..ff99a78c3 100644 --- a/src/data/rooms/chozodia/chozodia_55.c +++ b/src/data/rooms/chozodia/chozodia_55.c @@ -20,11 +20,17 @@ const u8 sChozodia_36_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_55_Clipdata[132] = INCBIN_U8("data/rooms/chozodia/chozodia_55_clipdata.gfx"); +const u8 sChozodia_55_Clipdata[132] = { + #include "extracted/data/rooms/chozodia/chozodia_55_clipdata.gfx.inc" +}; -const u8 sChozodia_55_Bg2[415] = INCBIN_U8("data/rooms/chozodia/chozodia_55_bg2.gfx"); +const u8 sChozodia_55_Bg2[415] = { + #include "extracted/data/rooms/chozodia/chozodia_55_bg2.gfx.inc" +}; -const u8 sChozodia_55_Bg1[363] = INCBIN_U8("data/rooms/chozodia/chozodia_55_bg1.gfx"); +const u8 sChozodia_55_Bg1[363] = { + #include "extracted/data/rooms/chozodia/chozodia_55_bg1.gfx.inc" +}; const u8 sChozodia_55_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 18, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_56.c b/src/data/rooms/chozodia/chozodia_56.c index c24d465fc..64cd1c82e 100644 --- a/src/data/rooms/chozodia/chozodia_56.c +++ b/src/data/rooms/chozodia/chozodia_56.c @@ -13,11 +13,17 @@ const u8 sChozodia_37_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_56_Clipdata[301] = INCBIN_U8("data/rooms/chozodia/chozodia_56_clipdata.gfx"); +const u8 sChozodia_56_Clipdata[301] = { + #include "extracted/data/rooms/chozodia/chozodia_56_clipdata.gfx.inc" +}; -const u8 sChozodia_56_Bg2[166] = INCBIN_U8("data/rooms/chozodia/chozodia_56_bg2.gfx"); +const u8 sChozodia_56_Bg2[166] = { + #include "extracted/data/rooms/chozodia/chozodia_56_bg2.gfx.inc" +}; -const u8 sChozodia_56_Bg1[837] = INCBIN_U8("data/rooms/chozodia/chozodia_56_bg1.gfx"); +const u8 sChozodia_56_Bg1[837] = { + #include "extracted/data/rooms/chozodia/chozodia_56_bg1.gfx.inc" +}; const u8 sChozodia_56_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 11, 14, SPRITESET_IDX(3), @@ -30,5 +36,7 @@ const u8 sChozodia_56_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_56_Bg0[26] = INCBIN_U8("data/rooms/chozodia/chozodia_56_bg0.gfx"); +const u8 sChozodia_56_Bg0[26] = { + #include "extracted/data/rooms/chozodia/chozodia_56_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_57.c b/src/data/rooms/chozodia/chozodia_57.c index f6d6f1901..78693ebcf 100644 --- a/src/data/rooms/chozodia/chozodia_57.c +++ b/src/data/rooms/chozodia/chozodia_57.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_57_Clipdata[542] = INCBIN_U8("data/rooms/chozodia/chozodia_57_clipdata.gfx"); +const u8 sChozodia_57_Clipdata[542] = { + #include "extracted/data/rooms/chozodia/chozodia_57_clipdata.gfx.inc" +}; -const u8 sChozodia_57_Bg2[128] = INCBIN_U8("data/rooms/chozodia/chozodia_57_bg2.gfx"); +const u8 sChozodia_57_Bg2[128] = { + #include "extracted/data/rooms/chozodia/chozodia_57_bg2.gfx.inc" +}; -const u8 sChozodia_57_Bg1[1626] = INCBIN_U8("data/rooms/chozodia/chozodia_57_bg1.gfx"); +const u8 sChozodia_57_Bg1[1626] = { + #include "extracted/data/rooms/chozodia/chozodia_57_bg1.gfx.inc" +}; const u8 sChozodia_57_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 57, 6, SPRITESET_IDX(0), @@ -14,5 +20,7 @@ const u8 sChozodia_57_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_57_Bg0[456] = INCBIN_U8("data/rooms/chozodia/chozodia_57_bg0.gfx"); +const u8 sChozodia_57_Bg0[456] = { + #include "extracted/data/rooms/chozodia/chozodia_57_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_58.c b/src/data/rooms/chozodia/chozodia_58.c index fa8db7252..9244d8046 100644 --- a/src/data/rooms/chozodia/chozodia_58.c +++ b/src/data/rooms/chozodia/chozodia_58.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_58_Clipdata[138] = INCBIN_U8("data/rooms/chozodia/chozodia_58_clipdata.gfx"); +const u8 sChozodia_58_Clipdata[138] = { + #include "extracted/data/rooms/chozodia/chozodia_58_clipdata.gfx.inc" +}; -const u8 sChozodia_58_Bg2[428] = INCBIN_U8("data/rooms/chozodia/chozodia_58_bg2.gfx"); +const u8 sChozodia_58_Bg2[428] = { + #include "extracted/data/rooms/chozodia/chozodia_58_bg2.gfx.inc" +}; -const u8 sChozodia_58_Bg1[320] = INCBIN_U8("data/rooms/chozodia/chozodia_58_bg1.gfx"); +const u8 sChozodia_58_Bg1[320] = { + #include "extracted/data/rooms/chozodia/chozodia_58_bg1.gfx.inc" +}; const u8 sChozodia_58_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 4, 10, SPRITESET_IDX(4), @@ -16,5 +22,7 @@ const u8 sChozodia_58_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_58_Bg0[88] = INCBIN_U8("data/rooms/chozodia/chozodia_58_bg0.gfx"); +const u8 sChozodia_58_Bg0[88] = { + #include "extracted/data/rooms/chozodia/chozodia_58_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_59.c b/src/data/rooms/chozodia/chozodia_59.c index 8b5fe8457..3aba33a3a 100644 --- a/src/data/rooms/chozodia/chozodia_59.c +++ b/src/data/rooms/chozodia/chozodia_59.c @@ -1,7 +1,9 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_59_Clipdata[374] = INCBIN_U8("data/rooms/chozodia/chozodia_59_clipdata.gfx"); +const u8 sChozodia_59_Clipdata[374] = { + #include "extracted/data/rooms/chozodia/chozodia_59_clipdata.gfx.inc" +}; const u8 sChozodia_59_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 6, 11, SPRITESET_IDX(3), @@ -12,7 +14,9 @@ const u8 sChozodia_59_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_59_Bg1[793] = INCBIN_U8("data/rooms/chozodia/chozodia_59_bg1.gfx"); +const u8 sChozodia_59_Bg1[793] = { + #include "extracted/data/rooms/chozodia/chozodia_59_bg1.gfx.inc" +}; const u8 sChozodia_59_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 6, 11, SPRITESET_IDX(3), diff --git a/src/data/rooms/chozodia/chozodia_6.c b/src/data/rooms/chozodia/chozodia_6.c index 3fff4a0d7..e3ce127b1 100644 --- a/src/data/rooms/chozodia/chozodia_6.c +++ b/src/data/rooms/chozodia/chozodia_6.c @@ -20,16 +20,24 @@ const u8 sChozodia_3_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_6_Clipdata[151] = INCBIN_U8("data/rooms/chozodia/chozodia_6_clipdata.gfx"); +const u8 sChozodia_6_Clipdata[151] = { + #include "extracted/data/rooms/chozodia/chozodia_6_clipdata.gfx.inc" +}; -const u8 sChozodia_6_Bg2[38] = INCBIN_U8("data/rooms/chozodia/chozodia_6_bg2.gfx"); +const u8 sChozodia_6_Bg2[38] = { + #include "extracted/data/rooms/chozodia/chozodia_6_bg2.gfx.inc" +}; -const u8 sChozodia_6_Bg1[424] = INCBIN_U8("data/rooms/chozodia/chozodia_6_bg1.gfx"); +const u8 sChozodia_6_Bg1[424] = { + #include "extracted/data/rooms/chozodia/chozodia_6_bg1.gfx.inc" +}; const u8 sChozodia_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 20, 16, SPRITESET_IDX(2), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_6_Bg0[83] = INCBIN_U8("data/rooms/chozodia/chozodia_6_bg0.gfx"); +const u8 sChozodia_6_Bg0[83] = { + #include "extracted/data/rooms/chozodia/chozodia_6_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_60.c b/src/data/rooms/chozodia/chozodia_60.c index 51e24da2f..6eb26f722 100644 --- a/src/data/rooms/chozodia/chozodia_60.c +++ b/src/data/rooms/chozodia/chozodia_60.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_60_Clipdata[256] = INCBIN_U8("data/rooms/chozodia/chozodia_60_clipdata.gfx"); +const u8 sChozodia_60_Clipdata[256] = { + #include "extracted/data/rooms/chozodia/chozodia_60_clipdata.gfx.inc" +}; -const u8 sChozodia_60_Bg2[811] = INCBIN_U8("data/rooms/chozodia/chozodia_60_bg2.gfx"); +const u8 sChozodia_60_Bg2[811] = { + #include "extracted/data/rooms/chozodia/chozodia_60_bg2.gfx.inc" +}; -const u8 sChozodia_60_Bg1[858] = INCBIN_U8("data/rooms/chozodia/chozodia_60_bg1.gfx"); +const u8 sChozodia_60_Bg1[858] = { + #include "extracted/data/rooms/chozodia/chozodia_60_bg1.gfx.inc" +}; const u8 sChozodia_60_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 7, 46, SPRITESET_IDX(1), @@ -16,5 +22,7 @@ const u8 sChozodia_60_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_60_Bg0[45] = INCBIN_U8("data/rooms/chozodia/chozodia_60_bg0.gfx"); +const u8 sChozodia_60_Bg0[45] = { + #include "extracted/data/rooms/chozodia/chozodia_60_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_61.c b/src/data/rooms/chozodia/chozodia_61.c index 5ad155431..cc5977320 100644 --- a/src/data/rooms/chozodia/chozodia_61.c +++ b/src/data/rooms/chozodia/chozodia_61.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_61_Clipdata[81] = INCBIN_U8("data/rooms/chozodia/chozodia_61_clipdata.gfx"); +const u8 sChozodia_61_Clipdata[81] = { + #include "extracted/data/rooms/chozodia/chozodia_61_clipdata.gfx.inc" +}; -const u8 sChozodia_61_Bg1[173] = INCBIN_U8("data/rooms/chozodia/chozodia_61_bg1.gfx"); +const u8 sChozodia_61_Bg1[173] = { + #include "extracted/data/rooms/chozodia/chozodia_61_bg1.gfx.inc" +}; const u8 sChozodia_61_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_61_Bg0[44] = INCBIN_U8("data/rooms/chozodia/chozodia_61_bg0.gfx"); +const u8 sChozodia_61_Bg0[44] = { + #include "extracted/data/rooms/chozodia/chozodia_61_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_62.c b/src/data/rooms/chozodia/chozodia_62.c index 28cc578fb..8cfd4663a 100644 --- a/src/data/rooms/chozodia/chozodia_62.c +++ b/src/data/rooms/chozodia/chozodia_62.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_62_Clipdata[199] = INCBIN_U8("data/rooms/chozodia/chozodia_62_clipdata.gfx"); +const u8 sChozodia_62_Clipdata[199] = { + #include "extracted/data/rooms/chozodia/chozodia_62_clipdata.gfx.inc" +}; -const u8 sChozodia_62_Bg2[584] = INCBIN_U8("data/rooms/chozodia/chozodia_62_bg2.gfx"); +const u8 sChozodia_62_Bg2[584] = { + #include "extracted/data/rooms/chozodia/chozodia_62_bg2.gfx.inc" +}; -const u8 sChozodia_62_Bg1[686] = INCBIN_U8("data/rooms/chozodia/chozodia_62_bg1.gfx"); +const u8 sChozodia_62_Bg1[686] = { + #include "extracted/data/rooms/chozodia/chozodia_62_bg1.gfx.inc" +}; const u8 sChozodia_62_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 8, 6, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_63.c b/src/data/rooms/chozodia/chozodia_63.c index 0d3484cb0..29581c3dc 100644 --- a/src/data/rooms/chozodia/chozodia_63.c +++ b/src/data/rooms/chozodia/chozodia_63.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_63_Clipdata[133] = INCBIN_U8("data/rooms/chozodia/chozodia_63_clipdata.gfx"); +const u8 sChozodia_63_Clipdata[133] = { + #include "extracted/data/rooms/chozodia/chozodia_63_clipdata.gfx.inc" +}; -const u8 sChozodia_63_Bg2[574] = INCBIN_U8("data/rooms/chozodia/chozodia_63_bg2.gfx"); +const u8 sChozodia_63_Bg2[574] = { + #include "extracted/data/rooms/chozodia/chozodia_63_bg2.gfx.inc" +}; -const u8 sChozodia_63_Bg1[415] = INCBIN_U8("data/rooms/chozodia/chozodia_63_bg1.gfx"); +const u8 sChozodia_63_Bg1[415] = { + #include "extracted/data/rooms/chozodia/chozodia_63_bg1.gfx.inc" +}; const u8 sChozodia_63_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 6, 8, SPRITESET_IDX(4), diff --git a/src/data/rooms/chozodia/chozodia_64.c b/src/data/rooms/chozodia/chozodia_64.c index bc7570b1b..b6430bb62 100644 --- a/src/data/rooms/chozodia/chozodia_64.c +++ b/src/data/rooms/chozodia/chozodia_64.c @@ -13,11 +13,17 @@ const u8 sChozodia_38_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_64_Clipdata[108] = INCBIN_U8("data/rooms/chozodia/chozodia_64_clipdata.gfx"); +const u8 sChozodia_64_Clipdata[108] = { + #include "extracted/data/rooms/chozodia/chozodia_64_clipdata.gfx.inc" +}; -const u8 sChozodia_64_Bg2[394] = INCBIN_U8("data/rooms/chozodia/chozodia_64_bg2.gfx"); +const u8 sChozodia_64_Bg2[394] = { + #include "extracted/data/rooms/chozodia/chozodia_64_bg2.gfx.inc" +}; -const u8 sChozodia_64_Bg1[359] = INCBIN_U8("data/rooms/chozodia/chozodia_64_bg1.gfx"); +const u8 sChozodia_64_Bg1[359] = { + #include "extracted/data/rooms/chozodia/chozodia_64_bg1.gfx.inc" +}; const u8 sChozodia_64_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 8, 5, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_65.c b/src/data/rooms/chozodia/chozodia_65.c index bb10ecb2d..5b2596864 100644 --- a/src/data/rooms/chozodia/chozodia_65.c +++ b/src/data/rooms/chozodia/chozodia_65.c @@ -20,11 +20,17 @@ const u8 sChozodia_39_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_65_Clipdata[167] = INCBIN_U8("data/rooms/chozodia/chozodia_65_clipdata.gfx"); +const u8 sChozodia_65_Clipdata[167] = { + #include "extracted/data/rooms/chozodia/chozodia_65_clipdata.gfx.inc" +}; -const u8 sChozodia_65_Bg2[227] = INCBIN_U8("data/rooms/chozodia/chozodia_65_bg2.gfx"); +const u8 sChozodia_65_Bg2[227] = { + #include "extracted/data/rooms/chozodia/chozodia_65_bg2.gfx.inc" +}; -const u8 sChozodia_65_Bg1[586] = INCBIN_U8("data/rooms/chozodia/chozodia_65_bg1.gfx"); +const u8 sChozodia_65_Bg1[586] = { + #include "extracted/data/rooms/chozodia/chozodia_65_bg1.gfx.inc" +}; const u8 sChozodia_65_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 3, 11, SPRITESET_IDX(1), @@ -36,5 +42,7 @@ const u8 sChozodia_65_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_65_Bg0[41] = INCBIN_U8("data/rooms/chozodia/chozodia_65_bg0.gfx"); +const u8 sChozodia_65_Bg0[41] = { + #include "extracted/data/rooms/chozodia/chozodia_65_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_66.c b/src/data/rooms/chozodia/chozodia_66.c index 9f306c5b4..c9ad9fdae 100644 --- a/src/data/rooms/chozodia/chozodia_66.c +++ b/src/data/rooms/chozodia/chozodia_66.c @@ -13,11 +13,17 @@ const u8 sChozodia_40_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_66_Clipdata[301] = INCBIN_U8("data/rooms/chozodia/chozodia_66_clipdata.gfx"); +const u8 sChozodia_66_Clipdata[301] = { + #include "extracted/data/rooms/chozodia/chozodia_66_clipdata.gfx.inc" +}; -const u8 sChozodia_66_Bg2[582] = INCBIN_U8("data/rooms/chozodia/chozodia_66_bg2.gfx"); +const u8 sChozodia_66_Bg2[582] = { + #include "extracted/data/rooms/chozodia/chozodia_66_bg2.gfx.inc" +}; -const u8 sChozodia_66_Bg1[742] = INCBIN_U8("data/rooms/chozodia/chozodia_66_bg1.gfx"); +const u8 sChozodia_66_Bg1[742] = { + #include "extracted/data/rooms/chozodia/chozodia_66_bg1.gfx.inc" +}; const u8 sChozodia_66_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_67.c b/src/data/rooms/chozodia/chozodia_67.c index 2b8f0d085..51266bd46 100644 --- a/src/data/rooms/chozodia/chozodia_67.c +++ b/src/data/rooms/chozodia/chozodia_67.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_67_Clipdata[215] = INCBIN_U8("data/rooms/chozodia/chozodia_67_clipdata.gfx"); +const u8 sChozodia_67_Clipdata[215] = { + #include "extracted/data/rooms/chozodia/chozodia_67_clipdata.gfx.inc" +}; -const u8 sChozodia_67_Bg2[868] = INCBIN_U8("data/rooms/chozodia/chozodia_67_bg2.gfx"); +const u8 sChozodia_67_Bg2[868] = { + #include "extracted/data/rooms/chozodia/chozodia_67_bg2.gfx.inc" +}; -const u8 sChozodia_67_Bg1[902] = INCBIN_U8("data/rooms/chozodia/chozodia_67_bg1.gfx"); +const u8 sChozodia_67_Bg1[902] = { + #include "extracted/data/rooms/chozodia/chozodia_67_bg1.gfx.inc" +}; const u8 sChozodia_67_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 5, 21, SPRITESET_IDX(0), @@ -17,5 +23,7 @@ const u8 sChozodia_67_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_67_Bg0[334] = INCBIN_U8("data/rooms/chozodia/chozodia_67_bg0.gfx"); +const u8 sChozodia_67_Bg0[334] = { + #include "extracted/data/rooms/chozodia/chozodia_67_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_68.c b/src/data/rooms/chozodia/chozodia_68.c index 30498d02e..d6451c57b 100644 --- a/src/data/rooms/chozodia/chozodia_68.c +++ b/src/data/rooms/chozodia/chozodia_68.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_68_Clipdata[66] = INCBIN_U8("data/rooms/chozodia/chozodia_68_clipdata.gfx"); +const u8 sChozodia_68_Clipdata[66] = { + #include "extracted/data/rooms/chozodia/chozodia_68_clipdata.gfx.inc" +}; -const u8 sChozodia_68_Bg2[215] = INCBIN_U8("data/rooms/chozodia/chozodia_68_bg2.gfx"); +const u8 sChozodia_68_Bg2[215] = { + #include "extracted/data/rooms/chozodia/chozodia_68_bg2.gfx.inc" +}; -const u8 sChozodia_68_Bg1[246] = INCBIN_U8("data/rooms/chozodia/chozodia_68_bg1.gfx"); +const u8 sChozodia_68_Bg1[246] = { + #include "extracted/data/rooms/chozodia/chozodia_68_bg1.gfx.inc" +}; const u8 sChozodia_68_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_69.c b/src/data/rooms/chozodia/chozodia_69.c index 0c7b7b5be..39866410b 100644 --- a/src/data/rooms/chozodia/chozodia_69.c +++ b/src/data/rooms/chozodia/chozodia_69.c @@ -20,16 +20,24 @@ const u8 sChozodia_41_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_69_Clipdata[157] = INCBIN_U8("data/rooms/chozodia/chozodia_69_clipdata.gfx"); +const u8 sChozodia_69_Clipdata[157] = { + #include "extracted/data/rooms/chozodia/chozodia_69_clipdata.gfx.inc" +}; -const u8 sChozodia_69_Bg2[497] = INCBIN_U8("data/rooms/chozodia/chozodia_69_bg2.gfx"); +const u8 sChozodia_69_Bg2[497] = { + #include "extracted/data/rooms/chozodia/chozodia_69_bg2.gfx.inc" +}; -const u8 sChozodia_69_Bg1[435] = INCBIN_U8("data/rooms/chozodia/chozodia_69_bg1.gfx"); +const u8 sChozodia_69_Bg1[435] = { + #include "extracted/data/rooms/chozodia/chozodia_69_bg1.gfx.inc" +}; const u8 sChozodia_69_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 18, 41, SPRITESET_IDX(4), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_69_Bg0[91] = INCBIN_U8("data/rooms/chozodia/chozodia_69_bg0.gfx"); +const u8 sChozodia_69_Bg0[91] = { + #include "extracted/data/rooms/chozodia/chozodia_69_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_7.c b/src/data/rooms/chozodia/chozodia_7.c index 224eb998d..ad82d197c 100644 --- a/src/data/rooms/chozodia/chozodia_7.c +++ b/src/data/rooms/chozodia/chozodia_7.c @@ -1,9 +1,13 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_7_Clipdata[73] = INCBIN_U8("data/rooms/chozodia/chozodia_7_clipdata.gfx"); +const u8 sChozodia_7_Clipdata[73] = { + #include "extracted/data/rooms/chozodia/chozodia_7_clipdata.gfx.inc" +}; -const u8 sChozodia_7_Bg2[114] = INCBIN_U8("data/rooms/chozodia/chozodia_7_bg2.gfx"); +const u8 sChozodia_7_Bg2[114] = { + #include "extracted/data/rooms/chozodia/chozodia_7_bg2.gfx.inc" +}; const u8 sChozodia_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 5, 11, SPRITESET_IDX(3), @@ -11,11 +15,15 @@ const u8 sChozodia_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_7_Bg1[204] = INCBIN_U8("data/rooms/chozodia/chozodia_7_bg1.gfx"); +const u8 sChozodia_7_Bg1[204] = { + #include "extracted/data/rooms/chozodia/chozodia_7_bg1.gfx.inc" +}; const u8 sChozodia_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_7_Bg0[45] = INCBIN_U8("data/rooms/chozodia/chozodia_7_bg0.gfx"); +const u8 sChozodia_7_Bg0[45] = { + #include "extracted/data/rooms/chozodia/chozodia_7_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_70.c b/src/data/rooms/chozodia/chozodia_70.c index 592b7cc6c..ae72b6306 100644 --- a/src/data/rooms/chozodia/chozodia_70.c +++ b/src/data/rooms/chozodia/chozodia_70.c @@ -1,15 +1,23 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_70_Clipdata[126] = INCBIN_U8("data/rooms/chozodia/chozodia_70_clipdata.gfx"); +const u8 sChozodia_70_Clipdata[126] = { + #include "extracted/data/rooms/chozodia/chozodia_70_clipdata.gfx.inc" +}; -const u8 sChozodia_70_Bg2[56] = INCBIN_U8("data/rooms/chozodia/chozodia_70_bg2.gfx"); +const u8 sChozodia_70_Bg2[56] = { + #include "extracted/data/rooms/chozodia/chozodia_70_bg2.gfx.inc" +}; -const u8 sChozodia_70_Bg1[223] = INCBIN_U8("data/rooms/chozodia/chozodia_70_bg1.gfx"); +const u8 sChozodia_70_Bg1[223] = { + #include "extracted/data/rooms/chozodia/chozodia_70_bg1.gfx.inc" +}; const u8 sChozodia_70_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_70_Bg0[56] = INCBIN_U8("data/rooms/chozodia/chozodia_70_bg0.gfx"); +const u8 sChozodia_70_Bg0[56] = { + #include "extracted/data/rooms/chozodia/chozodia_70_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_71.c b/src/data/rooms/chozodia/chozodia_71.c index 133dc1ab4..c8b9d8287 100644 --- a/src/data/rooms/chozodia/chozodia_71.c +++ b/src/data/rooms/chozodia/chozodia_71.c @@ -20,11 +20,17 @@ const u8 sChozodia_42_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_71_Clipdata[186] = INCBIN_U8("data/rooms/chozodia/chozodia_71_clipdata.gfx"); +const u8 sChozodia_71_Clipdata[186] = { + #include "extracted/data/rooms/chozodia/chozodia_71_clipdata.gfx.inc" +}; -const u8 sChozodia_71_Bg2[499] = INCBIN_U8("data/rooms/chozodia/chozodia_71_bg2.gfx"); +const u8 sChozodia_71_Bg2[499] = { + #include "extracted/data/rooms/chozodia/chozodia_71_bg2.gfx.inc" +}; -const u8 sChozodia_71_Bg1[727] = INCBIN_U8("data/rooms/chozodia/chozodia_71_bg1.gfx"); +const u8 sChozodia_71_Bg1[727] = { + #include "extracted/data/rooms/chozodia/chozodia_71_bg1.gfx.inc" +}; const u8 sChozodia_71_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(19)] = { 7, 2, SPRITESET_IDX(1), @@ -48,5 +54,7 @@ const u8 sChozodia_71_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(19)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_71_Bg0[17] = INCBIN_U8("data/rooms/chozodia/chozodia_71_bg0.gfx"); +const u8 sChozodia_71_Bg0[17] = { + #include "extracted/data/rooms/chozodia/chozodia_71_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_72.c b/src/data/rooms/chozodia/chozodia_72.c index 66974da3c..40486c3f7 100644 --- a/src/data/rooms/chozodia/chozodia_72.c +++ b/src/data/rooms/chozodia/chozodia_72.c @@ -13,11 +13,17 @@ const u8 sChozodia_43_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_72_Clipdata[106] = INCBIN_U8("data/rooms/chozodia/chozodia_72_clipdata.gfx"); +const u8 sChozodia_72_Clipdata[106] = { + #include "extracted/data/rooms/chozodia/chozodia_72_clipdata.gfx.inc" +}; -const u8 sChozodia_72_Bg2[95] = INCBIN_U8("data/rooms/chozodia/chozodia_72_bg2.gfx"); +const u8 sChozodia_72_Bg2[95] = { + #include "extracted/data/rooms/chozodia/chozodia_72_bg2.gfx.inc" +}; -const u8 sChozodia_72_Bg1[112] = INCBIN_U8("data/rooms/chozodia/chozodia_72_bg1.gfx"); +const u8 sChozodia_72_Bg1[112] = { + #include "extracted/data/rooms/chozodia/chozodia_72_bg1.gfx.inc" +}; const u8 sChozodia_72_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 15, 11, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_73.c b/src/data/rooms/chozodia/chozodia_73.c index 983cd6b40..3343599b9 100644 --- a/src/data/rooms/chozodia/chozodia_73.c +++ b/src/data/rooms/chozodia/chozodia_73.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_73_Clipdata[143] = INCBIN_U8("data/rooms/chozodia/chozodia_73_clipdata.gfx"); +const u8 sChozodia_73_Clipdata[143] = { + #include "extracted/data/rooms/chozodia/chozodia_73_clipdata.gfx.inc" +}; -const u8 sChozodia_73_Bg2[139] = INCBIN_U8("data/rooms/chozodia/chozodia_73_bg2.gfx"); +const u8 sChozodia_73_Bg2[139] = { + #include "extracted/data/rooms/chozodia/chozodia_73_bg2.gfx.inc" +}; -const u8 sChozodia_73_Bg1[450] = INCBIN_U8("data/rooms/chozodia/chozodia_73_bg1.gfx"); +const u8 sChozodia_73_Bg1[450] = { + #include "extracted/data/rooms/chozodia/chozodia_73_bg1.gfx.inc" +}; const u8 sChozodia_73_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 19, 6, SPRITESET_IDX(0), @@ -14,5 +20,7 @@ const u8 sChozodia_73_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_73_Bg0[108] = INCBIN_U8("data/rooms/chozodia/chozodia_73_bg0.gfx"); +const u8 sChozodia_73_Bg0[108] = { + #include "extracted/data/rooms/chozodia/chozodia_73_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_74.c b/src/data/rooms/chozodia/chozodia_74.c index 42aede284..0a43e7fda 100644 --- a/src/data/rooms/chozodia/chozodia_74.c +++ b/src/data/rooms/chozodia/chozodia_74.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_74_Clipdata[84] = INCBIN_U8("data/rooms/chozodia/chozodia_74_clipdata.gfx"); +const u8 sChozodia_74_Clipdata[84] = { + #include "extracted/data/rooms/chozodia/chozodia_74_clipdata.gfx.inc" +}; -const u8 sChozodia_74_Bg1[189] = INCBIN_U8("data/rooms/chozodia/chozodia_74_bg1.gfx"); +const u8 sChozodia_74_Bg1[189] = { + #include "extracted/data/rooms/chozodia/chozodia_74_bg1.gfx.inc" +}; const u8 sChozodia_74_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 10, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_74_Bg0[45] = INCBIN_U8("data/rooms/chozodia/chozodia_74_bg0.gfx"); +const u8 sChozodia_74_Bg0[45] = { + #include "extracted/data/rooms/chozodia/chozodia_74_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_75.c b/src/data/rooms/chozodia/chozodia_75.c index c81afcf93..52a6dcb76 100644 --- a/src/data/rooms/chozodia/chozodia_75.c +++ b/src/data/rooms/chozodia/chozodia_75.c @@ -1,14 +1,20 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_75_Clipdata[83] = INCBIN_U8("data/rooms/chozodia/chozodia_75_clipdata.gfx"); +const u8 sChozodia_75_Clipdata[83] = { + #include "extracted/data/rooms/chozodia/chozodia_75_clipdata.gfx.inc" +}; -const u8 sChozodia_75_Bg1[194] = INCBIN_U8("data/rooms/chozodia/chozodia_75_bg1.gfx"); +const u8 sChozodia_75_Bg1[194] = { + #include "extracted/data/rooms/chozodia/chozodia_75_bg1.gfx.inc" +}; const u8 sChozodia_75_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_75_Bg0[45] = INCBIN_U8("data/rooms/chozodia/chozodia_75_bg0.gfx"); +const u8 sChozodia_75_Bg0[45] = { + #include "extracted/data/rooms/chozodia/chozodia_75_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_76.c b/src/data/rooms/chozodia/chozodia_76.c index 85f1ef02d..35d347281 100644 --- a/src/data/rooms/chozodia/chozodia_76.c +++ b/src/data/rooms/chozodia/chozodia_76.c @@ -1,9 +1,13 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_76_Clipdata[95] = INCBIN_U8("data/rooms/chozodia/chozodia_76_clipdata.gfx"); +const u8 sChozodia_76_Clipdata[95] = { + #include "extracted/data/rooms/chozodia/chozodia_76_clipdata.gfx.inc" +}; -const u8 sChozodia_76_Bg2[83] = INCBIN_U8("data/rooms/chozodia/chozodia_76_bg2.gfx"); +const u8 sChozodia_76_Bg2[83] = { + #include "extracted/data/rooms/chozodia/chozodia_76_bg2.gfx.inc" +}; const u8 sChozodia_76_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 7, SPRITESET_IDX(0), @@ -11,7 +15,9 @@ const u8 sChozodia_76_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_76_Bg1[269] = INCBIN_U8("data/rooms/chozodia/chozodia_76_bg1.gfx"); +const u8 sChozodia_76_Bg1[269] = { + #include "extracted/data/rooms/chozodia/chozodia_76_bg1.gfx.inc" +}; const u8 sChozodia_76_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 9, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_77.c b/src/data/rooms/chozodia/chozodia_77.c index cdc3f983e..9d2c286b4 100644 --- a/src/data/rooms/chozodia/chozodia_77.c +++ b/src/data/rooms/chozodia/chozodia_77.c @@ -20,11 +20,17 @@ const u8 sChozodia_44_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_77_Clipdata[251] = INCBIN_U8("data/rooms/chozodia/chozodia_77_clipdata.gfx"); +const u8 sChozodia_77_Clipdata[251] = { + #include "extracted/data/rooms/chozodia/chozodia_77_clipdata.gfx.inc" +}; -const u8 sChozodia_77_Bg2[436] = INCBIN_U8("data/rooms/chozodia/chozodia_77_bg2.gfx"); +const u8 sChozodia_77_Bg2[436] = { + #include "extracted/data/rooms/chozodia/chozodia_77_bg2.gfx.inc" +}; -const u8 sChozodia_77_Bg1[502] = INCBIN_U8("data/rooms/chozodia/chozodia_77_bg1.gfx"); +const u8 sChozodia_77_Bg1[502] = { + #include "extracted/data/rooms/chozodia/chozodia_77_bg1.gfx.inc" +}; const u8 sChozodia_77_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 20, 11, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_78.c b/src/data/rooms/chozodia/chozodia_78.c index 58818d6c2..4f9940003 100644 --- a/src/data/rooms/chozodia/chozodia_78.c +++ b/src/data/rooms/chozodia/chozodia_78.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_78_Clipdata[98] = INCBIN_U8("data/rooms/chozodia/chozodia_78_clipdata.gfx"); +const u8 sChozodia_78_Clipdata[98] = { + #include "extracted/data/rooms/chozodia/chozodia_78_clipdata.gfx.inc" +}; -const u8 sChozodia_78_Bg2[306] = INCBIN_U8("data/rooms/chozodia/chozodia_78_bg2.gfx"); +const u8 sChozodia_78_Bg2[306] = { + #include "extracted/data/rooms/chozodia/chozodia_78_bg2.gfx.inc" +}; -const u8 sChozodia_78_Bg1[360] = INCBIN_U8("data/rooms/chozodia/chozodia_78_bg1.gfx"); +const u8 sChozodia_78_Bg1[360] = { + #include "extracted/data/rooms/chozodia/chozodia_78_bg1.gfx.inc" +}; const u8 sChozodia_78_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_79.c b/src/data/rooms/chozodia/chozodia_79.c index 1994465fb..62e86ceb4 100644 --- a/src/data/rooms/chozodia/chozodia_79.c +++ b/src/data/rooms/chozodia/chozodia_79.c @@ -34,11 +34,17 @@ const u8 sChozodia_45_Scrolls[SCROLL_DATA_SIZE(4)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_79_Clipdata[296] = INCBIN_U8("data/rooms/chozodia/chozodia_79_clipdata.gfx"); +const u8 sChozodia_79_Clipdata[296] = { + #include "extracted/data/rooms/chozodia/chozodia_79_clipdata.gfx.inc" +}; -const u8 sChozodia_79_Bg2[303] = INCBIN_U8("data/rooms/chozodia/chozodia_79_bg2.gfx"); +const u8 sChozodia_79_Bg2[303] = { + #include "extracted/data/rooms/chozodia/chozodia_79_bg2.gfx.inc" +}; -const u8 sChozodia_79_Bg1[811] = INCBIN_U8("data/rooms/chozodia/chozodia_79_bg1.gfx"); +const u8 sChozodia_79_Bg1[811] = { + #include "extracted/data/rooms/chozodia/chozodia_79_bg1.gfx.inc" +}; const u8 sChozodia_79_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 15, 31, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_8.c b/src/data/rooms/chozodia/chozodia_8.c index 6c4716778..f201651e0 100644 --- a/src/data/rooms/chozodia/chozodia_8.c +++ b/src/data/rooms/chozodia/chozodia_8.c @@ -20,11 +20,17 @@ const u8 sChozodia_4_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_8_Clipdata[192] = INCBIN_U8("data/rooms/chozodia/chozodia_8_clipdata.gfx"); +const u8 sChozodia_8_Clipdata[192] = { + #include "extracted/data/rooms/chozodia/chozodia_8_clipdata.gfx.inc" +}; -const u8 sChozodia_8_Bg2[332] = INCBIN_U8("data/rooms/chozodia/chozodia_8_bg2.gfx"); +const u8 sChozodia_8_Bg2[332] = { + #include "extracted/data/rooms/chozodia/chozodia_8_bg2.gfx.inc" +}; -const u8 sChozodia_8_Bg1[511] = INCBIN_U8("data/rooms/chozodia/chozodia_8_bg1.gfx"); +const u8 sChozodia_8_Bg1[511] = { + #include "extracted/data/rooms/chozodia/chozodia_8_bg1.gfx.inc" +}; const u8 sChozodia_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 21, 30, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_80.c b/src/data/rooms/chozodia/chozodia_80.c index 3aecf3dfa..fd68bed65 100644 --- a/src/data/rooms/chozodia/chozodia_80.c +++ b/src/data/rooms/chozodia/chozodia_80.c @@ -13,15 +13,23 @@ const u8 sChozodia_46_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_80_Clipdata[155] = INCBIN_U8("data/rooms/chozodia/chozodia_80_clipdata.gfx"); +const u8 sChozodia_80_Clipdata[155] = { + #include "extracted/data/rooms/chozodia/chozodia_80_clipdata.gfx.inc" +}; -const u8 sChozodia_80_Bg2[140] = INCBIN_U8("data/rooms/chozodia/chozodia_80_bg2.gfx"); +const u8 sChozodia_80_Bg2[140] = { + #include "extracted/data/rooms/chozodia/chozodia_80_bg2.gfx.inc" +}; -const u8 sChozodia_80_Bg1[321] = INCBIN_U8("data/rooms/chozodia/chozodia_80_bg1.gfx"); +const u8 sChozodia_80_Bg1[321] = { + #include "extracted/data/rooms/chozodia/chozodia_80_bg1.gfx.inc" +}; const u8 sChozodia_80_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_80_Bg0[67] = INCBIN_U8("data/rooms/chozodia/chozodia_80_bg0.gfx"); +const u8 sChozodia_80_Bg0[67] = { + #include "extracted/data/rooms/chozodia/chozodia_80_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_81.c b/src/data/rooms/chozodia/chozodia_81.c index 2b0676492..8c3485d7d 100644 --- a/src/data/rooms/chozodia/chozodia_81.c +++ b/src/data/rooms/chozodia/chozodia_81.c @@ -13,15 +13,23 @@ const u8 sChozodia_47_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_81_Clipdata[190] = INCBIN_U8("data/rooms/chozodia/chozodia_81_clipdata.gfx"); +const u8 sChozodia_81_Clipdata[190] = { + #include "extracted/data/rooms/chozodia/chozodia_81_clipdata.gfx.inc" +}; -const u8 sChozodia_81_Bg2[97] = INCBIN_U8("data/rooms/chozodia/chozodia_81_bg2.gfx"); +const u8 sChozodia_81_Bg2[97] = { + #include "extracted/data/rooms/chozodia/chozodia_81_bg2.gfx.inc" +}; -const u8 sChozodia_81_Bg1[319] = INCBIN_U8("data/rooms/chozodia/chozodia_81_bg1.gfx"); +const u8 sChozodia_81_Bg1[319] = { + #include "extracted/data/rooms/chozodia/chozodia_81_bg1.gfx.inc" +}; const u8 sChozodia_81_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_81_Bg0[133] = INCBIN_U8("data/rooms/chozodia/chozodia_81_bg0.gfx"); +const u8 sChozodia_81_Bg0[133] = { + #include "extracted/data/rooms/chozodia/chozodia_81_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_82.c b/src/data/rooms/chozodia/chozodia_82.c index ea31d7988..418c12232 100644 --- a/src/data/rooms/chozodia/chozodia_82.c +++ b/src/data/rooms/chozodia/chozodia_82.c @@ -13,15 +13,23 @@ const u8 sChozodia_48_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_82_Clipdata[201] = INCBIN_U8("data/rooms/chozodia/chozodia_82_clipdata.gfx"); +const u8 sChozodia_82_Clipdata[201] = { + #include "extracted/data/rooms/chozodia/chozodia_82_clipdata.gfx.inc" +}; -const u8 sChozodia_82_Bg2[227] = INCBIN_U8("data/rooms/chozodia/chozodia_82_bg2.gfx"); +const u8 sChozodia_82_Bg2[227] = { + #include "extracted/data/rooms/chozodia/chozodia_82_bg2.gfx.inc" +}; -const u8 sChozodia_82_Bg1[605] = INCBIN_U8("data/rooms/chozodia/chozodia_82_bg1.gfx"); +const u8 sChozodia_82_Bg1[605] = { + #include "extracted/data/rooms/chozodia/chozodia_82_bg1.gfx.inc" +}; const u8 sChozodia_82_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_82_Bg0[38] = INCBIN_U8("data/rooms/chozodia/chozodia_82_bg0.gfx"); +const u8 sChozodia_82_Bg0[38] = { + #include "extracted/data/rooms/chozodia/chozodia_82_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_83.c b/src/data/rooms/chozodia/chozodia_83.c index 5f9b19a67..cf16c97b9 100644 --- a/src/data/rooms/chozodia/chozodia_83.c +++ b/src/data/rooms/chozodia/chozodia_83.c @@ -27,11 +27,17 @@ const u8 sChozodia_49_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_83_Clipdata[443] = INCBIN_U8("data/rooms/chozodia/chozodia_83_clipdata.gfx"); +const u8 sChozodia_83_Clipdata[443] = { + #include "extracted/data/rooms/chozodia/chozodia_83_clipdata.gfx.inc" +}; -const u8 sChozodia_83_Bg2[677] = INCBIN_U8("data/rooms/chozodia/chozodia_83_bg2.gfx"); +const u8 sChozodia_83_Bg2[677] = { + #include "extracted/data/rooms/chozodia/chozodia_83_bg2.gfx.inc" +}; -const u8 sChozodia_83_Bg1[1637] = INCBIN_U8("data/rooms/chozodia/chozodia_83_bg1.gfx"); +const u8 sChozodia_83_Bg1[1637] = { + #include "extracted/data/rooms/chozodia/chozodia_83_bg1.gfx.inc" +}; const u8 sChozodia_83_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 8, 61, SPRITESET_IDX(4), diff --git a/src/data/rooms/chozodia/chozodia_84.c b/src/data/rooms/chozodia/chozodia_84.c index 67a85971b..571745d91 100644 --- a/src/data/rooms/chozodia/chozodia_84.c +++ b/src/data/rooms/chozodia/chozodia_84.c @@ -13,11 +13,17 @@ const u8 sChozodia_50_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_84_Clipdata[184] = INCBIN_U8("data/rooms/chozodia/chozodia_84_clipdata.gfx"); +const u8 sChozodia_84_Clipdata[184] = { + #include "extracted/data/rooms/chozodia/chozodia_84_clipdata.gfx.inc" +}; -const u8 sChozodia_84_Bg2[38] = INCBIN_U8("data/rooms/chozodia/chozodia_84_bg2.gfx"); +const u8 sChozodia_84_Bg2[38] = { + #include "extracted/data/rooms/chozodia/chozodia_84_bg2.gfx.inc" +}; -const u8 sChozodia_84_Bg1[480] = INCBIN_U8("data/rooms/chozodia/chozodia_84_bg1.gfx"); +const u8 sChozodia_84_Bg1[480] = { + #include "extracted/data/rooms/chozodia/chozodia_84_bg1.gfx.inc" +}; const u8 sChozodia_84_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 12, SPRITESET_IDX(2), @@ -25,5 +31,7 @@ const u8 sChozodia_84_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_84_Bg0[119] = INCBIN_U8("data/rooms/chozodia/chozodia_84_bg0.gfx"); +const u8 sChozodia_84_Bg0[119] = { + #include "extracted/data/rooms/chozodia/chozodia_84_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_85.c b/src/data/rooms/chozodia/chozodia_85.c index b9d9baa62..165f176cb 100644 --- a/src/data/rooms/chozodia/chozodia_85.c +++ b/src/data/rooms/chozodia/chozodia_85.c @@ -20,11 +20,17 @@ const u8 sChozodia_51_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_85_Clipdata[423] = INCBIN_U8("data/rooms/chozodia/chozodia_85_clipdata.gfx"); +const u8 sChozodia_85_Clipdata[423] = { + #include "extracted/data/rooms/chozodia/chozodia_85_clipdata.gfx.inc" +}; -const u8 sChozodia_85_Bg2[401] = INCBIN_U8("data/rooms/chozodia/chozodia_85_bg2.gfx"); +const u8 sChozodia_85_Bg2[401] = { + #include "extracted/data/rooms/chozodia/chozodia_85_bg2.gfx.inc" +}; -const u8 sChozodia_85_Bg1[1438] = INCBIN_U8("data/rooms/chozodia/chozodia_85_bg1.gfx"); +const u8 sChozodia_85_Bg1[1438] = { + #include "extracted/data/rooms/chozodia/chozodia_85_bg1.gfx.inc" +}; const u8 sChozodia_85_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 16, 38, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_86.c b/src/data/rooms/chozodia/chozodia_86.c index e4721c3e4..59255b3d1 100644 --- a/src/data/rooms/chozodia/chozodia_86.c +++ b/src/data/rooms/chozodia/chozodia_86.c @@ -13,15 +13,23 @@ const u8 sChozodia_52_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_86_Clipdata[246] = INCBIN_U8("data/rooms/chozodia/chozodia_86_clipdata.gfx"); +const u8 sChozodia_86_Clipdata[246] = { + #include "extracted/data/rooms/chozodia/chozodia_86_clipdata.gfx.inc" +}; -const u8 sChozodia_86_Bg2[188] = INCBIN_U8("data/rooms/chozodia/chozodia_86_bg2.gfx"); +const u8 sChozodia_86_Bg2[188] = { + #include "extracted/data/rooms/chozodia/chozodia_86_bg2.gfx.inc" +}; -const u8 sChozodia_86_Bg1[778] = INCBIN_U8("data/rooms/chozodia/chozodia_86_bg1.gfx"); +const u8 sChozodia_86_Bg1[778] = { + #include "extracted/data/rooms/chozodia/chozodia_86_bg1.gfx.inc" +}; const u8 sChozodia_86_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_86_Bg0[23] = INCBIN_U8("data/rooms/chozodia/chozodia_86_bg0.gfx"); +const u8 sChozodia_86_Bg0[23] = { + #include "extracted/data/rooms/chozodia/chozodia_86_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_87.c b/src/data/rooms/chozodia/chozodia_87.c index c4c7d8bbd..1ee33a83f 100644 --- a/src/data/rooms/chozodia/chozodia_87.c +++ b/src/data/rooms/chozodia/chozodia_87.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_87_Clipdata[187] = INCBIN_U8("data/rooms/chozodia/chozodia_87_clipdata.gfx"); +const u8 sChozodia_87_Clipdata[187] = { + #include "extracted/data/rooms/chozodia/chozodia_87_clipdata.gfx.inc" +}; -const u8 sChozodia_87_Bg2[162] = INCBIN_U8("data/rooms/chozodia/chozodia_87_bg2.gfx"); +const u8 sChozodia_87_Bg2[162] = { + #include "extracted/data/rooms/chozodia/chozodia_87_bg2.gfx.inc" +}; -const u8 sChozodia_87_Bg1[1007] = INCBIN_U8("data/rooms/chozodia/chozodia_87_bg1.gfx"); +const u8 sChozodia_87_Bg1[1007] = { + #include "extracted/data/rooms/chozodia/chozodia_87_bg1.gfx.inc" +}; const u8 sChozodia_87_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_88.c b/src/data/rooms/chozodia/chozodia_88.c index 9cf44e933..183877101 100644 --- a/src/data/rooms/chozodia/chozodia_88.c +++ b/src/data/rooms/chozodia/chozodia_88.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_88_Clipdata[123] = INCBIN_U8("data/rooms/chozodia/chozodia_88_clipdata.gfx"); +const u8 sChozodia_88_Clipdata[123] = { + #include "extracted/data/rooms/chozodia/chozodia_88_clipdata.gfx.inc" +}; -const u8 sChozodia_88_Bg2[116] = INCBIN_U8("data/rooms/chozodia/chozodia_88_bg2.gfx"); +const u8 sChozodia_88_Bg2[116] = { + #include "extracted/data/rooms/chozodia/chozodia_88_bg2.gfx.inc" +}; -const u8 sChozodia_88_Bg1[808] = INCBIN_U8("data/rooms/chozodia/chozodia_88_bg1.gfx"); +const u8 sChozodia_88_Bg1[808] = { + #include "extracted/data/rooms/chozodia/chozodia_88_bg1.gfx.inc" +}; const u8 sChozodia_88_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_89.c b/src/data/rooms/chozodia/chozodia_89.c index 66dda4a36..4496be2f2 100644 --- a/src/data/rooms/chozodia/chozodia_89.c +++ b/src/data/rooms/chozodia/chozodia_89.c @@ -20,11 +20,17 @@ const u8 sChozodia_53_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_89_Clipdata[156] = INCBIN_U8("data/rooms/chozodia/chozodia_89_clipdata.gfx"); +const u8 sChozodia_89_Clipdata[156] = { + #include "extracted/data/rooms/chozodia/chozodia_89_clipdata.gfx.inc" +}; -const u8 sChozodia_89_Bg2[85] = INCBIN_U8("data/rooms/chozodia/chozodia_89_bg2.gfx"); +const u8 sChozodia_89_Bg2[85] = { + #include "extracted/data/rooms/chozodia/chozodia_89_bg2.gfx.inc" +}; -const u8 sChozodia_89_Bg1[501] = INCBIN_U8("data/rooms/chozodia/chozodia_89_bg1.gfx"); +const u8 sChozodia_89_Bg1[501] = { + #include "extracted/data/rooms/chozodia/chozodia_89_bg1.gfx.inc" +}; const u8 sChozodia_89_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 15, 6, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_9.c b/src/data/rooms/chozodia/chozodia_9.c index 3639c8410..bd83d5fe9 100644 --- a/src/data/rooms/chozodia/chozodia_9.c +++ b/src/data/rooms/chozodia/chozodia_9.c @@ -13,11 +13,17 @@ const u8 sChozodia_5_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_9_Clipdata[491] = INCBIN_U8("data/rooms/chozodia/chozodia_9_clipdata.gfx"); +const u8 sChozodia_9_Clipdata[491] = { + #include "extracted/data/rooms/chozodia/chozodia_9_clipdata.gfx.inc" +}; -const u8 sChozodia_9_Bg2[236] = INCBIN_U8("data/rooms/chozodia/chozodia_9_bg2.gfx"); +const u8 sChozodia_9_Bg2[236] = { + #include "extracted/data/rooms/chozodia/chozodia_9_bg2.gfx.inc" +}; -const u8 sChozodia_9_Bg1[446] = INCBIN_U8("data/rooms/chozodia/chozodia_9_bg1.gfx"); +const u8 sChozodia_9_Bg1[446] = { + #include "extracted/data/rooms/chozodia/chozodia_9_bg1.gfx.inc" +}; const u8 sChozodia_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/chozodia/chozodia_90.c b/src/data/rooms/chozodia/chozodia_90.c index 4117a6658..c11b31a7c 100644 --- a/src/data/rooms/chozodia/chozodia_90.c +++ b/src/data/rooms/chozodia/chozodia_90.c @@ -34,9 +34,13 @@ const u8 sChozodia_54_Scrolls[SCROLL_DATA_SIZE(4)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_90_Clipdata[943] = INCBIN_U8("data/rooms/chozodia/chozodia_90_clipdata.gfx"); +const u8 sChozodia_90_Clipdata[943] = { + #include "extracted/data/rooms/chozodia/chozodia_90_clipdata.gfx.inc" +}; -const u8 sChozodia_90_Bg1[1673] = INCBIN_U8("data/rooms/chozodia/chozodia_90_bg1.gfx"); +const u8 sChozodia_90_Bg1[1673] = { + #include "extracted/data/rooms/chozodia/chozodia_90_bg1.gfx.inc" +}; const u8 sChozodia_90_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 10, 17, SPRITESET_IDX(0), diff --git a/src/data/rooms/chozodia/chozodia_91.c b/src/data/rooms/chozodia/chozodia_91.c index 40ce7579d..326fef132 100644 --- a/src/data/rooms/chozodia/chozodia_91.c +++ b/src/data/rooms/chozodia/chozodia_91.c @@ -13,11 +13,17 @@ const u8 sChozodia_55_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_91_Clipdata[170] = INCBIN_U8("data/rooms/chozodia/chozodia_91_clipdata.gfx"); +const u8 sChozodia_91_Clipdata[170] = { + #include "extracted/data/rooms/chozodia/chozodia_91_clipdata.gfx.inc" +}; -const u8 sChozodia_91_Bg2[38] = INCBIN_U8("data/rooms/chozodia/chozodia_91_bg2.gfx"); +const u8 sChozodia_91_Bg2[38] = { + #include "extracted/data/rooms/chozodia/chozodia_91_bg2.gfx.inc" +}; -const u8 sChozodia_91_Bg1[497] = INCBIN_U8("data/rooms/chozodia/chozodia_91_bg1.gfx"); +const u8 sChozodia_91_Bg1[497] = { + #include "extracted/data/rooms/chozodia/chozodia_91_bg1.gfx.inc" +}; const u8 sChozodia_91_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 12, SPRITESET_IDX(2), diff --git a/src/data/rooms/chozodia/chozodia_92.c b/src/data/rooms/chozodia/chozodia_92.c index 23e0f824b..d4909863a 100644 --- a/src/data/rooms/chozodia/chozodia_92.c +++ b/src/data/rooms/chozodia/chozodia_92.c @@ -27,11 +27,17 @@ const u8 sChozodia_56_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_92_Clipdata[238] = INCBIN_U8("data/rooms/chozodia/chozodia_92_clipdata.gfx"); +const u8 sChozodia_92_Clipdata[238] = { + #include "extracted/data/rooms/chozodia/chozodia_92_clipdata.gfx.inc" +}; -const u8 sChozodia_92_Bg2[914] = INCBIN_U8("data/rooms/chozodia/chozodia_92_bg2.gfx"); +const u8 sChozodia_92_Bg2[914] = { + #include "extracted/data/rooms/chozodia/chozodia_92_bg2.gfx.inc" +}; -const u8 sChozodia_92_Bg1[1067] = INCBIN_U8("data/rooms/chozodia/chozodia_92_bg1.gfx"); +const u8 sChozodia_92_Bg1[1067] = { + #include "extracted/data/rooms/chozodia/chozodia_92_bg1.gfx.inc" +}; const u8 sChozodia_92_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 19, 32, SPRITESET_IDX(4), diff --git a/src/data/rooms/chozodia/chozodia_93.c b/src/data/rooms/chozodia/chozodia_93.c index 3a7ec3865..4274a450b 100644 --- a/src/data/rooms/chozodia/chozodia_93.c +++ b/src/data/rooms/chozodia/chozodia_93.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_93_Clipdata[414] = INCBIN_U8("data/rooms/chozodia/chozodia_93_clipdata.gfx"); +const u8 sChozodia_93_Clipdata[414] = { + #include "extracted/data/rooms/chozodia/chozodia_93_clipdata.gfx.inc" +}; -const u8 sChozodia_93_Bg2[1335] = INCBIN_U8("data/rooms/chozodia/chozodia_93_bg2.gfx"); +const u8 sChozodia_93_Bg2[1335] = { + #include "extracted/data/rooms/chozodia/chozodia_93_bg2.gfx.inc" +}; -const u8 sChozodia_93_Bg1[979] = INCBIN_U8("data/rooms/chozodia/chozodia_93_bg1.gfx"); +const u8 sChozodia_93_Bg1[979] = { + #include "extracted/data/rooms/chozodia/chozodia_93_bg1.gfx.inc" +}; const u8 sChozodia_93_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 16, 9, SPRITESET_IDX(0), @@ -16,5 +22,7 @@ const u8 sChozodia_93_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_93_Bg0[122] = INCBIN_U8("data/rooms/chozodia/chozodia_93_bg0.gfx"); +const u8 sChozodia_93_Bg0[122] = { + #include "extracted/data/rooms/chozodia/chozodia_93_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_94.c b/src/data/rooms/chozodia/chozodia_94.c index 0b5bcd4d8..255554eaf 100644 --- a/src/data/rooms/chozodia/chozodia_94.c +++ b/src/data/rooms/chozodia/chozodia_94.c @@ -1,15 +1,23 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_94_Clipdata[95] = INCBIN_U8("data/rooms/chozodia/chozodia_94_clipdata.gfx"); +const u8 sChozodia_94_Clipdata[95] = { + #include "extracted/data/rooms/chozodia/chozodia_94_clipdata.gfx.inc" +}; -const u8 sChozodia_94_Bg2[58] = INCBIN_U8("data/rooms/chozodia/chozodia_94_bg2.gfx"); +const u8 sChozodia_94_Bg2[58] = { + #include "extracted/data/rooms/chozodia/chozodia_94_bg2.gfx.inc" +}; -const u8 sChozodia_94_Bg1[284] = INCBIN_U8("data/rooms/chozodia/chozodia_94_bg1.gfx"); +const u8 sChozodia_94_Bg1[284] = { + #include "extracted/data/rooms/chozodia/chozodia_94_bg1.gfx.inc" +}; const u8 sChozodia_94_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_94_Bg0[60] = INCBIN_U8("data/rooms/chozodia/chozodia_94_bg0.gfx"); +const u8 sChozodia_94_Bg0[60] = { + #include "extracted/data/rooms/chozodia/chozodia_94_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_95.c b/src/data/rooms/chozodia/chozodia_95.c index be490edcb..b38ebfb27 100644 --- a/src/data/rooms/chozodia/chozodia_95.c +++ b/src/data/rooms/chozodia/chozodia_95.c @@ -20,9 +20,13 @@ const u8 sChozodia_57_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_95_Clipdata[572] = INCBIN_U8("data/rooms/chozodia/chozodia_95_clipdata.gfx"); +const u8 sChozodia_95_Clipdata[572] = { + #include "extracted/data/rooms/chozodia/chozodia_95_clipdata.gfx.inc" +}; -const u8 sChozodia_95_Bg1[971] = INCBIN_U8("data/rooms/chozodia/chozodia_95_bg1.gfx"); +const u8 sChozodia_95_Bg1[971] = { + #include "extracted/data/rooms/chozodia/chozodia_95_bg1.gfx.inc" +}; const u8 sChozodia_95_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 18, 30, SPRITESET_IDX(3), diff --git a/src/data/rooms/chozodia/chozodia_96.c b/src/data/rooms/chozodia/chozodia_96.c index 461b4e6ac..af0def538 100644 --- a/src/data/rooms/chozodia/chozodia_96.c +++ b/src/data/rooms/chozodia/chozodia_96.c @@ -1,11 +1,17 @@ #include "data/rooms/chozodia_rooms_data.h" #include "macros.h" -const u8 sChozodia_96_Clipdata[222] = INCBIN_U8("data/rooms/chozodia/chozodia_96_clipdata.gfx"); +const u8 sChozodia_96_Clipdata[222] = { + #include "extracted/data/rooms/chozodia/chozodia_96_clipdata.gfx.inc" +}; -const u8 sChozodia_96_Bg2[805] = INCBIN_U8("data/rooms/chozodia/chozodia_96_bg2.gfx"); +const u8 sChozodia_96_Bg2[805] = { + #include "extracted/data/rooms/chozodia/chozodia_96_bg2.gfx.inc" +}; -const u8 sChozodia_96_Bg1[861] = INCBIN_U8("data/rooms/chozodia/chozodia_96_bg1.gfx"); +const u8 sChozodia_96_Bg1[861] = { + #include "extracted/data/rooms/chozodia/chozodia_96_bg1.gfx.inc" +}; const u8 sChozodia_96_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 7, 46, SPRITESET_IDX(1), @@ -17,5 +23,7 @@ const u8 sChozodia_96_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_96_Bg0[71] = INCBIN_U8("data/rooms/chozodia/chozodia_96_bg0.gfx"); +const u8 sChozodia_96_Bg0[71] = { + #include "extracted/data/rooms/chozodia/chozodia_96_bg0.gfx.inc" +}; diff --git a/src/data/rooms/chozodia/chozodia_97.c b/src/data/rooms/chozodia/chozodia_97.c index 094d4353c..caf6033f6 100644 --- a/src/data/rooms/chozodia/chozodia_97.c +++ b/src/data/rooms/chozodia/chozodia_97.c @@ -13,9 +13,13 @@ const u8 sChozodia_58_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_97_Clipdata[135] = INCBIN_U8("data/rooms/chozodia/chozodia_97_clipdata.gfx"); +const u8 sChozodia_97_Clipdata[135] = { + #include "extracted/data/rooms/chozodia/chozodia_97_clipdata.gfx.inc" +}; -const u8 sChozodia_97_Bg1[177] = INCBIN_U8("data/rooms/chozodia/chozodia_97_bg1.gfx"); +const u8 sChozodia_97_Bg1[177] = { + #include "extracted/data/rooms/chozodia/chozodia_97_bg1.gfx.inc" +}; const u8 sChozodia_97_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 8, 2, SPRITESET_IDX(1), diff --git a/src/data/rooms/chozodia/chozodia_98.c b/src/data/rooms/chozodia/chozodia_98.c index 4230fc428..e0eb0cbdb 100644 --- a/src/data/rooms/chozodia/chozodia_98.c +++ b/src/data/rooms/chozodia/chozodia_98.c @@ -13,14 +13,22 @@ const u8 sChozodia_59_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sChozodia_98_Clipdata[491] = INCBIN_U8("data/rooms/chozodia/chozodia_98_clipdata.gfx"); +const u8 sChozodia_98_Clipdata[491] = { + #include "extracted/data/rooms/chozodia/chozodia_98_clipdata.gfx.inc" +}; -const u8 sChozodia_98_Bg2[236] = INCBIN_U8("data/rooms/chozodia/chozodia_98_bg2.gfx"); +const u8 sChozodia_98_Bg2[236] = { + #include "extracted/data/rooms/chozodia/chozodia_98_bg2.gfx.inc" +}; -const u8 sChozodia_98_Bg1[446] = INCBIN_U8("data/rooms/chozodia/chozodia_98_bg1.gfx"); +const u8 sChozodia_98_Bg1[446] = { + #include "extracted/data/rooms/chozodia/chozodia_98_bg1.gfx.inc" +}; const u8 sChozodia_98_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sChozodia_98_Bg0[18] = INCBIN_U8("data/rooms/chozodia/chozodia_98_bg0.gfx"); +const u8 sChozodia_98_Bg0[18] = { + #include "extracted/data/rooms/chozodia/chozodia_98_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/bg3.c b/src/data/rooms/crateria/bg3.c index 1c7f58231..25ad96d46 100644 --- a/src/data/rooms/crateria/bg3.c +++ b/src/data/rooms/crateria/bg3.c @@ -1,12 +1,26 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_Bg3_0[1040] = INCBIN_U8("data/rooms/crateria/crateria_bg3_0.gfx"); +const u8 sCrateria_Bg3_0[1040] = { + #include "extracted/data/rooms/crateria/crateria_bg3_0.gfx.inc" +}; -const u8 sCrateria_0_Bg0[784] = INCBIN_U8("data/rooms/crateria/crateria_0_bg0.gfx"); +const u8 sCrateria_0_Bg0[784] = { + #include "extracted/data/rooms/crateria/crateria_0_bg0.gfx.inc" +}; -const u8 sCrateria_Bg3_1[1444] = INCBIN_U8("data/rooms/crateria/crateria_bg3_1.gfx"); -const u8 sCrateria_Bg3_2[1224] = INCBIN_U8("data/rooms/crateria/crateria_bg3_2.gfx"); -const u8 sCrateria_Bg3_3[1840] = INCBIN_U8("data/rooms/crateria/crateria_bg3_3.gfx"); -const u8 sCrateria_Bg3_4[520] = INCBIN_U8("data/rooms/crateria/crateria_bg3_4.gfx"); -const u8 sCrateria_Bg3_5[1472] = INCBIN_U8("data/rooms/crateria/crateria_bg3_5.gfx"); +const u8 sCrateria_Bg3_1[1444] = { + #include "extracted/data/rooms/crateria/crateria_bg3_1.gfx.inc" +}; +const u8 sCrateria_Bg3_2[1224] = { + #include "extracted/data/rooms/crateria/crateria_bg3_2.gfx.inc" +}; +const u8 sCrateria_Bg3_3[1840] = { + #include "extracted/data/rooms/crateria/crateria_bg3_3.gfx.inc" +}; +const u8 sCrateria_Bg3_4[520] = { + #include "extracted/data/rooms/crateria/crateria_bg3_4.gfx.inc" +}; +const u8 sCrateria_Bg3_5[1472] = { + #include "extracted/data/rooms/crateria/crateria_bg3_5.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_0.c b/src/data/rooms/crateria/crateria_0.c index 575754b94..27afb731e 100644 --- a/src/data/rooms/crateria/crateria_0.c +++ b/src/data/rooms/crateria/crateria_0.c @@ -34,11 +34,17 @@ const u8 sCrateria_0_Scrolls[SCROLL_DATA_SIZE(4)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_0_Clipdata[664] = INCBIN_U8("data/rooms/crateria/crateria_0_clipdata.gfx"); +const u8 sCrateria_0_Clipdata[664] = { + #include "extracted/data/rooms/crateria/crateria_0_clipdata.gfx.inc" +}; -const u8 sCrateria_0_Bg2[1338] = INCBIN_U8("data/rooms/crateria/crateria_0_bg2.gfx"); +const u8 sCrateria_0_Bg2[1338] = { + #include "extracted/data/rooms/crateria/crateria_0_bg2.gfx.inc" +}; -const u8 sCrateria_0_Bg1[1429] = INCBIN_U8("data/rooms/crateria/crateria_0_bg1.gfx"); +const u8 sCrateria_0_Bg1[1429] = { + #include "extracted/data/rooms/crateria/crateria_0_bg1.gfx.inc" +}; const u8 sCrateria_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 68, 39, SPRITESET_IDX(0), diff --git a/src/data/rooms/crateria/crateria_1.c b/src/data/rooms/crateria/crateria_1.c index 0e2c7d4e8..c16d726c7 100644 --- a/src/data/rooms/crateria/crateria_1.c +++ b/src/data/rooms/crateria/crateria_1.c @@ -27,11 +27,17 @@ const u8 sCrateria_1_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_1_Clipdata[672] = INCBIN_U8("data/rooms/crateria/crateria_1_clipdata.gfx"); +const u8 sCrateria_1_Clipdata[672] = { + #include "extracted/data/rooms/crateria/crateria_1_clipdata.gfx.inc" +}; -const u8 sCrateria_1_Bg2[335] = INCBIN_U8("data/rooms/crateria/crateria_1_bg2.gfx"); +const u8 sCrateria_1_Bg2[335] = { + #include "extracted/data/rooms/crateria/crateria_1_bg2.gfx.inc" +}; -const u8 sCrateria_1_Bg1[1608] = INCBIN_U8("data/rooms/crateria/crateria_1_bg1.gfx"); +const u8 sCrateria_1_Bg1[1608] = { + #include "extracted/data/rooms/crateria/crateria_1_bg1.gfx.inc" +}; const u8 sCrateria_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(19)] = { 4, 34, SPRITESET_IDX(4), @@ -55,5 +61,7 @@ const u8 sCrateria_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(19)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_1_Bg0[14] = INCBIN_U8("data/rooms/crateria/crateria_1_bg0.gfx"); +const u8 sCrateria_1_Bg0[14] = { + #include "extracted/data/rooms/crateria/crateria_1_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_10.c b/src/data/rooms/crateria/crateria_10.c index 8be6dd41b..c8acf5508 100644 --- a/src/data/rooms/crateria/crateria_10.c +++ b/src/data/rooms/crateria/crateria_10.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_10_Clipdata[75] = INCBIN_U8("data/rooms/crateria/crateria_10_clipdata.gfx"); +const u8 sCrateria_10_Clipdata[75] = { + #include "extracted/data/rooms/crateria/crateria_10_clipdata.gfx.inc" +}; -const u8 sCrateria_10_Bg2[190] = INCBIN_U8("data/rooms/crateria/crateria_10_bg2.gfx"); +const u8 sCrateria_10_Bg2[190] = { + #include "extracted/data/rooms/crateria/crateria_10_bg2.gfx.inc" +}; -const u8 sCrateria_10_Bg1[290] = INCBIN_U8("data/rooms/crateria/crateria_10_bg1.gfx"); +const u8 sCrateria_10_Bg1[290] = { + #include "extracted/data/rooms/crateria/crateria_10_bg1.gfx.inc" +}; const u8 sCrateria_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_11.c b/src/data/rooms/crateria/crateria_11.c index 490dadc74..0ccbd2359 100644 --- a/src/data/rooms/crateria/crateria_11.c +++ b/src/data/rooms/crateria/crateria_11.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_11_Clipdata[150] = INCBIN_U8("data/rooms/crateria/crateria_11_clipdata.gfx"); +const u8 sCrateria_11_Clipdata[150] = { + #include "extracted/data/rooms/crateria/crateria_11_clipdata.gfx.inc" +}; -const u8 sCrateria_11_Bg2[241] = INCBIN_U8("data/rooms/crateria/crateria_11_bg2.gfx"); +const u8 sCrateria_11_Bg2[241] = { + #include "extracted/data/rooms/crateria/crateria_11_bg2.gfx.inc" +}; -const u8 sCrateria_11_Bg1[313] = INCBIN_U8("data/rooms/crateria/crateria_11_bg1.gfx"); +const u8 sCrateria_11_Bg1[313] = { + #include "extracted/data/rooms/crateria/crateria_11_bg1.gfx.inc" +}; const u8 sCrateria_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 3, 12, SPRITESET_IDX(2), diff --git a/src/data/rooms/crateria/crateria_12.c b/src/data/rooms/crateria/crateria_12.c index cd214bd00..bc0e7f6dc 100644 --- a/src/data/rooms/crateria/crateria_12.c +++ b/src/data/rooms/crateria/crateria_12.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_12_Clipdata[48] = INCBIN_U8("data/rooms/crateria/crateria_12_clipdata.gfx"); +const u8 sCrateria_12_Clipdata[48] = { + #include "extracted/data/rooms/crateria/crateria_12_clipdata.gfx.inc" +}; -const u8 sCrateria_12_Bg2[119] = INCBIN_U8("data/rooms/crateria/crateria_12_bg2.gfx"); +const u8 sCrateria_12_Bg2[119] = { + #include "extracted/data/rooms/crateria/crateria_12_bg2.gfx.inc" +}; -const u8 sCrateria_12_Bg1[145] = INCBIN_U8("data/rooms/crateria/crateria_12_bg1.gfx"); +const u8 sCrateria_12_Bg1[145] = { + #include "extracted/data/rooms/crateria/crateria_12_bg1.gfx.inc" +}; const u8 sCrateria_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 8, 7, SPRITESET_IDX(0), diff --git a/src/data/rooms/crateria/crateria_13.c b/src/data/rooms/crateria/crateria_13.c index 059443c34..670272dfc 100644 --- a/src/data/rooms/crateria/crateria_13.c +++ b/src/data/rooms/crateria/crateria_13.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_13_Clipdata[55] = INCBIN_U8("data/rooms/crateria/crateria_13_clipdata.gfx"); +const u8 sCrateria_13_Clipdata[55] = { + #include "extracted/data/rooms/crateria/crateria_13_clipdata.gfx.inc" +}; -const u8 sCrateria_13_Bg2[148] = INCBIN_U8("data/rooms/crateria/crateria_13_bg2.gfx"); +const u8 sCrateria_13_Bg2[148] = { + #include "extracted/data/rooms/crateria/crateria_13_bg2.gfx.inc" +}; -const u8 sCrateria_13_Bg1[202] = INCBIN_U8("data/rooms/crateria/crateria_13_bg1.gfx"); +const u8 sCrateria_13_Bg1[202] = { + #include "extracted/data/rooms/crateria/crateria_13_bg1.gfx.inc" +}; const u8 sCrateria_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_14.c b/src/data/rooms/crateria/crateria_14.c index 9cbd2dd93..420a52091 100644 --- a/src/data/rooms/crateria/crateria_14.c +++ b/src/data/rooms/crateria/crateria_14.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_14_Clipdata[84] = INCBIN_U8("data/rooms/crateria/crateria_14_clipdata.gfx"); +const u8 sCrateria_14_Clipdata[84] = { + #include "extracted/data/rooms/crateria/crateria_14_clipdata.gfx.inc" +}; -const u8 sCrateria_14_Bg2[131] = INCBIN_U8("data/rooms/crateria/crateria_14_bg2.gfx"); +const u8 sCrateria_14_Bg2[131] = { + #include "extracted/data/rooms/crateria/crateria_14_bg2.gfx.inc" +}; -const u8 sCrateria_14_Bg1[271] = INCBIN_U8("data/rooms/crateria/crateria_14_bg1.gfx"); +const u8 sCrateria_14_Bg1[271] = { + #include "extracted/data/rooms/crateria/crateria_14_bg1.gfx.inc" +}; const u8 sCrateria_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 2, 17, SPRITESET_IDX(2), diff --git a/src/data/rooms/crateria/crateria_15.c b/src/data/rooms/crateria/crateria_15.c index f77eec27d..8378038e7 100644 --- a/src/data/rooms/crateria/crateria_15.c +++ b/src/data/rooms/crateria/crateria_15.c @@ -1,15 +1,23 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_15_Clipdata[237] = INCBIN_U8("data/rooms/crateria/crateria_15_clipdata.gfx"); +const u8 sCrateria_15_Clipdata[237] = { + #include "extracted/data/rooms/crateria/crateria_15_clipdata.gfx.inc" +}; -const u8 sCrateria_15_Bg2[370] = INCBIN_U8("data/rooms/crateria/crateria_15_bg2.gfx"); +const u8 sCrateria_15_Bg2[370] = { + #include "extracted/data/rooms/crateria/crateria_15_bg2.gfx.inc" +}; -const u8 sCrateria_15_Bg1[510] = INCBIN_U8("data/rooms/crateria/crateria_15_bg1.gfx"); +const u8 sCrateria_15_Bg1[510] = { + #include "extracted/data/rooms/crateria/crateria_15_bg1.gfx.inc" +}; const u8 sCrateria_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_15_Bg0[148] = INCBIN_U8("data/rooms/crateria/crateria_15_bg0.gfx"); +const u8 sCrateria_15_Bg0[148] = { + #include "extracted/data/rooms/crateria/crateria_15_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_16.c b/src/data/rooms/crateria/crateria_16.c index be20fdef4..4b2b2ecd8 100644 --- a/src/data/rooms/crateria/crateria_16.c +++ b/src/data/rooms/crateria/crateria_16.c @@ -13,16 +13,24 @@ const u8 sCrateria_7_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_16_Clipdata[241] = INCBIN_U8("data/rooms/crateria/crateria_16_clipdata.gfx"); +const u8 sCrateria_16_Clipdata[241] = { + #include "extracted/data/rooms/crateria/crateria_16_clipdata.gfx.inc" +}; -const u8 sCrateria_16_Bg2[397] = INCBIN_U8("data/rooms/crateria/crateria_16_bg2.gfx"); +const u8 sCrateria_16_Bg2[397] = { + #include "extracted/data/rooms/crateria/crateria_16_bg2.gfx.inc" +}; -const u8 sCrateria_16_Bg1[759] = INCBIN_U8("data/rooms/crateria/crateria_16_bg1.gfx"); +const u8 sCrateria_16_Bg1[759] = { + #include "extracted/data/rooms/crateria/crateria_16_bg1.gfx.inc" +}; const u8 sCrateria_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 40, 13, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_16_Bg0[247] = INCBIN_U8("data/rooms/crateria/crateria_16_bg0.gfx"); +const u8 sCrateria_16_Bg0[247] = { + #include "extracted/data/rooms/crateria/crateria_16_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_17.c b/src/data/rooms/crateria/crateria_17.c index c9c1f8e7b..554ad1e78 100644 --- a/src/data/rooms/crateria/crateria_17.c +++ b/src/data/rooms/crateria/crateria_17.c @@ -13,11 +13,17 @@ const u8 sCrateria_8_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_17_Clipdata[223] = INCBIN_U8("data/rooms/crateria/crateria_17_clipdata.gfx"); +const u8 sCrateria_17_Clipdata[223] = { + #include "extracted/data/rooms/crateria/crateria_17_clipdata.gfx.inc" +}; -const u8 sCrateria_17_Bg2[527] = INCBIN_U8("data/rooms/crateria/crateria_17_bg2.gfx"); +const u8 sCrateria_17_Bg2[527] = { + #include "extracted/data/rooms/crateria/crateria_17_bg2.gfx.inc" +}; -const u8 sCrateria_17_Bg1[735] = INCBIN_U8("data/rooms/crateria/crateria_17_bg1.gfx"); +const u8 sCrateria_17_Bg1[735] = { + #include "extracted/data/rooms/crateria/crateria_17_bg1.gfx.inc" +}; const u8 sCrateria_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 40, 13, SPRITESET_IDX(0), diff --git a/src/data/rooms/crateria/crateria_18.c b/src/data/rooms/crateria/crateria_18.c index 45f1d0da0..47fea6493 100644 --- a/src/data/rooms/crateria/crateria_18.c +++ b/src/data/rooms/crateria/crateria_18.c @@ -13,11 +13,17 @@ const u8 sCrateria_9_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sCrateria_18_Clipdata[108] = INCBIN_U8("data/rooms/crateria/crateria_18_clipdata.gfx"); +const u8 sCrateria_18_Clipdata[108] = { + #include "extracted/data/rooms/crateria/crateria_18_clipdata.gfx.inc" +}; -const u8 sCrateria_18_Bg2[175] = INCBIN_U8("data/rooms/crateria/crateria_18_bg2.gfx"); +const u8 sCrateria_18_Bg2[175] = { + #include "extracted/data/rooms/crateria/crateria_18_bg2.gfx.inc" +}; -const u8 sCrateria_18_Bg1[321] = INCBIN_U8("data/rooms/crateria/crateria_18_bg1.gfx"); +const u8 sCrateria_18_Bg1[321] = { + #include "extracted/data/rooms/crateria/crateria_18_bg1.gfx.inc" +}; const u8 sCrateria_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/crateria/crateria_19.c b/src/data/rooms/crateria/crateria_19.c index 8b25068b8..67c00641c 100644 --- a/src/data/rooms/crateria/crateria_19.c +++ b/src/data/rooms/crateria/crateria_19.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_19_Clipdata[143] = INCBIN_U8("data/rooms/crateria/crateria_19_clipdata.gfx"); +const u8 sCrateria_19_Clipdata[143] = { + #include "extracted/data/rooms/crateria/crateria_19_clipdata.gfx.inc" +}; -const u8 sCrateria_19_Bg2[40] = INCBIN_U8("data/rooms/crateria/crateria_19_bg2.gfx"); +const u8 sCrateria_19_Bg2[40] = { + #include "extracted/data/rooms/crateria/crateria_19_bg2.gfx.inc" +}; -const u8 sCrateria_19_Bg1[300] = INCBIN_U8("data/rooms/crateria/crateria_19_bg1.gfx"); +const u8 sCrateria_19_Bg1[300] = { + #include "extracted/data/rooms/crateria/crateria_19_bg1.gfx.inc" +}; const u8 sCrateria_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_2.c b/src/data/rooms/crateria/crateria_2.c index ff0d46ba2..7be94123e 100644 --- a/src/data/rooms/crateria/crateria_2.c +++ b/src/data/rooms/crateria/crateria_2.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_2_Clipdata[79] = INCBIN_U8("data/rooms/crateria/crateria_2_clipdata.gfx"); +const u8 sCrateria_2_Clipdata[79] = { + #include "extracted/data/rooms/crateria/crateria_2_clipdata.gfx.inc" +}; -const u8 sCrateria_2_Bg2[96] = INCBIN_U8("data/rooms/crateria/crateria_2_bg2.gfx"); +const u8 sCrateria_2_Bg2[96] = { + #include "extracted/data/rooms/crateria/crateria_2_bg2.gfx.inc" +}; -const u8 sCrateria_2_Bg1[193] = INCBIN_U8("data/rooms/crateria/crateria_2_bg1.gfx"); +const u8 sCrateria_2_Bg1[193] = { + #include "extracted/data/rooms/crateria/crateria_2_bg1.gfx.inc" +}; const u8 sCrateria_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_20.c b/src/data/rooms/crateria/crateria_20.c index 68f1abbbc..2f29d0e1d 100644 --- a/src/data/rooms/crateria/crateria_20.c +++ b/src/data/rooms/crateria/crateria_20.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_20_Clipdata[75] = INCBIN_U8("data/rooms/crateria/crateria_20_clipdata.gfx"); +const u8 sCrateria_20_Clipdata[75] = { + #include "extracted/data/rooms/crateria/crateria_20_clipdata.gfx.inc" +}; -const u8 sCrateria_20_Bg2[190] = INCBIN_U8("data/rooms/crateria/crateria_20_bg2.gfx"); +const u8 sCrateria_20_Bg2[190] = { + #include "extracted/data/rooms/crateria/crateria_20_bg2.gfx.inc" +}; -const u8 sCrateria_20_Bg1[290] = INCBIN_U8("data/rooms/crateria/crateria_20_bg1.gfx"); +const u8 sCrateria_20_Bg1[290] = { + #include "extracted/data/rooms/crateria/crateria_20_bg1.gfx.inc" +}; const u8 sCrateria_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_21.c b/src/data/rooms/crateria/crateria_21.c index 7db9b7dad..f50738736 100644 --- a/src/data/rooms/crateria/crateria_21.c +++ b/src/data/rooms/crateria/crateria_21.c @@ -27,11 +27,17 @@ const u8 sCrateria_10_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_21_Clipdata[676] = INCBIN_U8("data/rooms/crateria/crateria_21_clipdata.gfx"); +const u8 sCrateria_21_Clipdata[676] = { + #include "extracted/data/rooms/crateria/crateria_21_clipdata.gfx.inc" +}; -const u8 sCrateria_21_Bg2[383] = INCBIN_U8("data/rooms/crateria/crateria_21_bg2.gfx"); +const u8 sCrateria_21_Bg2[383] = { + #include "extracted/data/rooms/crateria/crateria_21_bg2.gfx.inc" +}; -const u8 sCrateria_21_Bg1[1614] = INCBIN_U8("data/rooms/crateria/crateria_21_bg1.gfx"); +const u8 sCrateria_21_Bg1[1614] = { + #include "extracted/data/rooms/crateria/crateria_21_bg1.gfx.inc" +}; const u8 sCrateria_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_3.c b/src/data/rooms/crateria/crateria_3.c index 3ae93e2ce..a62d4d9d5 100644 --- a/src/data/rooms/crateria/crateria_3.c +++ b/src/data/rooms/crateria/crateria_3.c @@ -20,11 +20,17 @@ const u8 sCrateria_2_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_3_Clipdata[108] = INCBIN_U8("data/rooms/crateria/crateria_3_clipdata.gfx"); +const u8 sCrateria_3_Clipdata[108] = { + #include "extracted/data/rooms/crateria/crateria_3_clipdata.gfx.inc" +}; -const u8 sCrateria_3_Bg2[184] = INCBIN_U8("data/rooms/crateria/crateria_3_bg2.gfx"); +const u8 sCrateria_3_Bg2[184] = { + #include "extracted/data/rooms/crateria/crateria_3_bg2.gfx.inc" +}; -const u8 sCrateria_3_Bg1[340] = INCBIN_U8("data/rooms/crateria/crateria_3_bg1.gfx"); +const u8 sCrateria_3_Bg1[340] = { + #include "extracted/data/rooms/crateria/crateria_3_bg1.gfx.inc" +}; const u8 sCrateria_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/crateria/crateria_4.c b/src/data/rooms/crateria/crateria_4.c index f3ae87f0c..605931d16 100644 --- a/src/data/rooms/crateria/crateria_4.c +++ b/src/data/rooms/crateria/crateria_4.c @@ -13,11 +13,17 @@ const u8 sCrateria_3_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sCrateria_4_Clipdata[108] = INCBIN_U8("data/rooms/crateria/crateria_4_clipdata.gfx"); +const u8 sCrateria_4_Clipdata[108] = { + #include "extracted/data/rooms/crateria/crateria_4_clipdata.gfx.inc" +}; -const u8 sCrateria_4_Bg2[183] = INCBIN_U8("data/rooms/crateria/crateria_4_bg2.gfx"); +const u8 sCrateria_4_Bg2[183] = { + #include "extracted/data/rooms/crateria/crateria_4_bg2.gfx.inc" +}; -const u8 sCrateria_4_Bg1[321] = INCBIN_U8("data/rooms/crateria/crateria_4_bg1.gfx"); +const u8 sCrateria_4_Bg1[321] = { + #include "extracted/data/rooms/crateria/crateria_4_bg1.gfx.inc" +}; const u8 sCrateria_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 3, 7, SPRITESET_IDX(4), @@ -31,5 +37,7 @@ const u8 sCrateria_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_4_Bg0[15] = INCBIN_U8("data/rooms/crateria/crateria_4_bg0.gfx"); +const u8 sCrateria_4_Bg0[15] = { + #include "extracted/data/rooms/crateria/crateria_4_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_5.c b/src/data/rooms/crateria/crateria_5.c index 18658b6ec..54de94eab 100644 --- a/src/data/rooms/crateria/crateria_5.c +++ b/src/data/rooms/crateria/crateria_5.c @@ -34,15 +34,23 @@ const u8 sCrateria_4_Scrolls[SCROLL_DATA_SIZE(4)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_5_Clipdata[712] = INCBIN_U8("data/rooms/crateria/crateria_5_clipdata.gfx"); +const u8 sCrateria_5_Clipdata[712] = { + #include "extracted/data/rooms/crateria/crateria_5_clipdata.gfx.inc" +}; -const u8 sCrateria_5_Bg2[1338] = INCBIN_U8("data/rooms/crateria/crateria_5_bg2.gfx"); +const u8 sCrateria_5_Bg2[1338] = { + #include "extracted/data/rooms/crateria/crateria_5_bg2.gfx.inc" +}; -const u8 sCrateria_5_Bg1[1429] = INCBIN_U8("data/rooms/crateria/crateria_5_bg1.gfx"); +const u8 sCrateria_5_Bg1[1429] = { + #include "extracted/data/rooms/crateria/crateria_5_bg1.gfx.inc" +}; const u8 sCrateria_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_5_Bg0[80] = INCBIN_U8("data/rooms/crateria/crateria_5_bg0.gfx"); +const u8 sCrateria_5_Bg0[80] = { + #include "extracted/data/rooms/crateria/crateria_5_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_6.c b/src/data/rooms/crateria/crateria_6.c index 4684bfb7e..5a9610bc8 100644 --- a/src/data/rooms/crateria/crateria_6.c +++ b/src/data/rooms/crateria/crateria_6.c @@ -13,11 +13,17 @@ const u8 sCrateria_5_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sCrateria_6_Clipdata[153] = INCBIN_U8("data/rooms/crateria/crateria_6_clipdata.gfx"); +const u8 sCrateria_6_Clipdata[153] = { + #include "extracted/data/rooms/crateria/crateria_6_clipdata.gfx.inc" +}; -const u8 sCrateria_6_Bg2[269] = INCBIN_U8("data/rooms/crateria/crateria_6_bg2.gfx"); +const u8 sCrateria_6_Bg2[269] = { + #include "extracted/data/rooms/crateria/crateria_6_bg2.gfx.inc" +}; -const u8 sCrateria_6_Bg1[403] = INCBIN_U8("data/rooms/crateria/crateria_6_bg1.gfx"); +const u8 sCrateria_6_Bg1[403] = { + #include "extracted/data/rooms/crateria/crateria_6_bg1.gfx.inc" +}; const u8 sCrateria_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 9, SPRITESET_IDX(1), diff --git a/src/data/rooms/crateria/crateria_7.c b/src/data/rooms/crateria/crateria_7.c index 6951fbee7..3daae2018 100644 --- a/src/data/rooms/crateria/crateria_7.c +++ b/src/data/rooms/crateria/crateria_7.c @@ -1,11 +1,17 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_7_Clipdata[538] = INCBIN_U8("data/rooms/crateria/crateria_7_clipdata.gfx"); +const u8 sCrateria_7_Clipdata[538] = { + #include "extracted/data/rooms/crateria/crateria_7_clipdata.gfx.inc" +}; -const u8 sCrateria_7_Bg2[1867] = INCBIN_U8("data/rooms/crateria/crateria_7_bg2.gfx"); +const u8 sCrateria_7_Bg2[1867] = { + #include "extracted/data/rooms/crateria/crateria_7_bg2.gfx.inc" +}; -const u8 sCrateria_7_Bg1[1592] = INCBIN_U8("data/rooms/crateria/crateria_7_bg1.gfx"); +const u8 sCrateria_7_Bg1[1592] = { + #include "extracted/data/rooms/crateria/crateria_7_bg1.gfx.inc" +}; const u8 sCrateria_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(20)] = { 3, 65, SPRITESET_IDX(1), diff --git a/src/data/rooms/crateria/crateria_8.c b/src/data/rooms/crateria/crateria_8.c index 16d6748c3..f81081d91 100644 --- a/src/data/rooms/crateria/crateria_8.c +++ b/src/data/rooms/crateria/crateria_8.c @@ -1,15 +1,23 @@ #include "data/rooms/crateria_rooms_data.h" #include "macros.h" -const u8 sCrateria_8_Clipdata[230] = INCBIN_U8("data/rooms/crateria/crateria_8_clipdata.gfx"); +const u8 sCrateria_8_Clipdata[230] = { + #include "extracted/data/rooms/crateria/crateria_8_clipdata.gfx.inc" +}; -const u8 sCrateria_8_Bg2[156] = INCBIN_U8("data/rooms/crateria/crateria_8_bg2.gfx"); +const u8 sCrateria_8_Bg2[156] = { + #include "extracted/data/rooms/crateria/crateria_8_bg2.gfx.inc" +}; -const u8 sCrateria_8_Bg1[744] = INCBIN_U8("data/rooms/crateria/crateria_8_bg1.gfx"); +const u8 sCrateria_8_Bg1[744] = { + #include "extracted/data/rooms/crateria/crateria_8_bg1.gfx.inc" +}; const u8 sCrateria_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_8_Bg0[219] = INCBIN_U8("data/rooms/crateria/crateria_8_bg0.gfx"); +const u8 sCrateria_8_Bg0[219] = { + #include "extracted/data/rooms/crateria/crateria_8_bg0.gfx.inc" +}; diff --git a/src/data/rooms/crateria/crateria_9.c b/src/data/rooms/crateria/crateria_9.c index 4b14a5ff2..9ee0e494e 100644 --- a/src/data/rooms/crateria/crateria_9.c +++ b/src/data/rooms/crateria/crateria_9.c @@ -27,16 +27,24 @@ const u8 sCrateria_6_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sCrateria_9_Clipdata[645] = INCBIN_U8("data/rooms/crateria/crateria_9_clipdata.gfx"); +const u8 sCrateria_9_Clipdata[645] = { + #include "extracted/data/rooms/crateria/crateria_9_clipdata.gfx.inc" +}; -const u8 sCrateria_9_Bg2[1347] = INCBIN_U8("data/rooms/crateria/crateria_9_bg2.gfx"); +const u8 sCrateria_9_Bg2[1347] = { + #include "extracted/data/rooms/crateria/crateria_9_bg2.gfx.inc" +}; -const u8 sCrateria_9_Bg1[1539] = INCBIN_U8("data/rooms/crateria/crateria_9_bg1.gfx"); +const u8 sCrateria_9_Bg1[1539] = { + #include "extracted/data/rooms/crateria/crateria_9_bg1.gfx.inc" +}; const u8 sCrateria_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 35, 21, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sCrateria_9_Bg0[293] = INCBIN_U8("data/rooms/crateria/crateria_9_bg0.gfx"); +const u8 sCrateria_9_Bg0[293] = { + #include "extracted/data/rooms/crateria/crateria_9_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/bg3.c b/src/data/rooms/kraid/bg3.c index dfd2d998f..9bbd75428 100644 --- a/src/data/rooms/kraid/bg3.c +++ b/src/data/rooms/kraid/bg3.c @@ -1,14 +1,26 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_Bg3_0[1572] = INCBIN_U8("data/rooms/kraid/kraid_bg3_0.gfx"); +const u8 sKraid_Bg3_0[1572] = { + #include "extracted/data/rooms/kraid/kraid_bg3_0.gfx.inc" +}; -const u8 sKraid_Bg3_1[532] = INCBIN_U8("data/rooms/kraid/kraid_bg3_1.gfx"); +const u8 sKraid_Bg3_1[532] = { + #include "extracted/data/rooms/kraid/kraid_bg3_1.gfx.inc" +}; -const u8 sKraid_Bg3_2[1080] = INCBIN_U8("data/rooms/kraid/kraid_bg3_2.gfx"); +const u8 sKraid_Bg3_2[1080] = { + #include "extracted/data/rooms/kraid/kraid_bg3_2.gfx.inc" +}; -const u8 sKraid_Bg3_3[1332] = INCBIN_U8("data/rooms/kraid/kraid_bg3_3.gfx"); +const u8 sKraid_Bg3_3[1332] = { + #include "extracted/data/rooms/kraid/kraid_bg3_3.gfx.inc" +}; -const u8 sKraid_Bg3_4[1268] = INCBIN_U8("data/rooms/kraid/kraid_bg3_4.gfx"); +const u8 sKraid_Bg3_4[1268] = { + #include "extracted/data/rooms/kraid/kraid_bg3_4.gfx.inc" +}; -const u8 sKraid_5_Bg0[540] = INCBIN_U8("data/rooms/kraid/kraid_5_bg0.gfx"); +const u8 sKraid_5_Bg0[540] = { + #include "extracted/data/rooms/kraid/kraid_5_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_0.c b/src/data/rooms/kraid/kraid_0.c index 45240e217..d4630f366 100644 --- a/src/data/rooms/kraid/kraid_0.c +++ b/src/data/rooms/kraid/kraid_0.c @@ -13,11 +13,17 @@ const u8 sKraid_0_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sKraid_0_Clipdata[525] = INCBIN_U8("data/rooms/kraid/kraid_0_clipdata.gfx"); +const u8 sKraid_0_Clipdata[525] = { + #include "extracted/data/rooms/kraid/kraid_0_clipdata.gfx.inc" +}; -const u8 sKraid_0_Bg2[675] = INCBIN_U8("data/rooms/kraid/kraid_0_bg2.gfx"); +const u8 sKraid_0_Bg2[675] = { + #include "extracted/data/rooms/kraid/kraid_0_bg2.gfx.inc" +}; -const u8 sKraid_0_Bg1[1122] = INCBIN_U8("data/rooms/kraid/kraid_0_bg1.gfx"); +const u8 sKraid_0_Bg1[1122] = { + #include "extracted/data/rooms/kraid/kraid_0_bg1.gfx.inc" +}; const u8 sKraid_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 17, 9, SPRITESET_IDX(2), diff --git a/src/data/rooms/kraid/kraid_1.c b/src/data/rooms/kraid/kraid_1.c index cf438a170..fbf9cbba1 100644 --- a/src/data/rooms/kraid/kraid_1.c +++ b/src/data/rooms/kraid/kraid_1.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_1_Clipdata[279] = INCBIN_U8("data/rooms/kraid/kraid_1_clipdata.gfx"); +const u8 sKraid_1_Clipdata[279] = { + #include "extracted/data/rooms/kraid/kraid_1_clipdata.gfx.inc" +}; -const u8 sKraid_1_Bg2[149] = INCBIN_U8("data/rooms/kraid/kraid_1_bg2.gfx"); +const u8 sKraid_1_Bg2[149] = { + #include "extracted/data/rooms/kraid/kraid_1_bg2.gfx.inc" +}; const u8 sKraid_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 47, SPRITESET_IDX(0), @@ -13,7 +17,9 @@ const u8 sKraid_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_1_Bg1[670] = INCBIN_U8("data/rooms/kraid/kraid_1_bg1.gfx"); +const u8 sKraid_1_Bg1[670] = { + #include "extracted/data/rooms/kraid/kraid_1_bg1.gfx.inc" +}; const u8 sKraid_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 5, 66, SPRITESET_IDX(0), @@ -24,7 +30,9 @@ const u8 sKraid_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_1_Bg0[121] = INCBIN_U8("data/rooms/kraid/kraid_1_bg0.gfx"); +const u8 sKraid_1_Bg0[121] = { + #include "extracted/data/rooms/kraid/kraid_1_bg0.gfx.inc" +}; const u8 sKraid_1_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Room @@ -39,9 +47,13 @@ const u8 sKraid_1_Scrolls[SCROLL_DATA_SIZE(1)] = { }; -const u8 sKraid_2_Clipdata[555] = INCBIN_U8("data/rooms/kraid/kraid_2_clipdata.gfx"); +const u8 sKraid_2_Clipdata[555] = { + #include "extracted/data/rooms/kraid/kraid_2_clipdata.gfx.inc" +}; -const u8 sKraid_2_Bg2[665] = INCBIN_U8("data/rooms/kraid/kraid_2_bg2.gfx"); +const u8 sKraid_2_Bg2[665] = { + #include "extracted/data/rooms/kraid/kraid_2_bg2.gfx.inc" +}; const u8 sKraid_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 15, 14, SPRITESET_IDX(4), @@ -61,7 +73,9 @@ const u8 sKraid_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_2_Bg1[1100] = INCBIN_U8("data/rooms/kraid/kraid_2_bg1.gfx"); +const u8 sKraid_2_Bg1[1100] = { + #include "extracted/data/rooms/kraid/kraid_2_bg1.gfx.inc" +}; const u8 sKraid_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 15, 14, SPRITESET_IDX(0), @@ -81,5 +95,7 @@ const u8 sKraid_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_2_Bg0[80] = INCBIN_U8("data/rooms/kraid/kraid_2_bg0.gfx"); +const u8 sKraid_2_Bg0[80] = { + #include "extracted/data/rooms/kraid/kraid_2_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_10.c b/src/data/rooms/kraid/kraid_10.c index bb2eee337..a6717ecff 100644 --- a/src/data/rooms/kraid/kraid_10.c +++ b/src/data/rooms/kraid/kraid_10.c @@ -13,11 +13,17 @@ const u8 sKraid_5_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_10_Clipdata[165] = INCBIN_U8("data/rooms/kraid/kraid_10_clipdata.gfx"); +const u8 sKraid_10_Clipdata[165] = { + #include "extracted/data/rooms/kraid/kraid_10_clipdata.gfx.inc" +}; -const u8 sKraid_10_Bg2[113] = INCBIN_U8("data/rooms/kraid/kraid_10_bg2.gfx"); +const u8 sKraid_10_Bg2[113] = { + #include "extracted/data/rooms/kraid/kraid_10_bg2.gfx.inc" +}; -const u8 sKraid_10_Bg1[413] = INCBIN_U8("data/rooms/kraid/kraid_10_bg1.gfx"); +const u8 sKraid_10_Bg1[413] = { + #include "extracted/data/rooms/kraid/kraid_10_bg1.gfx.inc" +}; const u8 sKraid_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 3, 25, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_11.c b/src/data/rooms/kraid/kraid_11.c index 7d4dd384f..6c7c5aed4 100644 --- a/src/data/rooms/kraid/kraid_11.c +++ b/src/data/rooms/kraid/kraid_11.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_11_Clipdata[76] = INCBIN_U8("data/rooms/kraid/kraid_11_clipdata.gfx"); +const u8 sKraid_11_Clipdata[76] = { + #include "extracted/data/rooms/kraid/kraid_11_clipdata.gfx.inc" +}; -const u8 sKraid_11_Bg2[92] = INCBIN_U8("data/rooms/kraid/kraid_11_bg2.gfx"); +const u8 sKraid_11_Bg2[92] = { + #include "extracted/data/rooms/kraid/kraid_11_bg2.gfx.inc" +}; -const u8 sKraid_11_Bg1[286] = INCBIN_U8("data/rooms/kraid/kraid_11_bg1.gfx"); +const u8 sKraid_11_Bg1[286] = { + #include "extracted/data/rooms/kraid/kraid_11_bg1.gfx.inc" +}; const u8 sKraid_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 3, 24, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_12.c b/src/data/rooms/kraid/kraid_12.c index dc3cc2fb7..c3df537aa 100644 --- a/src/data/rooms/kraid/kraid_12.c +++ b/src/data/rooms/kraid/kraid_12.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_12_Clipdata[117] = INCBIN_U8("data/rooms/kraid/kraid_12_clipdata.gfx"); +const u8 sKraid_12_Clipdata[117] = { + #include "extracted/data/rooms/kraid/kraid_12_clipdata.gfx.inc" +}; -const u8 sKraid_12_Bg2[73] = INCBIN_U8("data/rooms/kraid/kraid_12_bg2.gfx"); +const u8 sKraid_12_Bg2[73] = { + #include "extracted/data/rooms/kraid/kraid_12_bg2.gfx.inc" +}; const u8 sKraid_12_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 3, 86, SPRITESET_IDX(1), @@ -21,7 +25,9 @@ const u8 sKraid_12_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_12_Bg1[345] = INCBIN_U8("data/rooms/kraid/kraid_12_bg1.gfx"); +const u8 sKraid_12_Bg1[345] = { + #include "extracted/data/rooms/kraid/kraid_12_bg1.gfx.inc" +}; const u8 sKraid_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 3, 86, SPRITESET_IDX(1), @@ -33,5 +39,7 @@ const u8 sKraid_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_12_Bg0[205] = INCBIN_U8("data/rooms/kraid/kraid_12_bg0.gfx"); +const u8 sKraid_12_Bg0[205] = { + #include "extracted/data/rooms/kraid/kraid_12_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_13.c b/src/data/rooms/kraid/kraid_13.c index d02bf13c4..9bf759fff 100644 --- a/src/data/rooms/kraid/kraid_13.c +++ b/src/data/rooms/kraid/kraid_13.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_13_Clipdata[284] = INCBIN_U8("data/rooms/kraid/kraid_13_clipdata.gfx"); +const u8 sKraid_13_Clipdata[284] = { + #include "extracted/data/rooms/kraid/kraid_13_clipdata.gfx.inc" +}; -const u8 sKraid_13_Bg2[308] = INCBIN_U8("data/rooms/kraid/kraid_13_bg2.gfx"); +const u8 sKraid_13_Bg2[308] = { + #include "extracted/data/rooms/kraid/kraid_13_bg2.gfx.inc" +}; const u8 sKraid_13_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 4, 6, SPRITESET_IDX(4), @@ -24,7 +28,9 @@ const u8 sKraid_13_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_13_Bg1[562] = INCBIN_U8("data/rooms/kraid/kraid_13_bg1.gfx"); +const u8 sKraid_13_Bg1[562] = { + #include "extracted/data/rooms/kraid/kraid_13_bg1.gfx.inc" +}; const u8 sKraid_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 4, 6, SPRITESET_IDX(0), @@ -45,5 +51,7 @@ const u8 sKraid_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_13_Bg0[42] = INCBIN_U8("data/rooms/kraid/kraid_13_bg0.gfx"); +const u8 sKraid_13_Bg0[42] = { + #include "extracted/data/rooms/kraid/kraid_13_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_14.c b/src/data/rooms/kraid/kraid_14.c index f9430d5f8..e186cddb3 100644 --- a/src/data/rooms/kraid/kraid_14.c +++ b/src/data/rooms/kraid/kraid_14.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_14_Clipdata[118] = INCBIN_U8("data/rooms/kraid/kraid_14_clipdata.gfx"); +const u8 sKraid_14_Clipdata[118] = { + #include "extracted/data/rooms/kraid/kraid_14_clipdata.gfx.inc" +}; -const u8 sKraid_14_Bg2[46] = INCBIN_U8("data/rooms/kraid/kraid_14_bg2.gfx"); +const u8 sKraid_14_Bg2[46] = { + #include "extracted/data/rooms/kraid/kraid_14_bg2.gfx.inc" +}; -const u8 sKraid_14_Bg1[217] = INCBIN_U8("data/rooms/kraid/kraid_14_bg1.gfx"); +const u8 sKraid_14_Bg1[217] = { + #include "extracted/data/rooms/kraid/kraid_14_bg1.gfx.inc" +}; const u8 sKraid_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 3, 5, SPRITESET_IDX(1), diff --git a/src/data/rooms/kraid/kraid_15.c b/src/data/rooms/kraid/kraid_15.c index 0eb256546..c6d54d5fa 100644 --- a/src/data/rooms/kraid/kraid_15.c +++ b/src/data/rooms/kraid/kraid_15.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_15_Clipdata[238] = INCBIN_U8("data/rooms/kraid/kraid_15_clipdata.gfx"); +const u8 sKraid_15_Clipdata[238] = { + #include "extracted/data/rooms/kraid/kraid_15_clipdata.gfx.inc" +}; -const u8 sKraid_15_Bg2[98] = INCBIN_U8("data/rooms/kraid/kraid_15_bg2.gfx"); +const u8 sKraid_15_Bg2[98] = { + #include "extracted/data/rooms/kraid/kraid_15_bg2.gfx.inc" +}; const u8 sKraid_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 5, 7, SPRITESET_IDX(4), @@ -11,7 +15,9 @@ const u8 sKraid_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_15_Bg1[387] = INCBIN_U8("data/rooms/kraid/kraid_15_bg1.gfx"); +const u8 sKraid_15_Bg1[387] = { + #include "extracted/data/rooms/kraid/kraid_15_bg1.gfx.inc" +}; const u8 sKraid_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 5, 7, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_16.c b/src/data/rooms/kraid/kraid_16.c index da0c1ad09..b2be7f67b 100644 --- a/src/data/rooms/kraid/kraid_16.c +++ b/src/data/rooms/kraid/kraid_16.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_16_Clipdata[66] = INCBIN_U8("data/rooms/kraid/kraid_16_clipdata.gfx"); +const u8 sKraid_16_Clipdata[66] = { + #include "extracted/data/rooms/kraid/kraid_16_clipdata.gfx.inc" +}; -const u8 sKraid_16_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_16_bg2.gfx"); +const u8 sKraid_16_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_16_bg2.gfx.inc" +}; -const u8 sKraid_16_Bg1[171] = INCBIN_U8("data/rooms/kraid/kraid_16_bg1.gfx"); +const u8 sKraid_16_Bg1[171] = { + #include "extracted/data/rooms/kraid/kraid_16_bg1.gfx.inc" +}; const u8 sKraid_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/kraid/kraid_17.c b/src/data/rooms/kraid/kraid_17.c index d80cdd789..408a38981 100644 --- a/src/data/rooms/kraid/kraid_17.c +++ b/src/data/rooms/kraid/kraid_17.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_17_Clipdata[] = INCBIN_U8("data/rooms/kraid/kraid_17_clipdata.gfx"); +const u8 sKraid_17_Clipdata[] = { + #include "extracted/data/rooms/kraid/kraid_17_clipdata.gfx.inc" +}; -const u8 sKraid_17_Bg2[114] = INCBIN_U8("data/rooms/kraid/kraid_17_bg2.gfx"); +const u8 sKraid_17_Bg2[114] = { + #include "extracted/data/rooms/kraid/kraid_17_bg2.gfx.inc" +}; -const u8 sKraid_17_Bg1[493] = INCBIN_U8("data/rooms/kraid/kraid_17_bg1.gfx"); +const u8 sKraid_17_Bg1[493] = { + #include "extracted/data/rooms/kraid/kraid_17_bg1.gfx.inc" +}; const u8 sKraid_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 7, 9, SPRITESET_IDX(4), @@ -15,5 +21,7 @@ const u8 sKraid_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_17_Bg0[] = INCBIN_U8("data/rooms/kraid/kraid_17_bg0.gfx"); +const u8 sKraid_17_Bg0[] = { + #include "extracted/data/rooms/kraid/kraid_17_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_18.c b/src/data/rooms/kraid/kraid_18.c index 91fc7fe01..e9a7dd64c 100644 --- a/src/data/rooms/kraid/kraid_18.c +++ b/src/data/rooms/kraid/kraid_18.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_18_Clipdata[111] = INCBIN_U8("data/rooms/kraid/kraid_18_clipdata.gfx"); +const u8 sKraid_18_Clipdata[111] = { + #include "extracted/data/rooms/kraid/kraid_18_clipdata.gfx.inc" +}; -const u8 sKraid_18_Bg2[137] = INCBIN_U8("data/rooms/kraid/kraid_18_bg2.gfx"); +const u8 sKraid_18_Bg2[137] = { + #include "extracted/data/rooms/kraid/kraid_18_bg2.gfx.inc" +}; const u8 sKraid_18_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 15, 13, SPRITESET_IDX(4), @@ -12,7 +16,9 @@ const u8 sKraid_18_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_18_Bg1[333] = INCBIN_U8("data/rooms/kraid/kraid_18_bg1.gfx"); +const u8 sKraid_18_Bg1[333] = { + #include "extracted/data/rooms/kraid/kraid_18_bg1.gfx.inc" +}; const u8 sKraid_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 16, 10, SPRITESET_IDX(4), @@ -20,5 +26,7 @@ const u8 sKraid_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_18_Bg0[30] = INCBIN_U8("data/rooms/kraid/kraid_18_bg0.gfx"); +const u8 sKraid_18_Bg0[30] = { + #include "extracted/data/rooms/kraid/kraid_18_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_19.c b/src/data/rooms/kraid/kraid_19.c index 9a7775f9e..df576fd8f 100644 --- a/src/data/rooms/kraid/kraid_19.c +++ b/src/data/rooms/kraid/kraid_19.c @@ -1,15 +1,23 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_19_Clipdata[108] = INCBIN_U8("data/rooms/kraid/kraid_19_clipdata.gfx"); +const u8 sKraid_19_Clipdata[108] = { + #include "extracted/data/rooms/kraid/kraid_19_clipdata.gfx.inc" +}; -const u8 sKraid_19_Bg2[42] = INCBIN_U8("data/rooms/kraid/kraid_19_bg2.gfx"); +const u8 sKraid_19_Bg2[42] = { + #include "extracted/data/rooms/kraid/kraid_19_bg2.gfx.inc" +}; -const u8 sKraid_19_Bg1[164] = INCBIN_U8("data/rooms/kraid/kraid_19_bg1.gfx"); +const u8 sKraid_19_Bg1[164] = { + #include "extracted/data/rooms/kraid/kraid_19_bg1.gfx.inc" +}; const u8 sKraid_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_19_Bg0[35] = INCBIN_U8("data/rooms/kraid/kraid_19_bg0.gfx"); +const u8 sKraid_19_Bg0[35] = { + #include "extracted/data/rooms/kraid/kraid_19_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_20.c b/src/data/rooms/kraid/kraid_20.c index 39f629258..334bfda69 100644 --- a/src/data/rooms/kraid/kraid_20.c +++ b/src/data/rooms/kraid/kraid_20.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_20_Clipdata[74] = INCBIN_U8("data/rooms/kraid/kraid_20_clipdata.gfx"); +const u8 sKraid_20_Clipdata[74] = { + #include "extracted/data/rooms/kraid/kraid_20_clipdata.gfx.inc" +}; -const u8 sKraid_20_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_20_bg2.gfx"); +const u8 sKraid_20_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_20_bg2.gfx.inc" +}; -const u8 sKraid_20_Bg1[210] = INCBIN_U8("data/rooms/kraid/kraid_20_bg1.gfx"); +const u8 sKraid_20_Bg1[210] = { + #include "extracted/data/rooms/kraid/kraid_20_bg1.gfx.inc" +}; const u8 sKraid_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_21.c b/src/data/rooms/kraid/kraid_21.c index 28e765f67..16fefae28 100644 --- a/src/data/rooms/kraid/kraid_21.c +++ b/src/data/rooms/kraid/kraid_21.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_21_Clipdata[360] = INCBIN_U8("data/rooms/kraid/kraid_21_clipdata.gfx"); +const u8 sKraid_21_Clipdata[360] = { + #include "extracted/data/rooms/kraid/kraid_21_clipdata.gfx.inc" +}; -const u8 sKraid_21_Bg1[521] = INCBIN_U8("data/rooms/kraid/kraid_21_bg1.gfx"); +const u8 sKraid_21_Bg1[521] = { + #include "extracted/data/rooms/kraid/kraid_21_bg1.gfx.inc" +}; const u8 sKraid_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 2, 17, SPRITESET_IDX(0), @@ -24,5 +28,7 @@ const u8 sKraid_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_21_Bg0[119] = INCBIN_U8("data/rooms/kraid/kraid_21_bg0.gfx"); +const u8 sKraid_21_Bg0[119] = { + #include "extracted/data/rooms/kraid/kraid_21_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_22.c b/src/data/rooms/kraid/kraid_22.c index 4ba7f1816..9a39ab740 100644 --- a/src/data/rooms/kraid/kraid_22.c +++ b/src/data/rooms/kraid/kraid_22.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_22_Clipdata[86] = INCBIN_U8("data/rooms/kraid/kraid_22_clipdata.gfx"); +const u8 sKraid_22_Clipdata[86] = { + #include "extracted/data/rooms/kraid/kraid_22_clipdata.gfx.inc" +}; -const u8 sKraid_22_Bg2[299] = INCBIN_U8("data/rooms/kraid/kraid_22_bg2.gfx"); +const u8 sKraid_22_Bg2[299] = { + #include "extracted/data/rooms/kraid/kraid_22_bg2.gfx.inc" +}; const u8 sKraid_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 3, 20, SPRITESET_IDX(0), @@ -20,7 +24,9 @@ const u8 sKraid_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_22_Bg1[382] = INCBIN_U8("data/rooms/kraid/kraid_22_bg1.gfx"); +const u8 sKraid_22_Bg1[382] = { + #include "extracted/data/rooms/kraid/kraid_22_bg1.gfx.inc" +}; const u8 sKraid_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 3, 20, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_23.c b/src/data/rooms/kraid/kraid_23.c index 93c58d3df..cf056901c 100644 --- a/src/data/rooms/kraid/kraid_23.c +++ b/src/data/rooms/kraid/kraid_23.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_23_Clipdata[76] = INCBIN_U8("data/rooms/kraid/kraid_23_clipdata.gfx"); +const u8 sKraid_23_Clipdata[76] = { + #include "extracted/data/rooms/kraid/kraid_23_clipdata.gfx.inc" +}; -const u8 sKraid_23_Bg2[63] = INCBIN_U8("data/rooms/kraid/kraid_23_bg2.gfx"); +const u8 sKraid_23_Bg2[63] = { + #include "extracted/data/rooms/kraid/kraid_23_bg2.gfx.inc" +}; -const u8 sKraid_23_Bg1[163] = INCBIN_U8("data/rooms/kraid/kraid_23_bg1.gfx"); +const u8 sKraid_23_Bg1[163] = { + #include "extracted/data/rooms/kraid/kraid_23_bg1.gfx.inc" +}; const u8 sKraid_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/kraid/kraid_24.c b/src/data/rooms/kraid/kraid_24.c index 8d5e21708..d24fc8ccf 100644 --- a/src/data/rooms/kraid/kraid_24.c +++ b/src/data/rooms/kraid/kraid_24.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_24_Clipdata[52] = INCBIN_U8("data/rooms/kraid/kraid_24_clipdata.gfx"); +const u8 sKraid_24_Clipdata[52] = { + #include "extracted/data/rooms/kraid/kraid_24_clipdata.gfx.inc" +}; -const u8 sKraid_24_Bg2[45] = INCBIN_U8("data/rooms/kraid/kraid_24_bg2.gfx"); +const u8 sKraid_24_Bg2[45] = { + #include "extracted/data/rooms/kraid/kraid_24_bg2.gfx.inc" +}; -const u8 sKraid_24_Bg1[135] = INCBIN_U8("data/rooms/kraid/kraid_24_bg1.gfx"); +const u8 sKraid_24_Bg1[135] = { + #include "extracted/data/rooms/kraid/kraid_24_bg1.gfx.inc" +}; const u8 sKraid_24_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/kraid/kraid_25.c b/src/data/rooms/kraid/kraid_25.c index 438b774c4..3ac6a16d2 100644 --- a/src/data/rooms/kraid/kraid_25.c +++ b/src/data/rooms/kraid/kraid_25.c @@ -20,9 +20,13 @@ const u8 sKraid_6_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_25_Clipdata[195] = INCBIN_U8("data/rooms/kraid/kraid_25_clipdata.gfx"); +const u8 sKraid_25_Clipdata[195] = { + #include "extracted/data/rooms/kraid/kraid_25_clipdata.gfx.inc" +}; -const u8 sKraid_25_Bg2[229] = INCBIN_U8("data/rooms/kraid/kraid_25_bg2.gfx"); +const u8 sKraid_25_Bg2[229] = { + #include "extracted/data/rooms/kraid/kraid_25_bg2.gfx.inc" +}; const u8 sKraid_25_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 3, 9, SPRITESET_IDX(4), @@ -37,7 +41,9 @@ const u8 sKraid_25_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_25_Bg1[487] = INCBIN_U8("data/rooms/kraid/kraid_25_bg1.gfx"); +const u8 sKraid_25_Bg1[487] = { + #include "extracted/data/rooms/kraid/kraid_25_bg1.gfx.inc" +}; const u8 sKraid_25_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 3, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_26.c b/src/data/rooms/kraid/kraid_26.c index 8429731d3..1fc8403e4 100644 --- a/src/data/rooms/kraid/kraid_26.c +++ b/src/data/rooms/kraid/kraid_26.c @@ -20,9 +20,13 @@ const u8 sKraid_7_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_26_Clipdata[415] = INCBIN_U8("data/rooms/kraid/kraid_26_clipdata.gfx"); +const u8 sKraid_26_Clipdata[415] = { + #include "extracted/data/rooms/kraid/kraid_26_clipdata.gfx.inc" +}; -const u8 sKraid_26_Bg2[545] = INCBIN_U8("data/rooms/kraid/kraid_26_bg2.gfx"); +const u8 sKraid_26_Bg2[545] = { + #include "extracted/data/rooms/kraid/kraid_26_bg2.gfx.inc" +}; const u8 sKraid_26_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 20, 11, SPRITESET_IDX(4), @@ -35,7 +39,9 @@ const u8 sKraid_26_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_26_Bg1[1009] = INCBIN_U8("data/rooms/kraid/kraid_26_bg1.gfx"); +const u8 sKraid_26_Bg1[1009] = { + #include "extracted/data/rooms/kraid/kraid_26_bg1.gfx.inc" +}; const u8 sKraid_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 20, 11, SPRITESET_IDX(0), @@ -47,5 +53,7 @@ const u8 sKraid_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_26_Bg0[712] = INCBIN_U8("data/rooms/kraid/kraid_26_bg0.gfx"); +const u8 sKraid_26_Bg0[712] = { + #include "extracted/data/rooms/kraid/kraid_26_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_27.c b/src/data/rooms/kraid/kraid_27.c index 5a723cd5b..418463579 100644 --- a/src/data/rooms/kraid/kraid_27.c +++ b/src/data/rooms/kraid/kraid_27.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_27_Clipdata[520] = INCBIN_U8("data/rooms/kraid/kraid_27_clipdata.gfx"); +const u8 sKraid_27_Clipdata[520] = { + #include "extracted/data/rooms/kraid/kraid_27_clipdata.gfx.inc" +}; -const u8 sKraid_27_Bg2[258] = INCBIN_U8("data/rooms/kraid/kraid_27_bg2.gfx"); +const u8 sKraid_27_Bg2[258] = { + #include "extracted/data/rooms/kraid/kraid_27_bg2.gfx.inc" +}; const u8 sKraid_27_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 25, 11, SPRITESET_IDX(4), @@ -19,7 +23,9 @@ const u8 sKraid_27_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_27_Bg1[879] = INCBIN_U8("data/rooms/kraid/kraid_27_bg1.gfx"); +const u8 sKraid_27_Bg1[879] = { + #include "extracted/data/rooms/kraid/kraid_27_bg1.gfx.inc" +}; const u8 sKraid_27_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 25, 11, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_28.c b/src/data/rooms/kraid/kraid_28.c index d2ed8d0de..c3ab218e3 100644 --- a/src/data/rooms/kraid/kraid_28.c +++ b/src/data/rooms/kraid/kraid_28.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_28_Clipdata[306] = INCBIN_U8("data/rooms/kraid/kraid_28_clipdata.gfx"); +const u8 sKraid_28_Clipdata[306] = { + #include "extracted/data/rooms/kraid/kraid_28_clipdata.gfx.inc" +}; -const u8 sKraid_28_Bg2[73] = INCBIN_U8("data/rooms/kraid/kraid_28_bg2.gfx"); +const u8 sKraid_28_Bg2[73] = { + #include "extracted/data/rooms/kraid/kraid_28_bg2.gfx.inc" +}; -const u8 sKraid_28_Bg1[838] = INCBIN_U8("data/rooms/kraid/kraid_28_bg1.gfx"); +const u8 sKraid_28_Bg1[838] = { + #include "extracted/data/rooms/kraid/kraid_28_bg1.gfx.inc" +}; const u8 sKraid_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 4, 27, SPRITESET_IDX(4), @@ -25,5 +31,7 @@ const u8 sKraid_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_28_Bg0[62] = INCBIN_U8("data/rooms/kraid/kraid_28_bg0.gfx"); +const u8 sKraid_28_Bg0[62] = { + #include "extracted/data/rooms/kraid/kraid_28_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_29.c b/src/data/rooms/kraid/kraid_29.c index 4a12d7b3c..6720b0de2 100644 --- a/src/data/rooms/kraid/kraid_29.c +++ b/src/data/rooms/kraid/kraid_29.c @@ -20,16 +20,24 @@ const u8 sKraid_8_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_29_Clipdata[61] = INCBIN_U8("data/rooms/kraid/kraid_29_clipdata.gfx"); +const u8 sKraid_29_Clipdata[61] = { + #include "extracted/data/rooms/kraid/kraid_29_clipdata.gfx.inc" +}; -const u8 sKraid_29_Bg2[106] = INCBIN_U8("data/rooms/kraid/kraid_29_bg2.gfx"); +const u8 sKraid_29_Bg2[106] = { + #include "extracted/data/rooms/kraid/kraid_29_bg2.gfx.inc" +}; -const u8 sKraid_29_Bg1[209] = INCBIN_U8("data/rooms/kraid/kraid_29_bg1.gfx"); +const u8 sKraid_29_Bg1[209] = { + #include "extracted/data/rooms/kraid/kraid_29_bg1.gfx.inc" +}; const u8 sKraid_29_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 8, 3, SPRITESET_IDX(7), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_29_Bg0[80] = INCBIN_U8("data/rooms/kraid/kraid_29_bg0.gfx"); +const u8 sKraid_29_Bg0[80] = { + #include "extracted/data/rooms/kraid/kraid_29_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_3.c b/src/data/rooms/kraid/kraid_3.c index 1f9f75eb2..6985759a9 100644 --- a/src/data/rooms/kraid/kraid_3.c +++ b/src/data/rooms/kraid/kraid_3.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_3_Clipdata[138] = INCBIN_U8("data/rooms/kraid/kraid_3_clipdata.gfx"); +const u8 sKraid_3_Clipdata[138] = { + #include "extracted/data/rooms/kraid/kraid_3_clipdata.gfx.inc" +}; -const u8 sKraid_3_Bg2[72] = INCBIN_U8("data/rooms/kraid/kraid_3_bg2.gfx"); +const u8 sKraid_3_Bg2[72] = { + #include "extracted/data/rooms/kraid/kraid_3_bg2.gfx.inc" +}; const u8 sKraid_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 2, 34, SPRITESET_IDX(1), @@ -12,7 +16,9 @@ const u8 sKraid_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_3_Bg1[410] = INCBIN_U8("data/rooms/kraid/kraid_3_bg1.gfx"); +const u8 sKraid_3_Bg1[410] = { + #include "extracted/data/rooms/kraid/kraid_3_bg1.gfx.inc" +}; const u8 sKraid_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 2, 34, SPRITESET_IDX(1), @@ -22,5 +28,7 @@ const u8 sKraid_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_3_Bg0[89] = INCBIN_U8("data/rooms/kraid/kraid_3_bg0.gfx"); +const u8 sKraid_3_Bg0[89] = { + #include "extracted/data/rooms/kraid/kraid_3_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_30.c b/src/data/rooms/kraid/kraid_30.c index 346c8e0ef..ffc93b9fd 100644 --- a/src/data/rooms/kraid/kraid_30.c +++ b/src/data/rooms/kraid/kraid_30.c @@ -13,11 +13,17 @@ const u8 sKraid_9_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_30_Clipdata[127] = INCBIN_U8("data/rooms/kraid/kraid_30_clipdata.gfx"); +const u8 sKraid_30_Clipdata[127] = { + #include "extracted/data/rooms/kraid/kraid_30_clipdata.gfx.inc" +}; -const u8 sKraid_30_Bg2[245] = INCBIN_U8("data/rooms/kraid/kraid_30_bg2.gfx"); +const u8 sKraid_30_Bg2[245] = { + #include "extracted/data/rooms/kraid/kraid_30_bg2.gfx.inc" +}; -const u8 sKraid_30_Bg1[468] = INCBIN_U8("data/rooms/kraid/kraid_30_bg1.gfx"); +const u8 sKraid_30_Bg1[468] = { + #include "extracted/data/rooms/kraid/kraid_30_bg1.gfx.inc" +}; const u8 sKraid_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 32, 17, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_31.c b/src/data/rooms/kraid/kraid_31.c index c5d872a70..b437841a6 100644 --- a/src/data/rooms/kraid/kraid_31.c +++ b/src/data/rooms/kraid/kraid_31.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_31_Clipdata[67] = INCBIN_U8("data/rooms/kraid/kraid_31_clipdata.gfx"); +const u8 sKraid_31_Clipdata[67] = { + #include "extracted/data/rooms/kraid/kraid_31_clipdata.gfx.inc" +}; -const u8 sKraid_31_Bg2[18] = INCBIN_U8("data/rooms/kraid/kraid_31_bg2.gfx"); +const u8 sKraid_31_Bg2[18] = { + #include "extracted/data/rooms/kraid/kraid_31_bg2.gfx.inc" +}; -const u8 sKraid_31_Bg1[208] = INCBIN_U8("data/rooms/kraid/kraid_31_bg1.gfx"); +const u8 sKraid_31_Bg1[208] = { + #include "extracted/data/rooms/kraid/kraid_31_bg1.gfx.inc" +}; const u8 sKraid_31_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_32.c b/src/data/rooms/kraid/kraid_32.c index 17b90b9fd..4c5789684 100644 --- a/src/data/rooms/kraid/kraid_32.c +++ b/src/data/rooms/kraid/kraid_32.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_32_Clipdata[70] = INCBIN_U8("data/rooms/kraid/kraid_32_clipdata.gfx"); +const u8 sKraid_32_Clipdata[70] = { + #include "extracted/data/rooms/kraid/kraid_32_clipdata.gfx.inc" +}; -const u8 sKraid_32_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_32_bg2.gfx"); +const u8 sKraid_32_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_32_bg2.gfx.inc" +}; -const u8 sKraid_32_Bg1[211] = INCBIN_U8("data/rooms/kraid/kraid_32_bg1.gfx"); +const u8 sKraid_32_Bg1[211] = { + #include "extracted/data/rooms/kraid/kraid_32_bg1.gfx.inc" +}; const u8 sKraid_32_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_33.c b/src/data/rooms/kraid/kraid_33.c index 15ed18c6f..46478d867 100644 --- a/src/data/rooms/kraid/kraid_33.c +++ b/src/data/rooms/kraid/kraid_33.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_33_Clipdata[71] = INCBIN_U8("data/rooms/kraid/kraid_33_clipdata.gfx"); +const u8 sKraid_33_Clipdata[71] = { + #include "extracted/data/rooms/kraid/kraid_33_clipdata.gfx.inc" +}; -const u8 sKraid_33_Bg2[29] = INCBIN_U8("data/rooms/kraid/kraid_33_bg2.gfx"); +const u8 sKraid_33_Bg2[29] = { + #include "extracted/data/rooms/kraid/kraid_33_bg2.gfx.inc" +}; -const u8 sKraid_33_Bg1[181] = INCBIN_U8("data/rooms/kraid/kraid_33_bg1.gfx"); +const u8 sKraid_33_Bg1[181] = { + #include "extracted/data/rooms/kraid/kraid_33_bg1.gfx.inc" +}; const u8 sKraid_33_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 7, 14, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_34.c b/src/data/rooms/kraid/kraid_34.c index e2bc0cb88..9646be2b1 100644 --- a/src/data/rooms/kraid/kraid_34.c +++ b/src/data/rooms/kraid/kraid_34.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_34_Clipdata[55] = INCBIN_U8("data/rooms/kraid/kraid_34_clipdata.gfx"); +const u8 sKraid_34_Clipdata[55] = { + #include "extracted/data/rooms/kraid/kraid_34_clipdata.gfx.inc" +}; -const u8 sKraid_34_Bg2[147] = INCBIN_U8("data/rooms/kraid/kraid_34_bg2.gfx"); +const u8 sKraid_34_Bg2[147] = { + #include "extracted/data/rooms/kraid/kraid_34_bg2.gfx.inc" +}; -const u8 sKraid_34_Bg1[144] = INCBIN_U8("data/rooms/kraid/kraid_34_bg1.gfx"); +const u8 sKraid_34_Bg1[144] = { + #include "extracted/data/rooms/kraid/kraid_34_bg1.gfx.inc" +}; const u8 sKraid_34_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 5, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_35.c b/src/data/rooms/kraid/kraid_35.c index bd8082b1b..272eda82f 100644 --- a/src/data/rooms/kraid/kraid_35.c +++ b/src/data/rooms/kraid/kraid_35.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_35_Clipdata[56] = INCBIN_U8("data/rooms/kraid/kraid_35_clipdata.gfx"); +const u8 sKraid_35_Clipdata[56] = { + #include "extracted/data/rooms/kraid/kraid_35_clipdata.gfx.inc" +}; -const u8 sKraid_35_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_35_bg2.gfx"); +const u8 sKraid_35_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_35_bg2.gfx.inc" +}; -const u8 sKraid_35_Bg1[193] = INCBIN_U8("data/rooms/kraid/kraid_35_bg1.gfx"); +const u8 sKraid_35_Bg1[193] = { + #include "extracted/data/rooms/kraid/kraid_35_bg1.gfx.inc" +}; const u8 sKraid_35_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 6, 5, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_36.c b/src/data/rooms/kraid/kraid_36.c index a5f07d2ab..387e4d238 100644 --- a/src/data/rooms/kraid/kraid_36.c +++ b/src/data/rooms/kraid/kraid_36.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_36_Clipdata[69] = INCBIN_U8("data/rooms/kraid/kraid_36_clipdata.gfx"); +const u8 sKraid_36_Clipdata[69] = { + #include "extracted/data/rooms/kraid/kraid_36_clipdata.gfx.inc" +}; -const u8 sKraid_36_Bg2[26] = INCBIN_U8("data/rooms/kraid/kraid_36_bg2.gfx"); +const u8 sKraid_36_Bg2[26] = { + #include "extracted/data/rooms/kraid/kraid_36_bg2.gfx.inc" +}; -const u8 sKraid_36_Bg1[224] = INCBIN_U8("data/rooms/kraid/kraid_36_bg1.gfx"); +const u8 sKraid_36_Bg1[224] = { + #include "extracted/data/rooms/kraid/kraid_36_bg1.gfx.inc" +}; const u8 sKraid_36_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 10, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_37.c b/src/data/rooms/kraid/kraid_37.c index 1e1ac1828..6b67369ba 100644 --- a/src/data/rooms/kraid/kraid_37.c +++ b/src/data/rooms/kraid/kraid_37.c @@ -20,11 +20,17 @@ const u8 sKraid_10_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_37_Clipdata[130] = INCBIN_U8("data/rooms/kraid/kraid_37_clipdata.gfx"); +const u8 sKraid_37_Clipdata[130] = { + #include "extracted/data/rooms/kraid/kraid_37_clipdata.gfx.inc" +}; -const u8 sKraid_37_Bg2[45] = INCBIN_U8("data/rooms/kraid/kraid_37_bg2.gfx"); +const u8 sKraid_37_Bg2[45] = { + #include "extracted/data/rooms/kraid/kraid_37_bg2.gfx.inc" +}; -const u8 sKraid_37_Bg1[447] = INCBIN_U8("data/rooms/kraid/kraid_37_bg1.gfx"); +const u8 sKraid_37_Bg1[447] = { + #include "extracted/data/rooms/kraid/kraid_37_bg1.gfx.inc" +}; const u8 sKraid_37_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/kraid/kraid_38.c b/src/data/rooms/kraid/kraid_38.c index 8f4f09157..97d19483b 100644 --- a/src/data/rooms/kraid/kraid_38.c +++ b/src/data/rooms/kraid/kraid_38.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_38_Clipdata[83] = INCBIN_U8("data/rooms/kraid/kraid_38_clipdata.gfx"); +const u8 sKraid_38_Clipdata[83] = { + #include "extracted/data/rooms/kraid/kraid_38_clipdata.gfx.inc" +}; -const u8 sKraid_38_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_38_bg2.gfx"); +const u8 sKraid_38_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_38_bg2.gfx.inc" +}; const u8 sKraid_38_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 5, 4, SPRITESET_IDX(4), @@ -13,7 +17,9 @@ const u8 sKraid_38_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_38_Bg1[185] = INCBIN_U8("data/rooms/kraid/kraid_38_bg1.gfx"); +const u8 sKraid_38_Bg1[185] = { + #include "extracted/data/rooms/kraid/kraid_38_bg1.gfx.inc" +}; const u8 sKraid_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 6, 6, SPRITESET_IDX(0), @@ -22,5 +28,7 @@ const u8 sKraid_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_38_Bg0[59] = INCBIN_U8("data/rooms/kraid/kraid_38_bg0.gfx"); +const u8 sKraid_38_Bg0[59] = { + #include "extracted/data/rooms/kraid/kraid_38_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_39.c b/src/data/rooms/kraid/kraid_39.c index 16cf35fb5..8cdb05d87 100644 --- a/src/data/rooms/kraid/kraid_39.c +++ b/src/data/rooms/kraid/kraid_39.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_39_Clipdata[78] = INCBIN_U8("data/rooms/kraid/kraid_39_clipdata.gfx"); +const u8 sKraid_39_Clipdata[78] = { + #include "extracted/data/rooms/kraid/kraid_39_clipdata.gfx.inc" +}; -const u8 sKraid_39_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_39_bg2.gfx"); +const u8 sKraid_39_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_39_bg2.gfx.inc" +}; -const u8 sKraid_39_Bg1[216] = INCBIN_U8("data/rooms/kraid/kraid_39_bg1.gfx"); +const u8 sKraid_39_Bg1[216] = { + #include "extracted/data/rooms/kraid/kraid_39_bg1.gfx.inc" +}; const u8 sKraid_39_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/kraid/kraid_4.c b/src/data/rooms/kraid/kraid_4.c index 5fba8a866..7b2a68e49 100644 --- a/src/data/rooms/kraid/kraid_4.c +++ b/src/data/rooms/kraid/kraid_4.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_4_Clipdata[119] = INCBIN_U8("data/rooms/kraid/kraid_4_clipdata.gfx"); +const u8 sKraid_4_Clipdata[119] = { + #include "extracted/data/rooms/kraid/kraid_4_clipdata.gfx.inc" +}; -const u8 sKraid_4_Bg2[36] = INCBIN_U8("data/rooms/kraid/kraid_4_bg2.gfx"); +const u8 sKraid_4_Bg2[36] = { + #include "extracted/data/rooms/kraid/kraid_4_bg2.gfx.inc" +}; -const u8 sKraid_4_Bg1[253] = INCBIN_U8("data/rooms/kraid/kraid_4_bg1.gfx"); +const u8 sKraid_4_Bg1[253] = { + #include "extracted/data/rooms/kraid/kraid_4_bg1.gfx.inc" +}; const u8 sKraid_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 3, 27, SPRITESET_IDX(1), @@ -16,5 +22,7 @@ const u8 sKraid_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_4_Bg0[62] = INCBIN_U8("data/rooms/kraid/kraid_4_bg0.gfx"); +const u8 sKraid_4_Bg0[62] = { + #include "extracted/data/rooms/kraid/kraid_4_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_40.c b/src/data/rooms/kraid/kraid_40.c index a67d7b397..caba6accd 100644 --- a/src/data/rooms/kraid/kraid_40.c +++ b/src/data/rooms/kraid/kraid_40.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_40_Clipdata[64] = INCBIN_U8("data/rooms/kraid/kraid_40_clipdata.gfx"); +const u8 sKraid_40_Clipdata[64] = { + #include "extracted/data/rooms/kraid/kraid_40_clipdata.gfx.inc" +}; -const u8 sKraid_40_Bg2[62] = INCBIN_U8("data/rooms/kraid/kraid_40_bg2.gfx"); +const u8 sKraid_40_Bg2[62] = { + #include "extracted/data/rooms/kraid/kraid_40_bg2.gfx.inc" +}; -const u8 sKraid_40_Bg1[151] = INCBIN_U8("data/rooms/kraid/kraid_40_bg1.gfx"); +const u8 sKraid_40_Bg1[151] = { + #include "extracted/data/rooms/kraid/kraid_40_bg1.gfx.inc" +}; const u8 sKraid_40_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/kraid/kraid_41.c b/src/data/rooms/kraid/kraid_41.c index 95543fc39..fbd98aa9e 100644 --- a/src/data/rooms/kraid/kraid_41.c +++ b/src/data/rooms/kraid/kraid_41.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_41_Clipdata[36] = INCBIN_U8("data/rooms/kraid/kraid_41_clipdata.gfx"); +const u8 sKraid_41_Clipdata[36] = { + #include "extracted/data/rooms/kraid/kraid_41_clipdata.gfx.inc" +}; -const u8 sKraid_41_Bg2[23] = INCBIN_U8("data/rooms/kraid/kraid_41_bg2.gfx"); +const u8 sKraid_41_Bg2[23] = { + #include "extracted/data/rooms/kraid/kraid_41_bg2.gfx.inc" +}; -const u8 sKraid_41_Bg1[124] = INCBIN_U8("data/rooms/kraid/kraid_41_bg1.gfx"); +const u8 sKraid_41_Bg1[124] = { + #include "extracted/data/rooms/kraid/kraid_41_bg1.gfx.inc" +}; const u8 sKraid_41_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/kraid/kraid_5.c b/src/data/rooms/kraid/kraid_5.c index 186c3766a..274d07f73 100644 --- a/src/data/rooms/kraid/kraid_5.c +++ b/src/data/rooms/kraid/kraid_5.c @@ -13,9 +13,13 @@ const u8 sKraid_2_Scrolls[SCROLL_DATA_SIZE(1)] = { 21, // Breakable block Y bound extension }; -const u8 sKraid_5_Clipdata[233] = INCBIN_U8("data/rooms/kraid/kraid_5_clipdata.gfx"); +const u8 sKraid_5_Clipdata[233] = { + #include "extracted/data/rooms/kraid/kraid_5_clipdata.gfx.inc" +}; -const u8 sKraid_5_Bg2[41] = INCBIN_U8("data/rooms/kraid/kraid_5_bg2.gfx"); +const u8 sKraid_5_Bg2[41] = { + #include "extracted/data/rooms/kraid/kraid_5_bg2.gfx.inc" +}; const u8 sKraid_5_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 4, 21, SPRITESET_IDX(1), @@ -25,7 +29,9 @@ const u8 sKraid_5_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_5_Bg1[480] = INCBIN_U8("data/rooms/kraid/kraid_5_bg1.gfx"); +const u8 sKraid_5_Bg1[480] = { + #include "extracted/data/rooms/kraid/kraid_5_bg1.gfx.inc" +}; const u8 sKraid_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 4, 21, SPRITESET_IDX(1), diff --git a/src/data/rooms/kraid/kraid_6.c b/src/data/rooms/kraid/kraid_6.c index fc29a5dee..8467783c3 100644 --- a/src/data/rooms/kraid/kraid_6.c +++ b/src/data/rooms/kraid/kraid_6.c @@ -1,9 +1,13 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_6_Clipdata[254] = INCBIN_U8("data/rooms/kraid/kraid_6_clipdata.gfx"); +const u8 sKraid_6_Clipdata[254] = { + #include "extracted/data/rooms/kraid/kraid_6_clipdata.gfx.inc" +}; -const u8 sKraid_6_Bg2[14] = INCBIN_U8("data/rooms/kraid/kraid_6_bg2.gfx"); +const u8 sKraid_6_Bg2[14] = { + #include "extracted/data/rooms/kraid/kraid_6_bg2.gfx.inc" +}; const u8 sKraid_6_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 14, 12, SPRITESET_IDX(4), @@ -18,7 +22,9 @@ const u8 sKraid_6_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_6_Bg1[522] = INCBIN_U8("data/rooms/kraid/kraid_6_bg1.gfx"); +const u8 sKraid_6_Bg1[522] = { + #include "extracted/data/rooms/kraid/kraid_6_bg1.gfx.inc" +}; const u8 sKraid_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 14, 12, SPRITESET_IDX(0), @@ -33,5 +39,7 @@ const u8 sKraid_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_6_Bg0[86] = INCBIN_U8("data/rooms/kraid/kraid_6_bg0.gfx"); +const u8 sKraid_6_Bg0[86] = { + #include "extracted/data/rooms/kraid/kraid_6_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_7.c b/src/data/rooms/kraid/kraid_7.c index beaabf7bb..ef75411dc 100644 --- a/src/data/rooms/kraid/kraid_7.c +++ b/src/data/rooms/kraid/kraid_7.c @@ -20,16 +20,22 @@ const u8 sKraid_3_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_7_Clipdata[246] = INCBIN_U8("data/rooms/kraid/kraid_7_clipdata.gfx"); +const u8 sKraid_7_Clipdata[246] = { + #include "extracted/data/rooms/kraid/kraid_7_clipdata.gfx.inc" +}; -const u8 sKraid_7_Bg2[259] = INCBIN_U8("data/rooms/kraid/kraid_7_bg2.gfx"); +const u8 sKraid_7_Bg2[259] = { + #include "extracted/data/rooms/kraid/kraid_7_bg2.gfx.inc" +}; const u8 sKraid_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 6, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_7_Bg1[684] = INCBIN_U8("data/rooms/kraid/kraid_7_bg1.gfx"); +const u8 sKraid_7_Bg1[684] = { + #include "extracted/data/rooms/kraid/kraid_7_bg1.gfx.inc" +}; const u8 sKraid_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 6, SPRITESET_IDX(0), @@ -37,5 +43,7 @@ const u8 sKraid_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_7_Bg0[70] = INCBIN_U8("data/rooms/kraid/kraid_7_bg0.gfx"); +const u8 sKraid_7_Bg0[70] = { + #include "extracted/data/rooms/kraid/kraid_7_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_8.c b/src/data/rooms/kraid/kraid_8.c index d15e28894..ababcaca2 100644 --- a/src/data/rooms/kraid/kraid_8.c +++ b/src/data/rooms/kraid/kraid_8.c @@ -27,11 +27,17 @@ const u8 sKraid_4_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sKraid_8_Clipdata[395] = INCBIN_U8("data/rooms/kraid/kraid_8_clipdata.gfx"); +const u8 sKraid_8_Clipdata[395] = { + #include "extracted/data/rooms/kraid/kraid_8_clipdata.gfx.inc" +}; -const u8 sKraid_8_Bg2[121] = INCBIN_U8("data/rooms/kraid/kraid_8_bg2.gfx"); +const u8 sKraid_8_Bg2[121] = { + #include "extracted/data/rooms/kraid/kraid_8_bg2.gfx.inc" +}; -const u8 sKraid_8_Bg1[1051] = INCBIN_U8("data/rooms/kraid/kraid_8_bg1.gfx"); +const u8 sKraid_8_Bg1[1051] = { + #include "extracted/data/rooms/kraid/kraid_8_bg1.gfx.inc" +}; const u8 sKraid_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 3, 49, SPRITESET_IDX(1), @@ -40,5 +46,7 @@ const u8 sKraid_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_8_Bg0[183] = INCBIN_U8("data/rooms/kraid/kraid_8_bg0.gfx"); +const u8 sKraid_8_Bg0[183] = { + #include "extracted/data/rooms/kraid/kraid_8_bg0.gfx.inc" +}; diff --git a/src/data/rooms/kraid/kraid_9.c b/src/data/rooms/kraid/kraid_9.c index 7a4ed23ec..0c7779c6e 100644 --- a/src/data/rooms/kraid/kraid_9.c +++ b/src/data/rooms/kraid/kraid_9.c @@ -1,11 +1,17 @@ #include "data/rooms/kraid_rooms_data.h" #include "macros.h" -const u8 sKraid_9_Clipdata[83] = INCBIN_U8("data/rooms/kraid/kraid_9_clipdata.gfx"); +const u8 sKraid_9_Clipdata[83] = { + #include "extracted/data/rooms/kraid/kraid_9_clipdata.gfx.inc" +}; -const u8 sKraid_9_Bg2[143] = INCBIN_U8("data/rooms/kraid/kraid_9_bg2.gfx"); +const u8 sKraid_9_Bg2[143] = { + #include "extracted/data/rooms/kraid/kraid_9_bg2.gfx.inc" +}; -const u8 sKraid_9_Bg1[334] = INCBIN_U8("data/rooms/kraid/kraid_9_bg1.gfx"); +const u8 sKraid_9_Bg1[334] = { + #include "extracted/data/rooms/kraid/kraid_9_bg1.gfx.inc" +}; const u8 sKraid_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 3, 24, SPRITESET_IDX(1), @@ -18,5 +24,7 @@ const u8 sKraid_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sKraid_9_Bg0[156] = INCBIN_U8("data/rooms/kraid/kraid_9_bg0.gfx"); +const u8 sKraid_9_Bg0[156] = { + #include "extracted/data/rooms/kraid/kraid_9_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/bg3.c b/src/data/rooms/norfair/bg3.c index 3fe2719dc..95e7ba942 100644 --- a/src/data/rooms/norfair/bg3.c +++ b/src/data/rooms/norfair/bg3.c @@ -1,26 +1,50 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_Bg3_0[2020] = INCBIN_U8("data/rooms/norfair/norfair_bg3_0.gfx"); +const u8 sNorfair_Bg3_0[2020] = { + #include "extracted/data/rooms/norfair/norfair_bg3_0.gfx.inc" +}; -const u8 sNorfair_Bg3_1[1308] = INCBIN_U8("data/rooms/norfair/norfair_bg3_1.gfx"); +const u8 sNorfair_Bg3_1[1308] = { + #include "extracted/data/rooms/norfair/norfair_bg3_1.gfx.inc" +}; -const u8 sNorfair_Bg3_2[1308] = INCBIN_U8("data/rooms/norfair/norfair_bg3_2.gfx"); +const u8 sNorfair_Bg3_2[1308] = { + #include "extracted/data/rooms/norfair/norfair_bg3_2.gfx.inc" +}; -const u8 sNorfair_Bg3_3[964] = INCBIN_U8("data/rooms/norfair/norfair_bg3_3.gfx"); +const u8 sNorfair_Bg3_3[964] = { + #include "extracted/data/rooms/norfair/norfair_bg3_3.gfx.inc" +}; -const u8 sNorfair_Bg3_4[1196] = INCBIN_U8("data/rooms/norfair/norfair_bg3_4.gfx"); +const u8 sNorfair_Bg3_4[1196] = { + #include "extracted/data/rooms/norfair/norfair_bg3_4.gfx.inc" +}; -const u8 sNorfair_Bg3_5[1052] = INCBIN_U8("data/rooms/norfair/norfair_bg3_5.gfx"); +const u8 sNorfair_Bg3_5[1052] = { + #include "extracted/data/rooms/norfair/norfair_bg3_5.gfx.inc" +}; -const u8 sNorfair_Bg3_6[1116] = INCBIN_U8("data/rooms/norfair/norfair_bg3_6.gfx"); +const u8 sNorfair_Bg3_6[1116] = { + #include "extracted/data/rooms/norfair/norfair_bg3_6.gfx.inc" +}; -const u8 sNorfair_Bg3_7[1624] = INCBIN_U8("data/rooms/norfair/norfair_bg3_7.gfx"); +const u8 sNorfair_Bg3_7[1624] = { + #include "extracted/data/rooms/norfair/norfair_bg3_7.gfx.inc" +}; -const u8 sNorfair_Bg3_8[2028] = INCBIN_U8("data/rooms/norfair/norfair_bg3_8.gfx"); +const u8 sNorfair_Bg3_8[2028] = { + #include "extracted/data/rooms/norfair/norfair_bg3_8.gfx.inc" +}; -const u8 sNorfair_Bg3_9[1236] = INCBIN_U8("data/rooms/norfair/norfair_bg3_9.gfx"); +const u8 sNorfair_Bg3_9[1236] = { + #include "extracted/data/rooms/norfair/norfair_bg3_9.gfx.inc" +}; -const u8 sNorfair_Bg3_10[1252] = INCBIN_U8("data/rooms/norfair/norfair_bg3_10.gfx"); +const u8 sNorfair_Bg3_10[1252] = { + #include "extracted/data/rooms/norfair/norfair_bg3_10.gfx.inc" +}; -const u8 sNorfair_Bg3_11[1272] = INCBIN_U8("data/rooms/norfair/norfair_bg3_11.gfx"); +const u8 sNorfair_Bg3_11[1272] = { + #include "extracted/data/rooms/norfair/norfair_bg3_11.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_0.c b/src/data/rooms/norfair/norfair_0.c index 8ee6f6d06..e3265b860 100644 --- a/src/data/rooms/norfair/norfair_0.c +++ b/src/data/rooms/norfair/norfair_0.c @@ -13,11 +13,17 @@ const u8 sNorfair_0_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sNorfair_0_Clipdata[238] = INCBIN_U8("data/rooms/norfair/norfair_0_clipdata.gfx"); +const u8 sNorfair_0_Clipdata[238] = { + #include "extracted/data/rooms/norfair/norfair_0_clipdata.gfx.inc" +}; -const u8 sNorfair_0_Bg2[167] = INCBIN_U8("data/rooms/norfair/norfair_0_bg2.gfx"); +const u8 sNorfair_0_Bg2[167] = { + #include "extracted/data/rooms/norfair/norfair_0_bg2.gfx.inc" +}; -const u8 sNorfair_0_Bg1[501] = INCBIN_U8("data/rooms/norfair/norfair_0_bg1.gfx"); +const u8 sNorfair_0_Bg1[501] = { + #include "extracted/data/rooms/norfair/norfair_0_bg1.gfx.inc" +}; const u8 sNorfair_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 15, 9, SPRITESET_IDX(4), diff --git a/src/data/rooms/norfair/norfair_1.c b/src/data/rooms/norfair/norfair_1.c index 1de5fefae..55a8c12c9 100644 --- a/src/data/rooms/norfair/norfair_1.c +++ b/src/data/rooms/norfair/norfair_1.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_1_Clipdata[310] = INCBIN_U8("data/rooms/norfair/norfair_1_clipdata.gfx"); +const u8 sNorfair_1_Clipdata[310] = { + #include "extracted/data/rooms/norfair/norfair_1_clipdata.gfx.inc" +}; const u8 sNorfair_1_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 2, 10, SPRITESET_IDX(3), @@ -16,7 +18,9 @@ const u8 sNorfair_1_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_1_Bg2[375] = INCBIN_U8("data/rooms/norfair/norfair_1_bg2.gfx"); +const u8 sNorfair_1_Bg2[375] = { + #include "extracted/data/rooms/norfair/norfair_1_bg2.gfx.inc" +}; const u8 sNorfair_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { 3, 11, SPRITESET_IDX(3), @@ -35,7 +39,9 @@ const u8 sNorfair_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_1_Bg1[1181] = INCBIN_U8("data/rooms/norfair/norfair_1_bg1.gfx"); +const u8 sNorfair_1_Bg1[1181] = { + #include "extracted/data/rooms/norfair/norfair_1_bg1.gfx.inc" +}; const u8 sNorfair_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 2, 10, SPRITESET_IDX(3), @@ -53,7 +59,9 @@ const u8 sNorfair_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_1_Bg0[399] = INCBIN_U8("data/rooms/norfair/norfair_1_bg0.gfx"); +const u8 sNorfair_1_Bg0[399] = { + #include "extracted/data/rooms/norfair/norfair_1_bg0.gfx.inc" +}; const u8 sNorfair_1_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Room @@ -67,7 +75,9 @@ const u8 sNorfair_1_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sNorfair_2_Clipdata[285] = INCBIN_U8("data/rooms/norfair/norfair_2_clipdata.gfx"); +const u8 sNorfair_2_Clipdata[285] = { + #include "extracted/data/rooms/norfair/norfair_2_clipdata.gfx.inc" +}; const u8 sNorfair_2_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 15, 9, SPRITESET_IDX(4), @@ -76,7 +86,9 @@ const u8 sNorfair_2_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_2_Bg2[193] = INCBIN_U8("data/rooms/norfair/norfair_2_bg2.gfx"); +const u8 sNorfair_2_Bg2[193] = { + #include "extracted/data/rooms/norfair/norfair_2_bg2.gfx.inc" +}; const u8 sNorfair_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 15, 9, SPRITESET_IDX(4), @@ -88,7 +100,9 @@ const u8 sNorfair_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_2_Bg1[659] = INCBIN_U8("data/rooms/norfair/norfair_2_bg1.gfx"); +const u8 sNorfair_2_Bg1[659] = { + #include "extracted/data/rooms/norfair/norfair_2_bg1.gfx.inc" +}; const u8 sNorfair_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 15, 9, SPRITESET_IDX(4), diff --git a/src/data/rooms/norfair/norfair_10.c b/src/data/rooms/norfair/norfair_10.c index 08680424a..40fc01e08 100644 --- a/src/data/rooms/norfair/norfair_10.c +++ b/src/data/rooms/norfair/norfair_10.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_10_Clipdata[160] = INCBIN_U8("data/rooms/norfair/norfair_10_clipdata.gfx"); +const u8 sNorfair_10_Clipdata[160] = { + #include "extracted/data/rooms/norfair/norfair_10_clipdata.gfx.inc" +}; -const u8 sNorfair_10_Bg2[134] = INCBIN_U8("data/rooms/norfair/norfair_10_bg2.gfx"); +const u8 sNorfair_10_Bg2[134] = { + #include "extracted/data/rooms/norfair/norfair_10_bg2.gfx.inc" +}; const u8 sNorfair_10_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 4, 27, SPRITESET_IDX(3), @@ -15,7 +19,9 @@ const u8 sNorfair_10_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_10_Bg1[341] = INCBIN_U8("data/rooms/norfair/norfair_10_bg1.gfx"); +const u8 sNorfair_10_Bg1[341] = { + #include "extracted/data/rooms/norfair/norfair_10_bg1.gfx.inc" +}; const u8 sNorfair_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 4, 27, SPRITESET_IDX(3), @@ -27,5 +33,7 @@ const u8 sNorfair_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_10_Bg0[659] = INCBIN_U8("data/rooms/norfair/norfair_10_bg0.gfx"); +const u8 sNorfair_10_Bg0[659] = { + #include "extracted/data/rooms/norfair/norfair_10_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_11.c b/src/data/rooms/norfair/norfair_11.c index 1a46b557f..31261c8ee 100644 --- a/src/data/rooms/norfair/norfair_11.c +++ b/src/data/rooms/norfair/norfair_11.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_11_Clipdata[111] = INCBIN_U8("data/rooms/norfair/norfair_11_clipdata.gfx"); +const u8 sNorfair_11_Clipdata[111] = { + #include "extracted/data/rooms/norfair/norfair_11_clipdata.gfx.inc" +}; const u8 sNorfair_11_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 6, 16, SPRITESET_IDX(4), @@ -10,7 +12,9 @@ const u8 sNorfair_11_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_11_Bg2[38] = INCBIN_U8("data/rooms/norfair/norfair_11_bg2.gfx"); +const u8 sNorfair_11_Bg2[38] = { + #include "extracted/data/rooms/norfair/norfair_11_bg2.gfx.inc" +}; const u8 sNorfair_11_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 6, 16, SPRITESET_IDX(4), @@ -21,7 +25,9 @@ const u8 sNorfair_11_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_11_Bg1[311] = INCBIN_U8("data/rooms/norfair/norfair_11_bg1.gfx"); +const u8 sNorfair_11_Bg1[311] = { + #include "extracted/data/rooms/norfair/norfair_11_bg1.gfx.inc" +}; const u8 sNorfair_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 16, SPRITESET_IDX(4), @@ -31,5 +37,7 @@ const u8 sNorfair_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_11_Bg0[199] = INCBIN_U8("data/rooms/norfair/norfair_11_bg0.gfx"); +const u8 sNorfair_11_Bg0[199] = { + #include "extracted/data/rooms/norfair/norfair_11_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_12.c b/src/data/rooms/norfair/norfair_12.c index e35a4c2d9..033ea29d8 100644 --- a/src/data/rooms/norfair/norfair_12.c +++ b/src/data/rooms/norfair/norfair_12.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_12_Clipdata[110] = INCBIN_U8("data/rooms/norfair/norfair_12_clipdata.gfx"); +const u8 sNorfair_12_Clipdata[110] = { + #include "extracted/data/rooms/norfair/norfair_12_clipdata.gfx.inc" +}; const u8 sNorfair_12_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 4, 14, SPRITESET_IDX(2), @@ -10,7 +12,9 @@ const u8 sNorfair_12_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_12_Bg2[48] = INCBIN_U8("data/rooms/norfair/norfair_12_bg2.gfx"); +const u8 sNorfair_12_Bg2[48] = { + #include "extracted/data/rooms/norfair/norfair_12_bg2.gfx.inc" +}; const u8 sNorfair_12_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 4, 14, SPRITESET_IDX(3), @@ -21,7 +25,9 @@ const u8 sNorfair_12_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_12_Bg1[269] = INCBIN_U8("data/rooms/norfair/norfair_12_bg1.gfx"); +const u8 sNorfair_12_Bg1[269] = { + #include "extracted/data/rooms/norfair/norfair_12_bg1.gfx.inc" +}; const u8 sNorfair_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 4, 14, SPRITESET_IDX(2), @@ -32,5 +38,7 @@ const u8 sNorfair_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_12_Bg0[129] = INCBIN_U8("data/rooms/norfair/norfair_12_bg0.gfx"); +const u8 sNorfair_12_Bg0[129] = { + #include "extracted/data/rooms/norfair/norfair_12_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_13.c b/src/data/rooms/norfair/norfair_13.c index b6b68bfc6..02b284f46 100644 --- a/src/data/rooms/norfair/norfair_13.c +++ b/src/data/rooms/norfair/norfair_13.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_13_Clipdata[54] = INCBIN_U8("data/rooms/norfair/norfair_13_clipdata.gfx"); +const u8 sNorfair_13_Clipdata[54] = { + #include "extracted/data/rooms/norfair/norfair_13_clipdata.gfx.inc" +}; -const u8 sNorfair_13_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_13_bg2.gfx"); +const u8 sNorfair_13_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_13_bg2.gfx.inc" +}; -const u8 sNorfair_13_Bg1[131] = INCBIN_U8("data/rooms/norfair/norfair_13_bg1.gfx"); +const u8 sNorfair_13_Bg1[131] = { + #include "extracted/data/rooms/norfair/norfair_13_bg1.gfx.inc" +}; const u8 sNorfair_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 7, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_13_Bg0[79] = INCBIN_U8("data/rooms/norfair/norfair_13_bg0.gfx"); +const u8 sNorfair_13_Bg0[79] = { + #include "extracted/data/rooms/norfair/norfair_13_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_14.c b/src/data/rooms/norfair/norfair_14.c index 6a284a9fe..199d0d095 100644 --- a/src/data/rooms/norfair/norfair_14.c +++ b/src/data/rooms/norfair/norfair_14.c @@ -13,9 +13,13 @@ const u8 sNorfair_4_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_14_Clipdata[313] = INCBIN_U8("data/rooms/norfair/norfair_14_clipdata.gfx"); +const u8 sNorfair_14_Clipdata[313] = { + #include "extracted/data/rooms/norfair/norfair_14_clipdata.gfx.inc" +}; -const u8 sNorfair_14_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_14_bg2.gfx"); +const u8 sNorfair_14_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_14_bg2.gfx.inc" +}; const u8 sNorfair_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 6, 44, SPRITESET_IDX(3), @@ -36,7 +40,9 @@ const u8 sNorfair_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_14_Bg1[983] = INCBIN_U8("data/rooms/norfair/norfair_14_bg1.gfx"); +const u8 sNorfair_14_Bg1[983] = { + #include "extracted/data/rooms/norfair/norfair_14_bg1.gfx.inc" +}; const u8 sNorfair_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 6, 44, SPRITESET_IDX(3), @@ -57,5 +63,7 @@ const u8 sNorfair_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_14_Bg0[1492] = INCBIN_U8("data/rooms/norfair/norfair_14_bg0.gfx"); +const u8 sNorfair_14_Bg0[1492] = { + #include "extracted/data/rooms/norfair/norfair_14_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_15.c b/src/data/rooms/norfair/norfair_15.c index a1ab2f403..7f0cd3c0d 100644 --- a/src/data/rooms/norfair/norfair_15.c +++ b/src/data/rooms/norfair/norfair_15.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_15_Clipdata[70] = INCBIN_U8("data/rooms/norfair/norfair_15_clipdata.gfx"); +const u8 sNorfair_15_Clipdata[70] = { + #include "extracted/data/rooms/norfair/norfair_15_clipdata.gfx.inc" +}; -const u8 sNorfair_15_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_15_bg2.gfx"); +const u8 sNorfair_15_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_15_bg2.gfx.inc" +}; const u8 sNorfair_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 9, 13, SPRITESET_IDX(0), @@ -12,12 +16,16 @@ const u8 sNorfair_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_15_Bg1[210] = INCBIN_U8("data/rooms/norfair/norfair_15_bg1.gfx"); +const u8 sNorfair_15_Bg1[210] = { + #include "extracted/data/rooms/norfair/norfair_15_bg1.gfx.inc" +}; const u8 sNorfair_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 16, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_15_Bg0[128] = INCBIN_U8("data/rooms/norfair/norfair_15_bg0.gfx"); +const u8 sNorfair_15_Bg0[128] = { + #include "extracted/data/rooms/norfair/norfair_15_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_16.c b/src/data/rooms/norfair/norfair_16.c index 111c0a076..e21823672 100644 --- a/src/data/rooms/norfair/norfair_16.c +++ b/src/data/rooms/norfair/norfair_16.c @@ -27,11 +27,17 @@ const u8 sNorfair_5_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_16_Clipdata[247] = INCBIN_U8("data/rooms/norfair/norfair_16_clipdata.gfx"); +const u8 sNorfair_16_Clipdata[247] = { + #include "extracted/data/rooms/norfair/norfair_16_clipdata.gfx.inc" +}; -const u8 sNorfair_16_Bg2[285] = INCBIN_U8("data/rooms/norfair/norfair_16_bg2.gfx"); +const u8 sNorfair_16_Bg2[285] = { + #include "extracted/data/rooms/norfair/norfair_16_bg2.gfx.inc" +}; -const u8 sNorfair_16_Bg1[452] = INCBIN_U8("data/rooms/norfair/norfair_16_bg1.gfx"); +const u8 sNorfair_16_Bg1[452] = { + #include "extracted/data/rooms/norfair/norfair_16_bg1.gfx.inc" +}; const u8 sNorfair_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 6, 14, SPRITESET_IDX(1), diff --git a/src/data/rooms/norfair/norfair_17.c b/src/data/rooms/norfair/norfair_17.c index 3315f69fb..2b4db73a5 100644 --- a/src/data/rooms/norfair/norfair_17.c +++ b/src/data/rooms/norfair/norfair_17.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_17_Clipdata[112] = INCBIN_U8("data/rooms/norfair/norfair_17_clipdata.gfx"); +const u8 sNorfair_17_Clipdata[112] = { + #include "extracted/data/rooms/norfair/norfair_17_clipdata.gfx.inc" +}; -const u8 sNorfair_17_Bg2[20] = INCBIN_U8("data/rooms/norfair/norfair_17_bg2.gfx"); +const u8 sNorfair_17_Bg2[20] = { + #include "extracted/data/rooms/norfair/norfair_17_bg2.gfx.inc" +}; const u8 sNorfair_17_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 4, 12, SPRITESET_IDX(2), @@ -13,7 +17,9 @@ const u8 sNorfair_17_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_17_Bg1[249] = INCBIN_U8("data/rooms/norfair/norfair_17_bg1.gfx"); +const u8 sNorfair_17_Bg1[249] = { + #include "extracted/data/rooms/norfair/norfair_17_bg1.gfx.inc" +}; const u8 sNorfair_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 4, 12, SPRITESET_IDX(2), diff --git a/src/data/rooms/norfair/norfair_18.c b/src/data/rooms/norfair/norfair_18.c index 91571f23f..fbef984c5 100644 --- a/src/data/rooms/norfair/norfair_18.c +++ b/src/data/rooms/norfair/norfair_18.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_18_Clipdata[56] = INCBIN_U8("data/rooms/norfair/norfair_18_clipdata.gfx"); +const u8 sNorfair_18_Clipdata[56] = { + #include "extracted/data/rooms/norfair/norfair_18_clipdata.gfx.inc" +}; -const u8 sNorfair_18_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_18_bg2.gfx"); +const u8 sNorfair_18_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_18_bg2.gfx.inc" +}; -const u8 sNorfair_18_Bg1[125] = INCBIN_U8("data/rooms/norfair/norfair_18_bg1.gfx"); +const u8 sNorfair_18_Bg1[125] = { + #include "extracted/data/rooms/norfair/norfair_18_bg1.gfx.inc" +}; const u8 sNorfair_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 6, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_18_Bg0[79] = INCBIN_U8("data/rooms/norfair/norfair_18_bg0.gfx"); +const u8 sNorfair_18_Bg0[79] = { + #include "extracted/data/rooms/norfair/norfair_18_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_19.c b/src/data/rooms/norfair/norfair_19.c index 4d1d6357c..9d10802d6 100644 --- a/src/data/rooms/norfair/norfair_19.c +++ b/src/data/rooms/norfair/norfair_19.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_19_Clipdata[237] = INCBIN_U8("data/rooms/norfair/norfair_19_clipdata.gfx"); +const u8 sNorfair_19_Clipdata[237] = { + #include "extracted/data/rooms/norfair/norfair_19_clipdata.gfx.inc" +}; -const u8 sNorfair_19_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_19_bg2.gfx"); +const u8 sNorfair_19_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_19_bg2.gfx.inc" +}; -const u8 sNorfair_19_Bg1[552] = INCBIN_U8("data/rooms/norfair/norfair_19_bg1.gfx"); +const u8 sNorfair_19_Bg1[552] = { + #include "extracted/data/rooms/norfair/norfair_19_bg1.gfx.inc" +}; const u8 sNorfair_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 2, 9, SPRITESET_IDX(1), @@ -17,5 +23,7 @@ const u8 sNorfair_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_19_Bg0[656] = INCBIN_U8("data/rooms/norfair/norfair_19_bg0.gfx"); +const u8 sNorfair_19_Bg0[656] = { + #include "extracted/data/rooms/norfair/norfair_19_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_20.c b/src/data/rooms/norfair/norfair_20.c index df143f9f4..082ac4af9 100644 --- a/src/data/rooms/norfair/norfair_20.c +++ b/src/data/rooms/norfair/norfair_20.c @@ -34,11 +34,17 @@ const u8 sNorfair_6_Scrolls[SCROLL_DATA_SIZE(4)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_20_Clipdata[] = INCBIN_U8("data/rooms/norfair/norfair_20_clipdata.gfx"); +const u8 sNorfair_20_Clipdata[] = { + #include "extracted/data/rooms/norfair/norfair_20_clipdata.gfx.inc" +}; -const u8 sNorfair_20_Bg2[724] = INCBIN_U8("data/rooms/norfair/norfair_20_bg2.gfx"); +const u8 sNorfair_20_Bg2[724] = { + #include "extracted/data/rooms/norfair/norfair_20_bg2.gfx.inc" +}; -const u8 sNorfair_20_Bg1[] = INCBIN_U8("data/rooms/norfair/norfair_20_bg1.gfx"); +const u8 sNorfair_20_Bg1[] = { + #include "extracted/data/rooms/norfair/norfair_20_bg1.gfx.inc" +}; const u8 sNorfair_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 8, 8, SPRITESET_IDX(0), @@ -52,5 +58,7 @@ const u8 sNorfair_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_20_Bg0[] = INCBIN_U8("data/rooms/norfair/norfair_20_bg0.gfx"); +const u8 sNorfair_20_Bg0[] = { + #include "extracted/data/rooms/norfair/norfair_20_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_21.c b/src/data/rooms/norfair/norfair_21.c index 44bd7efa2..05363a24d 100644 --- a/src/data/rooms/norfair/norfair_21.c +++ b/src/data/rooms/norfair/norfair_21.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_21_Clipdata[210] = INCBIN_U8("data/rooms/norfair/norfair_21_clipdata.gfx"); +const u8 sNorfair_21_Clipdata[210] = { + #include "extracted/data/rooms/norfair/norfair_21_clipdata.gfx.inc" +}; -const u8 sNorfair_21_Bg2[28] = INCBIN_U8("data/rooms/norfair/norfair_21_bg2.gfx"); +const u8 sNorfair_21_Bg2[28] = { + #include "extracted/data/rooms/norfair/norfair_21_bg2.gfx.inc" +}; const u8 sNorfair_21_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 2, 18, SPRITESET_IDX(1), @@ -14,7 +18,9 @@ const u8 sNorfair_21_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_21_Bg1[452] = INCBIN_U8("data/rooms/norfair/norfair_21_bg1.gfx"); +const u8 sNorfair_21_Bg1[452] = { + #include "extracted/data/rooms/norfair/norfair_21_bg1.gfx.inc" +}; const u8 sNorfair_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 2, 18, SPRITESET_IDX(1), @@ -25,5 +31,7 @@ const u8 sNorfair_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_21_Bg0[174] = INCBIN_U8("data/rooms/norfair/norfair_21_bg0.gfx"); +const u8 sNorfair_21_Bg0[174] = { + #include "extracted/data/rooms/norfair/norfair_21_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_22.c b/src/data/rooms/norfair/norfair_22.c index c012f9c8b..f3508ffd3 100644 --- a/src/data/rooms/norfair/norfair_22.c +++ b/src/data/rooms/norfair/norfair_22.c @@ -13,9 +13,13 @@ const u8 sNorfair_7_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_22_Clipdata[264] = INCBIN_U8("data/rooms/norfair/norfair_22_clipdata.gfx"); +const u8 sNorfair_22_Clipdata[264] = { + #include "extracted/data/rooms/norfair/norfair_22_clipdata.gfx.inc" +}; -const u8 sNorfair_22_Bg2[456] = INCBIN_U8("data/rooms/norfair/norfair_22_bg2.gfx"); +const u8 sNorfair_22_Bg2[456] = { + #include "extracted/data/rooms/norfair/norfair_22_bg2.gfx.inc" +}; const u8 sNorfair_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 9, 21, SPRITESET_IDX(4), @@ -28,7 +32,9 @@ const u8 sNorfair_22_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_22_Bg1[647] = INCBIN_U8("data/rooms/norfair/norfair_22_bg1.gfx"); +const u8 sNorfair_22_Bg1[647] = { + #include "extracted/data/rooms/norfair/norfair_22_bg1.gfx.inc" +}; const u8 sNorfair_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 9, 21, SPRITESET_IDX(4), @@ -41,5 +47,7 @@ const u8 sNorfair_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_22_Bg0[175] = INCBIN_U8("data/rooms/norfair/norfair_22_bg0.gfx"); +const u8 sNorfair_22_Bg0[175] = { + #include "extracted/data/rooms/norfair/norfair_22_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_23.c b/src/data/rooms/norfair/norfair_23.c index e15d2bc60..069fe4cae 100644 --- a/src/data/rooms/norfair/norfair_23.c +++ b/src/data/rooms/norfair/norfair_23.c @@ -20,9 +20,13 @@ const u8 sNorfair_8_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_23_Clipdata[295] = INCBIN_U8("data/rooms/norfair/norfair_23_clipdata.gfx"); +const u8 sNorfair_23_Clipdata[295] = { + #include "extracted/data/rooms/norfair/norfair_23_clipdata.gfx.inc" +}; -const u8 sNorfair_23_Bg2[381] = INCBIN_U8("data/rooms/norfair/norfair_23_bg2.gfx"); +const u8 sNorfair_23_Bg2[381] = { + #include "extracted/data/rooms/norfair/norfair_23_bg2.gfx.inc" +}; const u8 sNorfair_23_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 17, 8, SPRITESET_IDX(1), @@ -33,7 +37,9 @@ const u8 sNorfair_23_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_23_Bg1[637] = INCBIN_U8("data/rooms/norfair/norfair_23_bg1.gfx"); +const u8 sNorfair_23_Bg1[637] = { + #include "extracted/data/rooms/norfair/norfair_23_bg1.gfx.inc" +}; const u8 sNorfair_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 17, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_24.c b/src/data/rooms/norfair/norfair_24.c index 192a91a45..6299f8f23 100644 --- a/src/data/rooms/norfair/norfair_24.c +++ b/src/data/rooms/norfair/norfair_24.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_24_Clipdata[130] = INCBIN_U8("data/rooms/norfair/norfair_24_clipdata.gfx"); +const u8 sNorfair_24_Clipdata[130] = { + #include "extracted/data/rooms/norfair/norfair_24_clipdata.gfx.inc" +}; -const u8 sNorfair_24_Bg2[101] = INCBIN_U8("data/rooms/norfair/norfair_24_bg2.gfx"); +const u8 sNorfair_24_Bg2[101] = { + #include "extracted/data/rooms/norfair/norfair_24_bg2.gfx.inc" +}; -const u8 sNorfair_24_Bg1[542] = INCBIN_U8("data/rooms/norfair/norfair_24_bg1.gfx"); +const u8 sNorfair_24_Bg1[542] = { + #include "extracted/data/rooms/norfair/norfair_24_bg1.gfx.inc" +}; const u8 sNorfair_24_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 4, 36, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_25.c b/src/data/rooms/norfair/norfair_25.c index 4ecbd7dcb..143f32df5 100644 --- a/src/data/rooms/norfair/norfair_25.c +++ b/src/data/rooms/norfair/norfair_25.c @@ -20,9 +20,13 @@ const u8 sNorfair_9_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_25_Clipdata[138] = INCBIN_U8("data/rooms/norfair/norfair_25_clipdata.gfx"); +const u8 sNorfair_25_Clipdata[138] = { + #include "extracted/data/rooms/norfair/norfair_25_clipdata.gfx.inc" +}; -const u8 sNorfair_25_Bg2[205] = INCBIN_U8("data/rooms/norfair/norfair_25_bg2.gfx"); +const u8 sNorfair_25_Bg2[205] = { + #include "extracted/data/rooms/norfair/norfair_25_bg2.gfx.inc" +}; const u8 sNorfair_25_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 9, 10, SPRITESET_IDX(0), @@ -32,7 +36,9 @@ const u8 sNorfair_25_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_25_Bg1[365] = INCBIN_U8("data/rooms/norfair/norfair_25_bg1.gfx"); +const u8 sNorfair_25_Bg1[365] = { + #include "extracted/data/rooms/norfair/norfair_25_bg1.gfx.inc" +}; const u8 sNorfair_25_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 9, 10, SPRITESET_IDX(0), @@ -40,5 +46,7 @@ const u8 sNorfair_25_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_25_Bg0[214] = INCBIN_U8("data/rooms/norfair/norfair_25_bg0.gfx"); +const u8 sNorfair_25_Bg0[214] = { + #include "extracted/data/rooms/norfair/norfair_25_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_26.c b/src/data/rooms/norfair/norfair_26.c index 347a20481..decaa60b0 100644 --- a/src/data/rooms/norfair/norfair_26.c +++ b/src/data/rooms/norfair/norfair_26.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_26_Clipdata[128] = INCBIN_U8("data/rooms/norfair/norfair_26_clipdata.gfx"); +const u8 sNorfair_26_Clipdata[128] = { + #include "extracted/data/rooms/norfair/norfair_26_clipdata.gfx.inc" +}; -const u8 sNorfair_26_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_26_bg2.gfx"); +const u8 sNorfair_26_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_26_bg2.gfx.inc" +}; -const u8 sNorfair_26_Bg1[364] = INCBIN_U8("data/rooms/norfair/norfair_26_bg1.gfx"); +const u8 sNorfair_26_Bg1[364] = { + #include "extracted/data/rooms/norfair/norfair_26_bg1.gfx.inc" +}; const u8 sNorfair_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 8, 16, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_26_Bg0[128] = INCBIN_U8("data/rooms/norfair/norfair_26_bg0.gfx"); +const u8 sNorfair_26_Bg0[128] = { + #include "extracted/data/rooms/norfair/norfair_26_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_27.c b/src/data/rooms/norfair/norfair_27.c index e436fc68f..4e7b4f496 100644 --- a/src/data/rooms/norfair/norfair_27.c +++ b/src/data/rooms/norfair/norfair_27.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_27_Clipdata[56] = INCBIN_U8("data/rooms/norfair/norfair_27_clipdata.gfx"); +const u8 sNorfair_27_Clipdata[56] = { + #include "extracted/data/rooms/norfair/norfair_27_clipdata.gfx.inc" +}; -const u8 sNorfair_27_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_27_bg2.gfx"); +const u8 sNorfair_27_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_27_bg2.gfx.inc" +}; -const u8 sNorfair_27_Bg1[125] = INCBIN_U8("data/rooms/norfair/norfair_27_bg1.gfx"); +const u8 sNorfair_27_Bg1[125] = { + #include "extracted/data/rooms/norfair/norfair_27_bg1.gfx.inc" +}; const u8 sNorfair_27_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 7, 6, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_27_Bg0[79] = INCBIN_U8("data/rooms/norfair/norfair_27_bg0.gfx"); +const u8 sNorfair_27_Bg0[79] = { + #include "extracted/data/rooms/norfair/norfair_27_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_28.c b/src/data/rooms/norfair/norfair_28.c index adc1d29d9..d05fd593f 100644 --- a/src/data/rooms/norfair/norfair_28.c +++ b/src/data/rooms/norfair/norfair_28.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_28_Clipdata[251] = INCBIN_U8("data/rooms/norfair/norfair_28_clipdata.gfx"); +const u8 sNorfair_28_Clipdata[251] = { + #include "extracted/data/rooms/norfair/norfair_28_clipdata.gfx.inc" +}; -const u8 sNorfair_28_Bg2[165] = INCBIN_U8("data/rooms/norfair/norfair_28_bg2.gfx"); +const u8 sNorfair_28_Bg2[165] = { + #include "extracted/data/rooms/norfair/norfair_28_bg2.gfx.inc" +}; -const u8 sNorfair_28_Bg1[724] = INCBIN_U8("data/rooms/norfair/norfair_28_bg1.gfx"); +const u8 sNorfair_28_Bg1[724] = { + #include "extracted/data/rooms/norfair/norfair_28_bg1.gfx.inc" +}; const u8 sNorfair_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 7, 24, SPRITESET_IDX(0), @@ -22,5 +28,7 @@ const u8 sNorfair_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_28_Bg0[832] = INCBIN_U8("data/rooms/norfair/norfair_28_bg0.gfx"); +const u8 sNorfair_28_Bg0[832] = { + #include "extracted/data/rooms/norfair/norfair_28_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_29.c b/src/data/rooms/norfair/norfair_29.c index f4750dda6..a36218a69 100644 --- a/src/data/rooms/norfair/norfair_29.c +++ b/src/data/rooms/norfair/norfair_29.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_29_Clipdata[183] = INCBIN_U8("data/rooms/norfair/norfair_29_clipdata.gfx"); +const u8 sNorfair_29_Clipdata[183] = { + #include "extracted/data/rooms/norfair/norfair_29_clipdata.gfx.inc" +}; -const u8 sNorfair_29_Bg2[231] = INCBIN_U8("data/rooms/norfair/norfair_29_bg2.gfx"); +const u8 sNorfair_29_Bg2[231] = { + #include "extracted/data/rooms/norfair/norfair_29_bg2.gfx.inc" +}; -const u8 sNorfair_29_Bg1[764] = INCBIN_U8("data/rooms/norfair/norfair_29_bg1.gfx"); +const u8 sNorfair_29_Bg1[764] = { + #include "extracted/data/rooms/norfair/norfair_29_bg1.gfx.inc" +}; const u8 sNorfair_29_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 12, 11, SPRITESET_IDX(2), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_29_Bg0[852] = INCBIN_U8("data/rooms/norfair/norfair_29_bg0.gfx"); +const u8 sNorfair_29_Bg0[852] = { + #include "extracted/data/rooms/norfair/norfair_29_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_3.c b/src/data/rooms/norfair/norfair_3.c index 47f0d4991..70d719b5b 100644 --- a/src/data/rooms/norfair/norfair_3.c +++ b/src/data/rooms/norfair/norfair_3.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_3_Clipdata[189] = INCBIN_U8("data/rooms/norfair/norfair_3_clipdata.gfx"); +const u8 sNorfair_3_Clipdata[189] = { + #include "extracted/data/rooms/norfair/norfair_3_clipdata.gfx.inc" +}; const u8 sNorfair_3_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 3, 21, SPRITESET_IDX(3), @@ -15,7 +17,9 @@ const u8 sNorfair_3_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_3_Bg2[211] = INCBIN_U8("data/rooms/norfair/norfair_3_bg2.gfx"); +const u8 sNorfair_3_Bg2[211] = { + #include "extracted/data/rooms/norfair/norfair_3_bg2.gfx.inc" +}; const u8 sNorfair_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 4, 19, SPRITESET_IDX(3), @@ -31,7 +35,9 @@ const u8 sNorfair_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_3_Bg1[585] = INCBIN_U8("data/rooms/norfair/norfair_3_bg1.gfx"); +const u8 sNorfair_3_Bg1[585] = { + #include "extracted/data/rooms/norfair/norfair_3_bg1.gfx.inc" +}; const u8 sNorfair_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 3, 19, SPRITESET_IDX(3), @@ -48,5 +54,7 @@ const u8 sNorfair_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_3_Bg0[263] = INCBIN_U8("data/rooms/norfair/norfair_3_bg0.gfx"); +const u8 sNorfair_3_Bg0[263] = { + #include "extracted/data/rooms/norfair/norfair_3_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_30.c b/src/data/rooms/norfair/norfair_30.c index 12536587c..b4b15faa1 100644 --- a/src/data/rooms/norfair/norfair_30.c +++ b/src/data/rooms/norfair/norfair_30.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_30_Clipdata[420] = INCBIN_U8("data/rooms/norfair/norfair_30_clipdata.gfx"); +const u8 sNorfair_30_Clipdata[420] = { + #include "extracted/data/rooms/norfair/norfair_30_clipdata.gfx.inc" +}; const u8 sNorfair_30_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { 5, 41, SPRITESET_IDX(0), @@ -20,7 +22,9 @@ const u8 sNorfair_30_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_30_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_30_bg2.gfx"); +const u8 sNorfair_30_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_30_bg2.gfx.inc" +}; const u8 sNorfair_30_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(18)] = { 4, 17, SPRITESET_IDX(0), @@ -43,7 +47,9 @@ const u8 sNorfair_30_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(18)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_30_Bg1[1118] = INCBIN_U8("data/rooms/norfair/norfair_30_bg1.gfx"); +const u8 sNorfair_30_Bg1[1118] = { + #include "extracted/data/rooms/norfair/norfair_30_bg1.gfx.inc" +}; const u8 sNorfair_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { 4, 57, SPRITESET_IDX(0), @@ -65,5 +71,7 @@ const u8 sNorfair_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_30_Bg0[489] = INCBIN_U8("data/rooms/norfair/norfair_30_bg0.gfx"); +const u8 sNorfair_30_Bg0[489] = { + #include "extracted/data/rooms/norfair/norfair_30_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_31.c b/src/data/rooms/norfair/norfair_31.c index 5dbb1f148..69b9f6deb 100644 --- a/src/data/rooms/norfair/norfair_31.c +++ b/src/data/rooms/norfair/norfair_31.c @@ -20,11 +20,17 @@ const u8 sNorfair_10_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_31_Clipdata[120] = INCBIN_U8("data/rooms/norfair/norfair_31_clipdata.gfx"); +const u8 sNorfair_31_Clipdata[120] = { + #include "extracted/data/rooms/norfair/norfair_31_clipdata.gfx.inc" +}; -const u8 sNorfair_31_Bg2[296] = INCBIN_U8("data/rooms/norfair/norfair_31_bg2.gfx"); +const u8 sNorfair_31_Bg2[296] = { + #include "extracted/data/rooms/norfair/norfair_31_bg2.gfx.inc" +}; -const u8 sNorfair_31_Bg1[322] = INCBIN_U8("data/rooms/norfair/norfair_31_bg1.gfx"); +const u8 sNorfair_31_Bg1[322] = { + #include "extracted/data/rooms/norfair/norfair_31_bg1.gfx.inc" +}; const u8 sNorfair_31_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 14, 11, SPRITESET_IDX(2), @@ -32,5 +38,7 @@ const u8 sNorfair_31_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_31_Bg0[215] = INCBIN_U8("data/rooms/norfair/norfair_31_bg0.gfx"); +const u8 sNorfair_31_Bg0[215] = { + #include "extracted/data/rooms/norfair/norfair_31_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_32.c b/src/data/rooms/norfair/norfair_32.c index fbd7c7498..40af975b8 100644 --- a/src/data/rooms/norfair/norfair_32.c +++ b/src/data/rooms/norfair/norfair_32.c @@ -13,11 +13,17 @@ const u8 sNorfair_11_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sNorfair_32_Clipdata[193] = INCBIN_U8("data/rooms/norfair/norfair_32_clipdata.gfx"); +const u8 sNorfair_32_Clipdata[193] = { + #include "extracted/data/rooms/norfair/norfair_32_clipdata.gfx.inc" +}; -const u8 sNorfair_32_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_32_bg2.gfx"); +const u8 sNorfair_32_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_32_bg2.gfx.inc" +}; -const u8 sNorfair_32_Bg1[613] = INCBIN_U8("data/rooms/norfair/norfair_32_bg1.gfx"); +const u8 sNorfair_32_Bg1[613] = { + #include "extracted/data/rooms/norfair/norfair_32_bg1.gfx.inc" +}; const u8 sNorfair_32_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 8, 60, SPRITESET_IDX(4), @@ -27,5 +33,7 @@ const u8 sNorfair_32_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_32_Bg0[263] = INCBIN_U8("data/rooms/norfair/norfair_32_bg0.gfx"); +const u8 sNorfair_32_Bg0[263] = { + #include "extracted/data/rooms/norfair/norfair_32_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_33.c b/src/data/rooms/norfair/norfair_33.c index a666e9bb9..7910e2876 100644 --- a/src/data/rooms/norfair/norfair_33.c +++ b/src/data/rooms/norfair/norfair_33.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_33_Clipdata[184] = INCBIN_U8("data/rooms/norfair/norfair_33_clipdata.gfx"); +const u8 sNorfair_33_Clipdata[184] = { + #include "extracted/data/rooms/norfair/norfair_33_clipdata.gfx.inc" +}; -const u8 sNorfair_33_Bg2[152] = INCBIN_U8("data/rooms/norfair/norfair_33_bg2.gfx"); +const u8 sNorfair_33_Bg2[152] = { + #include "extracted/data/rooms/norfair/norfair_33_bg2.gfx.inc" +}; -const u8 sNorfair_33_Bg1[682] = INCBIN_U8("data/rooms/norfair/norfair_33_bg1.gfx"); +const u8 sNorfair_33_Bg1[682] = { + #include "extracted/data/rooms/norfair/norfair_33_bg1.gfx.inc" +}; const u8 sNorfair_33_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 4, 15, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_34.c b/src/data/rooms/norfair/norfair_34.c index 66dd21904..b2099239a 100644 --- a/src/data/rooms/norfair/norfair_34.c +++ b/src/data/rooms/norfair/norfair_34.c @@ -27,16 +27,24 @@ const u8 sNorfair_12_Scrolls[SCROLL_DATA_SIZE(3)] = { 16, // Breakable block Y bound extension }; -const u8 sNorfair_34_Clipdata[269] = INCBIN_U8("data/rooms/norfair/norfair_34_clipdata.gfx"); +const u8 sNorfair_34_Clipdata[269] = { + #include "extracted/data/rooms/norfair/norfair_34_clipdata.gfx.inc" +}; -const u8 sNorfair_34_Bg2[332] = INCBIN_U8("data/rooms/norfair/norfair_34_bg2.gfx"); +const u8 sNorfair_34_Bg2[332] = { + #include "extracted/data/rooms/norfair/norfair_34_bg2.gfx.inc" +}; -const u8 sNorfair_34_Bg1[704] = INCBIN_U8("data/rooms/norfair/norfair_34_bg1.gfx"); +const u8 sNorfair_34_Bg1[704] = { + #include "extracted/data/rooms/norfair/norfair_34_bg1.gfx.inc" +}; const u8 sNorfair_34_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 2, 23, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_34_Bg0[87] = INCBIN_U8("data/rooms/norfair/norfair_34_bg0.gfx"); +const u8 sNorfair_34_Bg0[87] = { + #include "extracted/data/rooms/norfair/norfair_34_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_35.c b/src/data/rooms/norfair/norfair_35.c index 1dc814055..c66ff41be 100644 --- a/src/data/rooms/norfair/norfair_35.c +++ b/src/data/rooms/norfair/norfair_35.c @@ -20,11 +20,17 @@ const u8 sNorfair_13_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_35_Clipdata[159] = INCBIN_U8("data/rooms/norfair/norfair_35_clipdata.gfx"); +const u8 sNorfair_35_Clipdata[159] = { + #include "extracted/data/rooms/norfair/norfair_35_clipdata.gfx.inc" +}; -const u8 sNorfair_35_Bg2[183] = INCBIN_U8("data/rooms/norfair/norfair_35_bg2.gfx"); +const u8 sNorfair_35_Bg2[183] = { + #include "extracted/data/rooms/norfair/norfair_35_bg2.gfx.inc" +}; -const u8 sNorfair_35_Bg1[601] = INCBIN_U8("data/rooms/norfair/norfair_35_bg1.gfx"); +const u8 sNorfair_35_Bg1[601] = { + #include "extracted/data/rooms/norfair/norfair_35_bg1.gfx.inc" +}; const u8 sNorfair_35_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 9, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_36.c b/src/data/rooms/norfair/norfair_36.c index 00d2f18a2..ad22affc9 100644 --- a/src/data/rooms/norfair/norfair_36.c +++ b/src/data/rooms/norfair/norfair_36.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_36_Clipdata[93] = INCBIN_U8("data/rooms/norfair/norfair_36_clipdata.gfx"); +const u8 sNorfair_36_Clipdata[93] = { + #include "extracted/data/rooms/norfair/norfair_36_clipdata.gfx.inc" +}; -const u8 sNorfair_36_Bg1[169] = INCBIN_U8("data/rooms/norfair/norfair_36_bg1.gfx"); +const u8 sNorfair_36_Bg1[169] = { + #include "extracted/data/rooms/norfair/norfair_36_bg1.gfx.inc" +}; const u8 sNorfair_36_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_37.c b/src/data/rooms/norfair/norfair_37.c index 36722ffce..eb595fe85 100644 --- a/src/data/rooms/norfair/norfair_37.c +++ b/src/data/rooms/norfair/norfair_37.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_37_Clipdata[321] = INCBIN_U8("data/rooms/norfair/norfair_37_clipdata.gfx"); +const u8 sNorfair_37_Clipdata[321] = { + #include "extracted/data/rooms/norfair/norfair_37_clipdata.gfx.inc" +}; const u8 sNorfair_37_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 6, 40, SPRITESET_IDX(0), @@ -12,7 +14,9 @@ const u8 sNorfair_37_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_37_Bg2[132] = INCBIN_U8("data/rooms/norfair/norfair_37_bg2.gfx"); +const u8 sNorfair_37_Bg2[132] = { + #include "extracted/data/rooms/norfair/norfair_37_bg2.gfx.inc" +}; const u8 sNorfair_37_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 7, 34, SPRITESET_IDX(1), @@ -30,7 +34,9 @@ const u8 sNorfair_37_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_37_Bg1[774] = INCBIN_U8("data/rooms/norfair/norfair_37_bg1.gfx"); +const u8 sNorfair_37_Bg1[774] = { + #include "extracted/data/rooms/norfair/norfair_37_bg1.gfx.inc" +}; const u8 sNorfair_37_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 6, 40, SPRITESET_IDX(0), @@ -45,5 +51,7 @@ const u8 sNorfair_37_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_37_Bg0[1242] = INCBIN_U8("data/rooms/norfair/norfair_37_bg0.gfx"); +const u8 sNorfair_37_Bg0[1242] = { + #include "extracted/data/rooms/norfair/norfair_37_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_38.c b/src/data/rooms/norfair/norfair_38.c index 4f722fef9..82eeb05f3 100644 --- a/src/data/rooms/norfair/norfair_38.c +++ b/src/data/rooms/norfair/norfair_38.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_38_Clipdata[157] = INCBIN_U8("data/rooms/norfair/norfair_38_clipdata.gfx"); +const u8 sNorfair_38_Clipdata[157] = { + #include "extracted/data/rooms/norfair/norfair_38_clipdata.gfx.inc" +}; -const u8 sNorfair_38_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_38_bg2.gfx"); +const u8 sNorfair_38_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_38_bg2.gfx.inc" +}; const u8 sNorfair_38_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 4, 8, SPRITESET_IDX(1), @@ -18,7 +22,9 @@ const u8 sNorfair_38_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_38_Bg1[462] = INCBIN_U8("data/rooms/norfair/norfair_38_bg1.gfx"); +const u8 sNorfair_38_Bg1[462] = { + #include "extracted/data/rooms/norfair/norfair_38_bg1.gfx.inc" +}; const u8 sNorfair_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 21, 11, SPRITESET_IDX(4), @@ -26,5 +32,7 @@ const u8 sNorfair_38_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_38_Bg0[228] = INCBIN_U8("data/rooms/norfair/norfair_38_bg0.gfx"); +const u8 sNorfair_38_Bg0[228] = { + #include "extracted/data/rooms/norfair/norfair_38_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_39.c b/src/data/rooms/norfair/norfair_39.c index 0860137ee..2d96278d3 100644 --- a/src/data/rooms/norfair/norfair_39.c +++ b/src/data/rooms/norfair/norfair_39.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_39_Clipdata[92] = INCBIN_U8("data/rooms/norfair/norfair_39_clipdata.gfx"); +const u8 sNorfair_39_Clipdata[92] = { + #include "extracted/data/rooms/norfair/norfair_39_clipdata.gfx.inc" +}; -const u8 sNorfair_39_Bg1[166] = INCBIN_U8("data/rooms/norfair/norfair_39_bg1.gfx"); +const u8 sNorfair_39_Bg1[166] = { + #include "extracted/data/rooms/norfair/norfair_39_bg1.gfx.inc" +}; const u8 sNorfair_39_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_4.c b/src/data/rooms/norfair/norfair_4.c index 8da3be2ee..95e860c8b 100644 --- a/src/data/rooms/norfair/norfair_4.c +++ b/src/data/rooms/norfair/norfair_4.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_4_Clipdata[507] = INCBIN_U8("data/rooms/norfair/norfair_4_clipdata.gfx"); +const u8 sNorfair_4_Clipdata[507] = { + #include "extracted/data/rooms/norfair/norfair_4_clipdata.gfx.inc" +}; const u8 sNorfair_4_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { 4, 43, SPRITESET_IDX(1), @@ -23,7 +25,9 @@ const u8 sNorfair_4_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_4_Bg2[63] = INCBIN_U8("data/rooms/norfair/norfair_4_bg2.gfx"); +const u8 sNorfair_4_Bg2[63] = { + #include "extracted/data/rooms/norfair/norfair_4_bg2.gfx.inc" +}; const u8 sNorfair_4_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { 6, 41, SPRITESET_IDX(0), @@ -42,7 +46,9 @@ const u8 sNorfair_4_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_4_Bg1[1198] = INCBIN_U8("data/rooms/norfair/norfair_4_bg1.gfx"); +const u8 sNorfair_4_Bg1[1198] = { + #include "extracted/data/rooms/norfair/norfair_4_bg1.gfx.inc" +}; const u8 sNorfair_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 9, 54, SPRITESET_IDX(3), @@ -54,5 +60,7 @@ const u8 sNorfair_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_4_Bg0[402] = INCBIN_U8("data/rooms/norfair/norfair_4_bg0.gfx"); +const u8 sNorfair_4_Bg0[402] = { + #include "extracted/data/rooms/norfair/norfair_4_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_40.c b/src/data/rooms/norfair/norfair_40.c index 3dee24068..95a382e05 100644 --- a/src/data/rooms/norfair/norfair_40.c +++ b/src/data/rooms/norfair/norfair_40.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_40_Clipdata[46] = INCBIN_U8("data/rooms/norfair/norfair_40_clipdata.gfx"); +const u8 sNorfair_40_Clipdata[46] = { + #include "extracted/data/rooms/norfair/norfair_40_clipdata.gfx.inc" +}; -const u8 sNorfair_40_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_40_bg2.gfx"); +const u8 sNorfair_40_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_40_bg2.gfx.inc" +}; -const u8 sNorfair_40_Bg1[169] = INCBIN_U8("data/rooms/norfair/norfair_40_bg1.gfx"); +const u8 sNorfair_40_Bg1[169] = { + #include "extracted/data/rooms/norfair/norfair_40_bg1.gfx.inc" +}; const u8 sNorfair_40_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 5, 5, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_41.c b/src/data/rooms/norfair/norfair_41.c index 9afa30d19..846d8d285 100644 --- a/src/data/rooms/norfair/norfair_41.c +++ b/src/data/rooms/norfair/norfair_41.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_41_Clipdata[93] = INCBIN_U8("data/rooms/norfair/norfair_41_clipdata.gfx"); +const u8 sNorfair_41_Clipdata[93] = { + #include "extracted/data/rooms/norfair/norfair_41_clipdata.gfx.inc" +}; -const u8 sNorfair_41_Bg1[165] = INCBIN_U8("data/rooms/norfair/norfair_41_bg1.gfx"); +const u8 sNorfair_41_Bg1[165] = { + #include "extracted/data/rooms/norfair/norfair_41_bg1.gfx.inc" +}; const u8 sNorfair_41_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_42.c b/src/data/rooms/norfair/norfair_42.c index d2b832f95..bc047c022 100644 --- a/src/data/rooms/norfair/norfair_42.c +++ b/src/data/rooms/norfair/norfair_42.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_42_Clipdata[187] = INCBIN_U8("data/rooms/norfair/norfair_42_clipdata.gfx"); +const u8 sNorfair_42_Clipdata[187] = { + #include "extracted/data/rooms/norfair/norfair_42_clipdata.gfx.inc" +}; -const u8 sNorfair_42_Bg2[223] = INCBIN_U8("data/rooms/norfair/norfair_42_bg2.gfx"); +const u8 sNorfair_42_Bg2[223] = { + #include "extracted/data/rooms/norfair/norfair_42_bg2.gfx.inc" +}; -const u8 sNorfair_42_Bg1[314] = INCBIN_U8("data/rooms/norfair/norfair_42_bg1.gfx"); +const u8 sNorfair_42_Bg1[314] = { + #include "extracted/data/rooms/norfair/norfair_42_bg1.gfx.inc" +}; const u8 sNorfair_42_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 5, 13, SPRITESET_IDX(1), @@ -13,5 +19,7 @@ const u8 sNorfair_42_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_42_Bg0[91] = INCBIN_U8("data/rooms/norfair/norfair_42_bg0.gfx"); +const u8 sNorfair_42_Bg0[91] = { + #include "extracted/data/rooms/norfair/norfair_42_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_43.c b/src/data/rooms/norfair/norfair_43.c index 3f10f06ea..c2a0747bb 100644 --- a/src/data/rooms/norfair/norfair_43.c +++ b/src/data/rooms/norfair/norfair_43.c @@ -13,11 +13,17 @@ const u8 sNorfair_14_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_43_Clipdata[] = INCBIN_U8("data/rooms/norfair/norfair_43_clipdata.gfx"); +const u8 sNorfair_43_Clipdata[] = { + #include "extracted/data/rooms/norfair/norfair_43_clipdata.gfx.inc" +}; -const u8 sNorfair_43_Bg2[1237] = INCBIN_U8("data/rooms/norfair/norfair_43_bg2.gfx"); +const u8 sNorfair_43_Bg2[1237] = { + #include "extracted/data/rooms/norfair/norfair_43_bg2.gfx.inc" +}; -const u8 sNorfair_43_Bg1[] = INCBIN_U8("data/rooms/norfair/norfair_43_bg1.gfx"); +const u8 sNorfair_43_Bg1[] = { + #include "extracted/data/rooms/norfair/norfair_43_bg1.gfx.inc" +}; const u8 sNorfair_43_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 2, 23, SPRITESET_IDX(0), @@ -25,5 +31,7 @@ const u8 sNorfair_43_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_43_Bg0[] = INCBIN_U8("data/rooms/norfair/norfair_43_bg0.gfx"); +const u8 sNorfair_43_Bg0[] = { + #include "extracted/data/rooms/norfair/norfair_43_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_44.c b/src/data/rooms/norfair/norfair_44.c index 5b750cd1b..e6798694c 100644 --- a/src/data/rooms/norfair/norfair_44.c +++ b/src/data/rooms/norfair/norfair_44.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_44_Clipdata[85] = INCBIN_U8("data/rooms/norfair/norfair_44_clipdata.gfx"); +const u8 sNorfair_44_Clipdata[85] = { + #include "extracted/data/rooms/norfair/norfair_44_clipdata.gfx.inc" +}; -const u8 sNorfair_44_Bg1[162] = INCBIN_U8("data/rooms/norfair/norfair_44_bg1.gfx"); +const u8 sNorfair_44_Bg1[162] = { + #include "extracted/data/rooms/norfair/norfair_44_bg1.gfx.inc" +}; const u8 sNorfair_44_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_45.c b/src/data/rooms/norfair/norfair_45.c index fc79e8cbe..1c4bff607 100644 --- a/src/data/rooms/norfair/norfair_45.c +++ b/src/data/rooms/norfair/norfair_45.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_45_Clipdata[92] = INCBIN_U8("data/rooms/norfair/norfair_45_clipdata.gfx"); +const u8 sNorfair_45_Clipdata[92] = { + #include "extracted/data/rooms/norfair/norfair_45_clipdata.gfx.inc" +}; -const u8 sNorfair_45_Bg1[166] = INCBIN_U8("data/rooms/norfair/norfair_45_bg1.gfx"); +const u8 sNorfair_45_Bg1[166] = { + #include "extracted/data/rooms/norfair/norfair_45_bg1.gfx.inc" +}; const u8 sNorfair_45_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_46.c b/src/data/rooms/norfair/norfair_46.c index 926f4b67e..55b4263e0 100644 --- a/src/data/rooms/norfair/norfair_46.c +++ b/src/data/rooms/norfair/norfair_46.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_46_Clipdata[170] = INCBIN_U8("data/rooms/norfair/norfair_46_clipdata.gfx"); +const u8 sNorfair_46_Clipdata[170] = { + #include "extracted/data/rooms/norfair/norfair_46_clipdata.gfx.inc" +}; -const u8 sNorfair_46_Bg2[228] = INCBIN_U8("data/rooms/norfair/norfair_46_bg2.gfx"); +const u8 sNorfair_46_Bg2[228] = { + #include "extracted/data/rooms/norfair/norfair_46_bg2.gfx.inc" +}; -const u8 sNorfair_46_Bg1[314] = INCBIN_U8("data/rooms/norfair/norfair_46_bg1.gfx"); +const u8 sNorfair_46_Bg1[314] = { + #include "extracted/data/rooms/norfair/norfair_46_bg1.gfx.inc" +}; const u8 sNorfair_46_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 34, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_46_Bg0[126] = INCBIN_U8("data/rooms/norfair/norfair_46_bg0.gfx"); +const u8 sNorfair_46_Bg0[126] = { + #include "extracted/data/rooms/norfair/norfair_46_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_47.c b/src/data/rooms/norfair/norfair_47.c index de16c1780..5d9ead6b5 100644 --- a/src/data/rooms/norfair/norfair_47.c +++ b/src/data/rooms/norfair/norfair_47.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_47_Clipdata[151] = INCBIN_U8("data/rooms/norfair/norfair_47_clipdata.gfx"); +const u8 sNorfair_47_Clipdata[151] = { + #include "extracted/data/rooms/norfair/norfair_47_clipdata.gfx.inc" +}; const u8 sNorfair_47_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 6, 11, SPRITESET_IDX(2), @@ -10,7 +12,9 @@ const u8 sNorfair_47_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_47_Bg2[65] = INCBIN_U8("data/rooms/norfair/norfair_47_bg2.gfx"); +const u8 sNorfair_47_Bg2[65] = { + #include "extracted/data/rooms/norfair/norfair_47_bg2.gfx.inc" +}; const u8 sNorfair_47_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 11, SPRITESET_IDX(2), @@ -20,7 +24,9 @@ const u8 sNorfair_47_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_47_Bg1[277] = INCBIN_U8("data/rooms/norfair/norfair_47_bg1.gfx"); +const u8 sNorfair_47_Bg1[277] = { + #include "extracted/data/rooms/norfair/norfair_47_bg1.gfx.inc" +}; const u8 sNorfair_47_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 6, 11, SPRITESET_IDX(2), diff --git a/src/data/rooms/norfair/norfair_48.c b/src/data/rooms/norfair/norfair_48.c index d4692bd4d..3ea48d3d6 100644 --- a/src/data/rooms/norfair/norfair_48.c +++ b/src/data/rooms/norfair/norfair_48.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_48_Clipdata[220] = INCBIN_U8("data/rooms/norfair/norfair_48_clipdata.gfx"); +const u8 sNorfair_48_Clipdata[220] = { + #include "extracted/data/rooms/norfair/norfair_48_clipdata.gfx.inc" +}; -const u8 sNorfair_48_Bg2[978] = INCBIN_U8("data/rooms/norfair/norfair_48_bg2.gfx"); +const u8 sNorfair_48_Bg2[978] = { + #include "extracted/data/rooms/norfair/norfair_48_bg2.gfx.inc" +}; -const u8 sNorfair_48_Bg1[437] = INCBIN_U8("data/rooms/norfair/norfair_48_bg1.gfx"); +const u8 sNorfair_48_Bg1[437] = { + #include "extracted/data/rooms/norfair/norfair_48_bg1.gfx.inc" +}; const u8 sNorfair_48_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 8, 25, SPRITESET_IDX(1), @@ -13,5 +19,7 @@ const u8 sNorfair_48_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_48_Bg0[76] = INCBIN_U8("data/rooms/norfair/norfair_48_bg0.gfx"); +const u8 sNorfair_48_Bg0[76] = { + #include "extracted/data/rooms/norfair/norfair_48_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_49.c b/src/data/rooms/norfair/norfair_49.c index b0f5b4689..e52a8442f 100644 --- a/src/data/rooms/norfair/norfair_49.c +++ b/src/data/rooms/norfair/norfair_49.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_49_Clipdata[182] = INCBIN_U8("data/rooms/norfair/norfair_49_clipdata.gfx"); +const u8 sNorfair_49_Clipdata[182] = { + #include "extracted/data/rooms/norfair/norfair_49_clipdata.gfx.inc" +}; -const u8 sNorfair_49_Bg2[98] = INCBIN_U8("data/rooms/norfair/norfair_49_bg2.gfx"); +const u8 sNorfair_49_Bg2[98] = { + #include "extracted/data/rooms/norfair/norfair_49_bg2.gfx.inc" +}; -const u8 sNorfair_49_Bg1[361] = INCBIN_U8("data/rooms/norfair/norfair_49_bg1.gfx"); +const u8 sNorfair_49_Bg1[361] = { + #include "extracted/data/rooms/norfair/norfair_49_bg1.gfx.inc" +}; const u8 sNorfair_49_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 6, 21, SPRITESET_IDX(0), @@ -13,5 +19,7 @@ const u8 sNorfair_49_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_49_Bg0[462] = INCBIN_U8("data/rooms/norfair/norfair_49_bg0.gfx"); +const u8 sNorfair_49_Bg0[462] = { + #include "extracted/data/rooms/norfair/norfair_49_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_5.c b/src/data/rooms/norfair/norfair_5.c index 8ff2b31cd..72a3030f1 100644 --- a/src/data/rooms/norfair/norfair_5.c +++ b/src/data/rooms/norfair/norfair_5.c @@ -41,9 +41,13 @@ const u8 sNorfair_2_Scrolls[SCROLL_DATA_SIZE(5)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_5_Clipdata[1592] = INCBIN_U8("data/rooms/norfair/norfair_5_clipdata.gfx"); +const u8 sNorfair_5_Clipdata[1592] = { + #include "extracted/data/rooms/norfair/norfair_5_clipdata.gfx.inc" +}; -const u8 sNorfair_5_Bg2[2172] = INCBIN_U8("data/rooms/norfair/norfair_5_bg2.gfx"); +const u8 sNorfair_5_Bg2[2172] = { + #include "extracted/data/rooms/norfair/norfair_5_bg2.gfx.inc" +}; const u8 sNorfair_5_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { 8, 11, SPRITESET_IDX(0), @@ -62,7 +66,9 @@ const u8 sNorfair_5_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_5_Bg1[2886] = INCBIN_U8("data/rooms/norfair/norfair_5_bg1.gfx"); +const u8 sNorfair_5_Bg1[2886] = { + #include "extracted/data/rooms/norfair/norfair_5_bg1.gfx.inc" +}; const u8 sNorfair_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 6, 12, SPRITESET_IDX(2), @@ -80,5 +86,7 @@ const u8 sNorfair_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_5_Bg0[363] = INCBIN_U8("data/rooms/norfair/norfair_5_bg0.gfx"); +const u8 sNorfair_5_Bg0[363] = { + #include "extracted/data/rooms/norfair/norfair_5_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_50.c b/src/data/rooms/norfair/norfair_50.c index 31b921ab3..621e57e3f 100644 --- a/src/data/rooms/norfair/norfair_50.c +++ b/src/data/rooms/norfair/norfair_50.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_50_Clipdata[32] = INCBIN_U8("data/rooms/norfair/norfair_50_clipdata.gfx"); +const u8 sNorfair_50_Clipdata[32] = { + #include "extracted/data/rooms/norfair/norfair_50_clipdata.gfx.inc" +}; -const u8 sNorfair_50_Bg2[122] = INCBIN_U8("data/rooms/norfair/norfair_50_bg2.gfx"); +const u8 sNorfair_50_Bg2[122] = { + #include "extracted/data/rooms/norfair/norfair_50_bg2.gfx.inc" +}; -const u8 sNorfair_50_Bg1[289] = INCBIN_U8("data/rooms/norfair/norfair_50_bg1.gfx"); +const u8 sNorfair_50_Bg1[289] = { + #include "extracted/data/rooms/norfair/norfair_50_bg1.gfx.inc" +}; const u8 sNorfair_50_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/norfair/norfair_51.c b/src/data/rooms/norfair/norfair_51.c index 4cd04f078..9404c0571 100644 --- a/src/data/rooms/norfair/norfair_51.c +++ b/src/data/rooms/norfair/norfair_51.c @@ -1,15 +1,23 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_51_Clipdata[32] = INCBIN_U8("data/rooms/norfair/norfair_51_clipdata.gfx"); +const u8 sNorfair_51_Clipdata[32] = { + #include "extracted/data/rooms/norfair/norfair_51_clipdata.gfx.inc" +}; -const u8 sNorfair_51_Bg2[505] = INCBIN_U8("data/rooms/norfair/norfair_51_bg2.gfx"); +const u8 sNorfair_51_Bg2[505] = { + #include "extracted/data/rooms/norfair/norfair_51_bg2.gfx.inc" +}; -const u8 sNorfair_51_Bg1[] = INCBIN_U8("data/rooms/norfair/norfair_51_bg1.gfx"); +const u8 sNorfair_51_Bg1[] = { + #include "extracted/data/rooms/norfair/norfair_51_bg1.gfx.inc" +}; const u8 sNorfair_51_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_51_Bg0[270] = INCBIN_U8("data/rooms/norfair/norfair_51_bg0.gfx"); +const u8 sNorfair_51_Bg0[270] = { + #include "extracted/data/rooms/norfair/norfair_51_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_52.c b/src/data/rooms/norfair/norfair_52.c index 7097fdf58..1c226ea36 100644 --- a/src/data/rooms/norfair/norfair_52.c +++ b/src/data/rooms/norfair/norfair_52.c @@ -1,16 +1,24 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_52_Clipdata[147] = INCBIN_U8("data/rooms/norfair/norfair_52_clipdata.gfx"); +const u8 sNorfair_52_Clipdata[147] = { + #include "extracted/data/rooms/norfair/norfair_52_clipdata.gfx.inc" +}; -const u8 sNorfair_52_Bg2[1329] = INCBIN_U8("data/rooms/norfair/norfair_52_bg2.gfx"); +const u8 sNorfair_52_Bg2[1329] = { + #include "extracted/data/rooms/norfair/norfair_52_bg2.gfx.inc" +}; -const u8 sNorfair_52_Bg1[516] = INCBIN_U8("data/rooms/norfair/norfair_52_bg1.gfx"); +const u8 sNorfair_52_Bg1[516] = { + #include "extracted/data/rooms/norfair/norfair_52_bg1.gfx.inc" +}; const u8 sNorfair_52_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 9, 7, SPRITESET_IDX(3), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_52_Bg0[694] = INCBIN_U8("data/rooms/norfair/norfair_52_bg0.gfx"); +const u8 sNorfair_52_Bg0[694] = { + #include "extracted/data/rooms/norfair/norfair_52_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_53.c b/src/data/rooms/norfair/norfair_53.c index 9fd69a00e..457ec1b03 100644 --- a/src/data/rooms/norfair/norfair_53.c +++ b/src/data/rooms/norfair/norfair_53.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_53_Clipdata[100] = INCBIN_U8("data/rooms/norfair/norfair_53_clipdata.gfx"); +const u8 sNorfair_53_Clipdata[100] = { + #include "extracted/data/rooms/norfair/norfair_53_clipdata.gfx.inc" +}; -const u8 sNorfair_53_Bg2[108] = INCBIN_U8("data/rooms/norfair/norfair_53_bg2.gfx"); +const u8 sNorfair_53_Bg2[108] = { + #include "extracted/data/rooms/norfair/norfair_53_bg2.gfx.inc" +}; -const u8 sNorfair_53_Bg1[234] = INCBIN_U8("data/rooms/norfair/norfair_53_bg1.gfx"); +const u8 sNorfair_53_Bg1[234] = { + #include "extracted/data/rooms/norfair/norfair_53_bg1.gfx.inc" +}; const u8 sNorfair_53_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 19, 6, SPRITESET_IDX(0), diff --git a/src/data/rooms/norfair/norfair_54.c b/src/data/rooms/norfair/norfair_54.c index 88f6f390d..4483385a1 100644 --- a/src/data/rooms/norfair/norfair_54.c +++ b/src/data/rooms/norfair/norfair_54.c @@ -20,16 +20,24 @@ const u8 sNorfair_15_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_54_Clipdata[266] = INCBIN_U8("data/rooms/norfair/norfair_54_clipdata.gfx"); +const u8 sNorfair_54_Clipdata[266] = { + #include "extracted/data/rooms/norfair/norfair_54_clipdata.gfx.inc" +}; -const u8 sNorfair_54_Bg2[606] = INCBIN_U8("data/rooms/norfair/norfair_54_bg2.gfx"); +const u8 sNorfair_54_Bg2[606] = { + #include "extracted/data/rooms/norfair/norfair_54_bg2.gfx.inc" +}; -const u8 sNorfair_54_Bg1[927] = INCBIN_U8("data/rooms/norfair/norfair_54_bg1.gfx"); +const u8 sNorfair_54_Bg1[927] = { + #include "extracted/data/rooms/norfair/norfair_54_bg1.gfx.inc" +}; const u8 sNorfair_54_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 2, 23, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_54_Bg0[85] = INCBIN_U8("data/rooms/norfair/norfair_54_bg0.gfx"); +const u8 sNorfair_54_Bg0[85] = { + #include "extracted/data/rooms/norfair/norfair_54_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_55.c b/src/data/rooms/norfair/norfair_55.c index d70dc16c1..54b40b6ae 100644 --- a/src/data/rooms/norfair/norfair_55.c +++ b/src/data/rooms/norfair/norfair_55.c @@ -13,15 +13,23 @@ const u8 sNorfair_16_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sNorfair_55_Clipdata[406] = INCBIN_U8("data/rooms/norfair/norfair_55_clipdata.gfx"); +const u8 sNorfair_55_Clipdata[406] = { + #include "extracted/data/rooms/norfair/norfair_55_clipdata.gfx.inc" +}; -const u8 sNorfair_55_Bg2[142] = INCBIN_U8("data/rooms/norfair/norfair_55_bg2.gfx"); +const u8 sNorfair_55_Bg2[142] = { + #include "extracted/data/rooms/norfair/norfair_55_bg2.gfx.inc" +}; -const u8 sNorfair_55_Bg1[1189] = INCBIN_U8("data/rooms/norfair/norfair_55_bg1.gfx"); +const u8 sNorfair_55_Bg1[1189] = { + #include "extracted/data/rooms/norfair/norfair_55_bg1.gfx.inc" +}; const u8 sNorfair_55_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_55_Bg0[750] = INCBIN_U8("data/rooms/norfair/norfair_55_bg0.gfx"); +const u8 sNorfair_55_Bg0[750] = { + #include "extracted/data/rooms/norfair/norfair_55_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_56.c b/src/data/rooms/norfair/norfair_56.c index 815e60065..639c8ecea 100644 --- a/src/data/rooms/norfair/norfair_56.c +++ b/src/data/rooms/norfair/norfair_56.c @@ -1,11 +1,17 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_56_Clipdata[58] = INCBIN_U8("data/rooms/norfair/norfair_56_clipdata.gfx"); +const u8 sNorfair_56_Clipdata[58] = { + #include "extracted/data/rooms/norfair/norfair_56_clipdata.gfx.inc" +}; -const u8 sNorfair_56_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_56_bg2.gfx"); +const u8 sNorfair_56_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_56_bg2.gfx.inc" +}; -const u8 sNorfair_56_Bg1[231] = INCBIN_U8("data/rooms/norfair/norfair_56_bg1.gfx"); +const u8 sNorfair_56_Bg1[231] = { + #include "extracted/data/rooms/norfair/norfair_56_bg1.gfx.inc" +}; const u8 sNorfair_56_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/norfair/norfair_6.c b/src/data/rooms/norfair/norfair_6.c index 943111cda..3eeec4a3a 100644 --- a/src/data/rooms/norfair/norfair_6.c +++ b/src/data/rooms/norfair/norfair_6.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_6_Clipdata[128] = INCBIN_U8("data/rooms/norfair/norfair_6_clipdata.gfx"); +const u8 sNorfair_6_Clipdata[128] = { + #include "extracted/data/rooms/norfair/norfair_6_clipdata.gfx.inc" +}; -const u8 sNorfair_6_Bg2[111] = INCBIN_U8("data/rooms/norfair/norfair_6_bg2.gfx"); +const u8 sNorfair_6_Bg2[111] = { + #include "extracted/data/rooms/norfair/norfair_6_bg2.gfx.inc" +}; const u8 sNorfair_6_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 7, 24, SPRITESET_IDX(0), @@ -15,7 +19,9 @@ const u8 sNorfair_6_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_6_Bg1[280] = INCBIN_U8("data/rooms/norfair/norfair_6_bg1.gfx"); +const u8 sNorfair_6_Bg1[280] = { + #include "extracted/data/rooms/norfair/norfair_6_bg1.gfx.inc" +}; const u8 sNorfair_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 7, 26, SPRITESET_IDX(0), @@ -27,5 +33,7 @@ const u8 sNorfair_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_6_Bg0[175] = INCBIN_U8("data/rooms/norfair/norfair_6_bg0.gfx"); +const u8 sNorfair_6_Bg0[175] = { + #include "extracted/data/rooms/norfair/norfair_6_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_7.c b/src/data/rooms/norfair/norfair_7.c index f7697d473..1c04d05cc 100644 --- a/src/data/rooms/norfair/norfair_7.c +++ b/src/data/rooms/norfair/norfair_7.c @@ -1,9 +1,13 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_7_Clipdata[180] = INCBIN_U8("data/rooms/norfair/norfair_7_clipdata.gfx"); +const u8 sNorfair_7_Clipdata[180] = { + #include "extracted/data/rooms/norfair/norfair_7_clipdata.gfx.inc" +}; -const u8 sNorfair_7_Bg2[251] = INCBIN_U8("data/rooms/norfair/norfair_7_bg2.gfx"); +const u8 sNorfair_7_Bg2[251] = { + #include "extracted/data/rooms/norfair/norfair_7_bg2.gfx.inc" +}; const u8 sNorfair_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 4, 8, SPRITESET_IDX(2), @@ -15,7 +19,9 @@ const u8 sNorfair_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_7_Bg1[478] = INCBIN_U8("data/rooms/norfair/norfair_7_bg1.gfx"); +const u8 sNorfair_7_Bg1[478] = { + #include "extracted/data/rooms/norfair/norfair_7_bg1.gfx.inc" +}; const u8 sNorfair_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 11, 11, SPRITESET_IDX(2), @@ -24,5 +30,7 @@ const u8 sNorfair_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_7_Bg0[82] = INCBIN_U8("data/rooms/norfair/norfair_7_bg0.gfx"); +const u8 sNorfair_7_Bg0[82] = { + #include "extracted/data/rooms/norfair/norfair_7_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_8.c b/src/data/rooms/norfair/norfair_8.c index 180bc90d4..45b33e09d 100644 --- a/src/data/rooms/norfair/norfair_8.c +++ b/src/data/rooms/norfair/norfair_8.c @@ -20,11 +20,17 @@ const u8 sNorfair_3_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sNorfair_8_Clipdata[150] = INCBIN_U8("data/rooms/norfair/norfair_8_clipdata.gfx"); +const u8 sNorfair_8_Clipdata[150] = { + #include "extracted/data/rooms/norfair/norfair_8_clipdata.gfx.inc" +}; -const u8 sNorfair_8_Bg2[292] = INCBIN_U8("data/rooms/norfair/norfair_8_bg2.gfx"); +const u8 sNorfair_8_Bg2[292] = { + #include "extracted/data/rooms/norfair/norfair_8_bg2.gfx.inc" +}; -const u8 sNorfair_8_Bg1[347] = INCBIN_U8("data/rooms/norfair/norfair_8_bg1.gfx"); +const u8 sNorfair_8_Bg1[347] = { + #include "extracted/data/rooms/norfair/norfair_8_bg1.gfx.inc" +}; const u8 sNorfair_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 7, 9, SPRITESET_IDX(1), @@ -32,5 +38,7 @@ const u8 sNorfair_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_8_Bg0[128] = INCBIN_U8("data/rooms/norfair/norfair_8_bg0.gfx"); +const u8 sNorfair_8_Bg0[128] = { + #include "extracted/data/rooms/norfair/norfair_8_bg0.gfx.inc" +}; diff --git a/src/data/rooms/norfair/norfair_9.c b/src/data/rooms/norfair/norfair_9.c index bfdc6e7f3..27849c957 100644 --- a/src/data/rooms/norfair/norfair_9.c +++ b/src/data/rooms/norfair/norfair_9.c @@ -1,7 +1,9 @@ #include "data/rooms/norfair_rooms_data.h" #include "macros.h" -const u8 sNorfair_9_Clipdata[117] = INCBIN_U8("data/rooms/norfair/norfair_9_clipdata.gfx"); +const u8 sNorfair_9_Clipdata[117] = { + #include "extracted/data/rooms/norfair/norfair_9_clipdata.gfx.inc" +}; const u8 sNorfair_9_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 11, 20, SPRITESET_IDX(0), @@ -9,7 +11,9 @@ const u8 sNorfair_9_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_9_Bg2[14] = INCBIN_U8("data/rooms/norfair/norfair_9_bg2.gfx"); +const u8 sNorfair_9_Bg2[14] = { + #include "extracted/data/rooms/norfair/norfair_9_bg2.gfx.inc" +}; const u8 sNorfair_9_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { 2, 20, SPRITESET_IDX(0), @@ -23,7 +27,9 @@ const u8 sNorfair_9_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(9)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_9_Bg1[282] = INCBIN_U8("data/rooms/norfair/norfair_9_bg1.gfx"); +const u8 sNorfair_9_Bg1[282] = { + #include "extracted/data/rooms/norfair/norfair_9_bg1.gfx.inc" +}; const u8 sNorfair_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 2, 20, SPRITESET_IDX(0), @@ -34,5 +40,7 @@ const u8 sNorfair_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sNorfair_9_Bg0[265] = INCBIN_U8("data/rooms/norfair/norfair_9_bg0.gfx"); +const u8 sNorfair_9_Bg0[265] = { + #include "extracted/data/rooms/norfair/norfair_9_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/bg3.c b/src/data/rooms/ridley/bg3.c index 9832ea426..144743895 100644 --- a/src/data/rooms/ridley/bg3.c +++ b/src/data/rooms/ridley/bg3.c @@ -1,14 +1,26 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_Bg3_0[1404] = INCBIN_U8("data/rooms/ridley/ridley_bg3_0.gfx"); +const u8 sRidley_Bg3_0[1404] = { + #include "extracted/data/rooms/ridley/ridley_bg3_0.gfx.inc" +}; -const u8 sRidley_Bg3_1[1300] = INCBIN_U8("data/rooms/ridley/ridley_bg3_1.gfx"); +const u8 sRidley_Bg3_1[1300] = { + #include "extracted/data/rooms/ridley/ridley_bg3_1.gfx.inc" +}; -const u8 sRidley_Bg3_2[1416] = INCBIN_U8("data/rooms/ridley/ridley_bg3_2.gfx"); +const u8 sRidley_Bg3_2[1416] = { + #include "extracted/data/rooms/ridley/ridley_bg3_2.gfx.inc" +}; -const u8 sRidley_Bg3_3[1248] = INCBIN_U8("data/rooms/ridley/ridley_bg3_3.gfx"); +const u8 sRidley_Bg3_3[1248] = { + #include "extracted/data/rooms/ridley/ridley_bg3_3.gfx.inc" +}; -const u8 sRidley_Bg3_4[1248] = INCBIN_U8("data/rooms/ridley/ridley_bg3_4.gfx"); +const u8 sRidley_Bg3_4[1248] = { + #include "extracted/data/rooms/ridley/ridley_bg3_4.gfx.inc" +}; -const u8 sRidley_Bg3_5[1268] = INCBIN_U8("data/rooms/ridley/ridley_bg3_5.gfx"); +const u8 sRidley_Bg3_5[1268] = { + #include "extracted/data/rooms/ridley/ridley_bg3_5.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_0.c b/src/data/rooms/ridley/ridley_0.c index 367b99820..bc245f511 100644 --- a/src/data/rooms/ridley/ridley_0.c +++ b/src/data/rooms/ridley/ridley_0.c @@ -13,16 +13,24 @@ const u8 sRidley_0_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sRidley_0_Clipdata[188] = INCBIN_U8("data/rooms/ridley/ridley_0_clipdata.gfx"); +const u8 sRidley_0_Clipdata[188] = { + #include "extracted/data/rooms/ridley/ridley_0_clipdata.gfx.inc" +}; -const u8 sRidley_0_Bg2[152] = INCBIN_U8("data/rooms/ridley/ridley_0_bg2.gfx"); +const u8 sRidley_0_Bg2[152] = { + #include "extracted/data/rooms/ridley/ridley_0_bg2.gfx.inc" +}; -const u8 sRidley_0_Bg1[530] = INCBIN_U8("data/rooms/ridley/ridley_0_bg1.gfx"); +const u8 sRidley_0_Bg1[530] = { + #include "extracted/data/rooms/ridley/ridley_0_bg1.gfx.inc" +}; const u8 sRidley_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 15, 9, SPRITESET_IDX(4), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_0_Bg0[82] = INCBIN_U8("data/rooms/ridley/ridley_0_bg0.gfx"); +const u8 sRidley_0_Bg0[82] = { + #include "extracted/data/rooms/ridley/ridley_0_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_1.c b/src/data/rooms/ridley/ridley_1.c index 1729aa06b..2b5420f64 100644 --- a/src/data/rooms/ridley/ridley_1.c +++ b/src/data/rooms/ridley/ridley_1.c @@ -1,9 +1,13 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_1_Clipdata[92] = INCBIN_U8("data/rooms/ridley/ridley_1_clipdata.gfx"); +const u8 sRidley_1_Clipdata[92] = { + #include "extracted/data/rooms/ridley/ridley_1_clipdata.gfx.inc" +}; -const u8 sRidley_1_Bg1[166] = INCBIN_U8("data/rooms/ridley/ridley_1_bg1.gfx"); +const u8 sRidley_1_Bg1[166] = { + #include "extracted/data/rooms/ridley/ridley_1_bg1.gfx.inc" +}; const u8 sRidley_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_10.c b/src/data/rooms/ridley/ridley_10.c index a316fdec2..31eefe883 100644 --- a/src/data/rooms/ridley/ridley_10.c +++ b/src/data/rooms/ridley/ridley_10.c @@ -13,11 +13,17 @@ const u8 sRidley_4_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sRidley_10_Clipdata[248] = INCBIN_U8("data/rooms/ridley/ridley_10_clipdata.gfx"); +const u8 sRidley_10_Clipdata[248] = { + #include "extracted/data/rooms/ridley/ridley_10_clipdata.gfx.inc" +}; -const u8 sRidley_10_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_10_bg2.gfx"); +const u8 sRidley_10_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_10_bg2.gfx.inc" +}; -const u8 sRidley_10_Bg1[855] = INCBIN_U8("data/rooms/ridley/ridley_10_bg1.gfx"); +const u8 sRidley_10_Bg1[855] = { + #include "extracted/data/rooms/ridley/ridley_10_bg1.gfx.inc" +}; const u8 sRidley_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 14, 17, SPRITESET_IDX(5), diff --git a/src/data/rooms/ridley/ridley_11.c b/src/data/rooms/ridley/ridley_11.c index 08542eb41..c464035e5 100644 --- a/src/data/rooms/ridley/ridley_11.c +++ b/src/data/rooms/ridley/ridley_11.c @@ -20,11 +20,17 @@ const u8 sRidley_5_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_11_Clipdata[184] = INCBIN_U8("data/rooms/ridley/ridley_11_clipdata.gfx"); +const u8 sRidley_11_Clipdata[184] = { + #include "extracted/data/rooms/ridley/ridley_11_clipdata.gfx.inc" +}; -const u8 sRidley_11_Bg2[494] = INCBIN_U8("data/rooms/ridley/ridley_11_bg2.gfx"); +const u8 sRidley_11_Bg2[494] = { + #include "extracted/data/rooms/ridley/ridley_11_bg2.gfx.inc" +}; -const u8 sRidley_11_Bg1[407] = INCBIN_U8("data/rooms/ridley/ridley_11_bg1.gfx"); +const u8 sRidley_11_Bg1[407] = { + #include "extracted/data/rooms/ridley/ridley_11_bg1.gfx.inc" +}; const u8 sRidley_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 7, 23, SPRITESET_IDX(3), @@ -33,5 +39,7 @@ const u8 sRidley_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_11_Bg0[73] = INCBIN_U8("data/rooms/ridley/ridley_11_bg0.gfx"); +const u8 sRidley_11_Bg0[73] = { + #include "extracted/data/rooms/ridley/ridley_11_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_12.c b/src/data/rooms/ridley/ridley_12.c index d97d468e5..f851cd718 100644 --- a/src/data/rooms/ridley/ridley_12.c +++ b/src/data/rooms/ridley/ridley_12.c @@ -13,16 +13,24 @@ const u8 sRidley_6_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_12_Clipdata[126] = INCBIN_U8("data/rooms/ridley/ridley_12_clipdata.gfx"); +const u8 sRidley_12_Clipdata[126] = { + #include "extracted/data/rooms/ridley/ridley_12_clipdata.gfx.inc" +}; -const u8 sRidley_12_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_12_bg2.gfx"); +const u8 sRidley_12_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_12_bg2.gfx.inc" +}; -const u8 sRidley_12_Bg1[343] = INCBIN_U8("data/rooms/ridley/ridley_12_bg1.gfx"); +const u8 sRidley_12_Bg1[343] = { + #include "extracted/data/rooms/ridley/ridley_12_bg1.gfx.inc" +}; const u8 sRidley_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 11, 16, SPRITESET_IDX(0), ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_12_Bg0[289] = INCBIN_U8("data/rooms/ridley/ridley_12_bg0.gfx"); +const u8 sRidley_12_Bg0[289] = { + #include "extracted/data/rooms/ridley/ridley_12_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_13.c b/src/data/rooms/ridley/ridley_13.c index 53a57c37b..e133ad7c3 100644 --- a/src/data/rooms/ridley/ridley_13.c +++ b/src/data/rooms/ridley/ridley_13.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_13_Clipdata[118] = INCBIN_U8("data/rooms/ridley/ridley_13_clipdata.gfx"); +const u8 sRidley_13_Clipdata[118] = { + #include "extracted/data/rooms/ridley/ridley_13_clipdata.gfx.inc" +}; -const u8 sRidley_13_Bg2[401] = INCBIN_U8("data/rooms/ridley/ridley_13_bg2.gfx"); +const u8 sRidley_13_Bg2[401] = { + #include "extracted/data/rooms/ridley/ridley_13_bg2.gfx.inc" +}; -const u8 sRidley_13_Bg1[245] = INCBIN_U8("data/rooms/ridley/ridley_13_bg1.gfx"); +const u8 sRidley_13_Bg1[245] = { + #include "extracted/data/rooms/ridley/ridley_13_bg1.gfx.inc" +}; const u8 sRidley_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 7, 15, SPRITESET_IDX(1), @@ -13,5 +19,7 @@ const u8 sRidley_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_13_Bg0[43] = INCBIN_U8("data/rooms/ridley/ridley_13_bg0.gfx"); +const u8 sRidley_13_Bg0[43] = { + #include "extracted/data/rooms/ridley/ridley_13_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_14.c b/src/data/rooms/ridley/ridley_14.c index 33910cacf..d2786fb95 100644 --- a/src/data/rooms/ridley/ridley_14.c +++ b/src/data/rooms/ridley/ridley_14.c @@ -20,9 +20,13 @@ const u8 sRidley_7_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_14_Clipdata[163] = INCBIN_U8("data/rooms/ridley/ridley_14_clipdata.gfx"); +const u8 sRidley_14_Clipdata[163] = { + #include "extracted/data/rooms/ridley/ridley_14_clipdata.gfx.inc" +}; -const u8 sRidley_14_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_14_bg2.gfx"); +const u8 sRidley_14_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_14_bg2.gfx.inc" +}; const u8 sRidley_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 2, 20, SPRITESET_IDX(3), @@ -33,7 +37,9 @@ const u8 sRidley_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_14_Bg1[433] = INCBIN_U8("data/rooms/ridley/ridley_14_bg1.gfx"); +const u8 sRidley_14_Bg1[433] = { + #include "extracted/data/rooms/ridley/ridley_14_bg1.gfx.inc" +}; const u8 sRidley_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 2, 20, SPRITESET_IDX(3), @@ -46,5 +52,7 @@ const u8 sRidley_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_14_Bg0[242] = INCBIN_U8("data/rooms/ridley/ridley_14_bg0.gfx"); +const u8 sRidley_14_Bg0[242] = { + #include "extracted/data/rooms/ridley/ridley_14_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_15.c b/src/data/rooms/ridley/ridley_15.c index e66f00b7e..c268534e3 100644 --- a/src/data/rooms/ridley/ridley_15.c +++ b/src/data/rooms/ridley/ridley_15.c @@ -20,7 +20,9 @@ const u8 sRidley_8_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_15_Clipdata[516] = INCBIN_U8("data/rooms/ridley/ridley_15_clipdata.gfx"); +const u8 sRidley_15_Clipdata[516] = { + #include "extracted/data/rooms/ridley/ridley_15_clipdata.gfx.inc" +}; const u8 sRidley_15_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 22, 8, SPRITESET_IDX(3), @@ -31,7 +33,9 @@ const u8 sRidley_15_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_15_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_15_bg2.gfx"); +const u8 sRidley_15_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_15_bg2.gfx.inc" +}; const u8 sRidley_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 32, 13, SPRITESET_IDX(1), @@ -41,7 +45,9 @@ const u8 sRidley_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_15_Bg1[1040] = INCBIN_U8("data/rooms/ridley/ridley_15_bg1.gfx"); +const u8 sRidley_15_Bg1[1040] = { + #include "extracted/data/rooms/ridley/ridley_15_bg1.gfx.inc" +}; const u8 sRidley_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 22, 8, SPRITESET_IDX(3), @@ -52,5 +58,7 @@ const u8 sRidley_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_15_Bg0[141] = INCBIN_U8("data/rooms/ridley/ridley_15_bg0.gfx"); +const u8 sRidley_15_Bg0[141] = { + #include "extracted/data/rooms/ridley/ridley_15_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_16.c b/src/data/rooms/ridley/ridley_16.c index ff9a8c696..cd04cb6a6 100644 --- a/src/data/rooms/ridley/ridley_16.c +++ b/src/data/rooms/ridley/ridley_16.c @@ -27,9 +27,13 @@ const u8 sRidley_9_Scrolls[SCROLL_DATA_SIZE(3)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_16_Clipdata[311] = INCBIN_U8("data/rooms/ridley/ridley_16_clipdata.gfx"); +const u8 sRidley_16_Clipdata[311] = { + #include "extracted/data/rooms/ridley/ridley_16_clipdata.gfx.inc" +}; -const u8 sRidley_16_Bg2[1456] = INCBIN_U8("data/rooms/ridley/ridley_16_bg2.gfx"); +const u8 sRidley_16_Bg2[1456] = { + #include "extracted/data/rooms/ridley/ridley_16_bg2.gfx.inc" +}; const u8 sRidley_16_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 5, 22, SPRITESET_IDX(2), @@ -41,7 +45,9 @@ const u8 sRidley_16_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_16_Bg1[760] = INCBIN_U8("data/rooms/ridley/ridley_16_bg1.gfx"); +const u8 sRidley_16_Bg1[760] = { + #include "extracted/data/rooms/ridley/ridley_16_bg1.gfx.inc" +}; const u8 sRidley_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 5, 22, SPRITESET_IDX(2), @@ -54,5 +60,7 @@ const u8 sRidley_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_16_Bg0[218] = INCBIN_U8("data/rooms/ridley/ridley_16_bg0.gfx"); +const u8 sRidley_16_Bg0[218] = { + #include "extracted/data/rooms/ridley/ridley_16_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_17.c b/src/data/rooms/ridley/ridley_17.c index 37dddffda..787f11566 100644 --- a/src/data/rooms/ridley/ridley_17.c +++ b/src/data/rooms/ridley/ridley_17.c @@ -20,7 +20,9 @@ const u8 sRidley_10_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_17_Clipdata[346] = INCBIN_U8("data/rooms/ridley/ridley_17_clipdata.gfx"); +const u8 sRidley_17_Clipdata[346] = { + #include "extracted/data/rooms/ridley/ridley_17_clipdata.gfx.inc" +}; const u8 sRidley_17_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 8, 23, SPRITESET_IDX(2), @@ -35,7 +37,9 @@ const u8 sRidley_17_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_17_Bg2[1131] = INCBIN_U8("data/rooms/ridley/ridley_17_bg2.gfx"); +const u8 sRidley_17_Bg2[1131] = { + #include "extracted/data/rooms/ridley/ridley_17_bg2.gfx.inc" +}; const u8 sRidley_17_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 8, 23, SPRITESET_IDX(2), @@ -53,7 +57,9 @@ const u8 sRidley_17_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_17_Bg1[1107] = INCBIN_U8("data/rooms/ridley/ridley_17_bg1.gfx"); +const u8 sRidley_17_Bg1[1107] = { + #include "extracted/data/rooms/ridley/ridley_17_bg1.gfx.inc" +}; const u8 sRidley_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 8, 23, SPRITESET_IDX(2), @@ -71,5 +77,7 @@ const u8 sRidley_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_17_Bg0[466] = INCBIN_U8("data/rooms/ridley/ridley_17_bg0.gfx"); +const u8 sRidley_17_Bg0[466] = { + #include "extracted/data/rooms/ridley/ridley_17_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_18.c b/src/data/rooms/ridley/ridley_18.c index 32ae45851..cc3c5829e 100644 --- a/src/data/rooms/ridley/ridley_18.c +++ b/src/data/rooms/ridley/ridley_18.c @@ -1,7 +1,9 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_18_Clipdata[345] = INCBIN_U8("data/rooms/ridley/ridley_18_clipdata.gfx"); +const u8 sRidley_18_Clipdata[345] = { + #include "extracted/data/rooms/ridley/ridley_18_clipdata.gfx.inc" +}; const u8 sRidley_18_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { 5, 118, SPRITESET_IDX(3), @@ -20,7 +22,9 @@ const u8 sRidley_18_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_18_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_18_bg2.gfx"); +const u8 sRidley_18_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_18_bg2.gfx.inc" +}; const u8 sRidley_18_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 5, 118, SPRITESET_IDX(3), @@ -41,7 +45,9 @@ const u8 sRidley_18_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_18_Bg1[1642] = INCBIN_U8("data/rooms/ridley/ridley_18_bg1.gfx"); +const u8 sRidley_18_Bg1[1642] = { + #include "extracted/data/rooms/ridley/ridley_18_bg1.gfx.inc" +}; const u8 sRidley_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { 5, 118, SPRITESET_IDX(3), @@ -63,5 +69,7 @@ const u8 sRidley_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_18_Bg0[818] = INCBIN_U8("data/rooms/ridley/ridley_18_bg0.gfx"); +const u8 sRidley_18_Bg0[818] = { + #include "extracted/data/rooms/ridley/ridley_18_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_19.c b/src/data/rooms/ridley/ridley_19.c index c647b9352..7b067cd7b 100644 --- a/src/data/rooms/ridley/ridley_19.c +++ b/src/data/rooms/ridley/ridley_19.c @@ -20,11 +20,17 @@ const u8 sRidley_11_Scrolls[SCROLL_DATA_SIZE(2)] = { 17, // Breakable block Y bound extension }; -const u8 sRidley_19_Clipdata[297] = INCBIN_U8("data/rooms/ridley/ridley_19_clipdata.gfx"); +const u8 sRidley_19_Clipdata[297] = { + #include "extracted/data/rooms/ridley/ridley_19_clipdata.gfx.inc" +}; -const u8 sRidley_19_Bg2[462] = INCBIN_U8("data/rooms/ridley/ridley_19_bg2.gfx"); +const u8 sRidley_19_Bg2[462] = { + #include "extracted/data/rooms/ridley/ridley_19_bg2.gfx.inc" +}; -const u8 sRidley_19_Bg1[794] = INCBIN_U8("data/rooms/ridley/ridley_19_bg1.gfx"); +const u8 sRidley_19_Bg1[794] = { + #include "extracted/data/rooms/ridley/ridley_19_bg1.gfx.inc" +}; const u8 sRidley_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 14, 11, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_2.c b/src/data/rooms/ridley/ridley_2.c index 7508b4ff0..5626fd62b 100644 --- a/src/data/rooms/ridley/ridley_2.c +++ b/src/data/rooms/ridley/ridley_2.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_2_Clipdata[273] = INCBIN_U8("data/rooms/ridley/ridley_2_clipdata.gfx"); +const u8 sRidley_2_Clipdata[273] = { + #include "extracted/data/rooms/ridley/ridley_2_clipdata.gfx.inc" +}; -const u8 sRidley_2_Bg2[229] = INCBIN_U8("data/rooms/ridley/ridley_2_bg2.gfx"); +const u8 sRidley_2_Bg2[229] = { + #include "extracted/data/rooms/ridley/ridley_2_bg2.gfx.inc" +}; -const u8 sRidley_2_Bg1[666] = INCBIN_U8("data/rooms/ridley/ridley_2_bg1.gfx"); +const u8 sRidley_2_Bg1[666] = { + #include "extracted/data/rooms/ridley/ridley_2_bg1.gfx.inc" +}; const u8 sRidley_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 22, 6, SPRITESET_IDX(0), @@ -14,5 +20,7 @@ const u8 sRidley_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_2_Bg0[116] = INCBIN_U8("data/rooms/ridley/ridley_2_bg0.gfx"); +const u8 sRidley_2_Bg0[116] = { + #include "extracted/data/rooms/ridley/ridley_2_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_20.c b/src/data/rooms/ridley/ridley_20.c index d2453c69b..8d98668c6 100644 --- a/src/data/rooms/ridley/ridley_20.c +++ b/src/data/rooms/ridley/ridley_20.c @@ -1,9 +1,13 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_20_Clipdata[92] = INCBIN_U8("data/rooms/ridley/ridley_20_clipdata.gfx"); +const u8 sRidley_20_Clipdata[92] = { + #include "extracted/data/rooms/ridley/ridley_20_clipdata.gfx.inc" +}; -const u8 sRidley_20_Bg1[166] = INCBIN_U8("data/rooms/ridley/ridley_20_bg1.gfx"); +const u8 sRidley_20_Bg1[166] = { + #include "extracted/data/rooms/ridley/ridley_20_bg1.gfx.inc" +}; const u8 sRidley_20_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_21.c b/src/data/rooms/ridley/ridley_21.c index 972460689..ce3786363 100644 --- a/src/data/rooms/ridley/ridley_21.c +++ b/src/data/rooms/ridley/ridley_21.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_21_Clipdata[56] = INCBIN_U8("data/rooms/ridley/ridley_21_clipdata.gfx"); +const u8 sRidley_21_Clipdata[56] = { + #include "extracted/data/rooms/ridley/ridley_21_clipdata.gfx.inc" +}; -const u8 sRidley_21_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_21_bg2.gfx"); +const u8 sRidley_21_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_21_bg2.gfx.inc" +}; -const u8 sRidley_21_Bg1[177] = INCBIN_U8("data/rooms/ridley/ridley_21_bg1.gfx"); +const u8 sRidley_21_Bg1[177] = { + #include "extracted/data/rooms/ridley/ridley_21_bg1.gfx.inc" +}; const u8 sRidley_21_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 4, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_22.c b/src/data/rooms/ridley/ridley_22.c index 686cd6c49..00ae8f3eb 100644 --- a/src/data/rooms/ridley/ridley_22.c +++ b/src/data/rooms/ridley/ridley_22.c @@ -20,15 +20,23 @@ const u8 sRidley_12_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_22_Clipdata[127] = INCBIN_U8("data/rooms/ridley/ridley_22_clipdata.gfx"); +const u8 sRidley_22_Clipdata[127] = { + #include "extracted/data/rooms/ridley/ridley_22_clipdata.gfx.inc" +}; -const u8 sRidley_22_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_22_bg2.gfx"); +const u8 sRidley_22_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_22_bg2.gfx.inc" +}; -const u8 sRidley_22_Bg1[387] = INCBIN_U8("data/rooms/ridley/ridley_22_bg1.gfx"); +const u8 sRidley_22_Bg1[387] = { + #include "extracted/data/rooms/ridley/ridley_22_bg1.gfx.inc" +}; const u8 sRidley_22_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_22_Bg0[67] = INCBIN_U8("data/rooms/ridley/ridley_22_bg0.gfx"); +const u8 sRidley_22_Bg0[67] = { + #include "extracted/data/rooms/ridley/ridley_22_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_23.c b/src/data/rooms/ridley/ridley_23.c index 15a80cf6e..91adab762 100644 --- a/src/data/rooms/ridley/ridley_23.c +++ b/src/data/rooms/ridley/ridley_23.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_23_Clipdata[186] = INCBIN_U8("data/rooms/ridley/ridley_23_clipdata.gfx"); +const u8 sRidley_23_Clipdata[186] = { + #include "extracted/data/rooms/ridley/ridley_23_clipdata.gfx.inc" +}; -const u8 sRidley_23_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_23_bg2.gfx"); +const u8 sRidley_23_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_23_bg2.gfx.inc" +}; -const u8 sRidley_23_Bg1[488] = INCBIN_U8("data/rooms/ridley/ridley_23_bg1.gfx"); +const u8 sRidley_23_Bg1[488] = { + #include "extracted/data/rooms/ridley/ridley_23_bg1.gfx.inc" +}; const u8 sRidley_23_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 19, 14, SPRITESET_IDX(2), diff --git a/src/data/rooms/ridley/ridley_24.c b/src/data/rooms/ridley/ridley_24.c index 73a73d2b2..afecc1b2f 100644 --- a/src/data/rooms/ridley/ridley_24.c +++ b/src/data/rooms/ridley/ridley_24.c @@ -1,9 +1,13 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_24_Clipdata[85] = INCBIN_U8("data/rooms/ridley/ridley_24_clipdata.gfx"); +const u8 sRidley_24_Clipdata[85] = { + #include "extracted/data/rooms/ridley/ridley_24_clipdata.gfx.inc" +}; -const u8 sRidley_24_Bg1[162] = INCBIN_U8("data/rooms/ridley/ridley_24_bg1.gfx"); +const u8 sRidley_24_Bg1[162] = { + #include "extracted/data/rooms/ridley/ridley_24_bg1.gfx.inc" +}; const u8 sRidley_24_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_25.c b/src/data/rooms/ridley/ridley_25.c index e3ad78637..c28c76ce1 100644 --- a/src/data/rooms/ridley/ridley_25.c +++ b/src/data/rooms/ridley/ridley_25.c @@ -1,9 +1,13 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_25_Clipdata[92] = INCBIN_U8("data/rooms/ridley/ridley_25_clipdata.gfx"); +const u8 sRidley_25_Clipdata[92] = { + #include "extracted/data/rooms/ridley/ridley_25_clipdata.gfx.inc" +}; -const u8 sRidley_25_Bg1[166] = INCBIN_U8("data/rooms/ridley/ridley_25_bg1.gfx"); +const u8 sRidley_25_Bg1[166] = { + #include "extracted/data/rooms/ridley/ridley_25_bg1.gfx.inc" +}; const u8 sRidley_25_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_26.c b/src/data/rooms/ridley/ridley_26.c index 6b4bb0e01..cc67c5ed0 100644 --- a/src/data/rooms/ridley/ridley_26.c +++ b/src/data/rooms/ridley/ridley_26.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_26_Clipdata[138] = INCBIN_U8("data/rooms/ridley/ridley_26_clipdata.gfx"); +const u8 sRidley_26_Clipdata[138] = { + #include "extracted/data/rooms/ridley/ridley_26_clipdata.gfx.inc" +}; -const u8 sRidley_26_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_26_bg2.gfx"); +const u8 sRidley_26_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_26_bg2.gfx.inc" +}; -const u8 sRidley_26_Bg1[457] = INCBIN_U8("data/rooms/ridley/ridley_26_bg1.gfx"); +const u8 sRidley_26_Bg1[457] = { + #include "extracted/data/rooms/ridley/ridley_26_bg1.gfx.inc" +}; const u8 sRidley_26_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 9, 33, SPRITESET_IDX(1), diff --git a/src/data/rooms/ridley/ridley_27.c b/src/data/rooms/ridley/ridley_27.c index 4efb22211..74edec518 100644 --- a/src/data/rooms/ridley/ridley_27.c +++ b/src/data/rooms/ridley/ridley_27.c @@ -20,11 +20,17 @@ const u8 sRidley_13_Scrolls[SCROLL_DATA_SIZE(2)] = { 17, // Breakable block Y bound extension }; -const u8 sRidley_27_Clipdata[304] = INCBIN_U8("data/rooms/ridley/ridley_27_clipdata.gfx"); +const u8 sRidley_27_Clipdata[304] = { + #include "extracted/data/rooms/ridley/ridley_27_clipdata.gfx.inc" +}; -const u8 sRidley_27_Bg2[470] = INCBIN_U8("data/rooms/ridley/ridley_27_bg2.gfx"); +const u8 sRidley_27_Bg2[470] = { + #include "extracted/data/rooms/ridley/ridley_27_bg2.gfx.inc" +}; -const u8 sRidley_27_Bg1[743] = INCBIN_U8("data/rooms/ridley/ridley_27_bg1.gfx"); +const u8 sRidley_27_Bg1[743] = { + #include "extracted/data/rooms/ridley/ridley_27_bg1.gfx.inc" +}; const u8 sRidley_27_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 14, 11, SPRITESET_IDX(0), diff --git a/src/data/rooms/ridley/ridley_28.c b/src/data/rooms/ridley/ridley_28.c index ddfbcd161..e06ced854 100644 --- a/src/data/rooms/ridley/ridley_28.c +++ b/src/data/rooms/ridley/ridley_28.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_28_Clipdata[250] = INCBIN_U8("data/rooms/ridley/ridley_28_clipdata.gfx"); +const u8 sRidley_28_Clipdata[250] = { + #include "extracted/data/rooms/ridley/ridley_28_clipdata.gfx.inc" +}; -const u8 sRidley_28_Bg2[157] = INCBIN_U8("data/rooms/ridley/ridley_28_bg2.gfx"); +const u8 sRidley_28_Bg2[157] = { + #include "extracted/data/rooms/ridley/ridley_28_bg2.gfx.inc" +}; -const u8 sRidley_28_Bg1[626] = INCBIN_U8("data/rooms/ridley/ridley_28_bg1.gfx"); +const u8 sRidley_28_Bg1[626] = { + #include "extracted/data/rooms/ridley/ridley_28_bg1.gfx.inc" +}; const u8 sRidley_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 15, 8, SPRITESET_IDX(2), @@ -15,5 +21,7 @@ const u8 sRidley_28_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_28_Bg0[116] = INCBIN_U8("data/rooms/ridley/ridley_28_bg0.gfx"); +const u8 sRidley_28_Bg0[116] = { + #include "extracted/data/rooms/ridley/ridley_28_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_29.c b/src/data/rooms/ridley/ridley_29.c index 45036b7a5..9d8401c4c 100644 --- a/src/data/rooms/ridley/ridley_29.c +++ b/src/data/rooms/ridley/ridley_29.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_29_Clipdata[351] = INCBIN_U8("data/rooms/ridley/ridley_29_clipdata.gfx"); +const u8 sRidley_29_Clipdata[351] = { + #include "extracted/data/rooms/ridley/ridley_29_clipdata.gfx.inc" +}; -const u8 sRidley_29_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_29_bg2.gfx"); +const u8 sRidley_29_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_29_bg2.gfx.inc" +}; -const u8 sRidley_29_Bg1[822] = INCBIN_U8("data/rooms/ridley/ridley_29_bg1.gfx"); +const u8 sRidley_29_Bg1[822] = { + #include "extracted/data/rooms/ridley/ridley_29_bg1.gfx.inc" +}; const u8 sRidley_29_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/ridley/ridley_3.c b/src/data/rooms/ridley/ridley_3.c index cc55c1995..c82e08749 100644 --- a/src/data/rooms/ridley/ridley_3.c +++ b/src/data/rooms/ridley/ridley_3.c @@ -1,7 +1,9 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_3_Clipdata[154] = INCBIN_U8("data/rooms/ridley/ridley_3_clipdata.gfx"); +const u8 sRidley_3_Clipdata[154] = { + #include "extracted/data/rooms/ridley/ridley_3_clipdata.gfx.inc" +}; const u8 sRidley_3_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 2, 18, SPRITESET_IDX(3), @@ -17,7 +19,9 @@ const u8 sRidley_3_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_3_Bg2[228] = INCBIN_U8("data/rooms/ridley/ridley_3_bg2.gfx"); +const u8 sRidley_3_Bg2[228] = { + #include "extracted/data/rooms/ridley/ridley_3_bg2.gfx.inc" +}; const u8 sRidley_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 2, 18, SPRITESET_IDX(3), @@ -34,7 +38,9 @@ const u8 sRidley_3_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_3_Bg1[530] = INCBIN_U8("data/rooms/ridley/ridley_3_bg1.gfx"); +const u8 sRidley_3_Bg1[530] = { + #include "extracted/data/rooms/ridley/ridley_3_bg1.gfx.inc" +}; const u8 sRidley_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 2, 18, SPRITESET_IDX(3), @@ -51,5 +57,7 @@ const u8 sRidley_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_3_Bg0[263] = INCBIN_U8("data/rooms/ridley/ridley_3_bg0.gfx"); +const u8 sRidley_3_Bg0[263] = { + #include "extracted/data/rooms/ridley/ridley_3_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_30.c b/src/data/rooms/ridley/ridley_30.c index 15703772b..d76c1cb9a 100644 --- a/src/data/rooms/ridley/ridley_30.c +++ b/src/data/rooms/ridley/ridley_30.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_30_Clipdata[345] = INCBIN_U8("data/rooms/ridley/ridley_30_clipdata.gfx"); +const u8 sRidley_30_Clipdata[345] = { + #include "extracted/data/rooms/ridley/ridley_30_clipdata.gfx.inc" +}; -const u8 sRidley_30_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_30_bg2.gfx"); +const u8 sRidley_30_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_30_bg2.gfx.inc" +}; -const u8 sRidley_30_Bg1[826] = INCBIN_U8("data/rooms/ridley/ridley_30_bg1.gfx"); +const u8 sRidley_30_Bg1[826] = { + #include "extracted/data/rooms/ridley/ridley_30_bg1.gfx.inc" +}; const u8 sRidley_30_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/ridley/ridley_31.c b/src/data/rooms/ridley/ridley_31.c index 5387b0f88..93e98e770 100644 --- a/src/data/rooms/ridley/ridley_31.c +++ b/src/data/rooms/ridley/ridley_31.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_31_Clipdata[146] = INCBIN_U8("data/rooms/ridley/ridley_31_clipdata.gfx"); +const u8 sRidley_31_Clipdata[146] = { + #include "extracted/data/rooms/ridley/ridley_31_clipdata.gfx.inc" +}; -const u8 sRidley_31_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_31_bg2.gfx"); +const u8 sRidley_31_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_31_bg2.gfx.inc" +}; -const u8 sRidley_31_Bg1[434] = INCBIN_U8("data/rooms/ridley/ridley_31_bg1.gfx"); +const u8 sRidley_31_Bg1[434] = { + #include "extracted/data/rooms/ridley/ridley_31_bg1.gfx.inc" +}; const u8 sRidley_31_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/ridley/ridley_32.c b/src/data/rooms/ridley/ridley_32.c index e25f8967a..f59cc5b75 100644 --- a/src/data/rooms/ridley/ridley_32.c +++ b/src/data/rooms/ridley/ridley_32.c @@ -1,11 +1,17 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_32_Clipdata[106] = INCBIN_U8("data/rooms/ridley/ridley_32_clipdata.gfx"); +const u8 sRidley_32_Clipdata[106] = { + #include "extracted/data/rooms/ridley/ridley_32_clipdata.gfx.inc" +}; -const u8 sRidley_32_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_32_bg2.gfx"); +const u8 sRidley_32_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_32_bg2.gfx.inc" +}; -const u8 sRidley_32_Bg1[164] = INCBIN_U8("data/rooms/ridley/ridley_32_bg1.gfx"); +const u8 sRidley_32_Bg1[164] = { + #include "extracted/data/rooms/ridley/ridley_32_bg1.gfx.inc" +}; const u8 sRidley_32_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/ridley/ridley_4.c b/src/data/rooms/ridley/ridley_4.c index 3e6801edc..de366a53d 100644 --- a/src/data/rooms/ridley/ridley_4.c +++ b/src/data/rooms/ridley/ridley_4.c @@ -20,11 +20,17 @@ const u8 sRidley_1_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_4_Clipdata[187] = INCBIN_U8("data/rooms/ridley/ridley_4_clipdata.gfx"); +const u8 sRidley_4_Clipdata[187] = { + #include "extracted/data/rooms/ridley/ridley_4_clipdata.gfx.inc" +}; -const u8 sRidley_4_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_4_bg2.gfx"); +const u8 sRidley_4_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_4_bg2.gfx.inc" +}; -const u8 sRidley_4_Bg1[435] = INCBIN_U8("data/rooms/ridley/ridley_4_bg1.gfx"); +const u8 sRidley_4_Bg1[435] = { + #include "extracted/data/rooms/ridley/ridley_4_bg1.gfx.inc" +}; const u8 sRidley_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 5, 9, SPRITESET_IDX(0), @@ -33,5 +39,7 @@ const u8 sRidley_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_4_Bg0[78] = INCBIN_U8("data/rooms/ridley/ridley_4_bg0.gfx"); +const u8 sRidley_4_Bg0[78] = { + #include "extracted/data/rooms/ridley/ridley_4_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_5.c b/src/data/rooms/ridley/ridley_5.c index 2f4c3cd0f..a67c60066 100644 --- a/src/data/rooms/ridley/ridley_5.c +++ b/src/data/rooms/ridley/ridley_5.c @@ -1,7 +1,9 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_5_Clipdata[112] = INCBIN_U8("data/rooms/ridley/ridley_5_clipdata.gfx"); +const u8 sRidley_5_Clipdata[112] = { + #include "extracted/data/rooms/ridley/ridley_5_clipdata.gfx.inc" +}; const u8 sRidley_5_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 3, 11, SPRITESET_IDX(3), @@ -17,7 +19,9 @@ const u8 sRidley_5_Spriteset2[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_5_Bg2[80] = INCBIN_U8("data/rooms/ridley/ridley_5_bg2.gfx"); +const u8 sRidley_5_Bg2[80] = { + #include "extracted/data/rooms/ridley/ridley_5_bg2.gfx.inc" +}; const u8 sRidley_5_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 3, 11, SPRITESET_IDX(3), @@ -37,7 +41,9 @@ const u8 sRidley_5_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_5_Bg1[252] = INCBIN_U8("data/rooms/ridley/ridley_5_bg1.gfx"); +const u8 sRidley_5_Bg1[252] = { + #include "extracted/data/rooms/ridley/ridley_5_bg1.gfx.inc" +}; const u8 sRidley_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 3, 11, SPRITESET_IDX(3), @@ -57,5 +63,7 @@ const u8 sRidley_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_5_Bg0[113] = INCBIN_U8("data/rooms/ridley/ridley_5_bg0.gfx"); +const u8 sRidley_5_Bg0[113] = { + #include "extracted/data/rooms/ridley/ridley_5_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_6.c b/src/data/rooms/ridley/ridley_6.c index e85172069..e072a297f 100644 --- a/src/data/rooms/ridley/ridley_6.c +++ b/src/data/rooms/ridley/ridley_6.c @@ -20,11 +20,17 @@ const u8 sRidley_2_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_6_Clipdata[491] = INCBIN_U8("data/rooms/ridley/ridley_6_clipdata.gfx"); +const u8 sRidley_6_Clipdata[491] = { + #include "extracted/data/rooms/ridley/ridley_6_clipdata.gfx.inc" +}; -const u8 sRidley_6_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_6_bg2.gfx"); +const u8 sRidley_6_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_6_bg2.gfx.inc" +}; -const u8 sRidley_6_Bg1[997] = INCBIN_U8("data/rooms/ridley/ridley_6_bg1.gfx"); +const u8 sRidley_6_Bg1[997] = { + #include "extracted/data/rooms/ridley/ridley_6_bg1.gfx.inc" +}; const u8 sRidley_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 8, 5, SPRITESET_IDX(0), @@ -36,5 +42,7 @@ const u8 sRidley_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_6_Bg0[211] = INCBIN_U8("data/rooms/ridley/ridley_6_bg0.gfx"); +const u8 sRidley_6_Bg0[211] = { + #include "extracted/data/rooms/ridley/ridley_6_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_7.c b/src/data/rooms/ridley/ridley_7.c index 8607548ba..ba395a78f 100644 --- a/src/data/rooms/ridley/ridley_7.c +++ b/src/data/rooms/ridley/ridley_7.c @@ -1,9 +1,13 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_7_Clipdata[76] = INCBIN_U8("data/rooms/ridley/ridley_7_clipdata.gfx"); +const u8 sRidley_7_Clipdata[76] = { + #include "extracted/data/rooms/ridley/ridley_7_clipdata.gfx.inc" +}; -const u8 sRidley_7_Bg2[68] = INCBIN_U8("data/rooms/ridley/ridley_7_bg2.gfx"); +const u8 sRidley_7_Bg2[68] = { + #include "extracted/data/rooms/ridley/ridley_7_bg2.gfx.inc" +}; const u8 sRidley_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 2, 10, SPRITESET_IDX(2), @@ -14,7 +18,9 @@ const u8 sRidley_7_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_7_Bg1[206] = INCBIN_U8("data/rooms/ridley/ridley_7_bg1.gfx"); +const u8 sRidley_7_Bg1[206] = { + #include "extracted/data/rooms/ridley/ridley_7_bg1.gfx.inc" +}; const u8 sRidley_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 2, 10, SPRITESET_IDX(2), @@ -27,5 +33,7 @@ const u8 sRidley_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_7_Bg0[464] = INCBIN_U8("data/rooms/ridley/ridley_7_bg0.gfx"); +const u8 sRidley_7_Bg0[464] = { + #include "extracted/data/rooms/ridley/ridley_7_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_8.c b/src/data/rooms/ridley/ridley_8.c index 46cffafac..4773c42f9 100644 --- a/src/data/rooms/ridley/ridley_8.c +++ b/src/data/rooms/ridley/ridley_8.c @@ -1,9 +1,13 @@ #include "data/rooms/ridley_rooms_data.h" #include "macros.h" -const u8 sRidley_8_Clipdata[62] = INCBIN_U8("data/rooms/ridley/ridley_8_clipdata.gfx"); +const u8 sRidley_8_Clipdata[62] = { + #include "extracted/data/rooms/ridley/ridley_8_clipdata.gfx.inc" +}; -const u8 sRidley_8_Bg2[118] = INCBIN_U8("data/rooms/ridley/ridley_8_bg2.gfx"); +const u8 sRidley_8_Bg2[118] = { + #include "extracted/data/rooms/ridley/ridley_8_bg2.gfx.inc" +}; const u8 sRidley_8_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { 3, 10, SPRITESET_IDX(2), @@ -13,7 +17,9 @@ const u8 sRidley_8_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(5)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_8_Bg1[224] = INCBIN_U8("data/rooms/ridley/ridley_8_bg1.gfx"); +const u8 sRidley_8_Bg1[224] = { + #include "extracted/data/rooms/ridley/ridley_8_bg1.gfx.inc" +}; const u8 sRidley_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 3, 14, SPRITESET_IDX(2), @@ -24,5 +30,7 @@ const u8 sRidley_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sRidley_8_Bg0[127] = INCBIN_U8("data/rooms/ridley/ridley_8_bg0.gfx"); +const u8 sRidley_8_Bg0[127] = { + #include "extracted/data/rooms/ridley/ridley_8_bg0.gfx.inc" +}; diff --git a/src/data/rooms/ridley/ridley_9.c b/src/data/rooms/ridley/ridley_9.c index b435b778d..611d3ff81 100644 --- a/src/data/rooms/ridley/ridley_9.c +++ b/src/data/rooms/ridley/ridley_9.c @@ -20,11 +20,17 @@ const u8 sRidley_3_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sRidley_9_Clipdata[231] = INCBIN_U8("data/rooms/ridley/ridley_9_clipdata.gfx"); +const u8 sRidley_9_Clipdata[231] = { + #include "extracted/data/rooms/ridley/ridley_9_clipdata.gfx.inc" +}; -const u8 sRidley_9_Bg2[14] = INCBIN_U8("data/rooms/ridley/ridley_9_bg2.gfx"); +const u8 sRidley_9_Bg2[14] = { + #include "extracted/data/rooms/ridley/ridley_9_bg2.gfx.inc" +}; -const u8 sRidley_9_Bg1[396] = INCBIN_U8("data/rooms/ridley/ridley_9_bg1.gfx"); +const u8 sRidley_9_Bg1[396] = { + #include "extracted/data/rooms/ridley/ridley_9_bg1.gfx.inc" +}; const u8 sRidley_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 7, 8, SPRITESET_IDX(0), diff --git a/src/data/rooms/test_rooms_data.c b/src/data/rooms/test_rooms_data.c index c549fd6b3..11d096e2f 100644 --- a/src/data/rooms/test_rooms_data.c +++ b/src/data/rooms/test_rooms_data.c @@ -1,29 +1,65 @@ #include "data/rooms/test_rooms_data.h" #include "macros.h" -const u32 sTileset_0_Gfx[445] = INCBIN_U32("data/rooms/test/tileset_0_tiles.gfx.lz"); -const u8 sTileset_0_Tilemap[1410] = INCBIN_U8("data/rooms/test/tileset_0.tm"); -const u16 sTileset_0_Pal[14 * 16] = INCBIN_U16("data/rooms/test/tileset_0.pal"); +const u32 sTileset_0_Gfx[445] = { + #include "extracted/data/rooms/test/tileset_0_tiles.gfx.lz.inc" +}; +const u8 sTileset_0_Tilemap[1410] = { + #include "extracted/data/rooms/test/tileset_0.tm.inc" +}; +const u16 sTileset_0_Pal[14 * 16] = { + #include "extracted/data/rooms/test/tileset_0.pal.inc" +}; -const u8 sTest_0_Clipdata[306] = INCBIN_U8("data/rooms/test/test_0_clipdata.rle"); -const u8 sTest_0_Bg2[14] = INCBIN_U8("data/rooms/test/test_0_bg2.rle"); -const u8 sTest_0_Bg1[369] = INCBIN_U8("data/rooms/test/test_0_bg1.rle"); +const u8 sTest_0_Clipdata[306] = { + #include "extracted/data/rooms/test/test_0_clipdata.rle.inc" +}; +const u8 sTest_0_Bg2[14] = { + #include "extracted/data/rooms/test/test_0_bg2.rle.inc" +}; +const u8 sTest_0_Bg1[369] = { + #include "extracted/data/rooms/test/test_0_bg1.rle.inc" +}; -const u8 sTest_1_Clipdata[446] = INCBIN_U8("data/rooms/test/test_1_clipdata.rle"); -const u8 sTest_1_Bg2[14] = INCBIN_U8("data/rooms/test/test_1_bg2.rle"); -const u8 sTest_1_Bg1[485] = INCBIN_U8("data/rooms/test/test_1_bg1.rle"); +const u8 sTest_1_Clipdata[446] = { + #include "extracted/data/rooms/test/test_1_clipdata.rle.inc" +}; +const u8 sTest_1_Bg2[14] = { + #include "extracted/data/rooms/test/test_1_bg2.rle.inc" +}; +const u8 sTest_1_Bg1[485] = { + #include "extracted/data/rooms/test/test_1_bg1.rle.inc" +}; -const u8 sTest_2_Clipdata[280] = INCBIN_U8("data/rooms/test/test_2_clipdata.rle"); -const u8 sTest_2_Bg2[116] = INCBIN_U8("data/rooms/test/test_2_bg2.rle"); -const u8 sTest_2_Bg1[209] = INCBIN_U8("data/rooms/test/test_2_bg1.rle"); +const u8 sTest_2_Clipdata[280] = { + #include "extracted/data/rooms/test/test_2_clipdata.rle.inc" +}; +const u8 sTest_2_Bg2[116] = { + #include "extracted/data/rooms/test/test_2_bg2.rle.inc" +}; +const u8 sTest_2_Bg1[209] = { + #include "extracted/data/rooms/test/test_2_bg1.rle.inc" +}; -const u8 sTest_3_Clipdata[156] = INCBIN_U8("data/rooms/test/test_3_clipdata.rle"); -const u8 sTest_3_Bg2[14] = INCBIN_U8("data/rooms/test/test_3_bg2.rle"); -const u8 sTest_3_Bg1[159] = INCBIN_U8("data/rooms/test/test_3_bg1.rle"); +const u8 sTest_3_Clipdata[156] = { + #include "extracted/data/rooms/test/test_3_clipdata.rle.inc" +}; +const u8 sTest_3_Bg2[14] = { + #include "extracted/data/rooms/test/test_3_bg2.rle.inc" +}; +const u8 sTest_3_Bg1[159] = { + #include "extracted/data/rooms/test/test_3_bg1.rle.inc" +}; -const u8 sTest_4_Clipdata[314] = INCBIN_U8("data/rooms/test/test_4_clipdata.rle"); -const u8 sTest_4_Bg2[14] = INCBIN_U8("data/rooms/test/test_4_bg2.rle"); -const u8 sTest_4_Bg1[330] = INCBIN_U8("data/rooms/test/test_4_bg1.rle"); +const u8 sTest_4_Clipdata[314] = { + #include "extracted/data/rooms/test/test_4_clipdata.rle.inc" +}; +const u8 sTest_4_Bg2[14] = { + #include "extracted/data/rooms/test/test_4_bg2.rle.inc" +}; +const u8 sTest_4_Bg1[330] = { + #include "extracted/data/rooms/test/test_4_bg1.rle.inc" +}; const u8 sTest1_0_SpriteData[2 * 3] = { 20, 9, 17, diff --git a/src/data/rooms/tourian/bg3.c b/src/data/rooms/tourian/bg3.c index 0f278b0a2..a3ad61e51 100644 --- a/src/data/rooms/tourian/bg3.c +++ b/src/data/rooms/tourian/bg3.c @@ -1,14 +1,26 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_Bg3_0[2180] = INCBIN_U8("data/rooms/tourian/tourian_bg3_0.gfx"); +const u8 sTourian_Bg3_0[2180] = { + #include "extracted/data/rooms/tourian/tourian_bg3_0.gfx.inc" +}; -const u8 sTourian_Bg3_1[2216] = INCBIN_U8("data/rooms/tourian/tourian_bg3_1.gfx"); +const u8 sTourian_Bg3_1[2216] = { + #include "extracted/data/rooms/tourian/tourian_bg3_1.gfx.inc" +}; -const u8 sTourian_Bg3_2[936] = INCBIN_U8("data/rooms/tourian/tourian_bg3_2.gfx"); +const u8 sTourian_Bg3_2[936] = { + #include "extracted/data/rooms/tourian/tourian_bg3_2.gfx.inc" +}; -const u8 sTourian_Bg3_3[932] = INCBIN_U8("data/rooms/tourian/tourian_bg3_3.gfx"); +const u8 sTourian_Bg3_3[932] = { + #include "extracted/data/rooms/tourian/tourian_bg3_3.gfx.inc" +}; -const u8 sTourian_Bg3_4[860] = INCBIN_U8("data/rooms/tourian/tourian_bg3_4.gfx"); +const u8 sTourian_Bg3_4[860] = { + #include "extracted/data/rooms/tourian/tourian_bg3_4.gfx.inc" +}; -const u8 sTourian_Bg3_5[852] = INCBIN_U8("data/rooms/tourian/tourian_bg3_5.gfx"); +const u8 sTourian_Bg3_5[852] = { + #include "extracted/data/rooms/tourian/tourian_bg3_5.gfx.inc" +}; diff --git a/src/data/rooms/tourian/tourian_0.c b/src/data/rooms/tourian/tourian_0.c index 0731be070..b4a811740 100644 --- a/src/data/rooms/tourian/tourian_0.c +++ b/src/data/rooms/tourian/tourian_0.c @@ -13,11 +13,17 @@ const u8 sTourian_0_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sTourian_0_Clipdata[158] = INCBIN_U8("data/rooms/tourian/tourian_0_clipdata.gfx"); +const u8 sTourian_0_Clipdata[158] = { + #include "extracted/data/rooms/tourian/tourian_0_clipdata.gfx.inc" +}; -const u8 sTourian_0_Bg2[178] = INCBIN_U8("data/rooms/tourian/tourian_0_bg2.gfx"); +const u8 sTourian_0_Bg2[178] = { + #include "extracted/data/rooms/tourian/tourian_0_bg2.gfx.inc" +}; -const u8 sTourian_0_Bg1[445] = INCBIN_U8("data/rooms/tourian/tourian_0_bg1.gfx"); +const u8 sTourian_0_Bg1[445] = { + #include "extracted/data/rooms/tourian/tourian_0_bg1.gfx.inc" +}; const u8 sTourian_0_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 15, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/tourian/tourian_1.c b/src/data/rooms/tourian/tourian_1.c index 44135879e..f7fd5e571 100644 --- a/src/data/rooms/tourian/tourian_1.c +++ b/src/data/rooms/tourian/tourian_1.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_1_Clipdata[182] = INCBIN_U8("data/rooms/tourian/tourian_1_clipdata.gfx"); +const u8 sTourian_1_Clipdata[182] = { + #include "extracted/data/rooms/tourian/tourian_1_clipdata.gfx.inc" +}; -const u8 sTourian_1_Bg2[116] = INCBIN_U8("data/rooms/tourian/tourian_1_bg2.gfx"); +const u8 sTourian_1_Bg2[116] = { + #include "extracted/data/rooms/tourian/tourian_1_bg2.gfx.inc" +}; const u8 sTourian_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { 2, 19, SPRITESET_IDX(1), @@ -24,7 +28,9 @@ const u8 sTourian_1_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(16)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_1_Bg1[436] = INCBIN_U8("data/rooms/tourian/tourian_1_bg1.gfx"); +const u8 sTourian_1_Bg1[436] = { + #include "extracted/data/rooms/tourian/tourian_1_bg1.gfx.inc" +}; const u8 sTourian_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { 2, 19, SPRITESET_IDX(1), @@ -39,5 +45,7 @@ const u8 sTourian_1_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(10)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_1_Bg0[264] = INCBIN_U8("data/rooms/tourian/tourian_1_bg0.gfx"); +const u8 sTourian_1_Bg0[264] = { + #include "extracted/data/rooms/tourian/tourian_1_bg0.gfx.inc" +}; diff --git a/src/data/rooms/tourian/tourian_10.c b/src/data/rooms/tourian/tourian_10.c index 350765670..416e13254 100644 --- a/src/data/rooms/tourian/tourian_10.c +++ b/src/data/rooms/tourian/tourian_10.c @@ -1,15 +1,23 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_10_Clipdata[66] = INCBIN_U8("data/rooms/tourian/tourian_10_clipdata.gfx"); +const u8 sTourian_10_Clipdata[66] = { + #include "extracted/data/rooms/tourian/tourian_10_clipdata.gfx.inc" +}; -const u8 sTourian_10_Bg2[164] = INCBIN_U8("data/rooms/tourian/tourian_10_bg2.gfx"); +const u8 sTourian_10_Bg2[164] = { + #include "extracted/data/rooms/tourian/tourian_10_bg2.gfx.inc" +}; -const u8 sTourian_10_Bg1[257] = INCBIN_U8("data/rooms/tourian/tourian_10_bg1.gfx"); +const u8 sTourian_10_Bg1[257] = { + #include "extracted/data/rooms/tourian/tourian_10_bg1.gfx.inc" +}; const u8 sTourian_10_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_10_Bg0[294] = INCBIN_U8("data/rooms/tourian/tourian_10_bg0.gfx"); +const u8 sTourian_10_Bg0[294] = { + #include "extracted/data/rooms/tourian/tourian_10_bg0.gfx.inc" +}; diff --git a/src/data/rooms/tourian/tourian_11.c b/src/data/rooms/tourian/tourian_11.c index e2263e4be..f9c852eae 100644 --- a/src/data/rooms/tourian/tourian_11.c +++ b/src/data/rooms/tourian/tourian_11.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_11_Clipdata[91] = INCBIN_U8("data/rooms/tourian/tourian_11_clipdata.gfx"); +const u8 sTourian_11_Clipdata[91] = { + #include "extracted/data/rooms/tourian/tourian_11_clipdata.gfx.inc" +}; -const u8 sTourian_11_Bg1[167] = INCBIN_U8("data/rooms/tourian/tourian_11_bg1.gfx"); +const u8 sTourian_11_Bg1[167] = { + #include "extracted/data/rooms/tourian/tourian_11_bg1.gfx.inc" +}; const u8 sTourian_11_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/tourian/tourian_12.c b/src/data/rooms/tourian/tourian_12.c index cba546e75..a79cbba1b 100644 --- a/src/data/rooms/tourian/tourian_12.c +++ b/src/data/rooms/tourian/tourian_12.c @@ -1,11 +1,17 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_12_Clipdata[60] = INCBIN_U8("data/rooms/tourian/tourian_12_clipdata.gfx"); +const u8 sTourian_12_Clipdata[60] = { + #include "extracted/data/rooms/tourian/tourian_12_clipdata.gfx.inc" +}; -const u8 sTourian_12_Bg2[36] = INCBIN_U8("data/rooms/tourian/tourian_12_bg2.gfx"); +const u8 sTourian_12_Bg2[36] = { + #include "extracted/data/rooms/tourian/tourian_12_bg2.gfx.inc" +}; -const u8 sTourian_12_Bg1[130] = INCBIN_U8("data/rooms/tourian/tourian_12_bg1.gfx"); +const u8 sTourian_12_Bg1[130] = { + #include "extracted/data/rooms/tourian/tourian_12_bg1.gfx.inc" +}; const u8 sTourian_12_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/tourian/tourian_13.c b/src/data/rooms/tourian/tourian_13.c index c3400e946..db6765d75 100644 --- a/src/data/rooms/tourian/tourian_13.c +++ b/src/data/rooms/tourian/tourian_13.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_13_Clipdata[100] = INCBIN_U8("data/rooms/tourian/tourian_13_clipdata.gfx"); +const u8 sTourian_13_Clipdata[100] = { + #include "extracted/data/rooms/tourian/tourian_13_clipdata.gfx.inc" +}; -const u8 sTourian_13_Bg2[52] = INCBIN_U8("data/rooms/tourian/tourian_13_bg2.gfx"); +const u8 sTourian_13_Bg2[52] = { + #include "extracted/data/rooms/tourian/tourian_13_bg2.gfx.inc" +}; const u8 sTourian_13_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 2, 10, SPRITESET_IDX(1), @@ -12,7 +16,9 @@ const u8 sTourian_13_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_13_Bg1[280] = INCBIN_U8("data/rooms/tourian/tourian_13_bg1.gfx"); +const u8 sTourian_13_Bg1[280] = { + #include "extracted/data/rooms/tourian/tourian_13_bg1.gfx.inc" +}; const u8 sTourian_13_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 12, 15, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_14.c b/src/data/rooms/tourian/tourian_14.c index 508dba579..d9ab9ff36 100644 --- a/src/data/rooms/tourian/tourian_14.c +++ b/src/data/rooms/tourian/tourian_14.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_14_Clipdata[68] = INCBIN_U8("data/rooms/tourian/tourian_14_clipdata.gfx"); +const u8 sTourian_14_Clipdata[68] = { + #include "extracted/data/rooms/tourian/tourian_14_clipdata.gfx.inc" +}; -const u8 sTourian_14_Bg2[52] = INCBIN_U8("data/rooms/tourian/tourian_14_bg2.gfx"); +const u8 sTourian_14_Bg2[52] = { + #include "extracted/data/rooms/tourian/tourian_14_bg2.gfx.inc" +}; const u8 sTourian_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { 2, 10, SPRITESET_IDX(1), @@ -14,7 +18,9 @@ const u8 sTourian_14_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(6)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_14_Bg1[173] = INCBIN_U8("data/rooms/tourian/tourian_14_bg1.gfx"); +const u8 sTourian_14_Bg1[173] = { + #include "extracted/data/rooms/tourian/tourian_14_bg1.gfx.inc" +}; const u8 sTourian_14_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(4)] = { 2, 10, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_15.c b/src/data/rooms/tourian/tourian_15.c index f9a9eb41b..96fae2192 100644 --- a/src/data/rooms/tourian/tourian_15.c +++ b/src/data/rooms/tourian/tourian_15.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_15_Clipdata[218] = INCBIN_U8("data/rooms/tourian/tourian_15_clipdata.gfx"); +const u8 sTourian_15_Clipdata[218] = { + #include "extracted/data/rooms/tourian/tourian_15_clipdata.gfx.inc" +}; -const u8 sTourian_15_Bg2[102] = INCBIN_U8("data/rooms/tourian/tourian_15_bg2.gfx"); +const u8 sTourian_15_Bg2[102] = { + #include "extracted/data/rooms/tourian/tourian_15_bg2.gfx.inc" +}; const u8 sTourian_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 17, 9, SPRITESET_IDX(0), @@ -20,7 +24,9 @@ const u8 sTourian_15_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_15_Bg1[573] = INCBIN_U8("data/rooms/tourian/tourian_15_bg1.gfx"); +const u8 sTourian_15_Bg1[573] = { + #include "extracted/data/rooms/tourian/tourian_15_bg1.gfx.inc" +}; const u8 sTourian_15_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(7)] = { 18, 3, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_16.c b/src/data/rooms/tourian/tourian_16.c index 48b98b57d..d180a45ce 100644 --- a/src/data/rooms/tourian/tourian_16.c +++ b/src/data/rooms/tourian/tourian_16.c @@ -20,9 +20,13 @@ const u8 sTourian_5_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sTourian_16_Clipdata[166] = INCBIN_U8("data/rooms/tourian/tourian_16_clipdata.gfx"); +const u8 sTourian_16_Clipdata[166] = { + #include "extracted/data/rooms/tourian/tourian_16_clipdata.gfx.inc" +}; -const u8 sTourian_16_Bg2[154] = INCBIN_U8("data/rooms/tourian/tourian_16_bg2.gfx"); +const u8 sTourian_16_Bg2[154] = { + #include "extracted/data/rooms/tourian/tourian_16_bg2.gfx.inc" +}; const u8 sTourian_16_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 4, 9, SPRITESET_IDX(1), @@ -42,7 +46,9 @@ const u8 sTourian_16_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_16_Bg1[513] = INCBIN_U8("data/rooms/tourian/tourian_16_bg1.gfx"); +const u8 sTourian_16_Bg1[513] = { + #include "extracted/data/rooms/tourian/tourian_16_bg1.gfx.inc" +}; const u8 sTourian_16_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(14)] = { 4, 9, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_17.c b/src/data/rooms/tourian/tourian_17.c index 54462a8ab..38d877232 100644 --- a/src/data/rooms/tourian/tourian_17.c +++ b/src/data/rooms/tourian/tourian_17.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_17_Clipdata[80] = INCBIN_U8("data/rooms/tourian/tourian_17_clipdata.gfx"); +const u8 sTourian_17_Clipdata[80] = { + #include "extracted/data/rooms/tourian/tourian_17_clipdata.gfx.inc" +}; -const u8 sTourian_17_Bg1[162] = INCBIN_U8("data/rooms/tourian/tourian_17_bg1.gfx"); +const u8 sTourian_17_Bg1[162] = { + #include "extracted/data/rooms/tourian/tourian_17_bg1.gfx.inc" +}; const u8 sTourian_17_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/tourian/tourian_18.c b/src/data/rooms/tourian/tourian_18.c index 7f13b31a5..dcc365a94 100644 --- a/src/data/rooms/tourian/tourian_18.c +++ b/src/data/rooms/tourian/tourian_18.c @@ -1,11 +1,17 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_18_Clipdata[113] = INCBIN_U8("data/rooms/tourian/tourian_18_clipdata.gfx"); +const u8 sTourian_18_Clipdata[113] = { + #include "extracted/data/rooms/tourian/tourian_18_clipdata.gfx.inc" +}; -const u8 sTourian_18_Bg2[14] = INCBIN_U8("data/rooms/tourian/tourian_18_bg2.gfx"); +const u8 sTourian_18_Bg2[14] = { + #include "extracted/data/rooms/tourian/tourian_18_bg2.gfx.inc" +}; -const u8 sTourian_18_Bg1[270] = INCBIN_U8("data/rooms/tourian/tourian_18_bg1.gfx"); +const u8 sTourian_18_Bg1[270] = { + #include "extracted/data/rooms/tourian/tourian_18_bg1.gfx.inc" +}; const u8 sTourian_18_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(3)] = { 2, 9, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_19.c b/src/data/rooms/tourian/tourian_19.c index d784c640a..05356c901 100644 --- a/src/data/rooms/tourian/tourian_19.c +++ b/src/data/rooms/tourian/tourian_19.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_19_Clipdata[149] = INCBIN_U8("data/rooms/tourian/tourian_19_clipdata.gfx"); +const u8 sTourian_19_Clipdata[149] = { + #include "extracted/data/rooms/tourian/tourian_19_clipdata.gfx.inc" +}; -const u8 sTourian_19_Bg2[129] = INCBIN_U8("data/rooms/tourian/tourian_19_bg2.gfx"); +const u8 sTourian_19_Bg2[129] = { + #include "extracted/data/rooms/tourian/tourian_19_bg2.gfx.inc" +}; const u8 sTourian_19_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { 2, 26, SPRITESET_IDX(1), @@ -23,7 +27,9 @@ const u8 sTourian_19_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(15)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_19_Bg1[387] = INCBIN_U8("data/rooms/tourian/tourian_19_bg1.gfx"); +const u8 sTourian_19_Bg1[387] = { + #include "extracted/data/rooms/tourian/tourian_19_bg1.gfx.inc" +}; const u8 sTourian_19_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(11)] = { 2, 26, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_2.c b/src/data/rooms/tourian/tourian_2.c index 1c54d105d..58b404d91 100644 --- a/src/data/rooms/tourian/tourian_2.c +++ b/src/data/rooms/tourian/tourian_2.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_2_Clipdata[242] = INCBIN_U8("data/rooms/tourian/tourian_2_clipdata.gfx"); +const u8 sTourian_2_Clipdata[242] = { + #include "extracted/data/rooms/tourian/tourian_2_clipdata.gfx.inc" +}; -const u8 sTourian_2_Bg2[114] = INCBIN_U8("data/rooms/tourian/tourian_2_bg2.gfx"); +const u8 sTourian_2_Bg2[114] = { + #include "extracted/data/rooms/tourian/tourian_2_bg2.gfx.inc" +}; const u8 sTourian_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { 5, 16, SPRITESET_IDX(1), @@ -21,7 +25,9 @@ const u8 sTourian_2_Spriteset1[ENEMY_ROOM_DATA_ARRAY_SIZE(13)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_2_Bg1[618] = INCBIN_U8("data/rooms/tourian/tourian_2_bg1.gfx"); +const u8 sTourian_2_Bg1[618] = { + #include "extracted/data/rooms/tourian/tourian_2_bg1.gfx.inc" +}; const u8 sTourian_2_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(12)] = { 5, 16, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_3.c b/src/data/rooms/tourian/tourian_3.c index a9cbff28b..15bbaa297 100644 --- a/src/data/rooms/tourian/tourian_3.c +++ b/src/data/rooms/tourian/tourian_3.c @@ -1,11 +1,17 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_3_Clipdata[64] = INCBIN_U8("data/rooms/tourian/tourian_3_clipdata.gfx"); +const u8 sTourian_3_Clipdata[64] = { + #include "extracted/data/rooms/tourian/tourian_3_clipdata.gfx.inc" +}; -const u8 sTourian_3_Bg2[14] = INCBIN_U8("data/rooms/tourian/tourian_3_bg2.gfx"); +const u8 sTourian_3_Bg2[14] = { + #include "extracted/data/rooms/tourian/tourian_3_bg2.gfx.inc" +}; -const u8 sTourian_3_Bg1[225] = INCBIN_U8("data/rooms/tourian/tourian_3_bg1.gfx"); +const u8 sTourian_3_Bg1[225] = { + #include "extracted/data/rooms/tourian/tourian_3_bg1.gfx.inc" +}; const u8 sTourian_3_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(8)] = { 2, 9, SPRITESET_IDX(1), diff --git a/src/data/rooms/tourian/tourian_4.c b/src/data/rooms/tourian/tourian_4.c index 7dff44d0b..30954258b 100644 --- a/src/data/rooms/tourian/tourian_4.c +++ b/src/data/rooms/tourian/tourian_4.c @@ -13,11 +13,17 @@ const u8 sTourian_1_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sTourian_4_Clipdata[375] = INCBIN_U8("data/rooms/tourian/tourian_4_clipdata.gfx"); +const u8 sTourian_4_Clipdata[375] = { + #include "extracted/data/rooms/tourian/tourian_4_clipdata.gfx.inc" +}; -const u8 sTourian_4_Bg2[144] = INCBIN_U8("data/rooms/tourian/tourian_4_bg2.gfx"); +const u8 sTourian_4_Bg2[144] = { + #include "extracted/data/rooms/tourian/tourian_4_bg2.gfx.inc" +}; -const u8 sTourian_4_Bg1[657] = INCBIN_U8("data/rooms/tourian/tourian_4_bg1.gfx"); +const u8 sTourian_4_Bg1[657] = { + #include "extracted/data/rooms/tourian/tourian_4_bg1.gfx.inc" +}; const u8 sTourian_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { 9, 28, SPRITESET_IDX(8), @@ -39,5 +45,7 @@ const u8 sTourian_4_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(17)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_4_Bg0[307] = INCBIN_U8("data/rooms/tourian/tourian_4_bg0.gfx"); +const u8 sTourian_4_Bg0[307] = { + #include "extracted/data/rooms/tourian/tourian_4_bg0.gfx.inc" +}; diff --git a/src/data/rooms/tourian/tourian_5.c b/src/data/rooms/tourian/tourian_5.c index e045ad8ef..501cd768f 100644 --- a/src/data/rooms/tourian/tourian_5.c +++ b/src/data/rooms/tourian/tourian_5.c @@ -13,11 +13,17 @@ const u8 sTourian_2_Scrolls[SCROLL_DATA_SIZE(1)] = { 2, // Breakable block Y bound extension }; -const u8 sTourian_5_Clipdata[597] = INCBIN_U8("data/rooms/tourian/tourian_5_clipdata.gfx"); +const u8 sTourian_5_Clipdata[597] = { + #include "extracted/data/rooms/tourian/tourian_5_clipdata.gfx.inc" +}; -const u8 sTourian_5_Bg2[226] = INCBIN_U8("data/rooms/tourian/tourian_5_bg2.gfx"); +const u8 sTourian_5_Bg2[226] = { + #include "extracted/data/rooms/tourian/tourian_5_bg2.gfx.inc" +}; -const u8 sTourian_5_Bg1[1425] = INCBIN_U8("data/rooms/tourian/tourian_5_bg1.gfx"); +const u8 sTourian_5_Bg1[1425] = { + #include "extracted/data/rooms/tourian/tourian_5_bg1.gfx.inc" +}; const u8 sTourian_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(24)] = { 13, 6, SPRITESET_IDX(4), @@ -46,5 +52,7 @@ const u8 sTourian_5_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(24)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_5_Bg0[186] = INCBIN_U8("data/rooms/tourian/tourian_5_bg0.gfx"); +const u8 sTourian_5_Bg0[186] = { + #include "extracted/data/rooms/tourian/tourian_5_bg0.gfx.inc" +}; diff --git a/src/data/rooms/tourian/tourian_6.c b/src/data/rooms/tourian/tourian_6.c index cfce566fa..c2ca46d42 100644 --- a/src/data/rooms/tourian/tourian_6.c +++ b/src/data/rooms/tourian/tourian_6.c @@ -1,9 +1,13 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_6_Clipdata[93] = INCBIN_U8("data/rooms/tourian/tourian_6_clipdata.gfx"); +const u8 sTourian_6_Clipdata[93] = { + #include "extracted/data/rooms/tourian/tourian_6_clipdata.gfx.inc" +}; -const u8 sTourian_6_Bg1[166] = INCBIN_U8("data/rooms/tourian/tourian_6_bg1.gfx"); +const u8 sTourian_6_Bg1[166] = { + #include "extracted/data/rooms/tourian/tourian_6_bg1.gfx.inc" +}; const u8 sTourian_6_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 10, 9, SPRITESET_IDX(0), diff --git a/src/data/rooms/tourian/tourian_7.c b/src/data/rooms/tourian/tourian_7.c index 554bae458..a453267ce 100644 --- a/src/data/rooms/tourian/tourian_7.c +++ b/src/data/rooms/tourian/tourian_7.c @@ -1,11 +1,17 @@ #include "data/rooms/tourian_rooms_data.h" #include "macros.h" -const u8 sTourian_7_Clipdata[55] = INCBIN_U8("data/rooms/tourian/tourian_7_clipdata.gfx"); +const u8 sTourian_7_Clipdata[55] = { + #include "extracted/data/rooms/tourian/tourian_7_clipdata.gfx.inc" +}; -const u8 sTourian_7_Bg2[14] = INCBIN_U8("data/rooms/tourian/tourian_7_bg2.gfx"); +const u8 sTourian_7_Bg2[14] = { + #include "extracted/data/rooms/tourian/tourian_7_bg2.gfx.inc" +}; -const u8 sTourian_7_Bg1[131] = INCBIN_U8("data/rooms/tourian/tourian_7_bg1.gfx"); +const u8 sTourian_7_Bg1[131] = { + #include "extracted/data/rooms/tourian/tourian_7_bg1.gfx.inc" +}; const u8 sTourian_7_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR diff --git a/src/data/rooms/tourian/tourian_8.c b/src/data/rooms/tourian/tourian_8.c index 5465e3fee..7d18ef273 100644 --- a/src/data/rooms/tourian/tourian_8.c +++ b/src/data/rooms/tourian/tourian_8.c @@ -20,11 +20,17 @@ const u8 sTourian_3_Scrolls[SCROLL_DATA_SIZE(2)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sTourian_8_Clipdata[657] = INCBIN_U8("data/rooms/tourian/tourian_8_clipdata.gfx"); +const u8 sTourian_8_Clipdata[657] = { + #include "extracted/data/rooms/tourian/tourian_8_clipdata.gfx.inc" +}; -const u8 sTourian_8_Bg2[1201] = INCBIN_U8("data/rooms/tourian/tourian_8_bg2.gfx"); +const u8 sTourian_8_Bg2[1201] = { + #include "extracted/data/rooms/tourian/tourian_8_bg2.gfx.inc" +}; -const u8 sTourian_8_Bg1[1638] = INCBIN_U8("data/rooms/tourian/tourian_8_bg1.gfx"); +const u8 sTourian_8_Bg1[1638] = { + #include "extracted/data/rooms/tourian/tourian_8_bg1.gfx.inc" +}; const u8 sTourian_8_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(2)] = { 15, 24, SPRITESET_IDX(0), diff --git a/src/data/rooms/tourian/tourian_9.c b/src/data/rooms/tourian/tourian_9.c index e357c7ab5..959c601f1 100644 --- a/src/data/rooms/tourian/tourian_9.c +++ b/src/data/rooms/tourian/tourian_9.c @@ -13,15 +13,23 @@ const u8 sTourian_4_Scrolls[SCROLL_DATA_SIZE(1)] = { UCHAR_MAX, // Breakable block Y bound extension }; -const u8 sTourian_9_Clipdata[271] = INCBIN_U8("data/rooms/tourian/tourian_9_clipdata.gfx"); +const u8 sTourian_9_Clipdata[271] = { + #include "extracted/data/rooms/tourian/tourian_9_clipdata.gfx.inc" +}; -const u8 sTourian_9_Bg2[602] = INCBIN_U8("data/rooms/tourian/tourian_9_bg2.gfx"); +const u8 sTourian_9_Bg2[602] = { + #include "extracted/data/rooms/tourian/tourian_9_bg2.gfx.inc" +}; -const u8 sTourian_9_Bg1[600] = INCBIN_U8("data/rooms/tourian/tourian_9_bg1.gfx"); +const u8 sTourian_9_Bg1[600] = { + #include "extracted/data/rooms/tourian/tourian_9_bg1.gfx.inc" +}; const u8 sTourian_9_Spriteset0[ENEMY_ROOM_DATA_ARRAY_SIZE(1)] = { ROOM_SPRITE_DATA_TERMINATOR }; -const u8 sTourian_9_Bg0[250] = INCBIN_U8("data/rooms/tourian/tourian_9_bg0.gfx"); +const u8 sTourian_9_Bg0[250] = { + #include "extracted/data/rooms/tourian/tourian_9_bg0.gfx.inc" +}; diff --git a/src/data/samus/arm_cannon_data.c b/src/data/samus/arm_cannon_data.c index d6183e7c9..4ee0aa7d0 100644 --- a/src/data/samus/arm_cannon_data.c +++ b/src/data/samus/arm_cannon_data.c @@ -5,139 +5,347 @@ #include "constants/samus.h" -const u8 sArmCannonGfx_Upper_Forward_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_left_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_left_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_left_default.gfx"); -const u8 sArmCannonGfx_Upper_Up_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_left_default.gfx"); -const u8 sArmCannonGfx_Upper_Down_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_left_default.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_left_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_left_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_left_default.gfx"); -const u8 sArmCannonGfx_Lower_Up_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_left_default.gfx"); -const u8 sArmCannonGfx_Lower_Down_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_left_default.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_right_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_right_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_right_default.gfx"); - -const u8 sArmCannonGfx_Upper_Up_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_standing.gfx"); -const u8 sArmCannonGfx_Upper_Down_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_standing.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_right_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_right_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_right_default.gfx"); - -const u8 sArmCannonGfx_Lower_Up_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_standing.gfx"); -const u8 sArmCannonGfx_Lower_Down_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_standing.gfx"); - - -const u8 sArmCannonGfx_Upper_Forward_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_left_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_left_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_left_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_Up_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_left_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_Down_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_left_armed_default.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_left_armed_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_left_armed_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_left_armed_default.gfx"); -const u8 sArmCannonGfx_Lower_Up_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_left_armed_default.gfx"); -const u8 sArmCannonGfx_Lower_Down_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_left_armed_default.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_right_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_right_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_right_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_Up_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_right_armed_default.gfx"); -const u8 sArmCannonGfx_Upper_Down_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_right_armed_default.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_right_armed_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_right_armed_default.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_right_armed_default.gfx"); - -const u8 sArmCannonGfx_Unused[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/unused.gfx"); - -const u8 sArmCannonGfx_Lower_Armed_Down[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_armed_down.gfx"); - - -const u8 sArmCannonGfx_Upper_Forward_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_right_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_right_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Up_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Upper_Down_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_right_hanging.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_right_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_right_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Up_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Lower_Down_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_right_hanging.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_left_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_left_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_left_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Up_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_left_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Down_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_left_hanging.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_left_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_left_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_left_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Up_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_left_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Down_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_left_hanging.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Up_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Down_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_right_armed_hanging.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Up_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_right_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Down_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_right_armed_hanging.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Up_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_up_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Upper_Down_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_left_armed_hanging.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Up_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_up_left_armed_hanging.gfx"); -const u8 sArmCannonGfx_Lower_Down_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_left_armed_hanging.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Upper_Down_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_right_on_zipline.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_right_on_zipline.gfx"); -const u8 sArmCannonGfx_Lower_Down_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_right_on_zipline.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_right_armed_on_zipline.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_right_armed_on_zipline.gfx"); -const u8 sArmCannonGfx_Upper_Down_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_down_right_armed_on_zipline.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_right_armed_on_zipline.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_right_armed_on_zipline.gfx"); -const u8 sArmCannonGfx_Lower_Down_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_down_right_armed_on_zipline.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_standing.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_standing.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_standing.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_standing.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_standing.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_standing.gfx"); - -const u8 sArmCannonGfx_Upper_Forward_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_forward_armed_standing.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalUp_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_up_armed_standing.gfx"); -const u8 sArmCannonGfx_Upper_DiagonalDown_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/upper_diagonal_down_armed_standing.gfx"); - -const u8 sArmCannonGfx_Lower_Forward_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_forward_armed_standing.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalUp_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_up_armed_standing.gfx"); -const u8 sArmCannonGfx_Lower_DiagonalDown_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = INCBIN_U8("data/samus/graphics/arm_cannon/lower_diagonal_down_armed_standing.gfx"); +const u8 sArmCannonGfx_Upper_Forward_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_left_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Up_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_left_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_left_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_right_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_right_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_right_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Up_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_standing.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_right_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_right_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_right_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Up_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_standing.gfx.inc" +}; + + +const u8 sArmCannonGfx_Upper_Forward_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_left_armed_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Up_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_left_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_left_armed_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_right_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_right_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_right_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_right_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_right_armed_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_right_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_right_armed_default.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_right_armed_default.gfx.inc" +}; + +const u8 sArmCannonGfx_Unused[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/unused.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Armed_Down[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_armed_down.gfx.inc" +}; + + +const u8 sArmCannonGfx_Upper_Forward_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_right_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_right_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_right_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_right_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_right_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Up_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Right_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_right_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_left_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Up_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_left_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Left_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_left_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_right_armed_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Up_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_right_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Right_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_right_armed_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Up_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_up_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_left_armed_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Up_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_up_left_armed_hanging.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Left_Armed_Hanging[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_left_armed_hanging.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_right_on_zipline.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_right_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Right_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_right_on_zipline.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_right_armed_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_right_armed_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_Down_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_down_right_armed_on_zipline.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_right_armed_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_right_armed_on_zipline.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_Down_Right_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_down_right_armed_on_zipline.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_standing.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_standing.gfx.inc" +}; + +const u8 sArmCannonGfx_Upper_Forward_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_forward_armed_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalUp_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_up_armed_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Upper_DiagonalDown_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/upper_diagonal_down_armed_standing.gfx.inc" +}; + +const u8 sArmCannonGfx_Lower_Forward_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_forward_armed_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalUp_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_up_armed_standing.gfx.inc" +}; +const u8 sArmCannonGfx_Lower_DiagonalDown_Armed_Standing[SAMUS_ARM_CANNON_GFX_SIZE] = { + #include "extracted/data/samus/graphics/arm_cannon/lower_diagonal_down_armed_standing.gfx.inc" +}; static const u16 sSamusArmCannonOam_Suit_Left_Forward_Running_Frame0[OAM_DATA_SIZE(1)] = { diff --git a/src/data/samus/samus_graphics.c b/src/data/samus/samus_graphics.c index e6874101f..4fc683ce8 100644 --- a/src/data/samus/samus_graphics.c +++ b/src/data/samus/samus_graphics.c @@ -19,786 +19,786 @@ const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame4[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame6[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame7[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame8[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame8[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Frame9[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Running_Frame9[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_running_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame7[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame8[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Frame9[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame7[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame8[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Frame9[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Standing_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Frame6[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Frame7[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Frame8[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Frame9[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_Running_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_running_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Standing_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Standing_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Standing_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalUp_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalUp_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalDown_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_down_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_down_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DiagonalDown_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_diagonal_down_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_diagonal_down_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_Standing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Up_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Up_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Up_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Up_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Standing_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Standing_Frame2[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_Standing_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_Standing_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_Standing_Frame2[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Crouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Crouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Crouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Crouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Crouching_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Crouching_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_ShootingAndCrouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_shooting_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_shooting_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Crouching_Frame0[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Crouching_Frame1[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Crouching_Frame2[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_GettingKnockedBack_Frame0[SAMUS_GFX_SIZE(11, 10)] = { 11, 10, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_getting_knocked_back_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_getting_knocked_back_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_GettingKnockedBack_Frame1[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_getting_knocked_back_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_getting_knocked_back_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_GettingKnockedBack_Frame0[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_getting_knocked_back_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_getting_knocked_back_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_GettingKnockedBack_Frame1[SAMUS_GFX_SIZE(11, 8)] = { 11, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_getting_knocked_back_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_getting_knocked_back_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Forward_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_forward_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Forward_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_forward_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Skidding_Frame0[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Skidding_Frame1[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Armed_Skidding_Frame0[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_armed_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_armed_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Armed_Skidding_Frame1[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_armed_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_armed_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Armed_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_armed_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_armed_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Skidding_Frame0[SAMUS_GFX_SIZE(14, 12)] = { 14, 12, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Skidding_Frame1[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Armed_Skidding_Frame0[SAMUS_GFX_SIZE(14, 12)] = { 14, 12, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_armed_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_armed_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Armed_Skidding_Frame1[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_armed_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_armed_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Armed_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_armed_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_armed_skidding_frame_2.gfx.inc" }; @@ -4492,358 +4492,358 @@ const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Armed_Skidding[4] = { const u8 sSamusGfx_Top_PowerSuit_Left_DelayBeforeShinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_delay_before_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_delay_before_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_MidAir_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_MidAir_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_MidAir_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Landing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_landing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_landing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_None_Landing_Frame1[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_none_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_none_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_Landing_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_None_Landing_Frame2[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_none_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_none_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_Landing_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Landing_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Down_MidAir_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_Down_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DelayBeforeShinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_delay_before_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_delay_before_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_None_Landing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_none_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_none_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_None_Landing_Frame2[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_none_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_none_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_MidAir_Frame0[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Landing_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_MidAir_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_MidAir_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Down_MidAir_Frame0[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_Down_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_StartingSpinJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_starting_spin_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_starting_spin_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Spinning_Frame0[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_spinning_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_spinning_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Spinning_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_spinning_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_spinning_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Spinning_Frame2[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_spinning_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_spinning_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Spinning_Frame3[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_spinning_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_spinning_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_StartingSpinJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_starting_spin_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_starting_spin_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Spinning_Frame0[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_spinning_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_spinning_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Spinning_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_spinning_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_spinning_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Spinning_Frame2[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_spinning_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_spinning_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Spinning_Frame3[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_spinning_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_spinning_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DelayBeforeShinesparking_Frame3[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_delay_before_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_delay_before_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_StartingWallJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_starting_wall_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_starting_wall_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_StartingWallJump_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_starting_wall_jump_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_starting_wall_jump_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_StartingWallJump_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_starting_wall_jump_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_starting_wall_jump_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_StartingWallJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_starting_wall_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_starting_wall_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_StartingWallJump_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_starting_wall_jump_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_starting_wall_jump_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_StartingWallJump_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_starting_wall_jump_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_starting_wall_jump_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Shinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame5[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Shinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame4[SAMUS_GFX_SIZE(7, 7)] = { 7, 7, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame3[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame2[SAMUS_GFX_SIZE(7, 7)] = { 7, 7, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame8[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame7[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Shinesparking_Frame6[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_shinesparking_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_shinesparking_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Sidewards_Shinesparking_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_sidewards_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_sidewards_shinesparking_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Sidewards_Shinesparking_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_sidewards_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_sidewards_shinesparking_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Sidewards_Shinesparking_Frame3[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_sidewards_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_sidewards_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Sidewards_Shinesparking_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_sidewards_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_sidewards_shinesparking_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Sidewards_Shinesparking_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_sidewards_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_sidewards_shinesparking_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Sidewards_Shinesparking_Frame3[SAMUS_GFX_SIZE(9, 9)] = { 9, 9, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_sidewards_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_sidewards_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SpaceJumping_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_space_jumping_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_space_jumping_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SpaceJumping_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_space_jumping_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_space_jumping_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SpaceJumping_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_space_jumping_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_space_jumping_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SpaceJumping_Frame3[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_space_jumping_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_space_jumping_frame_3.gfx.inc" }; @@ -6854,332 +6854,332 @@ const struct SamusAnimationData sSamusAnim_PowerSuit_Right_SpaceJumping[9] = { const u8 sSamusGfx_Top_PowerSuit_Left_Morphing_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_morphing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_morphing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphing_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphing_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphball_Frame0[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphball_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphball_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphing_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphball_Frame6[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphball_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphball_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphball_Frame5[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphball_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphball_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphball_Frame4[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphball_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphball_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphball_Frame3[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphball_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphball_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Morphball_Frame2[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_morphball_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_morphball_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Morphing_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_morphing_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_morphing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_TurningAround_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DiagonalUp_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_diagonal_up_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_diagonal_up_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DiagonalUp_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_diagonal_up_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_diagonal_up_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DiagonalDown_TurningAround_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_diagonal_down_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_diagonal_down_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DiagonalDown_TurningAround_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_diagonal_down_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_diagonal_down_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Up_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_up_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_up_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Up_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_up_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_up_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_TurningAroundAndCrouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_turning_around_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_turning_around_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_TurningAroundAndCrouching_Frame0[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_turning_around_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_turning_around_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_TurningAroundAndCrouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_turning_around_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_turning_around_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Down_TurningAroundMidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_down_turning_around_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_down_turning_around_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Down_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_down_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_down_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Down_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_down_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_down_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_FacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_FacingTheForeground_Frame1[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_facing_the_foreground_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_facing_the_foreground_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_FacingTheForeground_Frame2[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_facing_the_foreground_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_facing_the_foreground_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_UsingAnElevator_Frame1[SAMUS_GFX_SIZE(12, 9)] = { 12, 9, - _INCBIN_U8("data/samus/graphics/power_suit/top_using_an_elevator_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_using_an_elevator_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_TurningFromFacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_turning_from_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_turning_from_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_TurningFromFacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_turning_from_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_turning_from_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_TurningOnZipline_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_turning_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_turning_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DiagonalDown_TurningOnZipline_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_diagonal_down_turning_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_diagonal_down_turning_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DiagonalDown_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_diagonal_down_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_diagonal_down_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Down_TurningOnZipline_Frame1[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_down_turning_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_down_turning_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Down_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_down_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_down_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_MorphballMotionless_Frame0[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_morphball_motionless_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_morphball_motionless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_MorphballMotionless_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_morphball_motionless_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_morphball_motionless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_MorphballMotionless_Frame2[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_morphball_motionless_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_morphball_motionless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_MorphballMotionless_Frame3[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_morphball_motionless_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_morphball_motionless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame1[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame2[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame3[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame4[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame5[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame6[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame7[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame8[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_8.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame9[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_9.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_SavingLoadingGame_Frame10[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_saving_loading_game_frame_10.gfx") + #include "extracted/data/samus/graphics/power_suit/top_saving_loading_game_frame_10.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_DownloadingMapData_Frame0[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_downloading_map_data_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_downloading_map_data_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame0[SAMUS_GFX_SIZE(2, 0)] = { 2, 0, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame1[SAMUS_GFX_SIZE(3, 1)] = { 3, 1, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame2[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame3[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_4.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame5[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_5.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_6.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_6.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_DownloadingMapData_Frame7[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_downloading_map_data_frame_7.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_downloading_map_data_frame_7.gfx.inc" }; @@ -8760,431 +8760,431 @@ const struct SamusAnimationData sSamusAnim_256484[12] = { const u8 sSamusGfx_Top_PowerSuit_Left_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_PullingYourselfUpForwardFromHanging_Frame0[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpForwardFromHanging_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_PullingYourselfUpForwardFromHanging_Frame1[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpForwardFromHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_PullingYourselfUpForwardFromHanging_Frame2[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_PullingYourselfUpForwardFromHanging_Frame3[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_3.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Down_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_PullingYourselfForwardFromHanging_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_pulling_yourself_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_pulling_yourself_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_PullingYourselfForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_pulling_yourself_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_pulling_yourself_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Down_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_ShootingOnZipline_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_shooting_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_shooting_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Down_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Down_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Down_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Right_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_right_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_right_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalUp_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_DiagonalDown_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_diagonal_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_diagonal_down_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Up_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Down_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Down_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_down_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_PowerSuit_Left_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/power_suit/bottom_left_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/bottom_left_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalUp_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_DiagonalDown_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_diagonal_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_diagonal_down_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Up_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Down_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Down_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_down_aiming_while_hanging_frame_2.gfx.inc" }; @@ -10598,168 +10598,168 @@ const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Down_ShootingOnZiplin const u8 sSamusGfx_Top_PowerSuit_Left_Dying_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Left_Dying_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame10[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_10.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_10.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame17[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_17.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_17.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame18[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_18.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_18.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame19[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_19.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_19.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame20[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_20.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_20.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame21[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_21.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_21.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame22[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_22.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_22.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame23[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_23.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_23.gfx.inc" }; const u8 sSamusGfx_Top_Left_Dying_Frame24[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_left_dying_frame_24.gfx") + #include "extracted/data/samus/graphics/power_suit/top_left_dying_frame_24.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Dying_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_0.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_PowerSuit_Right_Dying_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_1.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame10[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_10.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_10.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_2.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame17[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_17.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_17.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame18[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_18.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_18.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame19[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_19.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_19.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame20[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_20.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_20.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame21[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_21.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_21.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame22[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_22.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_22.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame23[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_23.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_23.gfx.inc" }; const u8 sSamusGfx_Top_Right_Dying_Frame24[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/power_suit/top_right_dying_frame_24.gfx") + #include "extracted/data/samus/graphics/power_suit/top_right_dying_frame_24.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Dying_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_dying_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_dying_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Dying_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_dying_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_dying_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Dying_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_dying_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_dying_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Dying_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_dying_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_dying_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Dying_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_dying_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_dying_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Dying_Frame2[SAMUS_GFX_SIZE(9, 8)] = { 9, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_dying_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_dying_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Dying_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_dying_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_dying_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Dying_Frame2[SAMUS_GFX_SIZE(9, 8)] = { 9, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_dying_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_dying_frame_2.gfx.inc" }; @@ -11797,785 +11797,785 @@ const struct SamusAnimationData sSamusAnim_Suitless_Right_Dying[26] = { const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame1[SAMUS_GFX_SIZE(7, 7)] = { 7, 7, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame4[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame6[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame7[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame8[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame8[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Frame9[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Running_Frame9[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_running_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame7[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame8[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Frame9[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame7[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame8[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Frame9[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Standing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Frame8[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Frame9[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_running_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Standing_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Standing_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Standing_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalUp_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalUp_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalDown_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_down_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_down_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DiagonalDown_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_diagonal_down_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_diagonal_down_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_Standing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Up_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Up_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Up_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Up_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_Standing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_Standing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_Standing_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Crouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Crouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Crouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Crouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Crouching_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Crouching_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_ShootingAndCrouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_shooting_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_shooting_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Crouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Crouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Crouching_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_GettingKnockedBack_Frame0[SAMUS_GFX_SIZE(12, 11)] = { 12, 11, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_getting_knocked_back_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_getting_knocked_back_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_GettingKnockedBack_Frame1[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_getting_knocked_back_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_getting_knocked_back_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_GettingKnockedBack_Frame0[SAMUS_GFX_SIZE(10, 9)] = { 10, 9, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_getting_knocked_back_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_getting_knocked_back_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_GettingKnockedBack_Frame1[SAMUS_GFX_SIZE(11, 9)] = { 11, 9, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_getting_knocked_back_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_getting_knocked_back_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame1[SAMUS_GFX_SIZE(7, 7)] = { 7, 7, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Forward_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_forward_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Speedboosting_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Speedboosting_Frame8[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Forward_Running_Speedboosting_Frame9[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_forward_running_speedboosting_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_Running_Speedboosting_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_running_speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_running_speedboosting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Skidding_Frame0[SAMUS_GFX_SIZE(14, 10)] = { 14, 10, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Skidding_Frame1[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Skidding_Frame2[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Armed_Skidding_Frame0[SAMUS_GFX_SIZE(14, 10)] = { 14, 10, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_armed_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_armed_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Armed_Skidding_Frame1[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_armed_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_armed_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Armed_Skidding_Frame2[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_armed_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_armed_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Skidding_Frame0[SAMUS_GFX_SIZE(14, 12)] = { 14, 12, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Skidding_Frame1[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_skidding_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Armed_Skidding_Frame0[SAMUS_GFX_SIZE(14, 12)] = { 14, 12, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_armed_skidding_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_armed_skidding_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Armed_Skidding_Frame1[SAMUS_GFX_SIZE(12, 10)] = { 12, 10, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_armed_skidding_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_armed_skidding_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Armed_Skidding_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_armed_skidding_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_armed_skidding_frame_2.gfx.inc" }; @@ -16341,363 +16341,363 @@ const struct SamusAnimationData sSamusAnim_FullSuit_Right_Armed_Skidding[4] = { const u8 sSamusGfx_Top_FullSuit_Left_DelayBeforeShinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_delay_before_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_delay_before_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_MidAir_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_MidAir_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_MidAir_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Landing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_landing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_landing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_None_Landing_Frame1[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_none_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_none_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_Landing_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_None_Landing_Frame2[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_none_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_none_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_Landing_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Landing_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Down_MidAir_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_Down_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DelayBeforeShinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_delay_before_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_delay_before_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_None_Landing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_none_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_none_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_None_Landing_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_none_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_none_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Landing_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_Down_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_StartingSpinJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_starting_spin_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_starting_spin_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Spinning_Frame0[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_spinning_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_spinning_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Spinning_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_spinning_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_spinning_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Spinning_Frame2[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_spinning_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_spinning_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Spinning_Frame3[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_spinning_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_spinning_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_StartingSpinJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_starting_spin_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_starting_spin_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Spinning_Frame0[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_spinning_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_spinning_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Spinning_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_spinning_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_spinning_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Spinning_Frame2[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_spinning_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_spinning_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Spinning_Frame3[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_spinning_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_spinning_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DelayBeforeShinesparking_Frame3[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_delay_before_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_delay_before_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DelayBeforeShinesparking_Frame3[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_delay_before_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_delay_before_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_StartingWallJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_starting_wall_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_starting_wall_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_StartingWallJump_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_starting_wall_jump_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_starting_wall_jump_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_StartingWallJump_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_starting_wall_jump_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_starting_wall_jump_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_StartingWallJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_starting_wall_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_starting_wall_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_StartingWallJump_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_starting_wall_jump_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_starting_wall_jump_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_StartingWallJump_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_starting_wall_jump_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_starting_wall_jump_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Shinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame5[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Shinesparking_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_shinesparking_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame4[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame3[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame8[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame7[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Shinesparking_Frame6[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_shinesparking_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_shinesparking_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Sidewards_Shinesparking_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_sidewards_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_sidewards_shinesparking_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Sidewards_Shinesparking_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_sidewards_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_sidewards_shinesparking_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Sidewards_Shinesparking_Frame3[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_sidewards_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_sidewards_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Sidewards_Shinesparking_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_sidewards_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_sidewards_shinesparking_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Sidewards_Shinesparking_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_sidewards_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_sidewards_shinesparking_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Sidewards_Shinesparking_Frame3[SAMUS_GFX_SIZE(9, 9)] = { 9, 9, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_sidewards_shinesparking_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_sidewards_shinesparking_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SpaceJumping_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_space_jumping_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_space_jumping_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SpaceJumping_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_space_jumping_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_space_jumping_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SpaceJumping_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_space_jumping_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_space_jumping_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SpaceJumping_Frame3[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_space_jumping_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_space_jumping_frame_3.gfx.inc" }; @@ -18850,332 +18850,332 @@ const struct SamusAnimationData sSamusAnim_FullSuit_Right_SpaceJumping[9] = { const u8 sSamusGfx_Top_FullSuit_Left_Morphing_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_morphing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_morphing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphing_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphing_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphball_Frame0[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphball_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphball_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphing_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphball_Frame6[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphball_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphball_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphball_Frame5[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphball_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphball_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphball_Frame4[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphball_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphball_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphball_Frame3[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphball_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphball_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Morphball_Frame2[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_morphball_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_morphball_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Morphing_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_morphing_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_morphing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_TurningAround_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DiagonalUp_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_diagonal_up_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_diagonal_up_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DiagonalUp_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_diagonal_up_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_diagonal_up_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DiagonalDown_TurningAround_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_diagonal_down_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_diagonal_down_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DiagonalDown_TurningAround_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_diagonal_down_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_diagonal_down_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Up_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_up_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_up_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Up_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_up_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_up_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_TurningAroundAndCrouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_turning_around_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_turning_around_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_TurningAroundAndCrouching_Frame0[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_turning_around_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_turning_around_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_TurningAroundAndCrouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_turning_around_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_turning_around_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Down_TurningAroundMidAir_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_down_turning_around_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_down_turning_around_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Down_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_down_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_down_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Down_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_down_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_down_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_FacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_FacingTheForeground_Frame1[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_facing_the_foreground_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_facing_the_foreground_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_FacingTheForeground_Frame2[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_facing_the_foreground_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_facing_the_foreground_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_UsingAnElevator_Frame1[SAMUS_GFX_SIZE(12, 9)] = { 12, 9, - _INCBIN_U8("data/samus/graphics/full_suit/top_using_an_elevator_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_using_an_elevator_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_TurningFromFacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_turning_from_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_turning_from_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_TurningFromFacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_turning_from_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_turning_from_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_TurningOnZipline_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_turning_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_turning_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DiagonalDown_TurningOnZipline_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_diagonal_down_turning_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_diagonal_down_turning_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DiagonalDown_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_diagonal_down_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_diagonal_down_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Down_TurningOnZipline_Frame1[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/full_suit/top_down_turning_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_down_turning_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Down_TurningOnZipline_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_down_turning_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_down_turning_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_MorphballMotionless_Frame0[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_morphball_motionless_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_morphball_motionless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_MorphballMotionless_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_morphball_motionless_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_morphball_motionless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_MorphballMotionless_Frame2[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_morphball_motionless_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_morphball_motionless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_MorphballMotionless_Frame3[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/full_suit/top_morphball_motionless_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_morphball_motionless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame1[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame2[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame3[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame4[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame5[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame6[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame7[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame8[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_8.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame9[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_9.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_SavingLoadingGame_Frame10[SAMUS_GFX_SIZE(12, 6)] = { 12, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_saving_loading_game_frame_10.gfx") + #include "extracted/data/samus/graphics/full_suit/top_saving_loading_game_frame_10.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_DownloadingMapData_Frame0[SAMUS_GFX_SIZE(10, 8)] = { 10, 8, - _INCBIN_U8("data/samus/graphics/full_suit/top_downloading_map_data_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_downloading_map_data_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame0[SAMUS_GFX_SIZE(2, 0)] = { 2, 0, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame1[SAMUS_GFX_SIZE(3, 1)] = { 3, 1, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame2[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame3[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame4[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_4.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame5[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_5.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_6.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_6.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_DownloadingMapData_Frame7[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_downloading_map_data_frame_7.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_downloading_map_data_frame_7.gfx.inc" }; @@ -20825,431 +20825,431 @@ const struct SamusAnimationData sSamusAnim_27f430[12] = { const u8 sSamusGfx_Top_FullSuit_Left_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_PullingYourselfUpForwardFromHanging_Frame0[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpForwardFromHanging_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_PullingYourselfUpForwardFromHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpForwardFromHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_PullingYourselfUpForwardFromHanging_Frame2[SAMUS_GFX_SIZE(7, 4)] = { 7, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_pulling_yourself_up_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_PullingYourselfUpForwardFromHanging_Frame3[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_3.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_pulling_yourself_up_forward_from_hanging_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Down_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_PullingYourselfForwardFromHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_pulling_yourself_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_pulling_yourself_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_PullingYourselfForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_pulling_yourself_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_pulling_yourself_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Down_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_ShootingOnZipline_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_shooting_on_zipline_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_shooting_on_zipline_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Down_OnZipline_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Down_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Down_OnZipline_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_down_on_zipline_frame_0.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_down_on_zipline_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Right_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_right_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_right_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalUp_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_DiagonalDown_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_diagonal_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_diagonal_down_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Up_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Down_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Right_Down_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/top_right_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_right_down_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_FullSuit_Left_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/full_suit/bottom_left_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/bottom_left_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalUp_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_DiagonalDown_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_diagonal_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_diagonal_down_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Up_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_up_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_up_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Down_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_down_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_down_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_FullSuit_Left_Down_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/full_suit/top_left_down_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/full_suit/top_left_down_aiming_while_hanging_frame_2.gfx.inc" }; @@ -22666,193 +22666,193 @@ const struct SamusAnimationData sSamusAnim_FullSuit_Right_Down_ShootingOnZipline const u8 sSamusEffectGfx_Speedboosting_Frame0[SAMUS_GFX_SIZE(5, 0)] = { 5, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame1[SAMUS_GFX_SIZE(5, 0)] = { 5, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_1.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_1.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame2[SAMUS_GFX_SIZE(5, 0)] = { 5, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame3[SAMUS_GFX_SIZE(6, 0)] = { 6, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_3.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_3.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame4[SAMUS_GFX_SIZE(5, 0)] = { 5, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_4.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_4.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame5[SAMUS_GFX_SIZE(6, 0)] = { 6, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_5.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_5.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame6[SAMUS_GFX_SIZE(6, 0)] = { 6, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_6.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_6.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame7[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_7.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_7.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame8[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_8.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_8.gfx.inc" }; const u8 sSamusEffectGfx_Speedboosting_Frame9[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/effects/speedboosting_frame_9.gfx") + #include "extracted/data/samus/graphics/effects/speedboosting_frame_9.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame0[SAMUS_GFX_SIZE(1, 0)] = { 1, 0, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame1[SAMUS_GFX_SIZE(2, 0)] = { 2, 0, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_1.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_1.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame2[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame3[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_3.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_3.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame4[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_4.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_4.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame5[SAMUS_GFX_SIZE(10, 3)] = { 10, 3, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_5.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_5.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame6[SAMUS_GFX_SIZE(6, 1)] = { 6, 1, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_6.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_6.gfx.inc" }; const u8 sSamusEffectGfx_DelayBeforeBallsparking_Frame7[SAMUS_GFX_SIZE(3, 1)] = { 3, 1, - _INCBIN_U8("data/samus/graphics/effects/delay_before_ballsparking_frame_7.gfx") + #include "extracted/data/samus/graphics/effects/delay_before_ballsparking_frame_7.gfx.inc" }; const u8 sSamusEffectGfx_Sidewards_Shinesparking_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/effects/sidewards_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/sidewards_shinesparking_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_Sidewards_Shinesparking_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/effects/sidewards_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/effects/sidewards_shinesparking_frame_1.gfx.inc" }; const u8 sSamusEffectGfx_Sidewards_Shinesparking_Frame2[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/effects/sidewards_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/sidewards_shinesparking_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_Diagonal_Shinesparking_Frame0[SAMUS_GFX_SIZE(9, 8)] = { 9, 8, - _INCBIN_U8("data/samus/graphics/effects/diagonal_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/diagonal_shinesparking_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_Diagonal_Shinesparking_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/effects/diagonal_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/effects/diagonal_shinesparking_frame_1.gfx.inc" }; const u8 sSamusEffectGfx_Diagonal_Shinesparking_Frame2[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/effects/diagonal_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/diagonal_shinesparking_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_Up_Shinesparking_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/effects/up_shinesparking_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/up_shinesparking_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_Up_Shinesparking_Frame1[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/effects/up_shinesparking_frame_1.gfx") + #include "extracted/data/samus/graphics/effects/up_shinesparking_frame_1.gfx.inc" }; const u8 sSamusEffectGfx_Up_Shinesparking_Frame2[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/effects/up_shinesparking_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/up_shinesparking_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_ScrewAttacking_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/effects/screw_attacking_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/screw_attacking_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_ScrewAttacking_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/effects/screw_attacking_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/screw_attacking_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_ScrewAttacking_Frame4[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/effects/screw_attacking_frame_4.gfx") + #include "extracted/data/samus/graphics/effects/screw_attacking_frame_4.gfx.inc" }; const u8 sSamusEffectGfx_ScrewAttacking_Frame6[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/effects/screw_attacking_frame_6.gfx") + #include "extracted/data/samus/graphics/effects/screw_attacking_frame_6.gfx.inc" }; const u8 sSamusEffectGfx_StoringShinespark_Frame0[SAMUS_GFX_SIZE(2, 0)] = { 2, 0, - _INCBIN_U8("data/samus/graphics/effects/storing_shinespark_frame_0.gfx") + #include "extracted/data/samus/graphics/effects/storing_shinespark_frame_0.gfx.inc" }; const u8 sSamusEffectGfx_StoringShinespark_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/effects/storing_shinespark_frame_1.gfx") + #include "extracted/data/samus/graphics/effects/storing_shinespark_frame_1.gfx.inc" }; const u8 sSamusEffectGfx_StoringShinespark_Frame2[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/effects/storing_shinespark_frame_2.gfx") + #include "extracted/data/samus/graphics/effects/storing_shinespark_frame_2.gfx.inc" }; const u8 sSamusEffectGfx_StoringShinespark_Frame3[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/effects/storing_shinespark_frame_3.gfx") + #include "extracted/data/samus/graphics/effects/storing_shinespark_frame_3.gfx.inc" }; const u8 sSamusEffectGfx_StoringShinespark_Frame4[SAMUS_GFX_SIZE(2, 0)] = { 2, 0, - _INCBIN_U8("data/samus/graphics/effects/storing_shinespark_frame_4.gfx") + #include "extracted/data/samus/graphics/effects/storing_shinespark_frame_4.gfx.inc" }; const u8 sSamusEffectGfx_StoringShinespark_Frame5[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/effects/storing_shinespark_frame_5.gfx") + #include "extracted/data/samus/graphics/effects/storing_shinespark_frame_5.gfx.inc" }; @@ -23805,767 +23805,767 @@ const struct SamusEffectAnimationData sSamusEffectAnim_Right_Diagonal_Ballsparki const u8 sSamusGfx_Top_Suitless_Left_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame3[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame4[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame6[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_6.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame6[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_6.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame7[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_7.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame7[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_7.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame8[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_8.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame8[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_8.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Running_Frame9[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_running_frame_9.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Running_Frame9[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_running_frame_9.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame1[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame2[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame3[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame6[SAMUS_GFX_SIZE(5, 4)] = { 5, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_6.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame7[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_7.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame8[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_8.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Running_Frame9[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_running_frame_9.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_running_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Forward_Running_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_forward_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_forward_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Forward_Running_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_forward_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_forward_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Forward_Running_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_forward_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_forward_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Forward_Running_Frame3[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_forward_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_forward_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Forward_Running_Frame4[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_forward_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_forward_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Forward_Running_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_forward_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_forward_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Running_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Running_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Running_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Running_Frame3[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Running_Frame4[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Running_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Running_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Running_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Running_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Running_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Running_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Running_Frame5[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Forward_Running_Frame0[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_forward_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_forward_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Forward_Running_Frame1[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_forward_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_forward_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Forward_Running_Frame2[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_forward_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_forward_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Forward_Running_Frame3[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_forward_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_forward_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Forward_Running_Frame4[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_forward_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_forward_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Forward_Running_Frame5[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_forward_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_forward_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Running_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Running_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Running_Frame3[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Running_Frame4[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Running_Frame5[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Running_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_running_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_running_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Running_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_running_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_running_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Running_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_running_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_running_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Running_Frame3[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_running_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_running_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Running_Frame4[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_running_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_running_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Running_Frame5[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_running_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_running_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Standing_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Shooting_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Shooting_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DiagonalUp_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_diagonal_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_diagonal_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DiagonalUp_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_diagonal_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_diagonal_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DiagonalUp_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_diagonal_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_diagonal_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Shooting_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_Shooting_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_DiagonalUp_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_diagonal_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_diagonal_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DiagonalDown_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_diagonal_down_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_diagonal_down_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DiagonalDown_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_diagonal_down_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_diagonal_down_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DiagonalDown_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_diagonal_down_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_diagonal_down_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Shooting_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_DiagonalDown_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_diagonal_down_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_diagonal_down_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Up_Standing_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Up_Standing_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_up_standing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_up_standing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_Up_Standing_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_up_standing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_up_standing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_Shooting_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_Shooting_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Up_Shooting_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_up_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_up_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Standing_Frame0[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Shooting_Frame0[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Shooting_Frame1[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Shooting_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_Shooting_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Shooting_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_Shooting_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_Standing_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_standing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_standing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_Shooting_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_shooting_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_shooting_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_Shooting_Frame1[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_shooting_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_shooting_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Crouching_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrouchingSuitless_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_Crouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_Crouching_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_crouching_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_crouching_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingAndCrouching_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingAndCrouching_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_ShootingAndCrouching_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_shooting_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_shooting_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Crouching_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingAndCrouching_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingAndCrouching_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_GettingKnockedBack_Frame0[SAMUS_GFX_SIZE(11, 8)] = { 11, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_getting_knocked_back_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_getting_knocked_back_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_GettingKnockedBack_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_getting_knocked_back_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_getting_knocked_back_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_GettingKnockedBack_Frame0[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_getting_knocked_back_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_getting_knocked_back_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_GettingKnockedBack_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_getting_knocked_back_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_getting_knocked_back_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingSuitless_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingSuitless_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingSuitless_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingSuitless_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingSuitless_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_suitless_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_UncrouchingSuitless_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_UncrouchingSuitless_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_UncrouchingSuitless_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_UncrouchingSuitless_Frame3[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_UncrouchingSuitless_Frame4[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_uncrouching_suitless_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingSuitless_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingSuitless_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingSuitless_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingSuitless_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingSuitless_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_suitless_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_UncrouchingSuitless_Frame0[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_UncrouchingSuitless_Frame1[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_UncrouchingSuitless_Frame2[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_UncrouchingSuitless_Frame3[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_UncrouchingSuitless_Frame4[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_uncrouching_suitless_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_UncrouchingSuitless_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_UncrouchingSuitless_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_UncrouchingSuitless_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_UncrouchingSuitless_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_UncrouchingSuitless_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_uncrouching_suitless_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_UncrouchingSuitless_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_UncrouchingSuitless_Frame1[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_UncrouchingSuitless_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_UncrouchingSuitless_Frame3[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_UncrouchingSuitless_Frame4[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_uncrouching_suitless_frame_4.gfx.inc" }; @@ -27492,446 +27492,446 @@ const struct SamusAnimationData sSamusAnim_Suitless_Right_Up_UncrouchingSuitless const u8 sSamusGfx_Top_Suitless_Left_MidAir_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_MidAir_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_MidAir_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_MidAir_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_MidAir_Frame3[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_MidAir_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_MidAir_Frame4[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_MidAir_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Landing_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_landing_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_landing_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Landing_Frame1[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Landing_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Landing_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Landing_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Landing_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_landing_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_landing_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Landing_Frame4[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_landing_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_landing_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Landing_Frame5[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_landing_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_landing_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_MidAir_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_MidAir_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_MidAir_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_MidAir_Frame3[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_MidAir_Frame4[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_DiagonalUp_Landing_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_diagonal_up_landing_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_diagonal_up_landing_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_MidAir_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_MidAir_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_MidAir_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_MidAir_Frame3[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_MidAir_Frame4[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_DiagonalDown_Landing_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_diagonal_down_landing_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_diagonal_down_landing_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_MidAir_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_MidAir_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_MidAir_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_MidAir_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_MidAir_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Up_Landing_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_up_landing_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_up_landing_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Down_MidAir_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Down_MidAir_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Down_MidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_MidAir_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_MidAir_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_MidAir_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_MidAir_Frame3[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_MidAir_Frame4[SAMUS_GFX_SIZE(8, 6)] = { 8, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Landing_Frame1[SAMUS_GFX_SIZE(7, 2)] = { 7, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_landing_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_landing_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Landing_Frame2[SAMUS_GFX_SIZE(5, 2)] = { 5, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_landing_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_landing_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Landing_Frame3[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_landing_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_landing_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_Landing_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_landing_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_landing_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Landing_Frame4[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_landing_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_landing_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Landing_Frame5[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_landing_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_landing_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_MidAir_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_MidAir_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_MidAir_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_MidAir_Frame3[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_MidAir_Frame4[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_MidAir_Frame0[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_MidAir_Frame1[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_MidAir_Frame2[SAMUS_GFX_SIZE(5, 5)] = { 5, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_MidAir_Frame3[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_MidAir_Frame4[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_MidAir_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_MidAir_Frame1[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_MidAir_Frame2[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_mid_air_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_mid_air_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_MidAir_Frame3[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_mid_air_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_mid_air_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_MidAir_Frame4[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_mid_air_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_mid_air_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Down_MidAir_Frame0[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_down_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_down_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Down_MidAir_Frame1[SAMUS_GFX_SIZE(4, 3)] = { 4, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_down_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_down_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingSpinJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_spin_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_spin_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Spinning_Frame0[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_spinning_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_spinning_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Spinning_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_spinning_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_spinning_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Spinning_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_spinning_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_spinning_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Spinning_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_spinning_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_spinning_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingSpinJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_spin_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_spin_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Spinning_Frame0[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_spinning_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_spinning_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Spinning_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_spinning_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_spinning_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Spinning_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_spinning_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_spinning_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Spinning_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_spinning_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_spinning_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingWallJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_wall_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_wall_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingWallJump_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_wall_jump_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_wall_jump_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingWallJump_Frame2[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_wall_jump_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_wall_jump_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingWallJump_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_wall_jump_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_wall_jump_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingWallJump_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_wall_jump_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_wall_jump_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingWallJump_Frame2[SAMUS_GFX_SIZE(6, 3)] = { 6, 3, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_wall_jump_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_wall_jump_frame_2.gfx.inc" }; @@ -29712,423 +29712,423 @@ const struct SamusAnimationData sSamusAnim_Suitless_Right_StartingWallJump[4] = const u8 sSamusGfx_Top_Suitless_Left_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_HangingOnLedgeSuitless_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_hanging_on_ledge_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_hanging_on_ledge_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfForwardFromHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfForwardFromHanging_Frame0[SAMUS_GFX_SIZE(5, 3)] = { 5, 3, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfForwardFromHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfForwardFromHanging_Frame1[SAMUS_GFX_SIZE(3, 2)] = { 3, 2, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_PullingYourselfForwardFromHanging_Frame3[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_pulling_yourself_forward_from_hanging_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_PullingYourselfForwardFromHanging_Frame3[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_pulling_yourself_forward_from_hanging_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalUp_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_up_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_up_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_DiagonalDown_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_diagonal_down_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_diagonal_down_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Up_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_up_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_up_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Down_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Down_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_down_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_down_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Down_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_down_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_down_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_HangingOnLedge_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_hanging_on_ledge_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_hanging_on_ledge_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_HangingOnLedgeSuitless_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_hanging_on_ledge_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_hanging_on_ledge_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_HangingOnLedge_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_hanging_on_ledge_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_hanging_on_ledge_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_HangingOnLedge_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_hanging_on_ledge_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_hanging_on_ledge_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfUpFromHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_up_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_up_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfUpFromHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_up_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_up_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfUpFromHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_up_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_up_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfForwardFromHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfForwardFromHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfForwardFromHanging_Frame2[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_PullingYourselfForwardFromHanging_Frame3[SAMUS_GFX_SIZE(6, 2)] = { 6, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_pulling_yourself_forward_from_hanging_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(7, 7)] = { 7, 7, - _INCBIN_U8("data/samus/graphics/suitless/top_left_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_TurningToAimWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_turning_to_aim_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_turning_to_aim_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_AimingWhileHanging_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_aiming_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_aiming_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_AimingWhileHanging_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_aiming_while_hanging_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_aiming_while_hanging_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalUp_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_up_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_up_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_DiagonalDown_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_diagonal_down_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_diagonal_down_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Up_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_up_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_up_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Down_AimingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_down_aiming_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_down_aiming_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Down_ShootingWhileHanging_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_down_shooting_while_hanging_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_down_shooting_while_hanging_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Down_ShootingWhileHanging_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_down_shooting_while_hanging_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_down_shooting_while_hanging_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_HangingOnLedgeSuitless_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_HangingOnLedgeSuitless_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_HangingOnLedgeSuitless_Frame2[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_HangingOnLedgeSuitless_Frame3[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_HangingOnLedgeSuitless_Frame4[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_hanging_on_ledge_suitless_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_HangingOnLedgeSuitless_Frame0[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_HangingOnLedgeSuitless_Frame1[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_HangingOnLedgeSuitless_Frame2[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_HangingOnLedgeSuitless_Frame3[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_HangingOnLedgeSuitless_Frame4[SAMUS_GFX_SIZE(6, 5)] = { 6, 5, - _INCBIN_U8("data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_hanging_on_ledge_suitless_frame_4.gfx.inc" }; @@ -31441,509 +31441,509 @@ const struct SamusAnimationData sSamusAnim_Suitless_Right_HangingOnLedgeSuitless const u8 sSamusGfx_Top_Suitless_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_TurningAround_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_DiagonalUp_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_diagonal_up_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_diagonal_up_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_DiagonalUp_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_diagonal_up_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_diagonal_up_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_DiagonalDown_TurningAround_Frame0[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_diagonal_down_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_diagonal_down_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_DiagonalDown_TurningAround_Frame1[SAMUS_GFX_SIZE(6, 4)] = { 6, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_diagonal_down_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_diagonal_down_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Up_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_up_turning_around_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_up_turning_around_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Up_TurningAround_Frame1[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/suitless/top_up_turning_around_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_up_turning_around_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAroundAndCrouching_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_and_crouching_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_and_crouching_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_TurningAroundAndCrouching_Frame1[SAMUS_GFX_SIZE(3, 3)] = { 3, 3, - _INCBIN_U8("data/samus/graphics/suitless/bottom_turning_around_and_crouching_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_turning_around_and_crouching_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Down_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_down_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_down_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Down_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_down_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_down_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Down_TurningAroundMidAir_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/top_down_turning_around_mid_air_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_down_turning_around_mid_air_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_TurningAroundMidAir_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_turning_around_mid_air_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_turning_around_mid_air_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_FacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_FacingTheForeground_Frame1[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_facing_the_foreground_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_facing_the_foreground_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_FacingTheForeground_Frame2[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_facing_the_foreground_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_facing_the_foreground_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_TurningFromFacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_turning_from_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_turning_from_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_TurningFromFacingTheForeground_Frame0[SAMUS_GFX_SIZE(9, 6)] = { 9, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_turning_from_facing_the_foreground_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_turning_from_facing_the_foreground_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame1[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame2[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame3[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame4[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame5[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame6[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_6.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_6.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame7[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_7.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_7.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame8[SAMUS_GFX_SIZE(11, 6)] = { 11, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_8.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_8.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame9[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_9.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_9.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_SavingLoadingGame_Frame10[SAMUS_GFX_SIZE(10, 6)] = { 10, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_saving_loading_game_frame_10.gfx") + #include "extracted/data/samus/graphics/suitless/top_saving_loading_game_frame_10.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingToCrawl_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_to_crawl_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_to_crawl_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrouchingToCrawl_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingToCrawl_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_to_crawl_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_to_crawl_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrouchingToCrawl_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrouchingToCrawl_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crouching_to_crawl_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crouching_to_crawl_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrouchingToCrawl_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrouchingToCrawl_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crouching_to_crawl_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_CrawlingStopped_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crawling_stopped_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crawling_stopped_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrawlingStopped_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crawling_stopped_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crawling_stopped_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrawlingStopped_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crawling_stopped_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crawling_stopped_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_CrawlingStopped_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_crawling_stopped_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_crawling_stopped_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingWhileCrawling_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_while_crawling_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_while_crawling_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingWhileCrawling_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_while_crawling_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_while_crawling_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_ShootingWhileCrawling_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_left_shooting_while_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_shooting_while_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_ShootingWhileCrawling_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_shooting_while_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_shooting_while_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Crawling_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Crawling_Frame1[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Crawling_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crawling_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crawling_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Crawling_Frame2[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_crawling_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_crawling_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Crawling_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crawling_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crawling_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Crawling_Frame3[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_crawling_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_crawling_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Crawling_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crawling_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crawling_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Crawling_Frame4[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_crawling_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_crawling_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_Crawling_Frame5[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_crawling_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_crawling_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_Crawling_Frame5[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_crawling_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_crawling_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingToCrawl_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_to_crawl_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_to_crawl_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingToCrawl_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_to_crawl_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_to_crawl_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrouchingToCrawl_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crouching_to_crawl_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crouching_to_crawl_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_CrawlingStopped_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crawling_stopped_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crawling_stopped_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingWhileCrawling_Frame2[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_while_crawling_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_while_crawling_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingWhileCrawling_Frame0[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_while_crawling_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_while_crawling_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_ShootingWhileCrawling_Frame1[SAMUS_GFX_SIZE(8, 8)] = { 8, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_right_shooting_while_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_shooting_while_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Crawling_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Crawling_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crawling_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crawling_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Crawling_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crawling_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crawling_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Crawling_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crawling_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crawling_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_Crawling_Frame5[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_crawling_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_crawling_frame_5.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingToCrawl_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_to_crawl_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_to_crawl_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingToCrawl_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_to_crawl_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_to_crawl_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingToCrawl_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_to_crawl_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_to_crawl_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingToCrawl_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_to_crawl_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_to_crawl_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Left_StartingToCrawl_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_left_starting_to_crawl_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_left_starting_to_crawl_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAroundWhileCrawling_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_while_crawling_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_while_crawling_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_TurningAroundWhileCrawling_Frame0[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_turning_around_while_crawling_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_turning_around_while_crawling_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAroundWhileCrawling_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_while_crawling_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_while_crawling_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAroundWhileCrawling_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_while_crawling_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_while_crawling_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_TurningAroundWhileCrawling_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_turning_around_while_crawling_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_turning_around_while_crawling_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingToCrawl_Frame0[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_to_crawl_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_to_crawl_frame_0.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingToCrawl_Frame1[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_to_crawl_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_to_crawl_frame_1.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingToCrawl_Frame2[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_to_crawl_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_to_crawl_frame_2.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingToCrawl_Frame3[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_to_crawl_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_to_crawl_frame_3.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_Right_StartingToCrawl_Frame4[SAMUS_GFX_SIZE(6, 6)] = { 6, 6, - _INCBIN_U8("data/samus/graphics/suitless/top_right_starting_to_crawl_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/top_right_starting_to_crawl_frame_4.gfx.inc" }; const u8 sSamusGfx_Top_Suitless_DownloadingMapData_Frame0[SAMUS_GFX_SIZE(12, 8)] = { 12, 8, - _INCBIN_U8("data/samus/graphics/suitless/top_downloading_map_data_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/top_downloading_map_data_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame0[SAMUS_GFX_SIZE(2, 0)] = { 2, 0, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame1[SAMUS_GFX_SIZE(3, 1)] = { 3, 1, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_1.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_1.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame2[SAMUS_GFX_SIZE(2, 2)] = { 2, 2, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_2.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_2.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame3[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_3.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_3.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame4[SAMUS_GFX_SIZE(4, 2)] = { 4, 2, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_4.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_4.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame5[SAMUS_GFX_SIZE(8, 4)] = { 8, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_5.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_5.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame6[SAMUS_GFX_SIZE(4, 4)] = { 4, 4, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_6.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_6.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_DownloadingMapData_Frame7[SAMUS_GFX_SIZE(4, 0)] = { 4, 0, - _INCBIN_U8("data/samus/graphics/suitless/bottom_downloading_map_data_frame_7.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_downloading_map_data_frame_7.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_FacingTheBackground_Frame0[SAMUS_GFX_SIZE(7, 6)] = { 7, 6, - _INCBIN_U8("data/samus/graphics/suitless/bottom_facing_the_background_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_facing_the_background_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Left_TurningFromFacingTheBackground_Frame0[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/suitless/bottom_left_turning_from_facing_the_background_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_left_turning_from_facing_the_background_frame_0.gfx.inc" }; const u8 sSamusGfx_Bottom_Suitless_Right_TurningFromFacingTheBackground_Frame0[SAMUS_GFX_SIZE(7, 5)] = { 7, 5, - _INCBIN_U8("data/samus/graphics/suitless/bottom_right_turning_from_facing_the_background_frame_0.gfx") + #include "extracted/data/samus/graphics/suitless/bottom_right_turning_from_facing_the_background_frame_0.gfx.inc" }; diff --git a/src/data/samus/samus_palette_data.c b/src/data/samus/samus_palette_data.c index acc611da5..2484e285c 100644 --- a/src/data/samus/samus_palette_data.c +++ b/src/data/samus/samus_palette_data.c @@ -1,55 +1,147 @@ #include "data/samus/samus_palette_data.h" #include "macros.h" -const u16 sSamusPal_PowerSuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/power_suit_default.pal"); -const u16 sSamusPal_PowerSuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/power_suit_beam_release.pal"); -const u16 sSamusPal_PowerSuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/power_suit_flashing.pal"); -const u16 sSamusPal_PowerSuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/power_suit_speedboost.pal"); -const u16 sSamusPal_PowerSuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/power_suit_unmorph.pal"); -const u16 sSamusPal_PowerSuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/power_suit_dying.pal"); +const u16 sSamusPal_PowerSuit_Default[3 * 16] = { + #include "extracted/data/samus/palettes/power_suit_default.pal.inc" +}; +const u16 sSamusPal_PowerSuit_BeamRelease[5 * 16] = { + #include "extracted/data/samus/palettes/power_suit_beam_release.pal.inc" +}; +const u16 sSamusPal_PowerSuit_Flashing[2 * 16] = { + #include "extracted/data/samus/palettes/power_suit_flashing.pal.inc" +}; +const u16 sSamusPal_PowerSuit_Speedboost[3 * 16] = { + #include "extracted/data/samus/palettes/power_suit_speedboost.pal.inc" +}; +const u16 sSamusPal_PowerSuit_Unmorph[2 * 16] = { + #include "extracted/data/samus/palettes/power_suit_unmorph.pal.inc" +}; +const u16 sSamusPal_PowerSuit_Dying[1 * 16] = { + #include "extracted/data/samus/palettes/power_suit_dying.pal.inc" +}; -const u16 sSamusPal_Generic_Dying[8 * 16] = INCBIN_U16("data/samus/palettes/generic_dying.pal"); -const u16 sSamusPal_VariaSuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_dying.pal"); -const u16 sSamusPal_FullSuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/full_suit_dying.pal"); -const u16 sSamusPal_GravitySuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_dying.pal"); +const u16 sSamusPal_Generic_Dying[8 * 16] = { + #include "extracted/data/samus/palettes/generic_dying.pal.inc" +}; +const u16 sSamusPal_VariaSuit_Dying[1 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_dying.pal.inc" +}; +const u16 sSamusPal_FullSuit_Dying[1 * 16] = { + #include "extracted/data/samus/palettes/full_suit_dying.pal.inc" +}; +const u16 sSamusPal_GravitySuit_Dying[1 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_dying.pal.inc" +}; -const u16 sSamusPal_PowerSuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/power_suit_saving.pal"); -const u16 sSamusPal_PowerSuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/power_suit_charging_beam.pal"); -const u16 sSamusPal_PowerSuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/power_suit_downloading_map.pal"); +const u16 sSamusPal_PowerSuit_Saving[3 * 16] = { + #include "extracted/data/samus/palettes/power_suit_saving.pal.inc" +}; +const u16 sSamusPal_PowerSuit_ChargingBeam[10 * 16] = { + #include "extracted/data/samus/palettes/power_suit_charging_beam.pal.inc" +}; +const u16 sSamusPal_PowerSuit_DownloadingMap[2 * 16] = { + #include "extracted/data/samus/palettes/power_suit_downloading_map.pal.inc" +}; -const u16 sSamusPal_VariaSuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_default.pal"); -const u16 sSamusPal_VariaSuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_beam_release.pal"); -const u16 sSamusPal_VariaSuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_flashing.pal"); -const u16 sSamusPal_VariaSuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_speedboost.pal"); -const u16 sSamusPal_VariaSuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_unmorph.pal"); -const u16 sSamusPal_VariaSuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_saving.pal"); -const u16 sSamusPal_VariaSuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_charging_beam.pal"); -const u16 sSamusPal_VariaSuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/varia_suit_downloading_map.pal"); +const u16 sSamusPal_VariaSuit_Default[3 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_default.pal.inc" +}; +const u16 sSamusPal_VariaSuit_BeamRelease[5 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_beam_release.pal.inc" +}; +const u16 sSamusPal_VariaSuit_Flashing[2 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_flashing.pal.inc" +}; +const u16 sSamusPal_VariaSuit_Speedboost[3 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_speedboost.pal.inc" +}; +const u16 sSamusPal_VariaSuit_Unmorph[2 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_unmorph.pal.inc" +}; +const u16 sSamusPal_VariaSuit_Saving[3 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_saving.pal.inc" +}; +const u16 sSamusPal_VariaSuit_ChargingBeam[10 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_charging_beam.pal.inc" +}; +const u16 sSamusPal_VariaSuit_DownloadingMap[2 * 16] = { + #include "extracted/data/samus/palettes/varia_suit_downloading_map.pal.inc" +}; -const u16 sSamusPal_FullSuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/full_suit_default.pal"); -const u16 sSamusPal_FullSuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/full_suit_beam_release.pal"); -const u16 sSamusPal_FullSuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/full_suit_flashing.pal"); -const u16 sSamusPal_FullSuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/full_suit_speedboost.pal"); -const u16 sSamusPal_FullSuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/full_suit_unmorph.pal"); -const u16 sSamusPal_FullSuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/full_suit_saving.pal"); -const u16 sSamusPal_FullSuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/full_suit_charging_beam.pal"); -const u16 sSamusPal_FullSuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/full_suit_downloading_map.pal"); -const u16 sSamusPal_FullSuit_Frozen[3 * 16] = INCBIN_U16("data/samus/palettes/full_suit_frozen.pal"); +const u16 sSamusPal_FullSuit_Default[3 * 16] = { + #include "extracted/data/samus/palettes/full_suit_default.pal.inc" +}; +const u16 sSamusPal_FullSuit_BeamRelease[5 * 16] = { + #include "extracted/data/samus/palettes/full_suit_beam_release.pal.inc" +}; +const u16 sSamusPal_FullSuit_Flashing[2 * 16] = { + #include "extracted/data/samus/palettes/full_suit_flashing.pal.inc" +}; +const u16 sSamusPal_FullSuit_Speedboost[3 * 16] = { + #include "extracted/data/samus/palettes/full_suit_speedboost.pal.inc" +}; +const u16 sSamusPal_FullSuit_Unmorph[2 * 16] = { + #include "extracted/data/samus/palettes/full_suit_unmorph.pal.inc" +}; +const u16 sSamusPal_FullSuit_Saving[3 * 16] = { + #include "extracted/data/samus/palettes/full_suit_saving.pal.inc" +}; +const u16 sSamusPal_FullSuit_ChargingBeam[10 * 16] = { + #include "extracted/data/samus/palettes/full_suit_charging_beam.pal.inc" +}; +const u16 sSamusPal_FullSuit_DownloadingMap[2 * 16] = { + #include "extracted/data/samus/palettes/full_suit_downloading_map.pal.inc" +}; +const u16 sSamusPal_FullSuit_Frozen[3 * 16] = { + #include "extracted/data/samus/palettes/full_suit_frozen.pal.inc" +}; -const u16 sSamusPal_GravitySuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_default.pal"); -const u16 sSamusPal_GravitySuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_beam_release.pal"); -const u16 sSamusPal_GravitySuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_flashing.pal"); -const u16 sSamusPal_GravitySuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_speedboost.pal"); -const u16 sSamusPal_GravitySuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_unmorph.pal"); -const u16 sSamusPal_GravitySuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_saving.pal"); -const u16 sSamusPal_GravitySuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_charging_beam.pal"); -const u16 sSamusPal_GravitySuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_downloading_map.pal"); -const u16 sSamusPal_GravitySuit_Frozen[3 * 16] = INCBIN_U16("data/samus/palettes/gravity_suit_frozen.pal"); +const u16 sSamusPal_GravitySuit_Default[3 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_default.pal.inc" +}; +const u16 sSamusPal_GravitySuit_BeamRelease[5 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_beam_release.pal.inc" +}; +const u16 sSamusPal_GravitySuit_Flashing[2 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_flashing.pal.inc" +}; +const u16 sSamusPal_GravitySuit_Speedboost[3 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_speedboost.pal.inc" +}; +const u16 sSamusPal_GravitySuit_Unmorph[2 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_unmorph.pal.inc" +}; +const u16 sSamusPal_GravitySuit_Saving[3 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_saving.pal.inc" +}; +const u16 sSamusPal_GravitySuit_ChargingBeam[10 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_charging_beam.pal.inc" +}; +const u16 sSamusPal_GravitySuit_DownloadingMap[2 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_downloading_map.pal.inc" +}; +const u16 sSamusPal_GravitySuit_Frozen[3 * 16] = { + #include "extracted/data/samus/palettes/gravity_suit_frozen.pal.inc" +}; -const u16 sSamusPal_Suitless_Default[3 * 16] = INCBIN_U16("data/samus/palettes/suitless_default.pal"); -const u16 sSamusPal_Suitless_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/suitless_beam_release.pal"); -const u16 sSamusPal_Suitless_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/suitless_flashing.pal"); -const u16 sSamusPal_Suitless_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/suitless_saving.pal"); -const u16 sSamusPal_Suitless_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/suitless_charging_beam.pal"); -const u16 sSamusPal_Suitless_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/suitless_downloading_map.pal"); -const u16 sSamusPal_Suitless_Frozen[3 * 16] = INCBIN_U16("data/samus/palettes/suitless_frozen.pal"); +const u16 sSamusPal_Suitless_Default[3 * 16] = { + #include "extracted/data/samus/palettes/suitless_default.pal.inc" +}; +const u16 sSamusPal_Suitless_BeamRelease[5 * 16] = { + #include "extracted/data/samus/palettes/suitless_beam_release.pal.inc" +}; +const u16 sSamusPal_Suitless_Flashing[2 * 16] = { + #include "extracted/data/samus/palettes/suitless_flashing.pal.inc" +}; +const u16 sSamusPal_Suitless_Saving[3 * 16] = { + #include "extracted/data/samus/palettes/suitless_saving.pal.inc" +}; +const u16 sSamusPal_Suitless_ChargingBeam[10 * 16] = { + #include "extracted/data/samus/palettes/suitless_charging_beam.pal.inc" +}; +const u16 sSamusPal_Suitless_DownloadingMap[2 * 16] = { + #include "extracted/data/samus/palettes/suitless_downloading_map.pal.inc" +}; +const u16 sSamusPal_Suitless_Frozen[3 * 16] = { + #include "extracted/data/samus/palettes/suitless_frozen.pal.inc" +}; diff --git a/src/data/samus_close_up_data.c b/src/data/samus_close_up_data.c index d798c84ee..c34fab497 100644 --- a/src/data/samus_close_up_data.c +++ b/src/data/samus_close_up_data.c @@ -1,12 +1,26 @@ #include "data/samus_close_up_data.h" #include "macros.h" -const u16 sSamusCloseUpPal[6 * 16] = INCBIN_U16("data/close_up/palette.pal"); -const u32 sSamusCloseUpGfx[2319] = INCBIN_U32("data/close_up/close_up.gfx.lz"); +const u16 sSamusCloseUpPal[6 * 16] = { + #include "extracted/data/close_up/palette.pal.inc" +}; +const u32 sSamusCloseUpGfx[2319] = { + #include "extracted/data/close_up/close_up.gfx.lz.inc" +}; -const u32 sSamusCloseUpEyesGfx_1[80] = INCBIN_U32("data/close_up/eyes_1.gfx"); -const u32 sSamusCloseUpEyesGfx_2[80] = INCBIN_U32("data/close_up/eyes_2.gfx"); -const u32 sSamusCloseUpEyesGfx_3[1376] = INCBIN_U32("data/close_up/eyes_3.gfx"); +const u32 sSamusCloseUpEyesGfx_1[80] = { + #include "extracted/data/close_up/eyes_1.gfx.inc" +}; +const u32 sSamusCloseUpEyesGfx_2[80] = { + #include "extracted/data/close_up/eyes_2.gfx.inc" +}; +const u32 sSamusCloseUpEyesGfx_3[1376] = { + #include "extracted/data/close_up/eyes_3.gfx.inc" +}; -const u32 sSamusCloseUpBackgroundMap[385] = INCBIN_U32("data/close_up/background.tt"); -const u32 sSamusCloseUpEyesTiletable[98] = INCBIN_U32("data/close_up/eyes.tt"); +const u32 sSamusCloseUpBackgroundMap[385] = { + #include "extracted/data/close_up/background.tt.inc" +}; +const u32 sSamusCloseUpEyesTiletable[98] = { + #include "extracted/data/close_up/eyes.tt.inc" +}; diff --git a/src/data/sprites/acid_worm.c b/src/data/sprites/acid_worm.c index 20afa48d2..235dc7d0f 100644 --- a/src/data/sprites/acid_worm.c +++ b/src/data/sprites/acid_worm.c @@ -26,8 +26,12 @@ const s16 sAcidWormHeadRandomXVelocity[45] = { 0x4, 0x4, 0x3, 0x2, 0x2, 0x1, 0x1, SHORT_MAX }; -const u32 sAcidWormGfx[1000] = INCBIN_U32("data/sprites/acid_worm.gfx.lz"); -const u16 sAcidWormPal[64] = INCBIN_U16("data/sprites/acid_worm.pal"); +const u32 sAcidWormGfx[1000] = { + #include "extracted/data/sprites/acid_worm.gfx.lz.inc" +}; +const u16 sAcidWormPal[64] = { + #include "extracted/data/sprites/acid_worm.pal.inc" +}; static const u16 sAcidWormPartOam_Unused2_Frame0[OAM_DATA_SIZE(17)] = { 17, diff --git a/src/data/sprites/area_banner.c b/src/data/sprites/area_banner.c index 34f3cb7ef..0646d8ba9 100644 --- a/src/data/sprites/area_banner.c +++ b/src/data/sprites/area_banner.c @@ -2,9 +2,15 @@ #include "macros.h" -const u32 sAreaBannerGfx[65] = INCBIN_U32("data/sprites/area_banner.gfx.lz"); -const u16 sAreaBannerPal[16] = INCBIN_U16("data/sprites/area_banner.pal"); -const u16 sAreaBannerLocationTextPal[16] = INCBIN_U16("data/sprites/area_banner_location_text.pal"); +const u32 sAreaBannerGfx[65] = { + #include "extracted/data/sprites/area_banner.gfx.lz.inc" +}; +const u16 sAreaBannerPal[16] = { + #include "extracted/data/sprites/area_banner.pal.inc" +}; +const u16 sAreaBannerLocationTextPal[16] = { + #include "extracted/data/sprites/area_banner_location_text.pal.inc" +}; static const u16 sAreaBannerOam_SpawnMiddle_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/atomic.c b/src/data/sprites/atomic.c index d25e57790..95c1459bc 100644 --- a/src/data/sprites/atomic.c +++ b/src/data/sprites/atomic.c @@ -18,8 +18,12 @@ const s16 sAtomicIdleXMovement[81] = { SHORT_MAX }; -const u32 sAtomicGfx[752] = INCBIN_U32("data/sprites/atomic.gfx.lz"); -const u16 sAtomicPal[64] = INCBIN_U16("data/sprites/atomic.pal"); +const u32 sAtomicGfx[752] = { + #include "extracted/data/sprites/atomic.gfx.lz.inc" +}; +const u16 sAtomicPal[64] = { + #include "extracted/data/sprites/atomic.pal.inc" +}; static const u16 sAtomicOam_Idle_Frame0[OAM_DATA_SIZE(4)] = { 4, diff --git a/src/data/sprites/baristute.c b/src/data/sprites/baristute.c index 2ce57f8f5..378b57516 100644 --- a/src/data/sprites/baristute.c +++ b/src/data/sprites/baristute.c @@ -10,8 +10,12 @@ const s16 sBaristuteJumpingYVelocity[10] = { -12, -16, -16, -8, -4, 0, 12, 18, 24, 32 }; -const u32 sBaristuteGfx[596] = INCBIN_U32("data/sprites/baristute.gfx.lz"); -const u16 sBaristutePal[80] = INCBIN_U16("data/sprites/baristute.pal"); +const u32 sBaristuteGfx[596] = { + #include "extracted/data/sprites/baristute.gfx.lz.inc" +}; +const u16 sBaristutePal[80] = { + #include "extracted/data/sprites/baristute.pal.inc" +}; static const u16 sBaristuteOam_Idle_Frame0[OAM_DATA_SIZE(16)] = { 16, diff --git a/src/data/sprites/boss_statues.c b/src/data/sprites/boss_statues.c index 323283d20..d70cdcf61 100644 --- a/src/data/sprites/boss_statues.c +++ b/src/data/sprites/boss_statues.c @@ -2,8 +2,12 @@ #include "macros.h" -const u32 sBossStatuesGfx[2388] = INCBIN_U32("data/sprites/boss_statues.gfx.lz"); -const u16 sBossStatuesPal[128] = INCBIN_U16("data/sprites/boss_statues.pal"); +const u32 sBossStatuesGfx[2388] = { + #include "extracted/data/sprites/boss_statues.gfx.lz.inc" +}; +const u16 sBossStatuesPal[128] = { + #include "extracted/data/sprites/boss_statues.pal.inc" +}; static const u16 sKraidStatueOam_Idle_Frame0[OAM_DATA_SIZE(5)] = { 5, diff --git a/src/data/sprites/charge_beam.c b/src/data/sprites/charge_beam.c index 79492d2df..4ff25b1c8 100644 --- a/src/data/sprites/charge_beam.c +++ b/src/data/sprites/charge_beam.c @@ -10,8 +10,12 @@ const s16 sChargeBeamIdleYMovement[66] = { 0, SHORT_MAX }; -const u32 sChargeBeamGfx[243] = INCBIN_U32("data/sprites/charge_beam.gfx.lz"); -const u16 sChargeBeamPal[16] = INCBIN_U16("data/sprites/charge_beam.pal"); +const u32 sChargeBeamGfx[243] = { + #include "extracted/data/sprites/charge_beam.gfx.lz.inc" +}; +const u16 sChargeBeamPal[16] = { + #include "extracted/data/sprites/charge_beam.pal.inc" +}; static const u16 sChargeBeamOam_Visible_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/chozo_statue.c b/src/data/sprites/chozo_statue.c index 56571fc31..e0dd504ba 100644 --- a/src/data/sprites/chozo_statue.c +++ b/src/data/sprites/chozo_statue.c @@ -374,8 +374,12 @@ const u8 sChozoStatueFlashingPaletteRows[4] = { 1, 2, 3, 2 }; -const u32 sChozoStatueLongBeamGfx[1335] = INCBIN_U32("data/sprites/chozo_statue_long_beam.gfx.lz"); -const u16 sChozoStatueLongBeamPal[80] = INCBIN_U16("data/sprites/chozo_statue_long_beam.pal"); +const u32 sChozoStatueLongBeamGfx[1335] = { + #include "extracted/data/sprites/chozo_statue_long_beam.gfx.lz.inc" +}; +const u16 sChozoStatueLongBeamPal[80] = { + #include "extracted/data/sprites/chozo_statue_long_beam.pal.inc" +}; static const u16 sChozoStatuePartOam_LegStanding_Frame0[OAM_DATA_SIZE(5)] = { @@ -1354,23 +1358,51 @@ const struct FrameData sChozoStatuePartOam_GlowIdle[41] = { [40] = FRAME_DATA_TERMINATOR }; -const u32 sChozoStatueIceBeamGfx[1335] = INCBIN_U32("data/sprites/chozo_statue_ice_beam.gfx.lz"); -const u16 sChozoStatueIceBeamPal[80] = INCBIN_U16("data/sprites/chozo_statue_ice_beam.pal"); +const u32 sChozoStatueIceBeamGfx[1335] = { + #include "extracted/data/sprites/chozo_statue_ice_beam.gfx.lz.inc" +}; +const u16 sChozoStatueIceBeamPal[80] = { + #include "extracted/data/sprites/chozo_statue_ice_beam.pal.inc" +}; -const u32 sChozoStatueWaveBeamGfx[1335] = INCBIN_U32("data/sprites/chozo_statue_wave_beam.gfx.lz"); -const u16 sChozoStatueWaveBeamPal[80] = INCBIN_U16("data/sprites/chozo_statue_wave_beam.pal"); +const u32 sChozoStatueWaveBeamGfx[1335] = { + #include "extracted/data/sprites/chozo_statue_wave_beam.gfx.lz.inc" +}; +const u16 sChozoStatueWaveBeamPal[80] = { + #include "extracted/data/sprites/chozo_statue_wave_beam.pal.inc" +}; -const u32 sChozoStatueBombsGfx[1339] = INCBIN_U32("data/sprites/chozo_statue_bomb.gfx.lz"); -const u16 sChozoStatueBombsPal[80] = INCBIN_U16("data/sprites/chozo_statue_bomb.pal"); +const u32 sChozoStatueBombsGfx[1339] = { + #include "extracted/data/sprites/chozo_statue_bomb.gfx.lz.inc" +}; +const u16 sChozoStatueBombsPal[80] = { + #include "extracted/data/sprites/chozo_statue_bomb.pal.inc" +}; -const u32 sChozoStatueSpeedboosterGfx[1342] = INCBIN_U32("data/sprites/chozo_statue_speedbooster.gfx.lz"); -const u16 sChozoStatueSpeedboosterPal[80] = INCBIN_U16("data/sprites/chozo_statue_speedbooster.pal"); +const u32 sChozoStatueSpeedboosterGfx[1342] = { + #include "extracted/data/sprites/chozo_statue_speedbooster.gfx.lz.inc" +}; +const u16 sChozoStatueSpeedboosterPal[80] = { + #include "extracted/data/sprites/chozo_statue_speedbooster.pal.inc" +}; -const u32 sChozoStatueHighJumpGfx[1372] = INCBIN_U32("data/sprites/chozo_statue_high_jump.gfx.lz"); -const u16 sChozoStatueHighJumpPal[80] = INCBIN_U16("data/sprites/chozo_statue_high_jump.pal"); +const u32 sChozoStatueHighJumpGfx[1372] = { + #include "extracted/data/sprites/chozo_statue_high_jump.gfx.lz.inc" +}; +const u16 sChozoStatueHighJumpPal[80] = { + #include "extracted/data/sprites/chozo_statue_high_jump.pal.inc" +}; -const u32 sChozoStatueScrewAttackGfx[1378] = INCBIN_U32("data/sprites/chozo_statue_screw_attack.gfx.lz"); -const u16 sChozoStatueScrewAttackPal[80] = INCBIN_U16("data/sprites/chozo_statue_screw_attack.pal"); +const u32 sChozoStatueScrewAttackGfx[1378] = { + #include "extracted/data/sprites/chozo_statue_screw_attack.gfx.lz.inc" +}; +const u16 sChozoStatueScrewAttackPal[80] = { + #include "extracted/data/sprites/chozo_statue_screw_attack.pal.inc" +}; -const u32 sChozoStatueVariaGfx[1348] = INCBIN_U32("data/sprites/chozo_statue_varia_suit.gfx.lz"); -const u16 sChozoStatueVariaPal[80] = INCBIN_U16("data/sprites/chozo_statue_varia_suit.pal"); +const u32 sChozoStatueVariaGfx[1348] = { + #include "extracted/data/sprites/chozo_statue_varia_suit.gfx.lz.inc" +}; +const u16 sChozoStatueVariaPal[80] = { + #include "extracted/data/sprites/chozo_statue_varia_suit.pal.inc" +}; diff --git a/src/data/sprites/crocomire.c b/src/data/sprites/crocomire.c index b53b54608..ba9e757e6 100644 --- a/src/data/sprites/crocomire.c +++ b/src/data/sprites/crocomire.c @@ -396,8 +396,12 @@ const struct MultiSpriteData sCrocomireMultiSpriteData_Angry[2] = { [1] = MULTI_SPRITE_DATA_TERMINATOR }; -const u32 sCrocomireGfx[1954] = INCBIN_U32("data/sprites/crocomire.gfx.lz"); -const u16 sCrocomirePal[128] = INCBIN_U16("data/sprites/crocomire.pal"); +const u32 sCrocomireGfx[1954] = { + #include "extracted/data/sprites/crocomire.gfx.lz.inc" +}; +const u16 sCrocomirePal[128] = { + #include "extracted/data/sprites/crocomire.pal.inc" +}; static const u16 sCrocomireOam_Screaming_Frame1[OAM_DATA_SIZE(7)] = { 7, diff --git a/src/data/sprites/deorem.c b/src/data/sprites/deorem.c index d6124d247..38b19e71b 100644 --- a/src/data/sprites/deorem.c +++ b/src/data/sprites/deorem.c @@ -15,8 +15,12 @@ const s16 sDeoremThornYVelocity[40] = { SHORT_MAX }; -const u32 sDeoremGfx[1569] = INCBIN_U32("data/sprites/deorem.gfx.lz"); -const u16 sDeoremPal[16 * 5] = INCBIN_U16("data/sprites/deorem.pal"); +const u32 sDeoremGfx[1569] = { + #include "extracted/data/sprites/deorem.gfx.lz.inc" +}; +const u16 sDeoremPal[16 * 5] = { + #include "extracted/data/sprites/deorem.pal.inc" +}; static const u16 sDeoremSegmentOam_Middle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/dessgeega.c b/src/data/sprites/dessgeega.c index 4a4a4fdea..e01b311d4 100644 --- a/src/data/sprites/dessgeega.c +++ b/src/data/sprites/dessgeega.c @@ -10,8 +10,12 @@ const s16 sDessgeegaLowJumpYVelocity[10] = { -4, -8, -4, -2, 0, 4, 8, 16, 16, 16 }; -const u32 sDessgeegaGfx[270] = INCBIN_U32("data/sprites/dessgeega.gfx.lz"); -const u16 sDessgeegaPal[16] = INCBIN_U16("data/sprites/dessgeega.pal"); +const u32 sDessgeegaGfx[270] = { + #include "extracted/data/sprites/dessgeega.gfx.lz.inc" +}; +const u16 sDessgeegaPal[16] = { + #include "extracted/data/sprites/dessgeega.pal.inc" +}; static const u16 sDessGeegaOam_Idle_Frame0[OAM_DATA_SIZE(10)] = { 10, diff --git a/src/data/sprites/dragon.c b/src/data/sprites/dragon.c index e2aee8659..700bcd0b1 100644 --- a/src/data/sprites/dragon.c +++ b/src/data/sprites/dragon.c @@ -14,8 +14,12 @@ const s16 sDragonFireballOamRotation[40] = { 52, 56, 60, 64, 64, 64, 64, 64, SHORT_MAX }; -const u32 sDragonGfx[512] = INCBIN_U32("data/sprites/dragon.gfx.lz"); -const u16 sDragonPal[16 * 2] = INCBIN_U16("data/sprites/dragon.pal"); +const u32 sDragonGfx[512] = { + #include "extracted/data/sprites/dragon.gfx.lz.inc" +}; +const u16 sDragonPal[16 * 2] = { + #include "extracted/data/sprites/dragon.pal.inc" +}; static const u16 sDragonOam_Spitting_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/elevator_pad.c b/src/data/sprites/elevator_pad.c index e1dc8d181..71c13db56 100644 --- a/src/data/sprites/elevator_pad.c +++ b/src/data/sprites/elevator_pad.c @@ -1,8 +1,12 @@ #include "data/sprites/elevator_pad.h" #include "macros.h" -const u32 sElevatorPadGfx[136] = INCBIN_U32("data/sprites/elevator_pad.gfx.lz"); -const u16 sElevatorPadPal[16] = INCBIN_U16("data/sprites/elevator_pad.pal"); +const u32 sElevatorPadGfx[136] = { + #include "extracted/data/sprites/elevator_pad.gfx.lz.inc" +}; +const u16 sElevatorPadPal[16] = { + #include "extracted/data/sprites/elevator_pad.pal.inc" +}; static const u16 sElevatorPadOam_Moving_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/elevator_statue.c b/src/data/sprites/elevator_statue.c index a8c5f5e3f..50b39d983 100644 --- a/src/data/sprites/elevator_statue.c +++ b/src/data/sprites/elevator_statue.c @@ -1,8 +1,12 @@ #include "data/sprites/elevator_statue.h" #include "macros.h" -const u32 sElevatorStatuesGfx[1122] = INCBIN_U32("data/sprites/elevator_statues.gfx.lz"); -const u16 sElevatorStatuesPal[64] = INCBIN_U16("data/sprites/elevator_statues.pal"); +const u32 sElevatorStatuesGfx[1122] = { + #include "extracted/data/sprites/elevator_statues.gfx.lz.inc" +}; +const u16 sElevatorStatuesPal[64] = { + #include "extracted/data/sprites/elevator_statues.pal.inc" +}; static const u16 sKraidElevatorStatueOam_Idle_Frame0[OAM_DATA_SIZE(21)] = { 21, diff --git a/src/data/sprites/escape_gate.c b/src/data/sprites/escape_gate.c index 6f4ed931a..b78e02aa3 100644 --- a/src/data/sprites/escape_gate.c +++ b/src/data/sprites/escape_gate.c @@ -2,9 +2,15 @@ #include "macros.h" -const u8 sEscapeGateAndTimerGfx[2048] = INCBIN_U8("data/sprites/escape_gate_and_timer.gfx"); -const u16 sEscapeGateAndTimerPal[16] = INCBIN_U16("data/sprites/escape_gate_and_timer.pal"); -const u16 sEscapeGateFlashingPal[96] = INCBIN_U16("data/sprites/escape_gate_flashing.pal"); +const u8 sEscapeGateAndTimerGfx[2048] = { + #include "extracted/data/sprites/escape_gate_and_timer.gfx.inc" +}; +const u16 sEscapeGateAndTimerPal[16] = { + #include "extracted/data/sprites/escape_gate_and_timer.pal.inc" +}; +const u16 sEscapeGateFlashingPal[96] = { + #include "extracted/data/sprites/escape_gate_flashing.pal.inc" +}; static const u16 sEscapeGateOam_Closed_Frame0[OAM_DATA_SIZE(5)] = { 5, diff --git a/src/data/sprites/escape_ship.c b/src/data/sprites/escape_ship.c index 1fd16f311..c5aa83c67 100644 --- a/src/data/sprites/escape_ship.c +++ b/src/data/sprites/escape_ship.c @@ -16,9 +16,15 @@ const s16 sEscapeShipHoveringXMovement[57] = { -1, 0, -1, 0, -1, 0, 0, 0, 0, SHORT_MAX }; -const u32 sEscapeShipGfx[919] = INCBIN_U32("data/sprites/escape_ship.gfx.lz"); -const u16 sEscapeShipPal[64] = INCBIN_U16("data/sprites/escape_ship.pal"); -const u16 sEscapeShipFlashingPal[3 * 16] = INCBIN_U16("data/sprites/escape_ship_flashing.pal"); +const u32 sEscapeShipGfx[919] = { + #include "extracted/data/sprites/escape_ship.gfx.lz.inc" +}; +const u16 sEscapeShipPal[64] = { + #include "extracted/data/sprites/escape_ship.pal.inc" +}; +const u16 sEscapeShipFlashingPal[3 * 16] = { + #include "extracted/data/sprites/escape_ship_flashing.pal.inc" +}; static const u16 sEscapeShipOam_Idle_Frame0[OAM_DATA_SIZE(11)] = { 11, diff --git a/src/data/sprites/falling_chozo_pillar.c b/src/data/sprites/falling_chozo_pillar.c index ee04057ff..9fb6dff73 100644 --- a/src/data/sprites/falling_chozo_pillar.c +++ b/src/data/sprites/falling_chozo_pillar.c @@ -1,8 +1,12 @@ #include "data/sprites/falling_chozo_pillar.h" #include "macros.h" -const u32 sFallingChozoPillarGfx[219] = INCBIN_U32("data/sprites/falling_chozo_pillar.gfx.lz"); -const u16 sFallingChozoPillarPal[16] = INCBIN_U16("data/sprites/falling_chozo_pillar.pal"); +const u32 sFallingChozoPillarGfx[219] = { + #include "extracted/data/sprites/falling_chozo_pillar.gfx.lz.inc" +}; +const u16 sFallingChozoPillarPal[16] = { + #include "extracted/data/sprites/falling_chozo_pillar.pal.inc" +}; static const u16 sFallingChozoPillarOam_Falling_Frame0[OAM_DATA_SIZE(8)] = { 8, diff --git a/src/data/sprites/gadora.c b/src/data/sprites/gadora.c index 45c125d0c..9aa2e5c40 100644 --- a/src/data/sprites/gadora.c +++ b/src/data/sprites/gadora.c @@ -1,8 +1,12 @@ #include "data/sprites/gadora.h" #include "macros.h" -const u32 sGadoraGfx[585] = INCBIN_U32("data/sprites/gadora.gfx.lz"); -const u16 sGadoraPal[32] = INCBIN_U16("data/sprites/gadora.pal"); +const u32 sGadoraGfx[585] = { + #include "extracted/data/sprites/gadora.gfx.lz.inc" +}; +const u16 sGadoraPal[32] = { + #include "extracted/data/sprites/gadora.pal.inc" +}; static const u16 sGadoraOam_EyeClosed_Frame2[OAM_DATA_SIZE(7)] = { 7, diff --git a/src/data/sprites/gamet.c b/src/data/sprites/gamet.c index bf57583b0..12c32dd05 100644 --- a/src/data/sprites/gamet.c +++ b/src/data/sprites/gamet.c @@ -1,10 +1,18 @@ #include "data/sprites/gamet.h" #include "macros.h" -const u32 sGametBlueGfx[168] = INCBIN_U32("data/sprites/gamet_blue.gfx.lz"); -const u16 sGametBluePal[16] = INCBIN_U16("data/sprites/gamet_blue.pal"); -const u32 sGametRedGfx[168] = INCBIN_U32("data/sprites/gamet_red.gfx.lz"); -const u16 sGametRedPal[16] = INCBIN_U16("data/sprites/gamet_red.pal"); +const u32 sGametBlueGfx[168] = { + #include "extracted/data/sprites/gamet_blue.gfx.lz.inc" +}; +const u16 sGametBluePal[16] = { + #include "extracted/data/sprites/gamet_blue.pal.inc" +}; +const u32 sGametRedGfx[168] = { + #include "extracted/data/sprites/gamet_red.gfx.lz.inc" +}; +const u16 sGametRedPal[16] = { + #include "extracted/data/sprites/gamet_red.pal.inc" +}; static const u16 sGametOam_Idle_Frame0[OAM_DATA_SIZE(3)] = { 3, diff --git a/src/data/sprites/geega.c b/src/data/sprites/geega.c index 47af91a48..cb911b465 100644 --- a/src/data/sprites/geega.c +++ b/src/data/sprites/geega.c @@ -1,10 +1,18 @@ #include "data/sprites/geega.h" #include "macros.h" -const u32 sGeegaGfx[153] = INCBIN_U32("data/sprites/geega.gfx.lz"); -const u16 sGeegaPal[16] = INCBIN_U16("data/sprites/geega.pal"); -const u32 sGeegaWhiteGfx[153] = INCBIN_U32("data/sprites/geega_white.gfx.lz"); -const u16 sGeegaWhitePal[16] = INCBIN_U16("data/sprites/geega_white.pal"); +const u32 sGeegaGfx[153] = { + #include "extracted/data/sprites/geega.gfx.lz.inc" +}; +const u16 sGeegaPal[16] = { + #include "extracted/data/sprites/geega.pal.inc" +}; +const u32 sGeegaWhiteGfx[153] = { + #include "extracted/data/sprites/geega_white.gfx.lz.inc" +}; +const u16 sGeegaWhitePal[16] = { + #include "extracted/data/sprites/geega_white.pal.inc" +}; static const u16 sGeegaOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/gekitai_machine.c b/src/data/sprites/gekitai_machine.c index 51aa91926..ae949a664 100644 --- a/src/data/sprites/gekitai_machine.c +++ b/src/data/sprites/gekitai_machine.c @@ -1,8 +1,12 @@ #include "data/sprites/gekitai_machine.h" #include "macros.h" -const u32 sGekitaiMachineGfx[364] = INCBIN_U32("data/sprites/gekitai_machine.gfx.lz"); -const u16 sGekitaiMachinePal[80] = INCBIN_U16("data/sprites/gekitai_machine.pal"); +const u32 sGekitaiMachineGfx[364] = { + #include "extracted/data/sprites/gekitai_machine.gfx.lz.inc" +}; +const u16 sGekitaiMachinePal[80] = { + #include "extracted/data/sprites/gekitai_machine.pal.inc" +}; const s16 sGekitaiMachine_array_2f1c7c[96] = { 4097, 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, diff --git a/src/data/sprites/geron.c b/src/data/sprites/geron.c index 5b5c1ba4a..2bb2009f9 100644 --- a/src/data/sprites/geron.c +++ b/src/data/sprites/geron.c @@ -1,8 +1,12 @@ #include "data/sprites/geron.h" #include "macros.h" -const u32 sGeronGfx[711] = INCBIN_U32("data/sprites/geron.gfx.lz"); -const u16 sGeronPal[48] = INCBIN_U16("data/sprites/geron.pal"); +const u32 sGeronGfx[711] = { + #include "extracted/data/sprites/geron.gfx.lz.inc" +}; +const u16 sGeronPal[48] = { + #include "extracted/data/sprites/geron.pal.inc" +}; static const u16 sGeronOam_Idle_Frame0[OAM_DATA_SIZE(13)] = { 13, diff --git a/src/data/sprites/geron_norfair.c b/src/data/sprites/geron_norfair.c index a98385a9a..1f6241b45 100644 --- a/src/data/sprites/geron_norfair.c +++ b/src/data/sprites/geron_norfair.c @@ -1,8 +1,12 @@ #include "data/sprites/geron_norfair.h" #include "macros.h" -const u32 sGeronNorfairGfx[270] = INCBIN_U32("data/sprites/geron_norfair.gfx.lz"); -const u16 sGeronNorfairPal[16] = INCBIN_U16("data/sprites/geron_norfair.pal"); +const u32 sGeronNorfairGfx[270] = { + #include "extracted/data/sprites/geron_norfair.gfx.lz.inc" +}; +const u16 sGeronNorfairPal[16] = { + #include "extracted/data/sprites/geron_norfair.pal.inc" +}; static const u16 sGeronNorfairOam_Idle_Frame0[OAM_DATA_SIZE(14)] = { 14, diff --git a/src/data/sprites/geruta.c b/src/data/sprites/geruta.c index db96f8168..f6f8ee303 100644 --- a/src/data/sprites/geruta.c +++ b/src/data/sprites/geruta.c @@ -1,10 +1,18 @@ #include "data/sprites/geruta.h" #include "macros.h" -const u32 sGerutaRedGfx[321] = INCBIN_U32("data/sprites/geruta_red.gfx.lz"); -const u16 sGerutaRedPal[16] = INCBIN_U16("data/sprites/geruta_red.pal"); -const u32 sGerutaGreenGfx[308] = INCBIN_U32("data/sprites/geruta_green.gfx.lz"); -const u16 sGerutaGreenPal[16] = INCBIN_U16("data/sprites/geruta_green.pal"); +const u32 sGerutaRedGfx[321] = { + #include "extracted/data/sprites/geruta_red.gfx.lz.inc" +}; +const u16 sGerutaRedPal[16] = { + #include "extracted/data/sprites/geruta_red.pal.inc" +}; +const u32 sGerutaGreenGfx[308] = { + #include "extracted/data/sprites/geruta_green.gfx.lz.inc" +}; +const u16 sGerutaGreenPal[16] = { + #include "extracted/data/sprites/geruta_green.pal.inc" +}; static const u16 sGerutaOam_Idle_Frame0[OAM_DATA_SIZE(5)] = { 5, diff --git a/src/data/sprites/glass_tube.c b/src/data/sprites/glass_tube.c index 4494a1ac0..3a162c690 100644 --- a/src/data/sprites/glass_tube.c +++ b/src/data/sprites/glass_tube.c @@ -1,8 +1,12 @@ #include "data/sprites/glass_tube.h" #include "macros.h" -const u32 sGlassTubeGfx[514] = INCBIN_U32("data/sprites/glass_tube.gfx.lz"); -const u16 sGlassTubePal[80] = INCBIN_U16("data/sprites/glass_tube.pal"); +const u32 sGlassTubeGfx[514] = { + #include "extracted/data/sprites/glass_tube.gfx.lz.inc" +}; +const u16 sGlassTubePal[80] = { + #include "extracted/data/sprites/glass_tube.pal.inc" +}; static const u16 sGlassTubeOam_Intact_Frame0[OAM_DATA_SIZE(12)] = { 12, diff --git a/src/data/sprites/gunship.c b/src/data/sprites/gunship.c index f81b33c51..e55baf6d8 100644 --- a/src/data/sprites/gunship.c +++ b/src/data/sprites/gunship.c @@ -20,9 +20,15 @@ const s16 sGunshipFlyingYVelocity[22] = { -7, -7, -8, -12, -16, -20, -24, -28, -32, SHORT_MAX }; -const u32 sGunshipGfx[1027] = INCBIN_U32("data/sprites/gunship.gfx.lz"); -const u16 sGunshipPal[48] = INCBIN_U16("data/sprites/gunship.pal"); -const u16 sGunshipFlashingPal[8 * 16] = INCBIN_U16("data/sprites/gunship_flashing_pal.pal"); +const u32 sGunshipGfx[1027] = { + #include "extracted/data/sprites/gunship.gfx.lz.inc" +}; +const u16 sGunshipPal[48] = { + #include "extracted/data/sprites/gunship.pal.inc" +}; +const u16 sGunshipFlashingPal[8 * 16] = { + #include "extracted/data/sprites/gunship_flashing_pal.pal.inc" +}; static const u16 sGunshipOam_Idle_Frame0[OAM_DATA_SIZE(17)] = { 17, diff --git a/src/data/sprites/hive.c b/src/data/sprites/hive.c index 09216d844..d33185be5 100644 --- a/src/data/sprites/hive.c +++ b/src/data/sprites/hive.c @@ -16,8 +16,12 @@ const s16 sMellowIdleXVelocity[81] = { -2, -2, -1, -1, 0, 0, SHORT_MAX }; -const u32 sHiveGfx[1799] = INCBIN_U32("data/sprites/hive.gfx.lz"); -const u16 sHivePal[96] = INCBIN_U16("data/sprites/hive.pal"); +const u32 sHiveGfx[1799] = { + #include "extracted/data/sprites/hive.gfx.lz.inc" +}; +const u16 sHivePal[96] = { + #include "extracted/data/sprites/hive.pal.inc" +}; static const u16 sMellowOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/holtz.c b/src/data/sprites/holtz.c index ff27b07ee..09e02cce8 100644 --- a/src/data/sprites/holtz.c +++ b/src/data/sprites/holtz.c @@ -9,8 +9,12 @@ const s16 sHoltzIdleYVelocity[65] = { 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, 0, 0, SHORT_MAX }; -const u32 sHoltzGfx[200] = INCBIN_U32("data/sprites/holtz.gfx.lz"); -const u16 sHoltzPal[16] = INCBIN_U16("data/sprites/holtz.pal"); +const u32 sHoltzGfx[200] = { + #include "extracted/data/sprites/holtz.gfx.lz.inc" +}; +const u16 sHoltzPal[16] = { + #include "extracted/data/sprites/holtz.pal.inc" +}; static const u16 sHoltzOam_Idle_Frame0[OAM_DATA_SIZE(4)] = { 4, diff --git a/src/data/sprites/imago.c b/src/data/sprites/imago.c index 3af59c48c..cc8629206 100644 --- a/src/data/sprites/imago.c +++ b/src/data/sprites/imago.c @@ -298,8 +298,12 @@ const u8 sImagoDynamicPaletteData[9][2] = { { 128, 128 } }; -const u32 sImagoGfx[1503] = INCBIN_U32("data/sprites/imago.gfx.lz"); -const u16 sImagoPal[96] = INCBIN_U16("data/sprites/imago.pal"); +const u32 sImagoGfx[1503] = { + #include "extracted/data/sprites/imago.gfx.lz.inc" +}; +const u16 sImagoPal[96] = { + #include "extracted/data/sprites/imago.pal.inc" +}; static const u16 sImagoPartOam_BodyIdle_Frame0[OAM_DATA_SIZE(18)] = { 18, diff --git a/src/data/sprites/imago_cocoon.c b/src/data/sprites/imago_cocoon.c index 8476af90d..4e87a62b9 100644 --- a/src/data/sprites/imago_cocoon.c +++ b/src/data/sprites/imago_cocoon.c @@ -605,8 +605,12 @@ const s16 sImagoCocoon_ArrayUnused2[48] = { 0, 0, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2 }; -const u32 sImagoCocoonGfx[1758] = INCBIN_U32("data/sprites/imago_cocoon.gfx.lz"); -const u16 sImagoCocoonPal[96] = INCBIN_U16("data/sprites/imago_cocoon.pal"); +const u32 sImagoCocoonGfx[1758] = { + #include "extracted/data/sprites/imago_cocoon.gfx.lz.inc" +}; +const u16 sImagoCocoonPal[96] = { + #include "extracted/data/sprites/imago_cocoon.pal.inc" +}; static const u16 sImagoCocoonOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/imago_larva.c b/src/data/sprites/imago_larva.c index f69073f97..4e988f4ac 100644 --- a/src/data/sprites/imago_larva.c +++ b/src/data/sprites/imago_larva.c @@ -1440,8 +1440,12 @@ const u8 sImagoLarvaPaletteRows[4] = { 1, 2, 1, 0 }; -const u32 sImagoLarvaGfx[1195] = INCBIN_U32("data/sprites/imago_larva.gfx.lz"); -const u16 sImagoLarvaPal[80] = INCBIN_U16("data/sprites/imago_larva.pal"); +const u32 sImagoLarvaGfx[1195] = { + #include "extracted/data/sprites/imago_larva.gfx.lz.inc" +}; +const u16 sImagoLarvaPal[80] = { + #include "extracted/data/sprites/imago_larva.pal.inc" +}; static const u16 sImagoLarvaPartOam_ShellAttacking_Frame0[OAM_DATA_SIZE(27)] = { 27, diff --git a/src/data/sprites/imago_larva_right_side.c b/src/data/sprites/imago_larva_right_side.c index 7ea97c5e5..ee80f92e0 100644 --- a/src/data/sprites/imago_larva_right_side.c +++ b/src/data/sprites/imago_larva_right_side.c @@ -1,8 +1,12 @@ #include "data/sprites/imago_larva_right_side.h" #include "macros.h" -const u32 sImagoLarvaRightSideGfx[592] = INCBIN_U32("data/sprites/imago_larva_right_side.gfx.lz"); -const u16 sImagoLarvaRightSidePal[32] = INCBIN_U16("data/sprites/imago_larva_right_side.pal"); +const u32 sImagoLarvaRightSideGfx[592] = { + #include "extracted/data/sprites/imago_larva_right_side.gfx.lz.inc" +}; +const u16 sImagoLarvaRightSidePal[32] = { + #include "extracted/data/sprites/imago_larva_right_side.pal.inc" +}; static const u16 sImagoLarvaRightSideOam_Frame0[OAM_DATA_SIZE(12)] = { 12, diff --git a/src/data/sprites/kraid.c b/src/data/sprites/kraid.c index ce5443e3e..2dfcfc026 100644 --- a/src/data/sprites/kraid.c +++ b/src/data/sprites/kraid.c @@ -1872,8 +1872,12 @@ const struct MultiSpriteData sKraidMultiSpriteData_Dying2[2] = { [1] = MULTI_SPRITE_DATA_TERMINATOR }; -const u32 sKraidGfx[2725] = INCBIN_U32("data/sprites/kraid.gfx.lz"); -const u16 sKraidPal[128] = INCBIN_U16("data/sprites/kraid.pal"); +const u32 sKraidGfx[2725] = { + #include "extracted/data/sprites/kraid.gfx.lz.inc" +}; +const u16 sKraidPal[128] = { + #include "extracted/data/sprites/kraid.pal.inc" +}; static const u16 sKraidOam_MouthClosed_Frame0[OAM_DATA_SIZE(10)] = { 10, diff --git a/src/data/sprites/map_station.c b/src/data/sprites/map_station.c index 741b781ee..4a3841d80 100644 --- a/src/data/sprites/map_station.c +++ b/src/data/sprites/map_station.c @@ -1,8 +1,12 @@ #include "data/sprites/map_station.h" #include "macros.h" -const u32 sMapStationGfx[680] = INCBIN_U32("data/sprites/map_station.gfx.lz"); -const u16 sMapStationPal[64] = INCBIN_U16("data/sprites/map_station.pal"); +const u32 sMapStationGfx[680] = { + #include "extracted/data/sprites/map_station.gfx.lz.inc" +}; +const u16 sMapStationPal[64] = { + #include "extracted/data/sprites/map_station.pal.inc" +}; static const u16 sMapStationOam_Inactive_Frame19[OAM_DATA_SIZE(25)] = { 25, diff --git a/src/data/sprites/mecha_ridley.c b/src/data/sprites/mecha_ridley.c index cd108a3ca..6421042e2 100644 --- a/src/data/sprites/mecha_ridley.c +++ b/src/data/sprites/mecha_ridley.c @@ -10450,19 +10450,39 @@ const u8 sMechaRidleyGreenGlowPaletteData[7][2] = { { SCHAR_MAX + 1, SCHAR_MAX + 1 } }; -const u32 sMechaRidleyGfx[2525] = INCBIN_U32("data/sprites/mecha_ridley.gfx.lz"); -const u32 sMechaRidleyWeaponsGfx[32 * 32] = INCBIN_U32("data/sprites/mecha_ridley_weapons.gfx.lz"); -const u32 sMechaRidleyDestroyedGfx[336] = INCBIN_U32("data/sprites/mecha_ridley_destroyed.gfx.lz"); +const u32 sMechaRidleyGfx[2525] = { + #include "extracted/data/sprites/mecha_ridley.gfx.lz.inc" +}; +const u32 sMechaRidleyWeaponsGfx[32 * 32] = { + #include "extracted/data/sprites/mecha_ridley_weapons.gfx.lz.inc" +}; +const u32 sMechaRidleyDestroyedGfx[336] = { + #include "extracted/data/sprites/mecha_ridley_destroyed.gfx.lz.inc" +}; -const u16 sMechaRidleyPal[129] = INCBIN_U16("data/sprites/mecha_ridley.pal"); +const u16 sMechaRidleyPal[129] = { + #include "extracted/data/sprites/mecha_ridley.pal.inc" +}; -const u16 sMechaRidley_8323aaa_Pal[12] = INCBIN_U16("data/sprites/mecha_ridley_323aaa.pal"); -const u16 sMechaRidleyGreenGlowPal[4 * 16] = INCBIN_U16("data/sprites/mecha_ridley_green_glow.pal"); -const u16 sMechaRidley_8323b42_Pal[4] = INCBIN_U16("data/sprites/mecha_ridley_323b42.pal"); -const u16 sMechaRidley_8323b4a_Pal[12] = INCBIN_U16("data/sprites/mecha_ridley_323b4a.pal"); -const u16 sMechaRidley_8323b62_Pal[3] = INCBIN_U16("data/sprites/mecha_ridley_323b62.pal"); +const u16 sMechaRidley_8323aaa_Pal[12] = { + #include "extracted/data/sprites/mecha_ridley_323aaa.pal.inc" +}; +const u16 sMechaRidleyGreenGlowPal[4 * 16] = { + #include "extracted/data/sprites/mecha_ridley_green_glow.pal.inc" +}; +const u16 sMechaRidley_8323b42_Pal[4] = { + #include "extracted/data/sprites/mecha_ridley_323b42.pal.inc" +}; +const u16 sMechaRidley_8323b4a_Pal[12] = { + #include "extracted/data/sprites/mecha_ridley_323b4a.pal.inc" +}; +const u16 sMechaRidley_8323b62_Pal[3] = { + #include "extracted/data/sprites/mecha_ridley_323b62.pal.inc" +}; -const u16 sMechaRidleyFadingPal[7 * 16] = INCBIN_U16("data/sprites/mecha_ridley_fading.pal"); +const u16 sMechaRidleyFadingPal[7 * 16] = { + #include "extracted/data/sprites/mecha_ridley_fading.pal.inc" +}; static const u16 sMechaRidleyPartOam_Tail_Frame0[OAM_DATA_SIZE(2)] = { diff --git a/src/data/sprites/mella.c b/src/data/sprites/mella.c index b36c2b602..26788081a 100644 --- a/src/data/sprites/mella.c +++ b/src/data/sprites/mella.c @@ -28,8 +28,12 @@ const u16 sMellaMovingXMovement[7] = { 0, 1, 2, 3, 4, 5, 6 }; -const u32 sMellaGfx[162] = INCBIN_U32("data/sprites/mella.gfx.lz"); -const u16 sMellaPal[16] = INCBIN_U16("data/sprites/mella.pal"); +const u32 sMellaGfx[162] = { + #include "extracted/data/sprites/mella.gfx.lz.inc" +}; +const u16 sMellaPal[16] = { + #include "extracted/data/sprites/mella.pal.inc" +}; static const u16 sMellaOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/message_banner.c b/src/data/sprites/message_banner.c index 8918555a2..0982951b7 100644 --- a/src/data/sprites/message_banner.c +++ b/src/data/sprites/message_banner.c @@ -1,8 +1,12 @@ #include "data/sprites/message_banner.h" #include "macros.h" -const u32 sMessageBannerGfx[139] = INCBIN_U32("data/sprites/message_banner.gfx.lz"); -const u16 sMessageBannerPal[32] = INCBIN_U16("data/sprites/message_banner.pal"); +const u32 sMessageBannerGfx[139] = { + #include "extracted/data/sprites/message_banner.gfx.lz.inc" +}; +const u16 sMessageBannerPal[32] = { + #include "extracted/data/sprites/message_banner.pal.inc" +}; static const u16 sSaveYesNoCursorOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/metroid.c b/src/data/sprites/metroid.c index 7549627a7..277f2b513 100644 --- a/src/data/sprites/metroid.c +++ b/src/data/sprites/metroid.c @@ -16,9 +16,15 @@ const s16 sMetroidSpawningXMovement[81] = { -1, -1, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, 0, 0, SHORT_MAX }; -const u32 sMetroidGfx[793] = INCBIN_U32("data/sprites/metroid.gfx.lz"); -const u16 sMetroidPal[80] = INCBIN_U16("data/sprites/metroid.pal"); -const u16 sMetroidPal_SamusGrabbed[80] = INCBIN_U16("data/sprites/metroid_samus_grabbed.pal"); +const u32 sMetroidGfx[793] = { + #include "extracted/data/sprites/metroid.gfx.lz.inc" +}; +const u16 sMetroidPal[80] = { + #include "extracted/data/sprites/metroid.pal.inc" +}; +const u16 sMetroidPal_SamusGrabbed[80] = { + #include "extracted/data/sprites/metroid_samus_grabbed.pal.inc" +}; static const u16 sMetroidShellOam_Idle_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/morph_ball.c b/src/data/sprites/morph_ball.c index bce5fd2e4..b4d83b912 100644 --- a/src/data/sprites/morph_ball.c +++ b/src/data/sprites/morph_ball.c @@ -1,8 +1,12 @@ #include "data/sprites/morph_ball.h" #include "macros.h" -const u32 sMorphBallGfx[168] = INCBIN_U32("data/sprites/morph_ball.gfx.lz"); -const u16 sMorphBallPal[16] = INCBIN_U16("data/sprites/morph_ball.pal"); +const u32 sMorphBallGfx[168] = { + #include "extracted/data/sprites/morph_ball.gfx.lz.inc" +}; +const u16 sMorphBallPal[16] = { + #include "extracted/data/sprites/morph_ball.pal.inc" +}; static const u16 sMorphBallOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/morph_ball_launcher.c b/src/data/sprites/morph_ball_launcher.c index 7592f89fe..21ed1d8e3 100644 --- a/src/data/sprites/morph_ball_launcher.c +++ b/src/data/sprites/morph_ball_launcher.c @@ -1,8 +1,12 @@ #include "data/sprites/morph_ball_launcher.h" #include "macros.h" -const u32 sMorphBallLauncherGfx[303] = INCBIN_U32("data/sprites/morph_ball_launcher.gfx.lz"); -const u16 sMorphBallLauncherPal[16] = INCBIN_U16("data/sprites/morph_ball_launcher.pal"); +const u32 sMorphBallLauncherGfx[303] = { + #include "extracted/data/sprites/morph_ball_launcher.gfx.lz.inc" +}; +const u16 sMorphBallLauncherPal[16] = { + #include "extracted/data/sprites/morph_ball_launcher.pal.inc" +}; static const u16 sMorphBallLauncherOam_Idle_Frame0[OAM_DATA_SIZE(12)] = { 12, diff --git a/src/data/sprites/mother_brain.c b/src/data/sprites/mother_brain.c index 3224721a8..fca082990 100644 --- a/src/data/sprites/mother_brain.c +++ b/src/data/sprites/mother_brain.c @@ -145,8 +145,12 @@ const u8 sMotherBrainDynamicPaletteData[19][2] = { { SCHAR_MAX + 1, SCHAR_MAX + 1 } }; -const u32 sMotherBrainGfx[1871] = INCBIN_U32("data/sprites/mother_brain.gfx.lz"); -const u16 sMotherBrainPal[96] = INCBIN_U16("data/sprites/mother_brain.pal"); +const u32 sMotherBrainGfx[1871] = { + #include "extracted/data/sprites/mother_brain.gfx.lz.inc" +}; +const u16 sMotherBrainPal[96] = { + #include "extracted/data/sprites/mother_brain.pal.inc" +}; static const u16 sMotherBrainOam_Idle_Frame0[OAM_DATA_SIZE(19)] = { 19, diff --git a/src/data/sprites/multiviola.c b/src/data/sprites/multiviola.c index 2abc2faa2..3dfb15f4f 100644 --- a/src/data/sprites/multiviola.c +++ b/src/data/sprites/multiviola.c @@ -1,8 +1,12 @@ #include "data/sprites/multiviola.h" #include "macros.h" -const u32 sMultiviolaGfx[221] = INCBIN_U32("data/sprites/multiviola.gfx.lz"); -const u16 sMultiviolaPal[16] = INCBIN_U16("data/sprites/multiviola.pal"); +const u32 sMultiviolaGfx[221] = { + #include "extracted/data/sprites/multiviola.gfx.lz.inc" +}; +const u16 sMultiviolaPal[16] = { + #include "extracted/data/sprites/multiviola.pal.inc" +}; static const u16 sMultiviolaOam_Moving_Frame0[OAM_DATA_SIZE(7)] = { 7, diff --git a/src/data/sprites/parasite.c b/src/data/sprites/parasite.c index ae1af1154..be2bf052b 100644 --- a/src/data/sprites/parasite.c +++ b/src/data/sprites/parasite.c @@ -1,8 +1,12 @@ #include "data/sprites/parasite.h" #include "macros.h" -const u32 sParasiteGfx[309] = INCBIN_U32("data/sprites/parasite.gfx.lz"); -const u16 sParasitePal[16] = INCBIN_U16("data/sprites/parasite.pal"); +const u32 sParasiteGfx[309] = { + #include "extracted/data/sprites/parasite.gfx.lz.inc" +}; +const u16 sParasitePal[16] = { + #include "extracted/data/sprites/parasite.pal.inc" +}; static const u16 sParasiteOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/piston.c b/src/data/sprites/piston.c index 473836e99..1e6295a30 100644 --- a/src/data/sprites/piston.c +++ b/src/data/sprites/piston.c @@ -1,8 +1,12 @@ #include "data/sprites/piston.h" #include "macros.h" -const u32 sPistonGfx[179] = INCBIN_U32("data/sprites/piston.gfx.lz"); -const u16 sPistonPal[16] = INCBIN_U16("data/sprites/piston.pal"); +const u32 sPistonGfx[179] = { + #include "extracted/data/sprites/piston.gfx.lz.inc" +}; +const u16 sPistonPal[16] = { + #include "extracted/data/sprites/piston.pal.inc" +}; static const u16 sPistonOam_Idle_Frame0[OAM_DATA_SIZE(11)] = { 11, diff --git a/src/data/sprites/polyp.c b/src/data/sprites/polyp.c index 86a5e3d31..064329eb7 100644 --- a/src/data/sprites/polyp.c +++ b/src/data/sprites/polyp.c @@ -7,8 +7,12 @@ const s16 sPolypProjectileYVelocity[44] = { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16, 18, SHORT_MAX }; -const u32 sPolypGfx[241] = INCBIN_U32("data/sprites/polyp.gfx.lz"); -const u16 sPolypPal[16] = INCBIN_U16("data/sprites/polyp.pal"); +const u32 sPolypGfx[241] = { + #include "extracted/data/sprites/polyp.gfx.lz.inc" +}; +const u16 sPolypPal[16] = { + #include "extracted/data/sprites/polyp.pal.inc" +}; static const u16 sPolypOam_Idle_Frame0[OAM_DATA_SIZE(4)] = { 4, diff --git a/src/data/sprites/power_grip.c b/src/data/sprites/power_grip.c index 8db444901..26eb9003f 100644 --- a/src/data/sprites/power_grip.c +++ b/src/data/sprites/power_grip.c @@ -1,8 +1,12 @@ #include "data/sprites/power_grip.h" #include "macros.h" -const u32 sPowerGripGfx[279] = INCBIN_U32("data/sprites/power_grip.gfx.lz"); -const u16 sPowerGripPal[32] = INCBIN_U16("data/sprites/power_grip.pal"); +const u32 sPowerGripGfx[279] = { + #include "extracted/data/sprites/power_grip.gfx.lz.inc" +}; +const u16 sPowerGripPal[32] = { + #include "extracted/data/sprites/power_grip.pal.inc" +}; static const u16 sPowerGripOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/reo.c b/src/data/sprites/reo.c index b23351d8f..38f8600f2 100644 --- a/src/data/sprites/reo.c +++ b/src/data/sprites/reo.c @@ -18,10 +18,18 @@ const s16 sReoIdleXMovement[81] = { 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, 0, 0, SHORT_MAX }; -const u32 sReoGreenWingsGfx[277] = INCBIN_U32("data/sprites/reo_green_wings.gfx.lz"); -const u16 sReoGreenWingsPal[16] = INCBIN_U16("data/sprites/reo_green_wings.pal"); -const u32 sReoPurpleWingsGfx[277] = INCBIN_U32("data/sprites/reo_purple_wings.gfx.lz"); -const u16 sReoPurpleWingsPal[16] = INCBIN_U16("data/sprites/reo_purple_wings.pal"); +const u32 sReoGreenWingsGfx[277] = { + #include "extracted/data/sprites/reo_green_wings.gfx.lz.inc" +}; +const u16 sReoGreenWingsPal[16] = { + #include "extracted/data/sprites/reo_green_wings.pal.inc" +}; +const u32 sReoPurpleWingsGfx[277] = { + #include "extracted/data/sprites/reo_purple_wings.gfx.lz.inc" +}; +const u16 sReoPurpleWingsPal[16] = { + #include "extracted/data/sprites/reo_purple_wings.pal.inc" +}; static const u16 sReoOam_Idle_Frame0[OAM_DATA_SIZE(3)] = { 3, diff --git a/src/data/sprites/ridley.c b/src/data/sprites/ridley.c index f89e90c79..0ddc8d9ca 100644 --- a/src/data/sprites/ridley.c +++ b/src/data/sprites/ridley.c @@ -2633,8 +2633,12 @@ const s16 sRidleyIdleYOffsets[65] = { 0, 0, 0, SHORT_MAX }; -const u32 sRidleyGfx[2211] = INCBIN_U32("data/sprites/ridley.gfx.lz"); -const u16 sRidleyPal[128] = INCBIN_U16("data/sprites/ridley.pal"); +const u32 sRidleyGfx[2211] = { + #include "extracted/data/sprites/ridley.gfx.lz.inc" +}; +const u16 sRidleyPal[128] = { + #include "extracted/data/sprites/ridley.pal.inc" +}; static const u16 sRidleyOam_Idle_Frame0[OAM_DATA_SIZE(16)] = { 16, diff --git a/src/data/sprites/rinka.c b/src/data/sprites/rinka.c index 0288a1194..4717d8e8d 100644 --- a/src/data/sprites/rinka.c +++ b/src/data/sprites/rinka.c @@ -1,10 +1,18 @@ #include "data/sprites/rinka.h" #include "macros.h" -const u32 sRinkaOrangeGfx[242] = INCBIN_U32("data/sprites/rinka_orange.gfx.lz"); -const u16 sRinkaOrangePal[16] = INCBIN_U16("data/sprites/rinka_orange.pal"); -const u32 sRinkaGreenGfx[242] = INCBIN_U32("data/sprites/rinka_green.gfx.lz"); -const u16 sRinkaGreenPal[16] = INCBIN_U16("data/sprites/rinka_green.pal"); +const u32 sRinkaOrangeGfx[242] = { + #include "extracted/data/sprites/rinka_orange.gfx.lz.inc" +}; +const u16 sRinkaOrangePal[16] = { + #include "extracted/data/sprites/rinka_orange.pal.inc" +}; +const u32 sRinkaGreenGfx[242] = { + #include "extracted/data/sprites/rinka_green.gfx.lz.inc" +}; +const u16 sRinkaGreenPal[16] = { + #include "extracted/data/sprites/rinka_green.pal.inc" +}; static const u16 sRinkaOrangeOam_Moving_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/ripper.c b/src/data/sprites/ripper.c index c7c126a4d..f6ac07a59 100644 --- a/src/data/sprites/ripper.c +++ b/src/data/sprites/ripper.c @@ -1,10 +1,18 @@ #include "data/sprites/ripper.h" #include "macros.h" -const u32 sRipperBrownGfx[141] = INCBIN_U32("data/sprites/ripper_brown.gfx.lz"); -const u16 sRipperBrownPal[16] = INCBIN_U16("data/sprites/ripper_brown.pal"); -const u32 sRipperPurpleGfx[141] = INCBIN_U32("data/sprites/ripper_purple.gfx.lz"); -const u16 sRipperPurplePal[16] = INCBIN_U16("data/sprites/ripper_purple.pal"); +const u32 sRipperBrownGfx[141] = { + #include "extracted/data/sprites/ripper_brown.gfx.lz.inc" +}; +const u16 sRipperBrownPal[16] = { + #include "extracted/data/sprites/ripper_brown.pal.inc" +}; +const u32 sRipperPurpleGfx[141] = { + #include "extracted/data/sprites/ripper_purple.gfx.lz.inc" +}; +const u16 sRipperPurplePal[16] = { + #include "extracted/data/sprites/ripper_purple.pal.inc" +}; static const u16 sRipperOam_Moving_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/ripper2.c b/src/data/sprites/ripper2.c index 53ae95bd7..07984c992 100644 --- a/src/data/sprites/ripper2.c +++ b/src/data/sprites/ripper2.c @@ -1,8 +1,12 @@ #include "data/sprites/ripper.h" #include "macros.h" -const u32 sRipper2Gfx[212] = INCBIN_U32("data/sprites/ripper2.gfx.lz"); -const u16 sRipper2Pal[16] = INCBIN_U16("data/sprites/ripper2.pal"); +const u32 sRipper2Gfx[212] = { + #include "extracted/data/sprites/ripper2.gfx.lz.inc" +}; +const u16 sRipper2Pal[16] = { + #include "extracted/data/sprites/ripper2.pal.inc" +}; static const u16 sRipper2Oam_Moving_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/rising_chozo_pillar.c b/src/data/sprites/rising_chozo_pillar.c index 1706a9e20..9e62b564c 100644 --- a/src/data/sprites/rising_chozo_pillar.c +++ b/src/data/sprites/rising_chozo_pillar.c @@ -1,8 +1,12 @@ #include "data/sprites/rising_chozo_pillar.h" #include "macros.h" -const u32 sRisingChozoPillarGfx[671] = INCBIN_U32("data/sprites/rising_chozo_pillar.gfx.lz"); -const u16 sRisingChozoPillarPal[64] = INCBIN_U16("data/sprites/rising_chozo_pillar.pal"); +const u32 sRisingChozoPillarGfx[671] = { + #include "extracted/data/sprites/rising_chozo_pillar.gfx.lz.inc" +}; +const u16 sRisingChozoPillarPal[64] = { + #include "extracted/data/sprites/rising_chozo_pillar.pal.inc" +}; static const u16 sRisingChozoPillarPlatformOam_Slot0Spawning_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/ruins_test.c b/src/data/sprites/ruins_test.c index 486b091c3..556a80d87 100644 --- a/src/data/sprites/ruins_test.c +++ b/src/data/sprites/ruins_test.c @@ -1,25 +1,61 @@ #include "data/sprites/ruins_test.h" #include "macros.h" -const u32 sRuinsTestGfx[1951] = INCBIN_U32("data/sprites/ruins_test.gfx"); -const u32 sRuinsTestGfx_SamusReflectionTurningRightTop[96] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_turning_right_top.gfx"); -const u32 sRuinsTestGfx_SamusReflectionTurningRightBottom[64] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_turning_right_bottom.gfx"); -const u32 sRuinsTestGfx_SamusReflectionTurningLeftTop[96] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_turning_left_top.gfx"); -const u32 sRuinsTestGfx_SamusReflectionTurningLeftBottom[64] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_turning_left_bottom.gfx"); -const u32 sRuinsTestGfx_SamusReflectionFullSuitTop[96] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_full_suit_top.gfx"); -const u32 sRuinsTestGfx_SamusReflectionFullSuitBottom[64] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_full_suit_bottom.gfx"); -const u32 sRuinsTestGfx_SamusReflectionSuitlessTop[96] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_suitless_top.gfx"); -const u32 sRuinsTestGfx_SamusReflectionSuitlessBottom[64] = INCBIN_U32("data/sprites/ruins_test_samus_reflection_suitless_bottom.gfx"); - -const u16 sRuinsTestPal[128] = INCBIN_U16("data/sprites/ruins_test.pal"); -const u16 sRuinsTestPal_SymbolShot_Frame1[8] = INCBIN_U16("data/sprites/ruins_test_symbol_shot_frame_1.pal"); -const u16 sRuinsTestPal_SymbolShot_Frame2[8] = INCBIN_U16("data/sprites/ruins_test_symbol_shot_frame_2.pal"); -const u16 sRuinsTestPal_SymbolShot_Frame3[8] = INCBIN_U16("data/sprites/ruins_test_symbol_shot_frame_3.pal"); -const u16 sRuinsTestPal_SymbolShot_Frame4[8] = INCBIN_U16("data/sprites/ruins_test_symbol_shot_frame_4.pal"); -const u16 sRuinsTestPal_SymbolShot_Frame5[8] = INCBIN_U16("data/sprites/ruins_test_symbol_shot_frame_5.pal"); -const u16 sRuinsTestPal_SymbolShot_Frame6[8] = INCBIN_U16("data/sprites/ruins_test_symbol_shot_frame_6.pal"); -const u16 sRuinsTestPal_SamusReflection[15 * 16] = INCBIN_U16("data/sprites/ruins_test_samus_reflection.pal"); -const u16 sRuinsTestPal_SamusReflectionFullSuit[15 * 16] = INCBIN_U16("data/sprites/ruins_test_samus_reflection_full_suit.pal"); +const u32 sRuinsTestGfx[1951] = { + #include "extracted/data/sprites/ruins_test.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionTurningRightTop[96] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_turning_right_top.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionTurningRightBottom[64] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_turning_right_bottom.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionTurningLeftTop[96] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_turning_left_top.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionTurningLeftBottom[64] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_turning_left_bottom.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionFullSuitTop[96] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_full_suit_top.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionFullSuitBottom[64] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_full_suit_bottom.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionSuitlessTop[96] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_suitless_top.gfx.inc" +}; +const u32 sRuinsTestGfx_SamusReflectionSuitlessBottom[64] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_suitless_bottom.gfx.inc" +}; + +const u16 sRuinsTestPal[128] = { + #include "extracted/data/sprites/ruins_test.pal.inc" +}; +const u16 sRuinsTestPal_SymbolShot_Frame1[8] = { + #include "extracted/data/sprites/ruins_test_symbol_shot_frame_1.pal.inc" +}; +const u16 sRuinsTestPal_SymbolShot_Frame2[8] = { + #include "extracted/data/sprites/ruins_test_symbol_shot_frame_2.pal.inc" +}; +const u16 sRuinsTestPal_SymbolShot_Frame3[8] = { + #include "extracted/data/sprites/ruins_test_symbol_shot_frame_3.pal.inc" +}; +const u16 sRuinsTestPal_SymbolShot_Frame4[8] = { + #include "extracted/data/sprites/ruins_test_symbol_shot_frame_4.pal.inc" +}; +const u16 sRuinsTestPal_SymbolShot_Frame5[8] = { + #include "extracted/data/sprites/ruins_test_symbol_shot_frame_5.pal.inc" +}; +const u16 sRuinsTestPal_SymbolShot_Frame6[8] = { + #include "extracted/data/sprites/ruins_test_symbol_shot_frame_6.pal.inc" +}; +const u16 sRuinsTestPal_SamusReflection[15 * 16] = { + #include "extracted/data/sprites/ruins_test_samus_reflection.pal.inc" +}; +const u16 sRuinsTestPal_SamusReflectionFullSuit[15 * 16] = { + #include "extracted/data/sprites/ruins_test_samus_reflection_full_suit.pal.inc" +}; static const u16 sRuinsTestSamusReflectionOam_Frame0[OAM_DATA_SIZE(3)] = { 3, diff --git a/src/data/sprites/save_platform.c b/src/data/sprites/save_platform.c index 7d05d6412..def7cecda 100644 --- a/src/data/sprites/save_platform.c +++ b/src/data/sprites/save_platform.c @@ -1,8 +1,12 @@ #include "data/sprites/save_platform.h" #include "macros.h" -const u32 sSavePlatformGfx[603] = INCBIN_U32("data/sprites/save_platform.gfx.lz"); -const u16 sSavePlatformPal[64] = INCBIN_U16("data/sprites/save_platform.pal"); +const u32 sSavePlatformGfx[603] = { + #include "extracted/data/sprites/save_platform.gfx.lz.inc" +}; +const u16 sSavePlatformPal[64] = { + #include "extracted/data/sprites/save_platform.pal.inc" +}; static const u16 sSavePlatformOam_Idle_Frame0[OAM_DATA_SIZE(9)] = { 9, diff --git a/src/data/sprites/save_platform_chozodia.c b/src/data/sprites/save_platform_chozodia.c index f3b248e6e..03afb6ddb 100644 --- a/src/data/sprites/save_platform_chozodia.c +++ b/src/data/sprites/save_platform_chozodia.c @@ -1,8 +1,12 @@ #include "data/sprites/save_platform_chozodia.h" #include "macros.h" -const u32 sSavePlatformChozodiaGfx[552] = INCBIN_U32("data/sprites/save_platform_chozodia.gfx.lz"); -const u16 sSavePlatformChozodiaPal[64] = INCBIN_U16("data/sprites/save_platform_chozodia.pal"); +const u32 sSavePlatformChozodiaGfx[552] = { + #include "extracted/data/sprites/save_platform_chozodia.gfx.lz.inc" +}; +const u16 sSavePlatformChozodiaPal[64] = { + #include "extracted/data/sprites/save_platform_chozodia.pal.inc" +}; static const u16 sSavePlatformChozodiaOam_Idle_Frame0[OAM_DATA_SIZE(20)] = { 20, diff --git a/src/data/sprites/searchlight.c b/src/data/sprites/searchlight.c index b78980605..672c94a7d 100644 --- a/src/data/sprites/searchlight.c +++ b/src/data/sprites/searchlight.c @@ -1,8 +1,12 @@ #include "data/sprites/searchlight.h" #include "macros.h" -const u32 sSearchlightGfx[172] = INCBIN_U32("data/sprites/searchlight.gfx.lz"); -const u16 sSearchlightPal[16] = INCBIN_U16("data/sprites/searchlight.pal"); +const u32 sSearchlightGfx[172] = { + #include "extracted/data/sprites/searchlight.gfx.lz.inc" +}; +const u16 sSearchlightPal[16] = { + #include "extracted/data/sprites/searchlight.pal.inc" +}; static const u16 sSearchlightOam_Moving_Frame0[OAM_DATA_SIZE(8)] = { 8, diff --git a/src/data/sprites/searchlight_eye.c b/src/data/sprites/searchlight_eye.c index 645b707b0..7f7793b51 100644 --- a/src/data/sprites/searchlight_eye.c +++ b/src/data/sprites/searchlight_eye.c @@ -1,8 +1,12 @@ #include "data/sprites/searchlight_eye.h" #include "macros.h" -const u32 sSearchlightEyeGfx[177] = INCBIN_U32("data/sprites/searchlight_eye.gfx.lz"); -const u16 sSearchlightEyePal[16] = INCBIN_U16("data/sprites/searchlight_eye.pal"); +const u32 sSearchlightEyeGfx[177] = { + #include "extracted/data/sprites/searchlight_eye.gfx.lz.inc" +}; +const u16 sSearchlightEyePal[16] = { + #include "extracted/data/sprites/searchlight_eye.pal.inc" +}; static const u16 sSearchlightEyeOam_Idle_Frame0[OAM_DATA_SIZE(3)] = { 3, diff --git a/src/data/sprites/security_gate.c b/src/data/sprites/security_gate.c index 92f0f51f5..f82d9d1ed 100644 --- a/src/data/sprites/security_gate.c +++ b/src/data/sprites/security_gate.c @@ -1,8 +1,12 @@ #include "data/sprites/security_gate.h" #include "macros.h" -const u32 sSecurityGateGfx[122] = INCBIN_U32("data/sprites/security_gate.gfx.lz"); -const u16 sSecurityGatePal[16] = INCBIN_U16("data/sprites/security_gate.pal"); +const u32 sSecurityGateGfx[122] = { + #include "extracted/data/sprites/security_gate.gfx.lz.inc" +}; +const u16 sSecurityGatePal[16] = { + #include "extracted/data/sprites/security_gate.pal.inc" +}; static const u16 sSecurityGateOam_Opened_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/security_laser.c b/src/data/sprites/security_laser.c index 07580cab2..7007340c9 100644 --- a/src/data/sprites/security_laser.c +++ b/src/data/sprites/security_laser.c @@ -1,8 +1,12 @@ #include "data/sprites/security_laser.h" #include "macros.h" -const u32 sSecurityLaserGfx[104] = INCBIN_U32("data/sprites/security_laser.gfx.lz"); -const u16 sSecurityLaserPal[16] = INCBIN_U16("data/sprites/security_laser.pal"); +const u32 sSecurityLaserGfx[104] = { + #include "extracted/data/sprites/security_laser.gfx.lz.inc" +}; +const u16 sSecurityLaserPal[16] = { + #include "extracted/data/sprites/security_laser.pal.inc" +}; static const u16 sSecurityLaserOam_VerticalSmall_Frame0[OAM_DATA_SIZE(3)] = { 3, diff --git a/src/data/sprites/sidehopper.c b/src/data/sprites/sidehopper.c index 97a20731f..9b9e24e6c 100644 --- a/src/data/sprites/sidehopper.c +++ b/src/data/sprites/sidehopper.c @@ -10,8 +10,12 @@ const s16 sSidehopperLowJumpVelocity[10] = { -4, -8, -4, -2, 0, 4, 8, 16, 16, 16 }; -const u32 sSidehopperGfx[303] = INCBIN_U32("data/sprites/sidehopper.gfx.lz"); -const u16 sSidehopperPal[16] = INCBIN_U16("data/sprites/sidehopper.pal"); +const u32 sSidehopperGfx[303] = { + #include "extracted/data/sprites/sidehopper.gfx.lz.inc" +}; +const u16 sSidehopperPal[16] = { + #include "extracted/data/sprites/sidehopper.pal.inc" +}; static const u16 sSidehopperOam_Idle_Frame0[OAM_DATA_SIZE(6)] = { 6, diff --git a/src/data/sprites/skree.c b/src/data/sprites/skree.c index 4e8e5f5f3..209d7b4a2 100644 --- a/src/data/sprites/skree.c +++ b/src/data/sprites/skree.c @@ -12,10 +12,18 @@ const s16 sSkreeFallingSpeed[8] = { SHORT_MAX }; -const u32 sSkreeGreenGfx[264] = INCBIN_U32("data/sprites/skree_green.gfx.lz"); -const u16 sSkreeGreenPal[16] = INCBIN_U16("data/sprites/skree_green.pal"); -const u32 sSkreeBlueGfx[264] = INCBIN_U32("data/sprites/skree_blue.gfx.lz"); -const u16 sSkreeBluePal[16] = INCBIN_U16("data/sprites/skree_blue.pal"); +const u32 sSkreeGreenGfx[264] = { + #include "extracted/data/sprites/skree_green.gfx.lz.inc" +}; +const u16 sSkreeGreenPal[16] = { + #include "extracted/data/sprites/skree_green.pal.inc" +}; +const u32 sSkreeBlueGfx[264] = { + #include "extracted/data/sprites/skree_blue.gfx.lz.inc" +}; +const u16 sSkreeBluePal[16] = { + #include "extracted/data/sprites/skree_blue.pal.inc" +}; static const u16 sSkreeOam_Idle_Frame0[OAM_DATA_SIZE(4)] = { 4, diff --git a/src/data/sprites/skultera.c b/src/data/sprites/skultera.c index fce873474..285f17278 100644 --- a/src/data/sprites/skultera.c +++ b/src/data/sprites/skultera.c @@ -1,8 +1,12 @@ #include "data/sprites/skultera.h" #include "macros.h" -const u32 sSkulteraGfx[285] = INCBIN_U32("data/sprites/skultera.gfx.lz"); -const u16 sSkulteraPal[16] = INCBIN_U16("data/sprites/skultera.pal"); +const u32 sSkulteraGfx[285] = { + #include "extracted/data/sprites/skultera.gfx.lz.inc" +}; +const u16 sSkulteraPal[16] = { + #include "extracted/data/sprites/skultera.pal.inc" +}; static const u16 sSkulteraOam_Idle_Frame0[OAM_DATA_SIZE(6)] = { 6, diff --git a/src/data/sprites/sova.c b/src/data/sprites/sova.c index 618d9a773..32e9974f2 100644 --- a/src/data/sprites/sova.c +++ b/src/data/sprites/sova.c @@ -1,8 +1,12 @@ #include "data/sprites/sova.h" #include "macros.h" -const u32 sSovaGfx[851] = INCBIN_U32("data/sprites/sova.gfx.lz"); -const u16 sSovaPal[3 * 16] = INCBIN_U16("data/sprites/sova.pal"); +const u32 sSovaGfx[851] = { + #include "extracted/data/sprites/sova.gfx.lz.inc" +}; +const u16 sSovaPal[3 * 16] = { + #include "extracted/data/sprites/sova.pal.inc" +}; static const u16 sSovaOam_OnGround_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/space_pirate.c b/src/data/sprites/space_pirate.c index 4bda98865..27c28db96 100644 --- a/src/data/sprites/space_pirate.c +++ b/src/data/sprites/space_pirate.c @@ -21,8 +21,12 @@ const s16 sSpacePirate_2e1070[12] = { -32, -28, -24, -20, -16, -8, -4, 8, 16, 24, 28, 32 }; -const u32 sSpacePirateGfx[810] = INCBIN_U32("data/sprites/space_pirate.gfx.lz"); -const u16 sSpacePiratePal[48] = INCBIN_U16("data/sprites/space_pirate.pal"); +const u32 sSpacePirateGfx[810] = { + #include "extracted/data/sprites/space_pirate.gfx.lz.inc" +}; +const u16 sSpacePiratePal[48] = { + #include "extracted/data/sprites/space_pirate.pal.inc" +}; static const u16 sSpacePirateOam_Crouched_Frame0[OAM_DATA_SIZE(14)] = { 14, diff --git a/src/data/sprites/space_pirate_carrying_power_bomb.c b/src/data/sprites/space_pirate_carrying_power_bomb.c index 4607270b8..eae81627c 100644 --- a/src/data/sprites/space_pirate_carrying_power_bomb.c +++ b/src/data/sprites/space_pirate_carrying_power_bomb.c @@ -1,8 +1,12 @@ #include "data/sprites/space_pirate_carrying_power_bomb.h" #include "macros.h" -const u32 sFakePowerBombGfx[115] = INCBIN_U32("data/sprites/fake_power_bomb.gfx.lz"); -const u16 sFakePowerBombPal[16] = INCBIN_U16("data/sprites/fake_power_bomb.pal"); +const u32 sFakePowerBombGfx[115] = { + #include "extracted/data/sprites/fake_power_bomb.gfx.lz.inc" +}; +const u16 sFakePowerBombPal[16] = { + #include "extracted/data/sprites/fake_power_bomb.pal.inc" +}; static const u16 sFakePowerBombOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/squeept.c b/src/data/sprites/squeept.c index 213807ab9..4bd3bc91c 100644 --- a/src/data/sprites/squeept.c +++ b/src/data/sprites/squeept.c @@ -16,8 +16,12 @@ const s16 sSqueeptFallingMovement[16] = { 14, 16, 16, SHORT_MAX }; -const u32 sSqueeptGfx[263] = INCBIN_U32("data/sprites/squeept.gfx.lz"); -const u16 sSqueeptPal[16] = INCBIN_U16("data/sprites/squeept.pal"); +const u32 sSqueeptGfx[263] = { + #include "extracted/data/sprites/squeept.gfx.lz.inc" +}; +const u16 sSqueeptPal[16] = { + #include "extracted/data/sprites/squeept.pal.inc" +}; static const u16 sSqueeptOam_GoingUp_Frame0[OAM_DATA_SIZE(8)] = { 8, diff --git a/src/data/sprites/steam.c b/src/data/sprites/steam.c index 477260203..763769a17 100644 --- a/src/data/sprites/steam.c +++ b/src/data/sprites/steam.c @@ -1,8 +1,12 @@ #include "data/sprites/steam.h" #include "macros.h" -const u32 sSteamGfx[195] = INCBIN_U32("data/sprites/steam.gfx.lz"); -const u16 sSteamPal[16] = INCBIN_U16("data/sprites/steam.pal"); +const u32 sSteamGfx[195] = { + #include "extracted/data/sprites/steam.gfx.lz.inc" +}; +const u16 sSteamPal[16] = { + #include "extracted/data/sprites/steam.pal.inc" +}; static const u16 sSteamOam_HorizontalLarge_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/tangle_vine.c b/src/data/sprites/tangle_vine.c index 415ca9bf8..876a13428 100644 --- a/src/data/sprites/tangle_vine.c +++ b/src/data/sprites/tangle_vine.c @@ -95,8 +95,12 @@ const struct MultiSpriteData sTangleVineGerutaMultiSpriteData_Idle[5] = { [4] = MULTI_SPRITE_DATA_TERMINATOR }; -const u32 sTangleVineGfx[1298] = INCBIN_U32("data/sprites/tangle_vine.gfx.lz"); -const u16 sTangleVinePal[80] = INCBIN_U16("data/sprites/tangle_vine.pal"); +const u32 sTangleVineGfx[1298] = { + #include "extracted/data/sprites/tangle_vine.gfx.lz.inc" +}; +const u16 sTangleVinePal[80] = { + #include "extracted/data/sprites/tangle_vine.pal.inc" +}; const u16 sTangleVineTallOam_OnGround_Frame3[OAM_DATA_SIZE(4)] = { 4, diff --git a/src/data/sprites/unknown_item_block.c b/src/data/sprites/unknown_item_block.c index 5a136fc8b..e339b0463 100644 --- a/src/data/sprites/unknown_item_block.c +++ b/src/data/sprites/unknown_item_block.c @@ -1,12 +1,24 @@ #include "data/sprites/unknown_item_block.h" #include "macros.h" -const u32 sPlasmaBeamBlockGfx[306] = INCBIN_U32("data/sprites/plasma_beam_block.gfx.lz"); -const u16 sPlasmaBeamBlockPal[16] = INCBIN_U16("data/sprites/plasma_beam_block.pal"); -const u32 sGravityBlockGfx[303] = INCBIN_U32("data/sprites/gravity_suit_block.gfx.lz"); -const u16 sGravityBlockPal[16] = INCBIN_U16("data/sprites/gravity_suit_block.pal"); -const u32 sSpaceJumpBlockGfx[297] = INCBIN_U32("data/sprites/space_jump_block.gfx.lz"); -const u16 sSpaceJumpBlockPal[16] = INCBIN_U16("data/sprites/space_jump_block.pal"); +const u32 sPlasmaBeamBlockGfx[306] = { + #include "extracted/data/sprites/plasma_beam_block.gfx.lz.inc" +}; +const u16 sPlasmaBeamBlockPal[16] = { + #include "extracted/data/sprites/plasma_beam_block.pal.inc" +}; +const u32 sGravityBlockGfx[303] = { + #include "extracted/data/sprites/gravity_suit_block.gfx.lz.inc" +}; +const u16 sGravityBlockPal[16] = { + #include "extracted/data/sprites/gravity_suit_block.pal.inc" +}; +const u32 sSpaceJumpBlockGfx[297] = { + #include "extracted/data/sprites/space_jump_block.gfx.lz.inc" +}; +const u16 sSpaceJumpBlockPal[16] = { + #include "extracted/data/sprites/space_jump_block.pal.inc" +}; static const u16 sUnknownItemBlockOam_Idle_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/unknown_item_chozo_statue.c b/src/data/sprites/unknown_item_chozo_statue.c index 385011f56..450eef432 100644 --- a/src/data/sprites/unknown_item_chozo_statue.c +++ b/src/data/sprites/unknown_item_chozo_statue.c @@ -354,8 +354,12 @@ const u8 sUnknownItemChozoStatueFlashingPaletteRows[4] = { 1, 2, 3, 2 }; -const u32 sChozoStatueSpaceJumpGfx[1353] = INCBIN_U32("data/sprites/chozo_statue_space_jump.gfx.lz"); -const u16 sChozoStatueSpaceJumpPal[80] = INCBIN_U16("data/sprites/chozo_statue_space_jump.pal"); +const u32 sChozoStatueSpaceJumpGfx[1353] = { + #include "extracted/data/sprites/chozo_statue_space_jump.gfx.lz.inc" +}; +const u16 sChozoStatueSpaceJumpPal[80] = { + #include "extracted/data/sprites/chozo_statue_space_jump.pal.inc" +}; static const u16 sUnknownItemChozoStatuePartOam_LegStanding_Frame0[OAM_DATA_SIZE(5)] = { 5, @@ -1368,8 +1372,16 @@ const struct FrameData sUnknownItemChozoStatuePartOam_GlowIdle[41] = { [40] = FRAME_DATA_TERMINATOR }; -const u32 sChozoStatueGravitySuitGfx[1357] = INCBIN_U32("data/sprites/chozo_statue_gravity_suit.gfx.lz"); -const u16 sChozoStatueGravitySuitPal[80] = INCBIN_U16("data/sprites/chozo_statue_gravity_suit.pal"); +const u32 sChozoStatueGravitySuitGfx[1357] = { + #include "extracted/data/sprites/chozo_statue_gravity_suit.gfx.lz.inc" +}; +const u16 sChozoStatueGravitySuitPal[80] = { + #include "extracted/data/sprites/chozo_statue_gravity_suit.pal.inc" +}; -const u32 sChozoStatuePlasmaBeamGfx[1356] = INCBIN_U32("data/sprites/chozo_statue_plasma_beam.gfx.lz"); -const u16 sChozoStatuePlasmaBeamPal[80] = INCBIN_U16("data/sprites/chozo_statue_plasma_beam.pal"); +const u32 sChozoStatuePlasmaBeamGfx[1356] = { + #include "extracted/data/sprites/chozo_statue_plasma_beam.gfx.lz.inc" +}; +const u16 sChozoStatuePlasmaBeamPal[80] = { + #include "extracted/data/sprites/chozo_statue_plasma_beam.pal.inc" +}; diff --git a/src/data/sprites/unused_sprites.c b/src/data/sprites/unused_sprites.c index 62caf4af3..09533a7fc 100644 --- a/src/data/sprites/unused_sprites.c +++ b/src/data/sprites/unused_sprites.c @@ -31,5 +31,9 @@ const struct FrameData sUnusedSpritesOam_Unused[2] = { [1] = FRAME_DATA_TERMINATOR }; -const u32 sUnusedSpritesGfx[6] = INCBIN_U32("data/sprites/unused_sprites.gfx.lz"); -const u16 sUnusedSpritesPal[16] = INCBIN_U16("data/sprites/unused_sprites.pal"); +const u32 sUnusedSpritesGfx[6] = { + #include "extracted/data/sprites/unused_sprites.gfx.lz.inc" +}; +const u16 sUnusedSpritesPal[16] = { + #include "extracted/data/sprites/unused_sprites.pal.inc" +}; diff --git a/src/data/sprites/viola.c b/src/data/sprites/viola.c index 5aab7d3f9..b0e909ff4 100644 --- a/src/data/sprites/viola.c +++ b/src/data/sprites/viola.c @@ -1,10 +1,18 @@ #include "data/sprites/viola.h" #include "macros.h" -const u32 sViolaBlueGfx[302] = INCBIN_U32("data/sprites/viola_blue.gfx.lz"); -const u16 sViolaBluePal[16] = INCBIN_U16("data/sprites/viola_blue.pal"); -const u32 sViolaOrangeGfx[305] = INCBIN_U32("data/sprites/viola_orange.gfx.lz"); -const u16 sViolaOrangePal[16] = INCBIN_U16("data/sprites/viola_orange.pal"); +const u32 sViolaBlueGfx[302] = { + #include "extracted/data/sprites/viola_blue.gfx.lz.inc" +}; +const u16 sViolaBluePal[16] = { + #include "extracted/data/sprites/viola_blue.pal.inc" +}; +const u32 sViolaOrangeGfx[305] = { + #include "extracted/data/sprites/viola_orange.gfx.lz.inc" +}; +const u16 sViolaOrangePal[16] = { + #include "extracted/data/sprites/viola_orange.pal.inc" +}; static const u16 sViolaOam_Moving_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/waver.c b/src/data/sprites/waver.c index 4a89be6f7..709187ec3 100644 --- a/src/data/sprites/waver.c +++ b/src/data/sprites/waver.c @@ -1,8 +1,12 @@ #include "data/sprites/waver.h" #include "macros.h" -const u32 sWaverGfx[289] = INCBIN_U32("data/sprites/waver.gfx.lz"); -const u16 sWaverPal[16] = INCBIN_U16("data/sprites/waver.pal"); +const u32 sWaverGfx[289] = { + #include "extracted/data/sprites/waver.gfx.lz.inc" +}; +const u16 sWaverPal[16] = { + #include "extracted/data/sprites/waver.pal.inc" +}; static const u16 sWaverOam_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/worker_robot.c b/src/data/sprites/worker_robot.c index b1b6558f1..d6deec8b3 100644 --- a/src/data/sprites/worker_robot.c +++ b/src/data/sprites/worker_robot.c @@ -1,8 +1,12 @@ #include "data/sprites/worker_robot.h" #include "macros.h" -const u32 sWorkerRobotGfx[376] = INCBIN_U32("data/sprites/worker_robot.gfx.lz"); -const u16 sWorkerRobotPal[32] = INCBIN_U16("data/sprites/worker_robot.pal"); +const u32 sWorkerRobotGfx[376] = { + #include "extracted/data/sprites/worker_robot.gfx.lz.inc" +}; +const u16 sWorkerRobotPal[32] = { + #include "extracted/data/sprites/worker_robot.pal.inc" +}; static const u16 sWorkerRobotOam_Walking_Frame2[OAM_DATA_SIZE(6)] = { 6, diff --git a/src/data/sprites/zeb.c b/src/data/sprites/zeb.c index b7bb9e6f4..392a603ee 100644 --- a/src/data/sprites/zeb.c +++ b/src/data/sprites/zeb.c @@ -1,10 +1,18 @@ #include "data/sprites/zeb.h" #include "macros.h" -const u32 sZebPinkGfx[162] = INCBIN_U32("data/sprites/zeb_pink.gfx.lz"); -const u16 sZebPinkPal[16] = INCBIN_U16("data/sprites/zeb_pink.pal"); -const u32 sZebBlueGfx[162] = INCBIN_U32("data/sprites/zeb_blue.gfx.lz"); -const u16 sZebBluePal[16] = INCBIN_U16("data/sprites/zeb_blue.pal"); +const u32 sZebPinkGfx[162] = { + #include "extracted/data/sprites/zeb_pink.gfx.lz.inc" +}; +const u16 sZebPinkPal[16] = { + #include "extracted/data/sprites/zeb_pink.pal.inc" +}; +const u32 sZebBlueGfx[162] = { + #include "extracted/data/sprites/zeb_blue.gfx.lz.inc" +}; +const u16 sZebBluePal[16] = { + #include "extracted/data/sprites/zeb_blue.pal.inc" +}; static const u16 sZebOam_Idle_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/zebbo.c b/src/data/sprites/zebbo.c index 4dd3b3778..a3dbd4ea6 100644 --- a/src/data/sprites/zebbo.c +++ b/src/data/sprites/zebbo.c @@ -1,10 +1,18 @@ #include "data/sprites/zebbo.h" #include "macros.h" -const u32 sZebboGreenGfx[124] = INCBIN_U32("data/sprites/zebbo_green.gfx.lz"); -const u16 sZebboGreenPal[16] = INCBIN_U16("data/sprites/zebbo_green.pal"); -const u32 sZebboYellowGfx[124] = INCBIN_U32("data/sprites/zebbo_yellow.gfx.lz"); -const u16 sZebboYellowPal[16] = INCBIN_U16("data/sprites/zebbo_yellow.pal"); +const u32 sZebboGreenGfx[124] = { + #include "extracted/data/sprites/zebbo_green.gfx.lz.inc" +}; +const u16 sZebboGreenPal[16] = { + #include "extracted/data/sprites/zebbo_green.pal.inc" +}; +const u32 sZebboYellowGfx[124] = { + #include "extracted/data/sprites/zebbo_yellow.gfx.lz.inc" +}; +const u16 sZebboYellowPal[16] = { + #include "extracted/data/sprites/zebbo_yellow.pal.inc" +}; static const u16 sZebboOam_Idle_Frame0[OAM_DATA_SIZE(1)] = { 1, diff --git a/src/data/sprites/zebetite_and_cannon.c b/src/data/sprites/zebetite_and_cannon.c index e933a265f..181217f0f 100644 --- a/src/data/sprites/zebetite_and_cannon.c +++ b/src/data/sprites/zebetite_and_cannon.c @@ -1,8 +1,12 @@ #include "data/sprites/zebetite_and_cannon.h" #include "macros.h" -const u32 sRinkaZebetiteAndCannonGfx[476] = INCBIN_U32("data/sprites/zebetite_rinka_cannon.gfx.lz"); -const u16 sRinkaZebetiteAndCannonPal[32] = INCBIN_U16("data/sprites/zebetite_rinka_cannon.pal"); +const u32 sRinkaZebetiteAndCannonGfx[476] = { + #include "extracted/data/sprites/zebetite_rinka_cannon.gfx.lz.inc" +}; +const u16 sRinkaZebetiteAndCannonPal[32] = { + #include "extracted/data/sprites/zebetite_rinka_cannon.pal.inc" +}; static const u16 sRinkaMotherBrainOam_Moving_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/zeela.c b/src/data/sprites/zeela.c index 27f5ccb42..9084bd133 100644 --- a/src/data/sprites/zeela.c +++ b/src/data/sprites/zeela.c @@ -9,8 +9,12 @@ const s16 sZeelaEyesFallingFromBottomSpeed[12] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, SHORT_MAX }; -const u32 sZeelaGfx[578] = INCBIN_U32("data/sprites/zeela.gfx.lz"); -const u16 sZeelaPal[32] = INCBIN_U16("data/sprites/zeela.pal"); +const u32 sZeelaGfx[578] = { + #include "extracted/data/sprites/zeela.gfx.lz.inc" +}; +const u16 sZeelaPal[32] = { + #include "extracted/data/sprites/zeela.pal.inc" +}; static const u16 sZeelaOam_OnGround_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/zipline.c b/src/data/sprites/zipline.c index f50a6e4f6..6ea030d14 100644 --- a/src/data/sprites/zipline.c +++ b/src/data/sprites/zipline.c @@ -1,8 +1,12 @@ #include "data/sprites/zipline.h" #include "macros.h" -const u32 sZiplineGfx[264] = INCBIN_U32("data/sprites/zipline.gfx.lz"); -const u16 sZiplinePal[16] = INCBIN_U16("data/sprites/zipline.pal"); +const u32 sZiplineGfx[264] = { + #include "extracted/data/sprites/zipline.gfx.lz.inc" +}; +const u16 sZiplinePal[16] = { + #include "extracted/data/sprites/zipline.pal.inc" +}; static const u16 sZiplineOam_OffIdle_Frame0[OAM_DATA_SIZE(2)] = { 2, diff --git a/src/data/sprites/zipline_generator.c b/src/data/sprites/zipline_generator.c index 192e2d2cb..556ff3acb 100644 --- a/src/data/sprites/zipline_generator.c +++ b/src/data/sprites/zipline_generator.c @@ -1,8 +1,12 @@ #include "data/sprites/zipline_generator.h" #include "macros.h" -const u32 sZiplineGeneratorGfx[1124] = INCBIN_U32("data/sprites/zipline_generator.gfx.lz"); -const u16 sZiplineGeneratorPal[64] = INCBIN_U16("data/sprites/zipline_generator.pal"); +const u32 sZiplineGeneratorGfx[1124] = { + #include "extracted/data/sprites/zipline_generator.gfx.lz.inc" +}; +const u16 sZiplineGeneratorPal[64] = { + #include "extracted/data/sprites/zipline_generator.pal.inc" +}; static const u16 sZiplineGeneratorPartOam_ConductorDeactivated_Frame0[OAM_DATA_SIZE(10)] = { 10, diff --git a/src/data/sprites/zoomer.c b/src/data/sprites/zoomer.c index 213ca829d..5cc2cd3d7 100644 --- a/src/data/sprites/zoomer.c +++ b/src/data/sprites/zoomer.c @@ -1,8 +1,12 @@ #include "data/sprites/zoomer.h" #include "macros.h" -const u32 sZoomerGfx[379] = INCBIN_U32("data/sprites/zoomer.gfx.lz"); -const u16 sZoomerPal[32] = INCBIN_U16("data/sprites/zoomer.pal"); +const u32 sZoomerGfx[379] = { + #include "extracted/data/sprites/zoomer.gfx.lz.inc" +}; +const u16 sZoomerPal[32] = { + #include "extracted/data/sprites/zoomer.pal.inc" +}; static const u16 sZoomerOam_Falling_Frame0[OAM_DATA_SIZE(4)] = { 4, diff --git a/src/data/text_data.c b/src/data/text_data.c index 23718a82c..76e3d72a7 100644 --- a/src/data/text_data.c +++ b/src/data/text_data.c @@ -5,7 +5,9 @@ #include "constants/game_state.h" #include "constants/text.h" -const u8 sCharactersGfx[176 * 1024] = INCBIN_U8("data/text_characters.gfx"); +const u8 sCharactersGfx[176 * 1024] = { + #include "extracted/data/text_characters.gfx.inc" +}; const u16 sJapaneseText_Message_Dummy[] = INCTEXT("{GAP(98)}ダミー\n{GAP(110)}"); const u16 sJapaneseText_Message_EnergyTankAcquired[] = INCTEXT("{GAP(38)}{COLOR(5)}ENERGY TANK エネルギータンク\n{GAP(62)}{COLOR(0)}体力の最大値がＵＰした"); diff --git a/src/data/tilesets/tilesets_set0.c b/src/data/tilesets/tilesets_set0.c index ecbb69681..cd1437b51 100644 --- a/src/data/tilesets/tilesets_set0.c +++ b/src/data/tilesets/tilesets_set0.c @@ -2,19 +2,41 @@ #include "data/common_pals.h" #include "macros.h" -const u32 sTileset_42_Gfx[736] = INCBIN_U32("data/tilesets/42.gfx.lz"); -const u32 sTileset_78_Gfx[736] = INCBIN_U32("data/tilesets/78.gfx.lz"); -const u32 sTileset_27_Gfx[807] = INCBIN_U32("data/tilesets/27.gfx.lz"); +const u32 sTileset_42_Gfx[736] = { + #include "extracted/data/tilesets/42.gfx.lz.inc" +}; +const u32 sTileset_78_Gfx[736] = { + #include "extracted/data/tilesets/78.gfx.lz.inc" +}; +const u32 sTileset_27_Gfx[807] = { + #include "extracted/data/tilesets/27.gfx.lz.inc" +}; -const u32 sTileset_42_Bg_Gfx[591] = INCBIN_U32("data/tilesets/42_bg.gfx.lz"); -const u32 sTileset_27_Bg_Gfx[1487] = INCBIN_U32("data/tilesets/27_bg.gfx.lz"); +const u32 sTileset_42_Bg_Gfx[591] = { + #include "extracted/data/tilesets/42_bg.gfx.lz.inc" +}; +const u32 sTileset_27_Bg_Gfx[1487] = { + #include "extracted/data/tilesets/27_bg.gfx.lz.inc" +}; -const u16 sTileset_42_Pal[14 * 16] = INCBIN_U16("data/tilesets/42.pal"); +const u16 sTileset_42_Pal[14 * 16] = { + #include "extracted/data/tilesets/42.pal.inc" +}; -const u16 sAnimatedPal_7[4 * 16] = INCBIN_U16("data/tilesets/animated_palettes/7.pal"); -const u16 sAnimatedPal_16[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/16.pal"); -const u16 sAnimatedPal_0[4 * 16] = INCBIN_U16("data/tilesets/animated_palettes/0.pal"); +const u16 sAnimatedPal_7[4 * 16] = { + #include "extracted/data/tilesets/animated_palettes/7.pal.inc" +}; +const u16 sAnimatedPal_16[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/16.pal.inc" +}; +const u16 sAnimatedPal_0[4 * 16] = { + #include "extracted/data/tilesets/animated_palettes/0.pal.inc" +}; -const u16 sTileset_27_Pal[14 * 16] = INCBIN_U16("data/tilesets/27.pal"); +const u16 sTileset_27_Pal[14 * 16] = { + #include "extracted/data/tilesets/27.pal.inc" +}; -const u16 sAnimatedPal_5[4 * 16] = INCBIN_U16("data/tilesets/animated_palettes/5.pal"); +const u16 sAnimatedPal_5[4 * 16] = { + #include "extracted/data/tilesets/animated_palettes/5.pal.inc" +}; diff --git a/src/data/tilesets/tilesets_set1.c b/src/data/tilesets/tilesets_set1.c index 70d9bcf7e..23d124fc0 100644 --- a/src/data/tilesets/tilesets_set1.c +++ b/src/data/tilesets/tilesets_set1.c @@ -1,58 +1,156 @@ #include "data/tilesets/tilesets_set1.h" #include "macros.h" -const u8 sTileset_42_Tilemap[1796] = INCBIN_U8("data/tilesets/42.tm"); -const u8 sTileset_78_Tilemap[1796] = INCBIN_U8("data/tilesets/78.tm"); -const u8 sTileset_27_Tilemap[1796] = INCBIN_U8("data/tilesets/27.tm"); +const u8 sTileset_42_Tilemap[1796] = { + #include "extracted/data/tilesets/42.tm.inc" +}; +const u8 sTileset_78_Tilemap[1796] = { + #include "extracted/data/tilesets/78.tm.inc" +}; +const u8 sTileset_27_Tilemap[1796] = { + #include "extracted/data/tilesets/27.tm.inc" +}; -const u8 sMapRoom_Bg3[988] = INCBIN_U8("data/rooms/brinstar/map_room.rle"); -const u8 sChozodia_5_Bg3[988] = INCBIN_U8("data/rooms/chozodia/5_bg3.rle"); +const u8 sMapRoom_Bg3[988] = { + #include "extracted/data/rooms/brinstar/map_room.rle.inc" +}; +const u8 sChozodia_5_Bg3[988] = { + #include "extracted/data/rooms/chozodia/5_bg3.rle.inc" +}; -const u8 sWater_Bg0[548] = INCBIN_U8("data/rooms/water_bg0.rle"); -const u8 sSaveRoom_Bg3[1132] = INCBIN_U8("data/rooms/save_room_bg3.rle"); +const u8 sWater_Bg0[548] = { + #include "extracted/data/rooms/water_bg0.rle.inc" +}; +const u8 sSaveRoom_Bg3[1132] = { + #include "extracted/data/rooms/save_room_bg3.rle.inc" +}; -const u32 sTileset_8_Gfx[2752] = INCBIN_U32("data/tilesets/8.gfx.lz"); -const u32 sTileset_17_Gfx[] = INCBIN_U32("data/tilesets/17.gfx.lz"); -const u32 sTileset_34_Gfx[1569] = INCBIN_U32("data/tilesets/34.gfx.lz"); -const u32 sTileset_37_Gfx[2026] = INCBIN_U32("data/tilesets/37.gfx.lz"); -const u32 sTileset_53_Gfx[1742] = INCBIN_U32("data/tilesets/53.gfx.lz"); -const u32 sTileset_72_Gfx[1519] = INCBIN_U32("data/tilesets/72.gfx.lz"); -const u32 sTileset_33_Gfx[1221] = INCBIN_U32("data/tilesets/33.gfx.lz"); -const u32 sTileset_4_Gfx[1393] = INCBIN_U32("data/tilesets/4.gfx.lz"); -const u32 sTileset_65_Gfx[1846] = INCBIN_U32("data/tilesets/65.gfx.lz"); -const u32 sTileset_18_Gfx[882] = INCBIN_U32("data/tilesets/18.gfx.lz"); -const u32 sTileset_20_Gfx[973] = INCBIN_U32("data/tilesets/20.gfx.lz"); +const u32 sTileset_8_Gfx[2752] = { + #include "extracted/data/tilesets/8.gfx.lz.inc" +}; +const u32 sTileset_17_Gfx[] = { + #include "extracted/data/tilesets/17.gfx.lz.inc" +}; +const u32 sTileset_34_Gfx[1569] = { + #include "extracted/data/tilesets/34.gfx.lz.inc" +}; +const u32 sTileset_37_Gfx[2026] = { + #include "extracted/data/tilesets/37.gfx.lz.inc" +}; +const u32 sTileset_53_Gfx[1742] = { + #include "extracted/data/tilesets/53.gfx.lz.inc" +}; +const u32 sTileset_72_Gfx[1519] = { + #include "extracted/data/tilesets/72.gfx.lz.inc" +}; +const u32 sTileset_33_Gfx[1221] = { + #include "extracted/data/tilesets/33.gfx.lz.inc" +}; +const u32 sTileset_4_Gfx[1393] = { + #include "extracted/data/tilesets/4.gfx.lz.inc" +}; +const u32 sTileset_65_Gfx[1846] = { + #include "extracted/data/tilesets/65.gfx.lz.inc" +}; +const u32 sTileset_18_Gfx[882] = { + #include "extracted/data/tilesets/18.gfx.lz.inc" +}; +const u32 sTileset_20_Gfx[973] = { + #include "extracted/data/tilesets/20.gfx.lz.inc" +}; -const u32 sTileset_8_Bg_Gfx[1284] = INCBIN_U32("data/tilesets/8_bg.gfx.lz"); -const u32 sTileset_17_Bg_Gfx[1629] = INCBIN_U32("data/tilesets/17_bg.gfx.lz"); -const u32 sTileset_34_Bg_Gfx[1195] = INCBIN_U32("data/tilesets/34_bg.gfx.lz"); -const u32 sTileset_37_Bg_Gfx[1720] = INCBIN_U32("data/tilesets/37_bg.gfx.lz"); -const u32 sTileset_72_Bg_Gfx[1495] = INCBIN_U32("data/tilesets/72_bg.gfx.lz"); -const u32 sTileset_53_Bg_Gfx[1761] = INCBIN_U32("data/tilesets/53_bg.gfx.lz"); -const u32 sTileset_33_Bg_Gfx[1334] = INCBIN_U32("data/tilesets/33_bg.gfx.lz"); -const u32 sTileset_65_Bg_Gfx[2256] = INCBIN_U32("data/tilesets/65_bg.gfx.lz"); -const u32 sTileset_12_Bg_Gfx[1967] = INCBIN_U32("data/tilesets/12_bg.gfx.lz"); +const u32 sTileset_8_Bg_Gfx[1284] = { + #include "extracted/data/tilesets/8_bg.gfx.lz.inc" +}; +const u32 sTileset_17_Bg_Gfx[1629] = { + #include "extracted/data/tilesets/17_bg.gfx.lz.inc" +}; +const u32 sTileset_34_Bg_Gfx[1195] = { + #include "extracted/data/tilesets/34_bg.gfx.lz.inc" +}; +const u32 sTileset_37_Bg_Gfx[1720] = { + #include "extracted/data/tilesets/37_bg.gfx.lz.inc" +}; +const u32 sTileset_72_Bg_Gfx[1495] = { + #include "extracted/data/tilesets/72_bg.gfx.lz.inc" +}; +const u32 sTileset_53_Bg_Gfx[1761] = { + #include "extracted/data/tilesets/53_bg.gfx.lz.inc" +}; +const u32 sTileset_33_Bg_Gfx[1334] = { + #include "extracted/data/tilesets/33_bg.gfx.lz.inc" +}; +const u32 sTileset_65_Bg_Gfx[2256] = { + #include "extracted/data/tilesets/65_bg.gfx.lz.inc" +}; +const u32 sTileset_12_Bg_Gfx[1967] = { + #include "extracted/data/tilesets/12_bg.gfx.lz.inc" +}; -const u16 sTileset_8_Pal[14 * 16] = INCBIN_U16("data/tilesets/8.pal"); -const u16 sTileset_17_Pal[14 * 16] = INCBIN_U16("data/tilesets/17.pal"); -const u16 sTileset_34_Pal[14 * 16] = INCBIN_U16("data/tilesets/34.pal"); -const u16 sTileset_37_Pal[14 * 16] = INCBIN_U16("data/tilesets/37.pal"); -const u16 sTileset_53_Pal[14 * 16] = INCBIN_U16("data/tilesets/53.pal"); -const u16 sTileset_72_Pal[14 * 16] = INCBIN_U16("data/tilesets/72.pal"); -const u16 sTileset_33_Pal[14 * 16] = INCBIN_U16("data/tilesets/33.pal"); -const u16 sTileset_4_Pal[14 * 16] = INCBIN_U16("data/tilesets/4.pal"); -const u16 sTileset_65_Pal[14 * 16] = INCBIN_U16("data/tilesets/65.pal"); -const u16 sTileset_18_Pal[14 * 16] = INCBIN_U16("data/tilesets/18.pal"); -const u16 sTileset_20_Pal[14 * 16] = INCBIN_U16("data/tilesets/20.pal"); +const u16 sTileset_8_Pal[14 * 16] = { + #include "extracted/data/tilesets/8.pal.inc" +}; +const u16 sTileset_17_Pal[14 * 16] = { + #include "extracted/data/tilesets/17.pal.inc" +}; +const u16 sTileset_34_Pal[14 * 16] = { + #include "extracted/data/tilesets/34.pal.inc" +}; +const u16 sTileset_37_Pal[14 * 16] = { + #include "extracted/data/tilesets/37.pal.inc" +}; +const u16 sTileset_53_Pal[14 * 16] = { + #include "extracted/data/tilesets/53.pal.inc" +}; +const u16 sTileset_72_Pal[14 * 16] = { + #include "extracted/data/tilesets/72.pal.inc" +}; +const u16 sTileset_33_Pal[14 * 16] = { + #include "extracted/data/tilesets/33.pal.inc" +}; +const u16 sTileset_4_Pal[14 * 16] = { + #include "extracted/data/tilesets/4.pal.inc" +}; +const u16 sTileset_65_Pal[14 * 16] = { + #include "extracted/data/tilesets/65.pal.inc" +}; +const u16 sTileset_18_Pal[14 * 16] = { + #include "extracted/data/tilesets/18.pal.inc" +}; +const u16 sTileset_20_Pal[14 * 16] = { + #include "extracted/data/tilesets/20.pal.inc" +}; -const u8 sTileset_8_Tilemap[4228] = INCBIN_U8("data/tilesets/8.tm"); -const u8 sTileset_17_Tilemap[] = INCBIN_U8("data/tilesets/17.tm"); -const u8 sTileset_34_Tilemap[4228] = INCBIN_U8("data/tilesets/34.tm"); -const u8 sTileset_37_Tilemap[4228] = INCBIN_U8("data/tilesets/37.tm"); -const u8 sTileset_53_Tilemap[4228] = INCBIN_U8("data/tilesets/53.tm"); -const u8 sTileset_72_Tilemap[2308] = INCBIN_U8("data/tilesets/72.tm"); -const u8 sTileset_33_Tilemap[2308] = INCBIN_U8("data/tilesets/33.tm"); -const u8 sTileset_4_Tilemap[2436] = INCBIN_U8("data/tilesets/4.tm"); -const u8 sTileset_65_Tilemap[2820] = INCBIN_U8("data/tilesets/65.tm"); -const u8 sTileset_18_Tilemap[2436] = INCBIN_U8("data/tilesets/18.tm"); -const u8 sTileset_20_Tilemap[2436] = INCBIN_U8("data/tilesets/20.tm"); +const u8 sTileset_8_Tilemap[4228] = { + #include "extracted/data/tilesets/8.tm.inc" +}; +const u8 sTileset_17_Tilemap[] = { + #include "extracted/data/tilesets/17.tm.inc" +}; +const u8 sTileset_34_Tilemap[4228] = { + #include "extracted/data/tilesets/34.tm.inc" +}; +const u8 sTileset_37_Tilemap[4228] = { + #include "extracted/data/tilesets/37.tm.inc" +}; +const u8 sTileset_53_Tilemap[4228] = { + #include "extracted/data/tilesets/53.tm.inc" +}; +const u8 sTileset_72_Tilemap[2308] = { + #include "extracted/data/tilesets/72.tm.inc" +}; +const u8 sTileset_33_Tilemap[2308] = { + #include "extracted/data/tilesets/33.tm.inc" +}; +const u8 sTileset_4_Tilemap[2436] = { + #include "extracted/data/tilesets/4.tm.inc" +}; +const u8 sTileset_65_Tilemap[2820] = { + #include "extracted/data/tilesets/65.tm.inc" +}; +const u8 sTileset_18_Tilemap[2436] = { + #include "extracted/data/tilesets/18.tm.inc" +}; +const u8 sTileset_20_Tilemap[2436] = { + #include "extracted/data/tilesets/20.tm.inc" +}; diff --git a/src/data/tilesets/tilesets_set2.c b/src/data/tilesets/tilesets_set2.c index a48b909cc..15c68494f 100644 --- a/src/data/tilesets/tilesets_set2.c +++ b/src/data/tilesets/tilesets_set2.c @@ -1,28 +1,72 @@ #include "data/tilesets/tilesets_set2.h" #include "macros.h" -const u32 sTileset_9_Gfx[2905] = INCBIN_U32("data/tilesets/9.gfx.lz"); -const u32 sTileset_22_Gfx[2185] = INCBIN_U32("data/tilesets/22.gfx.lz"); -const u32 sTileset_29_Gfx[1822] = INCBIN_U32("data/tilesets/29.gfx.lz"); -const u32 sTileset_39_Gfx[1494] = INCBIN_U32("data/tilesets/39.gfx.lz"); -const u32 sTileset_5_Gfx[1472] = INCBIN_U32("data/tilesets/5.gfx.lz"); +const u32 sTileset_9_Gfx[2905] = { + #include "extracted/data/tilesets/9.gfx.lz.inc" +}; +const u32 sTileset_22_Gfx[2185] = { + #include "extracted/data/tilesets/22.gfx.lz.inc" +}; +const u32 sTileset_29_Gfx[1822] = { + #include "extracted/data/tilesets/29.gfx.lz.inc" +}; +const u32 sTileset_39_Gfx[1494] = { + #include "extracted/data/tilesets/39.gfx.lz.inc" +}; +const u32 sTileset_5_Gfx[1472] = { + #include "extracted/data/tilesets/5.gfx.lz.inc" +}; -const u32 sTileset_9_Bg_Gfx[1456] = INCBIN_U32("data/tilesets/9_bg.gfx.lz"); -const u32 sTileset_22_Bg_Gfx[1618] = INCBIN_U32("data/tilesets/22_bg.gfx.lz"); -const u32 sTileset_29_Bg_Gfx[1713] = INCBIN_U32("data/tilesets/29_bg.gfx.lz"); -const u32 sTileset_39_Bg_Gfx[1762] = INCBIN_U32("data/tilesets/39_bg.gfx.lz"); +const u32 sTileset_9_Bg_Gfx[1456] = { + #include "extracted/data/tilesets/9_bg.gfx.lz.inc" +}; +const u32 sTileset_22_Bg_Gfx[1618] = { + #include "extracted/data/tilesets/22_bg.gfx.lz.inc" +}; +const u32 sTileset_29_Bg_Gfx[1713] = { + #include "extracted/data/tilesets/29_bg.gfx.lz.inc" +}; +const u32 sTileset_39_Bg_Gfx[1762] = { + #include "extracted/data/tilesets/39_bg.gfx.lz.inc" +}; -const u16 sTileset_9_Pal[14 * 16] = INCBIN_U16("data/tilesets/9.pal"); -const u16 sAnimatedPal_2[12 * 16] = INCBIN_U16("data/tilesets/animated_palettes/2.pal"); -const u16 sTileset_22_Pal[14 * 16] = INCBIN_U16("data/tilesets/22.pal"); -const u16 sTileset_29_Pal[14 * 16] = INCBIN_U16("data/tilesets/29.pal"); -const u16 sAnimatedPal_3[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/3.pal"); -const u16 sTileset_51_Pal[14 * 16] = INCBIN_U16("data/tilesets/51.pal"); -const u16 sTileset_39_Pal[14 * 16] = INCBIN_U16("data/tilesets/39.pal"); -const u16 sTileset_5_Pal[14 * 16] = INCBIN_U16("data/tilesets/5.pal"); +const u16 sTileset_9_Pal[14 * 16] = { + #include "extracted/data/tilesets/9.pal.inc" +}; +const u16 sAnimatedPal_2[12 * 16] = { + #include "extracted/data/tilesets/animated_palettes/2.pal.inc" +}; +const u16 sTileset_22_Pal[14 * 16] = { + #include "extracted/data/tilesets/22.pal.inc" +}; +const u16 sTileset_29_Pal[14 * 16] = { + #include "extracted/data/tilesets/29.pal.inc" +}; +const u16 sAnimatedPal_3[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/3.pal.inc" +}; +const u16 sTileset_51_Pal[14 * 16] = { + #include "extracted/data/tilesets/51.pal.inc" +}; +const u16 sTileset_39_Pal[14 * 16] = { + #include "extracted/data/tilesets/39.pal.inc" +}; +const u16 sTileset_5_Pal[14 * 16] = { + #include "extracted/data/tilesets/5.pal.inc" +}; -const u8 sTileset_9_Tilemap[2692] = INCBIN_U8("data/tilesets/9.tm"); -const u8 sTileset_22_Tilemap[3076] = INCBIN_U8("data/tilesets/22.tm"); -const u8 sTileset_29_Tilemap[2564] = INCBIN_U8("data/tilesets/29.tm"); -const u8 sTileset_39_Tilemap[3460] = INCBIN_U8("data/tilesets/39.tm"); -const u8 sTileset_5_Tilemap[2564] = INCBIN_U8("data/tilesets/5.tm"); +const u8 sTileset_9_Tilemap[2692] = { + #include "extracted/data/tilesets/9.tm.inc" +}; +const u8 sTileset_22_Tilemap[3076] = { + #include "extracted/data/tilesets/22.tm.inc" +}; +const u8 sTileset_29_Tilemap[2564] = { + #include "extracted/data/tilesets/29.tm.inc" +}; +const u8 sTileset_39_Tilemap[3460] = { + #include "extracted/data/tilesets/39.tm.inc" +}; +const u8 sTileset_5_Tilemap[2564] = { + #include "extracted/data/tilesets/5.tm.inc" +}; diff --git a/src/data/tilesets/tilesets_set3.c b/src/data/tilesets/tilesets_set3.c index 47bbab455..383de2c57 100644 --- a/src/data/tilesets/tilesets_set3.c +++ b/src/data/tilesets/tilesets_set3.c @@ -1,47 +1,129 @@ #include "data/tilesets/tilesets_set3.h" #include "macros.h" -const u32 sTileset_7_Gfx[2010] = INCBIN_U32("data/tilesets/7.gfx.lz"); -const u32 sTileset_1_Gfx[2734] = INCBIN_U32("data/tilesets/1.gfx.lz"); -const u32 sTileset_30_Gfx[4132] = INCBIN_U32("data/tilesets/30.gfx.lz"); -const u32 sTileset_6_Gfx[3252] = INCBIN_U32("data/tilesets/6.gfx.lz"); -const u32 sTileset_68_Gfx[1607] = INCBIN_U32("data/tilesets/68.gfx.lz"); -const u32 sTileset_15_Gfx[2005] = INCBIN_U32("data/tilesets/15.gfx.lz"); -const u32 sTileset_12_Gfx[1445] = INCBIN_U32("data/tilesets/12.gfx.lz"); -const u32 sTileset_13_Gfx[2310] = INCBIN_U32("data/tilesets/13.gfx.lz"); -const u32 sTileset_14_Gfx[1890] = INCBIN_U32("data/tilesets/14.gfx.lz"); -const u32 sTileset_16_Gfx[2168] = INCBIN_U32("data/tilesets/16.gfx.lz"); -const u32 sTileset_19_Gfx[1640] = INCBIN_U32("data/tilesets/19.gfx.lz"); +const u32 sTileset_7_Gfx[2010] = { + #include "extracted/data/tilesets/7.gfx.lz.inc" +}; +const u32 sTileset_1_Gfx[2734] = { + #include "extracted/data/tilesets/1.gfx.lz.inc" +}; +const u32 sTileset_30_Gfx[4132] = { + #include "extracted/data/tilesets/30.gfx.lz.inc" +}; +const u32 sTileset_6_Gfx[3252] = { + #include "extracted/data/tilesets/6.gfx.lz.inc" +}; +const u32 sTileset_68_Gfx[1607] = { + #include "extracted/data/tilesets/68.gfx.lz.inc" +}; +const u32 sTileset_15_Gfx[2005] = { + #include "extracted/data/tilesets/15.gfx.lz.inc" +}; +const u32 sTileset_12_Gfx[1445] = { + #include "extracted/data/tilesets/12.gfx.lz.inc" +}; +const u32 sTileset_13_Gfx[2310] = { + #include "extracted/data/tilesets/13.gfx.lz.inc" +}; +const u32 sTileset_14_Gfx[1890] = { + #include "extracted/data/tilesets/14.gfx.lz.inc" +}; +const u32 sTileset_16_Gfx[2168] = { + #include "extracted/data/tilesets/16.gfx.lz.inc" +}; +const u32 sTileset_19_Gfx[1640] = { + #include "extracted/data/tilesets/19.gfx.lz.inc" +}; -const u32 sTileset_7_Bg_Gfx[1761] = INCBIN_U32("data/tilesets/7_bg.gfx.lz"); -const u32 sTileset_1_Bg_Gfx[2190] = INCBIN_U32("data/tilesets/1_bg.gfx.lz"); -const u32 sTileset_30_Bg_Gfx[2190] = INCBIN_U32("data/tilesets/30_bg.gfx.lz"); -const u32 sTileset_15_Bg_Gfx[1196] = INCBIN_U32("data/tilesets/15_bg.gfx.lz"); -const u32 sTileset_14_Bg_Gfx[1296] = INCBIN_U32("data/tilesets/14_bg.gfx.lz"); -const u32 sTileset_16_Bg_Gfx[1850] = INCBIN_U32("data/tilesets/16_bg.gfx.lz"); -const u32 sTileset_19_Bg_Gfx[1665] = INCBIN_U32("data/tilesets/19_bg.gfx.lz"); -const u32 sTileset_13_Bg_Gfx[1706] = INCBIN_U32("data/tilesets/13_bg.gfx.lz"); +const u32 sTileset_7_Bg_Gfx[1761] = { + #include "extracted/data/tilesets/7_bg.gfx.lz.inc" +}; +const u32 sTileset_1_Bg_Gfx[2190] = { + #include "extracted/data/tilesets/1_bg.gfx.lz.inc" +}; +const u32 sTileset_30_Bg_Gfx[2190] = { + #include "extracted/data/tilesets/30_bg.gfx.lz.inc" +}; +const u32 sTileset_15_Bg_Gfx[1196] = { + #include "extracted/data/tilesets/15_bg.gfx.lz.inc" +}; +const u32 sTileset_14_Bg_Gfx[1296] = { + #include "extracted/data/tilesets/14_bg.gfx.lz.inc" +}; +const u32 sTileset_16_Bg_Gfx[1850] = { + #include "extracted/data/tilesets/16_bg.gfx.lz.inc" +}; +const u32 sTileset_19_Bg_Gfx[1665] = { + #include "extracted/data/tilesets/19_bg.gfx.lz.inc" +}; +const u32 sTileset_13_Bg_Gfx[1706] = { + #include "extracted/data/tilesets/13_bg.gfx.lz.inc" +}; -const u16 sTileset_7_Pal[14 * 16] = INCBIN_U16("data/tilesets/7.pal"); -const u16 sTileset_1_Pal[14 * 16] = INCBIN_U16("data/tilesets/1.pal"); -const u16 sTileset_30_Pal[14 * 16] = INCBIN_U16("data/tilesets/30.pal"); -const u16 sTileset_6_Pal[14 * 16] = INCBIN_U16("data/tilesets/6.pal"); -const u16 sTileset_68_Pal[14 * 16] = INCBIN_U16("data/tilesets/68.pal"); -const u16 sTileset_15_Pal[14 * 16] = INCBIN_U16("data/tilesets/15.pal"); -const u16 sTileset_12_Pal[14 * 16] = INCBIN_U16("data/tilesets/12.pal"); -const u16 sTileset_13_Pal[14 * 16] = INCBIN_U16("data/tilesets/13.pal"); -const u16 sTileset_14_Pal[14 * 16] = INCBIN_U16("data/tilesets/14.pal"); -const u16 sTileset_16_Pal[14 * 16] = INCBIN_U16("data/tilesets/16.pal"); -const u16 sTileset_19_Pal[14 * 16] = INCBIN_U16("data/tilesets/19.pal"); +const u16 sTileset_7_Pal[14 * 16] = { + #include "extracted/data/tilesets/7.pal.inc" +}; +const u16 sTileset_1_Pal[14 * 16] = { + #include "extracted/data/tilesets/1.pal.inc" +}; +const u16 sTileset_30_Pal[14 * 16] = { + #include "extracted/data/tilesets/30.pal.inc" +}; +const u16 sTileset_6_Pal[14 * 16] = { + #include "extracted/data/tilesets/6.pal.inc" +}; +const u16 sTileset_68_Pal[14 * 16] = { + #include "extracted/data/tilesets/68.pal.inc" +}; +const u16 sTileset_15_Pal[14 * 16] = { + #include "extracted/data/tilesets/15.pal.inc" +}; +const u16 sTileset_12_Pal[14 * 16] = { + #include "extracted/data/tilesets/12.pal.inc" +}; +const u16 sTileset_13_Pal[14 * 16] = { + #include "extracted/data/tilesets/13.pal.inc" +}; +const u16 sTileset_14_Pal[14 * 16] = { + #include "extracted/data/tilesets/14.pal.inc" +}; +const u16 sTileset_16_Pal[14 * 16] = { + #include "extracted/data/tilesets/16.pal.inc" +}; +const u16 sTileset_19_Pal[14 * 16] = { + #include "extracted/data/tilesets/19.pal.inc" +}; -const u8 sTileset_7_Tilemap[3460] = INCBIN_U8("data/tilesets/7.tm"); -const u8 sTileset_1_Tilemap[3460] = INCBIN_U8("data/tilesets/1.tm"); -const u8 sTileset_30_Tilemap[6148] = INCBIN_U8("data/tilesets/30.tm"); -const u8 sTileset_6_Tilemap[4740] = INCBIN_U8("data/tilesets/6.tm"); -const u8 sTileset_68_Tilemap[3588] = INCBIN_U8("data/tilesets/68.tm"); -const u8 sTileset_15_Tilemap[3460] = INCBIN_U8("data/tilesets/15.tm"); -const u8 sTileset_12_Tilemap[2948] = INCBIN_U8("data/tilesets/12.tm"); -const u8 sTileset_13_Tilemap[4228] = INCBIN_U8("data/tilesets/13.tm"); -const u8 sTileset_14_Tilemap[3460] = INCBIN_U8("data/tilesets/14.tm"); -const u8 sTileset_16_Tilemap[5380] = INCBIN_U8("data/tilesets/16.tm"); -const u8 sTileset_19_Tilemap[3332] = INCBIN_U8("data/tilesets/19.tm"); +const u8 sTileset_7_Tilemap[3460] = { + #include "extracted/data/tilesets/7.tm.inc" +}; +const u8 sTileset_1_Tilemap[3460] = { + #include "extracted/data/tilesets/1.tm.inc" +}; +const u8 sTileset_30_Tilemap[6148] = { + #include "extracted/data/tilesets/30.tm.inc" +}; +const u8 sTileset_6_Tilemap[4740] = { + #include "extracted/data/tilesets/6.tm.inc" +}; +const u8 sTileset_68_Tilemap[3588] = { + #include "extracted/data/tilesets/68.tm.inc" +}; +const u8 sTileset_15_Tilemap[3460] = { + #include "extracted/data/tilesets/15.tm.inc" +}; +const u8 sTileset_12_Tilemap[2948] = { + #include "extracted/data/tilesets/12.tm.inc" +}; +const u8 sTileset_13_Tilemap[4228] = { + #include "extracted/data/tilesets/13.tm.inc" +}; +const u8 sTileset_14_Tilemap[3460] = { + #include "extracted/data/tilesets/14.tm.inc" +}; +const u8 sTileset_16_Tilemap[5380] = { + #include "extracted/data/tilesets/16.tm.inc" +}; +const u8 sTileset_19_Tilemap[3332] = { + #include "extracted/data/tilesets/19.tm.inc" +}; diff --git a/src/data/tilesets/tilesets_set4.c b/src/data/tilesets/tilesets_set4.c index 48dd4d721..ed66869fb 100644 --- a/src/data/tilesets/tilesets_set4.c +++ b/src/data/tilesets/tilesets_set4.c @@ -1,28 +1,72 @@ #include "data/tilesets/tilesets_set4.h" #include "macros.h" -const u32 sTileset_23_Gfx[2582] = INCBIN_U32("data/tilesets/23.gfx.lz"); -const u32 sTileset_24_Gfx[1770] = INCBIN_U32("data/tilesets/24.gfx.lz"); -const u32 sTileset_25_Gfx[1744] = INCBIN_U32("data/tilesets/25.gfx.lz"); -const u32 sTileset_76_Gfx[649] = INCBIN_U32("data/tilesets/76.gfx.lz"); -const u32 sTileset_61_Gfx[3200] = INCBIN_U32("data/tilesets/61.gfx.lz"); -const u32 sTileset_64_Gfx[2953] = INCBIN_U32("data/tilesets/64.gfx.lz"); +const u32 sTileset_23_Gfx[2582] = { + #include "extracted/data/tilesets/23.gfx.lz.inc" +}; +const u32 sTileset_24_Gfx[1770] = { + #include "extracted/data/tilesets/24.gfx.lz.inc" +}; +const u32 sTileset_25_Gfx[1744] = { + #include "extracted/data/tilesets/25.gfx.lz.inc" +}; +const u32 sTileset_76_Gfx[649] = { + #include "extracted/data/tilesets/76.gfx.lz.inc" +}; +const u32 sTileset_61_Gfx[3200] = { + #include "extracted/data/tilesets/61.gfx.lz.inc" +}; +const u32 sTileset_64_Gfx[2953] = { + #include "extracted/data/tilesets/64.gfx.lz.inc" +}; -const u32 sTileset_23_Bg_Gfx[1882] = INCBIN_U32("data/tilesets/23_bg.gfx.lz"); -const u32 sTileset_24_Bg_Gfx[1656] = INCBIN_U32("data/tilesets/24_bg.gfx.lz"); -const u32 sTileset_25_Bg_Gfx[1893] = INCBIN_U32("data/tilesets/25_bg.gfx.lz"); -const u32 sTileset_76_Bg_Gfx[1638] = INCBIN_U32("data/tilesets/76_bg.gfx.lz"); +const u32 sTileset_23_Bg_Gfx[1882] = { + #include "extracted/data/tilesets/23_bg.gfx.lz.inc" +}; +const u32 sTileset_24_Bg_Gfx[1656] = { + #include "extracted/data/tilesets/24_bg.gfx.lz.inc" +}; +const u32 sTileset_25_Bg_Gfx[1893] = { + #include "extracted/data/tilesets/25_bg.gfx.lz.inc" +}; +const u32 sTileset_76_Bg_Gfx[1638] = { + #include "extracted/data/tilesets/76_bg.gfx.lz.inc" +}; -const u8 sTileset_23_Tilemap[3972] = INCBIN_U8("data/tilesets/23.tm"); -const u8 sTileset_24_Tilemap[3844] = INCBIN_U8("data/tilesets/24.tm"); -const u8 sTileset_25_Tilemap[3332] = INCBIN_U8("data/tilesets/25.tm"); -const u8 sTileset_76_Tilemap[1668] = INCBIN_U8("data/tilesets/76.tm"); -const u8 sTileset_61_Tilemap[4740] = INCBIN_U8("data/tilesets/61.tm"); -const u8 sTileset_64_Tilemap[4612] = INCBIN_U8("data/tilesets/64.tm"); +const u8 sTileset_23_Tilemap[3972] = { + #include "extracted/data/tilesets/23.tm.inc" +}; +const u8 sTileset_24_Tilemap[3844] = { + #include "extracted/data/tilesets/24.tm.inc" +}; +const u8 sTileset_25_Tilemap[3332] = { + #include "extracted/data/tilesets/25.tm.inc" +}; +const u8 sTileset_76_Tilemap[1668] = { + #include "extracted/data/tilesets/76.tm.inc" +}; +const u8 sTileset_61_Tilemap[4740] = { + #include "extracted/data/tilesets/61.tm.inc" +}; +const u8 sTileset_64_Tilemap[4612] = { + #include "extracted/data/tilesets/64.tm.inc" +}; -const u16 sTileset_23_Pal[14 * 16] = INCBIN_U16("data/tilesets/23.pal"); -const u16 sTileset_24_Pal[14 * 16] = INCBIN_U16("data/tilesets/24.pal"); -const u16 sTileset_25_Pal[14 * 16] = INCBIN_U16("data/tilesets/25.pal"); -const u16 sTileset_76_Pal[14 * 16] = INCBIN_U16("data/tilesets/76.pal"); -const u16 sTileset_61_Pal[14 * 16] = INCBIN_U16("data/tilesets/61.pal"); -const u16 sTileset_64_Pal[14 * 16] = INCBIN_U16("data/tilesets/64.pal"); +const u16 sTileset_23_Pal[14 * 16] = { + #include "extracted/data/tilesets/23.pal.inc" +}; +const u16 sTileset_24_Pal[14 * 16] = { + #include "extracted/data/tilesets/24.pal.inc" +}; +const u16 sTileset_25_Pal[14 * 16] = { + #include "extracted/data/tilesets/25.pal.inc" +}; +const u16 sTileset_76_Pal[14 * 16] = { + #include "extracted/data/tilesets/76.pal.inc" +}; +const u16 sTileset_61_Pal[14 * 16] = { + #include "extracted/data/tilesets/61.pal.inc" +}; +const u16 sTileset_64_Pal[14 * 16] = { + #include "extracted/data/tilesets/64.pal.inc" +}; diff --git a/src/data/tilesets/tilesets_set5.c b/src/data/tilesets/tilesets_set5.c index 6d36bb46c..cd41afff8 100644 --- a/src/data/tilesets/tilesets_set5.c +++ b/src/data/tilesets/tilesets_set5.c @@ -1,23 +1,57 @@ #include "data/tilesets/tilesets_set5.h" #include "macros.h" -const u32 sTileset_26_Gfx[2843] = INCBIN_U32("data/tilesets/26.gfx.lz"); -const u32 sTileset_69_Gfx[3143] = INCBIN_U32("data/tilesets/69.gfx.lz"); -const u32 sTileset_40_Gfx[1558] = INCBIN_U32("data/tilesets/40.gfx.lz"); -const u32 sTileset_35_Gfx[3095] = INCBIN_U32("data/tilesets/35.gfx.lz"); +const u32 sTileset_26_Gfx[2843] = { + #include "extracted/data/tilesets/26.gfx.lz.inc" +}; +const u32 sTileset_69_Gfx[3143] = { + #include "extracted/data/tilesets/69.gfx.lz.inc" +}; +const u32 sTileset_40_Gfx[1558] = { + #include "extracted/data/tilesets/40.gfx.lz.inc" +}; +const u32 sTileset_35_Gfx[3095] = { + #include "extracted/data/tilesets/35.gfx.lz.inc" +}; -const u32 sTileset_69_Bg_Gfx[2287] = INCBIN_U32("data/tilesets/69_bg.gfx.lz"); -const u32 sTileset_26_Bg_Gfx[2281] = INCBIN_U32("data/tilesets/26_bg.gfx.lz"); -const u32 sTileset_35_Bg_Gfx[920] = INCBIN_U32("data/tilesets/35_bg.gfx.lz"); -const u32 sTileset_40_Bg_Gfx[709] = INCBIN_U32("data/tilesets/40_bg.gfx.lz"); +const u32 sTileset_69_Bg_Gfx[2287] = { + #include "extracted/data/tilesets/69_bg.gfx.lz.inc" +}; +const u32 sTileset_26_Bg_Gfx[2281] = { + #include "extracted/data/tilesets/26_bg.gfx.lz.inc" +}; +const u32 sTileset_35_Bg_Gfx[920] = { + #include "extracted/data/tilesets/35_bg.gfx.lz.inc" +}; +const u32 sTileset_40_Bg_Gfx[709] = { + #include "extracted/data/tilesets/40_bg.gfx.lz.inc" +}; -const u8 sTileset_26_Tilemap[4868] = INCBIN_U8("data/tilesets/26.tm"); -const u8 sTileset_69_Tilemap[3332] = INCBIN_U8("data/tilesets/69.tm"); -const u8 sTileset_40_Tilemap[3972] = INCBIN_U8("data/tilesets/40.tm"); -const u8 sTileset_35_Tilemap[4484] = INCBIN_U8("data/tilesets/35.tm"); +const u8 sTileset_26_Tilemap[4868] = { + #include "extracted/data/tilesets/26.tm.inc" +}; +const u8 sTileset_69_Tilemap[3332] = { + #include "extracted/data/tilesets/69.tm.inc" +}; +const u8 sTileset_40_Tilemap[3972] = { + #include "extracted/data/tilesets/40.tm.inc" +}; +const u8 sTileset_35_Tilemap[4484] = { + #include "extracted/data/tilesets/35.tm.inc" +}; -const u16 sTileset_26_Pal[14 * 16] = INCBIN_U16("data/tilesets/26.pal"); -const u16 sTileset_69_Pal[14 * 16] = INCBIN_U16("data/tilesets/69.pal"); -const u16 sTileset_40_Pal[14 * 16] = INCBIN_U16("data/tilesets/40.pal"); -const u16 sAnimatedPal_13[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/13.pal"); -const u16 sTileset_35_Pal[14 * 16] = INCBIN_U16("data/tilesets/35.pal"); +const u16 sTileset_26_Pal[14 * 16] = { + #include "extracted/data/tilesets/26.pal.inc" +}; +const u16 sTileset_69_Pal[14 * 16] = { + #include "extracted/data/tilesets/69.pal.inc" +}; +const u16 sTileset_40_Pal[14 * 16] = { + #include "extracted/data/tilesets/40.pal.inc" +}; +const u16 sAnimatedPal_13[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/13.pal.inc" +}; +const u16 sTileset_35_Pal[14 * 16] = { + #include "extracted/data/tilesets/35.pal.inc" +}; diff --git a/src/data/tilesets/tilesets_set6.c b/src/data/tilesets/tilesets_set6.c index b13d42e4d..aa93bb396 100644 --- a/src/data/tilesets/tilesets_set6.c +++ b/src/data/tilesets/tilesets_set6.c @@ -1,32 +1,84 @@ #include "data/tilesets/tilesets_set6.h" #include "macros.h" -const u32 sTileset_11_Gfx[1632] = INCBIN_U32("data/tilesets/11.gfx.lz"); -const u32 sTileset_2_Gfx[2523] = INCBIN_U32("data/tilesets/2.gfx.lz"); -const u32 sTileset_36_Gfx[2847] = INCBIN_U32("data/tilesets/36.gfx.lz"); -const u32 sTileset_3_Gfx[2536] = INCBIN_U32("data/tilesets/3.gfx.lz"); -const u32 sTileset_55_Gfx[3667] = INCBIN_U32("data/tilesets/55.gfx.lz"); -const u32 sTileset_54_Gfx[1973] = INCBIN_U32("data/tilesets/54.gfx.lz"); +const u32 sTileset_11_Gfx[1632] = { + #include "extracted/data/tilesets/11.gfx.lz.inc" +}; +const u32 sTileset_2_Gfx[2523] = { + #include "extracted/data/tilesets/2.gfx.lz.inc" +}; +const u32 sTileset_36_Gfx[2847] = { + #include "extracted/data/tilesets/36.gfx.lz.inc" +}; +const u32 sTileset_3_Gfx[2536] = { + #include "extracted/data/tilesets/3.gfx.lz.inc" +}; +const u32 sTileset_55_Gfx[3667] = { + #include "extracted/data/tilesets/55.gfx.lz.inc" +}; +const u32 sTileset_54_Gfx[1973] = { + #include "extracted/data/tilesets/54.gfx.lz.inc" +}; -const u32 sTileset_11_Bg_Gfx[808] = INCBIN_U32("data/tilesets/11_bg.gfx.lz"); -const u32 sTileset_2_Bg_Gfx[1459] = INCBIN_U32("data/tilesets/2_bg.gfx.lz"); -const u32 sTileset_32_Bg_Gfx[1309] = INCBIN_U32("data/tilesets/32_bg.gfx.lz"); -const u32 sTileset_55_Bg_Gfx[1239] = INCBIN_U32("data/tilesets/55_bg.gfx.lz"); -const u32 sTileset_54_Bg_Gfx[1266] = INCBIN_U32("data/tilesets/54_bg.gfx.lz"); +const u32 sTileset_11_Bg_Gfx[808] = { + #include "extracted/data/tilesets/11_bg.gfx.lz.inc" +}; +const u32 sTileset_2_Bg_Gfx[1459] = { + #include "extracted/data/tilesets/2_bg.gfx.lz.inc" +}; +const u32 sTileset_32_Bg_Gfx[1309] = { + #include "extracted/data/tilesets/32_bg.gfx.lz.inc" +}; +const u32 sTileset_55_Bg_Gfx[1239] = { + #include "extracted/data/tilesets/55_bg.gfx.lz.inc" +}; +const u32 sTileset_54_Bg_Gfx[1266] = { + #include "extracted/data/tilesets/54_bg.gfx.lz.inc" +}; -const u16 sTileset_11_Pal[14 * 16] = INCBIN_U16("data/tilesets/11.pal"); -const u16 sTileset_21_Pal[14 * 16] = INCBIN_U16("data/tilesets/21.pal"); -const u16 sTileset_31_Pal[14 * 16] = INCBIN_U16("data/tilesets/31.pal"); -const u16 sTileset_2_Pal[14 * 16] = INCBIN_U16("data/tilesets/2.pal"); -const u16 sTileset_36_Pal[14 * 16] = INCBIN_U16("data/tilesets/36.pal"); -const u16 sTileset_73_Pal[14 * 16] = INCBIN_U16("data/tilesets/73.pal"); -const u16 sTileset_3_Pal[14 * 16] = INCBIN_U16("data/tilesets/3.pal"); -const u16 sTileset_55_Pal[14 * 16] = INCBIN_U16("data/tilesets/55.pal"); -const u16 sTileset_54_Pal[14 * 16] = INCBIN_U16("data/tilesets/54.pal"); +const u16 sTileset_11_Pal[14 * 16] = { + #include "extracted/data/tilesets/11.pal.inc" +}; +const u16 sTileset_21_Pal[14 * 16] = { + #include "extracted/data/tilesets/21.pal.inc" +}; +const u16 sTileset_31_Pal[14 * 16] = { + #include "extracted/data/tilesets/31.pal.inc" +}; +const u16 sTileset_2_Pal[14 * 16] = { + #include "extracted/data/tilesets/2.pal.inc" +}; +const u16 sTileset_36_Pal[14 * 16] = { + #include "extracted/data/tilesets/36.pal.inc" +}; +const u16 sTileset_73_Pal[14 * 16] = { + #include "extracted/data/tilesets/73.pal.inc" +}; +const u16 sTileset_3_Pal[14 * 16] = { + #include "extracted/data/tilesets/3.pal.inc" +}; +const u16 sTileset_55_Pal[14 * 16] = { + #include "extracted/data/tilesets/55.pal.inc" +}; +const u16 sTileset_54_Pal[14 * 16] = { + #include "extracted/data/tilesets/54.pal.inc" +}; -const u8 sTileset_11_Tilemap[4228] = INCBIN_U8("data/tilesets/11.tm"); -const u8 sTileset_2_Tilemap[3460] = INCBIN_U8("data/tilesets/2.tm"); -const u8 sTileset_36_Tilemap[3588] = INCBIN_U8("data/tilesets/36.tm"); -const u8 sTileset_3_Tilemap[3460] = INCBIN_U8("data/tilesets/3.tm"); -const u8 sTileset_55_Tilemap[4228] = INCBIN_U8("data/tilesets/55.tm"); -const u8 sTileset_54_Tilemap[3332] = INCBIN_U8("data/tilesets/54.tm"); +const u8 sTileset_11_Tilemap[4228] = { + #include "extracted/data/tilesets/11.tm.inc" +}; +const u8 sTileset_2_Tilemap[3460] = { + #include "extracted/data/tilesets/2.tm.inc" +}; +const u8 sTileset_36_Tilemap[3588] = { + #include "extracted/data/tilesets/36.tm.inc" +}; +const u8 sTileset_3_Tilemap[3460] = { + #include "extracted/data/tilesets/3.tm.inc" +}; +const u8 sTileset_55_Tilemap[4228] = { + #include "extracted/data/tilesets/55.tm.inc" +}; +const u8 sTileset_54_Tilemap[3332] = { + #include "extracted/data/tilesets/54.tm.inc" +}; diff --git a/src/data/tilesets/tilesets_set7.c b/src/data/tilesets/tilesets_set7.c index 86623aac4..2f440f87d 100644 --- a/src/data/tilesets/tilesets_set7.c +++ b/src/data/tilesets/tilesets_set7.c @@ -1,82 +1,234 @@ #include "data/tilesets/tilesets_set7.h" #include "macros.h" -const u32 sTileset_10_Gfx[3663] = INCBIN_U32("data/tilesets/10.gfx.lz"); -const u32 sTileset_52_Gfx[3073] = INCBIN_U32("data/tilesets/52.gfx.lz"); -const u32 sTileset_74_Gfx[] = INCBIN_U32("data/tilesets/74.gfx.lz"); -const u32 sTileset_66_Gfx[1010] = INCBIN_U32("data/tilesets/66.gfx.lz"); -const u32 sTileset_77_Gfx[633] = INCBIN_U32("data/tilesets/77.gfx.lz"); -const u32 sTileset_44_Gfx[2791] = INCBIN_U32("data/tilesets/44.gfx.lz"); -const u32 sTileset_46_Gfx[2110] = INCBIN_U32("data/tilesets/46.gfx.lz"); -const u32 sTileset_75_Gfx[1058] = INCBIN_U32("data/tilesets/75.gfx.lz"); -const u32 sTileset_38_Gfx[3119] = INCBIN_U32("data/tilesets/38.gfx.lz"); -const u32 sTileset_48_Gfx[2581] = INCBIN_U32("data/tilesets/48.gfx.lz"); -const u32 sTileset_56_Gfx[4380] = INCBIN_U32("data/tilesets/56.gfx.lz"); -const u32 sTileset_47_Gfx[1737] = INCBIN_U32("data/tilesets/47.gfx.lz"); -const u32 sTileset_49_Gfx[2469] = INCBIN_U32("data/tilesets/49.gfx.lz"); -const u32 sTileset_50_Gfx[2359] = INCBIN_U32("data/tilesets/50.gfx.lz"); -const u32 sTileset_28_Gfx[541] = INCBIN_U32("data/tilesets/28.gfx.lz"); +const u32 sTileset_10_Gfx[3663] = { + #include "extracted/data/tilesets/10.gfx.lz.inc" +}; +const u32 sTileset_52_Gfx[3073] = { + #include "extracted/data/tilesets/52.gfx.lz.inc" +}; +const u32 sTileset_74_Gfx[] = { + #include "extracted/data/tilesets/74.gfx.lz.inc" +}; +const u32 sTileset_66_Gfx[1010] = { + #include "extracted/data/tilesets/66.gfx.lz.inc" +}; +const u32 sTileset_77_Gfx[633] = { + #include "extracted/data/tilesets/77.gfx.lz.inc" +}; +const u32 sTileset_44_Gfx[2791] = { + #include "extracted/data/tilesets/44.gfx.lz.inc" +}; +const u32 sTileset_46_Gfx[2110] = { + #include "extracted/data/tilesets/46.gfx.lz.inc" +}; +const u32 sTileset_75_Gfx[1058] = { + #include "extracted/data/tilesets/75.gfx.lz.inc" +}; +const u32 sTileset_38_Gfx[3119] = { + #include "extracted/data/tilesets/38.gfx.lz.inc" +}; +const u32 sTileset_48_Gfx[2581] = { + #include "extracted/data/tilesets/48.gfx.lz.inc" +}; +const u32 sTileset_56_Gfx[4380] = { + #include "extracted/data/tilesets/56.gfx.lz.inc" +}; +const u32 sTileset_47_Gfx[1737] = { + #include "extracted/data/tilesets/47.gfx.lz.inc" +}; +const u32 sTileset_49_Gfx[2469] = { + #include "extracted/data/tilesets/49.gfx.lz.inc" +}; +const u32 sTileset_50_Gfx[2359] = { + #include "extracted/data/tilesets/50.gfx.lz.inc" +}; +const u32 sTileset_28_Gfx[541] = { + #include "extracted/data/tilesets/28.gfx.lz.inc" +}; -const u32 sTileset_74_Bg_Gfx[2133] = INCBIN_U32("data/tilesets/74_bg.gfx.lz"); -const u32 sTileset_66_Bg_Gfx[1836] = INCBIN_U32("data/tilesets/66_bg.gfx.lz"); -const u32 sTileset_52_Bg_Gfx[3168] = INCBIN_U32("data/tilesets/52_bg.gfx.lz"); -const u32 sTileset_77_Bg_Gfx[1788] = INCBIN_U32("data/tilesets/77_bg.gfx.lz"); -const u32 sTileset_44_Bg_Gfx[405] = INCBIN_U32("data/tilesets/44_bg.gfx.lz"); -const u32 sTileset_46_Bg_Gfx[950] = INCBIN_U32("data/tilesets/46_bg.gfx.lz"); -const u32 sTileset_75_Bg_Gfx[1222] = INCBIN_U32("data/tilesets/75_bg.gfx.lz"); -const u32 sTileset_38_Bg_Gfx[2100] = INCBIN_U32("data/tilesets/38_bg.gfx.lz"); -const u32 sTileset_56_Bg_Gfx[726] = INCBIN_U32("data/tilesets/56_bg.gfx.lz"); -const u32 sTileset_47_Bg_Gfx[808] = INCBIN_U32("data/tilesets/47_bg.gfx.lz"); -const u32 sTileset_62_Bg_Gfx[1727] = INCBIN_U32("data/tilesets/62_bg.gfx.lz"); -const u32 sTileset_63_Bg_Gfx[20] = INCBIN_U32("data/tilesets/63_bg.gfx.lz"); +const u32 sTileset_74_Bg_Gfx[2133] = { + #include "extracted/data/tilesets/74_bg.gfx.lz.inc" +}; +const u32 sTileset_66_Bg_Gfx[1836] = { + #include "extracted/data/tilesets/66_bg.gfx.lz.inc" +}; +const u32 sTileset_52_Bg_Gfx[3168] = { + #include "extracted/data/tilesets/52_bg.gfx.lz.inc" +}; +const u32 sTileset_77_Bg_Gfx[1788] = { + #include "extracted/data/tilesets/77_bg.gfx.lz.inc" +}; +const u32 sTileset_44_Bg_Gfx[405] = { + #include "extracted/data/tilesets/44_bg.gfx.lz.inc" +}; +const u32 sTileset_46_Bg_Gfx[950] = { + #include "extracted/data/tilesets/46_bg.gfx.lz.inc" +}; +const u32 sTileset_75_Bg_Gfx[1222] = { + #include "extracted/data/tilesets/75_bg.gfx.lz.inc" +}; +const u32 sTileset_38_Bg_Gfx[2100] = { + #include "extracted/data/tilesets/38_bg.gfx.lz.inc" +}; +const u32 sTileset_56_Bg_Gfx[726] = { + #include "extracted/data/tilesets/56_bg.gfx.lz.inc" +}; +const u32 sTileset_47_Bg_Gfx[808] = { + #include "extracted/data/tilesets/47_bg.gfx.lz.inc" +}; +const u32 sTileset_62_Bg_Gfx[1727] = { + #include "extracted/data/tilesets/62_bg.gfx.lz.inc" +}; +const u32 sTileset_63_Bg_Gfx[20] = { + #include "extracted/data/tilesets/63_bg.gfx.lz.inc" +}; -const u8 sTileset_10_Tilemap[6020] = INCBIN_U8("data/tilesets/10.tm"); -const u8 sTileset_52_Tilemap[6020] = INCBIN_U8("data/tilesets/52.tm"); -const u8 sTileset_74_Tilemap[6020] = INCBIN_U8("data/tilesets/74.tm"); -const u8 sTileset_66_Tilemap[2436] = INCBIN_U8("data/tilesets/66.tm"); -const u8 sTileset_77_Tilemap[2180] = INCBIN_U8("data/tilesets/77.tm"); -const u8 sTileset_44_Tilemap[5764] = INCBIN_U8("data/tilesets/44.tm"); -const u8 sTileset_46_Tilemap[3460] = INCBIN_U8("data/tilesets/46.tm"); -const u8 sTileset_75_Tilemap[2436] = INCBIN_U8("data/tilesets/75.tm"); -const u8 sTileset_38_Tilemap[5764] = INCBIN_U8("data/tilesets/38.tm"); -const u8 sTileset_48_Tilemap[5764] = INCBIN_U8("data/tilesets/48.tm"); -const u8 sTileset_56_Tilemap[4868] = INCBIN_U8("data/tilesets/56.tm"); -const u8 sTileset_47_Tilemap[3460] = INCBIN_U8("data/tilesets/47.tm"); -const u8 sTileset_49_Tilemap[5764] = INCBIN_U8("data/tilesets/49.tm"); -const u8 sTileset_50_Tilemap[7684] = INCBIN_U8("data/tilesets/50.tm"); -const u8 sTileset_28_Tilemap[4484] = INCBIN_U8("data/tilesets/28.tm"); +const u8 sTileset_10_Tilemap[6020] = { + #include "extracted/data/tilesets/10.tm.inc" +}; +const u8 sTileset_52_Tilemap[6020] = { + #include "extracted/data/tilesets/52.tm.inc" +}; +const u8 sTileset_74_Tilemap[6020] = { + #include "extracted/data/tilesets/74.tm.inc" +}; +const u8 sTileset_66_Tilemap[2436] = { + #include "extracted/data/tilesets/66.tm.inc" +}; +const u8 sTileset_77_Tilemap[2180] = { + #include "extracted/data/tilesets/77.tm.inc" +}; +const u8 sTileset_44_Tilemap[5764] = { + #include "extracted/data/tilesets/44.tm.inc" +}; +const u8 sTileset_46_Tilemap[3460] = { + #include "extracted/data/tilesets/46.tm.inc" +}; +const u8 sTileset_75_Tilemap[2436] = { + #include "extracted/data/tilesets/75.tm.inc" +}; +const u8 sTileset_38_Tilemap[5764] = { + #include "extracted/data/tilesets/38.tm.inc" +}; +const u8 sTileset_48_Tilemap[5764] = { + #include "extracted/data/tilesets/48.tm.inc" +}; +const u8 sTileset_56_Tilemap[4868] = { + #include "extracted/data/tilesets/56.tm.inc" +}; +const u8 sTileset_47_Tilemap[3460] = { + #include "extracted/data/tilesets/47.tm.inc" +}; +const u8 sTileset_49_Tilemap[5764] = { + #include "extracted/data/tilesets/49.tm.inc" +}; +const u8 sTileset_50_Tilemap[7684] = { + #include "extracted/data/tilesets/50.tm.inc" +}; +const u8 sTileset_28_Tilemap[4484] = { + #include "extracted/data/tilesets/28.tm.inc" +}; -const u16 sTileset_10_Pal[14 * 16] = INCBIN_U16("data/tilesets/10.pal"); -const u16 sTileset_52_Pal[14 * 16] = INCBIN_U16("data/tilesets/52.pal"); -const u16 sTileset_57_Pal[14 * 16] = INCBIN_U16("data/tilesets/57.pal"); -const u16 sTileset_58_Pal[14 * 16] = INCBIN_U16("data/tilesets/58.pal"); -const u16 sTileset_59_Pal[14 * 16] = INCBIN_U16("data/tilesets/59.pal"); -const u16 sTileset_60_Pal[14 * 16] = INCBIN_U16("data/tilesets/60.pal"); -const u16 sTileset_74_Pal[14 * 16] = INCBIN_U16("data/tilesets/74.pal"); -const u16 sAnimatedPal_9[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/9.pal"); -const u16 sAnimatedPal_8[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/8.pal"); -const u16 sTileset_66_Pal[14 * 16] = INCBIN_U16("data/tilesets/66.pal"); -const u16 sAnimatedPal_6[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/6.pal"); -const u16 sTileset_77_Pal[14 * 16] = INCBIN_U16("data/tilesets/77.pal"); -const u16 sAnimatedPal_17[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/17.pal"); -const u16 sTileset_44_Pal[14 * 16] = INCBIN_U16("data/tilesets/44.pal"); -const u16 sTileset_45_Pal[14 * 16] = INCBIN_U16("data/tilesets/45.pal"); -const u16 sAnimatedPal_10[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/10.pal"); -const u16 sTileset_46_Pal[14 * 16] = INCBIN_U16("data/tilesets/46.pal"); -const u16 sAnimatedPal_11[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/11.pal"); -const u16 sTileset_75_Pal[14 * 16] = INCBIN_U16("data/tilesets/75.pal"); -const u16 sAnimatedPal_12[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/12.pal"); -const u16 sTileset_38_Pal[14 * 16] = INCBIN_U16("data/tilesets/38.pal"); -const u16 sTileset_48_Pal[14 * 16] = INCBIN_U16("data/tilesets/48.pal"); -const u16 sTileset_56_Pal[14 * 16] = INCBIN_U16("data/tilesets/56.pal"); -const u16 sTileset_47_Pal[14 * 16] = INCBIN_U16("data/tilesets/47.pal"); -const u16 sTileset_62_Pal[14 * 16] = INCBIN_U16("data/tilesets/62.pal"); -const u16 sAnimatedPal_4[8 * 16] = INCBIN_U16("data/tilesets/animated_palettes/4.pal"); -const u16 sTileset_49_Pal[14 * 16] = INCBIN_U16("data/tilesets/49.pal"); -const u16 sTileset_70_Pal[14 * 16] = INCBIN_U16("data/tilesets/70.pal"); -const u16 sAnimatedPal_14[4 * 16] = INCBIN_U16("data/tilesets/animated_palettes/14.pal"); -const u16 sTileset_50_Pal[14 * 16] = INCBIN_U16("data/tilesets/50.pal"); -const u16 sTileset_71_Pal[14 * 16] = INCBIN_U16("data/tilesets/71.pal"); -const u16 sAnimatedPal_15[4 * 16] = INCBIN_U16("data/tilesets/animated_palettes/15.pal"); -const u16 sTileset_28_Pal[14 * 16] = INCBIN_U16("data/tilesets/28.pal"); -const u16 sTileset_43_Pal[14 * 16] = INCBIN_U16("data/tilesets/43.pal"); +const u16 sTileset_10_Pal[14 * 16] = { + #include "extracted/data/tilesets/10.pal.inc" +}; +const u16 sTileset_52_Pal[14 * 16] = { + #include "extracted/data/tilesets/52.pal.inc" +}; +const u16 sTileset_57_Pal[14 * 16] = { + #include "extracted/data/tilesets/57.pal.inc" +}; +const u16 sTileset_58_Pal[14 * 16] = { + #include "extracted/data/tilesets/58.pal.inc" +}; +const u16 sTileset_59_Pal[14 * 16] = { + #include "extracted/data/tilesets/59.pal.inc" +}; +const u16 sTileset_60_Pal[14 * 16] = { + #include "extracted/data/tilesets/60.pal.inc" +}; +const u16 sTileset_74_Pal[14 * 16] = { + #include "extracted/data/tilesets/74.pal.inc" +}; +const u16 sAnimatedPal_9[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/9.pal.inc" +}; +const u16 sAnimatedPal_8[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/8.pal.inc" +}; +const u16 sTileset_66_Pal[14 * 16] = { + #include "extracted/data/tilesets/66.pal.inc" +}; +const u16 sAnimatedPal_6[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/6.pal.inc" +}; +const u16 sTileset_77_Pal[14 * 16] = { + #include "extracted/data/tilesets/77.pal.inc" +}; +const u16 sAnimatedPal_17[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/17.pal.inc" +}; +const u16 sTileset_44_Pal[14 * 16] = { + #include "extracted/data/tilesets/44.pal.inc" +}; +const u16 sTileset_45_Pal[14 * 16] = { + #include "extracted/data/tilesets/45.pal.inc" +}; +const u16 sAnimatedPal_10[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/10.pal.inc" +}; +const u16 sTileset_46_Pal[14 * 16] = { + #include "extracted/data/tilesets/46.pal.inc" +}; +const u16 sAnimatedPal_11[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/11.pal.inc" +}; +const u16 sTileset_75_Pal[14 * 16] = { + #include "extracted/data/tilesets/75.pal.inc" +}; +const u16 sAnimatedPal_12[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/12.pal.inc" +}; +const u16 sTileset_38_Pal[14 * 16] = { + #include "extracted/data/tilesets/38.pal.inc" +}; +const u16 sTileset_48_Pal[14 * 16] = { + #include "extracted/data/tilesets/48.pal.inc" +}; +const u16 sTileset_56_Pal[14 * 16] = { + #include "extracted/data/tilesets/56.pal.inc" +}; +const u16 sTileset_47_Pal[14 * 16] = { + #include "extracted/data/tilesets/47.pal.inc" +}; +const u16 sTileset_62_Pal[14 * 16] = { + #include "extracted/data/tilesets/62.pal.inc" +}; +const u16 sAnimatedPal_4[8 * 16] = { + #include "extracted/data/tilesets/animated_palettes/4.pal.inc" +}; +const u16 sTileset_49_Pal[14 * 16] = { + #include "extracted/data/tilesets/49.pal.inc" +}; +const u16 sTileset_70_Pal[14 * 16] = { + #include "extracted/data/tilesets/70.pal.inc" +}; +const u16 sAnimatedPal_14[4 * 16] = { + #include "extracted/data/tilesets/animated_palettes/14.pal.inc" +}; +const u16 sTileset_50_Pal[14 * 16] = { + #include "extracted/data/tilesets/50.pal.inc" +}; +const u16 sTileset_71_Pal[14 * 16] = { + #include "extracted/data/tilesets/71.pal.inc" +}; +const u16 sAnimatedPal_15[4 * 16] = { + #include "extracted/data/tilesets/animated_palettes/15.pal.inc" +}; +const u16 sTileset_28_Pal[14 * 16] = { + #include "extracted/data/tilesets/28.pal.inc" +}; +const u16 sTileset_43_Pal[14 * 16] = { + #include "extracted/data/tilesets/43.pal.inc" +}; diff --git a/src/data/tourian_escape_data.c b/src/data/tourian_escape_data.c index bdd2e4655..f27542b4a 100644 --- a/src/data/tourian_escape_data.c +++ b/src/data/tourian_escape_data.c @@ -1,26 +1,64 @@ #include "data/tourian_escape_data.h" -const u16 sTourianEscapeExplodingPal[9 * 16] = INCBIN_U16("data/tourian_escape/exploding.pal"); -const u16 sMotherShipBlowingUpExplosionsPal[6 * 16] = INCBIN_U16("data/tourian_escape/blowing_up_explosions.pal"); - -const u16 sTourianEscapeSamusInHerShipPowerSuitPal[7 * 16] = INCBIN_U16("data/tourian_escape/samus_in_her_ship_power_suit.pal"); -const u16 sTourianEscapeSamusInHerShipVariaSuitPal[7 * 16] = INCBIN_U16("data/tourian_escape/samus_in_her_ship_varia_suit.pal"); -const u16 sTourianEscapeSamusInHerShipSuitlessPal[8 * 16] = INCBIN_U16("data/tourian_escape/samus_in_her_ship_suitless.pal"); - -const u16 sTourianEscapeSamusLookingAroundPal[7 * 16] = INCBIN_U16("data/tourian_escape/samus_looking_around.pal"); -const u16 sTourianEscapeSamusChasedBackgroundPal[5 * 16] = INCBIN_U16("data/tourian_escape/samus_chased_background.pal"); -const u16 sTourianEscapeSamusGettingShotPal[5 * 16] = INCBIN_U16("data/tourian_escape/samus_getting_shot.pal"); -const u16 sTourianEscapeSamusSurroundedPal[16 * 16] = INCBIN_U16("data/tourian_escape/samus_surrounded.pal"); -const u16 sTourianEscapeSamusChasedShipsPal[6 * 16] = INCBIN_U16("data/tourian_escape/samus_chased_ships.pal"); -const u16 sTourianEscapeSamusChasedByPiratesFiringPal[4 * 16] = INCBIN_U16("data/tourian_escape/samus_chased_by_pirates_firing.pal"); -const u16 sTourianEscapeSamusGoingToCrashPal[7 * 16] = INCBIN_U16("data/tourian_escape/samus_going_to_crash.pal"); -const u16 sTourianEscape_479ee0[1 * 16] = INCBIN_U16("data/tourian_escape/479ee0.pal"); -const u16 sTourianEscape_479f00[1 * 16] = INCBIN_U16("data/tourian_escape/479f00.pal"); -const u16 sTourianEscapeSamusCrashingForegroundPal[3 * 16] = INCBIN_U16("data/tourian_escape/samus_crashing_foreground.pal"); -const u16 sTourianEscape_479f80[7 * 16] = INCBIN_U16("data/tourian_escape/479f80.pal"); -const u16 sTourianEscapeShipCrashingBackgroundAndShipPal[16 * 16] = INCBIN_U16("data/tourian_escape/ship_crashing_background_and_ship.pal"); -const u16 sTourianEscapeSamusLookingAtSkyPal[10 * 16] = INCBIN_U16("data/tourian_escape/samus_looking_at_sky.pal"); -const u16 sTourianEscapeSamusLookingAtMotherShipPal[10 * 16] = INCBIN_U16("data/tourian_escape/samus_looking_at_mother_ship.pal"); +const u16 sTourianEscapeExplodingPal[9 * 16] = { + #include "extracted/data/tourian_escape/exploding.pal.inc" +}; +const u16 sMotherShipBlowingUpExplosionsPal[6 * 16] = { + #include "extracted/data/tourian_escape/blowing_up_explosions.pal.inc" +}; + +const u16 sTourianEscapeSamusInHerShipPowerSuitPal[7 * 16] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_power_suit.pal.inc" +}; +const u16 sTourianEscapeSamusInHerShipVariaSuitPal[7 * 16] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_varia_suit.pal.inc" +}; +const u16 sTourianEscapeSamusInHerShipSuitlessPal[8 * 16] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_suitless.pal.inc" +}; + +const u16 sTourianEscapeSamusLookingAroundPal[7 * 16] = { + #include "extracted/data/tourian_escape/samus_looking_around.pal.inc" +}; +const u16 sTourianEscapeSamusChasedBackgroundPal[5 * 16] = { + #include "extracted/data/tourian_escape/samus_chased_background.pal.inc" +}; +const u16 sTourianEscapeSamusGettingShotPal[5 * 16] = { + #include "extracted/data/tourian_escape/samus_getting_shot.pal.inc" +}; +const u16 sTourianEscapeSamusSurroundedPal[16 * 16] = { + #include "extracted/data/tourian_escape/samus_surrounded.pal.inc" +}; +const u16 sTourianEscapeSamusChasedShipsPal[6 * 16] = { + #include "extracted/data/tourian_escape/samus_chased_ships.pal.inc" +}; +const u16 sTourianEscapeSamusChasedByPiratesFiringPal[4 * 16] = { + #include "extracted/data/tourian_escape/samus_chased_by_pirates_firing.pal.inc" +}; +const u16 sTourianEscapeSamusGoingToCrashPal[7 * 16] = { + #include "extracted/data/tourian_escape/samus_going_to_crash.pal.inc" +}; +const u16 sTourianEscape_479ee0[1 * 16] = { + #include "extracted/data/tourian_escape/479ee0.pal.inc" +}; +const u16 sTourianEscape_479f00[1 * 16] = { + #include "extracted/data/tourian_escape/479f00.pal.inc" +}; +const u16 sTourianEscapeSamusCrashingForegroundPal[3 * 16] = { + #include "extracted/data/tourian_escape/samus_crashing_foreground.pal.inc" +}; +const u16 sTourianEscape_479f80[7 * 16] = { + #include "extracted/data/tourian_escape/479f80.pal.inc" +}; +const u16 sTourianEscapeShipCrashingBackgroundAndShipPal[16 * 16] = { + #include "extracted/data/tourian_escape/ship_crashing_background_and_ship.pal.inc" +}; +const u16 sTourianEscapeSamusLookingAtSkyPal[10 * 16] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky.pal.inc" +}; +const u16 sTourianEscapeSamusLookingAtMotherShipPal[10 * 16] = { + #include "extracted/data/tourian_escape/samus_looking_at_mother_ship.pal.inc" +}; const u16 sTourianEscape_47a4e0[OAM_DATA_SIZE(6)] = { 6, @@ -528,7 +566,9 @@ const u16 sTourianEscape_47abc8[OAM_DATA_SIZE(2)] = { OAM_ENTRY(-40, 16, OAM_DIMS_32x32, OAM_NO_FLIP, 0x10a, 9, 0) }; -const u32 sTourianEscapeRainGfx[14] = INCBIN_U32("data/tourian_escape/rain.gfx.lz"); +const u32 sTourianEscapeRainGfx[14] = { + #include "extracted/data/tourian_escape/rain.gfx.lz.inc" +}; const u16 sTourianEscape_47ac10[OAM_DATA_SIZE(1)] = { 1, @@ -541,7 +581,9 @@ const u16 sTourianEscape_47ac18[OAM_DATA_SIZE(2)] = { OAM_ENTRY(-4, -8, OAM_DIMS_8x8, OAM_NO_FLIP, 0x3, 0, 0) }; -const u16 sTourianEscapeRainPal[1 * 16] = INCBIN_U16("data/tourian_escape/rain.pal"); +const u16 sTourianEscapeRainPal[1 * 16] = { + #include "extracted/data/tourian_escape/rain.pal.inc" +}; @@ -2793,7 +2835,9 @@ const struct FrameData sChozodiaEscapeOam_MotherShipDecaying[9] = { [8] = FRAME_DATA_TERMINATOR }; -const u32 sTourianEscapeDebrisGfx[25] = INCBIN_U32("data/tourian_escape/debris.gfx.lz"); +const u32 sTourianEscapeDebrisGfx[25] = { + #include "extracted/data/tourian_escape/debris.gfx.lz.inc" +}; static const u16 sTourianEscape_47cde0[OAM_DATA_SIZE(1)] = { 1, @@ -3225,57 +3269,139 @@ const u16 sTourianEscape_47cffe[TOURIAN_ESCAPE_MAX_OBJECTS] = { }; -const u32 sMotherShipExplodingFlashGfx[2588] = INCBIN_U32("data/tourian_escape/mother_ship_exploding_flash.gfx.lz"); -const u32 sMotherShipExplodingFlashTileTable[561] = INCBIN_U32("data/tourian_escape/mother_ship_exploding_flash.tt"); -const u32 sMotherShipBlowingUpExplosionsGfx[1761] = INCBIN_U32("data/tourian_escape/mother_ship_blowing_up_explosions.gfx.lz"); +const u32 sMotherShipExplodingFlashGfx[2588] = { + #include "extracted/data/tourian_escape/mother_ship_exploding_flash.gfx.lz.inc" +}; +const u32 sMotherShipExplodingFlashTileTable[561] = { + #include "extracted/data/tourian_escape/mother_ship_exploding_flash.tt.inc" +}; +const u32 sMotherShipBlowingUpExplosionsGfx[1761] = { + #include "extracted/data/tourian_escape/mother_ship_blowing_up_explosions.gfx.lz.inc" +}; -const u32 sTourianEscapeSamusInHerShipSuitGfx[3108] = INCBIN_U32("data/tourian_escape/samus_in_her_ship_suit.gfx.lz"); -const u32 sTourianEscapeSamusInHerShipSuitTileTable[368] = INCBIN_U32("data/tourian_escape/samus_in_her_ship_suit.tt"); -const u32 sTourianEscapeSamusInHerShipSuitlessGfx[4280] = INCBIN_U32("data/tourian_escape/samus_in_her_ship_suitless.gfx.lz"); -const u32 sTourianEscapeSamusInHerShipSuitlessTileTable[368] = INCBIN_U32("data/tourian_escape/samus_in_her_ship_suitless.tt"); -const u32 sTourianEscapeSamusInHerShipSuitlessEyesOpenedTileTable[368] = INCBIN_U32("data/tourian_escape/samus_in_her_ship_suitless_eyes_opened.tt"); +const u32 sTourianEscapeSamusInHerShipSuitGfx[3108] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_suit.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusInHerShipSuitTileTable[368] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_suit.tt.inc" +}; +const u32 sTourianEscapeSamusInHerShipSuitlessGfx[4280] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_suitless.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusInHerShipSuitlessTileTable[368] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_suitless.tt.inc" +}; +const u32 sTourianEscapeSamusInHerShipSuitlessEyesOpenedTileTable[368] = { + #include "extracted/data/tourian_escape/samus_in_her_ship_suitless_eyes_opened.tt.inc" +}; -const u32 sTourianEscapeZebesGfx[3442] = INCBIN_U32("data/tourian_escape/zebes.gfx.lz"); -const u32 sTourianEscapeZebesTileTable[577] = INCBIN_U32("data/tourian_escape/zebes.tt"); +const u32 sTourianEscapeZebesGfx[3442] = { + #include "extracted/data/tourian_escape/zebes.gfx.lz.inc" +}; +const u32 sTourianEscapeZebesTileTable[577] = { + #include "extracted/data/tourian_escape/zebes.tt.inc" +}; -const u32 sTourianEscapeZebesExplodingShipAndExplosionsGfx[1297] = INCBIN_U32("data/tourian_escape/zebes_exploding_ship_and_explosions.gfx.lz"); +const u32 sTourianEscapeZebesExplodingShipAndExplosionsGfx[1297] = { + #include "extracted/data/tourian_escape/zebes_exploding_ship_and_explosions.gfx.lz.inc" +}; -const u32 sTourianEscapeSamusChasedBackgroundGfx[5470] = INCBIN_U32("data/tourian_escape/samus_chased_background.gfx.lz"); -const u32 sTourianEscapeSamusChasedBackgroundTileTable[577] = INCBIN_U32("data/tourian_escape/samus_chased_background.tt"); -const u32 sTourianEscapeSamusSurroundedBackgroundGfx[2337] = INCBIN_U32("data/tourian_escape/samus_surrounded_background.gfx.lz"); -const u32 sTourianEscapeSamusSurroundedBackgroundTileTable[551] = INCBIN_U32("data/tourian_escape/samus_surrounded_background.tt"); +const u32 sTourianEscapeSamusChasedBackgroundGfx[5470] = { + #include "extracted/data/tourian_escape/samus_chased_background.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusChasedBackgroundTileTable[577] = { + #include "extracted/data/tourian_escape/samus_chased_background.tt.inc" +}; +const u32 sTourianEscapeSamusSurroundedBackgroundGfx[2337] = { + #include "extracted/data/tourian_escape/samus_surrounded_background.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusSurroundedBackgroundTileTable[551] = { + #include "extracted/data/tourian_escape/samus_surrounded_background.tt.inc" +}; -const u32 sTourianEscapeSamusSamusInHerShipLookingGfx[4090] = INCBIN_U32("data/tourian_escape/samus_samus_in_her_ship_looking.gfx.lz"); -const u32 sTourianEscapeSamusSamusInHerShipLookingLeftTileTable[368] = INCBIN_U32("data/tourian_escape/samus_samus_in_her_ship_looking_left.tt"); -const u32 sTourianEscapeSamusSamusInHerShipLookingRightTileTable[368] = INCBIN_U32("data/tourian_escape/samus_samus_in_her_ship_looking_right.tt"); +const u32 sTourianEscapeSamusSamusInHerShipLookingGfx[4090] = { + #include "extracted/data/tourian_escape/samus_samus_in_her_ship_looking.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusSamusInHerShipLookingLeftTileTable[368] = { + #include "extracted/data/tourian_escape/samus_samus_in_her_ship_looking_left.tt.inc" +}; +const u32 sTourianEscapeSamusSamusInHerShipLookingRightTileTable[368] = { + #include "extracted/data/tourian_escape/samus_samus_in_her_ship_looking_right.tt.inc" +}; -const u32 sTourianEscape_49cb90[3064] = INCBIN_U32("data/tourian_escape/49cb90.gfx.lz"); -const u32 sTourianEscape_49fb70[113] = INCBIN_U32("data/tourian_escape/49fb70.tt"); +const u32 sTourianEscape_49cb90[3064] = { + #include "extracted/data/tourian_escape/49cb90.gfx.lz.inc" +}; +const u32 sTourianEscape_49fb70[113] = { + #include "extracted/data/tourian_escape/49fb70.tt.inc" +}; -const u32 sTourianEscapeSamusSamusChasedShipsGfx[2507] = INCBIN_U32("data/tourian_escape/samus_samus_chased_ships.gfx.lz"); -const u32 sTourianEscapeShipsAndProjectilesGfx[1461] = INCBIN_U32("data/tourian_escape/ships_and_projectiles.gfx.lz"); +const u32 sTourianEscapeSamusSamusChasedShipsGfx[2507] = { + #include "extracted/data/tourian_escape/samus_samus_chased_ships.gfx.lz.inc" +}; +const u32 sTourianEscapeShipsAndProjectilesGfx[1461] = { + #include "extracted/data/tourian_escape/ships_and_projectiles.gfx.lz.inc" +}; -const u32 sTourianEscapeSamusGettingShotShipGfx[563] = INCBIN_U32("data/tourian_escape/samus_getting_shot_ship.gfx.lz"); -const u32 sTourianEscapeSamusGettingShotGfx[2999] = INCBIN_U32("data/tourian_escape/samus_getting_shot.gfx.lz"); -const u32 sTourianEscapeSamusGettingShotTileTable[566] = INCBIN_U32("data/tourian_escape/samus_getting_shot.tt"); +const u32 sTourianEscapeSamusGettingShotShipGfx[563] = { + #include "extracted/data/tourian_escape/samus_getting_shot_ship.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusGettingShotGfx[2999] = { + #include "extracted/data/tourian_escape/samus_getting_shot.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusGettingShotTileTable[566] = { + #include "extracted/data/tourian_escape/samus_getting_shot.tt.inc" +}; -const u32 sTourianEscapeShipCrashingBackgroundAndShipGfx[3251] = INCBIN_U32("data/tourian_escape/ship_crashing_background_and_ship.gfx.lz"); -const u32 sTourianEscapeShipCrashingForegroundGfx[1914] = INCBIN_U32("data/tourian_escape/ship_crashing_foreground.gfx.lz"); -const u32 sTourianEscapeShipCrashingForegroundTileTable[577] = INCBIN_U32("data/tourian_escape/ship_crashing_foreground.tt"); -const u32 sTourianEscapeShipGoingToCrashGfx[1219] = INCBIN_U32("data/tourian_escape/ship_going_to_crash.gfx.lz"); +const u32 sTourianEscapeShipCrashingBackgroundAndShipGfx[3251] = { + #include "extracted/data/tourian_escape/ship_crashing_background_and_ship.gfx.lz.inc" +}; +const u32 sTourianEscapeShipCrashingForegroundGfx[1914] = { + #include "extracted/data/tourian_escape/ship_crashing_foreground.gfx.lz.inc" +}; +const u32 sTourianEscapeShipCrashingForegroundTileTable[577] = { + #include "extracted/data/tourian_escape/ship_crashing_foreground.tt.inc" +}; +const u32 sTourianEscapeShipGoingToCrashGfx[1219] = { + #include "extracted/data/tourian_escape/ship_going_to_crash.gfx.lz.inc" +}; -const u32 sTourianEscapeShipCrashingExplosionGfx[1826] = INCBIN_U32("data/tourian_escape/ship_crashing_explosion.gfx.lz"); -const u32 sTourianEscapeShipCrashingExplosionTileTable[577] = INCBIN_U32("data/tourian_escape/ship_crashing_explosion.tt"); +const u32 sTourianEscapeShipCrashingExplosionGfx[1826] = { + #include "extracted/data/tourian_escape/ship_crashing_explosion.gfx.lz.inc" +}; +const u32 sTourianEscapeShipCrashingExplosionTileTable[577] = { + #include "extracted/data/tourian_escape/ship_crashing_explosion.tt.inc" +}; -const u32 sTourianEscapeSamusLookingAtSkyPiratesShipGfx[867] = INCBIN_U32("data/tourian_escape/samus_looking_at_sky_pirates_ship.gfx.lz"); -const u32 sTourianEscapeSamusLookingAtSkySkyBackgroundGfx[3056] = INCBIN_U32("data/tourian_escape/samus_looking_at_sky_sky_background.gfx.lz"); -const u32 sTourianEscapeSamusLookingAtSkySkyBackgroundTileTable[399] = INCBIN_U32("data/tourian_escape/samus_looking_at_sky_sky_background.tt"); -const u32 sTourianEscapeSamusLookingAtSkyGfx[4060] = INCBIN_U32("data/tourian_escape/samus_looking_at_sky.gfx.lz"); -const u32 sTourianEscapeSamusLookingAtSkyTopTileTable[430] = INCBIN_U32("data/tourian_escape/samus_looking_at_sky_top.tt"); -const u32 sTourianEscapeSamusLookingAtSkyBottomTileTable[185] = INCBIN_U32("data/tourian_escape/samus_looking_at_sky_bottom.tt"); +const u32 sTourianEscapeSamusLookingAtSkyPiratesShipGfx[867] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky_pirates_ship.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusLookingAtSkySkyBackgroundGfx[3056] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky_sky_background.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusLookingAtSkySkyBackgroundTileTable[399] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky_sky_background.tt.inc" +}; +const u32 sTourianEscapeSamusLookingAtSkyGfx[4060] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusLookingAtSkyTopTileTable[430] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky_top.tt.inc" +}; +const u32 sTourianEscapeSamusLookingAtSkyBottomTileTable[185] = { + #include "extracted/data/tourian_escape/samus_looking_at_sky_bottom.tt.inc" +}; -const u32 sTourianEscapeSamusLookingAtMotherShipGfx[2153] = INCBIN_U32("data/tourian_escape/samus_looking_at_mother_ship.gfx.lz"); -const u32 sTourianEscapeSamusLookingAtMotherShipTileTable[577] = INCBIN_U32("data/tourian_escape/samus_looking_at_mother_ship.tt"); -const u32 sTourianEscapeSamusLookingAtMotherShipMotherShipGfx[3112] = INCBIN_U32("data/tourian_escape/samus_looking_at_mother_ship_mother_ship.gfx.lz"); -const u32 sTourianEscapeSamusLookingAtMotherShipMotherShipTileTable[577] = INCBIN_U32("data/tourian_escape/samus_looking_at_mother_ship_mother_ship.tt"); +const u32 sTourianEscapeSamusLookingAtMotherShipGfx[2153] = { + #include "extracted/data/tourian_escape/samus_looking_at_mother_ship.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusLookingAtMotherShipTileTable[577] = { + #include "extracted/data/tourian_escape/samus_looking_at_mother_ship.tt.inc" +}; +const u32 sTourianEscapeSamusLookingAtMotherShipMotherShipGfx[3112] = { + #include "extracted/data/tourian_escape/samus_looking_at_mother_ship_mother_ship.gfx.lz.inc" +}; +const u32 sTourianEscapeSamusLookingAtMotherShipMotherShipTileTable[577] = { + #include "extracted/data/tourian_escape/samus_looking_at_mother_ship_mother_ship.tt.inc" +}; diff --git a/src/data/visual_effects_data.c b/src/data/visual_effects_data.c index 1846b3bc8..be3d22226 100644 --- a/src/data/visual_effects_data.c +++ b/src/data/visual_effects_data.c @@ -2374,7 +2374,9 @@ const struct FrameData sParticleSpriteSplashAcidSmallOam[7] = { [6] = FRAME_DATA_TERMINATOR }; -const u8 sEscapeTimerDigitsGfx[1024 * 2] = INCBIN_U8("data/escape_timer_digits.gfx"); +const u8 sEscapeTimerDigitsGfx[1024 * 2] = { + #include "extracted/data/escape_timer_digits.gfx.inc" +}; const u16 sParticleEscapeOam_Frame0[OAM_DATA_SIZE(8)] = { 8, diff --git a/tools/extractor.py b/tools/extractor.py index a79ff8d58..1fa87d722 100644 --- a/tools/extractor.py +++ b/tools/extractor.py @@ -5,6 +5,7 @@ DATA_PATH = "data" +DATA_INC_PATH = "include/extracted" DATABASE_PATH = "database.json" DATABASE_DEBUG_PATH = "database_debug.json" REGIONS = ["us", "eu", "jp", "us_beta", "eu_beta"] @@ -27,6 +28,8 @@ def extract_data(region: str, debug: bool, quiet: bool = False) -> None: root_dir = entry.get("dir", DATA_PATH) path_obj = Path(root_dir, path) path_obj.parent.mkdir(parents=True, exist_ok=True) + path_inc_obj = Path(DATA_INC_PATH, str(path_obj)+".inc") + path_inc_obj.parent.mkdir(parents=True, exist_ok=True) addr = entry["addr"].get(region) if addr is not None: @@ -35,8 +38,15 @@ def extract_data(region: str, debug: bool, quiet: bool = False) -> None: count = count[region] size: int = int(count, 16) * entry["size"] rom.seek(int(addr, 16)) + entry_bytes = rom.read(size) with open(path_obj, "wb") as f: - f.write(rom.read(size)) + f.write(entry_bytes) + # all values in the .inc are unsigned + entry_values = [] + for i in range(0, size, entry["size"]): + entry_values.append(int.from_bytes(entry_bytes[i:i+entry["size"]], byteorder='little', signed=False)) + with open(path_inc_obj, "w") as f: + f.write(",".join([str(v)+"u" for v in entry_values])) rom.close() diff --git a/tools/preproc.py b/tools/preproc.py index a3a8f845d..1f4ba3e5d 100644 --- a/tools/preproc.py +++ b/tools/preproc.py @@ -138,52 +138,6 @@ def convert_string(self, text): return out -""" -"INCBIN_S8", "INCBIN_U8", "_INCBIN_S8", "_INCBIN_U8", -"INCBIN_S16", "INCBIN_U16", "_INCBIN_S16", "_INCBIN_U16", -"INCBIN_S32", "INCBIN_U32", "_INCBIN_S32", "_INCBIN_U32" - -INCBIN = curly brackets, _INCBIN = no curly brackets -U = unsigned (signed is never used, so not implemented) -8, 16 or 32 bits integer -""" -def convert_incbin(ic): - REGEX_INCBIN = re.compile(r'_?INCBIN_U(8|16|32)+\(\".+\"\)') - out = "" - while True: - m = REGEX_INCBIN.search(ic) - if m is None: - break - mstr = m[0] - is_brackets = mstr[0] != '_' - size = int(m[1]) // 8 - - incbinfile = mstr.removeprefix("_")[10+len(m[1]):-2] - - try: - with open(incbinfile, "rb") as f: - incbinfile_bytes = f.read() - except FileNotFoundError: - incbinfile_bytes = bytes() - filesize = len(incbinfile_bytes) - if filesize % size != 0: - raise Exception(f"Size {size} doesn't evenly divide file size {filesize}.") - - incbinfile_values = [] - for i in range(0, len(incbinfile_bytes), size): - value = 0 - for j in range(size): - value += incbinfile_bytes[i+j] << (j*8) - incbinfile_values.append(str(value) + "u") - incbin_converted = ",".join(incbinfile_values) - if is_brackets: - incbin_converted = "{" + incbin_converted + "}" - - out += ic[:m.start()] + incbin_converted - ic = ic[m.end():] - return out + ic - - """ "INCTEXT" @@ -249,7 +203,6 @@ def preproc(infile, charmapfile): charmapfile_content = f.read() charmap = CharMap(charmapfile_content) - infile_content = convert_incbin(infile_content) infile_content = convert_inctext(infile_content, charmap) infile_content = convert_shift_jis(infile_content)