Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix hardcoding of moveID in battle/sushie.c #1183

Merged
merged 12 commits into from
Apr 19, 2024
Merged

Fix hardcoding of moveID in battle/sushie.c #1183

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c149616
suggest possible bgm name if it is not found
Rainchus Mar 5, 2024
6cc4520
remove pointless ()
Rainchus Mar 5, 2024
c617eeb
run black
Rainchus Mar 5, 2024
c6018a6
...run updated black
Rainchus Mar 5, 2024
816d7f5
unhardcode many for loop conditions
Rainchus Mar 5, 2024
f7cfb52
Merge branch 'pmret:main' into master
Rainchus Mar 5, 2024
3bf973a
fix inconsistent RGBA_BUF_SIZE naming
Rainchus Mar 5, 2024
2ce1730
requested macro changes
Rainchus Mar 5, 2024
1154132
Merge branch 'main' of https://github.com/pmret/papermario
Rainchus Mar 9, 2024
c258024
unhardcode 64 in pause_badges.c
Rainchus Mar 9, 2024
a92df7e
Merge branch 'main' of https://github.com/pmret/papermario
Rainchus Apr 18, 2024
4f2220d
remove hardcoding of 3 move IDs in battle/sushie.c
Rainchus Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/battle/partner/sushie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ EvtScript N(bellyFlop) = {
Else
Call(GetMenuSelection, LVar0, LVar1, LVar2)
Switch(LVar2)
CaseEq(167)
CaseEq(MOVE_BELLY_FLOP1)
Wait(13)
Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
Wait(1)
Expand All @@ -829,7 +829,7 @@ EvtScript N(bellyFlop) = {
Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
Wait(1)
Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
CaseEq(168)
CaseEq(MOVE_BELLY_FLOP2)
Wait(13)
Call(SetActorScale, ACTOR_PARTNER, Float(1.05), Float(1.05), Float(1.0))
Wait(1)
Expand All @@ -840,7 +840,7 @@ EvtScript N(bellyFlop) = {
Call(SetActorScale, ACTOR_PARTNER, Float(1.2), Float(1.2), Float(1.0))
Wait(1)
Call(SetActorScale, ACTOR_PARTNER, Float(1.25), Float(1.25), Float(1.0))
CaseEq(169)
CaseEq(MOVE_BELLY_FLOP3)
Wait(13)
Call(SetActorScale, ACTOR_PARTNER, Float(1.1), Float(1.1), Float(1.0))
Wait(1)
Expand Down
Loading