pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-10-18 10:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up #989 (#1005)

Browse Source
This commit is contained in:
Marijn van der Werf 2023-03-27 11:57:36 +02:00 committed by GitHub
parent 595f142b27
commit 2c7b849152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/common/actor/slot_machine.inc.c
View File

@ -122,7 +122,7 @@ EvtScript N(init) = {
#if VERSION_PAL #if VERSION_PAL
EVT_CALL(GetLanguage, LVar0) EVT_CALL(GetLanguage, LVar0)
EVT_IF_EQ(LVar0, LANGUAGE_ES) EVT_IF_EQ(LVar0, LANGUAGE_ES)
EVT_SET(LVar0, 2) EVT_SET(LVar0, LANGUAGE_FR)
EVT_END_IF EVT_END_IF
EVT_CALL(SetModelTexVariant, 28, LVar0) EVT_CALL(SetModelTexVariant, 28, LVar0)
#endif #endif

7
src/battle/partner/bombette.c
View File

@ -1060,12 +1060,7 @@ EvtScript N(bomb) = {
EVT_CASE_EQ(MOVE_BOMB) EVT_CASE_EQ(MOVE_BOMB)
EVT_CALL(action_command_bomb_start, 0, 57 * DT, 3, 0) EVT_CALL(action_command_bomb_start, 0, 57 * DT, 3, 0)
EVT_CASE_EQ(MOVE_POWER_BOMB) EVT_CASE_EQ(MOVE_POWER_BOMB)
#if VERSION_PAL EVT_CALL(action_command_bomb_start, 0, 73 * DT - 1, 3, 1)
// 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_CASE_EQ(MOVE_MEGA_BOMB) EVT_CASE_EQ(MOVE_MEGA_BOMB)
EVT_CALL(action_command_bomb_start, 0, 87 * DT, 3, 2) EVT_CALL(action_command_bomb_start, 0, 87 * DT, 3, 2)
EVT_END_SWITCH EVT_END_SWITCH

12
src/battle/partner/lakilester.c
View File

@ -1337,11 +1337,11 @@ enum {
}; };
#if VERSION_PAL #if VERSION_PAL
#define CONST_1 140 #define HURRICANE_PARTNER_MOVE_TIME 140
#define CONST_2 152 #define HURRICANE_UNUSED_TIME 152
#else #else
#define CONST_1 165 #define HURRICANE_PARTNER_MOVE_TIME 165
#define CONST_2 177 #define HURRICANE_UNUSED_TIME 177
#endif #endif
API_CALLABLE(N(ProcessHurricane)) { API_CALLABLE(N(ProcessHurricane)) {
@ -1375,7 +1375,7 @@ API_CALLABLE(N(ProcessHurricane)) {
switch (script->functionTemp[0]) { switch (script->functionTemp[0]) {
case 0: case 0:
partner->state.angle = 0.0f; partner->state.angle = 0.0f;
partner->state.moveTime = CONST_1; partner->state.moveTime = HURRICANE_PARTNER_MOVE_TIME;
partner->state.moveArcAmplitude = 0; partner->state.moveArcAmplitude = 0;
sIsHurricaneActive = TRUE; sIsHurricaneActive = TRUE;
D_8023D338 = 255; D_8023D338 = 255;
@ -1389,7 +1389,7 @@ API_CALLABLE(N(ProcessHurricane)) {
effect->data.huffPuffBreath->envG = 240; effect->data.huffPuffBreath->envG = 240;
effect->data.huffPuffBreath->envB = 240; effect->data.huffPuffBreath->envB = 240;
hurricaneState->unk_54 = CONST_2; hurricaneState->unk_54 = HURRICANE_UNUSED_TIME;
hurricaneState->breathSizeIncrease = 0; hurricaneState->breathSizeIncrease = 0;
hurricaneState->unk_46 = 0; hurricaneState->unk_46 = 0;
hurricaneState->state = 0; hurricaneState->state = 0;

2
src/world/area_omo/omo_03/omo_03_2_main.c
View File

@ -51,7 +51,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(GetLanguage, LVar0) EVT_CALL(GetLanguage, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES
EVT_SUB(LVar0, 2) EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN)
EVT_END_IF EVT_END_IF
EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_s, LVar0)
EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0)

2
src/world/area_omo/omo_06/omo_06_2_main.c
View File

@ -41,7 +41,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(GetLanguage, LVar0) EVT_CALL(GetLanguage, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES
EVT_SUB(LVar0, 2) EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN)
EVT_END_IF EVT_END_IF
EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_s, LVar0)
EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0)

2
src/world/area_omo/omo_08/omo_08_2_main.c
View File

@ -36,7 +36,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(GetLanguage, LVar0) EVT_CALL(GetLanguage, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES
EVT_SUB(LVar0, 2) EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN)
EVT_END_IF EVT_END_IF
EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_s, LVar0)
EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0)

2
src/world/area_omo/omo_10/omo_10_2_main.c
View File

@ -39,7 +39,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(GetLanguage, LVar0) EVT_CALL(GetLanguage, LVar0)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES EVT_IF_GE(LVar0, LANGUAGE_FR) // or LANGUAGE_ES
EVT_SUB(LVar0, 2) EVT_SUB(LVar0, LANGUAGE_FR - LANGUAGE_EN)
EVT_END_IF EVT_END_IF
EVT_CALL(SetModelTexVariant, MODEL_s, LVar0) EVT_CALL(SetModelTexVariant, MODEL_s, LVar0)
EVT_CALL(SetModelTexVariant, MODEL_a, LVar0) EVT_CALL(SetModelTexVariant, MODEL_a, LVar0)