Game-Decompilation/mzm
1
0
Fork 0
mirror of https://github.com/YohannDR/mzm.git synced 2024-10-07 02:23:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start extracting some samus data

Browse Source
This commit is contained in:
y.demaisonregne 2023-03-18 23:42:03 +01:00
parent 3585df664d
commit 142b7467e3
12 changed files with 2842 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
database.txt
View File

@ -971,12 +971,71 @@ rooms/debug/Debug4_Clipdata.rle;314;0x36763e;1
rooms/debug/Debug4_Bg2.rle;14;0x367778;1
rooms/debug/Debug4_Bg1.rle;330;0x367786;1
## Samus
# Palettes
samus/palettes/PowerSuit_Default.pal;48;0x2376a8;2
samus/palettes/PowerSuit_BeamRelease.pal;80;0x237708;2
samus/palettes/PowerSuit_Flashing.pal;32;0x2377a8;2
samus/palettes/PowerSuit_Speedboost.pal;48;0x2377e8;2
samus/palettes/PowerSuit_Unmorph.pal;32;0x237848;2
samus/palettes/PowerSuit_Dying.pal;16;0x237888;2
samus/palettes/Generic_Dying.pal;128;0x2378a8;2
samus/palettes/VariaSuit_Dying.pal;16;0x2379a8;2
samus/palettes/FullSuit_Dying.pal;16;0x2379c8;2
samus/palettes/GravitySuit_Dying.pal;16;0x2379e8;2
samus/palettes/PowerSuit_Saving.pal;48;0x237a08;2
samus/palettes/PowerSuit_ChargingBeam.pal;160;0x237a68;2
samus/palettes/PowerSuit_DownloadingMap.pal;32;0x237ba8;2
samus/palettes/VariaSuit_Default.pal;48;0x237be8;2
samus/palettes/VariaSuit_BeamRelease.pal;80;0x237c48;2
samus/palettes/VariaSuit_Flashing.pal;32;0x237ce8;2
samus/palettes/VariaSuit_Speedboost.pal;48;0x237d28;2
samus/palettes/VariaSuit_Unmorph.pal;32;0x237d88;2
samus/palettes/VariaSuit_Saving.pal;48;0x237dc8;2
samus/palettes/VariaSuit_ChargingBeam.pal;160;0x237e28;2
samus/palettes/VariaSuit_DownloadingMap.pal;32;0x237f68;2
samus/palettes/FullSuit_Default.pal;48;0x237fa8;2
samus/palettes/FullSuit_BeamRelease.pal;80;0x238008;2
samus/palettes/FullSuit_Flashing.pal;32;0x2380a8;2
samus/palettes/FullSuit_Speedboost.pal;48;0x2380e8;2
samus/palettes/FullSuit_Unmorph.pal;32;0x238148;2
samus/palettes/FullSuit_Saving.pal;48;0x238188;2
samus/palettes/FullSuit_ChargingBeam.pal;160;0x2381e8;2
samus/palettes/FullSuit_DownloadingMap.pal;32;0x238328;2
samus/palettes/FullSuit_Frozen.pal;48;0x238368;2
samus/palettes/GravitySuit_Default.pal;48;0x2383c8;2
samus/palettes/GravitySuit_BeamRelease.pal;80;0x238428;2
samus/palettes/GravitySuit_Flashing.pal;32;0x2384c8;2
samus/palettes/GravitySuit_Speedboost.pal;48;0x238508;2
samus/palettes/GravitySuit_Unmorph.pal;32;0x238568;2
samus/palettes/GravitySuit_Saving.pal;48;0x2385a8;2
samus/palettes/GravitySuit_ChargingBeam.pal;160;0x238608;2
samus/palettes/GravitySuit_DownloadingMap.pal;32;0x238748;2
samus/palettes/GravitySuit_Frozen.pal;48;0x238788;2
samus/palettes/Suitless_Default.pal;48;0x2387e8;2
samus/palettes/Suitless_BeamRelease.pal;80;0x238848;2
samus/palettes/Suitless_Flashing.pal;32;0x2388e8;2
samus/palettes/Suitless_Saving.pal;48;0x238928;2
samus/palettes/Suitless_ChargingBeam.pal;160;0x238988;2
samus/palettes/Suitless_DownloadingMap.pal;32;0x238ac8;2
samus/palettes/Suitless_Frozen.pal;48;0x238b08;2
# Blobs
Blob_8cad0_8cee2.bin;1042;0x8cad0;1
Blob_8ceec_8f253.bin;9064;0x8ceec;1
Blob_8f2c0_908df.bin;5664;0x8f2c0;1
Blob_908e0_2b0c93.bin;2229171;0x908e0;1
Blob_908e0_2320e4.bin;1710084;0x908e0;1
Blob_2320ec_2376a8.bin;21948;0x2320ec;1
Blob_238b68_2b0c93.bin;491819;0x238b68;1
Blob_2ceaa8_2cfd9f.bin;4856;0x2ceaa8;1
Blob_2d5ba0_2d7ae7.bin;7988;0x2d5ba0;1
Blob_34099c_345868.bin;20172;0x34099c;1

5
include/constants/samus.h
View File

@ -198,6 +198,11 @@
#define FORCED_MOVEMENT_JUMPING_AFTER_ROLLING 0x1
#define FORCED_MOVEMENT_MORPH_BALL_BOUNCE_BEFORE_JUMP 0x14
#define SAMUS_HITBOX_TYPE_STANDING 0
#define SAMUS_HITBOX_TYPE_CROUCHED 1
#define SAMUS_HITBOX_TYPE_MORPHED 2
#define SAMUS_HITBOX_TYPE_ZIPLINE 3
#define SCREW_SPEED_FLAG_NONE 0x0
#define SCREW_SPEED_FLAG_SHINESPARKING 0x1

40
include/data/samus/arm_cannon_data.h
View File

@ -12,17 +12,17 @@
// of the arm cannon facing forward left, when samus is on a zipline
// The Armed attribute can also be used, it indicates that the gfx have the arm cannon open
extern const u8 sArmCannonGfx_Upper_Forward_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalUp_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalDown_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Up_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Down_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Forward_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Up_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Down_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Forward_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalUp_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalDown_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Up_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Down_Left_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Forward_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Up_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Down_Left_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Forward_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Default[SAMUS_ARM_CANNON_GFX_SIZE];
@ -39,17 +39,17 @@ extern const u8 sArmCannonGfx_Lower_Up_Standing[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Down_Standing[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Forward_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Up_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Down_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Forward_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalUp_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalDown_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Up_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Down_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Forward_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Up_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Down_Left_Armed_OnZipline[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Forward_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalUp_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_DiagonalDown_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Up_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Lower_Down_Left_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_Forward_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];
extern const u8 sArmCannonGfx_Upper_DiagonalUp_Right_Armed_Default[SAMUS_ARM_CANNON_GFX_SIZE];

6
include/data/samus/samus_animation_pointers.h
View File

@ -97,7 +97,7 @@ extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_Landin
extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_AimingWhileHanging[5][2];
extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_ShootingWhileHanging[5][2];
extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_UncrouchingSuitless[4][2];
extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_CrouchingSuitless[4][2];
extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_CrouchingSuitless[3][2];
extern const struct SamusAnimationData* const sSamusAnimPointers_Suitless_CrawlingStopped[3][2];
extern const struct ArmCannonAnimationData* const sArmCannonAnimPointers_Suitless_All[MAX_AMOUNT_OF_SAMUS_POSES][2];
@ -172,8 +172,8 @@ extern const struct SamusEffectAnimationData* const sSamusEffectAnimPointers_Bal
extern const i16 sSamusDrawDistanceOffsets[4][4];
extern const i16 sSamusHitboxData[4][4];
extern const i16 sSamusHitboxData[4][3];
extern const struct FrameData* const sSamusEnvEffectsFrameDataPointers[18];
const u16 sSamusPullingSelfUpVelocity[8];
extern const u16 sSamusPullingSelfUpVelocity[4];
#endif /* SAMUS_ANIMATION_POINTERS_DATA_H */

64
include/data/samus/samus_graphics.h
View File

@ -943,22 +943,22 @@ extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Up_TurningArou
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_DiagonalUp_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_DiagonalDown_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_Down_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_Down_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_DiagonalUp_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_DiagonalDown_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Down_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Down_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_DiagonalUp_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_DiagonalDown_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_Up_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_DiagonalUp_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_DiagonalDown_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Left_Up_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_DiagonalUp_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_DiagonalDown_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Up_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_DiagonalUp_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_DiagonalDown_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_Right_Up_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_FacingTheForeground[5];
extern const struct SamusAnimationData sSamusAnim_PowerSuit_UsingAnElevator[4];
@ -2234,22 +2234,22 @@ extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_Up_TurningAroun
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_DiagonalUp_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_DiagonalDown_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_Down_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_Down_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_DiagonalUp_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_DiagonalDown_TurningAroundAndCrouching[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_Down_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_Down_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_DiagonalUp_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_DiagonalDown_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_Up_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_DiagonalUp_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_DiagonalDown_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Left_Up_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_DiagonalUp_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_DiagonalDown_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_Up_TurningArounMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_DiagonalUp_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_DiagonalDown_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_Right_Up_TurningAroundMidAir[3];
extern const struct SamusAnimationData sSamusAnim_FullSuit_FacingTheForeground[5];
extern const struct SamusAnimationData sSamusAnim_FullSuit_UsingAnElevator[4];
@ -3493,11 +3493,11 @@ extern const struct SamusAnimationData sSamusAnim_Suitless_Right_DiagonalDown_Ai
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_Up_AimingWhileHanging[5];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_Down_AimingWhileHanging[5];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_DiagonalUp_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_DiagonalDown_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_Up_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_Down_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_DiagonalUp_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_DiagonalDown_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_Up_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_Down_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_HangingOnLedge[5];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_PullingYourselfUpFromHanging[4];
@ -3511,14 +3511,14 @@ extern const struct SamusAnimationData sSamusAnim_Suitless_Left_DiagonalDown_Aim
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_Up_AimingWhileHanging[5];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_Down_AimingWhileHanging[5];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_DiagonalUp_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_DiagonalDown_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_Up_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_Down_ShootinghileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_DiagonalUp_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_DiagonalDown_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_Up_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_Down_ShootingWhileHanging[4];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_HanginOnLedgeSuitless[6];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_HanginOnLedgeSuitless[6];
extern const struct SamusAnimationData sSamusAnim_Suitless_Left_HangingOnLedgeSuitless[6];
extern const struct SamusAnimationData sSamusAnim_Suitless_Right_HangingOnLedgeSuitless[6];
extern const u8 sSamusGfx_Top_Suitless_TurningAround_Frame0[SAMUS_GFX_SIZE(4, 4)];
extern const u8 sSamusGfx_Bottom_Suitless_TurningAround_Frame1[SAMUS_GFX_SIZE(6, 6)];

7
linker.ld
View File

@ -543,7 +543,12 @@ SECTIONS {
src/data/generic_data.o(.rodata);
/* 8cad0-8f253 */
src/data/audio.o(.rodata);
/* 908e0-2b0c93 */
/* 908e0-2320e4 */
src/data/samus/samus_empty_data.o(.rodata);
/* 2320ec-2376a8 */
src/data/samus/samus_palette_data.o(.rodata);
/* 238b68-2b0c93 */
src/data/sprite_data.o(.rodata);
src/data/spriteset.o(.rodata);
src/data/sprites/enemy_drop.o(.rodata);

2
src/data/audio.c
View File

@ -69,4 +69,4 @@ const struct TrackGroupROMData sMusicTrackDataROM[9] = {
const u8 sTempArray_8f2c0[0x1620] = INCBIN_U8("data/Blob_8f2c0_908df.bin");
// const struct SoundEntry sSoundDataEntries[708] = {0};
const u8 sTempArray_908e0[0x2203b4] = INCBIN_U8("data/Blob_908e0_2b0c93.bin");
const u8 sTempArray_908e0[0x1a1804] = INCBIN_U8("data/Blob_908e0_2320e4.bin");

2635
src/data/samus/samus_animation_pointers.c Normal file
View File

File diff suppressed because it is too large Load Diff

19
src/data/samus/samus_empty_data.c Normal file
View File

@ -0,0 +1,19 @@
#include "data/samus/samus_empty_data.h"
#include "macros.h"
const u8 sSamusGfx_Empty[2] = {
0, 0
};
const u16 sArmCannonOam_Empty[1] = {
0
};
const struct ArmCannonOffset sArmCannonOffset_Empty[1] = {
{
.x = 0,
.y = 0
}
};
static const u8 sTempArray_2320ec[0x55bc] = INCBIN_U8("data/Blob_2320ec_2376a8.bin");

57
src/data/samus/samus_palette_data.c Normal file
View File

@ -0,0 +1,57 @@
#include "data/samus/samus_palette_data.h"
#include "macros.h"
const u16 sSamusPal_PowerSuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_Default.pal");
const u16 sSamusPal_PowerSuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_BeamRelease.pal");
const u16 sSamusPal_PowerSuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_Flashing.pal");
const u16 sSamusPal_PowerSuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_Speedboost.pal");
const u16 sSamusPal_PowerSuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_Unmorph.pal");
const u16 sSamusPal_PowerSuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_Dying.pal");
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/VariaSuit_Dying.pal");
const u16 sSamusPal_FullSuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Dying.pal");
const u16 sSamusPal_GravitySuit_Dying[1 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Dying.pal");
const u16 sSamusPal_PowerSuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_Saving.pal");
const u16 sSamusPal_PowerSuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_ChargingBeam.pal");
const u16 sSamusPal_PowerSuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/PowerSuit_DownloadingMap.pal");
const u16 sSamusPal_VariaSuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_Default.pal");
const u16 sSamusPal_VariaSuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_BeamRelease.pal");
const u16 sSamusPal_VariaSuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_Flashing.pal");
const u16 sSamusPal_VariaSuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_Speedboost.pal");
const u16 sSamusPal_VariaSuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_Unmorph.pal");
const u16 sSamusPal_VariaSuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_Saving.pal");
const u16 sSamusPal_VariaSuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_ChargingBeam.pal");
const u16 sSamusPal_VariaSuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/VariaSuit_DownloadingMap.pal");
const u16 sSamusPal_FullSuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Default.pal");
const u16 sSamusPal_FullSuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_BeamRelease.pal");
const u16 sSamusPal_FullSuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Flashing.pal");
const u16 sSamusPal_FullSuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Speedboost.pal");
const u16 sSamusPal_FullSuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Unmorph.pal");
const u16 sSamusPal_FullSuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Saving.pal");
const u16 sSamusPal_FullSuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_ChargingBeam.pal");
const u16 sSamusPal_FullSuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_DownloadingMap.pal");
const u16 sSamusPal_FullSuit_Frozen[3 * 16] = INCBIN_U16("data/samus/palettes/FullSuit_Frozen.pal");
const u16 sSamusPal_GravitySuit_Default[3 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Default.pal");
const u16 sSamusPal_GravitySuit_BeamRelease[5 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_BeamRelease.pal");
const u16 sSamusPal_GravitySuit_Flashing[2 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Flashing.pal");
const u16 sSamusPal_GravitySuit_Speedboost[3 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Speedboost.pal");
const u16 sSamusPal_GravitySuit_Unmorph[2 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Unmorph.pal");
const u16 sSamusPal_GravitySuit_Saving[3 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Saving.pal");
const u16 sSamusPal_GravitySuit_ChargingBeam[10 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_ChargingBeam.pal");
const u16 sSamusPal_GravitySuit_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_DownloadingMap.pal");
const u16 sSamusPal_GravitySuit_Frozen[3 * 16] = INCBIN_U16("data/samus/palettes/GravitySuit_Frozen.pal");
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_BeamRelease.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_ChargingBeam.pal");
const u16 sSamusPal_Suitless_DownloadingMap[2 * 16] = INCBIN_U16("data/samus/palettes/Suitless_DownloadingMap.pal");
const u16 sSamusPal_Suitless_Frozen[3 * 16] = INCBIN_U16("data/samus/palettes/Suitless_Frozen.pal");
static const u8 sTempArray_238b68[0x7812b] = INCBIN_U8("data/Blob_238b68_2b0c93.bin");

3
src/samus.c
View File

@ -5269,8 +5269,9 @@ void SamusUpdateGraphicsOAM(struct SamusData* pData, u8 direction)
switch (pose)
{
case SPOSE_RUNNING:
// Check for no ACD
if (acd > ACD_DOWN)
acd -= ACD_DIAGONALLY_DOWN;
acd -= 2;
if (pEquipment->suitType == SUIT_SUITLESS)
{

2
tools/extractor.py
View File

@ -29,6 +29,8 @@ subDirs: array = [
"menus/EraseSram/",
"rooms/",
"rooms/debug/",
"samus/",
"samus/palettes/",
]
try: