1 files changed, 36 insertions, 21 deletions

diff --git a/src/roomInit.c b/src/roomInit.c
index 4c5dbfa7..4db08d58 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -2,25 +2,40 @@
 #include "common.h"
 #include "effects.h"
 #include "flags.h"
-#include "functions.h"
 #include "game.h"
 #include "item.h"
 #include "kinstone.h"
 #include "main.h"
-#include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "room.h"
+#include "player.h"
+#include "physics.h"
 #include "save.h"
 #include "screen.h"
 #include "screenTransitions.h"
 #include "sound.h"
 #include "tiles.h"
 #include "windcrest.h"
+#include "enemy/armos.h"
+#include "manager/lightManager.h"
+#include "manager/hyruleTownTileSetManager.h"
+#include "manager/staticBackgroundManager.h"
+#include "manager/verticalMinishPathBackgroundManager.h"
+#include "manager/horizontalMinishPathBackgroundManager.h"
+#include "manager/minishRaftersBackgroundManager.h"
+#include "manager/miscManager.h"
+#include "npc/bigGoron.h"
+#include "scroll.h"
+#include "subtask.h"
+#include "beanstalkSubtask.h"
+#include "fade.h"
 
 extern u32 sub_08060354(void);
-extern void sub_08057E64(void);
+extern void MinishVillageTileSetManger_LoadInitialGfxGroup(void);
 extern void sub_0809F814(u32);
 extern void sub_080300E8(void);
-extern void sub_08058D34(void);
+extern void RollingBarrelManager_OnEnterRoom(void);
 extern void sub_0807BB98(u32, u32, u32, u32);
 extern void sub_080AF2E4(void);
 extern void sub_08059994(void);
@@ -46,7 +61,7 @@ u32 sub_unk3_ArmosInteriors_RuinsEntranceNorth(u32 arg0) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsEntranceNorth(void) {
-    sub_08030118(0);
+    Armos_SetFlagFromTransition(0);
 }
 
 u32 sub_unk3_ArmosInteriors_RuinsEntranceSouth(void) {
@@ -54,7 +69,7 @@ u32 sub_unk3_ArmosInteriors_RuinsEntranceSouth(void) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsEntranceSouth(void) {
-    sub_08030118(1);
+    Armos_SetFlagFromTransition(1);
 }
 
 u32 sub_unk3_ArmosInteriors_RuinsLeft(void) {
@@ -62,7 +77,7 @@ u32 sub_unk3_ArmosInteriors_RuinsLeft(void) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsLeft(void) {
-    sub_08030118(2);
+    Armos_SetFlagFromTransition(2);
 }
 
 u32 sub_unk3_ArmosInteriors_RuinsMiddleLeft(void) {
@@ -70,7 +85,7 @@ u32 sub_unk3_ArmosInteriors_RuinsMiddleLeft(void) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsMiddleLeft(void) {
-    sub_08030118(3);
+    Armos_SetFlagFromTransition(3);
 }
 
 u32 sub_unk3_ArmosInteriors_RuinsMiddleRight(void) {
@@ -78,7 +93,7 @@ u32 sub_unk3_ArmosInteriors_RuinsMiddleRight(void) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsMiddleRight(void) {
-    sub_08030118(4);
+    Armos_SetFlagFromTransition(4);
 }
 
 u32 sub_unk3_ArmosInteriors_RuinsRight(void) {
@@ -86,7 +101,7 @@ u32 sub_unk3_ArmosInteriors_RuinsRight(void) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsRight(void) {
-    sub_08030118(5);
+    Armos_SetFlagFromTransition(5);
 }
 
 u32 sub_unk3_ArmosInteriors_6(void) {
@@ -94,7 +109,7 @@ u32 sub_unk3_ArmosInteriors_6(void) {
 }
 
 void sub_StateChange_ArmosInteriors_6(void) {
-    sub_08030118(6);
+    Armos_SetFlagFromTransition(6);
 }
 
 u32 sub_unk3_ArmosInteriors_RuinsGrassPath(void) {
@@ -102,7 +117,7 @@ u32 sub_unk3_ArmosInteriors_RuinsGrassPath(void) {
 }
 
 void sub_StateChange_ArmosInteriors_RuinsGrassPath(void) {
-    sub_08030118(7);
+    Armos_SetFlagFromTransition(7);
 }
 
 u32 sub_unk3_ArmosInteriors_8(void) {
@@ -110,7 +125,7 @@ u32 sub_unk3_ArmosInteriors_8(void) {
 }
 
 void sub_StateChange_ArmosInteriors_8(void) {
-    sub_08030118(8);
+    Armos_SetFlagFromTransition(8);
 }
 
 u32 sub_unk3_ArmosInteriors_FortressOfWindsLeft(void) {
@@ -118,7 +133,7 @@ u32 sub_unk3_ArmosInteriors_FortressOfWindsLeft(void) {
 }
 
 void sub_StateChange_ArmosInteriors_FortressOfWindsLeft(void) {
-    sub_08030118(9);
+    Armos_SetFlagFromTransition(9);
     gArea.dungeon_idx = 3;
     gArea.areaMetadata = AR_HAS_NO_ENEMIES | AR_HAS_MAP | AR_IS_DUNGEON | AR_HAS_KEYS;
 }
@@ -128,7 +143,7 @@ u32 sub_unk3_ArmosInteriors_FortressOfWindsRight(void) {
 }
 
 void sub_StateChange_ArmosInteriors_FortressOfWindsRight(void) {
-    sub_08030118(10);
+    Armos_SetFlagFromTransition(10);
     gArea.dungeon_idx = 3;
     gArea.areaMetadata = AR_HAS_NO_ENEMIES | AR_HAS_MAP | AR_IS_DUNGEON | AR_HAS_KEYS;
 }
@@ -713,7 +728,7 @@ void sub_StateChange_HyruleCastle_4(void) {
 }
 
 void sub_0804BCDC(void) {
-    sub_0808091C(&gUnk_0813AB80, TRANSITION_FADE_BLACK_SLOW);
+    DoExitTransitionWithType(&gUnk_0813AB80, TRANSITION_FADE_BLACK_SLOW);
 }
 
 u32 sub_unk3_HyruleCastle_5(void) {
@@ -861,7 +876,7 @@ void sub_StateChange_Dojos_Grimblade(void) {
     if (!CheckLocalFlag(3)) {
         LoadRoomEntityList(&gUnk_080D827C);
     } else {
-        sub_0805BC4C();
+        UnDarkRoom();
         SetTileType(TILE_TYPE_118, TILE_POS(2, 2), LAYER_TOP);
         SetTileType(TILE_TYPE_118, TILE_POS(12, 2), LAYER_TOP);
     }
@@ -1796,7 +1811,7 @@ void sub_StateChange_MinishVillage_Main(void) {
     if (!CheckLocalFlag(KOBITO_MORI_1ST)) {
         LoadRoomEntityList(&gUnk_080DC4C0);
     }
-    sub_08057E64();
+    MinishVillageTileSetManger_LoadInitialGfxGroup();
 }
 
 u32 sub_unk3_MinishVillage_SideHouse(void) {
@@ -1814,8 +1829,8 @@ typedef struct {
 extern struct_086D4460 gUnk_086D4460;
 
 void sub_unk2_MinishVillage_SideHouse(void) {
-    LoadResourceAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000);
-    LoadResourceAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000);
+    LoadResourceAsync(&gUnk_086D4460.LO, BG_SCREEN_ADDR(0), BG_SCREEN_SIZE * 8);
+    LoadResourceAsync(&gUnk_086D4460.HI, BG_SCREEN_ADDR(16), BG_SCREEN_SIZE * 8);
     LoadPaletteGroup(0x19);
 }
 
@@ -2342,7 +2357,7 @@ u32 sub_unk3_DeepwoodShrine_InsideBarrel(void) {
 }
 
 void sub_StateChange_DeepwoodShrine_InsideBarrel(void) {
-    sub_08058D34();
+    RollingBarrelManager_OnEnterRoom();
     gArea.areaMetadata |= AR_HAS_NO_ENEMIES;
     gMain.substate = GAMEMAIN_BARRELUPDATE;
 }