Extract dungeon maps

2 files changed, 4 insertions, 5 deletions

diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c
index edd88119..2c853edc 100644
--- a/src/enemy/gyorgFemale.c
+++ b/src/enemy/gyorgFemale.c
@@ -1,5 +1,6 @@
 #define NENT_DEPRECATED
 #include "asm.h"
+#include "beanstalkSubtask.h"
 #include "collision.h"
 #include "enemy.h"
 #include "enemy/gyorg.h"
@@ -12,8 +13,6 @@ extern u8 gMapDataTopSpecial[];
 
 extern u16 gMapDataBottomSpecial[];
 
-extern void sub_080197D4(const void*);
-
 extern u32 sub_08000E62(u32);
 extern void RegisterTransitionManager(void*, void (*)(), void (*)());
 
@@ -229,7 +228,7 @@ void sub_080464C0(GyorgFemaleEntity* this) {
     s32 i;
     u8* src;
     u8* dst;
-    sub_080197D4(gUnk_080D1A74[super->animationState >> 6]);
+    LoadMapData((MapDataDefinition*)gUnk_080D1A74[super->animationState >> 6]);
     sub_08046518();
     for (i = 0x20, src = ((u8*)&gMapDataBottomSpecial), dst = ((u8*)&gMapDataBottomSpecial) + 0x3260; i != 0; i--) {
         MemCopy(src, dst, 0x40);
diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c
index fe57c230..94774b42 100644
--- a/src/enemy/spinyBeetle.c
+++ b/src/enemy/spinyBeetle.c
@@ -111,7 +111,7 @@ void sub_08033958(SpinyBeetleEntity* this) {
     u32 direction;
     if (sub_08033DF0(this)) {
         sub_08033E1C(this);
-        sub_0807B9B8(this->tileIndex, this->tile, super->collisionLayer);
+        SetMetaTileByIndex(this->tileIndex, this->tile, super->collisionLayer);
         return;
     }
 
@@ -160,7 +160,7 @@ void sub_08033958(SpinyBeetleEntity* this) {
     COLLISION_ON(super);
 
     super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000;
-    sub_0807B9B8(this->tileIndex, this->tile, super->collisionLayer);
+    SetMetaTileByIndex(this->tileIndex, this->tile, super->collisionLayer);
     InitializeAnimation(super, 2);
 }