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.

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

EFFECT_CHILLY_RECEPTION #3379

Merged
merged 22 commits into from
Dec 6, 2023

Conversation

RapidNutcracker
Copy link

@RapidNutcracker RapidNutcracker commented Oct 5, 2023

Description

Implements MOVE_CHILLY_RECEPTION. Animation borrows from a bunch of other moves in combination and could maybe use some refinement. I copied the base tests from U-Turn and I'm not sure if I covered everything that's necessary in the modifications; please let me know.

First PR, so please let me know if there are issues on the administrative side! Feel free to be critical of coding standards etc. so I can better learn going forward!

Images

Chilly Reception Animation

Issue(s) that this PR fixes

Fixes #2505

Discord contact info

rapidnutcracker

@RapidNutcracker RapidNutcracker marked this pull request as ready for review October 8, 2023 19:06
Copy link
Collaborator

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initial review.

Also since you change the Parting Shot script, would you be interested in writing tests for it?

test/battle/move_effect/chilly_reception.c Show resolved Hide resolved
test/battle/move_effect/chilly_reception.c Show resolved Hide resolved
test/battle/move_effect/chilly_reception.c Show resolved Hide resolved
waitmessage B_WAIT_TIME_LONG
attackstring
ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The user is supposed to still switch out even if the weather can't be changed.

Also, these three jumps appear 8 times in this file. You should make a macro so you don't need to duplicate even more code than already is.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually a mistake, but what I wanted to do didn't work anyway... Oops! I've updated the logic for this portion to always switch though. There might still be a better way to do what I did. I'm all ears!

I also went ahead and made a macro for those other instances of this jump even though I don't use it here anymore.

data/battle_scripts_1.s Show resolved Hide resolved
Patrick Curran added 4 commits October 30, 2023 17:32
* Created CheckPrimalWeather macro for Weather Effects
* Updated Chilly Reception logic to switch even if weather doesn't change

Testing Updates
data/battle_scripts_1.s Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Show resolved Hide resolved
data/battle_scripts_1.s Show resolved Hide resolved
Patrick Curran added 3 commits November 2, 2023 14:31
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Show resolved Hide resolved
Copy link
Collaborator

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please solve conflicts.

test/battle/move_effect/chilly_reception.c Outdated Show resolved Hide resolved
test/battle/move_effect/chilly_reception.c Outdated Show resolved Hide resolved
data/battle_anim_scripts.s Show resolved Hide resolved
@AlexOn1ine AlexOn1ine merged commit f7ca839 into rh-hideout:upcoming Dec 6, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants