Merge pull request #151 from notyourav/rooms

merge + fix

2 files changed, 9 insertions, 9 deletions

diff --git a/src/loadRoom.c b/src/loadRoom.c
index 0bd68f75..eaf41966 100644
--- a/src/loadRoom.c
+++ b/src/loadRoom.c
@@ -10,7 +10,7 @@ extern Entity* LoadRoomEntity(EntityData*);
 extern void* GetRoomProperty(u32, u32, u32);
 
 extern u32 gUnk_02017654;
-extern u32* gAreaEntities;
+extern u32* gAreaTable;
 
 extern void sub_080186EC();
 extern void sub_0804B16C();
@@ -74,7 +74,7 @@ void sub_0804B0B0(u32 arg0, u32 arg1) {
 void SetCurrentRoomPropertyList(u32 arg0, u32 arg1) {
     u32** arr;
     gUnk_02017654 = 0;
-    arr = &gAreaEntities;
+    arr = &gAreaTable;
     if (arr[arg0] != 0) {
         gUnk_02017654 = arr[arg0][arg1];
     }
@@ -94,7 +94,7 @@ void* GetRoomProperty(u32 arg0, u32 arg1, u32 arg2) {
     u32 temp;
     u32** arr;
     temp = 0;
-    arr = &gAreaEntities;
+    arr = &gAreaTable;
     if (arr[arg0] != NULL) {
         temp = arr[arg0][arg1];
         if (temp != 0) {
diff --git a/src/room.c b/src/room.c
index e0e5a435..3529459b 100644
--- a/src/room.c
+++ b/src/room.c
@@ -5595,7 +5595,7 @@ extern void sub_0804F5E8();
 extern u32 gUnk_080F7C80;
 extern void sub_0804F4E4();
 
-u32 sub_0804F468(void) {
+u32 Vars_HyruleField_OutsideCastle(void) {
     if (CheckGlobalFlag(TABIDACHI) && !GetInventoryValue(0x11)) {
         gRoomVars.field_0x6c = &gUnk_080F7CD0;
         gRoomVars.field_0x88 = sub_0804F5E8;
@@ -5618,7 +5618,7 @@ void sub_0804F4E4() {
 
 extern EntityData gUnk_080F7D70;
 
-void sub_0804F4F4(void) {
+void Load_HyruleField_OutsideCastle(void) {
     sub_0804F4E4();
     if (!CheckLocalFlag(0x8b)) {
         LoadRoomEntityList(&gUnk_080F7D70);
@@ -5781,13 +5781,13 @@ void sub_0804F9C8(void) {
     sub_0807BA8C(0x4d9, 1);
 }
 
-u32 sub_0804F9FC() {
+u32 Vars_HyruleField_OutsideCastleWest() {
     return 1;
 }
 
 extern EntityData gUnk_080F806C;
 
-void sub_0804FA00(void) {
+void Load_HyruleField_OutsideCastleWest(void) {
 
     sub_0805ADD8(0);
     if ((gSave.unk8 > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) {
@@ -5795,13 +5795,13 @@ void sub_0804FA00(void) {
     }
 }
 
-u32 sub_0804FA2C() {
+u32 Vars_HyruleField_TrilbyHighlands() {
     return 1;
 }
 
 extern EntityData gUnk_080F82E0;
 
-void sub_0804FA30(void) {
+void Load_HyruleField_TrilbyHighlands(void) {
 
     sub_0805ADD8(0);
     if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9c)) {