diff options
| author | Henny022p <info@henny022.de> | 2022-01-31 17:30:51 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2022-01-31 17:30:51 +0100 |
| commit | 2a53ee4bf2ee7eea617280118c2188bffec77ae5 (patch) | |
| tree | 85ed631ab330f9ca3734bb77253a374e3ef0de21 /include/enemy.h | |
| parent | 9b60d9c5e24ed592524c25a9dc013417d6e7ee0c (diff) | |
| parent | 2b8d880ffc0a4548d25dc613d53a908d36362d84 (diff) | |
merge master
Diffstat (limited to 'include/enemy.h')
| -rw-r--r-- | include/enemy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/enemy.h b/include/enemy.h index 49d40b28..2e04b2af 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -64,7 +64,7 @@ typedef enum { /*0x21*/ FALLING_BOULDER, /*0x22*/ BOBOMB, /*0x23*/ WALL_MASTER_2, - /*0x24*/ GLEEROCK, + /*0x24*/ GLEEROK, /*0x25*/ VAATI_EYES_MACRO, /*0x26*/ TEKTITE, /*0x27*/ WIZZROBE_WIND, @@ -101,7 +101,7 @@ typedef enum { /*0x46*/ BOW_MOBLIN, /*0x47*/ LAKITU, /*0x48*/ LAKITU_CLOUD, - /*0x49*/ ENEMY_49, + /*0x49*/ TORCH_TRAP, /*0x4a*/ VAATI_REBORN_ENEMY, /*0x4b*/ VAATI_PROJECTILE, /*0x4c*/ BALL_CHAIN_SOLIDER, @@ -206,7 +206,7 @@ void Takkuri(Entity*); void BowMoblin(Entity*); void Lakitu(Entity*); void LakituCloud(Entity*); -void Enemy49(Entity*); +void TorchTrap(Entity*); void VaatiRebornEnemy(Entity*); void VaatiProjectile(Entity*); void BallChainSoldier(Entity*); |