From 2c7b84915280b47f7aa200ed5a6fccaffa340a55 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 27 Mar 2023 11:57:36 +0200 Subject: [PATCH] Clean up #989 (#1005) --- src/battle/common/actor/slot_machine.inc.c | 2 +- src/battle/partner/bombette.c | 7 +------ src/battle/partner/lakilester.c | 12 ++++++------ src/world/area_omo/omo_03/omo_03_2_main.c | 2 +- src/world/area_omo/omo_06/omo_06_2_main.c | 2 +- src/world/area_omo/omo_08/omo_08_2_main.c | 2 +- src/world/area_omo/omo_10/omo_10_2_main.c | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index d0344efdc8..39c85e3bca 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -122,7 +122,7 @@ EvtScript N(init) = { #if VERSION_PAL EVT_CALL(GetLanguage, LVar0) EVT_IF_EQ(LVar0, LANGUAGE_ES) - EVT_SET(LVar0, 2) + EVT_SET(LVar0, LANGUAGE_FR) EVT_END_IF EVT_CALL(SetModelTexVariant, 28, LVar0) #endif diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index e4434b7536..ce30c985c2 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -1060,12 +1060,7 @@ EvtScript N(bomb) = { EVT_CASE_EQ(MOVE_BOMB) EVT_CALL(action_command_bomb_start, 0, 57 * DT, 3, 0) EVT_CASE_EQ(MOVE_POWER_BOMB) -#if VERSION_PAL - // 72 * DT = 60 - EVT_CALL(action_command_bomb_start, 0, 59, 3, 1) -#else - EVT_CALL(action_command_bomb_start, 0, 72 * DT, 3, 1) -#endif + EVT_CALL(action_command_bomb_start, 0, 73 * DT - 1, 3, 1) EVT_CASE_EQ(MOVE_MEGA_BOMB) EVT_CALL(action_command_bomb_start, 0, 87 * DT, 3, 2) EVT_END_SWITCH diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 13def90327..6662245bfd 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -1337,11 +1337,11 @@ enum { }; #if VERSION_PAL -#define CONST_1 140 -#define CONST_2 152 +#define HURRICANE_PARTNER_MOVE_TIME 140 +#define HURRICANE_UNUSED_TIME 152 #else -#define CONST_1 165 -#define CONST_2 177 +#define HURRICANE_PARTNER_MOVE_TIME 165 +#define HURRICANE_UNUSED_TIME 177 #endif API_CALLABLE(N(ProcessHurricane)) { @@ -1375,7 +1375,7 @@ API_CALLABLE(N(ProcessHurricane)) { switch (script->functionTemp[0]) { case 0: partner->state.angle = 0.0f; - partner->state.moveTime = CONST_1; + partner->state.moveTime = HURRICANE_PARTNER_MOVE_TIME; partner->state.moveArcAmplitude = 0; sIsHurricaneActive = TRUE; D_8023D338 = 255; @@ -1389,7 +1389,7 @@ API_CALLABLE(N(ProcessHurricane)) { effect->data.huffPuffBreath->envG = 240; effect->data.huffPuffBreath->envB = 240; - hurricaneState->unk_54 = CONST_2; + hurricaneState->unk_54 = HURRICANE_UNUSED_TIME; hurricaneState->breathSizeIncrease = 0; hurricaneState->unk_46 = 0; hurricaneState->state = 0; diff --git a/src/world/area_omo/omo_03/omo_03_2_main.c b/src/world/area_omo/omo_03/omo_03_2_main.c index 76828c8b84..b8de882f4a 100644 --- a/src/world/area_omo/omo_03/omo_03_2_main.c +++ b/src/world/area_omo/omo_03/omo_03_2_main.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(GetLanguage, LVar0) EVT_SWITCH(LVar0) EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES - EVT_SUB(LVar0, 2) + EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN) EVT_END_IF EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) diff --git a/src/world/area_omo/omo_06/omo_06_2_main.c b/src/world/area_omo/omo_06/omo_06_2_main.c index 497de6514d..06fe8dd75e 100644 --- a/src/world/area_omo/omo_06/omo_06_2_main.c +++ b/src/world/area_omo/omo_06/omo_06_2_main.c @@ -41,7 +41,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(GetLanguage, LVar0) EVT_SWITCH(LVar0) EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES - EVT_SUB(LVar0, 2) + EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN) EVT_END_IF EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) diff --git a/src/world/area_omo/omo_08/omo_08_2_main.c b/src/world/area_omo/omo_08/omo_08_2_main.c index 335cc12157..3d14065b1a 100644 --- a/src/world/area_omo/omo_08/omo_08_2_main.c +++ b/src/world/area_omo/omo_08/omo_08_2_main.c @@ -36,7 +36,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(GetLanguage, LVar0) EVT_SWITCH(LVar0) EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES - EVT_SUB(LVar0, 2) + EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN) EVT_END_IF EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) diff --git a/src/world/area_omo/omo_10/omo_10_2_main.c b/src/world/area_omo/omo_10/omo_10_2_main.c index 7476741dca..c53e886b26 100644 --- a/src/world/area_omo/omo_10/omo_10_2_main.c +++ b/src/world/area_omo/omo_10/omo_10_2_main.c @@ -39,7 +39,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(GetLanguage, LVar0) EVT_SWITCH(LVar0) EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES - EVT_SUB(LVar0, 2) + EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN) EVT_END_IF EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0)