pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update scripts

Browse Source
This commit is contained in:
Marijn van der Werf 2023-03-26 15:17:00 +02:00
parent 4ff11c5df0
commit 2524190689
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1103,12 +1103,7 @@ EvtScript N(bomb) = {
EVT_CALL(StopSound, SOUND_287)
EVT_SWITCH(LVar2)
EVT_CASE_EQ(MOVE_BOMB)
#if VERSION_PAL
// 7 * DT = 5
EVT_SET(LVar0, 6)
#else
EVT_SET(LVar0, 7 * DT)
#endif
EVT_SET(LVar0, 6 * DT + 1)
EVT_CASE_EQ(MOVE_POWER_BOMB)
EVT_SET(LVar0, 12 * DT)
EVT_CASE_EQ(MOVE_MEGA_BOMB)

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

@ -553,12 +553,7 @@ EvtScript N(shellToss) = {
EVT_BREAK_LOOP
EVT_END_IF
EVT_END_LOOP
#if VERSION_PAL
// 47 * DT = 39
EVT_CALL(action_command_hammer_start, 0, 38, 3)
#else
EVT_CALL(action_command_hammer_start, 0, 47 * DT, 3)
#endif
EVT_CALL(action_command_hammer_start, 0, 50 * DT - 3, 3)
EVT_CALL(SetActionResult, 0)
EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest)
EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C)

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

@ -1337,8 +1337,8 @@ enum {
};
#if VERSION_PAL
#define CONST_1 0x8C
#define CONST_2 0x98
#define CONST_1 140
#define CONST_2 152
#else
#define CONST_1 165
#define CONST_2 177

8
src/battle/partner/watt.c
View File

@ -983,13 +983,7 @@ EvtScript N(powerShock) = {
EVT_CALL(MoveBattleCamOver, 80)
EVT_CALL(N(WattFXDisable))
EVT_CALL(N(TargetParalyzeChance))
#if VERSION_PAL
// (72 * DT = 60)
// TODO: maybe use (75 * DT) - 3
EVT_CALL(action_command_power_shock_start, 0, 59, 3, LVar0)
#else
EVT_CALL(action_command_power_shock_start, 0, 72 * DT, 3, LVar0)
#endif
EVT_CALL(action_command_power_shock_start, 0, 75 * DT - 3, 3, LVar0)
EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 15)
EVT_ADD(LVar2, 5)