From f07b64e4667174f27051ab93ab839bd006214d28 Mon Sep 17 00:00:00 2001 From: tk Date: Fri, 24 Apr 2026 01:40:54 -0400 Subject: [PATCH] Remove aHT1_GetDefaultAngle macro and remove parameters from aHT1_GetDefaultAngle call sites. --- src/actor/npc/ac_harvest_npc1.c | 1 - src/actor/npc/ac_harvest_npc1.c_inc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/actor/npc/ac_harvest_npc1.c b/src/actor/npc/ac_harvest_npc1.c index 0a672f62..d592f3ed 100644 --- a/src/actor/npc/ac_harvest_npc1.c +++ b/src/actor/npc/ac_harvest_npc1.c @@ -96,7 +96,6 @@ static void aHT1_actor_move(ACTOR* actorx, GAME* game) { static s16 aHT1_GetDefaultAngle() { return 0; } -#define aHT1_GetDefaultAngle(...) aHT1_GetDefaultAngle() static void aHT1_actor_draw(ACTOR* actorx, GAME* game) { NPC_CLIP->draw_proc(actorx, game); diff --git a/src/actor/npc/ac_harvest_npc1.c_inc b/src/actor/npc/ac_harvest_npc1.c_inc index d3362f4d..91d09473 100644 --- a/src/actor/npc/ac_harvest_npc1.c_inc +++ b/src/actor/npc/ac_harvest_npc1.c_inc @@ -17,7 +17,7 @@ static void aHT1_wait(NPC_HARVEST_NPC1_ACTOR* actor, GAME_PLAY* play) { } static void aHT1_to_default(NPC_HARVEST_NPC1_ACTOR* actor, GAME_PLAY* play) { - if (actor->actor.actor_class.shape_info.rotation.y == aHT1_GetDefaultAngle(actor)) { + if (actor->actor.actor_class.shape_info.rotation.y == aHT1_GetDefaultAngle()) { actor->_998 = 0; actor->actor.action.step = -1; } @@ -64,7 +64,7 @@ static void aHT1_think_main_proc(NPC_HARVEST_NPC1_ACTOR* actor, GAME_PLAY* play) actor->actor.collision.check_kind = aNPC_BG_CHECK_TYPE_ONLY_GROUND; } break; case aNPC_ACT_TALK: { - actor->actor.movement.mv_angl = aHT1_GetDefaultAngle(actor); + actor->actor.movement.mv_angl = aHT1_GetDefaultAngle(); aHT1_set_request_act(&actor->actor); actor->actor.condition_info.demo_flg = aNPC_COND_DEMO_SKIP_MOVE_RANGE_CHECK | aNPC_COND_DEMO_SKIP_MOVE_CIRCLE_REV;