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

More cleanup, particles

Browse Source
This commit is contained in:
y.demaisonregne 2023-07-12 04:10:41 +02:00
parent 4b43c2a5e9
commit 00e2adb2c3
33 changed files with 2443 additions and 2228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/engine/coordinates.md Normal file
View File

@ -0,0 +1,18 @@
# Coordinates system
The game uses a coordinates system that has 3 units, sub-pixel, pixel and block.
The following table describes the convertion between them :
| Sub pixel | Pixel | Block |
|--------------|-----------|------------|
| 1 | 0.25 | 0.015625 |
| 4 | 1 | 0.0625 |
| 64 | 16 | 1 |
Conversions can be made between each unit with simple multiplciation and division, however there are macros defined in [macros.h](../../include/macros.h) that can be used to do the conversions.
Most of the coordinates used in the game are in sub-pixel units (position, hitboxes).
There are a few coordinates that are in block units (doors, hatches).
Only one uses pixel unit (sprite draw distances).
All coordinates use the same position for 0;0, which is the top left of the current context (room, cutscene...).

474
include/data/particle_data.h
View File

@ -4,67 +4,67 @@
#include "types.h"
#include "oam.h"
extern const u16 sParticleShootingBeamHorizontalOAM_Frame0[4];
extern const u16 sParticleShootingBeamHorizontalOam_Frame0[4];
extern const u16 sParticleShootingBeamHorizontalOAM_Frame1[10];
extern const u16 sParticleShootingBeamHorizontalOam_Frame1[10];
extern const u16 sParticleShootingBeamHorizontalOAM_Frame2[4];
extern const u16 sParticleShootingBeamHorizontalOam_Frame2[4];
extern const u16 sParticleShootingBeamHorizontalOAM_Frame3[7];
extern const u16 sParticleShootingBeamHorizontalOam_Frame3[7];
extern const u16 sParticleShootingBeamDiagonallyUpOAM_Frame0[4];
extern const u16 sParticleShootingBeamDiagonallyUpOam_Frame0[4];
extern const u16 sParticleShootingBeamDiagonallyUpOAM_Frame1[10];
extern const u16 sParticleShootingBeamDiagonallyUpOam_Frame1[10];
extern const u16 sParticleShootingBeamDiagonallyUpOAM_Frame2[4];
extern const u16 sParticleShootingBeamDiagonallyUpOam_Frame2[4];
extern const u16 sParticleShootingBeamDiagonallyUpOAM_Frame3[7];
extern const u16 sParticleShootingBeamDiagonallyUpOam_Frame3[7];
extern const u16 sParticleShootingBeamDiagonallyDownOAM_Frame0[4];
extern const u16 sParticleShootingBeamDiagonallyDownOam_Frame0[4];
extern const u16 sParticleShootingBeamDiagonallyDownOAM_Frame1[10];
extern const u16 sParticleShootingBeamDiagonallyDownOam_Frame1[10];
extern const u16 sParticleShootingBeamDiagonallyDownOAM_Frame2[4];
extern const u16 sParticleShootingBeamDiagonallyDownOam_Frame2[4];
extern const u16 sParticleShootingBeamDiagonallyDownOAM_Frame3[7];
extern const u16 sParticleShootingBeamDiagonallyDownOam_Frame3[7];
extern const u16 sParticleShootingBeamUpOAM_Frame0[4];
extern const u16 sParticleShootingBeamUpOam_Frame0[4];
extern const u16 sParticleShootingBeamUpOAM_Frame1[10];
extern const u16 sParticleShootingBeamUpOam_Frame1[10];
extern const u16 sParticleShootingBeamUpOAM_Frame2[4];
extern const u16 sParticleShootingBeamUpOam_Frame2[4];
extern const u16 sParticleShootingBeamUpOAM_Frame3[7];
extern const u16 sParticleShootingBeamUpOam_Frame3[7];
extern const u16 sParticleShootingBeamDownOAM_Frame0[4];
extern const u16 sParticleShootingBeamDownOam_Frame0[4];
extern const u16 sParticleShootingBeamDownOAM_Frame1[10];
extern const u16 sParticleShootingBeamDownOam_Frame1[10];
extern const u16 sParticleShootingBeamDownOAM_Frame2[4];
extern const u16 sParticleShootingBeamDownOam_Frame2[4];
extern const u16 sParticleShootingBeamDownOAM_Frame3[7];
extern const u16 sParticleShootingBeamDownOam_Frame3[7];
extern const u16 sParticleBombOAM_Frame0[13];
extern const u16 sParticleBombOam_Frame0[13];
extern const u16 sParticleBombOAM_Frame1[13];
extern const u16 sParticleBombOam_Frame1[13];
extern const u16 sParticleBombOAM_Frame2[13];
extern const u16 sParticleBombOam_Frame2[13];
extern const u16 sParticleBombOAM_Frame3[13];
extern const u16 sParticleBombOam_Frame3[13];
extern const u16 sParticleBombOAM_Frame4[13];
extern const u16 sParticleBombOam_Frame4[13];
extern const u16 sParticleBombOAM_Frame5[13];
extern const u16 sParticleBombOam_Frame5[13];
extern const u16 sParticleBeamTrailingOAM_Frame0[4];
extern const u16 sParticleBeamTrailingOam_Frame0[4];
extern const u16 sParticleBeamTrailingOAM_Frame1[4];
extern const u16 sParticleBeamTrailingOam_Frame1[4];
extern const u16 sParticleBeamTrailingOAM_Frame2[4];
extern const u16 sParticleBeamTrailingOam_Frame2[4];
extern const u16 sParticleBeamTrailingOAM_Frame3[4];
extern const u16 sParticleBeamTrailingOam_Frame3[4];
extern const u16 sParticleBeamTrailingOAM_Frame4[4];
extern const u16 sParticleBeamTrailingOam_Frame4[4];
extern const u16 sParticleChargingBeamBeginOAM_Frame0[4];
@ -82,45 +82,45 @@ extern const u16 sParticleChargingBeamBeginOAM_Frame16[16];
extern const u16 sParticleChargingBeamChargedOAM_Frame1[16];
extern const struct FrameData sParticleShootingBeamHorizontalOAM[5];
extern const struct FrameData sParticleShootingBeamHorizontalOam[5];
extern const struct FrameData sParticleShootingBeamDiagonallyUpOAM[5];
extern const struct FrameData sParticleShootingBeamDiagonallyUpOam[5];
extern const struct FrameData sParticleShootingBeamDiagonallyDownOAM[5];
extern const struct FrameData sParticleShootingBeamDiagonallyDownOam[5];
extern const struct FrameData sParticleShootingBeamUpOAM[5];
extern const struct FrameData sParticleShootingBeamUpOam[5];
extern const struct FrameData sParticleShootingBeamDownOAM[5];
extern const struct FrameData sParticleShootingBeamDownOam[5];
extern const struct FrameData sParticleBombOAM[7];
extern const struct FrameData sParticleBombOam[7];
extern const struct FrameData sParticleBeamTrailingOAM[6];
extern const struct FrameData sParticleBeamTrailingOam[6];
extern const struct FrameData sParticleChargingBeamBeginOAM[23];
extern const struct FrameData sParticleChargingBeamChargedOAM[3];
extern const u16 sParticleHittingSomethingWithNormalBeamOAM_Frame0[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOam_Frame0[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOAM_Frame1[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOam_Frame1[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOAM_Frame2[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOam_Frame2[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOAM_Frame3[4];
extern const u16 sParticleHittingSomethingWithNormalBeamOam_Frame3[4];
extern const u16 sParticleHittingSomethingWithLongBeamOAM_Frame2[7];
extern const u16 sParticleHittingSomethingWithLongBeamOam_Frame2[7];
extern const u16 sParticleHittingSomethingWithLongBeamOAM_Frame3[7];
extern const u16 sParticleHittingSomethingWithLongBeamOam_Frame3[7];
extern const u16 sParticleHittingSomethingWithIceBeamOAM_Frame3[7];
extern const u16 sParticleHittingSomethingWithIceBeamOam_Frame3[7];
extern const u16 sParticleHittingSomethingWithIceBeamOAM_Frame4[13];
extern const u16 sParticleHittingSomethingWithIceBeamOam_Frame4[13];
extern const u16 sParticleHittingSomethingWithWaveBeamOAM_Frame4[13];
extern const u16 sParticleHittingSomethingWithWaveBeamOam_Frame4[13];
extern const u16 sParticleHittingSomethingWithWaveBeamOAM_Frame5[13];
extern const u16 sParticleHittingSomethingWithWaveBeamOam_Frame5[13];
extern const u16 sParticleHittingSomethingWithPlasmaBeamOAM_Frame5[13];
extern const u16 sParticleHittingSomethingWithPlasmaBeamOam_Frame5[13];
extern const u16 sParticleHittingSomethingInvincible_Frame0[4];
@ -132,333 +132,333 @@ extern const u16 sParticleHittingSomethingInvincible_Frame3[4];
extern const u16 sParticleHittingSomethingInvincible_Frame4[4];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame0[7];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame0[7];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame1[4];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame1[4];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame2[13];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame2[13];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame3[13];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame3[13];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame4[13];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame4[13];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame5[13];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame5[13];
extern const u16 sParticleHittingSomethingWithMissileOAM_Frame6[13];
extern const u16 sParticleHittingSomethingWithMissileOam_Frame6[13];
extern const u16 sParticleHittingSomethingWithSuperMissileOAM_Frame4[19];
extern const u16 sParticleHittingSomethingWithSuperMissileOam_Frame4[19];
extern const u16 sParticleHittingSomethingWithSuperMissileOAM_Frame5[13];
extern const u16 sParticleHittingSomethingWithSuperMissileOam_Frame5[13];
extern const u16 sParticleHittingSomethingWithSuperMissileOAM_Frame6[13];
extern const u16 sParticleHittingSomethingWithSuperMissileOam_Frame6[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame0[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame0[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame1[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame1[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame2[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame2[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame4[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame4[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame5[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame5[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame6[22];
extern const u16 sParticleSpriteExplosionHugeOam_Frame6[22];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame7[22];
extern const u16 sParticleSpriteExplosionHugeOam_Frame7[22];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame8[22];
extern const u16 sParticleSpriteExplosionHugeOam_Frame8[22];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame9[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame9[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame10[13];
extern const u16 sParticleSpriteExplosionHugeOam_Frame10[13];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame11[10];
extern const u16 sParticleSpriteExplosionHugeOam_Frame11[10];
extern const u16 sParticleSpriteExplosionHugeOAM_Frame12[4];
extern const u16 sParticleSpriteExplosionHugeOam_Frame12[4];
extern const u16 sParticleSmallDustOAM_Frame0[4];
extern const u16 sParticleSmallDustOam_Frame0[4];
extern const u16 sParticleSmallDustOAM_Frame1[4];
extern const u16 sParticleSmallDustOam_Frame1[4];
extern const u16 sParticleSmallDustOAM_Frame2[4];
extern const u16 sParticleSmallDustOam_Frame2[4];
extern const u16 sParticleSmallDustOAM_Frame3[4];
extern const u16 sParticleSmallDustOam_Frame3[4];
extern const u16 sParticleSmallDustOAM_Frame4[4];
extern const u16 sParticleSmallDustOam_Frame4[4];
extern const u16 sParticleSmallDustOAM_Frame5[4];
extern const u16 sParticleSmallDustOam_Frame5[4];
extern const u16 sParticleMediumDustOAM_Frame0[7];
extern const u16 sParticleMediumDustOam_Frame0[7];
extern const u16 sParticleMediumDustOAM_Frame1[7];
extern const u16 sParticleMediumDustOam_Frame1[7];
extern const u16 sParticleMediumDustOAM_Frame2[10];
extern const u16 sParticleMediumDustOam_Frame2[10];
extern const u16 sParticleMediumDustOAM_Frame3[10];
extern const u16 sParticleMediumDustOam_Frame3[10];
extern const u16 sParticleMediumDustOAM_Frame4[10];
extern const u16 sParticleMediumDustOam_Frame4[10];
extern const u16 sParticleMediumDustOAM_Frame5[10];
extern const u16 sParticleMediumDustOam_Frame5[10];
extern const u16 sParticleMediumDustOAM_Frame6[10];
extern const u16 sParticleMediumDustOam_Frame6[10];
extern const u16 sParticleMediumDustOAM_Frame7[7];
extern const u16 sParticleMediumDustOam_Frame7[7];
extern const u16 sParticleMediumDustOAM_Frame8[4];
extern const u16 sParticleMediumDustOam_Frame8[4];
extern const u16 sParticleTwoMediumDustOAM_Frame0[7];
extern const u16 sParticleTwoMediumDustOam_Frame0[7];
extern const u16 sParticleTwoMediumDustOAM_Frame1[10];
extern const u16 sParticleTwoMediumDustOam_Frame1[10];
extern const u16 sParticleTwoMediumDustOAM_Frame2[10];
extern const u16 sParticleTwoMediumDustOam_Frame2[10];
extern const u16 sParticleTwoMediumDustOAM_Frame3[10];
extern const u16 sParticleTwoMediumDustOam_Frame3[10];
extern const u16 sParticleTwoMediumDustOAM_Frame4[13];
extern const u16 sParticleTwoMediumDustOam_Frame4[13];
extern const u16 sParticleTwoMediumDustOAM_Frame5[13];
extern const u16 sParticleTwoMediumDustOam_Frame5[13];
extern const u16 sParticleTwoMediumDustOAM_Frame6[10];
extern const u16 sParticleTwoMediumDustOam_Frame6[10];
extern const u16 sParticleTwoMediumDustOAM_Frame7[7];
extern const u16 sParticleTwoMediumDustOam_Frame7[7];
extern const u16 sParticleTwoMediumDustOAM_Frame8[7];
extern const u16 sParticleTwoMediumDustOam_Frame8[7];
extern const u16 sParticleTwoMediumDustOAM_Frame9[4];
extern const u16 sParticleTwoMediumDustOam_Frame9[4];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame0[4];
extern const u16 sParticleSpriteExplosionSmallOam_Frame0[4];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame1[4];
extern const u16 sParticleSpriteExplosionSmallOam_Frame1[4];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame2[4];
extern const u16 sParticleSpriteExplosionSmallOam_Frame2[4];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame3[4];
extern const u16 sParticleSpriteExplosionSmallOam_Frame3[4];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame4[4];
extern const u16 sParticleSpriteExplosionSmallOam_Frame4[4];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame5[7];
extern const u16 sParticleSpriteExplosionSmallOam_Frame5[7];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame6[7];
extern const u16 sParticleSpriteExplosionSmallOam_Frame6[7];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame7[7];
extern const u16 sParticleSpriteExplosionSmallOam_Frame7[7];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame8[7];
extern const u16 sParticleSpriteExplosionSmallOam_Frame8[7];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame9[7];
extern const u16 sParticleSpriteExplosionSmallOam_Frame9[7];
extern const u16 sParticleSpriteExplosionSmallOAM_Frame10[4];
extern const u16 sParticleSpriteExplosionSmallOam_Frame10[4];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame3[7];
extern const u16 sParticleSpriteExplosionMediumOam_Frame3[7];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame4[7];
extern const u16 sParticleSpriteExplosionMediumOam_Frame4[7];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame5[10];
extern const u16 sParticleSpriteExplosionMediumOam_Frame5[10];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame6[13];
extern const u16 sParticleSpriteExplosionMediumOam_Frame6[13];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame7[13];
extern const u16 sParticleSpriteExplosionMediumOam_Frame7[13];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame8[16];
extern const u16 sParticleSpriteExplosionMediumOam_Frame8[16];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame9[16];
extern const u16 sParticleSpriteExplosionMediumOam_Frame9[16];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame10[13];
extern const u16 sParticleSpriteExplosionMediumOam_Frame10[13];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame11[13];
extern const u16 sParticleSpriteExplosionMediumOam_Frame11[13];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame12[13];
extern const u16 sParticleSpriteExplosionMediumOam_Frame12[13];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame13[10];
extern const u16 sParticleSpriteExplosionMediumOam_Frame13[10];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame14[7];
extern const u16 sParticleSpriteExplosionMediumOam_Frame14[7];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame15[7];
extern const u16 sParticleSpriteExplosionMediumOam_Frame15[7];
extern const u16 sParticleSpriteExplosionMediumOAM_Frame16[4];
extern const u16 sParticleSpriteExplosionMediumOam_Frame16[4];
extern const u16 sParticleSpriteExplosionBigOAM_Frame6[16];
extern const u16 sParticleSpriteExplosionBigOam_Frame6[16];
extern const u16 sParticleSpriteExplosionBigOAM_Frame7[16];
extern const u16 sParticleSpriteExplosionBigOam_Frame7[16];
extern const u16 sParticleSpriteExplosionBigOAM_Frame8[19];
extern const u16 sParticleSpriteExplosionBigOam_Frame8[19];
extern const u16 sParticleSpriteExplosionBigOAM_Frame9[19];
extern const u16 sParticleSpriteExplosionBigOam_Frame9[19];
extern const u16 sParticleSpriteExplosionBigOAM_Frame10[16];
extern const u16 sParticleSpriteExplosionBigOam_Frame10[16];
extern const u16 sParticleSpriteExplosionBigOAM_Frame11[19];
extern const u16 sParticleSpriteExplosionBigOam_Frame11[19];
extern const u16 sParticleSpriteExplosionBigOAM_Frame12[16];
extern const u16 sParticleSpriteExplosionBigOam_Frame12[16];
extern const u16 sParticleSpriteExplosionBigOAM_Frame13[16];
extern const u16 sParticleSpriteExplosionBigOam_Frame13[16];
extern const u16 sParticleSpriteExplosionBigOAM_Frame14[10];
extern const u16 sParticleSpriteExplosionBigOam_Frame14[10];
extern const u16 sParticleSpriteExplosionBigOAM_Frame15[7];
extern const u16 sParticleSpriteExplosionBigOam_Frame15[7];
extern const u16 sParticleSpriteExplosionBigOAM_Frame16[4];
extern const u16 sParticleSpriteExplosionBigOam_Frame16[4];
extern const u16 sParticleSpriteExplosionSingleThenBigOAM_Frame3[28];
extern const u16 sParticleSpriteExplosionSingleThenBigOam_Frame3[28];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame0[4];
extern const u16 sParticleScrewAttackDestroyedOam_Frame0[4];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame1[25];
extern const u16 sParticleScrewAttackDestroyedOam_Frame1[25];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame2[37];
extern const u16 sParticleScrewAttackDestroyedOam_Frame2[37];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame3[49];
extern const u16 sParticleScrewAttackDestroyedOam_Frame3[49];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame4[49];
extern const u16 sParticleScrewAttackDestroyedOam_Frame4[49];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame5[28];
extern const u16 sParticleScrewAttackDestroyedOam_Frame5[28];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame6[16];
extern const u16 sParticleScrewAttackDestroyedOam_Frame6[16];
extern const u16 sParticleScrewAttackDestroyedOAM_Frame7[22];
extern const u16 sParticleScrewAttackDestroyedOam_Frame7[22];
extern const u16 sParticleShinesparkDestroyedOAM_Frame0[10];
extern const u16 sParticleShinesparkDestroyedOam_Frame0[10];
extern const u16 sParticleShinesparkDestroyedOAM_Frame1[13];
extern const u16 sParticleShinesparkDestroyedOam_Frame1[13];
extern const u16 sParticleShinesparkDestroyedOAM_Frame2[19];
extern const u16 sParticleShinesparkDestroyedOam_Frame2[19];
extern const u16 sParticleShinesparkDestroyedOAM_Frame3[28];
extern const u16 sParticleShinesparkDestroyedOam_Frame3[28];
extern const u16 sParticleShinesparkDestroyedOAM_Frame4[31];
extern const u16 sParticleShinesparkDestroyedOam_Frame4[31];
extern const u16 sParticleShinesparkDestroyedOAM_Frame5[31];
extern const u16 sParticleShinesparkDestroyedOam_Frame5[31];
extern const u16 sParticleShinesparkDestroyedOAM_Frame6[22];
extern const u16 sParticleShinesparkDestroyedOam_Frame6[22];
extern const u16 sParticleShinesparkDestroyedOAM_Frame7[19];
extern const u16 sParticleShinesparkDestroyedOam_Frame7[19];
extern const u16 sParticleShinesparkDestroyedOAM_Frame8[10];
extern const u16 sParticleShinesparkDestroyedOam_Frame8[10];
extern const u16 sParticleShinesparkDestroyedOAM_Frame9[10];
extern const u16 sParticleShinesparkDestroyedOam_Frame9[10];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame0[7];
extern const u16 sParticleSudoScrewDestroyedOam_Frame0[7];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame1[22];
extern const u16 sParticleSudoScrewDestroyedOam_Frame1[22];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame2[28];
extern const u16 sParticleSudoScrewDestroyedOam_Frame2[28];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame3[25];
extern const u16 sParticleSudoScrewDestroyedOam_Frame3[25];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame4[25];
extern const u16 sParticleSudoScrewDestroyedOam_Frame4[25];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame5[10];
extern const u16 sParticleSudoScrewDestroyedOam_Frame5[10];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame6[10];
extern const u16 sParticleSudoScrewDestroyedOam_Frame6[10];
extern const u16 sParticleSudoScrewDestroyedOAM_Frame7[16];
extern const u16 sParticleSudoScrewDestroyedOam_Frame7[16];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame0[13];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame0[13];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame1[28];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame1[28];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame2[40];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame2[40];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame3[37];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame3[37];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame4[37];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame4[37];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame5[16];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame5[16];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame6[16];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame6[16];
extern const u16 sParticleSpeedboosterDestroyedOAM_Frame7[22];
extern const u16 sParticleSpeedboosterDestroyedOam_Frame7[22];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame0[4];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame0[4];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame1[4];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame1[4];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame2[4];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame2[4];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame3[7];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame3[7];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame4[7];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame4[7];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame5[7];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame5[7];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame6[10];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame6[10];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame7[10];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame7[10];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame8[10];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame8[10];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame9[10];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame9[10];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame10[10];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame10[10];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame11[7];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame11[7];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame12[7];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame12[7];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame13[4];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame13[4];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame14[4];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame14[4];
extern const u16 sParticleFreezingSpriteWithIceOAM_Frame15[4];
extern const u16 sParticleFreezingSpriteWithIceOam_Frame15[4];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame0[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame0[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame1[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame1[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame2[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame2[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame3[28];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame3[28];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame4[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame4[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame5[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame5[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame6[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame6[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame7[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame7[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame8[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame8[13];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame9[10];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame9[10];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame10[10];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame10[10];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame11[7];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame11[7];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame12[4];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame12[4];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame13[7];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame13[7];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOAM_Frame14[4];
extern const u16 sParticleFreezingSpritewithChargedIceBeamOam_Frame14[4];
extern const u16 sParticleMainBossDeathOAM_Frame2[19];
extern const u16 sParticleMainBossDeathOam_Frame2[19];
extern const u16 sParticleMainBossDeathOAM_Frame3[16];
extern const u16 sParticleMainBossDeathOam_Frame3[16];
extern const u16 sParticleMainBossDeathOAM_Frame4[31];
extern const u16 sParticleMainBossDeathOam_Frame4[31];
extern const u16 sParticleMainBossDeathOAM_Frame5[49];
extern const u16 sParticleMainBossDeathOam_Frame5[49];
extern const u16 sParticleMainBossDeathOAM_Frame6[52];
extern const u16 sParticleMainBossDeathOam_Frame6[52];
extern const u16 sParticleMainBossDeathOAM_Frame7[55];
extern const u16 sParticleMainBossDeathOam_Frame7[55];
extern const u16 sParticleMainBossDeathOAM_Frame8[64];
extern const u16 sParticleMainBossDeathOam_Frame8[64];
extern const u16 sParticleMainBossDeathOAM_Frame9[61];
extern const u16 sParticleMainBossDeathOam_Frame9[61];
extern const u16 sParticleMainBossDeathOAM_Frame10[58];
extern const u16 sParticleMainBossDeathOam_Frame10[58];
extern const u16 sParticleMainBossDeathOAM_Frame11[55];
extern const u16 sParticleMainBossDeathOam_Frame11[55];
extern const u16 sParticleMainBossDeathOAM_Frame12[37];
extern const u16 sParticleMainBossDeathOam_Frame12[37];
extern const u16 sParticleMainBossDeathOAM_Frame13[37];
extern const u16 sParticleMainBossDeathOam_Frame13[37];
extern const u16 sParticleMainBossDeathOAM_Frame14[31];
extern const u16 sParticleMainBossDeathOam_Frame14[31];
extern const u16 sParticleMainBossDeathOAM_Frame15[19];
extern const u16 sParticleMainBossDeathOam_Frame15[19];
extern const u16 sParticleMainBossDeathOAM_Frame16[10];
extern const u16 sParticleMainBossDeathOam_Frame16[10];
extern const u16 sWaterDropOam_Spawning_Frame0[4];
@ -488,57 +488,57 @@ extern const u16 sSpriteDebrisOAM_Frame2[4];
extern const u16 sSpriteDebrisOAM_Frame3[4];
extern const u16 sParticleHittingSomethingWithPlasmaBeamOAM_Frame6[13];
extern const u16 sParticleHittingSomethingWithPlasmaBeamOam_Frame6[13];
extern const u16 sSpriteDebrisOAM_Unused_Frame4[25];
extern const u16 sSpriteDebrisOAM_Unused_Frame5[25];
extern const struct FrameData sParticleHittingSomethingWithNormalBeamOAM[5];
extern const struct FrameData sParticleHittingSomethingWithNormalBeamOam[5];
extern const struct FrameData sParticleHittingSomethingWithLongBeamOAM[5];
extern const struct FrameData sParticleHittingSomethingWithLongBeamOam[5];
extern const struct FrameData sParticleHittingSomethingWithIceBeamOAM[6];
extern const struct FrameData sParticleHittingSomethingWithIceBeamOam[6];
extern const struct FrameData sParticleHittingSomethingWithWaveBeamOAM[7];
extern const struct FrameData sParticleHittingSomethingWithWaveBeamOam[7];
extern const struct FrameData sParticleHittingSomethingWithPlasmaBeamOAM[8];
extern const struct FrameData sParticleHittingSomethingWithPlasmaBeamOam[8];
extern const struct FrameData sParticleHittingSomethingInvincibleOAM[6];
extern const struct FrameData sParticleHittingSomethingInvincibleOam[6];
extern const struct FrameData sParticleHittingSomethingWithMissileOAM[8];
extern const struct FrameData sParticleHittingSomethingWithMissileOam[8];
extern const struct FrameData sParticleHittingSomethingWithSuperMissileOAM[8];
extern const struct FrameData sParticleHittingSomethingWithSuperMissileOam[8];
extern const struct FrameData sParticleSpriteExplosionHugeOAM[14];
extern const struct FrameData sParticleSpriteExplosionHugeOam[14];
extern const struct FrameData sParticleSmallDustOAM[7];
extern const struct FrameData sParticleSmallDustOam[7];
extern const struct FrameData sParticleMediumDustOAM[10];
extern const struct FrameData sParticleMediumDustOam[10];
extern const struct FrameData sParticleTwoMediumDustOAM[11];
extern const struct FrameData sParticleTwoMediumDustOam[11];
extern const struct FrameData sParticleSpriteExplosionSmallOAM[12];
extern const struct FrameData sParticleSpriteExplosionSmallOam[12];
extern const struct FrameData sParticleSpriteExplosionMediumOAM[18];
extern const struct FrameData sParticleSpriteExplosionMediumOam[18];
extern const struct FrameData sParticleSpriteExplosionBigOAM[18];
extern const struct FrameData sParticleSpriteExplosionBigOam[18];
extern const struct FrameData sParticleSpriteExplosionSingleThenBigOAM[17];
extern const struct FrameData sParticleSpriteExplosionSingleThenBigOam[17];
extern const struct FrameData sParticleScrewAttackDestroyedOAM[9];
extern const struct FrameData sParticleScrewAttackDestroyedOam[9];
extern const struct FrameData sParticleShinesparkDestroyedOAM[11];
extern const struct FrameData sParticleShinesparkDestroyedOam[11];
extern const struct FrameData sParticleSudoScrewDestroyedOAM[9];
extern const struct FrameData sParticleSudoScrewDestroyedOam[9];
extern const struct FrameData sParticleSpeedboosterDestroyedOAM[9];
extern const struct FrameData sParticleSpeedboosterDestroyedOam[9];
extern const struct FrameData sParticleFreezingSpriteWithIceOAM[17];
extern const struct FrameData sParticleFreezingSpriteWithIceOam[17];
extern const struct FrameData sParticleFreezingSpritewithChargedIceBeamOAM[16];
extern const struct FrameData sParticleFreezingSpritewithChargedIceBeamOam[16];
extern const struct FrameData sParticleMainBossDeathOAM[18];
extern const struct FrameData sParticleMainBossDeathOam[18];
extern const struct FrameData sWaterDropOam_Spawning[8];

76
include/data/projectile_data.h
View File

@ -88,23 +88,23 @@ extern const u16 sSuperMissileOAM_Tumbling_Frame6[4];
extern const u16 sSuperMissileOAM_Tumbling_Frame7[4];
extern const u16 sParticleMissileTrailOAM_Frame0[4];
extern const u16 sParticleMissileTrailOam_Frame0[4];
extern const u16 sParticleMissileTrailOAM_Frame1[4];
extern const u16 sParticleMissileTrailOam_Frame1[4];
extern const u16 sParticleMissileTrailOAM_Frame2[4];
extern const u16 sParticleMissileTrailOam_Frame2[4];
extern const u16 sParticleSuperMissileTrailOAM_Frame3[4];
extern const u16 sParticleSuperMissileTrailOam_Frame3[4];
extern const u16 sParticleMissileTrailOAM_Frame3[4];
extern const u16 sParticleMissileTrailOam_Frame3[4];
extern const u16 sParticleMissileTrailOAM_Frame4[4];
extern const u16 sParticleMissileTrailOam_Frame4[4];
extern const u16 sParticleMissileTrailOAM_Frame5[4];
extern const u16 sParticleMissileTrailOam_Frame5[4];
extern const u16 sParticleMissileTrailOAM_Frame6[4];
extern const u16 sParticleMissileTrailOam_Frame6[4];
extern const u16 sParticleSuperMissileTrailOAM_Frame0[4];
extern const u16 sParticleSuperMissileTrailOam_Frame0[4];
extern const struct FrameData sMissileOAM_Horizontal[3];
@ -122,9 +122,9 @@ extern const struct FrameData sMissileOAM_Tumbling[9];
extern const struct FrameData sSuperMissileOAM_Tumbling[9];
extern const struct FrameData sParticleMissileTrailOAM[8];
extern const struct FrameData sParticleMissileTrailOam[8];
extern const struct FrameData sParticleSuperMissileTrailOAM[9];
extern const struct FrameData sParticleSuperMissileTrailOam[9];
extern const u16 sBeamPAL[96];
@ -226,13 +226,13 @@ extern const u16 sChargedLongBeamOAM_Vertical_Frame0[7];
extern const u16 sChargedLongBeamOAM_Vertical_Frame1[10];
extern const u16 sParticleChargedLongBeamTrailOAM_Frame0[4];
extern const u16 sParticleChargedLongBeamTrailOam_Frame0[4];
extern const u16 sParticleChargedLongBeamTrailOAM_Frame1[4];
extern const u16 sParticleChargedLongBeamTrailOam_Frame1[4];
extern const u16 sParticleChargedLongBeamTrailOAM_Frame2[4];
extern const u16 sParticleChargedLongBeamTrailOam_Frame2[4];
extern const u16 sParticleChargedLongBeamTrailOAM_Frame3[4];
extern const u16 sParticleChargedLongBeamTrailOam_Frame3[4];
extern const struct FrameData sLongBeamOAM_Horizontal[3];
@ -246,7 +246,7 @@ extern const struct FrameData sChargedLongBeamOAM_Diagonal[3];
extern const struct FrameData sChargedLongBeamOAM_Vertical[3];
extern const struct FrameData sParticleChargedLongBeamTrailOAM[5];
extern const struct FrameData sParticleChargedLongBeamTrailOam[5];
extern const u8 sIceBeamGfx_Top[512];
extern const u8 sIceBeamGfx_Bottom[512];
@ -289,15 +289,15 @@ extern const u16 sChargedIceBeamOAM_Vertical_Frame0[13];
extern const u16 sChargedIceBeamOAM_Vertical_Frame1[19];
extern const u16 sParticleChargedIceBeamTrailOAM_Frame0[4];
extern const u16 sParticleChargedIceBeamTrailOam_Frame0[4];
extern const u16 sParticleChargedIceBeamTrailOAM_Frame1[4];
extern const u16 sParticleChargedIceBeamTrailOam_Frame1[4];
extern const u16 sParticleChargedIceBeamTrailOAM_Frame2[4];
extern const u16 sParticleChargedIceBeamTrailOam_Frame2[4];
extern const u16 sParticleChargedIceBeamTrailOAM_Frame3[4];
extern const u16 sParticleChargedIceBeamTrailOam_Frame3[4];
extern const u16 sParticleChargedIceBeamTrailOAM_Frame4[4];
extern const u16 sParticleChargedIceBeamTrailOam_Frame4[4];
extern const struct FrameData sIceBeamOAM_Horizontal[3];
@ -317,7 +317,7 @@ extern const struct FrameData sChargedIceBeamOAM_Diagonal[3];
extern const struct FrameData sChargedIceBeamOAM_Vertical[3];
extern const struct FrameData sParticleChargedIceBeamTrailOAM[6];
extern const struct FrameData sParticleChargedIceBeamTrailOam[6];
extern const u8 sWaveBeamGfx_Top[512];
extern const u8 sWaveBeamGfx_Bottom[512];
@ -388,13 +388,13 @@ extern const u16 sChargedWaveBeamOAM_Vertical_Frame5[7];
extern const u16 sChargedWaveBeamOAM_Vertical_Frame6[7];
extern const u16 sParticleChargedWaveBeamTrailOAM_Frame0[4];
extern const u16 sParticleChargedWaveBeamTrailOam_Frame0[4];
extern const u16 sParticleChargedWaveBeamTrailOAM_Frame1[7];
extern const u16 sParticleChargedWaveBeamTrailOam_Frame1[7];
extern const u16 sParticleChargedWaveBeamTrailOAM_Frame2[4];
extern const u16 sParticleChargedWaveBeamTrailOam_Frame2[4];
extern const u16 sParticleChargedWaveBeamTrailOAM_Frame3[7];
extern const u16 sParticleChargedWaveBeamTrailOam_Frame3[7];
extern const struct FrameData sWaveBeamOAM_Horizontal[8];
@ -414,7 +414,7 @@ extern const struct FrameData sChargedWaveBeamOAM_Diagonal[8];
extern const struct FrameData sChargedWaveBeamOAM_Vertical[8];
extern const struct FrameData sParticleChargedWaveBeamTrailOAM[5];
extern const struct FrameData sParticleChargedWaveBeamTrailOam[5];
extern const u8 sPlasmaBeamGfx_Top[512];
extern const u8 sPlasmaBeamGfx_Bottom[512];
@ -519,13 +519,13 @@ extern const u16 sPlasmaBeamOAM_Diagonal_Wave_Unused_Frame1[19];
extern const u16 sPlasmaBeamOAM_Diagonal_Wave_Unused_Frame2[13];
extern const u16 sParticleChargedPlasmaBeamTrailOAM_Frame0[4];
extern const u16 sParticleChargedPlasmaBeamTrailOam_Frame0[4];
extern const u16 sParticleChargedFullBeamTrailOAM_Frame5[4];
extern const u16 sParticleChargedFullBeamTrailOam_Frame5[4];
extern const u16 sParticleChargedFullBeamTrailOAM_Frame6[4];
extern const u16 sParticleChargedFullBeamTrailOam_Frame6[4];
extern const u16 sParticleChargedPlasmaBeamTrailOAM_Frame3[4];
extern const u16 sParticleChargedPlasmaBeamTrailOam_Frame3[4];
extern const struct FrameData sPlasmaBeamOAM_Horizontal_NoWave[3];
@ -563,9 +563,9 @@ extern const struct FrameData sChargedPlasmaBeamOAM_Diagonal_Wave[8];
extern const struct FrameData sChargedPlasmaBeamOAM_Vertical_Wave[8];
extern const struct FrameData sParticleChargedPlasmaBeamTrailOAM[5];
extern const struct FrameData sParticleChargedPlasmaBeamTrailOam[5];
extern const struct FrameData sParticleChargedFullBeamTrailOAM[9];
extern const struct FrameData sParticleChargedFullBeamTrailOam[9];
extern const u8 sPistolBeamGfx_Top[512];
extern const u8 sPistolBeamGfx_Bottom[512];
@ -596,13 +596,13 @@ extern const u16 sChargedPistolOAM_Vertical_Frame0[7];
extern const u16 sChargedPistolOAM_Vertical_Frame1[10];
extern const u16 sParticleChargedPistolTrailOAM_Frame0[4];
extern const u16 sParticleChargedPistolTrailOam_Frame0[4];
extern const u16 sParticleChargedPistolTrailOAM_Frame1[4];
extern const u16 sParticleChargedPistolTrailOam_Frame1[4];
extern const u16 sParticleChargedPistolTrailOAM_Frame2[4];
extern const u16 sParticleChargedPistolTrailOam_Frame2[4];
extern const u16 sParticleChargedPistolTrailOAM_Frame3[4];
extern const u16 sParticleChargedPistolTrailOam_Frame3[4];
extern const struct FrameData sPistolOAM_Horizontal[3];
@ -616,7 +616,7 @@ extern const struct FrameData sChargedPistolOAM_Diagonal[3];
extern const struct FrameData sChargedPistolOAM_Vertical[3];
extern const struct FrameData sParticleChargedPistolTrailOAM[5];
extern const struct FrameData sParticleChargedPistolTrailOam[5];
extern const struct FrameData sParticleEscapeOAM_Unused[2];

92
include/data/sprites/zeela.h
View File

@ -11,79 +11,79 @@ extern const s16 sZeelaEyesFallingFromBottomSpeed[12];
extern const u32 sZeelaGfx[578];
extern const u16 sZeelaPAL[32];
extern const u16 sZeelaOAM_OnGround_Frame0[7];
extern const u16 sZeelaOam_OnGround_Frame0[7];
extern const u16 sZeelaOAM_OnGround_Frame1[10];
extern const u16 sZeelaOam_OnGround_Frame1[10];
extern const u16 sZeelaOAM_OnGround_Frame2[7];
extern const u16 sZeelaOam_OnGround_Frame2[7];
extern const u16 sZeelaOAM_OnGround_Frame3[7];
extern const u16 sZeelaOam_OnGround_Frame3[7];
extern const u16 sZeelaOAM_TurningEdgeLeft_Frame0[10];
extern const u16 sZeelaOam_TurningEdgeLeft_Frame0[10];
extern const u16 sZeelaOAM_TurningEdgeLeft_Frame1[10];
extern const u16 sZeelaOam_TurningEdgeLeft_Frame1[10];
extern const u16 sZeelaOAM_TurningEdgeLeft_Frame2[10];
extern const u16 sZeelaOam_TurningEdgeLeft_Frame2[10];
extern const u16 sZeelaOAM_OnWall_Frame0[7];
extern const u16 sZeelaOam_OnWall_Frame0[7];
extern const u16 sZeelaOAM_OnWall_Frame1[10];
extern const u16 sZeelaOam_OnWall_Frame1[10];
extern const u16 sZeelaOAM_OnWall_Frame2[7];
extern const u16 sZeelaOam_OnWall_Frame2[7];
extern const u16 sZeelaOAM_OnWall_Frame3[7];
extern const u16 sZeelaOam_OnWall_Frame3[7];
extern const u16 sZeelaOAM_TurningCornerRight_Frame0[10];
extern const u16 sZeelaOam_TurningCornerRight_Frame0[10];
extern const u16 sZeelaOAM_TurningCornerRight_Frame1[10];
extern const u16 sZeelaOam_TurningCornerRight_Frame1[10];
extern const u16 sZeelaOAM_TurningCornerRight_Frame2[10];
extern const u16 sZeelaOam_TurningCornerRight_Frame2[10];
extern const u16 sZeelaOAM_TurningCornerLeft_Frame0[10];
extern const u16 sZeelaOam_TurningCornerLeft_Frame0[10];
extern const u16 sZeelaOAM_TurningCornerLeft_Frame1[10];
extern const u16 sZeelaOam_TurningCornerLeft_Frame1[10];
extern const u16 sZeelaOAM_TurningCornerLeft_Frame2[10];
extern const u16 sZeelaOam_TurningCornerLeft_Frame2[10];
extern const u16 sZeelaOAM_WalkingOnSlope_Frame0[10];
extern const u16 sZeelaOam_WalkingOnSlope_Frame0[10];
extern const u16 sZeelaOAM_WalkingOnSlope_Frame1[10];
extern const u16 sZeelaOam_WalkingOnSlope_Frame1[10];
extern const u16 sZeelaOAM_WalkingOnSlope_Frame2[10];
extern const u16 sZeelaOam_WalkingOnSlope_Frame2[10];
extern const u16 sZeelaOAM_WalkingOnSlope_Frame3[10];
extern const u16 sZeelaOam_WalkingOnSlope_Frame3[10];
extern const u16 sZeelaOAM_FallingOnGround_Frame0[10];
extern const u16 sZeelaOam_FallingOnGround_Frame0[10];
extern const u16 sZeelaOAM_FallingOnGround_Frame1[13];
extern const u16 sZeelaOam_FallingOnGround_Frame1[13];
extern const u16 sZeelaOAM_FallingOnGround_Frame2[10];
extern const u16 sZeelaOam_FallingOnGround_Frame2[10];
extern const u16 sZeelaOAM_FallingOnGround_Frame3[10];
extern const u16 sZeelaOam_FallingOnGround_Frame3[10];
extern const u16 sZeelaOAM_FallingOnGround_Frame4[10];
extern const u16 sZeelaOam_FallingOnGround_Frame4[10];
extern const u16 sZeelaOAM_FallingOnGround_Frame5[13];
extern const u16 sZeelaOam_FallingOnGround_Frame5[13];
extern const u16 sZeelaOAM_FallingOnGround_Frame6[10];
extern const u16 sZeelaOam_FallingOnGround_Frame6[10];
extern const u16 sZeelaOAM_FallingOnGround_Frame7[10];
extern const u16 sZeelaOam_FallingOnGround_Frame7[10];
extern const u16 sZeelaOAM_FallingOnWall_Frame0[13];
extern const u16 sZeelaOam_FallingOnWall_Frame0[13];
extern const u16 sZeelaOAM_FallingOnWall_Frame1[16];
extern const u16 sZeelaOam_FallingOnWall_Frame1[16];
extern const u16 sZeelaOAM_FallingOnWall_Frame2[13];
extern const u16 sZeelaOam_FallingOnWall_Frame2[13];
extern const u16 sZeelaOAM_FallingOnWall_Frame3[13];
extern const u16 sZeelaOam_FallingOnWall_Frame3[13];
extern const u16 sZeelaOAM_FallingOnWall_Frame4[13];
extern const u16 sZeelaOam_FallingOnWall_Frame4[13];
extern const u16 sZeelaOAM_FallingOnWall_Frame5[16];
extern const u16 sZeelaOam_FallingOnWall_Frame5[16];
extern const u16 sZeelaOAM_FallingOnWall_Frame6[13];
extern const u16 sZeelaOam_FallingOnWall_Frame6[13];
extern const u16 sZeelaOAM_FallingOnWall_Frame7[13];
extern const u16 sZeelaOam_FallingOnWall_Frame7[13];
extern const u16 sZeelaEyesOAM_Idle_Frame0[4];
@ -97,23 +97,23 @@ extern const u16 sZeelaEyesOAM_Exploding_Frame1[13];
extern const u16 sZeelaEyesOAM_Exploding_Frame2[13];
extern const struct FrameData sZeelaOAM_OnGround[5];
extern const struct FrameData sZeelaOam_OnGround[5];
extern const struct FrameData sZeelaOAM_TurningEdgeLeft[4];
extern const struct FrameData sZeelaOam_TurningEdgeLeft[4];
extern const struct FrameData sZeelaOAM_TurningEdgeRight[4];
extern const struct FrameData sZeelaOam_TurningEdgeRight[4];
extern const struct FrameData sZeelaOAM_OnWall[5];
extern const struct FrameData sZeelaOam_OnWall[5];
extern const struct FrameData sZeelaOAM_TurningCornerRight[4];
extern const struct FrameData sZeelaOam_TurningCornerRight[4];
extern const struct FrameData sZeelaOAM_TurningCornerLeft[4];
extern const struct FrameData sZeelaOam_TurningCornerLeft[4];
extern const struct FrameData sZeelaOAM_WalkingOnSlope[5];
extern const struct FrameData sZeelaOam_WalkingOnSlope[5];
extern const struct FrameData sZeelaOAM_FallingOnGround[9];
extern const struct FrameData sZeelaOam_FallingOnGround[9];
extern const struct FrameData sZeelaOAM_FallingOnWall[9];
extern const struct FrameData sZeelaOam_FallingOnWall[9];
extern const struct FrameData sZeelaEyesOAM_Idle[2];

18
include/data/visual_effects_data.h
View File

@ -21,15 +21,15 @@ extern const struct FrameData sEnvEffectOAM_BreathingBubbles[8];
extern const struct FrameData sEnvEffectOAM_RunningOnVeryDustyGround[12];
extern const struct FrameData sEnvEffectOAM_LandingOnVeryDustyGround[18];
extern const struct FrameData sParticleSpriteSplashWaterBigOAM[10];
extern const struct FrameData sParticleSpriteSplashWaterHugeOAM[10];
extern const struct FrameData sParticleSpriteSplashWaterSmallOAM[7];
extern const struct FrameData sParticleSpriteSplashLavaBigOAM[10];
extern const struct FrameData sParticleSpriteSplashLavaHugeOAM[10];
extern const struct FrameData sParticleSpriteSplashLavaSmallOAM[7];
extern const struct FrameData sParticleSpriteSplashAcidBigOAM[10];
extern const struct FrameData sParticleSpriteSplashAcidHugeOAM[10];
extern const struct FrameData sParticleSpriteSplashAcidSmallOAM[7];
extern const struct FrameData sParticleSpriteSplashWaterBigOam[10];
extern const struct FrameData sParticleSpriteSplashWaterHugeOam[10];
extern const struct FrameData sParticleSpriteSplashWaterSmallOam[7];
extern const struct FrameData sParticleSpriteSplashLavaBigOam[10];
extern const struct FrameData sParticleSpriteSplashLavaHugeOam[10];
extern const struct FrameData sParticleSpriteSplashLavaSmallOam[7];
extern const struct FrameData sParticleSpriteSplashAcidBigOam[10];
extern const struct FrameData sParticleSpriteSplashAcidHugeOam[10];
extern const struct FrameData sParticleSpriteSplashAcidSmallOam[7];
extern const u8 sEscapeTimerDigitsGfx[1024 * 2];
extern const u16 sParticleEscapeOAM[34];

6
include/macros.h
View File

@ -55,7 +55,9 @@
#define COLOR_BLACK COLOR(0x0, 0x0, 0x0)
#define COLOR_MASK 0x1F
#define OAM_DATA_SIZE(nbrOfParts) (1 + nbrOfParts * 3)
#define OAM_PART_SIZE 3
#define OAM_DATA_SIZE(nbrOfParts) (1 + (nbrOfParts) * OAM_PART_SIZE)
#define GET_OAM_DATA_SIZE(size) (((size) - 1) / OAM_PART_SIZE)
#define PI 128
#define sin(a) (sSineTable[(a)])
@ -107,6 +109,8 @@
#define SUB_PIXEL_TO_PIXEL(pixel) ((pixel) / SUB_PIXEL_RATIO)
#define PIXEL_TO_SUBPIXEL(pixel) ((pixel) * SUB_PIXEL_RATIO)
#define SUB_PIXEL_TO_BLOCK(pixel) ((pixel) / BLOCK_SIZE)
#define BLOCK_TO_SUB_PIXEL(block) ((block) * BLOCK_SIZE)
#define SPRITE_HAS_ISFT(sprite) ((sprite).invincibilityStunFlashTimer & 0x7F)
#define SPRITE_CLEAR_ISFT(sprite) ((sprite).invincibilityStunFlashTimer &= 0x80)

2
include/particle.h
View File

@ -12,7 +12,7 @@ void ParticleDraw(struct ParticleEffect* pParticle);
void ParticleProcessAll(void);
void ParticleSet(u16 yPosition, u16 xPosition, u8 effect);
u8 ParticleUpdateAnimation(struct ParticleEffect* pParticle, const struct FrameData* pOam);
void ParticleSetCurrentOAMFramePointer(struct ParticleEffect* pParticle, const struct FrameData* pOam);
void ParticleSetCurrentOamFramePointer(struct ParticleEffect* pParticle, const struct FrameData* pOam);
void ParticleSpriteSplashWaterSmall(struct ParticleEffect* pParticle);
void ParticleSpriteSplashWaterBig(struct ParticleEffect* pParticle);
void ParticleSpriteSplashWaterHuge(struct ParticleEffect* pParticle);

2
include/sprites_AI/ridley.h
View File

@ -3,7 +3,7 @@
#include "types.h"
#define RIDLEY_GROUND_POSITION (BLOCK_SIZE * 18 - PIXEL_SIZE / PIXEL_SIZE)
#define RIDLEY_GROUND_POSITION (BLOCK_SIZE * 18 - ONE_SUB_PIXEL)
#define RIDLEY_POSE_CHECK_PLAY_CUTSCENE 0x1
#define RIDLEY_POSE_SPAWNING 0x2

2
include/sprites_AI/zebetite_and_cannon.h
View File

@ -20,7 +20,7 @@
#define CANNON_VIEW_RIGHT 1
#define CANNON_VIEW_LEFT 2
#define CANNON_BULLET_SPEED (PIXEL_SIZE + PIXEL_SIZE / PIXEL_SIZE)
#define CANNON_BULLET_SPEED (PIXEL_SIZE + ONE_SUB_PIXEL)
#define CANNON_BULLET_SPEED_DIAG (CANNON_BULLET_SPEED - CANNON_BULLET_SPEED / 2)
void Zebetite(void);

9
include/sprites_AI/zeela.h
View File

@ -25,11 +25,16 @@
#define ZEELA_EYES_POSE_EXPLODING_INIT 0x42
#define ZEELA_EYES_POSE_EXPLODING 0x43
#define ZEELA_LEGS_HITBOX (PIXEL_SIZE)
#define ZEELA_EYES_HITBOX (QUARTER_BLOCK_SIZE * 3 + QUARTER_BLOCK_SIZE / 2)
#define ZEELA_LEFT_HITBOX (QUARTER_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2)
#define ZEELA_RIGHT_HITBOX (QUARTER_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2)
void ZeelaSpawnEyes(void);
u8 ZeelaCheckCollidingWithAir(void);
void ZeelaUpdateHitbox(void);
void ZeelaSetCrawlingOAM(void);
void ZeelaSetFallingOAM(void);
void ZeelaSetCrawlingOam(void);
void ZeelaSetFallingOam(void);
void ZeelaInit(void);
void ZeelaIdleInit(void);
void ZeelaMove(void);

9
include/structs/particle.h
View File

@ -2,6 +2,7 @@
#define PARTICLE_STRUCT_H
#include "types.h"
#include "macros.h"
// Structs
@ -25,8 +26,8 @@ typedef void (*ParticleFunc_T)(struct ParticleEffect*);
#define MAX_AMOUNT_OF_PARTICLES 16
extern struct ParticleEffect gParticleEffects[MAX_AMOUNT_OF_PARTICLES];
extern const u16* gCurrentParticleEffectOAMFramePointer;
extern u16 gParticleEscapeOAMFrames[25];
extern u16 gParticleSamusReflectionOAMFrames[73];
extern const u16* gCurrentParticleEffectOamFramePointer;
extern u16 gParticleEscapeOamFrames[OAM_DATA_SIZE(8)];
extern u16 gParticleSamusReflectionOamFrames[OAM_DATA_SIZE(24)];
#endif
#endif /* PARTICLE_STRUCT_H */

4
include/structs/samus.h
View File

@ -77,13 +77,13 @@ struct SamusPhysics {
const u8* pBodyLowerHalfGfx;
u16 bodyLowerHalfGfxSize;
u16 unk_22;
const u16* pArmCannonOAM;
const u16* pArmCannonOam;
const u8* pArmCannonGfxUpper;
u16 armCannonGfxUpperSize;
const u8* pArmCannonGfxLower;
u16 armCannonGfxLowerSize;
u8 unk_36;
const u16* pScrewSpeedOAM;
const u16* pScrewSpeedOam;
const u8* pScrewSpeedGfx;
u16 screwSpeedGfxSize;
const u8* pScrewShinesparkGfx;

5
include/structs/sprite.h
View File

@ -95,11 +95,12 @@ struct BossWork {
// Globals
#define MAX_AMOUNT_OF_SPRITES 24
#define MAX_AMOUNT_OF_SPRITE_TYPES 15
extern u16 gAlarmTimer;
extern struct SpriteData gSpriteData[MAX_AMOUNT_OF_SPRITES];
extern u8 gSpritesetSpritesID[15];
extern u8 gSpritesetGfxSlots[15];
extern u8 gSpritesetSpritesID[MAX_AMOUNT_OF_SPRITE_TYPES];
extern u8 gSpritesetGfxSlots[MAX_AMOUNT_OF_SPRITE_TYPES];
extern struct SubSpriteData gSubSpriteData1;
extern struct SubSpriteData gSubSpriteData2;
extern u8 gParasiteRelated;

1
include/types.h
View File

@ -39,6 +39,7 @@ typedef volatile signed int vs32;
#define PIXEL_SIZE (BLOCK_SIZE / SUB_PIXEL_NUMBER)
#define BLOCK_POSITION_FLAG ((u16)~BLOCK_SIZE + 1)
#define SUB_PIXEL_POSITION_FLAG (BLOCK_SIZE - 1)
#define ONE_SUB_PIXEL (PIXEL_SIZE / PIXEL_SIZE)
struct RawCoordsX {
u16 x;

6
linker.ld
View File

@ -144,17 +144,17 @@ SECTIONS {
. = 0x0000090C; gMissileDigits = .;
. = 0x00000910; gPowerBombDigits = .;
. = 0x00000914; gSuperMissileDigits = .;
. = 0x00000918; gCurrentParticleEffectOAMFramePointer = .;
. = 0x00000918; gCurrentParticleEffectOamFramePointer = .;
. = 0x0000091C; gAmmoDigitsGfx = .;
. = 0x0000095C; gCurrentEscapeStatus = .;
. = 0x0000095D; gEscapeTimerCounter = .;
. = 0x0000095E; gEscapeTimerDigits = .;
. = 0x00000964; gParticleEscapeOAMFrames = .;
. = 0x00000964; gParticleEscapeOamFrames = .;
. = 0x00000996; gEnergyRefillAnimation = .;
. = 0x00000997; gMissileRefillAnimation = .;
. = 0x00000998; gSuperMissileRefillAnimation = .;
. = 0x00000999; gPowerBombRefillAnimation = .;
. = 0x0000099A; gParticleSamusReflectionOAMFrames = .;
. = 0x0000099A; gParticleSamusReflectionOamFrames = .;
. = 0x00000A2C; gProjectileData = .;
. = 0x00000BEC; gArmCannonY = .;
. = 0x00000BEE; gArmCannonX = .;

2
src/cutscenes/enter_tourian.c
View File

@ -192,7 +192,7 @@ void EnterTourianScrollBackground(void)
CUTSCENE_DATA.unk_A = FALSE;
pPosition = CutsceneGetBgHorizontalPointer(sEnterTourianPageData[0].bg);
*pPosition -= PIXEL_SIZE / PIXEL_SIZE;
*pPosition -= ONE_SUB_PIXEL;
}
/**

986
src/data/particle_data.c
View File

File diff suppressed because it is too large Load Diff

176
src/data/projectile_data.c
View File

@ -250,47 +250,47 @@ const u16 sSuperMissileOAM_Tumbling_Frame7[4] = {
0xf8, OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x405e
};
const u16 sParticleMissileTrailOAM_Frame0[4] = {
const u16 sParticleMissileTrailOam_Frame0[4] = {
0x1,
0xfc, 0x1fc, 0x30d5
};
const u16 sParticleMissileTrailOAM_Frame1[4] = {
const u16 sParticleMissileTrailOam_Frame1[4] = {
0x1,
0xfc, 0x1fc, 0x30f5
};
const u16 sParticleMissileTrailOAM_Frame2[4] = {
const u16 sParticleMissileTrailOam_Frame2[4] = {
0x1,
0xfc, 0x1fc, 0x30f6
};
const u16 sParticleSuperMissileTrailOAM_Frame3[4] = {
const u16 sParticleSuperMissileTrailOam_Frame3[4] = {
0x1,
0xfc, 0x1fc, 0x4159
};
const u16 sParticleMissileTrailOAM_Frame3[4] = {
const u16 sParticleMissileTrailOam_Frame3[4] = {
0x1,
0xf9, 0x1fc, 0x415a
};
const u16 sParticleMissileTrailOAM_Frame4[4] = {
const u16 sParticleMissileTrailOam_Frame4[4] = {
0x1,
0xf7, 0x1fc, 0x415b
};
const u16 sParticleMissileTrailOAM_Frame5[4] = {
const u16 sParticleMissileTrailOam_Frame5[4] = {
0x1,
0xf3, 0x1fc, 0x415c
};
const u16 sParticleMissileTrailOAM_Frame6[4] = {
const u16 sParticleMissileTrailOam_Frame6[4] = {
0x1,
0xf1, 0x1fc, 0x415d
};
const u16 sParticleSuperMissileTrailOAM_Frame0[4] = {
const u16 sParticleSuperMissileTrailOam_Frame0[4] = {
0x1,
0xfc, 0x1fc, 0x30d0
};
@ -391,41 +391,41 @@ const struct FrameData sSuperMissileOAM_Tumbling[9] = {
0x0
};
const struct FrameData sParticleMissileTrailOAM[8] = {
sParticleMissileTrailOAM_Frame0,
const struct FrameData sParticleMissileTrailOam[8] = {
sParticleMissileTrailOam_Frame0,
0x4,
sParticleMissileTrailOAM_Frame1,
sParticleMissileTrailOam_Frame1,
0x4,
sParticleMissileTrailOAM_Frame2,
sParticleMissileTrailOam_Frame2,
0x4,
sParticleMissileTrailOAM_Frame3,
sParticleMissileTrailOam_Frame3,
0x3,
sParticleMissileTrailOAM_Frame4,
sParticleMissileTrailOam_Frame4,
0x3,
sParticleMissileTrailOAM_Frame5,
sParticleMissileTrailOam_Frame5,
0x3,
sParticleMissileTrailOAM_Frame6,
sParticleMissileTrailOam_Frame6,
0x3,
NULL,
0x0
};
const struct FrameData sParticleSuperMissileTrailOAM[9] = {
sParticleSuperMissileTrailOAM_Frame0,
const struct FrameData sParticleSuperMissileTrailOam[9] = {
sParticleSuperMissileTrailOam_Frame0,
0x4,
sParticleMissileTrailOAM_Frame1,
sParticleMissileTrailOam_Frame1,
0x4,
sParticleMissileTrailOAM_Frame2,
sParticleMissileTrailOam_Frame2,
0x4,
sParticleSuperMissileTrailOAM_Frame3,
sParticleSuperMissileTrailOam_Frame3,
0x3,
sParticleMissileTrailOAM_Frame3,
sParticleMissileTrailOam_Frame3,
0x3,
sParticleMissileTrailOAM_Frame4,
sParticleMissileTrailOam_Frame4,
0x3,
sParticleMissileTrailOAM_Frame5,
sParticleMissileTrailOam_Frame5,
0x3,
sParticleMissileTrailOAM_Frame6,
sParticleMissileTrailOam_Frame6,
0x3,
NULL,
0x0
@ -725,22 +725,22 @@ const u16 sChargedLongBeamOAM_Vertical_Frame1[10] = {
OBJ_SHAPE_VERTICAL | 0xb, OBJ_SIZE_16x32 | 0x1f8, 0x208c
};
const u16 sParticleChargedLongBeamTrailOAM_Frame0[4] = {
const u16 sParticleChargedLongBeamTrailOam_Frame0[4] = {
0x1,
0xfc, 0x1fc, 0x20ce
};
const u16 sParticleChargedLongBeamTrailOAM_Frame1[4] = {
const u16 sParticleChargedLongBeamTrailOam_Frame1[4] = {
0x1,
0xf8, OBJ_SIZE_16x16 | 0x1f8, 0x208e
};
const u16 sParticleChargedLongBeamTrailOAM_Frame2[4] = {
const u16 sParticleChargedLongBeamTrailOam_Frame2[4] = {
0x1,
0xfc, 0x1fc, 0x20cf
};
const u16 sParticleChargedLongBeamTrailOAM_Frame3[4] = {
const u16 sParticleChargedLongBeamTrailOam_Frame3[4] = {
0x1,
0xfc, 0x1fc, 0x20ef
};
@ -799,14 +799,14 @@ const struct FrameData sChargedLongBeamOAM_Vertical[3] = {
0x0
};
const struct FrameData sParticleChargedLongBeamTrailOAM[5] = {
sParticleChargedLongBeamTrailOAM_Frame0,
const struct FrameData sParticleChargedLongBeamTrailOam[5] = {
sParticleChargedLongBeamTrailOam_Frame0,
0x4,
sParticleChargedLongBeamTrailOAM_Frame1,
sParticleChargedLongBeamTrailOam_Frame1,
0x4,
sParticleChargedLongBeamTrailOAM_Frame2,
sParticleChargedLongBeamTrailOam_Frame2,
0x4,
sParticleChargedLongBeamTrailOAM_Frame3,
sParticleChargedLongBeamTrailOam_Frame3,
0x4,
NULL,
0x0
@ -926,27 +926,27 @@ const u16 sChargedIceBeamOAM_Vertical_Frame1[19] = {
0x1a, 0x1fc, 0x20eb
};
const u16 sParticleChargedIceBeamTrailOAM_Frame0[4] = {
const u16 sParticleChargedIceBeamTrailOam_Frame0[4] = {
0x1,
0xf8, OBJ_SIZE_16x16 | 0x1f8, 0x208c
};
const u16 sParticleChargedIceBeamTrailOAM_Frame1[4] = {
const u16 sParticleChargedIceBeamTrailOam_Frame1[4] = {
0x1,
0xf8, OBJ_SIZE_16x16 | 0x1f8, 0x20ce
};
const u16 sParticleChargedIceBeamTrailOAM_Frame2[4] = {
const u16 sParticleChargedIceBeamTrailOam_Frame2[4] = {
0x1,
0xfc, 0x1fc, 0x20ae
};
const u16 sParticleChargedIceBeamTrailOAM_Frame3[4] = {
const u16 sParticleChargedIceBeamTrailOam_Frame3[4] = {
0x1,
0xfc, 0x1fc, 0x20af
};
const u16 sParticleChargedIceBeamTrailOAM_Frame4[4] = {
const u16 sParticleChargedIceBeamTrailOam_Frame4[4] = {
0x1,
0xfc, 0x1fc, 0x208f
};
@ -1032,16 +1032,16 @@ const struct FrameData sChargedIceBeamOAM_Vertical[3] = {
0x0
};
const struct FrameData sParticleChargedIceBeamTrailOAM[6] = {
sParticleChargedIceBeamTrailOAM_Frame0,
const struct FrameData sParticleChargedIceBeamTrailOam[6] = {
sParticleChargedIceBeamTrailOam_Frame0,
0x4,
sParticleChargedIceBeamTrailOAM_Frame1,
sParticleChargedIceBeamTrailOam_Frame1,
0x4,
sParticleChargedIceBeamTrailOAM_Frame2,
sParticleChargedIceBeamTrailOam_Frame2,
0x4,
sParticleChargedIceBeamTrailOAM_Frame3,
sParticleChargedIceBeamTrailOam_Frame3,
0x4,
sParticleChargedIceBeamTrailOAM_Frame4,
sParticleChargedIceBeamTrailOam_Frame4,
0x4,
NULL,
0x0
@ -1498,23 +1498,23 @@ const u16 sChargedWaveBeamOAM_Vertical_Frame6[7] = {
OBJ_SHAPE_VERTICAL | 0xc, OBJ_SIZE_16x32 | 0x1f1, 0x208c
};
const u16 sParticleChargedWaveBeamTrailOAM_Frame0[4] = {
const u16 sParticleChargedWaveBeamTrailOam_Frame0[4] = {
0x1,
0xfc, 0x1fc, 0x20c7
};
const u16 sParticleChargedWaveBeamTrailOAM_Frame1[7] = {
const u16 sParticleChargedWaveBeamTrailOam_Frame1[7] = {
0x2,
OBJ_SHAPE_HORIZONTAL | 0xf8, 0x1f8, 0x208e,
OBJ_SHAPE_HORIZONTAL | 0x0, OBJ_Y_FLIP | 0x1f8, 0x208e
};
const u16 sParticleChargedWaveBeamTrailOAM_Frame2[4] = {
const u16 sParticleChargedWaveBeamTrailOam_Frame2[4] = {
0x1,
0xf8, OBJ_SIZE_16x16 | 0x1f8, 0x20ae
};
const u16 sParticleChargedWaveBeamTrailOAM_Frame3[7] = {
const u16 sParticleChargedWaveBeamTrailOam_Frame3[7] = {
0x2,
OBJ_SHAPE_HORIZONTAL | 0xf8, 0x1f8, 0x20ee,
OBJ_SHAPE_HORIZONTAL | 0x0, OBJ_Y_FLIP | 0x1f8, 0x20ee
@ -1691,14 +1691,14 @@ const struct FrameData sChargedWaveBeamOAM_Vertical[8] = {
0x0
};
const struct FrameData sParticleChargedWaveBeamTrailOAM[5] = {
sParticleChargedWaveBeamTrailOAM_Frame0,
const struct FrameData sParticleChargedWaveBeamTrailOam[5] = {
sParticleChargedWaveBeamTrailOam_Frame0,
0x4,
sParticleChargedWaveBeamTrailOAM_Frame1,
sParticleChargedWaveBeamTrailOam_Frame1,
0x4,
sParticleChargedWaveBeamTrailOAM_Frame2,
sParticleChargedWaveBeamTrailOam_Frame2,
0x4,
sParticleChargedWaveBeamTrailOAM_Frame3,
sParticleChargedWaveBeamTrailOam_Frame3,
0x4,
NULL,
0x0
@ -2164,7 +2164,7 @@ const u16 sPlasmaBeamOAM_Diagonal_Wave_Unused_Frame2[13] = {
OBJ_SHAPE_VERTICAL | 0xc, OBJ_X_FLIP | OBJ_SIZE_8x32 | 0x1ff, 0x2089
};
const u16 sParticleChargedPlasmaBeamTrailOAM_Frame1[13] = {
const u16 sParticleChargedPlasmaBeamTrailOam_Frame1[13] = {
0x4,
0xf8, 0x1f8, 0x20ea,
0xf8, OBJ_X_FLIP | 0x0, 0x20ea,
@ -2172,7 +2172,7 @@ const u16 sParticleChargedPlasmaBeamTrailOAM_Frame1[13] = {
0x0, OBJ_X_FLIP | OBJ_Y_FLIP | 0x0, 0x20ea
};
const u16 sParticleChargedFullBeamTrailOAM_Frame1[13] = {
const u16 sParticleChargedFullBeamTrailOam_Frame1[13] = {
0x4,
0xf9, 0x1f9, 0x20ea,
0xf9, OBJ_X_FLIP | 0x1ff, 0x20ea,
@ -2180,7 +2180,7 @@ const u16 sParticleChargedFullBeamTrailOAM_Frame1[13] = {
0xff, OBJ_X_FLIP | OBJ_Y_FLIP | 0x1ff, 0x20ea
};
const u16 sParticleChargedPlasmaBeamTrailOAM_Frame2[13] = {
const u16 sParticleChargedPlasmaBeamTrailOam_Frame2[13] = {
0x4,
0xf8, 0x1f8, 0x20eb,
0xf8, OBJ_X_FLIP | 0x0, 0x20eb,
@ -2188,7 +2188,7 @@ const u16 sParticleChargedPlasmaBeamTrailOAM_Frame2[13] = {
0x0, OBJ_X_FLIP | OBJ_Y_FLIP | 0x0, 0x20eb
};
const u16 sParticleChargedFullBeamTrailOAM_Frame3[13] = {
const u16 sParticleChargedFullBeamTrailOam_Frame3[13] = {
0x4,
0xf9, 0x1f9, 0x20eb,
0xf9, OBJ_X_FLIP | 0x1ff, 0x20eb,
@ -2196,22 +2196,22 @@ const u16 sParticleChargedFullBeamTrailOAM_Frame3[13] = {
0xff, OBJ_X_FLIP | OBJ_Y_FLIP | 0x1ff, 0x20eb
};
const u16 sParticleChargedPlasmaBeamTrailOAM_Frame0[4] = {
const u16 sParticleChargedPlasmaBeamTrailOam_Frame0[4] = {
0x1,
0xfc, 0x1fc, 0x20c0
};
const u16 sParticleChargedFullBeamTrailOAM_Frame5[4] = {
const u16 sParticleChargedFullBeamTrailOam_Frame5[4] = {
0x1,
0xfc, 0x1fc, 0x2082
};
const u16 sParticleChargedFullBeamTrailOAM_Frame6[4] = {
const u16 sParticleChargedFullBeamTrailOam_Frame6[4] = {
0x1,
0xfc, 0x1fc, 0x20c4
};
const u16 sParticleChargedPlasmaBeamTrailOAM_Frame3[4] = {
const u16 sParticleChargedPlasmaBeamTrailOam_Frame3[4] = {
0x1,
0xfc, 0x1fc, 0x2086
};
@ -2456,35 +2456,35 @@ const struct FrameData sChargedPlasmaBeamOAM_Vertical_Wave[8] = {
0x0
};
const struct FrameData sParticleChargedPlasmaBeamTrailOAM[5] = {
sParticleChargedPlasmaBeamTrailOAM_Frame0,
const struct FrameData sParticleChargedPlasmaBeamTrailOam[5] = {
sParticleChargedPlasmaBeamTrailOam_Frame0,
0x4,
sParticleChargedPlasmaBeamTrailOAM_Frame1,
sParticleChargedPlasmaBeamTrailOam_Frame1,
0x4,
sParticleChargedPlasmaBeamTrailOAM_Frame2,
sParticleChargedPlasmaBeamTrailOam_Frame2,
0x4,
sParticleChargedPlasmaBeamTrailOAM_Frame3,
sParticleChargedPlasmaBeamTrailOam_Frame3,
0x4,
NULL,
0x0
};
const struct FrameData sParticleChargedFullBeamTrailOAM[9] = {
sParticleChargedPlasmaBeamTrailOAM_Frame1,
const struct FrameData sParticleChargedFullBeamTrailOam[9] = {
sParticleChargedPlasmaBeamTrailOam_Frame1,
0x3,
sParticleChargedFullBeamTrailOAM_Frame1,
sParticleChargedFullBeamTrailOam_Frame1,
0x3,
sParticleChargedPlasmaBeamTrailOAM_Frame2,
sParticleChargedPlasmaBeamTrailOam_Frame2,
0x3,
sParticleChargedFullBeamTrailOAM_Frame3,
sParticleChargedFullBeamTrailOam_Frame3,
0x3,
sParticleChargedPlasmaBeamTrailOAM_Frame0,
sParticleChargedPlasmaBeamTrailOam_Frame0,
0x4,
sParticleChargedFullBeamTrailOAM_Frame5,
sParticleChargedFullBeamTrailOam_Frame5,
0x4,
sParticleChargedFullBeamTrailOAM_Frame6,
sParticleChargedFullBeamTrailOam_Frame6,
0x4,
sParticleChargedPlasmaBeamTrailOAM_Frame3,
sParticleChargedPlasmaBeamTrailOam_Frame3,
0x4,
NULL,
0x0
@ -2564,22 +2564,22 @@ const u16 sChargedPistolOAM_Vertical_Frame1[10] = {
0x9, OBJ_SIZE_16x16 | 0x1f8, 0x20ca
};
const u16 sParticleChargedPistolTrailOAM_Frame0[4] = {
const u16 sParticleChargedPistolTrailOam_Frame0[4] = {
0x1,
0xfc, 0x1fc, 0x20ce
};
const u16 sParticleChargedPistolTrailOAM_Frame1[4] = {
const u16 sParticleChargedPistolTrailOam_Frame1[4] = {
0x1,
0xfc, 0x1fc, 0x20cf
};
const u16 sParticleChargedPistolTrailOAM_Frame2[4] = {
const u16 sParticleChargedPistolTrailOam_Frame2[4] = {
0x1,
0xfc, 0x1fc, 0x20ee
};
const u16 sParticleChargedPistolTrailOAM_Frame3[4] = {
const u16 sParticleChargedPistolTrailOam_Frame3[4] = {
0x1,
0xfc, 0x1fc, 0x20ef
};
@ -2638,28 +2638,28 @@ const struct FrameData sChargedPistolOAM_Vertical[3] = {
0x0
};
const struct FrameData sParticleChargedPistolTrailOAM[5] = {
sParticleChargedPistolTrailOAM_Frame0,
const struct FrameData sParticleChargedPistolTrailOam[5] = {
sParticleChargedPistolTrailOam_Frame0,
0x4,
sParticleChargedPistolTrailOAM_Frame1,
sParticleChargedPistolTrailOam_Frame1,
0x4,
sParticleChargedPistolTrailOAM_Frame2,
sParticleChargedPistolTrailOam_Frame2,
0x4,
sParticleChargedPistolTrailOAM_Frame3,
sParticleChargedPistolTrailOam_Frame3,
0x4,
NULL,
0x0
};
const struct FrameData sParticleEscapeOAM_Unused[2] = {
gParticleEscapeOAMFrames,
gParticleEscapeOamFrames,
UCHAR_MAX,
NULL,
0x0
};
const struct FrameData sParticleSamusReflectionOAM_Unused[2] = {
gParticleSamusReflectionOAMFrames,
gParticleSamusReflectionOamFrames,
UCHAR_MAX,
NULL,
0x0

172
src/data/sprites/zeela.c
View File

@ -12,155 +12,155 @@ const s16 sZeelaEyesFallingFromBottomSpeed[12] = {
const u32 sZeelaGfx[578] = INCBIN_U32("data/sprites/Zeela.gfx.lz");
const u16 sZeelaPAL[32] = INCBIN_U16("data/sprites/Zeela.pal");
const u16 sZeelaOAM_OnGround_Frame0[7] = {
const u16 sZeelaOam_OnGround_Frame0[7] = {
0x2,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x200,
OBJ_SHAPE_VERTICAL | 0xf0, 0x2, OBJ_SPRITE_OAM | 0x202
};
const u16 sZeelaOAM_OnGround_Frame1[10] = {
const u16 sZeelaOam_OnGround_Frame1[10] = {
0x3,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x203,
OBJ_SHAPE_VERTICAL | 0xf0, 0x2, OBJ_SPRITE_OAM | 0x205,
0xe8, 0x2, OBJ_SPRITE_OAM | 0x266
};
const u16 sZeelaOAM_OnGround_Frame2[7] = {
const u16 sZeelaOam_OnGround_Frame2[7] = {
0x2,
0xf0, OBJ_SIZE_16x16 | 0x1f6, OBJ_SPRITE_OAM | 0x240,
OBJ_SHAPE_VERTICAL | 0xf0, 0x6, OBJ_SPRITE_OAM | 0x242
};
const u16 sZeelaOAM_OnGround_Frame3[7] = {
const u16 sZeelaOam_OnGround_Frame3[7] = {
0x2,
0xf0, OBJ_SIZE_16x16 | 0x1f6, OBJ_SPRITE_OAM | 0x243,
OBJ_SHAPE_VERTICAL | 0xf0, 0x6, OBJ_SPRITE_OAM | 0x245
};
const u16 sZeelaOAM_TurningEdgeLeft_Frame0[10] = {
const u16 sZeelaOam_TurningEdgeLeft_Frame0[10] = {
0x3,
0xf3, OBJ_SIZE_16x16 | 0x1f4, OBJ_SPRITE_OAM | 0x22e,
OBJ_SHAPE_VERTICAL | 0xf3, 0x4, OBJ_SPRITE_OAM | 0x230,
0xeb, 0x1fc, OBJ_SPRITE_OAM | 0x20f
};
const u16 sZeelaOAM_TurningEdgeLeft_Frame1[10] = {
const u16 sZeelaOam_TurningEdgeLeft_Frame1[10] = {
0x3,
0xf1, OBJ_SIZE_16x16 | 0x1f8, OBJ_SPRITE_OAM | 0x21a,
OBJ_SHAPE_VERTICAL | 0xf1, 0x8, OBJ_SPRITE_OAM | 0x21c,
OBJ_SHAPE_HORIZONTAL | 0x1, 0x1f8, OBJ_SPRITE_OAM | 0x25a
};
const u16 sZeelaOAM_TurningEdgeLeft_Frame2[10] = {
const u16 sZeelaOam_TurningEdgeLeft_Frame2[10] = {
0x3,
0xf3, OBJ_SIZE_16x16 | 0x1f7, OBJ_SPRITE_OAM | 0x21d,
OBJ_SHAPE_VERTICAL | 0xf3, 0x7, OBJ_SPRITE_OAM | 0x21f,
0x3, 0x1ff, OBJ_SPRITE_OAM | 0x25e
};
const u16 sZeelaOAM_OnWall_Frame0[7] = {
const u16 sZeelaOam_OnWall_Frame0[7] = {
0x2,
0xf2, OBJ_SIZE_16x16 | 0x0, OBJ_SPRITE_OAM | 0x206,
OBJ_SHAPE_HORIZONTAL | 0x2, 0x0, OBJ_SPRITE_OAM | 0x246
};
const u16 sZeelaOAM_OnWall_Frame1[10] = {
const u16 sZeelaOam_OnWall_Frame1[10] = {
0x3,
0xf2, OBJ_SIZE_16x16 | 0x0, OBJ_SPRITE_OAM | 0x208,
OBJ_SHAPE_HORIZONTAL | 0x2, 0x0, OBJ_SPRITE_OAM | 0x248,
0x2, 0x10, OBJ_SPRITE_OAM | 0x267
};
const u16 sZeelaOAM_OnWall_Frame2[7] = {
const u16 sZeelaOam_OnWall_Frame2[7] = {
0x2,
0xf6, OBJ_SIZE_16x16 | 0x0, OBJ_SPRITE_OAM | 0x20a,
OBJ_SHAPE_HORIZONTAL | 0x6, 0x0, OBJ_SPRITE_OAM | 0x24a
};
const u16 sZeelaOAM_OnWall_Frame3[7] = {
const u16 sZeelaOam_OnWall_Frame3[7] = {
0x2,
0xf6, OBJ_SIZE_16x16 | 0x0, OBJ_SPRITE_OAM | 0x20c,
OBJ_SHAPE_HORIZONTAL | 0x6, 0x0, OBJ_SPRITE_OAM | 0x24c
};
const u16 sZeelaOAM_TurningCornerRight_Frame0[10] = {
const u16 sZeelaOam_TurningCornerRight_Frame0[10] = {
0x3,
0xf4, OBJ_SIZE_16x16 | 0x1f4, OBJ_SPRITE_OAM | 0x22e,
OBJ_SHAPE_VERTICAL | 0xf4, 0x4, OBJ_SPRITE_OAM | 0x230,
0xec, 0x1fc, OBJ_SPRITE_OAM | 0x20f
};
const u16 sZeelaOAM_TurningCornerRight_Frame1[10] = {
const u16 sZeelaOam_TurningCornerRight_Frame1[10] = {
0x3,
0xf0, OBJ_SIZE_16x16 | 0x1f4, OBJ_SPRITE_OAM | 0x21a,
OBJ_SHAPE_VERTICAL | 0xf0, 0x4, OBJ_SPRITE_OAM | 0x21c,
OBJ_SHAPE_HORIZONTAL | 0x0, 0x1f4, OBJ_SPRITE_OAM | 0x25a
};
const u16 sZeelaOAM_TurningCornerRight_Frame2[10] = {
const u16 sZeelaOam_TurningCornerRight_Frame2[10] = {
0x3,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x21d,
OBJ_SHAPE_VERTICAL | 0xf0, 0x2, OBJ_SPRITE_OAM | 0x21f,
0x0, 0x1fa, OBJ_SPRITE_OAM | 0x25e
};
const u16 sZeelaOAM_TurningCornerLeft_Frame0[10] = {
const u16 sZeelaOam_TurningCornerLeft_Frame0[10] = {
0x3,
0xf2, OBJ_SIZE_16x16 | 0x1fa, OBJ_SPRITE_OAM | 0x21d,
OBJ_SHAPE_VERTICAL | 0xf2, 0xa, OBJ_SPRITE_OAM | 0x21f,
0x2, 0x2, OBJ_SPRITE_OAM | 0x25e
};
const u16 sZeelaOAM_TurningCornerLeft_Frame1[10] = {
const u16 sZeelaOam_TurningCornerLeft_Frame1[10] = {
0x3,
0xf1, OBJ_SIZE_16x16 | 0x1fb, OBJ_SPRITE_OAM | 0x21a,
OBJ_SHAPE_VERTICAL | 0xf1, 0xb, OBJ_SPRITE_OAM | 0x21c,
OBJ_SHAPE_HORIZONTAL | 0x1, 0x1fb, OBJ_SPRITE_OAM | 0x25a
};
const u16 sZeelaOAM_TurningCornerLeft_Frame2[10] = {
const u16 sZeelaOam_TurningCornerLeft_Frame2[10] = {
0x3,
0xf5, OBJ_SIZE_16x16 | 0x1fa, OBJ_SPRITE_OAM | 0x22e,
OBJ_SHAPE_VERTICAL | 0xf5, 0xa, OBJ_SPRITE_OAM | 0x230,
0xed, 0x2, OBJ_SPRITE_OAM | 0x20f
};
const u16 sZeelaOAM_WalkingOnSlope_Frame0[10] = {
const u16 sZeelaOam_WalkingOnSlope_Frame0[10] = {
0x3,
0xf2, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x22e,
OBJ_SHAPE_VERTICAL | 0xf2, 0x2, OBJ_SPRITE_OAM | 0x230,
0xea, 0x1fa, OBJ_SPRITE_OAM | 0x20f
};
const u16 sZeelaOAM_WalkingOnSlope_Frame1[10] = {
const u16 sZeelaOam_WalkingOnSlope_Frame1[10] = {
0x3,
0xf0, OBJ_SIZE_16x16 | 0x1f3, OBJ_SPRITE_OAM | 0x211,
OBJ_SHAPE_VERTICAL | 0xf0, 0x3, OBJ_SPRITE_OAM | 0x213,
OBJ_SHAPE_HORIZONTAL | 0x0, 0x1fb, OBJ_SPRITE_OAM | 0x252
};
const u16 sZeelaOAM_WalkingOnSlope_Frame2[10] = {
const u16 sZeelaOam_WalkingOnSlope_Frame2[10] = {
0x3,
0xf0, OBJ_SIZE_16x16 | 0x1f4, OBJ_SPRITE_OAM | 0x214,
OBJ_SHAPE_VERTICAL | 0xf0, 0x4, OBJ_SPRITE_OAM | 0x216,
OBJ_SHAPE_HORIZONTAL | 0x0, 0x1fc, OBJ_SPRITE_OAM | 0x255
};
const u16 sZeelaOAM_WalkingOnSlope_Frame3[10] = {
const u16 sZeelaOam_WalkingOnSlope_Frame3[10] = {
0x3,
0xf4, OBJ_SIZE_16x16 | 0x1f3, OBJ_SPRITE_OAM | 0x237,
OBJ_SHAPE_VERTICAL | 0xf4, 0x3, OBJ_SPRITE_OAM | 0x239,
0xec, 0x1fb, OBJ_SPRITE_OAM | 0x218
};
const u16 sZeelaOAM_FallingOnGround_Frame0[10] = {
const u16 sZeelaOam_FallingOnGround_Frame0[10] = {
0x3,
OBJ_SHAPE_HORIZONTAL | 0xef, 0x1f7, OBJ_SPRITE_OAM | 0x268,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x200,
OBJ_SHAPE_VERTICAL | 0xf0, 0x2, OBJ_SPRITE_OAM | 0x202
};
const u16 sZeelaOAM_FallingOnGround_Frame1[13] = {
const u16 sZeelaOam_FallingOnGround_Frame1[13] = {
0x4,
OBJ_SHAPE_HORIZONTAL | 0xf0, 0x1f7, OBJ_SPRITE_OAM | 0x26a,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x203,
@ -168,28 +168,28 @@ const u16 sZeelaOAM_FallingOnGround_Frame1[13] = {
0xe8, 0x2, OBJ_SPRITE_OAM | 0x266
};
const u16 sZeelaOAM_FallingOnGround_Frame2[10] = {
const u16 sZeelaOam_FallingOnGround_Frame2[10] = {
0x3,
OBJ_SHAPE_HORIZONTAL | 0xf0, 0x1f8, OBJ_SPRITE_OAM | 0x274,
0xf0, OBJ_SIZE_16x16 | 0x1f6, OBJ_SPRITE_OAM | 0x240,
OBJ_SHAPE_VERTICAL | 0xf0, 0x6, OBJ_SPRITE_OAM | 0x242
};
const u16 sZeelaOAM_FallingOnGround_Frame3[10] = {
const u16 sZeelaOam_FallingOnGround_Frame3[10] = {
0x3,
OBJ_SHAPE_HORIZONTAL | 0xf0, 0x1f8, OBJ_SPRITE_OAM | 0x276,
0xf0, OBJ_SIZE_16x16 | 0x1f6, OBJ_SPRITE_OAM | 0x243,
OBJ_SHAPE_VERTICAL | 0xf0, 0x6, OBJ_SPRITE_OAM | 0x245
};
const u16 sZeelaOAM_FallingOnGround_Frame4[10] = {
const u16 sZeelaOam_FallingOnGround_Frame4[10] = {
0x3,
OBJ_SHAPE_HORIZONTAL | 0xef, 0x1f7, OBJ_SPRITE_OAM | 0x270,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x200,
OBJ_SHAPE_VERTICAL | 0xf0, 0x2, OBJ_SPRITE_OAM | 0x202
};
const u16 sZeelaOAM_FallingOnGround_Frame5[13] = {
const u16 sZeelaOam_FallingOnGround_Frame5[13] = {
0x4,
OBJ_SHAPE_HORIZONTAL | 0xf0, 0x1f7, OBJ_SPRITE_OAM | 0x272,
0xf0, OBJ_SIZE_16x16 | 0x1f2, OBJ_SPRITE_OAM | 0x203,
@ -197,21 +197,21 @@ const u16 sZeelaOAM_FallingOnGround_Frame5[13] = {
0xe8, 0x2, OBJ_SPRITE_OAM | 0x266
};
const u16 sZeelaOAM_FallingOnGround_Frame6[10] = {
const u16 sZeelaOam_FallingOnGround_Frame6[10] = {
0x3,
OBJ_SHAPE_HORIZONTAL | 0xf0, 0x1f8, OBJ_SPRITE_OAM | 0x26c,
0xf0, OBJ_SIZE_16x16 | 0x1f6, OBJ_SPRITE_OAM | 0x240,
OBJ_SHAPE_VERTICAL | 0xf0, 0x6, OBJ_SPRITE_OAM | 0x242
};
const u16 sZeelaOAM_FallingOnGround_Frame7[10] = {
const u16 sZeelaOam_FallingOnGround_Frame7[10] = {
0x3,
OBJ_SHAPE_HORIZONTAL | 0xf0, 0x1f8, OBJ_SPRITE_OAM | 0x26e,
0xf0, OBJ_SIZE_16x16 | 0x1f6, OBJ_SPRITE_OAM | 0x243,
OBJ_SHAPE_VERTICAL | 0xf0, 0x6, OBJ_SPRITE_OAM | 0x245
};
const u16 sZeelaOAM_FallingOnWall_Frame0[13] = {
const u16 sZeelaOam_FallingOnWall_Frame0[13] = {
0x4,
0xf7, 0x9, OBJ_SPRITE_OAM | 0x279,
0x0, 0x9, OBJ_SPRITE_OAM | 0x279,
@ -219,7 +219,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame0[13] = {
OBJ_SHAPE_HORIZONTAL | 0x2, 0x0, OBJ_SPRITE_OAM | 0x246
};
const u16 sZeelaOAM_FallingOnWall_Frame1[16] = {
const u16 sZeelaOam_FallingOnWall_Frame1[16] = {
0x5,
0xf7, 0x8, OBJ_SPRITE_OAM | 0x27a,
0x0, 0xa, OBJ_SPRITE_OAM | 0x27a,
@ -228,7 +228,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame1[16] = {
0x2, 0x10, OBJ_SPRITE_OAM | 0x267
};
const u16 sZeelaOAM_FallingOnWall_Frame2[13] = {
const u16 sZeelaOam_FallingOnWall_Frame2[13] = {
0x4,
0xf8, 0x8, OBJ_SPRITE_OAM | 0x27e,
0x1, 0x9, OBJ_SPRITE_OAM | 0x27e,
@ -236,7 +236,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame2[13] = {
OBJ_SHAPE_HORIZONTAL | 0x6, 0x0, OBJ_SPRITE_OAM | 0x24a
};
const u16 sZeelaOAM_FallingOnWall_Frame3[13] = {
const u16 sZeelaOam_FallingOnWall_Frame3[13] = {
0x4,
0xf8, 0x9, OBJ_SPRITE_OAM | 0x27d,
0x1, 0x8, OBJ_SPRITE_OAM | 0x27d,
@ -244,7 +244,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame3[13] = {
OBJ_SHAPE_HORIZONTAL | 0x6, 0x0, OBJ_SPRITE_OAM | 0x24c
};
const u16 sZeelaOAM_FallingOnWall_Frame4[13] = {
const u16 sZeelaOam_FallingOnWall_Frame4[13] = {
0x4,
0xf7, 0x9, OBJ_SPRITE_OAM | 0x27c,
0x0, 0x9, OBJ_SPRITE_OAM | 0x27c,
@ -252,7 +252,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame4[13] = {
OBJ_SHAPE_HORIZONTAL | 0x2, 0x0, OBJ_SPRITE_OAM | 0x246
};
const u16 sZeelaOAM_FallingOnWall_Frame5[16] = {
const u16 sZeelaOam_FallingOnWall_Frame5[16] = {
0x5,
0xf7, 0x8, OBJ_SPRITE_OAM | 0x27d,
0x0, 0xa, OBJ_SPRITE_OAM | 0x27d,
@ -261,7 +261,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame5[16] = {
0x2, 0x10, OBJ_SPRITE_OAM | 0x267
};
const u16 sZeelaOAM_FallingOnWall_Frame6[13] = {
const u16 sZeelaOam_FallingOnWall_Frame6[13] = {
0x4,
0xf8, 0x8, OBJ_SPRITE_OAM | 0x27b,
0x1, 0x9, OBJ_SPRITE_OAM | 0x27b,
@ -269,7 +269,7 @@ const u16 sZeelaOAM_FallingOnWall_Frame6[13] = {
OBJ_SHAPE_HORIZONTAL | 0x6, 0x0, OBJ_SPRITE_OAM | 0x24a
};
const u16 sZeelaOAM_FallingOnWall_Frame7[13] = {
const u16 sZeelaOam_FallingOnWall_Frame7[13] = {
0x4,
0xf8, 0x9, OBJ_SPRITE_OAM | 0x27a,
0x1, 0x8, OBJ_SPRITE_OAM | 0x27a,
@ -316,126 +316,126 @@ const u16 sZeelaEyesOAM_Exploding_Frame2[13] = {
0x5, 0x1f3, OBJ_SPRITE_OAM | 0x25f
};
const struct FrameData sZeelaOAM_OnGround[5] = {
sZeelaOAM_OnGround_Frame0,
const struct FrameData sZeelaOam_OnGround[5] = {
sZeelaOam_OnGround_Frame0,
0xC,
sZeelaOAM_OnGround_Frame1,
sZeelaOam_OnGround_Frame1,
0xC,
sZeelaOAM_OnGround_Frame2,
sZeelaOam_OnGround_Frame2,
0xC,
sZeelaOAM_OnGround_Frame3,
sZeelaOam_OnGround_Frame3,
0xC,
NULL,
0x0
};
const struct FrameData sZeelaOAM_TurningEdgeLeft[4] = {
sZeelaOAM_TurningEdgeLeft_Frame0,
const struct FrameData sZeelaOam_TurningEdgeLeft[4] = {
sZeelaOam_TurningEdgeLeft_Frame0,
0x2,
sZeelaOAM_TurningEdgeLeft_Frame1,
sZeelaOam_TurningEdgeLeft_Frame1,
0x2,
sZeelaOAM_TurningEdgeLeft_Frame2,
sZeelaOam_TurningEdgeLeft_Frame2,
0x2,
NULL,
0x0
};
const struct FrameData sZeelaOAM_TurningEdgeRight[4] = {
sZeelaOAM_TurningEdgeLeft_Frame2,
const struct FrameData sZeelaOam_TurningEdgeRight[4] = {
sZeelaOam_TurningEdgeLeft_Frame2,
0x2,
sZeelaOAM_TurningEdgeLeft_Frame1,
sZeelaOam_TurningEdgeLeft_Frame1,
0x2,
sZeelaOAM_TurningEdgeLeft_Frame0,
sZeelaOam_TurningEdgeLeft_Frame0,
0x2,
NULL,
0x0
};
const struct FrameData sZeelaOAM_OnWall[5] = {
sZeelaOAM_OnWall_Frame0,
const struct FrameData sZeelaOam_OnWall[5] = {
sZeelaOam_OnWall_Frame0,
0xC,
sZeelaOAM_OnWall_Frame1,
sZeelaOam_OnWall_Frame1,
0xC,
sZeelaOAM_OnWall_Frame2,
sZeelaOam_OnWall_Frame2,
0xC,
sZeelaOAM_OnWall_Frame3,
sZeelaOam_OnWall_Frame3,
0xC,
NULL,
0x0
};
const struct FrameData sZeelaOAM_TurningCornerRight[4] = {
sZeelaOAM_TurningCornerRight_Frame0,
const struct FrameData sZeelaOam_TurningCornerRight[4] = {
sZeelaOam_TurningCornerRight_Frame0,
0x2,
sZeelaOAM_TurningCornerRight_Frame1,
sZeelaOam_TurningCornerRight_Frame1,
0x2,
sZeelaOAM_TurningCornerRight_Frame2,
sZeelaOam_TurningCornerRight_Frame2,
0x2,
NULL,
0x0
};
const struct FrameData sZeelaOAM_TurningCornerLeft[4] = {
sZeelaOAM_TurningCornerLeft_Frame0,
const struct FrameData sZeelaOam_TurningCornerLeft[4] = {
sZeelaOam_TurningCornerLeft_Frame0,
0x2,
sZeelaOAM_TurningCornerLeft_Frame1,
sZeelaOam_TurningCornerLeft_Frame1,
0x2,
sZeelaOAM_TurningCornerLeft_Frame2,
sZeelaOam_TurningCornerLeft_Frame2,
0x2,
NULL,
0x0
};
const struct FrameData sZeelaOAM_WalkingOnSlope[5] = {
sZeelaOAM_WalkingOnSlope_Frame0,
const struct FrameData sZeelaOam_WalkingOnSlope[5] = {
sZeelaOam_WalkingOnSlope_Frame0,
0xC,
sZeelaOAM_WalkingOnSlope_Frame1,
sZeelaOam_WalkingOnSlope_Frame1,
0xC,
sZeelaOAM_WalkingOnSlope_Frame2,
sZeelaOam_WalkingOnSlope_Frame2,
0xC,
sZeelaOAM_WalkingOnSlope_Frame3,
sZeelaOam_WalkingOnSlope_Frame3,
0xC,
NULL,
0x0
};
const struct FrameData sZeelaOAM_FallingOnGround[9] = {
sZeelaOAM_FallingOnGround_Frame0,
const struct FrameData sZeelaOam_FallingOnGround[9] = {
sZeelaOam_FallingOnGround_Frame0,
0xC,
sZeelaOAM_FallingOnGround_Frame1,
sZeelaOam_FallingOnGround_Frame1,
0xC,
sZeelaOAM_FallingOnGround_Frame2,
sZeelaOam_FallingOnGround_Frame2,
0xC,
sZeelaOAM_FallingOnGround_Frame3,
sZeelaOam_FallingOnGround_Frame3,
0xC,
sZeelaOAM_FallingOnGround_Frame4,
sZeelaOam_FallingOnGround_Frame4,
0xC,
sZeelaOAM_FallingOnGround_Frame5,
sZeelaOam_FallingOnGround_Frame5,
0xC,
sZeelaOAM_FallingOnGround_Frame6,
sZeelaOam_FallingOnGround_Frame6,
0xC,
sZeelaOAM_FallingOnGround_Frame7,
sZeelaOam_FallingOnGround_Frame7,
0xC,
NULL,
0x0
};
const struct FrameData sZeelaOAM_FallingOnWall[9] = {
sZeelaOAM_FallingOnWall_Frame0,
const struct FrameData sZeelaOam_FallingOnWall[9] = {
sZeelaOam_FallingOnWall_Frame0,
0xC,
sZeelaOAM_FallingOnWall_Frame1,
sZeelaOam_FallingOnWall_Frame1,
0xC,
sZeelaOAM_FallingOnWall_Frame2,
sZeelaOam_FallingOnWall_Frame2,
0xC,
sZeelaOAM_FallingOnWall_Frame3,
sZeelaOam_FallingOnWall_Frame3,
0xC,
sZeelaOAM_FallingOnWall_Frame4,
sZeelaOam_FallingOnWall_Frame4,
0xC,
sZeelaOAM_FallingOnWall_Frame5,
sZeelaOam_FallingOnWall_Frame5,
0xC,
sZeelaOAM_FallingOnWall_Frame6,
sZeelaOam_FallingOnWall_Frame6,
0xC,
sZeelaOAM_FallingOnWall_Frame7,
sZeelaOam_FallingOnWall_Frame7,
0xC,
NULL,
0x0

294
src/data/visual_effects_data.c
View File

@ -1183,14 +1183,14 @@ const struct FrameData sEnvEffectOAM_LandingOnVeryDustyGround[18] = {
0
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame0[10] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame0[10] = {
0x3,
0xfe, OBJ_SIZE_16x16 | 0x1f8, 0x4188,
OBJ_SHAPE_VERTICAL | 0xfa, 0x1fb, 0x415f,
OBJ_SHAPE_VERTICAL | 0xfa, OBJ_X_FLIP | 0x1fd, 0x415f
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame1[13] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame1[13] = {
0x4,
0xfe, OBJ_X_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x4188,
OBJ_SHAPE_VERTICAL | 0xf7, OBJ_X_FLIP | 0x1fa, 0x415f,
@ -1198,7 +1198,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame1[13] = {
0xee, 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame2[19] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame2[19] = {
0x6,
0xfa, 0x1f6, 0x409d,
0xfa, OBJ_X_FLIP | 0x2, 0x409d,
@ -1208,7 +1208,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame2[19] = {
0xea, 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame3[19] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame3[19] = {
0x6,
0xf9, 0x1f5, 0x409d,
0xf9, OBJ_X_FLIP | 0x3, 0x409d,
@ -1218,7 +1218,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame3[19] = {
0xe7, OBJ_X_FLIP | OBJ_Y_FLIP | 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame4[22] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame4[22] = {
0x7,
0xf9, 0x1f4, 0x409e,
0xf9, OBJ_X_FLIP | 0x4, 0x409e,
@ -1229,7 +1229,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame4[22] = {
0xf8, 0x1fc, 0x409d
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame5[22] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame5[22] = {
0x7,
0xfa, 0x1f4, 0x409e,
0xfa, OBJ_X_FLIP | 0x4, 0x409e,
@ -1240,7 +1240,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame5[22] = {
0xf2, OBJ_X_FLIP | 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame6[22] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame6[22] = {
0x7,
0x6, OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x418e,
0xfa, 0x1f4, 0x409f,
@ -1251,7 +1251,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame6[22] = {
0xf4, OBJ_X_FLIP | 0x1fb, 0x418f
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame7[19] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame7[19] = {
0x6,
0x8, OBJ_SIZE_16x16 | 0x1f8, 0x41d4,
0xfa, 0x0, 0x415f,
@ -1261,7 +1261,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame7[19] = {
0xf8, 0x1fc, 0x40be
};
const u16 sParticleSpriteSplashWaterBigOAM_Frame8[13] = {
const u16 sParticleSpriteSplashWaterBigOam_Frame8[13] = {
0x4,
0xf8, 0x1f7, 0x40be,
0xf8, OBJ_X_FLIP | 0x1, 0x40be,
@ -1269,7 +1269,7 @@ const u16 sParticleSpriteSplashWaterBigOAM_Frame8[13] = {
0xf7, 0x1fc, 0x41a7
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame2[25] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame2[25] = {
0x8,
0xf9, 0x1f3, 0x409d,
0xf9, OBJ_X_FLIP | 0x5, 0x409d,
@ -1281,7 +1281,7 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame2[25] = {
0xea, OBJ_X_FLIP | 0x1ff, 0x415e
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame3[25] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame3[25] = {
0x8,
0xf8, 0x1f2, 0x409d,
0xf8, OBJ_X_FLIP | 0x6, 0x409d,
@ -1293,7 +1293,7 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame3[25] = {
0xe7, OBJ_Y_FLIP | 0x0, 0x415e
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame4[28] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame4[28] = {
0x9,
0xf8, 0x1f0, 0x409e,
0xf8, OBJ_X_FLIP | 0x8, 0x409e,
@ -1306,7 +1306,7 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame4[28] = {
0xea, 0x1, 0x415e
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame5[28] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame5[28] = {
0x9,
0xf9, 0x1ef, 0x409e,
0xf9, OBJ_X_FLIP | 0x9, 0x409e,
@ -1319,7 +1319,7 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame5[28] = {
0xf2, 0x4, 0x415e
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame6[25] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame6[25] = {
0x8,
0x6, OBJ_X_FLIP | OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1ef, 0x418e,
0x3, OBJ_X_FLIP | OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1, 0x418e,
@ -1331,7 +1331,7 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame6[25] = {
0xf4, OBJ_X_FLIP | 0x1fb, 0x418f
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame7[22] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame7[22] = {
0x7,
0x8, OBJ_SIZE_16x16 | 0x1ef, 0x41d4,
0xfa, 0x1ef, 0x40bd,
@ -1342,7 +1342,7 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame7[22] = {
0xf8, 0x1fc, 0x40be
};
const u16 sParticleSpriteSplashWaterHugeOAM_Frame8[16] = {
const u16 sParticleSpriteSplashWaterHugeOam_Frame8[16] = {
0x5,
0xf8, 0x1f2, 0x40be,
0xf8, OBJ_X_FLIP | 0x6, 0x40be,
@ -1351,41 +1351,41 @@ const u16 sParticleSpriteSplashWaterHugeOAM_Frame8[16] = {
0xf7, 0x1fc, 0x41a7
};
const u16 sParticleSpriteSplashWaterSmallOAM_Frame0[7] = {
const u16 sParticleSpriteSplashWaterSmallOam_Frame0[7] = {
0x2,
0xf9, OBJ_X_FLIP | 0x1f8, 0x409d,
0xf9, 0x0, 0x409d
};
const u16 sParticleSpriteSplashWaterSmallOAM_Frame1[10] = {
const u16 sParticleSpriteSplashWaterSmallOam_Frame1[10] = {
0x3,
0xf9, OBJ_X_FLIP | 0x1f7, 0x409e,
0xf9, 0x1, 0x409e,
0xf6, 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterSmallOAM_Frame2[10] = {
const u16 sParticleSpriteSplashWaterSmallOam_Frame2[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f7, 0x409f,
0xf8, 0x1, 0x409f,
0xf3, 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterSmallOAM_Frame3[10] = {
const u16 sParticleSpriteSplashWaterSmallOam_Frame3[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f7, 0x40bd,
0xf8, 0x1, 0x40bd,
0xf1, 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterSmallOAM_Frame4[10] = {
const u16 sParticleSpriteSplashWaterSmallOam_Frame4[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f8, 0x40be,
0xf8, 0x0, 0x40be,
0xf4, OBJ_X_FLIP | 0x1fc, 0x415e
};
const u16 sParticleSpriteSplashWaterSmallOAM_Frame5[16] = {
const u16 sParticleSpriteSplashWaterSmallOam_Frame5[16] = {
0x5,
0xf9, OBJ_X_FLIP | 0x1f8, 0x40be,
0xf9, 0x0, 0x40be,
@ -1394,14 +1394,14 @@ const u16 sParticleSpriteSplashWaterSmallOAM_Frame5[16] = {
0xf5, OBJ_X_FLIP | 0x0, 0x41a7
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame0[10] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame0[10] = {
0x3,
0xfe, OBJ_SIZE_16x16 | 0x1f8, 0x3188,
OBJ_SHAPE_VERTICAL | 0xfa, 0x1fb, 0x315f,
OBJ_SHAPE_VERTICAL | 0xfa, OBJ_X_FLIP | 0x1fd, 0x315f
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame1[13] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame1[13] = {
0x4,
0xfe, OBJ_X_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x3188,
OBJ_SHAPE_VERTICAL | 0xf7, OBJ_X_FLIP | 0x1fa, 0x315f,
@ -1409,7 +1409,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame1[13] = {
0xee, 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame2[19] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame2[19] = {
0x6,
0xfa, 0x1f6, 0x309d,
0xfa, OBJ_X_FLIP | 0x2, 0x309d,
@ -1419,7 +1419,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame2[19] = {
0xea, 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame3[19] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame3[19] = {
0x6,
0xf9, 0x1f5, 0x309d,
0xf9, OBJ_X_FLIP | 0x3, 0x309d,
@ -1429,7 +1429,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame3[19] = {
0xe7, OBJ_X_FLIP | OBJ_Y_FLIP | 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame4[22] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame4[22] = {
0x7,
0xf9, 0x1f4, 0x309e,
0xf9, OBJ_X_FLIP | 0x4, 0x309e,
@ -1440,7 +1440,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame4[22] = {
0xf8, 0x1fc, 0x309d
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame5[22] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame5[22] = {
0x7,
0xfa, 0x1f4, 0x309e,
0xfa, OBJ_X_FLIP | 0x4, 0x309e,
@ -1451,7 +1451,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame5[22] = {
0xf2, OBJ_X_FLIP | 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame6[22] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame6[22] = {
0x7,
0x6, OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x318e,
0xfa, 0x1f4, 0x309f,
@ -1462,7 +1462,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame6[22] = {
0xf4, OBJ_X_FLIP | 0x1fb, 0x318f
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame7[19] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame7[19] = {
0x6,
0x8, OBJ_SIZE_16x16 | 0x1f8, 0x31d4,
0xfa, 0x0, 0x315f,
@ -1472,7 +1472,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame7[19] = {
0xf8, 0x1fc, 0x30be
};
const u16 sParticleSpriteSplashLavaBigOAM_Frame8[13] = {
const u16 sParticleSpriteSplashLavaBigOam_Frame8[13] = {
0x4,
0xf8, 0x1f7, 0x30be,
0xf8, OBJ_X_FLIP | 0x1, 0x30be,
@ -1480,7 +1480,7 @@ const u16 sParticleSpriteSplashLavaBigOAM_Frame8[13] = {
0xf7, 0x1fc, 0x31a7
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame2[25] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame2[25] = {
0x8,
0xf9, 0x1f3, 0x309d,
0xf9, OBJ_X_FLIP | 0x5, 0x309d,
@ -1492,7 +1492,7 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame2[25] = {
0xea, OBJ_X_FLIP | 0x1ff, 0x315e
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame3[25] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame3[25] = {
0x8,
0xf8, 0x1f2, 0x309d,
0xf8, OBJ_X_FLIP | 0x6, 0x309d,
@ -1504,7 +1504,7 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame3[25] = {
0xe7, OBJ_Y_FLIP | 0x0, 0x315e
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame4[28] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame4[28] = {
0x9,
0xf8, 0x1f0, 0x309e,
0xf8, OBJ_X_FLIP | 0x8, 0x309e,
@ -1517,7 +1517,7 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame4[28] = {
0xea, 0x1, 0x315e
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame5[28] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame5[28] = {
0x9,
0xf9, 0x1ef, 0x309e,
0xf9, OBJ_X_FLIP | 0x9, 0x309e,
@ -1530,7 +1530,7 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame5[28] = {
0xf2, 0x4, 0x315e
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame6[25] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame6[25] = {
0x8,
0x6, OBJ_X_FLIP | OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1ef, 0x318e,
0x3, OBJ_X_FLIP | OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1, 0x318e,
@ -1542,7 +1542,7 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame6[25] = {
0xf4, OBJ_X_FLIP | 0x1fb, 0x318f
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame7[22] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame7[22] = {
0x7,
0x8, OBJ_SIZE_16x16 | 0x1ef, 0x31d4,
0xfa, 0x1ef, 0x30bd,
@ -1553,7 +1553,7 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame7[22] = {
0xf8, 0x1fc, 0x30be
};
const u16 sParticleSpriteSplashLavaHugeOAM_Frame8[16] = {
const u16 sParticleSpriteSplashLavaHugeOam_Frame8[16] = {
0x5,
0xf8, 0x1f2, 0x30be,
0xf8, OBJ_X_FLIP | 0x6, 0x30be,
@ -1562,41 +1562,41 @@ const u16 sParticleSpriteSplashLavaHugeOAM_Frame8[16] = {
0xf7, 0x1fc, 0x31a7
};
const u16 sParticleSpriteSplashLavaSmallOAM_Frame0[7] = {
const u16 sParticleSpriteSplashLavaSmallOam_Frame0[7] = {
0x2,
0xf9, OBJ_X_FLIP | 0x1f8, 0x309d,
0xf9, 0x0, 0x309d
};
const u16 sParticleSpriteSplashLavaSmallOAM_Frame1[10] = {
const u16 sParticleSpriteSplashLavaSmallOam_Frame1[10] = {
0x3,
0xf9, OBJ_X_FLIP | 0x1f7, 0x309e,
0xf9, 0x1, 0x309e,
0xf6, 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaSmallOAM_Frame2[10] = {
const u16 sParticleSpriteSplashLavaSmallOam_Frame2[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f7, 0x309f,
0xf8, 0x1, 0x309f,
0xf3, 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaSmallOAM_Frame3[10] = {
const u16 sParticleSpriteSplashLavaSmallOam_Frame3[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f7, 0x30bd,
0xf8, 0x1, 0x30bd,
0xf1, 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaSmallOAM_Frame4[10] = {
const u16 sParticleSpriteSplashLavaSmallOam_Frame4[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f8, 0x30be,
0xf8, 0x0, 0x30be,
0xf4, OBJ_X_FLIP | 0x1fc, 0x315e
};
const u16 sParticleSpriteSplashLavaSmallOAM_Frame5[16] = {
const u16 sParticleSpriteSplashLavaSmallOam_Frame5[16] = {
0x5,
0xf9, OBJ_X_FLIP | 0x1f8, 0x30be,
0xf9, 0x0, 0x30be,
@ -1605,14 +1605,14 @@ const u16 sParticleSpriteSplashLavaSmallOAM_Frame5[16] = {
0xf5, OBJ_X_FLIP | 0x0, 0x31a7
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame0[10] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame0[10] = {
0x3,
0xfe, OBJ_SIZE_16x16 | 0x1f8, 0x5188,
OBJ_SHAPE_VERTICAL | 0xfa, 0x1fb, 0x515f,
OBJ_SHAPE_VERTICAL | 0xfa, OBJ_X_FLIP | 0x1fd, 0x515f
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame1[13] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame1[13] = {
0x4,
0xfe, OBJ_X_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x5188,
OBJ_SHAPE_VERTICAL | 0xf7, OBJ_X_FLIP | 0x1fa, 0x515f,
@ -1620,7 +1620,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame1[13] = {
0xee, 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame2[19] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame2[19] = {
0x6,
0xfa, 0x1f6, 0x509d,
0xfa, OBJ_X_FLIP | 0x2, 0x509d,
@ -1630,7 +1630,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame2[19] = {
0xea, 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame3[19] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame3[19] = {
0x6,
0xf9, 0x1f5, 0x509d,
0xf9, OBJ_X_FLIP | 0x3, 0x509d,
@ -1640,7 +1640,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame3[19] = {
0xe7, OBJ_X_FLIP | OBJ_Y_FLIP | 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame4[22] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame4[22] = {
0x7,
0xf9, 0x1f4, 0x509e,
0xf9, OBJ_X_FLIP | 0x4, 0x509e,
@ -1651,7 +1651,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame4[22] = {
0xf8, 0x1fc, 0x509d
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame5[22] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame5[22] = {
0x7,
0xfa, 0x1f4, 0x509e,
0xfa, OBJ_X_FLIP | 0x4, 0x509e,
@ -1662,7 +1662,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame5[22] = {
0xf2, OBJ_X_FLIP | 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame6[22] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame6[22] = {
0x7,
0x6, OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1f8, 0x518e,
0xfa, 0x1f4, 0x509f,
@ -1673,7 +1673,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame6[22] = {
0xf4, OBJ_X_FLIP | 0x1fb, 0x518f
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame7[19] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame7[19] = {
0x6,
0x8, OBJ_SIZE_16x16 | 0x1f8, 0x51d4,
0xfa, 0x0, 0x515f,
@ -1683,7 +1683,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame7[19] = {
0xf8, 0x1fc, 0x50be
};
const u16 sParticleSpriteSplashAcidBigOAM_Frame8[13] = {
const u16 sParticleSpriteSplashAcidBigOam_Frame8[13] = {
0x4,
0xf8, 0x1f7, 0x50be,
0xf8, OBJ_X_FLIP | 0x1, 0x50be,
@ -1691,7 +1691,7 @@ const u16 sParticleSpriteSplashAcidBigOAM_Frame8[13] = {
0xf7, 0x1fc, 0x51a7
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame2[25] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame2[25] = {
0x8,
0xf9, 0x1f3, 0x509d,
0xf9, OBJ_X_FLIP | 0x5, 0x509d,
@ -1703,7 +1703,7 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame2[25] = {
0xea, OBJ_X_FLIP | 0x1ff, 0x515e
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame3[25] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame3[25] = {
0x8,
0xf8, 0x1f2, 0x509d,
0xf8, OBJ_X_FLIP | 0x6, 0x509d,
@ -1715,7 +1715,7 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame3[25] = {
0xe7, OBJ_Y_FLIP | 0x0, 0x515e
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame4[28] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame4[28] = {
0x9,
0xf8, 0x1f0, 0x509e,
0xf8, OBJ_X_FLIP | 0x8, 0x509e,
@ -1728,7 +1728,7 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame4[28] = {
0xea, 0x1, 0x515e
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame5[28] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame5[28] = {
0x9,
0xf9, 0x1ef, 0x509e,
0xf9, OBJ_X_FLIP | 0x9, 0x509e,
@ -1741,7 +1741,7 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame5[28] = {
0xf2, 0x4, 0x515e
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame6[25] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame6[25] = {
0x8,
0x6, OBJ_X_FLIP | OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1ef, 0x518e,
0x3, OBJ_X_FLIP | OBJ_Y_FLIP | OBJ_SIZE_16x16 | 0x1, 0x518e,
@ -1753,7 +1753,7 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame6[25] = {
0xf4, OBJ_X_FLIP | 0x1fb, 0x518f
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame7[22] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame7[22] = {
0x7,
0x8, OBJ_SIZE_16x16 | 0x1ef, 0x51d4,
0xfa, 0x1ef, 0x50bd,
@ -1764,7 +1764,7 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame7[22] = {
0xf8, 0x1fc, 0x50be
};
const u16 sParticleSpriteSplashAcidHugeOAM_Frame8[16] = {
const u16 sParticleSpriteSplashAcidHugeOam_Frame8[16] = {
0x5,
0xf8, 0x1f2, 0x50be,
0xf8, OBJ_X_FLIP | 0x6, 0x50be,
@ -1773,41 +1773,41 @@ const u16 sParticleSpriteSplashAcidHugeOAM_Frame8[16] = {
0xf7, 0x1fc, 0x51a7
};
const u16 sParticleSpriteSplashAcidSmallOAM_Frame0[7] = {
const u16 sParticleSpriteSplashAcidSmallOam_Frame0[7] = {
0x2,
0xf9, OBJ_X_FLIP | 0x1f8, 0x509d,
0xf9, 0x0, 0x509d
};
const u16 sParticleSpriteSplashAcidSmallOAM_Frame1[10] = {
const u16 sParticleSpriteSplashAcidSmallOam_Frame1[10] = {
0x3,
0xf9, OBJ_X_FLIP | 0x1f7, 0x509e,
0xf9, 0x1, 0x509e,
0xf6, 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidSmallOAM_Frame2[10] = {
const u16 sParticleSpriteSplashAcidSmallOam_Frame2[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f7, 0x509f,
0xf8, 0x1, 0x509f,
0xf3, 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidSmallOAM_Frame3[10] = {
const u16 sParticleSpriteSplashAcidSmallOam_Frame3[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f7, 0x50bd,
0xf8, 0x1, 0x50bd,
0xf1, 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidSmallOAM_Frame4[10] = {
const u16 sParticleSpriteSplashAcidSmallOam_Frame4[10] = {
0x3,
0xf8, OBJ_X_FLIP | 0x1f8, 0x50be,
0xf8, 0x0, 0x50be,
0xf4, OBJ_X_FLIP | 0x1fc, 0x515e
};
const u16 sParticleSpriteSplashAcidSmallOAM_Frame5[16] = {
const u16 sParticleSpriteSplashAcidSmallOam_Frame5[16] = {
0x5,
0xf9, OBJ_X_FLIP | 0x1f8, 0x50be,
0xf9, 0x0, 0x50be,
@ -1816,189 +1816,189 @@ const u16 sParticleSpriteSplashAcidSmallOAM_Frame5[16] = {
0xf5, OBJ_X_FLIP | 0x0, 0x51a7
};
const struct FrameData sParticleSpriteSplashWaterBigOAM[10] = {
sParticleSpriteSplashWaterBigOAM_Frame0,
const struct FrameData sParticleSpriteSplashWaterBigOam[10] = {
sParticleSpriteSplashWaterBigOam_Frame0,
3,
sParticleSpriteSplashWaterBigOAM_Frame1,
sParticleSpriteSplashWaterBigOam_Frame1,
3,
sParticleSpriteSplashWaterBigOAM_Frame2,
sParticleSpriteSplashWaterBigOam_Frame2,
3,
sParticleSpriteSplashWaterBigOAM_Frame3,
sParticleSpriteSplashWaterBigOam_Frame3,
3,
sParticleSpriteSplashWaterBigOAM_Frame4,
sParticleSpriteSplashWaterBigOam_Frame4,
3,
sParticleSpriteSplashWaterBigOAM_Frame5,
sParticleSpriteSplashWaterBigOam_Frame5,
3,
sParticleSpriteSplashWaterBigOAM_Frame6,
sParticleSpriteSplashWaterBigOam_Frame6,
3,
sParticleSpriteSplashWaterBigOAM_Frame7,
sParticleSpriteSplashWaterBigOam_Frame7,
3,
sParticleSpriteSplashWaterBigOAM_Frame8,
sParticleSpriteSplashWaterBigOam_Frame8,
3,
NULL,
0
};
const struct FrameData sParticleSpriteSplashWaterHugeOAM[10] = {
sParticleSpriteSplashWaterBigOAM_Frame0,
const struct FrameData sParticleSpriteSplashWaterHugeOam[10] = {
sParticleSpriteSplashWaterBigOam_Frame0,
3,
sParticleSpriteSplashWaterBigOAM_Frame1,
sParticleSpriteSplashWaterBigOam_Frame1,
3,
sParticleSpriteSplashWaterHugeOAM_Frame2,
sParticleSpriteSplashWaterHugeOam_Frame2,
3,
sParticleSpriteSplashWaterHugeOAM_Frame3,
sParticleSpriteSplashWaterHugeOam_Frame3,
3,
sParticleSpriteSplashWaterHugeOAM_Frame4,
sParticleSpriteSplashWaterHugeOam_Frame4,
3,
sParticleSpriteSplashWaterHugeOAM_Frame5,
sParticleSpriteSplashWaterHugeOam_Frame5,
3,
sParticleSpriteSplashWaterHugeOAM_Frame6,
sParticleSpriteSplashWaterHugeOam_Frame6,
3,
sParticleSpriteSplashWaterHugeOAM_Frame7,
sParticleSpriteSplashWaterHugeOam_Frame7,
3,
sParticleSpriteSplashWaterHugeOAM_Frame8,
sParticleSpriteSplashWaterHugeOam_Frame8,
3,
NULL,0
};
const struct FrameData sParticleSpriteSplashWaterSmallOAM[7] = {
sParticleSpriteSplashWaterSmallOAM_Frame0,
const struct FrameData sParticleSpriteSplashWaterSmallOam[7] = {
sParticleSpriteSplashWaterSmallOam_Frame0,
4,
sParticleSpriteSplashWaterSmallOAM_Frame1,
sParticleSpriteSplashWaterSmallOam_Frame1,
4,
sParticleSpriteSplashWaterSmallOAM_Frame2,
sParticleSpriteSplashWaterSmallOam_Frame2,
4,
sParticleSpriteSplashWaterSmallOAM_Frame3,
sParticleSpriteSplashWaterSmallOam_Frame3,
4,
sParticleSpriteSplashWaterSmallOAM_Frame4,
sParticleSpriteSplashWaterSmallOam_Frame4,
4,
sParticleSpriteSplashWaterSmallOAM_Frame5,
sParticleSpriteSplashWaterSmallOam_Frame5,
4,
NULL,
0
};
const struct FrameData sParticleSpriteSplashLavaBigOAM[10] = {
sParticleSpriteSplashLavaBigOAM_Frame0,
const struct FrameData sParticleSpriteSplashLavaBigOam[10] = {
sParticleSpriteSplashLavaBigOam_Frame0,
3,
sParticleSpriteSplashLavaBigOAM_Frame1,
sParticleSpriteSplashLavaBigOam_Frame1,
3,
sParticleSpriteSplashLavaBigOAM_Frame2,
sParticleSpriteSplashLavaBigOam_Frame2,
3,
sParticleSpriteSplashLavaBigOAM_Frame3,
sParticleSpriteSplashLavaBigOam_Frame3,
3,
sParticleSpriteSplashLavaBigOAM_Frame4,
sParticleSpriteSplashLavaBigOam_Frame4,
3,
sParticleSpriteSplashLavaBigOAM_Frame5,
sParticleSpriteSplashLavaBigOam_Frame5,
3,
sParticleSpriteSplashLavaBigOAM_Frame6,
sParticleSpriteSplashLavaBigOam_Frame6,
3,
sParticleSpriteSplashLavaBigOAM_Frame7,
sParticleSpriteSplashLavaBigOam_Frame7,
3,
sParticleSpriteSplashLavaBigOAM_Frame8,
sParticleSpriteSplashLavaBigOam_Frame8,
3,
NULL,
0
};
const struct FrameData sParticleSpriteSplashLavaHugeOAM[10] = {
sParticleSpriteSplashLavaBigOAM_Frame0,
const struct FrameData sParticleSpriteSplashLavaHugeOam[10] = {
sParticleSpriteSplashLavaBigOam_Frame0,
3,
sParticleSpriteSplashLavaBigOAM_Frame1,
sParticleSpriteSplashLavaBigOam_Frame1,
3,
sParticleSpriteSplashLavaHugeOAM_Frame2,
sParticleSpriteSplashLavaHugeOam_Frame2,
3,
sParticleSpriteSplashLavaHugeOAM_Frame3,
sParticleSpriteSplashLavaHugeOam_Frame3,
3,
sParticleSpriteSplashLavaHugeOAM_Frame4,
sParticleSpriteSplashLavaHugeOam_Frame4,
3,
sParticleSpriteSplashLavaHugeOAM_Frame5,
sParticleSpriteSplashLavaHugeOam_Frame5,
3,
sParticleSpriteSplashLavaHugeOAM_Frame6,
sParticleSpriteSplashLavaHugeOam_Frame6,
3,
sParticleSpriteSplashLavaHugeOAM_Frame7,
sParticleSpriteSplashLavaHugeOam_Frame7,
3,
sParticleSpriteSplashLavaHugeOAM_Frame8,
sParticleSpriteSplashLavaHugeOam_Frame8,
3,
NULL,
0
};
const struct FrameData sParticleSpriteSplashLavaSmallOAM[7] = {
sParticleSpriteSplashLavaSmallOAM_Frame0,
const struct FrameData sParticleSpriteSplashLavaSmallOam[7] = {
sParticleSpriteSplashLavaSmallOam_Frame0,
4,
sParticleSpriteSplashLavaSmallOAM_Frame1,
sParticleSpriteSplashLavaSmallOam_Frame1,
4,
sParticleSpriteSplashLavaSmallOAM_Frame2,
sParticleSpriteSplashLavaSmallOam_Frame2,
4,
sParticleSpriteSplashLavaSmallOAM_Frame3,
sParticleSpriteSplashLavaSmallOam_Frame3,
4,
sParticleSpriteSplashLavaSmallOAM_Frame4,
sParticleSpriteSplashLavaSmallOam_Frame4,
4,
sParticleSpriteSplashLavaSmallOAM_Frame5,
sParticleSpriteSplashLavaSmallOam_Frame5,
4,
NULL,
0
};
const struct FrameData sParticleSpriteSplashAcidBigOAM[10] = {
sParticleSpriteSplashAcidBigOAM_Frame0,
const struct FrameData sParticleSpriteSplashAcidBigOam[10] = {
sParticleSpriteSplashAcidBigOam_Frame0,
3,
sParticleSpriteSplashAcidBigOAM_Frame1,
sParticleSpriteSplashAcidBigOam_Frame1,
3,
sParticleSpriteSplashAcidBigOAM_Frame2,
sParticleSpriteSplashAcidBigOam_Frame2,
3,
sParticleSpriteSplashAcidBigOAM_Frame3,
sParticleSpriteSplashAcidBigOam_Frame3,
3,
sParticleSpriteSplashAcidBigOAM_Frame4,
sParticleSpriteSplashAcidBigOam_Frame4,
3,
sParticleSpriteSplashAcidBigOAM_Frame5,
sParticleSpriteSplashAcidBigOam_Frame5,
3,
sParticleSpriteSplashAcidBigOAM_Frame6,
sParticleSpriteSplashAcidBigOam_Frame6,
3,
sParticleSpriteSplashAcidBigOAM_Frame7,
sParticleSpriteSplashAcidBigOam_Frame7,
3,
sParticleSpriteSplashAcidBigOAM_Frame8,
sParticleSpriteSplashAcidBigOam_Frame8,
3,
NULL,
0
};
const struct FrameData sParticleSpriteSplashAcidHugeOAM[10] = {
sParticleSpriteSplashAcidBigOAM_Frame0,
const struct FrameData sParticleSpriteSplashAcidHugeOam[10] = {
sParticleSpriteSplashAcidBigOam_Frame0,
3,
sParticleSpriteSplashAcidBigOAM_Frame1,
sParticleSpriteSplashAcidBigOam_Frame1,
3,
sParticleSpriteSplashAcidHugeOAM_Frame2,
sParticleSpriteSplashAcidHugeOam_Frame2,
3,
sParticleSpriteSplashAcidHugeOAM_Frame3,
sParticleSpriteSplashAcidHugeOam_Frame3,
3,
sParticleSpriteSplashAcidHugeOAM_Frame4,
sParticleSpriteSplashAcidHugeOam_Frame4,
3,
sParticleSpriteSplashAcidHugeOAM_Frame5,
sParticleSpriteSplashAcidHugeOam_Frame5,
3,
sParticleSpriteSplashAcidHugeOAM_Frame6,
sParticleSpriteSplashAcidHugeOam_Frame6,
3,
sParticleSpriteSplashAcidHugeOAM_Frame7,
sParticleSpriteSplashAcidHugeOam_Frame7,
3,
sParticleSpriteSplashAcidHugeOAM_Frame8,
sParticleSpriteSplashAcidHugeOam_Frame8,
3,
NULL,
0
};
const struct FrameData sParticleSpriteSplashAcidSmallOAM[7] = {
sParticleSpriteSplashAcidSmallOAM_Frame0,
const struct FrameData sParticleSpriteSplashAcidSmallOam[7] = {
sParticleSpriteSplashAcidSmallOam_Frame0,
4,
sParticleSpriteSplashAcidSmallOAM_Frame1,
sParticleSpriteSplashAcidSmallOam_Frame1,
4,
sParticleSpriteSplashAcidSmallOAM_Frame2,
sParticleSpriteSplashAcidSmallOam_Frame2,
4,
sParticleSpriteSplashAcidSmallOAM_Frame3,
sParticleSpriteSplashAcidSmallOam_Frame3,
4,
sParticleSpriteSplashAcidSmallOAM_Frame4,
sParticleSpriteSplashAcidSmallOam_Frame4,
4,
sParticleSpriteSplashAcidSmallOAM_Frame5,
sParticleSpriteSplashAcidSmallOam_Frame5,
4,
NULL,
0

14
src/escape.c
View File

@ -68,12 +68,12 @@ void EscapeUpdateOAM(void)
increment = 0x33C0;
gParticleEscapeOAMFrames[24] = gEscapeTimerDigits.hundredths + increment;
gParticleEscapeOAMFrames[21] = gEscapeTimerDigits.tenths + increment;
gParticleEscapeOAMFrames[15] = gEscapeTimerDigits.secondsOnes + increment;
gParticleEscapeOAMFrames[12] = gEscapeTimerDigits.secondsTens + increment;
gParticleEscapeOAMFrames[6] = gEscapeTimerDigits.minutesOnes + increment;
gParticleEscapeOAMFrames[3] = gEscapeTimerDigits.minutesTens + increment;
gParticleEscapeOamFrames[24] = gEscapeTimerDigits.hundredths + increment;
gParticleEscapeOamFrames[21] = gEscapeTimerDigits.tenths + increment;
gParticleEscapeOamFrames[15] = gEscapeTimerDigits.secondsOnes + increment;
gParticleEscapeOamFrames[12] = gEscapeTimerDigits.secondsTens + increment;
gParticleEscapeOamFrames[6] = gEscapeTimerDigits.minutesOnes + increment;
gParticleEscapeOamFrames[3] = gEscapeTimerDigits.minutesTens + increment;
}
/**
@ -96,7 +96,7 @@ void EscapeStart(void)
{
DMA_SET(3, sEscapeTimerDigitsGfx, VRAM_BASE + 0x17800, DMA_ENABLE << 16 | 0xB0);
DMA_SET(3, sEscapeTimerDigitsGfx + 1024, VRAM_BASE + 0x17c00, DMA_ENABLE << 16 | 0xB0);
DMA_SET(3, sParticleEscapeOAM, gParticleEscapeOAMFrames, DMA_ENABLE << 16 | sizeof(gParticleEscapeOAMFrames) / 2);
DMA_SET(3, sParticleEscapeOAM, gParticleEscapeOamFrames, DMA_ENABLE << 16 | sizeof(gParticleEscapeOamFrames) / 2);
ParticleSet(2, 141, PE_ESCAPE);
}

2
src/location_text.c
View File

@ -250,7 +250,7 @@ u8 LocationTextLoadAreaBannerGfx(void)
gfxSlot = 0x80; // Default
// Loop through sprites to try and find if an area banner is in the spriteset
for (count = 0; count < 0xF; count++)
for (count = 0; count < MAX_AMOUNT_OF_SPRITE_TYPES; count++)
{
if (gSpritesetSpritesID[count] == PSPRITE_AREA_BANNER)
{

4
src/oam_id.c
View File

@ -9,7 +9,7 @@
void UpdateMenuOamDataID(struct MenuOamData* pOam, u8 oamId)
{
pOam->oamID = oamId;
pOam->exists = oamId ? 2 : 0;
pOam->exists = oamId ? OAM_ID_CHANGED_FLAG : FALSE;
}
/**
@ -21,5 +21,5 @@ void UpdateMenuOamDataID(struct MenuOamData* pOam, u8 oamId)
void UpdateCutsceneOamDataID(struct CutsceneOamData* pOam, u8 oamId)
{
pOam->oamID = oamId;
pOam->exists = oamId ? 2 : 0;
pOam->exists = oamId ? OAM_ID_CHANGED_FLAG : FALSE;
}

1704
src/particle.c
View File

File diff suppressed because it is too large Load Diff

14
src/samus.c
View File

@ -5981,8 +5981,8 @@ void SamusUpdateGraphicsOAM(struct SamusData* pData, u8 direction)
// Update arm cannon OAM
pArmCannonAnim = &pArmCannonAnim[pData->currentAnimationFrame];
pPhysics->pArmCannonOAM = pArmCannonAnim->pOam;
pPhysics->unk_22 = *pPhysics->pArmCannonOAM;
pPhysics->pArmCannonOam = pArmCannonAnim->pOam;
pPhysics->unk_22 = *pPhysics->pArmCannonOam;
// Fetch current arm cannon graphics based on the current pose and arm cannon direction
switch (pose)
@ -6155,7 +6155,7 @@ void SamusUpdateGraphicsOAM(struct SamusData* pData, u8 direction)
pEffectAnim = &pEffectAnim[pScrew->currentAnimationFrame];
// Update OAM
pPhysics->pScrewSpeedOAM = pEffectAnim->pOam;
pPhysics->pScrewSpeedOam = pEffectAnim->pOam;
// Update graphics
pGraphics = pEffectAnim->pGraphics;
@ -6841,7 +6841,7 @@ void SamusDraw(void)
if (gSamusPhysics.unk_36 & 0x20)
{
src = gSamusPhysics.pScrewSpeedOAM;
src = gSamusPhysics.pScrewSpeedOam;
nextSlot += *src++;
for (; currSlot < nextSlot; currSlot++)
@ -6866,7 +6866,7 @@ void SamusDraw(void)
if (gSamusPhysics.unk_22 & 0x2000)
{
src = gSamusPhysics.pArmCannonOAM;
src = gSamusPhysics.pArmCannonOam;
part1 = *src++;
nextSlot += part1 & 0xFF;
@ -6914,7 +6914,7 @@ void SamusDraw(void)
if (gSamusPhysics.unk_22 & 0x1000)
{
src = gSamusPhysics.pArmCannonOAM;
src = gSamusPhysics.pArmCannonOam;
part1 = *src++;
nextSlot += part1 & 0xFF;
@ -6940,7 +6940,7 @@ void SamusDraw(void)
if (gSamusPhysics.unk_36 & 0x10)
{
src = gSamusPhysics.pScrewSpeedOAM;
src = gSamusPhysics.pScrewSpeedOam;
part1 = *src++;
futureSlot = nextSlot + (part1 & 0xFF);
if (futureSlot > 0x80)

81
src/sprite.c
View File

@ -142,8 +142,10 @@ void SpriteUpdate(void)
else
sPrimarySpritesAIPointers[pCurrent->spriteID]();
}
if (pCurrent->status & SPRITE_STATUS_EXISTS)
SpriteCheckOnScreen(pCurrent);
DMA_SET(3, &gCurrentSprite, &gSpriteData[count], DMA_ENABLE << 16 | (sizeof(struct SpriteData) * 2));
}
}
@ -257,12 +259,10 @@ void SpriteDrawAll(void)
for (drawOrder = 1; drawOrder < 9; drawOrder++)
{
i = 0;
for (pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; pSprite++)
for (i = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; i++, pSprite++)
{
if (gSpriteDrawOrder[i] == drawOrder)
SpriteDraw(pSprite, i);
i++;
}
}
}
@ -899,48 +899,49 @@ void SpriteInitPrimary(u8 spritesetSlot, u16 yPosition, u16 xPosition, u8 roomSl
u8 ramSlot;
struct SpriteData* pSprite;
ramSlot = 0x0;
for (pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; pSprite++)
for (ramSlot = 0, pSprite = gSpriteData; pSprite < gSpriteData + MAX_AMOUNT_OF_SPRITES; ramSlot++, pSprite++)
{
if (!(pSprite->status & SPRITE_STATUS_EXISTS))
if (pSprite->status & SPRITE_STATUS_EXISTS)
continue;
pSprite->status = SPRITE_STATUS_EXISTS;
spritesetSlot = MOD_AND(spritesetSlot, 128);
if (spritesetSlot > 0x10)
{
pSprite->status = SPRITE_STATUS_EXISTS;
spritesetSlot &= 0x7F;
if (spritesetSlot >= 0x11)
{
spritesetSlot--;
spritesetSlot &= 0xF;
spritesetSlot--;
spritesetSlot = MOD_AND(spritesetSlot, 16);
pSprite->spritesetGfxSlot = gSpritesetGfxSlots[spritesetSlot];
pSprite->spriteID = gSpritesetSpritesID[spritesetSlot];
}
else
{
pSprite->spritesetGfxSlot = 0x0;
pSprite->spriteID = spritesetSlot - 0x1;
}
pSprite->properties = 0x0;
pSprite->yPosition = (yPosition * BLOCK_SIZE) + BLOCK_SIZE;
pSprite->xPosition = (xPosition * BLOCK_SIZE) + (HALF_BLOCK_SIZE);
pSprite->roomSlot = roomSlot;
pSprite->bgPriority = 0x2;
pSprite->drawOrder = 0x4;
pSprite->pose = SPRITE_POSE_UNINITIALIZED;
pSprite->health = 0x0;
pSprite->invincibilityStunFlashTimer = 0x0;
pSprite->paletteRow = 0x0;
pSprite->frozenPaletteRowOffset = 0x0;
pSprite->absolutePaletteRow = 0x0;
pSprite->ignoreSamusCollisionTimer = 0x1;
pSprite->primarySpriteRamSlot = ramSlot;
pSprite->freezeTimer = 0x0;
pSprite->standingOnSprite = FALSE;
return;
pSprite->spritesetGfxSlot = gSpritesetGfxSlots[spritesetSlot];
pSprite->spriteID = gSpritesetSpritesID[spritesetSlot];
}
else
{
pSprite->spritesetGfxSlot = 0;
pSprite->spriteID = spritesetSlot - 1;
}
ramSlot++;
pSprite->properties = SP_NONE;
pSprite->yPosition = yPosition * BLOCK_SIZE + BLOCK_SIZE;
pSprite->xPosition = xPosition * BLOCK_SIZE + 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 = 1;
pSprite->primarySpriteRamSlot = ramSlot;
pSprite->freezeTimer = 0;
pSprite->standingOnSprite = FALSE;
break;
}
}

62
src/sprite_debris.c
View File

@ -28,8 +28,7 @@ void SpriteDebrisSetSplash(u16 oldY, u16 yPosition, u16 xPosition)
}
/**
* 117b4 | 4d4 |
* Processes a sprite debris (handles movement and checks if it should despawn)
* 117b4 | 4d4 | Processes a sprite debris (handles movement and checks if it should despawn)
*
* @param pDebris Sprite Debris Pointer
*/
@ -37,36 +36,37 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
{
u32 offset;
u16 oldY;
u32 block_top;
u32 blockTop;
s32 movement;
pDebris->frameCounter++;
if (pDebris->frameCounter == 0x0)
if (pDebris->frameCounter == 0)
{
pDebris->exists = FALSE;
return;
}
offset = pDebris->arrayOffset / 2;
if (offset > 0x8)
offset = 0x8;
if (offset > 8)
offset = 8;
oldY = pDebris->yPosition;
switch (pDebris->debrisType)
{
case 0x1:
if (pDebris->frameCounter < 0x9)
case 1:
if (pDebris->frameCounter < 9)
return;
case 0x11:
case 17:
movement = sDebris11YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition -= 0x1;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x81;
pDebris->arrayOffset = 0x0;
}
@ -89,10 +89,10 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris12YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition++;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x82;
pDebris->arrayOffset = 0x0;
}
@ -115,10 +115,10 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris13YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition += 0x2;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x83;
pDebris->arrayOffset = 0x0;
}
@ -138,10 +138,10 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris4YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition -= 0x2;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x84;
pDebris->arrayOffset = 0x0;
}
@ -161,12 +161,12 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris5YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition--;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
if (pDebris->frameCounter > 0x13)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x81;
pDebris->arrayOffset = 0x0;
}
@ -179,12 +179,12 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris6YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition++;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
if (pDebris->frameCounter > 0x13)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x82;
pDebris->arrayOffset = 0x0;
}
@ -197,12 +197,12 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris7YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition++;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
if (pDebris->frameCounter > 0x13)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x83;
pDebris->arrayOffset = 0x0;
}
@ -215,12 +215,12 @@ void SpriteDebrisProcess(struct SpriteDebris* pDebris)
movement = sDebris8YVelocity[offset];
pDebris->yPosition += movement;
pDebris->xPosition--;
block_top = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
blockTop = SpriteUtilCheckVerticalCollisionAtPositionSlopes(pDebris->yPosition, pDebris->xPosition);
if (gPreviousVerticalCollisionCheck != COLLISION_AIR)
{
if (pDebris->frameCounter > 0x13)
{
pDebris->yPosition = block_top;
pDebris->yPosition = blockTop;
pDebris->debrisType = 0x84;
pDebris->arrayOffset = 0x0;
}
@ -340,13 +340,13 @@ void SpriteDebrisDrawAll(void)
{
struct SpriteDebris* pDebris;
if (gGameModeSub1 == SUB_GAME_MODE_PLAYING)
if (gGameModeSub1 != SUB_GAME_MODE_PLAYING)
return;
for (pDebris = gSpriteDebris; pDebris < gSpriteDebris + MAX_AMOUNT_OF_SPRITE_DEBRIS; pDebris++)
{
for (pDebris = gSpriteDebris; pDebris < gSpriteDebris + MAX_AMOUNT_OF_SPRITE_DEBRIS; pDebris++)
{
if (pDebris->exists && pDebris->frameCounter != 0x0)
SpriteDebrisDraw(pDebris);
}
if (pDebris->exists && pDebris->frameCounter != 0)
SpriteDebrisDraw(pDebris);
}
}

2
src/sprites_AI/item_banner.c
View File

@ -69,7 +69,7 @@ void ItemBannerInit(void)
gfxSlot = 0x80; // Default
// Loop through sprites to try and find if an item banner is in the spriteset
for (count = 0; count < 0xF; count++)
for (count = 0; count < MAX_AMOUNT_OF_SPRITE_TYPES; count++)
{
if (gSpritesetSpritesID[count] == PSPRITE_ITEM_BANNER)
{

2
src/sprites_AI/ridley.c
View File

@ -964,7 +964,7 @@ void RidleyIdleInit(void)
gCurrentSprite.arrayOffset = 0;
gCurrentSprite.pose = RIDLEY_POSE_IDLE;
range = BLOCK_SIZE * 10 - PIXEL_SIZE / PIXEL_SIZE;
range = BLOCK_SIZE * 10 - ONE_SUB_PIXEL;
if (range < gSubSpriteData1.yPosition)
{
gCurrentSprite.timer = 0;

2
src/sprites_AI/ruins_test.c
View File

@ -2172,7 +2172,7 @@ void RuinsTestSamusReflectionEnd(void)
if (gCurrentSprite.xPosition - (QUARTER_BLOCK_SIZE - PIXEL_SIZE) < gSamusData.xPosition &&
gCurrentSprite.xPosition + (QUARTER_BLOCK_SIZE - PIXEL_SIZE) > gSamusData.xPosition &&
gSamusData.yPosition == gBossWork.work1 + (BLOCK_SIZE * 4 + QUARTER_BLOCK_SIZE * 3 - PIXEL_SIZE / PIXEL_SIZE))
gSamusData.yPosition == gBossWork.work1 + (BLOCK_SIZE * 4 + QUARTER_BLOCK_SIZE * 3 - ONE_SUB_PIXEL))
{
// Set samus in place
gSamusData.xPosition = gCurrentSprite.xPosition;

424
src/sprites_AI/zeela.c
View File

@ -135,34 +135,38 @@ void ZeelaUpdateHitbox(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_XFLIP)
{
gCurrentSprite.hitboxTopOffset = -0x18;
gCurrentSprite.hitboxBottomOffset = 0x18;
gCurrentSprite.hitboxLeftOffset = -0x38;
gCurrentSprite.hitboxRightOffset = 0x4;
// On right wall
gCurrentSprite.hitboxTopOffset = -ZEELA_RIGHT_HITBOX;
gCurrentSprite.hitboxBottomOffset = ZEELA_LEFT_HITBOX;
gCurrentSprite.hitboxLeftOffset = -ZEELA_EYES_HITBOX;
gCurrentSprite.hitboxRightOffset = ZEELA_LEGS_HITBOX;
}
else
{
gCurrentSprite.hitboxTopOffset = -0x18;
gCurrentSprite.hitboxBottomOffset = 0x18;
gCurrentSprite.hitboxLeftOffset = -0x4;
gCurrentSprite.hitboxRightOffset = 0x38;
// On left wall
gCurrentSprite.hitboxTopOffset = -ZEELA_LEFT_HITBOX;
gCurrentSprite.hitboxBottomOffset = ZEELA_RIGHT_HITBOX;
gCurrentSprite.hitboxLeftOffset = -ZEELA_LEGS_HITBOX;
gCurrentSprite.hitboxRightOffset = ZEELA_EYES_HITBOX;
}
}
else
{
if (gCurrentSprite.status & SPRITE_STATUS_YFLIP)
{
gCurrentSprite.hitboxTopOffset = -0x4;
gCurrentSprite.hitboxBottomOffset = 0x38;
gCurrentSprite.hitboxLeftOffset = -0x18;
gCurrentSprite.hitboxRightOffset = 0x18;
// On ceiling
gCurrentSprite.hitboxTopOffset = -ZEELA_LEGS_HITBOX;
gCurrentSprite.hitboxBottomOffset = ZEELA_EYES_HITBOX;
gCurrentSprite.hitboxLeftOffset = -ZEELA_LEFT_HITBOX;
gCurrentSprite.hitboxRightOffset = ZEELA_RIGHT_HITBOX;
}
else
{
gCurrentSprite.hitboxTopOffset = -0x38;
gCurrentSprite.hitboxBottomOffset = 0x4;
gCurrentSprite.hitboxLeftOffset = -0x18;
gCurrentSprite.hitboxRightOffset = 0x18;
// On ground
gCurrentSprite.hitboxTopOffset = -ZEELA_EYES_HITBOX;
gCurrentSprite.hitboxBottomOffset = ZEELA_LEGS_HITBOX;
gCurrentSprite.hitboxLeftOffset = -ZEELA_LEFT_HITBOX;
gCurrentSprite.hitboxRightOffset = ZEELA_RIGHT_HITBOX;
}
}
}
@ -171,10 +175,12 @@ void ZeelaUpdateHitbox(void)
* @brief 17578 | 48 | Sets the crawling OAM for a zeela
*
*/
void ZeelaSetCrawlingOAM(void)
void ZeelaSetCrawlingOam(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_UNKNOWN2)
gCurrentSprite.pOam = sZeelaOAM_OnWall;
{
gCurrentSprite.pOam = sZeelaOam_OnWall;
}
else
{
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
@ -182,26 +188,26 @@ void ZeelaSetCrawlingOAM(void)
else
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.pOam = sZeelaOAM_OnGround;
gCurrentSprite.pOam = sZeelaOam_OnGround;
}
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
/**
* @brief 175c0 | 30 | Sets the falling OAM for a zeela
*
*/
void ZeelaSetFallingOAM(void)
void ZeelaSetFallingOam(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_UNKNOWN2)
gCurrentSprite.pOam = sZeelaOAM_FallingOnWall;
gCurrentSprite.pOam = sZeelaOam_FallingOnWall;
else
gCurrentSprite.pOam = sZeelaOAM_FallingOnGround;
gCurrentSprite.pOam = sZeelaOam_FallingOnGround;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
/**
@ -215,10 +221,12 @@ void ZeelaInit(void)
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition, gCurrentSprite.xPosition);
if (gPreviousCollisionCheck & 0xF0)
{
gCurrentSprite.status &= ~SPRITE_STATUS_UNKNOWN2;
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - (BLOCK_SIZE + 0x4), gCurrentSprite.xPosition);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - (BLOCK_SIZE + PIXEL_SIZE), gCurrentSprite.xPosition);
if (gPreviousCollisionCheck & 0xF0)
{
gCurrentSprite.status &= ~SPRITE_STATUS_UNKNOWN2;
@ -228,7 +236,8 @@ void ZeelaInit(void)
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - HALF_BLOCK_SIZE,
gCurrentSprite.xPosition - (HALF_BLOCK_SIZE + 0x4));
gCurrentSprite.xPosition - (HALF_BLOCK_SIZE + PIXEL_SIZE));
if (gPreviousCollisionCheck & 0xF0)
{
gCurrentSprite.status |= SPRITE_STATUS_UNKNOWN2;
@ -239,6 +248,7 @@ void ZeelaInit(void)
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - HALF_BLOCK_SIZE,
gCurrentSprite.xPosition + HALF_BLOCK_SIZE);
if (gPreviousCollisionCheck & 0xF0)
{
gCurrentSprite.status |= SPRITE_STATUS_UNKNOWN2;
@ -256,18 +266,18 @@ void ZeelaInit(void)
}
gCurrentSprite.samusCollision = SSC_HURTS_SAMUS;
ZeelaSetCrawlingOAM();
ZeelaSetCrawlingOam();
ZeelaUpdateHitbox();
gCurrentSprite.health = GET_PSPRITE_HEALTH(gCurrentSprite.spriteID);
gCurrentSprite.drawDistanceTopOffset = 0x10;
gCurrentSprite.drawDistanceBottomOffset = 0x10;
gCurrentSprite.drawDistanceHorizontalOffset = 0x10;
gCurrentSprite.drawDistanceTopOffset = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE);
gCurrentSprite.drawDistanceBottomOffset = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE);
gCurrentSprite.drawDistanceHorizontalOffset = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE);
if (gCurrentSprite.spriteID == PSPRITE_ZEELA_RED)
{
gCurrentSprite.absolutePaletteRow = 0x1;
gCurrentSprite.paletteRow = 0x1;
gCurrentSprite.absolutePaletteRow = 1;
gCurrentSprite.paletteRow = 1;
}
}
@ -277,7 +287,7 @@ void ZeelaInit(void)
*/
void ZeelaIdleInit(void)
{
ZeelaSetCrawlingOAM();
ZeelaSetCrawlingOam();
gCurrentSprite.pose = ZEELA_POSE_IDLE;
}
@ -290,7 +300,7 @@ void ZeelaMove(void)
u16 speed;
u8 turning;
speed = 0x1;
speed = ONE_SUB_PIXEL;
turning = FALSE;
@ -304,6 +314,7 @@ void ZeelaMove(void)
{
if (gCurrentSprite.status & (SPRITE_STATUS_YFLIP | SPRITE_STATUS_UNKNOWN2))
gCurrentSprite.pose = ZEELA_POSE_FALLING_INIT;
return;
}
@ -322,7 +333,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition + HALF_BLOCK_SIZE, gCurrentSprite.xPosition - 0x4);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition + HALF_BLOCK_SIZE, gCurrentSprite.xPosition - PIXEL_SIZE);
if (gPreviousCollisionCheck == COLLISION_SOLID)
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -335,7 +346,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - 0x4, gCurrentSprite.xPosition);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - PIXEL_SIZE, gCurrentSprite.xPosition);
if (!(gPreviousCollisionCheck & 0xF0))
{
gCurrentSprite.status |= SPRITE_STATUS_FACING_RIGHT;
@ -344,7 +355,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - HALF_BLOCK_SIZE, gCurrentSprite.xPosition - 0x4);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - HALF_BLOCK_SIZE, gCurrentSprite.xPosition - PIXEL_SIZE);
if (gPreviousCollisionCheck == COLLISION_SOLID)
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -360,7 +371,7 @@ void ZeelaMove(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition, gCurrentSprite.xPosition - 0x4);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition, gCurrentSprite.xPosition - PIXEL_SIZE);
if (!(gPreviousCollisionCheck & 0xF0))
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -382,7 +393,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - 0x4, gCurrentSprite.xPosition - 0x4);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - PIXEL_SIZE, gCurrentSprite.xPosition - PIXEL_SIZE);
if (!(gPreviousCollisionCheck & 0xF0))
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -410,7 +421,7 @@ void ZeelaMove(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - 0x4, gCurrentSprite.xPosition);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - PIXEL_SIZE, gCurrentSprite.xPosition);
if (!(gPreviousCollisionCheck & 0xF))
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -432,7 +443,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - 0x4, gCurrentSprite.xPosition - 0x4);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - PIXEL_SIZE, gCurrentSprite.xPosition - PIXEL_SIZE);
if (!(gPreviousCollisionCheck & 0xF))
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -459,11 +470,11 @@ void ZeelaMove(void)
if (gPreviousVerticalCollisionCheck == COLLISION_AIR || gPreviousVerticalCollisionCheck & 0xF0)
{
if (gCurrentSprite.pOam != sZeelaOAM_OnGround)
if (gCurrentSprite.pOam != sZeelaOam_OnGround)
{
gCurrentSprite.pOam = sZeelaOAM_OnGround;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pOam = sZeelaOam_OnGround;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
@ -477,7 +488,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - 0x4, gCurrentSprite.xPosition + HALF_BLOCK_SIZE);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - PIXEL_SIZE, gCurrentSprite.xPosition + HALF_BLOCK_SIZE);
if (gPreviousCollisionCheck == COLLISION_SOLID)
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -490,7 +501,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition, gCurrentSprite.xPosition - 0x4);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition, gCurrentSprite.xPosition - PIXEL_SIZE);
if (gPreviousCollisionCheck == COLLISION_AIR)
{
gCurrentSprite.status |= SPRITE_STATUS_FACING_RIGHT;
@ -499,7 +510,7 @@ void ZeelaMove(void)
}
else
{
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - 0x4, gCurrentSprite.xPosition - HALF_BLOCK_SIZE);
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition - PIXEL_SIZE, gCurrentSprite.xPosition - HALF_BLOCK_SIZE);
if (gPreviousCollisionCheck == COLLISION_SOLID)
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_RIGHT;
@ -517,24 +528,24 @@ void ZeelaMove(void)
{
if (gPreviousVerticalCollisionCheck == COLLISION_LEFT_SLIGHT_FLOOR_SLOPE || gPreviousVerticalCollisionCheck == COLLISION_LEFT_STEEP_FLOOR_SLOPE)
{
if (gCurrentSprite.pOam != sZeelaOAM_WalkingOnSlope)
if (gCurrentSprite.pOam != sZeelaOam_WalkingOnSlope)
{
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.pOam = sZeelaOAM_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pOam = sZeelaOam_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
gCurrentSprite.xPosition += speed;
}
else
{
if (gCurrentSprite.pOam != sZeelaOAM_WalkingOnSlope)
if (gCurrentSprite.pOam != sZeelaOam_WalkingOnSlope)
{
gCurrentSprite.status |= SPRITE_STATUS_XFLIP;
gCurrentSprite.pOam = sZeelaOAM_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pOam = sZeelaOam_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
gCurrentSprite.xPosition += speed;
@ -544,24 +555,24 @@ void ZeelaMove(void)
{
if (gPreviousVerticalCollisionCheck == COLLISION_RIGHT_SLIGHT_FLOOR_SLOPE || gPreviousVerticalCollisionCheck == COLLISION_RIGHT_STEEP_FLOOR_SLOPE)
{
if (gCurrentSprite.pOam != sZeelaOAM_WalkingOnSlope)
if (gCurrentSprite.pOam != sZeelaOam_WalkingOnSlope)
{
gCurrentSprite.status |= SPRITE_STATUS_XFLIP;
gCurrentSprite.pOam = sZeelaOAM_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pOam = sZeelaOam_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
gCurrentSprite.xPosition -= speed;
}
else
{
if (gCurrentSprite.pOam != sZeelaOAM_WalkingOnSlope)
if (gCurrentSprite.pOam != sZeelaOam_WalkingOnSlope)
{
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.pOam = sZeelaOAM_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pOam = sZeelaOam_WalkingOnSlope;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
}
gCurrentSprite.xPosition -= speed;
@ -582,16 +593,16 @@ void ZeelaMove(void)
void ZeelaTurningAroundInit(void)
{
gCurrentSprite.pose = ZEELA_POSE_TURNING_AROUND;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
switch (gCurrentSprite.workVariable)
{
case ZEELA_TURNING_DIRECTION_BOTTOM_LEFT_CORNER:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeLeft;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeLeft;
else
gCurrentSprite.pOam = sZeelaOAM_TurningCornerRight;
gCurrentSprite.pOam = sZeelaOam_TurningCornerRight;
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.status &= ~SPRITE_STATUS_YFLIP;
@ -599,9 +610,9 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_TOP_RIGHT_EDGE:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeLeft;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeLeft;
else
gCurrentSprite.pOam = sZeelaOAM_TurningCornerRight;
gCurrentSprite.pOam = sZeelaOam_TurningCornerRight;
gCurrentSprite.status |= SPRITE_STATUS_XFLIP;
gCurrentSprite.status &= ~SPRITE_STATUS_YFLIP;
@ -609,9 +620,9 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_BOTTOM_RIGHT_EDGE:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningCornerRight;
gCurrentSprite.pOam = sZeelaOam_TurningCornerRight;
else
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeLeft;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeLeft;
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.status |= SPRITE_STATUS_YFLIP;
@ -619,9 +630,9 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_TOP_RIGHT_CORNER:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningCornerRight;
gCurrentSprite.pOam = sZeelaOam_TurningCornerRight;
else
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeLeft;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeLeft;
gCurrentSprite.status |= SPRITE_STATUS_XFLIP;
gCurrentSprite.status |= SPRITE_STATUS_YFLIP;
@ -629,9 +640,9 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_TOP_LEFT_EDGE:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningCornerLeft;
gCurrentSprite.pOam = sZeelaOam_TurningCornerLeft;
else
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeRight;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeRight;
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.status &= ~SPRITE_STATUS_YFLIP;
@ -639,9 +650,9 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_BOTTOM_RIGHT_CORNER:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeRight;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeRight;
else
gCurrentSprite.pOam = sZeelaOAM_TurningCornerLeft;
gCurrentSprite.pOam = sZeelaOam_TurningCornerLeft;
gCurrentSprite.status |= SPRITE_STATUS_XFLIP;
gCurrentSprite.status &= ~SPRITE_STATUS_YFLIP;
@ -649,9 +660,9 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_TOP_LEFT_CORNER:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningCornerLeft;
gCurrentSprite.pOam = sZeelaOam_TurningCornerLeft;
else
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeRight;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeRight;
gCurrentSprite.status &= ~SPRITE_STATUS_XFLIP;
gCurrentSprite.status |= SPRITE_STATUS_YFLIP;
@ -659,16 +670,16 @@ void ZeelaTurningAroundInit(void)
case ZEELA_TURNING_DIRECTION_BOTTOM_LEFT_EDGE:
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)
gCurrentSprite.pOam = sZeelaOAM_TurningEdgeRight;
gCurrentSprite.pOam = sZeelaOam_TurningEdgeRight;
else
gCurrentSprite.pOam = sZeelaOAM_TurningCornerLeft;
gCurrentSprite.pOam = sZeelaOam_TurningCornerLeft;
gCurrentSprite.status |= SPRITE_STATUS_XFLIP;
gCurrentSprite.status |= SPRITE_STATUS_YFLIP;
break;
default:
gCurrentSprite.status = 0x0;
gCurrentSprite.status = 0;
}
}
@ -782,10 +793,10 @@ void ZeelaTurning(void)
break;
default:
gCurrentSprite.status = 0x0;
gCurrentSprite.status = 0;
}
ZeelaSetCrawlingOAM();
ZeelaSetCrawlingOam();
ZeelaUpdateHitbox();
}
@ -796,7 +807,7 @@ void ZeelaTurning(void)
void ZeelaLandingInit_Unused(void)
{
gCurrentSprite.pose = ZEELA_POSE_LANDING;
ZeelaSetFallingOAM();
ZeelaSetFallingOam();
}
/**
@ -805,7 +816,7 @@ void ZeelaLandingInit_Unused(void)
*/
void ZeelaLanding(void)
{
gCurrentSprite.animationDurationCounter += 0x2;
gCurrentSprite.animationDurationCounter += 2;
if (ZeelaCheckCollidingWithAir())
gCurrentSprite.pose = ZEELA_POSE_FALLING_INIT;
@ -827,14 +838,14 @@ void ZeelaFallingInit(void)
gCurrentSprite.xPosition += HALF_BLOCK_SIZE;
}
else if (gCurrentSprite.status & SPRITE_STATUS_YFLIP)
gCurrentSprite.yPosition += 0x28;
gCurrentSprite.yPosition += HALF_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2;
gCurrentSprite.pose = ZEELA_POSE_FALLING;
gCurrentSprite.arrayOffset = 0x0;
gCurrentSprite.arrayOffset = 0;
gCurrentSprite.status &= ~(SPRITE_STATUS_XFLIP | SPRITE_STATUS_YFLIP | SPRITE_STATUS_UNKNOWN2);
ZeelaUpdateHitbox();
ZeelaSetFallingOAM();
ZeelaSetFallingOam();
}
/**
@ -892,16 +903,16 @@ void ZeelaDeath(void)
if (gCurrentSprite.status & SPRITE_STATUS_UNKNOWN2)
{
if (gCurrentSprite.status & SPRITE_STATUS_XFLIP)
xPosition -= 0x28;
xPosition -= HALF_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2;
else
xPosition += 0x28;
xPosition += HALF_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2;
}
else
{
if (gCurrentSprite.status & SPRITE_STATUS_YFLIP)
yPosition += 0x28;
yPosition += HALF_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2;
else
yPosition -= 0x28;
yPosition -= HALF_BLOCK_SIZE + QUARTER_BLOCK_SIZE / 2;
}
if (gCurrentSprite.spriteID == PSPRITE_ZEELA_RED)
@ -922,33 +933,34 @@ void ZeelaEyesInit(void)
gCurrentSprite.oamScaling = Q_8_8(1.f);
gCurrentSprite.properties |= SP_KILL_OFF_SCREEN;
gCurrentSprite.drawDistanceTopOffset = 0x8;
gCurrentSprite.drawDistanceBottomOffset = 0x8;
gCurrentSprite.drawDistanceHorizontalOffset = 0x8;
gCurrentSprite.drawDistanceTopOffset = SUB_PIXEL_TO_PIXEL(HALF_BLOCK_SIZE);
gCurrentSprite.drawDistanceBottomOffset = SUB_PIXEL_TO_PIXEL(HALF_BLOCK_SIZE);
gCurrentSprite.drawDistanceHorizontalOffset = SUB_PIXEL_TO_PIXEL(HALF_BLOCK_SIZE);
gCurrentSprite.hitboxTopOffset = -0x8;
gCurrentSprite.hitboxBottomOffset = 0x4;
gCurrentSprite.hitboxLeftOffset = -0x8;
gCurrentSprite.hitboxRightOffset = 0x8;
gCurrentSprite.hitboxTopOffset = -(PIXEL_SIZE * 2);
gCurrentSprite.hitboxBottomOffset = PIXEL_SIZE;
gCurrentSprite.hitboxLeftOffset = -(PIXEL_SIZE * 2);
gCurrentSprite.hitboxRightOffset = (PIXEL_SIZE * 2);
gCurrentSprite.pOam = sZeelaEyesOAM_Idle;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.arrayOffset = 0x0;
gCurrentSprite.arrayOffset = 0;
gCurrentSprite.pose = ZEELA_EYES_POSE_MOVING;
gCurrentSprite.samusCollision = SSC_HURTS_SAMUS_STOP_DIES_WHEN_HIT;
gCurrentSprite.drawOrder = 0x3;
gCurrentSprite.drawOrder = 3;
if (gSpriteRng & 0x1)
// Setup rotation, choose random direction
if (MOD_AND(gSpriteRng, 2))
{
gCurrentSprite.workVariable = TRUE;
gCurrentSprite.oamRotation = 0x80;
gCurrentSprite.oamRotation = PI;
}
else
{
gCurrentSprite.workVariable = FALSE;
gCurrentSprite.oamRotation = 0x0;
gCurrentSprite.oamRotation = 0;
}
}
@ -965,71 +977,73 @@ void ZeelaEyesMove(void)
SpriteUtilCheckCollisionAtPosition(gCurrentSprite.yPosition, gCurrentSprite.xPosition);
if (gPreviousCollisionCheck & 0xF0)
gCurrentSprite.pose = ZEELA_EYES_POSE_EXPLODING_INIT;
{
gCurrentSprite.pose = SPRITE_POSE_STOPPED;
return;
}
if (gCurrentSprite.roomSlot == 0)
{
offset = gCurrentSprite.arrayOffset;
yMovement = sZeelaEyesFallingFromUpSpeed[offset];
if (yMovement == SHORT_MAX)
{
yMovement = sZeelaEyesFallingFromUpSpeed[offset - 1];
gCurrentSprite.yPosition += yMovement;
}
else
{
gCurrentSprite.arrayOffset++;
gCurrentSprite.yPosition += yMovement;
}
xMovement = 1;
}
else if (gCurrentSprite.roomSlot == 1)
{
offset = gCurrentSprite.arrayOffset;
yMovement = sZeelaEyesFallingFromBottomSpeed[offset];
if (yMovement == SHORT_MAX)
{
yMovement = sZeelaEyesFallingFromBottomSpeed[offset - 1];
gCurrentSprite.yPosition += yMovement;
}
else
{
gCurrentSprite.arrayOffset++;
gCurrentSprite.yPosition += yMovement;
}
xMovement = 2;
}
else
{
if (gCurrentSprite.roomSlot == 0)
offset = gCurrentSprite.arrayOffset;
yMovement = sZeelaEyesFallingFromUpSpeed[offset];
if (yMovement == SHORT_MAX)
{
offset = gCurrentSprite.arrayOffset;
yMovement = sZeelaEyesFallingFromUpSpeed[offset];
if (yMovement == SHORT_MAX)
{
yMovement = sZeelaEyesFallingFromUpSpeed[offset - 1];
gCurrentSprite.yPosition += yMovement;
}
else
{
gCurrentSprite.arrayOffset++;
gCurrentSprite.yPosition += yMovement;
}
xMovement = 1;
}
else if (gCurrentSprite.roomSlot == 1)
{
offset = gCurrentSprite.arrayOffset;
yMovement = sZeelaEyesFallingFromBottomSpeed[offset];
if (yMovement == SHORT_MAX)
{
yMovement = sZeelaEyesFallingFromBottomSpeed[offset - 1];
gCurrentSprite.yPosition += yMovement;
}
else
{
gCurrentSprite.arrayOffset++;
gCurrentSprite.yPosition += yMovement;
}
xMovement = 2;
yMovement = sZeelaEyesFallingFromUpSpeed[offset - 1];
gCurrentSprite.yPosition += yMovement;
}
else
{
offset = gCurrentSprite.arrayOffset;
yMovement = sZeelaEyesFallingFromUpSpeed[offset];
if (yMovement == SHORT_MAX)
{
yMovement = sZeelaEyesFallingFromUpSpeed[offset - 1];
gCurrentSprite.yPosition += yMovement;
}
else
{
gCurrentSprite.arrayOffset++;
gCurrentSprite.yPosition += yMovement;
}
xMovement = 3;
gCurrentSprite.arrayOffset++;
gCurrentSprite.yPosition += yMovement;
}
if (gCurrentSprite.status & SPRITE_STATUS_XFLIP)
gCurrentSprite.xPosition += xMovement;
else
gCurrentSprite.xPosition -= xMovement;
if (gCurrentSprite.workVariable)
gCurrentSprite.oamRotation -= 0x14;
else
gCurrentSprite.oamRotation += 0x14;
xMovement = 3;
}
if (gCurrentSprite.status & SPRITE_STATUS_XFLIP)
gCurrentSprite.xPosition += xMovement;
else
gCurrentSprite.xPosition -= xMovement;
// Rotate
if (gCurrentSprite.workVariable)
gCurrentSprite.oamRotation -= PI / 6 - PI / PI;
else
gCurrentSprite.oamRotation += PI / 6 - PI / PI;
}
/**
@ -1042,10 +1056,10 @@ void ZeelaEyesExplodingInit(void)
gCurrentSprite.samusCollision = SSC_NONE;
gCurrentSprite.pOam = sZeelaEyesOAM_Exploding;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.bgPriority = 0x1;
gCurrentSprite.bgPriority = 1;
}
/**
@ -1055,6 +1069,7 @@ void ZeelaEyesExplodingInit(void)
void ZeelaEyesExploding(void)
{
gCurrentSprite.ignoreSamusCollisionTimer = 1;
if (SpriteUtilCheckEndCurrentSpriteAnim())
gCurrentSprite.status = 0;
}
@ -1072,50 +1087,51 @@ void Zeela(void)
SoundPlayNotAlreadyPlaying(0x148);
}
if (gCurrentSprite.freezeTimer != 0x0)
SpriteUtilUpdateFreezeTimer();
else
if (gCurrentSprite.freezeTimer != 0)
{
if (SpriteUtilIsSpriteStunned())
return;
SpriteUtilUpdateFreezeTimer();
return;
}
switch (gCurrentSprite.pose)
{
case 0x0:
ZeelaInit();
break;
if (SpriteUtilIsSpriteStunned())
return;
case ZEELA_POSE_IDLE_INIT:
ZeelaIdleInit();
switch (gCurrentSprite.pose)
{
case SPRITE_POSE_UNINITIALIZED:
ZeelaInit();
break;
case ZEELA_POSE_IDLE:
ZeelaMove();
break;
case ZEELA_POSE_IDLE_INIT:
ZeelaIdleInit();
case ZEELA_POSE_TURNING_AROUND_INIT:
ZeelaTurningAroundInit();
case ZEELA_POSE_TURNING_AROUND:
ZeelaTurning();
break;
case ZEELA_POSE_IDLE:
ZeelaMove();
break;
case ZEELA_POSE_LANDING_INIT:
ZeelaLandingInit_Unused();
case ZEELA_POSE_TURNING_AROUND_INIT:
ZeelaTurningAroundInit();
case ZEELA_POSE_TURNING_AROUND:
ZeelaTurning();
break;
case ZEELA_POSE_LANDING:
ZeelaLanding();
break;
case ZEELA_POSE_LANDING_INIT:
ZeelaLandingInit_Unused();
case ZEELA_POSE_FALLING_INIT:
ZeelaFallingInit();
case ZEELA_POSE_LANDING:
ZeelaLanding();
break;
case ZEELA_POSE_FALLING:
ZeelaFalling();
break;
case ZEELA_POSE_FALLING_INIT:
ZeelaFallingInit();
default:
ZeelaDeath();
}
case ZEELA_POSE_FALLING:
ZeelaFalling();
break;
default:
ZeelaDeath();
}
}
@ -1127,7 +1143,7 @@ void ZeelaEyes(void)
{
switch (gCurrentSprite.pose)
{
case 0:
case SPRITE_POSE_UNINITIALIZED:
ZeelaEyesInit();
case ZEELA_EYES_POSE_MOVING:

2
src/sram_misc.c
View File

@ -53,7 +53,7 @@ u8* DoSramOperation(u8 operation)
{
case SRAM_OPERATION_WRITE_FILE_SCREEN_OPTIONS:
DMA_SET(3, &sSramEwramPointer->fileScreenOptions_fileA, &sSramEwramPointer->fileScreenOptions_fileC,
DMA_ENABLE << 16 | sizeof(struct SaveFileScreenOptions) / sizeof(u16));
C_32_2_16(DMA_ENABLE, sizeof(struct SaveFileScreenOptions) / sizeof(u16)));
diff = SramWriteChecked((u8*)&sSramEwramPointer->fileScreenOptions_fileA,
(u8*)&sSramFlashPointer->fileScreenOptions_fileA, sizeof(struct SaveFileScreenOptions));

4
src/update_input.c
View File

@ -3,6 +3,10 @@
#include "structs/game_state.h"
#include "types.h"
/**
* @brief 968 | 38 | Updates the input
*
*/
void UpdateInput(void)
{
u16 keys;