merge master

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*);