1 files changed, 8 insertions, 8 deletions

diff --git a/src/map/map.c b/src/map/map.c
index e121f0d55..ea05208a6 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -624,8 +624,8 @@ int map_foreachininstance(int (*func)(struct block_list*, va_list), int16 instan
 	int i;
 	int returnCount = 0;
 
-	for (i = 0; i < instances[instance_id].num_map; i++) {
-		int m = instances[instance_id].map[i];
+	for (i = 0; i < instance->list[instance_id].num_map; i++) {
+		int m = instance->list[instance_id].map[i];
 		va_list ap;
 		va_start(ap, type);
 		returnCount += map_vforeachinmap(func, m, type, ap);
@@ -4905,9 +4905,9 @@ void do_final(void)
 	script->final();
 	itemdb->final();
 	instance->final();
-	storage->final();
+	gstorage->final();
 	guild->final();
-	party->do_final_party();
+	party->final();
 	pc->do_final_pc();
 	pet->final();
 	mob->final();
@@ -4918,7 +4918,7 @@ void do_final(void)
 	unit->final();
 	bg->final();
 	duel->final();
-	elemental->do_final_elemental();
+	elemental->final();
 	do_final_maps();
 	vending->final();
 
@@ -5387,13 +5387,13 @@ int do_init(int argc, char *argv[])
 	mob->init();
 	pc->do_init_pc();
 	status->init();
-	party->do_init_party();
+	party->init();
 	guild->init();
-	storage->init();
+	gstorage->init();
 	pet->init();
 	homun->init();
 	mercenary->init();
-	elemental->do_init_elemental();
+	elemental->init();
 	quest->init();
 	npc->init();
 	unit->init();