Remove THIS macro (#1047)

* remove THIS

* fix

* forgot dorf

1 files changed, 3 insertions, 5 deletions

diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c
index 41e91141d..a1bff00ef 100644
--- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c
+++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c
@@ -9,8 +9,6 @@
 
 #define FLAGS 0x00000010
 
-#define THIS ((EnTrap*)thisx)
-
 #define BEGIN_MOVE_OUT 65535.0f
 
 #define DIR_FWD 0
@@ -66,7 +64,7 @@ void EnTrap_Init(Actor* thisx, GlobalContext* globalCtx) {
     f32 trapSpeed;
     s16 zSpeed;
     s16 xSpeed;
-    EnTrap* this = THIS;
+    EnTrap* this = (EnTrap*)thisx;
     ColliderCylinder* unused = &this->collider; // required to match
 
     this->upperParams = (thisx->params >> 8) & 0xFF;
@@ -117,12 +115,12 @@ void EnTrap_Init(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void EnTrap_Destroy(Actor* thisx, GlobalContext* globalCtx) {
-    EnTrap* this = THIS;
+    EnTrap* this = (EnTrap*)thisx;
     Collider_DestroyCylinder(globalCtx, &this->collider);
 }
 
 void EnTrap_Update(Actor* thisx, GlobalContext* globalCtx) {
-    EnTrap* this = THIS;
+    EnTrap* this = (EnTrap*)thisx;
     Vec3f posTemp;
     s16 angleToKnockPlayer;
     s16 angleToCollidedActor;