1 files changed, 11 insertions, 12 deletions
diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c
index 034e8eb4..e566c480 100644
--- a/src/enemy/gyorgFemale.c
+++ b/src/enemy/gyorgFemale.c
@@ -9,10 +9,10 @@
 #include "collision.h"
 #include "enemy.h"
 #include "enemy/gyorg.h"
-#include "entity.h"
-#include "functions.h"
 #include "sound.h"
 #include "assets/map_offsets.h"
+#include "game.h"
+#include "functions.h"
 
 extern u8 gEntCount;
 extern u8 gMapDataTopSpecial[];
@@ -20,11 +20,10 @@ extern u8 gMapDataTopSpecial[];
 extern u16 gMapDataBottomSpecial[];
 
 extern u32 sub_08000E62(u32);
-extern void RegisterTransitionManager(void*, void (*)(), void (*)());
 
-void sub_08046498();
+void GyorgFemale_OnEnterRoom();
 void sub_0804660C(GyorgFemaleEntity*, u32);
-void sub_080464C0(GyorgFemaleEntity*);
+void GyorgFemale_Reset(GyorgFemaleEntity*);
 void GyorgFemale_SpawnChildren(GyorgFemaleEntity* this, bool32 unlimit_tmp);
 void sub_080465C8(void);
 void GyorgFemale_ProcessEyeHit(GyorgFemaleEntity* this);
@@ -92,13 +91,13 @@ void GyorgFemale_Setup(GyorgFemaleEntity* this) {
     MemClear(&gMapDataBottomSpecial, 0x8000);
     MemClear(&gMapDataTopSpecial, 0x8000);
     sub_0804660C(this, 0);
-    sub_080464C0(this);
+    GyorgFemale_Reset(this);
     gPlayerEntity.base.collisionLayer = 2;
     UpdateSpriteForCollisionLayer(&gPlayerEntity.base);
 #ifndef EU
-    RegisterTransitionManager(this, sub_08046498, 0);
+    RegisterTransitionHandler(this, GyorgFemale_OnEnterRoom, NULL);
 #else
-    RegisterTransitionManager(this, sub_080464C0, 0);
+    RegisterTransitionHandler(this, GyorgFemale_Reset, NULL);
 #endif
 }
 
@@ -110,7 +109,7 @@ void GyorgFemale_Action1(GyorgFemaleEntity* this) {
     } else {
         if (this->unk_79 & 0x40) {
             this->unk_79 &= ~0x40;
-            sub_080464C0(this);
+            GyorgFemale_Reset(this);
         }
     }
     sub_080465C8();
@@ -217,14 +216,14 @@ void GyorgFemale_Action3(GyorgFemaleEntity* this) {
 }
 
 #ifndef EU
-void sub_08046498(GyorgFemaleEntity* this) {
+void GyorgFemale_OnEnterRoom(GyorgFemaleEntity* this) {
     MemClear(&gMapDataBottomSpecial, 0x8000);
     MemClear(&gMapDataTopSpecial, 0x8000);
-    sub_080464C0(this);
+    GyorgFemale_Reset(this);
 }
 #endif
 
-void sub_080464C0(GyorgFemaleEntity* this) {
+void GyorgFemale_Reset(GyorgFemaleEntity* this) {
     static const MapDataDefinition* const gyorgMappings[] = {
         gGyorgMapping0,
         gGyorgMapping1,