Merge pull request #701 from Henny022p/cleanup/250302HEADmaster

Various code cleanup changes

1 files changed, 12 insertions, 6 deletions

diff --git a/src/enemy/armos.c b/src/enemy/armos.c
index 51daa2a8..873f8824 100644
--- a/src/enemy/armos.c
+++ b/src/enemy/armos.c
@@ -4,21 +4,27 @@
  *
  * @brief Armos enemy
  */
+#include "enemy/armos.h"
 #include "collision.h"
 #include "common.h"
 #include "enemy.h"
+#include "sound.h"
 #include "flags.h"
-#include "functions.h"
+#include "physics.h"
 #include "global.h"
 #include "hitbox.h"
 #include "tiles.h"
+#include "room.h"
+#include "player.h"
+#include "asm.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
     /*0x68*/ u8 unk_68[0x10];
     /*0x78*/ u16 unk_78;
     /*0x7a*/ u16 unk_7a;
-    /*0x7c*/ ScreenTransitionData* unk_7c;
+    /*0x7c*/ Transition* unk_7c;
     /*0x80*/ u8 unk_80;
     /*0x81*/ u8 unk_81;
     /*0x82*/ u8 unk_82;
@@ -66,11 +72,11 @@ void sub_080300E8(void) {
     }
 }
 
-void sub_08030118(u32 armosId) {
+void Armos_SetFlagFromTransition(u32 armosId) {
     if (((gRoomTransition.armos_data.field_0xac >> armosId) & 1) != 0) {
-        SetLocalFlagByBank(FLAG_BANK_3, armosId + 0x67);
+        SetLocalFlagByBank(FLAG_BANK_3, armosId + AMOS_00_00);
     } else {
-        ClearLocalFlagByBank(FLAG_BANK_3, armosId + 0x67);
+        ClearLocalFlagByBank(FLAG_BANK_3, armosId + AMOS_00_00);
     }
 }
 
@@ -132,7 +138,7 @@ void sub_0803026C(ArmosEntity* this) {
         this->unk_84 = (0x47d >> this->unk_80) & 1;
     }
     if (super->type2 != 0) {
-        this->unk_7c = (ScreenTransitionData*)GetCurrentRoomProperty(super->type2);
+        this->unk_7c = (Transition*)GetCurrentRoomProperty(super->type2);
     }
     this->unk_81 = super->health;
     sub_08030580(this);