Convert various to callnatives - Part 1 #3269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- jumpifshelltrap - jumpifemergencyexited - jumpifrodaffected - jumpifabsorbaffected - jumpifmotoraffected
ghoulslash
previously approved these changes
Sep 3, 2023
|
|
||
| gActiveBattler = GetBattlerForBattleScript(cmd->battler); | ||
| HandleScriptMegaPrimalBurst(cmd->caseId, gActiveBattler, HANDLE_TYPE_MEGA_EVOLUTION); | ||
| gBattlescriptCurrInstr = cmd->nextInstr; |
There was a problem hiding this comment.
might be useful to have some macros e.g. #define NEXT_INSTR gBattlescriptCurrInstr = cmd->nextInstr and a similar FAIL_INSTR so we can put that at the end of these BS callnatives
There was a problem hiding this comment.
Since gBattlescriptCurrInstr = cmd->nextInstr is used by all 3 various, callnative and regular commands, it might be better to have this as a separate PR.
ghoulslash
requested changes
Sep 3, 2023
# Conflicts: # include/constants/battle_script_commands.h # src/battle_script_commands.c
|
Re-ready for re-review |
ghoulslash
approved these changes
Sep 11, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
First batch of conversions.
Discord contact info
AsparagusEduardo