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

Various code cleanup changes

1 files changed, 7 insertions, 5 deletions

diff --git a/src/object/giantBookLadder.c b/src/object/giantBookLadder.c
index 5f18d1b4..d0d602c5 100644
--- a/src/object/giantBookLadder.c
+++ b/src/object/giantBookLadder.c
@@ -4,10 +4,12 @@
  *
  * @brief Giant Book Ladder object
  */
-#include "manager.h"
 #include "map.h"
 #include "object.h"
+#include "asm.h"
+#include "room.h"
 #include "tiles.h"
+#include "game.h"
 
 typedef struct {
     Entity base;
@@ -16,7 +18,7 @@ typedef struct {
     u16 unk76;
 } GiantBookLadderEntity;
 
-void sub_0808E55C(GiantBookLadderEntity*);
+void GiantBookLadder_OnEnterRoom(GiantBookLadderEntity*);
 u32 sub_0808E670(GiantBookLadderEntity*);
 
 void GiantBookLadder(Entity* this) {
@@ -33,14 +35,14 @@ void GiantBookLadder(Entity* this) {
         this->spritePriority.b0 = spriteDefPtr[1];
         ((GiantBookLadderEntity*)this)->unk76 = 0;
         ((GiantBookLadderEntity*)this)->unk74 = COORD_TO_TILE(this);
-        sub_0808E55C((GiantBookLadderEntity*)this);
-        RegisterTransitionManager(this, sub_0808E55C, 0);
+        GiantBookLadder_OnEnterRoom((GiantBookLadderEntity*)this);
+        RegisterTransitionHandler(this, GiantBookLadder_OnEnterRoom, NULL);
     } else if ((this->type & 1) == 0) {
         sub_0808E670((GiantBookLadderEntity*)this);
     }
 }
 
-void sub_0808E55C(GiantBookLadderEntity* this) {
+void GiantBookLadder_OnEnterRoom(GiantBookLadderEntity* this) {
     u32 type;
     u32 uVar4;
     u32 unaff_r9;