Revert "Destroy the hintstones on Citra as they cause huge lag" (#709)

This reverts commit 4afa8e9.
gamestabled · Dec 20, 2023 · 0c4d2a0 · 0c4d2a0
1 parent 3438023
commit 0c4d2a0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 17 deletions.
diff --git a/code/src/actor.c b/code/src/actor.c
@@ -231,8 +231,6 @@ void Actor_Init() {
 
     gActorOverlayTable[0x1D2].initInfo->update = (ActorFunc)ObjHamishi_rUpdate;
 
-    gActorOverlayTable[0x1D9].initInfo->update = EnHintstone_rUpdate;
-
     // Define object 4 to be by default the same as object 189
     strncpy(gObjectTable[OBJECT_CUSTOM_DOUBLE_DEFENSE].filename, gObjectTable[OBJECT_GI_HEARTS].filename, 0x40);
 

diff --git a/code/src/actors/gossip_stone.c b/code/src/actors/gossip_stone.c
@@ -1,6 +1,5 @@
 #include "gossip_stone.h"
 #include "z3D/z3D.h"
-#include "settings.h"
 
 #define EnGs_Init_addr 0x16461C
 #define EnGs_Init ((ActorFunc)EnGs_Init_addr)
@@ -20,15 +19,3 @@ void EnGs_rInit(Actor* thisx, GlobalContext* globalCtx) {
 
     EnGs_Init(thisx, globalCtx);
 }
-
-#define EnHintstone_Update_addr 0x281834
-#define EnHintstone_Update ((ActorFunc)EnHintstone_Update_addr)
-
-void EnHintstone_rUpdate(Actor* thisx, GlobalContext* globalCtx) {
-    // Destroy the hintstones on Citra as they cause huge lag when entered
-    if (gSettingsContext.playOption == PLAY_ON_CITRA) {
-        Actor_Kill(thisx);
-        return;
-    }
-    EnHintstone_Update(thisx, globalCtx);
-}
diff --git a/code/src/actors/gossip_stone.h b/code/src/actors/gossip_stone.h
@@ -5,6 +5,4 @@
 
 void EnGs_rInit(Actor* thisx, GlobalContext* globalCtx);
 
-void EnHintstone_rUpdate(Actor* thisx, GlobalContext* globalCtx);
-
 #endif //_GOSSIP_STONE_H_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,4 @@

		void EnGs_rInit(Actor* thisx, GlobalContext* globalCtx);

		void EnHintstone_rUpdate(Actor* thisx, GlobalContext* globalCtx);

		#endif //_GOSSIP_STONE_H_