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

Implementing Teatime effect #1956

Merged
merged 37 commits into from
Dec 30, 2022
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1de476d
Update battle_script.inc
SonikkuA-DatH Nov 29, 2021
c8fba3f
Update graphics.h
SonikkuA-DatH Nov 29, 2021
ca4207d
Update battle_anim.h
SonikkuA-DatH Nov 29, 2021
002556c
Update battle_script_commands.h
SonikkuA-DatH Nov 29, 2021
7b5dfa8
Update battle_move_effects.h
SonikkuA-DatH Nov 29, 2021
10a870a
Update battle_scripts_1.s
SonikkuA-DatH Nov 29, 2021
adecc77
Update battle_anim_scripts.s
SonikkuA-DatH Nov 29, 2021
7fe8e95
Update battle_anim.c
SonikkuA-DatH Nov 29, 2021
3c33a4b
Update battle_anim_effects_1.c
SonikkuA-DatH Nov 29, 2021
1a882dd
Update battle_script_commands.c
SonikkuA-DatH Nov 29, 2021
492f8d8
Update battle_util.c
SonikkuA-DatH Nov 29, 2021
5258ddc
Update graphics.c
SonikkuA-DatH Nov 29, 2021
ec596cf
Update battle_moves.h
SonikkuA-DatH Nov 29, 2021
9d14cb3
Add files via upload
SonikkuA-DatH Nov 29, 2021
9cd8d81
Update battle_scripts_1.s
SonikkuA-DatH Dec 18, 2022
44b522f
Update battle_script_commands.c
SonikkuA-DatH Dec 18, 2022
f0aee1f
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
SonikkuA-DatH Dec 19, 2022
b97a686
Delete battle_anim.h
SonikkuA-DatH Dec 19, 2022
5682247
Add files via upload
SonikkuA-DatH Dec 19, 2022
6a2a026
Update battle_anim.h
SonikkuA-DatH Dec 19, 2022
03b5d36
Update src/battle_script_commands.c
SonikkuA-DatH Dec 19, 2022
c81b702
Update src/battle_script_commands.c
SonikkuA-DatH Dec 19, 2022
bf1a205
Update src/battle_script_commands.c
SonikkuA-DatH Dec 19, 2022
2dbfc1c
Update data/battle_scripts_1.s
SonikkuA-DatH Dec 19, 2022
ffda816
Update battle_script_commands.h
SonikkuA-DatH Dec 19, 2022
562736a
Update battle_scripts_1.s
SonikkuA-DatH Dec 19, 2022
f6fab92
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2
SonikkuA-DatH Dec 19, 2022
6215d4b
Update src/battle_script_commands.c
SonikkuA-DatH Dec 20, 2022
459631e
Update src/battle_script_commands.c
SonikkuA-DatH Dec 20, 2022
07a91b9
Update src/battle_script_commands.c
SonikkuA-DatH Dec 20, 2022
5eaf0e1
Update data/battle_scripts_1.s
SonikkuA-DatH Dec 21, 2022
2c28076
Update include/constants/battle_script_commands.h
SonikkuA-DatH Dec 21, 2022
8d28d23
Update src/battle_util.c
SonikkuA-DatH Dec 21, 2022
405a42b
Update battle_anim_effects_1.c
SonikkuA-DatH Dec 21, 2022
0a51544
Update battle_scripts_1.s
SonikkuA-DatH Dec 21, 2022
c4db744
Update battle_util.c
SonikkuA-DatH Dec 21, 2022
3e807e5
Update battle_scripts_1.s
SonikkuA-DatH Dec 21, 2022
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
25 changes: 25 additions & 0 deletions asm/macros/battle_script.inc
Original file line number Diff line number Diff line change
@@ -1924,6 +1924,31 @@
.macro shellsidearmcheck
various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK
.endm

.macro jumpifrodaffected battler:req, ptr:req
various \battler, VARIOUS_JUMP_IF_ROD
.4byte \ptr
.endm

.macro jumpifabsorbaffected battler:req, ptr:req
various \battler, VARIOUS_JUMP_IF_ABSORB
.4byte \ptr
.endm

.macro jumpifmotoraffected battler:req, ptr:req
various \battler, VARIOUS_JUMP_IF_MOTOR
.4byte \ptr
.endm

.macro jumpifteanoberry ptr:req
various BS_ATTACKER, VARIOUS_TEATIME_TARGETS
.4byte \ptr
.endm

.macro jumpifteainvulnerable battler:req, ptr:req
various \battler, VARIOUS_TEATIME_INVUL
.4byte \ptr
.endm

@ helpful macros
.macro setstatchanger stat:req, stages:req, down:req