diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-03 17:25:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 17:25:05 -0400 |
| commit | 585d92f298e1edd8f756f8362de45c9fadc6fcab (patch) | |
| tree | 2e3b17d37c4782f575329fc0fbe1f7bd406e6bad /src/battle_ai_script_commands.c | |
| parent | 558097f42326f19044a6351004468a46d6ee0b38 (diff) | |
| parent | ff94d49a45ef605cfaed1268aa5a230958e25cd9 (diff) | |
Merge pull request #445 from Kurausukun/ubfix
Port UBFIX Macro and Some Usages from Emerald
Diffstat (limited to 'src/battle_ai_script_commands.c')
| -rw-r--r-- | src/battle_ai_script_commands.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 952c1487f..a500d591b 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1362,7 +1362,12 @@ static void Cmd_if_status_not_in_party(void) // everytime the status is found, the AI's logic jumps further and further past its intended destination. this results in a broken AI macro and is probably why it is unused. if (species != SPECIES_NONE && species != SPECIES_EGG && hp != 0 && status == statusToCompareTo) + { sAIScriptPtr += 10; // doesnt return? + #ifdef UBFIX + return; + #endif + } } sAIScriptPtr = T1_READ_PTR(sAIScriptPtr + 6); } |