diff --git a/INSTALL.md b/INSTALL.md
index 02851644ad..2759124bee 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -44,15 +44,15 @@ WSL1 is the preferred terminal to build **pokeemerald**. The following instructi
3. The next step is to choose and install a Linux distribution from the Microsoft Store. The following instructions will assume Ubuntu as the Linux distribution of choice.
Note for advanced users...
-
- > You can pick a preferred Linux distribution, but setup instructions may differ. Debian should work with the given instructions, but has not been tested.
+
+ > You can pick a preferred Linux distribution, but setup instructions may differ. Debian should work with the given instructions, but has not been tested.
4. Open the [Microsoft Store Linux Selection](https://aka.ms/wslstore), click Ubuntu, then click Get, which will install the Ubuntu distribution.
Notes...
- > Note 1: If a dialog pops up asking for you to sign into a Microsoft Account, then just close the dialog.
+ > Note 1: If a dialog pops up asking for you to sign into a Microsoft Account, then just close the dialog.
> Note 2: If the link does not work, then open the Microsoft Store manually, and search for the Ubuntu app (choose the one with no version number).
@@ -102,8 +102,8 @@ cd /mnt/c/Users//Desktop/decomps
Notes...
-> Note 1: The Windows C:\ drive is called /mnt/c/ in WSL.
-> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users//Desktop/decomp folder"`.
+> Note 1: The Windows C:\ drive is called /mnt/c/ in WSL.
+> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users//Desktop/decomp folder"`.
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
@@ -213,8 +213,8 @@ Note that the directory **must exist** in Windows. If you want to store pokeemer
Notes...
-> Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users//Desktop/decomp folder"`.
-> Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed
+> Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users//Desktop/decomp folder"`.
+> Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
@@ -283,8 +283,8 @@ Note that the directory **must exist** in the folder system. If you want to stor
Note...
-
-> Note: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Desktop/decomp folder"`
+
+> Note: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Desktop/decomp folder"`
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
@@ -305,7 +305,7 @@ Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to
> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
> [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions).
-
+
### Arch Linux
Run this command as root to install the necessary packages:
```bash
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index ff246955ad..50c5f7fd72 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -676,7 +676,7 @@
.byte 0x77
.endm
- .macro faintifabilitynotdamp
+ .macro tryexplosion
.byte 0x78
.endm
@@ -1044,7 +1044,7 @@
.byte 0xc8
.endm
- .macro jumpifattackandspecialattackcannotfall ptr:req
+ .macro trymemento ptr:req
.byte 0xc9
.4byte \ptr
.endm
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 06c7bdaeab..26391bd4a6 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -277,7 +277,7 @@
.endm
@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific
- @ commands and specials. Calling EnableBothScriptContexts for instance will allow execution to continue.
+ @ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
.macro waitstate
.byte 0x27
.endm
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc
index 62618379b6..a43dc07ac5 100644
--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -152,8 +152,8 @@
create_movement_action walk_slow_diag_northeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
create_movement_action walk_slow_diag_southwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
create_movement_action walk_slow_diag_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
- create_movement_action store_lock_anim, MOVEMENT_ACTION_STORE_AND_LOCK_ANIM
- create_movement_action free_unlock_anim, MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM
+ create_movement_action lock_anim, MOVEMENT_ACTION_LOCK_ANIM
+ create_movement_action unlock_anim, MOVEMENT_ACTION_UNLOCK_ANIM
create_movement_action walk_left_affine, MOVEMENT_ACTION_WALK_LEFT_AFFINE
create_movement_action walk_right_affine, MOVEMENT_ACTION_WALK_RIGHT_AFFINE
create_movement_action levitate, MOVEMENT_ACTION_LEVITATE
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 145ea70049..5e6ab33921 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1,6 +1,7 @@
#include "constants/global.h"
#include "constants/battle.h"
#include "constants/pokemon.h"
+#include "constants/battle_arena.h"
#include "constants/battle_script_commands.h"
#include "constants/battle_anim.h"
#include "constants/battle_string_ids.h"
@@ -467,16 +468,16 @@ BattleScript_EffectCourtChange::
attackanimation
waitanimation
printstring STRINGID_COURTCHANGE
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_BeakBlastSetUp::
setbeakblast BS_ATTACKER
printstring STRINGID_EMPTYSTRING3
- waitmessage 0x1
+ waitmessage 1
playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL
printstring STRINGID_HEATUPBEAK
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
end2
BattleScript_BeakBlastBurn::
@@ -506,7 +507,7 @@ BattleScript_FirstChargingTurnMeteorBeam::
seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
seteffectsecondary
return
@@ -539,24 +540,24 @@ BattleScript_ScaleShotDoMultiHit::
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
multihitresultmessage
printstring STRINGID_EMPTYSTRING3
- waitmessage 0x1
+ waitmessage 1
addbyte sMULTIHIT_STRING + 4, 0x1
moveendto MOVEEND_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_ScaleShotPrintStrings
decrementmultihit BattleScript_ScaleShotLoop
goto BattleScript_ScaleShotPrintStrings
BattleScript_ScaleShotMultiHitNoMoreHits::
- pause 0x20
+ pause B_WAIT_TIME_SHORT
BattleScript_ScaleShotPrintStrings::
resultmessage
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
jumpifmovehadnoeffect BattleScript_ScaleShotEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_ScaleShotEnd::
setmoveeffect MOVE_EFFECT_SCALE_SHOT | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
seteffectwithchance
@@ -781,7 +782,7 @@ BattleScript_OctolockLowerDef:
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE
setbyte sSTAT_ANIM_PLAYED, TRUE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_OctolockTryLowerSpDef
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OctolockTryLowerSpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_OctolockTryLowerSpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -790,7 +791,7 @@ BattleScript_OctolockTryLowerSpDef:
playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_NEGATIVE
BattleScript_OctolockSkipSpDefAnim:
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_OctolockEnd2
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OctolockEnd2
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_OctolockEnd2
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -816,7 +817,7 @@ BattleScript_EffectTarShot:
setstatchanger STAT_SPEED, 1, TRUE
attackanimation
waitanimation
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TryTarShot
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TryTarShot
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
@@ -1064,7 +1065,7 @@ BattleScript_StuffCheeksEatBerry:
bicword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, FALSE
setstatchanger STAT_DEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StuffCheeksEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StuffCheeksEnd
setgraphicalstatchangevalues
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StuffCheeksEnd @ cant raise def
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1087,13 +1088,13 @@ BattleScript_DecorateBoost:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0x0
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_DecorateBoostSpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_DecorateBoostSpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DecorateBoostSpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DecorateBoostSpAtk:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1144,13 +1145,13 @@ BattleScript_CoachingWorks:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, 0x0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_CoachingBoostDef
+ statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_CoachingBoostDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CoachingBoostDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoachingBoostDef:
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1296,7 +1297,7 @@ BattleScript_EffectStrengthSap:
ppreduce
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, MIN_STAT_STAGE, BattleScript_StrengthSapTryLower
pause B_WAIT_TIME_SHORT
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_MoveEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -1305,7 +1306,7 @@ BattleScript_StrengthSapTryLower:
jumpiffullhp BS_ATTACKER, BattleScript_StrengthSapMustLower
attackanimation
waitanimation
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StrengthSapHp
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StrengthSapHp
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StrengthSapHp
BattleScript_StrengthSapLower:
setgraphicalstatchangevalues
@@ -1328,7 +1329,7 @@ BattleScript_StrengthSapHp:
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_StrengthSapMustLower:
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_MoveEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_MoveEnd
attackanimation
waitanimation
@@ -1394,19 +1395,19 @@ BattleScript_VCreateStatAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VCreateTrySpDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VCreateTrySpDef:
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VCreateTrySpeed
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VCreateTrySpeed:
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateStatLossRet
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateStatLossRet
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VCreateStatLossRet
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1439,13 +1440,13 @@ BattleScript_EffectPartingShotTryAtk:
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectPartingShotTrySpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectPartingShotTrySpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectPartingShotTrySpAtk:
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectPartingShotSwitch
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectPartingShotSwitch
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectPartingShotSwitch:
@@ -1496,7 +1497,7 @@ BattleScript_EffectAromaticMist:
goto BattleScript_ButItFailed
BattleScript_EffectAromaticMistWorks:
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AromaticMistAnim
pause B_WAIT_TIME_SHORTEST
printstring STRINGID_TARGETSTATWONTGOHIGHER
@@ -1532,14 +1533,14 @@ BattleScript_EffectMagneticFluxSkipAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMagneticFluxTrySpDef
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMagneticFluxTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectMagneticFluxTrySpDef
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMagneticFluxTrySpDef:
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMagneticFluxLoop
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMagneticFluxLoop
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectMagneticFluxLoop
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
@@ -1571,14 +1572,14 @@ BattleScript_EffectGearUpSkipAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectGearUpTrySpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectGearUpTrySpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectGearUpTrySpAtk
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectGearUpTrySpAtk:
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectGearUpLoop
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectGearUpLoop
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectGearUpLoop
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
@@ -1649,7 +1650,7 @@ BattleScript_FlowerShieldLoop:
goto BattleScript_FlowerShieldMoveTargetEnd
BattleScript_FlowerShieldLoop2:
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlowerShieldMoveTargetEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlowerShieldMoveTargetEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlowerShieldDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_FlowerShieldMoveTargetEnd
pause 21
@@ -1687,13 +1688,13 @@ BattleScript_RototillerAffected:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_RototillerTrySpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerTrySpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_RototillerTrySpAtk::
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_RototillerMoveTargetEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerMoveTargetEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerMoveTargetEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1858,7 +1859,7 @@ BattleScript_DefogWorks:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_DefogTryHazardsWithAnim
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_DefogTryHazardsWithAnim
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefogDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_DefogTryHazardsWithAnim
pause B_WAIT_TIME_SHORT
@@ -1912,7 +1913,7 @@ BattleScript_EffectAutotomize:
attackcanceler
attackstring
ppreduce
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutotomizeWeightLoss
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AutotomizeWeightLoss
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AutotomizeAttackAnim
pause B_WAIT_TIME_SHORT
goto BattleScript_AutotomizePrintString
@@ -2002,7 +2003,7 @@ BattleScript_ToxicThreadWorks:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_ToxicThreadTryPsn
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_ToxicThreadTryPsn
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_ToxicThreadDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_ToxicThreadTryPsn
pause B_WAIT_TIME_SHORT
@@ -2038,21 +2039,21 @@ BattleScript_VenomDrenchDoMoveAnim::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchTryLowerSpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VenomDrenchTryLowerSpAtk::
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpeed
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchTryLowerSpeed
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VenomDrenchTryLowerSpeed::
playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2073,14 +2074,14 @@ BattleScript_NobleRoarDoMoveAnim::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_NobleRoarTryLowerSpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_NobleRoarTryLowerSpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_NobleRoarTryLowerSpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_NobleRoarTryLowerSpAtk::
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_NobleRoarEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_NobleRoarEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_NobleRoarEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2102,13 +2103,13 @@ BattleScript_ShellSmashTryDef::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTrySpDef:
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTryAttack
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTryAttack
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTryAttack
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2116,19 +2117,19 @@ BattleScript_ShellSmashTryAttack:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_ATK | BIT_SPEED, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashTrySpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTrySpAtk:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTrySpeed:
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2160,7 +2161,7 @@ BattleScript_GrowthDoMoveAnim::
BattleScript_GrowthAtk2:
setstatchanger STAT_ATK, 2, FALSE
BattleScript_GrowthAtk:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GrowthTrySpAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GrowthTrySpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GrowthTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2171,7 +2172,7 @@ BattleScript_GrowthTrySpAtk::
BattleScript_GrowthSpAtk2:
setstatchanger STAT_SPATK, 2, FALSE
BattleScript_GrowthSpAtk:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GrowthEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GrowthEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GrowthEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2235,13 +2236,13 @@ BattleScript_ShiftGearSpeedBy1:
playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, 0
setstatchanger STAT_SPEED, 1, FALSE
BattleScript_ShiftGearDoSpeed:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShiftGearTryAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShiftGearTryAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShiftGearTryAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShiftGearTryAtk:
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShiftGearEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShiftGearEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShiftGearEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2261,19 +2262,19 @@ BattleScript_CoilDoMoveAnim:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_ACC, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilTryDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CoilTryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilTryDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoilTryDef:
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilTryAcc
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CoilTryAcc
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilTryAcc
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoilTryAcc:
setstatchanger STAT_ACC, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CoilEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2293,19 +2294,19 @@ BattleScript_QuiverDanceDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_QuiverDanceTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_QuiverDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2338,13 +2339,13 @@ BattleScript_AttackSpAttackUpDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackSpAttackUpTrySpAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackSpAttackUpTrySpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackSpAttackUpTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackSpAttackUpTrySpAtk::
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackSpAttackUpEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackSpAttackUpEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackSpAttackUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2363,13 +2364,13 @@ BattleScript_AttackAccUpDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackAccUpTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackAccUpTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackAccUpTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackAccUpTrySpDef::
setstatchanger STAT_ACC, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackAccUpEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackAccUpEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackAccUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -3193,7 +3194,8 @@ BattleScript_EffectExplosion::
attackcanceler
attackstring
ppreduce
- faintifabilitynotdamp
+@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can)
+ tryexplosion
setatkhptozero
waitstate
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
@@ -3236,7 +3238,7 @@ BattleScript_EffectMindBlown::
attackcanceler
attackstring
ppreduce
- faintifabilitynotdamp
+ tryexplosion
dmg_1_2_attackerhp
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
@@ -3335,7 +3337,7 @@ BattleScript_EffectStatUp::
BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpEnd
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim
pause B_WAIT_TIME_SHORT
goto BattleScript_StatUpPrintString
@@ -3391,7 +3393,7 @@ BattleScript_EffectStatDown:
BattleScript_StatDownFromAttackString:
attackstring
ppreduce
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StatDownEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd
pause B_WAIT_TIME_SHORT
@@ -3412,7 +3414,7 @@ BattleScript_MirrorArmorReflect::
call BattleScript_AbilityPopUp
jumpifsubstituteblocks BattleScript_AbilityNoSpecificStatLoss
BattleScript_MirrorArmorReflectStatLoss:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_MirrorArmorReflectEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorArmorReflectEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_MirrorArmorReflectAnim
goto BattleScript_MirrorArmorReflectWontFall
BattleScript_MirrorArmorReflectAnim:
@@ -4102,19 +4104,19 @@ BattleScript_GeomancyDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GeomancyTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GeomancyTrySpDef::
setstatchanger STAT_SPDEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GeomancyTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GeomancyTrySpeed::
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GeomancyEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -4607,17 +4609,17 @@ BattleScript_CurseTrySpeed::
attackanimation
waitanimation
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryAttack
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryAttack::
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryDefense
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryDefense
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryDefense::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseEnd::
@@ -4746,7 +4748,7 @@ BattleScript_EffectSwagger::
attackanimation
waitanimation
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_SwaggerTryConfuse
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -4887,7 +4889,7 @@ BattleScript_EffectRapidSpin::
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
seteffectwithchance
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectRapidSpinEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectRapidSpinEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectRapidSpinEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -5071,7 +5073,7 @@ BattleScript_EffectSkullBash::
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKULL_BASH
call BattleScriptFirstChargingTurn
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_SkullBashEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SkullBashEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -5138,8 +5140,8 @@ BattleScript_EffectTeleport:
ppreduce
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
getifcantrunfrombattle BS_ATTACKER
- jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed
- jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective
+ jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
+ jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
@@ -5228,7 +5230,7 @@ BattleScript_EffectDefenseCurl::
ppreduce
setdefensecurlbit
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString
attackanimation
waitanimation
@@ -5315,13 +5317,13 @@ BattleScript_EffectStockpileDef:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectStockpileSpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectStockpileSpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectStockpileSpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectStockpileSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectStockpileEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectStockpileEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectStockpileEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -5401,7 +5403,7 @@ BattleScript_EffectFlatter::
attackanimation
waitanimation
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlatterTryConfuse
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -5453,10 +5455,10 @@ BattleScript_AlreadyBurned::
BattleScript_EffectMemento::
attackcanceler
- jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoFailProtect
+ jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoTargetProtect
attackstring
ppreduce
- jumpifattackandspecialattackcannotfall BattleScript_ButItFailed
+ trymemento BattleScript_ButItFailed
setatkhptozero
attackanimation
waitanimation
@@ -5465,16 +5467,16 @@ BattleScript_EffectMemento::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
- @ Greater than STAT_FELL is checking if the stat cannot decrease
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
+@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMementoTrySpAtk:
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTryFaint
- @ Greater than STAT_FELL is checking if the stat cannot decrease
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTryFaint
+@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -5485,11 +5487,12 @@ BattleScript_EffectMementoPrintNoEffect:
printstring STRINGID_BUTNOEFFECT
waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectMementoTryFaint
-BattleScript_MementoFailProtect:
+@ If the target is protected there's no need to check the target's stats or animate, the user will just faint
+BattleScript_MementoTargetProtect:
attackstring
ppreduce
- jumpifattackandspecialattackcannotfall BattleScript_MementoFailEnd
-BattleScript_MementoFailEnd:
+ trymemento BattleScript_MementoTargetProtectEnd
+BattleScript_MementoTargetProtectEnd:
setatkhptozero
pause B_WAIT_TIME_LONG
effectivenesssound
@@ -5542,7 +5545,7 @@ BattleScript_EffectCharge::
waitanimation
.if B_CHARGE_SPDEF_RAISE >= GEN_5
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectChargeString
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectChargeString
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectChargeString
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -5946,14 +5949,14 @@ BattleScript_TickleDoMoveAnim::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleTryLowerDef
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TickleTryLowerDef::
playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -5979,13 +5982,13 @@ BattleScript_CosmicPowerDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CosmicPowerTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -6007,13 +6010,13 @@ BattleScript_BulkUpDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpTryDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpTryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_BulkUpTryDef::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -6032,13 +6035,13 @@ BattleScript_CalmMindDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CalmMindTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -6064,13 +6067,13 @@ BattleScript_DragonDanceDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DragonDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -6798,13 +6801,13 @@ BattleScript_WeaknessPolicyAtk:
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeaknessPolicySpAtk
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeaknessPolicySpAtk
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeaknessPolicySpAtk
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
BattleScript_WeaknessPolicySpAtk:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeaknessPolicyRemoveItem
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeaknessPolicyRemoveItem
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeaknessPolicyRemoveItem
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
@@ -6958,7 +6961,7 @@ BattleScript_StickyWebOnSwitchIn::
printstring STRINGID_STICKYWEBSWITCHIN
waitmessage B_WAIT_TIME_LONG
jumpifability BS_TARGET, ABILITY_MIRROR_ARMOR, BattleScript_MirrorArmorReflectStickyWeb
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StickyWebOnSwitchInEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StickyWebOnSwitchInEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StickyWebOnSwitchInStatAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StickyWebOnSwitchInEnd
pause B_WAIT_TIME_SHORT
@@ -7042,7 +7045,7 @@ BattleScript_GulpMissileNoDmgGulping:
waitanimation
swapattackerwithtarget @ to make gStatDownStringIds down below print the right battler
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_GulpMissileGorgingTargetDefenseCantGoLower
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_GulpMissileGorgingTargetDefenseCantGoLower
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
@@ -7074,27 +7077,27 @@ BattleScript_AllStatsUpAtk::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpDef::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpAtk::
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpRet
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpRet::
@@ -7330,14 +7333,14 @@ BattleScript_AtkDefDown::
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDownTryDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownTryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDownTryDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefDownTryDef:
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDownRet
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownRet
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDownRet
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -7349,14 +7352,14 @@ BattleScript_DefSpDefDown::
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefSpDefDownTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_DefSpDefDownTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefSpDefDownTrySpDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DefSpDefDownTrySpDef::
playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefSpDefDownRet
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_DefSpDefDownRet
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefSpDefDownRet
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -7369,14 +7372,14 @@ BattleScript_DefDownSpeedUp::
BattleScript_DefDownSpeedUpTryDef::
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_DefDownSpeedUpTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_DefDownSpeedUpTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DefDownSpeedUpTrySpeed
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DefDownSpeedUpTrySpeed:
playstatchangeanimation BS_ATTACKER, BIT_SPEED, 0
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_DefDownSpeedUpRet
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_DefDownSpeedUpRet
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DefDownSpeedUpRet
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -7461,7 +7464,7 @@ BattleScript_SAtkDown2::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_SAtkDown2End
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_SAtkDown2End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SAtkDown2End
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -7610,7 +7613,7 @@ BattleScript_CottonDownLoop:
jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_CottonDownLoopIncrement
setstatchanger STAT_SPEED, 1, TRUE
jumpifbyteequal gBattlerTarget, gEffectBattler, BattleScript_CottonDownLoopIncrement
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_CottonDownTargetSpeedCantGoLower
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_CottonDownTargetSpeedCantGoLower
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
@@ -7744,7 +7747,7 @@ BattleScript_MoveUsedFlinchedEnd:
goto BattleScript_MoveEnd
BattleScript_TryActivateSteadFast:
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_MoveUsedFlinchedEnd
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
@@ -8039,7 +8042,7 @@ sZero:
BattleScript_MoodyActivates::
call BattleScript_AbilityPopUp
jumpifbyteequal sSTATCHANGER, sZero, BattleScript_MoodyLower
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoodyLower
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoodyLower
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_ROSE, BattleScript_MoodyLower
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -8048,7 +8051,7 @@ BattleScript_MoodyActivates::
BattleScript_MoodyLower:
jumpifbyteequal sSAVED_STAT_CHANGER, sZero, BattleScript_MoodyEnd
copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_MoodyEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoodyEnd
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_MoodyEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -8207,7 +8210,7 @@ BattleScript_TryAdrenalineOrb:
jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_ADRENALINE_ORB, BattleScript_TryAdrenalineOrbRet
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPEED, 12, BattleScript_TryAdrenalineOrbRet
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_TryAdrenalineOrbRet
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_TryAdrenalineOrbRet
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -8241,7 +8244,7 @@ BattleScript_IntimidateActivatesLoop:
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented
.endif
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_IntimidateActivatesLoopIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -8657,7 +8660,7 @@ BattleScript_WanderingSpiritActivates::
BattleScript_TargetsStatWasMaxedOut::
call BattleScript_AbilityPopUp
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_TARGETSSTATWASMAXEDOUT
@@ -8667,7 +8670,7 @@ BattleScript_TargetsStatWasMaxedOut::
BattleScript_BattlerAbilityStatRaiseOnSwitchIn::
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
@@ -8677,7 +8680,7 @@ BattleScript_BattlerAbilityStatRaiseOnSwitchIn::
BattleScript_TargetAbilityStatRaiseOnMoveEnd::
call BattleScript_AbilityPopUp
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
@@ -8690,7 +8693,7 @@ BattleScript_ScriptingAbilityStatRaise::
call BattleScript_AbilityPopUp
copybyte sSAVED_DMG, gBattlerAttacker
copybyte gBattlerAttacker, sBATTLER
- statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
+ statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
setgraphicalstatchangevalues
playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
waitanimation
@@ -8702,7 +8705,7 @@ BattleScript_ScriptingAbilityStatRaise::
BattleScript_WeakArmorActivates::
call BattleScript_AbilityPopUp
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_WeakArmorDefAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_WeakArmorActivatesSpeed
pause B_WAIT_TIME_SHORTEST
@@ -8716,7 +8719,7 @@ BattleScript_WeakArmorDefAnim:
waitmessage B_WAIT_TIME_LONG
BattleScript_WeakArmorActivatesSpeed:
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeakArmorSpeedAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_WeakArmorActivatesEnd
pause B_WAIT_TIME_SHORTEST
@@ -8752,7 +8755,7 @@ BattleScript_AttackerAbilityStatRaise::
return
BattleScript_FellStingerRaisesStat::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_FellStingerRaisesAtkEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_FellStingerRaisesAtkEnd
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_ROSE, BattleScript_FellStingerRaisesAtkEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -9255,7 +9258,7 @@ BattleScript_BerryStatRaiseEnd2::
BattleScript_BerryStatRaiseEnd2_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryStatRaiseEnd2_Anim:
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_BerryStatRaiseEnd2_End
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_BerryStatRaiseEnd2_End
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
@@ -9270,7 +9273,7 @@ BattleScript_BerryStatRaiseRet::
BattleScript_BerryStatRaiseRet_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_BerryStatRaiseRet_Anim:
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_BerryStatRaiseRet_End
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_BerryStatRaiseRet_End
setgraphicalstatchangevalues
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
@@ -9346,7 +9349,7 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_THATS_IT
arenawaitmessage B_MSG_REF_THATS_IT
pause B_WAIT_TIME_LONG
- setbyte gBattleCommunication, 0
+ setbyte gBattleCommunication, 0 @ Reset state for arenajudgmentwindow
arenajudgmentwindow
pause B_WAIT_TIME_LONG
arenajudgmentwindow
@@ -9359,8 +9362,9 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_JUDGE_BODY
arenawaitmessage B_MSG_REF_JUDGE_BODY
arenajudgmentwindow
- jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 3, BattleScript_ArenaJudgmentPlayerLoses
- jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 4, BattleScript_ArenaJudgmentDraw
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw
+@ ARENA_RESULT_PLAYER_WON
arenajudgmentstring B_MSG_REF_PLAYER_WON
arenawaitmessage B_MSG_REF_PLAYER_WON
arenajudgmentwindow
@@ -9434,7 +9438,7 @@ BattleScript_TotemVar::
BattleScript_TotemVarEnd:
end2
BattleScript_ApplyTotemVarBoost:
- statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TotemVarEnd
+ statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TotemVarEnd
setgraphicalstatchangevalues
playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_TotemVarPrintStatMsg:
@@ -9519,7 +9523,7 @@ BattleScript_ZMoveActivateDamaging::
printstring STRINGID_ZPOWERSURROUNDS
playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
printstring STRINGID_ZMOVEUNLEASHED
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
return
BattleScript_ZMoveActivateStatus::
@@ -9533,32 +9537,32 @@ BattleScript_ZMoveActivateStatus::
BattleScript_ZEffectPrintString::
printfromtable gZEffectStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
return
BattleScript_RecoverHPZMove::
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
printfromtable gZEffectStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
return
BattleScript_StatUpZMove::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpZMoveEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpZMoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpZMoveEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_ZMOVESTATUP
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
printfromtable gStatUpStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_StatUpZMoveEnd:
return
BattleScript_HealReplacementZMove::
playanimation BS_SCRIPTING B_ANIM_WISH_HEAL 0x0
printfromtable gZEffectStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
return
@@ -9580,29 +9584,29 @@ BattleScript_ExtremeEvoboostAtk::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostDef
printfromtable gStatUpStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostDef::
setstatchanger STAT_DEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpeed
printfromtable gStatUpStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpeed::
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpAtk
printfromtable gStatUpStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpAtk::
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpDef
printfromtable gStatUpStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpDef::
setstatchanger STAT_SPDEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostEnd
printfromtable gStatUpStringIds
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostEnd::
goto BattleScript_MoveEnd
@@ -9622,9 +9626,9 @@ BattleScript_EffectTerrainHit:
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
resultmessage
- waitmessage 0x40
+ waitmessage B_WAIT_TIME_LONG
setterrain BattleScript_TryFaint
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
printfromtable gTerrainStringIds
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 481f7000db..2a8903fe6f 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -472,8 +472,8 @@ BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
@ Unused
BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
- .string "For the feat of your 7-win streak,\n"
- .string "we present you with Battle Point(s).$"
+ .string "For the feat of your 7-win streak,\n"
+ .string "we present you with Battle Point(s).$"
BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
.string "You seem to have no space for\n"
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 1039422808..f9723ffa0f 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
waitmovement 0
setvar VAR_TEMP_1, 1
goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
- releaseall
- end
+ releaseall
+ end
EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
walk_up
diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index a42f47af73..4394312876 100644
--- a/data/maps/FortreeCity_DecorationShop/scripts.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
@@ -19,7 +19,7 @@ FortreeCity_DecorationShop_EventScript_ClerkDesks::
release
end
- .align 2
+ .align 2
FortreeCity_DecorationShop_PokemartDecor_Desks:
.2byte DECOR_SMALL_DESK
.2byte DECOR_POKEMON_DESK
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 6cb83b4528..f97326c543 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -144,7 +144,7 @@ Route111_EventScript_RootFossilDisappeared::
@ Unused
Route111_Movement_PlayerFall::
- store_lock_anim
+ lock_anim
walk_fast_down
walk_fast_down
walk_fast_down
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index e1fa3d1799..eda3505bf4 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -315,7 +315,7 @@ MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory::
.string "the HOENN region!$"
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle::
- .string "The BERRY-Planting TRAINER$"
+ .string "The BERRY-Planting TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction::
.string "Planted BERRIES$"
diff --git a/data/sound_data.s b/data/sound_data.s
index cd33950e17..1bc2995808 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -2,7 +2,7 @@
.include "asm/macros/m4a.inc"
.include "asm/macros/music_voice.inc"
-
+ .include "include/constants/pokemon_config.h"
.include "sound/voice_groups.inc"
.include "sound/keysplit_tables.inc"
.include "sound/programmable_wave_data.inc"
diff --git a/data/text/event_ticket_2.inc b/data/text/event_ticket_2.inc
index 0165b5fde9..e5536eebf8 100644
--- a/data/text/event_ticket_2.inc
+++ b/data/text/event_ticket_2.inc
@@ -1,71 +1,71 @@
EventTicket_Text_OldSeaMapTooFar:
- .string "What's up, youngster?\p"
- .string "What, it's you who's supposed to have\n"
- .string "a tattered old map?\p"
- .string "Let's have a look.\n"
- .string "… … … … … …\p"
- .string "Boy, this is quite a ways away.\n"
- .string "I'm afraid I can't help you…$"
+ .string "What's up, youngster?\p"
+ .string "What, it's you who's supposed to have\n"
+ .string "a tattered old map?\p"
+ .string "Let's have a look.\n"
+ .string "… … … … … …\p"
+ .string "Boy, this is quite a ways away.\n"
+ .string "I'm afraid I can't help you…$"
EventTicket_Text_BrineyHoldOnASecond:
- .string "BRINEY: Hold on a second!\p"
- .string "What's the idea of turning down\n"
- .string "someone that I owe so much to?$"
+ .string "BRINEY: Hold on a second!\p"
+ .string "What's the idea of turning down\n"
+ .string "someone that I owe so much to?$"
EventTicket_Text_BrineyLetsSail:
- .string "{PLAYER}{KUN}, I'm terribly sorry.\p"
- .string "You came to me seeking my help,\n"
- .string "and we almost turned you away.\p"
- .string "Well, let me make things right.\p"
- .string "We'll sail right away, of course!\p"
- .string "Let's find this island on\n"
- .string "this OLD SEA MAP!$"
+ .string "{PLAYER}{KUN}, I'm terribly sorry.\p"
+ .string "You came to me seeking my help,\n"
+ .string "and we almost turned you away.\p"
+ .string "Well, let me make things right.\p"
+ .string "We'll sail right away, of course!\p"
+ .string "Let's find this island on\n"
+ .string "this OLD SEA MAP!$"
EventTicket_Text_OddTicketGetOnBoard:
- .string "Is it you who brought that odd\n"
- .string "ticket?\p"
- .string "Where you're trying to go is an island\n"
- .string "that's far, far away.\p"
- .string "No one knows what awaits there…\p"
- .string "The very thought excites my blood\n"
- .string "as a sailing man!\p"
- .string "Get on board, youngster!$"
+ .string "Is it you who brought that odd\n"
+ .string "ticket?\p"
+ .string "Where you're trying to go is an island\n"
+ .string "that's far, far away.\p"
+ .string "No one knows what awaits there…\p"
+ .string "The very thought excites my blood\n"
+ .string "as a sailing man!\p"
+ .string "Get on board, youngster!$"
FarawayIsland_Entrance_Text_SailorReturn:
- .string "CAPT. BRINEY can be so maddeningly\n"
- .string "fickle…\p"
- .string "Do you want to return to LILYCOVE?$"
+ .string "CAPT. BRINEY can be so maddeningly\n"
+ .string "fickle…\p"
+ .string "Do you want to return to LILYCOVE?$"
BirthIsland_Harbor_Text_SailorReturn:
- .string "What an oddly shaped island, eh?\n"
- .string "Do you want to return to LILYCOVE?$"
+ .string "What an oddly shaped island, eh?\n"
+ .string "Do you want to return to LILYCOVE?$"
EventTicket_Text_OddTicketsWhereTo:
- .string "Is it you who brought those\n"
- .string "odd tickets?\p"
- .string "… … …Hm.\p"
- .string "These tickets will get you to islands\n"
- .string "that are far, far away.\p"
- .string "No one knows what awaits there,\n"
- .string "or what may happen there.\p"
- .string "The very thought excites my blood\n"
- .string "as a sailing man!\p"
- .string "Get on board, youngster!\n"
- .string "Where shall we sail first?$"
+ .string "Is it you who brought those\n"
+ .string "odd tickets?\p"
+ .string "… … …Hm.\p"
+ .string "These tickets will get you to islands\n"
+ .string "that are far, far away.\p"
+ .string "No one knows what awaits there,\n"
+ .string "or what may happen there.\p"
+ .string "The very thought excites my blood\n"
+ .string "as a sailing man!\p"
+ .string "Get on board, youngster!\n"
+ .string "Where shall we sail first?$"
NavelRock_Harbor_Text_SailorReturn:
- .string "Did… Did you hear that?\n"
- .string "That low growling from deep in there.\p"
- .string "Are you sure it's safe?\n"
- .string "Do you think we should leave?$"
+ .string "Did… Did you hear that?\n"
+ .string "That low growling from deep in there.\p"
+ .string "Are you sure it's safe?\n"
+ .string "Do you think we should leave?$"
FarawayIsland_Entrance_Text_Sign:
- .string "The writing is fading as if it was\n"
- .string "written a long time ago…\p"
- .string "“…ber, 6th day\n"
- .string "If any human…sets foot here…\l"
- .string "again…et it be a kindhearted pers…\l"
- .string "…ith that hope, I depar…”$"
+ .string "The writing is fading as if it was\n"
+ .string "written a long time ago…\p"
+ .string "“…ber, 6th day\n"
+ .string "If any human…sets foot here…\l"
+ .string "again…et it be a kindhearted pers…\l"
+ .string "…ith that hope, I depar…”$"
FarawayIsland_Interior_Text_Mew:
- .string "Myuu…$"
+ .string "Myuu…$"
diff --git a/data/text/pkmn_center_nurse.inc b/data/text/pkmn_center_nurse.inc
index 05a186f2fa..eb0a0dc46d 100644
--- a/data/text/pkmn_center_nurse.inc
+++ b/data/text/pkmn_center_nurse.inc
@@ -1,51 +1,51 @@
gText_WouldYouLikeToRestYourPkmn::
- .string "Hello, and welcome to\n"
- .string "the POKéMON CENTER.\p"
- .string "We restore your tired POKéMON\n"
- .string "to full health.\p"
- .string "Would you like to rest your POKéMON?$"
+ .string "Hello, and welcome to\n"
+ .string "the POKéMON CENTER.\p"
+ .string "We restore your tired POKéMON\n"
+ .string "to full health.\p"
+ .string "Would you like to rest your POKéMON?$"
gText_IllTakeYourPkmn::
- .string "Okay, I'll take your POKéMON\n"
- .string "for a few seconds.$"
+ .string "Okay, I'll take your POKéMON\n"
+ .string "for a few seconds.$"
gText_RestoredPkmnToFullHealth::
- .string "Thank you for waiting.\p"
- .string "We've restored your POKéMON\n"
- .string "to full health.$"
+ .string "Thank you for waiting.\p"
+ .string "We've restored your POKéMON\n"
+ .string "to full health.$"
gText_WeHopeToSeeYouAgain::
- .string "We hope to see you again!$"
+ .string "We hope to see you again!$"
gText_WelcomeCutShort::
- .string "Hello, and welcome to\n"
- .string "the POKéMON CENTER.\p"
- .string "We restore your tired POKéMON\n"
- .string "to full health.\p"
- .string "Would you like to…$"
+ .string "Hello, and welcome to\n"
+ .string "the POKéMON CENTER.\p"
+ .string "We restore your tired POKéMON\n"
+ .string "to full health.\p"
+ .string "Would you like to…$"
gText_NoticesGoldCard::
- .string "Th-that card…\n"
- .string "Could it be… The GOLD CARD?!\p"
- .string "Oh, the gold color is brilliant!\n"
- .string "The four stars seem to sparkle!\p"
- .string "I've seen several TRAINERS with\n"
- .string "a SILVER CARD before, but, {PLAYER},\l"
- .string "you're the first TRAINER I've ever\l"
- .string "seen with a GOLD CARD!\p"
- .string "Okay, {PLAYER}, please allow me\n"
- .string "the honor of resting your POKéMON!$"
+ .string "Th-that card…\n"
+ .string "Could it be… The GOLD CARD?!\p"
+ .string "Oh, the gold color is brilliant!\n"
+ .string "The four stars seem to sparkle!\p"
+ .string "I've seen several TRAINERS with\n"
+ .string "a SILVER CARD before, but, {PLAYER},\l"
+ .string "you're the first TRAINER I've ever\l"
+ .string "seen with a GOLD CARD!\p"
+ .string "Okay, {PLAYER}, please allow me\n"
+ .string "the honor of resting your POKéMON!$"
gText_YouWantTheUsual::
- .string "I'm delighted to see you, {PLAYER}!\n"
- .string "You want the usual, am I right?$"
+ .string "I'm delighted to see you, {PLAYER}!\n"
+ .string "You want the usual, am I right?$"
gText_IllTakeYourPkmn2::
- .string "Okay, I'll take your POKéMON\n"
- .string "for a few seconds.$"
+ .string "Okay, I'll take your POKéMON\n"
+ .string "for a few seconds.$"
gText_ThankYouForWaiting::
- .string "Thank you for waiting.$"
+ .string "Thank you for waiting.$"
gText_WeHopeToSeeYouAgain2::
- .string "We hope to see you again!$"
+ .string "We hope to see you again!$"
diff --git a/data/text/secret_base_trainers.inc b/data/text/secret_base_trainers.inc
index f1881533ab..ef8ba4dca5 100644
--- a/data/text/secret_base_trainers.inc
+++ b/data/text/secret_base_trainers.inc
@@ -1,286 +1,286 @@
SecretBase_Text_Trainer0Intro:
- .string "Have you made a SECRET BASE already?\p"
- .string "I went here, there, everywhere before\n"
- .string "choosing this place.\p"
- .string "Since you're already here, how would\n"
- .string "you like to battle?$"
+ .string "Have you made a SECRET BASE already?\p"
+ .string "I went here, there, everywhere before\n"
+ .string "choosing this place.\p"
+ .string "Since you're already here, how would\n"
+ .string "you like to battle?$"
SecretBase_Text_Trainer0AcceptBattle:
- .string "Okay!\n"
- .string "Here we come!$"
+ .string "Okay!\n"
+ .string "Here we come!$"
SecretBase_Text_Trainer0DeclineBattle:
- .string "Hunh?\n"
- .string "Oh, you can't now…$"
+ .string "Hunh?\n"
+ .string "Oh, you can't now…$"
SecretBase_Text_Trainer0Defeated::
- .string "Waaargh! You're too strong!\n"
- .string "About me losing… Please keep it secret!$"
+ .string "Waaargh! You're too strong!\n"
+ .string "About me losing… Please keep it secret!$"
SecretBase_Text_Trainer0PostBattle:
- .string "What do you think of my SECRET BASE?\n"
- .string "Come visit me again tomorrow.$"
+ .string "What do you think of my SECRET BASE?\n"
+ .string "Come visit me again tomorrow.$"
SecretBase_Text_Trainer0PreChampion:
- .string "Have you made a SECRET BASE already?\p"
- .string "I went here, there, everywhere before\n"
- .string "choosing this place.\p"
- .string "Feel free to hang out!$"
+ .string "Have you made a SECRET BASE already?\p"
+ .string "I went here, there, everywhere before\n"
+ .string "choosing this place.\p"
+ .string "Feel free to hang out!$"
SecretBase_Text_Trainer5Intro:
- .string "There're a lot of places where\n"
- .string "you can make a SECRET BASE.\p"
- .string "But I like this spot best.\n"
- .string "Don't you think it's nice?\p"
- .string "Oh, would you like to have a battle?$"
+ .string "There're a lot of places where\n"
+ .string "you can make a SECRET BASE.\p"
+ .string "But I like this spot best.\n"
+ .string "Don't you think it's nice?\p"
+ .string "Oh, would you like to have a battle?$"
SecretBase_Text_Trainer5AcceptBattle:
- .string "Okay, here goes!$"
+ .string "Okay, here goes!$"
SecretBase_Text_Trainer5DeclineBattle:
- .string "Oh…\n"
- .string "You can't now, okay.$"
+ .string "Oh…\n"
+ .string "You can't now, okay.$"
SecretBase_Text_Trainer5Defeated::
- .string "Hmmm… It's our loss…\n"
- .string "But don't tell anyone!\l"
- .string "It's a confidential secret!$"
+ .string "Hmmm… It's our loss…\n"
+ .string "But don't tell anyone!\l"
+ .string "It's a confidential secret!$"
SecretBase_Text_Trainer5PostBattle:
- .string "If you're in this area again,\n"
- .string "I hope you'll visit me.$"
+ .string "If you're in this area again,\n"
+ .string "I hope you'll visit me.$"
SecretBase_Text_Trainer5PreChampion:
- .string "There're a lot of places where you can\n"
- .string "make a SECRET BASE.\p"
- .string "But I like this spot best.\n"
- .string "Don't you think it's nice?$"
+ .string "There're a lot of places where you can\n"
+ .string "make a SECRET BASE.\p"
+ .string "But I like this spot best.\n"
+ .string "Don't you think it's nice?$"
SecretBase_Text_Trainer1Intro:
- .string "This is a popular spot.\n"
- .string "It's always taken.\p"
- .string "Oh! Were you thinking about\n"
- .string "taking this spot, too?\p"
- .string "I'll tell you what, you can have this\n"
- .string "spot if you can beat me.$"
+ .string "This is a popular spot.\n"
+ .string "It's always taken.\p"
+ .string "Oh! Were you thinking about\n"
+ .string "taking this spot, too?\p"
+ .string "I'll tell you what, you can have this\n"
+ .string "spot if you can beat me.$"
SecretBase_Text_Trainer1AcceptBattle:
- .string "Okay!\n"
- .string "I'm going to defend my SECRET BASE!$"
+ .string "Okay!\n"
+ .string "I'm going to defend my SECRET BASE!$"
SecretBase_Text_Trainer1DeclineBattle:
- .string "Hunh? Is that right?\n"
- .string "You're not interested in this spot?$"
+ .string "Hunh? Is that right?\n"
+ .string "You're not interested in this spot?$"
SecretBase_Text_Trainer1Defeated::
- .string "I can't keep going!\n"
- .string "I surrender!$"
+ .string "I can't keep going!\n"
+ .string "I surrender!$"
SecretBase_Text_Trainer1PostBattle:
- .string "Okay, when I move one day,\n"
- .string "this place will be yours!$"
+ .string "Okay, when I move one day,\n"
+ .string "this place will be yours!$"
SecretBase_Text_Trainer1PreChampion:
- .string "This is a popular spot.\n"
- .string "It's always taken.\p"
- .string "I waited a long time for it to open.\n"
- .string "I finally got to use it!$"
+ .string "This is a popular spot.\n"
+ .string "It's always taken.\p"
+ .string "I waited a long time for it to open.\n"
+ .string "I finally got to use it!$"
SecretBase_Text_Trainer6Intro:
- .string "Welcome to my POKéMON LAB.\p"
- .string "I carry out research on battling in\n"
- .string "secrecy.\p"
- .string "Would you like to see how strong I am?$"
+ .string "Welcome to my POKéMON LAB.\p"
+ .string "I carry out research on battling in\n"
+ .string "secrecy.\p"
+ .string "Would you like to see how strong I am?$"
SecretBase_Text_Trainer6AcceptBattle:
- .string "I'm going to go all out!$"
+ .string "I'm going to go all out!$"
SecretBase_Text_Trainer6DeclineBattle:
- .string "Oh.\n"
- .string "Some other time, then!$"
+ .string "Oh.\n"
+ .string "Some other time, then!$"
SecretBase_Text_Trainer6Defeated::
- .string "Hmm… I've still got lots to learn.\n"
- .string "I have to study some more.$"
+ .string "Hmm… I've still got lots to learn.\n"
+ .string "I have to study some more.$"
SecretBase_Text_Trainer6PostBattle:
- .string "Thanks for battling with me.\n"
- .string "Please come back again tomorrow.$"
+ .string "Thanks for battling with me.\n"
+ .string "Please come back again tomorrow.$"
SecretBase_Text_Trainer6PreChampion:
- .string "Welcome to my POKéMON LAB.\p"
- .string "I carry out research on battling in\n"
- .string "secrecy.$"
+ .string "Welcome to my POKéMON LAB.\p"
+ .string "I carry out research on battling in\n"
+ .string "secrecy.$"
SecretBase_Text_Trainer2Intro:
- .string "A big mansion is nice, but I like this\n"
- .string "sort of place more.\p"
- .string "I like it because all kinds of people\n"
- .string "come visit me.\p"
- .string "So, how would you like a battle?$"
+ .string "A big mansion is nice, but I like this\n"
+ .string "sort of place more.\p"
+ .string "I like it because all kinds of people\n"
+ .string "come visit me.\p"
+ .string "So, how would you like a battle?$"
SecretBase_Text_Trainer2AcceptBattle:
- .string "That's the way!$"
+ .string "That's the way!$"
SecretBase_Text_Trainer2DeclineBattle:
- .string "When you're ready, give me a shout!$"
+ .string "When you're ready, give me a shout!$"
SecretBase_Text_Trainer2Defeated::
- .string "Aww! Done in!\n"
- .string "But it's still fun to battle!$"
+ .string "Aww! Done in!\n"
+ .string "But it's still fun to battle!$"
SecretBase_Text_Trainer2PostBattle:
- .string "Well, anyway, I should go buy some\n"
- .string "decorations and furniture.\p"
- .string "I want my SECRET BASE to be a place\n"
- .string "other people can enjoy.$"
+ .string "Well, anyway, I should go buy some\n"
+ .string "decorations and furniture.\p"
+ .string "I want my SECRET BASE to be a place\n"
+ .string "other people can enjoy.$"
SecretBase_Text_Trainer2PreChampion:
- .string "A big mansion is nice, but I like this\n"
- .string "sort of place more.\p"
- .string "I like it because all kinds of people\n"
- .string "come visit me.$"
+ .string "A big mansion is nice, but I like this\n"
+ .string "sort of place more.\p"
+ .string "I like it because all kinds of people\n"
+ .string "come visit me.$"
SecretBase_Text_Trainer7Intro:
- .string "I simply adore shopping for decorations\n"
- .string "and furniture.\p"
- .string "I also love raising POKéMON just\n"
- .string "as much.\p"
- .string "If you would be so kind, will you battle\n"
- .string "with my POKéMON?$"
+ .string "I simply adore shopping for decorations\n"
+ .string "and furniture.\p"
+ .string "I also love raising POKéMON just\n"
+ .string "as much.\p"
+ .string "If you would be so kind, will you battle\n"
+ .string "with my POKéMON?$"
SecretBase_Text_Trainer7AcceptBattle:
- .string "Thank you.\n"
- .string "Shall we begin?$"
+ .string "Thank you.\n"
+ .string "Shall we begin?$"
SecretBase_Text_Trainer7DeclineBattle:
- .string "Oh.\n"
- .string "How disappointing…$"
+ .string "Oh.\n"
+ .string "How disappointing…$"
SecretBase_Text_Trainer7Defeated::
- .string "I concede…$"
+ .string "I concede…$"
SecretBase_Text_Trainer7PostBattle:
- .string "That was all in good fun!\n"
- .string "I should go enjoy shopping now.$"
+ .string "That was all in good fun!\n"
+ .string "I should go enjoy shopping now.$"
SecretBase_Text_Trainer7PreChampion:
- .string "I simply adore shopping for decorations\n"
- .string "and furniture.\p"
- .string "I also love raising POKéMON just\n"
- .string "as much.$"
+ .string "I simply adore shopping for decorations\n"
+ .string "and furniture.\p"
+ .string "I also love raising POKéMON just\n"
+ .string "as much.$"
SecretBase_Text_Trainer3Intro:
- .string "Some people make their SECRET BASES in\n"
- .string "hard-to-find places.\l"
- .string "Do they want to just lie low?\p"
- .string "But since you found me, how about we\n"
- .string "have a battle?$"
+ .string "Some people make their SECRET BASES in\n"
+ .string "hard-to-find places.\l"
+ .string "Do they want to just lie low?\p"
+ .string "But since you found me, how about we\n"
+ .string "have a battle?$"
SecretBase_Text_Trainer3AcceptBattle:
- .string "I'm not going down easily!$"
+ .string "I'm not going down easily!$"
SecretBase_Text_Trainer3DeclineBattle:
- .string "Oh… Are you maybe tired from searching\n"
- .string "for this place?$"
+ .string "Oh… Are you maybe tired from searching\n"
+ .string "for this place?$"
SecretBase_Text_Trainer3Defeated::
- .string "I went down…$"
+ .string "I went down…$"
SecretBase_Text_Trainer3PostBattle:
- .string "Where's your SECRET BASE?\n"
- .string "I should go visit you there.$"
+ .string "Where's your SECRET BASE?\n"
+ .string "I should go visit you there.$"
SecretBase_Text_Trainer3PreChampion:
- .string "Some people make their SECRET BASES in\n"
- .string "hard-to-find places.\l"
- .string "Do they want to just lie low?$"
+ .string "Some people make their SECRET BASES in\n"
+ .string "hard-to-find places.\l"
+ .string "Do they want to just lie low?$"
SecretBase_Text_Trainer8Intro:
- .string "People have told me that you can get\n"
- .string "decorations in several ways.\p"
- .string "We should have a race to see who can\n"
- .string "get nicer decorations and furniture!\p"
- .string "In the meantime, want to battle?$"
+ .string "People have told me that you can get\n"
+ .string "decorations in several ways.\p"
+ .string "We should have a race to see who can\n"
+ .string "get nicer decorations and furniture!\p"
+ .string "In the meantime, want to battle?$"
SecretBase_Text_Trainer8AcceptBattle:
- .string "This is my SECRET BASE.\n"
- .string "I can't lose!$"
+ .string "This is my SECRET BASE.\n"
+ .string "I can't lose!$"
SecretBase_Text_Trainer8DeclineBattle:
- .string "I'll battle with you anytime.$"
+ .string "I'll battle with you anytime.$"
SecretBase_Text_Trainer8Defeated::
- .string "Huh?\n"
- .string "Did I just lose?$"
+ .string "Huh?\n"
+ .string "Did I just lose?$"
SecretBase_Text_Trainer8PostBattle:
- .string "I won't lose at collecting decorations.\n"
- .string "Come visit again!$"
+ .string "I won't lose at collecting decorations.\n"
+ .string "Come visit again!$"
SecretBase_Text_Trainer8PreChampion:
- .string "People have told me that you can get\n"
- .string "decorations in several ways.\p"
- .string "We should have a race to see who can\n"
- .string "get nicer decorations and furniture!$"
+ .string "People have told me that you can get\n"
+ .string "decorations in several ways.\p"
+ .string "We should have a race to see who can\n"
+ .string "get nicer decorations and furniture!$"
SecretBase_Text_Trainer4Intro:
- .string "I found a spot I liked, and I did it up\n"
- .string "with my favorite decorations.\p"
- .string "I raise my favorite POKéMON and grow\n"
- .string "stronger with it.\p"
- .string "That's what I do.\n"
- .string "Want to battle with me?$"
+ .string "I found a spot I liked, and I did it up\n"
+ .string "with my favorite decorations.\p"
+ .string "I raise my favorite POKéMON and grow\n"
+ .string "stronger with it.\p"
+ .string "That's what I do.\n"
+ .string "Want to battle with me?$"
SecretBase_Text_Trainer4AcceptBattle:
- .string "Show me what you're made of!$"
+ .string "Show me what you're made of!$"
SecretBase_Text_Trainer4DeclineBattle:
- .string "I guess there are times when you're not\n"
- .string "into it.$"
+ .string "I guess there are times when you're not\n"
+ .string "into it.$"
SecretBase_Text_Trainer4Defeated::
- .string "I know exactly what you're made of now.$"
+ .string "I know exactly what you're made of now.$"
SecretBase_Text_Trainer4PostBattle:
- .string "We can both become stronger.\n"
- .string "Let's keep at it!$"
+ .string "We can both become stronger.\n"
+ .string "Let's keep at it!$"
SecretBase_Text_Trainer4PreChampion:
- .string "I found a spot I liked, and I did it up\n"
- .string "with my favorite decorations.\p"
- .string "I raise my favorite POKéMON and grow\n"
- .string "stronger with it.\p"
- .string "Every day is a great day.$"
+ .string "I found a spot I liked, and I did it up\n"
+ .string "with my favorite decorations.\p"
+ .string "I raise my favorite POKéMON and grow\n"
+ .string "stronger with it.\p"
+ .string "Every day is a great day.$"
SecretBase_Text_Trainer9Intro:
- .string "You can learn a lot about the taste\n"
- .string "and sense of people by the kinds of\l"
- .string "decorations they have, and how they\l"
- .string "display them.\p"
- .string "What do you think of my taste?\n"
- .string "Are you speechless?\p"
- .string "Want to see my taste in battling?$"
+ .string "You can learn a lot about the taste\n"
+ .string "and sense of people by the kinds of\l"
+ .string "decorations they have, and how they\l"
+ .string "display them.\p"
+ .string "What do you think of my taste?\n"
+ .string "Are you speechless?\p"
+ .string "Want to see my taste in battling?$"
SecretBase_Text_Trainer9AcceptBattle:
- .string "There's no holding back!$"
+ .string "There's no holding back!$"
SecretBase_Text_Trainer9DeclineBattle:
- .string "I'll be happy to demonstrate my style\n"
- .string "anytime.$"
+ .string "I'll be happy to demonstrate my style\n"
+ .string "anytime.$"
SecretBase_Text_Trainer9Defeated::
- .string "You're supremely talented!\n"
- .string "Your power seems to be limitless…$"
+ .string "You're supremely talented!\n"
+ .string "Your power seems to be limitless…$"
SecretBase_Text_Trainer9PostBattle:
- .string "What did you think of my style?\n"
- .string "I'll keep on polishing it!$"
+ .string "What did you think of my style?\n"
+ .string "I'll keep on polishing it!$"
SecretBase_Text_Trainer9PreChampion:
- .string "You can learn a lot about the taste\n"
- .string "and sense of people by the kinds of\l"
- .string "decorations they have, and how they\l"
- .string "display them.\p"
- .string "What do you think of my taste?\n"
- .string "Are you speechless?$"
+ .string "You can learn a lot about the taste\n"
+ .string "and sense of people by the kinds of\l"
+ .string "decorations they have, and how they\l"
+ .string "display them.\p"
+ .string "What do you think of my taste?\n"
+ .string "Are you speechless?$"
diff --git a/gflib/bg.c b/gflib/bg.c
index 6e97be2073..f300e4609d 100644
--- a/gflib/bg.c
+++ b/gflib/bg.c
@@ -33,7 +33,7 @@ struct BgConfig2
u32 basePalette:4;
u32 unk_3:18;
- void* tilemap;
+ void *tilemap;
s32 bg_x;
s32 bg_y;
};
@@ -183,14 +183,14 @@ u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode)
case 0x1:
offset = sGpuBgConfigs.configs[bg].charBaseIndex * BG_CHAR_SIZE;
offset = destOffset + offset;
- cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0);
+ cursor = RequestDma3Copy(src, (void *)(offset + BG_VRAM), size, 0);
if (cursor == -1)
return -1;
break;
case 0x2:
offset = sGpuBgConfigs.configs[bg].mapBaseIndex * BG_SCREEN_SIZE;
offset = destOffset + offset;
- cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0);
+ cursor = RequestDma3Copy(src, (void *)(offset + BG_VRAM), size, 0);
if (cursor == -1)
return -1;
break;
@@ -372,7 +372,7 @@ void SetBgMode(u8 bgMode)
SetBgModeInternal(bgMode);
}
-u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset)
+u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset)
{
u16 tileOffset;
u8 cursor;
@@ -422,7 +422,7 @@ u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset)
if (!IsInvalidBg32(bg))
{
u16 paletteOffset = (sGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2);
- cursor = RequestDma3Copy(src, (void*)(paletteOffset + BG_PLTT), size, 0);
+ cursor = RequestDma3Copy(src, (void *)(paletteOffset + BG_PLTT), size, 0);
if (cursor == -1)
{
@@ -863,7 +863,7 @@ void UnsetBgTilemapBuffer(u8 bg)
}
}
-void* GetBgTilemapBuffer(u8 bg)
+void *GetBgTilemapBuffer(u8 bg)
{
if (IsInvalidBg32(bg))
return NULL;
@@ -906,7 +906,7 @@ void CopyBgTilemapBufferToVram(u8 bg)
}
}
-void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height)
+void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height)
{
u16 destX16;
u16 destY16;
@@ -923,20 +923,20 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi
{
for (destX16 = destX; destX16 < (destX + width); destX16++)
{
- ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *srcCopy++;
+ ((u16 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *srcCopy++;
}
}
break;
}
case BG_TYPE_AFFINE:
{
- const u8 * srcCopy = src;
+ const u8 *srcCopy = src;
mode = GetBgMetricAffineMode(bg, 0x1);
for (destY16 = destY; destY16 < (destY + height); destY16++)
{
for (destX16 = destX; destX16 < (destX + width); destX16++)
{
- ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *srcCopy++;
+ ((u8 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *srcCopy++;
}
}
break;
@@ -984,7 +984,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
{
for (j = destX; j < (destX + rectWidth); j++)
{
- *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + tileOffset;
+ *(u8 *)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8 *)(srcPtr) + tileOffset;
srcPtr++;
}
srcPtr += (srcWidth - rectWidth);
@@ -1009,7 +1009,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
{
for (x16 = x; x16 < (x + width); x16++)
{
- ((u16*)sGpuBgConfigs2[bg].tilemap)[((y16 * 0x20) + x16)] = tileNum;
+ ((u16 *)sGpuBgConfigs2[bg].tilemap)[((y16 * 0x20) + x16)] = tileNum;
}
}
break;
@@ -1019,7 +1019,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
{
for (x16 = x; x16 < (x + width); x16++)
{
- ((u8*)sGpuBgConfigs2[bg].tilemap)[((y16 * mode) + x16)] = tileNum;
+ ((u8 *)sGpuBgConfigs2[bg].tilemap)[((y16 * mode) + x16)] = tileNum;
}
}
break;
@@ -1052,7 +1052,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
{
for (x16 = x; x16 < (x + width); x16++)
{
- CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0);
+ CopyTileMapEntry(&firstTileNum, &((u16 *)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0);
firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK);
}
}
@@ -1063,7 +1063,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
{
for (x16 = x; x16 < (x + width); x16++)
{
- ((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum;
+ ((u8 *)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum;
firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK);
}
}
@@ -1240,7 +1240,7 @@ bool32 IsInvalidBg32(u8 bg)
bool32 IsTileMapOutsideWram(u8 bg)
{
- if (sGpuBgConfigs2[bg].tilemap > (void*)IWRAM_END)
+ if (sGpuBgConfigs2[bg].tilemap > (void *)IWRAM_END)
return TRUE;
else if (sGpuBgConfigs2[bg].tilemap == NULL)
return TRUE;
diff --git a/gflib/bg.h b/gflib/bg.h
index 02ff073694..9818339910 100644
--- a/gflib/bg.h
+++ b/gflib/bg.h
@@ -3,29 +3,29 @@
enum
{
- BG_ATTR_CHARBASEINDEX = 1,
- BG_ATTR_MAPBASEINDEX,
- BG_ATTR_SCREENSIZE,
- BG_ATTR_PALETTEMODE,
- BG_ATTR_MOSAIC,
- BG_ATTR_WRAPAROUND,
- BG_ATTR_PRIORITY,
- BG_ATTR_METRIC,
- BG_ATTR_TYPE,
- BG_ATTR_BASETILE,
+ BG_ATTR_CHARBASEINDEX = 1,
+ BG_ATTR_MAPBASEINDEX,
+ BG_ATTR_SCREENSIZE,
+ BG_ATTR_PALETTEMODE,
+ BG_ATTR_MOSAIC,
+ BG_ATTR_WRAPAROUND,
+ BG_ATTR_PRIORITY,
+ BG_ATTR_METRIC,
+ BG_ATTR_TYPE,
+ BG_ATTR_BASETILE,
};
enum {
- BG_TYPE_NORMAL,
- BG_TYPE_AFFINE,
- BG_TYPE_NONE = 0xFFFF
+ BG_TYPE_NORMAL,
+ BG_TYPE_AFFINE,
+ BG_TYPE_NONE = 0xFFFF
};
// Modes for ChangeBgX / ChangeBgY
enum {
- BG_COORD_SET,
- BG_COORD_ADD,
- BG_COORD_SUB,
+ BG_COORD_SET,
+ BG_COORD_ADD,
+ BG_COORD_SUB,
};
// Modes for Unused_AdjustBgMosaic
@@ -62,7 +62,7 @@ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates);
void InitBgFromTemplate(const struct BgTemplate *template);
void SetBgMode(u8 bgMode);
-u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset);
+u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset);
u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset);
bool8 IsDma3ManagerBusyWithBgCopy(void);
@@ -79,10 +79,10 @@ void SetBgAffine(u8 bg, s32 srcCenterX, s32 srcCenterY, s16 dispCenterX, s16 dis
u8 Unused_AdjustBgMosaic(u8 val, u8 mode);
void SetBgTilemapBuffer(u8 bg, void *tilemap);
void UnsetBgTilemapBuffer(u8 bg);
-void* GetBgTilemapBuffer(u8 bg);
+void *GetBgTilemapBuffer(u8 bg);
void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
void CopyBgTilemapBufferToVram(u8 bg);
-void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height);
+void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2);
void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height);
diff --git a/gflib/sprite.c b/gflib/sprite.c
index e5bf890634..9fc597cc3b 100644
--- a/gflib/sprite.c
+++ b/gflib/sprite.c
@@ -94,7 +94,7 @@ static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameC
static u8 IndexOfSpriteTileTag(u16 tag);
static void AllocSpriteTileRange(u16 tag, u16 start, u16 count);
static void DoLoadSpritePalette(const u16 *src, u16 paletteOffset);
-static void UpdateSpriteMatrixAnchorPos(struct Sprite*, s32, s32);
+static void UpdateSpriteMatrixAnchorPos(struct Sprite *, s32, s32);
typedef void (*AnimFunc)(struct Sprite *);
typedef void (*AnimCmdFunc)(struct Sprite *);
@@ -105,7 +105,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
.y = DISPLAY_HEIGHT, \
.affineMode = 0, \
.objMode = 0, \
- .mosaic = 0, \
+ .mosaic = FALSE, \
.bpp = 0, \
.shape = SPRITE_SHAPE(8x8), \
.x = DISPLAY_WIDTH + 64, \
@@ -1201,7 +1201,7 @@ u8 GetSpriteMatrixNum(struct Sprite *sprite)
// Used to shift a sprite's position as it scales.
// Only used by the minigame countdown, so that for instance the numbers don't slide up as they squish down before jumping.
-void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y)
+void SetSpriteMatrixAnchor(struct Sprite *sprite, s16 x, s16 y)
{
sprite->sAnchorX = x;
sprite->sAnchorY = y;
diff --git a/gflib/sprite.h b/gflib/sprite.h
index f7ef165328..86527bc4c0 100644
--- a/gflib/sprite.h
+++ b/gflib/sprite.h
@@ -282,7 +282,7 @@ void FreeSpritePalette(struct Sprite *sprite);
void FreeSpriteOamMatrix(struct Sprite *sprite);
void DestroySpriteAndFreeResources(struct Sprite *sprite);
void AnimateSprite(struct Sprite *sprite);
-void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y);
+void SetSpriteMatrixAnchor(struct Sprite *sprite, s16 x, s16 y);
void StartSpriteAnim(struct Sprite *sprite, u8 animNum);
void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum);
void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex);
diff --git a/gflib/string_util.c b/gflib/string_util.c
index bc6f976c71..4bf8d946db 100644
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
@@ -387,7 +387,7 @@ u8 *StringBraille(u8 *dest, const u8 *src)
const u8 setBrailleFont[] = {
EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_FONT,
- 6,
+ FONT_BRAILLE,
EOS
};
const u8 gotoLine2[] = {
diff --git a/gflib/text.c b/gflib/text.c
index c400c05823..c7efdccce3 100644
--- a/gflib/text.c
+++ b/gflib/text.c
@@ -652,7 +652,7 @@ void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
struct Window *window;
struct Bitmap pixels_data;
struct TextGlyph *glyph;
- u8* glyphHeight;
+ u8 *glyphHeight;
if (sLastTextBgColor != TEXT_COLOR_TRANSPARENT)
{
@@ -1684,7 +1684,7 @@ u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
static void DecompressGlyph_Small(u16 glyphId, bool32 isJapanese)
{
- const u16* glyphs;
+ const u16 *glyphs;
if (isJapanese == 1)
{
@@ -1726,7 +1726,7 @@ static u32 GetGlyphWidth_Small(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Narrow(u16 glyphId, bool32 isJapanese)
{
- const u16* glyphs;
+ const u16 *glyphs;
if (isJapanese == TRUE)
{
@@ -1768,7 +1768,7 @@ static u32 GetGlyphWidth_Narrow(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_SmallNarrow(u16 glyphId, bool32 isJapanese)
{
- const u16* glyphs;
+ const u16 *glyphs;
if (isJapanese == TRUE)
{
@@ -1810,7 +1810,7 @@ static u32 GetGlyphWidth_SmallNarrow(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Short(u16 glyphId, bool32 isJapanese)
{
- const u16* glyphs;
+ const u16 *glyphs;
if (isJapanese == TRUE)
{
@@ -1854,7 +1854,7 @@ static u32 GetGlyphWidth_Short(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Normal(u16 glyphId, bool32 isJapanese)
{
- const u16* glyphs;
+ const u16 *glyphs;
if (isJapanese == TRUE)
{
@@ -1896,7 +1896,7 @@ static u32 GetGlyphWidth_Normal(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Bold(u16 glyphId)
{
- const u16* glyphs;
+ const u16 *glyphs;
glyphs = sFontBoldJapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
diff --git a/gflib/text.h b/gflib/text.h
index 2f660354fc..c07817290d 100644
--- a/gflib/text.h
+++ b/gflib/text.h
@@ -65,7 +65,7 @@ struct TextPrinterSubStruct
struct TextPrinterTemplate
{
- const u8* currentChar;
+ const u8 *currentChar;
u8 windowId;
u8 fontId;
u8 x;
diff --git a/gflib/window.c b/gflib/window.c
index 8ca1a4b628..ff9e8a6e01 100644
--- a/gflib/window.c
+++ b/gflib/window.c
@@ -35,7 +35,7 @@ bool16 InitWindows(const struct WindowTemplate *templates)
int j;
u8 bgLayer;
u16 attrib;
- u8* allocatedTilemapBuffer;
+ u8 *allocatedTilemapBuffer;
int allocatedBaseBlock;
for (i = 0; i < NUM_BACKGROUNDS; ++i)
@@ -405,7 +405,7 @@ void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u
struct Bitmap sourceRect;
struct Bitmap destRect;
- sourceRect.pixels = (u8*)pixels;
+ sourceRect.pixels = (u8 *)pixels;
sourceRect.width = srcWidth;
sourceRect.height = srcHeight;
@@ -421,7 +421,7 @@ static void BlitBitmapRectToWindowWithColorKey(u8 windowId, const u8 *pixels, u1
struct Bitmap sourceRect;
struct Bitmap destRect;
- sourceRect.pixels = (u8*)pixels;
+ sourceRect.pixels = (u8 *)pixels;
sourceRect.width = srcWidth;
sourceRect.height = srcHeight;
@@ -463,9 +463,9 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue)
destOffset = i + (a); \
srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \
if (srcOffset < size) \
- *(u32*)(tileData + destOffset) = *(u32*)(tileData + srcOffset); \
+ *(u32 *)(tileData + destOffset) = *(u32 *)(tileData + srcOffset); \
else \
- *(u32*)(tileData + destOffset) = fillValue32; \
+ *(u32 *)(tileData + destOffset) = fillValue32; \
distanceLoop++; \
}
@@ -474,9 +474,9 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue)
destOffset = i + (a); \
srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \
if (srcOffset < size) \
- *(u32*)(tileData - destOffset) = *(u32*)(tileData - srcOffset); \
+ *(u32 *)(tileData - destOffset) = *(u32 *)(tileData - srcOffset); \
else \
- *(u32*)(tileData - destOffset) = fillValue32; \
+ *(u32 *)(tileData - destOffset) = fillValue32; \
distanceLoop++; \
}
@@ -550,7 +550,7 @@ bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
gWindows[windowId].window.baseBlock = value;
return FALSE;
case WINDOW_TILE_DATA:
- gWindows[windowId].tileData = (u8*)(value);
+ gWindows[windowId].tileData = (u8 *)(value);
return TRUE;
case WINDOW_BG:
case WINDOW_WIDTH:
@@ -605,7 +605,7 @@ static void DummyWindowBgTilemap8Bit(void)
u16 AddWindow8Bit(const struct WindowTemplate *template)
{
u16 windowId;
- u8* memAddress;
+ u8 *memAddress;
u8 bgLayer;
for (windowId = 0; windowId < WINDOWS_MAX; windowId++)
@@ -675,7 +675,7 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u
struct Bitmap sourceRect;
struct Bitmap destRect;
- sourceRect.pixels = (u8*) pixels;
+ sourceRect.pixels = (u8 *) pixels;
sourceRect.width = srcWidth;
sourceRect.height = srcHeight;
diff --git a/gflib/window.h b/gflib/window.h
index 6cb98c8456..583e7e1673 100644
--- a/gflib/window.h
+++ b/gflib/window.h
@@ -73,7 +73,7 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u
void CopyWindowToVram8Bit(u8 windowId, u8 mode);
extern struct Window gWindows[];
-extern void* gWindowBgTilemapBuffers[];
+extern void *gWindowBgTilemapBuffers[];
extern u32 gUnusedWindowVar1;
extern u32 gUnusedWindowVar2;
extern u32 gUnusedWindowVar3;
diff --git a/graphics/battle_transitions/rayquaza.png b/graphics/battle_transitions/rayquaza.png
index 5c3a914749..00df7d7415 100644
Binary files a/graphics/battle_transitions/rayquaza.png and b/graphics/battle_transitions/rayquaza.png differ
diff --git a/graphics/battle_transitions/regis.png b/graphics/battle_transitions/regis.png
index a083107374..4926b165b7 100644
Binary files a/graphics/battle_transitions/regis.png and b/graphics/battle_transitions/regis.png differ
diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png
new file mode 100644
index 0000000000..bf7730024d
Binary files /dev/null and b/graphics/naming_screen/back_button.png differ
diff --git a/graphics/naming_screen/buttons.pal b/graphics/naming_screen/buttons.pal
new file mode 100644
index 0000000000..fdf80bdb06
--- /dev/null
+++ b/graphics/naming_screen/buttons.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+139 139 131
+197 189 180
+230 222 213
+74 115 139
+123 172 197
+172 115 74
+213 156 115
+98 156 57
+148 189 106
+189 164 32
+230 222 90
+57 57 57
+57 57 57
diff --git a/graphics/naming_screen/cursor.pal b/graphics/naming_screen/cursor.pal
new file mode 100644
index 0000000000..8950f9b34b
--- /dev/null
+++ b/graphics/naming_screen/cursor.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 8 8
+222 57 74
+180 65 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 213
+0 0 0
+230 222 213
+0 0 0
diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png
index 3d92ef6f49..e0f5022bed 100644
Binary files a/graphics/naming_screen/cursor.png and b/graphics/naming_screen/cursor.png differ
diff --git a/graphics/naming_screen/cursor_filled.png b/graphics/naming_screen/cursor_filled.png
new file mode 100644
index 0000000000..efb5e11015
Binary files /dev/null and b/graphics/naming_screen/cursor_filled.png differ
diff --git a/graphics/naming_screen/cursor_squished.png b/graphics/naming_screen/cursor_squished.png
new file mode 100644
index 0000000000..5126fcccae
Binary files /dev/null and b/graphics/naming_screen/cursor_squished.png differ
diff --git a/graphics/naming_screen/input_arrow.png b/graphics/naming_screen/input_arrow.png
index e07b9e5a80..0a50726733 100644
Binary files a/graphics/naming_screen/input_arrow.png and b/graphics/naming_screen/input_arrow.png differ
diff --git a/graphics/naming_screen/menu.pal b/graphics/naming_screen/menu.pal
index 0da3b93f2f..2f5c86a568 100644
--- a/graphics/naming_screen/menu.pal
+++ b/graphics/naming_screen/menu.pal
@@ -1,6 +1,6 @@
JASC-PAL
0100
-96
+16
106 156 213
255 255 255
115 115 115
@@ -17,83 +17,3 @@ JASC-PAL
230 222 90
238 230 139
246 238 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-74 115 139
-98 139 164
-123 172 197
-156 205 230
-180 222 246
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-172 115 74
-189 131 90
-213 156 115
-246 205 164
-255 230 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-98 156 57
-123 172 82
-148 189 106
-197 230 156
-213 238 189
-106 156 213
-255 255 255
-57 57 57
-139 139 131
-197 189 180
-230 222 213
-74 115 139
-123 172 197
-172 115 74
-213 156 115
-98 156 57
-148 189 106
-189 164 32
-230 222 90
-57 57 57
-57 57 57
-106 156 213
-255 8 8
-222 57 74
-180 65 82
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-230 222 213
-0 0 0
-230 222 213
-0 0 0
diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png
new file mode 100644
index 0000000000..3850f462a4
Binary files /dev/null and b/graphics/naming_screen/ok_button.png differ
diff --git a/graphics/naming_screen/page_button.png b/graphics/naming_screen/page_button.png
deleted file mode 100644
index e5a0048941..0000000000
Binary files a/graphics/naming_screen/page_button.png and /dev/null differ
diff --git a/graphics/naming_screen/page_swap_button.png b/graphics/naming_screen/page_swap_button.png
new file mode 100644
index 0000000000..2e5cabed0f
Binary files /dev/null and b/graphics/naming_screen/page_swap_button.png differ
diff --git a/graphics/naming_screen/page_swap_frame.png b/graphics/naming_screen/page_swap_frame.png
new file mode 100644
index 0000000000..bc3ff122b2
Binary files /dev/null and b/graphics/naming_screen/page_swap_frame.png differ
diff --git a/graphics/naming_screen/page_swap_lower.pal b/graphics/naming_screen/page_swap_lower.pal
new file mode 100644
index 0000000000..0fac7e3752
--- /dev/null
+++ b/graphics/naming_screen/page_swap_lower.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+172 115 74
+189 131 90
+213 156 115
+246 205 164
+255 230 197
diff --git a/graphics/naming_screen/page_swap_lower.png b/graphics/naming_screen/page_swap_lower.png
new file mode 100644
index 0000000000..5747c6265d
Binary files /dev/null and b/graphics/naming_screen/page_swap_lower.png differ
diff --git a/graphics/naming_screen/page_swap_others.pal b/graphics/naming_screen/page_swap_others.pal
new file mode 100644
index 0000000000..0bb9d4f719
--- /dev/null
+++ b/graphics/naming_screen/page_swap_others.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+98 156 57
+123 172 82
+148 189 106
+197 230 156
+213 238 189
diff --git a/graphics/naming_screen/page_swap_others.png b/graphics/naming_screen/page_swap_others.png
new file mode 100644
index 0000000000..1c878a7532
Binary files /dev/null and b/graphics/naming_screen/page_swap_others.png differ
diff --git a/graphics/naming_screen/page_swap_upper.pal b/graphics/naming_screen/page_swap_upper.pal
new file mode 100644
index 0000000000..af5c2d1a52
--- /dev/null
+++ b/graphics/naming_screen/page_swap_upper.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+74 115 139
+98 139 164
+123 172 197
+156 205 230
+180 222 246
diff --git a/graphics/naming_screen/page_swap_upper.png b/graphics/naming_screen/page_swap_upper.png
new file mode 100644
index 0000000000..922f0b93f5
Binary files /dev/null and b/graphics/naming_screen/page_swap_upper.png differ
diff --git a/graphics/naming_screen/pc_icon/off.png b/graphics/naming_screen/pc_icon_off.png
similarity index 100%
rename from graphics/naming_screen/pc_icon/off.png
rename to graphics/naming_screen/pc_icon_off.png
diff --git a/graphics/naming_screen/pc_icon/on.png b/graphics/naming_screen/pc_icon_on.png
similarity index 100%
rename from graphics/naming_screen/pc_icon/on.png
rename to graphics/naming_screen/pc_icon_on.png
diff --git a/graphics/naming_screen/unused.pal b/graphics/naming_screen/rival.pal
similarity index 100%
rename from graphics/naming_screen/unused.pal
rename to graphics/naming_screen/rival.pal
diff --git a/graphics/naming_screen/roptions.png b/graphics/naming_screen/roptions.png
deleted file mode 100644
index dfb7e01059..0000000000
Binary files a/graphics/naming_screen/roptions.png and /dev/null differ
diff --git a/graphics/naming_screen/rwindow.png b/graphics/naming_screen/rwindow.png
deleted file mode 100644
index 9571abb805..0000000000
Binary files a/graphics/naming_screen/rwindow.png and /dev/null differ
diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png
index 409ca82ed6..58d78ce086 100644
Binary files a/graphics/naming_screen/underscore.png and b/graphics/naming_screen/underscore.png differ
diff --git a/graphics/picture_frame/lobby.png b/graphics/picture_frame/lobby.png
index 1b7da4a1a6..2f04105ff0 100644
Binary files a/graphics/picture_frame/lobby.png and b/graphics/picture_frame/lobby.png differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 6087248df2..c275c37601 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -21,6 +21,7 @@ MISCGFXDIR := graphics/misc
JPCONTESTGFXDIR := graphics/contest/japanese
POKEDEXGFXDIR := graphics/pokedex
STARTERGFXDIR := graphics/starter_choose
+NAMINGGFXDIR := graphics/naming_screen
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
contest_types := cool beauty cute smart tough
@@ -82,31 +83,31 @@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/normal/shiny.gbapal \
### Tilesets ###
$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 159
+ $(GFX) $< $@ -num_tiles 159 -Wnum_tiles
$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 498
+ $(GFX) $< $@ -num_tiles 498 -Wnum_tiles
$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 503
+ $(GFX) $< $@ -num_tiles 503 -Wnum_tiles
$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 504
+ $(GFX) $< $@ -num_tiles 504 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 503
+ $(GFX) $< $@ -num_tiles 503 -Wnum_tiles
$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 450
+ $(GFX) $< $@ -num_tiles 450 -Wnum_tiles
$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 493
+ $(GFX) $< $@ -num_tiles 493 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 504
+ $(GFX) $< $@ -num_tiles 504 -Wnum_tiles
$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 328
+ $(GFX) $< $@ -num_tiles 328 -Wnum_tiles
SOOTOPOLISANIMDIR := $(TILESETGFXDIR)/secondary/sootopolis/anim
@@ -143,169 +144,169 @@ $(SOOTOPOLISANIMDIR)/stormy_water/7.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/7_ky
@cat $^ >$@
$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 508
+ $(GFX) $< $@ -num_tiles 508 -Wnum_tiles
$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 508
+ $(GFX) $< $@ -num_tiles 508 -Wnum_tiles
$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 502
+ $(GFX) $< $@ -num_tiles 502 -Wnum_tiles
$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 502
+ $(GFX) $< $@ -num_tiles 502 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 478
+ $(GFX) $< $@ -num_tiles 478 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 425
+ $(GFX) $< $@ -num_tiles 425 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 278
+ $(GFX) $< $@ -num_tiles 278 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 319
+ $(GFX) $< $@ -num_tiles 319 -Wnum_tiles
$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 17
+ $(GFX) $< $@ -num_tiles 17 -Wnum_tiles
$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 460
+ $(GFX) $< $@ -num_tiles 460 -Wnum_tiles
$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 319
+ $(GFX) $< $@ -num_tiles 319 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 120
+ $(GFX) $< $@ -num_tiles 120 -Wnum_tiles
$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 312
+ $(GFX) $< $@ -num_tiles 312 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 345
+ $(GFX) $< $@ -num_tiles 345 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 355
+ $(GFX) $< $@ -num_tiles 355 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 83
+ $(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 83
+ $(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 83
+ $(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 83
+ $(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 83
+ $(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 83
+ $(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 62
+ $(GFX) $< $@ -num_tiles 62 -Wnum_tiles
$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 430
+ $(GFX) $< $@ -num_tiles 430 -Wnum_tiles
$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 431
+ $(GFX) $< $@ -num_tiles 431 -Wnum_tiles
$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 500
+ $(GFX) $< $@ -num_tiles 500 -Wnum_tiles
$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 500
+ $(GFX) $< $@ -num_tiles 500 -Wnum_tiles
$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 509
+ $(GFX) $< $@ -num_tiles 509 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 469
+ $(GFX) $< $@ -num_tiles 469 -Wnum_tiles
$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 150
+ $(GFX) $< $@ -num_tiles 150 -Wnum_tiles
$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 60
+ $(GFX) $< $@ -num_tiles 60 -Wnum_tiles
$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 61
+ $(GFX) $< $@ -num_tiles 61 -Wnum_tiles
$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 54
+ $(GFX) $< $@ -num_tiles 54 -Wnum_tiles
$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 148
+ $(GFX) $< $@ -num_tiles 148 -Wnum_tiles
$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 61
+ $(GFX) $< $@ -num_tiles 61 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 82
+ $(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 484
+ $(GFX) $< $@ -num_tiles 484 -Wnum_tiles
$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 294
+ $(GFX) $< $@ -num_tiles 294 -Wnum_tiles
$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 342
+ $(GFX) $< $@ -num_tiles 342 -Wnum_tiles
$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 505
+ $(GFX) $< $@ -num_tiles 505 -Wnum_tiles
$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 310
+ $(GFX) $< $@ -num_tiles 310 -Wnum_tiles
$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 424
+ $(GFX) $< $@ -num_tiles 424 -Wnum_tiles
$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 382
+ $(GFX) $< $@ -num_tiles 382 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 420
+ $(GFX) $< $@ -num_tiles 420 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 95
+ $(GFX) $< $@ -num_tiles 95 -Wnum_tiles
$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 503
+ $(GFX) $< $@ -num_tiles 503 -Wnum_tiles
$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 374
+ $(GFX) $< $@ -num_tiles 374 -Wnum_tiles
$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 420
+ $(GFX) $< $@ -num_tiles 420 -Wnum_tiles
$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 136
+ $(GFX) $< $@ -num_tiles 136 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 509
+ $(GFX) $< $@ -num_tiles 509 -Wnum_tiles
@@ -353,13 +354,13 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
$(GFX) $< $@ -num_colors 224
graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 63
+ $(GFX) $< $@ -num_tiles 63 -Wnum_tiles
graphics/pokenav/region_map.8bpp: %.8bpp: %.png
- $(GFX) $< $@ -num_tiles 233
+ $(GFX) $< $@ -num_tiles 233 -Wnum_tiles
$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 29
+ $(GFX) $< $@ -num_tiles 29 -Wnum_tiles
$(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
$(BATINTGFXDIR)/textbox_1.gbapal
@@ -403,10 +404,10 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
@cat $^ >$@
$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 353
+ $(GFX) $< $@ -num_tiles 353 -Wnum_tiles
$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 5
+ $(GFX) $< $@ -num_tiles 5 -Wnum_tiles
$(JPCONTESTGFXDIR)/composite_1.4bpp: $(JPCONTESTGFXDIR)/frame_1.4bpp \
$(JPCONTESTGFXDIR)/floor.4bpp \
@@ -422,7 +423,7 @@ $(JPCONTESTGFXDIR)/composite_2.4bpp: $(JPCONTESTGFXDIR)/interface.4bpp \
@cat $^ >$@
$(JPCONTESTGFXDIR)/voltage.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 36
+ $(GFX) $< $@ -num_tiles 36 -Wnum_tiles
$(BTLANMSPRGFXDIR)/ice_crystals.4bpp: $(BTLANMSPRGFXDIR)/ice_crystals_0.4bpp \
$(BTLANMSPRGFXDIR)/ice_crystals_1.4bpp \
@@ -444,13 +445,13 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
@cat $^ >$@
$(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 14
+ $(GFX) $< $@ -num_tiles 14 -Wnum_tiles
$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 16
+ $(GFX) $< $@ -num_tiles 16 -Wnum_tiles
graphics/party_menu/bg.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 62
+ $(GFX) $< $@ -num_tiles 62 -Wnum_tiles
$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
@cat $^ >$@
@@ -461,29 +462,29 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
@cat $^ >$@
graphics/bag/menu.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 53
+ $(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png
- $(GFX) $< $@ -num_tiles 227
+ $(GFX) $< $@ -num_tiles 227 -Wnum_tiles
$(RAYQUAZAGFXDIR)/scene_2/bg.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 313
+ $(GFX) $< $@ -num_tiles 313 -Wnum_tiles
$(RAYQUAZAGFXDIR)/scene_3/rayquaza.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 124
+ $(GFX) $< $@ -num_tiles 124 -Wnum_tiles
$(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail.4bpp
cp $< $@
head -c 12 /dev/zero >> $@
$(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 19
+ $(GFX) $< $@ -num_tiles 19 -Wnum_tiles
$(RAYQUAZAGFXDIR)/scene_4/rayquaza.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 155
+ $(GFX) $< $@ -num_tiles 155 -Wnum_tiles
graphics/picture_frame/lobby.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 86
+ $(GFX) $< $@ -num_tiles 86 -Wnum_tiles
$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
$(ROULETTEGFXDIR)/tailow.4bpp
@@ -496,10 +497,10 @@ $(ROULETTEGFXDIR)/wheel_icons.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
@cat $^ >$@
$(BATTRANSGFXDIR)/regis.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 53
+ $(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 938
+ $(GFX) $< $@ -num_tiles 938 -Wnum_tiles
$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
$(BATTRANSGFXDIR)/frontier_squares_1.4bpp
@@ -522,20 +523,20 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
@cat $^ >$@
graphics/birch_speech/unused_beauty.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 822
+ $(GFX) $< $@ -num_tiles 822 -Wnum_tiles
### Pokémon Storage System ###
$(WALLPAPERGFXDIR)/forest/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 55
+ $(GFX) $< $@ -num_tiles 55 -Wnum_tiles
$(WALLPAPERGFXDIR)/forest/tiles.4bpp: $(WALLPAPERGFXDIR)/forest/frame.4bpp $(WALLPAPERGFXDIR)/forest/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/city/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 52
+ $(GFX) $< $@ -num_tiles 52 -Wnum_tiles
$(WALLPAPERGFXDIR)/city/tiles.4bpp: $(WALLPAPERGFXDIR)/city/frame.4bpp $(WALLPAPERGFXDIR)/city/bg.4bpp
@cat $^ >$@
@@ -544,97 +545,97 @@ $(WALLPAPERGFXDIR)/desert/tiles.4bpp: $(WALLPAPERGFXDIR)/desert/frame.4bpp $(WAL
@cat $^ >$@
$(WALLPAPERGFXDIR)/savanna/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 45
+ $(GFX) $< $@ -num_tiles 45 -Wnum_tiles
$(WALLPAPERGFXDIR)/savanna/bg.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 23
+ $(GFX) $< $@ -num_tiles 23 -Wnum_tiles
$(WALLPAPERGFXDIR)/savanna/tiles.4bpp: $(WALLPAPERGFXDIR)/savanna/frame.4bpp $(WALLPAPERGFXDIR)/savanna/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/crag/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 49
+ $(GFX) $< $@ -num_tiles 49 -Wnum_tiles
$(WALLPAPERGFXDIR)/crag/tiles.4bpp: $(WALLPAPERGFXDIR)/crag/frame.4bpp $(WALLPAPERGFXDIR)/crag/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/volcano/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 56
+ $(GFX) $< $@ -num_tiles 56 -Wnum_tiles
$(WALLPAPERGFXDIR)/volcano/tiles.4bpp: $(WALLPAPERGFXDIR)/volcano/frame.4bpp $(WALLPAPERGFXDIR)/volcano/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/snow/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 57
+ $(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(WALLPAPERGFXDIR)/snow/tiles.4bpp: $(WALLPAPERGFXDIR)/snow/frame.4bpp $(WALLPAPERGFXDIR)/snow/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/cave/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 55
+ $(GFX) $< $@ -num_tiles 55 -Wnum_tiles
$(WALLPAPERGFXDIR)/cave/tiles.4bpp: $(WALLPAPERGFXDIR)/cave/frame.4bpp $(WALLPAPERGFXDIR)/cave/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/beach/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 46
+ $(GFX) $< $@ -num_tiles 46 -Wnum_tiles
$(WALLPAPERGFXDIR)/beach/bg.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 23
+ $(GFX) $< $@ -num_tiles 23 -Wnum_tiles
$(WALLPAPERGFXDIR)/beach/tiles.4bpp: $(WALLPAPERGFXDIR)/beach/frame.4bpp $(WALLPAPERGFXDIR)/beach/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/seafloor/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 54
+ $(GFX) $< $@ -num_tiles 54 -Wnum_tiles
$(WALLPAPERGFXDIR)/seafloor/tiles.4bpp: $(WALLPAPERGFXDIR)/seafloor/frame.4bpp $(WALLPAPERGFXDIR)/seafloor/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/river/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 51
+ $(GFX) $< $@ -num_tiles 51 -Wnum_tiles
$(WALLPAPERGFXDIR)/river/bg.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 11
+ $(GFX) $< $@ -num_tiles 11 -Wnum_tiles
$(WALLPAPERGFXDIR)/river/tiles.4bpp: $(WALLPAPERGFXDIR)/river/frame.4bpp $(WALLPAPERGFXDIR)/river/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/sky/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 45
+ $(GFX) $< $@ -num_tiles 45 -Wnum_tiles
$(WALLPAPERGFXDIR)/sky/tiles.4bpp: $(WALLPAPERGFXDIR)/sky/frame.4bpp $(WALLPAPERGFXDIR)/sky/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/polkadot/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 54
+ $(GFX) $< $@ -num_tiles 54 -Wnum_tiles
$(WALLPAPERGFXDIR)/polkadot/tiles.4bpp: $(WALLPAPERGFXDIR)/polkadot/frame.4bpp $(WALLPAPERGFXDIR)/polkadot/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/pokecenter/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 35
+ $(GFX) $< $@ -num_tiles 35 -Wnum_tiles
$(WALLPAPERGFXDIR)/pokecenter/tiles.4bpp: $(WALLPAPERGFXDIR)/pokecenter/frame.4bpp $(WALLPAPERGFXDIR)/pokecenter/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/machine/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 33
+ $(GFX) $< $@ -num_tiles 33 -Wnum_tiles
$(WALLPAPERGFXDIR)/machine/tiles.4bpp: $(WALLPAPERGFXDIR)/machine/frame.4bpp $(WALLPAPERGFXDIR)/machine/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/plain/frame.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 18
+ $(GFX) $< $@ -num_tiles 18 -Wnum_tiles
$(WALLPAPERGFXDIR)/plain/tiles.4bpp: $(WALLPAPERGFXDIR)/plain/frame.4bpp $(WALLPAPERGFXDIR)/plain/bg.4bpp
@cat $^ >$@
$(WALLPAPERGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 57
+ $(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(WALLPAPERGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 57
+ $(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(WALLPAPERGFXDIR)/zigzagoon/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/zigzagoon/bg.4bpp
@cat $^ >$@
@@ -685,13 +686,13 @@ $(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
@cat $^ >$@
$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 11
+ $(GFX) $< $@ -num_tiles 11 -Wnum_tiles
$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 8
+ $(GFX) $< $@ -num_tiles 8 -Wnum_tiles
$(BATTRANSGFXDIR)/frontier_logo_center.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 43
+ $(GFX) $< $@ -num_tiles 43 -Wnum_tiles
@@ -713,19 +714,28 @@ $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
@cat $^ >$@
$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 53
+ $(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(PKNAVGFXDIR)/device_outline.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 53
+ $(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(PKNAVGFXDIR)/match_call/ui.4bpp: %.4bpp: %.png
- $(GFX) $< $@ -num_tiles 13
+ $(GFX) $< $@ -num_tiles 13 -Wnum_tiles
$(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
- $(GFX) $< $@ -num_tiles 232
+ $(GFX) $< $@ -num_tiles 232 -Wnum_tiles
$(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
- $(GFX) $< $@ -num_tiles 233
+ $(GFX) $< $@ -num_tiles 233 -Wnum_tiles
$(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp
@cat $^ >$@
+
+$(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 5 -Wnum_tiles
+
+$(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 5 -Wnum_tiles
+
+$(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png
+ $(GFX) $< $@ -num_tiles 5 -Wnum_tiles
diff --git a/include/apprentice.h b/include/apprentice.h
index 27ce0371e0..582d41435e 100644
--- a/include/apprentice.h
+++ b/include/apprentice.h
@@ -16,7 +16,7 @@ struct ApprenticeTrainer
extern const struct ApprenticeTrainer gApprentices[];
void BufferApprenticeChallengeText(u8 saveApprenticeId);
-void Apprentice_EnableBothScriptContexts(void);
+void Apprentice_ScriptContext_Enable(void);
void ResetApprenticeStruct(struct Apprentice *apprentice);
void ResetAllApprenticeData(void);
void CallApprenticeFunction(void);
diff --git a/include/battle.h b/include/battle.h
index 4c281f0d6e..931b13b2f4 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -796,10 +796,10 @@ struct BattleSpriteData
struct MonSpritesGfx
{
- void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
+ void *firstDecompressed; // ptr to the decompressed sprite of the first pokemon
union {
- void* ptr[MAX_BATTLERS_COUNT];
- u8* byte[MAX_BATTLERS_COUNT];
+ void *ptr[MAX_BATTLERS_COUNT];
+ u8 *byte[MAX_BATTLERS_COUNT];
} sprites;
struct SpriteTemplate templates[MAX_BATTLERS_COUNT];
struct SpriteFrameImage frameImages[MAX_BATTLERS_COUNT][4];
diff --git a/include/battle_anim.h b/include/battle_anim.h
index ae2d520d89..e1dd853848 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -112,8 +112,8 @@ u8 GetBattlerSpriteBGPriority(u8 battlerId);
void *LoadPointerFromVars(s16 bottom, s16 top);
void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr);
void InitPrioritiesForVisibleBattlers(void);
-void GetBattleAnimBg1Data(struct BattleAnimBgData*);
-void GetBattleAnimBgData(struct BattleAnimBgData*, u32 bgId);
+void GetBattleAnimBg1Data(struct BattleAnimBgData *);
+void GetBattleAnimBgData(struct BattleAnimBgData *, u32 bgId);
u8 GetBattlerSpriteSubpriority(u8 battlerId);
bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
@@ -126,10 +126,10 @@ u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target,
u32 GetBattleMonSpritePalettesMask(u8 playerLeft, u8 playerRight, u8 opponentLeft, u8 opponentRight);
u8 AnimDummyReturnArg(u8 battler);
s16 CloneBattlerSpriteWithBlend(u8);
-void DestroySpriteWithActiveSheet(struct Sprite*);
+void DestroySpriteWithActiveSheet(struct Sprite *);
u8 CreateInvisibleSpriteCopy(int, u8, int);
-void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData*, const void*, bool32);
-void AnimLoadCompressedBgGfx(u32, const u32*, u32);
+void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData *, const void *, bool32);
+void AnimLoadCompressedBgGfx(u32, const u32 *, u32);
void UpdateAnimBg3ScreenSize(bool8);
void TranslateSpriteInGrowingCircle(struct Sprite *);
void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
@@ -190,7 +190,7 @@ u8 GetAnimBattlerSpriteId(u8 wantedBattler);
bool8 IsDoubleBattle(void);
u8 GetBattleBgPaletteNum(void);
u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
-void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
+void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *));
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
u8 GetBattlerSpriteDefault_Y(u8 battlerId);
u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
@@ -227,29 +227,29 @@ void InitStatsChangeAnimation(u8);
void StartMonScrollingBgMask(u8 taskId, int unused, u16 scrollSpeed, u8 battler, bool8 includePartner, u8 numFadeSteps, u8 fadeStepDelay, u8 duration, const u32 *gfx, const u32 *tilemap, const u32 *palette);
// battle_anim_effects_1.c
-void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite);
-void AnimMoveTwisterParticle(struct Sprite* sprite);
+void SetSpriteNextToMonHead(u8 battler, struct Sprite *sprite);
+void AnimMoveTwisterParticle(struct Sprite *sprite);
void AnimParticleBurst(struct Sprite *);
-void AnimPowerAbsorptionOrb(struct Sprite* sprite);
+void AnimPowerAbsorptionOrb(struct Sprite *sprite);
void AnimNeedleArmSpike(struct Sprite *);
void AnimTask_CompressTargetHorizontally(u8 taskId);
-void AnimSporeParticle(struct Sprite* sprite);
-void AnimAbsorptionOrb(struct Sprite* sprite);
-void AnimPetalDanceSmallFlower(struct Sprite* sprite);
-void AnimPetalDanceBigFlower(struct Sprite* sprite);
-void AnimEndureEnergy(struct Sprite* sprite);
-void AnimMimicOrb(struct Sprite* sprite);
-void AnimSolarBeamBigOrb(struct Sprite* sprite);
-void AnimHyperBeamOrb(struct Sprite* sprite);
-void AnimNeedleArmSpike_Step(struct Sprite* sprite);
-void AnimMovePowderParticle(struct Sprite* sprite);
-void AnimMetronomeFinger(struct Sprite* sprite);
-void AnimConversion(struct Sprite* sprite);
-void AnimCuttingSlice(struct Sprite* sprite);
-void AnimThoughtBubble(struct Sprite* sprite);
-void AnimTranslateLinearSingleSineWave(struct Sprite* sprite);
-void AnimGrantingStars(struct Sprite* sprite);
-void AnimFollowMeFinger(struct Sprite* sprite);
+void AnimSporeParticle(struct Sprite *sprite);
+void AnimAbsorptionOrb(struct Sprite *sprite);
+void AnimPetalDanceSmallFlower(struct Sprite *sprite);
+void AnimPetalDanceBigFlower(struct Sprite *sprite);
+void AnimEndureEnergy(struct Sprite *sprite);
+void AnimMimicOrb(struct Sprite *sprite);
+void AnimSolarBeamBigOrb(struct Sprite *sprite);
+void AnimHyperBeamOrb(struct Sprite *sprite);
+void AnimNeedleArmSpike_Step(struct Sprite *sprite);
+void AnimMovePowderParticle(struct Sprite *sprite);
+void AnimMetronomeFinger(struct Sprite *sprite);
+void AnimConversion(struct Sprite *sprite);
+void AnimCuttingSlice(struct Sprite *sprite);
+void AnimThoughtBubble(struct Sprite *sprite);
+void AnimTranslateLinearSingleSineWave(struct Sprite *sprite);
+void AnimGrantingStars(struct Sprite *sprite);
+void AnimFollowMeFinger(struct Sprite *sprite);
extern const union AnimCmd *const gRazorLeafParticleAnimTable[];
extern const union AnimCmd *const gPowerAbsorptionOrbAnimTable[];
extern const union AffineAnimCmd *const gPowerAbsorptionOrbAffineAnimTable[];
@@ -514,7 +514,7 @@ void AnimDragonDanceOrb(struct Sprite *sprite);
void AnimOverheatFlame(struct Sprite *sprite);
// battle_anim_new.c
-void CoreEnforcerLoadBeamTarget(struct Sprite* sprite);
-void SpriteCB_RandomCentredHits(struct Sprite* sprite);
+void CoreEnforcerLoadBeamTarget(struct Sprite *sprite);
+void SpriteCB_RandomCentredHits(struct Sprite *sprite);
#endif // GUARD_BATTLE_ANIM_H
diff --git a/include/battle_arena.h b/include/battle_arena.h
index cc0e72c0c1..469c096129 100644
--- a/include/battle_arena.h
+++ b/include/battle_arena.h
@@ -1,6 +1,8 @@
#ifndef GUARD_BATTLE_ARENA_H
#define GUARD_BATTLE_ARENA_H
+#include "constants/battle_arena.h"
+
void CallBattleArenaFunction(void);
u8 BattleArena_ShowJudgmentWindow(u8 *state);
void BattleArena_InitPoints(void);
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 71c1f3af0c..769dccbd69 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -92,7 +92,7 @@ enum {
LINK_STANDBY_MSG_ONLY,
};
-#define INSTANT_HP_BAR_DROP 32767
+#define INSTANT_HP_BAR_DROP 0x7FFF
#define PARTY_SUMM_SKIP_DRAW_DELAY (1 << 7)
@@ -228,8 +228,8 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId);
void BtlController_EmitChooseAction(u8 bufferId, u8 action, u16 itemId);
void BtlController_EmitYesNoBox(u8 bufferId);
void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
-void BtlController_EmitChooseItem(u8 bufferId, u8* battlePartyOrder);
-void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 slotId, u16 abilityId, u8* data);
+void BtlController_EmitChooseItem(u8 bufferId, u8 *battlePartyOrder);
+void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 slotId, u16 abilityId, u8 *data);
void BtlController_EmitCmd23(u8 bufferId); // unused
void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
void BtlController_EmitExpUpdate(u8 bufferId, u8 partyId, s32 expPoints);
diff --git a/include/battle_main.h b/include/battle_main.h
index 7991696e7d..df59dcae34 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -22,12 +22,6 @@ struct MultiPartnerMenuPokemon
/*0x1D*/ u8 language;
};
-#if B_EXPANDED_ABILITY_NAMES
-#define ABILITY_NAME_LENGTH 16
-#else
-#define ABILITY_NAME_LENGTH 12
-#endif
-
// defines for the 'DoBounceEffect' function
#define BOUNCE_MON 0x0
#define BOUNCE_HEALTHBOX 0x1
@@ -41,16 +35,16 @@ void SpriteCB_VsLetterInit(struct Sprite *sprite);
void CB2_InitEndLinkBattle(void);
u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId);
u32 GetBattleWindowTemplatePixelWidth(u32 setId, u32 tableId);
-void SpriteCb_WildMon(struct Sprite *sprite);
+void SpriteCB_WildMon(struct Sprite *sprite);
void SpriteCallbackDummy_2(struct Sprite *sprite);
void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
-void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite);
-void SpriteCb_HideAsMoveTarget(struct Sprite *sprite);
+void SpriteCB_ShowAsMoveTarget(struct Sprite *sprite);
+void SpriteCB_HideAsMoveTarget(struct Sprite *sprite);
void SpriteCB_OpponentMonFromBall(struct Sprite *sprite);
void SpriteCB_BattleSpriteStartSlideLeft(struct Sprite *sprite);
void SpriteCB_FaintSlideAnim(struct Sprite *sprite);
-void DoBounceEffect(u8 battlerId, u8 b, s8 c, s8 d);
-void EndBounceEffect(u8 battlerId, bool8 b);
+void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude);
+void EndBounceEffect(u8 battler, u8 which);
void SpriteCB_PlayerMonFromBall(struct Sprite *sprite);
void SpriteCB_TrainerThrowObject(struct Sprite *sprite);
void AnimSetCenterToCornerVecX(struct Sprite *sprite);
diff --git a/include/battle_message.h b/include/battle_message.h
index 1a74b44e86..4102bb5c9a 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -234,9 +234,9 @@ enum
};
void BufferStringBattle(u16 stringID);
-u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
-u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
-void BattlePutTextOnWindow(const u8* text, u8 windowId);
+u32 BattleStringExpandPlaceholdersToDisplayedString(const u8 *src);
+u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst);
+void BattlePutTextOnWindow(const u8 *text, u8 windowId);
void SetPpNumbersPaletteInMoveSelection(void);
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
bool32 ShouldDoTrainerSlide(u32 battlerId, u32 trainerId, u32 which);
@@ -244,10 +244,10 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst);
extern struct BattleMsgData *gBattleMsgDataPtr;
-extern const u8* const gBattleStringsTable[];
-extern const u8* const gStatNamesTable[];
-extern const u8* const gPokeblockWasTooXStringTable[];
-extern const u8* const gRefereeStringsTable[];
+extern const u8 *const gBattleStringsTable[];
+extern const u8 *const gStatNamesTable[];
+extern const u8 *const gPokeblockWasTooXStringTable[];
+extern const u8 *const gRefereeStringsTable[];
extern const u8 *const gRoundsStringTable[];
extern const u8 gText_PkmnIsEvolving[];
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h
index a7bd7b9aa3..44185a11a3 100644
--- a/include/battle_script_commands.h
+++ b/include/battle_script_commands.h
@@ -7,6 +7,9 @@
#define WINDOW_CLEAR (1 << 0)
#define WINDOW_BG1 (1 << 7)
+// Arguments for 'xStart, yStart, xEnd, yEnd' in HandleBattleWindow
+#define YESNOBOX_X_Y 24, 8, 29, 13
+
struct StatFractions
{
u8 dividend;
diff --git a/include/battle_util.h b/include/battle_util.h
index e45acdb893..d0edbc9d1b 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -76,7 +76,6 @@ u8 GetBattlerForBattleScript(u8 caseId);
void PressurePPLose(u8 target, u8 attacker, u16 move);
void PressurePPLoseOnUsingPerishSong(u8 attacker);
void PressurePPLoseOnUsingImprison(u8 attacker);
-void MarkAllBattlersForControllerExec(void); // unused
bool32 IsBattlerMarkedForControllerExec(u8 battlerId);
void MarkBattlerForControllerExec(u8 battlerId);
void MarkBattlerReceivedLinkData(u8 battlerId);
@@ -86,7 +85,7 @@ void PrepareStringBattle(u16 stringId, u8 battlerId);
void ResetSentPokesToOpponentValue(void);
void OpponentSwitchInResetSentPokesToOpponentValue(u8 battlerId);
void UpdateSentPokesToOpponentValue(u8 battlerId);
-void BattleScriptPush(const u8* bsPtr);
+void BattleScriptPush(const u8 *bsPtr);
void BattleScriptPushCursor(void);
void BattleScriptPop(void);
u8 TrySetCantSelectMoveBattleScript(void);
@@ -113,8 +112,8 @@ u32 IsAbilityOnFieldExcept(u32 battlerId, u32 ability);
u32 IsAbilityPreventingEscape(u32 battlerId);
bool32 IsBattlerProtected(u8 battlerId, u16 move);
bool32 CanBattlerEscape(u32 battlerId); // no ability check
-void BattleScriptExecute(const u8* BS_ptr);
-void BattleScriptPushCursorAndCallback(const u8* BS_ptr);
+void BattleScriptExecute(const u8 *BS_ptr);
+void BattleScriptPushCursorAndCallback(const u8 *BS_ptr);
u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn);
void ClearFuryCutterDestinyBondGrudge(u8 battlerId);
void HandleAction_RunBattleScript(void);
diff --git a/include/battle_z_move.h b/include/battle_z_move.h
index 2d1ff1a006..94a9c3568c 100644
--- a/include/battle_z_move.h
+++ b/include/battle_z_move.h
@@ -22,7 +22,7 @@ void HideZMoveTriggerSprite(void);
bool32 IsZMoveTriggerSpriteActive(void);
void DestroyZMoveTriggerSprite(void);
bool32 MoveSelectionDisplayZMove(u16 zmove);
-const u8* GetZMoveName(u16 move);
+const u8 *GetZMoveName(u16 move);
void SetZEffect(void);
bool32 IsZMoveUsable(u8 battlerId, u16 moveIndex);
void GetUsableZMoves(u8 battlerId, u16 *moves);
diff --git a/include/config.h b/include/config.h
index 4c231a84de..5f2fa4d2cc 100644
--- a/include/config.h
+++ b/include/config.h
@@ -19,8 +19,10 @@
#ifdef ENGLISH
#define UNITS_IMPERIAL
+#define CHAR_DEC_SEPARATOR CHAR_PERIOD // Period is used as a decimal separator only in the UK and the US.
#else
#define UNITS_METRIC
+#define CHAR_DEC_SEPARATOR CHAR_COMMA
#endif
// Uncomment to fix some identified minor bugs
diff --git a/include/constants/battle.h b/include/constants/battle.h
index a06e3e11eb..37b9a637a3 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -53,17 +53,17 @@
#define BATTLE_TYPE_MULTI (1 << 6)
#define BATTLE_TYPE_SAFARI (1 << 7)
#define BATTLE_TYPE_BATTLE_TOWER (1 << 8)
-#define BATTLE_TYPE_WALLY_TUTORIAL (1 << 9)
+#define BATTLE_TYPE_WALLY_TUTORIAL (1 << 9) // Used in pokefirered as BATTLE_TYPE_OLD_MAN_TUTORIAL.
#define BATTLE_TYPE_ROAMER (1 << 10)
#define BATTLE_TYPE_EREADER_TRAINER (1 << 11)
#define BATTLE_TYPE_KYOGRE_GROUDON (1 << 12)
#define BATTLE_TYPE_LEGENDARY (1 << 13)
#define BATTLE_TYPE_REGI (1 << 14)
-#define BATTLE_TYPE_TWO_OPPONENTS (1 << 15)
-#define BATTLE_TYPE_DOME (1 << 16)
-#define BATTLE_TYPE_PALACE (1 << 17)
-#define BATTLE_TYPE_ARENA (1 << 18)
-#define BATTLE_TYPE_FACTORY (1 << 19)
+#define BATTLE_TYPE_TWO_OPPONENTS (1 << 15) // Used in pokefirered as BATTLE_TYPE_GHOST.
+#define BATTLE_TYPE_DOME (1 << 16) // Used in pokefirered as BATTLE_TYPE_POKEDUDE.
+#define BATTLE_TYPE_PALACE (1 << 17) // Used in pokefirered as BATTLE_TYPE_WILD_SCRIPTED.
+#define BATTLE_TYPE_ARENA (1 << 18) // Used in pokefirered as BATTLE_TYPE_LEGENDARY_FRLG.
+#define BATTLE_TYPE_FACTORY (1 << 19) // Used in pokefirered as BATTLE_TYPE_TRAINER_TOWER.
#define BATTLE_TYPE_PIKE (1 << 20)
#define BATTLE_TYPE_PYRAMID (1 << 21)
#define BATTLE_TYPE_INGAME_PARTNER (1 << 22)
@@ -418,6 +418,11 @@
#define FLEE_ITEM 1
#define FLEE_ABILITY 2
+// Return value for IsRunningFromBattleImpossible.
+#define BATTLE_RUN_SUCCESS 0
+#define BATTLE_RUN_FORBIDDEN 1
+#define BATTLE_RUN_FAILURE 2
+
#define B_WIN_TYPE_NORMAL 0
#define B_WIN_TYPE_ARENA 1
diff --git a/include/constants/battle_arena.h b/include/constants/battle_arena.h
index e04211115d..d4288d04fc 100644
--- a/include/constants/battle_arena.h
+++ b/include/constants/battle_arena.h
@@ -17,4 +17,10 @@
#define ARENA_CATEGORY_SKILL 1
#define ARENA_CATEGORY_BODY 2
+#define ARENA_RESULT_RUNNING 0 // For intermediate steps, when BattleArena_ShowJudgmentWindow should be called again immediately
+#define ARENA_RESULT_STEP_DONE 1 // A step has been completed, the script may advance to the next instruction
+#define ARENA_RESULT_PLAYER_WON 2
+#define ARENA_RESULT_PLAYER_LOST 3
+#define ARENA_RESULT_TIE 4
+
#endif //GUARD_CONSTANTS_BATTLE_ARENA_H
diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index 23926a9bbd..5e9984c550 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -3,127 +3,6 @@
#include "constants/expansion_branches.h"
-// Species with peculiar battle effects.
-#ifndef POKEMON_EXPANSION
- #define SPECIES_DIALGA 0
- #define SPECIES_PALKIA 0
- #define SPECIES_GIRATINA 0
- #define SPECIES_CHERRIM 0
- #define SPECIES_ARCEUS 0
- #define SPECIES_SILVALLY 0
- #define SPECIES_GENESECT 0
- #define SPECIES_AEGISLASH 0
- #define SPECIES_AEGISLASH_BLADE 10000
- #define SPECIES_MIMIKYU 0
- #define SPECIES_MIMIKYU_BUSTED 10001
- #define SPECIES_DARMANITAN 0
- #define SPECIES_DARMANITAN_ZEN_MODE 10002
- #define SPECIES_MINIOR_CORE_RED 0
- #define SPECIES_MINIOR 10003
- #define SPECIES_MINIOR_CORE_BLUE 0
- #define SPECIES_MINIOR_METEOR_BLUE 10004
- #define SPECIES_MINIOR_CORE_GREEN 0
- #define SPECIES_MINIOR_METEOR_GREEN 10005
- #define SPECIES_MINIOR_CORE_INDIGO 0
- #define SPECIES_MINIOR_METEOR_INDIGO 10006
- #define SPECIES_MINIOR_CORE_ORANGE 0
- #define SPECIES_MINIOR_METEOR_ORANGE 10007
- #define SPECIES_MINIOR_CORE_VIOLET 0
- #define SPECIES_MINIOR_METEOR_VIOLET 10008
- #define SPECIES_MINIOR_CORE_YELLOW 0
- #define SPECIES_MINIOR_METEOR_YELLOW 10009
- #define SPECIES_WISHIWASHI 0
- #define SPECIES_WISHIWASHI_SCHOOL 10010
- #define SPECIES_ZYGARDE 0 // 50%
- #define SPECIES_ZYGARDE_10 10011 // 10 %
- #define SPECIES_ZYGARDE_COMPLETE 10012 // 100 %
- #define SPECIES_BURMY 0
- #define SPECIES_BURMY_SANDY_CLOAK 10013
- #define SPECIES_BURMY_TRASH_CLOAK 10014
- #define SPECIES_CRAMORANT 0
- #define SPECIES_CRAMORANT_GORGING 10015
- #define SPECIES_CRAMORANT_GULPING 10016
- #define SPECIES_GRENINJA_BATTLE_BOND 0
- #define SPECIES_GRENINJA_ASH 10017
- #define SPECIES_HOOPA 0
- #define SPECIES_HOOPA_UNBOUND 10018
- #define SPECIES_MELOETTA 0
- #define SPECIES_MELOETTA_PIROUETTE 10019
- #define SPECIES_MORPEKO 0
- #define SPECIES_MORPEKO_HANGRY 10020
- #define SPECIES_SIRFETCHD 10021
- #define SPECIES_DARMANITAN_GALARIAN 0
- #define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN 10022
- #define SPECIES_HEATMOR 0
- #define SPECIES_DURANT 0
- #define SPECIES_CARBINK 0
- #define SPECIES_MAREANIE 0
-#endif
-
-// Items with peculiar battle effects.
-#ifndef ITEM_EXPANSION
- #define ITEM_CHOPLE_BERRY 177
- #define ITEM_KEBIA_BERRY 178
- #define ITEM_SHUCA_BERRY 179
- #define ITEM_COBA_BERRY 180
- #define ITEM_PAYAPA_BERRY 181
- #define ITEM_TANGA_BERRY 182
- #define ITEM_CHARTI_BERRY 183
- #define ITEM_KASIB_BERRY 184
- #define ITEM_HABAN_BERRY 185
- #define ITEM_COLBUR_BERRY 186
- #define ITEM_BABIRI_BERRY 187
- #define ITEM_CHILAN_BERRY 188
- #define ITEM_ROSELI_BERRY 189
- #define ITEM_MICLE_BERRY 197
- #define ITEM_CUSTAP_BERRY 199
- #define ITEM_JABOCA_BERRY 200
- #define ITEM_ROWAP_BERRY 201
- #define ITEM_KEE_BERRY 202
- #define ITEM_MARANGA_BERRY 203
- #define ITEM_OCCA_BERRY 204
- #define ITEM_PASSHO_BERRY 205
- #define ITEM_WACAN_BERRY 206
- #define ITEM_RINDO_BERRY 207
- #define ITEM_YACHE_BERRY 208
- #define ITEM_GRISEOUS_ORB 369
- // z crystals
- #define ITEM_NORMALIUM_Z 568
- #define ITEM_FIGHTINIUM_Z 569
- #define ITEM_FLYINIUM_Z 570
- #define ITEM_POISONIUM_Z 571
- #define ITEM_GROUNDIUM_Z 572
- #define ITEM_ROCKIUM_Z 573
- #define ITEM_BUGINIUM_Z 574
- #define ITEM_GHOSTIUM_Z 575
- #define ITEM_STEELIUM_Z 576
- #define ITEM_FIRIUM_Z 577
- #define ITEM_WATERIUM_Z 578
- #define ITEM_GRASSIUM_Z 579
- #define ITEM_ELECTRIUM_Z 580
- #define ITEM_PSYCHIUM_Z 581
- #define ITEM_ICIUM_Z 582
- #define ITEM_DRAGONIUM_Z 583
- #define ITEM_DARKINIUM_Z 584
- #define ITEM_FAIRIUM_Z 585
- #define ITEM_ALORAICHIUM_Z 586
- #define ITEM_DECIDIUM_Z 587
- #define ITEM_EEVIUM_Z 588
- #define ITEM_INCINIUM_Z 589
- #define ITEM_KOMMONIUM_Z 590
- #define ITEM_LUNALIUM_Z 591
- #define ITEM_LYCANIUM_Z 592
- #define ITEM_MARSHADIUM_Z 593
- #define ITEM_MEWNIUM_Z 594
- #define ITEM_MIMIKIUM_Z 595
- #define ITEM_PIKANIUM_Z 596
- #define ITEM_PIKASHUNIUM_Z 597
- #define ITEM_PRIMARIUM_Z 598
- #define ITEM_SNORLIUM_Z 599
- #define ITEM_SOLGANIUM_Z 600
- #define ITEM_TAPUNIUM_Z 601
-#endif
-
#ifndef GEN_3
#define GEN_3 0
#define GEN_4 1
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 4a954906a8..077cba1eb2 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -63,15 +63,15 @@
#define BS_EFFECT_BATTLER 2
#define BS_FAINTED 3
#define BS_ATTACKER_WITH_PARTNER 4 // for Cmd_updatestatusicon
-#define BS_FAINTED_LINK_MULTIPLE_1 5
-#define BS_FAINTED_LINK_MULTIPLE_2 6
+#define BS_FAINTED_LINK_MULTIPLE_1 5 // for openpartyscreen
+#define BS_FAINTED_LINK_MULTIPLE_2 6 // for openpartyscreen
#define BS_BATTLER_0 7
#define BS_ATTACKER_SIDE 8 // for Cmd_jumpifability
#define BS_TARGET_SIDE 9 // for Cmd_jumpifability
#define BS_SCRIPTING 10
#define BS_PLAYER1 11
#define BS_OPPONENT1 12
-#define BS_PLAYER2 13
+#define BS_PLAYER2 13 // for Cmd_updatestatusicon
#define BS_OPPONENT2 14
#define BS_ABILITY_BATTLER 15
@@ -258,9 +258,9 @@
#define SWITCH_IGNORE_ESCAPE_PREVENTION (1 << 7)
// Cmd_statbuffchange
-#define STAT_BUFF_ALLOW_PTR (1 << 0) // If set, allow use of jumpptr. Set in every use of statbuffchange
-#define STAT_BUFF_NOT_PROTECT_AFFECTED (1 << 5)
-#define STAT_BUFF_UPDATE_MOVE_EFFECT (1 << 6)
+#define STAT_CHANGE_ALLOW_PTR (1 << 0) // If set, allow use of jumpptr. Set in every use of statbuffchange
+#define STAT_CHANGE_NOT_PROTECT_AFFECTED (1 << 5)
+#define STAT_CHANGE_UPDATE_MOVE_EFFECT (1 << 6)
// stat change flags for Cmd_playstatchangeanimation
#define STAT_CHANGE_NEGATIVE (1 << 0)
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index a9d59935ec..af5af53403 100755
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -232,8 +232,8 @@
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93
-#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94
-#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95
+#define MOVEMENT_ACTION_LOCK_ANIM 0x94
+#define MOVEMENT_ACTION_UNLOCK_ANIM 0x95
#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96
#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97
#define MOVEMENT_ACTION_LEVITATE 0x98
diff --git a/include/constants/global.h b/include/constants/global.h
index e05f33a25c..2a773dbb95 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -109,6 +109,12 @@
#define WONDER_CARD_BODY_TEXT_LINES 4
#define WONDER_NEWS_BODY_TEXT_LINES 10
#define TYPE_NAME_LENGTH 6
+#if B_EXPANDED_ABILITY_NAMES == TRUE
+#define ABILITY_NAME_LENGTH 16
+#else
+#define ABILITY_NAME_LENGTH 12
+#endif
+#define TRAINER_NAME_LENGTH 10
#define MAX_STAMP_CARD_STAMPS 7
diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h
index 23625ecb04..c3970b9c1b 100644
--- a/include/constants/item_effects.h
+++ b/include/constants/item_effects.h
@@ -2,22 +2,10 @@
#define GUARD_CONSTANTS_ITEM_EFFECTS_H
// field 0 masks
-#ifndef ITEM_EXPANSION
-#define ITEM0_X_ATTACK 0x0F
-#endif
#define ITEM0_DIRE_HIT 0x30 // Works the same way as the move Focus Energy.
#define ITEM0_SACRED_ASH 0x40
#define ITEM0_INFATUATION 0x80
-#ifndef ITEM_EXPANSION
-// field 1 masks
-#define ITEM1_X_SPEED 0x0F
-#define ITEM1_X_DEFEND 0xF0
-
-// field 2 masks
-#define ITEM2_X_SPATK 0x0F
-#define ITEM2_X_ACCURACY 0xF0
-#else
// new field 1 masks
#define ITEM1_X_ATTACK 0x1
#define ITEM1_X_DEFENSE 0x2
@@ -25,7 +13,6 @@
#define ITEM1_X_SPATK 0x8
#define ITEM1_X_SPDEF 0x10
#define ITEM1_X_ACCURACY 0x20
-#endif
// field 3 masks
#define ITEM3_CONFUSION 0x1
diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h
index 8f40f9a7be..f47cc24fe4 100644
--- a/include/constants/pokedex.h
+++ b/include/constants/pokedex.h
@@ -1,7 +1,8 @@
#ifndef GUARD_CONSTANTS_POKEDEX_H
#define GUARD_CONSTANTS_POKEDEX_H
-// National Pokedex order
+#include "constants/pokemon_config.h"
+// National Pokedex order. Gen 4+ mons and forms are not disabled by P_NEW_POKEMON to keep pokedex_orders.h clean.
enum {
NATIONAL_DEX_NONE,
// Kanto
@@ -915,7 +916,11 @@ enum {
#define KANTO_DEX_COUNT NATIONAL_DEX_MEW
#define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI
+#if P_NEW_POKEMON == TRUE
#define NATIONAL_DEX_COUNT NATIONAL_DEX_CALYREX
+#else
+#define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS
+#endif
#define POKEMON_SLOTS_NUMBER (NATIONAL_DEX_COUNT + 1)
// Hoenn Pokedex order
@@ -952,7 +957,9 @@ enum {
HOENN_DEX_RALTS,
HOENN_DEX_KIRLIA,
HOENN_DEX_GARDEVOIR,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_GALLADE,
+#endif
HOENN_DEX_SURSKIT,
HOENN_DEX_MASQUERAIN,
HOENN_DEX_SHROOMISH,
@@ -982,7 +989,9 @@ enum {
HOENN_DEX_GRAVELER,
HOENN_DEX_GOLEM,
HOENN_DEX_NOSEPASS,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_PROBOPASS,
+#endif
HOENN_DEX_SKITTY,
HOENN_DEX_DELCATTY,
HOENN_DEX_ZUBAT,
@@ -1006,7 +1015,9 @@ enum {
HOENN_DEX_MINUN,
HOENN_DEX_MAGNEMITE,
HOENN_DEX_MAGNETON,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_MAGNEZONE,
+#endif
HOENN_DEX_VOLTORB,
HOENN_DEX_ELECTRODE,
HOENN_DEX_VOLBEAT,
@@ -1017,9 +1028,13 @@ enum {
HOENN_DEX_BELLOSSOM,
HOENN_DEX_DODUO,
HOENN_DEX_DODRIO,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_BUDEW,
HOENN_DEX_ROSELIA,
HOENN_DEX_ROSERADE,
+#else
+ HOENN_DEX_ROSELIA,
+#endif
HOENN_DEX_GULPIN,
HOENN_DEX_SWALOT,
HOENN_DEX_CARVANHA,
@@ -1075,9 +1090,13 @@ enum {
HOENN_DEX_BANETTE,
HOENN_DEX_DUSKULL,
HOENN_DEX_DUSCLOPS,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_DUSKNOIR,
HOENN_DEX_TROPIUS,
HOENN_DEX_CHINGLING,
+#else
+ HOENN_DEX_TROPIUS,
+#endif
HOENN_DEX_CHIMECHO,
HOENN_DEX_ABSOL,
HOENN_DEX_VULPIX,
@@ -1098,10 +1117,14 @@ enum {
HOENN_DEX_HERACROSS,
HOENN_DEX_RHYHORN,
HOENN_DEX_RHYDON,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_RHYPERIOR,
+#endif
HOENN_DEX_SNORUNT,
HOENN_DEX_GLALIE,
+#if P_NEW_POKEMON == TRUE
HOENN_DEX_FROSLASS,
+#endif
HOENN_DEX_SPHEAL,
HOENN_DEX_SEALEO,
HOENN_DEX_WALREIN,
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index a354e80cff..14a037f9f3 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -94,97 +94,6 @@
// Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
-// Flags for Get(Box)MonData / Set(Box)MonData
-#define MON_DATA_PERSONALITY 0
-#define MON_DATA_OT_ID 1
-#define MON_DATA_NICKNAME 2
-#define MON_DATA_LANGUAGE 3
-#define MON_DATA_SANITY_IS_BAD_EGG 4
-#define MON_DATA_SANITY_HAS_SPECIES 5
-#define MON_DATA_SANITY_IS_EGG 6
-#define MON_DATA_OT_NAME 7
-#define MON_DATA_MARKINGS 8
-#define MON_DATA_CHECKSUM 9
-#define MON_DATA_ENCRYPT_SEPARATOR 10
-#define MON_DATA_SPECIES 11
-#define MON_DATA_HELD_ITEM 12
-#define MON_DATA_MOVE1 13
-#define MON_DATA_MOVE2 14
-#define MON_DATA_MOVE3 15
-#define MON_DATA_MOVE4 16
-#define MON_DATA_PP1 17
-#define MON_DATA_PP2 18
-#define MON_DATA_PP3 19
-#define MON_DATA_PP4 20
-#define MON_DATA_PP_BONUSES 21
-#define MON_DATA_COOL 22
-#define MON_DATA_BEAUTY 23
-#define MON_DATA_CUTE 24
-#define MON_DATA_EXP 25
-#define MON_DATA_HP_EV 26
-#define MON_DATA_ATK_EV 27
-#define MON_DATA_DEF_EV 28
-#define MON_DATA_SPEED_EV 29
-#define MON_DATA_SPATK_EV 30
-#define MON_DATA_SPDEF_EV 31
-#define MON_DATA_FRIENDSHIP 32
-#define MON_DATA_SMART 33
-#define MON_DATA_POKERUS 34
-#define MON_DATA_MET_LOCATION 35
-#define MON_DATA_MET_LEVEL 36
-#define MON_DATA_MET_GAME 37
-#define MON_DATA_POKEBALL 38
-#define MON_DATA_HP_IV 39
-#define MON_DATA_ATK_IV 40
-#define MON_DATA_DEF_IV 41
-#define MON_DATA_SPEED_IV 42
-#define MON_DATA_SPATK_IV 43
-#define MON_DATA_SPDEF_IV 44
-#define MON_DATA_IS_EGG 45
-#define MON_DATA_ABILITY_NUM 46
-#define MON_DATA_TOUGH 47
-#define MON_DATA_SHEEN 48
-#define MON_DATA_OT_GENDER 49
-#define MON_DATA_COOL_RIBBON 50
-#define MON_DATA_BEAUTY_RIBBON 51
-#define MON_DATA_CUTE_RIBBON 52
-#define MON_DATA_SMART_RIBBON 53
-#define MON_DATA_TOUGH_RIBBON 54
-#define MON_DATA_STATUS 55
-#define MON_DATA_LEVEL 56
-#define MON_DATA_HP 57
-#define MON_DATA_MAX_HP 58
-#define MON_DATA_ATK 59
-#define MON_DATA_DEF 60
-#define MON_DATA_SPEED 61
-#define MON_DATA_SPATK 62
-#define MON_DATA_SPDEF 63
-#define MON_DATA_MAIL 64
-#define MON_DATA_SPECIES2 65
-#define MON_DATA_IVS 66
-#define MON_DATA_CHAMPION_RIBBON 67
-#define MON_DATA_WINNING_RIBBON 68
-#define MON_DATA_VICTORY_RIBBON 69
-#define MON_DATA_ARTIST_RIBBON 70
-#define MON_DATA_EFFORT_RIBBON 71
-#define MON_DATA_MARINE_RIBBON 72
-#define MON_DATA_LAND_RIBBON 73
-#define MON_DATA_SKY_RIBBON 74
-#define MON_DATA_COUNTRY_RIBBON 75
-#define MON_DATA_NATIONAL_RIBBON 76
-#define MON_DATA_EARTH_RIBBON 77
-#define MON_DATA_WORLD_RIBBON 78
-#define MON_DATA_UNUSED_RIBBONS 79
-#define MON_DATA_EVENT_LEGAL 80
-#define MON_DATA_KNOWN_MOVES 81
-#define MON_DATA_RIBBON_COUNT 82
-#define MON_DATA_RIBBONS 83
-#define MON_DATA_ATK2 84
-#define MON_DATA_DEF2 85
-#define MON_DATA_SPEED2 86
-#define MON_DATA_SPATK2 87
-#define MON_DATA_SPDEF2 88
-
// Ribbon IDs used by TV and Pokénav
#define CHAMPION_RIBBON 0
#define COOL_RIBBON_NORMAL 1
diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h
index 685f5df42d..077c02e332 100644
--- a/include/constants/pokemon_config.h
+++ b/include/constants/pokemon_config.h
@@ -21,355 +21,8 @@
#define P_KADABRA_EVERSTONE GEN_8 // Since Gen 4, Kadabra can evolve even when holding an Everstone.
#define P_NIDORAN_M_DITTO_BREED GEN_8 // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat.
+#define P_NEW_POKEMON TRUE // Turning this to FALSE will remove all newly added Pokémon and Forms. Only Unown, Castform and Deoxys forms will remain.
+
#define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.
-#ifndef ITEM_EXPANSION
-//Item Definitions for gEvolutionTable
-
- //EVO_MEGA_EVOLUTION
- #define ITEM_VENUSAURITE 10001
- #define ITEM_CHARIZARDITE_X 10002
- #define ITEM_CHARIZARDITE_Y 10003
- #define ITEM_BLASTOISINITE 10004
- #define ITEM_BEEDRILLITE 10005
- #define ITEM_PIDGEOTITE 10006
- #define ITEM_ALAKAZITE 10007
- #define ITEM_SLOWBRONITE 10008
- #define ITEM_GENGARITE 10009
- #define ITEM_KANGASKHANITE 10010
- #define ITEM_PINSIRITE 10011
- #define ITEM_GYARADOSITE 10012
- #define ITEM_AERODACTYLITE 10013
- #define ITEM_MEWTWONITE_X 10014
- #define ITEM_MEWTWONITE_Y 10015
- #define ITEM_AMPHAROSITE 10016
- #define ITEM_STEELIXITE 10017
- #define ITEM_SCIZORITE 10018
- #define ITEM_HERACRONITE 10019
- #define ITEM_HOUNDOOMINITE 10020
- #define ITEM_TYRANITARITE 10021
- #define ITEM_SCEPTILITE 10022
- #define ITEM_BLAZIKENITE 10023
- #define ITEM_SWAMPERTITE 10024
- #define ITEM_SABLENITE 10025
- #define ITEM_SHARPEDONITE 10026
- #define ITEM_MANECTITE 10027
- #define ITEM_CAMERUPTITE 10028
- #define ITEM_GLALITITE 10029
- #define ITEM_MAWILITE 10030
- #define ITEM_MEDICHAMITE 10031
- #define ITEM_ALTARIANITE 10032
- #define ITEM_ABSOLITE 10033
- #define ITEM_BANETTITE 10034
- #define ITEM_AGGRONITE 10035
- #define ITEM_GARDEVOIRITE 10036
- #define ITEM_SALAMENCITE 10037
- #define ITEM_METAGROSSITE 10038
- #define ITEM_LATIASITE 10039
- #define ITEM_LATIOSITE 10040
- #define ITEM_LOPUNNITE 10041
- #define ITEM_GARCHOMPITE 10042
- #define ITEM_LUCARIONITE 10043
- #define ITEM_ABOMASITE 10044
- #define ITEM_GALLADITE 10045
- #define ITEM_AUDINITE 10046
- #define ITEM_DIANCITE 10047
-
- //EVO_TRADE_ITEM
- #define ITEM_PROTECTOR 10048
- #define ITEM_ELECTIRIZER 10049
- #define ITEM_MAGMARIZER 10050
- #define ITEM_DUBIOUS_DISC 10051
- #define ITEM_PRISM_SCALE 10052
- #define ITEM_REAPER_CLOTH 10053
- #define ITEM_SACHET 10054
- #define ITEM_WHIPPED_DREAM 10055
-
- //EVO_ITEM
- #define ITEM_ICE_STONE 10056
- #define ITEM_SHINY_STONE 10057
- #define ITEM_DUSK_STONE 10058
- #define ITEM_DAWN_STONE 10059
- #define ITEM_TART_APPLE 10060
- #define ITEM_SWEET_APPLE 10061
- #define ITEM_CRACKED_POT 10062
- #define ITEM_GALARICA_CUFF 10063
- #define ITEM_GALARICA_WREATH 10064
- #define ITEM_CHIPPED_POT 10065
-
- //EVO_ITEM_HOLD
- #define ITEM_RAZOR_FANG 10066
- #define ITEM_RAZOR_CLAW 10067
- #define ITEM_OVAL_STONE 10068
-
- //FORM_ITEM_HOLD
- #define ITEM_GRISEOUS_ORB 10069
- #define ITEM_DRACO_PLATE 10070
- #define ITEM_DREAD_PLATE 10071
- #define ITEM_EARTH_PLATE 10072
- #define ITEM_FIST_PLATE 10073
- #define ITEM_FLAME_PLATE 10074
- #define ITEM_ICICLE_PLATE 10075
- #define ITEM_INSECT_PLATE 10076
- #define ITEM_IRON_PLATE 10077
- #define ITEM_MEADOW_PLATE 10078
- #define ITEM_MIND_PLATE 10079
- #define ITEM_PIXIE_PLATE 10080
- #define ITEM_SKY_PLATE 10081
- #define ITEM_SPLASH_PLATE 10082
- #define ITEM_SPOOKY_PLATE 10083
- #define ITEM_STONE_PLATE 10084
- #define ITEM_TOXIC_PLATE 10085
- #define ITEM_ZAP_PLATE 10086
- #define ITEM_FIGHTINIUM_Z 10087
- #define ITEM_FLYINIUM_Z 10088
- #define ITEM_POISONIUM_Z 10089
- #define ITEM_GROUNDIUM_Z 10090
- #define ITEM_ROCKIUM_Z 10091
- #define ITEM_BUGINIUM_Z 10092
- #define ITEM_GHOSTIUM_Z 10093
- #define ITEM_STEELIUM_Z 10094
- #define ITEM_FIRIUM_Z 10095
- #define ITEM_WATERIUM_Z 10096
- #define ITEM_GRASSIUM_Z 10097
- #define ITEM_ELECTRIUM_Z 10098
- #define ITEM_PSYCHIUM_Z 10099
- #define ITEM_ICIUM_Z 10100
- #define ITEM_DRAGONIUM_Z 10101
- #define ITEM_DARKINIUM_Z 10102
- #define ITEM_FAIRIUM_Z 10103
- #define ITEM_DOUSE_DRIVE 10104
- #define ITEM_SHOCK_DRIVE 10105
- #define ITEM_BURN_DRIVE 10106
- #define ITEM_CHILL_DRIVE 10107
- #define ITEM_BUG_MEMORY 10108
- #define ITEM_DARK_MEMORY 10109
- #define ITEM_DRAGON_MEMORY 10110
- #define ITEM_ELECTRIC_MEMORY 10111
- #define ITEM_FAIRY_MEMORY 10112
- #define ITEM_FIGHTING_MEMORY 10113
- #define ITEM_FIRE_MEMORY 10114
- #define ITEM_FLYING_MEMORY 10115
- #define ITEM_GHOST_MEMORY 10116
- #define ITEM_GRASS_MEMORY 10117
- #define ITEM_GROUND_MEMORY 10118
- #define ITEM_ICE_MEMORY 10119
- #define ITEM_POISON_MEMORY 10120
- #define ITEM_PSYCHIC_MEMORY 10121
- #define ITEM_ROCK_MEMORY 10122
- #define ITEM_STEEL_MEMORY 10123
- #define ITEM_WATER_MEMORY 10124
-
- //FORM_ITEM_USE
- #define ITEM_GRACIDEA 10125
- #define ITEM_REVEAL_GLASS 10126
- #define ITEM_PRISON_BOTTLE 10127
- #define ITEM_RED_NECTAR 10128
- #define ITEM_YELLOW_NECTAR 10129
- #define ITEM_PINK_NECTAR 10130
- #define ITEM_PURPLE_NECTAR 10131
-
- // Held Items
- #define ITEM_HONEY ITEM_NONE
-#endif // ITEM_EXPANSION
-
-#ifndef BATTLE_ENGINE
- // Gen 4
- #define ABILITY_TANGLED_FEET ABILITY_NONE
- #define ABILITY_MOTOR_DRIVE ABILITY_NONE
- #define ABILITY_RIVALRY ABILITY_NONE
- #define ABILITY_STEADFAST ABILITY_NONE
- #define ABILITY_SNOW_CLOAK ABILITY_NONE
- #define ABILITY_GLUTTONY ABILITY_NONE
- #define ABILITY_ANGER_POINT ABILITY_NONE
- #define ABILITY_UNBURDEN ABILITY_NONE
- #define ABILITY_HEATPROOF ABILITY_NONE
- #define ABILITY_SIMPLE ABILITY_NONE
- #define ABILITY_DRY_SKIN ABILITY_NONE
- #define ABILITY_DOWNLOAD ABILITY_NONE
- #define ABILITY_IRON_FIST ABILITY_NONE
- #define ABILITY_POISON_HEAL ABILITY_NONE
- #define ABILITY_ADAPTABILITY ABILITY_NONE
- #define ABILITY_SKILL_LINK ABILITY_NONE
- #define ABILITY_HYDRATION ABILITY_NONE
- #define ABILITY_SOLAR_POWER ABILITY_NONE
- #define ABILITY_QUICK_FEET ABILITY_NONE
- #define ABILITY_NORMALIZE ABILITY_NONE
- #define ABILITY_SNIPER ABILITY_NONE
- #define ABILITY_MAGIC_GUARD ABILITY_NONE
- #define ABILITY_NO_GUARD ABILITY_NONE
- #define ABILITY_STALL ABILITY_NONE
- #define ABILITY_TECHNICIAN ABILITY_NONE
- #define ABILITY_LEAF_GUARD ABILITY_NONE
- #define ABILITY_KLUTZ ABILITY_NONE
- #define ABILITY_MOLD_BREAKER ABILITY_NONE
- #define ABILITY_SUPER_LUCK ABILITY_NONE
- #define ABILITY_AFTERMATH ABILITY_NONE
- #define ABILITY_ANTICIPATION ABILITY_NONE
- #define ABILITY_FOREWARN ABILITY_NONE
- #define ABILITY_UNAWARE ABILITY_NONE
- #define ABILITY_TINTED_LENS ABILITY_NONE
- #define ABILITY_FILTER ABILITY_NONE
- #define ABILITY_SLOW_START ABILITY_NONE
- #define ABILITY_SCRAPPY ABILITY_NONE
- #define ABILITY_STORM_DRAIN ABILITY_NONE
- #define ABILITY_ICE_BODY ABILITY_NONE
- #define ABILITY_SOLID_ROCK ABILITY_NONE
- #define ABILITY_SNOW_WARNING ABILITY_NONE
- #define ABILITY_HONEY_GATHER ABILITY_NONE
- #define ABILITY_FRISK ABILITY_NONE
- #define ABILITY_RECKLESS ABILITY_NONE
- #define ABILITY_MULTITYPE ABILITY_NONE
- #define ABILITY_FLOWER_GIFT ABILITY_NONE
- #define ABILITY_BAD_DREAMS ABILITY_NONE
- // Gen 5
- #define ABILITY_PICKPOCKET ABILITY_NONE
- #define ABILITY_SHEER_FORCE ABILITY_NONE
- #define ABILITY_CONTRARY ABILITY_NONE
- #define ABILITY_UNNERVE ABILITY_NONE
- #define ABILITY_DEFIANT ABILITY_NONE
- #define ABILITY_DEFEATIST ABILITY_NONE
- #define ABILITY_CURSED_BODY ABILITY_NONE
- #define ABILITY_HEALER ABILITY_NONE
- #define ABILITY_FRIEND_GUARD ABILITY_NONE
- #define ABILITY_WEAK_ARMOR ABILITY_NONE
- #define ABILITY_HEAVY_METAL ABILITY_NONE
- #define ABILITY_LIGHT_METAL ABILITY_NONE
- #define ABILITY_MULTISCALE ABILITY_NONE
- #define ABILITY_TOXIC_BOOST ABILITY_NONE
- #define ABILITY_FLARE_BOOST ABILITY_NONE
- #define ABILITY_HARVEST ABILITY_NONE
- #define ABILITY_TELEPATHY ABILITY_NONE
- #define ABILITY_MOODY ABILITY_NONE
- #define ABILITY_OVERCOAT ABILITY_NONE
- #define ABILITY_POISON_TOUCH ABILITY_NONE
- #define ABILITY_REGENERATOR ABILITY_NONE
- #define ABILITY_BIG_PECKS ABILITY_NONE
- #define ABILITY_SAND_RUSH ABILITY_NONE
- #define ABILITY_WONDER_SKIN ABILITY_NONE
- #define ABILITY_ANALYTIC ABILITY_NONE
- #define ABILITY_ILLUSION ABILITY_NONE
- #define ABILITY_IMPOSTER ABILITY_NONE
- #define ABILITY_INFILTRATOR ABILITY_NONE
- #define ABILITY_MUMMY ABILITY_NONE
- #define ABILITY_MOXIE ABILITY_NONE
- #define ABILITY_JUSTIFIED ABILITY_NONE
- #define ABILITY_RATTLED ABILITY_NONE
- #define ABILITY_MAGIC_BOUNCE ABILITY_NONE
- #define ABILITY_SAP_SIPPER ABILITY_NONE
- #define ABILITY_PRANKSTER ABILITY_NONE
- #define ABILITY_SAND_FORCE ABILITY_NONE
- #define ABILITY_IRON_BARBS ABILITY_NONE
- #define ABILITY_ZEN_MODE ABILITY_NONE
- #define ABILITY_VICTORY_STAR ABILITY_NONE
- #define ABILITY_TURBOBLAZE ABILITY_NONE
- #define ABILITY_TERAVOLT ABILITY_NONE
- // Gen 6
- #define ABILITY_AROMA_VEIL ABILITY_NONE
- #define ABILITY_FLOWER_VEIL ABILITY_NONE
- #define ABILITY_CHEEK_POUCH ABILITY_NONE
- #define ABILITY_PROTEAN ABILITY_NONE
- #define ABILITY_FUR_COAT ABILITY_NONE
- #define ABILITY_MAGICIAN ABILITY_NONE
- #define ABILITY_BULLETPROOF ABILITY_NONE
- #define ABILITY_COMPETITIVE ABILITY_NONE
- #define ABILITY_STRONG_JAW ABILITY_NONE
- #define ABILITY_REFRIGERATE ABILITY_NONE
- #define ABILITY_SWEET_VEIL ABILITY_NONE
- #define ABILITY_STANCE_CHANGE ABILITY_NONE
- #define ABILITY_GALE_WINGS ABILITY_NONE
- #define ABILITY_MEGA_LAUNCHER ABILITY_NONE
- #define ABILITY_GRASS_PELT ABILITY_NONE
- #define ABILITY_SYMBIOSIS ABILITY_NONE
- #define ABILITY_TOUGH_CLAWS ABILITY_NONE
- #define ABILITY_PIXILATE ABILITY_NONE
- #define ABILITY_GOOEY ABILITY_NONE
- #define ABILITY_AERILATE ABILITY_NONE
- #define ABILITY_PARENTAL_BOND ABILITY_NONE
- #define ABILITY_DARK_AURA ABILITY_NONE
- #define ABILITY_FAIRY_AURA ABILITY_NONE
- #define ABILITY_AURA_BREAK ABILITY_NONE
- #define ABILITY_PRIMORDIAL_SEA ABILITY_NONE
- #define ABILITY_DESOLATE_LAND ABILITY_NONE
- #define ABILITY_DELTA_STREAM ABILITY_NONE
- // Gen 7
- #define ABILITY_STAMINA ABILITY_NONE
- #define ABILITY_WIMP_OUT ABILITY_NONE
- #define ABILITY_EMERGENCY_EXIT ABILITY_NONE
- #define ABILITY_WATER_COMPACTION ABILITY_NONE
- #define ABILITY_MERCILESS ABILITY_NONE
- #define ABILITY_SHIELDS_DOWN ABILITY_NONE
- #define ABILITY_STAKEOUT ABILITY_NONE
- #define ABILITY_WATER_BUBBLE ABILITY_NONE
- #define ABILITY_STEELWORKER ABILITY_NONE
- #define ABILITY_BERSERK ABILITY_NONE
- #define ABILITY_SLUSH_RUSH ABILITY_NONE
- #define ABILITY_LONG_REACH ABILITY_NONE
- #define ABILITY_LIQUID_VOICE ABILITY_NONE
- #define ABILITY_TRIAGE ABILITY_NONE
- #define ABILITY_GALVANIZE ABILITY_NONE
- #define ABILITY_SURGE_SURFER ABILITY_NONE
- #define ABILITY_SCHOOLING ABILITY_NONE
- #define ABILITY_DISGUISE ABILITY_NONE
- #define ABILITY_BATTLE_BOND ABILITY_NONE
- #define ABILITY_POWER_CONSTRUCT ABILITY_NONE
- #define ABILITY_CORROSION ABILITY_NONE
- #define ABILITY_COMATOSE ABILITY_NONE
- #define ABILITY_QUEENLY_MAJESTY ABILITY_NONE
- #define ABILITY_INNARDS_OUT ABILITY_NONE
- #define ABILITY_DANCER ABILITY_NONE
- #define ABILITY_BATTERY ABILITY_NONE
- #define ABILITY_FLUFFY ABILITY_NONE
- #define ABILITY_DAZZLING ABILITY_NONE
- #define ABILITY_SOUL_HEART ABILITY_NONE
- #define ABILITY_TANGLING_HAIR ABILITY_NONE
- #define ABILITY_RECEIVER ABILITY_NONE
- #define ABILITY_POWER_OF_ALCHEMY ABILITY_NONE
- #define ABILITY_BEAST_BOOST ABILITY_NONE
- #define ABILITY_RKS_SYSTEM ABILITY_NONE
- #define ABILITY_ELECTRIC_SURGE ABILITY_NONE
- #define ABILITY_PSYCHIC_SURGE ABILITY_NONE
- #define ABILITY_MISTY_SURGE ABILITY_NONE
- #define ABILITY_GRASSY_SURGE ABILITY_NONE
- #define ABILITY_FULL_METAL_BODY ABILITY_NONE
- #define ABILITY_SHADOW_SHIELD ABILITY_NONE
- #define ABILITY_PRISM_ARMOR ABILITY_NONE
- #define ABILITY_NEUROFORCE ABILITY_NONE
- // Gen 8
- #define ABILITY_INTREPID_SWORD ABILITY_NONE
- #define ABILITY_DAUNTLESS_SHIELD ABILITY_NONE
- #define ABILITY_LIBERO ABILITY_NONE
- #define ABILITY_BALL_FETCH ABILITY_NONE
- #define ABILITY_COTTON_DOWN ABILITY_NONE
- #define ABILITY_PROPELLER_TAIL ABILITY_NONE
- #define ABILITY_MIRROR_ARMOR ABILITY_NONE
- #define ABILITY_GULP_MISSILE ABILITY_NONE
- #define ABILITY_STALWART ABILITY_NONE
- #define ABILITY_STEAM_ENGINE ABILITY_NONE
- #define ABILITY_PUNK_ROCK ABILITY_NONE
- #define ABILITY_SAND_SPIT ABILITY_NONE
- #define ABILITY_ICE_SCALES ABILITY_NONE
- #define ABILITY_RIPEN ABILITY_NONE
- #define ABILITY_ICE_FACE ABILITY_NONE
- #define ABILITY_POWER_SPOT ABILITY_NONE
- #define ABILITY_MIMICRY ABILITY_NONE
- #define ABILITY_SCREEN_CLEANER ABILITY_NONE
- #define ABILITY_STEELY_SPIRIT ABILITY_NONE
- #define ABILITY_PERISH_BODY ABILITY_NONE
- #define ABILITY_WANDERING_SPIRIT ABILITY_NONE
- #define ABILITY_GORILLA_TACTICS ABILITY_NONE
- #define ABILITY_NEUTRALIZING_GAS ABILITY_NONE
- #define ABILITY_PASTEL_VEIL ABILITY_NONE
- #define ABILITY_HUNGER_SWITCH ABILITY_NONE
- #define ABILITY_QUICK_DRAW ABILITY_NONE
- #define ABILITY_UNSEEN_FIST ABILITY_NONE
- #define ABILITY_CURIOUS_MEDICINE ABILITY_NONE
- #define ABILITY_TRANSISTOR ABILITY_NONE
- #define ABILITY_DRAGONS_MAW ABILITY_NONE
- #define ABILITY_CHILLING_NEIGH ABILITY_NONE
- #define ABILITY_GRIM_NEIGH ABILITY_NONE
- #define ABILITY_AS_ONE_ICE_RIDER ABILITY_NONE
- #define ABILITY_AS_ONE_SHADOW_RIDER ABILITY_NONE
-#endif // BATTLE_ENGINE
-
#endif // GUARD_CONSTANTS_POKEMON_CONFIG_H
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index 65aa3e1ca8..5b8029acf5 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -100,8 +100,8 @@
#define MAPSEC_CINNABAR_ISLAND 0x60
#define MAPSEC_INDIGO_PLATEAU 0x61
#define MAPSEC_SAFFRON_CITY 0x62
-#define MAPSEC_ROUTE_4_FLYDUP 0x63
-#define MAPSEC_ROUTE_10_FLYDUP 0x64
+#define MAPSEC_ROUTE_4_POKECENTER 0x63
+#define MAPSEC_ROUTE_10_POKECENTER 0x64
#define MAPSEC_ROUTE_1 0x65
#define MAPSEC_ROUTE_2 0x66
#define MAPSEC_ROUTE_3 0x67
diff --git a/include/constants/species.h b/include/constants/species.h
index b8689a32af..5c1ef7a4f9 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -1,6 +1,8 @@
#ifndef GUARD_CONSTANTS_SPECIES_H
#define GUARD_CONSTANTS_SPECIES_H
+#include "constants/pokemon_config.h"
+
#define SPECIES_NONE 0
#define SPECIES_BULBASAUR 1
#define SPECIES_IVYSAUR 2
@@ -901,8 +903,6 @@
#define SPECIES_SPECTRIER 897
#define SPECIES_CALYREX 898
-#define FORMS_START SPECIES_CALYREX
-
// Megas
#define SPECIES_VENUSAUR_MEGA FORMS_START + 1
#define SPECIES_CHARIZARD_MEGA_X FORMS_START + 2
@@ -1021,6 +1021,7 @@
// Pichu
#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 102
+#if P_NEW_POKEMON == TRUE
// Unown
#define SPECIES_UNOWN_B FORMS_START + 103
#define SPECIES_UNOWN_C FORMS_START + 104
@@ -1060,6 +1061,47 @@
#define SPECIES_DEOXYS_DEFENSE FORMS_START + 134
#define SPECIES_DEOXYS_SPEED FORMS_START + 135
+#else
+// Unown
+#define SPECIES_UNOWN_B FORMS_START + 1
+#define SPECIES_UNOWN_C FORMS_START + 2
+#define SPECIES_UNOWN_D FORMS_START + 3
+#define SPECIES_UNOWN_E FORMS_START + 4
+#define SPECIES_UNOWN_F FORMS_START + 5
+#define SPECIES_UNOWN_G FORMS_START + 6
+#define SPECIES_UNOWN_H FORMS_START + 7
+#define SPECIES_UNOWN_I FORMS_START + 8
+#define SPECIES_UNOWN_J FORMS_START + 9
+#define SPECIES_UNOWN_K FORMS_START + 10
+#define SPECIES_UNOWN_L FORMS_START + 11
+#define SPECIES_UNOWN_M FORMS_START + 12
+#define SPECIES_UNOWN_N FORMS_START + 13
+#define SPECIES_UNOWN_O FORMS_START + 14
+#define SPECIES_UNOWN_P FORMS_START + 15
+#define SPECIES_UNOWN_Q FORMS_START + 16
+#define SPECIES_UNOWN_R FORMS_START + 17
+#define SPECIES_UNOWN_S FORMS_START + 18
+#define SPECIES_UNOWN_T FORMS_START + 19
+#define SPECIES_UNOWN_U FORMS_START + 20
+#define SPECIES_UNOWN_V FORMS_START + 21
+#define SPECIES_UNOWN_W FORMS_START + 22
+#define SPECIES_UNOWN_X FORMS_START + 23
+#define SPECIES_UNOWN_Y FORMS_START + 24
+#define SPECIES_UNOWN_Z FORMS_START + 25
+#define SPECIES_UNOWN_EMARK FORMS_START + 26
+#define SPECIES_UNOWN_QMARK FORMS_START + 27
+
+// Castform
+#define SPECIES_CASTFORM_SUNNY FORMS_START + 28
+#define SPECIES_CASTFORM_RAINY FORMS_START + 29
+#define SPECIES_CASTFORM_SNOWY FORMS_START + 30
+
+// Deoxys
+#define SPECIES_DEOXYS_ATTACK FORMS_START + 31
+#define SPECIES_DEOXYS_DEFENSE FORMS_START + 32
+#define SPECIES_DEOXYS_SPEED FORMS_START + 33
+#endif
+
// Burmy
#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 136
#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 137
@@ -1341,7 +1383,14 @@
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 307
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 308
+#if P_NEW_POKEMON == TRUE
+#define FORMS_START SPECIES_CALYREX
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
+#else
+#define FORMS_START SPECIES_DEOXYS
+#define SPECIES_EGG SPECIES_DEOXYS_SPEED + 1
+#endif
+
#define NUM_SPECIES SPECIES_EGG
#endif // GUARD_CONSTANTS_SPECIES_H
diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h
index 371763faf3..e0f660b6f0 100644
--- a/include/constants/trainer_hill.h
+++ b/include/constants/trainer_hill.h
@@ -52,8 +52,6 @@
#define TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED 1
#define TRAINER_HILL_PLAYER_STATUS_NORMAL 2
-#define HILL_TRAINER_NAME_LENGTH 11
-
#define TRAINER_HILL_OTID 0x10000000
// The full map of each Trainer Hill floor is 16x21.
diff --git a/include/contest.h b/include/contest.h
index d0630a8011..21e2530c21 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -291,7 +291,7 @@ struct ContestResources
struct ContestMoveAnimData *moveAnim;
struct ContestTV *tv;
struct ContestUnused * unused;
- u8 * contestBgTilemaps[CONTESTANT_COUNT];
+ u8 *contestBgTilemaps[CONTESTANT_COUNT];
void * boxBlinkTiles1;
void * boxBlinkTiles2;
void * animBgTileBuffer;
diff --git a/include/data.h b/include/data.h
index 3b55d345c9..b018da3f3b 100644
--- a/include/data.h
+++ b/include/data.h
@@ -57,6 +57,11 @@ struct TrainerMonItemCustomMoves
u16 moves[MAX_MON_MOVES];
};
+#define NO_ITEM_DEFAULT_MOVES(party) { .NoItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = 0
+#define NO_ITEM_CUSTOM_MOVES(party) { .NoItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET
+#define ITEM_DEFAULT_MOVES(party) { .ItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_HELD_ITEM
+#define ITEM_CUSTOM_MOVES(party) { .ItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM
+
union TrainerMonPtr
{
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
@@ -71,7 +76,7 @@ struct Trainer
/*0x01*/ u8 trainerClass;
/*0x02*/ u8 encounterMusic_gender; // last bit is gender
/*0x03*/ u8 trainerPic;
- /*0x04*/ u8 trainerName[12];
+ /*0x04*/ u8 trainerName[TRAINER_NAME_LENGTH + 1];
/*0x10*/ u16 items[MAX_TRAINER_ITEMS];
/*0x18*/ bool8 doubleBattle;
/*0x1C*/ u32 aiFlags;
diff --git a/include/decompress.h b/include/decompress.h
index 27fc5e61ab..bea2788abc 100644
--- a/include/decompress.h
+++ b/include/decompress.h
@@ -10,14 +10,13 @@ void LZDecompressVram(const u32 *src, void *dest);
u16 LoadCompressedSpriteSheet(const struct CompressedSpriteSheet *src);
void LoadCompressedSpriteSheetOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer);
-bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src);
+bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet *src);
void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src);
void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer);
bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src);
-void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
-
+void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer, s32 species);
void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality);
void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
diff --git a/include/easy_chat.h b/include/easy_chat.h
index c9ef4428f7..d84af93fc8 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -122,7 +122,7 @@ struct EasyChatWordsByLetter
void InitEasyChatPhrases(void);
void ShowEasyChatScreen(void);
-u8 * CopyEasyChatWord(u8 *dest, u16 word);
+u8 *CopyEasyChatWord(u8 *dest, u16 word);
bool32 IsEasyChatAnswerUnlocked(int word);
void InitializeEasyChatWordArray(u16 *words, u16 length);
u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index d31802a67f..22cef49219 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -63,7 +63,7 @@ struct PairedPalettes
struct LockedAnimObjectEvents
{
- u8 objectEventIds[OBJECT_EVENTS_COUNT];
+ u8 localIds[OBJECT_EVENTS_COUNT];
u8 count;
};
diff --git a/include/evolution_scene.h b/include/evolution_scene.h
index 5f8c534b93..25d34eddfb 100644
--- a/include/evolution_scene.h
+++ b/include/evolution_scene.h
@@ -1,9 +1,9 @@
#ifndef GUARD_EVOLUTION_SCENE_H
#define GUARD_EVOLUTION_SCENE_H
-void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
-void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
-void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
+void BeginEvolutionScene(struct Pokemon *mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
+void EvolutionScene(struct Pokemon *mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
+void TradeEvolutionScene(struct Pokemon *mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
extern void (*gCB2_AfterEvolution)(void);
diff --git a/include/faraway_island.h b/include/faraway_island.h
index a5243c6a70..9fd2a69fc4 100755
--- a/include/faraway_island.h
+++ b/include/faraway_island.h
@@ -2,7 +2,7 @@
#define GUARD_FARAWAY_ISLAND_H
u32 GetMewMoveDirection(void);
-bool8 ShouldMewShakeGrass(struct ObjectEvent*);
+bool8 ShouldMewShakeGrass(struct ObjectEvent *);
void UpdateFarawayIslandStepCounter(void);
bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
bool8 IsMewPlayingHideAndSeek(void);
diff --git a/include/field_effect.h b/include/field_effect.h
index 731fb9c59f..b35a8c8694 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -39,8 +39,8 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
void StartLavaridgeGymB1FWarp(u8 priority);
void StartLavaridgeGym1FWarp(u8 priority);
-void SpriteCB_AshPuff(struct Sprite*);
-void SpriteCB_AshLaunch(struct Sprite*);
+void SpriteCB_AshPuff(struct Sprite *);
+void SpriteCB_AshLaunch(struct Sprite *);
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 528492d814..2ae5d79f75 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -20,25 +20,25 @@ void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset);
bool8 UpdateRevealDisguise(struct ObjectEvent *);
void StartRevealDisguise(struct ObjectEvent *);
void StartAshFieldEffect(s16, s16, u16, s16);
-void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
-u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
+void SetUpReflection(struct ObjectEvent *, struct Sprite *, u8);
+u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent *);
u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
-void UpdateRayquazaSpotlightEffect(struct Sprite*);
-void UpdateShadowFieldEffect(struct Sprite*);
-void UpdateTallGrassFieldEffect(struct Sprite*);
-void WaitFieldEffectSpriteAnim(struct Sprite*);
-void UpdateAshFieldEffect(struct Sprite*);
-void UpdateSurfBlobFieldEffect(struct Sprite*);
-void UpdateJumpImpactEffect(struct Sprite*);
-void UpdateFootprintsTireTracksFieldEffect(struct Sprite*);
-void UpdateSplashFieldEffect(struct Sprite*);
-void UpdateLongGrassFieldEffect(struct Sprite*);
-void UpdateSandPileFieldEffect(struct Sprite*);
-void UpdateDisguiseFieldEffect(struct Sprite*);
-void UpdateShortGrassFieldEffect(struct Sprite*);
-void UpdateHotSpringsWaterFieldEffect(struct Sprite*);
-void UpdateBubblesFieldEffect(struct Sprite*);
-void UpdateSparkleFieldEffect(struct Sprite*);
+void UpdateRayquazaSpotlightEffect(struct Sprite *);
+void UpdateShadowFieldEffect(struct Sprite *);
+void UpdateTallGrassFieldEffect(struct Sprite *);
+void WaitFieldEffectSpriteAnim(struct Sprite *);
+void UpdateAshFieldEffect(struct Sprite *);
+void UpdateSurfBlobFieldEffect(struct Sprite *);
+void UpdateJumpImpactEffect(struct Sprite *);
+void UpdateFootprintsTireTracksFieldEffect(struct Sprite *);
+void UpdateSplashFieldEffect(struct Sprite *);
+void UpdateLongGrassFieldEffect(struct Sprite *);
+void UpdateSandPileFieldEffect(struct Sprite *);
+void UpdateDisguiseFieldEffect(struct Sprite *);
+void UpdateShortGrassFieldEffect(struct Sprite *);
+void UpdateHotSpringsWaterFieldEffect(struct Sprite *);
+void UpdateBubblesFieldEffect(struct Sprite *);
+void UpdateSparkleFieldEffect(struct Sprite *);
void SetSpriteInvisible(u8 spriteId);
void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
diff --git a/include/fieldmap.h b/include/fieldmap.h
index e7497f7bd4..7caadfcaaa 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -25,8 +25,8 @@ u32 MapGridGetMetatileIdAt(int, int);
u32 MapGridGetMetatileBehaviorAt(int, int);
void MapGridSetMetatileIdAt(int, int, u16);
void MapGridSetMetatileEntryAt(int, int, u16);
-void GetCameraCoords(u16*, u16*);
-bool8 MapGridIsImpassableAt(int, int);
+void GetCameraCoords(u16 *, u16 *);
+u8 MapGridGetCollisionAt(int, int);
int GetMapBorderIdAt(int x, int y);
bool32 CanCameraMoveInDirection(int direction);
u16 GetMetatileAttributesById(u16 metatileId);
diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h
index 1be3852e3b..13687825ef 100644
--- a/include/gba/isagbprint.h
+++ b/include/gba/isagbprint.h
@@ -23,14 +23,14 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
#ifdef NDEBUG
#define AGB_ASSERT(exp)
#else
-#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1);
+#define AGB_ASSERT(exp) (exp) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #exp, 1);
#endif
#undef AGB_WARNING
#ifdef NDEBUG
#define AGB_WARNING(exp)
#else
-#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0);
+#define AGB_WARNING(exp) (exp) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #exp, 0);
#endif
// for matching purposes
@@ -38,13 +38,13 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
#ifdef NDEBUG
#define AGB_ASSERT_EX(exp, file, line)
#else
-#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1);
+#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void *)0) : AGBAssert(file, line, #exp, 1);
#endif
#ifdef NDEBUG
#define AGB_WARNING_EX(exp, file, line)
#else
-#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0);
+#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void *)0) : AGBAssert(file, line, #exp, 0);
#endif
#endif // GUARD_GBA_ISAGBPRINT_H
diff --git a/include/global.h b/include/global.h
index 8c5917713e..25b43db206 100644
--- a/include/global.h
+++ b/include/global.h
@@ -109,13 +109,13 @@
#define T1_READ_8(ptr) ((ptr)[0])
#define T1_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8))
#define T1_READ_32(ptr) ((ptr)[0] | ((ptr)[1] << 8) | ((ptr)[2] << 16) | ((ptr)[3] << 24))
-#define T1_READ_PTR(ptr) (u8*) T1_READ_32(ptr)
+#define T1_READ_PTR(ptr) (u8 *) T1_READ_32(ptr)
// T2_READ_8 is a duplicate to remain consistent with each group.
#define T2_READ_8(ptr) ((ptr)[0])
#define T2_READ_16(ptr) ((ptr)[0] + ((ptr)[1] << 8))
#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24))
-#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr)
+#define T2_READ_PTR(ptr) (void *) T2_READ_32(ptr)
// Macros for checking the joypad
#define TEST_BUTTON(field, button) ((field) & (button))
diff --git a/include/global.tv.h b/include/global.tv.h
index e24ead3f21..1fb1b8a333 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -81,7 +81,8 @@ typedef union // size = 0x24
/*0x01*/ bool8 active;
/*0x02*/ u16 species;
/*0x04*/ u8 pokemonName[POKEMON_NAME_LENGTH + 1];
- /*0x0F*/ u8 trainerName[11];
+ /*0x0F*/ u8 trainerName[PLAYER_NAME_LENGTH + 1];
+ /*0x17*/ u8 unused[3];
/*0x1A*/ u8 random;
/*0x1B*/ u8 random2;
/*0x1C*/ u16 randomSpecies;
diff --git a/include/graphics.h b/include/graphics.h
index 907568c2bc..908fa4f4c4 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -454,6 +454,7 @@ extern const u32 gMonFrontPic_Groudon[];
extern const u32 gMonFrontPic_Rayquaza[];
extern const u32 gMonFrontPic_Jirachi[];
extern const u32 gMonFrontPic_Deoxys[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonFrontPic_Turtwig[];
extern const u32 gMonFrontPic_Grotle[];
extern const u32 gMonFrontPic_Torterra[];
@@ -1081,6 +1082,7 @@ extern const u32 gMonFrontPic_PikachuAlolaCap[];
extern const u32 gMonFrontPic_PikachuPartnerCap[];
extern const u32 gMonFrontPic_PikachuWorldCap[];
extern const u32 gMonFrontPic_PichuSpikyEared[];
+#endif
extern const u32 gMonFrontPic_UnownB[];
extern const u32 gMonFrontPic_UnownC[];
extern const u32 gMonFrontPic_UnownD[];
@@ -1114,6 +1116,7 @@ extern const u32 gMonFrontPic_CastformSnowy[];
extern const u32 gMonFrontPic_DeoxysAttack[];
extern const u32 gMonFrontPic_DeoxysDefense[];
extern const u32 gMonFrontPic_DeoxysSpeed[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonFrontPic_BurmySandyCloak[];
extern const u32 gMonFrontPic_BurmyTrashCloak[];
extern const u32 gMonFrontPic_WormadamSandyCloak[];
@@ -1216,6 +1219,7 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonFrontPic_ZarudeDada[];
extern const u32 gMonFrontPic_CalyrexIceRider[];
extern const u32 gMonFrontPic_CalyrexShadowRider[];
+#endif
extern const u32 gMonFrontPic_Egg[];
extern const u32 gMonBackPic_CircledQuestionMark[];
@@ -1607,6 +1611,7 @@ extern const u32 gMonBackPic_Groudon[];
extern const u32 gMonBackPic_Rayquaza[];
extern const u32 gMonBackPic_Jirachi[];
extern const u32 gMonBackPic_Deoxys[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonBackPic_Turtwig[];
extern const u32 gMonBackPic_Grotle[];
extern const u32 gMonBackPic_Torterra[];
@@ -2233,6 +2238,7 @@ extern const u32 gMonBackPic_PikachuAlolaCap[];
extern const u32 gMonBackPic_PikachuPartnerCap[];
extern const u32 gMonBackPic_PikachuWorldCap[];
extern const u32 gMonBackPic_PichuSpikyEared[];
+#endif
extern const u32 gMonBackPic_UnownB[];
extern const u32 gMonBackPic_UnownC[];
extern const u32 gMonBackPic_UnownD[];
@@ -2266,6 +2272,7 @@ extern const u32 gMonBackPic_CastformSnowy[];
extern const u32 gMonBackPic_DeoxysAttack[];
extern const u32 gMonBackPic_DeoxysDefense[];
extern const u32 gMonBackPic_DeoxysSpeed[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonBackPic_BurmySandyCloak[];
extern const u32 gMonBackPic_BurmyTrashCloak[];
extern const u32 gMonBackPic_WormadamSandyCloak[];
@@ -2368,6 +2375,7 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonBackPic_ZarudeDada[];
extern const u32 gMonBackPic_CalyrexIceRider[];
extern const u32 gMonBackPic_CalyrexShadowRider[];
+#endif
extern const u32 gMonPalette_CircledQuestionMark[];
extern const u32 gMonPalette_DoubleQuestionMark[];
@@ -2757,6 +2765,7 @@ extern const u32 gMonPalette_Groudon[];
extern const u32 gMonPalette_Rayquaza[];
extern const u32 gMonPalette_Jirachi[];
extern const u32 gMonPalette_Deoxys[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonPalette_Turtwig[];
extern const u32 gMonPalette_Grotle[];
extern const u32 gMonPalette_Torterra[];
@@ -3377,12 +3386,14 @@ extern const u32 gMonPalette_PikachuAlolaCap[];
extern const u32 gMonPalette_PikachuPartnerCap[];
extern const u32 gMonPalette_PikachuWorldCap[];
extern const u32 gMonPalette_PichuSpikyEared[];
+#endif
extern const u32 gMonPalette_CastformSunny[];
extern const u32 gMonPalette_CastformRainy[];
extern const u32 gMonPalette_CastformSnowy[];
extern const u32 gMonPalette_DeoxysAttack[];
extern const u32 gMonPalette_DeoxysDefense[];
extern const u32 gMonPalette_DeoxysSpeed[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonPalette_BurmySandyCloak[];
extern const u32 gMonPalette_BurmyTrashCloak[];
extern const u32 gMonPalette_WormadamSandyCloak[];
@@ -3538,6 +3549,7 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonPalette_ZarudeDada[];
extern const u32 gMonPalette_CalyrexIceRider[];
extern const u32 gMonPalette_CalyrexShadowRider[];
+#endif
extern const u32 gMonPalette_Egg[];
extern const u32 gMonShinyPalette_CircledQuestionMark[];
@@ -3928,6 +3940,7 @@ extern const u32 gMonShinyPalette_Groudon[];
extern const u32 gMonShinyPalette_Rayquaza[];
extern const u32 gMonShinyPalette_Jirachi[];
extern const u32 gMonShinyPalette_Deoxys[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonShinyPalette_Turtwig[];
extern const u32 gMonShinyPalette_Grotle[];
extern const u32 gMonShinyPalette_Torterra[];
@@ -4549,12 +4562,14 @@ extern const u32 gMonShinyPalette_PikachuAlolaCap[];
extern const u32 gMonShinyPalette_PikachuPartnerCap[];
extern const u32 gMonShinyPalette_PikachuWorldCap[];
extern const u32 gMonShinyPalette_PichuSpikyEared[];
+#endif
extern const u32 gMonShinyPalette_CastformSunny[];
extern const u32 gMonShinyPalette_CastformRainy[];
extern const u32 gMonShinyPalette_CastformSnowy[];
extern const u32 gMonShinyPalette_DeoxysAttack[];
extern const u32 gMonShinyPalette_DeoxysDefense[];
extern const u32 gMonShinyPalette_DeoxysSpeed[];
+#if P_NEW_POKEMON == TRUE
extern const u32 gMonShinyPalette_BurmySandyCloak[];
extern const u32 gMonShinyPalette_BurmyTrashCloak[];
extern const u32 gMonShinyPalette_WormadamSandyCloak[];
@@ -4704,6 +4719,7 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonShinyPalette_ZarudeDada[];
extern const u32 gMonShinyPalette_CalyrexIceRider[];
extern const u32 gMonShinyPalette_CalyrexShadowRider[];
+#endif
extern const u8 gMonIcon_QuestionMark[];
extern const u8 gMonIcon_Bulbasaur[];
@@ -5092,6 +5108,7 @@ extern const u8 gMonIcon_Groudon[];
extern const u8 gMonIcon_Rayquaza[];
extern const u8 gMonIcon_Jirachi[];
extern const u8 gMonIcon_Deoxys[];
+#if P_NEW_POKEMON == TRUE
extern const u8 gMonIcon_Turtwig[];
extern const u8 gMonIcon_Grotle[];
extern const u8 gMonIcon_Torterra[];
@@ -5709,6 +5726,7 @@ extern const u8 gMonIcon_PikachuKalosCap[];
extern const u8 gMonIcon_PikachuAlolaCap[];
extern const u8 gMonIcon_PikachuPartnerCap[];
extern const u8 gMonIcon_PichuSpikyEared[];
+#endif
extern const u8 gMonIcon_UnownB[];
extern const u8 gMonIcon_UnownC[];
extern const u8 gMonIcon_UnownD[];
@@ -5742,6 +5760,7 @@ extern const u8 gMonIcon_CastformSnowy[];
extern const u8 gMonIcon_DeoxysAttack[];
extern const u8 gMonIcon_DeoxysDefense[];
extern const u8 gMonIcon_DeoxysSpeed[];
+#if P_NEW_POKEMON == TRUE
extern const u8 gMonIcon_BurmySandyCloak[];
extern const u8 gMonIcon_BurmyTrashCloak[];
extern const u8 gMonIcon_WormadamSandyCloak[];
@@ -5858,6 +5877,7 @@ extern const u8 gMonIcon_EternatusEternamax[];
extern const u8 gMonIcon_ZarudeDada[];
extern const u8 gMonIcon_CalyrexIceRider[];
extern const u8 gMonIcon_CalyrexShadowRider[];
+#endif
extern const u8 gMonIcon_Egg[];
extern const u8 gMonFootprint_QuestionMark[];
@@ -6247,6 +6267,7 @@ extern const u8 gMonFootprint_Latios[];
extern const u8 gMonFootprint_Jirachi[];
extern const u8 gMonFootprint_Deoxys[];
extern const u8 gMonFootprint_Chimecho[];
+#if P_NEW_POKEMON == TRUE
extern const u8 gMonFootprint_Turtwig[];
extern const u8 gMonFootprint_Grotle[];
extern const u8 gMonFootprint_Torterra[];
@@ -6759,6 +6780,7 @@ extern const u8 gMonFootprint_Regidrago[];
extern const u8 gMonFootprint_Glastrier[];
extern const u8 gMonFootprint_Spectrier[];
extern const u8 gMonFootprint_Calyrex[];
+#endif
// trainer sprites
extern const u32 gTrainerFrontPic_Hiker[];
@@ -8766,18 +8788,24 @@ extern const u16 gBattleInterface_BallStatusBarPal[];
extern const u16 gBattleInterface_BallDisplayPal[];
extern const u8 gHealthboxElementsGfxTable[][32];
-extern const u16 gNamingScreenMenu_Pal[];
+extern const u16 gNamingScreenMenu_Pal[6][16];
extern const u32 gNamingScreenMenu_Gfx[];
extern const u32 gNamingScreenBackground_Tilemap[];
extern const u8 gNamingScreenKeyboardUpper_Tilemap[];
extern const u8 gNamingScreenKeyboardLower_Tilemap[];
extern const u8 gNamingScreenKeyboardSymbols_Tilemap[];
-extern const u8 gNamingScreenRWindow_Gfx[];
-extern const u8 gNamingScreenPageButton_Gfx[];
-extern const u8 gNamingScreenROptions_Gfx[];
-extern const u8 gNamingScreenCursor_Gfx[];
-extern const u8 gNamingScreenInputArrow_Gfx[];
-extern const u8 gNamingScreenUnderscore_Gfx[];
+extern const u32 gNamingScreenPageSwapFrame_Gfx[];
+extern const u32 gNamingScreenBackButton_Gfx[];
+extern const u32 gNamingScreenOKButton_Gfx[];
+extern const u32 gNamingScreenPageSwapButton_Gfx[];
+extern const u32 gNamingScreenPageSwapUpper_Gfx[];
+extern const u32 gNamingScreenPageSwapLower_Gfx[];
+extern const u32 gNamingScreenPageSwapOthers_Gfx[];
+extern const u32 gNamingScreenCursor_Gfx[];
+extern const u32 gNamingScreenCursorSquished_Gfx[];
+extern const u32 gNamingScreenCursorFilled_Gfx[];
+extern const u32 gNamingScreenInputArrow_Gfx[];
+extern const u32 gNamingScreenUnderscore_Gfx[];
extern const u32 gPokeblockFeedBg_Tilemap[];
diff --git a/include/international_string_util.h b/include/international_string_util.h
index dd5c6ac5fe..b0ac8afb6b 100644
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -11,7 +11,7 @@ int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth);
int GetStringCenterAlignXOffsetWithLetterSpacing(int fontId, const u8 *str, int totalWidth, int letterSpacing);
int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int letterSpacing);
int GetMaxWidthInMenuTable(const struct MenuAction *actions, int numActions);
-int GetMaxWidthInSubsetOfMenuTable(const struct MenuAction *actions, const u8* actionIds, int numActions);
+int GetMaxWidthInSubsetOfMenuTable(const struct MenuAction *actions, const u8 *actionIds, int numActions);
int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu);
void CopyMonCategoryText(int dexNum, u8 *dest);
u8 *GetStringClearToWidth(u8 *dest, int fontId, const u8 *str, int totalStringWidth);
diff --git a/include/intro.h b/include/intro.h
index 198ae26696..8ba030a287 100644
--- a/include/intro.h
+++ b/include/intro.h
@@ -7,7 +7,6 @@
// Exported ROM declarations
void CB2_InitCopyrightScreenAfterBootup(void);
-void CB2_InitCopyrightScreenAfterBootup(void);
void CB2_InitCopyrightScreenAfterTitleScreen(void);
void PanFadeAndZoomScreen(u16, u16, u16, u16);
diff --git a/include/item_menu.h b/include/item_menu.h
index fd576c3b5a..ce03cdacb8 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -71,7 +71,7 @@ struct BagMenu
u8 unused1[2];
u8 pocketScrollArrowsTask;
u8 pocketSwitchArrowsTask;
- const u8* contextMenuItemsPtr;
+ const u8 *contextMenuItemsPtr;
u8 contextMenuItemsBuffer[4];
u8 contextMenuNumItems;
u8 numItemStacks[POCKETS_COUNT];
diff --git a/include/link_rfu.h b/include/link_rfu.h
index d52c2fef6a..a8f8362cb3 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -98,7 +98,7 @@ struct RfuGameCompatibilityData
// anything the developers want. This struct is what GF decided to use it for.
// It can be up to 13 bytes in size (RFU_GAME_NAME_LENGTH).
// The player's name is sent separately as the username ("uname"), and does not
-// use a struct (gHostRfuUsername).
+// use a struct (gHostRfuUsername).
struct __attribute__((packed, aligned(2))) RfuGameData
{
struct RfuGameCompatibilityData compatibility;
diff --git a/include/mail.h b/include/mail.h
index 68c532b310..f4590a70ec 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -15,7 +15,7 @@
|| itemId == ITEM_RETRO_MAIL))
// mail.h
-void ReadMail(struct Mail *mail, void (*callback)(void), bool8 flag);
+void ReadMail(struct Mail *mail, void (*exitCallback)(void), bool8 hasText);
// mail_data.h
void ClearAllMail(void);
diff --git a/include/menu.h b/include/menu.h
index c38e87cbd6..43b564da28 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -50,7 +50,7 @@ void LoadMessageBoxAndBorderGfx(void);
void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
-void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
+void PrintPlayerNameOnWindow(u8, const u8 *, u16, u16);
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram);
void DisplayYesNoMenuDefaultYes(void);
@@ -61,7 +61,7 @@ void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(str
void BgDmaFill(u32 bg, u8 value, int offset, int size);
void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
-void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
+void SetWindowTemplateFields(struct WindowTemplate *template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
void ScheduleBgCopyTilemapToVram(u8 bgNum);
void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
diff --git a/include/money.h b/include/money.h
index 5c7c1c9842..e7a8379787 100644
--- a/include/money.h
+++ b/include/money.h
@@ -1,11 +1,11 @@
#ifndef GUARD_MONEY_H
#define GUARD_MONEY_H
-u32 GetMoney(u32* moneyPtr);
-void SetMoney(u32* moneyPtr, u32 newValue);
-bool8 IsEnoughMoney(u32* moneyPtr, u32 cost);
-void AddMoney(u32* moneyPtr, u32 toAdd);
-void RemoveMoney(u32* moneyPtr, u32 toSub);
+u32 GetMoney(u32 *moneyPtr);
+void SetMoney(u32 *moneyPtr, u32 newValue);
+bool8 IsEnoughMoney(u32 *moneyPtr, u32 cost);
+void AddMoney(u32 *moneyPtr, u32 toAdd);
+void RemoveMoney(u32 *moneyPtr, u32 toSub);
bool8 IsEnoughForCostInVar0x8005(void);
void SubtractMoneyFromVar0x8005(void);
void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed);
diff --git a/include/party_menu.h b/include/party_menu.h
index 1bb870a835..02f7b30b10 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -36,8 +36,8 @@ bool8 IsMultiBattle(void);
u8 GetCursorSelectionMonId(void);
u8 GetPartyMenuType(void);
void Task_HandleChooseMonInput(u8 taskId);
-u8* GetMonNickname(struct Pokemon *mon, u8 *dest);
-u8 DisplayPartyMenuMessage(const u8* str, bool8 keepOpen);
+u8 *GetMonNickname(struct Pokemon *mon, u8 *dest);
+u8 DisplayPartyMenuMessage(const u8 *str, bool8 keepOpen);
bool8 IsPartyMenuTextPrinterActive(void);
void PartyMenuModifyHP(u8 taskId, u8 slot, s8 hpIncrement, s16 HPDifference, TaskFunc task);
u8 GetAilmentFromStatus(u32 status);
diff --git a/include/pokedex_area_screen.h b/include/pokedex_area_screen.h
index 027d3e4a78..86dfaa6c5b 100755
--- a/include/pokedex_area_screen.h
+++ b/include/pokedex_area_screen.h
@@ -1,6 +1,6 @@
#ifndef GUARD_POKEDEX_AREA_SCREEN_H
#define GUARD_POKEDEX_AREA_SCREEN_H
-void ShowPokedexAreaScreen(u16, u8*);
+void ShowPokedexAreaScreen(u16, u8 *);
#endif // GUARD_POKEDEX_AREA_SCREEN_H
diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h
index 4d2043292d..3401db22da 100755
--- a/include/pokedex_cry_screen.h
+++ b/include/pokedex_cry_screen.h
@@ -12,10 +12,10 @@ struct CryScreenWindow
extern u8 gDexCryScreenState;
-bool8 LoadCryWaveformWindow(struct CryScreenWindow*, u8);
+bool8 LoadCryWaveformWindow(struct CryScreenWindow *, u8);
void UpdateCryWaveformWindow(u8);
void CryScreenPlayButton(u16);
-bool8 LoadCryMeter(struct CryScreenWindow*, u8);
+bool8 LoadCryMeter(struct CryScreenWindow *, u8);
void FreeCryScreen(void);
#endif
diff --git a/include/pokemon.h b/include/pokemon.h
index 578ca42a2e..d7de38c61f 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -9,6 +9,99 @@
#define GET_BASE_SPECIES_ID(speciesId) (GetFormSpeciesId(speciesId, 0))
#define FORM_SPECIES_END (0xffff)
+// Property labels for Get(Box)MonData / Set(Box)MonData
+enum {
+ MON_DATA_PERSONALITY,
+ MON_DATA_OT_ID,
+ MON_DATA_NICKNAME,
+ MON_DATA_LANGUAGE,
+ MON_DATA_SANITY_IS_BAD_EGG,
+ MON_DATA_SANITY_HAS_SPECIES,
+ MON_DATA_SANITY_IS_EGG,
+ MON_DATA_OT_NAME,
+ MON_DATA_MARKINGS,
+ MON_DATA_CHECKSUM,
+ MON_DATA_ENCRYPT_SEPARATOR,
+ MON_DATA_SPECIES,
+ MON_DATA_HELD_ITEM,
+ MON_DATA_MOVE1,
+ MON_DATA_MOVE2,
+ MON_DATA_MOVE3,
+ MON_DATA_MOVE4,
+ MON_DATA_PP1,
+ MON_DATA_PP2,
+ MON_DATA_PP3,
+ MON_DATA_PP4,
+ MON_DATA_PP_BONUSES,
+ MON_DATA_COOL,
+ MON_DATA_BEAUTY,
+ MON_DATA_CUTE,
+ MON_DATA_EXP,
+ MON_DATA_HP_EV,
+ MON_DATA_ATK_EV,
+ MON_DATA_DEF_EV,
+ MON_DATA_SPEED_EV,
+ MON_DATA_SPATK_EV,
+ MON_DATA_SPDEF_EV,
+ MON_DATA_FRIENDSHIP,
+ MON_DATA_SMART,
+ MON_DATA_POKERUS,
+ MON_DATA_MET_LOCATION,
+ MON_DATA_MET_LEVEL,
+ MON_DATA_MET_GAME,
+ MON_DATA_POKEBALL,
+ MON_DATA_HP_IV,
+ MON_DATA_ATK_IV,
+ MON_DATA_DEF_IV,
+ MON_DATA_SPEED_IV,
+ MON_DATA_SPATK_IV,
+ MON_DATA_SPDEF_IV,
+ MON_DATA_IS_EGG,
+ MON_DATA_ABILITY_NUM,
+ MON_DATA_TOUGH,
+ MON_DATA_SHEEN,
+ MON_DATA_OT_GENDER,
+ MON_DATA_COOL_RIBBON,
+ MON_DATA_BEAUTY_RIBBON,
+ MON_DATA_CUTE_RIBBON,
+ MON_DATA_SMART_RIBBON,
+ MON_DATA_TOUGH_RIBBON,
+ MON_DATA_STATUS,
+ MON_DATA_LEVEL,
+ MON_DATA_HP,
+ MON_DATA_MAX_HP,
+ MON_DATA_ATK,
+ MON_DATA_DEF,
+ MON_DATA_SPEED,
+ MON_DATA_SPATK,
+ MON_DATA_SPDEF,
+ MON_DATA_MAIL,
+ MON_DATA_SPECIES2,
+ MON_DATA_IVS,
+ MON_DATA_CHAMPION_RIBBON,
+ MON_DATA_WINNING_RIBBON,
+ MON_DATA_VICTORY_RIBBON,
+ MON_DATA_ARTIST_RIBBON,
+ MON_DATA_EFFORT_RIBBON,
+ MON_DATA_MARINE_RIBBON,
+ MON_DATA_LAND_RIBBON,
+ MON_DATA_SKY_RIBBON,
+ MON_DATA_COUNTRY_RIBBON,
+ MON_DATA_NATIONAL_RIBBON,
+ MON_DATA_EARTH_RIBBON,
+ MON_DATA_WORLD_RIBBON,
+ MON_DATA_UNUSED_RIBBONS,
+ MON_DATA_EVENT_LEGAL,
+ MON_DATA_KNOWN_MOVES,
+ MON_DATA_RIBBON_COUNT,
+ MON_DATA_RIBBONS,
+ MON_DATA_ATK2,
+ MON_DATA_DEF2,
+ MON_DATA_SPEED2,
+ MON_DATA_SPATK2,
+ MON_DATA_SPDEF2,
+};
+
struct PokemonSubstruct0
{
/*0x00*/ u16 species;
@@ -445,11 +538,11 @@ void SetWildMonHeldItem(void);
bool8 IsMonShiny(struct Pokemon *mon);
bool8 IsShinyOtIdPersonality(u32 otId, u32 personality);
const u8 *GetTrainerPartnerName(void);
-void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 panMode);
-void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 panModeAnimFlag);
-void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneFrame);
+void BattleAnimateFrontSprite(struct Sprite *sprite, u16 species, bool8 noCry, u8 panMode);
+void DoMonFrontSpriteAnimation(struct Sprite *sprite, u16 species, bool8 noCry, u8 panModeAnimFlag);
+void PokemonSummaryDoMonAnimation(struct Sprite *sprite, u16 species, bool8 oneFrame);
void StopPokemonAnimationDelayTask(void);
-void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
+void BattleAnimateBackSprite(struct Sprite *sprite, u16 species);
u8 GetOpposingLinkMultiBattlerId(bool8 rightSide, u8 multiplayerId);
u16 FacilityClassToPicIndex(u16 facilityClass);
u16 PlayerGenderToFrontTrainerPicId(u8 playerGender);
diff --git a/include/pokenav.h b/include/pokenav.h
index 593c684890..959998383f 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -116,21 +116,21 @@ enum
#define POKENAV_MENU_IDS_START 100000
enum
{
- POKENAV_MAIN_MENU = POKENAV_MENU_IDS_START, // The main menu where the player selects Hoenn Map/Condition/Match Call/Ribbons
- POKENAV_MAIN_MENU_CURSOR_ON_MAP,
- POKENAV_CONDITION_MENU, // The first Condition screen where the player selects Party or Search
- POKENAV_CONDITION_SEARCH_MENU, // The Condition search menu where the player selects a search parameter
- POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL,
- POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS,
- POKENAV_REGION_MAP,
- POKENAV_CONDITION_GRAPH_PARTY, // The Condition graph screen when Party has been selected
- POKENAV_CONDITION_SEARCH_RESULTS, // The list of results from a Condition search
- POKENAV_CONDITION_GRAPH_SEARCH, // The Condition graph screen when a search result has been selected
- POKENAV_RETURN_CONDITION_SEARCH, // Exited the graph screen back to the list of Condition search results
- POKENAV_MATCH_CALL,
- POKENAV_RIBBONS_MON_LIST, // The list of Pokémon with ribbons
- POKENAV_RIBBONS_SUMMARY_SCREEN, // The ribbon summary screen shown when a Pokémon has been selected
- POKENAV_RIBBONS_RETURN_TO_MON_LIST, // Exited the summary screen back to the ribbon list
+ POKENAV_MAIN_MENU = POKENAV_MENU_IDS_START, // The main menu where the player selects Hoenn Map/Condition/Match Call/Ribbons
+ POKENAV_MAIN_MENU_CURSOR_ON_MAP,
+ POKENAV_CONDITION_MENU, // The first Condition screen where the player selects Party or Search
+ POKENAV_CONDITION_SEARCH_MENU, // The Condition search menu where the player selects a search parameter
+ POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL,
+ POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS,
+ POKENAV_REGION_MAP,
+ POKENAV_CONDITION_GRAPH_PARTY, // The Condition graph screen when Party has been selected
+ POKENAV_CONDITION_SEARCH_RESULTS, // The list of results from a Condition search
+ POKENAV_CONDITION_GRAPH_SEARCH, // The Condition graph screen when a search result has been selected
+ POKENAV_RETURN_CONDITION_SEARCH, // Exited the graph screen back to the list of Condition search results
+ POKENAV_MATCH_CALL,
+ POKENAV_RIBBONS_MON_LIST, // The list of Pokémon with ribbons
+ POKENAV_RIBBONS_SUMMARY_SCREEN, // The ribbon summary screen shown when a Pokémon has been selected
+ POKENAV_RIBBONS_RETURN_TO_MON_LIST, // Exited the summary screen back to the ribbon list
};
enum
@@ -185,28 +185,28 @@ enum
enum
{
- MC_HEADER_MR_STONE,
- MC_HEADER_PROF_BIRCH,
- MC_HEADER_BRENDAN,
- MC_HEADER_MAY,
- MC_HEADER_WALLY,
- MC_HEADER_NORMAN,
- MC_HEADER_MOM,
- MC_HEADER_STEVEN,
- MC_HEADER_SCOTT,
- MC_HEADER_ROXANNE,
- MC_HEADER_BRAWLY,
- MC_HEADER_WATTSON,
- MC_HEADER_FLANNERY,
- MC_HEADER_WINONA,
- MC_HEADER_TATE_LIZA,
- MC_HEADER_JUAN,
- MC_HEADER_SIDNEY,
- MC_HEADER_PHOEBE,
- MC_HEADER_GLACIA,
- MC_HEADER_DRAKE,
- MC_HEADER_WALLACE,
- MC_HEADER_COUNT
+ MC_HEADER_MR_STONE,
+ MC_HEADER_PROF_BIRCH,
+ MC_HEADER_BRENDAN,
+ MC_HEADER_MAY,
+ MC_HEADER_WALLY,
+ MC_HEADER_NORMAN,
+ MC_HEADER_MOM,
+ MC_HEADER_STEVEN,
+ MC_HEADER_SCOTT,
+ MC_HEADER_ROXANNE,
+ MC_HEADER_BRAWLY,
+ MC_HEADER_WATTSON,
+ MC_HEADER_FLANNERY,
+ MC_HEADER_WINONA,
+ MC_HEADER_TATE_LIZA,
+ MC_HEADER_JUAN,
+ MC_HEADER_SIDNEY,
+ MC_HEADER_PHOEBE,
+ MC_HEADER_GLACIA,
+ MC_HEADER_DRAKE,
+ MC_HEADER_WALLACE,
+ MC_HEADER_COUNT
};
enum
diff --git a/include/save.h b/include/save.h
index 89fc9ad33e..41913d1df4 100644
--- a/include/save.h
+++ b/include/save.h
@@ -9,8 +9,8 @@
#define NUM_SAVE_SLOTS 2
-// If the sector's security field is not this value then the sector is either invalid or empty.
-#define SECTOR_SECURITY_NUM 0x8012025
+// If the sector's signature field is not this value then the sector is either invalid or empty.
+#define SECTOR_SIGNATURE 0x8012025
#define SPECIAL_SECTOR_SENTINEL 0xB39D
@@ -72,12 +72,12 @@ struct SaveSector
u8 unused[SECTOR_FOOTER_SIZE - 12]; // Unused portion of the footer
u16 id;
u16 checksum;
- u32 security;
+ u32 signature;
u32 counter;
}; // size is SECTOR_SIZE (0x1000)
-#define SECTOR_SECURITY_OFFSET offsetof(struct SaveSector, security)
-#define SECTOR_COUNTER_OFFSET offsetof(struct SaveSector, counter)
+#define SECTOR_SIGNATURE_OFFSET offsetof(struct SaveSector, signature)
+#define SECTOR_COUNTER_OFFSET offsetof(struct SaveSector, counter)
extern u16 gLastWrittenSector;
extern u32 gLastSaveCounter;
@@ -99,13 +99,13 @@ u8 TrySavingData(u8 saveType);
bool8 LinkFullSave_Init(void);
bool8 LinkFullSave_WriteSector(void);
bool8 LinkFullSave_ReplaceLastSector(void);
-bool8 LinkFullSave_SetLastSectorSecurity(void);
+bool8 LinkFullSave_SetLastSectorSignature(void);
bool8 WriteSaveBlock2(void);
bool8 WriteSaveBlock1Sector(void);
u8 LoadGameSave(u8 saveType);
u16 GetSaveBlocksPointersBaseOffset(void);
-u32 TryReadSpecialSaveSector(u8 sector, u8* dst);
-u32 TryWriteSpecialSaveSector(u8 sector, u8* src);
+u32 TryReadSpecialSaveSector(u8 sector, u8 *dst);
+u32 TryWriteSpecialSaveSector(u8 sector, u8 *src);
void Task_LinkFullSave(u8 taskId);
// save_failed_screen.c
diff --git a/include/script.h b/include/script.h
index 63f6f5aef9..7c180e961b 100644
--- a/include/script.h
+++ b/include/script.h
@@ -31,16 +31,16 @@ void ScriptCall(struct ScriptContext *ctx, const u8 *ptr);
void ScriptReturn(struct ScriptContext *ctx);
u16 ScriptReadHalfword(struct ScriptContext *ctx);
u32 ScriptReadWord(struct ScriptContext *ctx);
-void ScriptContext2_Enable(void);
-void ScriptContext2_Disable(void);
-bool8 ScriptContext2_IsEnabled(void);
-void ScriptContext1_Init(void);
-bool8 ScriptContext1_IsScriptSetUp(void);
-bool8 ScriptContext2_RunScript(void);
-void ScriptContext1_SetupScript(const u8 *ptr);
-void ScriptContext1_Stop(void);
-void EnableBothScriptContexts(void);
-void ScriptContext2_RunNewScript(const u8 *ptr);
+void LockPlayerFieldControls(void);
+void UnlockPlayerFieldControls(void);
+bool8 ArePlayerFieldControlsLocked(void);
+void ScriptContext_Init(void);
+bool8 ScriptContext_IsEnabled(void);
+bool8 ScriptContext_RunScript(void);
+void ScriptContext_SetupScript(const u8 *ptr);
+void ScriptContext_Stop(void);
+void ScriptContext_Enable(void);
+void RunScriptImmediately(const u8 *ptr);
u8 *MapHeaderGetScriptTable(u8 tag);
void MapHeaderRunScriptType(u8 tag);
u8 *MapHeaderCheckScriptTable(u8 tag);
diff --git a/include/script_menu.h b/include/script_menu.h
index a690ef8b8b..36b66bf987 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -12,7 +12,7 @@ bool8 (*ScriptMenu_HidePokemonPic(void))(void);
int ConvertPixelWidthToTileWidth(int width);
u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height);
void ClearToTransparentAndRemoveWindow(u8 windowId);
-int DisplayTextAndGetWidth(const u8* str, int width);
+int DisplayTextAndGetWidth(const u8 *str, int width);
int ScriptMenu_AdjustLeftCoordFromWidth(int left, int width);
bool16 ScriptMenu_CreatePCMultichoice(void);
void ScriptMenu_DisplayPCStartupPrompt(void);
diff --git a/include/secret_base.h b/include/secret_base.h
index b7d36a8ee9..cb3b95ee78 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -24,7 +24,7 @@ void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const st
void TrySetCurSecretBaseIndex(void);
void CheckPlayerHasSecretBase(void);
void ToggleSecretBaseEntranceMetatile(void);
-void EnableBothScriptContexts(void);
+void ScriptContext_Enable(void);
void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx);
#endif //GUARD_SECRET_BASE_H
diff --git a/include/sound.h b/include/sound.h
index a5463a4561..b39a7306a6 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -12,7 +12,6 @@ void StopMapMusic(void);
void FadeOutMapMusic(u8 speed);
void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed);
void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed);
-void FadeInNewMapMusic(u16 songNum, u8 speed);
bool8 IsNotWaitingForBGMStop(void);
void PlayFanfareByFanfareNum(u8 fanfareNum);
bool8 WaitFanfare(bool8 stop);
diff --git a/include/start_menu.h b/include/start_menu.h
index 1ddd82066d..94d0f9d5b6 100644
--- a/include/start_menu.h
+++ b/include/start_menu.h
@@ -11,6 +11,6 @@ void SaveGame(void);
void CB2_SetUpSaveAfterLinkBattle(void);
void SaveForBattleTowerLink(void);
void HideStartMenu(void);
-void AppendToList(u8* list, u8* pos, u8 newEntry);
+void AppendToList(u8 *list, u8 *pos, u8 newEntry);
#endif // GUARD_START_MENU_H
diff --git a/include/strings.h b/include/strings.h
index 6ace70c4d7..e2ae613d06 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -179,7 +179,7 @@ extern const u8 gText_EmptyString2[];
extern const u8 gText_Confirm3[];
extern const u8 gText_Cancel4[];
extern const u8 gText_IsThisTheCorrectTime[];
-extern const u8 gText_PkmnFainted3[];
+extern const u8 gText_PkmnFainted_FldPsn[];
extern const u8 gText_Coins[];
extern const u8 gText_Silver[];
extern const u8 gText_Gold[];
@@ -3022,4 +3022,11 @@ extern const u8 gText_PkmnForSwap[];
extern const u8 gText_SamePkmnInPartyAlready[];
extern const u8 gText_Cancel3[];
+// Naming Screen
+extern const u8 gText_MoveOkBack[];
+extern const u8 gText_YourName[];
+extern const u8 gText_BoxName[];
+extern const u8 gText_PkmnsNickname[];
+extern const u8 gText_TellHimTheWords[];
+
#endif // GUARD_STRINGS_H
diff --git a/include/trade.h b/include/trade.h
index 27b5ee8bdf..d63749653a 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -14,10 +14,10 @@ void CB2_StartCreateTradeMenu(void);
void CB2_LinkTrade(void);
int CanRegisterMonForTradingBoard(struct RfuGameCompatibilityData player, u16 species2, u16 species, bool8 isEventLegal);
int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct RfuGameCompatibilityData partner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, bool8 isEventLegal);
-int CanSpinTradeMon(struct Pokemon*, u16);
+int CanSpinTradeMon(struct Pokemon *, u16);
void InitTradeSequenceBgGpuRegs(void);
void LinkTradeDrawWindow(void);
-void InitTradeBg(void);
+void LoadTradeAnimGfx(void);
void DrawTextOnTradeWindow(u8, const u8 *, u8);
#endif //GUARD_TRADE_H
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index 954087e1bb..6e2ec0ba0a 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -5,7 +5,7 @@
struct TrainerHillTrainer
{
- u8 name[HILL_TRAINER_NAME_LENGTH];
+ u8 name[TRAINER_NAME_LENGTH + 1];
u8 facilityClass;
bool32 unused; // Set to TRUE on JP trainers
u16 speechBefore[EASY_CHAT_BATTLE_WORDS_COUNT];
diff --git a/include/util.h b/include/util.h
index 77062de96e..8f2079a0ba 100644
--- a/include/util.h
+++ b/include/util.h
@@ -12,7 +12,7 @@ void LoadWordFromTwoHalfwords(u16 *, u32 *);
int CountTrailingZeroBits(u32 value);
u16 CalcCRC16(const u8 *data, s32 length);
u16 CalcCRC16WithTable(const u8 *data, u32 length);
-u32 CalcByteArraySum(const u8* data, u32 length);
+u32 CalcByteArraySum(const u8 *data, u32 length);
void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output);
diff --git a/ld_script.txt b/ld_script.txt
index ef153e50ff..da0eb682d3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -14,6 +14,9 @@ SECTIONS {
. = 0x1C000;
INCLUDE "sym_ewram.ld"
+ src/*.o(.ewram_data);
+ gflib/*.o(.ewram_data);
+
*libc.a:impure.o(.data);
*libc.a:locale.o(.data);
*libc.a:mallocr.o(.data);
@@ -27,6 +30,9 @@ SECTIONS {
{
/* .bss starts at 0x3000000 */
INCLUDE "sym_bss.ld"
+ src/*.o(.bss);
+ gflib/*.o(.bss);
+ data/*.o(.bss);
/* .bss.code starts at 0x3001AA8 */
src/m4a.o(.bss.code);
@@ -696,6 +702,7 @@ SECTIONS {
src/battle_transition_frontier.o(.rodata);
src/text_input_strings.o(.rodata);
src/fonts.o(.rodata);
+ src/international_string_util.o(.rodata);
src/mystery_event_msg.o(.rodata);
data/mystery_gift.o(.rodata);
src/m4a_tables.o(.rodata);
@@ -1305,6 +1312,16 @@ SECTIONS {
src/graphics.o(.rodata);
} =0
+ extra :
+ ALIGN(4)
+ {
+ src/*.o(.text);
+ gflib/*.o(.text);
+ src/*.o(.rodata);
+ gflib/*.o(.rodata);
+ data/*.o(.rodata);
+ } = 0
+
/* DWARF debug sections.
Symbols in the DWARF debugging sections are relative to the beginning
of the section so we begin them at 0. */
diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc
index d1b33a637e..0fdc9cb505 100644
--- a/sound/cry_tables.inc
+++ b/sound/cry_tables.inc
@@ -386,6 +386,7 @@ gCryTable::
cry Cry_Rayquaza
cry Cry_Jirachi
cry Cry_Deoxys
+.if P_NEW_POKEMON == TRUE
cry Cry_Turtwig
cry Cry_Grotle
cry Cry_Torterra
@@ -1271,6 +1272,44 @@ gCryTable::
@ Calyrex
cry Cry_CalyrexIceRider
cry Cry_CalyrexShadowRider
+.else
+ @ Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ cry Cry_Unown
+ @ Castform
+ cry Cry_Castform
+ cry Cry_Castform
+ cry Cry_Castform
+ @ Deoxys
+ cry Cry_Deoxys
+ cry Cry_Deoxys
+ cry Cry_Deoxys
+.endif
.align 2
gCryTable_Reverse::
@@ -1660,6 +1699,7 @@ gCryTable_Reverse::
cry_reverse Cry_Rayquaza
cry_reverse Cry_Jirachi
cry_reverse Cry_Deoxys
+.if P_NEW_POKEMON == TRUE
cry_reverse Cry_Turtwig
cry_reverse Cry_Grotle
cry_reverse Cry_Torterra
@@ -2545,3 +2585,41 @@ gCryTable_Reverse::
@ Calyrex
cry_reverse Cry_CalyrexIceRider
cry_reverse Cry_CalyrexShadowRider
+.else
+ @ Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ cry_reverse Cry_Unown
+ @ Castform
+ cry_reverse Cry_Castform
+ cry_reverse Cry_Castform
+ cry_reverse Cry_Castform
+ @ Deoxys
+ cry_reverse Cry_Deoxys
+ cry_reverse Cry_Deoxys
+ cry_reverse Cry_Deoxys
+.endif
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index bddd27423d..c177475d61 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -1930,6 +1930,7 @@ Cry_Jirachi::
Cry_Deoxys::
.incbin "sound/direct_sound_samples/cries/deoxys.bin"
+.if P_NEW_POKEMON == TRUE
.align 2
Cry_Turtwig::
.incbin "sound/direct_sound_samples/cries/turtwig.bin"
@@ -4305,6 +4306,7 @@ Cry_CalyrexIceRider::
.align 2
Cry_CalyrexShadowRider::
.incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin"
+.endif
.align 2
DirectSoundWaveData_register_noise::
diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c
index f6ebcc7265..747a6c7849 100644
--- a/src/AgbRfu_LinkManager.c
+++ b/src/AgbRfu_LinkManager.c
@@ -49,7 +49,7 @@ u32 rfu_LMAN_REQBN_softReset_and_checkID(void)
return id;
}
-void rfu_LMAN_REQ_sendData(u8 clockChangeFlag)
+void rfu_LMAN_REQ_sendData(bool8 clockChangeFlag)
{
if (gRfuLinkStatus->parentChild == MODE_CHILD)
{
diff --git a/src/apprentice.c b/src/apprentice.c
index cf14585aae..4103e8f795 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -132,9 +132,9 @@ void BufferApprenticeChallengeText(u8 saveApprenticeId)
StringExpandPlaceholders(gStringVar4, challengeText);
}
-void Apprentice_EnableBothScriptContexts(void)
+void Apprentice_ScriptContext_Enable(void)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void ResetApprenticeStruct(struct Apprentice *apprentice)
@@ -638,7 +638,7 @@ static void CreateApprenticeMenu(u8 menu)
width = ConvertPixelWidthToTileWidth(pixelWidth);
left = ScriptMenu_AdjustLeftCoordFromWidth(left, width);
windowId = CreateAndShowWindow(left, top, width, count * 2);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
for (i = 0; i < count; i++)
AddTextPrinterParameterized(windowId, FONT_NORMAL, strings[i], 8, (i * 16) + 1, TEXT_SKIP_DRAW, NULL);
@@ -679,7 +679,7 @@ static void Task_ChooseAnswer(u8 taskId)
RemoveAndHideWindow(tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static u8 CreateAndShowWindow(u8 left, u8 top, u8 width, u8 height)
@@ -815,9 +815,9 @@ static void Task_WaitForPrintingMessage(u8 taskId)
{
DestroyTask(taskId);
if (gSpecialVar_0x8005)
- ExecuteFuncAfterButtonPress(EnableBothScriptContexts);
+ ExecuteFuncAfterButtonPress(ScriptContext_Enable);
else
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
@@ -895,7 +895,7 @@ static void PrintApprenticeMessage(void)
}
else
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
return;
}
@@ -906,11 +906,11 @@ static void PrintApprenticeMessage(void)
static void Script_PrintApprenticeMessage(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
PlayerFreeze();
StopPlayerAvatar();
- DrawDialogueFrame(0, 1);
+ DrawDialogueFrame(0, TRUE);
PrintApprenticeMessage();
}
@@ -1289,7 +1289,7 @@ static void Task_ExecuteFuncAfterButtonPress(u8 taskId)
{
if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{
- gApprenticeFunc = (void*)(u32)(((u16)gTasks[taskId].data[0] | (gTasks[taskId].data[1] << 16)));
+ gApprenticeFunc = (void *)(u32)(((u16)gTasks[taskId].data[0] | (gTasks[taskId].data[1] << 16)));
gApprenticeFunc();
DestroyTask(taskId);
}
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 8d7b539a85..13cc828242 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -781,11 +781,7 @@ static u8 GetAI_ItemType(u16 itemId, const u8 *itemEffect)
return AI_ITEM_HEAL_HP;
else if (itemEffect[3] & ITEM3_STATUS_ALL)
return AI_ITEM_CURE_CONDITION;
-#ifdef ITEM_EXPANSION
else if ((itemEffect[0] & ITEM0_DIRE_HIT) || itemEffect[1])
-#else
- else if (itemEffect[0] & (ITEM0_DIRE_HIT | ITEM0_X_ATTACK) || itemEffect[1] != 0 || itemEffect[2] != 0)
-#endif
return AI_ITEM_X_STAT;
else if (itemEffect[3] & ITEM3_GUARD_SPEC)
return AI_ITEM_GUARD_SPEC;
@@ -913,20 +909,6 @@ static bool8 ShouldUseItem(void)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) = 0;
if (gDisableStructs[gActiveBattler].isFirstTurn == 0)
break;
- #ifndef ITEM_EXPANSION
- if (itemEffects[0] & ITEM0_X_ATTACK)
- *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_ATTACK);
- if (itemEffects[1] & ITEM1_X_DEFEND)
- *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_DEFEND);
- if (itemEffects[1] & ITEM1_X_SPEED)
- *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_SPEED);
- if (itemEffects[2] & ITEM2_X_SPATK)
- *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_SPATK);
- if (itemEffects[2] & ITEM2_X_ACCURACY)
- *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_ACCURACY);
- if (itemEffects[0] & ITEM0_DIRE_HIT)
- *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_DIRE_HIT);
- #else
if (itemEffects[1] & ITEM1_X_ATTACK)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_ATTACK);
if (itemEffects[1] & ITEM1_X_DEFENSE)
@@ -941,7 +923,6 @@ static bool8 ShouldUseItem(void)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_X_ACCURACY);
if (itemEffects[0] & ITEM0_DIRE_HIT)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_DIRE_HIT);
- #endif
shouldUse = TRUE;
break;
case AI_ITEM_GUARD_SPEC:
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index fe715eec6e..25c7f3b9d5 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -3357,9 +3357,7 @@ static const u16 sRecycleEncouragedItems[] =
ITEM_MICLE_BERRY,
ITEM_CUSTAP_BERRY,
ITEM_MENTAL_HERB,
- #ifdef ITEM_EXPANSION
ITEM_FOCUS_SASH,
- #endif
// TODO expand this
};
@@ -3375,9 +3373,7 @@ bool32 IsStatBoostingBerry(u16 item)
case ITEM_APICOT_BERRY:
//case ITEM_LANSAT_BERRY:
case ITEM_STARF_BERRY:
- #ifdef ITEM_EXPANSION
case ITEM_MICLE_BERRY:
- #endif
return TRUE;
default:
return FALSE;
@@ -3619,12 +3615,10 @@ bool32 ShouldUseZMove(u8 battlerAtk, u8 battlerDef, u16 chosenMove)
{
u8 effectiveness;
- #ifdef POKEMON_EXPANSION
if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU)
return FALSE; // Don't waste a Z-Move busting disguise
if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE && IS_MOVE_PHYSICAL(chosenMove))
return FALSE; // Don't waste a Z-Move busting Ice Face
- #endif
if (IS_MOVE_STATUS(chosenMove) && !IS_MOVE_STATUS(gBattleStruct->zmove.chosenZMove))
return FALSE;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index fe42b81cb2..e3885ec4eb 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -720,13 +720,13 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
if (IsContest() == TRUE)
{
- RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(16)), 0x2000, 1);
- RequestDma3Fill(0xFF, (void*)(BG_SCREEN_ADDR(30)), 0x1000, 0);
+ RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(16)), 0x2000, 1);
+ RequestDma3Fill(0xFF, (void *)(BG_SCREEN_ADDR(30)), 0x1000, 0);
}
else
{
- RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(8)), 0x2000, 1);
- RequestDma3Fill(0xFF, (void*)(BG_SCREEN_ADDR(28)), 0x1000, 0);
+ RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(8)), 0x2000, 1);
+ RequestDma3Fill(0xFF, (void *)(BG_SCREEN_ADDR(28)), 0x1000, 0);
}
GetBattleAnimBg1Data(&animBg);
@@ -751,7 +751,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20);
- CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + animBg.paletteId * 32), 0x20);
+ CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + animBg.paletteId * 32), 0x20);
if (IsContest())
battlerPosition = 0;
@@ -765,8 +765,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
}
else
{
- RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(12)), 0x2000, 1);
- RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(30)), 0x1000, 1);
+ RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(12)), 0x2000, 1);
+ RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(30)), 0x1000, 1);
GetBattleAnimBgData(&animBg, 2);
CpuFill16(0, animBg.bgTiles + 0x1000, 0x1000);
CpuFill16(0, animBg.bgTilemap + 0x400, 0x800);
@@ -786,7 +786,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20);
- CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + 0x120), 0x20);
+ CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + 0x120), 0x20);
DrawBattlerOnBg(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset);
}
@@ -1247,7 +1247,7 @@ void LoadMoveBg(u16 bgId)
void *dmaDest;
LZDecompressWram(tilemap, gDecompressionBuffer);
- RelocateBattleBgPal(GetBattleBgPaletteNum(), (void*)gDecompressionBuffer, 0x100, FALSE);
+ RelocateBattleBgPal(GetBattleBgPaletteNum(), (void *)gDecompressionBuffer, 0x100, FALSE);
dmaSrc = gDecompressionBuffer;
dmaDest = (void *)BG_SCREEN_ADDR(26);
DmaCopy32(3, dmaSrc, dmaDest, 0x800);
diff --git a/src/battle_anim_bug.c b/src/battle_anim_bug.c
index dde184f993..894fd866e0 100644
--- a/src/battle_anim_bug.c
+++ b/src/battle_anim_bug.c
@@ -267,7 +267,7 @@ static void AnimTranslateWebThread(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]);
}
InitAnimLinearTranslationWithSpeed(sprite);
@@ -290,7 +290,7 @@ static void AnimTranslateWebThread_Step(struct Sprite *sprite)
// Second stage of String Shot
static void AnimStringWrap(struct Sprite *sprite)
{
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker))
sprite->x -= gBattleAnimArgs[0];
else
@@ -400,7 +400,7 @@ static void AnimTranslateStinger(struct Sprite *sprite)
}
}
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
@@ -425,7 +425,7 @@ static void AnimTranslateStinger(struct Sprite *sprite)
// arg 5: wave amplitude
void AnimMissileArc(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c
index 142e5596e5..becbc8fcf9 100644
--- a/src/battle_anim_dark.c
+++ b/src/battle_anim_dark.c
@@ -508,7 +508,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
GetBattleAnimBg1Data(&animBg);
task->data[10] = gBattle_BG1_Y;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
- FillPalette(0, animBg.paletteId * 16, 32);
+ FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
scanlineParams.dmaDest = ®_BG1VOFS;
var0 = WINOUT_WIN01_BG1;
if (!IsContest())
@@ -518,7 +518,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
{
task->data[10] = gBattle_BG2_Y;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
- FillPalette(0, 144, 32);
+ FillPalette(RGB_BLACK, 144, 32);
scanlineParams.dmaDest = ®_BG2VOFS;
var0 = WINOUT_WIN01_BG2;
if (!IsContest())
@@ -648,12 +648,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
{
GetBattleAnimBg1Data(&animBg);
task->data[10] = gBattle_BG1_Y;
- FillPalette(0, animBg.paletteId * 16, 32);
+ FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
}
else
{
task->data[10] = gBattle_BG2_Y;
- FillPalette(0, 9 * 16, 32);
+ FillPalette(RGB_BLACK, 9 * 16, 32);
}
SetAllBattlersSpritePriority(3);
@@ -868,7 +868,7 @@ void AnimTask_InitMementoShadow(u8 taskId)
void AnimTask_MementoHandleBg(u8 taskId)
{
- u8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? 1 : 0;
+ bool8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? TRUE : FALSE;
ResetBattleAnimBg(toBG2);
if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index ddd625a87f..7348edaf5e 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -139,23 +139,23 @@ static void AnimTask_SkullBashPositionReset(u8);
static void AnimMoveFeintSwipe(struct Sprite *);
static void AnimMoveFeintZoom(struct Sprite *);
static void AnimMoveTrumpCard(struct Sprite *);
-static void AnimMoveTrumpCardParticle(struct Sprite* sprite);
-static void AnimMoveAccupressure(struct Sprite* sprite);
-static void AnimMoveWringOut(struct Sprite* sprite);
-static void AnimMoveWorrySeed(struct Sprite* sprite);
-static void AnimMoveSmallCloud(struct Sprite* sprite);
-static void AnimGrassKnotStep(struct Sprite *sprite);
-static void AnimGrassKnot(struct Sprite *sprite);
-static void AnimWoodHammerSmall(struct Sprite *sprite);
-static void AnimWoodHammerBig(struct Sprite *sprite);
+static void AnimMoveTrumpCardParticle(struct Sprite *);
+static void AnimMoveAccupressure(struct Sprite *);
+static void AnimMoveWringOut(struct Sprite *);
+static void AnimMoveWorrySeed(struct Sprite *);
+static void AnimMoveSmallCloud(struct Sprite *);
+static void AnimGrassKnotStep(struct Sprite *);
+static void AnimGrassKnot(struct Sprite *);
+static void AnimWoodHammerSmall(struct Sprite *);
+static void AnimWoodHammerBig(struct Sprite *);
static void AnimTask_DoubleTeam_Step(u8);
static void AnimDoubleTeam(struct Sprite *);
-static void AnimNightSlash(struct Sprite *sprite);
-static void AnimRockPolishStreak(struct Sprite *sprite);
-static void AnimRockPolishSparkle(struct Sprite *sprite);
-static void AnimPoisonJabProjectile(struct Sprite *sprite);
-static void AnimNightSlash(struct Sprite *sprite);
-static void AnimPluck(struct Sprite* sprite);
+static void AnimNightSlash(struct Sprite *);
+static void AnimRockPolishStreak(struct Sprite *);
+static void AnimRockPolishSparkle(struct Sprite *);
+static void AnimPoisonJabProjectile(struct Sprite *);
+static void AnimNightSlash(struct Sprite *);
+static void AnimPluck(struct Sprite *);
const union AnimCmd gPowderParticlesAnimCmds[] =
{
@@ -2998,7 +2998,7 @@ static void AnimWoodHammerSmall(struct Sprite *sprite)
// arg 3: vertical movement speed (sub-pixel value)
// arg 4: wave amplitude
// arg 5: wave speed
-void AnimMovePowderParticle(struct Sprite* sprite)
+void AnimMovePowderParticle(struct Sprite *sprite)
{
sprite->x += gBattleAnimArgs[0];
sprite->y += gBattleAnimArgs[1];
@@ -3018,7 +3018,7 @@ void AnimMovePowderParticle(struct Sprite* sprite)
sprite->callback = AnimMovePowderParticle_Step;
}
-static void AnimMovePowderParticle_Step(struct Sprite* sprite)
+static void AnimMovePowderParticle_Step(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -3038,7 +3038,7 @@ static void AnimMovePowderParticle_Step(struct Sprite* sprite)
// arg 0: initial x pixel offset
// arg 1: initial y pixel offset
// arg 2: duration
-void AnimPowerAbsorptionOrb(struct Sprite* sprite)
+void AnimPowerAbsorptionOrb(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2];
@@ -3053,7 +3053,7 @@ void AnimPowerAbsorptionOrb(struct Sprite* sprite)
// arg 1: initial y pixel offset
// arg 2: duration
// arg 3: sprite anim number
-void AnimSolarBeamBigOrb(struct Sprite* sprite)
+void AnimSolarBeamBigOrb(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
StartSpriteAnim(sprite, gBattleAnimArgs[3]);
@@ -3070,7 +3070,7 @@ void AnimSolarBeamBigOrb(struct Sprite* sprite)
// arg 1: initial y pixel offset
// arg 2: duration
// arg 3: initial wave offset
-static void AnimSolarBeamSmallOrb(struct Sprite* sprite)
+static void AnimSolarBeamSmallOrb(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
@@ -3093,7 +3093,7 @@ static void AnimSolarBeamSmallOrb(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimSolarBeamSmallOrb_Step(struct Sprite* sprite)
+static void AnimSolarBeamSmallOrb_Step(struct Sprite *sprite)
{
if (AnimTranslateLinear(sprite))
{
@@ -3137,7 +3137,7 @@ void AnimTask_CreateSmallSolarBeamOrbs(u8 taskId)
// arg 1: initial y pixel offset
// arg 2: wave amplitude
// arg 3: wave period (lower means faster wave)
-void AnimAbsorptionOrb(struct Sprite* sprite)
+void AnimAbsorptionOrb(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[3];
@@ -3148,7 +3148,7 @@ void AnimAbsorptionOrb(struct Sprite* sprite)
sprite->callback = AnimAbsorptionOrb_Step;
}
-static void AnimAbsorptionOrb_Step(struct Sprite* sprite)
+static void AnimAbsorptionOrb_Step(struct Sprite *sprite)
{
if (TranslateAnimHorizontalArc(sprite))
DestroyAnimSprite(sprite);
@@ -3156,7 +3156,7 @@ static void AnimAbsorptionOrb_Step(struct Sprite* sprite)
// Moves an orb in a wave-like fashion towards the target mon. The wave's
// properties and the sprite anim are randomly determined.
-void AnimHyperBeamOrb(struct Sprite* sprite)
+void AnimHyperBeamOrb(struct Sprite *sprite)
{
u16 speed;
u16 animNum = Random2();
@@ -3182,7 +3182,7 @@ void AnimHyperBeamOrb(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimHyperBeamOrb_Step(struct Sprite* sprite)
+static void AnimHyperBeamOrb_Step(struct Sprite *sprite)
{
if (AnimFastTranslateLinear(sprite))
{
@@ -3201,7 +3201,7 @@ static void AnimHyperBeamOrb_Step(struct Sprite* sprite)
}
}
-static void AnimMoveWorrySeedWait(struct Sprite* sprite)
+static void AnimMoveWorrySeedWait(struct Sprite *sprite)
{
if (TranslateAnimHorizontalArc(sprite))
DestroyAnimSprite(sprite);
@@ -3211,7 +3211,7 @@ static void AnimMoveWorrySeedWait(struct Sprite* sprite)
// arg 1: initial y pixel offset
// arg 2: wave period
// arg 3: wave amplitude
-static void AnimMoveWorrySeed(struct Sprite* sprite)
+static void AnimMoveWorrySeed(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
@@ -3223,7 +3223,7 @@ static void AnimMoveWorrySeed(struct Sprite* sprite)
sprite->callback = AnimMoveWorrySeedWait;
}
-static void AnimMoveSmallCloudAnimate(struct Sprite* sprite)
+static void AnimMoveSmallCloudAnimate(struct Sprite *sprite)
{
sprite->x2 += sprite->data[0];
sprite->y2 += sprite->data[1];
@@ -3242,7 +3242,7 @@ static void AnimMoveSmallCloudAnimate(struct Sprite* sprite)
// arg 3: horizontal velocity
// arg 4: vertical velocity
// arg 5: duration
-static void AnimMoveSmallCloud(struct Sprite* sprite)
+static void AnimMoveSmallCloud(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[3];
@@ -3251,7 +3251,7 @@ static void AnimMoveSmallCloud(struct Sprite* sprite)
StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]+1);
}
-static void AnimPluckParticle(struct Sprite* sprite)
+static void AnimPluckParticle(struct Sprite *sprite)
{
if(sprite->data[0] > 0)
{
@@ -3278,7 +3278,7 @@ static void AnimPluckParticle(struct Sprite* sprite)
// arg 2: lifetime of the particle
// arg 3: upward velocity initial (decreases over time)
// arg 4: horizontal velocity (stays the same)
-static void AnimPluck(struct Sprite* sprite)
+static void AnimPluck(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
@@ -3290,7 +3290,7 @@ static void AnimPluck(struct Sprite* sprite)
sprite->callback = AnimPluckParticle;
}
-static void AnimMoveFeintSwipeStep(struct Sprite* sprite)
+static void AnimMoveFeintSwipeStep(struct Sprite *sprite)
{
switch(sprite->data[5])
{
@@ -3319,7 +3319,7 @@ static void AnimMoveFeintSwipeStep(struct Sprite* sprite)
}
-static void AnimMoveFeintSwipe(struct Sprite* sprite)
+static void AnimMoveFeintSwipe(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
@@ -3337,14 +3337,14 @@ static void AnimMoveFeintSwipe(struct Sprite* sprite)
sprite->callback = AnimMoveFeintSwipeStep;
}
-static void AnimMoveFeintZoom(struct Sprite* sprite)
+static void AnimMoveFeintZoom(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
}
-static void AnimMoveTrumpCardArc(struct Sprite* sprite)
+static void AnimMoveTrumpCardArc(struct Sprite *sprite)
{
if(AnimTranslateLinear(sprite))
{
@@ -3358,7 +3358,7 @@ static void AnimMoveTrumpCardArc(struct Sprite* sprite)
}
-static void AnimMoveTrumpCard(struct Sprite* sprite)
+static void AnimMoveTrumpCard(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
@@ -3377,7 +3377,7 @@ static void AnimMoveTrumpCard(struct Sprite* sprite)
sprite->callback = AnimMoveTrumpCardArc;
}
-static void AnimMoveTrumpCardParticleAlive(struct Sprite* sprite)
+static void AnimMoveTrumpCardParticleAlive(struct Sprite *sprite)
{
if(sprite->data[0] > 0)
{
@@ -3407,7 +3407,7 @@ static void AnimMoveTrumpCardParticleAlive(struct Sprite* sprite)
}
}
-static void AnimMoveTrumpCardParticle(struct Sprite* sprite)
+static void AnimMoveTrumpCardParticle(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
@@ -3422,7 +3422,7 @@ static void AnimMoveTrumpCardParticle(struct Sprite* sprite)
sprite->callback = AnimMoveTrumpCardParticleAlive;
}
-static void AnimMoveAccupressureTransition(struct Sprite* sprite)
+static void AnimMoveAccupressureTransition(struct Sprite *sprite)
{
switch(sprite->data[5])
{
@@ -3442,7 +3442,7 @@ static void AnimMoveAccupressureTransition(struct Sprite* sprite)
}
}
-static void AnimMoveAccupressure(struct Sprite* sprite)
+static void AnimMoveAccupressure(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2];
@@ -3455,7 +3455,7 @@ static void AnimMoveAccupressure(struct Sprite* sprite)
sprite->callback = AnimMoveAccupressureTransition;
}
-static void AnimMoveWringOutCircle(struct Sprite* sprite)
+static void AnimMoveWringOutCircle(struct Sprite *sprite)
{
sprite->x2 = Cos(sprite->data[3], sprite->data[2]);
sprite->y2 = Sin(sprite->data[3], sprite->data[2]);
@@ -3483,7 +3483,7 @@ static void AnimMoveWringOutCircle(struct Sprite* sprite)
}
}
-static void AnimMoveWringOut(struct Sprite* sprite)
+static void AnimMoveWringOut(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
if(gBattleAnimArgs[5] == TRUE)
@@ -3505,7 +3505,7 @@ static void AnimMoveWringOut(struct Sprite* sprite)
// arg 3: target y pixel offset
// arg 4: duration
// arg 5: wave amplitude
-static void AnimLeechSeed(struct Sprite* sprite)
+static void AnimLeechSeed(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -3519,7 +3519,7 @@ static void AnimLeechSeed(struct Sprite* sprite)
sprite->callback = AnimLeechSeed_Step;
}
-static void AnimLeechSeed_Step(struct Sprite* sprite)
+static void AnimLeechSeed_Step(struct Sprite *sprite)
{
if (TranslateAnimHorizontalArc(sprite))
{
@@ -3530,7 +3530,7 @@ static void AnimLeechSeed_Step(struct Sprite* sprite)
}
}
-static void AnimLeechSeedSprouts(struct Sprite* sprite)
+static void AnimLeechSeedSprouts(struct Sprite *sprite)
{
sprite->invisible = FALSE;
StartSpriteAnim(sprite, 1);
@@ -3547,7 +3547,7 @@ static void AnimLeechSeedSprouts(struct Sprite* sprite)
// arg 2: initial wave offset
// arg 3: duration
// arg 4: blend (0 = off, 1 = on)
-void AnimSporeParticle(struct Sprite* sprite)
+void AnimSporeParticle(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
StartSpriteAnim(sprite, gBattleAnimArgs[4]);
@@ -3560,7 +3560,7 @@ void AnimSporeParticle(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimSporeParticle_Step(struct Sprite* sprite)
+static void AnimSporeParticle_Step(struct Sprite *sprite)
{
sprite->x2 = Sin(sprite->data[1], 32);
sprite->y2 = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8);
@@ -3609,7 +3609,7 @@ void AnimTask_SporeDoubleBattle(u8 taskId)
// arg 1: initial y pixel offset
// arg 2: target y pixel offset
// arg 3: duration
-void AnimPetalDanceBigFlower(struct Sprite* sprite)
+void AnimPetalDanceBigFlower(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, FALSE);
sprite->data[0] = gBattleAnimArgs[3];
@@ -3623,7 +3623,7 @@ void AnimPetalDanceBigFlower(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimPetalDanceBigFlower_Step(struct Sprite* sprite)
+static void AnimPetalDanceBigFlower_Step(struct Sprite *sprite)
{
if (!AnimTranslateLinear(sprite))
{
@@ -3647,7 +3647,7 @@ static void AnimPetalDanceBigFlower_Step(struct Sprite* sprite)
// arg 1: initial y pixel offset
// arg 2: target y pixel offset
// arg 3: duration
-void AnimPetalDanceSmallFlower(struct Sprite* sprite)
+void AnimPetalDanceSmallFlower(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[3];
@@ -3661,7 +3661,7 @@ void AnimPetalDanceSmallFlower(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimPetalDanceSmallFlower_Step(struct Sprite* sprite)
+static void AnimPetalDanceSmallFlower_Step(struct Sprite *sprite)
{
if (!AnimTranslateLinear(sprite))
{
@@ -3682,7 +3682,7 @@ static void AnimPetalDanceSmallFlower_Step(struct Sprite* sprite)
// arg 0: upward x delta per frame
// arg 1: upward y delta per frame
// arg 2: upward duration
-static void AnimRazorLeafParticle(struct Sprite* sprite)
+static void AnimRazorLeafParticle(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
@@ -3692,7 +3692,7 @@ static void AnimRazorLeafParticle(struct Sprite* sprite)
sprite->callback = AnimRazorLeafParticle_Step1;
}
-static void AnimRazorLeafParticle_Step1(struct Sprite* sprite)
+static void AnimRazorLeafParticle_Step1(struct Sprite *sprite)
{
if (!sprite->data[2])
{
@@ -3718,7 +3718,7 @@ static void AnimRazorLeafParticle_Step1(struct Sprite* sprite)
}
}
-static void AnimRazorLeafParticle_Step2(struct Sprite* sprite)
+static void AnimRazorLeafParticle_Step2(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker))
sprite->x2 = -Sin(sprite->data[0], 25);
@@ -3745,7 +3745,7 @@ static void AnimRazorLeafParticle_Step2(struct Sprite* sprite)
// arg 4: translation duration
// arg 5: wave amplitude
// arg 6: target between double battle opponents (boolean)
-void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
+void AnimTranslateLinearSingleSineWave(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -3774,7 +3774,7 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
sprite->callback = AnimTranslateLinearSingleSineWave_Step;
}
-static void AnimTranslateLinearSingleSineWave_Step(struct Sprite* sprite)
+static void AnimTranslateLinearSingleSineWave_Step(struct Sprite *sprite)
{
bool8 destroy = FALSE;
s16 a = sprite->data[0];
@@ -3812,10 +3812,10 @@ static void AnimTranslateLinearSingleSineWave_Step(struct Sprite* sprite)
// arg 2: wave period (higher means faster wave)
// arg 3: wave amplitude
// arg 4: speedup frame (particles move faster at the end of the animation)
-void AnimMoveTwisterParticle(struct Sprite* sprite)
+void AnimMoveTwisterParticle(struct Sprite *sprite)
{
if (IsDoubleBattle() == TRUE)
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y);
sprite->y += 32;
sprite->data[0] = gBattleAnimArgs[0];
@@ -3826,7 +3826,7 @@ void AnimMoveTwisterParticle(struct Sprite* sprite)
sprite->callback = AnimMoveTwisterParticle_Step;
}
-static void AnimMoveTwisterParticle_Step(struct Sprite* sprite)
+static void AnimMoveTwisterParticle_Step(struct Sprite *sprite)
{
if (sprite->data[1] == 0xFF)
{
@@ -3859,7 +3859,7 @@ static void AnimMoveTwisterParticle_Step(struct Sprite* sprite)
// arg 1: initial y pixel offset
// arg 2: affine anim num
// arg 3: num squeezes
-static void AnimConstrictBinding(struct Sprite* sprite)
+static void AnimConstrictBinding(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, FALSE);
sprite->affineAnimPaused = 1;
@@ -3869,7 +3869,7 @@ static void AnimConstrictBinding(struct Sprite* sprite)
sprite->callback = AnimConstrictBinding_Step1;
}
-static void AnimConstrictBinding_Step1(struct Sprite* sprite)
+static void AnimConstrictBinding_Step1(struct Sprite *sprite)
{
u8 spriteId;
@@ -3882,7 +3882,7 @@ static void AnimConstrictBinding_Step1(struct Sprite* sprite)
}
}
-static void AnimConstrictBinding_Step2(struct Sprite* sprite)
+static void AnimConstrictBinding_Step2(struct Sprite *sprite)
{
u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
if (!sprite->data[2])
@@ -3976,7 +3976,7 @@ static void AnimTask_DuplicateAndShrinkToPos_Step2(u8 taskId)
// Moves an orb from the target mon to the attacking mon.
// arg 0: initial x pixel offset
// arg 1: initial y pixel offset
-void AnimMimicOrb(struct Sprite* sprite)
+void AnimMimicOrb(struct Sprite *sprite)
{
switch (sprite->data[0])
{
@@ -4010,7 +4010,7 @@ void AnimMimicOrb(struct Sprite* sprite)
// arg 2: sprite subpriority offset
// arg 3: sprite anim num
// arg 4: duration
-static void AnimIngrainRoot(struct Sprite* sprite)
+static void AnimIngrainRoot(struct Sprite *sprite)
{
if (!sprite->data[0])
{
@@ -4058,7 +4058,7 @@ static void AnimFrenzyPlantRoot(struct Sprite *sprite)
sFrenzyPlantRootData.targetY = targetY;
}
-static void AnimRootFlickerOut(struct Sprite* sprite)
+static void AnimRootFlickerOut(struct Sprite *sprite)
{
if (++sprite->data[0] > (sprite->data[2] - 10))
sprite->invisible = sprite->data[0] % 2;
@@ -4073,7 +4073,7 @@ static void AnimRootFlickerOut(struct Sprite* sprite)
// arg 2: horizontal velocity
// arg 3: wave amplitude
// arg 4: duration
-static void AnimIngrainOrb(struct Sprite* sprite)
+static void AnimIngrainOrb(struct Sprite *sprite)
{
if (!sprite->data[0])
{
@@ -4091,7 +4091,7 @@ static void AnimIngrainOrb(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void InitItemBagData(struct Sprite* sprite, s16 c)
+static void InitItemBagData(struct Sprite *sprite, s16 c)
{
int a = (sprite->x << 8) | sprite->y;
int b = (sprite->data[6] << 8) | sprite->data[7];
@@ -4101,7 +4101,7 @@ static void InitItemBagData(struct Sprite* sprite, s16 c)
sprite->data[7] = c;
}
-bool8 moveAlongLinearPath(struct Sprite* sprite)
+bool8 moveAlongLinearPath(struct Sprite *sprite)
{
u16 xStartPos = (u8)(sprite->data[5] >> 8);
u16 yStartPos = (u8)sprite->data[5];
@@ -4132,7 +4132,7 @@ bool8 moveAlongLinearPath(struct Sprite* sprite)
return FALSE;
}
-static void AnimItemSteal_Step2(struct Sprite* sprite)
+static void AnimItemSteal_Step2(struct Sprite *sprite)
{
if (sprite->data[0] == 10)
StartSpriteAffineAnim(sprite, 1);
@@ -4142,7 +4142,7 @@ static void AnimItemSteal_Step2(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void AnimItemSteal_Step1(struct Sprite* sprite)
+static void AnimItemSteal_Step1(struct Sprite *sprite)
{
sprite->data[0] += sprite->data[3] * 128 / sprite->data[4];
if (sprite->data[0] >= 128)
@@ -4160,7 +4160,7 @@ static void AnimItemSteal_Step1(struct Sprite* sprite)
}
}
-static void AnimPresent(struct Sprite* sprite)
+static void AnimPresent(struct Sprite *sprite)
{
s16 targetX;
s16 targetY;
@@ -4186,7 +4186,7 @@ static void AnimPresent(struct Sprite* sprite)
sprite->callback = AnimItemSteal_Step1;
}
-static void AnimKnockOffOpponentsItem(struct Sprite* sprite)
+static void AnimKnockOffOpponentsItem(struct Sprite *sprite)
{
int zero;
sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]);
@@ -4206,7 +4206,7 @@ static void AnimKnockOffOpponentsItem(struct Sprite* sprite)
}
}
-static void AnimKnockOffItem(struct Sprite* sprite)
+static void AnimKnockOffItem(struct Sprite *sprite)
{
s16 targetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y);
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
@@ -4237,7 +4237,7 @@ static void AnimKnockOffItem(struct Sprite* sprite)
// arg 1: initial y pixel offset
// arg 2: vertical velocity
// arg 3: unused
-static void AnimPresentHealParticle(struct Sprite* sprite)
+static void AnimPresentHealParticle(struct Sprite *sprite)
{
if (!sprite->data[0])
{
@@ -4251,7 +4251,7 @@ static void AnimPresentHealParticle(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void AnimItemSteal(struct Sprite* sprite)
+static void AnimItemSteal(struct Sprite *sprite)
{
s16 attackerX;
s16 attackerY;
@@ -4277,7 +4277,7 @@ static void AnimItemSteal(struct Sprite* sprite)
sprite->callback = AnimItemSteal_Step3;
}
-static void AnimItemSteal_Step3(struct Sprite* sprite)
+static void AnimItemSteal_Step3(struct Sprite *sprite)
{
int zero;
sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]);
@@ -4304,7 +4304,7 @@ static void AnimItemSteal_Step3(struct Sprite* sprite)
// Moves a bag in a circular motion.
// arg 0: y position
// arg 1: initial wave offset
-static void AnimTrickBag(struct Sprite* sprite)
+static void AnimTrickBag(struct Sprite *sprite)
{
int a;
int b;
@@ -4341,7 +4341,7 @@ static void AnimTrickBag(struct Sprite* sprite)
}
}
-static void AnimTrickBag_Step1(struct Sprite* sprite)
+static void AnimTrickBag_Step1(struct Sprite *sprite)
{
switch (sprite->data[3])
{
@@ -4371,7 +4371,7 @@ static void AnimTrickBag_Step1(struct Sprite* sprite)
}
}
-static void AnimTrickBag_Step2(struct Sprite* sprite)
+static void AnimTrickBag_Step2(struct Sprite *sprite)
{
if (sprite->data[2] == gTrickBagCoordinates[sprite->data[0]][1])
{
@@ -4401,7 +4401,7 @@ static void AnimTrickBag_Step2(struct Sprite* sprite)
}
}
-static void AnimTrickBag_Step3(struct Sprite* sprite)
+static void AnimTrickBag_Step3(struct Sprite *sprite)
{
if (sprite->data[0] > 20)
DestroyAnimSprite(sprite);
@@ -4438,8 +4438,8 @@ void AnimTask_LeafBlade(u8 taskId)
static void AnimTask_LeafBlade_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
- struct Sprite* sprite = &gSprites[task->data[2]];
+ struct Task *task = &gTasks[taskId];
+ struct Sprite *sprite = &gSprites[task->data[2]];
int a = task->data[0];
switch (a)
{
@@ -4621,7 +4621,7 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
}
}
-static s16 LeafBladeGetPosFactor(struct Sprite* sprite)
+static s16 LeafBladeGetPosFactor(struct Sprite *sprite)
{
s16 var = 8;
if (sprite->data[4] < sprite->y)
@@ -4630,7 +4630,7 @@ static s16 LeafBladeGetPosFactor(struct Sprite* sprite)
return var;
}
-static void AnimTask_LeafBlade_Step2(struct Task* task, u8 taskId)
+static void AnimTask_LeafBlade_Step2(struct Task *task, u8 taskId)
{
task->data[14]++;
if (task->data[14] > 0)
@@ -4656,7 +4656,7 @@ static void AnimTask_LeafBlade_Step2(struct Task* task, u8 taskId)
}
}
-static void AnimTask_LeafBlade_Step2_Callback(struct Sprite* sprite)
+static void AnimTask_LeafBlade_Step2_Callback(struct Sprite *sprite)
{
sprite->data[0]++;
if (sprite->data[0] > 1)
@@ -4672,7 +4672,7 @@ static void AnimTask_LeafBlade_Step2_Callback(struct Sprite* sprite)
}
}
-static void AnimFlyingParticle(struct Sprite* sprite)
+static void AnimFlyingParticle(struct Sprite *sprite)
{
u8 battler;
if (!gBattleAnimArgs[6])
@@ -4720,7 +4720,7 @@ static void AnimFlyingParticle(struct Sprite* sprite)
sprite->callback = AnimFlyingParticle_Step;
}
-static void AnimFlyingParticle_Step(struct Sprite* sprite)
+static void AnimFlyingParticle_Step(struct Sprite *sprite)
{
int a = sprite->data[7];
sprite->data[7]++;
@@ -4743,7 +4743,7 @@ static void AnimFlyingParticle_Step(struct Sprite* sprite)
void AnimTask_CycleMagicalLeafPal(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
case 0:
@@ -4771,7 +4771,7 @@ void AnimTask_CycleMagicalLeafPal(u8 taskId)
DestroyAnimVisualTask(taskId);
}
-void AnimNeedleArmSpike(struct Sprite* sprite)
+void AnimNeedleArmSpike(struct Sprite *sprite)
{
u8 a;
u8 b;
@@ -4822,12 +4822,12 @@ void AnimNeedleArmSpike(struct Sprite* sprite)
if (IsContest())
c -= 0x8000;
- TrySetSpriteRotScale(sprite, 0, 0x100, 0x100, c);
+ TrySetSpriteRotScale(sprite, FALSE, 0x100, 0x100, c);
sprite->callback = AnimNeedleArmSpike_Step;
}
}
-void AnimNeedleArmSpike_Step(struct Sprite* sprite)
+void AnimNeedleArmSpike_Step(struct Sprite *sprite)
{
if (sprite->data[0])
{
@@ -4843,13 +4843,13 @@ void AnimNeedleArmSpike_Step(struct Sprite* sprite)
}
}
-static void AnimWhipHit_WaitEnd(struct Sprite* sprite)
+static void AnimWhipHit_WaitEnd(struct Sprite *sprite)
{
if (sprite->animEnded)
DestroyAnimSprite(sprite);
}
-static void AnimSlidingHit(struct Sprite* sprite)
+static void AnimSlidingHit(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
@@ -4866,7 +4866,7 @@ static void AnimSlidingHit(struct Sprite* sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
-static void AnimWhipHit(struct Sprite* sprite)
+static void AnimWhipHit(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
StartSpriteAnim(sprite, 1);
@@ -4876,7 +4876,7 @@ static void AnimWhipHit(struct Sprite* sprite)
sprite->y += gBattleAnimArgs[1];
}
-static void AnimFlickeringPunch(struct Sprite* sprite)
+static void AnimFlickeringPunch(struct Sprite *sprite)
{
sprite->x += gBattleAnimArgs[0];
sprite->y += gBattleAnimArgs[1];
@@ -4894,7 +4894,7 @@ static void AnimFlickeringPunch(struct Sprite* sprite)
// arg 0: initial x pixel offset
// arg 1: initial y pixel offset
// arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
-void AnimCuttingSlice(struct Sprite* sprite)
+void AnimCuttingSlice(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y);
@@ -4920,7 +4920,7 @@ void AnimCuttingSlice(struct Sprite* sprite)
sprite->data[1] = -sprite->data[1];
}
-static void AnimAirCutterSlice(struct Sprite* sprite)
+static void AnimAirCutterSlice(struct Sprite *sprite)
{
u8 x, y;
switch (gBattleAnimArgs[3])
@@ -4969,7 +4969,7 @@ static void AnimAirCutterSlice(struct Sprite* sprite)
sprite->data[1] = -sprite->data[1];
}
-static void AnimSlice_Step(struct Sprite* sprite)
+static void AnimSlice_Step(struct Sprite *sprite)
{
sprite->data[3] += sprite->data[1];
sprite->data[4] += sprite->data[2];
@@ -4990,7 +4990,7 @@ static void AnimSlice_Step(struct Sprite* sprite)
}
}
-static void UnusedFlickerAnim(struct Sprite* sprite)
+static void UnusedFlickerAnim(struct Sprite *sprite)
{
if (sprite->data[2] > 1)
{
@@ -5023,7 +5023,7 @@ static void UnusedFlickerAnim(struct Sprite* sprite)
}
}
-static void AnimCirclingMusicNote(struct Sprite* sprite)
+static void AnimCirclingMusicNote(struct Sprite *sprite)
{
sprite->data[0] = gBattleAnimArgs[2];
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -5039,7 +5039,7 @@ static void AnimCirclingMusicNote(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
+static void AnimCirclingMusicNote_Step(struct Sprite *sprite)
{
sprite->x2 = Cos(sprite->data[0], 100);
sprite->y2 = Sin(sprite->data[0], 20);
@@ -5056,7 +5056,7 @@ static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void AnimProtect(struct Sprite* sprite)
+static void AnimProtect(struct Sprite *sprite)
{
if (IsContest())
gBattleAnimArgs[1] += 8;
@@ -5119,7 +5119,7 @@ static void AnimProtect_Step(struct Sprite *sprite)
}
}
-static void AnimMilkBottle(struct Sprite* sprite)
+static void AnimMilkBottle(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + 0xFFE8;
@@ -5135,7 +5135,7 @@ static void AnimMilkBottle(struct Sprite* sprite)
sprite->callback = AnimMilkBottle_Step1;
}
-static void AnimMilkBottle_Step1(struct Sprite* sprite)
+static void AnimMilkBottle_Step1(struct Sprite *sprite)
{
switch (sprite->data[0])
{
@@ -5208,7 +5208,7 @@ static void AnimMilkBottle_Step1(struct Sprite* sprite)
}
}
-static void AnimMilkBottle_Step2(struct Sprite* sprite, int unk1, int unk2)
+static void AnimMilkBottle_Step2(struct Sprite *sprite, int unk1, int unk2)
{
if (sprite->data[3] <= 11)
sprite->data[4] += 2;
@@ -5229,7 +5229,7 @@ static void AnimMilkBottle_Step2(struct Sprite* sprite, int unk1, int unk2)
sprite->data[3] = 0;
}
-void AnimGrantingStars(struct Sprite* sprite)
+void AnimGrantingStars(struct Sprite *sprite)
{
if (!gBattleAnimArgs[2])
SetSpriteCoordsToAnimAttackerCoords(sprite);
@@ -5243,7 +5243,7 @@ void AnimGrantingStars(struct Sprite* sprite)
sprite->callback = TranslateSpriteLinearFixedPoint;
}
-static void AnimSparkingStars(struct Sprite* sprite)
+static void AnimSparkingStars(struct Sprite *sprite)
{
u8 battler;
if (!gBattleAnimArgs[2])
@@ -5280,7 +5280,7 @@ static void AnimSparkingStars(struct Sprite* sprite)
sprite->callback = TranslateSpriteLinearFixedPoint;
}
-static void AnimBubbleBurst(struct Sprite* sprite)
+static void AnimBubbleBurst(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
@@ -5298,7 +5298,7 @@ static void AnimBubbleBurst(struct Sprite* sprite)
sprite->callback = AnimBubbleBurst_Step;
}
-static void AnimBubbleBurst_Step(struct Sprite* sprite)
+static void AnimBubbleBurst_Step(struct Sprite *sprite)
{
if (++sprite->data[0] > 30)
{
@@ -5311,7 +5311,7 @@ static void AnimBubbleBurst_Step(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void AnimSleepLetterZ(struct Sprite* sprite)
+static void AnimSleepLetterZ(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
@@ -5331,7 +5331,7 @@ static void AnimSleepLetterZ(struct Sprite* sprite)
sprite->callback = AnimSleepLetterZ_Step;
}
-static void AnimSleepLetterZ_Step(struct Sprite* sprite)
+static void AnimSleepLetterZ_Step(struct Sprite *sprite)
{
sprite->y2 = -(sprite->data[0] / 0x28);
sprite->x2 = sprite->data[4] / 10;
@@ -5341,7 +5341,7 @@ static void AnimSleepLetterZ_Step(struct Sprite* sprite)
DestroySpriteAndMatrix(sprite);
}
-static void AnimLockOnTarget(struct Sprite* sprite)
+static void AnimLockOnTarget(struct Sprite *sprite)
{
sprite->x -= 32;
sprite->y -= 32;
@@ -5350,7 +5350,7 @@ static void AnimLockOnTarget(struct Sprite* sprite)
StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step1);
}
-static void AnimLockOnTarget_Step1(struct Sprite* sprite)
+static void AnimLockOnTarget_Step1(struct Sprite *sprite)
{
switch (sprite->data[5] & 1)
{
@@ -5377,7 +5377,7 @@ static void AnimLockOnTarget_Step1(struct Sprite* sprite)
sprite->data[5] ^= 1;
}
-static void AnimLockOnTarget_Step2(struct Sprite* sprite)
+static void AnimLockOnTarget_Step2(struct Sprite *sprite)
{
if ((sprite->data[5] >> 8) == 4)
{
@@ -5391,7 +5391,7 @@ static void AnimLockOnTarget_Step2(struct Sprite* sprite)
}
}
-static void AnimLockOnTarget_Step3(struct Sprite* sprite)
+static void AnimLockOnTarget_Step3(struct Sprite *sprite)
{
s16 a;
s16 b;
@@ -5437,7 +5437,7 @@ static void AnimLockOnTarget_Step3(struct Sprite* sprite)
}
}
-static void AnimLockOnTarget_Step4(struct Sprite* sprite)
+static void AnimLockOnTarget_Step4(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
@@ -5464,7 +5464,7 @@ static void AnimLockOnTarget_Step4(struct Sprite* sprite)
}
}
-static void AnimLockOnTarget_Step5(struct Sprite* sprite)
+static void AnimLockOnTarget_Step5(struct Sprite *sprite)
{
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
@@ -5474,7 +5474,7 @@ static void AnimLockOnTarget_Step5(struct Sprite* sprite)
}
}
-static void AnimLockOnTarget_Step6(struct Sprite* sprite)
+static void AnimLockOnTarget_Step6(struct Sprite *sprite)
{
if (sprite->data[0] % 3 == 0)
{
@@ -5487,7 +5487,7 @@ static void AnimLockOnTarget_Step6(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void AnimLockOnMoveTarget(struct Sprite* sprite)
+static void AnimLockOnMoveTarget(struct Sprite *sprite)
{
sprite->oam.affineParam = gBattleAnimArgs[0];
if ((s16)sprite->oam.affineParam == 1)
@@ -5519,7 +5519,7 @@ static void AnimLockOnMoveTarget(struct Sprite* sprite)
sprite->callback(sprite);
}
-static void AnimBowMon(struct Sprite* sprite)
+static void AnimBowMon(struct Sprite *sprite)
{
sprite->invisible = TRUE;
sprite->data[0] = 0;
@@ -5540,7 +5540,7 @@ static void AnimBowMon(struct Sprite* sprite)
}
}
-static void AnimBowMon_Step1(struct Sprite* sprite)
+static void AnimBowMon_Step1(struct Sprite *sprite)
{
sprite->data[0] = 6;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2;
@@ -5550,7 +5550,7 @@ static void AnimBowMon_Step1(struct Sprite* sprite)
sprite->callback = TranslateSpriteLinearById;
}
-static void AnimBowMon_Step1_Callback(struct Sprite* sprite)
+static void AnimBowMon_Step1_Callback(struct Sprite *sprite)
{
if (sprite->data[0] == 0)
{
@@ -5570,7 +5570,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite* sprite)
}
}
-static void AnimBowMon_Step2(struct Sprite* sprite)
+static void AnimBowMon_Step2(struct Sprite *sprite)
{
sprite->data[0] = 4;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3;
@@ -5580,7 +5580,7 @@ static void AnimBowMon_Step2(struct Sprite* sprite)
sprite->callback = TranslateSpriteLinearById;
}
-static void AnimBowMon_Step3(struct Sprite* sprite)
+static void AnimBowMon_Step3(struct Sprite *sprite)
{
if (++sprite->data[0] > 8)
{
@@ -5589,7 +5589,7 @@ static void AnimBowMon_Step3(struct Sprite* sprite)
}
}
-static void AnimBowMon_Step3_Callback(struct Sprite* sprite)
+static void AnimBowMon_Step3_Callback(struct Sprite *sprite)
{
if (sprite->data[0] == 0)
{
@@ -5617,7 +5617,7 @@ static void AnimBowMon_Step3_Callback(struct Sprite* sprite)
}
}
-static void AnimBowMon_Step4(struct Sprite* sprite)
+static void AnimBowMon_Step4(struct Sprite *sprite)
{
DestroyAnimSprite(sprite);
}
@@ -5796,7 +5796,7 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
static void AnimTask_SkullBashPositionReset(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (task->data[3])
{
task->data[4] -= task->data[5];
@@ -5811,7 +5811,7 @@ static void AnimTask_SkullBashPositionReset(u8 taskId)
}
}
-static void AnimSlashSlice(struct Sprite* sprite)
+static void AnimSlashSlice(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
@@ -5830,7 +5830,7 @@ static void AnimSlashSlice(struct Sprite* sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds;
}
-static void AnimFalseSwipeSlice(struct Sprite* sprite)
+static void AnimFalseSwipeSlice(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + 0xFFD0;
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
@@ -5838,7 +5838,7 @@ static void AnimFalseSwipeSlice(struct Sprite* sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds;
}
-static void AnimFalseSwipePositionedSlice(struct Sprite* sprite)
+static void AnimFalseSwipePositionedSlice(struct Sprite *sprite)
{
sprite->x = sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + 0xFFD0 + gBattleAnimArgs[0];
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
@@ -5848,7 +5848,7 @@ static void AnimFalseSwipePositionedSlice(struct Sprite* sprite)
sprite->callback = AnimFalseSwipeSlice_Step3;
}
-static void AnimFalseSwipeSlice_Step1(struct Sprite* sprite)
+static void AnimFalseSwipeSlice_Step1(struct Sprite *sprite)
{
if (++sprite->data[0] > 8)
{
@@ -5860,14 +5860,14 @@ static void AnimFalseSwipeSlice_Step1(struct Sprite* sprite)
}
}
-static void AnimFalseSwipeSlice_Step2(struct Sprite* sprite)
+static void AnimFalseSwipeSlice_Step2(struct Sprite *sprite)
{
sprite->data[0] = 0;
sprite->data[1] = 0;
sprite->callback = AnimFalseSwipeSlice_Step3;
}
-static void AnimFalseSwipeSlice_Step3(struct Sprite* sprite)
+static void AnimFalseSwipeSlice_Step3(struct Sprite *sprite)
{
if (++sprite->data[0] > 1)
{
@@ -5878,7 +5878,7 @@ static void AnimFalseSwipeSlice_Step3(struct Sprite* sprite)
}
}
-void AnimEndureEnergy(struct Sprite* sprite)
+void AnimEndureEnergy(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
@@ -5896,7 +5896,7 @@ void AnimEndureEnergy(struct Sprite* sprite)
sprite->callback = AnimEndureEnergy_Step;
}
-static void AnimEndureEnergy_Step(struct Sprite* sprite)
+static void AnimEndureEnergy_Step(struct Sprite *sprite)
{
if (++sprite->data[0] > sprite->data[1])
{
@@ -5909,7 +5909,7 @@ static void AnimEndureEnergy_Step(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-static void AnimSharpenSphere(struct Sprite* sprite)
+static void AnimSharpenSphere(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) - 12;
@@ -5922,7 +5922,7 @@ static void AnimSharpenSphere(struct Sprite* sprite)
sprite->callback = AnimSharpenSphere_Step;
}
-static void AnimSharpenSphere_Step(struct Sprite* sprite)
+static void AnimSharpenSphere_Step(struct Sprite *sprite)
{
if (++sprite->data[0] >= sprite->data[1])
{
@@ -5946,7 +5946,7 @@ static void AnimSharpenSphere_Step(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
-void AnimConversion(struct Sprite* sprite)
+void AnimConversion(struct Sprite *sprite)
{
if (sprite->data[0] == 0)
{
@@ -5986,7 +5986,7 @@ void AnimTask_ConversionAlphaBlend(u8 taskId)
}
}
-static void AnimConversion2(struct Sprite* sprite)
+static void AnimConversion2(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, FALSE);
sprite->animPaused = 1;
@@ -5994,7 +5994,7 @@ static void AnimConversion2(struct Sprite* sprite)
sprite->callback = AnimConversion2_Step;
}
-static void AnimConversion2_Step(struct Sprite* sprite)
+static void AnimConversion2_Step(struct Sprite *sprite)
{
if (sprite->data[0])
{
@@ -6049,7 +6049,7 @@ static void AnimTask_ShowBattlersHealthbox(u8 taskId)
DestroyAnimVisualTask(taskId);
}
-static void AnimMoon(struct Sprite* sprite)
+static void AnimMoon(struct Sprite *sprite)
{
if (IsContest())
{
@@ -6068,13 +6068,13 @@ static void AnimMoon(struct Sprite* sprite)
sprite->callback = AnimMoon_Step;
}
-static void AnimMoon_Step(struct Sprite* sprite)
+static void AnimMoon_Step(struct Sprite *sprite)
{
if (sprite->data[0])
DestroyAnimSprite(sprite);
}
-static void AnimMoonlightSparkle(struct Sprite* sprite)
+static void AnimMoonlightSparkle(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
sprite->y = gBattleAnimArgs[1];
@@ -6086,7 +6086,7 @@ static void AnimMoonlightSparkle(struct Sprite* sprite)
sprite->callback = AnimMoonlightSparkle_Step;
}
-static void AnimMoonlightSparkle_Step(struct Sprite* sprite)
+static void AnimMoonlightSparkle_Step(struct Sprite *sprite)
{
if (++sprite->data[1] > 1)
{
@@ -6121,7 +6121,7 @@ void AnimTask_MoonlightEndFade(u8 taskId)
gTasks[taskId].data[9] = 15;
b = GetBattleMonSpritePalettesMask(1, 1, 1, 1);
c = a | b;
- StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c);
+ StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void *)c);
b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON));
d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE);
BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31));
@@ -6131,7 +6131,7 @@ void AnimTask_MoonlightEndFade(u8 taskId)
static void AnimTask_MoonlightEndFade_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
case 0:
@@ -6207,7 +6207,7 @@ static void AnimTask_MoonlightEndFade_Step(u8 taskId)
}
}
-static void AnimHornHit(struct Sprite* sprite)
+static void AnimHornHit(struct Sprite *sprite)
{
if (gBattleAnimArgs[2] < 2)
gBattleAnimArgs[2] = 2;
@@ -6254,7 +6254,7 @@ static void AnimHornHit(struct Sprite* sprite)
sprite->callback = AnimHornHit_Step;
}
-static void AnimHornHit_Step(struct Sprite* sprite)
+static void AnimHornHit_Step(struct Sprite *sprite)
{
sprite->data[2] += sprite->data[3];
sprite->data[4] += sprite->data[5];
@@ -6276,7 +6276,7 @@ void AnimTask_DoubleTeam(u8 taskId)
int obj;
u16 r3;
u16 r4;
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[1] = AllocSpritePalette(ANIM_TAG_BENT_SPOON);
r3 = (task->data[1] * 16) + 0x100;
@@ -6307,7 +6307,7 @@ void AnimTask_DoubleTeam(u8 taskId)
static void AnimTask_DoubleTeam_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (!task->data[3])
{
if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1)
@@ -6320,7 +6320,7 @@ static void AnimTask_DoubleTeam_Step(u8 taskId)
}
}
-static void AnimDoubleTeam(struct Sprite* sprite)
+static void AnimDoubleTeam(struct Sprite *sprite)
{
if (++sprite->data[3] > 1)
{
@@ -6342,7 +6342,7 @@ static void AnimDoubleTeam(struct Sprite* sprite)
}
}
-static void AnimSuperFang(struct Sprite* sprite)
+static void AnimSuperFang(struct Sprite *sprite)
{
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
sprite->callback = RunStoredCallbackWhenAnimEnds;
@@ -6394,7 +6394,7 @@ void AnimTask_MusicNotesClearRainbowBlend(u8 taskId)
#define sVelocX data[6]
#define sVelocY data[7]
-static void AnimWavyMusicNotes(struct Sprite* sprite)
+static void AnimWavyMusicNotes(struct Sprite *sprite)
{
u8 index;
u8 x, y;
@@ -6423,7 +6423,7 @@ static void AnimWavyMusicNotes(struct Sprite* sprite)
sprite->callback = AnimWavyMusicNotes_Step;
}
-static void AnimWavyMusicNotes_CalcVelocity(s16 x, s16 y, s16* velocX, s16* velocY, s8 xSpeedFactor)
+static void AnimWavyMusicNotes_CalcVelocity(s16 x, s16 y, s16 *velocX, s16 *velocY, s8 xSpeedFactor)
{
int x2;
int time;
@@ -6439,7 +6439,7 @@ static void AnimWavyMusicNotes_CalcVelocity(s16 x, s16 y, s16* velocX, s16* velo
*velocY = (y * 256) / time;
}
-static void AnimWavyMusicNotes_Step(struct Sprite* sprite)
+static void AnimWavyMusicNotes_Step(struct Sprite *sprite)
{
s16 y, trigIdx;
u8 index;
@@ -6472,7 +6472,7 @@ static void AnimWavyMusicNotes_Step(struct Sprite* sprite)
}
}
-static void AnimFlyingMusicNotes(struct Sprite* sprite)
+static void AnimFlyingMusicNotes(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[1] *= -1;
@@ -6489,7 +6489,7 @@ static void AnimFlyingMusicNotes(struct Sprite* sprite)
sprite->callback = AnimFlyingMusicNotes_Step;
}
-static void AnimFlyingMusicNotes_Step(struct Sprite* sprite)
+static void AnimFlyingMusicNotes_Step(struct Sprite *sprite)
{
sprite->data[4] += sprite->data[6];
sprite->data[5] += sprite->data[7];
@@ -6508,7 +6508,7 @@ static void AnimFlyingMusicNotes_Step(struct Sprite* sprite)
DestroySpriteAndMatrix(sprite);
}
-static void AnimBellyDrumHand(struct Sprite* sprite)
+static void AnimBellyDrumHand(struct Sprite *sprite)
{
s16 a;
if (gBattleAnimArgs[0] == 1)
@@ -6528,7 +6528,7 @@ static void AnimBellyDrumHand(struct Sprite* sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
-void AnimSlowFlyingMusicNotes(struct Sprite* sprite)
+void AnimSlowFlyingMusicNotes(struct Sprite *sprite)
{
s16 xDiff;
u8 index;
@@ -6550,7 +6550,7 @@ void AnimSlowFlyingMusicNotes(struct Sprite* sprite)
sprite->callback = AnimSlowFlyingMusicNotes_Step;
}
-static void AnimSlowFlyingMusicNotes_Step(struct Sprite* sprite)
+static void AnimSlowFlyingMusicNotes_Step(struct Sprite *sprite)
{
if (AnimTranslateLinear(sprite) == 0)
{
@@ -6569,7 +6569,7 @@ static void AnimSlowFlyingMusicNotes_Step(struct Sprite* sprite)
}
}
-void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite)
+void SetSpriteNextToMonHead(u8 battler, struct Sprite *sprite)
{
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
@@ -6579,7 +6579,7 @@ void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite)
sprite->y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) - (s16)GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_HEIGHT) / 4;
}
-void AnimThoughtBubble(struct Sprite* sprite)
+void AnimThoughtBubble(struct Sprite *sprite)
{
u8 animNum;
u8 battler;
@@ -6597,7 +6597,7 @@ void AnimThoughtBubble(struct Sprite* sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds;
}
-static void AnimThoughtBubble_Step(struct Sprite* sprite)
+static void AnimThoughtBubble_Step(struct Sprite *sprite)
{
if (--sprite->data[0] == 0)
{
@@ -6607,7 +6607,7 @@ static void AnimThoughtBubble_Step(struct Sprite* sprite)
}
}
-void AnimMetronomeFinger(struct Sprite* sprite)
+void AnimMetronomeFinger(struct Sprite *sprite)
{
u8 battler;
if (gBattleAnimArgs[0] == 0)
@@ -6621,7 +6621,7 @@ void AnimMetronomeFinger(struct Sprite* sprite)
sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
}
-static void AnimMetronomeFinger_Step(struct Sprite* sprite)
+static void AnimMetronomeFinger_Step(struct Sprite *sprite)
{
if (++sprite->data[0] > 16)
{
@@ -6631,7 +6631,7 @@ static void AnimMetronomeFinger_Step(struct Sprite* sprite)
}
}
-void AnimFollowMeFinger(struct Sprite* sprite)
+void AnimFollowMeFinger(struct Sprite *sprite)
{
u8 battler;
if (gBattleAnimArgs[0] == 0)
@@ -6653,13 +6653,13 @@ void AnimFollowMeFinger(struct Sprite* sprite)
sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
}
-static void AnimFollowMeFinger_Step1(struct Sprite* sprite)
+static void AnimFollowMeFinger_Step1(struct Sprite *sprite)
{
if (++sprite->data[4] > 12)
sprite->callback = AnimFollowMeFinger_Step2;
}
-static void AnimFollowMeFinger_Step2(struct Sprite* sprite)
+static void AnimFollowMeFinger_Step2(struct Sprite *sprite)
{
s16 x1, x2;
@@ -6689,7 +6689,7 @@ static void AnimFollowMeFinger_Step2(struct Sprite* sprite)
sprite->x2 = (x1 >> 3) + (x2 >> 1);
}
-static void AnimTauntFinger(struct Sprite* sprite)
+static void AnimTauntFinger(struct Sprite *sprite)
{
u8 battler;
if (gBattleAnimArgs[0] == 0)
@@ -6712,7 +6712,7 @@ static void AnimTauntFinger(struct Sprite* sprite)
sprite->callback = AnimTauntFinger_Step1;
}
-static void AnimTauntFinger_Step1(struct Sprite* sprite)
+static void AnimTauntFinger_Step1(struct Sprite *sprite)
{
if (++sprite->data[1] > 10)
{
@@ -6723,7 +6723,7 @@ static void AnimTauntFinger_Step1(struct Sprite* sprite)
}
}
-static void AnimTauntFinger_Step2(struct Sprite* sprite)
+static void AnimTauntFinger_Step2(struct Sprite *sprite)
{
if (++sprite->data[1] > 5)
DestroyAnimSprite(sprite);
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index f1ed8a4732..b919a54c45 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1570,7 +1570,7 @@ static void AnimAirWaveProjectile_Step2(struct Sprite *sprite)
static void AnimAirWaveProjectile_Step1(struct Sprite *sprite)
{
- struct Task* task = &gTasks[sprite->data[7]];
+ struct Task *task = &gTasks[sprite->data[7]];
if (sprite->data[0] > task->data[5])
{
sprite->data[5] += sprite->data[3];
@@ -1607,7 +1607,7 @@ static void AnimAirWaveProjectile(struct Sprite *sprite)
s16 b;
s16 c;
- struct Task* task = &gTasks[sprite->data[7]];
+ struct Task *task = &gTasks[sprite->data[7]];
sprite->data[1] += (-2 & task->data[7]);
sprite->data[2] += (-2 & task->data[8]);
if (1 & task->data[7])
@@ -1720,7 +1720,7 @@ void AnimTask_AirCutterProjectile(u8 taskId)
if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
&& IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimTarget)))
{
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &targetX, &targetY);
+ SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &targetX, &targetY);
}
else
{
@@ -1874,7 +1874,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
{
int i;
u16 rand;
- s16* ptr;
+ s16 *ptr;
PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(63));
sprite->x += sprite->x2;
sprite->y += sprite->y2;
@@ -2071,7 +2071,7 @@ static void AnimTask_GrowAndGrayscale_Step(u8 taskId)
// No args.
void AnimTask_Minimize(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId;
PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL);
@@ -2087,7 +2087,7 @@ void AnimTask_Minimize(u8 taskId)
static void AnimTask_Minimize_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[1])
{
case 0:
@@ -2151,7 +2151,7 @@ static void AnimTask_Minimize_Step(u8 taskId)
}
}
-static void CreateMinimizeSprite(struct Task* task, u8 taskId)
+static void CreateMinimizeSprite(struct Task *task, u8 taskId)
{
u16 matrixNum;
s16 spriteId = CloneBattlerSpriteWithBlend(ANIM_ATTACKER);
@@ -2196,7 +2196,7 @@ static void ClonedMinizeSprite_Step(struct Sprite *sprite)
// arg 1: num hops
void AnimTask_Splash(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (gBattleAnimArgs[1] == 0)
{
DestroyAnimVisualTask(taskId);
@@ -2216,7 +2216,7 @@ void AnimTask_Splash(u8 taskId)
static void AnimTask_Splash_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[1])
{
case 0:
@@ -2270,7 +2270,7 @@ static void AnimTask_Splash_Step(u8 taskId)
// No args.
void AnimTask_GrowAndShrink(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
PrepareAffineAnimInTaskData(task, spriteId, gGrowAndShrinkAffineAnimCmds);
task->func = AnimTask_GrowAndShrink_Step;
@@ -2278,7 +2278,7 @@ void AnimTask_GrowAndShrink(u8 taskId)
static void AnimTask_GrowAndShrink_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (!RunAffineAnimFromTaskData(task))
DestroyAnimVisualTask(taskId);
}
@@ -2337,7 +2337,7 @@ void AnimAngerMark(struct Sprite *sprite)
// left/right movements
void AnimTask_ThrashMoveMonHorizontal(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId;
task->data[1] = 0;
@@ -2347,7 +2347,7 @@ void AnimTask_ThrashMoveMonHorizontal(u8 taskId)
static void AnimTask_ThrashMoveMonHorizontal_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (!RunAffineAnimFromTaskData(task))
DestroyAnimVisualTask(taskId);
}
@@ -2355,7 +2355,7 @@ static void AnimTask_ThrashMoveMonHorizontal_Step(u8 taskId)
// up/down movements
void AnimTask_ThrashMoveMonVertical(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[1] = 0;
task->data[2] = 4;
@@ -2374,7 +2374,7 @@ void AnimTask_ThrashMoveMonVertical(u8 taskId)
static void AnimTask_ThrashMoveMonVertical_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (++task->data[7] > 2)
{
task->data[7] = 0;
@@ -2425,7 +2425,7 @@ static void AnimTask_ThrashMoveMonVertical_Step(u8 taskId)
void AnimTask_SketchDrawMon(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
struct ScanlineEffectParams params;
s16 i;
@@ -2466,7 +2466,7 @@ void AnimTask_SketchDrawMon(u8 taskId)
static void AnimTask_SketchDrawMon_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[4])
{
@@ -2827,7 +2827,7 @@ static void AnimSoftBoiledEgg_Step4_Callback(struct Sprite *sprite)
// Used by Extremespeed
void AnimTask_AttackerStretchAndDisappear(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
task->data[0] = spriteId;
PrepareAffineAnimInTaskData(task, spriteId, gStretchAttackerAffineAnimCmds);
@@ -2836,7 +2836,7 @@ void AnimTask_AttackerStretchAndDisappear(u8 taskId)
static void AnimTask_AttackerStretchAndDisappear_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (!RunAffineAnimFromTaskData(task))
{
gSprites[task->data[0]].y2 = 0;
@@ -2847,7 +2847,7 @@ static void AnimTask_AttackerStretchAndDisappear_Step(u8 taskId)
void AnimTask_ExtremeSpeedImpact(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
task->data[0] = 0;
task->data[1] = 0;
task->data[2] = 0;
@@ -2870,7 +2870,7 @@ void AnimTask_ExtremeSpeedImpact(u8 taskId)
static void AnimTask_ExtremeSpeedImpact_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
@@ -2916,7 +2916,7 @@ static void AnimTask_ExtremeSpeedImpact_Step(u8 taskId)
void AnimTask_ExtremeSpeedMonReappear(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
task->data[0] = 0;
task->data[1] = 0;
task->data[2] = 0;
@@ -2930,7 +2930,7 @@ void AnimTask_ExtremeSpeedMonReappear(u8 taskId)
static void AnimTask_ExtremeSpeedMonReappear_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
if (task->data[0] == 0 && ++task->data[1] > task->data[4])
{
task->data[1] = 0;
@@ -2958,7 +2958,7 @@ static void AnimTask_ExtremeSpeedMonReappear_Step(u8 taskId)
void AnimTask_SpeedDust(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
task->data[0] = 0;
task->data[1] = 4;
task->data[2] = 0;
@@ -2976,7 +2976,7 @@ void AnimTask_SpeedDust(u8 taskId)
static void AnimTask_SpeedDust_Step(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->data[8])
{
case 0:
@@ -3756,7 +3756,7 @@ static void AnimPerishSongMusicNote2(struct Sprite *sprite)
}
if (++sprite->data[0] == sprite->data[1])
- SetGrayscaleOrOriginalPalette(sprite->oam.paletteNum + 16, 0);
+ SetGrayscaleOrOriginalPalette(sprite->oam.paletteNum + 16, FALSE);
if (sprite->data[0] == sprite->data[1] + 80)
DestroyAnimSprite(sprite);
@@ -3843,7 +3843,7 @@ static void AnimGuardRing(struct Sprite *sprite)
{
if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
{
- SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimAttacker, FALSE, &sprite->x, &sprite->y);
sprite->y += 40;
StartSpriteAffineAnim(sprite, 1);
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 428602c133..0274c588ee 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2770,7 +2770,7 @@ static void AnimWeakFrustrationAngerMark(struct Sprite *sprite)
{
if (sprite->data[0] == 0)
{
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
sprite->data[0]++;
}
else if (sprite->data[0]++ > 20)
@@ -4911,7 +4911,7 @@ void AnimTask_MonToSubstitute(u8 taskId)
}
else
{
- LoadBattleMonGfxAndAnimate(gBattleAnimAttacker, 0, spriteId);
+ LoadBattleMonGfxAndAnimate(gBattleAnimAttacker, FALSE, spriteId);
if (IsContest())
{
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteContest;
diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c
index 1ec887c9e1..b4a950310f 100644
--- a/src/battle_anim_electric.c
+++ b/src/battle_anim_electric.c
@@ -664,7 +664,7 @@ void AnimSparkElectricity(struct Sprite *sprite)
void AnimZapCannonSpark(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[3];
sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c
index 050aa1a136..ca1a04402c 100644
--- a/src/battle_anim_fight.c
+++ b/src/battle_anim_fight.c
@@ -526,7 +526,7 @@ void AnimBasicFistOrFoot(struct Sprite *sprite)
StartSpriteAnim(sprite, gBattleAnimArgs[4]);
if (gBattleAnimArgs[3] == 0)
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
else
InitSpritePosToAnimTarget(sprite, TRUE);
@@ -1036,7 +1036,7 @@ static void AnimArmThrustHit(struct Sprite *sprite)
void AnimRevengeScratch(struct Sprite *sprite)
{
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
else
InitSpritePosToAnimTarget(sprite, FALSE);
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index e898d9cc45..bfbc0a697b 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -731,7 +731,7 @@ static void AnimBurnFlame(struct Sprite *sprite)
//void AnimFireRing(struct Sprite *sprite)
void AnimFireRing(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[7] = gBattleAnimArgs[2];
sprite->data[0] = 0;
@@ -818,7 +818,7 @@ void AnimFireCross(struct Sprite *sprite)
void AnimFireSpiralOutward(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[1] = gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[3];
@@ -1184,7 +1184,7 @@ void AnimWillOWispOrb(struct Sprite *sprite)
switch (sprite->data[0])
{
case 0:
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
sprite->data[7] = gBattleAnimArgs[2];
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c
index d70114e106..fb5f2a1bf9 100644
--- a/src/battle_anim_flying.c
+++ b/src/battle_anim_flying.c
@@ -451,7 +451,7 @@ void AnimAirWaveCrescent(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]);
}
sprite->data[2] = sprite->data[2] + gBattleAnimArgs[2];
@@ -591,7 +591,7 @@ static void AnimFallingFeather(struct Sprite *sprite)
data->unkA = (gBattleAnimArgs[2] >> 8) & 0xFF;
data->unk4 = gBattleAnimArgs[3];
data->unk6 = gBattleAnimArgs[4];
- *(u16*)(data->unkC) = gBattleAnimArgs[5];
+ *(u16 *)(data->unkC) = gBattleAnimArgs[5];
if (data->unk2 >= 64 && data->unk2 <= 191)
{
@@ -902,7 +902,7 @@ static void AnimWhirlwindLine(struct Sprite * sprite)
u8 mult;
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
else
InitSpritePosToAnimTarget(sprite, FALSE);
@@ -967,7 +967,7 @@ static void AnimBounceBallShrink(struct Sprite *sprite)
switch (sprite->data[0])
{
case 0:
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = TRUE;
++sprite->data[0];
break;
@@ -1005,7 +1005,7 @@ void AnimBounceBallLand(struct Sprite *sprite)
static void AnimDiveBall(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3];
sprite->callback = AnimDiveBall_Step1;
@@ -1063,7 +1063,7 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
sprite->data[1] = 0x200;
- TrySetSpriteRotScale(sprite, 0, 0x100, sprite->data[1], 0);
+ TrySetSpriteRotScale(sprite, FALSE, 0x100, sprite->data[1], 0);
sprite->data[0]++;
break;
case 1:
@@ -1074,7 +1074,7 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
sprite->data[2]++;
- TrySetSpriteRotScale(sprite, 0, 0x100, sprite->data[1], 0);
+ TrySetSpriteRotScale(sprite, FALSE, 0x100, sprite->data[1], 0);
matrixNum = sprite->oam.matrixNum;
@@ -1198,7 +1198,7 @@ static void AnimSkyAttackBird(struct Sprite *sprite)
rotation = ArcTan2Neg(posx - sprite->x, posy - sprite->y);
rotation -= 16384;
- TrySetSpriteRotScale(sprite, 1, 0x100, 0x100, rotation);
+ TrySetSpriteRotScale(sprite, TRUE, 0x100, 0x100, rotation);
sprite->callback = AnimSkyAttackBird_Step;
}
diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c
index eb270cf40e..f14b35ccb2 100644
--- a/src/battle_anim_ghost.c
+++ b/src/battle_anim_ghost.c
@@ -1109,7 +1109,7 @@ static void AnimCurseNail(struct Sprite *sprite)
s16 xDelta;
s16 xDelta2;
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
xDelta = 24;
diff --git a/src/battle_anim_ground.c b/src/battle_anim_ground.c
index fc943aaf54..184107d488 100644
--- a/src/battle_anim_ground.c
+++ b/src/battle_anim_ground.c
@@ -223,7 +223,7 @@ void AnimDirtScatter(struct Sprite *sprite)
u8 targetXPos, targetYPos;
s16 xOffset, yOffset;
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
targetXPos = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_X_2);
targetYPos = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c
index db61ef5a04..e4a7805a85 100644
--- a/src/battle_anim_ice.c
+++ b/src/battle_anim_ice.c
@@ -714,7 +714,7 @@ void AnimIceEffectParticle(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -759,7 +759,7 @@ static void AnimSwirlingSnowball(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]);
}
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -879,7 +879,7 @@ void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]);
}
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -950,7 +950,7 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -988,7 +988,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimAttacker, FALSE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
sprite->x -= gBattleAnimArgs[0];
else
@@ -1007,7 +1007,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
sprite->x -= gBattleAnimArgs[0];
else
@@ -1580,7 +1580,7 @@ static void InitIceBallAnim(struct Sprite *sprite)
animNum = 4;
StartSpriteAffineAnim(sprite, animNum);
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c
index c5c35ef6fa..ba4ede0171 100644
--- a/src/battle_anim_mon_movement.c
+++ b/src/battle_anim_mon_movement.c
@@ -14,7 +14,7 @@ static void AnimTask_TranslateMonElliptical_Step(u8 taskId);
static void DoHorizontalLunge(struct Sprite *sprite);
static void ReverseHorizontalLungeDirection(struct Sprite *sprite);
static void DoVerticalDip(struct Sprite *sprite);
-static void ReverseVerticalDipDirection(struct Sprite* sprite);
+static void ReverseVerticalDipDirection(struct Sprite *sprite);
static void SlideMonToOriginalPos(struct Sprite *sprite);
static void SlideMonToOriginalPos_Step(struct Sprite *sprite);
static void SlideMonToOffset(struct Sprite *sprite);
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index 244e2318cc..21a3ed9027 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -412,7 +412,7 @@ u8 GetAnimBattlerSpriteId(u8 animBattler)
}
}
-void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*callback)(struct Sprite*))
+void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*callback)(struct Sprite *))
{
sprite->data[6] = (u32)(callback) & 0xffff;
sprite->data[7] = (u32)(callback) >> 16;
@@ -1622,7 +1622,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
void AnimThrowProjectile(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c
index 96faf23dd7..b8304f124f 100644
--- a/src/battle_anim_new.c
+++ b/src/battle_anim_new.c
@@ -20,29 +20,29 @@
#include "constants/items.h"
// function declarations
-static void SpriteCB_SpriteToCentreOfSide(struct Sprite* sprite);
+static void SpriteCB_SpriteToCentreOfSide(struct Sprite *sprite);
static void SpriteCB_SpriteOnMonForDuration(struct Sprite *sprite);
static void SpriteCB_ToxicThreadWrap(struct Sprite *sprite);
static void SpriteCB_GrowingSuperpower(struct Sprite *sprite);
-static void SpriteCB_CentredSpiderWeb(struct Sprite* sprite);
-static void SpriteCB_CoreEnforcerHits(struct Sprite* sprite);
-static void SpriteCB_CoreEnforcerBeam(struct Sprite* sprite);
-static void SpriteCB_TranslateAnimSpriteToTargetMonLocationDoubles(struct Sprite* sprite);
+static void SpriteCB_CentredSpiderWeb(struct Sprite *sprite);
+static void SpriteCB_CoreEnforcerHits(struct Sprite *sprite);
+static void SpriteCB_CoreEnforcerBeam(struct Sprite *sprite);
+static void SpriteCB_TranslateAnimSpriteToTargetMonLocationDoubles(struct Sprite *sprite);
static void SpriteCB_FallingObject(struct Sprite *sprite);
static void SpriteCB_FallingObjectStep(struct Sprite *sprite);
-static void SpriteCB_SunsteelStrikeRings(struct Sprite* sprite);
+static void SpriteCB_SunsteelStrikeRings(struct Sprite *sprite);
static void SpriteCB_MoongeistCharge(struct Sprite *sprite);
static void SpriteCB_MindBlownBall(struct Sprite *sprite);
static void AnimMindBlownBallStep(struct Sprite *sprite);
-static void SpriteCB_MindBlownExplosion(struct Sprite* sprite);
+static void SpriteCB_MindBlownExplosion(struct Sprite *sprite);
static void SpriteCB_LockingJaw(struct Sprite *sprite);
static void SpriteCB_LockingJawStep(struct Sprite *sprite);
static void SpriteCB_LockingJawFinish(struct Sprite *sprite);
static void SpriteCB_LeftRightSlice(struct Sprite *sprite);
static void SpriteCB_LeftRightSliceStep1(struct Sprite *sprite);
static void SpriteCB_LeftRightSliceStep0(struct Sprite *sprite);
-static void SpriteCB_PyroBallRockBounce(struct Sprite* sprite);
-static void SpriteCB_PyroBallLaunch(struct Sprite* sprite);
+static void SpriteCB_PyroBallRockBounce(struct Sprite *sprite);
+static void SpriteCB_PyroBallLaunch(struct Sprite *sprite);
static void SpriteCB_AcidLaunchSingleTarget(struct Sprite *sprite);
static void SpriteCB_AcidDripSingleTarget(struct Sprite *sprite);
static void SpriteCB_WaterDroplet(struct Sprite *sprite);
@@ -50,14 +50,14 @@ static void SpriteCB_WaterDropletDrip(struct Sprite *sprite);
static void SpriteCB_WaterDropletDrop(struct Sprite *sprite);
static void SpriteCB_AnimSpriteOnSelectedMonPos(struct Sprite *sprite);
static void SpriteCB_SurroundingRing(struct Sprite *sprite);
-static void SpriteCB_PhotonGeyserBeam(struct Sprite* sprite);
-static void SpriteCB_BeamUpStep(struct Sprite* sprite);
-static void SpriteCB_CentredElectricity(struct Sprite* sprite);
+static void SpriteCB_PhotonGeyserBeam(struct Sprite *sprite);
+static void SpriteCB_BeamUpStep(struct Sprite *sprite);
+static void SpriteCB_CentredElectricity(struct Sprite *sprite);
static void AnimSkyDropBallUp(struct Sprite *sprite);
-static void SpriteCB_SearingShotRock(struct Sprite* sprite);
+static void SpriteCB_SearingShotRock(struct Sprite *sprite);
static void AnimHappyHourCoinShower(struct Sprite *sprite);
-static void SpriteCB_Geyser(struct Sprite* sprite);
-static void SpriteCB_GeyserTarget(struct Sprite* sprite);
+static void SpriteCB_Geyser(struct Sprite *sprite);
+static void SpriteCB_GeyserTarget(struct Sprite *sprite);
static void SpriteCB_TwinkleOnBattler(struct Sprite *sprite);
static void AnimBlastBurnTargetPlume_Step1(struct Sprite *sprite);
static void AnimBlastBurnTargetPlume(struct Sprite *sprite);
@@ -6609,7 +6609,7 @@ static u8 GetProperCentredCoord(u8 battler, u8 coordType)
return GetBattlerSpriteCoord(battler, coordType);
}
-static void InitSpritePosToGivenTarget(struct Sprite* sprite, u8 target)
+static void InitSpritePosToGivenTarget(struct Sprite *sprite, u8 target)
{
sprite->x = GetBattlerSpriteCoord2(target, BATTLER_COORD_X);
sprite->y = GetBattlerSpriteCoord2(target, BATTLER_COORD_Y);
@@ -6780,7 +6780,7 @@ static void AnimBlastBurnTargetPlume_Step1(struct Sprite *sprite)
DestroySpriteAndMatrix(sprite);
}
-static void SpriteCB_SpriteToCentreOfSide(struct Sprite* sprite)
+static void SpriteCB_SpriteToCentreOfSide(struct Sprite *sprite)
{
bool8 var;
@@ -6882,7 +6882,7 @@ static void SpriteCB_GrowingSuperpower(struct Sprite *sprite)
sprite->callback = AnimTranslateLinear_WithFollowup;
}
-static void SpriteCB_CentredSpiderWeb(struct Sprite* sprite)
+static void SpriteCB_CentredSpiderWeb(struct Sprite *sprite)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
InitSpritePosToAnimTargetsCentre(sprite, FALSE);
@@ -6892,7 +6892,7 @@ static void SpriteCB_CentredSpiderWeb(struct Sprite* sprite)
sprite->callback = AnimSpiderWeb;
}
-static void SpriteCB_CoreEnforcerHits(struct Sprite* sprite)
+static void SpriteCB_CoreEnforcerHits(struct Sprite *sprite)
{
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
@@ -6915,7 +6915,7 @@ static void SpriteCB_CoreEnforcerHits(struct Sprite* sprite)
sprite->callback = AnimFlashingHitSplat_Step;
}
-static void SpriteCB_CoreEnforcerBeam(struct Sprite* sprite)
+static void SpriteCB_CoreEnforcerBeam(struct Sprite *sprite)
{
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
{
@@ -6940,7 +6940,7 @@ static void SpriteCB_CoreEnforcerBeam(struct Sprite* sprite)
}
}
-static void SpriteCB_TranslateAnimSpriteToTargetMonLocationDoubles(struct Sprite* sprite)
+static void SpriteCB_TranslateAnimSpriteToTargetMonLocationDoubles(struct Sprite *sprite)
{
bool8 v1;
u8 target;
@@ -7028,7 +7028,7 @@ static void SpriteCB_FallingObjectStep(struct Sprite *sprite)
}
}
-static void SpriteCB_SunsteelStrikeRings(struct Sprite* sprite)
+static void SpriteCB_SunsteelStrikeRings(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
@@ -7137,7 +7137,7 @@ static void AnimMindBlownBallStep(struct Sprite *sprite)
}
}
-static void SpriteCB_MindBlownExplosion(struct Sprite* sprite)
+static void SpriteCB_MindBlownExplosion(struct Sprite *sprite)
{
u8 a;
u8 b;
@@ -7180,7 +7180,7 @@ static void SpriteCB_MindBlownExplosion(struct Sprite* sprite)
}
}
-void SpriteCB_RandomCentredHits(struct Sprite* sprite)
+void SpriteCB_RandomCentredHits(struct Sprite *sprite)
{
if (gBattleAnimArgs[1] == -1)
gBattleAnimArgs[1] = Random() & 3;
@@ -7271,7 +7271,7 @@ static void SpriteCB_LeftRightSliceStep0(struct Sprite *sprite)
#define sVerticalTime sprite->data[0]
#define sHorizontalTime sprite->data[1]
#define sMovingBackHorizontally sprite->data[2]
-static void SpriteCB_PyroBallRockBounceStep(struct Sprite* sprite)
+static void SpriteCB_PyroBallRockBounceStep(struct Sprite *sprite)
{
s8 initialVerticalVelocity;
s8 initialHorizontalVelocity;
@@ -7310,7 +7310,7 @@ static void SpriteCB_PyroBallRockBounceStep(struct Sprite* sprite)
sHorizontalTime++; //Move right to left
}
-static void InitSpritePositionForPyroBall(struct Sprite* sprite)
+static void InitSpritePositionForPyroBall(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, 0);
sprite->y += 20; //Move closer to attacker's feet
@@ -7320,7 +7320,7 @@ static void InitSpritePositionForPyroBall(struct Sprite* sprite)
}
-static void SpriteCB_PyroBallRockBounce(struct Sprite* sprite)
+static void SpriteCB_PyroBallRockBounce(struct Sprite *sprite)
{
InitSpritePositionForPyroBall(sprite);
sprite->callback = SpriteCB_PyroBallRockBounceStep;
@@ -7336,7 +7336,7 @@ static void SpriteCB_PyroBallRockBounce(struct Sprite* sprite)
//arg 3: target y pixel offset
//arg 4: duration
//arg 5: wave amplitude
-static void SpriteCB_PyroBallLaunch(struct Sprite* sprite)
+static void SpriteCB_PyroBallLaunch(struct Sprite *sprite)
{
InitSpritePositionForPyroBall(sprite);
@@ -7474,7 +7474,7 @@ static void SpriteCB_SurroundingRing(struct Sprite *sprite)
//arg 3: duration
//arg 4: Anim num
//arg 5: affine anim start delay
-static void SpriteCB_PhotonGeyserBeam(struct Sprite* sprite)
+static void SpriteCB_PhotonGeyserBeam(struct Sprite *sprite)
{
u8 target = LoadBattleAnimTarget(2);
@@ -7490,7 +7490,7 @@ static void SpriteCB_PhotonGeyserBeam(struct Sprite* sprite)
}
}
//Animates the beam of light
-static void SpriteCB_BeamUpStep(struct Sprite* sprite)
+static void SpriteCB_BeamUpStep(struct Sprite *sprite)
{
if (sprite->data[1]-- == 0)
StartSpriteAffineAnim(sprite, 1);
@@ -7499,7 +7499,7 @@ static void SpriteCB_BeamUpStep(struct Sprite* sprite)
DestroySpriteAndMatrix(sprite);
}
-static void SpriteCB_CentredElectricity(struct Sprite* sprite)
+static void SpriteCB_CentredElectricity(struct Sprite *sprite)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
InitSpritePosToAnimTargetsCentre(sprite, FALSE);
@@ -7527,7 +7527,7 @@ static void AnimSkyDropBallUp(struct Sprite *sprite)
gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = TRUE;
}
-static void SpriteCB_SearingShotRock(struct Sprite* sprite)
+static void SpriteCB_SearingShotRock(struct Sprite *sprite)
{
u8 target = LoadBattleAnimTarget(4);
@@ -7569,7 +7569,7 @@ static void AnimHappyHourCoinShower(struct Sprite *sprite)
//arg 0: null
//arg 1: initial x pixel offset
//arg 2: initial y pixel offset
-static void SpriteCB_Geyser(struct Sprite* sprite)
+static void SpriteCB_Geyser(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
@@ -7582,7 +7582,7 @@ static void SpriteCB_Geyser(struct Sprite* sprite)
//arg 0: null
//arg 1: initial x pixel offset
//arg 2: initial y pixel offset
-static void SpriteCB_GeyserTarget(struct Sprite* sprite)
+static void SpriteCB_GeyserTarget(struct Sprite *sprite)
{
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1];
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2];
@@ -7629,7 +7629,7 @@ void AnimTask_TwinkleTackleLaunchStep(u8 taskId)
u16 rotation;
s16 xScale, yScale;
struct Task* task = &gTasks[taskId];
- struct Sprite* sprite = &gSprites[task->tSpriteId];
+ struct Sprite *sprite = &gSprites[task->tSpriteId];
if (task->tTimer > task->tAnimLengthTime)
{
@@ -7712,12 +7712,9 @@ void AnimTask_GetTimeOfDay(u8 taskId)
void AnimTask_GetLycanrocForm(u8 taskId)
{
-
- #ifdef POKEMON_EXPANSION
if (GetMonData(GetIllusionMonPtr(gBattleAnimAttacker), MON_DATA_SPECIES) == SPECIES_LYCANROC_MIDNIGHT)
gBattleAnimArgs[0] = 1;
else
- #endif
gBattleAnimArgs[0] = 0;
gBattleAnimArgs[0] = 0;
@@ -7782,7 +7779,7 @@ void AnimTask_SquishTarget(u8 taskId)
task->func = AnimTask_WaitAffineAnim;
}
-void CoreEnforcerLoadBeamTarget(struct Sprite* sprite)
+void CoreEnforcerLoadBeamTarget(struct Sprite *sprite)
{
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = sprite->x;
diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c
index a9e1b8526d..f43dd6e9b0 100644
--- a/src/battle_anim_normal.c
+++ b/src/battle_anim_normal.c
@@ -305,7 +305,7 @@ const struct SpriteTemplate gPersistHitSplatSpriteTemplate =
.callback = AnimHitSplatPersistent,
};
-static void AnimMovePowerSwapGuardSwapWait(struct Sprite* sprite)
+static void AnimMovePowerSwapGuardSwapWait(struct Sprite *sprite)
{
if (TranslateAnimHorizontalArc(sprite))
DestroyAnimSprite(sprite);
@@ -317,7 +317,7 @@ static void AnimMovePowerSwapGuardSwapWait(struct Sprite* sprite)
// arg 3: from user to target / target to user
// arg 4: wave period
// arg 5: wave amplitude
-static void AnimMovePowerSwapGuardSwap(struct Sprite* sprite)
+static void AnimMovePowerSwapGuardSwap(struct Sprite *sprite)
{
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
if(gBattleAnimArgs[3] == 0)
@@ -1030,7 +1030,7 @@ void AnimHitSplatBasic(struct Sprite *sprite)
{
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
else
InitSpritePosToAnimTarget(sprite, TRUE);
@@ -1043,7 +1043,7 @@ static void AnimHitSplatPersistent(struct Sprite *sprite)
{
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
else
InitSpritePosToAnimTarget(sprite, TRUE);
@@ -1093,7 +1093,7 @@ void AnimHitSplatOnMonEdge(struct Sprite *sprite)
void AnimCrossImpact(struct Sprite *sprite)
{
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
else
InitSpritePosToAnimTarget(sprite, TRUE);
@@ -1106,7 +1106,7 @@ void AnimFlashingHitSplat(struct Sprite *sprite)
{
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
else
InitSpritePosToAnimTarget(sprite, TRUE);
diff --git a/src/battle_anim_poison.c b/src/battle_anim_poison.c
index 00fa95d320..8905f5c475 100644
--- a/src/battle_anim_poison.c
+++ b/src/battle_anim_poison.c
@@ -403,7 +403,7 @@ static void AnimSludgeProjectile(struct Sprite *sprite)
if (!gBattleAnimArgs[3])
StartSpriteAnim(sprite, 2);
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
@@ -427,9 +427,9 @@ static void AnimAcidPoisonBubble(struct Sprite *sprite)
if (!gBattleAnimArgs[3])
StartSpriteAnim(sprite, 2);
- InitSpritePosToAnimAttacker(sprite, 1);
+ InitSpritePosToAnimAttacker(sprite, TRUE);
if (gBattleAnimArgs[6])
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &l1, &l2);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &l1, &l2);
else
l1 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2), l2 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c
index 52a669cfea..d3ae318df5 100644
--- a/src/battle_anim_rock.c
+++ b/src/battle_anim_rock.c
@@ -393,7 +393,7 @@ static void AnimStealthRockStep2(struct Sprite *sprite)
void AnimFallingRock(struct Sprite *sprite)
{
if (gBattleAnimArgs[3] != 0)
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
+ SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y);
sprite->x += gBattleAnimArgs[0];
sprite->y += 14;
@@ -459,7 +459,7 @@ void AnimRockFragment(struct Sprite *sprite)
void AnimParticleInVortex(struct Sprite *sprite)
{
if (gBattleAnimArgs[6] == ANIM_ATTACKER)
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
else
InitSpritePosToAnimTarget(sprite, FALSE);
@@ -640,7 +640,7 @@ void AnimFlyingSandCrescent(struct Sprite *sprite)
void AnimRaiseSprite(struct Sprite *sprite)
{
StartSpriteAnim(sprite, gBattleAnimArgs[4]);
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
sprite->data[0] = gBattleAnimArgs[3];
sprite->data[2] = sprite->x;
diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c
index c7be8d41c4..e395be5f84 100644
--- a/src/battle_anim_smokescreen.c
+++ b/src/battle_anim_smokescreen.c
@@ -61,7 +61,7 @@ static const struct OamData sOamData_SmokescreenImpact =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -134,7 +134,7 @@ static const struct OamData sOamData_EnemyShadow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c
index c5cb114930..9226a9dab8 100755
--- a/src/battle_anim_throw.c
+++ b/src/battle_anim_throw.c
@@ -733,7 +733,7 @@ static void AnimTask_UnusedLevelUpHealthBox_Step(u8 taskId)
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[12], 16 - gTasks[taskId].data[12]));
if (gTasks[taskId].data[12] == 0)
{
- ResetBattleAnimBg(0);
+ ResetBattleAnimBg(FALSE);
gBattle_WIN0H = 0;
gBattle_WIN0V = 0;
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
@@ -2673,7 +2673,7 @@ void AnimTask_FreePokeblockGfx(u8 taskId)
static void SpriteCB_PokeBlock_Throw(struct Sprite *sprite)
{
- InitSpritePosToAnimAttacker(sprite, 0);
+ InitSpritePosToAnimAttacker(sprite, FALSE);
sprite->sDuration = 30;
sprite->sTargetX = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), BATTLER_COORD_X) + gBattleAnimArgs[2];
sprite->sTargetY = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), BATTLER_COORD_Y) + gBattleAnimArgs[3];
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index 9c927593fa..1462807a3e 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -27,7 +27,7 @@ static void StartBlendAnimSpriteColor(u8, u32);
static void AnimTask_BlendSpriteColor_Step2(u8);
static void AnimTask_HardwarePaletteFade_Step(u8);
static void AnimTask_TraceMonBlended_Step(u8);
-static void AnimMonTrace(struct Sprite*);
+static void AnimMonTrace(struct Sprite *);
static void AnimTask_DrawFallingWhiteLinesOnAttacker_Step(u8);
static void StatsChangeAnimation_Step1(u8);
static void StatsChangeAnimation_Step2(u8);
@@ -357,7 +357,7 @@ static void AnimTask_DrawFallingWhiteLinesOnAttacker_Step(u8 taskId)
gBattle_BG1_Y += 64;
if (++gTasks[taskId].data[11] == 4)
{
- ResetBattleAnimBg(0);
+ ResetBattleAnimBg(FALSE);
gBattle_WIN0H = 0;
gBattle_WIN0V = 0;
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR
@@ -569,7 +569,7 @@ static void StatsChangeAnimation_Step3(u8 taskId)
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[12], 16 - gTasks[taskId].data[12]));
if (gTasks[taskId].data[12] == 0)
{
- ResetBattleAnimBg(0);
+ ResetBattleAnimBg(FALSE);
gTasks[taskId].data[15]++;
}
}
@@ -870,7 +870,7 @@ static void UpdateMonScrollingBgMask(u8 taskId)
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[12], 16 - gTasks[taskId].data[12]));
if (gTasks[taskId].data[12] == 0)
{
- ResetBattleAnimBg(0);
+ ResetBattleAnimBg(FALSE);
gBattle_WIN0H = 0;
gBattle_WIN0V = 0;
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR
diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c
index e18214a0a1..48d1dc6d6a 100644
--- a/src/battle_anim_water.c
+++ b/src/battle_anim_water.c
@@ -48,11 +48,11 @@ static void AnimTask_SurfWaveScanlineEffect(u8);
static void AnimTask_WaterSpoutLaunch_Step(u8);
static void AnimTask_WaterSpoutRain_Step(u8);
static u8 GetWaterSpoutPowerForAnim(void);
-static void CreateWaterSpoutLaunchDroplets(struct Task*, u8);
-static void CreateWaterSpoutRainDroplet(struct Task*, u8);
+static void CreateWaterSpoutLaunchDroplets(struct Task *, u8);
+static void CreateWaterSpoutRainDroplet(struct Task *, u8);
static void AnimTask_WaterSport_Step(u8);
-static void CreateWaterSportDroplet(struct Task*);
-static void CreateWaterPulseRingBubbles(struct Sprite*, int, int);
+static void CreateWaterSportDroplet(struct Task *);
+static void CreateWaterPulseRingBubbles(struct Sprite *, int, int);
static void AnimAquaTail(struct Sprite *sprite);
static void AnimKnockOffAquaTail(struct Sprite *sprite);
static void AnimKnockOffAquaTailStep(struct Sprite *sprite);
diff --git a/src/battle_arena.c b/src/battle_arena.c
index e5f8161c4f..e0a2c5e748 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -35,12 +35,28 @@ static void SaveArenaChallenge(void);
static void SetArenaPrize(void);
static void GiveArenaPrize(void);
static void BufferArenaOpponentName(void);
-static void SpriteCb_JudgmentIcon(struct Sprite *sprite);
+static void SpriteCB_JudgmentIcon(struct Sprite *sprite);
static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler);
-static const s8 sMindRatings[] =
+#define JUDGEMENT_STATE_FINISHED 8
+
+#define TAG_JUDGEMENT_ICON 1000
+
+enum {
+ ANIM_ICON_X, // Player lost
+ ANIM_ICON_TRIANGLE, // Tie
+ ANIM_ICON_CIRCLE, // Player won
+ ANIM_ICON_LINE, // Line segment for separating the score total at the bottom
+};
+
+// This table holds the number of points to add to the 'mind' score for each move.
+// All moves with power != 0 give 1 point, with the following exceptions:
+// - Counter, Mirror Coat, and Bide give 0 points
+// - Fake Out subtracts 1 point
+// All moves with power == 0 give 0 points, with the following exceptions:
+// - Protect, Detect, and Endure subtract 1 point
+static const s8 sMindRatings[MOVES_COUNT] =
{
- [MOVE_NONE] = 0,
[MOVE_POUND] = 1,
[MOVE_KARATE_CHOP] = 1,
[MOVE_DOUBLE_SLAP] = 1,
@@ -54,11 +70,9 @@ static const s8 sMindRatings[] =
[MOVE_VISE_GRIP] = 1,
[MOVE_GUILLOTINE] = 1,
[MOVE_RAZOR_WIND] = 1,
- [MOVE_SWORDS_DANCE] = 0,
[MOVE_CUT] = 1,
[MOVE_GUST] = 1,
[MOVE_WING_ATTACK] = 1,
- [MOVE_WHIRLWIND] = 0,
[MOVE_FLY] = 1,
[MOVE_BIND] = 1,
[MOVE_SLAM] = 1,
@@ -68,7 +82,6 @@ static const s8 sMindRatings[] =
[MOVE_MEGA_KICK] = 1,
[MOVE_JUMP_KICK] = 1,
[MOVE_ROLLING_KICK] = 1,
- [MOVE_SAND_ATTACK] = 0,
[MOVE_HEADBUTT] = 1,
[MOVE_HORN_ATTACK] = 1,
[MOVE_FURY_ATTACK] = 1,
@@ -79,22 +92,14 @@ static const s8 sMindRatings[] =
[MOVE_TAKE_DOWN] = 1,
[MOVE_THRASH] = 1,
[MOVE_DOUBLE_EDGE] = 1,
- [MOVE_TAIL_WHIP] = 0,
[MOVE_POISON_STING] = 1,
[MOVE_TWINEEDLE] = 1,
[MOVE_PIN_MISSILE] = 1,
- [MOVE_LEER] = 0,
[MOVE_BITE] = 1,
- [MOVE_GROWL] = 0,
- [MOVE_ROAR] = 0,
- [MOVE_SING] = 0,
- [MOVE_SUPERSONIC] = 0,
[MOVE_SONIC_BOOM] = 1,
- [MOVE_DISABLE] = 0,
[MOVE_ACID] = 1,
[MOVE_EMBER] = 1,
[MOVE_FLAMETHROWER] = 1,
- [MOVE_MIST] = 0,
[MOVE_WATER_GUN] = 1,
[MOVE_HYDRO_PUMP] = 1,
[MOVE_SURF] = 1,
@@ -108,58 +113,27 @@ static const s8 sMindRatings[] =
[MOVE_DRILL_PECK] = 1,
[MOVE_SUBMISSION] = 1,
[MOVE_LOW_KICK] = 1,
- [MOVE_COUNTER] = 0,
[MOVE_SEISMIC_TOSS] = 1,
[MOVE_STRENGTH] = 1,
[MOVE_ABSORB] = 1,
[MOVE_MEGA_DRAIN] = 1,
- [MOVE_LEECH_SEED] = 0,
- [MOVE_GROWTH] = 0,
[MOVE_RAZOR_LEAF] = 1,
[MOVE_SOLAR_BEAM] = 1,
- [MOVE_POISON_POWDER] = 0,
- [MOVE_STUN_SPORE] = 0,
- [MOVE_SLEEP_POWDER] = 0,
[MOVE_PETAL_DANCE] = 1,
- [MOVE_STRING_SHOT] = 0,
[MOVE_DRAGON_RAGE] = 1,
[MOVE_FIRE_SPIN] = 1,
[MOVE_THUNDER_SHOCK] = 1,
[MOVE_THUNDERBOLT] = 1,
- [MOVE_THUNDER_WAVE] = 0,
[MOVE_THUNDER] = 1,
[MOVE_ROCK_THROW] = 1,
[MOVE_EARTHQUAKE] = 1,
[MOVE_FISSURE] = 1,
[MOVE_DIG] = 1,
- [MOVE_TOXIC] = 0,
[MOVE_CONFUSION] = 1,
[MOVE_PSYCHIC] = 1,
- [MOVE_HYPNOSIS] = 0,
- [MOVE_MEDITATE] = 0,
- [MOVE_AGILITY] = 0,
[MOVE_QUICK_ATTACK] = 1,
[MOVE_RAGE] = 1,
- [MOVE_TELEPORT] = 0,
[MOVE_NIGHT_SHADE] = 1,
- [MOVE_MIMIC] = 0,
- [MOVE_SCREECH] = 0,
- [MOVE_DOUBLE_TEAM] = 0,
- [MOVE_RECOVER] = 0,
- [MOVE_HARDEN] = 0,
- [MOVE_MINIMIZE] = 0,
- [MOVE_SMOKESCREEN] = 0,
- [MOVE_CONFUSE_RAY] = 0,
- [MOVE_WITHDRAW] = 0,
- [MOVE_DEFENSE_CURL] = 0,
- [MOVE_BARRIER] = 0,
- [MOVE_LIGHT_SCREEN] = 0,
- [MOVE_HAZE] = 0,
- [MOVE_REFLECT] = 0,
- [MOVE_FOCUS_ENERGY] = 0,
- [MOVE_BIDE] = 0,
- [MOVE_METRONOME] = 0,
- [MOVE_MIRROR_MOVE] = 0,
[MOVE_SELF_DESTRUCT] = 1,
[MOVE_EGG_BOMB] = 1,
[MOVE_LICK] = 1,
@@ -173,118 +147,67 @@ static const s8 sMindRatings[] =
[MOVE_SKULL_BASH] = 1,
[MOVE_SPIKE_CANNON] = 1,
[MOVE_CONSTRICT] = 1,
- [MOVE_AMNESIA] = 0,
- [MOVE_KINESIS] = 0,
- [MOVE_SOFT_BOILED] = 0,
[MOVE_HIGH_JUMP_KICK] = 1,
- [MOVE_GLARE] = 0,
[MOVE_DREAM_EATER] = 1,
- [MOVE_POISON_GAS] = 0,
[MOVE_BARRAGE] = 1,
[MOVE_LEECH_LIFE] = 1,
- [MOVE_LOVELY_KISS] = 0,
[MOVE_SKY_ATTACK] = 1,
- [MOVE_TRANSFORM] = 0,
[MOVE_BUBBLE] = 1,
[MOVE_DIZZY_PUNCH] = 1,
- [MOVE_SPORE] = 0,
- [MOVE_FLASH] = 0,
[MOVE_PSYWAVE] = 1,
- [MOVE_SPLASH] = 0,
- [MOVE_ACID_ARMOR] = 0,
[MOVE_CRABHAMMER] = 1,
[MOVE_EXPLOSION] = 1,
[MOVE_FURY_SWIPES] = 1,
[MOVE_BONEMERANG] = 1,
- [MOVE_REST] = 0,
[MOVE_ROCK_SLIDE] = 1,
[MOVE_HYPER_FANG] = 1,
- [MOVE_SHARPEN] = 0,
- [MOVE_CONVERSION] = 0,
[MOVE_TRI_ATTACK] = 1,
[MOVE_SUPER_FANG] = 1,
[MOVE_SLASH] = 1,
- [MOVE_SUBSTITUTE] = 0,
[MOVE_STRUGGLE] = 1,
- [MOVE_SKETCH] = 0,
[MOVE_TRIPLE_KICK] = 1,
[MOVE_THIEF] = 1,
- [MOVE_SPIDER_WEB] = 0,
- [MOVE_MIND_READER] = 0,
- [MOVE_NIGHTMARE] = 0,
[MOVE_FLAME_WHEEL] = 1,
[MOVE_SNORE] = 1,
- [MOVE_CURSE] = 0,
[MOVE_FLAIL] = 1,
- [MOVE_CONVERSION_2] = 0,
[MOVE_AEROBLAST] = 1,
- [MOVE_COTTON_SPORE] = 0,
[MOVE_REVERSAL] = 1,
- [MOVE_SPITE] = 0,
[MOVE_POWDER_SNOW] = 1,
[MOVE_PROTECT] = -1,
[MOVE_MACH_PUNCH] = 1,
- [MOVE_SCARY_FACE] = 0,
[MOVE_FEINT_ATTACK] = 1,
- [MOVE_SWEET_KISS] = 0,
- [MOVE_BELLY_DRUM] = 0,
[MOVE_SLUDGE_BOMB] = 1,
[MOVE_MUD_SLAP] = 1,
[MOVE_OCTAZOOKA] = 1,
- [MOVE_SPIKES] = 0,
[MOVE_ZAP_CANNON] = 1,
- [MOVE_FORESIGHT] = 0,
- [MOVE_DESTINY_BOND] = 0,
- [MOVE_PERISH_SONG] = 0,
[MOVE_ICY_WIND] = 1,
[MOVE_DETECT] = -1,
[MOVE_BONE_RUSH] = 1,
- [MOVE_LOCK_ON] = 0,
[MOVE_OUTRAGE] = 1,
- [MOVE_SANDSTORM] = 0,
[MOVE_GIGA_DRAIN] = 1,
[MOVE_ENDURE] = -1,
- [MOVE_CHARM] = 0,
[MOVE_ROLLOUT] = 1,
[MOVE_FALSE_SWIPE] = 1,
- [MOVE_SWAGGER] = 0,
- [MOVE_MILK_DRINK] = 0,
[MOVE_SPARK] = 1,
[MOVE_FURY_CUTTER] = 1,
[MOVE_STEEL_WING] = 1,
- [MOVE_MEAN_LOOK] = 0,
- [MOVE_ATTRACT] = 0,
- [MOVE_SLEEP_TALK] = 0,
- [MOVE_HEAL_BELL] = 0,
[MOVE_RETURN] = 1,
[MOVE_PRESENT] = 1,
[MOVE_FRUSTRATION] = 1,
- [MOVE_SAFEGUARD] = 0,
- [MOVE_PAIN_SPLIT] = 0,
[MOVE_SACRED_FIRE] = 1,
[MOVE_MAGNITUDE] = 1,
[MOVE_DYNAMIC_PUNCH] = 1,
[MOVE_MEGAHORN] = 1,
[MOVE_DRAGON_BREATH] = 1,
- [MOVE_BATON_PASS] = 0,
- [MOVE_ENCORE] = 0,
[MOVE_PURSUIT] = 1,
[MOVE_RAPID_SPIN] = 1,
- [MOVE_SWEET_SCENT] = 0,
[MOVE_IRON_TAIL] = 1,
[MOVE_METAL_CLAW] = 1,
[MOVE_VITAL_THROW] = 1,
- [MOVE_MORNING_SUN] = 0,
- [MOVE_SYNTHESIS] = 0,
- [MOVE_MOONLIGHT] = 0,
[MOVE_HIDDEN_POWER] = 1,
[MOVE_CROSS_CHOP] = 1,
[MOVE_TWISTER] = 1,
- [MOVE_RAIN_DANCE] = 0,
- [MOVE_SUNNY_DAY] = 0,
[MOVE_CRUNCH] = 1,
- [MOVE_MIRROR_COAT] = 0,
- [MOVE_PSYCH_UP] = 0,
[MOVE_EXTREME_SPEED] = 1,
[MOVE_ANCIENT_POWER] = 1,
[MOVE_SHADOW_BALL] = 1,
@@ -294,56 +217,25 @@ static const s8 sMindRatings[] =
[MOVE_BEAT_UP] = 1,
[MOVE_FAKE_OUT] = -1,
[MOVE_UPROAR] = 1,
- [MOVE_STOCKPILE] = 0,
[MOVE_SPIT_UP] = 1,
- [MOVE_SWALLOW] = 0,
[MOVE_HEAT_WAVE] = 1,
- [MOVE_HAIL] = 0,
- [MOVE_TORMENT] = 0,
- [MOVE_FLATTER] = 0,
- [MOVE_WILL_O_WISP] = 0,
- [MOVE_MEMENTO] = 0,
[MOVE_FACADE] = 1,
[MOVE_FOCUS_PUNCH] = 1,
[MOVE_SMELLING_SALTS] = 1,
- [MOVE_FOLLOW_ME] = 0,
- [MOVE_NATURE_POWER] = 0,
- [MOVE_CHARGE] = 0,
- [MOVE_TAUNT] = 0,
- [MOVE_HELPING_HAND] = 0,
- [MOVE_TRICK] = 0,
- [MOVE_ROLE_PLAY] = 0,
- [MOVE_WISH] = 0,
- [MOVE_ASSIST] = 0,
- [MOVE_INGRAIN] = 0,
[MOVE_SUPERPOWER] = 1,
- [MOVE_MAGIC_COAT] = 0,
- [MOVE_RECYCLE] = 0,
[MOVE_REVENGE] = 1,
[MOVE_BRICK_BREAK] = 1,
- [MOVE_YAWN] = 0,
[MOVE_KNOCK_OFF] = 1,
[MOVE_ENDEAVOR] = 1,
[MOVE_ERUPTION] = 1,
- [MOVE_SKILL_SWAP] = 0,
- [MOVE_IMPRISON] = 0,
- [MOVE_REFRESH] = 0,
- [MOVE_GRUDGE] = 0,
- [MOVE_SNATCH] = 0,
[MOVE_SECRET_POWER] = 1,
[MOVE_DIVE] = 1,
[MOVE_ARM_THRUST] = 1,
- [MOVE_CAMOUFLAGE] = 0,
- [MOVE_TAIL_GLOW] = 0,
[MOVE_LUSTER_PURGE] = 1,
[MOVE_MIST_BALL] = 1,
- [MOVE_FEATHER_DANCE] = 0,
- [MOVE_TEETER_DANCE] = 0,
[MOVE_BLAZE_KICK] = 1,
- [MOVE_MUD_SPORT] = 0,
[MOVE_ICE_BALL] = 1,
[MOVE_NEEDLE_ARM] = 1,
- [MOVE_SLACK_OFF] = 0,
[MOVE_HYPER_VOICE] = 1,
[MOVE_POISON_FANG] = 1,
[MOVE_CRUSH_CLAW] = 1,
@@ -352,17 +244,10 @@ static const s8 sMindRatings[] =
[MOVE_METEOR_MASH] = 1,
[MOVE_ASTONISH] = 1,
[MOVE_WEATHER_BALL] = 1,
- [MOVE_AROMATHERAPY] = 0,
- [MOVE_FAKE_TEARS] = 0,
[MOVE_AIR_CUTTER] = 1,
[MOVE_OVERHEAT] = 1,
- [MOVE_ODOR_SLEUTH] = 0,
[MOVE_ROCK_TOMB] = 1,
[MOVE_SILVER_WIND] = 1,
- [MOVE_METAL_SOUND] = 0,
- [MOVE_GRASS_WHISTLE] = 0,
- [MOVE_TICKLE] = 0,
- [MOVE_COSMIC_POWER] = 0,
[MOVE_WATER_SPOUT] = 1,
[MOVE_SIGNAL_BEAM] = 1,
[MOVE_SHADOW_PUNCH] = 1,
@@ -374,22 +259,15 @@ static const s8 sMindRatings[] =
[MOVE_BULLET_SEED] = 1,
[MOVE_AERIAL_ACE] = 1,
[MOVE_ICICLE_SPEAR] = 1,
- [MOVE_IRON_DEFENSE] = 0,
- [MOVE_BLOCK] = 0,
- [MOVE_HOWL] = 0,
[MOVE_DRAGON_CLAW] = 1,
[MOVE_FRENZY_PLANT] = 1,
- [MOVE_BULK_UP] = 0,
[MOVE_BOUNCE] = 1,
[MOVE_MUD_SHOT] = 1,
[MOVE_POISON_TAIL] = 1,
[MOVE_COVET] = 1,
[MOVE_VOLT_TACKLE] = 1,
[MOVE_MAGICAL_LEAF] = 1,
- [MOVE_WATER_SPORT] = 0,
- [MOVE_CALM_MIND] = 0,
[MOVE_LEAF_BLADE] = 1,
- [MOVE_DRAGON_DANCE] = 0,
[MOVE_ROCK_BLAST] = 1,
[MOVE_SHOCK_WAVE] = 1,
[MOVE_WATER_PULSE] = 1,
@@ -397,14 +275,12 @@ static const s8 sMindRatings[] =
[MOVE_PSYCHO_BOOST] = 1,
};
-#define TAG_JUDGEMENT_ICON 1000
-
-static const struct OamData sJudgementIconOamData =
+static const struct OamData sOam_JudgementIcon =
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -416,47 +292,47 @@ static const struct OamData sJudgementIconOamData =
.affineParam = 0
};
-static const union AnimCmd sJudgementIconAnimCmd0[] =
+static const union AnimCmd sAnim_JudgementIcon_X[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END
};
-static const union AnimCmd sJudgementIconAnimCmd1[] =
+static const union AnimCmd sAnim_JudgementIcon_Triangle[] =
{
ANIMCMD_FRAME(4, 1),
ANIMCMD_END
};
-static const union AnimCmd sJudgementIconAnimCmd2[] =
+static const union AnimCmd sAnim_JudgementIcon_Circle[] =
{
ANIMCMD_FRAME(8, 1),
ANIMCMD_END
};
-static const union AnimCmd sJudgementIconAnimCmd3[] =
+static const union AnimCmd sAnim_JudgementIcon_Line[] =
{
ANIMCMD_FRAME(12, 1),
ANIMCMD_END
};
-static const union AnimCmd *const sJudgementIconAnimCmds[] =
+static const union AnimCmd *const sAnims_JudgementIcon[] =
{
- sJudgementIconAnimCmd0,
- sJudgementIconAnimCmd1,
- sJudgementIconAnimCmd2,
- sJudgementIconAnimCmd3
+ [ANIM_ICON_X] = sAnim_JudgementIcon_X,
+ [ANIM_ICON_TRIANGLE] = sAnim_JudgementIcon_Triangle,
+ [ANIM_ICON_CIRCLE] = sAnim_JudgementIcon_Circle,
+ [ANIM_ICON_LINE] = sAnim_JudgementIcon_Line,
};
static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon =
{
.tileTag = TAG_JUDGEMENT_ICON,
.paletteTag = TAG_NONE,
- .oam = &sJudgementIconOamData,
- .anims = sJudgementIconAnimCmds,
+ .oam = &sOam_JudgementIcon,
+ .anims = sAnims_JudgementIcon,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = SpriteCb_JudgmentIcon,
+ .callback = SpriteCB_JudgmentIcon,
};
static const struct CompressedSpriteSheet sBattleArenaJudgementSymbolsSpriteSheet[] =
@@ -507,12 +383,12 @@ void CallBattleArenaFunction(void)
u8 BattleArena_ShowJudgmentWindow(u8 *state)
{
int i;
- u8 ret = 0;
+ u8 result = ARENA_RESULT_RUNNING;
switch (*state)
{
case 0:
BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK);
- SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
+ SetGpuReg(REG_OFFSET_WININ, (WININ_WIN0_ALL & ~WININ_WIN0_BG0) | WININ_WIN1_ALL);
LoadCompressedSpriteSheet(sBattleArenaJudgementSymbolsSpriteSheet);
LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, 0x1F0, 0x20);
gBattle_WIN0H = 0xFF;
@@ -549,13 +425,15 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
case 3:
if (!IsDma3ManagerBusyWithBgCopy())
{
- SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
+ SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_ALL | WININ_WIN1_ALL);
+
+ // Create dividing line for the the score totals at the bottom
for (i = 0; i < 8; i++)
{
u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 64 + i * 16, 84, 0);
- StartSpriteAnim(&gSprites[spriteId], 3);
+ StartSpriteAnim(&gSprites[spriteId], ANIM_ICON_LINE);
}
- ret = 1;
+ result = ARENA_RESULT_STEP_DONE;
(*state)++;
}
break;
@@ -566,7 +444,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement);
BattlePutTextOnWindow(gDisplayedStringBattle, ARENA_WIN_JUDGEMENT_TITLE);
(*state)++;
- ret = 1;
+ result = ARENA_RESULT_STEP_DONE;
break;
case 5:
PlaySE(SE_ARENA_TIMEUP1);
@@ -575,7 +453,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement);
BattlePutTextOnWindow(gDisplayedStringBattle, ARENA_WIN_JUDGEMENT_TITLE);
(*state)++;
- ret = 1;
+ result = ARENA_RESULT_STEP_DONE;
break;
case 6:
PlaySE(SE_ARENA_TIMEUP1);
@@ -584,49 +462,50 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement);
BattlePutTextOnWindow(gDisplayedStringBattle, ARENA_WIN_JUDGEMENT_TITLE);
(*state)++;
- ret = 1;
+ result = ARENA_RESULT_STEP_DONE;
break;
case 7:
PlaySE(SE_ARENA_TIMEUP2);
if (gBattleTextBuff1[0] > gBattleTextBuff2[0])
{
- ret = 2;
+ result = ARENA_RESULT_PLAYER_WON;
gBattleScripting.battler = 0;
}
else if (gBattleTextBuff1[0] < gBattleTextBuff2[0])
{
- ret = 3;
+ result = ARENA_RESULT_PLAYER_LOST;
gBattleScripting.battler = 1;
}
else
{
- ret = 4;
+ result = ARENA_RESULT_TIE;
}
(*state)++;
break;
- case 8:
+ case JUDGEMENT_STATE_FINISHED:
+ // Finishing this state is the indicator to SpriteCB_JudgmentIcon that its safe to destroy the judgement icon sprites
(*state)++;
break;
- case 9:
- SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
+ case JUDGEMENT_STATE_FINISHED + 1:
+ SetGpuReg(REG_OFFSET_WININ, (WININ_WIN0_ALL & ~WININ_WIN0_BG0) | WININ_WIN1_ALL);
HandleBattleWindow(5, 0, 24, 13, WINDOW_CLEAR);
CopyBgTilemapBufferToVram(0);
m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256);
BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, RGB_BLACK);
(*state)++;
break;
- case 10:
+ case JUDGEMENT_STATE_FINISHED + 2:
if (!gPaletteFade.active)
{
- SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
+ SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_ALL | WININ_WIN1_ALL);
FreeSpriteTilesByTag(TAG_JUDGEMENT_ICON);
- ret = 1;
+ result = ARENA_RESULT_STEP_DONE;
(*state)++;
}
break;
}
- return ret;
+ return result;
}
static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler)
@@ -656,7 +535,8 @@ static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler)
if (pointsPlayer > pointsOpponent)
{
- animNum = 2;
+ animNum = ANIM_ICON_CIRCLE;
+ // +2 to score total for winning
if (battler != 0)
gBattleTextBuff2[0] += 2;
else
@@ -664,7 +544,8 @@ static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler)
}
else if (pointsPlayer == pointsOpponent)
{
- animNum = 1;
+ animNum = ANIM_ICON_TRIANGLE;
+ // +1 to score total for a tie
if (battler != 0)
gBattleTextBuff2[0] += 1;
else
@@ -672,16 +553,16 @@ static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler)
}
else
{
- animNum = 0;
+ animNum = ANIM_ICON_X;
}
pointsPlayer = CreateSprite(&sSpriteTemplate_JudgmentIcon, x, y, 0);
StartSpriteAnim(&gSprites[pointsPlayer], animNum);
}
-static void SpriteCb_JudgmentIcon(struct Sprite *sprite)
+static void SpriteCB_JudgmentIcon(struct Sprite *sprite)
{
- if (gBattleCommunication[0] > 8)
+ if (gBattleCommunication[0] > JUDGEMENT_STATE_FINISHED)
DestroySprite(sprite);
}
@@ -701,8 +582,7 @@ void BattleArena_InitPoints(void)
void BattleArena_AddMindPoints(u8 battler)
{
- s8 *mindPoints = gBattleStruct->arenaMindPoints;
- mindPoints[battler] += sMindRatings[gCurrentMove];
+ gBattleStruct->arenaMindPoints[battler] += sMindRatings[gCurrentMove];
}
void BattleArena_AddSkillPoints(u8 battler)
@@ -719,7 +599,7 @@ void BattleArena_AddSkillPoints(u8 battler)
}
else if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
{
- if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[6] != 1)
+ if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[MISS_TYPE] != B_MSG_PROTECTED)
skillPoints[battler] -= 2;
}
else if ((gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) && (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE))
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 7c754a0e0d..3965be2eab 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -45,7 +45,7 @@ static const struct OamData sVsLetter_V_OamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -62,7 +62,7 @@ static const struct OamData sVsLetter_S_OamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -768,26 +768,26 @@ void DrawMainBattleBackground(void)
{
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
{
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
}
else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
{
- LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Cave, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Cave, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
}
else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
{
- LZDecompressVram(gBattleTerrainTiles_Water, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Water, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Water, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
}
else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
{
- LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
}
else
@@ -797,15 +797,15 @@ void DrawMainBattleBackground(void)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
return;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
return;
}
@@ -815,48 +815,48 @@ void DrawMainBattleBackground(void)
{
default:
case MAP_BATTLE_SCENE_NORMAL:
- LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_GYM:
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_MAGMA:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_AQUA:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_SIDNEY:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_PHOEBE:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_GLACIA:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_DRAKE:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_FRONTIER:
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
break;
}
@@ -865,7 +865,7 @@ void DrawMainBattleBackground(void)
void LoadBattleTextboxAndBackground(void)
{
- LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0)));
+ LZDecompressVram(gBattleTextboxTiles, (void *)(BG_CHAR_ADDR(0)));
CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
CopyBgTilemapBufferToVram(0);
LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
@@ -1136,8 +1136,8 @@ void DrawBattleEntryBackground(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
- LZDecompressVram(gBattleVSFrame_Gfx, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gVsLettersGfx, (void*)OBJ_VRAM0);
+ LZDecompressVram(gBattleVSFrame_Gfx, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gVsLettersGfx, (void *)OBJ_VRAM0);
LoadCompressedPalette(gBattleVSFrame_Pal, 0x60, 0x20);
SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1);
SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04);
@@ -1155,8 +1155,8 @@ void DrawBattleEntryBackground(void)
{
if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER || gPartnerTrainerId >= TRAINER_CUSTOM_PARTNER)
{
- LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(BG_SCREEN_ADDR(28)));
}
else
{
@@ -1172,18 +1172,18 @@ void DrawBattleEntryBackground(void)
}
else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
{
- LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void *)(BG_SCREEN_ADDR(28)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
{
- LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void *)(BG_SCREEN_ADDR(28)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
{
- LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void *)(BG_SCREEN_ADDR(28)));
}
else
{
@@ -1192,27 +1192,27 @@ void DrawBattleEntryBackground(void)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
- LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(BG_SCREEN_ADDR(28)));
return;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
- LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(BG_SCREEN_ADDR(28)));
return;
}
}
if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL)
{
- LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTileset, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTilemap, (void *)(BG_SCREEN_ADDR(28)));
}
else
{
- LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
- LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
+ LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(BG_CHAR_ADDR(1)));
+ LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(BG_SCREEN_ADDR(28)));
}
}
}
@@ -1224,7 +1224,7 @@ bool8 LoadChosenBattleElement(u8 caseId)
switch (caseId)
{
case 0:
- LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0)));
+ LZDecompressVram(gBattleTextboxTiles, (void *)(BG_CHAR_ADDR(0)));
break;
case 1:
CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
@@ -1236,11 +1236,11 @@ bool8 LoadChosenBattleElement(u8 caseId)
case 3:
if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
{
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
{
- LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Cave, (void *)(BG_CHAR_ADDR(2)));
}
else
{
@@ -1249,12 +1249,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
break;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
}
}
@@ -1263,31 +1263,31 @@ bool8 LoadChosenBattleElement(u8 caseId)
{
default:
case MAP_BATTLE_SCENE_NORMAL:
- LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_GYM:
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_MAGMA:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_AQUA:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_SIDNEY:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_PHOEBE:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_GLACIA:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_DRAKE:
- LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_FRONTIER:
- LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
+ LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
break;
}
}
@@ -1295,14 +1295,14 @@ bool8 LoadChosenBattleElement(u8 caseId)
case 4:
if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
{
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
{
if (gGameVersion == VERSION_RUBY)
- LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Cave, (void *)(BG_SCREEN_ADDR(26)));
else
- LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Water, (void *)(BG_SCREEN_ADDR(26)));
}
else
{
@@ -1311,12 +1311,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
break;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
}
}
@@ -1325,31 +1325,31 @@ bool8 LoadChosenBattleElement(u8 caseId)
{
default:
case MAP_BATTLE_SCENE_NORMAL:
- LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_GYM:
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_MAGMA:
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_AQUA:
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_SIDNEY:
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_PHOEBE:
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_GLACIA:
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_DRAKE:
- LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_FRONTIER:
- LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
+ LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
break;
}
}
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 2ef3077d70..833925550a 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -628,7 +628,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1460,7 +1460,7 @@ static void LinkOpponentHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 1dadd9a44c..6a0ecb2976 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -515,7 +515,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1292,7 +1292,7 @@ static void LinkPartnerHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 501e31704c..a503c1c7aa 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -638,7 +638,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1523,7 +1523,7 @@ static void OpponentHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
@@ -1556,7 +1556,7 @@ static void OpponentHandleChooseMove(void)
else
{
u8 chosenMoveId;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER)
|| IsWildMonSmart())
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index ee939a612f..8195414955 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -375,7 +375,7 @@ static void HandleInputChooseTarget(void)
if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
if (gBattleStruct->mega.playerSelect)
BtlController_EmitTwoReturnValues(BUFFER_B, 10, gMoveSelectionCursor[gActiveBattler] | RET_MEGA_EVOLUTION | (gMultiUsePlayerCursor << 8));
else
@@ -388,7 +388,7 @@ static void HandleInputChooseTarget(void)
else if (JOY_NEW(B_BUTTON) || gPlayerDpadHoldFrames > 59)
{
PlaySE(SE_SELECT);
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1);
DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1);
@@ -397,7 +397,7 @@ static void HandleInputChooseTarget(void)
else if (JOY_NEW(DPAD_LEFT | DPAD_UP))
{
PlaySE(SE_SELECT);
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
if (moveTarget == (MOVE_TARGET_USER | MOVE_TARGET_ALLY))
{
@@ -442,12 +442,12 @@ static void HandleInputChooseTarget(void)
i = 0;
} while (i == 0);
}
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
}
else if (JOY_NEW(DPAD_RIGHT | DPAD_DOWN))
{
PlaySE(SE_SELECT);
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
if (moveTarget == (MOVE_TARGET_USER | MOVE_TARGET_ALLY))
{
@@ -493,7 +493,7 @@ static void HandleInputChooseTarget(void)
} while (i == 0);
}
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
}
}
@@ -504,7 +504,7 @@ static void HideAllTargets(void)
{
if (IsBattlerAlive(i) && gBattleSpritesDataPtr->healthBoxesData[i].healthboxIsBouncing)
{
- gSprites[gBattlerSpriteIds[i]].callback = SpriteCb_HideAsMoveTarget;
+ gSprites[gBattlerSpriteIds[i]].callback = SpriteCB_HideAsMoveTarget;
EndBounceEffect(i, BOUNCE_HEALTHBOX);
}
}
@@ -517,7 +517,7 @@ static void HideShownTargets(void)
{
if (IsBattlerAlive(i) && gBattleSpritesDataPtr->healthBoxesData[i].healthboxIsBouncing && i != gActiveBattler)
{
- gSprites[gBattlerSpriteIds[i]].callback = SpriteCb_HideAsMoveTarget;
+ gSprites[gBattlerSpriteIds[i]].callback = SpriteCB_HideAsMoveTarget;
EndBounceEffect(i, BOUNCE_HEALTHBOX);
}
}
@@ -585,7 +585,7 @@ static void TryShowAsTarget(u32 battlerId)
if (IsBattlerAlive(battlerId))
{
DoBounceEffect(battlerId, BOUNCE_HEALTHBOX, 15, 1);
- gSprites[gBattlerSpriteIds[battlerId]].callback = SpriteCb_ShowAsMoveTarget;
+ gSprites[gBattlerSpriteIds[battlerId]].callback = SpriteCB_ShowAsMoveTarget;
}
}
@@ -593,7 +593,7 @@ static void HandleInputChooseMove(void)
{
u16 moveTarget;
u32 canSelectTarget = 0;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
gPlayerDpadHoldFrames++;
@@ -696,7 +696,7 @@ static void HandleInputChooseMove(void)
else
gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
- gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
+ gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
break;
case 2:
gBattlerControllerFuncs[gActiveBattler] = HandleInputShowTargets;
@@ -886,7 +886,7 @@ static void HandleMoveSwitching(void)
if (gMoveSelectionCursor[gActiveBattler] != gMultiUsePlayerCursor)
{
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
s32 i;
// swap moves and pp
@@ -1656,7 +1656,7 @@ static void PlayerHandleYesNoInput(void)
}
if (JOY_NEW(A_BUTTON))
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
PlaySE(SE_SELECT);
if (gMultiUsePlayerCursor != 0)
@@ -1668,7 +1668,7 @@ static void PlayerHandleYesNoInput(void)
}
if (JOY_NEW(B_BUTTON))
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
PlaySE(SE_SELECT);
PlayerBufferExecCompleted();
}
@@ -1677,7 +1677,7 @@ static void PlayerHandleYesNoInput(void)
static void MoveSelectionDisplayMoveNames(void)
{
s32 i;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
gNumberOfMovesToChoose = 0;
for (i = 0; i < MAX_MON_MOVES; i++)
@@ -1706,7 +1706,7 @@ static void MoveSelectionDisplayPpNumber(void)
return;
SetPpNumbersPaletteInMoveSelection();
- moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
*(txtPtr)++ = CHAR_SLASH;
ConvertIntToDecimalStringN(txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
@@ -1717,12 +1717,12 @@ static void MoveSelectionDisplayPpNumber(void)
static void MoveSelectionDisplayMoveType(void)
{
u8 *txtPtr;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
*(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
*(txtPtr)++ = EXT_CTRL_CODE_FONT;
- *(txtPtr)++ = 1;
+ *(txtPtr)++ = FONT_NORMAL;
StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_TYPE);
@@ -1892,7 +1892,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -2767,7 +2767,7 @@ static void PlayerHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
@@ -2814,7 +2814,7 @@ static void PlayerHandleYesNoBox(void)
{
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gMultiUsePlayerCursor = 1;
BattleCreateYesNoCursorAt(1);
@@ -2857,7 +2857,7 @@ static void PlayerHandleChooseMove(void)
}
else
{
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
InitMoveSelectionsVarsAndStrings();
gBattleStruct->mega.playerSelect = FALSE;
@@ -3032,7 +3032,7 @@ static void PlayerHandleDMA3Transfer(void)
u16 sizeArg = gBattleResources->bufferA[gActiveBattler][5] | (gBattleResources->bufferA[gActiveBattler][6] << 8);
const u8 *src = &gBattleResources->bufferA[gActiveBattler][7];
- u8 *dst = (u8*)(dstArg);
+ u8 *dst = (u8 *)(dstArg);
u32 size = sizeArg;
while (1)
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index a59841f152..a868d09c03 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -701,7 +701,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1490,7 +1490,7 @@ static void PlayerPartnerHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
@@ -1515,7 +1515,7 @@ static void PlayerPartnerHandleYesNoBox(void)
static void PlayerPartnerHandleChooseMove(void)
{
u8 chosenMoveId;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
chosenMoveId = gBattleStruct->aiMoveOrAction[gActiveBattler];
gBattlerTarget = gBattleStruct->aiChosenTarget[gActiveBattler];
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 8968617ca6..3f5e1cf7f9 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -611,7 +611,7 @@ static u32 CopyRecordedOpponentMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1387,7 +1387,7 @@ static void RecordedOpponentHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 157bcf9420..b02f171f98 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -588,7 +588,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1391,7 +1391,7 @@ static void RecordedPlayerHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index f020651116..1542838dbb 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -424,7 +424,7 @@ static void SafariHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 5cd282b5ba..9728376df2 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -517,7 +517,7 @@ static u32 CopyWallyMonData(u8 monId, u8 *dst)
moveData.pp[size] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES);
- src = (u8*)(&moveData);
+ src = (u8 *)(&moveData);
for (size = 0; size < sizeof(moveData); size++)
dst[size] = src[size];
break;
@@ -1169,7 +1169,7 @@ static void WallyHandlePrintString(void)
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
- stringId = (u16*)(&gBattleResources->bufferA[gActiveBattler][2]);
+ stringId = (u16 *)(&gBattleResources->bufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 427a9bf0d6..82ce1ebf20 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -101,10 +101,10 @@ void InitBattleControllers(void)
}
for (i = 0; i < sizeof(gBattleStruct->tvMovePoints); i++)
- *((u8*)(&gBattleStruct->tvMovePoints) + i) = 0;
+ *((u8 *)(&gBattleStruct->tvMovePoints) + i) = 0;
for (i = 0; i < sizeof(gBattleStruct->tv); i++)
- *((u8*)(&gBattleStruct->tv) + i) = 0;
+ *((u8 *)(&gBattleStruct->tv) + i) = 0;
}
static void InitSinglePlayerBtlControllers(void)
@@ -940,7 +940,7 @@ void BtlController_EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 b
sBattleBuffersTransferData[1] = requestId;
sBattleBuffersTransferData[2] = monToCheck;
for (i = 0; i < bytes; i++)
- sBattleBuffersTransferData[3 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[3 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 3 + bytes);
}
@@ -952,7 +952,7 @@ void BtlController_EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data
sBattleBuffersTransferData[1] = monId;
sBattleBuffersTransferData[2] = bytes;
for (i = 0; i < bytes; i++)
- sBattleBuffersTransferData[3 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[3 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, bytes + 3);
}
@@ -1049,7 +1049,7 @@ void BtlController_EmitPause(u8 bufferId, u8 toWait, void *data)
sBattleBuffersTransferData[0] = CONTROLLER_PAUSE;
sBattleBuffersTransferData[1] = toWait;
for (i = 0; i < toWait * 3; i++)
- sBattleBuffersTransferData[2 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[2 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, toWait * 3 + 2);
}
@@ -1086,14 +1086,14 @@ void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 m
void BtlController_EmitPrintString(u8 bufferId, u16 stringID)
{
s32 i;
- struct BattleMsgData* stringInfo;
+ struct BattleMsgData *stringInfo;
sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRING;
sBattleBuffersTransferData[1] = gBattleOutcome;
sBattleBuffersTransferData[2] = stringID;
sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8;
- stringInfo = (struct BattleMsgData*)(&sBattleBuffersTransferData[4]);
+ stringInfo = (struct BattleMsgData *)(&sBattleBuffersTransferData[4]);
stringInfo->currentMove = gCurrentMove;
stringInfo->originallyUsedMove = gChosenMove;
stringInfo->lastItem = gLastUsedItem;
@@ -1125,7 +1125,7 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID)
sBattleBuffersTransferData[2] = stringID;
sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8;
- stringInfo = (struct BattleMsgData*)(&sBattleBuffersTransferData[4]);
+ stringInfo = (struct BattleMsgData *)(&sBattleBuffersTransferData[4]);
stringInfo->currentMove = gCurrentMove;
stringInfo->originallyUsedMove = gChosenMove;
stringInfo->lastItem = gLastUsedItem;
@@ -1174,7 +1174,7 @@ void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpN
sBattleBuffersTransferData[2] = NoPpNumber;
sBattleBuffersTransferData[3] = 0;
for (i = 0; i < sizeof(*movePpData); i++)
- sBattleBuffersTransferData[4 + i] = *((u8*)(movePpData) + i);
+ sBattleBuffersTransferData[4 + i] = *((u8 *)(movePpData) + i);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(*movePpData) + 4);
}
@@ -1273,7 +1273,7 @@ void BtlController_EmitDataTransfer(u8 bufferId, u16 size, void *data)
sBattleBuffersTransferData[2] = size;
sBattleBuffersTransferData[3] = (size & 0xFF00) >> 8;
for (i = 0; i < size; i++)
- sBattleBuffersTransferData[4 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[4 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, size + 4);
}
@@ -1289,7 +1289,7 @@ void BtlController_EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data
sBattleBuffersTransferData[5] = size;
sBattleBuffersTransferData[6] = (size & 0xFF00) >> 8;
for (i = 0; i < size; i++)
- sBattleBuffersTransferData[7 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[7 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, size + 7);
}
@@ -1305,7 +1305,7 @@ void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *data)
// Nonsense loop using songId as a size
// Would go out of bounds for any song id after SE_RG_BAG_POCKET (253)
for (i = 0; i < songId; i++)
- sBattleBuffersTransferData[3 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[3 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, songId + 3);
}
@@ -1317,7 +1317,7 @@ void BtlController_EmitCmd32(u8 bufferId, u16 size, void *data)
sBattleBuffersTransferData[1] = size;
sBattleBuffersTransferData[2] = (size & 0xFF00) >> 8;
for (i = 0; i < size; i++)
- sBattleBuffersTransferData[3 + i] = *(u8*)(data++);
+ sBattleBuffersTransferData[3 + i] = *(u8 *)(data++);
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, size + 3);
}
@@ -1465,7 +1465,7 @@ void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* h
sBattleBuffersTransferData[2] = (flags & PARTY_SUMM_SKIP_DRAW_DELAY) >> 7; // If true, skip delay after drawing. True during intro
sBattleBuffersTransferData[3] = CONTROLLER_DRAWPARTYSTATUSSUMMARY;
for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * PARTY_SIZE); i++)
- sBattleBuffersTransferData[4 + i] = *(i + (u8*)(hpAndStatus));
+ sBattleBuffersTransferData[4 + i] = *(i + (u8 *)(hpAndStatus));
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct HpAndStatus) * PARTY_SIZE + 4);
}
diff --git a/src/battle_debug.c b/src/battle_debug.c
index 0657ed2ac4..9911154022 100644
--- a/src/battle_debug.c
+++ b/src/battle_debug.c
@@ -614,7 +614,7 @@ static void SwitchToDebugView(u8 taskId);
// code
static struct BattleDebugMenu *GetStructPtr(u8 taskId)
{
- u8 *taskDataPtr = (u8*)(&gTasks[taskId].data[0]);
+ u8 *taskDataPtr = (u8 *)(&gTasks[taskId].data[0]);
return (struct BattleDebugMenu*)(T1_READ_PTR(taskDataPtr));
}
@@ -622,7 +622,7 @@ static struct BattleDebugMenu *GetStructPtr(u8 taskId)
static void SetStructPtr(u8 taskId, void *ptr)
{
u32 structPtr = (u32)(ptr);
- u8 *taskDataPtr = (u8*)(&gTasks[taskId].data[0]);
+ u8 *taskDataPtr = (u8 *)(&gTasks[taskId].data[0]);
taskDataPtr[0] = structPtr >> 0;
taskDataPtr[1] = structPtr >> 8;
@@ -771,15 +771,9 @@ static void Task_ShowAiPoints(u8 taskId)
{
if (i != data->aiBattlerId && IsBattlerAlive(i))
{
- #ifndef POKEMON_EXPANSION
- data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
- SpriteCallbackDummy,
- 95 + (count * 60), 17, 0, 0, FALSE);
- #else
data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
SpriteCallbackDummy,
95 + (count * 60), 17, 0, 0);
- #endif
gSprites[data->aiIconSpriteIds[i]].data[0] = i; // battler id
count++;
}
@@ -788,19 +782,11 @@ static void Task_ShowAiPoints(u8 taskId)
data->aiIconSpriteIds[i] = 0xFF;
}
}
- #ifndef POKEMON_EXPANSION
- data->aiMonSpriteId = CreateMonPicSprite_HandleDeoxys(gBattleMons[data->aiBattlerId].species,
- gBattleMons[data->aiBattlerId].otId,
- gBattleMons[data->aiBattlerId].personality,
- TRUE,
- 39, 130, 15, TAG_NONE);
- #else
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
gBattleMons[data->aiBattlerId].otId,
gBattleMons[data->aiBattlerId].personality,
TRUE,
39, 130, 15, TAG_NONE);
- #endif
data->aiViewState++;
break;
// Put text
@@ -894,15 +880,9 @@ static void Task_ShowAiKnowledge(u8 taskId)
{
if (GET_BATTLER_SIDE(i) == B_SIDE_PLAYER && IsBattlerAlive(i))
{
- #ifndef POKEMON_EXPANSION
- data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
- SpriteCallbackDummy,
- 95 + (count * 80), 17, 0, 0, FALSE);
- #else
data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
SpriteCallbackDummy,
95 + (count * 80), 17, 0, 0);
- #endif
gSprites[data->aiIconSpriteIds[i]].data[0] = i; // battler id
count++;
}
@@ -911,19 +891,11 @@ static void Task_ShowAiKnowledge(u8 taskId)
data->aiIconSpriteIds[i] = 0xFF;
}
}
- #ifndef POKEMON_EXPANSION
- data->aiMonSpriteId = CreateMonPicSprite_HandleDeoxys(gBattleMons[data->aiBattlerId].species,
- gBattleMons[data->aiBattlerId].otId,
- gBattleMons[data->aiBattlerId].personality,
- TRUE,
- 39, 130, 15, TAG_NONE);
- #else
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
gBattleMons[data->aiBattlerId].otId,
gBattleMons[data->aiBattlerId].personality,
TRUE,
39, 130, 15, TAG_NONE);
- #endif
data->aiViewState++;
break;
// Put text
@@ -1394,30 +1366,30 @@ static void UpdateBattlerValue(struct BattleDebugMenu *data)
switch (data->modifyArrows.typeOfVal)
{
case VAL_U8:
- *(u8*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+ *(u8 *)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
break;
case VAL_S8:
- *(s8*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+ *(s8 *)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
break;
case VAL_U16:
- *(u16*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+ *(u16 *)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
break;
case VAR_U16_4_ENTRIES:
- ((u16*)(data->modifyArrows.modifiedValPtr))[0] = data->modifyArrows.currValue;
- ((u16*)(data->modifyArrows.modifiedValPtr))[1] = data->modifyArrows.currValue;
- ((u16*)(data->modifyArrows.modifiedValPtr))[2] = data->modifyArrows.currValue;
- ((u16*)(data->modifyArrows.modifiedValPtr))[3] = data->modifyArrows.currValue;
+ ((u16 *)(data->modifyArrows.modifiedValPtr))[0] = data->modifyArrows.currValue;
+ ((u16 *)(data->modifyArrows.modifiedValPtr))[1] = data->modifyArrows.currValue;
+ ((u16 *)(data->modifyArrows.modifiedValPtr))[2] = data->modifyArrows.currValue;
+ ((u16 *)(data->modifyArrows.modifiedValPtr))[3] = data->modifyArrows.currValue;
break;
case VAL_ALL_STAT_STAGES:
for (i = 0; i < NUM_BATTLE_STATS; i++)
gBattleMons[data->battlerId].statStages[i] = data->modifyArrows.currValue;
break;
case VAL_U32:
- *(u32*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
break;
case VAL_BITFIELD_32:
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~(GetBitfieldToAndValue(data->bitfield[data->currentSecondaryListItemId].currBit, data->bitfield[data->currentSecondaryListItemId].bitsCount));
- *(u32*)(data->modifyArrows.modifiedValPtr) |= (data->modifyArrows.currValue << data->bitfield[data->currentSecondaryListItemId].currBit);
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~(GetBitfieldToAndValue(data->bitfield[data->currentSecondaryListItemId].currBit, data->bitfield[data->currentSecondaryListItemId].bitsCount));
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= (data->modifyArrows.currValue << data->bitfield[data->currentSecondaryListItemId].currBit);
break;
case VAR_SIDE_STATUS:
*GetSideStatusValue(data, TRUE, data->modifyArrows.currValue != 0) = data->modifyArrows.currValue;
@@ -1426,8 +1398,8 @@ static void UpdateBattlerValue(struct BattleDebugMenu *data)
(*(struct BattleSpriteInfo*)(data->modifyArrows.modifiedValPtr)).hpNumbersNoBars = data->modifyArrows.currValue;
break;
case VAR_SUBSTITUTE:
- *(u8*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
- if (*(u8*)(data->modifyArrows.modifiedValPtr) == 0)
+ *(u8 *)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+ if (*(u8 *)(data->modifyArrows.modifiedValPtr) == 0)
{
gBattleMons[data->battlerId].status2 &= ~STATUS2_SUBSTITUTE;
gBattleSpritesDataPtr->battlerData[data->battlerId].behindSubstitute = 0;
@@ -1453,7 +1425,7 @@ static void UpdateBattlerValue(struct BattleDebugMenu *data)
break;
case VAL_ITEM:
if (data->currentSecondaryListItemId == 0)
- *(u16*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+ *(u16 *)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
else if (data->currentSecondaryListItemId == 1)
gBattleStruct->debugHoldEffects[data->battlerId] = data->modifyArrows.currValue;
break;
@@ -1512,9 +1484,9 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_REFLECT;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_REFLECT;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_REFLECT;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_REFLECT;
sideTimer->reflectBattlerId = data->battlerId;
}
return &sideTimer->reflectTimer;
@@ -1522,9 +1494,9 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_LIGHTSCREEN;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_LIGHTSCREEN;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_LIGHTSCREEN;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_LIGHTSCREEN;
sideTimer->lightscreenBattlerId = data->battlerId;
}
return &sideTimer->lightscreenTimer;
@@ -1532,18 +1504,18 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_SPIKES;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_SPIKES;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_SPIKES;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_SPIKES;
}
return &sideTimer->spikesAmount;
case LIST_SIDE_SAFEGUARD:
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_SAFEGUARD;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_SAFEGUARD;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_SAFEGUARD;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_SAFEGUARD;
sideTimer->safeguardBattlerId = data->battlerId;
}
return &sideTimer->safeguardTimer;
@@ -1551,9 +1523,9 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_MIST;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_MIST;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_MIST;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_MIST;
sideTimer->mistBattlerId = data->battlerId;
}
return &sideTimer->mistTimer;
@@ -1561,9 +1533,9 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_AURORA_VEIL;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_AURORA_VEIL;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_AURORA_VEIL;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_AURORA_VEIL;
sideTimer->auroraVeilBattlerId = data->battlerId;
}
return &sideTimer->auroraVeilTimer;
@@ -1571,9 +1543,9 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_LUCKY_CHANT;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_LUCKY_CHANT;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_LUCKY_CHANT;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_LUCKY_CHANT;
sideTimer->luckyChantBattlerId = data->battlerId;
}
return &sideTimer->luckyChantTimer;
@@ -1581,9 +1553,9 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_TAILWIND;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_TAILWIND;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_TAILWIND;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_TAILWIND;
sideTimer->tailwindBattlerId = data->battlerId;
}
return &sideTimer->tailwindTimer;
@@ -1591,27 +1563,27 @@ static u8 *GetSideStatusValue(struct BattleDebugMenu *data, bool32 changeStatus,
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_STEALTH_ROCK;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_STEALTH_ROCK;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_STEALTH_ROCK;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_STEALTH_ROCK;
}
return &sideTimer->stealthRockAmount;
case LIST_SIDE_TOXIC_SPIKES:
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_TOXIC_SPIKES;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_TOXIC_SPIKES;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_TOXIC_SPIKES;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_TOXIC_SPIKES;
}
return &sideTimer->toxicSpikesAmount;
case LIST_SIDE_STICKY_WEB:
if (changeStatus)
{
if (statusTrue)
- *(u32*)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_STICKY_WEB;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) |= SIDE_STATUS_STICKY_WEB;
else
- *(u32*)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_STICKY_WEB;
+ *(u32 *)(data->modifyArrows.modifiedValPtr) &= ~SIDE_STATUS_STICKY_WEB;
}
return &sideTimer->stickyWebAmount;
default:
@@ -1675,9 +1647,9 @@ static void SetUpModifyArrows(struct BattleDebugMenu *data)
data->modifyArrows.minValue = 0;
data->modifyArrows.maxValue = NUMBER_OF_MON_TYPES - 1;
data->modifyArrows.maxDigits = 2;
- data->modifyArrows.modifiedValPtr = (u8*)((&gBattleMons[data->battlerId].type1) + data->currentSecondaryListItemId);
+ data->modifyArrows.modifiedValPtr = (u8 *)((&gBattleMons[data->battlerId].type1) + data->currentSecondaryListItemId);
data->modifyArrows.typeOfVal = VAL_U8;
- data->modifyArrows.currValue = *(u8*)((&gBattleMons[data->battlerId].type1) + data->currentSecondaryListItemId);
+ data->modifyArrows.currValue = *(u8 *)((&gBattleMons[data->battlerId].type1) + data->currentSecondaryListItemId);
break;
case LIST_ITEM_STATS:
data->modifyArrows.minValue = 0;
@@ -1698,8 +1670,8 @@ static void SetUpModifyArrows(struct BattleDebugMenu *data)
}
else
{
- data->modifyArrows.modifiedValPtr = (u16*)((&gBattleMons[data->battlerId].attack) + (data->currentSecondaryListItemId - 2));
- data->modifyArrows.currValue = *(u16*)((&gBattleMons[data->battlerId].attack) + (data->currentSecondaryListItemId - 2));
+ data->modifyArrows.modifiedValPtr = (u16 *)((&gBattleMons[data->battlerId].attack) + (data->currentSecondaryListItemId - 2));
+ data->modifyArrows.currValue = *(u16 *)((&gBattleMons[data->battlerId].attack) + (data->currentSecondaryListItemId - 2));
}
data->modifyArrows.typeOfVal = VAL_U16;
break;
@@ -1953,20 +1925,12 @@ static const u8 sText_HoldEffectPsychicPower[] = _("Psychic Power");
static const u8 sText_HoldEffectFirePower[] = _("Fire Power");
static const u8 sText_HoldEffectDragonPower[] = _("Dragon Power");
static const u8 sText_HoldEffectNormalPower[] = _("Normal Power");
-#ifdef ITEM_EXPANSION
static const u8 sText_HoldEffectUpgrade[] = _("Upgrade");
-#else
-static const u8 sText_HoldEffectUpgrade[] = _("Up Grade");
-#endif
static const u8 sText_HoldEffectShellBell[] = _("Shell Bell");
static const u8 sText_HoldEffectLuckyPunch[] = _("Lucky Punch");
static const u8 sText_HoldEffectMetalPowder[] = _("Metal Powder");
static const u8 sText_HoldEffectThickClub[] = _("Thick Club");
-#ifdef ITEM_EXPANSION
static const u8 sText_HoldEffectLeek[] = _("Leek");
-#else
-static const u8 sText_HoldEffectLeek[] = _("Stick");
-#endif
static const u8 sText_HoldEffectChoiceScarf[] = _("Choice Scarf");
static const u8 sText_HoldEffectChoiceSpecs[] = _("Choice Specs");
static const u8 sText_HoldEffectDampRock[] = _("Damp Rock");
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 3fa0c23415..8b3b29fc15 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -97,7 +97,7 @@ static void CB2_TourneyTree(void);
static void VblankCb_TourneyInfoCard(void);
static void DisplayMatchInfoOnCard(u8, u8);
static void DisplayTrainerInfoOnCard(u8, u8);
-static int BufferDomeWinString(u8, u8*);
+static int BufferDomeWinString(u8, u8 *);
static u8 GetDomeBrainTrainerPicId(void);
static u8 GetDomeBrainTrainerClass(void);
static void CopyDomeBrainTrainerName(u8 *);
@@ -108,8 +108,8 @@ static u8 UpdateTourneyTreeCursor(u8);
static void DecideRoundWinners(u8);
static u8 GetOpposingNPCTournamentIdByRound(u8, u8);
static void DrawTourneyAdvancementLine(u8, u8);
-static void SpriteCb_HorizontalScrollArrow(struct Sprite *);
-static void SpriteCb_VerticalScrollArrow(struct Sprite *);
+static void SpriteCB_HorizontalScrollArrow(struct Sprite *);
+static void SpriteCB_VerticalScrollArrow(struct Sprite *);
static void InitDomeChallenge(void);
static void GetDomeData(void);
static void SetDomeData(void);
@@ -894,7 +894,7 @@ static const struct OamData sOamData_TourneyTreePokeball =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -912,7 +912,7 @@ static const struct OamData sOamData_TourneyTreeCloseButton =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -929,7 +929,7 @@ static const struct OamData sOamData_VerticalScrollArrow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8),
.x = 0,
@@ -946,7 +946,7 @@ static const struct OamData sOamData_HorizontalScrollArrow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16),
.x = 0,
@@ -1089,7 +1089,7 @@ static const struct SpriteTemplate sHorizontalScrollArrowSpriteTemplate =
.anims = sSpriteAnimTable_HorizontalScrollArrow,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = SpriteCb_HorizontalScrollArrow
+ .callback = SpriteCB_HorizontalScrollArrow
};
static const struct SpriteTemplate sVerticalScrollArrowSpriteTemplate =
@@ -1100,7 +1100,7 @@ static const struct SpriteTemplate sVerticalScrollArrowSpriteTemplate =
.anims = sSpriteAnimTable_VerticalScrollArrow,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = SpriteCb_VerticalScrollArrow
+ .callback = SpriteCB_VerticalScrollArrow
};
// Organized by seed starting position, i.e. seed 0 battles seed 8 first
@@ -2763,7 +2763,7 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int mode)
{
typePower = 8;
#ifdef BUGFIX
- return;
+ return typePower;
#endif
}
}
@@ -3098,7 +3098,7 @@ static void Task_ShowTourneyInfoCard(u8 taskId)
// Note: Card scrolling up means the current card goes down and another one appears from top.
// The same is true for scrolling left.
// That means that the sprite needs to move with the moving card in the opposite scrolling direction.
-static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
+static void SpriteCB_TrainerIconCardScrollUp(struct Sprite *sprite)
{
sprite->y += 4;
if (sprite->data[0] != 0)
@@ -3118,7 +3118,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
}
}
-static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
+static void SpriteCB_TrainerIconCardScrollDown(struct Sprite *sprite)
{
sprite->y -= 4;
if (sprite->data[0] != 0)
@@ -3138,7 +3138,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
}
}
-static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
+static void SpriteCB_TrainerIconCardScrollLeft(struct Sprite *sprite)
{
sprite->x += 4;
if (sprite->data[0] != 0)
@@ -3158,7 +3158,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
}
}
-static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
+static void SpriteCB_TrainerIconCardScrollRight(struct Sprite *sprite)
{
sprite->x -= 4;
if (sprite->data[0] != 0)
@@ -3180,13 +3180,13 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
#define sMonIconStill data[3]
-static void SpriteCb_MonIcon(struct Sprite *sprite)
+static void SpriteCB_MonIconDomeInfo(struct Sprite *sprite)
{
if (!sprite->sMonIconStill)
UpdateMonIconFrame(sprite);
}
-static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
+static void SpriteCB_MonIconCardScrollUp(struct Sprite *sprite)
{
if (!sprite->sMonIconStill)
UpdateMonIconFrame(sprite);
@@ -3196,7 +3196,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
if (sprite->y >= -16)
sprite->invisible = FALSE;
if (++sprite->data[1] == 40)
- sprite->callback = SpriteCb_MonIcon;
+ sprite->callback = SpriteCB_MonIconDomeInfo;
}
else
{
@@ -3208,7 +3208,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
}
}
-static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
+static void SpriteCB_MonIconCardScrollDown(struct Sprite *sprite)
{
if (!sprite->sMonIconStill)
UpdateMonIconFrame(sprite);
@@ -3218,7 +3218,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
if (sprite->y <= 176)
sprite->invisible = FALSE;
if (++sprite->data[1] == 40)
- sprite->callback = SpriteCb_MonIcon;
+ sprite->callback = SpriteCB_MonIconDomeInfo;
}
else
{
@@ -3230,7 +3230,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
}
}
-static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
+static void SpriteCB_MonIconCardScrollLeft(struct Sprite *sprite)
{
if (!sprite->sMonIconStill)
UpdateMonIconFrame(sprite);
@@ -3240,7 +3240,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
if (sprite->x >= -16)
sprite->invisible = FALSE;
if (++sprite->data[1] == 64)
- sprite->callback = SpriteCb_MonIcon;
+ sprite->callback = SpriteCB_MonIconDomeInfo;
}
else
{
@@ -3252,7 +3252,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
}
}
-static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
+static void SpriteCB_MonIconCardScrollRight(struct Sprite *sprite)
{
if (!sprite->sMonIconStill)
UpdateMonIconFrame(sprite);
@@ -3262,7 +3262,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
if (sprite->x <= DISPLAY_WIDTH + 16)
sprite->invisible = FALSE;
if (++sprite->data[1] == 64)
- sprite->callback = SpriteCb_MonIcon;
+ sprite->callback = SpriteCB_MonIconDomeInfo;
}
else
{
@@ -3274,7 +3274,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
}
}
-static void SpriteCb_HorizontalScrollArrow(struct Sprite *sprite)
+static void SpriteCB_HorizontalScrollArrow(struct Sprite *sprite)
{
int taskId1 = sprite->data[0];
int arrId = gTasks[gTasks[taskId1].data[4]].data[1];
@@ -3343,7 +3343,7 @@ static void SpriteCb_HorizontalScrollArrow(struct Sprite *sprite)
}
}
-static void SpriteCb_VerticalScrollArrow(struct Sprite *sprite)
+static void SpriteCB_VerticalScrollArrow(struct Sprite *sprite)
{
int taskId1 = sprite->data[0];
@@ -3509,7 +3509,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollUp;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollUp;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3520,7 +3520,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollUp;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollUp;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3533,7 +3533,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollUp;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollUp;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3544,7 +3544,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollUp;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollUp;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3625,7 +3625,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollDown;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollDown;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3636,7 +3636,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollDown;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollDown;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3649,7 +3649,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollDown;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollDown;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3660,7 +3660,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollDown;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollDown;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3708,7 +3708,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3719,7 +3719,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3732,7 +3732,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3743,7 +3743,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3791,7 +3791,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3802,7 +3802,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3815,7 +3815,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3826,7 +3826,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollLeft;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollLeft;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3872,7 +3872,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3883,7 +3883,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3896,7 +3896,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3907,7 +3907,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3955,7 +3955,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3966,7 +3966,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot ^ 1;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3979,7 +3979,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_TrainerIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_TrainerIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -3990,7 +3990,7 @@ static void Task_HandleInfoCardInput(u8 taskId)
{
if (sInfoCard->spriteIds[i] != SPRITE_NONE)
{
- gSprites[sInfoCard->spriteIds[i]].callback = SpriteCb_MonIconCardScrollRight;
+ gSprites[sInfoCard->spriteIds[i]].callback = SpriteCB_MonIconCardScrollRight;
gSprites[sInfoCard->spriteIds[i]].data[0] = gTasks[taskId].tUsingAlternateSlot;
gSprites[sInfoCard->spriteIds[i]].data[1] = 0;
gSprites[sInfoCard->spriteIds[i]].data[2] = i;
@@ -4280,7 +4280,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
if (trainerId == TRAINER_PLAYER)
{
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[trainerTourneyId][i],
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sInfoTrainerMonX[i],
y + sInfoTrainerMonY[i],
0, 0);
@@ -4289,7 +4289,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
else if (trainerId == TRAINER_FRONTIER_BRAIN)
{
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[trainerTourneyId][i],
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sInfoTrainerMonX[i],
y + sInfoTrainerMonY[i],
0, 0);
@@ -4298,7 +4298,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
else
{
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[DOME_MONS[trainerTourneyId][i]].species,
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sInfoTrainerMonX[i],
y + sInfoTrainerMonY[i],
0, 0);
@@ -4768,7 +4768,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
if (trainerIds[0] == TRAINER_PLAYER)
{
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[0]][i],
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sLeftTrainerMonX[i],
y + sLeftTrainerMonY[i],
0, 0);
@@ -4777,7 +4777,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN)
{
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[0]][i],
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sLeftTrainerMonX[i],
y + sLeftTrainerMonY[i],
0, 0);
@@ -4786,7 +4786,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
else
{
sInfoCard->spriteIds[2 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[DOME_MONS[tournamentIds[0]][i]].species,
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sLeftTrainerMonX[i],
y + sLeftTrainerMonY[i],
0, 0);
@@ -4808,7 +4808,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
if (trainerIds[1] == TRAINER_PLAYER)
{
sInfoCard->spriteIds[5 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[1]][i],
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sRightTrainerMonX[i],
y + sRightTrainerMonY[i],
0, 0);
@@ -4817,7 +4817,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN)
{
sInfoCard->spriteIds[5 + i + arrId] = CreateMonIcon(DOME_MONS[tournamentIds[1]][i],
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sRightTrainerMonX[i],
y + sRightTrainerMonY[i],
0, 0);
@@ -4826,7 +4826,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
else
{
sInfoCard->spriteIds[5 + i + arrId] = CreateMonIcon(gFacilityTrainerMons[DOME_MONS[tournamentIds[1]][i]].species,
- SpriteCb_MonIcon,
+ SpriteCB_MonIconDomeInfo,
x | sRightTrainerMonX[i],
y + sRightTrainerMonY[i],
0, 0);
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index 3085277022..6f9a2efb3a 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -410,7 +410,7 @@ static const struct OamData sOam_Select_Pokeball =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -427,7 +427,7 @@ static const struct OamData sOam_Select_Arrow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -444,7 +444,7 @@ static const struct OamData sOam_Select_MenuHighlight =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -461,7 +461,7 @@ static const struct OamData sOam_Select_MonPicBgAnim =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -661,7 +661,7 @@ static const struct OamData sOam_Swap_Pokeball =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -678,7 +678,7 @@ static const struct OamData sOam_Swap_Arrow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -695,7 +695,7 @@ static const struct OamData sOam_Swap_MenuHighlight =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -712,7 +712,7 @@ static const struct OamData sOam_Swap_MonPicBgAnim =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -1747,9 +1747,9 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId)
u16 monId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
sFactorySelectScreen->mons[i + firstMonId].monId = monId;
if (i < rentalRank)
- ivs = GetFactoryMonFixedIV(challengeNum + 1, 0);
+ ivs = GetFactoryMonFixedIV(challengeNum + 1, FALSE);
else
- ivs = GetFactoryMonFixedIV(challengeNum, 0);
+ ivs = GetFactoryMonFixedIV(challengeNum, FALSE);
CreateMonWithEVSpreadNatureOTID(&sFactorySelectScreen->mons[i + firstMonId].monData,
gFacilityTrainerMons[monId].species,
level,
@@ -2473,7 +2473,7 @@ static void Swap_Task_HandleYesNo(u8 taskId)
gTasks[taskId].tSaidYes = TRUE;
hiPtr = gTasks[taskId].tFollowUpTaskPtrHi;
loPtr = gTasks[taskId].tFollowUpTaskPtrLo;
- gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr);
+ gTasks[taskId].func = (void *)((hiPtr << 16) | loPtr);
}
else
{
@@ -2482,7 +2482,7 @@ static void Swap_Task_HandleYesNo(u8 taskId)
Swap_ErasePopupMenu(SWAP_WIN_YES_NO);
hiPtr = gTasks[taskId].tFollowUpTaskPtrHi;
loPtr = gTasks[taskId].tFollowUpTaskPtrLo;
- gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr);
+ gTasks[taskId].func = (void *)((hiPtr << 16) | loPtr);
}
}
else if (JOY_NEW(B_BUTTON))
@@ -2492,7 +2492,7 @@ static void Swap_Task_HandleYesNo(u8 taskId)
Swap_ErasePopupMenu(SWAP_WIN_YES_NO);
hiPtr = gTasks[taskId].tFollowUpTaskPtrHi;
loPtr = gTasks[taskId].tFollowUpTaskPtrLo;
- gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr);
+ gTasks[taskId].func = (void *)((hiPtr << 16) | loPtr);
}
else if (JOY_REPEAT(DPAD_UP))
{
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index c911329638..8cd23098f2 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -28,8 +28,8 @@
#include "constants/battle_palace.h"
extern const u8 gBattlePalaceNatureToMoveTarget[];
-extern const u8 * const gBattleAnims_General[];
-extern const u8 * const gBattleAnims_Special[];
+extern const u8 *const gBattleAnims_General[];
+extern const u8 *const gBattleAnims_Special[];
extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
@@ -115,7 +115,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
{
s32 i, var1, var2;
s32 chosenMoveId = -1;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, MOVE_LIMITATIONS_ALL);
s32 percent = Random() % 100;
@@ -1173,7 +1173,7 @@ void HideBattlerShadowSprite(u8 battlerId)
// Color the background tiles surrounding the action selection and move windows
void FillAroundBattleWindows(void)
{
- u16 *vramPtr = (u16*)(VRAM + 0x240);
+ u16 *vramPtr = (u16 *)(VRAM + 0x240);
s32 i;
s32 j;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 4dc19f2075..a504cf1c0e 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -158,7 +158,7 @@ enum
};
static const u8 *GetHealthboxElementGfxPtr(u8);
-static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *, u32, u32, u32, u32 *);
+static u8 *AddTextPrinterAndCreateWindowOnHealthbox(const u8 *, u32, u32, u32, u32 *);
static void RemoveWindowOnHealthbox(u32 windowId);
static void UpdateHpTextInHealthboxInDoubles(u8, s16, u8);
@@ -201,7 +201,7 @@ static const struct OamData sOamData_64x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -273,7 +273,7 @@ static const struct OamData sOamData_Healthbar =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -502,7 +502,7 @@ static const struct OamData sOamData_StatusSummaryBalls =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -833,7 +833,7 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId)
healthBarSpritePtr->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
healthBarSpritePtr->oam.priority = 1;
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + healthBarSpritePtr->oam.tileNum * TILE_SIZE_4BPP), 64);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + healthBarSpritePtr->oam.tileNum * TILE_SIZE_4BPP), 64);
gSprites[healthboxLeftSpriteId].hMain_HealthBarSpriteId = healthbarSpriteId;
gSprites[healthboxLeftSpriteId].hMain_Battler = battlerId;
@@ -1101,7 +1101,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
{
- objVram = (void*)(OBJ_VRAM0);
+ objVram = (void *)(OBJ_VRAM0);
if (!IsDoubleBattle())
objVram += spriteTileNum + 0x820;
else
@@ -1109,7 +1109,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
}
else
{
- objVram = (void*)(OBJ_VRAM0);
+ objVram = (void *)(OBJ_VRAM0);
objVram += spriteTileNum + 0x400;
}
TextIntoHealthboxObject(objVram, windowTileData, 3);
@@ -1130,7 +1130,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
{
ConvertIntToDecimalStringN(text, value, STR_CONV_MODE_RIGHT_ALIGN, 3);
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 2, &windowId);
- objVram = (void*)(OBJ_VRAM0);
+ objVram = (void *)(OBJ_VRAM0);
objVram += spriteTileNum + 0xB40;
HpTextIntoHealthboxObject(objVram, windowTileData, 2);
RemoveWindowOnHealthbox(windowId);
@@ -1141,10 +1141,10 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
text[3] = CHAR_SLASH;
text[4] = EOS;
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 4, 5, 2, &windowId);
- objVram = (void*)(OBJ_VRAM0);
+ objVram = (void *)(OBJ_VRAM0);
objVram += spriteTileNum + 0x3E0;
HpTextIntoHealthboxObject(objVram, windowTileData, 1);
- objVram = (void*)(OBJ_VRAM0);
+ objVram = (void *)(OBJ_VRAM0);
objVram += spriteTileNum + 0xB00;
HpTextIntoHealthboxObject(objVram, windowTileData + 0x20, 2);
RemoveWindowOnHealthbox(windowId);
@@ -1186,7 +1186,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
for (i = 0; i < 3; i++)
{
CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[i * 64 + 32],
- (void*)((OBJ_VRAM0) + TILE_SIZE_4BPP * (gSprites[healthboxSpriteId].oam.tileNum + var + i)),
+ (void *)((OBJ_VRAM0) + TILE_SIZE_4BPP * (gSprites[healthboxSpriteId].oam.tileNum + var + i)),
0x20);
}
}
@@ -1205,16 +1205,16 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
if (gBattleSpritesDataPtr->battlerData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible
{
spriteTileNum = gSprites[gSprites[healthboxSpriteId].data[5]].oam.tileNum * TILE_SIZE_4BPP;
- objVram = (void*)(OBJ_VRAM0) + spriteTileNum;
+ objVram = (void *)(OBJ_VRAM0) + spriteTileNum;
if (maxOrCurrent != HP_CURRENT) // doubles, max hp
{
ConvertIntToDecimalStringN(text, value, STR_CONV_MODE_RIGHT_ALIGN, 3);
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 0, &windowId);
- HpTextIntoHealthboxObject((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2);
+ HpTextIntoHealthboxObject((void *)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2);
RemoveWindowOnHealthbox(windowId);
CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END),
- (void*)(OBJ_VRAM0 + 0x680) + (gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP),
+ (void *)(OBJ_VRAM0 + 0x680) + (gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP),
0x20);
}
else
@@ -1224,7 +1224,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
text[4] = EOS;
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 4, 5, 0, &windowId);
FillHealthboxObject(objVram, 0, 3); // Erases HP bar leftover.
- HpTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x60) + spriteTileNum, windowTileData, 3);
+ HpTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x60) + spriteTileNum, windowTileData, 3);
RemoveWindowOnHealthbox(windowId);
}
}
@@ -1257,13 +1257,13 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
if (i < 3)
{
CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[((i - var) * 64) + 32],
- (void*)((OBJ_VRAM0) + 32 * (1 + gSprites[r7].oam.tileNum + i)),
+ (void *)((OBJ_VRAM0) + 32 * (1 + gSprites[r7].oam.tileNum + i)),
0x20);
}
else
{
CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[((i - var) * 64) + 32],
- (void*)((OBJ_VRAM0 + 0x20) + 32 * (i + gSprites[r7].oam.tileNum)),
+ (void *)((OBJ_VRAM0 + 0x20) + 32 * (i + gSprites[r7].oam.tileNum)),
0x20);
}
}
@@ -1271,16 +1271,16 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
if (maxOrCurrent == HP_CURRENT)
{
CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[224],
- (void*)((OBJ_VRAM0) + ((gSprites[r7].oam.tileNum + 4) * TILE_SIZE_4BPP)),
+ (void *)((OBJ_VRAM0) + ((gSprites[r7].oam.tileNum + 4) * TILE_SIZE_4BPP)),
0x20);
- CpuFill32(0, (void*)((OBJ_VRAM0) + (gSprites[r7].oam.tileNum * TILE_SIZE_4BPP)), 0x20);
+ CpuFill32(0, (void *)((OBJ_VRAM0) + (gSprites[r7].oam.tileNum * TILE_SIZE_4BPP)), 0x20);
}
else
{
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // Impossible to reach part, because the battlerId is from the opponent's side.
{
CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END),
- (void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * TILE_SIZE_4BPP),
+ (void *)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * TILE_SIZE_4BPP),
0x20);
}
}
@@ -1320,11 +1320,11 @@ static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon)
for (j = 1; j < var + 1; j++)
{
spriteTileNum = (gSprites[healthboxSpriteId].oam.tileNum + (j - (j / 8 * 8)) + (j / 8 * 64)) * TILE_SIZE_4BPP;
- CpuCopy32(barFontGfx, (void*)(OBJ_VRAM0) + (spriteTileNum), 0x20);
+ CpuCopy32(barFontGfx, (void *)(OBJ_VRAM0) + (spriteTileNum), 0x20);
barFontGfx += 0x20;
spriteTileNum = (8 + gSprites[healthboxSpriteId].oam.tileNum + (j - (j / 8 * 8)) + (j / 8 * 64)) * TILE_SIZE_4BPP;
- CpuCopy32(barFontGfx, (void*)(OBJ_VRAM0) + (spriteTileNum), 0x20);
+ CpuCopy32(barFontGfx, (void *)(OBJ_VRAM0) + (spriteTileNum), 0x20);
barFontGfx += 0x20;
}
@@ -1341,13 +1341,13 @@ static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon)
if (j <= 1)
{
CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20],
- (void*)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * TILE_SIZE_4BPP,
+ (void *)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * TILE_SIZE_4BPP,
32);
}
else
{
CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20],
- (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * TILE_SIZE_4BPP,
+ (void *)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * TILE_SIZE_4BPP,
32);
}
}
@@ -1379,7 +1379,7 @@ void SwapHpBarsWithHpText(void)
{
healthBarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId;
- CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 0x100);
+ CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 0x100);
UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT);
UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX);
}
@@ -1387,7 +1387,7 @@ void SwapHpBarsWithHpText(void)
{
UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gPlayerParty[gBattlerPartyIndexes[i]], HEALTHBOX_HEALTH_BAR);
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END_BAR), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END_BAR), (void *)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
}
}
else
@@ -2150,8 +2150,8 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
{
- TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40 + spriteTileNum), windowTileData, 6);
- ptr = (void*)(OBJ_VRAM0);
+ TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x40 + spriteTileNum), windowTileData, 6);
+ ptr = (void *)(OBJ_VRAM0);
if (!IsDoubleBattle())
ptr += spriteTileNum + 0x800;
else
@@ -2160,7 +2160,7 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
}
else
{
- TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x20 + spriteTileNum), windowTileData, 7);
+ TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x20 + spriteTileNum), windowTileData, 7);
}
RemoveWindowOnHealthbox(windowId);
@@ -2184,9 +2184,9 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId;
if (noStatus)
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_STATUS_BALL_CAUGHT), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_STATUS_BALL_CAUGHT), (void *)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
else
- CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
+ CpuFill32(0, (void *)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
}
static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
@@ -2244,7 +2244,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
statusGfxPtr = GetHealthboxElementGfxPtr(HEALTHBOX_GFX_39);
for (i = 0; i < 3; i++)
- CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * TILE_SIZE_4BPP), 32);
+ CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * TILE_SIZE_4BPP), 32);
if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)
CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 64);
@@ -2257,14 +2257,14 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
pltAdder += battlerId + 12;
FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2);
- CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void*)(OBJ_PLTT + pltAdder * 2), 2);
- CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96);
+ CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void *)(OBJ_PLTT + pltAdder * 2), 2);
+ CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96);
if (IsDoubleBattle() == TRUE || GetBattlerSide(battlerId) == B_SIDE_OPPONENT)
{
if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)
{
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 32);
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 1) * TILE_SIZE_4BPP), 32);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 32);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void *)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 1) * TILE_SIZE_4BPP), 32);
}
}
TryAddPokeballIconToHealthbox(healthboxSpriteId, FALSE);
@@ -2337,8 +2337,8 @@ static void UpdateSafariBallsTextOnHealthbox(u8 healthboxSpriteId)
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(gText_SafariBalls, 0, 3, 2, &windowId);
spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP;
- TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6);
- TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2);
+ TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6);
+ TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2);
RemoveWindowOnHealthbox(windowId);
}
@@ -2354,8 +2354,8 @@ static void UpdateLeftNoOfBallsTextOnHealthbox(u8 healthboxSpriteId)
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, GetStringRightAlignXOffset(FONT_SMALL, text, 0x2F), 3, 2, &windowId);
spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP;
- SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2);
- SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4);
+ SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2);
+ SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4);
RemoveWindowOnHealthbox(windowId);
}
@@ -2504,10 +2504,10 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar)
u8 healthbarSpriteId = gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].hMain_HealthBarSpriteId;
if (i < 2)
CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32,
- (void*)(OBJ_VRAM0 + (gSprites[healthbarSpriteId].oam.tileNum + 2 + i) * TILE_SIZE_4BPP), 32);
+ (void *)(OBJ_VRAM0 + (gSprites[healthbarSpriteId].oam.tileNum + 2 + i) * TILE_SIZE_4BPP), 32);
else
CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32,
- (void*)(OBJ_VRAM0 + 64 + (i + gSprites[healthbarSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32);
+ (void *)(OBJ_VRAM0 + 64 + (i + gSprites[healthbarSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32);
}
break;
case EXP_BAR:
@@ -2526,10 +2526,10 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar)
{
if (i < 4)
CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_12) + array[i] * 32,
- (void*)(OBJ_VRAM0 + (gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum + 0x24 + i) * TILE_SIZE_4BPP), 32);
+ (void *)(OBJ_VRAM0 + (gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum + 0x24 + i) * TILE_SIZE_4BPP), 32);
else
CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_12) + array[i] * 32,
- (void*)(OBJ_VRAM0 + 0xB80 + (i + gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32);
+ (void *)(OBJ_VRAM0 + 0xB80 + (i + gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32);
}
break;
}
@@ -2716,7 +2716,7 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp)
return result;
}
-static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, u32 bgColor, u32 *windowId)
+static u8 *AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, u32 bgColor, u32 *windowId)
{
u16 winId;
u8 color[3];
@@ -2732,7 +2732,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
AddTextPrinterParameterized4(winId, FONT_SMALL, x, y, 0, 0, color, TEXT_SKIP_DRAW, str);
*windowId = winId;
- return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));
+ return (u8 *)(GetWindowAttribute(winId, WINDOW_TILE_DATA));
}
static void RemoveWindowOnHealthbox(u32 windowId)
@@ -2886,7 +2886,7 @@ static u8* AddTextPrinterAndCreateWindowOnAbilityPopUp(const u8 *str, u32 x, u32
FillWindowPixelBuffer(*windowId, PIXEL_FILL(color1));
AddTextPrinterParameterized4(*windowId, 0, x, y, 0, 0, color, -1, str);
- return (u8*)(GetWindowAttribute(*windowId, WINDOW_TILE_DATA));
+ return (u8 *)(GetWindowAttribute(*windowId, WINDOW_TILE_DATA));
}
static void TextIntoAbilityPopUp(void *dest, u8 *windowTileData, s32 arg2, bool32 arg3)
diff --git a/src/battle_main.c b/src/battle_main.c
index 383f5efc08..e64dab4b10 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -83,12 +83,12 @@ static void EndLinkBattleInSteps(void);
static void CB2_InitAskRecordBattle(void);
static void CB2_AskRecordBattle(void);
static void AskRecordBattle(void);
-static void SpriteCb_MoveWildMonToRight(struct Sprite *sprite);
-static void SpriteCb_WildMonShowHealthbox(struct Sprite *sprite);
-static void SpriteCb_WildMonAnimate(struct Sprite *sprite);
+static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite);
+static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite);
+static void SpriteCB_WildMonAnimate(struct Sprite *sprite);
static void SpriteCB_Flicker(struct Sprite *sprite);
static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
-static void SpriteCb_BlinkVisible(struct Sprite *sprite);
+static void SpriteCB_BlinkVisible(struct Sprite *sprite);
static void SpriteCB_Idle(struct Sprite *sprite);
static void SpriteCB_BattleSpriteSlideLeft(struct Sprite *sprite);
static void TurnValuesCleanUp(bool8 var0);
@@ -115,7 +115,7 @@ static void HandleEndTurn_BattleLost(void);
static void HandleEndTurn_RanFromBattle(void);
static void HandleEndTurn_MonFled(void);
static void HandleEndTurn_FinishBattle(void);
-static void SpriteCB_UnusedBattleInit(struct Sprite* sprite);
+static void SpriteCB_UnusedBattleInit(struct Sprite *sprite);
static void SpriteCB_UnusedBattleInit_Main(struct Sprite *sprite);
static void TrySpecialEvolution(void);
@@ -436,7 +436,7 @@ const u8 gStatusConditionString_IceJpn[] = _("こおり$$$$");
const u8 gStatusConditionString_ConfusionJpn[] = _("こんらん$$$");
const u8 gStatusConditionString_LoveJpn[] = _("メロメロ$$$");
-const u8 * const gStatusConditionStringsTable[][2] =
+const u8 *const gStatusConditionStringsTable[][2] =
{
{gStatusConditionString_PoisonJpn, gText_Poison},
{gStatusConditionString_SleepJpn, gText_Sleep},
@@ -485,7 +485,7 @@ static void CB2_InitBattleInternal(void)
SetHBlankCallback(NULL);
SetVBlankCallback(NULL);
- CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFill32(0, (void *)(VRAM), VRAM_SIZE);
SetGpuReg(REG_OFFSET_MOSAIC, 0);
SetGpuReg(REG_OFFSET_WIN0H, DISPLAY_WIDTH);
@@ -651,8 +651,7 @@ static void SetPlayerBerryDataInBattleStruct(void)
static void SetAllPlayersBerryData(void)
{
- s32 i;
- s32 j;
+ s32 i, j;
if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
{
@@ -695,8 +694,8 @@ static void SetAllPlayersBerryData(void)
gEnigmaBerries[2].itemEffect[i] = 0;
}
- gEnigmaBerries[0].holdEffect = 0;
- gEnigmaBerries[2].holdEffect = 0;
+ gEnigmaBerries[0].holdEffect = HOLD_EFFECT_NONE;
+ gEnigmaBerries[2].holdEffect = HOLD_EFFECT_NONE;
gEnigmaBerries[0].holdEffectParam = 0;
gEnigmaBerries[2].holdEffectParam = 0;
}
@@ -946,7 +945,7 @@ static void CB2_HandleStartBattle(void)
// Recv Pokémon 5-6
ResetBlockReceivedFlags();
memcpy(&gEnemyParty[4], gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-
+
TryCorrectShedinjaLanguage(&gEnemyParty[0]);
TryCorrectShedinjaLanguage(&gEnemyParty[1]);
TryCorrectShedinjaLanguage(&gEnemyParty[2]);
@@ -1682,7 +1681,7 @@ static void CB2_HandleStartMultiBattle(void)
case 8:
if (IsLinkTaskFinished())
{
- u32* ptr = gBattleStruct->multiBuffer.battleVideo;
+ u32 *ptr = gBattleStruct->multiBuffer.battleVideo;
ptr[0] = gBattleTypeFlags;
ptr[1] = gRecordedBattleRngSeed; // UB: overwrites berry data
SendBlock(BitmaskAllOtherLinkPlayers(), ptr, sizeof(gBattleStruct->multiBuffer.battleVideo));
@@ -1768,7 +1767,7 @@ void CB2_QuitRecordedBattle(void)
#define sState data[0]
#define sDelay data[4]
-static void SpriteCB_UnusedBattleInit(struct Sprite* sprite)
+static void SpriteCB_UnusedBattleInit(struct Sprite *sprite)
{
sprite->sState = 0;
sprite->callback = SpriteCB_UnusedBattleInit_Main;
@@ -1776,7 +1775,7 @@ static void SpriteCB_UnusedBattleInit(struct Sprite* sprite)
static void SpriteCB_UnusedBattleInit_Main(struct Sprite *sprite)
{
- u16 *arr = (u16*)gDecompressionBuffer;
+ u16 *arr = (u16 *)gDecompressionBuffer;
switch (sprite->sState)
{
@@ -2048,7 +2047,7 @@ void CB2_InitEndLinkBattle(void)
}
else
{
- CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFill32(0, (void *)(VRAM), VRAM_SIZE);
SetGpuReg(REG_OFFSET_MOSAIC, 0);
SetGpuReg(REG_OFFSET_WIN0H, DISPLAY_WIDTH);
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(DISPLAY_HEIGHT / 2, DISPLAY_HEIGHT / 2 + 1));
@@ -2189,7 +2188,7 @@ static void EndLinkBattleInSteps(void)
}
break;
case 3:
- CpuFill32(0, (void*)VRAM, VRAM_SIZE);
+ CpuFill32(0, (void *)VRAM, VRAM_SIZE);
for (i = 0; i < 2; i++)
LoadChosenBattleElement(i);
@@ -2276,7 +2275,7 @@ static void CB2_InitAskRecordBattle(void)
SetHBlankCallback(NULL);
SetVBlankCallback(NULL);
- CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFill32(0, (void *)(VRAM), VRAM_SIZE);
ResetPaletteFade();
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
@@ -2359,7 +2358,7 @@ static void AskRecordBattle(void)
case STATE_PRINT_YES_NO:
if (!IsTextPrinterActive(B_WIN_MSG))
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleCommunication[CURSOR_POSITION] = 1;
BattleCreateYesNoCursorAt(1);
@@ -2395,7 +2394,7 @@ static void AskRecordBattle(void)
if (gBattleCommunication[CURSOR_POSITION] == 0)
{
// Selected Yes
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattleCommunication[1] = MoveRecordedBattleToSaveData();
gBattleCommunication[MULTIUSE_STATE] = STATE_RECORD_YES;
}
@@ -2414,7 +2413,7 @@ static void AskRecordBattle(void)
case STATE_RECORD_NO:
if (IsLinkTaskFinished() == TRUE)
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
if (gMain.anyLinkBattlerHasFrontierPass)
{
// Other battlers may be recording, wait for them
@@ -2520,9 +2519,9 @@ u32 GetBattleWindowTemplatePixelWidth(u32 windowsType, u32 tableId)
#define sBattler data[0]
#define sSpeciesId data[2]
-void SpriteCb_WildMon(struct Sprite *sprite)
+void SpriteCB_WildMon(struct Sprite *sprite)
{
- sprite->callback = SpriteCb_MoveWildMonToRight;
+ sprite->callback = SpriteCB_MoveWildMonToRight;
StartSpriteAnimIfDifferent(sprite, 0);
if (WILD_DOUBLE_BATTLE)
BeginNormalPaletteFade((0x10000 << sprite->sBattler) | (0x10000 << BATTLE_PARTNER(sprite->sBattler)), 0, 10, 10, RGB(8, 8, 8));
@@ -2530,25 +2529,25 @@ void SpriteCb_WildMon(struct Sprite *sprite)
BeginNormalPaletteFade((0x10000 << sprite->sBattler), 0, 10, 10, RGB(8, 8, 8));
}
-static void SpriteCb_MoveWildMonToRight(struct Sprite *sprite)
+static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite)
{
if ((gIntroSlideFlags & 1) == 0)
{
sprite->x2 += 2;
if (sprite->x2 == 0)
{
- sprite->callback = SpriteCb_WildMonShowHealthbox;
+ sprite->callback = SpriteCB_WildMonShowHealthbox;
}
}
}
-static void SpriteCb_WildMonShowHealthbox(struct Sprite *sprite)
+static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite)
{
if (sprite->animEnded)
{
StartHealthboxSlideIn(sprite->sBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]);
- sprite->callback = SpriteCb_WildMonAnimate;
+ sprite->callback = SpriteCB_WildMonAnimate;
StartSpriteAnimIfDifferent(sprite, 0);
if (WILD_DOUBLE_BATTLE)
BeginNormalPaletteFade((0x10000 << sprite->sBattler) | (0x10000 << BATTLE_PARTNER(sprite->sBattler)), 0, 10, 0, RGB(8, 8, 8));
@@ -2557,7 +2556,7 @@ static void SpriteCb_WildMonShowHealthbox(struct Sprite *sprite)
}
}
-static void SpriteCb_WildMonAnimate(struct Sprite *sprite)
+static void SpriteCB_WildMonAnimate(struct Sprite *sprite)
{
if (!gPaletteFade.active)
{
@@ -2648,7 +2647,7 @@ static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite)
}
else // Erase bottom part of the sprite to create a smooth illusion of mon falling down.
{
- u8* dst = gMonSpritesGfxPtr->sprites.byte[GetBattlerPosition(sprite->sBattler)] + (gBattleMonForms[sprite->sBattler] << 11) + (sprite->data[3] << 8);
+ u8 *dst = gMonSpritesGfxPtr->sprites.byte[GetBattlerPosition(sprite->sBattler)] + (gBattleMonForms[sprite->sBattler] << 11) + (sprite->data[3] << 8);
for (i = 0; i < 0x100; i++)
*(dst++) = 0;
@@ -2659,14 +2658,14 @@ static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite)
}
// Used when selecting a move, which can hit multiple targets, in double battles.
-void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite)
+void SpriteCB_ShowAsMoveTarget(struct Sprite *sprite)
{
sprite->data[3] = 8;
sprite->data[4] = sprite->invisible;
- sprite->callback = SpriteCb_BlinkVisible;
+ sprite->callback = SpriteCB_BlinkVisible;
}
-static void SpriteCb_BlinkVisible(struct Sprite *sprite)
+static void SpriteCB_BlinkVisible(struct Sprite *sprite)
{
if (--sprite->data[3] == 0)
{
@@ -2675,7 +2674,7 @@ static void SpriteCb_BlinkVisible(struct Sprite *sprite)
}
}
-void SpriteCb_HideAsMoveTarget(struct Sprite *sprite)
+void SpriteCB_HideAsMoveTarget(struct Sprite *sprite)
{
sprite->invisible = sprite->data[4];
sprite->data[4] = FALSE;
@@ -2847,7 +2846,7 @@ static void SpriteCB_TrainerThrowObject_Main(struct Sprite *sprite)
sprite->callback = SpriteCB_Idle;
}
-// Sprite callback for a trainer back pic to throw an object
+// Sprite callback for a trainer back pic to throw an object
// (Wally throwing a ball, throwing Pokéblocks/balls in the Safari Zone)
void SpriteCB_TrainerThrowObject(struct Sprite *sprite)
{
@@ -2901,22 +2900,22 @@ static void BattleStartClearSetData(void)
gStatuses3[i] = 0;
gStatuses4[i] = 0;
gDisableStructs[i].isFirstTurn = 2;
- gLastMoves[i] = 0;
- gLastLandedMoves[i] = 0;
+ gLastMoves[i] = MOVE_NONE;
+ gLastLandedMoves[i] = MOVE_NONE;
gLastHitByType[i] = 0;
- gLastResultingMoves[i] = 0;
+ gLastResultingMoves[i] = MOVE_NONE;
gLastHitBy[i] = 0xFF;
- gLockedMoves[i] = 0;
- gLastPrintedMoves[i] = 0;
+ gLockedMoves[i] = MOVE_NONE;
+ gLastPrintedMoves[i] = MOVE_NONE;
gBattleResources->flags->flags[i] = 0;
gPalaceSelectionBattleScripts[i] = 0;
- gBattleStruct->lastTakenMove[i] = 0;
- gBattleStruct->choicedMove[i] = 0;
+ gBattleStruct->lastTakenMove[i] = MOVE_NONE;
+ gBattleStruct->choicedMove[i] = MOVE_NONE;
gBattleStruct->changedItems[i] = 0;
- gBattleStruct->lastTakenMoveFrom[i][0] = 0;
- gBattleStruct->lastTakenMoveFrom[i][1] = 0;
- gBattleStruct->lastTakenMoveFrom[i][2] = 0;
- gBattleStruct->lastTakenMoveFrom[i][3] = 0;
+ gBattleStruct->lastTakenMoveFrom[i][0] = MOVE_NONE;
+ gBattleStruct->lastTakenMoveFrom[i][1] = MOVE_NONE;
+ gBattleStruct->lastTakenMoveFrom[i][2] = MOVE_NONE;
+ gBattleStruct->lastTakenMoveFrom[i][3] = MOVE_NONE;
gBattleStruct->AI_monToSwitchIntoId[i] = PARTY_SIZE;
gBattleStruct->skyDropTargets[i] = 0xFF;
}
@@ -3070,11 +3069,11 @@ void SwitchInClearSetData(void)
gMoveResultFlags = 0;
gDisableStructs[gActiveBattler].isFirstTurn = 2;
gDisableStructs[gActiveBattler].truantSwitchInHack = disableStructCopy.truantSwitchInHack;
- gLastMoves[gActiveBattler] = 0;
- gLastLandedMoves[gActiveBattler] = 0;
+ gLastMoves[gActiveBattler] = MOVE_NONE;
+ gLastLandedMoves[gActiveBattler] = MOVE_NONE;
gLastHitByType[gActiveBattler] = 0;
- gLastResultingMoves[gActiveBattler] = 0;
- gLastPrintedMoves[gActiveBattler] = 0;
+ gLastResultingMoves[gActiveBattler] = MOVE_NONE;
+ gLastPrintedMoves[gActiveBattler] = MOVE_NONE;
gLastHitBy[gActiveBattler] = 0xFF;
gBattleStruct->lastTakenMove[gActiveBattler] = 0;
@@ -3092,14 +3091,14 @@ void SwitchInClearSetData(void)
for (i = 0; i < gBattlersCount; i++)
{
if (i != gActiveBattler && GetBattlerSide(i) != GetBattlerSide(gActiveBattler))
- gBattleStruct->lastTakenMove[i] = 0;
+ gBattleStruct->lastTakenMove[i] = MOVE_NONE;
gBattleStruct->lastTakenMoveFrom[i][gActiveBattler] = 0;
}
- gBattleStruct->choicedMove[gActiveBattler] = 0;
+ gBattleStruct->choicedMove[gActiveBattler] = MOVE_NONE;
gBattleResources->flags->flags[gActiveBattler] = 0;
- gCurrentMove = 0;
+ gCurrentMove = MOVE_NONE;
gBattleStruct->arenaTurnCounter = 0xFF;
// Reset damage to prevent things like red card activating if the switched-in mon is holding it
@@ -3169,16 +3168,16 @@ void FaintClearSetData(void)
gDisableStructs[gActiveBattler].isFirstTurn = 2;
- gLastMoves[gActiveBattler] = 0;
- gLastLandedMoves[gActiveBattler] = 0;
+ gLastMoves[gActiveBattler] = MOVE_NONE;
+ gLastLandedMoves[gActiveBattler] = MOVE_NONE;
gLastHitByType[gActiveBattler] = 0;
- gLastResultingMoves[gActiveBattler] = 0;
- gLastPrintedMoves[gActiveBattler] = 0;
+ gLastResultingMoves[gActiveBattler] = MOVE_NONE;
+ gLastPrintedMoves[gActiveBattler] = MOVE_NONE;
gLastHitBy[gActiveBattler] = 0xFF;
- gBattleStruct->choicedMove[gActiveBattler] = 0;
+ gBattleStruct->choicedMove[gActiveBattler] = MOVE_NONE;
gBattleStruct->sameMoveTurns[gActiveBattler] = 0;
- gBattleStruct->lastTakenMove[gActiveBattler] = 0;
+ gBattleStruct->lastTakenMove[gActiveBattler] = MOVE_NONE;
gBattleStruct->lastTakenMoveFrom[gActiveBattler][0] = 0;
gBattleStruct->lastTakenMoveFrom[gActiveBattler][1] = 0;
gBattleStruct->lastTakenMoveFrom[gActiveBattler][2] = 0;
@@ -3192,7 +3191,7 @@ void FaintClearSetData(void)
for (i = 0; i < gBattlersCount; i++)
{
if (i != gActiveBattler && GetBattlerSide(i) != GetBattlerSide(gActiveBattler))
- gBattleStruct->lastTakenMove[i] = 0;
+ gBattleStruct->lastTakenMove[i] = MOVE_NONE;
gBattleStruct->lastTakenMoveFrom[i][gActiveBattler] = 0;
}
@@ -3813,40 +3812,40 @@ u8 IsRunningFromBattleImpossible(void)
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) // Cannot ever run from saving Birch's battle.
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DONT_LEAVE_BIRCH;
- return 1;
+ return BATTLE_RUN_FORBIDDEN;
}
if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT && WILD_DOUBLE_BATTLE
&& IsBattlerAlive(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT))) // The second pokemon cannot run from a double wild battle, unless it's the only alive mon.
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CANT_ESCAPE;
- return 1;
+ return BATTLE_RUN_FORBIDDEN;
}
if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
- return 0;
+ return BATTLE_RUN_SUCCESS;
#if B_GHOSTS_ESCAPE >= GEN_6
if (IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_GHOST))
- return 0;
+ return BATTLE_RUN_SUCCESS;
#endif
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
- return 0;
+ return BATTLE_RUN_SUCCESS;
if (GetBattlerAbility(gActiveBattler) == ABILITY_RUN_AWAY)
- return 0;
+ return BATTLE_RUN_SUCCESS;
if ((i = IsAbilityPreventingEscape(gActiveBattler)))
{
gBattleScripting.battler = i - 1;
gLastUsedAbility = gBattleMons[i - 1].ability;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_PREVENTS_ESCAPE;
- return 2;
+ return BATTLE_RUN_FAILURE;
}
if (!CanBattlerEscape(gActiveBattler))
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CANT_ESCAPE;
- return 1;
+ return BATTLE_RUN_FORBIDDEN;
}
- return 0;
+ return BATTLE_RUN_SUCCESS;
}
void SwitchPartyOrder(u8 battler)
@@ -3856,7 +3855,7 @@ void SwitchPartyOrder(u8 battler)
u8 partyId2;
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
- gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8*)(gBattleStruct->battlerPartyOrders));
+ gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->battlerPartyOrders));
partyId1 = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battler]);
partyId2 = GetPartyIdFromBattlePartyId(*(gBattleStruct->monToSwitchIntoId + battler));
@@ -3866,15 +3865,15 @@ void SwitchPartyOrder(u8 battler)
{
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
{
- *(battler * 3 + i + (u8*)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
- *(BATTLE_PARTNER(battler) * 3 + i + (u8*)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
+ *(battler * 3 + i + (u8 *)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
+ *(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
}
}
else
{
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
{
- *(battler * 3 + i + (u8*)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
+ *(battler * 3 + i + (u8 *)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
}
}
}
@@ -4122,7 +4121,7 @@ static void HandleTurnActionSelectionState(void)
BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
}
- else if (IsRunningFromBattleImpossible()
+ else if (IsRunningFromBattleImpossible() != BATTLE_RUN_SUCCESS
&& gBattleResources->bufferB[gActiveBattler][1] == B_ACTION_RUN)
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintCantEscapeFromBattle;
@@ -4382,13 +4381,13 @@ static void UpdateBattlerPartyOrdersOnSwitch(void)
if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
- *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF;
- *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0);
- *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 1) = gBattleResources->bufferB[gActiveBattler][3];
+ *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF;
+ *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0);
+ *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 1) = gBattleResources->bufferB[gActiveBattler][3];
- *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0);
- *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0) >> 4;
- *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 2) = gBattleResources->bufferB[gActiveBattler][3];
+ *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0);
+ *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0) >> 4;
+ *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 2) = gBattleResources->bufferB[gActiveBattler][3];
}
}
@@ -5197,11 +5196,7 @@ static void TrySpecialEvolution(void) // Attempts to perform non-level related b
for (i = 0; i < PARTY_SIZE; i++)
{
- #ifndef POKEMON_EXPANSION
- u16 species = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_BATTLE_SPECIAL, i);
- #else
- u16 species = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_BATTLE_SPECIAL, i, NULL);
- #endif
+ u16 species = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_BATTLE_SPECIAL, i, NULL);
if (species != SPECIES_NONE && !(sTriedEvolving & gBitTable[i]))
{
sTriedEvolving |= gBitTable[i];
diff --git a/src/battle_message.c b/src/battle_message.c
index 843d0f132d..688a48f256 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -436,7 +436,7 @@ static const u8 sText_ExclamationMark5[] = _("!");
static const u8 sText_Accuracy[] = _("accuracy");
static const u8 sText_Evasiveness[] = _("evasiveness");
-const u8 * const gStatNamesTable[NUM_BATTLE_STATS] =
+const u8 *const gStatNamesTable[NUM_BATTLE_STATS] =
{
gText_HP3, gText_Attack, gText_Defense,
gText_Speed, gText_SpAtk, gText_SpDef,
@@ -449,7 +449,7 @@ static const u8 sText_PokeblockWasTooSweet[] = _("was too sweet!");
static const u8 sText_PokeblockWasTooBitter[] = _("was too bitter!");
static const u8 sText_PokeblockWasTooSour[] = _("was too sour!");
-const u8 * const gPokeblockWasTooXStringTable[FLAVOR_COUNT] =
+const u8 *const gPokeblockWasTooXStringTable[FLAVOR_COUNT] =
{
[FLAVOR_SPICY] = sText_PokeblockWasTooSpicy,
[FLAVOR_DRY] = sText_PokeblockWasTooDry,
@@ -1569,7 +1569,7 @@ const u16 gStatUpStringIds[] =
[B_MSG_STAT_WONT_INCREASE] = STRINGID_STATSWONTINCREASE,
[B_MSG_STAT_ROSE_EMPTY] = STRINGID_EMPTYSTRING3,
[B_MSG_STAT_ROSE_ITEM] = STRINGID_USINGITEMSTATOFPKMNROSE,
- [B_MSG_USED_DIRE_HIT] = STRINGID_PKMNUSEDXTOGETPUMPED,
+ [B_MSG_USED_DIRE_HIT] = STRINGID_PKMNUSEDXTOGETPUMPED,
};
const u16 gStatDownStringIds[] =
@@ -1856,7 +1856,7 @@ const u8 gText_BattleSwitchWhich4[] = _("{ESCAPE 4}");
const u8 gText_BattleSwitchWhich5[] = _("-");
// Unused
-static const u8 * const sStatNamesTable2[] =
+static const u8 *const sStatNamesTable2[] =
{
gText_HP3, gText_SpAtk, gText_Attack,
gText_SpDef, gText_Defense, gText_Speed
@@ -1969,7 +1969,7 @@ static const u8 sText_LostToOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} lost t
static const u8 sText_TiedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} tied the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!");
static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS {B_OPPONENT_MON1_NAME}!\nCommence battling!");
-const u8 * const gRefereeStringsTable[] =
+const u8 *const gRefereeStringsTable[] =
{
[B_MSG_REF_NOTHING_IS_DECIDED] = sText_RefIfNothingIsDecided,
[B_MSG_REF_THATS_IT] = sText_RefThatsIt,
@@ -2627,7 +2627,7 @@ void BufferStringBattle(u16 stringID)
s32 i;
const u8 *stringPtr = NULL;
- gBattleMsgDataPtr = (struct BattleMsgData*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ gBattleMsgDataPtr = (struct BattleMsgData *)(&gBattleResources->bufferA[gActiveBattler][4]);
gLastUsedItem = gBattleMsgDataPtr->lastItem;
gLastUsedAbility = gBattleMsgDataPtr->lastAbility;
gBattleScripting.battler = gBattleMsgDataPtr->scrActive;
@@ -2920,17 +2920,17 @@ void BufferStringBattle(u16 stringID)
BattleStringExpandPlaceholdersToDisplayedString(stringPtr);
}
-u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src)
+u32 BattleStringExpandPlaceholdersToDisplayedString(const u8 *src)
{
BattleStringExpandPlaceholders(src, gDisplayedStringBattle);
}
-static const u8* TryGetStatusString(u8 *src)
+static const u8 *TryGetStatusString(u8 *src)
{
u32 i;
u8 status[8];
u32 chars1, chars2;
- u8* statusPtr;
+ u8 *statusPtr;
memcpy(status, sDummyWeirdStatusString, 8);
@@ -2943,13 +2943,13 @@ static const u8* TryGetStatusString(u8 *src)
statusPtr++;
}
- chars1 = *(u32*)(&status[0]);
- chars2 = *(u32*)(&status[4]);
+ chars1 = *(u32 *)(&status[0]);
+ chars2 = *(u32 *)(&status[4]);
for (i = 0; i < ARRAY_COUNT(gStatusConditionStringsTable); i++)
{
- if (chars1 == *(u32*)(&gStatusConditionStringsTable[i][0][0])
- && chars2 == *(u32*)(&gStatusConditionStringsTable[i][0][4]))
+ if (chars1 == *(u32 *)(&gStatusConditionStringsTable[i][0][0])
+ && chars2 == *(u32 *)(&gStatusConditionStringsTable[i][0][4]))
return gStatusConditionStringsTable[i][1];
}
return NULL;
@@ -3724,7 +3724,7 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
// unused, since the value loaded into the buffer is not read; it loaded one of
// two particles (either "?" or "?") which works in tandem with ChooseTypeOfMoveUsedString
// below to effect changes in the meaning of the line.
-static void ChooseMoveUsedParticle(u8* textBuff)
+static void ChooseMoveUsedParticle(u8 *textBuff)
{
s32 counter = 0;
u32 i = 0;
@@ -3764,7 +3764,7 @@ static void ChooseMoveUsedParticle(u8* textBuff)
//
// sText_ExclamationMark5 was " ????!" This resulted in a translation of
// "'s attack!".
-static void ChooseTypeOfMoveUsedString(u8* dst)
+static void ChooseTypeOfMoveUsedString(u8 *dst)
{
s32 counter = 0;
s32 i = 0;
@@ -3877,7 +3877,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId)
void SetPpNumbersPaletteInMoveSelection(void)
{
- struct ChooseMoveStruct *chooseMoveStruct = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *chooseMoveStruct = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
const u16 *palPtr = gPPTextPalette;
u8 var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[gActiveBattler]],
chooseMoveStruct->maxPp[gMoveSelectionCursor[gActiveBattler]]);
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 2b24e9583e..229f6211ba 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -1253,7 +1253,7 @@ static void Task_DoStatusInflictionScreenFlash(u8 taskId)
{
if (IsStatusInflictionScreenFlashTaskFinished())
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index e2de5cea94..d1f418ccbe 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1480,7 +1480,7 @@ u8 GetTrainerEncounterMusicIdInBattlePyramid(u16 trainerId)
// Unused
static void BattlePyramidRetireChallenge(void)
{
- ScriptContext1_SetupScript(BattlePyramid_Retire);
+ ScriptContext_SetupScript(BattlePyramid_Retire);
}
static u16 GetUniqueTrainerId(u8 objectEventId)
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 66b4cd97d1..9fab996da8 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -309,7 +309,7 @@ static const struct OamData sOamData_PyramidBag =
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -393,7 +393,7 @@ static void OpenBattlePyramidBagInBattle(void)
// make room.
void ChooseItemsToTossFromPyramidBag(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
CreateTask(Task_ChooseItemsToTossFromPyramidBag, 10);
}
@@ -1195,7 +1195,7 @@ static void Task_ChooseHowManyToToss(u8 taskId)
{
// Toss
PlaySE(SE_SELECT);
- ClearStdWindowAndFrameToTransparent(WIN_TOSS_NUM, 0);
+ ClearStdWindowAndFrameToTransparent(WIN_TOSS_NUM, FALSE);
ClearWindowTilemap(WIN_TOSS_NUM);
ScheduleBgCopyTilemapToVram(1);
AskConfirmToss(taskId);
@@ -1204,7 +1204,7 @@ static void Task_ChooseHowManyToToss(u8 taskId)
{
// Cancel tossing
PlaySE(SE_SELECT);
- ClearStdWindowAndFrameToTransparent(WIN_TOSS_NUM, 0);
+ ClearStdWindowAndFrameToTransparent(WIN_TOSS_NUM, FALSE);
ClearWindowTilemap(WIN_TOSS_NUM);
ScheduleBgCopyTilemapToVram(1);
DontTossItem(taskId);
@@ -1464,7 +1464,7 @@ static void PyramidBagPrint_Quantity(u8 windowId, const u8 *src, u8 x, u8 y, u8
static void DrawTossNumberWindow(u8 windowId)
{
- DrawStdFrameWithCustomTileAndPalette(windowId, 0, 1, 0xE);
+ DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 1, 0xE);
ScheduleBgCopyTilemapToVram(1);
}
diff --git a/src/battle_records.c b/src/battle_records.c
index f576d5912d..6cab28d21b 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -388,7 +388,7 @@ static void RemoveTrainerHillRecordsWindow(u8 windowId)
static void ClearVramOamPlttRegs(void)
{
- DmaClearLarge16(3, (void*)(VRAM), VRAM_SIZE, 0x1000);
+ DmaClearLarge16(3, (void *)(VRAM), VRAM_SIZE, 0x1000);
DmaClear32(3, OAM, OAM_SIZE);
DmaClear16(3, PLTT, PLTT_SIZE);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index f997279618..420d5790ce 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -62,7 +62,7 @@
extern struct Evolution gEvolutionTable[][EVOS_PER_MON];
-extern const u8* const gBattleScriptsForMoveEffects[];
+extern const u8 *const gBattleScriptsForMoveEffects[];
// table to avoid ugly powing on gba (courtesy of doesnt)
// this returns (i^2.5)/4
@@ -314,7 +314,7 @@ static void DrawLevelUpWindow1(void);
static void DrawLevelUpWindow2(void);
static void PutMonIconOnLvlUpBanner(void);
static void DrawLevelUpBannerText(void);
-static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite* sprite);
+static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite *sprite);
static bool32 CriticalCapture(u32 odds);
static void Cmd_attackcanceler(void);
@@ -437,7 +437,7 @@ static void Cmd_hpthresholds2(void);
static void Cmd_useitemonopponent(void);
static void Cmd_various(void);
static void Cmd_setprotectlike(void);
-static void Cmd_faintifabilitynotdamp(void);
+static void Cmd_tryexplosion(void);
static void Cmd_setatkhptozero(void);
static void Cmd_jumpifnexttargetvalid(void);
static void Cmd_tryhealhalfhealth(void);
@@ -518,7 +518,7 @@ static void Cmd_setsemiinvulnerablebit(void);
static void Cmd_clearsemiinvulnerablebit(void);
static void Cmd_setminimize(void);
static void Cmd_sethail(void);
-static void Cmd_jumpifattackandspecialattackcannotfall(void);
+static void Cmd_trymemento(void);
static void Cmd_setforcedtarget(void);
static void Cmd_setcharge(void);
static void Cmd_callterrainattack(void);
@@ -696,7 +696,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_useitemonopponent, //0x75
Cmd_various, //0x76
Cmd_setprotectlike, //0x77
- Cmd_faintifabilitynotdamp, //0x78
+ Cmd_tryexplosion, //0x78
Cmd_setatkhptozero, //0x79
Cmd_jumpifnexttargetvalid, //0x7A
Cmd_tryhealhalfhealth, //0x7B
@@ -777,7 +777,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_clearsemiinvulnerablebit, //0xC6
Cmd_setminimize, //0xC7
Cmd_sethail, //0xC8
- Cmd_jumpifattackandspecialattackcannotfall, //0xC9
+ Cmd_trymemento, //0xC9
Cmd_setforcedtarget, //0xCA
Cmd_setcharge, //0xCB
Cmd_callterrainattack, //0xCC
@@ -870,7 +870,7 @@ static const u32 sStatusFlagsForMoveEffects[NUM_MOVE_EFFECTS] =
[MOVE_EFFECT_THRASH] = STATUS2_LOCK_CONFUSE,
};
-static const u8* const sMoveEffectBS_Ptrs[] =
+static const u8 *const sMoveEffectBS_Ptrs[] =
{
[MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep,
[MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison,
@@ -886,7 +886,8 @@ static const u8* const sMoveEffectBS_Ptrs[] =
[MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil,
};
-static const struct WindowTemplate sUnusedWinTemplate = {
+static const struct WindowTemplate sUnusedWinTemplate =
+{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 3,
@@ -904,7 +905,7 @@ static const struct OamData sOamData_MonIconOnLvlUpBanner =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -1580,7 +1581,7 @@ static void Cmd_jumpifaffectedbyprotect(void)
}
}
-bool8 JumpIfMoveAffectedByProtect(u16 move)
+static bool8 JumpIfMoveAffectedByProtect(u16 move)
{
bool8 affected = FALSE;
if (IsBattlerProtected(gBattlerTarget, move))
@@ -1781,7 +1782,8 @@ static void Cmd_accuracycheck(void)
static void Cmd_attackstring(void)
{
if (gBattleControllerExecFlags)
- return;
+ return;
+
if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED)))
{
PrepareStringBattle(STRINGID_USEDMOVE, gBattlerAttacker);
@@ -2150,8 +2152,8 @@ static void Cmd_attackanimation(void)
multihit = gMultiHitCounter;
BtlController_EmitMoveAnimation(BUFFER_A, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattlerAttacker].friendship, &gDisableStructs[gBattlerAttacker], multihit);
- gBattleScripting.animTurn += 1;
- gBattleScripting.animTargetsHit += 1;
+ gBattleScripting.animTurn++;
+ gBattleScripting.animTargetsHit++;
MarkBattlerForControllerExec(gBattlerAttacker);
gBattlescriptCurrInstr++;
}
@@ -2547,7 +2549,7 @@ static void Cmd_printfromtable(void)
{
if (gBattleControllerExecFlags == 0)
{
- const u16 *ptr = (const u16*) T1_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1);
ptr += gBattleCommunication[MULTISTRING_CHOOSER];
gBattlescriptCurrInstr += 5;
@@ -2560,7 +2562,7 @@ static void Cmd_printselectionstringfromtable(void)
{
if (gBattleControllerExecFlags == 0)
{
- const u16 *ptr = (const u16*) T1_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1);
ptr += gBattleCommunication[MULTISTRING_CHOOSER];
gActiveBattler = gBattlerAttacker;
@@ -3067,7 +3069,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
if (NoAliveMonsForEitherParty()
|| ChangeStatBuffs(SET_STAT_BUFF_VALUE(1),
gBattleScripting.moveEffect - MOVE_EFFECT_ATK_PLUS_1 + 1,
- affectsUser | STAT_BUFF_UPDATE_MOVE_EFFECT, 0))
+ affectsUser | STAT_CHANGE_UPDATE_MOVE_EFFECT, 0))
{
gBattlescriptCurrInstr++;
}
@@ -3088,11 +3090,11 @@ void SetMoveEffect(bool32 primary, u32 certain)
case MOVE_EFFECT_EVS_MINUS_1:
flags = affectsUser;
if (mirrorArmorReflected && !affectsUser)
- flags |= STAT_BUFF_ALLOW_PTR;
+ flags |= STAT_CHANGE_ALLOW_PTR;
if (ChangeStatBuffs(SET_STAT_BUFF_VALUE(1) | STAT_BUFF_NEGATIVE,
- gBattleScripting.moveEffect - MOVE_EFFECT_ATK_MINUS_1 + 1,
- flags | STAT_BUFF_UPDATE_MOVE_EFFECT, gBattlescriptCurrInstr + 1))
+ gBattleScripting.moveEffect - MOVE_EFFECT_ATK_MINUS_1 + 1,
+ flags | STAT_CHANGE_UPDATE_MOVE_EFFECT, gBattlescriptCurrInstr + 1))
{
if (!mirrorArmorReflected)
gBattlescriptCurrInstr++;
@@ -3115,7 +3117,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
if (NoAliveMonsForEitherParty()
|| ChangeStatBuffs(SET_STAT_BUFF_VALUE(2),
gBattleScripting.moveEffect - MOVE_EFFECT_ATK_PLUS_2 + 1,
- affectsUser | STAT_BUFF_UPDATE_MOVE_EFFECT, 0))
+ affectsUser | STAT_CHANGE_UPDATE_MOVE_EFFECT, 0))
{
gBattlescriptCurrInstr++;
}
@@ -3136,10 +3138,10 @@ void SetMoveEffect(bool32 primary, u32 certain)
case MOVE_EFFECT_EVS_MINUS_2:
flags = affectsUser;
if (mirrorArmorReflected && !affectsUser)
- flags |= STAT_BUFF_ALLOW_PTR;
+ flags |= STAT_CHANGE_ALLOW_PTR;
if (ChangeStatBuffs(SET_STAT_BUFF_VALUE(2) | STAT_BUFF_NEGATIVE,
gBattleScripting.moveEffect - MOVE_EFFECT_ATK_MINUS_2 + 1,
- flags | STAT_BUFF_UPDATE_MOVE_EFFECT, gBattlescriptCurrInstr + 1))
+ flags | STAT_CHANGE_UPDATE_MOVE_EFFECT, gBattlescriptCurrInstr + 1))
{
if (!mirrorArmorReflected)
gBattlescriptCurrInstr++;
@@ -3173,21 +3175,21 @@ void SetMoveEffect(bool32 primary, u32 certain)
side = GetBattlerSide(gBattlerAttacker);
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT
&& !(gBattleTypeFlags &
- (BATTLE_TYPE_EREADER_TRAINER
- | BATTLE_TYPE_FRONTIER
- | BATTLE_TYPE_LINK
- | BATTLE_TYPE_RECORDED_LINK
- | BATTLE_TYPE_SECRET_BASE)))
+ (BATTLE_TYPE_EREADER_TRAINER
+ | BATTLE_TYPE_FRONTIER
+ | BATTLE_TYPE_LINK
+ | BATTLE_TYPE_RECORDED_LINK
+ | BATTLE_TYPE_SECRET_BASE)))
{
gBattlescriptCurrInstr++;
}
else if (!(gBattleTypeFlags &
- (BATTLE_TYPE_EREADER_TRAINER
- | BATTLE_TYPE_FRONTIER
- | BATTLE_TYPE_LINK
- | BATTLE_TYPE_RECORDED_LINK
- | BATTLE_TYPE_SECRET_BASE))
- && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]]))
+ (BATTLE_TYPE_EREADER_TRAINER
+ | BATTLE_TYPE_FRONTIER
+ | BATTLE_TYPE_LINK
+ | BATTLE_TYPE_RECORDED_LINK
+ | BATTLE_TYPE_SECRET_BASE))
+ && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]]))
{
gBattlescriptCurrInstr++;
}
@@ -3209,12 +3211,11 @@ void SetMoveEffect(bool32 primary, u32 certain)
else
{
StealTargetItem(gBattlerAttacker, gBattlerTarget); // Attacker steals target item
- gBattleMons[gBattlerAttacker].item = 0; // Item assigned later on with thief (see MOVEEND_CHANGED_ITEMS)
+ gBattleMons[gBattlerAttacker].item = ITEM_NONE; // Item assigned later on with thief (see MOVEEND_CHANGED_ITEMS)
gBattleStruct->changedItems[gBattlerAttacker] = gLastUsedItem; // Stolen item to be assigned later
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_ItemSteal;
}
-
}
break;
case MOVE_EFFECT_PREVENT_ESCAPE:
@@ -3716,9 +3717,9 @@ static void Cmd_jumpifstatus(void)
{
u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2);
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6);
- if (gBattleMons[battlerId].status1 & flags && gBattleMons[battlerId].hp)
+ if (gBattleMons[battlerId].status1 & flags && gBattleMons[battlerId].hp != 0)
gBattlescriptCurrInstr = jumpPtr;
else
gBattlescriptCurrInstr += 10;
@@ -3728,9 +3729,9 @@ static void Cmd_jumpifstatus2(void)
{
u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2);
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6);
- if (gBattleMons[battlerId].status2 & flags && gBattleMons[battlerId].hp)
+ if (gBattleMons[battlerId].status2 & flags && gBattleMons[battlerId].hp != 0)
gBattlescriptCurrInstr = jumpPtr;
else
gBattlescriptCurrInstr += 10;
@@ -3845,7 +3846,7 @@ static void Cmd_jumpbasedontype(void)
{
u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
u8 type = gBattlescriptCurrInstr[2];
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 4);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 4);
// jumpiftype
if (gBattlescriptCurrInstr[3])
@@ -4156,8 +4157,8 @@ static void Cmd_getexp(void)
if (gBattleControllerExecFlags == 0)
{
// not sure why gf clears the item and ability here
- gBattleMons[gBattlerFainted].item = 0;
- gBattleMons[gBattlerFainted].ability = 0;
+ gBattleMons[gBattlerFainted].item = ITEM_NONE;
+ gBattleMons[gBattlerFainted].ability = ABILITY_NONE;
gBattlescriptCurrInstr += 2;
}
break;
@@ -4344,9 +4345,9 @@ static void Cmd_goto(void)
static void Cmd_jumpifbyte(void)
{
u8 caseID = gBattlescriptCurrInstr[1];
- const u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2);
+ const u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2);
u8 value = gBattlescriptCurrInstr[6];
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7);
gBattlescriptCurrInstr += 11;
@@ -4382,9 +4383,9 @@ static void Cmd_jumpifbyte(void)
static void Cmd_jumpifhalfword(void)
{
u8 caseID = gBattlescriptCurrInstr[1];
- const u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2);
+ const u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2);
u16 value = T2_READ_16(gBattlescriptCurrInstr + 6);
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 8);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 8);
gBattlescriptCurrInstr += 12;
@@ -4420,9 +4421,9 @@ static void Cmd_jumpifhalfword(void)
static void Cmd_jumpifword(void)
{
u8 caseID = gBattlescriptCurrInstr[1];
- const u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2);
+ const u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2);
u32 value = T1_READ_32(gBattlescriptCurrInstr + 6);
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10);
gBattlescriptCurrInstr += 14;
@@ -4457,10 +4458,10 @@ static void Cmd_jumpifword(void)
static void Cmd_jumpifarrayequal(void)
{
- const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
- const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
+ const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
u32 size = gBattlescriptCurrInstr[9];
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10);
u8 i;
for (i = 0; i < size; i++)
@@ -4480,10 +4481,10 @@ static void Cmd_jumpifarrayequal(void)
static void Cmd_jumpifarraynotequal(void)
{
u8 equalBytes = 0;
- const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
- const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
+ const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
u32 size = gBattlescriptCurrInstr[9];
- const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10);
+ const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10);
u8 i;
for (i = 0; i < size; i++)
@@ -4501,7 +4502,7 @@ static void Cmd_jumpifarraynotequal(void)
static void Cmd_setbyte(void)
{
- u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
*memByte = gBattlescriptCurrInstr[5];
gBattlescriptCurrInstr += 6;
@@ -4509,22 +4510,22 @@ static void Cmd_setbyte(void)
static void Cmd_addbyte(void)
{
- u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
*memByte += gBattlescriptCurrInstr[5];
gBattlescriptCurrInstr += 6;
}
static void Cmd_subbyte(void)
{
- u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
*memByte -= gBattlescriptCurrInstr[5];
gBattlescriptCurrInstr += 6;
}
static void Cmd_copyarray(void)
{
- u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
- const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
+ u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
s32 size = gBattlescriptCurrInstr[9];
s32 i;
@@ -4536,9 +4537,9 @@ static void Cmd_copyarray(void)
static void Cmd_copyarraywithindex(void)
{
- u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
- const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
- const u8* index = T2_READ_PTR(gBattlescriptCurrInstr + 9);
+ u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
+ const u8 *index = T2_READ_PTR(gBattlescriptCurrInstr + 9);
s32 size = gBattlescriptCurrInstr[13];
s32 i;
@@ -4550,14 +4551,14 @@ static void Cmd_copyarraywithindex(void)
static void Cmd_orbyte(void)
{
- u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
*memByte |= gBattlescriptCurrInstr[5];
gBattlescriptCurrInstr += 6;
}
static void Cmd_orhalfword(void)
{
- u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
u16 val = T2_READ_16(gBattlescriptCurrInstr + 5);
*memHword |= val;
@@ -4566,7 +4567,7 @@ static void Cmd_orhalfword(void)
static void Cmd_orword(void)
{
- u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
u32 val = T2_READ_32(gBattlescriptCurrInstr + 5);
*memWord |= val;
@@ -4575,14 +4576,14 @@ static void Cmd_orword(void)
static void Cmd_bicbyte(void)
{
- u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
*memByte &= ~(gBattlescriptCurrInstr[5]);
gBattlescriptCurrInstr += 6;
}
static void Cmd_bichalfword(void)
{
- u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
u16 val = T2_READ_16(gBattlescriptCurrInstr + 5);
*memHword &= ~val;
@@ -4591,7 +4592,7 @@ static void Cmd_bichalfword(void)
static void Cmd_bicword(void)
{
- u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
+ u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
u32 val = T2_READ_32(gBattlescriptCurrInstr + 5);
*memWord &= ~val;
@@ -4650,7 +4651,8 @@ static void Cmd_end2(void)
gCurrentActionFuncId = B_ACTION_TRY_FINISH;
}
-static void Cmd_end3(void) // pops the main function stack
+// Pops the main function stack
+static void Cmd_end3(void)
{
BattleScriptPop();
if (gBattleResources->battleCallbackStack->size != 0)
@@ -4712,7 +4714,7 @@ static void Cmd_endselectionscript(void)
static void Cmd_playanimation(void)
{
- const u16* argumentPtr;
+ const u16 *argumentPtr;
u8 animId = gBattlescriptCurrInstr[2];
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
@@ -4768,8 +4770,8 @@ static void Cmd_playanimation(void)
// Same as playanimation, except it takes a pointer to some animation id, instead of taking the value directly
static void Cmd_playanimation_var(void)
{
- const u16* argumentPtr;
- const u8* animationIdPtr;
+ const u16 *argumentPtr;
+ const u8 *animationIdPtr;
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
animationIdPtr = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -5143,19 +5145,19 @@ static void Cmd_moveend(void)
|| gBattleMoves[gChosenMove].effect == EFFECT_HEALING_WISH)
&& !(gMoveResultFlags & MOVE_RESULT_FAILED))
{
- ++gBattleScripting.moveendState;
+ gBattleScripting.moveendState++;
break;
}
*choicedMoveAtk = gChosenMove;
}
- for (i = 0; i < MAX_MON_MOVES; ++i)
+ for (i = 0; i < MAX_MON_MOVES; i++)
{
if (gBattleMons[gBattlerAttacker].moves[i] == *choicedMoveAtk)
break;
}
if (i == MAX_MON_MOVES)
*choicedMoveAtk = MOVE_NONE;
- ++gBattleScripting.moveendState;
+ gBattleScripting.moveendState++;
break;
case MOVEEND_CHANGED_ITEMS: // changed held items
for (i = 0; i < gBattlersCount; i++)
@@ -5713,7 +5715,7 @@ static void Cmd_switchindataupdate(void)
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
oldData = gBattleMons[gActiveBattler];
- monData = (u8*)(&gBattleMons[gActiveBattler]);
+ monData = (u8 *)(&gBattleMons[gActiveBattler]);
for (i = 0; i < sizeof(struct BattlePokemon); i++)
monData[i] = gBattleResources->bufferB[gActiveBattler][4 + i];
@@ -5727,7 +5729,7 @@ static void Cmd_switchindataupdate(void)
i = GetBattlerSide(gActiveBattler);
if (gWishFutureKnock.knockedOffMons[i] & gBitTable[gBattlerPartyIndexes[gActiveBattler]])
{
- gBattleMons[gActiveBattler].item = 0;
+ gBattleMons[gActiveBattler].item = ITEM_NONE;
}
if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
@@ -5769,7 +5771,7 @@ static void Cmd_switchinanim(void)
| BATTLE_TYPE_RECORDED_LINK
| BATTLE_TYPE_TRAINER_HILL
| BATTLE_TYPE_FRONTIER)))
- HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
+ HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
gAbsentBattlerFlags &= ~(gBitTable[gActiveBattler]);
@@ -6290,13 +6292,13 @@ static void Cmd_switchhandleorder(void)
if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
- *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF;
- *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0);
- *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 1) = gBattleResources->bufferB[gActiveBattler][3];
+ *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF;
+ *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0);
+ *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 1) = gBattleResources->bufferB[gActiveBattler][3];
- *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0);
- *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0) >> 4;
- *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 2) = gBattleResources->bufferB[gActiveBattler][3];
+ *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0);
+ *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleResources->bufferB[gActiveBattler][2] & 0xF0) >> 4;
+ *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 2) = gBattleResources->bufferB[gActiveBattler][3];
}
else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
{
@@ -6580,7 +6582,7 @@ static void Cmd_yesnoboxlearnmove(void)
switch (gBattleScripting.learnMoveState)
{
case 0:
- HandleBattleWindow(24, 8, 29, 13, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleScripting.learnMoveState++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -6606,7 +6608,7 @@ static void Cmd_yesnoboxlearnmove(void)
PlaySE(SE_SELECT);
if (gBattleCommunication[1] == 0)
{
- HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gBattleScripting.learnMoveState++;
}
@@ -6677,7 +6679,7 @@ static void Cmd_yesnoboxlearnmove(void)
}
break;
case 5:
- HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattlescriptCurrInstr += 5;
break;
case 6:
@@ -6694,7 +6696,7 @@ static void Cmd_yesnoboxstoplearningmove(void)
switch (gBattleScripting.learnMoveState)
{
case 0:
- HandleBattleWindow(24, 8, 29, 13, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleScripting.learnMoveState++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -6724,13 +6726,13 @@ static void Cmd_yesnoboxstoplearningmove(void)
else
gBattlescriptCurrInstr += 5;
- HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
}
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
- HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
}
break;
}
@@ -6866,7 +6868,7 @@ static void Cmd_updatebattlermoves(void)
if (gBattleControllerExecFlags == 0)
{
s32 i;
- struct BattlePokemon *bufferPoke = (struct BattlePokemon*) &gBattleResources->bufferB[gActiveBattler][4];
+ struct BattlePokemon *bufferPoke = (struct BattlePokemon *) &gBattleResources->bufferB[gActiveBattler][4];
for (i = 0; i < MAX_MON_MOVES; i++)
{
gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i];
@@ -7015,7 +7017,7 @@ static void Cmd_yesnobox(void)
switch (gBattleCommunication[0])
{
case 0:
- HandleBattleWindow(24, 8, 29, 13, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleCommunication[0]++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -7040,13 +7042,13 @@ static void Cmd_yesnobox(void)
{
gBattleCommunication[CURSOR_POSITION] = 1;
PlaySE(SE_SELECT);
- HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattlescriptCurrInstr++;
}
else if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
- HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattlescriptCurrInstr++;
}
break;
@@ -7108,7 +7110,7 @@ static void Cmd_removeitem(void)
if (GetBattlerHoldEffect(gActiveBattler, TRUE) != HOLD_EFFECT_AIR_BALLOON)
gBattleStruct->usedHeldItems[gBattlerPartyIndexes[gActiveBattler]][GetBattlerSide(gActiveBattler)] = itemId; // Remember if switched out
- gBattleMons[gActiveBattler].item = 0;
+ gBattleMons[gActiveBattler].item = ITEM_NONE;
CheckSetUnburden(gActiveBattler);
BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].item), &gBattleMons[gActiveBattler].item);
@@ -7354,14 +7356,14 @@ static bool8 SlideOutLevelUpBanner(void)
static void PutMonIconOnLvlUpBanner(void)
{
u8 spriteId;
- const u16* iconPal;
+ const u16 *iconPal;
struct SpriteSheet iconSheet;
struct SpritePalette iconPalSheet;
u16 species = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPECIES);
u32 personality = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_PERSONALITY);
- const u8* iconPtr = GetMonIconPtr(species, personality);
+ const u8 *iconPtr = GetMonIconPtr(species, personality);
iconSheet.data = iconPtr;
iconSheet.size = 0x200;
iconSheet.tag = TAG_LVLUP_BANNER_MON_ICON;
@@ -7378,7 +7380,7 @@ static void PutMonIconOnLvlUpBanner(void)
gSprites[spriteId].sXOffset = gBattle_BG2_X;
}
-static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite* sprite)
+static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite *sprite)
{
sprite->x2 = sprite->sXOffset - gBattle_BG2_X;
@@ -7459,19 +7461,19 @@ static void Cmd_jumpifplayerran(void)
static void Cmd_hpthresholds(void)
{
- u8 opposingBank;
+ u8 opposingBattler;
s32 result;
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
{
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
- opposingBank = gActiveBattler ^ BIT_SIDE;
+ opposingBattler = gActiveBattler ^ BIT_SIDE;
- result = gBattleMons[opposingBank].hp * 100 / gBattleMons[opposingBank].maxHP;
+ result = gBattleMons[opposingBattler].hp * 100 / gBattleMons[opposingBattler].maxHP;
if (result == 0)
result = 1;
- if (result > 69 || !gBattleMons[opposingBank].hp)
+ if (result > 69 || gBattleMons[opposingBattler].hp == 0)
gBattleStruct->hpScale = 0;
else if (result > 39)
gBattleStruct->hpScale = 1;
@@ -7486,18 +7488,18 @@ static void Cmd_hpthresholds(void)
static void Cmd_hpthresholds2(void)
{
- u8 opposingBank;
+ u8 opposingBattler;
s32 result;
u8 hpSwitchout;
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
{
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
- opposingBank = gActiveBattler ^ BIT_SIDE;
- hpSwitchout = *(gBattleStruct->hpOnSwitchout + GetBattlerSide(opposingBank));
- result = (hpSwitchout - gBattleMons[opposingBank].hp) * 100 / hpSwitchout;
+ opposingBattler = gActiveBattler ^ BIT_SIDE;
+ hpSwitchout = *(gBattleStruct->hpOnSwitchout + GetBattlerSide(opposingBattler));
+ result = (hpSwitchout - gBattleMons[opposingBattler].hp) * 100 / hpSwitchout;
- if (gBattleMons[opposingBank].hp >= hpSwitchout)
+ if (gBattleMons[opposingBattler].hp >= hpSwitchout)
gBattleStruct->hpScale = 0;
else if (result <= 29)
gBattleStruct->hpScale = 1;
@@ -7514,7 +7516,7 @@ static void Cmd_useitemonopponent(void)
{
gBattlerInMenuId = gBattlerAttacker;
PokemonUseItemEffects(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, TRUE);
- gBattlescriptCurrInstr += 1;
+ gBattlescriptCurrInstr++;
}
static bool32 HasAttackerFaintedTarget(void)
@@ -7883,7 +7885,7 @@ static void Cmd_various(void)
return;
case VARIOUS_GET_STAT_VALUE:
i = gBattlescriptCurrInstr[3];
- gBattleMoveDamage = *(u16*)(&gBattleMons[gActiveBattler].attack) + (i - 1);
+ gBattleMoveDamage = *(u16 *)(&gBattleMons[gActiveBattler].attack) + (i - 1);
gBattleMoveDamage *= gStatStageRatios[gBattleMons[gActiveBattler].statStages[i]][0];
gBattleMoveDamage /= gStatStageRatios[gBattleMons[gActiveBattler].statStages[i]][1];
gBattlescriptCurrInstr += 4;
@@ -8073,7 +8075,7 @@ static void Cmd_various(void)
break;
}
if (i == MAX_MON_MOVES)
- gBattleStruct->choicedMove[gActiveBattler] = 0;
+ gBattleStruct->choicedMove[gActiveBattler] = MOVE_NONE;
}
break;
case VARIOUS_RESET_PLAYER_FAINTED:
@@ -8101,7 +8103,10 @@ static void Cmd_various(void)
break;
case VARIOUS_ARENA_JUDGMENT_WINDOW:
i = BattleArena_ShowJudgmentWindow(&gBattleCommunication[0]);
- if (i == 0)
+
+ // BattleArena_ShowJudgmentWindow's last state was an intermediate step.
+ // Return without advancing the current instruction so that it will be called again.
+ if (i == ARENA_RESULT_RUNNING)
return;
gBattleCommunication[1] = i;
@@ -8833,8 +8838,8 @@ static void Cmd_various(void)
case VARIOUS_LOSE_TYPE:
for (i = 0; i < 3; i++)
{
- if (*(u8*)(&gBattleMons[gActiveBattler].type1 + i) == gBattlescriptCurrInstr[3])
- *(u8*)(&gBattleMons[gActiveBattler].type1 + i) = TYPE_MYSTERY;
+ if (*(u8 *)(&gBattleMons[gActiveBattler].type1 + i) == gBattlescriptCurrInstr[3])
+ *(u8 *)(&gBattleMons[gActiveBattler].type1 + i) = TYPE_MYSTERY;
}
gBattlescriptCurrInstr += 4;
return;
@@ -9748,13 +9753,14 @@ static void Cmd_setprotectlike(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_faintifabilitynotdamp(void)
+static void Cmd_tryexplosion(void)
{
if (gBattleControllerExecFlags)
return;
if ((gBattlerTarget = IsAbilityOnField(ABILITY_DAMP)))
{
+ // Failed, a battler has Damp
gLastUsedAbility = ABILITY_DAMP;
RecordAbilityBattle(--gBattlerTarget, ABILITY_DAMP);
gBattlescriptCurrInstr = BattleScript_DampStopsExplosion;
@@ -9837,6 +9843,7 @@ static void Cmd_trymirrormove(void)
if (i != gBattlerAttacker)
{
move = gBattleStruct->lastTakenMoveFrom[gBattlerAttacker][i];
+
if (move != MOVE_NONE && move != MOVE_UNAVAILABLE)
{
validMoves[validMovesCount] = move;
@@ -9846,6 +9853,7 @@ static void Cmd_trymirrormove(void)
}
move = gBattleStruct->lastTakenMove[gBattlerAttacker];
+
if (move != MOVE_NONE && move != MOVE_UNAVAILABLE)
{
gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
@@ -10006,7 +10014,7 @@ static void Cmd_trysetrest(void)
static void Cmd_jumpifnotfirstturn(void)
{
- const u8* failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1);
if (gDisableStructs[gBattlerAttacker].isFirstTurn)
gBattlescriptCurrInstr += 5;
@@ -10109,7 +10117,7 @@ static void Cmd_stockpile(void)
static void Cmd_stockpiletobasedamage(void)
{
- const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0)
{
gBattlescriptCurrInstr = jumpPtr;
@@ -10129,7 +10137,7 @@ static void Cmd_stockpiletobasedamage(void)
static void Cmd_stockpiletohpheal(void)
{
- const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
+ const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0)
{
@@ -10245,6 +10253,9 @@ static u16 ReverseStatChangeMoveEffect(u16 moveEffect)
}
}
+#define STAT_CHANGE_WORKED 0
+#define STAT_CHANGE_DIDNT_WORK 1
+
static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr)
{
bool32 certain = FALSE;
@@ -10268,17 +10279,17 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
certain++;
flags &= ~MOVE_EFFECT_CERTAIN;
- if (flags & STAT_BUFF_NOT_PROTECT_AFFECTED)
+ if (flags & STAT_CHANGE_NOT_PROTECT_AFFECTED)
notProtectAffected++;
- flags &= ~STAT_BUFF_NOT_PROTECT_AFFECTED;
+ flags &= ~STAT_CHANGE_NOT_PROTECT_AFFECTED;
if (activeBattlerAbility == ABILITY_CONTRARY)
{
statValue ^= STAT_BUFF_NEGATIVE;
gBattleScripting.statChanger ^= STAT_BUFF_NEGATIVE;
- if (flags & STAT_BUFF_UPDATE_MOVE_EFFECT)
+ if (flags & STAT_CHANGE_UPDATE_MOVE_EFFECT)
{
- flags &= ~STAT_BUFF_UPDATE_MOVE_EFFECT;
+ flags &= ~STAT_CHANGE_UPDATE_MOVE_EFFECT;
gBattleScripting.moveEffect = ReverseStatChangeMoveEffect(gBattleScripting.moveEffect);
}
}
@@ -10295,7 +10306,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
&& !certain && gCurrentMove != MOVE_CURSE
&& !(gActiveBattler == gBattlerTarget && GetBattlerAbility(gBattlerAttacker) == ABILITY_INFILTRATOR))
{
- if (flags == STAT_BUFF_ALLOW_PTR)
+ if (flags == STAT_CHANGE_ALLOW_PTR)
{
if (gSpecialStatuses[gActiveBattler].statLowered)
{
@@ -10322,7 +10333,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
|| activeBattlerAbility == ABILITY_WHITE_SMOKE)
&& !certain && gCurrentMove != MOVE_CURSE)
{
- if (flags == STAT_BUFF_ALLOW_PTR)
+ if (flags == STAT_CHANGE_ALLOW_PTR)
{
if (gSpecialStatuses[gActiveBattler].statLowered)
{
@@ -10343,7 +10354,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
}
else if ((index = IsFlowerVeilProtected(gActiveBattler)) && !certain)
{
- if (flags == STAT_BUFF_ALLOW_PTR)
+ if (flags == STAT_CHANGE_ALLOW_PTR)
{
if (gSpecialStatuses[gActiveBattler].statLowered)
{
@@ -10366,7 +10377,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
|| (activeBattlerAbility == ABILITY_HYPER_CUTTER && statId == STAT_ATK)
|| (activeBattlerAbility == ABILITY_BIG_PECKS && statId == STAT_DEF)))
{
- if (flags == STAT_BUFF_ALLOW_PTR)
+ if (flags == STAT_CHANGE_ALLOW_PTR)
{
BattleScriptPush(BS_ptr);
gBattleScripting.battler = gActiveBattler;
@@ -10379,7 +10390,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
}
else if (activeBattlerAbility == ABILITY_MIRROR_ARMOR && !affectsUser && gBattlerAttacker != gBattlerTarget && gActiveBattler == gBattlerTarget)
{
- if (flags == STAT_BUFF_ALLOW_PTR)
+ if (flags == STAT_CHANGE_ALLOW_PTR)
{
SET_STATCHANGER(statId, GET_STAT_BUFF_VALUE(statValue) | STAT_BUFF_NEGATIVE, TRUE);
BattleScriptPush(BS_ptr);
@@ -10417,12 +10428,9 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
gBattleTextBuff2[3] = STRINGID_SEVERELY >> 8;
index = 4;
}
- gBattleTextBuff2[index] = B_BUFF_STRING;
- index++;
- gBattleTextBuff2[index] = STRINGID_STATFELL;
- index++;
- gBattleTextBuff2[index] = STRINGID_STATFELL >> 8;
- index++;
+ gBattleTextBuff2[index++] = B_BUFF_STRING;
+ gBattleTextBuff2[index++] = STRINGID_STATFELL;
+ gBattleTextBuff2[index++] = STRINGID_STATFELL >> 8;
gBattleTextBuff2[index] = B_BUFF_EOS;
if (gBattleMons[gActiveBattler].statStages[statId] == MIN_STAT_STAGE)
@@ -10459,12 +10467,9 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
gBattleTextBuff2[3] = STRINGID_DRASTICALLY >> 8;
index = 4;
}
- gBattleTextBuff2[index] = B_BUFF_STRING;
- index++;
- gBattleTextBuff2[index] = STRINGID_STATROSE;
- index++;
- gBattleTextBuff2[index] = STRINGID_STATROSE >> 8;
- index++;
+ gBattleTextBuff2[index++] = B_BUFF_STRING;
+ gBattleTextBuff2[index++] = STRINGID_STATROSE;
+ gBattleTextBuff2[index++] = STRINGID_STATROSE >> 8;
gBattleTextBuff2[index] = B_BUFF_EOS;
if (gBattleMons[gActiveBattler].statStages[statId] == MAX_STAT_STAGE)
@@ -10484,10 +10489,10 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
if (gBattleMons[gActiveBattler].statStages[statId] > MAX_STAT_STAGE)
gBattleMons[gActiveBattler].statStages[statId] = MAX_STAT_STAGE;
- if (gBattleCommunication[MULTISTRING_CHOOSER] == B_MSG_STAT_WONT_INCREASE && flags & STAT_BUFF_ALLOW_PTR)
+ if (gBattleCommunication[MULTISTRING_CHOOSER] == B_MSG_STAT_WONT_INCREASE && flags & STAT_CHANGE_ALLOW_PTR)
gMoveResultFlags |= MOVE_RESULT_MISSED;
- if (gBattleCommunication[MULTISTRING_CHOOSER] == B_MSG_STAT_WONT_INCREASE && !(flags & STAT_BUFF_ALLOW_PTR))
+ if (gBattleCommunication[MULTISTRING_CHOOSER] == B_MSG_STAT_WONT_INCREASE && !(flags & STAT_CHANGE_ALLOW_PTR))
return STAT_CHANGE_DIDNT_WORK;
return STAT_CHANGE_WORKED;
@@ -10523,7 +10528,8 @@ bool32 TryResetBattlerStatChanges(u8 battler)
return ret;
}
-static void Cmd_normalisebuffs(void) // haze
+// Haze
+static void Cmd_normalisebuffs(void)
{
s32 i, j;
@@ -10610,7 +10616,7 @@ static void Cmd_forcerandomswitch(void)
s32 firstMonId;
s32 lastMonId = 0; // + 1
s32 monsCount;
- struct Pokemon* party = NULL;
+ struct Pokemon *party = NULL;
s32 validMons = 0;
s32 minNeeded;
@@ -10679,15 +10685,15 @@ static void Cmd_forcerandomswitch(void)
{
if ((gBattlerTarget & BIT_FLANK) != B_FLANK_LEFT)
{
- firstMonId = 3;
- lastMonId = 6;
+ firstMonId = PARTY_SIZE / 2;
+ lastMonId = PARTY_SIZE;
}
else
{
firstMonId = 0;
- lastMonId = 3;
+ lastMonId = PARTY_SIZE / 2;
}
- monsCount = 3;
+ monsCount = PARTY_SIZE / 2;
minNeeded = 1;
battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
@@ -10697,15 +10703,15 @@ static void Cmd_forcerandomswitch(void)
{
if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == B_FLANK_RIGHT)
{
- firstMonId = 3;
- lastMonId = 6;
+ firstMonId = PARTY_SIZE / 2;
+ lastMonId = PARTY_SIZE;
}
else
{
firstMonId = 0;
- lastMonId = 3;
+ lastMonId = PARTY_SIZE / 2;
}
- monsCount = 3;
+ monsCount = PARTY_SIZE / 2;
minNeeded = 1;
battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
@@ -10715,23 +10721,23 @@ static void Cmd_forcerandomswitch(void)
if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
{
firstMonId = 0;
- lastMonId = 6;
- monsCount = 6;
+ lastMonId = PARTY_SIZE;
+ monsCount = PARTY_SIZE;
minNeeded = 2; // since there are two opponents, it has to be a double battle
}
else
{
if ((gBattlerTarget & BIT_FLANK) != B_FLANK_LEFT)
{
- firstMonId = 3;
- lastMonId = 6;
+ firstMonId = PARTY_SIZE / 2;
+ lastMonId = PARTY_SIZE;
}
else
{
firstMonId = 0;
- lastMonId = 3;
+ lastMonId = PARTY_SIZE / 2;
}
- monsCount = 3;
+ monsCount = PARTY_SIZE / 2;
minNeeded = 1;
}
battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
@@ -10740,8 +10746,8 @@ static void Cmd_forcerandomswitch(void)
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
firstMonId = 0;
- lastMonId = 6;
- monsCount = 6;
+ lastMonId = PARTY_SIZE;
+ monsCount = PARTY_SIZE;
minNeeded = 2;
battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
@@ -10749,8 +10755,8 @@ static void Cmd_forcerandomswitch(void)
else
{
firstMonId = 0;
- lastMonId = 6;
- monsCount = 6;
+ lastMonId = PARTY_SIZE;
+ monsCount = PARTY_SIZE;
minNeeded = 1;
battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one pokemon out in single battles
battler1PartyId = gBattlerPartyIndexes[gBattlerTarget];
@@ -10821,7 +10827,7 @@ static void Cmd_tryconversiontypechange(void)
u8 moveType;
#if B_UPDATED_CONVERSION >= GEN_6
- // changes user's type to its first move's type
+ // Changes user's type to its first move's type
for (moveChecked = 0; moveChecked < MAX_MON_MOVES; moveChecked++)
{
if (gBattleMons[gBattlerAttacker].moves[moveChecked] != MOVE_NONE)
@@ -10841,7 +10847,7 @@ static void Cmd_tryconversiontypechange(void)
gBattlescriptCurrInstr += 5;
}
#else
- // randomly changes user's type to one of its moves' type
+ // Randomly changes user's type to one of its moves' type
while (validMoves < MAX_MON_MOVES)
{
if (gBattleMons[gBattlerAttacker].moves[validMoves] == MOVE_NONE)
@@ -10877,7 +10883,6 @@ static void Cmd_tryconversiontypechange(void)
{
do
{
-
while ((moveChecked = Random() & (MAX_MON_MOVES - 1)) >= validMoves);
moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type;
@@ -11022,7 +11027,8 @@ static void Cmd_tryKO(void)
}
}
-static void Cmd_damagetohalftargethp(void) // super fang
+// Super Fang
+static void Cmd_damagetohalftargethp(void)
{
gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2;
if (gBattleMoveDamage == 0)
@@ -11234,8 +11240,8 @@ static void Cmd_transformdataexecution(void)
PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species)
- battleMonAttacker = (u8*)(&gBattleMons[gBattlerAttacker]);
- battleMonTarget = (u8*)(&gBattleMons[gBattlerTarget]);
+ battleMonAttacker = (u8 *)(&gBattleMons[gBattlerAttacker]);
+ battleMonTarget = (u8 *)(&gBattleMons[gBattlerTarget]);
for (i = 0; i < offsetof(struct BattlePokemon, pp); i++)
battleMonAttacker[i] = battleMonTarget[i];
@@ -11323,7 +11329,7 @@ static void Cmd_mimicattackcopy(void)
static void Cmd_metronome(void)
{
- while (1)
+ while (TRUE)
{
gCurrentMove = (Random() % (MOVES_COUNT - 1)) + 1;
if (gBattleMoves[gCurrentMove].effect == EFFECT_PLACEHOLDER)
@@ -11381,7 +11387,8 @@ static void Cmd_counterdamagecalculator(void)
}
}
-static void Cmd_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
+// A copy of Cmd with the physical -> special field changes
+static void Cmd_mirrorcoatdamagecalculator(void)
{
u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBattlerId);
@@ -11474,7 +11481,7 @@ static void Cmd_painsplitdmgcalc(void)
{
s32 hpDiff = (gBattleMons[gBattlerAttacker].hp + gBattleMons[gBattlerTarget].hp) / 2;
s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - hpDiff;
- u8* storeLoc = (void*)(&gBattleScripting.painSplitHp);
+ u8 *storeLoc = (void *)(&gBattleScripting.painSplitHp);
storeLoc[0] = (painSplitHp);
storeLoc[1] = (painSplitHp & 0x0000FF00) >> 8;
@@ -11492,7 +11499,8 @@ static void Cmd_painsplitdmgcalc(void)
}
}
-static void Cmd_settypetorandomresistance(void) // conversion 2
+// Conversion 2
+static void Cmd_settypetorandomresistance(void)
{
if (gLastLandedMoves[gBattlerAttacker] == MOVE_NONE
|| gLastLandedMoves[gBattlerAttacker] == MOVE_UNAVAILABLE)
@@ -11551,7 +11559,8 @@ static void Cmd_setalwayshitflag(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_copymovepermanently(void) // sketch
+// Sketch
+static void Cmd_copymovepermanently(void)
{
gChosenMove = MOVE_UNAVAILABLE;
@@ -12101,7 +12110,8 @@ static void Cmd_magnitudedamagecalculation(void)
magnitude = 10;
}
- PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude);
+ PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude)
+
for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
{
if (gBattlerTarget == gBattlerAttacker)
@@ -12172,7 +12182,8 @@ static void Cmd_setsunny(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_maxattackhalvehp(void) // belly drum
+// Belly Drum
+static void Cmd_maxattackhalvehp(void)
{
u32 halfHp = gBattleMons[gBattlerAttacker].maxHP / 2;
@@ -12196,7 +12207,8 @@ static void Cmd_maxattackhalvehp(void) // belly drum
}
}
-static void Cmd_copyfoestats(void) // psych up
+// Psych Up
+static void Cmd_copyfoestats(void)
{
s32 i;
@@ -12376,7 +12388,7 @@ static void Cmd_trydobeatup(void)
&& GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2)
&& GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2) != SPECIES_EGG
&& !GetMonData(&party[gBattleCommunication[0]], MON_DATA_STATUS))
- break;
+ break;
}
if (gBattleCommunication[0] < PARTY_SIZE)
{
@@ -12454,7 +12466,7 @@ static void Cmd_sethail(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
+static void Cmd_trymemento(void)
{
#if B_MEMENTO_FAIL == GEN_3
if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == MIN_STAT_STAGE
@@ -12467,10 +12479,12 @@ static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
|| DoesSubstituteBlockMove(gBattlerAttacker, gBattlerTarget, gCurrentMove))
#endif
{
+ // Failed, unprotected target already has minimum Attack and Special Attack.
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
else
{
+ // Success, drop user's HP bar to 0
gActiveBattler = gBattlerAttacker;
gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
BtlController_EmitHealthBarUpdate(BUFFER_A, INSTANT_HP_BAR_DROP);
@@ -12479,7 +12493,8 @@ static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
}
}
-static void Cmd_setforcedtarget(void) // follow me
+// Follow Me
+static void Cmd_setforcedtarget(void)
{
gSideTimers[GetBattlerSide(gBattlerTarget)].followmeTimer = 1;
gSideTimers[GetBattlerSide(gBattlerTarget)].followmeTarget = gBattlerTarget;
@@ -12495,7 +12510,8 @@ static void Cmd_setcharge(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_callterrainattack(void) // nature power
+// Nature Power
+static void Cmd_callterrainattack(void)
{
gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
gCurrentMove = GetNaturePowerMove();
@@ -12519,7 +12535,8 @@ u16 GetNaturePowerMove(void)
return sNaturePowerMoves[gBattleTerrain];
}
-static void Cmd_cureifburnedparalysedorpoisoned(void) // refresh
+// Refresh
+static void Cmd_cureifburnedparalysedorpoisoned(void)
{
if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
{
@@ -12606,7 +12623,8 @@ static void Cmd_trysethelpinghand(void)
}
}
-static void Cmd_tryswapitems(void) // trick
+// Trick
+static void Cmd_tryswapitems(void)
{
// opponent can't swap items with player in regular battles
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL
@@ -12679,8 +12697,8 @@ static void Cmd_tryswapitems(void) // trick
BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gBattlerTarget].item), &gBattleMons[gBattlerTarget].item);
MarkBattlerForControllerExec(gBattlerTarget);
- gBattleStruct->choicedMove[gBattlerTarget] = 0;
- gBattleStruct->choicedMove[gBattlerAttacker] = 0;
+ gBattleStruct->choicedMove[gBattlerTarget] = MOVE_NONE;
+ gBattleStruct->choicedMove[gBattlerAttacker] = MOVE_NONE;
gBattlescriptCurrInstr += 5;
@@ -12716,7 +12734,8 @@ static void Cmd_tryswapitems(void) // trick
}
}
-static void Cmd_trycopyability(void) // role play
+// Role Play
+static void Cmd_trycopyability(void)
{
u16 defAbility = gBattleMons[gBattlerTarget].ability;
@@ -12879,7 +12898,8 @@ static void Cmd_setroom(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_tryswapabilities(void) // skill swap
+// Skill Swap
+static void Cmd_tryswapabilities(void)
{
if (IsSkillSwapBannedAbility(gBattleMons[gBattlerAttacker].ability)
|| IsSkillSwapBannedAbility(gBattleMons[gBattlerTarget].ability))
@@ -12981,9 +13001,9 @@ static void Cmd_setuserstatus3(void)
static void Cmd_assistattackselect(void)
{
s32 chooseableMovesNo = 0;
- struct Pokemon* party;
+ struct Pokemon *party;
s32 monId, moveId;
- u16* validMoves = gBattleStruct->assistPossibleMoves;
+ u16 *validMoves = gBattleStruct->assistPossibleMoves;
if (GET_BATTLER_SIDE(gBattlerAttacker) != B_SIDE_PLAYER)
party = gEnemyParty;
@@ -13039,7 +13059,8 @@ static void Cmd_trysetmagiccoat(void)
}
}
-static void Cmd_trysetsnatch(void) // snatch
+// Snatch
+static void Cmd_trysetsnatch(void)
{
gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = TRUE;
if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
@@ -13364,7 +13385,8 @@ static void Cmd_trycastformdatachange(void)
}
}
-static void Cmd_settypebasedhalvers(void) // water and mud sport
+// Water and Mud Sport
+static void Cmd_settypebasedhalvers(void)
{
bool8 worked = FALSE;
@@ -13387,7 +13409,7 @@ static void Cmd_settypebasedhalvers(void) // water and mud sport
}
#endif
}
- else // water sport
+ else // Water Sport
{
#if B_SPORT_TURNS >= GEN_6
if (!(gFieldStatuses & STATUS_FIELD_WATERSPORT))
@@ -13548,7 +13570,8 @@ static void Cmd_snatchsetbattlers(void)
gBattlescriptCurrInstr++;
}
-static void Cmd_removelightscreenreflect(void) // brick break
+// Brick Break
+static void Cmd_removelightscreenreflect(void)
{
u8 side;
bool32 failed;
@@ -13631,7 +13654,6 @@ static void Cmd_handleballthrow(void)
else
catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
- #if defined POKEMON_EXPANSION && defined ITEM_EXPANSION
if (gBaseStats[gBattleMons[gBattlerTarget].species].flags & FLAG_ULTRA_BEAST)
{
if (gLastUsedItem == ITEM_BEAST_BALL)
@@ -13641,177 +13663,168 @@ static void Cmd_handleballthrow(void)
}
else
{
- #endif
-
- switch (gLastUsedItem)
- {
- case ITEM_ULTRA_BALL:
- ballMultiplier = 20;
- case ITEM_GREAT_BALL:
- case ITEM_SAFARI_BALL:
- #ifdef ITEM_EXPANSION
- case ITEM_SPORT_BALL:
- #endif
- ballMultiplier = 15;
- case ITEM_NET_BALL:
- if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG))
- #if B_NET_BALL_MODIFIER >= GEN_7
- ballMultiplier = 50;
- #else
- ballMultiplier = 30;
- #endif
- break;
- case ITEM_DIVE_BALL:
- #if B_DIVE_BALL_MODIFIER >= GEN_4
- if (GetCurrentMapType() == MAP_TYPE_UNDERWATER || gIsFishingEncounter || gIsSurfingEncounter)
- ballMultiplier = 35;
- #else
- if (GetCurrentMapType() == MAP_TYPE_UNDERWATER)
- ballMultiplier = 35;
- #endif
- break;
- case ITEM_NEST_BALL:
- #if B_NEST_BALL_MODIFIER >= GEN_6
- //((41 - Pokémon's level) ÷ 10)× if Pokémon's level is between 1 and 29, 1× otherwise.
- if (gBattleMons[gBattlerTarget].level < 30)
- ballMultiplier = 41 - gBattleMons[gBattlerTarget].level;
- #elif B_NEST_BALL_MODIFIER == GEN_5
- //((41 - Pokémon's level) ÷ 10)×, minimum 1×
- if (gBattleMons[gBattlerTarget].level < 31)
- ballMultiplier = 41 - gBattleMons[gBattlerTarget].level;
- #else
- //((40 - Pokémon's level) ÷ 10)×, minimum 1×
- if (gBattleMons[gBattlerTarget].level < 40)
- {
- ballMultiplier = 40 - gBattleMons[gBattlerTarget].level;
- if (ballMultiplier <= 9)
- ballMultiplier = 10;
- }
- #endif
- break;
- case ITEM_REPEAT_BALL:
- if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), FLAG_GET_CAUGHT))
- #if B_REPEAT_BALL_MODIFIER >= GEN_7
- ballMultiplier = 35;
- #else
- ballMultiplier = 30;
- #endif
- break;
- case ITEM_TIMER_BALL:
- #if B_TIMER_BALL_MODIFIER >= GEN_5
- ballMultiplier = (gBattleResults.battleTurnCounter * 3) + 10;
- #else
- ballMultiplier = gBattleResults.battleTurnCounter + 10;
- #endif
- if (ballMultiplier > 40)
- ballMultiplier = 40;
- break;
- #ifdef ITEM_EXPANSION
- case ITEM_DUSK_BALL:
- RtcCalcLocalTime();
- if ((gLocalTime.hours >= 20 && gLocalTime.hours <= 3) || gMapHeader.cave || gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
- #if B_DUSK_BALL_MODIFIER >= GEN_7
- ballMultiplier = 30;
- #else
- ballMultiplier = 35;
- #endif
- break;
- case ITEM_QUICK_BALL:
- if (gBattleResults.battleTurnCounter == 0)
- #if B_QUICK_BALL_MODIFIER >= GEN_5
- ballMultiplier = 50;
- #else
- ballMultiplier = 40;
- #endif
- break;
- case ITEM_LEVEL_BALL:
- if (gBattleMons[gBattlerAttacker].level >= 4 * gBattleMons[gBattlerTarget].level)
- ballMultiplier = 80;
- else if (gBattleMons[gBattlerAttacker].level > 2 * gBattleMons[gBattlerTarget].level)
- ballMultiplier = 40;
- else if (gBattleMons[gBattlerAttacker].level > gBattleMons[gBattlerTarget].level)
+ switch (gLastUsedItem)
+ {
+ case ITEM_ULTRA_BALL:
ballMultiplier = 20;
- break;
- case ITEM_LURE_BALL:
- if (gIsFishingEncounter)
- #if B_LURE_BALL_MODIFIER >= GEN_7
- ballMultiplier = 50;
+ case ITEM_GREAT_BALL:
+ case ITEM_SAFARI_BALL:
+ case ITEM_SPORT_BALL:
+ ballMultiplier = 15;
+ case ITEM_NET_BALL:
+ if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG))
+ #if B_NET_BALL_MODIFIER >= GEN_7
+ ballMultiplier = 50;
+ #else
+ ballMultiplier = 30;
+ #endif
+ break;
+ case ITEM_DIVE_BALL:
+ #if B_DIVE_BALL_MODIFIER >= GEN_4
+ if (GetCurrentMapType() == MAP_TYPE_UNDERWATER || gIsFishingEncounter || gIsSurfingEncounter)
+ ballMultiplier = 35;
#else
- ballMultiplier = 30;
+ if (GetCurrentMapType() == MAP_TYPE_UNDERWATER)
+ ballMultiplier = 35;
#endif
- break;
- case ITEM_MOON_BALL:
- for (i = 0; i < EVOS_PER_MON; i++)
- {
- if (gEvolutionTable[gBattleMons[gBattlerTarget].species][i].method == EVO_ITEM
- && gEvolutionTable[gBattleMons[gBattlerTarget].species][i].param == ITEM_MOON_STONE)
+ break;
+ case ITEM_NEST_BALL:
+ #if B_NEST_BALL_MODIFIER >= GEN_6
+ //((41 - Pokémon's level) ÷ 10)× if Pokémon's level is between 1 and 29, 1× otherwise.
+ if (gBattleMons[gBattlerTarget].level < 30)
+ ballMultiplier = 41 - gBattleMons[gBattlerTarget].level;
+ #elif B_NEST_BALL_MODIFIER == GEN_5
+ //((41 - Pokémon's level) ÷ 10)×, minimum 1×
+ if (gBattleMons[gBattlerTarget].level < 31)
+ ballMultiplier = 41 - gBattleMons[gBattlerTarget].level;
+ #else
+ //((40 - Pokémon's level) ÷ 10)×, minimum 1×
+ if (gBattleMons[gBattlerTarget].level < 40)
+ {
+ ballMultiplier = 40 - gBattleMons[gBattlerTarget].level;
+ if (ballMultiplier <= 9)
+ ballMultiplier = 10;
+ }
+ #endif
+ break;
+ case ITEM_REPEAT_BALL:
+ if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), FLAG_GET_CAUGHT))
+ #if B_REPEAT_BALL_MODIFIER >= GEN_7
+ ballMultiplier = 35;
+ #else
+ ballMultiplier = 30;
+ #endif
+ break;
+ case ITEM_TIMER_BALL:
+ #if B_TIMER_BALL_MODIFIER >= GEN_5
+ ballMultiplier = (gBattleResults.battleTurnCounter * 3) + 10;
+ #else
+ ballMultiplier = gBattleResults.battleTurnCounter + 10;
+ #endif
+ if (ballMultiplier > 40)
ballMultiplier = 40;
- }
- break;
- case ITEM_LOVE_BALL:
- if (gBattleMons[gBattlerTarget].species == gBattleMons[gBattlerAttacker].species)
- {
- u8 gender1 = GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]);
- u8 gender2 = GetMonGender(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]);
-
- if (gender1 != gender2 && gender1 != MON_GENDERLESS && gender2 != MON_GENDERLESS)
+ break;
+ case ITEM_DUSK_BALL:
+ RtcCalcLocalTime();
+ if ((gLocalTime.hours >= 20 && gLocalTime.hours <= 3) || gMapHeader.cave || gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
+ #if B_DUSK_BALL_MODIFIER >= GEN_7
+ ballMultiplier = 30;
+ #else
+ ballMultiplier = 35;
+ #endif
+ break;
+ case ITEM_QUICK_BALL:
+ if (gBattleResults.battleTurnCounter == 0)
+ #if B_QUICK_BALL_MODIFIER >= GEN_5
+ ballMultiplier = 50;
+ #else
+ ballMultiplier = 40;
+ #endif
+ break;
+ case ITEM_LEVEL_BALL:
+ if (gBattleMons[gBattlerAttacker].level >= 4 * gBattleMons[gBattlerTarget].level)
ballMultiplier = 80;
- }
- break;
- case ITEM_FAST_BALL:
- if (gBaseStats[gBattleMons[gBattlerTarget].species].baseSpeed >= 100)
- ballMultiplier = 40;
- break;
- case ITEM_HEAVY_BALL:
- i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1);
- #if B_HEAVY_BALL_MODIFIER >= GEN_7
- if (i < 1000)
- ballAddition = -20;
- else if (i < 2000)
- ballAddition = 0;
- else if (i < 3000)
- ballAddition = 20;
- else
- ballAddition = 30;
- #elif B_HEAVY_BALL_MODIFIER >= GEN_4
- if (i < 2048)
- ballAddition = -20;
- else if (i < 3072)
- ballAddition = 20;
- else if (i < 4096)
- ballAddition = 30;
- else
- ballAddition = 40;
- #else
- if (i < 1024)
- ballAddition = -20;
- else if (i < 2048)
- ballAddition = 0;
- else if (i < 3072)
- ballAddition = 20;
- else if (i < 4096)
- ballAddition = 30;
- else
- ballAddition = 40;
- #endif
- break;
- case ITEM_DREAM_BALL:
- #if B_DREAM_BALL_MODIFIER >= GEN_8
- if (gBattleMons[gBattlerTarget].status1 & STATUS1_SLEEP || GetBattlerAbility(gBattlerTarget) == ABILITY_COMATOSE)
+ else if (gBattleMons[gBattlerAttacker].level > 2 * gBattleMons[gBattlerTarget].level)
ballMultiplier = 40;
- #else
- ballMultiplier = 10;
- #endif
- break;
- case ITEM_BEAST_BALL:
- ballMultiplier = 1;
- break;
- #endif
- }
+ else if (gBattleMons[gBattlerAttacker].level > gBattleMons[gBattlerTarget].level)
+ ballMultiplier = 20;
+ break;
+ case ITEM_LURE_BALL:
+ if (gIsFishingEncounter)
+ #if B_LURE_BALL_MODIFIER >= GEN_7
+ ballMultiplier = 50;
+ #else
+ ballMultiplier = 30;
+ #endif
+ break;
+ case ITEM_MOON_BALL:
+ for (i = 0; i < EVOS_PER_MON; i++)
+ {
+ if (gEvolutionTable[gBattleMons[gBattlerTarget].species][i].method == EVO_ITEM
+ && gEvolutionTable[gBattleMons[gBattlerTarget].species][i].param == ITEM_MOON_STONE)
+ ballMultiplier = 40;
+ }
+ break;
+ case ITEM_LOVE_BALL:
+ if (gBattleMons[gBattlerTarget].species == gBattleMons[gBattlerAttacker].species)
+ {
+ u8 gender1 = GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]);
+ u8 gender2 = GetMonGender(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]);
- #if defined POKEMON_EXPANSION && defined ITEM_EXPANSION
+ if (gender1 != gender2 && gender1 != MON_GENDERLESS && gender2 != MON_GENDERLESS)
+ ballMultiplier = 80;
+ }
+ break;
+ case ITEM_FAST_BALL:
+ if (gBaseStats[gBattleMons[gBattlerTarget].species].baseSpeed >= 100)
+ ballMultiplier = 40;
+ break;
+ case ITEM_HEAVY_BALL:
+ i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1);
+ #if B_HEAVY_BALL_MODIFIER >= GEN_7
+ if (i < 1000)
+ ballAddition = -20;
+ else if (i < 2000)
+ ballAddition = 0;
+ else if (i < 3000)
+ ballAddition = 20;
+ else
+ ballAddition = 30;
+ #elif B_HEAVY_BALL_MODIFIER >= GEN_4
+ if (i < 2048)
+ ballAddition = -20;
+ else if (i < 3072)
+ ballAddition = 20;
+ else if (i < 4096)
+ ballAddition = 30;
+ else
+ ballAddition = 40;
+ #else
+ if (i < 1024)
+ ballAddition = -20;
+ else if (i < 2048)
+ ballAddition = 0;
+ else if (i < 3072)
+ ballAddition = 20;
+ else if (i < 4096)
+ ballAddition = 30;
+ else
+ ballAddition = 40;
+ #endif
+ break;
+ case ITEM_DREAM_BALL:
+ #if B_DREAM_BALL_MODIFIER >= GEN_8
+ if (gBattleMons[gBattlerTarget].status1 & STATUS1_SLEEP || GetBattlerAbility(gBattlerTarget) == ABILITY_COMATOSE)
+ ballMultiplier = 40;
+ #else
+ ballMultiplier = 10;
+ #endif
+ break;
+ case ITEM_BEAST_BALL:
+ ballMultiplier = 1;
+ break;
+ }
}
- #endif
// catchRate is unsigned, which means that it may potentially overflow if sum is applied directly.
if (catchRate < 21 && ballAddition == -20)
@@ -13844,7 +13857,6 @@ static void Cmd_handleballthrow(void)
else
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
- #ifdef ITEM_EXPANSION
if (gLastUsedItem == ITEM_HEAL_BALL)
{
MonRestorePP(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]);
@@ -13852,7 +13864,6 @@ static void Cmd_handleballthrow(void)
gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP;
SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_HP, &gBattleMons[gBattlerTarget].hp);
}
- #endif
}
else // mon may be caught, calculate shakes
{
@@ -13900,7 +13911,6 @@ static void Cmd_handleballthrow(void)
else
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
- #ifdef ITEM_EXPANSION
if (gLastUsedItem == ITEM_HEAL_BALL)
{
MonRestorePP(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]);
@@ -13908,7 +13918,6 @@ static void Cmd_handleballthrow(void)
gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP;
SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_HP, &gBattleMons[gBattlerTarget].hp);
}
- #endif
}
else // not caught
{
@@ -14094,7 +14103,7 @@ static void Cmd_trygivecaughtmonnick(void)
switch (gBattleCommunication[MULTIUSE_STATE])
{
case 0:
- HandleBattleWindow(24, 8, 29, 13, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleCommunication[MULTIUSE_STATE]++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -14150,7 +14159,7 @@ static void Cmd_trygivecaughtmonnick(void)
}
break;
case 3:
- if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active )
+ if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{
SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -14201,13 +14210,13 @@ static const u16 sTelekinesisBanList[] =
{
SPECIES_DIGLETT,
SPECIES_DUGTRIO,
- #ifdef POKEMON_EXPANSION
+// #ifdef NEW_POKEMON
SPECIES_DIGLETT_ALOLAN,
SPECIES_DUGTRIO_ALOLAN,
SPECIES_SANDYGAST,
SPECIES_PALOSSAND,
SPECIES_GENGAR_MEGA,
- #endif
+// #endif
};
bool32 IsTelekinesisBannedSpecies(u16 species)
@@ -14253,12 +14262,12 @@ static void Cmd_swapstatstages(void)
static void Cmd_averagestats(void)
{
u8 statId = T1_READ_8(gBattlescriptCurrInstr + 1);
- u16 atkStat = *(u16*)((&gBattleMons[gBattlerAttacker].attack) + (statId - 1));
- u16 defStat = *(u16*)((&gBattleMons[gBattlerTarget].attack) + (statId - 1));
+ u16 atkStat = *(u16 *)((&gBattleMons[gBattlerAttacker].attack) + (statId - 1));
+ u16 defStat = *(u16 *)((&gBattleMons[gBattlerTarget].attack) + (statId - 1));
u16 average = (atkStat + defStat) / 2;
- *(u16*)((&gBattleMons[gBattlerAttacker].attack) + (statId - 1)) = average;
- *(u16*)((&gBattleMons[gBattlerTarget].attack) + (statId - 1)) = average;
+ *(u16 *)((&gBattleMons[gBattlerAttacker].attack) + (statId - 1)) = average;
+ *(u16 *)((&gBattleMons[gBattlerTarget].attack) + (statId - 1)) = average;
gBattlescriptCurrInstr += 2;
}
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 705e8a2848..b0b068ef39 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -403,7 +403,7 @@ void BattleSetup_StartBattlePikeWildBattle(void)
static void DoStandardWildBattle(bool32 isDouble)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle;
@@ -424,7 +424,7 @@ static void DoStandardWildBattle(bool32 isDouble)
void BattleSetup_StartRoamerBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle;
@@ -438,7 +438,7 @@ void BattleSetup_StartRoamerBattle(void)
static void DoSafariBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
StopPlayerAvatar();
gMain.savedCallback = CB2_EndSafariBattle;
@@ -448,7 +448,7 @@ static void DoSafariBattle(void)
static void DoBattlePikeWildBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle;
@@ -484,7 +484,7 @@ static void DoBattlePyramidTrainerHillBattle(void)
void StartWallyTutorialBattle(void)
{
CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic;
gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
CreateBattleStartTask(B_TRANSITION_SLICE, 0);
@@ -492,7 +492,7 @@ void StartWallyTutorialBattle(void)
void BattleSetup_StartScriptedWildBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = 0;
CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -504,7 +504,7 @@ void BattleSetup_StartScriptedWildBattle(void)
void BattleSetup_StartScriptedDoubleWildBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_DOUBLE;
CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -516,7 +516,7 @@ void BattleSetup_StartScriptedDoubleWildBattle(void)
void BattleSetup_StartLatiBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -528,7 +528,7 @@ void BattleSetup_StartLatiBattle(void)
void BattleSetup_StartLegendaryBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
@@ -567,7 +567,7 @@ void BattleSetup_StartLegendaryBattle(void)
void StartGroudonKyogreBattle(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
@@ -587,7 +587,7 @@ void StartRegiBattle(void)
u8 transitionId;
u16 species;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
@@ -617,7 +617,7 @@ void StartRegiBattle(void)
static void CB2_EndWildBattle(void)
{
- CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE);
+ CpuFill16(0, (void *)(BG_PLTT), BG_PLTT_SIZE);
ResetOamRange(0, 128);
if (IsPlayerDefeated(gBattleOutcome) == TRUE && !InBattlePyramid() && !InBattlePike())
@@ -633,7 +633,7 @@ static void CB2_EndWildBattle(void)
static void CB2_EndScriptedWildBattle(void)
{
- CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE);
+ CpuFill16(0, (void *)(BG_PLTT), BG_PLTT_SIZE);
ResetOamRange(0, 128);
if (IsPlayerDefeated(gBattleOutcome) == TRUE)
@@ -1054,22 +1054,22 @@ static void InitTrainerBattleVariables(void)
static inline void SetU8(void *ptr, u8 value)
{
- *(u8*)(ptr) = value;
+ *(u8 *)(ptr) = value;
}
static inline void SetU16(void *ptr, u16 value)
{
- *(u16*)(ptr) = value;
+ *(u16 *)(ptr) = value;
}
static inline void SetU32(void *ptr, u32 value)
{
- *(u32*)(ptr) = value;
+ *(u32 *)(ptr) = value;
}
-static inline void SetPtr(const void *ptr, const void* value)
+static inline void SetPtr(const void *ptr, const void *value)
{
- *(const void**)(ptr) = value;
+ *(const void **)(ptr) = value;
}
static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, const u8 *data)
@@ -1212,8 +1212,8 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerSc
gSelectedObjectEvent = trainerObjEventId;
gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
- ScriptContext1_SetupScript(EventScript_StartTrainerApproach);
- ScriptContext2_Enable();
+ ScriptContext_SetupScript(EventScript_StartTrainerApproach);
+ LockPlayerFieldControls();
}
void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript)
@@ -1225,8 +1225,8 @@ void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript)
void SetUpTwoTrainersBattle(void)
{
- ScriptContext1_SetupScript(EventScript_StartTrainerApproach);
- ScriptContext2_Enable();
+ ScriptContext_SetupScript(EventScript_StartTrainerApproach);
+ LockPlayerFieldControls();
}
bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
@@ -1338,7 +1338,7 @@ void BattleSetup_StartTrainerBattle(void)
else
DoTrainerBattle();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
}
static void CB2_EndTrainerBattle(void)
@@ -1389,7 +1389,7 @@ void BattleSetup_StartRematchBattle(void)
gBattleTypeFlags = BATTLE_TYPE_TRAINER;
gMain.savedCallback = CB2_EndRematchBattle;
DoTrainerBattle();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
}
void ShowTrainerIntroSpeech(void)
diff --git a/src/battle_tower.c b/src/battle_tower.c
index bb09b46b1e..62479186ff 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -996,7 +996,7 @@ static bool8 ChooseSpecialBattleTowerTrainer(void)
winStreak = GetCurrentBattleTowerWinStreak(lvlMode, battleMode);
for (i = 0; i < BATTLE_TOWER_RECORD_COUNT; i++)
{
- u32 *record = (u32*)(&gSaveBlock2Ptr->frontier.towerRecords[i]);
+ u32 *record = (u32 *)(&gSaveBlock2Ptr->frontier.towerRecords[i]);
u32 recordHasData = 0;
u32 checksum = 0;
for (j = 0; j < (sizeof(struct EmeraldBattleTowerRecord) - 4) / 4; j++) // - 4, because of the last field being the checksum itself.
@@ -2418,7 +2418,7 @@ static void LoadMultiPartnerCandidatesData(void)
r10 = 0;
for (i = 0; i < BATTLE_TOWER_RECORD_COUNT; i++)
{
- u32 *record = (u32*)(&gSaveBlock2Ptr->frontier.towerRecords[i]);
+ u32 *record = (u32 *)(&gSaveBlock2Ptr->frontier.towerRecords[i]);
u32 recordHasData = 0;
u32 checksum = 0;
for (j = 0; j < (sizeof(struct EmeraldBattleTowerRecord) - 4) / 4; j++) // - 4, because of the last field being the checksum itself.
@@ -2734,7 +2734,7 @@ static void SetTowerInterviewData(void)
static void ValidateBattleTowerRecordChecksums(void)
{
s32 i, j;
- u32 *record = (u32*)(&gSaveBlock2Ptr->frontier.towerPlayer);
+ u32 *record = (u32 *)(&gSaveBlock2Ptr->frontier.towerPlayer);
u32 checksum = 0;
for (j = 0; j < (sizeof(struct EmeraldBattleTowerRecord) - 4) / 4; j++) // - 4, because of the last field being the checksum itself.
@@ -2746,7 +2746,7 @@ static void ValidateBattleTowerRecordChecksums(void)
for (i = 0; i < BATTLE_TOWER_RECORD_COUNT; i++)
{
- record = (u32*)(&gSaveBlock2Ptr->frontier.towerRecords[i]);
+ record = (u32 *)(&gSaveBlock2Ptr->frontier.towerRecords[i]);
checksum = 0;
for (j = 0; j < (sizeof(struct EmeraldBattleTowerRecord) - 4) / 4; j++) // - 4, because of the last field being the checksum itself.
{
@@ -3305,7 +3305,7 @@ static void ValidateApprenticesChecksums(void)
for (i = 0; i < APPRENTICE_COUNT; i++)
{
- u32 *data = (u32*) &gSaveBlock2Ptr->apprentices[i];
+ u32 *data = (u32 *) &gSaveBlock2Ptr->apprentices[i];
u32 checksum = 0;
for (j = 0; j < (sizeof(struct Apprentice) - 4) / 4; j++)
checksum += data[j];
@@ -3614,7 +3614,7 @@ u8 FacilityClassToGraphicsId(u8 facilityClass)
bool32 ValidateBattleTowerRecord(u8 recordId) // unused
{
s32 i;
- u32 *record = (u32*)(&gSaveBlock2Ptr->frontier.towerRecords[recordId]);
+ u32 *record = (u32 *)(&gSaveBlock2Ptr->frontier.towerRecords[recordId]);
u32 checksum = 0;
u32 hasData = 0;
for (i = 0; i < (sizeof(struct EmeraldBattleTowerRecord) - 4) / 4; i++) // - 4, because of the last fjeld bejng the checksum jtself.
diff --git a/src/battle_transition.c b/src/battle_transition.c
index c523cbe7b9..bc289efa7f 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -827,7 +827,7 @@ static const struct OamData sOam_UnusedBrendanLass =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -2186,7 +2186,7 @@ static bool8 Wave_Init(struct Task *task)
static bool8 Wave_Main(struct Task *task)
{
u8 i, sinIndex;
- u16* toStore;
+ u16 *toStore;
bool8 finished;
sTransitionData->VBlank_DMA = FALSE;
@@ -2347,7 +2347,7 @@ static bool8 Mugshot_SetGfx(struct Task *task)
static bool8 Mugshot_ShowBanner(struct Task *task)
{
u8 i, sinIndex;
- u16* toStore;
+ u16 *toStore;
s16 x;
s32 mergedValue;
@@ -2388,7 +2388,7 @@ static bool8 Mugshot_ShowBanner(struct Task *task)
if (task->tBottomBannerX < 0)
task->tBottomBannerX = 0;
- mergedValue = *(s32*)(&task->tTopBannerX);
+ mergedValue = *(s32 *)(&task->tTopBannerX);
if (mergedValue == DISPLAY_WIDTH)
task->tState++;
@@ -2401,7 +2401,7 @@ static bool8 Mugshot_ShowBanner(struct Task *task)
static bool8 Mugshot_StartOpponentSlide(struct Task *task)
{
u8 i;
- u16* toStore;
+ u16 *toStore;
sTransitionData->VBlank_DMA = FALSE;
@@ -3716,8 +3716,8 @@ static void SpriteCB_WhiteBarFade(struct Sprite *sprite)
else
{
u16 i;
- u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->y];
- u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->y + DISPLAY_HEIGHT];
+ u16 *ptr1 = &gScanlineEffectRegBuffers[0][sprite->y];
+ u16 *ptr2 = &gScanlineEffectRegBuffers[0][sprite->y + DISPLAY_HEIGHT];
for (i = 0; i < DISPLAY_HEIGHT / NUM_WHITE_BARS; i++)
{
ptr1[i] = sprite->sFade >> 8;
@@ -3783,7 +3783,7 @@ static bool8 GridSquares_Init(struct Task *task)
static bool8 GridSquares_Main(struct Task *task)
{
- u16* tileset;
+ u16 *tileset;
if (task->tDelay == 0)
{
@@ -4061,7 +4061,7 @@ static void GetBg0TilemapDst(u16 **tileset)
{
u16 charBase = REG_BG0CNT >> 2;
charBase <<= 14;
- *tileset = (u16*)(BG_VRAM + charBase);
+ *tileset = (u16 *)(BG_VRAM + charBase);
}
void GetBg0TilesDst(u16 **tilemap, u16 **tileset)
@@ -4072,8 +4072,8 @@ void GetBg0TilesDst(u16 **tilemap, u16 **tileset)
screenBase <<= 11;
charBase <<= 14;
- *tilemap = (u16*)(BG_VRAM + screenBase);
- *tileset = (u16*)(BG_VRAM + charBase);
+ *tilemap = (u16 *)(BG_VRAM + screenBase);
+ *tileset = (u16 *)(BG_VRAM + charBase);
}
static void FadeScreenBlack(void)
diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c
index a1a39abdab..088865dbab 100644
--- a/src/battle_transition_frontier.c
+++ b/src/battle_transition_frontier.c
@@ -58,7 +58,7 @@ static const struct OamData sOamData_LogoCircles =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/battle_util.c b/src/battle_util.c
index 7438b04476..fd9b699b8e 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -250,7 +250,7 @@ void HandleAction_UseMove(void)
gBattleStruct->atkCancellerTracker = 0;
gMoveResultFlags = 0;
gMultiHitCounter = 0;
- gBattleCommunication[6] = 0;
+ gBattleCommunication[MISS_TYPE] = 0;
gBattleScripting.savedMoveEffect = 0;
gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerAttacker);
@@ -689,7 +689,7 @@ bool8 TryRunFromBattle(u8 battler)
gBattleStruct->runTries++;
}
- if (effect)
+ if (effect != 0)
{
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = B_OUTCOME_RAN;
@@ -1409,7 +1409,8 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker)
}
}
-void MarkAllBattlersForControllerExec(void) // unused
+// Unused
+static void MarkAllBattlersForControllerExec(void)
{
int i;
@@ -1991,8 +1992,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
#define ALL_MOVES_MASK ((1 << MAX_MON_MOVES) - 1)
bool8 AreAllMovesUnusable(void)
{
- u8 unusable;
- unusable = CheckMoveLimitations(gActiveBattler, 0, MOVE_LIMITATIONS_ALL);
+ u8 unusable = CheckMoveLimitations(gActiveBattler, 0, MOVE_LIMITATIONS_ALL);
if (unusable == ALL_MOVES_MASK) // All moves are unusable.
{
@@ -2166,10 +2166,10 @@ u8 DoFieldEndTurnEffects(void)
}
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
- if (!effect)
+ if (effect == 0)
{
gBattleStruct->turnCountersTracker++;
gBattleStruct->turnSideTracker = 0;
@@ -2192,10 +2192,10 @@ u8 DoFieldEndTurnEffects(void)
}
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
- if (!effect)
+ if (effect == 0)
{
gBattleStruct->turnCountersTracker++;
gBattleStruct->turnSideTracker = 0;
@@ -2218,7 +2218,7 @@ u8 DoFieldEndTurnEffects(void)
}
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
if (!effect)
@@ -2232,8 +2232,7 @@ u8 DoFieldEndTurnEffects(void)
{
side = gBattleStruct->turnSideTracker;
gActiveBattler = gBattlerAttacker = gSideTimers[side].mistBattlerId;
- if (gSideTimers[side].mistTimer != 0
- && --gSideTimers[side].mistTimer == 0)
+ if (gSideTimers[side].mistTimer != 0 && --gSideTimers[side].mistTimer == 0)
{
gSideStatuses[side] &= ~SIDE_STATUS_MIST;
BattleScriptExecute(BattleScript_SideStatusWoreOff);
@@ -2242,10 +2241,10 @@ u8 DoFieldEndTurnEffects(void)
effect++;
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
- if (!effect)
+ if (effect == 0)
{
gBattleStruct->turnCountersTracker++;
gBattleStruct->turnSideTracker = 0;
@@ -2266,10 +2265,10 @@ u8 DoFieldEndTurnEffects(void)
}
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
- if (!effect)
+ if (effect == 0)
{
gBattleStruct->turnCountersTracker++;
gBattleStruct->turnSideTracker = 0;
@@ -2290,7 +2289,7 @@ u8 DoFieldEndTurnEffects(void)
}
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
if (!effect)
@@ -2314,7 +2313,7 @@ u8 DoFieldEndTurnEffects(void)
}
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
if (!effect)
@@ -2336,10 +2335,10 @@ u8 DoFieldEndTurnEffects(void)
effect++;
}
gBattleStruct->turnSideTracker++;
- if (effect)
+ if (effect != 0)
break;
}
- if (!effect)
+ if (effect == 0)
{
gBattleStruct->turnCountersTracker++;
}
@@ -3510,7 +3509,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_DISABLED: // disabled move
- if (gDisableStructs[gBattlerAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattlerAttacker].disabledMove != 0)
+ if (gDisableStructs[gBattlerAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattlerAttacker].disabledMove != MOVE_NONE)
{
gProtectStructs[gBattlerAttacker].usedDisabledMove = TRUE;
gBattleScripting.battler = gBattlerAttacker;
@@ -3601,7 +3600,7 @@ u8 AtkCanceller_UnableToUseMove(void)
if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
{
gProtectStructs[gBattlerAttacker].prlzImmobility = TRUE;
- // This is removed in Emerald for some reason
+ // This is removed in FRLG and Emerald for some reason
//CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
@@ -3639,7 +3638,7 @@ u8 AtkCanceller_UnableToUseMove(void)
}
else
{
- // This is removed in Emerald for some reason
+ // This is removed in FRLG and Emerald for some reason
//gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_MULTIPLETURNS;
if (gTakenDmg[gBattlerAttacker])
{
@@ -3689,7 +3688,7 @@ u8 AtkCanceller_UnableToUseMove(void)
effect = 1;
}
- if (effect)
+ if (effect != 0)
gBattlescriptCurrInstr = BattleScript_PowderMoveNoEffect;
}
gBattleStruct->atkCancellerTracker++;
@@ -3797,8 +3796,8 @@ u8 AtkCanceller_UnableToUseMove2(void)
bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
{
+ u8 playerId, flankId;
struct Pokemon *party;
- u8 id1, id2;
s32 i;
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
@@ -3806,14 +3805,14 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
if (BATTLE_TWO_VS_ONE_OPPONENT && GetBattlerSide(battler) == B_SIDE_OPPONENT)
{
- id2 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
- id1 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+ flankId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+ playerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
party = gEnemyParty;
if (partyIdBattlerOn1 == PARTY_SIZE)
- partyIdBattlerOn1 = gBattlerPartyIndexes[id2];
+ partyIdBattlerOn1 = gBattlerPartyIndexes[flankId];
if (partyIdBattlerOn2 == PARTY_SIZE)
- partyIdBattlerOn2 = gBattlerPartyIndexes[id1];
+ partyIdBattlerOn2 = gBattlerPartyIndexes[playerId];
for (i = 0; i < PARTY_SIZE; i++)
{
@@ -3821,7 +3820,7 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG
&& i != partyIdBattlerOn1 && i != partyIdBattlerOn2
- && i != *(gBattleStruct->monToSwitchIntoId + id2) && i != id1[gBattleStruct->monToSwitchIntoId])
+ && i != *(gBattleStruct->monToSwitchIntoId + flankId) && i != playerId[gBattleStruct->monToSwitchIntoId])
break;
}
return (i == PARTY_SIZE);
@@ -3833,15 +3832,15 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
else
party = gEnemyParty;
- id1 = ((battler & BIT_FLANK) / 2);
- for (i = id1 * MULTI_PARTY_SIZE; i < id1 * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE; i++)
+ playerId = ((battler & BIT_FLANK) / 2);
+ for (i = playerId * MULTI_PARTY_SIZE; i < playerId * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE; i++)
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
break;
}
- return (i == id1 * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE);
+ return (i == playerId * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE);
}
else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
@@ -3850,76 +3849,76 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
{
party = gPlayerParty;
- id2 = GetBattlerMultiplayerId(battler);
- id1 = GetLinkTrainerFlankId(id2);
+ flankId = GetBattlerMultiplayerId(battler);
+ playerId = GetLinkTrainerFlankId(flankId);
}
else
{
party = gEnemyParty;
if (battler == 1)
- id1 = 0;
+ playerId = 0;
else
- id1 = 1;
+ playerId = 1;
}
}
else
{
- id2 = GetBattlerMultiplayerId(battler);
+ flankId = GetBattlerMultiplayerId(battler);
if (GetBattlerSide(battler) == B_SIDE_PLAYER)
party = gPlayerParty;
else
party = gEnemyParty;
- id1 = GetLinkTrainerFlankId(id2);
+ playerId = GetLinkTrainerFlankId(flankId);
}
- for (i = id1 * MULTI_PARTY_SIZE; i < id1 * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE; i++)
+ for (i = playerId * MULTI_PARTY_SIZE; i < playerId * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE; i++)
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
break;
}
- return (i == id1 * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE);
+ return (i == playerId * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE);
}
else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBattlerSide(battler) == B_SIDE_OPPONENT)
{
party = gEnemyParty;
if (battler == 1)
- id1 = 0;
+ playerId = 0;
else
- id1 = MULTI_PARTY_SIZE;
+ playerId = MULTI_PARTY_SIZE;
- for (i = id1; i < id1 + MULTI_PARTY_SIZE; i++)
+ for (i = playerId; i < playerId + MULTI_PARTY_SIZE; i++)
{
if (GetMonData(&party[i], MON_DATA_HP) != 0
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG)
break;
}
- return (i == id1 + 3);
+ return (i == playerId + 3);
}
else
{
if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
{
- id2 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
- id1 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+ flankId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+ playerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
party = gEnemyParty;
}
else
{
- id2 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
- id1 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+ flankId = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+ playerId = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
party = gPlayerParty;
}
if (partyIdBattlerOn1 == PARTY_SIZE)
- partyIdBattlerOn1 = gBattlerPartyIndexes[id2];
+ partyIdBattlerOn1 = gBattlerPartyIndexes[flankId];
if (partyIdBattlerOn2 == PARTY_SIZE)
- partyIdBattlerOn2 = gBattlerPartyIndexes[id1];
+ partyIdBattlerOn2 = gBattlerPartyIndexes[playerId];
for (i = 0; i < PARTY_SIZE; i++)
{
@@ -3927,7 +3926,7 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG
&& i != partyIdBattlerOn1 && i != partyIdBattlerOn2
- && i != *(gBattleStruct->monToSwitchIntoId + id2) && i != id1[gBattleStruct->monToSwitchIntoId])
+ && i != *(gBattleStruct->monToSwitchIntoId + flankId) && i != playerId[gBattleStruct->monToSwitchIntoId])
break;
}
return (i == PARTY_SIZE);
@@ -4259,7 +4258,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
break;
}
}
- if (effect)
+ if (effect != 0)
{
gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather();
BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
@@ -4378,7 +4377,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
}
}
- if (effect)
+ if (effect != 0)
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWITCHIN_ANTICIPATION;
gSpecialStatuses[battler].switchInAbilityDone = TRUE;
@@ -4586,7 +4585,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
case ABILITY_FORECAST:
case ABILITY_FLOWER_GIFT:
effect = TryWeatherFormChange(battler);
- if (effect)
+ if (effect != 0)
{
BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
*(&gBattleStruct->formToChangeInto) = effect - 1;
@@ -5635,7 +5634,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
effect = 4;
break;
}
- if (effect)
+ if (effect != 0)
{
switch (effect)
{
@@ -5675,7 +5674,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
if (battlerAbility == ABILITY_FORECAST || battlerAbility == ABILITY_FLOWER_GIFT)
{
effect = TryWeatherFormChange(battler);
- if (effect)
+ if (effect != 0)
{
BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
gBattleScripting.battler = battler;
@@ -5779,7 +5778,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
gActiveBattler = target1, effect++;
}
- if (effect)
+ if (effect != 0)
{
if (caseID == ABILITYEFFECT_TRACE1)
{
@@ -5814,7 +5813,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
effect++;
}
- if (effect)
+ if (effect != 0)
break;
}
break;
@@ -6471,7 +6470,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
effect = ITEM_STATS_CHANGE;
}
}
- if (effect)
+ if (effect != 0)
{
gBattleScripting.battler = battlerId;
gPotentialItemEffectBattler = battlerId;
@@ -6675,8 +6674,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
}
break;
}
-
- if (effect)
+ if (effect != 0)
{
gSpecialStatuses[battlerId].switchInItemDone = TRUE;
gActiveBattler = gBattlerAttacker = gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
@@ -6756,7 +6754,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
effect = ITEM_STATS_CHANGE;
}
}
- if (effect)
+ if (effect != 0)
{
gBattleScripting.battler = battlerId;
gPotentialItemEffectBattler = battlerId;
@@ -6959,7 +6957,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
break;
}
- if (effect)
+ if (effect != 0)
{
gActiveBattler = gBattlerAttacker = gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
switch (effect)
@@ -7148,7 +7146,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
effect = ITEM_STATS_CHANGE;
}
}
- if (effect)
+ if (effect != 0)
{
gBattleScripting.battler = battlerId;
gPotentialItemEffectBattler = battlerId;
@@ -7158,8 +7156,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
}
break;
}
-
- if (effect)
+ if (effect != 0)
{
gActiveBattler = gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
if (effect == ITEM_STATUS_CHANGE)
@@ -9443,14 +9440,12 @@ bool32 CanMegaEvolve(u8 battlerId)
struct Pokemon *mon;
u8 battlerPosition = GetBattlerPosition(battlerId);
u8 partnerPosition = GetBattlerPosition(BATTLE_PARTNER(battlerId));
- struct MegaEvolutionData *mega = &(((struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]))->mega);
+ struct MegaEvolutionData *mega = &(((struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]))->mega);
-#ifdef ITEM_EXPANSION
// Check if Player has a Mega Ring
if ((GetBattlerPosition(battlerId) == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT))
&& !CheckBagHasItem(ITEM_MEGA_RING, 1))
return FALSE;
-#endif
// Check if trainer already mega evolved a pokemon.
if (mega->alreadyEvolved[battlerPosition])
@@ -9483,13 +9478,8 @@ bool32 CanMegaEvolve(u8 battlerId)
{
if (B_ENABLE_DEBUG && gBattleStruct->debugHoldEffects[battlerId])
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
-#ifdef ITEM_EXPANSION
else if (itemId == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[battlerId].holdEffect;
-#else
- else if (itemId == ITEM_ENIGMA_BERRY)
- holdEffect = gEnigmaBerries[battlerId].holdEffect;
-#endif
else
holdEffect = ItemId_GetHoldEffect(itemId);
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 2ccc38a8a7..7bc1459d89 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -108,12 +108,12 @@ void SwitchPartyOrderInGameMulti(u8 battlerId, u8 arg1)
{
s32 i;
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
- gBattlePartyCurrentOrder[i] = *(0 * 3 + i + (u8*)(gBattleStruct->battlerPartyOrders));
+ gBattlePartyCurrentOrder[i] = *(0 * 3 + i + (u8 *)(gBattleStruct->battlerPartyOrders));
SwitchPartyMonSlots(GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battlerId]), GetPartyIdFromBattlePartyId(arg1));
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
- *(0 * 3 + i + (u8*)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
+ *(0 * 3 + i + (u8 *)(gBattleStruct->battlerPartyOrders)) = gBattlePartyCurrentOrder[i];
}
}
diff --git a/src/battle_z_move.c b/src/battle_z_move.c
index db00d8d7cd..efa1e6e18c 100644
--- a/src/battle_z_move.c
+++ b/src/battle_z_move.c
@@ -58,7 +58,7 @@ static u8 GetZMoveScore(u8 battlerAtk, u8 battlerDef, u16 baseMove, u16 zMove);
// Const Data
static const struct SignatureZMove sSignatureZMoves[] =
{
- #ifdef POKEMON_EXPANSION
+// #ifdef NEW_POKEMON
{SPECIES_PIKACHU_COSPLAY, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA},
{SPECIES_PIKACHU_ROCK_STAR, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA},
{SPECIES_PIKACHU_BELLE, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA},
@@ -95,7 +95,7 @@ static const struct SignatureZMove sSignatureZMoves[] =
{SPECIES_TAPU_LELE, ITEM_TAPUNIUM_Z, MOVE_NATURES_MADNESS, MOVE_GUARDIAN_OF_ALOLA},
{SPECIES_TAPU_FINI, ITEM_TAPUNIUM_Z, MOVE_NATURES_MADNESS, MOVE_GUARDIAN_OF_ALOLA},
{SPECIES_NECROZMA_ULTRA, ITEM_ULTRANECROZIUM_Z, MOVE_PHOTON_GEYSER, MOVE_LIGHT_THAT_BURNS_THE_SKY},
- #endif
+// #endif
{SPECIES_MEW, ITEM_MEWNIUM_Z, MOVE_PSYCHIC, MOVE_GENESIS_SUPERNOVA},
{SPECIES_PIKACHU, ITEM_PIKANIUM_Z, MOVE_VOLT_TACKLE, MOVE_CATASTROPIKA},
{SPECIES_EEVEE, ITEM_EEVIUM_Z, MOVE_LAST_RESORT, MOVE_EXTREME_EVOBOOST},
@@ -161,7 +161,7 @@ void QueueZMove(u8 battlerId, u16 baseMove)
bool32 IsViableZMove(u8 battlerId, u16 move)
{
struct Pokemon *mon;
- struct MegaEvolutionData *mega = &(((struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]))->mega);
+ struct MegaEvolutionData *mega = &(((struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]))->mega);
u8 battlerPosition = GetBattlerPosition(battlerId);
u8 partnerPosition = GetBattlerPosition(BATTLE_PARTNER(battlerId));
u32 item;
@@ -212,7 +212,7 @@ bool32 IsViableZMove(u8 battlerId, u16 move)
if (move != MOVE_NONE && zMove != MOVE_Z_STATUS && gBattleMoves[move].type == ItemId_GetSecondaryId(item))
{
- if (IS_MOVE_STATUS(gBattleMoves[move].split))
+ if (IS_MOVE_STATUS(move))
gBattleStruct->zmove.chosenZMove = move;
else
gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battlerId);
@@ -408,7 +408,7 @@ static u16 GetTypeBasedZMove(u16 move, u8 battler)
bool32 MoveSelectionDisplayZMove(u16 zmove)
{
u32 i;
- struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
u16 move = moveInfo->moves[gMoveSelectionCursor[gActiveBattler]];
PlaySE(SE_SELECT);
@@ -501,7 +501,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove)
break;
}
- BattlePutTextOnWindow(gDisplayedStringBattle, 5); // Slot of Move 3
+ BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3);
gDisplayedStringBattle[0] = CHAR_Z;
gDisplayedStringBattle[1] = CHAR_HYPHEN;
StringCopy(gDisplayedStringBattle + 2, gMoveNames[move]);
@@ -510,7 +510,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove)
{
// Damaging move -> status z move
StringCopy(gDisplayedStringBattle, sText_StatsPlus2);
- BattlePutTextOnWindow(gDisplayedStringBattle, 5); // Slot of Move 3
+ BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3);
StringCopy(gDisplayedStringBattle, GetZMoveName(zmove));
}
else
@@ -518,7 +518,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove)
ZMoveSelectionDisplayPower(move, zmove);
StringCopy(gDisplayedStringBattle, GetZMoveName(zmove));
}
- BattlePutTextOnWindow(gDisplayedStringBattle, 3); // First move slot
+ BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_1);
ZMoveSelectionDisplayPpNumber();
MoveSelectionCreateCursorAt(0, 0);
@@ -540,7 +540,7 @@ static void ZMoveSelectionDisplayPower(u16 move, u16 zMove)
{
txtPtr = StringCopy(gDisplayedStringBattle, sText_PowerColon);
ConvertIntToDecimalStringN(txtPtr, power, STR_CONV_MODE_LEFT_ALIGN, 3);
- BattlePutTextOnWindow(gDisplayedStringBattle, 5); // Bottom left
+ BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3);
}
}
@@ -553,14 +553,14 @@ static void ZMoveSelectionDisplayPpNumber(void)
return;
SetPpNumbersPaletteInMoveSelection();
- moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
+ moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, 1, STR_CONV_MODE_RIGHT_ALIGN, 2);
*(txtPtr)++ = CHAR_SLASH;
ConvertIntToDecimalStringN(txtPtr, 1, STR_CONV_MODE_RIGHT_ALIGN, 2);
- BattlePutTextOnWindow(gDisplayedStringBattle, 9);
+ BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_PP_REMAINING);
}
-const u8* GetZMoveName(u16 move)
+const u8 *GetZMoveName(u16 move)
{
if (IsZMove(move))
return gZMoveNames[move - FIRST_Z_MOVE];
diff --git a/src/berry.c b/src/berry.c
index 88cd88b791..e6ee039f40 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1444,7 +1444,7 @@ void ClearEnigmaBerries(void)
void SetEnigmaBerry(u8 *src)
{
u32 i;
- u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
+ u8 *dest = (u8 *)&gSaveBlock1Ptr->enigmaBerry;
for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry); i++)
dest[i] = src[i];
@@ -1456,7 +1456,7 @@ static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
u32 checksum;
u8 *dest;
- dest = (u8*)enigmaBerry;
+ dest = (u8 *)enigmaBerry;
checksum = 0;
for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry) - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
checksum += dest[i];
@@ -1478,7 +1478,7 @@ bool32 IsEnigmaBerryValid(void)
const struct Berry *GetBerryInfo(u8 berry)
{
if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY_E_READER) && IsEnigmaBerryValid())
- return (struct Berry*)(&gSaveBlock1Ptr->enigmaBerry.berry);
+ return (struct Berry *)(&gSaveBlock1Ptr->enigmaBerry.berry);
else
{
if (berry == BERRY_NONE || berry > ITEM_TO_BERRY(LAST_BERRY_INDEX))
@@ -1670,7 +1670,7 @@ void GetBerryNameByBerryType(u8 berry, u8 *string)
string[BERRY_NAME_LENGTH] = EOS;
}
-void GetBerryCountStringByBerryType(u8 berry, u8* dest, u32 berryCount)
+void GetBerryCountStringByBerryType(u8 berry, u8 *dest, u32 berryCount)
{
GetBerryCountString(dest, GetBerryInfo(berry)->name, berryCount);
}
@@ -1798,7 +1798,7 @@ void ObjectEventInteractionPlantBerryTree(void)
{
u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
- PlantBerryTree(GetObjectEventBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE);
+ PlantBerryTree(GetObjectEventBerryTreeId(gSelectedObjectEvent), berry, BERRY_STAGE_PLANTED, TRUE);
ObjectEventInteractionGetBerryTreeData();
}
diff --git a/src/berry_blender.c b/src/berry_blender.c
index a5105ae45f..6ff17931b3 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -215,7 +215,7 @@ static void SetPlayerBerryData(u8, u16);
static void Blender_AddTextPrinter(u8, const u8 *, u8, u8, s32, s32);
static void ResetLinkCmds(void);
static void CreateParticleSprites(void);
-static void ShakeBgCoordForHit(s16*, u16);
+static void ShakeBgCoordForHit(s16 *, u16);
static void TryUpdateProgressBar(u16, u16);
static void UpdateRPM(u16);
static void RestoreBgCoords(void);
@@ -265,7 +265,7 @@ static const u8 sText_Master[] = _("MASTER");
static const u8 sText_Dude[] = _("DUDE");
static const u8 sText_Miss[] = _("MISS");
-static const u8* const sBlenderOpponentsNames[] =
+static const u8 *const sBlenderOpponentsNames[] =
{
[BLENDER_MISTER] = sText_Mister,
[BLENDER_LADDIE] = sText_Laddie,
@@ -456,7 +456,7 @@ static const struct OamData sOam_PlayerArrow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -599,7 +599,7 @@ static const struct OamData sOam_ScoreSymbols =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -668,7 +668,7 @@ static const struct OamData sOam_Particles =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -755,7 +755,7 @@ static const struct OamData sOam_CountdownNumbers =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -813,7 +813,7 @@ static const struct OamData sOam_Start =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -1145,7 +1145,7 @@ static void CB2_LoadBerryBlender(void)
#define sYDownSpeed data[7]
// For throwing berries into the machine
-static void SpriteCB_Berry(struct Sprite* sprite)
+static void SpriteCB_Berry(struct Sprite *sprite)
{
sprite->sX += sprite->sXSpeed;
sprite->sY -= sprite->sYUpSpeed;
@@ -1166,7 +1166,7 @@ static void SpriteCB_Berry(struct Sprite* sprite)
sprite->y = sprite->sY;
}
-static void SetBerrySpriteData(struct Sprite* sprite, s16 x, s16 y, s16 bounceSpeed, s16 xSpeed, s16 ySpeed)
+static void SetBerrySpriteData(struct Sprite *sprite, s16 x, s16 y, s16 bounceSpeed, s16 xSpeed, s16 ySpeed)
{
sprite->sTargetY = y;
sprite->sX = x;
@@ -2260,7 +2260,7 @@ static bool8 AreBlenderBerriesSame(struct BlenderBerry* berries, u8 a, u8 b)
return FALSE;
}
-static u32 CalculatePokeblockColor(struct BlenderBerry* berries, s16* _flavors, u8 numPlayers, u8 negativeFlavors)
+static u32 CalculatePokeblockColor(struct BlenderBerry* berries, s16 *_flavors, u8 numPlayers, u8 negativeFlavors)
{
s16 flavors[FLAVOR_COUNT + 1];
s32 i, j;
@@ -2494,7 +2494,7 @@ static void CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *p
}
// Unused
-static void Debug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 numPlayers, u8* flavors, u16 maxRPM)
+static void Debug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 numPlayers, u8 *flavors, u16 maxRPM)
{
CalculatePokeblock(berries, pokeblock, numPlayers, flavors, maxRPM);
}
@@ -2628,7 +2628,7 @@ static void CB2_EndBlenderGame(void)
if (gReceivedRemoteLinkPlayers && gWirelessCommType)
{
- struct BlenderGameBlock *receivedBlock = (struct BlenderGameBlock*)(&gBlockRecvBuffer);
+ struct BlenderGameBlock *receivedBlock = (struct BlenderGameBlock *)(&gBlockRecvBuffer);
sBerryBlender->maxRPM = receivedBlock->timeRPM.maxRPM;
sBerryBlender->gameFrameTime = receivedBlock->timeRPM.time;
@@ -2641,7 +2641,7 @@ static void CB2_EndBlenderGame(void)
}
else
{
- struct TimeAndRPM *receivedBlock = (struct TimeAndRPM*)(&gBlockRecvBuffer);
+ struct TimeAndRPM *receivedBlock = (struct TimeAndRPM *)(&gBlockRecvBuffer);
sBerryBlender->maxRPM = receivedBlock->maxRPM;
sBerryBlender->gameFrameTime = receivedBlock->time;
@@ -3159,7 +3159,7 @@ static void SetBgPos(void)
SetGpuReg(REG_OFFSET_BG0VOFS, sBerryBlender->bg_Y);
}
-static void SpriteCB_Particle(struct Sprite* sprite)
+static void SpriteCB_Particle(struct Sprite *sprite)
{
sprite->data[2] += sprite->data[0];
sprite->data[3] += sprite->data[1];
@@ -3194,7 +3194,7 @@ static void CreateParticleSprites(void)
}
}
-static void SpriteCB_ScoreSymbol(struct Sprite* sprite)
+static void SpriteCB_ScoreSymbol(struct Sprite *sprite)
{
sprite->data[0]++;
sprite->y2 = -(sprite->data[0] / 3);
@@ -3203,7 +3203,7 @@ static void SpriteCB_ScoreSymbol(struct Sprite* sprite)
DestroySprite(sprite);
}
-static void SpriteCB_ScoreSymbolBest(struct Sprite* sprite)
+static void SpriteCB_ScoreSymbolBest(struct Sprite *sprite)
{
sprite->data[0]++;
sprite->y2 = -(sprite->data[0] * 2);
@@ -3225,7 +3225,7 @@ static void SetPlayerBerryData(u8 playerId, u16 itemId)
#define sDelay data[2]
#define sAnimId data[3]
-static void SpriteCB_CountdownNumber(struct Sprite* sprite)
+static void SpriteCB_CountdownNumber(struct Sprite *sprite)
{
switch (sprite->sState)
{
@@ -3272,7 +3272,7 @@ static void SpriteCB_CountdownNumber(struct Sprite* sprite)
#undef sDelay
#undef sAnimId
-static void SpriteCB_Start(struct Sprite* sprite)
+static void SpriteCB_Start(struct Sprite *sprite)
{
switch (sprite->data[0])
{
@@ -3318,7 +3318,7 @@ static void UpdateProgressBar(u16 value, u16 limit)
s32 amountFilled, maxFilledSegment, subSegmentsFilled, i;
u16 *vram;
- vram = (u16*)(BG_SCREEN_ADDR(12));
+ vram = (u16 *)(BG_SCREEN_ADDR(12));
amountFilled = (value * 64) / limit;
maxFilledSegment = amountFilled / 8;
@@ -3368,22 +3368,22 @@ static void UpdateRPM(u16 speed)
digits[i] = currentRPM % 10;
currentRPM /= 10;
}
- *((u16*)(BG_SCREEN_ADDR(12) + 0x458)) = digits[4] + RPM_DIGIT;
- *((u16*)(BG_SCREEN_ADDR(12) + 0x45A)) = digits[3] + RPM_DIGIT;
- *((u16*)(BG_SCREEN_ADDR(12) + 0x45C)) = digits[2] + RPM_DIGIT;
- *((u16*)(BG_SCREEN_ADDR(12) + 0x460)) = digits[1] + RPM_DIGIT;
- *((u16*)(BG_SCREEN_ADDR(12) + 0x462)) = digits[0] + RPM_DIGIT;
+ *((u16 *)(BG_SCREEN_ADDR(12) + 0x458)) = digits[4] + RPM_DIGIT;
+ *((u16 *)(BG_SCREEN_ADDR(12) + 0x45A)) = digits[3] + RPM_DIGIT;
+ *((u16 *)(BG_SCREEN_ADDR(12) + 0x45C)) = digits[2] + RPM_DIGIT;
+ *((u16 *)(BG_SCREEN_ADDR(12) + 0x460)) = digits[1] + RPM_DIGIT;
+ *((u16 *)(BG_SCREEN_ADDR(12) + 0x462)) = digits[0] + RPM_DIGIT;
}
// Passed a pointer to the bg x/y
// Used when hitting a Best at high RPM
-static void ShakeBgCoordForHit(s16* coord, u16 speed)
+static void ShakeBgCoordForHit(s16 *coord, u16 speed)
{
if (*coord == 0)
*coord = (Random() % speed) - (speed / 2);
}
-static void RestoreBgCoord(s16* coord)
+static void RestoreBgCoord(s16 *coord)
{
if (*coord < 0)
(*coord)++;
@@ -3398,7 +3398,7 @@ static void RestoreBgCoords(void)
RestoreBgCoord(&sBerryBlender->bg_Y);
}
-static void BlenderLandShakeBgCoord(s16* coord, u16 timer)
+static void BlenderLandShakeBgCoord(s16 *coord, u16 timer)
{
s32 strength;
@@ -3443,7 +3443,7 @@ static bool8 UpdateBlenderLandScreenShake(void)
return FALSE;
}
-static void SpriteCB_PlayerArrow(struct Sprite* sprite)
+static void SpriteCB_PlayerArrow(struct Sprite *sprite)
{
sprite->x2 = -(sBerryBlender->bg_X);
sprite->y2 = -(sBerryBlender->bg_Y);
@@ -3553,7 +3553,7 @@ static bool8 PrintBlendingResults(void)
sBerryBlender->mainState++;
break;
case 5:
- ClearStdWindowAndFrameToTransparent(5, 1);
+ ClearStdWindowAndFrameToTransparent(5, TRUE);
for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
{
@@ -3692,7 +3692,7 @@ static bool8 PrintBlendingRanking(void)
}
break;
case 3:
- DrawStdFrameWithCustomTileAndPalette(5, 0, 1, 0xD);
+ DrawStdFrameWithCustomTileAndPalette(5, FALSE, 1, 0xD);
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, sText_Ranking, 168);
Blender_AddTextPrinter(5, sText_Ranking, xPos, 1, TEXT_SKIP_DRAW, 0);
@@ -3764,7 +3764,7 @@ void ShowBerryBlenderRecordWindow(void)
winTemplate = sBlenderRecordWindowTemplate;
gRecordsWindowId = AddWindow(&winTemplate);
- DrawStdWindowFrame(gRecordsWindowId, 0);
+ DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, gText_BlenderMaxSpeedRecord, 144);
diff --git a/src/berry_crush.c b/src/berry_crush.c
index e6e2d87427..eff0a20737 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -874,7 +874,7 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] =
.xDelta = 8,
.x = 156,
.y = 0,
- .spriteSheet = (void*) &sSpriteSheets[3],
+ .spriteSheet = (void *) &sSpriteSheets[3],
.spritePal = &sSpritePals[2],
},
{ // Seconds
@@ -886,7 +886,7 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] =
.xDelta = 8,
.x = 180,
.y = 0,
- .spriteSheet = (void*) &sSpriteSheets[3],
+ .spriteSheet = (void *) &sSpriteSheets[3],
.spritePal = &sSpritePals[2],
},
{ // 1/60ths of a second
@@ -898,7 +898,7 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] =
.xDelta = 8,
.x = 204,
.y = 0,
- .spriteSheet = (void*) &sSpriteSheets[3],
+ .spriteSheet = (void *) &sSpriteSheets[3],
.spritePal = &sSpritePals[2],
}
};
@@ -914,7 +914,7 @@ static const u8 *const sResultsTexts[] =
[RESULTS_PAGE_POWER + NUM_RESULTS_PAGES] = gText_PressingPowerRankings,
};
-static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame * game, u8 * data) =
+static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame * game, u8 *data) =
{
[CMD_NONE] = NULL,
[CMD_FADE] = Cmd_BeginNormalPaletteFade,
@@ -1752,7 +1752,7 @@ static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGa
break;
case 2:
LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, 208);
- DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, 0, 541, 13);
+ DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, FALSE, 541, 13);
break;
case 3:
playerCountIdx = game->playerCount - 2;
@@ -1788,7 +1788,7 @@ static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGa
static void CloseResultsWindow(struct BerryCrushGame *game)
{
- ClearStdWindowAndFrameToTransparent(game->gfx.resultsWindowId, 1);
+ ClearStdWindowAndFrameToTransparent(game->gfx.resultsWindowId, TRUE);
RemoveWindow(game->gfx.resultsWindowId);
DrawPlayerNameWindows(game);
}
@@ -1810,7 +1810,7 @@ static void Task_ShowRankings(u8 taskId)
PutWindowTilemap(tWindowId);
FillWindowPixelBuffer(tWindowId, PIXEL_FILL(0));
LoadUserWindowBorderGfx_(tWindowId, 541, 208);
- DrawStdFrameWithCustomTileAndPalette(tWindowId, 0, 541, 13);
+ DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 541, 13);
break;
case 1:
// Print header text
@@ -1849,12 +1849,12 @@ static void Task_ShowRankings(u8 taskId)
else
return;
case 3:
- ClearStdWindowAndFrameToTransparent(tWindowId, 1);
+ ClearStdWindowAndFrameToTransparent(tWindowId, TRUE);
ClearWindowTilemap(tWindowId);
RemoveWindow(tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
- ScriptContext2_Disable();
+ ScriptContext_Enable();
+ UnlockPlayerFieldControls();
tState = 0;
return;
}
@@ -1865,7 +1865,7 @@ void ShowBerryCrushRankings(void)
{
u8 taskId;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
taskId = CreateTask(Task_ShowRankings, 0);
gTasks[taskId].tPressingSpeeds(0) = gSaveBlock2Ptr->berryCrush.pressingSpeeds[0];
gTasks[taskId].tPressingSpeeds(1) = gSaveBlock2Ptr->berryCrush.pressingSpeeds[1];
@@ -1885,9 +1885,9 @@ static void HideTimer(struct BerryCrushGame_Gfx *gfx)
{
gfx->timerSprites[0]->invisible = TRUE;
gfx->timerSprites[1]->invisible = TRUE;
- DigitObjUtil_HideOrShow(2, 1);
- DigitObjUtil_HideOrShow(1, 1);
- DigitObjUtil_HideOrShow(0, 1);
+ DigitObjUtil_HideOrShow(2, TRUE);
+ DigitObjUtil_HideOrShow(1, TRUE);
+ DigitObjUtil_HideOrShow(0, TRUE);
}
static void CreatePlayerNameWindows(struct BerryCrushGame *game)
@@ -1947,7 +1947,7 @@ static void DrawPlayerNameWindows(struct BerryCrushGame *game)
static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame *game)
{
u8 i = 0;
- u8 * windowGfx;
+ u8 *windowGfx;
LZ77UnCompWram(gBerryCrush_TextWindows_Tilemap, gDecompressionBuffer);
@@ -2258,11 +2258,11 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame *game, u8 *args)
if (args[1] & F_MSG_EXPAND)
{
StringExpandPlaceholders(gStringVar4, sMessages[args[0]]);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, game->textSpeed, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
else
{
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[args[0]], game->textSpeed, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[args[0]], game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
CopyWindowToVram(0, COPYWIN_FULL);
break;
@@ -2282,7 +2282,7 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame *game, u8 *args)
break;
case 3:
if (args[1] & F_MSG_CLEAR)
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
RunOrScheduleCommand(game->nextCmd, SCHEDULE_CMD, NULL);
game->cmdState = args[4];
return 0;
@@ -2402,7 +2402,7 @@ static u32 Cmd_WaitForOthersToPickBerries(struct BerryCrushGame *game, u8 *args)
game->targetDepth = MathUtil_Div32(Q_24_8(game->targetAPresses), Q_24_8(32));
break;
case 5:
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
RunOrScheduleCommand(CMD_DROP_BERRIES, SCHEDULE_CMD, NULL);
game->gameState = STATE_DROP_BERRIES;
game->cmdState = 0;
@@ -3242,7 +3242,7 @@ static u32 Cmd_SaveGame(struct BerryCrushGame *game, u8 *args)
if (!IsLinkTaskFinished())
return 0;
DrawDialogueFrame(0, FALSE);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
CreateTask(Task_LinkFullSave, 0);
break;
@@ -3295,7 +3295,7 @@ static u32 Cmd_AskPlayAgain(struct BerryCrushGame *game, u8 *args)
}
// Close Yes/No and start communication
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
SetPrintMessageArgs(args, MSG_COMM_STANDBY, 0, 0, 0);
game->nextCmd = CMD_COMM_PLAY_AGAIN;
RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL);
@@ -3367,7 +3367,7 @@ static u32 Cmd_PlayAgain(struct BerryCrushGame *game, u8 *args)
return 0;
break;
case 2:
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
ResetCrusherPos(game);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
UpdatePaletteFade();
@@ -3391,9 +3391,9 @@ static u32 Cmd_StopGame(struct BerryCrushGame *game, u8 *args)
case 0:
DrawDialogueFrame(0, FALSE);
if (game->playAgainState == PLAY_AGAIN_NO_BERRIES)
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
else
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_DROPPED], game->textSpeed, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_DROPPED], game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
break;
case 1:
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 3da0d3957b..d359a0fc1b 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -276,7 +276,7 @@ static bool8 InitBerryTagScreen(void)
gMain.state++;
break;
case 14:
- BlendPalettes(PALETTES_ALL, 0x10, 0);
+ BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
gMain.state++;
break;
case 15:
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 876e6b4a73..6b5d66d315 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -86,7 +86,7 @@ void DoBrailleDigEffect(void)
DrawWholeMapView();
PlaySE(SE_BANG);
FlagSet(FLAG_SYS_BRAILLE_DIG);
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
bool8 CheckRelicanthWailord(void)
@@ -152,7 +152,7 @@ static void Task_SealedChamberShakingEffect(u8 taskId)
if (task->tShakeCounter == task->tNumShakes)
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
InstallCameraPanAheadCallback();
}
}
@@ -213,7 +213,7 @@ static void DoBrailleRegirockEffect(void)
DrawWholeMapView();
PlaySE(SE_BANG);
FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
bool8 ShouldDoBrailleRegisteelEffect(void)
@@ -252,7 +252,7 @@ static void DoBrailleRegisteelEffect(void)
DrawWholeMapView();
PlaySE(SE_BANG);
FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
// theory: another commented out DoBrailleWait and Task_BrailleWait.
diff --git a/src/cable_car.c b/src/cable_car.c
index c81764728b..562e9eceb7 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -245,7 +245,7 @@ static void Task_LoadCableCar(u8 taskId)
void CableCar(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_LoadCableCar, 1);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB(0, 0, 0));
}
diff --git a/src/cable_club.c b/src/cable_club.c
index 4ee2797f4d..913a1b7287 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -97,7 +97,7 @@ static void PrintNumPlayersInLink(u16 windowId, u32 numPlayers)
u8 xPos;
ConvertIntToDecimalStringN(gStringVar1, numPlayers, STR_CONV_MODE_LEFT_ALIGN, 1);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
StringExpandPlaceholders(gStringVar4, gText_NumPlayerLink);
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 88);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, xPos, 1, TEXT_SKIP_DRAW, NULL);
@@ -486,7 +486,7 @@ static void FinishLinkup(u16 *linkupStatus, u32 taskId)
{
// Successful battle tower linkup
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
@@ -494,7 +494,7 @@ static void FinishLinkup(u16 *linkupStatus, u32 taskId)
{
// Successful linkup
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
@@ -531,7 +531,7 @@ static void Task_StopLinkup(u8 taskId)
if (!gReceivedRemoteLinkPlayers)
{
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
}
@@ -543,7 +543,7 @@ static void Task_LinkupFailed(u8 taskId)
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
StopFieldMessage();
RemoveWindow(gTasks[taskId].tWindowId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
@@ -553,7 +553,7 @@ static void Task_LinkupConnectionError(u8 taskId)
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
RemoveWindow(gTasks[taskId].tWindowId);
HideFieldMessageBox();
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
@@ -688,13 +688,13 @@ static void Task_ValidateMixingGameLanguage(u8 taskId)
return;
}
}
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
break;
case 1:
if (!gReceivedRemoteLinkPlayers)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
break;
@@ -833,7 +833,7 @@ static void SetLinkBattleTypeFlags(int linkService)
static void Task_StartWiredCableClubBattle(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->tState)
{
@@ -879,7 +879,7 @@ static void Task_StartWiredCableClubBattle(u8 taskId)
static void Task_StartWirelessCableClubBattle(u8 taskId)
{
int i;
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
switch (tState)
{
@@ -1042,7 +1042,7 @@ void ExitLinkRoom(void)
// Note: gSpecialVar_0x8005 contains the id of the seat the player entered
static void Task_EnterCableClubSeat(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch (task->tState)
{
@@ -1080,7 +1080,7 @@ static void Task_EnterCableClubSeat(u8 taskId)
SetLinkWaitingForScript();
EraseFieldMessageBox(TRUE);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
break;
}
}
@@ -1089,7 +1089,7 @@ void CreateTask_EnterCableClubSeat(TaskFunc followupFunc)
{
u8 taskId = CreateTask(Task_EnterCableClubSeat, 80);
SetTaskFuncWithFollowupFunc(taskId, Task_EnterCableClubSeat, followupFunc);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
}
static void Task_StartWiredTrade(u8 taskId)
@@ -1099,7 +1099,7 @@ static void Task_StartWiredTrade(u8 taskId)
switch (task->tState)
{
case 0:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
ClearLinkCallback_2();
task->tState++;
@@ -1132,7 +1132,7 @@ static void Task_StartWirelessTrade(u8 taskId)
switch (tState)
{
case 0:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
ClearLinkRfuCallback();
tState++;
@@ -1176,7 +1176,7 @@ static void CreateTask_StartWiredTrade(void)
void Script_StartWiredTrade(void)
{
// CreateTask_StartWiredTrade();
- // ScriptContext1_Stop();
+ // ScriptContext_Stop();
}
void ColosseumPlayerSpotTriggered(void)
@@ -1193,7 +1193,7 @@ void ColosseumPlayerSpotTriggered(void)
static void CreateTask_EnterCableClubSeatNoFollowup(void)
{
u8 taskId = CreateTask(Task_EnterCableClubSeat, 80);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
}
void Script_ShowLinkTrainerCard(void)
@@ -1257,7 +1257,7 @@ static void Task_WaitExitToScript(u8 taskId)
{
if (!gReceivedRemoteLinkPlayers)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index 9bde45e97b..9b79b48f1f 100644
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -79,7 +79,7 @@ void CB2_InitClearSaveDataScreen(void)
static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
{
- DrawStdFrameWithCustomTileAndPalette(0, 0, 2, 14);
+ DrawStdFrameWithCustomTileAndPalette(0, FALSE, 2, 14);
AddTextPrinterParameterized(0, FONT_NORMAL, gText_ClearAllSaveData, 0, 1, 0, 0);
CreateYesNoMenu(sClearSaveYesNo, 2, 14, 1);
gTasks[taskId].func = Task_ClearSaveDataScreenYesNoChoice;
diff --git a/src/contest.c b/src/contest.c
index 1f9b475499..0c525ed3ab 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -388,7 +388,7 @@ static const struct OamData sOam_SliderHeart =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -473,7 +473,7 @@ static const struct OamData sOam_NextTurn =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -859,19 +859,19 @@ static const struct CompressedSpriteSheet sSpriteSheets_ContestantsTurnBlinkEffe
static const struct SpritePalette sSpritePalettes_ContestantsTurnBlinkEffect[CONTESTANT_COUNT] =
{
{
- .data = (u16*)(gHeap + 0x1A0A4),
+ .data = (u16 *)(gHeap + 0x1A0A4),
.tag = TAG_BLINK_EFFECT_CONTESTANT0
},
{
- .data = (u16*)(gHeap + 0x1A0C4),
+ .data = (u16 *)(gHeap + 0x1A0C4),
.tag = TAG_BLINK_EFFECT_CONTESTANT1
},
{
- .data = (u16*)(gHeap + 0x1A0E4),
+ .data = (u16 *)(gHeap + 0x1A0E4),
.tag = TAG_BLINK_EFFECT_CONTESTANT2
},
{
- .data = (u16*)(gHeap + 0x1A104),
+ .data = (u16 *)(gHeap + 0x1A104),
.tag = TAG_BLINK_EFFECT_CONTESTANT3
}
};
@@ -1396,7 +1396,7 @@ static void Task_RaiseCurtainAtStart(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 1:
- *(s16*)&gBattle_BG1_Y += 7;
+ *(s16 *)&gBattle_BG1_Y += 7;
if ((s16)gBattle_BG1_Y <= DISPLAY_HEIGHT)
break;
gTasks[taskId].data[0]++;
@@ -1582,7 +1582,7 @@ static void Task_HandleMoveSelectInput(u8 taskId)
StringCopy(gDisplayedStringBattle, gText_AppealNumButItCantParticipate);
ContestClearGeneralTextWindow();
StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
- Contest_StartTextPrinter(gStringVar4, 0);
+ Contest_StartTextPrinter(gStringVar4, FALSE);
gBattle_BG0_Y = 0;
gBattle_BG2_Y = 0;
gTasks[taskId].func = Task_TryShowMoveSelectScreen;
@@ -1814,7 +1814,7 @@ static void Task_DoAppeals(u8 taskId)
else
StringCopy(gStringVar2, sInvalidContestMoveNames[eContestantStatus[contestant].moveCategory]);
StringExpandPlaceholders(gStringVar4, gText_MonAppealedWithMove);
- Contest_StartTextPrinter(gStringVar4, 1);
+ Contest_StartTextPrinter(gStringVar4, TRUE);
gTasks[taskId].tState = APPEALSTATE_WAIT_USED_MOVE_MSG;
}
return;
@@ -2076,7 +2076,7 @@ static void Task_DoAppeals(u8 taskId)
ContestClearGeneralTextWindow();
StringCopy(gStringVar1, gContestMons[contestant].nickname);
StringExpandPlaceholders(gStringVar4, gText_MonCantAppealNextTurn);
- Contest_StartTextPrinter(gStringVar4, 1);
+ Contest_StartTextPrinter(gStringVar4, TRUE);
}
gTasks[taskId].tState = APPEALSTATE_WAIT_SKIP_NEXT_TURN_MSG;
}
@@ -2118,7 +2118,7 @@ static void Task_DoAppeals(u8 taskId)
ContestClearGeneralTextWindow();
StringCopy(gStringVar1, gContestMons[contestant].nickname);
StringExpandPlaceholders(gStringVar4, gText_JudgeLookedAtMonExpectantly);
- Contest_StartTextPrinter(gStringVar4, 1);
+ Contest_StartTextPrinter(gStringVar4, TRUE);
DoJudgeSpeechBubble(JUDGE_SYMBOL_ONE_EXCLAMATION);
gTasks[taskId].tCounter = 0;
gTasks[taskId].tState = APPEALSTATE_WAIT_JUDGE_COMBO;
@@ -2231,7 +2231,7 @@ static void Task_DoAppeals(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_MonsXWentOverGreat);
else
StringExpandPlaceholders(gStringVar4, gText_MonsXGotTheCrowdGoing);
- Contest_StartTextPrinter(gStringVar4, 1);
+ Contest_StartTextPrinter(gStringVar4, TRUE);
gTasks[taskId].tCounter = 0;
gTasks[taskId].data[11] = 0;
if (r3 < 0)
@@ -2753,8 +2753,8 @@ static void Task_ContestReturnToField(u8 taskId)
static void FieldCB_ContestReturnToField(void)
{
- ScriptContext2_Disable();
- EnableBothScriptContexts();
+ UnlockPlayerFieldControls();
+ ScriptContext_Enable();
}
static void TryPutPlayerLast(void)
@@ -2853,7 +2853,7 @@ void SetContestants(u8 contestType, u8 rank)
u8 opponentsCount = 0;
u8 opponents[100];
bool8 allowPostgameContestants = FALSE;
- const u8 * filter;
+ const u8 *filter;
TryPutPlayerLast();
@@ -3009,7 +3009,7 @@ static void DrawContestantWindowText(void)
static u8 *Contest_CopyStringWithColor(const u8 *string, u8 color)
{
- u8 * ptr = StringCopy(gDisplayedStringBattle, gText_ColorTransparent);
+ u8 *ptr = StringCopy(gDisplayedStringBattle, gText_ColorTransparent);
ptr[-1] = color; // Overwrites the "{COLOR TRANSPARENT}" part of the string.
ptr = StringCopy(ptr, string);
@@ -3663,7 +3663,7 @@ static void ContestPrintLinkStandby(void)
gBattle_BG0_Y = 0;
gBattle_BG2_Y = 0;
ContestClearGeneralTextWindow();
- Contest_StartTextPrinter(gText_LinkStandby4, 0);
+ Contest_StartTextPrinter(gText_LinkStandby4, FALSE);
}
static void FillContestantWindowBgs(void)
@@ -4574,7 +4574,7 @@ static void PrintAppealMoveResultText(u8 contestant, u8 stringId)
StringCopy(gStringVar3, gText_Contest_Fear);
StringExpandPlaceholders(gStringVar4, sAppealResultTexts[stringId]);
ContestClearGeneralTextWindow();
- Contest_StartTextPrinter(gStringVar4, 1);
+ Contest_StartTextPrinter(gStringVar4, TRUE);
}
void MakeContestantNervous(u8 p)
diff --git a/src/contest_util.c b/src/contest_util.c
index 5fc39a792d..79bf09eb2e 100644
--- a/src/contest_util.c
+++ b/src/contest_util.c
@@ -196,7 +196,7 @@ static const struct OamData sOamData_ResultsTextWindow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -242,7 +242,7 @@ static const struct OamData sOamData_Confetti =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -365,7 +365,7 @@ static const struct OamData sOamData_WirelessIndicatorWindow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -1180,7 +1180,7 @@ static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId)
spriteTilePtrs[0] = (u8 *)(sprite->oam.tileNum * 32 + OBJ_VRAM0);
for (i = 1; i < (int)ARRAY_COUNT(spriteTilePtrs); i++)
- spriteTilePtrs[i] = (void*)(gSprites[sprite->data[i - 1]].oam.tileNum * 32 + OBJ_VRAM0);
+ spriteTilePtrs[i] = (void *)(gSprites[sprite->data[i - 1]].oam.tileNum * 32 + OBJ_VRAM0);
for (i = 0; i < (int)ARRAY_COUNT(spriteTilePtrs); i++)
CpuFill32(0, spriteTilePtrs[i], 0x400);
@@ -2113,7 +2113,7 @@ static void Task_StartContest(u8 taskId)
void StartContest(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_StartContest, 10);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
@@ -2134,7 +2134,7 @@ static void Task_StartShowContestResults(u8 taskId)
void ShowContestResults(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_StartShowContestResults, 10);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
@@ -2147,7 +2147,7 @@ void GetContestPlayerId(void)
void ContestLinkTransfer(u8 category)
{
u8 newTaskId;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
newTaskId = CreateTask(Task_LinkContest_Init, 0);
SetTaskFuncWithFollowupFunc(newTaskId, Task_LinkContest_Init, Task_StartCommunication);
gTasks[newTaskId].data[9] = category;
@@ -2249,8 +2249,8 @@ void Task_LinkContest_FinalizeConnection(u8 taskId)
DestroyTask(taskId);
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, WARP_ID_NONE);
- ScriptContext2_Disable();
- EnableBothScriptContexts();
+ UnlockPlayerFieldControls();
+ ScriptContext_Enable();
}
}
@@ -2265,8 +2265,8 @@ static void Task_LinkContest_WaitDisconnect(u8 taskId)
if (!gReceivedRemoteLinkPlayers)
{
DestroyTask(taskId);
- ScriptContext2_Disable();
- EnableBothScriptContexts();
+ UnlockPlayerFieldControls();
+ ScriptContext_Enable();
}
}
@@ -2620,7 +2620,7 @@ static void Task_ShowContestEntryMonPic(u8 taskId)
break;
case 1:
task->data[5] = CreateWindowFromRect(10, 3, 8, 8);
- SetStandardWindowBorderStyle(task->data[5], 1);
+ SetStandardWindowBorderStyle(task->data[5], TRUE);
task->data[0]++;
break;
case 2:
@@ -2707,7 +2707,7 @@ static void Task_LinkContestWaitForConnection(u8 taskId)
default:
if (IsLinkTaskFinished() == 1)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
break;
diff --git a/src/credits.c b/src/credits.c
index 138ae30df6..958639e465 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -287,7 +287,7 @@ static const struct OamData sOamData_MonBg =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/data/easy_chat/easy_chat_group_pokemon2.h b/src/data/easy_chat/easy_chat_group_pokemon2.h
index 44dce0cc84..331c5ac6c3 100755
--- a/src/data/easy_chat/easy_chat_group_pokemon2.h
+++ b/src/data/easy_chat/easy_chat_group_pokemon2.h
@@ -1,253 +1,253 @@
const u16 gEasyChatGroup_Pokemon2[] = {
- SPECIES_ABRA,
- SPECIES_AERODACTYL,
- SPECIES_AIPOM,
- SPECIES_ALAKAZAM,
- SPECIES_AMPHAROS,
- SPECIES_ARBOK,
- SPECIES_ARCANINE,
- SPECIES_ARIADOS,
- SPECIES_ARTICUNO,
- SPECIES_AZUMARILL,
- SPECIES_BAYLEEF,
- SPECIES_BEEDRILL,
- SPECIES_BELLOSSOM,
- SPECIES_BELLSPROUT,
- SPECIES_BLASTOISE,
- SPECIES_BLISSEY,
- SPECIES_BULBASAUR,
- SPECIES_BUTTERFREE,
- SPECIES_CATERPIE,
- SPECIES_CELEBI,
- SPECIES_CHANSEY,
- SPECIES_CHARIZARD,
- SPECIES_CHARMANDER,
- SPECIES_CHARMELEON,
- SPECIES_CHIKORITA,
- SPECIES_CHINCHOU,
- SPECIES_CLEFABLE,
- SPECIES_CLEFAIRY,
- SPECIES_CLEFFA,
- SPECIES_CLOYSTER,
- SPECIES_CORSOLA,
- SPECIES_CROBAT,
- SPECIES_CROCONAW,
- SPECIES_CUBONE,
- SPECIES_CYNDAQUIL,
- SPECIES_DELIBIRD,
- SPECIES_DEWGONG,
- SPECIES_DIGLETT,
- SPECIES_DITTO,
- SPECIES_DODRIO,
- SPECIES_DODUO,
- SPECIES_DONPHAN,
- SPECIES_DRAGONAIR,
- SPECIES_DRAGONITE,
- SPECIES_DRATINI,
- SPECIES_DROWZEE,
- SPECIES_DUGTRIO,
- SPECIES_DUNSPARCE,
- SPECIES_EEVEE,
- SPECIES_EKANS,
- SPECIES_ELECTABUZZ,
- SPECIES_ELECTRODE,
- SPECIES_ELEKID,
- SPECIES_ENTEI,
- SPECIES_ESPEON,
- SPECIES_EXEGGCUTE,
- SPECIES_EXEGGUTOR,
- SPECIES_FARFETCHD,
- SPECIES_FEAROW,
- SPECIES_FERALIGATR,
- SPECIES_FLAAFFY,
- SPECIES_FLAREON,
- SPECIES_FORRETRESS,
- SPECIES_FURRET,
- SPECIES_GASTLY,
- SPECIES_GENGAR,
- SPECIES_GEODUDE,
- SPECIES_GIRAFARIG,
- SPECIES_GLIGAR,
- SPECIES_GLOOM,
- SPECIES_GOLBAT,
- SPECIES_GOLDEEN,
- SPECIES_GOLDUCK,
- SPECIES_GOLEM,
- SPECIES_GRANBULL,
- SPECIES_GRAVELER,
- SPECIES_GRIMER,
- SPECIES_GROWLITHE,
- SPECIES_GYARADOS,
- SPECIES_HAUNTER,
- SPECIES_HERACROSS,
- SPECIES_HITMONCHAN,
- SPECIES_HITMONLEE,
- SPECIES_HITMONTOP,
- SPECIES_HO_OH,
- SPECIES_HOOTHOOT,
- SPECIES_HOPPIP,
- SPECIES_HORSEA,
- SPECIES_HOUNDOOM,
- SPECIES_HOUNDOUR,
- SPECIES_HYPNO,
- SPECIES_IGGLYBUFF,
- SPECIES_IVYSAUR,
- SPECIES_JIGGLYPUFF,
- SPECIES_JOLTEON,
- SPECIES_JUMPLUFF,
- SPECIES_JYNX,
- SPECIES_KABUTO,
- SPECIES_KABUTOPS,
- SPECIES_KADABRA,
- SPECIES_KAKUNA,
- SPECIES_KANGASKHAN,
- SPECIES_KINGDRA,
- SPECIES_KINGLER,
- SPECIES_KOFFING,
- SPECIES_KRABBY,
- SPECIES_LANTURN,
- SPECIES_LAPRAS,
- SPECIES_LARVITAR,
- SPECIES_LEDIAN,
- SPECIES_LEDYBA,
- SPECIES_LICKITUNG,
- SPECIES_LUGIA,
- SPECIES_MACHAMP,
- SPECIES_MACHOKE,
- SPECIES_MACHOP,
- SPECIES_MAGBY,
- SPECIES_MAGCARGO,
- SPECIES_MAGIKARP,
- SPECIES_MAGMAR,
- SPECIES_MAGNEMITE,
- SPECIES_MAGNETON,
- SPECIES_MANKEY,
- SPECIES_MANTINE,
- SPECIES_MAREEP,
- SPECIES_MARILL,
- SPECIES_MAROWAK,
- SPECIES_MEGANIUM,
- SPECIES_MEOWTH,
- SPECIES_METAPOD,
- SPECIES_MEW,
- SPECIES_MEWTWO,
- SPECIES_MILTANK,
- SPECIES_MISDREAVUS,
- SPECIES_MOLTRES,
- SPECIES_MR_MIME,
- SPECIES_MUK,
- SPECIES_MURKROW,
- SPECIES_NATU,
- SPECIES_NIDOKING,
- SPECIES_NIDOQUEEN,
- SPECIES_NIDORAN_F,
- SPECIES_NIDORAN_M,
- SPECIES_NIDORINA,
- SPECIES_NIDORINO,
- SPECIES_NINETALES,
- SPECIES_NOCTOWL,
- SPECIES_OCTILLERY,
- SPECIES_ODDISH,
- SPECIES_OMANYTE,
- SPECIES_OMASTAR,
- SPECIES_ONIX,
- SPECIES_PARAS,
- SPECIES_PARASECT,
- SPECIES_PERSIAN,
- SPECIES_PHANPY,
- SPECIES_PICHU,
- SPECIES_PIDGEOT,
- SPECIES_PIDGEOTTO,
- SPECIES_PIDGEY,
- SPECIES_PIKACHU,
- SPECIES_PILOSWINE,
- SPECIES_PINECO,
- SPECIES_PINSIR,
- SPECIES_POLITOED,
- SPECIES_POLIWAG,
- SPECIES_POLIWHIRL,
- SPECIES_POLIWRATH,
- SPECIES_PONYTA,
- SPECIES_PORYGON,
- SPECIES_PORYGON2,
- SPECIES_PRIMEAPE,
- SPECIES_PSYDUCK,
- SPECIES_PUPITAR,
- SPECIES_QUAGSIRE,
- SPECIES_QUILAVA,
- SPECIES_QWILFISH,
- SPECIES_RAICHU,
- SPECIES_RAIKOU,
- SPECIES_RAPIDASH,
- SPECIES_RATICATE,
- SPECIES_RATTATA,
- SPECIES_REMORAID,
- SPECIES_RHYDON,
- SPECIES_RHYHORN,
- SPECIES_SANDSHREW,
- SPECIES_SANDSLASH,
- SPECIES_SCIZOR,
- SPECIES_SCYTHER,
- SPECIES_SEADRA,
- SPECIES_SEAKING,
- SPECIES_SEEL,
- SPECIES_SENTRET,
- SPECIES_SHELLDER,
- SPECIES_SHUCKLE,
- SPECIES_SKARMORY,
- SPECIES_SKIPLOOM,
- SPECIES_SLOWBRO,
- SPECIES_SLOWKING,
- SPECIES_SLOWPOKE,
- SPECIES_SLUGMA,
- SPECIES_SMEARGLE,
- SPECIES_SMOOCHUM,
- SPECIES_SNEASEL,
- SPECIES_SNORLAX,
- SPECIES_SNUBBULL,
- SPECIES_SPEAROW,
- SPECIES_SPINARAK,
- SPECIES_SQUIRTLE,
- SPECIES_STANTLER,
- SPECIES_STARMIE,
- SPECIES_STARYU,
- SPECIES_STEELIX,
- SPECIES_SUDOWOODO,
- SPECIES_SUICUNE,
- SPECIES_SUNFLORA,
- SPECIES_SUNKERN,
- SPECIES_SWINUB,
- SPECIES_TANGELA,
- SPECIES_TAUROS,
- SPECIES_TEDDIURSA,
- SPECIES_TENTACOOL,
- SPECIES_TENTACRUEL,
- SPECIES_TOGEPI,
- SPECIES_TOGETIC,
- SPECIES_TOTODILE,
- SPECIES_TYPHLOSION,
- SPECIES_TYRANITAR,
- SPECIES_TYROGUE,
- SPECIES_UMBREON,
- SPECIES_UNOWN,
- SPECIES_URSARING,
- SPECIES_VAPOREON,
- SPECIES_VENOMOTH,
- SPECIES_VENONAT,
- SPECIES_VENUSAUR,
- SPECIES_VICTREEBEL,
- SPECIES_VILEPLUME,
- SPECIES_VOLTORB,
- SPECIES_VULPIX,
- SPECIES_WARTORTLE,
- SPECIES_WEEDLE,
- SPECIES_WEEPINBELL,
- SPECIES_WEEZING,
- SPECIES_WIGGLYTUFF,
- SPECIES_WOBBUFFET,
- SPECIES_WOOPER,
- SPECIES_XATU,
- SPECIES_YANMA,
- SPECIES_ZAPDOS,
- SPECIES_ZUBAT,
+ SPECIES_ABRA,
+ SPECIES_AERODACTYL,
+ SPECIES_AIPOM,
+ SPECIES_ALAKAZAM,
+ SPECIES_AMPHAROS,
+ SPECIES_ARBOK,
+ SPECIES_ARCANINE,
+ SPECIES_ARIADOS,
+ SPECIES_ARTICUNO,
+ SPECIES_AZUMARILL,
+ SPECIES_BAYLEEF,
+ SPECIES_BEEDRILL,
+ SPECIES_BELLOSSOM,
+ SPECIES_BELLSPROUT,
+ SPECIES_BLASTOISE,
+ SPECIES_BLISSEY,
+ SPECIES_BULBASAUR,
+ SPECIES_BUTTERFREE,
+ SPECIES_CATERPIE,
+ SPECIES_CELEBI,
+ SPECIES_CHANSEY,
+ SPECIES_CHARIZARD,
+ SPECIES_CHARMANDER,
+ SPECIES_CHARMELEON,
+ SPECIES_CHIKORITA,
+ SPECIES_CHINCHOU,
+ SPECIES_CLEFABLE,
+ SPECIES_CLEFAIRY,
+ SPECIES_CLEFFA,
+ SPECIES_CLOYSTER,
+ SPECIES_CORSOLA,
+ SPECIES_CROBAT,
+ SPECIES_CROCONAW,
+ SPECIES_CUBONE,
+ SPECIES_CYNDAQUIL,
+ SPECIES_DELIBIRD,
+ SPECIES_DEWGONG,
+ SPECIES_DIGLETT,
+ SPECIES_DITTO,
+ SPECIES_DODRIO,
+ SPECIES_DODUO,
+ SPECIES_DONPHAN,
+ SPECIES_DRAGONAIR,
+ SPECIES_DRAGONITE,
+ SPECIES_DRATINI,
+ SPECIES_DROWZEE,
+ SPECIES_DUGTRIO,
+ SPECIES_DUNSPARCE,
+ SPECIES_EEVEE,
+ SPECIES_EKANS,
+ SPECIES_ELECTABUZZ,
+ SPECIES_ELECTRODE,
+ SPECIES_ELEKID,
+ SPECIES_ENTEI,
+ SPECIES_ESPEON,
+ SPECIES_EXEGGCUTE,
+ SPECIES_EXEGGUTOR,
+ SPECIES_FARFETCHD,
+ SPECIES_FEAROW,
+ SPECIES_FERALIGATR,
+ SPECIES_FLAAFFY,
+ SPECIES_FLAREON,
+ SPECIES_FORRETRESS,
+ SPECIES_FURRET,
+ SPECIES_GASTLY,
+ SPECIES_GENGAR,
+ SPECIES_GEODUDE,
+ SPECIES_GIRAFARIG,
+ SPECIES_GLIGAR,
+ SPECIES_GLOOM,
+ SPECIES_GOLBAT,
+ SPECIES_GOLDEEN,
+ SPECIES_GOLDUCK,
+ SPECIES_GOLEM,
+ SPECIES_GRANBULL,
+ SPECIES_GRAVELER,
+ SPECIES_GRIMER,
+ SPECIES_GROWLITHE,
+ SPECIES_GYARADOS,
+ SPECIES_HAUNTER,
+ SPECIES_HERACROSS,
+ SPECIES_HITMONCHAN,
+ SPECIES_HITMONLEE,
+ SPECIES_HITMONTOP,
+ SPECIES_HO_OH,
+ SPECIES_HOOTHOOT,
+ SPECIES_HOPPIP,
+ SPECIES_HORSEA,
+ SPECIES_HOUNDOOM,
+ SPECIES_HOUNDOUR,
+ SPECIES_HYPNO,
+ SPECIES_IGGLYBUFF,
+ SPECIES_IVYSAUR,
+ SPECIES_JIGGLYPUFF,
+ SPECIES_JOLTEON,
+ SPECIES_JUMPLUFF,
+ SPECIES_JYNX,
+ SPECIES_KABUTO,
+ SPECIES_KABUTOPS,
+ SPECIES_KADABRA,
+ SPECIES_KAKUNA,
+ SPECIES_KANGASKHAN,
+ SPECIES_KINGDRA,
+ SPECIES_KINGLER,
+ SPECIES_KOFFING,
+ SPECIES_KRABBY,
+ SPECIES_LANTURN,
+ SPECIES_LAPRAS,
+ SPECIES_LARVITAR,
+ SPECIES_LEDIAN,
+ SPECIES_LEDYBA,
+ SPECIES_LICKITUNG,
+ SPECIES_LUGIA,
+ SPECIES_MACHAMP,
+ SPECIES_MACHOKE,
+ SPECIES_MACHOP,
+ SPECIES_MAGBY,
+ SPECIES_MAGCARGO,
+ SPECIES_MAGIKARP,
+ SPECIES_MAGMAR,
+ SPECIES_MAGNEMITE,
+ SPECIES_MAGNETON,
+ SPECIES_MANKEY,
+ SPECIES_MANTINE,
+ SPECIES_MAREEP,
+ SPECIES_MARILL,
+ SPECIES_MAROWAK,
+ SPECIES_MEGANIUM,
+ SPECIES_MEOWTH,
+ SPECIES_METAPOD,
+ SPECIES_MEW,
+ SPECIES_MEWTWO,
+ SPECIES_MILTANK,
+ SPECIES_MISDREAVUS,
+ SPECIES_MOLTRES,
+ SPECIES_MR_MIME,
+ SPECIES_MUK,
+ SPECIES_MURKROW,
+ SPECIES_NATU,
+ SPECIES_NIDOKING,
+ SPECIES_NIDOQUEEN,
+ SPECIES_NIDORAN_F,
+ SPECIES_NIDORAN_M,
+ SPECIES_NIDORINA,
+ SPECIES_NIDORINO,
+ SPECIES_NINETALES,
+ SPECIES_NOCTOWL,
+ SPECIES_OCTILLERY,
+ SPECIES_ODDISH,
+ SPECIES_OMANYTE,
+ SPECIES_OMASTAR,
+ SPECIES_ONIX,
+ SPECIES_PARAS,
+ SPECIES_PARASECT,
+ SPECIES_PERSIAN,
+ SPECIES_PHANPY,
+ SPECIES_PICHU,
+ SPECIES_PIDGEOT,
+ SPECIES_PIDGEOTTO,
+ SPECIES_PIDGEY,
+ SPECIES_PIKACHU,
+ SPECIES_PILOSWINE,
+ SPECIES_PINECO,
+ SPECIES_PINSIR,
+ SPECIES_POLITOED,
+ SPECIES_POLIWAG,
+ SPECIES_POLIWHIRL,
+ SPECIES_POLIWRATH,
+ SPECIES_PONYTA,
+ SPECIES_PORYGON,
+ SPECIES_PORYGON2,
+ SPECIES_PRIMEAPE,
+ SPECIES_PSYDUCK,
+ SPECIES_PUPITAR,
+ SPECIES_QUAGSIRE,
+ SPECIES_QUILAVA,
+ SPECIES_QWILFISH,
+ SPECIES_RAICHU,
+ SPECIES_RAIKOU,
+ SPECIES_RAPIDASH,
+ SPECIES_RATICATE,
+ SPECIES_RATTATA,
+ SPECIES_REMORAID,
+ SPECIES_RHYDON,
+ SPECIES_RHYHORN,
+ SPECIES_SANDSHREW,
+ SPECIES_SANDSLASH,
+ SPECIES_SCIZOR,
+ SPECIES_SCYTHER,
+ SPECIES_SEADRA,
+ SPECIES_SEAKING,
+ SPECIES_SEEL,
+ SPECIES_SENTRET,
+ SPECIES_SHELLDER,
+ SPECIES_SHUCKLE,
+ SPECIES_SKARMORY,
+ SPECIES_SKIPLOOM,
+ SPECIES_SLOWBRO,
+ SPECIES_SLOWKING,
+ SPECIES_SLOWPOKE,
+ SPECIES_SLUGMA,
+ SPECIES_SMEARGLE,
+ SPECIES_SMOOCHUM,
+ SPECIES_SNEASEL,
+ SPECIES_SNORLAX,
+ SPECIES_SNUBBULL,
+ SPECIES_SPEAROW,
+ SPECIES_SPINARAK,
+ SPECIES_SQUIRTLE,
+ SPECIES_STANTLER,
+ SPECIES_STARMIE,
+ SPECIES_STARYU,
+ SPECIES_STEELIX,
+ SPECIES_SUDOWOODO,
+ SPECIES_SUICUNE,
+ SPECIES_SUNFLORA,
+ SPECIES_SUNKERN,
+ SPECIES_SWINUB,
+ SPECIES_TANGELA,
+ SPECIES_TAUROS,
+ SPECIES_TEDDIURSA,
+ SPECIES_TENTACOOL,
+ SPECIES_TENTACRUEL,
+ SPECIES_TOGEPI,
+ SPECIES_TOGETIC,
+ SPECIES_TOTODILE,
+ SPECIES_TYPHLOSION,
+ SPECIES_TYRANITAR,
+ SPECIES_TYROGUE,
+ SPECIES_UMBREON,
+ SPECIES_UNOWN,
+ SPECIES_URSARING,
+ SPECIES_VAPOREON,
+ SPECIES_VENOMOTH,
+ SPECIES_VENONAT,
+ SPECIES_VENUSAUR,
+ SPECIES_VICTREEBEL,
+ SPECIES_VILEPLUME,
+ SPECIES_VOLTORB,
+ SPECIES_VULPIX,
+ SPECIES_WARTORTLE,
+ SPECIES_WEEDLE,
+ SPECIES_WEEPINBELL,
+ SPECIES_WEEZING,
+ SPECIES_WIGGLYTUFF,
+ SPECIES_WOBBUFFET,
+ SPECIES_WOOPER,
+ SPECIES_XATU,
+ SPECIES_YANMA,
+ SPECIES_ZAPDOS,
+ SPECIES_ZUBAT,
};
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 05332ea459..a522ab13f5 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -387,6 +387,7 @@ const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_fro
const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz");
const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz");
const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/anim_front.4bpp.lz");
const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz");
const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/anim_front.4bpp.lz");
@@ -1014,6 +1015,7 @@ const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/
const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/front.4bpp.lz");
const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/front.4bpp.lz");
const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/front.4bpp.lz");
+#endif
const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/anim_front.4bpp.lz");
const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/anim_front.4bpp.lz");
const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/anim_front.4bpp.lz");
@@ -1047,6 +1049,7 @@ const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/s
const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz");
const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz");
const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz");
const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz");
const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz");
@@ -1149,6 +1152,7 @@ const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/
const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz");
const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz");
const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz");
+#endif
const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/back.4bpp.lz");
@@ -1540,6 +1544,7 @@ const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp
const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz");
const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz");
const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz");
const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz");
const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/back.4bpp.lz");
@@ -2166,6 +2171,7 @@ const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/a
const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/back.4bpp.lz");
const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/back.4bpp.lz");
const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/back.4bpp.lz");
+#endif
const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/back.4bpp.lz");
const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz");
const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/back.4bpp.lz");
@@ -2199,6 +2205,7 @@ const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/sn
const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.lz");
const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz");
const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz");
const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz");
const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz");
@@ -2301,6 +2308,7 @@ const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u
const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz");
const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz");
const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz");
+#endif
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/normal.gbapal.lz");
@@ -2690,6 +2698,7 @@ const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gb
const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz");
const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz");
const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz");
const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz");
const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/normal.gbapal.lz");
@@ -3310,12 +3319,14 @@ const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/a
const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/normal.gbapal.lz");
const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/normal.gbapal.lz");
const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/normal.gbapal.lz");
+#endif
const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz");
const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/normal.gbapal.lz");
const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/normal.gbapal.lz");
const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz");
const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz");
const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/normal.gbapal.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz");
const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz");
const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz");
@@ -3471,6 +3482,7 @@ const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u
const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz");
const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz");
const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz");
+#endif
const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/shiny.gbapal.lz");
@@ -3861,6 +3873,7 @@ const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shin
const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz");
const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz");
const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz");
const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz");
const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/shiny.gbapal.lz");
@@ -4481,12 +4494,14 @@ const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pika
const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/shiny.gbapal.lz");
const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/shiny.gbapal.lz");
const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/shiny.gbapal.lz");
+#endif
const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/shiny.gbapal.lz");
const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/shiny.gbapal.lz");
const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/shiny.gbapal.lz");
const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/shiny.gbapal.lz");
const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz");
const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/shiny.gbapal.lz");
+#if P_NEW_POKEMON == TRUE
const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz");
const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz");
const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz");
@@ -4636,6 +4651,7 @@ const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/poke
const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz");
+#endif
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp");
@@ -5024,6 +5040,7 @@ const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp");
const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp");
const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp");
const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp");
+#if P_NEW_POKEMON == TRUE
const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp");
const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp");
const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp");
@@ -5641,6 +5658,7 @@ const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/pikachu/kalos_
const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/pikachu/alola_cap/icon.4bpp");
const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp");
const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/pichu/spiky_eared/icon.4bpp");
+#endif
const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp");
const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/icon.4bpp");
const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/d/icon.4bpp");
@@ -5674,6 +5692,7 @@ const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/i
const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp");
const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp");
const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp");
+#if P_NEW_POKEMON == TRUE
const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp");
const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp");
const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp");
@@ -5790,6 +5809,7 @@ const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/e
const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp");
const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp");
const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
+#endif
const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");
const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
@@ -6179,6 +6199,7 @@ const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1
const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp");
const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp");
const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp");
+#if P_NEW_POKEMON == TRUE
const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp");
const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp");
const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp");
@@ -6691,3 +6712,4 @@ const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footp
const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp");
const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp");
const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp");
+#endif
diff --git a/src/data/items.h b/src/data/items.h
index f55ddf48d3..bcb12e6956 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -3186,14 +3186,9 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sRedNectarDesc,
.pocket = POCKET_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
+ .secondaryId = FORM_ITEM_USE,
.flingPower = 10,
},
@@ -3205,14 +3200,9 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sYellowNectarDesc,
.pocket = POCKET_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
+ .secondaryId = FORM_ITEM_USE,
.flingPower = 10,
},
@@ -3224,14 +3214,9 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sPinkNectarDesc,
.pocket = POCKET_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
+ .secondaryId = FORM_ITEM_USE,
.flingPower = 10,
},
@@ -3243,14 +3228,9 @@ const struct Item gItems[] =
.holdEffectParam = 0,
.description = sPurpleNectarDesc,
.pocket = POCKET_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse,
+ .secondaryId = FORM_ITEM_USE,
.flingPower = 10,
},
@@ -5310,7 +5290,7 @@ const struct Item gItems[] =
.itemId = ITEM_SOUL_DEW,
.price = 0,
.holdEffect = HOLD_EFFECT_SOUL_DEW,
- #if defined(BATTLE_ENGINE) && B_SOUL_DEW_BOOST >= GEN_7
+ #if B_SOUL_DEW_BOOST >= GEN_7
.holdEffectParam = 20,
#else
.holdEffectParam = 50,
@@ -7021,7 +7001,7 @@ const struct Item gItems[] =
.name = _("Sitrus Berry"),
.itemId = ITEM_SITRUS_BERRY,
.price = 20,
- #if defined(BATTLE_ENGINE) && I_SITRUS_BERRY_HEAL >= GEN_4
+ #if I_SITRUS_BERRY_HEAL >= GEN_4
.holdEffect = HOLD_EFFECT_RESTORE_PCT_HP,
.holdEffectParam = 25,
#else
@@ -7037,9 +7017,9 @@ const struct Item gItems[] =
.flingPower = 10,
},
-#if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL >= GEN_8
+#if B_CONFUSE_BERRIES_HEAL >= GEN_8
#define CONFUSE_BERRY_HEAL_FRACTION 3
-#elif defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7
+#elif B_CONFUSE_BERRIES_HEAL == GEN_7
#define CONFUSE_BERRY_HEAL_FRACTION 2
#else
#define CONFUSE_BERRY_HEAL_FRACTION 8
@@ -7921,7 +7901,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_5)
+ #if B_UPDATED_MOVE_DATA >= GEN_5
.flingPower = 25,
#else
.flingPower = 10,
@@ -7937,7 +7917,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 60,
#else
.flingPower = 10,
@@ -7977,7 +7957,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 90,
#else
.flingPower = 95,
@@ -7993,7 +7973,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 110,
#else
.flingPower = 120,
@@ -8057,7 +8037,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_5)
+ #if B_UPDATED_MOVE_DATA >= GEN_5
.flingPower = 75,
#else
.flingPower = 60,
@@ -8121,7 +8101,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 90,
#else
.flingPower = 95,
@@ -8137,7 +8117,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 110,
#else
.flingPower = 120,
@@ -8177,7 +8157,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4)
+ #if B_UPDATED_MOVE_DATA >= GEN_4
.flingPower = 80,
#else
.flingPower = 60,
@@ -8265,7 +8245,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 90,
#else
.flingPower = 95,
@@ -8305,7 +8285,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 110,
#else
.flingPower = 120,
@@ -8321,7 +8301,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 60,
#else
.flingPower = 50,
@@ -8409,7 +8389,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 60,
#else
.flingPower = 40,
@@ -8461,7 +8441,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 130,
#else
.flingPower = 140,
@@ -9041,7 +9021,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4)
+ #if B_UPDATED_MOVE_DATA >= GEN_4
.flingPower = 90,
#else
.flingPower = 70,
@@ -9058,7 +9038,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_6)
+ #if B_UPDATED_MOVE_DATA >= GEN_6
.flingPower = 90,
#else
.flingPower = 95,
@@ -9101,7 +9081,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4)
+ #if B_UPDATED_MOVE_DATA >= GEN_4
.flingPower = 20,
#else
.flingPower = 40,
@@ -9131,7 +9111,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
- #if (defined BATTLE_ENGINE && B_UPDATED_MOVE_DATA >= GEN_4)
+ #if B_UPDATED_MOVE_DATA >= GEN_4
.flingPower = 80,
#else
.flingPower = 60,
@@ -9210,14 +9190,9 @@ const struct Item gItems[] =
.price = 0,
.description = sGracideaDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE_TIME,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE_TIME,
},
[ITEM_REVEAL_GLASS] =
@@ -9227,14 +9202,9 @@ const struct Item gItems[] =
.price = 0,
.description = sRevealGlassDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE,
},
[ITEM_DNA_SPLICERS] =
@@ -9244,14 +9214,9 @@ const struct Item gItems[] =
.price = 0,
.description = sDNASplicersDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE,
},
[ITEM_ZYGARDE_CUBE] =
@@ -9273,14 +9238,9 @@ const struct Item gItems[] =
.price = 0,
.description = sPrisonBottleDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE,
},
[ITEM_N_SOLARIZER] =
@@ -9290,14 +9250,9 @@ const struct Item gItems[] =
.price = 0,
.description = sNSolarizerDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE,
},
[ITEM_N_LUNARIZER] =
@@ -9307,14 +9262,9 @@ const struct Item gItems[] =
.price = 0,
.description = sNLunarizerDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE,
},
[ITEM_REINS_OF_UNITY] =
@@ -9324,14 +9274,9 @@ const struct Item gItems[] =
.price = 0,
.description = sReinsOfUnityDesc,
.pocket = POCKET_KEY_ITEMS,
- #ifdef POKEMON_EXPANSION
- .type = ITEM_USE_PARTY_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_FormChange,
- .secondaryId = FORM_ITEM_USE,
- #else
- .type = ITEM_USE_BAG_MENU,
- .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
- #endif
+ .type = ITEM_USE_PARTY_MENU,
+ .fieldUseFunc = ItemUseOutOfBattle_FormChange,
+ .secondaryId = FORM_ITEM_USE,
},
// Battle Mechanic Key Items
diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h
index 8070e98774..2e1b6b3b31 100755
--- a/src/data/object_events/movement_action_func_tables.h
+++ b/src/data/object_events/movement_action_func_tables.h
@@ -253,9 +253,9 @@ u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Spr
u8 MovementAction_Levitate_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementAction_StopLevitate_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementAction_StopLevitateAtTop_Step0(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementAction_LockAnim_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementAction_UnlockAnim_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementAction_FlyUp_Step0(struct ObjectEvent *, struct Sprite *);
u8 MovementAction_FlyUp_Step1(struct ObjectEvent *, struct Sprite *);
u8 MovementAction_Fly_Finish(struct ObjectEvent *, struct Sprite *);
@@ -410,8 +410,8 @@ u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *,
u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *);
u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *);
u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *);
-u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *);
-u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *);
+u8 (*const gMovementActionFuncs_LockAnim[])(struct ObjectEvent *, struct Sprite *);
+u8 (*const gMovementActionFuncs_UnlockAnim[])(struct ObjectEvent *, struct Sprite *);
u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *);
u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *);
u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *);
@@ -570,8 +570,8 @@ u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *)
[MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalUpRight,
[MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkSlowDiagonalDownLeft,
[MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalDownRight,
- [MOVEMENT_ACTION_STORE_AND_LOCK_ANIM] = gMovementActionFuncs_StoreAndLockAnim,
- [MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM] = gMovementActionFuncs_FreeAndUnlockAnim,
+ [MOVEMENT_ACTION_LOCK_ANIM] = gMovementActionFuncs_LockAnim,
+ [MOVEMENT_ACTION_UNLOCK_ANIM] = gMovementActionFuncs_UnlockAnim,
[MOVEMENT_ACTION_WALK_LEFT_AFFINE] = gMovementActionFuncs_WalkLeftAffine,
[MOVEMENT_ACTION_WALK_RIGHT_AFFINE] = gMovementActionFuncs_WalkRightAffine,
[MOVEMENT_ACTION_LEVITATE] = gMovementActionFuncs_Levitate,
diff --git a/src/data/party_menu.h b/src/data/party_menu.h
index f6c4db4cae..9411ec3bb7 100644
--- a/src/data/party_menu.h
+++ b/src/data/party_menu.h
@@ -1,9 +1,3 @@
-enum {
- TAG_POKEBALL = 1200,
- TAG_POKEBALL_SMALL,
- TAG_STATUS_ICONS,
-};
-
static const struct BgTemplate sPartyMenuBgTemplates[] =
{
{
@@ -35,12 +29,6 @@ static const struct BgTemplate sPartyMenuBgTemplates[] =
},
};
-enum
-{
- PARTY_BOX_LEFT_COLUMN,
- PARTY_BOX_RIGHT_COLUMN
-};
-
static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
{
[PARTY_BOX_LEFT_COLUMN] =
@@ -663,51 +651,6 @@ static const u16 sUnusedData[] =
0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123,
};
-enum
-{
- MENU_SUMMARY,
- MENU_SWITCH,
- MENU_CANCEL1,
- MENU_ITEM,
- MENU_GIVE,
- MENU_TAKE_ITEM,
- MENU_MAIL,
- MENU_TAKE_MAIL,
- MENU_READ,
- MENU_CANCEL2,
- MENU_SHIFT,
- MENU_SEND_OUT,
- MENU_ENTER,
- MENU_NO_ENTRY,
- MENU_STORE,
- MENU_REGISTER,
- MENU_TRADE1,
- MENU_TRADE2,
- MENU_TOSS,
- MENU_FIELD_MOVES,
-};
-
-enum
-{
- FIELD_MOVE_CUT,
- FIELD_MOVE_FLASH,
- FIELD_MOVE_ROCK_SMASH,
- FIELD_MOVE_STRENGTH,
- FIELD_MOVE_SURF,
- FIELD_MOVE_FLY,
- FIELD_MOVE_DIVE,
- FIELD_MOVE_WATERFALL,
- FIELD_MOVE_TELEPORT,
- FIELD_MOVE_DIG,
- FIELD_MOVE_SECRET_POWER,
- FIELD_MOVE_MILK_DRINK,
- FIELD_MOVE_SOFT_BOILED,
- FIELD_MOVE_SWEET_SCENT,
-};
-
-// What a weird choice of table termination;
-#define FIELD_MOVE_TERMINATOR MOVE_SWORDS_DANCE
-
struct
{
const u8 *text;
@@ -763,25 +706,6 @@ static const u8 sPartyMenuAction_TradeSummaryCancel1[] = {MENU_TRADE1, MENU_SUMM
static const u8 sPartyMenuAction_TradeSummaryCancel2[] = {MENU_TRADE2, MENU_SUMMARY, MENU_CANCEL1};
static const u8 sPartyMenuAction_TakeItemTossCancel[] = {MENU_TAKE_ITEM, MENU_TOSS, MENU_CANCEL1};
-// IDs for the action lists that appear when a party mon is selected
-enum
-{
- ACTIONS_NONE,
- ACTIONS_SWITCH,
- ACTIONS_SHIFT,
- ACTIONS_SEND_OUT,
- ACTIONS_ENTER,
- ACTIONS_NO_ENTRY,
- ACTIONS_STORE,
- ACTIONS_SUMMARY_ONLY,
- ACTIONS_ITEM,
- ACTIONS_MAIL,
- ACTIONS_REGISTER,
- ACTIONS_TRADE,
- ACTIONS_SPIN_TRADE,
- ACTIONS_TAKEITEM_TOSS
-};
-
static const u8 *const sPartyMenuActions[] =
{
[ACTIONS_NONE] = NULL,
@@ -818,17 +742,32 @@ static const u8 sPartyMenuActionCounts[] =
[ACTIONS_TAKEITEM_TOSS] = ARRAY_COUNT(sPartyMenuAction_TakeItemTossCancel)
};
-static const u16 sFieldMoves[] =
+static const u16 sFieldMoves[FIELD_MOVES_COUNT + 1] =
{
- MOVE_CUT, MOVE_FLASH, MOVE_ROCK_SMASH, MOVE_STRENGTH, MOVE_SURF, MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL, MOVE_TELEPORT,
- MOVE_DIG, MOVE_SECRET_POWER, MOVE_MILK_DRINK, MOVE_SOFT_BOILED, MOVE_SWEET_SCENT, FIELD_MOVE_TERMINATOR
+ [FIELD_MOVE_CUT] = MOVE_CUT,
+ [FIELD_MOVE_FLASH] = MOVE_FLASH,
+ [FIELD_MOVE_ROCK_SMASH] = MOVE_ROCK_SMASH,
+ [FIELD_MOVE_STRENGTH] = MOVE_STRENGTH,
+ [FIELD_MOVE_SURF] = MOVE_SURF,
+ [FIELD_MOVE_FLY] = MOVE_FLY,
+ [FIELD_MOVE_DIVE] = MOVE_DIVE,
+ [FIELD_MOVE_WATERFALL] = MOVE_WATERFALL,
+ [FIELD_MOVE_TELEPORT] = MOVE_TELEPORT,
+ [FIELD_MOVE_DIG] = MOVE_DIG,
+ [FIELD_MOVE_SECRET_POWER] = MOVE_SECRET_POWER,
+ [FIELD_MOVE_MILK_DRINK] = MOVE_MILK_DRINK,
+ [FIELD_MOVE_SOFT_BOILED] = MOVE_SOFT_BOILED,
+ [FIELD_MOVE_SWEET_SCENT] = MOVE_SWEET_SCENT,
+ // NOTE: This value is used as the terminal value for the table. There's no reason to do this, as the size of the table is known.
+ // Whichever move shares this value (MOVE_SWORDS_DANCE by default) if present will be treated as the end of the array rather than a field move.
+ [FIELD_MOVES_COUNT] = FIELD_MOVES_COUNT
};
struct
{
bool8 (*fieldMoveFunc)(void);
u8 msgId;
-} static const sFieldMoveCursorCallbacks[] =
+} static const sFieldMoveCursorCallbacks[FIELD_MOVES_COUNT] =
{
[FIELD_MOVE_CUT] = {SetUpFieldMove_Cut, PARTY_MSG_NOTHING_TO_CUT},
[FIELD_MOVE_FLASH] = {SetUpFieldMove_Flash, PARTY_MSG_CANT_USE_HERE},
@@ -867,7 +806,7 @@ static const struct OamData sOamData_HeldItem =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -899,23 +838,23 @@ static const union AnimCmd *const sSpriteAnimTable_HeldItem[] =
static const struct SpriteSheet sSpriteSheet_HeldItem =
{
- sHeldItemGfx, sizeof(sHeldItemGfx), 0xd750
+ .data = sHeldItemGfx, .size = sizeof(sHeldItemGfx), .tag = TAG_HELD_ITEM
};
static const struct SpritePalette sSpritePalette_HeldItem =
{
- sHeldItemPalette, 0xd750
+ .data = sHeldItemPalette, .tag = TAG_HELD_ITEM
};
static const struct SpriteTemplate sSpriteTemplate_HeldItem =
{
- 0xd750,
- 0xd750,
- &sOamData_HeldItem,
- sSpriteAnimTable_HeldItem,
- NULL,
- gDummySpriteAffineAnimTable,
- SpriteCallbackDummy
+ .tileTag = TAG_HELD_ITEM,
+ .paletteTag = TAG_HELD_ITEM,
+ .oam = &sOamData_HeldItem,
+ .anims = sSpriteAnimTable_HeldItem,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy
};
static const struct OamData sOamData_MenuPokeball =
@@ -923,7 +862,7 @@ static const struct OamData sOamData_MenuPokeball =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -980,7 +919,7 @@ static const struct OamData sOamData_MenuPokeballSmall =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -1061,7 +1000,7 @@ static const struct OamData sOamData_StatusCondition =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h
index 72fa7fe980..1157ac23da 100644
--- a/src/data/pokemon/base_stats.h
+++ b/src/data/pokemon/base_stats.h
@@ -1558,9 +1558,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 60,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_GRIP_CLAW,
- #endif
+ .itemRare = ITEM_GRIP_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -1585,9 +1583,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 90,
.expYield = 158,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_GRIP_CLAW,
- #endif
+ .itemRare = ITEM_GRIP_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -1991,9 +1987,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 64,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -2018,9 +2012,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 120,
.expYield = 138,
.evYield_SpAttack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -2049,9 +2041,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 221,
.evYield_SpAttack = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -2154,9 +2144,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 158,
.evYield_Speed = 1,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -2914,9 +2902,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 63,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LAGGING_TAIL,
- #endif
+ .itemRare = ITEM_LAGGING_TAIL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -3147,9 +3133,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 65,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BLACK_SLUDGE,
- #endif
+ .itemRare = ITEM_BLACK_SLUDGE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -3175,9 +3159,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 175,
.evYield_HP = 1,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_BLACK_SLUDGE,
- #endif
+ .itemCommon = ITEM_BLACK_SLUDGE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -3502,9 +3484,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 90,
.expYield = 65,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_PSYCHIC_SEED,
- #endif
+ .itemRare = ITEM_PSYCHIC_SEED,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -3655,9 +3635,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 77,
.evYield_HP = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LAGGING_TAIL,
- #endif
+ .itemRare = ITEM_LAGGING_TAIL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -4083,9 +4061,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 172,
.evYield_Speed = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ELECTIRIZER,
- #endif
+ .itemRare = ITEM_ELECTIRIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -4110,9 +4086,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 173,
.evYield_SpAttack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_MAGMARIZER,
- #endif
+ .itemRare = ITEM_MAGMARIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -4260,9 +4234,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 35,
.expYield = 101,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_QUICK_POWDER,
- #endif
+ .itemCommon = ITEM_QUICK_POWDER,
.itemRare = ITEM_METAL_POWDER,
.genderRatio = MON_GENDERLESS,
.eggCycles = 20,
@@ -5504,9 +5476,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 221,
.evYield_SpDefense = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -5790,9 +5760,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 75,
.expYield = 78,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_WIDE_LENS,
- #endif
+ .itemRare = ITEM_WIDE_LENS,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -6501,9 +6469,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 144,
.evYield_Defense = 1,
.evYield_SpDefense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LUMINOUS_MOSS,
- #endif
+ .itemRare = ITEM_LUMINOUS_MOSS,
.genderRatio = PERCENT_FEMALE(75),
.eggCycles = 20,
.friendship = 70,
@@ -6922,9 +6888,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 72,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ELECTIRIZER,
- #endif
+ .itemRare = ITEM_ELECTIRIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -6949,9 +6913,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 73,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_MAGMARIZER,
- #endif
+ .itemRare = ITEM_MAGMARIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -7639,9 +7601,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 178,
.evYield_SpAttack = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -7690,9 +7650,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 173,
.evYield_SpDefense = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -7792,9 +7750,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 44,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_POWER_HERB,
- #endif
+ .itemRare = ITEM_POWER_HERB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -7819,9 +7775,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 120,
.expYield = 119,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_POWER_HERB,
- #endif
+ .itemRare = ITEM_POWER_HERB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -7846,9 +7800,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 216,
.evYield_Attack = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_POWER_HERB,
- #endif
+ .itemRare = ITEM_POWER_HERB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -7925,9 +7877,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 54,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_PRETTY_FEATHER,
- #endif
+ .itemCommon = ITEM_PRETTY_FEATHER,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -7956,9 +7906,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 154,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_PRETTY_FEATHER,
- #endif
+ .itemCommon = ITEM_PRETTY_FEATHER,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -8569,9 +8517,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 133,
.evYield_Attack = 1,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_WIDE_LENS,
- #endif
+ .itemRare = ITEM_WIDE_LENS,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 25,
.friendship = 35,
@@ -8602,9 +8548,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 133,
.evYield_Attack = 1,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_IRON_BALL,
- #endif
+ .itemRare = ITEM_IRON_BALL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -8800,9 +8744,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 200,
.expYield = 142,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_CELL_BATTERY,
- #endif
+ .itemRare = ITEM_CELL_BATTERY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -8827,9 +8769,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 200,
.expYield = 142,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_CELL_BATTERY,
- #endif
+ .itemRare = ITEM_CELL_BATTERY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -9322,9 +9262,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 67,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_STICKY_BARB,
- #endif
+ .itemRare = ITEM_STICKY_BARB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 35,
@@ -9350,9 +9288,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 166,
.evYield_Attack = 1,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_STICKY_BARB,
- #endif
+ .itemRare = ITEM_STICKY_BARB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 35,
@@ -9451,9 +9387,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 160,
.evYield_Attack = 1,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -9634,9 +9568,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 60,
.evYield_SpDefense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LIGHT_CLAY,
- #endif
+ .itemRare = ITEM_LIGHT_CLAY,
.genderRatio = MON_GENDERLESS,
.eggCycles = 20,
.friendship = 70,
@@ -9661,9 +9593,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 90,
.expYield = 175,
.evYield_SpDefense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LIGHT_CLAY,
- #endif
+ .itemRare = ITEM_LIGHT_CLAY,
.genderRatio = MON_GENDERLESS,
.eggCycles = 20,
.friendship = 70,
@@ -9688,9 +9618,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 71,
.evYield_SpDefense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BIG_ROOT,
- #endif
+ .itemRare = ITEM_BIG_ROOT,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 30,
.friendship = 70,
@@ -9715,9 +9643,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 173,
.evYield_SpDefense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BIG_ROOT,
- #endif
+ .itemRare = ITEM_BIG_ROOT,
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 30,
.friendship = 70,
@@ -10069,9 +9995,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 60,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SNOWBALL,
- #endif
+ .itemRare = ITEM_SNOWBALL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -10713,6 +10637,7 @@ const struct BaseStats gBaseStats[] =
.flags = FLAG_MYTHICAL,
},
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] =
{
.baseHP = 55,
@@ -11074,9 +10999,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 39,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_METRONOME,
- #endif
+ .itemRare = ITEM_METRONOME,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -11102,9 +11025,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 134,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_METRONOME,
- #endif
+ .itemRare = ITEM_METRONOME,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -11955,9 +11876,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 130,
.expYield = 110,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_OVAL_STONE,
- #endif
+ .itemCommon = ITEM_OVAL_STONE,
.genderRatio = MON_FEMALE,
.eggCycles = 40,
.friendship = 140,
@@ -11982,9 +11901,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 30,
.expYield = 144,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_METRONOME,
- #endif
+ .itemRare = ITEM_METRONOME,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 35,
@@ -12281,9 +12198,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 140,
.expYield = 60,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BLACK_SLUDGE,
- #endif
+ .itemRare = ITEM_BLACK_SLUDGE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 10,
.friendship = 100,
@@ -12308,9 +12223,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 75,
.expYield = 172,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BLACK_SLUDGE,
- #endif
+ .itemRare = ITEM_BLACK_SLUDGE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -12533,9 +12446,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 30,
.expYield = 180,
.evYield_HP = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LAGGING_TAIL,
- #endif
+ .itemRare = ITEM_LAGGING_TAIL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -12608,9 +12519,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 30,
.expYield = 243,
.evYield_Attack = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ELECTIRIZER,
- #endif
+ .itemRare = ITEM_ELECTIRIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -12635,9 +12544,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 30,
.expYield = 243,
.evYield_SpAttack = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_MAGMARIZER,
- #endif
+ .itemRare = ITEM_MAGMARIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -12692,9 +12599,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 30,
.expYield = 180,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_WIDE_LENS,
- #endif
+ .itemRare = ITEM_WIDE_LENS,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -14637,9 +14542,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 56,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -14669,9 +14572,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 75,
.expYield = 168,
.evYield_Speed = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -14696,9 +14597,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 56,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = MON_FEMALE,
.eggCycles = 20,
.friendship = 70,
@@ -14723,9 +14622,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 75,
.expYield = 168,
.evYield_SpAttack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ABSORB_BULB,
- #endif
+ .itemRare = ITEM_ABSORB_BULB,
.genderRatio = MON_FEMALE,
.eggCycles = 20,
.friendship = 70,
@@ -14981,9 +14878,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 180,
.expYield = 70,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 35,
@@ -15009,9 +14904,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 171,
.evYield_Defense = 1,
.evYield_SpDefense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -15232,9 +15125,7 @@ const struct BaseStats gBaseStats[] =
.expYield = 166,
.evYield_Attack = 2,
.itemCommon = ITEM_SILK_SCARF,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BLACK_SLUDGE,
- #endif
+ .itemRare = ITEM_BLACK_SLUDGE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -15872,9 +15763,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 61,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_STICKY_BARB,
- #endif
+ .itemRare = ITEM_STICKY_BARB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -15899,9 +15788,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 90,
.expYield = 171,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_STICKY_BARB,
- #endif
+ .itemRare = ITEM_STICKY_BARB,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -16502,9 +16389,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 61,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LIGHT_CLAY,
- #endif
+ .itemRare = ITEM_LIGHT_CLAY,
.genderRatio = MON_GENDERLESS,
.eggCycles = 25,
.friendship = 70,
@@ -16529,9 +16414,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 90,
.expYield = 169,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LIGHT_CLAY,
- #endif
+ .itemRare = ITEM_LIGHT_CLAY,
.genderRatio = MON_GENDERLESS,
.eggCycles = 25,
.friendship = 70,
@@ -18379,9 +18262,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 60,
.evYield_SpDefense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 35,
@@ -18406,9 +18287,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 158,
.evYield_SpDefense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SHED_SHELL,
- #endif
+ .itemRare = ITEM_SHED_SHELL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 35,
@@ -19133,9 +19012,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 120,
.expYield = 140,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_CELL_BATTERY,
- #endif
+ .itemRare = ITEM_CELL_BATTERY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -19386,9 +19263,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 77,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LIGHT_CLAY,
- #endif
+ .itemRare = ITEM_LIGHT_CLAY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -19413,9 +19288,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 60,
.expYield = 175,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LIGHT_CLAY,
- #endif
+ .itemRare = ITEM_LIGHT_CLAY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -19690,9 +19563,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 235,
.expYield = 42,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_GRASSY_SEED,
- #endif
+ .itemRare = ITEM_GRASSY_SEED,
.genderRatio = MON_FEMALE,
.eggCycles = 20,
.friendship = 70,
@@ -19717,9 +19588,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 120,
.expYield = 102,
.evYield_Speed = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_GRASSY_SEED,
- #endif
+ .itemRare = ITEM_GRASSY_SEED,
.genderRatio = MON_FEMALE,
.eggCycles = 20,
.friendship = 70,
@@ -19744,9 +19613,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 230,
.evYield_Attack = 3,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_GRASSY_SEED,
- #endif
+ .itemCommon = ITEM_GRASSY_SEED,
.genderRatio = MON_FEMALE,
.eggCycles = 20,
.friendship = 70,
@@ -19771,9 +19638,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 60,
.expYield = 170,
.evYield_SpDefense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_MISTY_SEED,
- #endif
+ .itemRare = ITEM_MISTY_SEED,
.genderRatio = PERCENT_FEMALE(75),
.eggCycles = 20,
.friendship = 70,
@@ -20046,9 +19911,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 180,
.expYield = 152,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_ELECTRIC_SEED,
- #endif
+ .itemRare = ITEM_ELECTRIC_SEED,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 10,
.friendship = 70,
@@ -20075,9 +19938,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 80,
.expYield = 166,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_RAZOR_FANG,
- #endif
+ .itemRare = ITEM_RAZOR_FANG,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -20151,9 +20012,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 60,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_RAZOR_CLAW,
- #endif
+ .itemRare = ITEM_RAZOR_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 70,
@@ -20178,9 +20037,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 147,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_RAZOR_CLAW,
- #endif
+ .itemRare = ITEM_RAZOR_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 70,
@@ -20205,9 +20062,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 270,
.evYield_Defense = 3,
- #ifdef ITEM_EXPANSION
- .itemCommon = ITEM_RAZOR_CLAW,
- #endif
+ .itemCommon = ITEM_RAZOR_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 40,
.friendship = 70,
@@ -21203,9 +21058,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 120,
.expYield = 117,
.evYield_SpDefense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_PSYCHIC_SEED,
- #endif
+ .itemRare = ITEM_PSYCHIC_SEED,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -21230,9 +21083,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 45,
.expYield = 253,
.evYield_SpDefense = 3,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_PSYCHIC_SEED,
- #endif
+ .itemRare = ITEM_PSYCHIC_SEED,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -22229,9 +22080,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 37,
.evYield_SpAttack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SNOWBALL,
- #endif
+ .itemRare = ITEM_SNOWBALL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -22354,9 +22203,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 66,
.evYield_Attack = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LAGGING_TAIL,
- #endif
+ .itemRare = ITEM_LAGGING_TAIL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 25,
.friendship = 70,
@@ -22381,9 +22228,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 90,
.expYield = 175,
.evYield_Attack = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_LAGGING_TAIL,
- #endif
+ .itemRare = ITEM_LAGGING_TAIL,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 25,
.friendship = 70,
@@ -24162,9 +24007,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 60,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_GRIP_CLAW,
- #endif
+ .itemRare = ITEM_GRIP_CLAW,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -24215,9 +24058,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 60,
.evYield_Speed = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_SNOWBALL,
- #endif
+ .itemRare = ITEM_SNOWBALL,
.genderRatio = PERCENT_FEMALE(75),
.eggCycles = 20,
.friendship = 70,
@@ -24373,9 +24214,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 255,
.expYield = 60,
.evYield_Defense = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_CELL_BATTERY,
- #endif
+ .itemRare = ITEM_CELL_BATTERY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -24401,9 +24240,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 120,
.expYield = 137,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_CELL_BATTERY,
- #endif
+ .itemRare = ITEM_CELL_BATTERY,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
@@ -24454,9 +24291,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 190,
.expYield = 65,
.evYield_HP = 1,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_BLACK_SLUDGE,
- #endif
+ .itemRare = ITEM_BLACK_SLUDGE,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -24709,9 +24544,7 @@ const struct BaseStats gBaseStats[] =
.catchRate = 60,
.expYield = 172,
.evYield_Defense = 2,
- #ifdef ITEM_EXPANSION
- .itemRare = ITEM_MISTY_SEED,
- #endif
+ .itemRare = ITEM_MISTY_SEED,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
@@ -25041,7 +24874,7 @@ const struct BaseStats gBaseStats[] =
[SPECIES_PIKACHU_WORLD_CAP] = CAP_PIKACHU_BASE_STATS(FLIP),
[SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP),
-
+#endif
[SPECIES_UNOWN_B] = UNOWN_BASE_STATS(NO_FLIP),
[SPECIES_UNOWN_C] = UNOWN_BASE_STATS(NO_FLIP),
[SPECIES_UNOWN_D] = UNOWN_BASE_STATS(NO_FLIP),
@@ -25148,6 +24981,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = TRUE,
},
+#if P_NEW_POKEMON == TRUE
[SPECIES_BURMY_SANDY_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_BROWN),
[SPECIES_BURMY_TRASH_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_RED),
@@ -26250,4 +26084,5 @@ const struct BaseStats gBaseStats[] =
.bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE,
},
+#endif
};
diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h
index 18853e0c87..3a5f3c332c 100644
--- a/src/data/pokemon/egg_moves.h
+++ b/src/data/pokemon/egg_moves.h
@@ -2387,6 +2387,7 @@ const u16 gEggMoves[] = {
MOVE_ENDURE,
MOVE_DEFENSE_CURL),
+#if P_NEW_POKEMON == TRUE
egg_moves(TURTWIG,
MOVE_WORRY_SEED,
MOVE_GROWTH,
@@ -4409,6 +4410,7 @@ const u16 gEggMoves[] = {
MOVE_FAKE_OUT,
MOVE_PSYCHO_SHIFT,
MOVE_HEAL_PULSE),
+#endif
EGG_MOVES_TERMINATOR
};
diff --git a/src/data/pokemon/evolution_old.h b/src/data/pokemon/evolution_old.h
new file mode 100644
index 0000000000..0a604defb3
--- /dev/null
+++ b/src/data/pokemon/evolution_old.h
@@ -0,0 +1,188 @@
+const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
+{
+ [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}},
+ [SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR}},
+ [SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON}},
+ [SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD}},
+ [SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE}},
+ [SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE}},
+ [SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD}},
+ [SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE}},
+ [SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA}},
+ [SPECIES_KAKUNA] = {{EVO_LEVEL, 10, SPECIES_BEEDRILL}},
+ [SPECIES_PIDGEY] = {{EVO_LEVEL, 18, SPECIES_PIDGEOTTO}},
+ [SPECIES_PIDGEOTTO] = {{EVO_LEVEL, 36, SPECIES_PIDGEOT}},
+ [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}},
+ [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}},
+ [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}},
+ [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}},
+ [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}},
+ [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}},
+ [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}},
+ [SPECIES_NIDORAN_M] = {{EVO_LEVEL, 16, SPECIES_NIDORINO}},
+ [SPECIES_NIDORINO] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}},
+ [SPECIES_CLEFAIRY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}},
+ [SPECIES_VULPIX] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}},
+ [SPECIES_JIGGLYPUFF] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}},
+ [SPECIES_ZUBAT] = {{EVO_LEVEL, 22, SPECIES_GOLBAT}},
+ [SPECIES_GOLBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_CROBAT}},
+ [SPECIES_ODDISH] = {{EVO_LEVEL, 21, SPECIES_GLOOM}},
+ [SPECIES_GLOOM] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME},
+ {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}},
+ [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT}},
+ [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH}},
+ [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO}},
+ [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN}},
+ [SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK}},
+ [SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE}},
+ [SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}},
+ [SPECIES_POLIWAG] = {{EVO_LEVEL, 25, SPECIES_POLIWHIRL}},
+ [SPECIES_POLIWHIRL] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH},
+ {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}},
+ [SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA}},
+ [SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM}},
+ [SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE}},
+ [SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP}},
+ [SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL}},
+ [SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}},
+ [SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL}},
+ [SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER}},
+ [SPECIES_GRAVELER] = {{EVO_TRADE, 0, SPECIES_GOLEM}},
+ [SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}},
+ [SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO},
+ {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}},
+ [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}},
+ [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}},
+ [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}},
+ [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}},
+ [SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}},
+ [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}},
+ [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}},
+ [SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}},
+ [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}},
+ [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}},
+ [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}},
+ [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}},
+ [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}},
+ [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}},
+ [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}},
+ [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}},
+ [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}},
+ [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}},
+ [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}},
+ [SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}},
+ [SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}},
+ [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}},
+ [SPECIES_EEVEE] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON},
+ {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON},
+ {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON},
+ {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON},
+ {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}},
+ [SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}},
+ [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}},
+ [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}},
+ [SPECIES_DRATINI] = {{EVO_LEVEL, 30, SPECIES_DRAGONAIR}},
+ [SPECIES_DRAGONAIR] = {{EVO_LEVEL, 55, SPECIES_DRAGONITE}},
+ [SPECIES_CHIKORITA] = {{EVO_LEVEL, 16, SPECIES_BAYLEEF}},
+ [SPECIES_BAYLEEF] = {{EVO_LEVEL, 32, SPECIES_MEGANIUM}},
+ [SPECIES_CYNDAQUIL] = {{EVO_LEVEL, 14, SPECIES_QUILAVA}},
+ [SPECIES_QUILAVA] = {{EVO_LEVEL, 36, SPECIES_TYPHLOSION}},
+ [SPECIES_TOTODILE] = {{EVO_LEVEL, 18, SPECIES_CROCONAW}},
+ [SPECIES_CROCONAW] = {{EVO_LEVEL, 30, SPECIES_FERALIGATR}},
+ [SPECIES_SENTRET] = {{EVO_LEVEL, 15, SPECIES_FURRET}},
+ [SPECIES_HOOTHOOT] = {{EVO_LEVEL, 20, SPECIES_NOCTOWL}},
+ [SPECIES_LEDYBA] = {{EVO_LEVEL, 18, SPECIES_LEDIAN}},
+ [SPECIES_SPINARAK] = {{EVO_LEVEL, 22, SPECIES_ARIADOS}},
+ [SPECIES_CHINCHOU] = {{EVO_LEVEL, 27, SPECIES_LANTURN}},
+ [SPECIES_PICHU] = {{EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}},
+ [SPECIES_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}},
+ [SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}},
+ [SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}},
+ [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}},
+ [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}},
+ [SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}},
+ [SPECIES_MARILL] = {{EVO_LEVEL, 18, SPECIES_AZUMARILL}},
+ [SPECIES_HOPPIP] = {{EVO_LEVEL, 18, SPECIES_SKIPLOOM}},
+ [SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}},
+ [SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}},
+ [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}},
+ [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}},
+ [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}},
+ [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}},
+ [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}},
+ [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}},
+ [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}},
+ [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}},
+ [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}},
+ [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN},
+ {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE},
+ {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}},
+ [SPECIES_SMOOCHUM] = {{EVO_LEVEL, 30, SPECIES_JYNX}},
+ [SPECIES_ELEKID] = {{EVO_LEVEL, 30, SPECIES_ELECTABUZZ}},
+ [SPECIES_MAGBY] = {{EVO_LEVEL, 30, SPECIES_MAGMAR}},
+ [SPECIES_LARVITAR] = {{EVO_LEVEL, 30, SPECIES_PUPITAR}},
+ [SPECIES_PUPITAR] = {{EVO_LEVEL, 55, SPECIES_TYRANITAR}},
+ [SPECIES_TREECKO] = {{EVO_LEVEL, 16, SPECIES_GROVYLE}},
+ [SPECIES_GROVYLE] = {{EVO_LEVEL, 36, SPECIES_SCEPTILE}},
+ [SPECIES_TORCHIC] = {{EVO_LEVEL, 16, SPECIES_COMBUSKEN}},
+ [SPECIES_COMBUSKEN] = {{EVO_LEVEL, 36, SPECIES_BLAZIKEN}},
+ [SPECIES_MUDKIP] = {{EVO_LEVEL, 16, SPECIES_MARSHTOMP}},
+ [SPECIES_MARSHTOMP] = {{EVO_LEVEL, 36, SPECIES_SWAMPERT}},
+ [SPECIES_POOCHYENA] = {{EVO_LEVEL, 18, SPECIES_MIGHTYENA}},
+ [SPECIES_ZIGZAGOON] = {{EVO_LEVEL, 20, SPECIES_LINOONE}},
+ [SPECIES_WURMPLE] = {{EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON},
+ {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}},
+ [SPECIES_SILCOON] = {{EVO_LEVEL, 10, SPECIES_BEAUTIFLY}},
+ [SPECIES_CASCOON] = {{EVO_LEVEL, 10, SPECIES_DUSTOX}},
+ [SPECIES_LOTAD] = {{EVO_LEVEL, 14, SPECIES_LOMBRE}},
+ [SPECIES_LOMBRE] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}},
+ [SPECIES_SEEDOT] = {{EVO_LEVEL, 14, SPECIES_NUZLEAF}},
+ [SPECIES_NUZLEAF] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}},
+ [SPECIES_NINCADA] = {{EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK},
+ {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}},
+ [SPECIES_TAILLOW] = {{EVO_LEVEL, 22, SPECIES_SWELLOW}},
+ [SPECIES_SHROOMISH] = {{EVO_LEVEL, 23, SPECIES_BRELOOM}},
+ [SPECIES_WINGULL] = {{EVO_LEVEL, 25, SPECIES_PELIPPER}},
+ [SPECIES_SURSKIT] = {{EVO_LEVEL, 22, SPECIES_MASQUERAIN}},
+ [SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}},
+ [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}},
+ [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}},
+ [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}},
+ [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}},
+ [SPECIES_FEEBAS] = {{EVO_BEAUTY, 170, SPECIES_MILOTIC},
+ {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}},
+ [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO}},
+ [SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA}},
+ [SPECIES_VIBRAVA] = {{EVO_LEVEL, 45, SPECIES_FLYGON}},
+ [SPECIES_MAKUHITA] = {{EVO_LEVEL, 24, SPECIES_HARIYAMA}},
+ [SPECIES_ELECTRIKE] = {{EVO_LEVEL, 26, SPECIES_MANECTRIC}},
+ [SPECIES_NUMEL] = {{EVO_LEVEL, 33, SPECIES_CAMERUPT}},
+ [SPECIES_SPHEAL] = {{EVO_LEVEL, 32, SPECIES_SEALEO}},
+ [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}},
+ [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}},
+ [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}},
+ [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}},
+ [SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}},
+ [SPECIES_MEDITITE] = {{EVO_LEVEL, 37, SPECIES_MEDICHAM}},
+ [SPECIES_SWABLU] = {{EVO_LEVEL, 35, SPECIES_ALTARIA}},
+ [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}},
+ [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}},
+ [SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}},
+ [SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}},
+ [SPECIES_GULPIN] = {{EVO_LEVEL, 26, SPECIES_SWALOT}},
+ [SPECIES_WHISMUR] = {{EVO_LEVEL, 20, SPECIES_LOUDRED}},
+ [SPECIES_LOUDRED] = {{EVO_LEVEL, 40, SPECIES_EXPLOUD}},
+ [SPECIES_CLAMPERL] = {{EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL},
+ {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}},
+ [SPECIES_SHUPPET] = {{EVO_LEVEL, 37, SPECIES_BANETTE}},
+ [SPECIES_ARON] = {{EVO_LEVEL, 32, SPECIES_LAIRON}},
+ [SPECIES_LAIRON] = {{EVO_LEVEL, 42, SPECIES_AGGRON}},
+ [SPECIES_LILEEP] = {{EVO_LEVEL, 40, SPECIES_CRADILY}},
+ [SPECIES_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}},
+ [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}},
+ [SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}},
+ [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}},
+ [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}},
+ [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}},
+ [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}},
+};
diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h
index d40d332abf..3fdbff7a6e 100644
--- a/src/data/pokemon/form_change_table_pointers.h
+++ b/src/data/pokemon/form_change_table_pointers.h
@@ -1,5 +1,6 @@
const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
{
+#if P_NEW_POKEMON == TRUE
[SPECIES_GIRATINA] = sGiratinaFormChangeTable,
[SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable,
[SPECIES_SHAYMIN] = sShayminFormChangeTable,
@@ -59,4 +60,5 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
[SPECIES_SILVALLY_ROCK] = sSilvallyFormChangeTable,
[SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable,
[SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable,
+#endif
};
diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h
index c224a1a028..15cb8cdecd 100644
--- a/src/data/pokemon/form_change_tables.h
+++ b/src/data/pokemon/form_change_tables.h
@@ -43,6 +43,7 @@ FORM_ITEM_USE_TIME:
#define DAY 0
#define NIGHT 1
+#if P_NEW_POKEMON == TRUE
static const struct FormChange sGiratinaFormChangeTable[] = {
{FORM_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE},
{FORM_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB},
@@ -182,6 +183,7 @@ static const struct FormChange sSilvallyFormChangeTable[] = {
{FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_FAIRY, ITEM_FAIRY_MEMORY, ABILITY_RKS_SYSTEM},
{FORM_CHANGE_END},
};
+#endif
#undef WHEN_LEARNED
#undef WHEN_FORGOTTEN
diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h
index 7c7c56b0e3..60cfadad27 100644
--- a/src/data/pokemon/form_species_table_pointers.h
+++ b/src/data/pokemon/form_species_table_pointers.h
@@ -1,5 +1,6 @@
const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
{
+#if P_NEW_POKEMON == TRUE
[SPECIES_VENUSAUR] = sVenusaurFormSpeciesIdTable,
[SPECIES_CHARIZARD] = sCharizardFormSpeciesIdTable,
[SPECIES_BLASTOISE] = sBlastoiseFormSpeciesIdTable,
@@ -44,7 +45,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_PICHU] = sPichuFormSpeciesIdTable,
[SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable,
[SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable,
+#endif
[SPECIES_UNOWN] = sUnownFormSpeciesIdTable,
+#if P_NEW_POKEMON == TRUE
[SPECIES_STEELIX] = sSteelixFormSpeciesIdTable,
[SPECIES_SCIZOR] = sScizorFormSpeciesIdTable,
[SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable,
@@ -65,7 +68,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable,
[SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable,
[SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable,
+#endif
[SPECIES_CASTFORM] = sCastformFormSpeciesIdTable,
+#if P_NEW_POKEMON == TRUE
[SPECIES_BANETTE] = sBanetteFormSpeciesIdTable,
[SPECIES_ABSOL] = sAbsolFormSpeciesIdTable,
[SPECIES_GLALIE] = sGlalieFormSpeciesIdTable,
@@ -76,7 +81,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable,
[SPECIES_GROUDON] = sGroudonFormSpeciesIdTable,
[SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable,
+#endif
[SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable,
+#if P_NEW_POKEMON == TRUE
[SPECIES_BURMY] = sBurmyFormSpeciesIdTable,
[SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable,
[SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable,
@@ -253,6 +260,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable,
// Pichu
[SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable,
+#endif
// Unown
[SPECIES_UNOWN_B] = sUnownFormSpeciesIdTable,
[SPECIES_UNOWN_C] = sUnownFormSpeciesIdTable,
@@ -289,6 +297,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_DEOXYS_ATTACK] = sDeoxysFormSpeciesIdTable,
[SPECIES_DEOXYS_DEFENSE] = sDeoxysFormSpeciesIdTable,
[SPECIES_DEOXYS_SPEED] = sDeoxysFormSpeciesIdTable,
+#if P_NEW_POKEMON == TRUE
// Burmy
[SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable,
[SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable,
@@ -516,4 +525,5 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
// Calyrex
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexFormSpeciesIdTable,
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable,
+#endif
};
diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h
index 810da64997..d54426df41 100644
--- a/src/data/pokemon/form_species_tables.h
+++ b/src/data/pokemon/form_species_tables.h
@@ -1,3 +1,4 @@
+#if P_NEW_POKEMON == TRUE
static const u16 sVenusaurFormSpeciesIdTable[] = {
SPECIES_VENUSAUR,
SPECIES_VENUSAUR_MEGA,
@@ -278,6 +279,7 @@ static const u16 sSlowkingFormSpeciesIdTable[] = {
SPECIES_SLOWKING_GALARIAN,
FORM_SPECIES_END,
};
+#endif
static const u16 sUnownFormSpeciesIdTable[] = {
SPECIES_UNOWN,
@@ -311,6 +313,7 @@ static const u16 sUnownFormSpeciesIdTable[] = {
FORM_SPECIES_END,
};
+#if P_NEW_POKEMON == TRUE
static const u16 sSteelixFormSpeciesIdTable[] = {
SPECIES_STEELIX,
SPECIES_STEELIX_MEGA,
@@ -430,7 +433,7 @@ static const u16 sAltariaFormSpeciesIdTable[] = {
SPECIES_ALTARIA_MEGA,
FORM_SPECIES_END,
};
-
+#endif
static const u16 sCastformFormSpeciesIdTable[] = {
SPECIES_CASTFORM,
SPECIES_CASTFORM_SUNNY,
@@ -439,6 +442,7 @@ static const u16 sCastformFormSpeciesIdTable[] = {
FORM_SPECIES_END,
};
+#if P_NEW_POKEMON == TRUE
static const u16 sBanetteFormSpeciesIdTable[] = {
SPECIES_BANETTE,
SPECIES_BANETTE_MEGA,
@@ -498,7 +502,7 @@ static const u16 sRayquazaFormSpeciesIdTable[] = {
SPECIES_RAYQUAZA_MEGA,
FORM_SPECIES_END,
};
-
+#endif
static const u16 sDeoxysFormSpeciesIdTable[] = {
SPECIES_DEOXYS,
SPECIES_DEOXYS_ATTACK,
@@ -506,7 +510,7 @@ static const u16 sDeoxysFormSpeciesIdTable[] = {
SPECIES_DEOXYS_SPEED,
FORM_SPECIES_END,
};
-
+#if P_NEW_POKEMON == TRUE
static const u16 sBurmyFormSpeciesIdTable[] = {
SPECIES_BURMY,
SPECIES_BURMY_SANDY_CLOAK,
@@ -1020,3 +1024,4 @@ static const u16 sCalyrexFormSpeciesIdTable[] = {
SPECIES_CALYREX_SHADOW_RIDER,
FORM_SPECIES_END,
};
+#endif
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index ff621356e1..f2290351a3 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -322,59 +322,37 @@ const u8 gItemEffect_DireHit[8] = {
};
const u8 gItemEffect_XAttack[8] = {
-#ifdef BATTLE_ENGINE
[1] = ITEM1_X_ATTACK,
-#else
- [0] = 1, // ITEM0_X_ATTACK
-#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XDefense[8] = {
-#ifdef BATTLE_ENGINE
[1] = ITEM1_X_DEFENSE,
-#else
- [1] = 1 << 4, // ITEM1_X_DEFEND
-#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XSpeed[8] = {
-#ifdef BATTLE_ENGINE
[1] = ITEM1_X_SPEED,
-#else
- [1] = 1, // ITEM1_X_SPEED
-#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XAccuracy[8] = {
-#ifdef BATTLE_ENGINE
[1] = ITEM1_X_ACCURACY,
-#else
- [2] = 1 << 4, // ITEM2_X_ACCURACY
-#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XSpecialAttack[8] = {
-#ifdef BATTLE_ENGINE
[1] = ITEM1_X_SPATK,
-#else
- [2] = 1, // ITEM2_X_SPATK
-#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XSpecialDefense[8] = {
-#ifdef BATTLE_ENGINE
[1] = ITEM1_X_SPDEF,
-#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
STAT_BOOST_FRIENDSHIP_CHANGE,
};
diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h
index 6cd308aa7d..52f1e187aa 100644
--- a/src/data/pokemon/level_up_learnset_pointers.h
+++ b/src/data/pokemon/level_up_learnset_pointers.h
@@ -387,6 +387,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_JIRACHI] = sJirachiLevelUpLearnset,
[SPECIES_DEOXYS] = sDeoxysLevelUpLearnset,
[SPECIES_CHIMECHO] = sChimechoLevelUpLearnset,
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = sTurtwigLevelUpLearnset,
[SPECIES_GROTLE] = sGrotleLevelUpLearnset,
[SPECIES_TORTERRA] = sTorterraLevelUpLearnset,
@@ -1009,6 +1010,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset,
// Pichu
[SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset,
+#endif
// Unown
[SPECIES_UNOWN_B] = sUnownLevelUpLearnset,
[SPECIES_UNOWN_C] = sUnownLevelUpLearnset,
@@ -1045,6 +1047,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset,
[SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset,
[SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset,
+#if P_NEW_POKEMON == TRUE
// Burmy
[SPECIES_BURMY_SANDY_CLOAK] = sBurmyLevelUpLearnset,
[SPECIES_BURMY_TRASH_CLOAK] = sBurmyLevelUpLearnset,
@@ -1272,4 +1275,5 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
// Calyrex
[SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset,
[SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset,
+#endif
};
diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h
index e7c4150cc2..42fdc00d9f 100644
--- a/src/data/pokemon/level_up_learnsets.h
+++ b/src/data/pokemon/level_up_learnsets.h
@@ -7903,6 +7903,7 @@ static const struct LevelUpMove sChimechoLevelUpLearnset[] = {
LEVEL_UP_END
};
+#if P_NEW_POKEMON == TRUE
static const struct LevelUpMove sTurtwigLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 5, MOVE_WITHDRAW),
@@ -18840,7 +18841,7 @@ static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = {
LEVEL_UP_MOVE(55, MOVE_FISSURE),
LEVEL_UP_END
};
-
+#endif
static const struct LevelUpMove sDeoxysAttackLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_WRAP),
@@ -18897,6 +18898,7 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = {
LEVEL_UP_END
};
+#if P_NEW_POKEMON == TRUE
static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = {
//LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE),
LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE),
@@ -19247,3 +19249,4 @@ static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = {
LEVEL_UP_MOVE(88, MOVE_FUTURE_SIGHT),
LEVEL_UP_END
};
+#endif
diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h
index 6ceff22eec..db228f4c54 100644
--- a/src/data/pokemon/pokedex_entries.h
+++ b/src/data/pokemon/pokedex_entries.h
@@ -4644,6 +4644,7 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerOffset = 2,
},
+#if P_NEW_POKEMON == TRUE
[NATIONAL_DEX_TURTWIG] =
{
.categoryName = _("Tiny Leaf"),
@@ -10787,4 +10788,5 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 256,
.trainerOffset = 0,
},
+#endif
};
diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h
index 15d56ee9d5..c91e340c71 100644
--- a/src/data/pokemon/pokedex_text.h
+++ b/src/data/pokemon/pokedex_text.h
@@ -2320,6 +2320,7 @@ const u8 gChimechoPokedexText[] = _(
"themselves using seven different and\n"
"distinguishing cries.");
+#if P_NEW_POKEMON == TRUE
const u8 gTurtwigPokedexText[] = _(
"The shell on its back is made of soil. \n"
"On a very healthy Turtwig, the shell \n"
@@ -5348,3 +5349,4 @@ const u8 gCalyrexPokedexText[] = _(
"providing healing and blessings. It\n"
"reigned over the Galar region in times\n"
"of yore.");
+#endif
diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h
index fd0cb07bc9..014e4a598e 100644
--- a/src/data/pokemon/tmhm_learnsets.h
+++ b/src/data/pokemon/tmhm_learnsets.h
@@ -9614,6 +9614,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM06_TOXIC)
| TMHM(TM03_WATER_PULSE)),
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = TMHM_LEARNSET(TMHM(TM45_ATTRACT)
| TMHM(TM09_BULLET_SEED)
| TMHM(HM01_CUT)
@@ -21117,7 +21118,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM25_THUNDER)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM06_TOXIC)),
-
+#endif
[SPECIES_UNOWN_B] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)),
[SPECIES_UNOWN_C] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)),
@@ -21283,6 +21284,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM06_TOXIC)
| TMHM(TM03_WATER_PULSE)),
+#if P_NEW_POKEMON == TRUE
[SPECIES_BURMY_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)
| TMHM(TM17_PROTECT)),
@@ -24751,4 +24753,5 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM22_SOLAR_BEAM)
| TMHM(TM11_SUNNY_DAY)
| TMHM(TM12_TAUNT)),
+#endif
};
diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h
index f6ad5b26e8..7d4eb99dff 100644
--- a/src/data/pokemon/tutor_learnsets.h
+++ b/src/data/pokemon/tutor_learnsets.h
@@ -5893,6 +5893,7 @@ static const u32 sTutorLearnsets[] =
| TUTOR(MOVE_THUNDER_PUNCH)
| TUTOR(MOVE_THUNDER_WAVE)),
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM)
| TUTOR(MOVE_DOUBLE_EDGE)
| TUTOR(MOVE_ENDURE)
@@ -10590,4 +10591,5 @@ static const u32 sTutorLearnsets[] =
| TUTOR(MOVE_SNORE)
| TUTOR(MOVE_SUBSTITUTE)
| TUTOR(MOVE_SWIFT)),
+#endif
};
diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h
index 70baff4b4f..98aa69403e 100644
--- a/src/data/pokemon_graphics/back_pic_coordinates.h
+++ b/src/data/pokemon_graphics/back_pic_coordinates.h
@@ -1939,6 +1939,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56),
.y_offset = 9,
},
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] =
{
.size = MON_COORDS_SIZE(48, 56),
@@ -5017,6 +5018,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(48, 56),
.y_offset = 8,
},
+#endif
// Unown
[SPECIES_UNOWN_B] =
{
@@ -5185,6 +5187,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
+#if P_NEW_POKEMON == TRUE
// Burmy
[SPECIES_BURMY_SANDY_CLOAK] =
{
@@ -6104,6 +6107,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = MON_COORDS_SIZE(64, 56),
.y_offset = 7,
},
+#endif
// Egg
[SPECIES_EGG] =
{
diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h
index 80f7aab3b3..f9a97cdd5d 100644
--- a/src/data/pokemon_graphics/back_pic_table.h
+++ b/src/data/pokemon_graphics/back_pic_table.h
@@ -387,6 +387,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi),
SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys),
SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho),
+#if P_NEW_POKEMON == TRUE
SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig),
SPECIES_SPRITE(GROTLE, gMonBackPic_Grotle),
SPECIES_SPRITE(TORTERRA, gMonBackPic_Torterra),
@@ -1008,7 +1009,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonBackPic_PikachuWorldCap),
SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonBackPic_PichuSpikyEared),
-
+#endif
SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB),
SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC),
SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD),
@@ -1044,7 +1045,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(DEOXYS_ATTACK, gMonBackPic_DeoxysAttack),
SPECIES_SPRITE(DEOXYS_DEFENSE, gMonBackPic_DeoxysDefense),
SPECIES_SPRITE(DEOXYS_SPEED, gMonBackPic_DeoxysSpeed),
-
+#if P_NEW_POKEMON == TRUE
SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonBackPic_BurmySandyCloak),
SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonBackPic_BurmyTrashCloak),
@@ -1271,13 +1272,14 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider),
-
+#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
{
SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF),
+#if P_NEW_POKEMON == TRUE
SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF),
SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF),
SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor),
@@ -1292,4 +1294,5 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF),
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
+#endif
};
diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index 84a5ea9fac..26d49a5281 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -58,6 +58,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_LATIOS] = 6,
[SPECIES_JIRACHI] = 14,
[SPECIES_CHIMECHO] = 16,
+#if P_NEW_POKEMON == TRUE
// Gen 4
[SPECIES_MOTHIM] = 10,
[SPECIES_COMBEE] = 8,
@@ -177,6 +178,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_WEEZING_GALARIAN] = 6,
[SPECIES_ARTICUNO_GALARIAN] = 10,
[SPECIES_YAMASK_GALARIAN] = 4,
+#endif
// Other Forms
[SPECIES_UNOWN_B] = 8,
[SPECIES_UNOWN_C] = 8,
@@ -208,6 +210,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_CASTFORM_SUNNY] = 5,
[SPECIES_CASTFORM_RAINY] = 5,
[SPECIES_CASTFORM_SNOWY] = 5,
+#if P_NEW_POKEMON == TRUE
[SPECIES_ROTOM_HEAT] = 6,
[SPECIES_ROTOM_WASH] = 6,
[SPECIES_ROTOM_FROST] = 6,
@@ -264,4 +267,5 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_SINISTEA_ANTIQUE] = 10,
[SPECIES_POLTEAGEIST_ANTIQUE] = 12,
[SPECIES_ETERNATUS_ETERNAMAX] = 13,
+#endif
};
diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h
index da05b7fff8..cacf582ca5 100644
--- a/src/data/pokemon_graphics/footprint_table.h
+++ b/src/data/pokemon_graphics/footprint_table.h
@@ -387,6 +387,7 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_JIRACHI] = gMonFootprint_Jirachi,
[SPECIES_DEOXYS] = gMonFootprint_Deoxys,
[SPECIES_CHIMECHO] = gMonFootprint_Chimecho,
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = gMonFootprint_Turtwig,
[SPECIES_GROTLE] = gMonFootprint_Grotle,
[SPECIES_TORTERRA] = gMonFootprint_Torterra,
@@ -899,5 +900,6 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_GLASTRIER] = gMonFootprint_Glastrier,
[SPECIES_SPECTRIER] = gMonFootprint_Spectrier,
[SPECIES_CALYREX] = gMonFootprint_Calyrex,
+#endif
[SPECIES_EGG] = gMonFootprint_Bulbasaur,
};
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 6387994c1a..bd3c82b20a 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -4805,6 +4805,7 @@ static const union AnimCmd sAnim_UNOWN_QMARK_1[] =
ANIMCMD_END,
};
+#if P_NEW_POKEMON == TRUE
static const union AnimCmd sAnim_TURTWIG_1[] =
{
ANIMCMD_FRAME(0, 15),
@@ -9168,7 +9169,7 @@ static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] =
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
-
+#endif
static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] =
{
ANIMCMD_FRAME(0, 16),
@@ -9226,6 +9227,7 @@ static const union AnimCmd sAnim_DEOXYS_SPEED_2[] =
ANIMCMD_END,
};
+#if P_NEW_POKEMON == TRUE
static const union AnimCmd sAnim_PIKACHU_COSPLAY_1[] =
{
ANIMCMD_FRAME(0, 1),
@@ -9315,6 +9317,7 @@ static const union AnimCmd sAnim_PICHU_SPIKY_EARED_1[] =
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
+#endif
static const union AnimCmd *const sAnims_NONE[] ={
sAnim_GeneralFrame0,
@@ -11456,6 +11459,7 @@ static const union AnimCmd *const sAnims_UNOWN_QMARK[] ={
sAnim_UNOWN_QMARK_1,
};
+#if P_NEW_POKEMON == TRUE
static const union AnimCmd *const sAnims_TURTWIG[] ={
sAnim_GeneralFrame0,
sAnim_TURTWIG_1,
@@ -14575,7 +14579,7 @@ static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] ={
sAnim_GeneralFrame0,
sAnim_ZYGARDE_COMPLETE_1,
};
-
+#endif
static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] ={
sAnim_GeneralFrame0,
sAnim_DEOXYS_ATTACK_1,
@@ -14594,6 +14598,7 @@ static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={
sAnim_DEOXYS_SPEED_2,
};
+#if P_NEW_POKEMON == TRUE
static const union AnimCmd *const sAnims_PIKACHU_COSPLAY[] ={
sAnim_GeneralFrame0,
sAnim_PIKACHU_COSPLAY_1,
@@ -14668,6 +14673,7 @@ static const union AnimCmd *const sAnims_PICHU_SPIKY_EARED[] ={
sAnim_GeneralFrame0,
sAnim_PICHU_SPIKY_EARED_1,
};
+#endif
#define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name
#define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
@@ -15061,6 +15067,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(JIRACHI),
ANIM_CMD(DEOXYS),
ANIM_CMD(CHIMECHO),
+#if P_NEW_POKEMON == TRUE
ANIM_CMD(TURTWIG),
ANIM_CMD(GROTLE),
ANIM_CMD(TORTERRA),
@@ -15675,6 +15682,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(PIKACHU_PARTNER_CAP),
ANIM_CMD(PIKACHU_WORLD_CAP),
ANIM_CMD(PICHU_SPIKY_EARED),
+#endif
ANIM_CMD(UNOWN_B),
ANIM_CMD(UNOWN_C),
ANIM_CMD(UNOWN_D),
@@ -15708,6 +15716,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(DEOXYS_ATTACK),
ANIM_CMD(DEOXYS_DEFENSE),
ANIM_CMD(DEOXYS_SPEED),
+#if P_NEW_POKEMON == TRUE
ANIM_CMD_FULL(BURMY_SANDY_CLOAK, sAnims_BURMY),
ANIM_CMD_FULL(BURMY_TRASH_CLOAK, sAnims_BURMY),
ANIM_CMD_FULL(WORMADAM_SANDY_CLOAK, sAnims_WORMADAM),
@@ -15881,6 +15890,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD_FULL(ZARUDE_DADA, sAnims_ZARUDE),
ANIM_CMD_FULL(CALYREX_ICE_RIDER, sAnims_CALYREX),
ANIM_CMD_FULL(CALYREX_SHADOW_RIDER, sAnims_CALYREX),
+#endif
ANIM_CMD(EGG),
};
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index 02a0e06135..2f658eea9c 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -1939,6 +1939,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(48, 48),
.y_offset = 11,
},
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] =
{
.size = MON_COORDS_SIZE(40, 48),
@@ -5017,6 +5018,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(32, 40),
.y_offset = 14,
},
+#endif
// Unown
[SPECIES_UNOWN_B] =
{
@@ -5185,6 +5187,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 1,
},
+#if P_NEW_POKEMON == TRUE
// Burmy
[SPECIES_BURMY_SANDY_CLOAK] =
{
@@ -6104,6 +6107,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 0,
},
+#endif
// Egg
[SPECIES_EGG] =
{
diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h
index 7640dc23e4..969ef7579d 100644
--- a/src/data/pokemon_graphics/front_pic_table.h
+++ b/src/data/pokemon_graphics/front_pic_table.h
@@ -387,6 +387,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi),
SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys),
SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho),
+#if P_NEW_POKEMON == TRUE
SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig),
SPECIES_SPRITE(GROTLE, gMonFrontPic_Grotle),
SPECIES_SPRITE(TORTERRA, gMonFrontPic_Torterra),
@@ -1008,7 +1009,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonFrontPic_PikachuWorldCap),
SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonFrontPic_PichuSpikyEared),
-
+#endif
SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB),
SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC),
SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD),
@@ -1044,7 +1045,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(DEOXYS_ATTACK, gMonFrontPic_DeoxysAttack),
SPECIES_SPRITE(DEOXYS_DEFENSE, gMonFrontPic_DeoxysDefense),
SPECIES_SPRITE(DEOXYS_SPEED, gMonFrontPic_DeoxysSpeed),
-
+#if P_NEW_POKEMON == TRUE
SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonFrontPic_BurmySandyCloak),
SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonFrontPic_BurmyTrashCloak),
@@ -1271,13 +1272,14 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider),
-
+#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
{
SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF),
+#if P_NEW_POKEMON == TRUE
SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF),
SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF),
SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF),
@@ -1292,4 +1294,5 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF),
SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF),
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
+#endif
};
diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h
index 3de4107007..ba7801bcab 100644
--- a/src/data/pokemon_graphics/palette_table.h
+++ b/src/data/pokemon_graphics/palette_table.h
@@ -387,6 +387,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(JIRACHI, gMonPalette_Jirachi),
SPECIES_PAL(DEOXYS, gMonPalette_Deoxys),
SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho),
+#if P_NEW_POKEMON == TRUE
SPECIES_PAL(TURTWIG, gMonPalette_Turtwig),
SPECIES_PAL(GROTLE, gMonPalette_Grotle),
SPECIES_PAL(TORTERRA, gMonPalette_Torterra),
@@ -1008,7 +1009,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(PIKACHU_WORLD_CAP, gMonPalette_PikachuWorldCap),
SPECIES_PAL(PICHU_SPIKY_EARED, gMonPalette_PichuSpikyEared),
-
+#endif
SPECIES_PAL(UNOWN_B, gMonPalette_Unown),
SPECIES_PAL(UNOWN_C, gMonPalette_Unown),
SPECIES_PAL(UNOWN_D, gMonPalette_Unown),
@@ -1044,7 +1045,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(DEOXYS_ATTACK, gMonPalette_DeoxysAttack),
SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense),
SPECIES_PAL(DEOXYS_SPEED, gMonPalette_DeoxysSpeed),
-
+#if P_NEW_POKEMON == TRUE
SPECIES_PAL(BURMY_SANDY_CLOAK, gMonPalette_BurmySandyCloak),
SPECIES_PAL(BURMY_TRASH_CLOAK, gMonPalette_BurmyTrashCloak),
@@ -1271,13 +1272,14 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider),
SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider),
-
+#endif
SPECIES_PAL(EGG, gMonPalette_Egg),
};
const struct CompressedSpritePalette gMonPaletteTableFemale[] =
{
SPECIES_PAL(EEVEE, gMonPalette_Eevee),
+#if P_NEW_POKEMON == TRUE
SPECIES_PAL(COMBEE, gMonPalette_Combee),
SPECIES_PAL(STARLY, gMonPalette_Starly),
SPECIES_PAL(STARAVIA, gMonPalette_Staravia),
@@ -1292,4 +1294,5 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
SPECIES_PAL(FRILLISH, gMonPalette_FrillishF),
SPECIES_PAL(JELLICENT, gMonPalette_JellicentF),
SPECIES_PAL(PYROAR, gMonPalette_PyroarF),
+#endif
};
diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h
index aa7c4153e7..bc1b8266fb 100644
--- a/src/data/pokemon_graphics/shiny_palette_table.h
+++ b/src/data/pokemon_graphics/shiny_palette_table.h
@@ -387,6 +387,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi),
SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys),
SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho),
+#if P_NEW_POKEMON == TRUE
SPECIES_SHINY_PAL(TURTWIG, gMonShinyPalette_Turtwig),
SPECIES_SHINY_PAL(GROTLE, gMonShinyPalette_Grotle),
SPECIES_SHINY_PAL(TORTERRA, gMonShinyPalette_Torterra),
@@ -1008,7 +1009,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(PIKACHU_WORLD_CAP, gMonShinyPalette_PikachuWorldCap),
SPECIES_SHINY_PAL(PICHU_SPIKY_EARED, gMonShinyPalette_PichuSpikyEared),
-
+#endif
SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown),
SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown),
SPECIES_SHINY_PAL(UNOWN_D, gMonShinyPalette_Unown),
@@ -1044,7 +1045,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(DEOXYS_ATTACK, gMonShinyPalette_DeoxysAttack),
SPECIES_SHINY_PAL(DEOXYS_DEFENSE, gMonShinyPalette_DeoxysDefense),
SPECIES_SHINY_PAL(DEOXYS_SPEED, gMonShinyPalette_DeoxysSpeed),
-
+#if P_NEW_POKEMON == TRUE
SPECIES_SHINY_PAL(BURMY_SANDY_CLOAK, gMonShinyPalette_BurmySandyCloak),
SPECIES_SHINY_PAL(BURMY_TRASH_CLOAK, gMonShinyPalette_BurmyTrashCloak),
@@ -1271,13 +1272,14 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider),
SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider),
-
+#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};
const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
{
SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee),
+#if P_NEW_POKEMON == TRUE
SPECIES_SHINY_PAL(STARLY, gMonShinyPalette_Starly),
SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia),
SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor),
@@ -1292,4 +1294,5 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF),
SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF),
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF),
+#endif
};
diff --git a/src/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h
index 6b433f90fa..d1913cd8a0 100644
--- a/src/data/region_map/region_map_entries.h
+++ b/src/data/region_map/region_map_entries.h
@@ -299,8 +299,8 @@ const struct RegionMapLocation gRegionMapEntries[] = {
[MAPSEC_CINNABAR_ISLAND] = { 0, 0, 1, 1, sMapName_CinnabarIsland},
[MAPSEC_INDIGO_PLATEAU] = { 0, 0, 1, 1, sMapName_IndigoPlateau},
[MAPSEC_SAFFRON_CITY] = { 0, 0, 1, 1, sMapName_SaffronCity},
- [MAPSEC_ROUTE_4_FLYDUP] = { 0, 0, 1, 1, sMapName_Route4},
- [MAPSEC_ROUTE_10_FLYDUP] = { 0, 0, 1, 1, sMapName_Route10},
+ [MAPSEC_ROUTE_4_POKECENTER] = { 0, 0, 1, 1, sMapName_Route4},
+ [MAPSEC_ROUTE_10_POKECENTER] = { 0, 0, 1, 1, sMapName_Route10},
[MAPSEC_ROUTE_1] = { 0, 0, 1, 1, sMapName_Route1},
[MAPSEC_ROUTE_2] = { 0, 0, 1, 1, sMapName_Route2},
[MAPSEC_ROUTE_3] = { 0, 0, 1, 1, sMapName_Route3},
diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h
index 4706ddfdba..08e5fc8468 100644
--- a/src/data/text/item_descriptions.h
+++ b/src/data/text/item_descriptions.h
@@ -108,7 +108,7 @@ static const u8 sHeavyBallDesc[] = _(
"Pokémon.");
static const u8 sDreamBallDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_DREAM_BALL_MODIFIER >= GEN_8
+#if B_DREAM_BALL_MODIFIER >= GEN_8
"A Ball that works\n"
"well on sleeping\n"
"Pokémon.");
@@ -634,7 +634,7 @@ static const u8 sEscapeRopeDesc[] = _(
// Battle items
static const u8 sXAttackDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7
+#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises stat\n"
"Attack during\n"
"one battle.");
@@ -645,7 +645,7 @@ static const u8 sXAttackDesc[] = _(
#endif
static const u8 sXDefenseDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7
+#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises stat\n"
"Defense during\n"
"one battle.");
@@ -656,7 +656,7 @@ static const u8 sXDefenseDesc[] = _(
#endif
static const u8 sXSpAtkDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7
+#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises stat\n"
"Sp. Atk during\n"
"one battle.");
@@ -667,7 +667,7 @@ static const u8 sXSpAtkDesc[] = _(
#endif
static const u8 sXSpDefDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7
+#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises stat\n"
"Sp. Def during\n"
"one battle.");
@@ -678,7 +678,7 @@ static const u8 sXSpDefDesc[] = _(
#endif
static const u8 sXSpeedDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7
+#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises stat\n"
"Speed during\n"
"one battle.");
@@ -689,7 +689,7 @@ static const u8 sXSpeedDesc[] = _(
#endif
static const u8 sXAccuracyDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_X_ITEMS_BUFF >= GEN_7
+#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises move\n"
"accuracy during\n"
"one battle.");
@@ -2070,7 +2070,7 @@ static const u8 sDeepSeaToothDesc[] = _(
"of Clamperl.");
static const u8 sSoulDewDesc[] = _(
-#if defined(BATTLE_ENGINE) && B_SOUL_DEW_BOOST >= GEN_7
+#if B_SOUL_DEW_BOOST >= GEN_7
"Powers up Latios' &\n"
"Latias' Psychic and\n"
"Dragon-type moves.");
@@ -2405,7 +2405,7 @@ static const u8 sSootheBellDesc[] = _(
"calms spirits and\n"
"fosters friendship.");
-#if defined(BATTLE_ENGINE) && B_MENTAL_HERB >= GEN_5
+#if B_MENTAL_HERB >= GEN_5
static const u8 sMentalHerbDesc[] = _(
"Snaps Pokémon out\n"
"of move-binding\n"
diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h
index 8129e2a602..95774f9630 100644
--- a/src/data/text/species_names.h
+++ b/src/data/text/species_names.h
@@ -386,6 +386,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_RAYQUAZA] = _("Rayquaza"),
[SPECIES_JIRACHI] = _("Jirachi"),
[SPECIES_DEOXYS] = _("Deoxys"),
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = _("Turtwig"),
[SPECIES_GROTLE] = _("Grotle"),
[SPECIES_TORTERRA] = _("Torterra"),
@@ -1011,6 +1012,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"),
// Pichu
[SPECIES_PICHU_SPIKY_EARED] = _("Pichu"),
+#endif
// Unown
[SPECIES_UNOWN_B] = _("Unown"),
[SPECIES_UNOWN_C] = _("Unown"),
@@ -1047,6 +1049,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_DEOXYS_ATTACK] = _("Deoxys"),
[SPECIES_DEOXYS_DEFENSE] = _("Deoxys"),
[SPECIES_DEOXYS_SPEED] = _("Deoxys"),
+#if P_NEW_POKEMON == TRUE
// Burmy
[SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"),
[SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"),
@@ -1274,4 +1277,5 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
// Calyrex
[SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"),
[SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"),
+#endif
};
diff --git a/src/data/trainers.h b/src/data/trainers.h
index b1a873f6c0..75f7edc8b7 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -15,7 +15,6 @@ const struct Trainer gTrainers[] = {
[TRAINER_SAWYER_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -23,13 +22,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sawyer1),
- .party = {.NoItemDefaultMoves = sParty_Sawyer1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer1),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -37,13 +34,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout1),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout1),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -51,13 +46,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout2),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout2),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -65,13 +58,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout3),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout3),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -79,13 +70,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout4),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout4),
},
[TRAINER_GRUNT_SEAFLOOR_CAVERN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -93,13 +82,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern1),
- .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern1),
},
[TRAINER_GRUNT_SEAFLOOR_CAVERN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -107,13 +94,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern2),
- .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern2),
},
[TRAINER_GRUNT_SEAFLOOR_CAVERN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -121,13 +106,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern3),
- .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern3),
},
[TRAINER_GABRIELLE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -135,13 +118,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gabrielle1),
- .party = {.NoItemDefaultMoves = sParty_Gabrielle1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle1),
},
[TRAINER_GRUNT_PETALBURG_WOODS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -149,13 +130,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntPetalburgWoods),
- .party = {.NoItemDefaultMoves = sParty_GruntPetalburgWoods},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntPetalburgWoods),
},
[TRAINER_MARCEL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -163,13 +142,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Marcel),
- .party = {.NoItemDefaultMoves = sParty_Marcel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Marcel),
},
[TRAINER_ALBERTO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -177,13 +154,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alberto),
- .party = {.NoItemDefaultMoves = sParty_Alberto},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alberto),
},
[TRAINER_ED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -191,13 +166,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ed),
- .party = {.NoItemDefaultMoves = sParty_Ed},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ed),
},
[TRAINER_GRUNT_SEAFLOOR_CAVERN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -205,13 +178,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern4),
- .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern4),
},
[TRAINER_DECLAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -219,13 +190,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Declan),
- .party = {.NoItemDefaultMoves = sParty_Declan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Declan),
},
[TRAINER_GRUNT_RUSTURF_TUNNEL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -233,13 +202,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntRusturfTunnel),
- .party = {.NoItemDefaultMoves = sParty_GruntRusturfTunnel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntRusturfTunnel),
},
[TRAINER_GRUNT_WEATHER_INST_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -247,13 +214,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntWeatherInst1),
- .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst1),
},
[TRAINER_GRUNT_WEATHER_INST_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -261,13 +226,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntWeatherInst2),
- .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst2),
},
[TRAINER_GRUNT_WEATHER_INST_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -275,13 +238,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntWeatherInst3),
- .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst3),
},
[TRAINER_GRUNT_MUSEUM_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -289,13 +250,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMuseum1),
- .party = {.NoItemDefaultMoves = sParty_GruntMuseum1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMuseum1),
},
[TRAINER_GRUNT_MUSEUM_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -303,13 +262,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMuseum2),
- .party = {.NoItemDefaultMoves = sParty_GruntMuseum2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMuseum2),
},
[TRAINER_GRUNT_SPACE_CENTER_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -317,13 +274,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter1),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter1),
},
[TRAINER_GRUNT_MT_PYRE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -331,13 +286,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMtPyre1),
- .party = {.NoItemDefaultMoves = sParty_GruntMtPyre1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre1),
},
[TRAINER_GRUNT_MT_PYRE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -345,13 +298,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMtPyre2),
- .party = {.NoItemDefaultMoves = sParty_GruntMtPyre2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre2),
},
[TRAINER_GRUNT_MT_PYRE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -359,13 +310,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMtPyre3),
- .party = {.NoItemDefaultMoves = sParty_GruntMtPyre3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre3),
},
[TRAINER_GRUNT_WEATHER_INST_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -373,13 +322,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntWeatherInst4),
- .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst4),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -387,13 +334,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout5),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout5),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_6] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -401,13 +346,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout6),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout6},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout6),
},
[TRAINER_FREDRICK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -415,13 +358,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Fredrick),
- .party = {.NoItemDefaultMoves = sParty_Fredrick},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fredrick),
},
[TRAINER_MATT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_ADMIN_M,
@@ -429,13 +370,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Matt),
- .party = {.NoItemDefaultMoves = sParty_Matt},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Matt),
},
[TRAINER_ZANDER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -443,13 +382,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Zander),
- .party = {.NoItemDefaultMoves = sParty_Zander},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Zander),
},
[TRAINER_SHELLY_WEATHER_INSTITUTE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_ADMIN_F,
@@ -457,13 +394,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_ShellyWeatherInstitute),
- .party = {.NoItemDefaultMoves = sParty_ShellyWeatherInstitute},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_ShellyWeatherInstitute),
},
[TRAINER_SHELLY_SEAFLOOR_CAVERN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_ADMIN_F,
@@ -471,13 +406,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_ShellySeafloorCavern),
- .party = {.NoItemDefaultMoves = sParty_ShellySeafloorCavern},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_ShellySeafloorCavern),
},
[TRAINER_ARCHIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE,
@@ -485,13 +418,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Archie),
- .party = {.NoItemDefaultMoves = sParty_Archie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Archie),
},
[TRAINER_LEAH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -499,13 +430,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Leah),
- .party = {.NoItemDefaultMoves = sParty_Leah},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Leah),
},
[TRAINER_DAISY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -513,13 +442,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Daisy),
- .party = {.NoItemDefaultMoves = sParty_Daisy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Daisy),
},
[TRAINER_ROSE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -527,13 +454,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rose1),
- .party = {.NoItemDefaultMoves = sParty_Rose1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose1),
},
[TRAINER_FELIX] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -541,13 +466,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Felix),
- .party = {.NoItemCustomMoves = sParty_Felix},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Felix),
},
[TRAINER_VIOLET] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -555,13 +478,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Violet),
- .party = {.NoItemDefaultMoves = sParty_Violet},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Violet),
},
[TRAINER_ROSE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -569,13 +490,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rose2),
- .party = {.NoItemDefaultMoves = sParty_Rose2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose2),
},
[TRAINER_ROSE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -583,13 +502,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rose3),
- .party = {.NoItemDefaultMoves = sParty_Rose3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose3),
},
[TRAINER_ROSE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -597,13 +514,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rose4),
- .party = {.NoItemDefaultMoves = sParty_Rose4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose4),
},
[TRAINER_ROSE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -611,13 +526,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rose5),
- .party = {.NoItemDefaultMoves = sParty_Rose5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose5),
},
[TRAINER_DUSTY_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -625,13 +538,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dusty1),
- .party = {.NoItemCustomMoves = sParty_Dusty1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty1),
},
[TRAINER_CHIP] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -639,13 +550,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Chip),
- .party = {.NoItemCustomMoves = sParty_Chip},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Chip),
},
[TRAINER_FOSTER] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -653,13 +562,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Foster),
- .party = {.NoItemCustomMoves = sParty_Foster},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Foster),
},
[TRAINER_DUSTY_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -667,13 +574,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dusty2),
- .party = {.NoItemCustomMoves = sParty_Dusty2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty2),
},
[TRAINER_DUSTY_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -681,13 +586,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dusty3),
- .party = {.NoItemCustomMoves = sParty_Dusty3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty3),
},
[TRAINER_DUSTY_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -695,13 +598,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dusty4),
- .party = {.NoItemCustomMoves = sParty_Dusty4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty4),
},
[TRAINER_DUSTY_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -709,13 +610,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dusty5),
- .party = {.NoItemCustomMoves = sParty_Dusty5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty5),
},
[TRAINER_GABBY_AND_TY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
.trainerPic = TRAINER_PIC_INTERVIEWER,
@@ -723,13 +622,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GabbyAndTy1),
- .party = {.NoItemDefaultMoves = sParty_GabbyAndTy1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy1),
},
[TRAINER_GABBY_AND_TY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
.trainerPic = TRAINER_PIC_INTERVIEWER,
@@ -737,13 +634,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GabbyAndTy2),
- .party = {.NoItemDefaultMoves = sParty_GabbyAndTy2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy2),
},
[TRAINER_GABBY_AND_TY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
.trainerPic = TRAINER_PIC_INTERVIEWER,
@@ -751,13 +646,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GabbyAndTy3),
- .party = {.NoItemDefaultMoves = sParty_GabbyAndTy3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy3),
},
[TRAINER_GABBY_AND_TY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
.trainerPic = TRAINER_PIC_INTERVIEWER,
@@ -765,13 +658,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GabbyAndTy4),
- .party = {.NoItemDefaultMoves = sParty_GabbyAndTy4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy4),
},
[TRAINER_GABBY_AND_TY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
.trainerPic = TRAINER_PIC_INTERVIEWER,
@@ -779,13 +670,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GabbyAndTy5),
- .party = {.NoItemDefaultMoves = sParty_GabbyAndTy5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy5),
},
[TRAINER_GABBY_AND_TY_6] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_INTERVIEWER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
.trainerPic = TRAINER_PIC_INTERVIEWER,
@@ -793,13 +682,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GabbyAndTy6),
- .party = {.NoItemCustomMoves = sParty_GabbyAndTy6},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_GabbyAndTy6),
},
[TRAINER_LOLA_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -807,13 +694,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lola1),
- .party = {.NoItemDefaultMoves = sParty_Lola1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola1),
},
[TRAINER_AUSTINA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -821,13 +706,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Austina),
- .party = {.NoItemDefaultMoves = sParty_Austina},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Austina),
},
[TRAINER_GWEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -835,13 +718,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gwen),
- .party = {.NoItemDefaultMoves = sParty_Gwen},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gwen),
},
[TRAINER_LOLA_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -849,13 +730,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lola2),
- .party = {.NoItemDefaultMoves = sParty_Lola2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola2),
},
[TRAINER_LOLA_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -863,13 +742,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lola3),
- .party = {.NoItemDefaultMoves = sParty_Lola3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola3),
},
[TRAINER_LOLA_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -877,13 +754,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lola4),
- .party = {.NoItemDefaultMoves = sParty_Lola4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola4),
},
[TRAINER_LOLA_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -891,13 +766,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lola5),
- .party = {.NoItemDefaultMoves = sParty_Lola5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola5),
},
[TRAINER_RICKY_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -905,13 +778,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ricky1),
- .party = {.NoItemCustomMoves = sParty_Ricky1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky1),
},
[TRAINER_SIMON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -919,13 +790,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Simon),
- .party = {.NoItemDefaultMoves = sParty_Simon},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Simon),
},
[TRAINER_CHARLIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -933,13 +802,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Charlie),
- .party = {.NoItemDefaultMoves = sParty_Charlie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Charlie),
},
[TRAINER_RICKY_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -947,13 +814,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ricky2),
- .party = {.NoItemCustomMoves = sParty_Ricky2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky2),
},
[TRAINER_RICKY_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -961,13 +826,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ricky3),
- .party = {.NoItemCustomMoves = sParty_Ricky3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky3),
},
[TRAINER_RICKY_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -975,13 +838,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ricky4),
- .party = {.NoItemCustomMoves = sParty_Ricky4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky4),
},
[TRAINER_RICKY_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -989,13 +850,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ricky5),
- .party = {.NoItemCustomMoves = sParty_Ricky5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky5),
},
[TRAINER_RANDALL] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1003,13 +862,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Randall),
- .party = {.ItemCustomMoves = sParty_Randall},
+ .party = ITEM_CUSTOM_MOVES(sParty_Randall),
},
[TRAINER_PARKER] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1017,13 +874,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Parker),
- .party = {.ItemCustomMoves = sParty_Parker},
+ .party = ITEM_CUSTOM_MOVES(sParty_Parker),
},
[TRAINER_GEORGE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1031,13 +886,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_George),
- .party = {.ItemCustomMoves = sParty_George},
+ .party = ITEM_CUSTOM_MOVES(sParty_George),
},
[TRAINER_BERKE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1045,13 +898,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Berke),
- .party = {.ItemCustomMoves = sParty_Berke},
+ .party = ITEM_CUSTOM_MOVES(sParty_Berke),
},
[TRAINER_BRAXTON] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1059,13 +910,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Braxton),
- .party = {.NoItemCustomMoves = sParty_Braxton},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Braxton),
},
[TRAINER_VINCENT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1073,13 +922,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Vincent),
- .party = {.NoItemDefaultMoves = sParty_Vincent},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Vincent),
},
[TRAINER_LEROY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1087,13 +934,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Leroy),
- .party = {.NoItemDefaultMoves = sParty_Leroy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Leroy),
},
[TRAINER_WILTON_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1101,13 +946,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wilton1),
- .party = {.NoItemDefaultMoves = sParty_Wilton1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wilton1),
},
[TRAINER_EDGAR] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1115,13 +958,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Edgar),
- .party = {.NoItemDefaultMoves = sParty_Edgar},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edgar),
},
[TRAINER_ALBERT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1129,13 +970,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Albert),
- .party = {.NoItemDefaultMoves = sParty_Albert},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Albert),
},
[TRAINER_SAMUEL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1143,13 +982,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Samuel),
- .party = {.NoItemDefaultMoves = sParty_Samuel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Samuel),
},
[TRAINER_VITO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1157,13 +994,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Vito),
- .party = {.NoItemDefaultMoves = sParty_Vito},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Vito),
},
[TRAINER_OWEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1171,13 +1006,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Owen),
- .party = {.NoItemDefaultMoves = sParty_Owen},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Owen),
},
[TRAINER_WILTON_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1185,13 +1018,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wilton2),
- .party = {.NoItemDefaultMoves = sParty_Wilton2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wilton2),
},
[TRAINER_WILTON_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1199,13 +1030,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wilton3),
- .party = {.NoItemDefaultMoves = sParty_Wilton3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wilton3),
},
[TRAINER_WILTON_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1213,13 +1042,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wilton4),
- .party = {.NoItemDefaultMoves = sParty_Wilton4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wilton4),
},
[TRAINER_WILTON_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1227,13 +1054,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wilton5),
- .party = {.NoItemDefaultMoves = sParty_Wilton5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wilton5),
},
[TRAINER_WARREN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -1241,13 +1066,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Warren),
- .party = {.NoItemDefaultMoves = sParty_Warren},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Warren),
},
[TRAINER_MARY] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1255,13 +1078,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Mary),
- .party = {.ItemCustomMoves = sParty_Mary},
+ .party = ITEM_CUSTOM_MOVES(sParty_Mary),
},
[TRAINER_ALEXIA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1269,13 +1090,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Alexia),
- .party = {.ItemCustomMoves = sParty_Alexia},
+ .party = ITEM_CUSTOM_MOVES(sParty_Alexia),
},
[TRAINER_JODY] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1283,13 +1102,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Jody),
- .party = {.ItemCustomMoves = sParty_Jody},
+ .party = ITEM_CUSTOM_MOVES(sParty_Jody),
},
[TRAINER_WENDY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1297,13 +1114,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Wendy),
- .party = {.NoItemCustomMoves = sParty_Wendy},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Wendy),
},
[TRAINER_KEIRA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1311,13 +1126,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Keira),
- .party = {.NoItemDefaultMoves = sParty_Keira},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Keira),
},
[TRAINER_BROOKE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1325,13 +1138,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brooke1),
- .party = {.NoItemDefaultMoves = sParty_Brooke1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brooke1),
},
[TRAINER_JENNIFER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1339,13 +1150,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Jennifer),
- .party = {.NoItemDefaultMoves = sParty_Jennifer},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jennifer),
},
[TRAINER_HOPE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1353,13 +1162,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Hope),
- .party = {.NoItemDefaultMoves = sParty_Hope},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hope),
},
[TRAINER_SHANNON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1367,13 +1174,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shannon),
- .party = {.NoItemDefaultMoves = sParty_Shannon},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shannon),
},
[TRAINER_MICHELLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1381,13 +1186,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Michelle),
- .party = {.NoItemDefaultMoves = sParty_Michelle},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Michelle),
},
[TRAINER_CAROLINE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1395,13 +1198,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Caroline),
- .party = {.NoItemDefaultMoves = sParty_Caroline},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Caroline),
},
[TRAINER_JULIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1409,13 +1210,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Julie),
- .party = {.NoItemDefaultMoves = sParty_Julie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Julie),
},
[TRAINER_BROOKE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1423,13 +1222,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brooke2),
- .party = {.NoItemDefaultMoves = sParty_Brooke2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brooke2),
},
[TRAINER_BROOKE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1437,13 +1234,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brooke3),
- .party = {.NoItemDefaultMoves = sParty_Brooke3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brooke3),
},
[TRAINER_BROOKE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1451,13 +1246,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brooke4),
- .party = {.NoItemDefaultMoves = sParty_Brooke4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brooke4),
},
[TRAINER_BROOKE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -1465,13 +1258,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brooke5),
- .party = {.NoItemDefaultMoves = sParty_Brooke5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brooke5),
},
[TRAINER_PATRICIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1479,13 +1270,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Patricia),
- .party = {.NoItemDefaultMoves = sParty_Patricia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Patricia),
},
[TRAINER_KINDRA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1493,13 +1282,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kindra),
- .party = {.NoItemDefaultMoves = sParty_Kindra},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kindra),
},
[TRAINER_TAMMY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1507,13 +1294,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tammy),
- .party = {.NoItemDefaultMoves = sParty_Tammy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tammy),
},
[TRAINER_VALERIE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1521,13 +1306,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Valerie1),
- .party = {.NoItemDefaultMoves = sParty_Valerie1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie1),
},
[TRAINER_TASHA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1535,13 +1318,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tasha),
- .party = {.NoItemDefaultMoves = sParty_Tasha},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tasha),
},
[TRAINER_VALERIE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1549,13 +1330,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Valerie2),
- .party = {.NoItemDefaultMoves = sParty_Valerie2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie2),
},
[TRAINER_VALERIE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1563,13 +1342,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Valerie3),
- .party = {.NoItemDefaultMoves = sParty_Valerie3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie3),
},
[TRAINER_VALERIE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1577,13 +1354,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Valerie4),
- .party = {.NoItemDefaultMoves = sParty_Valerie4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie4),
},
[TRAINER_VALERIE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -1591,13 +1366,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Valerie5),
- .party = {.NoItemDefaultMoves = sParty_Valerie5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie5),
},
[TRAINER_CINDY_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1605,13 +1378,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cindy1),
- .party = {.ItemDefaultMoves = sParty_Cindy1},
+ .party = ITEM_DEFAULT_MOVES(sParty_Cindy1),
},
[TRAINER_DAPHNE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1619,13 +1390,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Daphne),
- .party = {.ItemCustomMoves = sParty_Daphne},
+ .party = ITEM_CUSTOM_MOVES(sParty_Daphne),
},
[TRAINER_GRUNT_SPACE_CENTER_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -1633,13 +1402,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter2),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter2),
},
[TRAINER_CINDY_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1647,13 +1414,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cindy2),
- .party = {.ItemCustomMoves = sParty_Cindy2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Cindy2),
},
[TRAINER_BRIANNA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1661,13 +1426,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Brianna),
- .party = {.ItemDefaultMoves = sParty_Brianna},
+ .party = ITEM_DEFAULT_MOVES(sParty_Brianna),
},
[TRAINER_NAOMI] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1675,13 +1438,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Naomi),
- .party = {.ItemDefaultMoves = sParty_Naomi},
+ .party = ITEM_DEFAULT_MOVES(sParty_Naomi),
},
[TRAINER_CINDY_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1689,13 +1450,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cindy3),
- .party = {.ItemDefaultMoves = sParty_Cindy3},
+ .party = ITEM_DEFAULT_MOVES(sParty_Cindy3),
},
[TRAINER_CINDY_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1703,13 +1462,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cindy4),
- .party = {.ItemDefaultMoves = sParty_Cindy4},
+ .party = ITEM_DEFAULT_MOVES(sParty_Cindy4),
},
[TRAINER_CINDY_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1717,13 +1474,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cindy5),
- .party = {.ItemDefaultMoves = sParty_Cindy5},
+ .party = ITEM_DEFAULT_MOVES(sParty_Cindy5),
},
[TRAINER_CINDY_6] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -1731,13 +1486,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cindy6),
- .party = {.ItemCustomMoves = sParty_Cindy6},
+ .party = ITEM_CUSTOM_MOVES(sParty_Cindy6),
},
[TRAINER_MELISSA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1745,13 +1498,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Melissa),
- .party = {.NoItemDefaultMoves = sParty_Melissa},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Melissa),
},
[TRAINER_SHEILA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1759,13 +1510,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sheila),
- .party = {.NoItemDefaultMoves = sParty_Sheila},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sheila),
},
[TRAINER_SHIRLEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1773,13 +1522,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Shirley),
- .party = {.NoItemDefaultMoves = sParty_Shirley},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shirley),
},
[TRAINER_JESSICA_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1787,13 +1534,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jessica1),
- .party = {.NoItemCustomMoves = sParty_Jessica1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica1),
},
[TRAINER_CONNIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1801,13 +1546,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Connie),
- .party = {.NoItemDefaultMoves = sParty_Connie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Connie),
},
[TRAINER_BRIDGET] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1815,13 +1558,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bridget),
- .party = {.NoItemDefaultMoves = sParty_Bridget},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bridget),
},
[TRAINER_OLIVIA] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1829,13 +1570,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Olivia),
- .party = {.NoItemCustomMoves = sParty_Olivia},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Olivia),
},
[TRAINER_TIFFANY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1843,13 +1582,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tiffany),
- .party = {.NoItemDefaultMoves = sParty_Tiffany},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tiffany),
},
[TRAINER_JESSICA_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1857,13 +1594,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jessica2),
- .party = {.NoItemCustomMoves = sParty_Jessica2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica2),
},
[TRAINER_JESSICA_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1871,13 +1606,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jessica3),
- .party = {.NoItemCustomMoves = sParty_Jessica3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica3),
},
[TRAINER_JESSICA_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1885,13 +1618,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jessica4),
- .party = {.NoItemCustomMoves = sParty_Jessica4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica4),
},
[TRAINER_JESSICA_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -1899,13 +1630,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jessica5),
- .party = {.NoItemCustomMoves = sParty_Jessica5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica5),
},
[TRAINER_WINSTON_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -1913,13 +1642,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Winston1),
- .party = {.ItemDefaultMoves = sParty_Winston1},
+ .party = ITEM_DEFAULT_MOVES(sParty_Winston1),
},
[TRAINER_MOLLIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -1927,13 +1654,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Mollie),
- .party = {.NoItemDefaultMoves = sParty_Mollie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Mollie),
},
[TRAINER_GARRET] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -1941,13 +1666,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Garret),
- .party = {.ItemDefaultMoves = sParty_Garret},
+ .party = ITEM_DEFAULT_MOVES(sParty_Garret),
},
[TRAINER_WINSTON_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -1955,13 +1678,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Winston2),
- .party = {.ItemDefaultMoves = sParty_Winston2},
+ .party = ITEM_DEFAULT_MOVES(sParty_Winston2),
},
[TRAINER_WINSTON_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -1969,13 +1690,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Winston3),
- .party = {.ItemDefaultMoves = sParty_Winston3},
+ .party = ITEM_DEFAULT_MOVES(sParty_Winston3),
},
[TRAINER_WINSTON_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -1983,13 +1702,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Winston4),
- .party = {.ItemDefaultMoves = sParty_Winston4},
+ .party = ITEM_DEFAULT_MOVES(sParty_Winston4),
},
[TRAINER_WINSTON_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -1997,13 +1714,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Winston5),
- .party = {.ItemCustomMoves = sParty_Winston5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Winston5),
},
[TRAINER_STEVE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -2011,13 +1726,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Steve1),
- .party = {.NoItemDefaultMoves = sParty_Steve1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve1),
},
[TRAINER_THALIA_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -2025,13 +1738,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Thalia1),
- .party = {.NoItemDefaultMoves = sParty_Thalia1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia1),
},
[TRAINER_MARK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -2039,13 +1750,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Mark),
- .party = {.NoItemDefaultMoves = sParty_Mark},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Mark),
},
[TRAINER_GRUNT_MT_CHIMNEY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
@@ -2053,13 +1762,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMtChimney1),
- .party = {.NoItemDefaultMoves = sParty_GruntMtChimney1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtChimney1),
},
[TRAINER_STEVE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -2067,13 +1774,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Steve2),
- .party = {.NoItemDefaultMoves = sParty_Steve2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve2),
},
[TRAINER_STEVE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -2081,13 +1786,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Steve3),
- .party = {.NoItemDefaultMoves = sParty_Steve3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve3),
},
[TRAINER_STEVE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -2095,13 +1798,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Steve4),
- .party = {.NoItemDefaultMoves = sParty_Steve4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve4),
},
[TRAINER_STEVE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -2109,13 +1810,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Steve5),
- .party = {.NoItemDefaultMoves = sParty_Steve5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve5),
},
[TRAINER_LUIS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2123,13 +1822,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Luis),
- .party = {.NoItemDefaultMoves = sParty_Luis},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Luis),
},
[TRAINER_DOMINIK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2137,13 +1834,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dominik),
- .party = {.NoItemDefaultMoves = sParty_Dominik},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dominik),
},
[TRAINER_DOUGLAS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2151,13 +1846,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Douglas),
- .party = {.NoItemDefaultMoves = sParty_Douglas},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Douglas),
},
[TRAINER_DARRIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2165,13 +1858,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Darrin),
- .party = {.NoItemDefaultMoves = sParty_Darrin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Darrin),
},
[TRAINER_TONY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2179,13 +1870,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tony1),
- .party = {.NoItemDefaultMoves = sParty_Tony1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony1),
},
[TRAINER_JEROME] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2193,13 +1882,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jerome),
- .party = {.NoItemDefaultMoves = sParty_Jerome},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerome),
},
[TRAINER_MATTHEW] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2207,13 +1894,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Matthew),
- .party = {.NoItemDefaultMoves = sParty_Matthew},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Matthew),
},
[TRAINER_DAVID] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2221,13 +1906,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_David),
- .party = {.NoItemDefaultMoves = sParty_David},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_David),
},
[TRAINER_SPENCER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2235,13 +1918,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Spencer),
- .party = {.NoItemDefaultMoves = sParty_Spencer},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Spencer),
},
[TRAINER_ROLAND] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2249,13 +1930,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Roland),
- .party = {.NoItemDefaultMoves = sParty_Roland},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Roland),
},
[TRAINER_NOLEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2263,13 +1942,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nolen),
- .party = {.NoItemDefaultMoves = sParty_Nolen},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nolen),
},
[TRAINER_STAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2277,13 +1954,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Stan),
- .party = {.NoItemDefaultMoves = sParty_Stan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Stan),
},
[TRAINER_BARRY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2291,13 +1966,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Barry),
- .party = {.NoItemDefaultMoves = sParty_Barry},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Barry),
},
[TRAINER_DEAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2305,13 +1978,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dean),
- .party = {.NoItemDefaultMoves = sParty_Dean},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dean),
},
[TRAINER_RODNEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2319,13 +1990,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rodney),
- .party = {.NoItemDefaultMoves = sParty_Rodney},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rodney),
},
[TRAINER_RICHARD] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2333,13 +2002,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Richard),
- .party = {.NoItemDefaultMoves = sParty_Richard},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Richard),
},
[TRAINER_HERMAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2347,13 +2014,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Herman),
- .party = {.NoItemDefaultMoves = sParty_Herman},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Herman),
},
[TRAINER_SANTIAGO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2361,13 +2026,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Santiago),
- .party = {.NoItemDefaultMoves = sParty_Santiago},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Santiago),
},
[TRAINER_GILBERT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2375,13 +2038,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gilbert),
- .party = {.NoItemDefaultMoves = sParty_Gilbert},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gilbert),
},
[TRAINER_FRANKLIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2389,13 +2050,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Franklin),
- .party = {.NoItemDefaultMoves = sParty_Franklin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Franklin),
},
[TRAINER_KEVIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2403,13 +2062,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kevin),
- .party = {.NoItemDefaultMoves = sParty_Kevin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kevin),
},
[TRAINER_JACK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2417,13 +2074,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jack),
- .party = {.NoItemDefaultMoves = sParty_Jack},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jack),
},
[TRAINER_DUDLEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2431,13 +2086,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dudley),
- .party = {.NoItemDefaultMoves = sParty_Dudley},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dudley),
},
[TRAINER_CHAD] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2445,13 +2098,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Chad),
- .party = {.NoItemDefaultMoves = sParty_Chad},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Chad),
},
[TRAINER_TONY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2459,13 +2110,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tony2),
- .party = {.NoItemDefaultMoves = sParty_Tony2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony2),
},
[TRAINER_TONY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2473,13 +2122,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tony3),
- .party = {.NoItemDefaultMoves = sParty_Tony3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony3),
},
[TRAINER_TONY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2487,13 +2134,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tony4),
- .party = {.NoItemDefaultMoves = sParty_Tony4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony4),
},
[TRAINER_TONY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -2501,13 +2146,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tony5),
- .party = {.NoItemDefaultMoves = sParty_Tony5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony5),
},
[TRAINER_TAKAO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2515,13 +2158,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Takao),
- .party = {.NoItemDefaultMoves = sParty_Takao},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Takao),
},
[TRAINER_HITOSHI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2529,13 +2170,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hitoshi),
- .party = {.NoItemDefaultMoves = sParty_Hitoshi},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hitoshi),
},
[TRAINER_KIYO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2543,13 +2182,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kiyo),
- .party = {.NoItemDefaultMoves = sParty_Kiyo},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kiyo),
},
[TRAINER_KOICHI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2557,13 +2194,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Koichi),
- .party = {.NoItemDefaultMoves = sParty_Koichi},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Koichi),
},
[TRAINER_NOB_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2571,13 +2206,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nob1),
- .party = {.NoItemDefaultMoves = sParty_Nob1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob1),
},
[TRAINER_NOB_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2585,13 +2218,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nob2),
- .party = {.NoItemDefaultMoves = sParty_Nob2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob2),
},
[TRAINER_NOB_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2599,13 +2230,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nob3),
- .party = {.NoItemDefaultMoves = sParty_Nob3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob3),
},
[TRAINER_NOB_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2613,13 +2242,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nob4),
- .party = {.NoItemDefaultMoves = sParty_Nob4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob4),
},
[TRAINER_NOB_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2627,13 +2254,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nob5),
- .party = {.ItemDefaultMoves = sParty_Nob5},
+ .party = ITEM_DEFAULT_MOVES(sParty_Nob5),
},
[TRAINER_YUJI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2641,13 +2266,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Yuji),
- .party = {.NoItemDefaultMoves = sParty_Yuji},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Yuji),
},
[TRAINER_DAISUKE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2655,13 +2278,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Daisuke),
- .party = {.NoItemDefaultMoves = sParty_Daisuke},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Daisuke),
},
[TRAINER_ATSUSHI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -2669,13 +2290,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Atsushi),
- .party = {.NoItemDefaultMoves = sParty_Atsushi},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Atsushi),
},
[TRAINER_KIRK] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2683,13 +2302,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kirk),
- .party = {.NoItemCustomMoves = sParty_Kirk},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Kirk),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_7] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -2697,13 +2314,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout7),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout7},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout7),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_8] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -2711,13 +2326,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntAquaHideout8),
- .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout8},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout8),
},
[TRAINER_SHAWN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2725,13 +2338,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Shawn),
- .party = {.NoItemDefaultMoves = sParty_Shawn},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shawn),
},
[TRAINER_FERNANDO_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2739,13 +2350,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Fernando1),
- .party = {.NoItemDefaultMoves = sParty_Fernando1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando1),
},
[TRAINER_DALTON_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2753,13 +2362,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dalton1),
- .party = {.NoItemDefaultMoves = sParty_Dalton1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton1),
},
[TRAINER_DALTON_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2767,13 +2374,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dalton2),
- .party = {.NoItemDefaultMoves = sParty_Dalton2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton2),
},
[TRAINER_DALTON_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2781,13 +2386,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dalton3),
- .party = {.NoItemDefaultMoves = sParty_Dalton3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton3),
},
[TRAINER_DALTON_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2795,13 +2398,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dalton4),
- .party = {.NoItemDefaultMoves = sParty_Dalton4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton4),
},
[TRAINER_DALTON_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -2809,13 +2410,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dalton5),
- .party = {.NoItemDefaultMoves = sParty_Dalton5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton5),
},
[TRAINER_COLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2823,13 +2422,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cole),
- .party = {.NoItemDefaultMoves = sParty_Cole},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cole),
},
[TRAINER_JEFF] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2837,13 +2434,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jeff),
- .party = {.NoItemDefaultMoves = sParty_Jeff},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeff),
},
[TRAINER_AXLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2851,13 +2446,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Axle),
- .party = {.NoItemDefaultMoves = sParty_Axle},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Axle),
},
[TRAINER_JACE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2865,13 +2458,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jace),
- .party = {.NoItemDefaultMoves = sParty_Jace},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jace),
},
[TRAINER_KEEGAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2879,13 +2470,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Keegan),
- .party = {.NoItemDefaultMoves = sParty_Keegan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Keegan),
},
[TRAINER_BERNIE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2893,13 +2482,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bernie1),
- .party = {.NoItemDefaultMoves = sParty_Bernie1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie1),
},
[TRAINER_BERNIE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2907,13 +2494,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bernie2),
- .party = {.NoItemDefaultMoves = sParty_Bernie2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie2),
},
[TRAINER_BERNIE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2921,13 +2506,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bernie3),
- .party = {.NoItemDefaultMoves = sParty_Bernie3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie3),
},
[TRAINER_BERNIE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2935,13 +2518,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bernie4),
- .party = {.NoItemDefaultMoves = sParty_Bernie4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie4),
},
[TRAINER_BERNIE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -2949,13 +2530,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bernie5),
- .party = {.NoItemDefaultMoves = sParty_Bernie5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie5),
},
[TRAINER_DREW] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -2963,13 +2542,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Drew),
- .party = {.NoItemCustomMoves = sParty_Drew},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Drew),
},
[TRAINER_BEAU] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -2977,13 +2554,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Beau),
- .party = {.NoItemCustomMoves = sParty_Beau},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Beau),
},
[TRAINER_LARRY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -2991,13 +2566,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Larry),
- .party = {.NoItemDefaultMoves = sParty_Larry},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Larry),
},
[TRAINER_SHANE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3005,13 +2578,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Shane),
- .party = {.NoItemDefaultMoves = sParty_Shane},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shane),
},
[TRAINER_JUSTIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3019,13 +2590,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Justin),
- .party = {.NoItemDefaultMoves = sParty_Justin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Justin),
},
[TRAINER_ETHAN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3033,13 +2602,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ethan1),
- .party = {.NoItemDefaultMoves = sParty_Ethan1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan1),
},
[TRAINER_AUTUMN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -3047,13 +2614,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Autumn),
- .party = {.NoItemDefaultMoves = sParty_Autumn},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Autumn),
},
[TRAINER_TRAVIS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3061,13 +2626,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Travis),
- .party = {.NoItemDefaultMoves = sParty_Travis},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Travis),
},
[TRAINER_ETHAN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3075,13 +2638,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ethan2),
- .party = {.NoItemDefaultMoves = sParty_Ethan2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan2),
},
[TRAINER_ETHAN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3089,13 +2650,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ethan3),
- .party = {.NoItemDefaultMoves = sParty_Ethan3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan3),
},
[TRAINER_ETHAN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3103,13 +2662,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ethan4),
- .party = {.NoItemDefaultMoves = sParty_Ethan4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan4),
},
[TRAINER_ETHAN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -3117,13 +2674,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ethan5),
- .party = {.NoItemDefaultMoves = sParty_Ethan5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan5),
},
[TRAINER_BRENT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3131,13 +2686,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Brent),
- .party = {.NoItemDefaultMoves = sParty_Brent},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brent),
},
[TRAINER_DONALD] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3145,13 +2698,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Donald),
- .party = {.NoItemDefaultMoves = sParty_Donald},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Donald),
},
[TRAINER_TAYLOR] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3159,13 +2710,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Taylor),
- .party = {.NoItemDefaultMoves = sParty_Taylor},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Taylor),
},
[TRAINER_JEFFREY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3173,13 +2722,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jeffrey1),
- .party = {.NoItemDefaultMoves = sParty_Jeffrey1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey1),
},
[TRAINER_DEREK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3187,13 +2734,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Derek),
- .party = {.NoItemDefaultMoves = sParty_Derek},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Derek),
},
[TRAINER_JEFFREY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3201,13 +2746,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jeffrey2),
- .party = {.NoItemDefaultMoves = sParty_Jeffrey2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey2),
},
[TRAINER_JEFFREY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3215,13 +2758,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jeffrey3),
- .party = {.NoItemDefaultMoves = sParty_Jeffrey3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey3),
},
[TRAINER_JEFFREY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3229,13 +2770,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jeffrey4),
- .party = {.NoItemDefaultMoves = sParty_Jeffrey4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey4),
},
[TRAINER_JEFFREY_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -3243,13 +2782,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jeffrey5),
- .party = {.ItemDefaultMoves = sParty_Jeffrey5},
+ .party = ITEM_DEFAULT_MOVES(sParty_Jeffrey5),
},
[TRAINER_EDWARD] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3257,13 +2794,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edward),
- .party = {.NoItemCustomMoves = sParty_Edward},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Edward),
},
[TRAINER_PRESTON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3271,13 +2806,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Preston),
- .party = {.NoItemDefaultMoves = sParty_Preston},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Preston),
},
[TRAINER_VIRGIL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3285,13 +2818,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Virgil),
- .party = {.NoItemDefaultMoves = sParty_Virgil},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Virgil),
},
[TRAINER_BLAKE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3299,13 +2830,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Blake),
- .party = {.NoItemDefaultMoves = sParty_Blake},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Blake),
},
[TRAINER_WILLIAM] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3313,13 +2842,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_William),
- .party = {.NoItemDefaultMoves = sParty_William},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_William),
},
[TRAINER_JOSHUA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3327,13 +2854,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Joshua),
- .party = {.NoItemDefaultMoves = sParty_Joshua},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Joshua),
},
[TRAINER_CAMERON_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3341,13 +2866,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cameron1),
- .party = {.NoItemDefaultMoves = sParty_Cameron1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron1),
},
[TRAINER_CAMERON_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3355,13 +2878,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cameron2),
- .party = {.NoItemDefaultMoves = sParty_Cameron2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron2),
},
[TRAINER_CAMERON_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3369,13 +2890,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cameron3),
- .party = {.NoItemDefaultMoves = sParty_Cameron3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron3),
},
[TRAINER_CAMERON_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3383,13 +2902,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cameron4),
- .party = {.NoItemDefaultMoves = sParty_Cameron4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron4),
},
[TRAINER_CAMERON_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -3397,13 +2914,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cameron5),
- .party = {.NoItemDefaultMoves = sParty_Cameron5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron5),
},
[TRAINER_JACLYN] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3411,13 +2926,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jaclyn),
- .party = {.NoItemCustomMoves = sParty_Jaclyn},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jaclyn),
},
[TRAINER_HANNAH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3425,13 +2938,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hannah),
- .party = {.NoItemDefaultMoves = sParty_Hannah},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hannah),
},
[TRAINER_SAMANTHA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3439,13 +2950,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Samantha),
- .party = {.NoItemDefaultMoves = sParty_Samantha},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Samantha),
},
[TRAINER_MAURA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3453,13 +2962,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Maura),
- .party = {.NoItemDefaultMoves = sParty_Maura},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Maura),
},
[TRAINER_KAYLA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3467,13 +2974,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kayla),
- .party = {.NoItemDefaultMoves = sParty_Kayla},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kayla),
},
[TRAINER_ALEXIS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3481,13 +2986,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alexis),
- .party = {.NoItemDefaultMoves = sParty_Alexis},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alexis),
},
[TRAINER_JACKI_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3495,13 +2998,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jacki1),
- .party = {.NoItemDefaultMoves = sParty_Jacki1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki1),
},
[TRAINER_JACKI_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3509,13 +3010,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jacki2),
- .party = {.NoItemDefaultMoves = sParty_Jacki2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki2),
},
[TRAINER_JACKI_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3523,13 +3022,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jacki3),
- .party = {.NoItemDefaultMoves = sParty_Jacki3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki3),
},
[TRAINER_JACKI_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3537,13 +3034,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jacki4),
- .party = {.NoItemDefaultMoves = sParty_Jacki4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki4),
},
[TRAINER_JACKI_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -3551,13 +3046,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jacki5),
- .party = {.NoItemDefaultMoves = sParty_Jacki5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki5),
},
[TRAINER_WALTER_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3565,13 +3058,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Walter1),
- .party = {.NoItemDefaultMoves = sParty_Walter1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Walter1),
},
[TRAINER_MICAH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3579,13 +3070,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Micah),
- .party = {.NoItemDefaultMoves = sParty_Micah},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Micah),
},
[TRAINER_THOMAS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3593,13 +3082,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Thomas),
- .party = {.NoItemDefaultMoves = sParty_Thomas},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Thomas),
},
[TRAINER_WALTER_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3607,13 +3094,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Walter2),
- .party = {.NoItemDefaultMoves = sParty_Walter2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Walter2),
},
[TRAINER_WALTER_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3621,13 +3106,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Walter3),
- .party = {.NoItemCustomMoves = sParty_Walter3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Walter3),
},
[TRAINER_WALTER_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3635,13 +3118,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Walter4),
- .party = {.NoItemCustomMoves = sParty_Walter4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Walter4),
},
[TRAINER_WALTER_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -3649,13 +3130,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Walter5),
- .party = {.NoItemCustomMoves = sParty_Walter5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Walter5),
},
[TRAINER_SIDNEY] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
.trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY,
@@ -3663,13 +3142,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Sidney),
- .party = {.ItemCustomMoves = sParty_Sidney},
+ .party = ITEM_CUSTOM_MOVES(sParty_Sidney),
},
[TRAINER_PHOEBE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
.trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE,
@@ -3677,13 +3154,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Phoebe),
- .party = {.ItemCustomMoves = sParty_Phoebe},
+ .party = ITEM_CUSTOM_MOVES(sParty_Phoebe),
},
[TRAINER_GLACIA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
.trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA,
@@ -3691,13 +3166,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Glacia),
- .party = {.ItemCustomMoves = sParty_Glacia},
+ .party = ITEM_CUSTOM_MOVES(sParty_Glacia),
},
[TRAINER_DRAKE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_ELITE_FOUR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
.trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE,
@@ -3705,13 +3178,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Drake),
- .party = {.ItemCustomMoves = sParty_Drake},
+ .party = ITEM_CUSTOM_MOVES(sParty_Drake),
},
[TRAINER_ROXANNE_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_ROXANNE,
@@ -3719,13 +3190,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Roxanne1),
- .party = {.ItemCustomMoves = sParty_Roxanne1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Roxanne1),
},
[TRAINER_BRAWLY_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_BRAWLY,
@@ -3733,13 +3202,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brawly1),
- .party = {.ItemCustomMoves = sParty_Brawly1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Brawly1),
},
[TRAINER_WATTSON_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_WATTSON,
@@ -3747,13 +3214,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wattson1),
- .party = {.ItemCustomMoves = sParty_Wattson1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Wattson1),
},
[TRAINER_FLANNERY_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_FLANNERY,
@@ -3761,13 +3226,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Flannery1),
- .party = {.ItemCustomMoves = sParty_Flannery1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Flannery1),
},
[TRAINER_NORMAN_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_NORMAN,
@@ -3775,13 +3238,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Norman1),
- .party = {.ItemCustomMoves = sParty_Norman1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Norman1),
},
[TRAINER_WINONA_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_WINONA,
@@ -3789,13 +3250,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
- .partySize = ARRAY_COUNT(sParty_Winona1),
- .party = {.ItemCustomMoves = sParty_Winona1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Winona1),
},
[TRAINER_TATE_AND_LIZA_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
@@ -3803,13 +3262,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_TateAndLiza1),
- .party = {.ItemCustomMoves = sParty_TateAndLiza1},
+ .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza1),
},
[TRAINER_JUAN_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_JUAN,
@@ -3817,13 +3274,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Juan1),
- .party = {.ItemCustomMoves = sParty_Juan1},
+ .party = ITEM_CUSTOM_MOVES(sParty_Juan1),
},
[TRAINER_JERRY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3831,13 +3286,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jerry1),
- .party = {.NoItemDefaultMoves = sParty_Jerry1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry1),
},
[TRAINER_TED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3845,13 +3298,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ted),
- .party = {.NoItemDefaultMoves = sParty_Ted},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ted),
},
[TRAINER_PAUL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3859,13 +3310,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Paul),
- .party = {.NoItemDefaultMoves = sParty_Paul},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Paul),
},
[TRAINER_JERRY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3873,13 +3322,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jerry2),
- .party = {.NoItemDefaultMoves = sParty_Jerry2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry2),
},
[TRAINER_JERRY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3887,13 +3334,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jerry3),
- .party = {.NoItemDefaultMoves = sParty_Jerry3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry3),
},
[TRAINER_JERRY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3901,13 +3346,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jerry4),
- .party = {.NoItemDefaultMoves = sParty_Jerry4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry4),
},
[TRAINER_JERRY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SCHOOL_KID_M,
@@ -3915,13 +3358,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jerry5),
- .party = {.NoItemDefaultMoves = sParty_Jerry5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry5),
},
[TRAINER_KAREN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_SCHOOL_KID_F,
@@ -3929,13 +3370,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Karen1),
- .party = {.NoItemDefaultMoves = sParty_Karen1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen1),
},
[TRAINER_GEORGIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_SCHOOL_KID_F,
@@ -3943,13 +3382,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Georgia),
- .party = {.NoItemDefaultMoves = sParty_Georgia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Georgia),
},
[TRAINER_KAREN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_SCHOOL_KID_F,
@@ -3957,13 +3394,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Karen2),
- .party = {.NoItemDefaultMoves = sParty_Karen2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen2),
},
[TRAINER_KAREN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_SCHOOL_KID_F,
@@ -3971,13 +3406,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Karen3),
- .party = {.NoItemDefaultMoves = sParty_Karen3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen3),
},
[TRAINER_KAREN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_SCHOOL_KID_F,
@@ -3985,13 +3418,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Karen4),
- .party = {.NoItemDefaultMoves = sParty_Karen4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen4),
},
[TRAINER_KAREN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SCHOOL_KID,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_SCHOOL_KID_F,
@@ -3999,13 +3430,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Karen5),
- .party = {.NoItemDefaultMoves = sParty_Karen5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen5),
},
[TRAINER_KATE_AND_JOY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -4013,13 +3442,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KateAndJoy),
- .party = {.NoItemCustomMoves = sParty_KateAndJoy},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_KateAndJoy),
},
[TRAINER_ANNA_AND_MEG_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -4027,13 +3454,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AnnaAndMeg1),
- .party = {.NoItemCustomMoves = sParty_AnnaAndMeg1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg1),
},
[TRAINER_ANNA_AND_MEG_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -4041,13 +3466,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AnnaAndMeg2),
- .party = {.NoItemCustomMoves = sParty_AnnaAndMeg2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg2),
},
[TRAINER_ANNA_AND_MEG_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -4055,13 +3478,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AnnaAndMeg3),
- .party = {.NoItemCustomMoves = sParty_AnnaAndMeg3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg3),
},
[TRAINER_ANNA_AND_MEG_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -4069,13 +3490,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AnnaAndMeg4),
- .party = {.NoItemCustomMoves = sParty_AnnaAndMeg4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg4),
},
[TRAINER_ANNA_AND_MEG_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -4083,13 +3502,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AnnaAndMeg5),
- .party = {.NoItemCustomMoves = sParty_AnnaAndMeg5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg5),
},
[TRAINER_VICTOR] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4097,13 +3514,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Victor),
- .party = {.ItemDefaultMoves = sParty_Victor},
+ .party = ITEM_DEFAULT_MOVES(sParty_Victor),
},
[TRAINER_MIGUEL_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4111,13 +3526,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Miguel1),
- .party = {.ItemDefaultMoves = sParty_Miguel1},
+ .party = ITEM_DEFAULT_MOVES(sParty_Miguel1),
},
[TRAINER_COLTON] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4125,13 +3538,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Colton),
- .party = {.ItemCustomMoves = sParty_Colton},
+ .party = ITEM_CUSTOM_MOVES(sParty_Colton),
},
[TRAINER_MIGUEL_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4139,13 +3550,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Miguel2),
- .party = {.ItemDefaultMoves = sParty_Miguel2},
+ .party = ITEM_DEFAULT_MOVES(sParty_Miguel2),
},
[TRAINER_MIGUEL_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4153,13 +3562,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Miguel3),
- .party = {.ItemDefaultMoves = sParty_Miguel3},
+ .party = ITEM_DEFAULT_MOVES(sParty_Miguel3),
},
[TRAINER_MIGUEL_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4167,13 +3574,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Miguel4),
- .party = {.ItemDefaultMoves = sParty_Miguel4},
+ .party = ITEM_DEFAULT_MOVES(sParty_Miguel4),
},
[TRAINER_MIGUEL_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -4181,13 +3586,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Miguel5),
- .party = {.ItemDefaultMoves = sParty_Miguel5},
+ .party = ITEM_DEFAULT_MOVES(sParty_Miguel5),
},
[TRAINER_VICTORIA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4195,13 +3598,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Victoria),
- .party = {.ItemDefaultMoves = sParty_Victoria},
+ .party = ITEM_DEFAULT_MOVES(sParty_Victoria),
},
[TRAINER_VANESSA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4209,13 +3610,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Vanessa),
- .party = {.ItemDefaultMoves = sParty_Vanessa},
+ .party = ITEM_DEFAULT_MOVES(sParty_Vanessa),
},
[TRAINER_BETHANY] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4223,13 +3622,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bethany),
- .party = {.ItemDefaultMoves = sParty_Bethany},
+ .party = ITEM_DEFAULT_MOVES(sParty_Bethany),
},
[TRAINER_ISABEL_1] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4237,13 +3634,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabel1),
- .party = {.ItemDefaultMoves = sParty_Isabel1},
+ .party = ITEM_DEFAULT_MOVES(sParty_Isabel1),
},
[TRAINER_ISABEL_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4251,13 +3646,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabel2),
- .party = {.ItemDefaultMoves = sParty_Isabel2},
+ .party = ITEM_DEFAULT_MOVES(sParty_Isabel2),
},
[TRAINER_ISABEL_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4265,13 +3658,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabel3),
- .party = {.ItemDefaultMoves = sParty_Isabel3},
+ .party = ITEM_DEFAULT_MOVES(sParty_Isabel3),
},
[TRAINER_ISABEL_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4279,13 +3670,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabel4),
- .party = {.ItemDefaultMoves = sParty_Isabel4},
+ .party = ITEM_DEFAULT_MOVES(sParty_Isabel4),
},
[TRAINER_ISABEL_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -4293,13 +3682,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabel5),
- .party = {.ItemDefaultMoves = sParty_Isabel5},
+ .party = ITEM_DEFAULT_MOVES(sParty_Isabel5),
},
[TRAINER_TIMOTHY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -4307,13 +3694,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Timothy1),
- .party = {.NoItemDefaultMoves = sParty_Timothy1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Timothy1),
},
[TRAINER_TIMOTHY_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -4321,13 +3706,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Timothy2),
- .party = {.NoItemCustomMoves = sParty_Timothy2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy2),
},
[TRAINER_TIMOTHY_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -4335,13 +3718,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Timothy3),
- .party = {.NoItemCustomMoves = sParty_Timothy3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy3),
},
[TRAINER_TIMOTHY_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -4349,13 +3730,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Timothy4),
- .party = {.NoItemCustomMoves = sParty_Timothy4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy4),
},
[TRAINER_TIMOTHY_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -4363,13 +3742,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Timothy5),
- .party = {.NoItemCustomMoves = sParty_Timothy5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy5),
},
[TRAINER_VICKY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_WINSTRATE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -4377,13 +3754,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Vicky),
- .party = {.NoItemCustomMoves = sParty_Vicky},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Vicky),
},
[TRAINER_SHELBY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -4391,13 +3766,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelby1),
- .party = {.NoItemDefaultMoves = sParty_Shelby1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby1),
},
[TRAINER_SHELBY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -4405,13 +3778,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelby2),
- .party = {.NoItemDefaultMoves = sParty_Shelby2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby2),
},
[TRAINER_SHELBY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -4419,13 +3790,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelby3),
- .party = {.NoItemDefaultMoves = sParty_Shelby3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby3),
},
[TRAINER_SHELBY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -4433,13 +3802,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelby4),
- .party = {.NoItemDefaultMoves = sParty_Shelby4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby4),
},
[TRAINER_SHELBY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -4447,13 +3814,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Shelby5),
- .party = {.NoItemDefaultMoves = sParty_Shelby5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby5),
},
[TRAINER_CALVIN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4461,13 +3826,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Calvin1),
- .party = {.NoItemDefaultMoves = sParty_Calvin1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin1),
},
[TRAINER_BILLY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4475,13 +3838,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Billy),
- .party = {.NoItemDefaultMoves = sParty_Billy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Billy),
},
[TRAINER_JOSH] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4489,13 +3850,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Josh),
- .party = {.NoItemCustomMoves = sParty_Josh},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Josh),
},
[TRAINER_TOMMY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4503,13 +3862,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tommy),
- .party = {.NoItemDefaultMoves = sParty_Tommy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tommy),
},
[TRAINER_JOEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4517,13 +3874,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Joey),
- .party = {.NoItemDefaultMoves = sParty_Joey},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Joey),
},
[TRAINER_BEN] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4531,13 +3886,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ben),
- .party = {.NoItemCustomMoves = sParty_Ben},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Ben),
},
[TRAINER_QUINCY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -4545,13 +3898,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Quincy),
- .party = {.NoItemCustomMoves = sParty_Quincy},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Quincy),
},
[TRAINER_KATELYNN] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -4559,13 +3910,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Katelynn),
- .party = {.NoItemCustomMoves = sParty_Katelynn},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Katelynn),
},
[TRAINER_JAYLEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4573,13 +3922,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jaylen),
- .party = {.NoItemDefaultMoves = sParty_Jaylen},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jaylen),
},
[TRAINER_DILLON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4587,13 +3934,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dillon),
- .party = {.NoItemDefaultMoves = sParty_Dillon},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dillon),
},
[TRAINER_CALVIN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4601,13 +3946,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Calvin2),
- .party = {.NoItemDefaultMoves = sParty_Calvin2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin2),
},
[TRAINER_CALVIN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4615,13 +3958,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Calvin3),
- .party = {.NoItemDefaultMoves = sParty_Calvin3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin3),
},
[TRAINER_CALVIN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4629,13 +3970,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Calvin4),
- .party = {.NoItemDefaultMoves = sParty_Calvin4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin4),
},
[TRAINER_CALVIN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4643,13 +3982,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Calvin5),
- .party = {.NoItemDefaultMoves = sParty_Calvin5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin5),
},
[TRAINER_EDDIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4657,13 +3994,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Eddie),
- .party = {.NoItemDefaultMoves = sParty_Eddie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Eddie),
},
[TRAINER_ALLEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4671,13 +4006,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Allen),
- .party = {.NoItemDefaultMoves = sParty_Allen},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Allen),
},
[TRAINER_TIMMY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -4685,13 +4018,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Timmy),
- .party = {.NoItemDefaultMoves = sParty_Timmy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Timmy),
},
[TRAINER_WALLACE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_CHAMPION,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CHAMPION_WALLACE,
@@ -4699,13 +4030,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wallace),
- .party = {.ItemCustomMoves = sParty_Wallace},
+ .party = ITEM_CUSTOM_MOVES(sParty_Wallace),
},
[TRAINER_ANDREW] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4713,13 +4042,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andrew),
- .party = {.NoItemDefaultMoves = sParty_Andrew},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andrew),
},
[TRAINER_IVAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4727,13 +4054,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ivan),
- .party = {.NoItemDefaultMoves = sParty_Ivan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ivan),
},
[TRAINER_CLAUDE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4741,13 +4066,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Claude),
- .party = {.NoItemDefaultMoves = sParty_Claude},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Claude),
},
[TRAINER_ELLIOT_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4755,13 +4078,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Elliot1),
- .party = {.NoItemDefaultMoves = sParty_Elliot1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot1),
},
[TRAINER_NED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4769,13 +4090,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ned),
- .party = {.NoItemDefaultMoves = sParty_Ned},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ned),
},
[TRAINER_DALE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4783,13 +4102,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dale),
- .party = {.NoItemDefaultMoves = sParty_Dale},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dale),
},
[TRAINER_NOLAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4797,13 +4114,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nolan),
- .party = {.NoItemDefaultMoves = sParty_Nolan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nolan),
},
[TRAINER_BARNY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4811,13 +4126,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Barny),
- .party = {.NoItemDefaultMoves = sParty_Barny},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Barny),
},
[TRAINER_WADE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4825,13 +4138,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Wade),
- .party = {.NoItemDefaultMoves = sParty_Wade},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wade),
},
[TRAINER_CARTER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4839,13 +4150,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Carter),
- .party = {.NoItemDefaultMoves = sParty_Carter},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Carter),
},
[TRAINER_ELLIOT_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4853,13 +4162,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Elliot2),
- .party = {.NoItemDefaultMoves = sParty_Elliot2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot2),
},
[TRAINER_ELLIOT_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4867,13 +4174,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Elliot3),
- .party = {.NoItemDefaultMoves = sParty_Elliot3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot3),
},
[TRAINER_ELLIOT_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4881,13 +4186,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Elliot4),
- .party = {.NoItemDefaultMoves = sParty_Elliot4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot4),
},
[TRAINER_ELLIOT_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4895,13 +4198,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Elliot5),
- .party = {.NoItemDefaultMoves = sParty_Elliot5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot5),
},
[TRAINER_RONALD] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -4909,13 +4210,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ronald),
- .party = {.NoItemDefaultMoves = sParty_Ronald},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ronald),
},
[TRAINER_JACOB] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -4923,13 +4222,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jacob),
- .party = {.NoItemDefaultMoves = sParty_Jacob},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacob),
},
[TRAINER_ANTHONY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -4937,13 +4234,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Anthony),
- .party = {.NoItemDefaultMoves = sParty_Anthony},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Anthony),
},
[TRAINER_BENJAMIN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -4951,13 +4246,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Benjamin1),
- .party = {.NoItemDefaultMoves = sParty_Benjamin1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin1),
},
[TRAINER_BENJAMIN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -4965,13 +4258,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Benjamin2),
- .party = {.NoItemDefaultMoves = sParty_Benjamin2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin2),
},
[TRAINER_BENJAMIN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -4979,13 +4270,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Benjamin3),
- .party = {.NoItemDefaultMoves = sParty_Benjamin3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin3),
},
[TRAINER_BENJAMIN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -4993,13 +4282,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Benjamin4),
- .party = {.NoItemDefaultMoves = sParty_Benjamin4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin4),
},
[TRAINER_BENJAMIN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -5007,13 +4294,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Benjamin5),
- .party = {.NoItemDefaultMoves = sParty_Benjamin5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin5),
},
[TRAINER_ABIGAIL_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -5021,13 +4306,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Abigail1),
- .party = {.NoItemDefaultMoves = sParty_Abigail1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail1),
},
[TRAINER_JASMINE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -5035,13 +4318,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jasmine),
- .party = {.NoItemDefaultMoves = sParty_Jasmine},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jasmine),
},
[TRAINER_ABIGAIL_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -5049,13 +4330,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Abigail2),
- .party = {.NoItemDefaultMoves = sParty_Abigail2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail2),
},
[TRAINER_ABIGAIL_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -5063,13 +4342,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Abigail3),
- .party = {.NoItemDefaultMoves = sParty_Abigail3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail3),
},
[TRAINER_ABIGAIL_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -5077,13 +4354,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Abigail4),
- .party = {.NoItemDefaultMoves = sParty_Abigail4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail4),
},
[TRAINER_ABIGAIL_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -5091,13 +4366,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Abigail5),
- .party = {.NoItemDefaultMoves = sParty_Abigail5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail5),
},
[TRAINER_DYLAN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
@@ -5105,13 +4378,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dylan1),
- .party = {.NoItemDefaultMoves = sParty_Dylan1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan1),
},
[TRAINER_DYLAN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
@@ -5119,13 +4390,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dylan2),
- .party = {.NoItemDefaultMoves = sParty_Dylan2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan2),
},
[TRAINER_DYLAN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
@@ -5133,13 +4402,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dylan3),
- .party = {.NoItemDefaultMoves = sParty_Dylan3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan3),
},
[TRAINER_DYLAN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
@@ -5147,13 +4414,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dylan4),
- .party = {.NoItemDefaultMoves = sParty_Dylan4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan4),
},
[TRAINER_DYLAN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
@@ -5161,13 +4426,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dylan5),
- .party = {.NoItemDefaultMoves = sParty_Dylan5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan5),
},
[TRAINER_MARIA_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -5175,13 +4438,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Maria1),
- .party = {.NoItemDefaultMoves = sParty_Maria1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria1),
},
[TRAINER_MARIA_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -5189,13 +4450,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Maria2),
- .party = {.NoItemDefaultMoves = sParty_Maria2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria2),
},
[TRAINER_MARIA_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -5203,13 +4462,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Maria3),
- .party = {.NoItemDefaultMoves = sParty_Maria3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria3),
},
[TRAINER_MARIA_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -5217,13 +4474,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Maria4),
- .party = {.NoItemDefaultMoves = sParty_Maria4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria4),
},
[TRAINER_MARIA_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -5231,13 +4486,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Maria5),
- .party = {.NoItemDefaultMoves = sParty_Maria5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria5),
},
[TRAINER_CAMDEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5245,13 +4498,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Camden),
- .party = {.NoItemDefaultMoves = sParty_Camden},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Camden),
},
[TRAINER_DEMETRIUS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -5259,13 +4510,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Demetrius),
- .party = {.NoItemDefaultMoves = sParty_Demetrius},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Demetrius),
},
[TRAINER_ISAIAH_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5273,13 +4522,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaiah1),
- .party = {.NoItemDefaultMoves = sParty_Isaiah1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah1),
},
[TRAINER_PABLO_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5287,13 +4534,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pablo1),
- .party = {.NoItemDefaultMoves = sParty_Pablo1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo1),
},
[TRAINER_CHASE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5301,13 +4546,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Chase),
- .party = {.NoItemDefaultMoves = sParty_Chase},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Chase),
},
[TRAINER_ISAIAH_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5315,13 +4558,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaiah2),
- .party = {.NoItemDefaultMoves = sParty_Isaiah2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah2),
},
[TRAINER_ISAIAH_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5329,13 +4570,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaiah3),
- .party = {.NoItemDefaultMoves = sParty_Isaiah3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah3),
},
[TRAINER_ISAIAH_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5343,13 +4582,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaiah4),
- .party = {.NoItemDefaultMoves = sParty_Isaiah4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah4),
},
[TRAINER_ISAIAH_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -5357,13 +4594,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaiah5),
- .party = {.NoItemDefaultMoves = sParty_Isaiah5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah5),
},
[TRAINER_ISOBEL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5371,13 +4606,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isobel),
- .party = {.NoItemDefaultMoves = sParty_Isobel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isobel),
},
[TRAINER_DONNY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5385,13 +4618,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Donny),
- .party = {.NoItemDefaultMoves = sParty_Donny},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Donny),
},
[TRAINER_TALIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5399,13 +4630,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Talia),
- .party = {.NoItemDefaultMoves = sParty_Talia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Talia),
},
[TRAINER_KATELYN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5413,13 +4642,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Katelyn1),
- .party = {.NoItemDefaultMoves = sParty_Katelyn1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn1),
},
[TRAINER_ALLISON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5427,13 +4654,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Allison),
- .party = {.NoItemDefaultMoves = sParty_Allison},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Allison),
},
[TRAINER_KATELYN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5441,13 +4666,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Katelyn2),
- .party = {.NoItemDefaultMoves = sParty_Katelyn2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn2),
},
[TRAINER_KATELYN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5455,13 +4678,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Katelyn3),
- .party = {.NoItemDefaultMoves = sParty_Katelyn3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn3),
},
[TRAINER_KATELYN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5469,13 +4690,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Katelyn4),
- .party = {.NoItemDefaultMoves = sParty_Katelyn4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn4),
},
[TRAINER_KATELYN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -5483,13 +4702,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Katelyn5),
- .party = {.NoItemDefaultMoves = sParty_Katelyn5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn5),
},
[TRAINER_NICOLAS_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_DRAGON_TAMER,
@@ -5497,13 +4714,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nicolas1),
- .party = {.NoItemDefaultMoves = sParty_Nicolas1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas1),
},
[TRAINER_NICOLAS_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_DRAGON_TAMER,
@@ -5511,13 +4726,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nicolas2),
- .party = {.NoItemDefaultMoves = sParty_Nicolas2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas2),
},
[TRAINER_NICOLAS_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_DRAGON_TAMER,
@@ -5525,13 +4738,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nicolas3),
- .party = {.NoItemDefaultMoves = sParty_Nicolas3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas3),
},
[TRAINER_NICOLAS_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_DRAGON_TAMER,
@@ -5539,13 +4750,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nicolas4),
- .party = {.NoItemDefaultMoves = sParty_Nicolas4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas4),
},
[TRAINER_NICOLAS_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_DRAGON_TAMER,
@@ -5553,13 +4762,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nicolas5),
- .party = {.ItemDefaultMoves = sParty_Nicolas5},
+ .party = ITEM_DEFAULT_MOVES(sParty_Nicolas5),
},
[TRAINER_AARON] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_DRAGON_TAMER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_DRAGON_TAMER,
@@ -5567,13 +4774,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Aaron),
- .party = {.NoItemCustomMoves = sParty_Aaron},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Aaron),
},
[TRAINER_PERRY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5581,13 +4786,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Perry),
- .party = {.NoItemDefaultMoves = sParty_Perry},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Perry),
},
[TRAINER_HUGH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5595,13 +4798,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hugh),
- .party = {.NoItemDefaultMoves = sParty_Hugh},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hugh),
},
[TRAINER_PHIL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5609,13 +4810,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Phil),
- .party = {.NoItemDefaultMoves = sParty_Phil},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Phil),
},
[TRAINER_JARED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5623,13 +4822,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jared),
- .party = {.NoItemDefaultMoves = sParty_Jared},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jared),
},
[TRAINER_HUMBERTO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5637,13 +4834,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Humberto),
- .party = {.NoItemDefaultMoves = sParty_Humberto},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Humberto),
},
[TRAINER_PRESLEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5651,13 +4846,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Presley),
- .party = {.NoItemDefaultMoves = sParty_Presley},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Presley),
},
[TRAINER_EDWARDO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5665,13 +4858,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edwardo),
- .party = {.NoItemDefaultMoves = sParty_Edwardo},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwardo),
},
[TRAINER_COLIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5679,13 +4870,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Colin),
- .party = {.NoItemDefaultMoves = sParty_Colin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Colin),
},
[TRAINER_ROBERT_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5693,13 +4882,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Robert1),
- .party = {.NoItemDefaultMoves = sParty_Robert1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert1),
},
[TRAINER_BENNY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5707,13 +4894,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Benny),
- .party = {.NoItemDefaultMoves = sParty_Benny},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Benny),
},
[TRAINER_CHESTER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5721,13 +4906,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Chester),
- .party = {.NoItemDefaultMoves = sParty_Chester},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Chester),
},
[TRAINER_ROBERT_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5735,13 +4918,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Robert2),
- .party = {.NoItemDefaultMoves = sParty_Robert2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert2),
},
[TRAINER_ROBERT_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5749,13 +4930,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Robert3),
- .party = {.NoItemDefaultMoves = sParty_Robert3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert3),
},
[TRAINER_ROBERT_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5763,13 +4942,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Robert4),
- .party = {.NoItemDefaultMoves = sParty_Robert4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert4),
},
[TRAINER_ROBERT_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5777,13 +4954,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Robert5),
- .party = {.NoItemDefaultMoves = sParty_Robert5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert5),
},
[TRAINER_ALEX] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5791,13 +4966,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alex),
- .party = {.NoItemDefaultMoves = sParty_Alex},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alex),
},
[TRAINER_BECK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -5805,13 +4978,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Beck),
- .party = {.NoItemDefaultMoves = sParty_Beck},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Beck),
},
[TRAINER_YASU] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5819,13 +4990,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Yasu),
- .party = {.NoItemDefaultMoves = sParty_Yasu},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Yasu),
},
[TRAINER_TAKASHI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5833,13 +5002,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Takashi),
- .party = {.NoItemDefaultMoves = sParty_Takashi},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Takashi),
},
[TRAINER_DIANNE] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -5847,13 +5014,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Dianne),
- .party = {.ItemCustomMoves = sParty_Dianne},
+ .party = ITEM_CUSTOM_MOVES(sParty_Dianne),
},
[TRAINER_JANI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -5861,13 +5026,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Jani),
- .party = {.NoItemDefaultMoves = sParty_Jani},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jani),
},
[TRAINER_LAO_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5875,13 +5038,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Lao1),
- .party = {.NoItemCustomMoves = sParty_Lao1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao1),
},
[TRAINER_LUNG] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5889,13 +5050,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Lung),
- .party = {.NoItemDefaultMoves = sParty_Lung},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lung),
},
[TRAINER_LAO_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5903,13 +5062,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Lao2),
- .party = {.NoItemCustomMoves = sParty_Lao2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao2),
},
[TRAINER_LAO_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5917,13 +5074,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Lao3),
- .party = {.NoItemCustomMoves = sParty_Lao3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao3),
},
[TRAINER_LAO_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5931,13 +5086,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Lao4),
- .party = {.NoItemCustomMoves = sParty_Lao4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao4),
},
[TRAINER_LAO_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -5945,13 +5098,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Lao5),
- .party = {.ItemCustomMoves = sParty_Lao5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Lao5),
},
[TRAINER_JOCELYN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -5959,13 +5110,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jocelyn),
- .party = {.NoItemDefaultMoves = sParty_Jocelyn},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jocelyn),
},
[TRAINER_LAURA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -5973,13 +5122,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Laura),
- .party = {.NoItemDefaultMoves = sParty_Laura},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Laura),
},
[TRAINER_CYNDY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -5987,13 +5134,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cyndy1),
- .party = {.NoItemDefaultMoves = sParty_Cyndy1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy1),
},
[TRAINER_CORA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -6001,13 +5146,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cora),
- .party = {.NoItemDefaultMoves = sParty_Cora},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cora),
},
[TRAINER_PAULA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -6015,13 +5158,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Paula),
- .party = {.NoItemDefaultMoves = sParty_Paula},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Paula),
},
[TRAINER_CYNDY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -6029,13 +5170,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cyndy2),
- .party = {.NoItemDefaultMoves = sParty_Cyndy2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy2),
},
[TRAINER_CYNDY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -6043,13 +5182,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cyndy3),
- .party = {.NoItemDefaultMoves = sParty_Cyndy3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy3),
},
[TRAINER_CYNDY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -6057,13 +5194,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cyndy4),
- .party = {.NoItemDefaultMoves = sParty_Cyndy4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy4),
},
[TRAINER_CYNDY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -6071,13 +5206,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cyndy5),
- .party = {.NoItemDefaultMoves = sParty_Cyndy5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy5),
},
[TRAINER_MADELINE_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6085,13 +5218,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Madeline1),
- .party = {.NoItemCustomMoves = sParty_Madeline1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline1),
},
[TRAINER_CLARISSA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6099,13 +5230,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Clarissa),
- .party = {.NoItemDefaultMoves = sParty_Clarissa},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Clarissa),
},
[TRAINER_ANGELICA] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6113,13 +5242,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Angelica),
- .party = {.NoItemCustomMoves = sParty_Angelica},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Angelica),
},
[TRAINER_MADELINE_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6127,13 +5254,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Madeline2),
- .party = {.NoItemCustomMoves = sParty_Madeline2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline2),
},
[TRAINER_MADELINE_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6141,13 +5266,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Madeline3),
- .party = {.NoItemCustomMoves = sParty_Madeline3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline3),
},
[TRAINER_MADELINE_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6155,13 +5278,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Madeline4),
- .party = {.NoItemCustomMoves = sParty_Madeline4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline4),
},
[TRAINER_MADELINE_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -6169,13 +5290,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Madeline5),
- .party = {.NoItemCustomMoves = sParty_Madeline5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline5),
},
[TRAINER_BEVERLY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6183,13 +5302,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Beverly),
- .party = {.NoItemDefaultMoves = sParty_Beverly},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Beverly),
},
[TRAINER_IMANI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6197,13 +5314,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Imani),
- .party = {.NoItemDefaultMoves = sParty_Imani},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Imani),
},
[TRAINER_KYLA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6211,13 +5326,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kyla),
- .party = {.NoItemDefaultMoves = sParty_Kyla},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kyla),
},
[TRAINER_DENISE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6225,13 +5338,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Denise),
- .party = {.NoItemDefaultMoves = sParty_Denise},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Denise),
},
[TRAINER_BETH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6239,13 +5350,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Beth),
- .party = {.NoItemDefaultMoves = sParty_Beth},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Beth),
},
[TRAINER_TARA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6253,13 +5362,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tara),
- .party = {.NoItemDefaultMoves = sParty_Tara},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tara),
},
[TRAINER_MISSY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6267,13 +5374,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Missy),
- .party = {.NoItemDefaultMoves = sParty_Missy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Missy),
},
[TRAINER_ALICE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6281,13 +5386,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alice),
- .party = {.NoItemDefaultMoves = sParty_Alice},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alice),
},
[TRAINER_JENNY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6295,13 +5398,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jenny1),
- .party = {.NoItemDefaultMoves = sParty_Jenny1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny1),
},
[TRAINER_GRACE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6309,13 +5410,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Grace),
- .party = {.NoItemDefaultMoves = sParty_Grace},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Grace),
},
[TRAINER_TANYA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6323,13 +5422,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tanya),
- .party = {.NoItemDefaultMoves = sParty_Tanya},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tanya),
},
[TRAINER_SHARON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6337,13 +5434,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sharon),
- .party = {.NoItemDefaultMoves = sParty_Sharon},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sharon),
},
[TRAINER_NIKKI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6351,13 +5446,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nikki),
- .party = {.NoItemDefaultMoves = sParty_Nikki},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nikki),
},
[TRAINER_BRENDA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6365,13 +5458,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Brenda),
- .party = {.NoItemDefaultMoves = sParty_Brenda},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brenda),
},
[TRAINER_KATIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6379,13 +5470,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Katie),
- .party = {.NoItemDefaultMoves = sParty_Katie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Katie),
},
[TRAINER_SUSIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6393,13 +5482,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Susie),
- .party = {.NoItemDefaultMoves = sParty_Susie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Susie),
},
[TRAINER_KARA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6407,13 +5494,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kara),
- .party = {.NoItemDefaultMoves = sParty_Kara},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kara),
},
[TRAINER_DANA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6421,13 +5506,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dana),
- .party = {.NoItemDefaultMoves = sParty_Dana},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dana),
},
[TRAINER_SIENNA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6435,13 +5518,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sienna),
- .party = {.NoItemDefaultMoves = sParty_Sienna},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sienna),
},
[TRAINER_DEBRA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6449,13 +5530,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Debra),
- .party = {.NoItemDefaultMoves = sParty_Debra},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Debra),
},
[TRAINER_LINDA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6463,13 +5542,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Linda),
- .party = {.NoItemDefaultMoves = sParty_Linda},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Linda),
},
[TRAINER_KAYLEE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6477,13 +5554,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kaylee),
- .party = {.NoItemDefaultMoves = sParty_Kaylee},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kaylee),
},
[TRAINER_LAUREL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6491,13 +5566,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Laurel),
- .party = {.NoItemDefaultMoves = sParty_Laurel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Laurel),
},
[TRAINER_CARLEE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6505,13 +5578,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Carlee),
- .party = {.NoItemDefaultMoves = sParty_Carlee},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Carlee),
},
[TRAINER_JENNY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6519,13 +5590,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jenny2),
- .party = {.NoItemDefaultMoves = sParty_Jenny2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny2),
},
[TRAINER_JENNY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6533,13 +5602,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jenny3),
- .party = {.NoItemDefaultMoves = sParty_Jenny3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny3),
},
[TRAINER_JENNY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6547,13 +5614,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jenny4),
- .party = {.NoItemDefaultMoves = sParty_Jenny4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny4),
},
[TRAINER_JENNY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -6561,13 +5626,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jenny5),
- .party = {.NoItemDefaultMoves = sParty_Jenny5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny5),
},
[TRAINER_HEIDI] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6575,13 +5638,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Heidi),
- .party = {.NoItemCustomMoves = sParty_Heidi},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Heidi),
},
[TRAINER_BECKY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6589,13 +5650,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Becky),
- .party = {.NoItemCustomMoves = sParty_Becky},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Becky),
},
[TRAINER_CAROL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6603,13 +5662,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Carol),
- .party = {.NoItemDefaultMoves = sParty_Carol},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Carol),
},
[TRAINER_NANCY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6617,13 +5674,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nancy),
- .party = {.NoItemDefaultMoves = sParty_Nancy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nancy),
},
[TRAINER_MARTHA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6631,13 +5686,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Martha),
- .party = {.NoItemDefaultMoves = sParty_Martha},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Martha),
},
[TRAINER_DIANA_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6645,13 +5698,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Diana1),
- .party = {.NoItemDefaultMoves = sParty_Diana1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana1),
},
[TRAINER_CEDRIC] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -6659,13 +5710,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cedric),
- .party = {.NoItemCustomMoves = sParty_Cedric},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Cedric),
},
[TRAINER_IRENE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6673,13 +5722,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Irene),
- .party = {.NoItemDefaultMoves = sParty_Irene},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Irene),
},
[TRAINER_DIANA_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6687,13 +5734,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Diana2),
- .party = {.NoItemDefaultMoves = sParty_Diana2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana2),
},
[TRAINER_DIANA_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6701,13 +5746,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Diana3),
- .party = {.NoItemDefaultMoves = sParty_Diana3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana3),
},
[TRAINER_DIANA_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6715,13 +5758,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Diana4),
- .party = {.NoItemDefaultMoves = sParty_Diana4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana4),
},
[TRAINER_DIANA_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -6729,13 +5770,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Diana5),
- .party = {.NoItemDefaultMoves = sParty_Diana5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana5),
},
[TRAINER_AMY_AND_LIV_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6743,13 +5782,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AmyAndLiv1),
- .party = {.NoItemDefaultMoves = sParty_AmyAndLiv1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv1),
},
[TRAINER_AMY_AND_LIV_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6757,13 +5794,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AmyAndLiv2),
- .party = {.NoItemDefaultMoves = sParty_AmyAndLiv2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv2),
},
[TRAINER_GINA_AND_MIA_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6771,13 +5806,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GinaAndMia1),
- .party = {.NoItemDefaultMoves = sParty_GinaAndMia1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GinaAndMia1),
},
[TRAINER_MIU_AND_YUKI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6785,13 +5818,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_MiuAndYuki),
- .party = {.NoItemDefaultMoves = sParty_MiuAndYuki},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MiuAndYuki),
},
[TRAINER_AMY_AND_LIV_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6799,13 +5830,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AmyAndLiv3),
- .party = {.NoItemDefaultMoves = sParty_AmyAndLiv3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv3),
},
[TRAINER_GINA_AND_MIA_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6813,13 +5842,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GinaAndMia2),
- .party = {.NoItemCustomMoves = sParty_GinaAndMia2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_GinaAndMia2),
},
[TRAINER_AMY_AND_LIV_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6827,13 +5854,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AmyAndLiv4),
- .party = {.NoItemDefaultMoves = sParty_AmyAndLiv4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv4),
},
[TRAINER_AMY_AND_LIV_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6841,13 +5866,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AmyAndLiv5),
- .party = {.NoItemCustomMoves = sParty_AmyAndLiv5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AmyAndLiv5),
},
[TRAINER_AMY_AND_LIV_6] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -6855,13 +5878,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_AmyAndLiv6),
- .party = {.NoItemCustomMoves = sParty_AmyAndLiv6},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_AmyAndLiv6),
},
[TRAINER_HUEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6869,13 +5890,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Huey),
- .party = {.NoItemDefaultMoves = sParty_Huey},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Huey),
},
[TRAINER_EDMOND] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6883,13 +5902,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edmond),
- .party = {.NoItemDefaultMoves = sParty_Edmond},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edmond),
},
[TRAINER_ERNEST_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6897,13 +5914,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ernest1),
- .party = {.NoItemDefaultMoves = sParty_Ernest1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest1),
},
[TRAINER_DWAYNE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6911,13 +5926,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dwayne),
- .party = {.NoItemDefaultMoves = sParty_Dwayne},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dwayne),
},
[TRAINER_PHILLIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6925,13 +5938,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Phillip),
- .party = {.NoItemDefaultMoves = sParty_Phillip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Phillip),
},
[TRAINER_LEONARD] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6939,13 +5950,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Leonard),
- .party = {.NoItemDefaultMoves = sParty_Leonard},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Leonard),
},
[TRAINER_DUNCAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6953,13 +5962,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Duncan),
- .party = {.NoItemDefaultMoves = sParty_Duncan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Duncan),
},
[TRAINER_ERNEST_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6967,13 +5974,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ernest2),
- .party = {.NoItemDefaultMoves = sParty_Ernest2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest2),
},
[TRAINER_ERNEST_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6981,13 +5986,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ernest3),
- .party = {.NoItemDefaultMoves = sParty_Ernest3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest3),
},
[TRAINER_ERNEST_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -6995,13 +5998,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ernest4),
- .party = {.NoItemDefaultMoves = sParty_Ernest4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest4),
},
[TRAINER_ERNEST_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -7009,13 +6010,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ernest5),
- .party = {.NoItemDefaultMoves = sParty_Ernest5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest5),
},
[TRAINER_ELI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -7023,13 +6022,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Eli),
- .party = {.NoItemDefaultMoves = sParty_Eli},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Eli),
},
[TRAINER_ANNIKA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_F,
@@ -7037,13 +6034,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Annika),
- .party = {.ItemCustomMoves = sParty_Annika},
+ .party = ITEM_CUSTOM_MOVES(sParty_Annika),
},
[TRAINER_JAZMYN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER_2,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -7051,13 +6046,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Jazmyn),
- .party = {.NoItemDefaultMoves = sParty_Jazmyn},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jazmyn),
},
[TRAINER_JONAS] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -7065,13 +6058,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Jonas),
- .party = {.NoItemCustomMoves = sParty_Jonas},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Jonas),
},
[TRAINER_KAYLEY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -7079,13 +6070,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kayley),
- .party = {.NoItemCustomMoves = sParty_Kayley},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Kayley),
},
[TRAINER_AURON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -7093,13 +6082,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Auron),
- .party = {.NoItemDefaultMoves = sParty_Auron},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Auron),
},
[TRAINER_KELVIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -7107,13 +6094,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kelvin),
- .party = {.NoItemDefaultMoves = sParty_Kelvin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kelvin),
},
[TRAINER_MARLEY] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -7121,13 +6106,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Marley),
- .party = {.ItemCustomMoves = sParty_Marley},
+ .party = ITEM_CUSTOM_MOVES(sParty_Marley),
},
[TRAINER_REYNA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -7135,13 +6118,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Reyna),
- .party = {.NoItemDefaultMoves = sParty_Reyna},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Reyna),
},
[TRAINER_HUDSON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -7149,13 +6130,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hudson),
- .party = {.NoItemDefaultMoves = sParty_Hudson},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hudson),
},
[TRAINER_CONOR] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -7163,13 +6142,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Conor),
- .party = {.NoItemDefaultMoves = sParty_Conor},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Conor),
},
[TRAINER_EDWIN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -7177,13 +6154,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edwin1),
- .party = {.NoItemDefaultMoves = sParty_Edwin1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin1),
},
[TRAINER_HECTOR] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -7191,13 +6166,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hector),
- .party = {.NoItemDefaultMoves = sParty_Hector},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hector),
},
[TRAINER_TABITHA_MOSSDEEP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_ADMIN,
@@ -7205,13 +6178,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_TabithaMossdeep),
- .party = {.NoItemDefaultMoves = sParty_TabithaMossdeep},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMossdeep),
},
[TRAINER_EDWIN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -7219,13 +6190,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edwin2),
- .party = {.NoItemDefaultMoves = sParty_Edwin2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin2),
},
[TRAINER_EDWIN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -7233,13 +6202,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edwin3),
- .party = {.NoItemDefaultMoves = sParty_Edwin3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin3),
},
[TRAINER_EDWIN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -7247,13 +6214,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edwin4),
- .party = {.NoItemDefaultMoves = sParty_Edwin4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin4),
},
[TRAINER_EDWIN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COLLECTOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_COLLECTOR,
@@ -7261,13 +6226,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Edwin5),
- .party = {.NoItemDefaultMoves = sParty_Edwin5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin5),
},
[TRAINER_WALLY_VR_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_WALLY,
@@ -7275,13 +6238,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_WallyVR1),
- .party = {.NoItemCustomMoves = sParty_WallyVR1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR1),
},
[TRAINER_BRENDAN_ROUTE_103_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7289,13 +6250,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute103Mudkip),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Mudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Mudkip),
},
[TRAINER_BRENDAN_ROUTE_110_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7303,13 +6262,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute110Mudkip),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Mudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute110Mudkip),
},
[TRAINER_BRENDAN_ROUTE_119_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7317,13 +6274,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute119Mudkip),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Mudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute119Mudkip),
},
[TRAINER_BRENDAN_ROUTE_103_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7331,13 +6286,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute103Treecko),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Treecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Treecko),
},
[TRAINER_BRENDAN_ROUTE_110_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7345,13 +6298,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute110Treecko),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Treecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute110Treecko),
},
[TRAINER_BRENDAN_ROUTE_119_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7359,13 +6310,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute119Treecko),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Treecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute119Treecko),
},
[TRAINER_BRENDAN_ROUTE_103_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7373,13 +6322,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute103Torchic),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Torchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Torchic),
},
[TRAINER_BRENDAN_ROUTE_110_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7387,13 +6334,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute110Torchic),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Torchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute110Torchic),
},
[TRAINER_BRENDAN_ROUTE_119_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -7401,13 +6346,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRoute119Torchic),
- .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Torchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute119Torchic),
},
[TRAINER_MAY_ROUTE_103_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7415,13 +6358,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute103Mudkip),
- .party = {.NoItemDefaultMoves = sParty_MayRoute103Mudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute103Mudkip),
},
[TRAINER_MAY_ROUTE_110_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7429,13 +6370,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute110Mudkip),
- .party = {.NoItemDefaultMoves = sParty_MayRoute110Mudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute110Mudkip),
},
[TRAINER_MAY_ROUTE_119_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7443,13 +6382,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute119Mudkip),
- .party = {.NoItemDefaultMoves = sParty_MayRoute119Mudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute119Mudkip),
},
[TRAINER_MAY_ROUTE_103_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7457,13 +6394,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute103Treecko),
- .party = {.NoItemDefaultMoves = sParty_MayRoute103Treecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute103Treecko),
},
[TRAINER_MAY_ROUTE_110_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7471,13 +6406,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute110Treecko),
- .party = {.NoItemDefaultMoves = sParty_MayRoute110Treecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute110Treecko),
},
[TRAINER_MAY_ROUTE_119_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7485,13 +6418,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute119Treecko),
- .party = {.NoItemDefaultMoves = sParty_MayRoute119Treecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute119Treecko),
},
[TRAINER_MAY_ROUTE_103_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7499,13 +6430,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute103Torchic),
- .party = {.NoItemDefaultMoves = sParty_MayRoute103Torchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute103Torchic),
},
[TRAINER_MAY_ROUTE_110_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7513,13 +6442,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute110Torchic),
- .party = {.NoItemDefaultMoves = sParty_MayRoute110Torchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute110Torchic),
},
[TRAINER_MAY_ROUTE_119_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -7527,13 +6454,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRoute119Torchic),
- .party = {.NoItemDefaultMoves = sParty_MayRoute119Torchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute119Torchic),
},
[TRAINER_ISAAC_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
@@ -7541,13 +6466,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaac1),
- .party = {.NoItemDefaultMoves = sParty_Isaac1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac1),
},
[TRAINER_DAVIS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -7555,13 +6478,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Davis),
- .party = {.NoItemDefaultMoves = sParty_Davis},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Davis),
},
[TRAINER_MITCHELL] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -7569,13 +6490,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Mitchell),
- .party = {.NoItemCustomMoves = sParty_Mitchell},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Mitchell),
},
[TRAINER_ISAAC_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
@@ -7583,13 +6502,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaac2),
- .party = {.NoItemDefaultMoves = sParty_Isaac2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac2),
},
[TRAINER_ISAAC_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
@@ -7597,13 +6514,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaac3),
- .party = {.NoItemDefaultMoves = sParty_Isaac3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac3),
},
[TRAINER_ISAAC_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
@@ -7611,13 +6526,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaac4),
- .party = {.NoItemDefaultMoves = sParty_Isaac4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac4),
},
[TRAINER_ISAAC_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
@@ -7625,13 +6538,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isaac5),
- .party = {.NoItemDefaultMoves = sParty_Isaac5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac5),
},
[TRAINER_LYDIA_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -7639,13 +6550,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lydia1),
- .party = {.NoItemDefaultMoves = sParty_Lydia1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia1),
},
[TRAINER_HALLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -7653,13 +6562,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Halle),
- .party = {.NoItemDefaultMoves = sParty_Halle},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Halle),
},
[TRAINER_GARRISON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -7667,13 +6574,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Garrison),
- .party = {.NoItemDefaultMoves = sParty_Garrison},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Garrison),
},
[TRAINER_LYDIA_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -7681,13 +6586,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lydia2),
- .party = {.NoItemDefaultMoves = sParty_Lydia2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia2),
},
[TRAINER_LYDIA_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -7695,13 +6598,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lydia3),
- .party = {.NoItemDefaultMoves = sParty_Lydia3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia3),
},
[TRAINER_LYDIA_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -7709,13 +6610,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lydia4),
- .party = {.NoItemDefaultMoves = sParty_Lydia4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia4),
},
[TRAINER_LYDIA_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -7723,13 +6622,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lydia5),
- .party = {.NoItemDefaultMoves = sParty_Lydia5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia5),
},
[TRAINER_JACKSON_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7737,13 +6634,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Jackson1),
- .party = {.NoItemDefaultMoves = sParty_Jackson1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jackson1),
},
[TRAINER_LORENZO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7751,13 +6646,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Lorenzo),
- .party = {.NoItemDefaultMoves = sParty_Lorenzo},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lorenzo),
},
[TRAINER_SEBASTIAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7765,13 +6658,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sebastian),
- .party = {.NoItemDefaultMoves = sParty_Sebastian},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sebastian),
},
[TRAINER_JACKSON_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7779,13 +6670,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Jackson2),
- .party = {.NoItemDefaultMoves = sParty_Jackson2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jackson2),
},
[TRAINER_JACKSON_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7793,13 +6682,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Jackson3),
- .party = {.NoItemDefaultMoves = sParty_Jackson3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jackson3),
},
[TRAINER_JACKSON_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7807,13 +6694,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Jackson4),
- .party = {.NoItemDefaultMoves = sParty_Jackson4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jackson4),
},
[TRAINER_JACKSON_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
@@ -7821,13 +6706,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Jackson5),
- .party = {.NoItemDefaultMoves = sParty_Jackson5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jackson5),
},
[TRAINER_CATHERINE_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7835,13 +6718,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Catherine1),
- .party = {.NoItemDefaultMoves = sParty_Catherine1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Catherine1),
},
[TRAINER_JENNA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7849,13 +6730,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Jenna),
- .party = {.NoItemDefaultMoves = sParty_Jenna},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenna),
},
[TRAINER_SOPHIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7863,13 +6742,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sophia),
- .party = {.NoItemDefaultMoves = sParty_Sophia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sophia),
},
[TRAINER_CATHERINE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7877,13 +6754,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Catherine2),
- .party = {.NoItemDefaultMoves = sParty_Catherine2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Catherine2),
},
[TRAINER_CATHERINE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7891,13 +6766,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Catherine3),
- .party = {.NoItemDefaultMoves = sParty_Catherine3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Catherine3),
},
[TRAINER_CATHERINE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7905,13 +6778,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Catherine4),
- .party = {.NoItemDefaultMoves = sParty_Catherine4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Catherine4),
},
[TRAINER_CATHERINE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
@@ -7919,13 +6790,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Catherine5),
- .party = {.NoItemDefaultMoves = sParty_Catherine5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Catherine5),
},
[TRAINER_JULIO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
@@ -7933,13 +6802,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Julio),
- .party = {.NoItemDefaultMoves = sParty_Julio},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Julio),
},
[TRAINER_GRUNT_SEAFLOOR_CAVERN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
@@ -7947,13 +6814,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern5),
- .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern5),
},
[TRAINER_GRUNT_UNUSED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -7961,13 +6826,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntUnused),
- .party = {.NoItemDefaultMoves = sParty_GruntUnused},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntUnused),
},
[TRAINER_GRUNT_MT_PYRE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -7975,13 +6838,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMtPyre4),
- .party = {.NoItemDefaultMoves = sParty_GruntMtPyre4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre4),
},
[TRAINER_GRUNT_JAGGED_PASS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -7989,13 +6850,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntJaggedPass),
- .party = {.NoItemDefaultMoves = sParty_GruntJaggedPass},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntJaggedPass),
},
[TRAINER_MARC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8003,13 +6862,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Marc),
- .party = {.NoItemDefaultMoves = sParty_Marc},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Marc),
},
[TRAINER_BRENDEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -8017,13 +6874,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Brenden),
- .party = {.NoItemDefaultMoves = sParty_Brenden},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brenden),
},
[TRAINER_LILITH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -8031,13 +6886,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lilith),
- .party = {.NoItemDefaultMoves = sParty_Lilith},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lilith),
},
[TRAINER_CRISTIAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -8045,13 +6898,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cristian),
- .party = {.NoItemDefaultMoves = sParty_Cristian},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristian),
},
[TRAINER_SYLVIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -8059,13 +6910,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sylvia),
- .party = {.NoItemDefaultMoves = sParty_Sylvia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sylvia),
},
[TRAINER_LEONARDO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -8073,13 +6922,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Leonardo),
- .party = {.NoItemDefaultMoves = sParty_Leonardo},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Leonardo),
},
[TRAINER_ATHENA] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -8087,13 +6934,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Athena),
- .party = {.ItemCustomMoves = sParty_Athena},
+ .party = ITEM_CUSTOM_MOVES(sParty_Athena),
},
[TRAINER_HARRISON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -8101,13 +6946,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Harrison),
- .party = {.NoItemDefaultMoves = sParty_Harrison},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Harrison),
},
[TRAINER_GRUNT_MT_CHIMNEY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -8115,13 +6958,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMtChimney2),
- .party = {.NoItemDefaultMoves = sParty_GruntMtChimney2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtChimney2),
},
[TRAINER_CLARENCE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -8129,13 +6970,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Clarence),
- .party = {.NoItemDefaultMoves = sParty_Clarence},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Clarence),
},
[TRAINER_TERRY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -8143,13 +6982,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Terry),
- .party = {.NoItemDefaultMoves = sParty_Terry},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Terry),
},
[TRAINER_NATE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -8157,13 +6994,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nate),
- .party = {.NoItemDefaultMoves = sParty_Nate},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nate),
},
[TRAINER_KATHLEEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HEX_MANIAC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_HEX_MANIAC,
@@ -8171,13 +7006,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kathleen),
- .party = {.NoItemDefaultMoves = sParty_Kathleen},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kathleen),
},
[TRAINER_CLIFFORD] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -8185,13 +7018,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Clifford),
- .party = {.NoItemDefaultMoves = sParty_Clifford},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Clifford),
},
[TRAINER_NICHOLAS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -8199,13 +7030,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Nicholas),
- .party = {.NoItemDefaultMoves = sParty_Nicholas},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicholas),
},
[TRAINER_GRUNT_SPACE_CENTER_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
@@ -8213,13 +7042,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter3),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter3),
},
[TRAINER_GRUNT_SPACE_CENTER_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -8227,13 +7054,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter4),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter4),
},
[TRAINER_GRUNT_SPACE_CENTER_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -8241,13 +7066,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter5),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter5),
},
[TRAINER_GRUNT_SPACE_CENTER_6] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -8255,13 +7078,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter6),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter6},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter6),
},
[TRAINER_GRUNT_SPACE_CENTER_7] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -8269,13 +7090,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter7),
- .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter7},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter7),
},
[TRAINER_MACEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -8283,13 +7102,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Macey),
- .party = {.NoItemDefaultMoves = sParty_Macey},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Macey),
},
[TRAINER_BRENDAN_RUSTBORO_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -8297,13 +7114,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_BrendanRustboroTreecko),
- .party = {.NoItemDefaultMoves = sParty_BrendanRustboroTreecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroTreecko),
},
[TRAINER_BRENDAN_RUSTBORO_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -8311,13 +7126,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_BrendanRustboroMudkip),
- .party = {.NoItemDefaultMoves = sParty_BrendanRustboroMudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroMudkip),
},
[TRAINER_PAXTON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_M,
@@ -8325,13 +7138,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Paxton),
- .party = {.NoItemDefaultMoves = sParty_Paxton},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Paxton),
},
[TRAINER_ISABELLA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
@@ -8339,13 +7150,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabella),
- .party = {.NoItemDefaultMoves = sParty_Isabella},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isabella),
},
[TRAINER_GRUNT_WEATHER_INST_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_AQUA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
.trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
@@ -8353,13 +7162,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntWeatherInst5),
- .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst5),
},
[TRAINER_TABITHA_MT_CHIMNEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_ADMIN,
@@ -8367,13 +7174,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_TabithaMtChimney),
- .party = {.NoItemDefaultMoves = sParty_TabithaMtChimney},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMtChimney),
},
[TRAINER_JONATHAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -8381,13 +7186,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_Jonathan),
- .party = {.NoItemDefaultMoves = sParty_Jonathan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jonathan),
},
[TRAINER_BRENDAN_RUSTBORO_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -8395,13 +7198,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanRustboroTorchic),
- .party = {.NoItemDefaultMoves = sParty_BrendanRustboroTorchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroTorchic),
},
[TRAINER_MAY_RUSTBORO_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -8409,13 +7210,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_MayRustboroMudkip),
- .party = {.NoItemDefaultMoves = sParty_MayRustboroMudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroMudkip),
},
[TRAINER_MAXIE_MAGMA_HIDEOUT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
@@ -8423,13 +7222,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MaxieMagmaHideout),
- .party = {.NoItemDefaultMoves = sParty_MaxieMagmaHideout},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMagmaHideout),
},
[TRAINER_MAXIE_MT_CHIMNEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
@@ -8437,13 +7234,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MaxieMtChimney),
- .party = {.NoItemDefaultMoves = sParty_MaxieMtChimney},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMtChimney),
},
[TRAINER_TIANA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8451,13 +7246,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tiana),
- .party = {.NoItemDefaultMoves = sParty_Tiana},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tiana),
},
[TRAINER_HALEY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8465,13 +7258,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Haley1),
- .party = {.NoItemDefaultMoves = sParty_Haley1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley1),
},
[TRAINER_JANICE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8479,13 +7270,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Janice),
- .party = {.NoItemDefaultMoves = sParty_Janice},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Janice),
},
[TRAINER_VIVI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_WINSTRATE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8493,13 +7282,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Vivi),
- .party = {.NoItemDefaultMoves = sParty_Vivi},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Vivi),
},
[TRAINER_HALEY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8507,13 +7294,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Haley2),
- .party = {.NoItemDefaultMoves = sParty_Haley2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley2),
},
[TRAINER_HALEY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8521,13 +7306,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Haley3),
- .party = {.NoItemDefaultMoves = sParty_Haley3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley3),
},
[TRAINER_HALEY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8535,13 +7318,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Haley4),
- .party = {.NoItemDefaultMoves = sParty_Haley4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley4),
},
[TRAINER_HALEY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8549,13 +7330,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Haley5),
- .party = {.NoItemDefaultMoves = sParty_Haley5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley5),
},
[TRAINER_SALLY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8563,13 +7342,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sally),
- .party = {.NoItemDefaultMoves = sParty_Sally},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sally),
},
[TRAINER_ROBIN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8577,13 +7354,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Robin),
- .party = {.NoItemDefaultMoves = sParty_Robin},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Robin),
},
[TRAINER_ANDREA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8591,13 +7366,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andrea),
- .party = {.NoItemDefaultMoves = sParty_Andrea},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andrea),
},
[TRAINER_CRISSY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LASS,
@@ -8605,13 +7378,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Crissy),
- .party = {.NoItemDefaultMoves = sParty_Crissy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Crissy),
},
[TRAINER_RICK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8619,13 +7390,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rick),
- .party = {.NoItemDefaultMoves = sParty_Rick},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rick),
},
[TRAINER_LYLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8633,13 +7402,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lyle),
- .party = {.NoItemDefaultMoves = sParty_Lyle},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lyle),
},
[TRAINER_JOSE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8647,13 +7414,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jose),
- .party = {.NoItemDefaultMoves = sParty_Jose},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jose),
},
[TRAINER_DOUG] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8661,13 +7426,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Doug),
- .party = {.NoItemDefaultMoves = sParty_Doug},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Doug),
},
[TRAINER_GREG] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8675,13 +7438,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Greg),
- .party = {.NoItemDefaultMoves = sParty_Greg},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Greg),
},
[TRAINER_KENT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8689,13 +7450,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kent),
- .party = {.NoItemDefaultMoves = sParty_Kent},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kent),
},
[TRAINER_JAMES_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8703,13 +7462,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_James1),
- .party = {.NoItemDefaultMoves = sParty_James1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_James1),
},
[TRAINER_JAMES_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8717,13 +7474,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_James2),
- .party = {.NoItemDefaultMoves = sParty_James2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_James2),
},
[TRAINER_JAMES_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8731,13 +7486,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_James3),
- .party = {.NoItemDefaultMoves = sParty_James3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_James3),
},
[TRAINER_JAMES_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8745,13 +7498,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_James4),
- .party = {.NoItemDefaultMoves = sParty_James4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_James4),
},
[TRAINER_JAMES_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_CATCHER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BUG_CATCHER,
@@ -8759,13 +7510,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_James5),
- .party = {.NoItemDefaultMoves = sParty_James5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_James5),
},
[TRAINER_BRICE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8773,13 +7522,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Brice),
- .party = {.NoItemDefaultMoves = sParty_Brice},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brice),
},
[TRAINER_TRENT_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8787,13 +7534,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Trent1),
- .party = {.NoItemDefaultMoves = sParty_Trent1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent1),
},
[TRAINER_LENNY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8801,13 +7546,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lenny),
- .party = {.NoItemDefaultMoves = sParty_Lenny},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lenny),
},
[TRAINER_LUCAS_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8815,13 +7558,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lucas1),
- .party = {.NoItemDefaultMoves = sParty_Lucas1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lucas1),
},
[TRAINER_ALAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8829,13 +7570,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alan),
- .party = {.NoItemDefaultMoves = sParty_Alan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alan),
},
[TRAINER_CLARK] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8843,13 +7582,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Clark),
- .party = {.NoItemDefaultMoves = sParty_Clark},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Clark),
},
[TRAINER_ERIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8857,13 +7594,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Eric),
- .party = {.NoItemDefaultMoves = sParty_Eric},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Eric),
},
[TRAINER_LUCAS_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8871,13 +7606,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lucas2),
- .party = {.NoItemCustomMoves = sParty_Lucas2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Lucas2),
},
[TRAINER_MIKE_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8885,13 +7618,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Mike1),
- .party = {.NoItemCustomMoves = sParty_Mike1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Mike1),
},
[TRAINER_MIKE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8899,13 +7630,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Mike2),
- .party = {.NoItemDefaultMoves = sParty_Mike2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Mike2),
},
[TRAINER_TRENT_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8913,13 +7642,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Trent2),
- .party = {.NoItemDefaultMoves = sParty_Trent2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent2),
},
[TRAINER_TRENT_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8927,13 +7654,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Trent3),
- .party = {.NoItemDefaultMoves = sParty_Trent3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent3),
},
[TRAINER_TRENT_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8941,13 +7666,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Trent4),
- .party = {.NoItemDefaultMoves = sParty_Trent4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent4),
},
[TRAINER_TRENT_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -8955,13 +7678,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Trent5),
- .party = {.NoItemDefaultMoves = sParty_Trent5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent5),
},
[TRAINER_DEZ_AND_LUKE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -8969,13 +7690,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_DezAndLuke),
- .party = {.NoItemDefaultMoves = sParty_DezAndLuke},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_DezAndLuke),
},
[TRAINER_LEA_AND_JED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -8983,13 +7702,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LeaAndJed),
- .party = {.NoItemDefaultMoves = sParty_LeaAndJed},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LeaAndJed),
},
[TRAINER_KIRA_AND_DAN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -8997,13 +7714,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KiraAndDan1),
- .party = {.NoItemDefaultMoves = sParty_KiraAndDan1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan1),
},
[TRAINER_KIRA_AND_DAN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -9011,13 +7726,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KiraAndDan2),
- .party = {.NoItemDefaultMoves = sParty_KiraAndDan2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan2),
},
[TRAINER_KIRA_AND_DAN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -9025,13 +7738,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KiraAndDan3),
- .party = {.NoItemDefaultMoves = sParty_KiraAndDan3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan3),
},
[TRAINER_KIRA_AND_DAN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -9039,13 +7750,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KiraAndDan4),
- .party = {.NoItemDefaultMoves = sParty_KiraAndDan4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan4),
},
[TRAINER_KIRA_AND_DAN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -9053,13 +7762,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KiraAndDan5),
- .party = {.NoItemDefaultMoves = sParty_KiraAndDan5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan5),
},
[TRAINER_JOHANNA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -9067,13 +7774,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Johanna),
- .party = {.NoItemDefaultMoves = sParty_Johanna},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Johanna),
},
[TRAINER_GERALD] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -9081,13 +7786,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Gerald),
- .party = {.NoItemCustomMoves = sParty_Gerald},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Gerald),
},
[TRAINER_VIVIAN] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -9095,13 +7798,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Vivian),
- .party = {.NoItemCustomMoves = sParty_Vivian},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Vivian),
},
[TRAINER_DANIELLE] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -9109,13 +7810,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Danielle),
- .party = {.NoItemCustomMoves = sParty_Danielle},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Danielle),
},
[TRAINER_HIDEO] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -9123,13 +7822,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Hideo),
- .party = {.NoItemCustomMoves = sParty_Hideo},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Hideo),
},
[TRAINER_KEIGO] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -9137,13 +7834,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Keigo),
- .party = {.NoItemCustomMoves = sParty_Keigo},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Keigo),
},
[TRAINER_RILEY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -9151,13 +7846,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
- .partySize = ARRAY_COUNT(sParty_Riley),
- .party = {.NoItemCustomMoves = sParty_Riley},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Riley),
},
[TRAINER_FLINT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -9165,13 +7858,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Flint),
- .party = {.NoItemDefaultMoves = sParty_Flint},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Flint),
},
[TRAINER_ASHLEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -9179,13 +7870,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Ashley),
- .party = {.NoItemDefaultMoves = sParty_Ashley},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ashley),
},
[TRAINER_WALLY_MAUVILLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_WALLY,
@@ -9193,13 +7882,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_WallyMauville),
- .party = {.NoItemDefaultMoves = sParty_WallyMauville},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_WallyMauville),
},
[TRAINER_WALLY_VR_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_WALLY,
@@ -9207,13 +7894,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_WallyVR2),
- .party = {.NoItemCustomMoves = sParty_WallyVR2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR2),
},
[TRAINER_WALLY_VR_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_WALLY,
@@ -9221,13 +7906,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_WallyVR3),
- .party = {.NoItemCustomMoves = sParty_WallyVR3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR3),
},
[TRAINER_WALLY_VR_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_WALLY,
@@ -9235,13 +7918,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_WallyVR4),
- .party = {.NoItemCustomMoves = sParty_WallyVR4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR4),
},
[TRAINER_WALLY_VR_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_WALLY,
@@ -9249,13 +7930,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_WallyVR5),
- .party = {.NoItemCustomMoves = sParty_WallyVR5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR5),
},
[TRAINER_BRENDAN_LILYCOVE_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -9263,13 +7942,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanLilycoveMudkip),
- .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveMudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLilycoveMudkip),
},
[TRAINER_BRENDAN_LILYCOVE_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -9277,13 +7954,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanLilycoveTreecko),
- .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTreecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLilycoveTreecko),
},
[TRAINER_BRENDAN_LILYCOVE_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_BRENDAN,
@@ -9291,13 +7966,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_BrendanLilycoveTorchic),
- .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTorchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLilycoveTorchic),
},
[TRAINER_MAY_LILYCOVE_MUDKIP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -9305,13 +7978,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayLilycoveMudkip),
- .party = {.NoItemDefaultMoves = sParty_MayLilycoveMudkip},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLilycoveMudkip),
},
[TRAINER_MAY_LILYCOVE_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -9319,13 +7990,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayLilycoveTreecko),
- .party = {.NoItemDefaultMoves = sParty_MayLilycoveTreecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLilycoveTreecko),
},
[TRAINER_MAY_LILYCOVE_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -9333,13 +8002,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayLilycoveTorchic),
- .party = {.NoItemDefaultMoves = sParty_MayLilycoveTorchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLilycoveTorchic),
},
[TRAINER_JONAH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9347,13 +8014,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jonah),
- .party = {.NoItemDefaultMoves = sParty_Jonah},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jonah),
},
[TRAINER_HENRY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9361,13 +8026,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Henry),
- .party = {.NoItemDefaultMoves = sParty_Henry},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Henry),
},
[TRAINER_ROGER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9375,13 +8038,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Roger),
- .party = {.NoItemDefaultMoves = sParty_Roger},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Roger),
},
[TRAINER_ALEXA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -9389,13 +8050,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Alexa),
- .party = {.NoItemDefaultMoves = sParty_Alexa},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alexa),
},
[TRAINER_RUBEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -9403,13 +8062,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Ruben),
- .party = {.NoItemDefaultMoves = sParty_Ruben},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Ruben),
},
[TRAINER_KOJI_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -9417,13 +8074,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Koji1),
- .party = {.NoItemDefaultMoves = sParty_Koji1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji1),
},
[TRAINER_WAYNE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9431,13 +8086,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Wayne),
- .party = {.NoItemDefaultMoves = sParty_Wayne},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wayne),
},
[TRAINER_AIDAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -9445,13 +8098,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Aidan),
- .party = {.NoItemDefaultMoves = sParty_Aidan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Aidan),
},
[TRAINER_REED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -9459,13 +8110,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Reed),
- .party = {.NoItemDefaultMoves = sParty_Reed},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Reed),
},
[TRAINER_TISHA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -9473,13 +8122,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tisha),
- .party = {.NoItemDefaultMoves = sParty_Tisha},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tisha),
},
[TRAINER_TORI_AND_TIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TWINS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_TWINS,
@@ -9487,13 +8134,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_ToriAndTia),
- .party = {.NoItemDefaultMoves = sParty_ToriAndTia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_ToriAndTia),
},
[TRAINER_KIM_AND_IRIS] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -9501,13 +8146,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_KimAndIris),
- .party = {.NoItemCustomMoves = sParty_KimAndIris},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_KimAndIris),
},
[TRAINER_TYRA_AND_IVY] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_SR_AND_JR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_SR_AND_JR,
@@ -9515,13 +8158,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_TyraAndIvy),
- .party = {.NoItemCustomMoves = sParty_TyraAndIvy},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_TyraAndIvy),
},
[TRAINER_MEL_AND_PAUL] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_YOUNG_COUPLE,
@@ -9529,13 +8170,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_MelAndPaul),
- .party = {.NoItemCustomMoves = sParty_MelAndPaul},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_MelAndPaul),
},
[TRAINER_JOHN_AND_JAY_1] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_OLD_COUPLE,
@@ -9543,13 +8182,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_JohnAndJay1),
- .party = {.NoItemCustomMoves = sParty_JohnAndJay1},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay1),
},
[TRAINER_JOHN_AND_JAY_2] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_OLD_COUPLE,
@@ -9557,13 +8194,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_JohnAndJay2),
- .party = {.NoItemCustomMoves = sParty_JohnAndJay2},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay2),
},
[TRAINER_JOHN_AND_JAY_3] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_OLD_COUPLE,
@@ -9571,13 +8206,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_JohnAndJay3),
- .party = {.NoItemCustomMoves = sParty_JohnAndJay3},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay3),
},
[TRAINER_JOHN_AND_JAY_4] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_OLD_COUPLE,
@@ -9585,13 +8218,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
- .partySize = ARRAY_COUNT(sParty_JohnAndJay4),
- .party = {.NoItemCustomMoves = sParty_JohnAndJay4},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay4),
},
[TRAINER_JOHN_AND_JAY_5] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_OLD_COUPLE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_OLD_COUPLE,
@@ -9599,13 +8230,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_JohnAndJay5),
- .party = {.NoItemCustomMoves = sParty_JohnAndJay5},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay5),
},
[TRAINER_RELI_AND_IAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9613,13 +8242,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_ReliAndIan),
- .party = {.NoItemDefaultMoves = sParty_ReliAndIan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_ReliAndIan),
},
[TRAINER_LILA_AND_ROY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9627,13 +8254,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LilaAndRoy1),
- .party = {.NoItemDefaultMoves = sParty_LilaAndRoy1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy1),
},
[TRAINER_LILA_AND_ROY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9641,13 +8266,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LilaAndRoy2),
- .party = {.NoItemDefaultMoves = sParty_LilaAndRoy2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy2),
},
[TRAINER_LILA_AND_ROY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9655,13 +8278,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LilaAndRoy3),
- .party = {.NoItemDefaultMoves = sParty_LilaAndRoy3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy3),
},
[TRAINER_LILA_AND_ROY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9669,13 +8290,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LilaAndRoy4),
- .party = {.NoItemDefaultMoves = sParty_LilaAndRoy4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy4),
},
[TRAINER_LILA_AND_ROY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9683,13 +8302,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LilaAndRoy5),
- .party = {.NoItemDefaultMoves = sParty_LilaAndRoy5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy5),
},
[TRAINER_LISA_AND_RAY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SIS_AND_BRO,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SIS_AND_BRO,
@@ -9697,13 +8314,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_LisaAndRay),
- .party = {.NoItemDefaultMoves = sParty_LisaAndRay},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_LisaAndRay),
},
[TRAINER_CHRIS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9711,13 +8326,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Chris),
- .party = {.NoItemDefaultMoves = sParty_Chris},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Chris),
},
[TRAINER_DAWSON] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_RICH_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_RICH_BOY,
@@ -9725,13 +8338,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dawson),
- .party = {.ItemDefaultMoves = sParty_Dawson},
+ .party = ITEM_DEFAULT_MOVES(sParty_Dawson),
},
[TRAINER_SARAH] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LADY,
@@ -9739,13 +8350,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sarah),
- .party = {.ItemDefaultMoves = sParty_Sarah},
+ .party = ITEM_DEFAULT_MOVES(sParty_Sarah),
},
[TRAINER_DARIAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9753,13 +8362,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Darian),
- .party = {.NoItemDefaultMoves = sParty_Darian},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Darian),
},
[TRAINER_HAILEY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_F,
@@ -9767,13 +8374,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hailey),
- .party = {.NoItemDefaultMoves = sParty_Hailey},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hailey),
},
[TRAINER_CHANDLER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TUBER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_TUBER_M,
@@ -9781,13 +8386,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Chandler),
- .party = {.NoItemDefaultMoves = sParty_Chandler},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Chandler),
},
[TRAINER_KALEB] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_POKEFAN_M,
@@ -9795,13 +8398,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kaleb),
- .party = {.ItemDefaultMoves = sParty_Kaleb},
+ .party = ITEM_DEFAULT_MOVES(sParty_Kaleb),
},
[TRAINER_JOSEPH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -9809,13 +8410,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Joseph),
- .party = {.NoItemDefaultMoves = sParty_Joseph},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Joseph),
},
[TRAINER_ALYSSA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
@@ -9823,13 +8422,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alyssa),
- .party = {.NoItemDefaultMoves = sParty_Alyssa},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alyssa),
},
[TRAINER_MARCOS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -9837,13 +8434,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Marcos),
- .party = {.NoItemDefaultMoves = sParty_Marcos},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Marcos),
},
[TRAINER_RHETT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -9851,13 +8446,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rhett),
- .party = {.NoItemDefaultMoves = sParty_Rhett},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rhett),
},
[TRAINER_TYRON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -9865,13 +8458,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Tyron),
- .party = {.NoItemDefaultMoves = sParty_Tyron},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tyron),
},
[TRAINER_CELINA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -9879,13 +8470,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Celina),
- .party = {.NoItemDefaultMoves = sParty_Celina},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Celina),
},
[TRAINER_BIANCA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -9893,13 +8482,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bianca),
- .party = {.NoItemDefaultMoves = sParty_Bianca},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bianca),
},
[TRAINER_HAYDEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -9907,13 +8494,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Hayden),
- .party = {.NoItemDefaultMoves = sParty_Hayden},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Hayden),
},
[TRAINER_SOPHIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -9921,13 +8506,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Sophie),
- .party = {.NoItemDefaultMoves = sParty_Sophie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sophie),
},
[TRAINER_COBY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -9935,13 +8518,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Coby),
- .party = {.NoItemDefaultMoves = sParty_Coby},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Coby),
},
[TRAINER_LAWRENCE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -9949,13 +8530,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Lawrence),
- .party = {.NoItemDefaultMoves = sParty_Lawrence},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lawrence),
},
[TRAINER_WYATT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_POKEMANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_POKEMANIAC,
@@ -9963,13 +8542,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Wyatt),
- .party = {.NoItemDefaultMoves = sParty_Wyatt},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Wyatt),
},
[TRAINER_ANGELINA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -9977,13 +8554,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Angelina),
- .party = {.NoItemDefaultMoves = sParty_Angelina},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Angelina),
},
[TRAINER_KAI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FISHERMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_FISHERMAN,
@@ -9991,13 +8566,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kai),
- .party = {.NoItemDefaultMoves = sParty_Kai},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kai),
},
[TRAINER_CHARLOTTE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -10005,13 +8578,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Charlotte),
- .party = {.NoItemDefaultMoves = sParty_Charlotte},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Charlotte),
},
[TRAINER_DEANDRE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -10019,13 +8590,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Deandre),
- .party = {.NoItemDefaultMoves = sParty_Deandre},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Deandre),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10033,13 +8602,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout1),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout1),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10047,13 +8614,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout2),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout2),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10061,13 +8626,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout3),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout3),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10075,13 +8638,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout4),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout4),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10089,13 +8650,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout5),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout5),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_6] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10103,13 +8662,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout6),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout6},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout6),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_7] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10117,13 +8674,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout7),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout7},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout7),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_8] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10131,13 +8686,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout8),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout8},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout8),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_9] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10145,13 +8698,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout9),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout9},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout9),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_10] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10159,13 +8710,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout10),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout10},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout10),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_11] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10173,13 +8722,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout11),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout11},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout11),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_12] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10187,13 +8734,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout12),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout12},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout12),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_13] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
@@ -10201,13 +8746,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout13),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout13},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout13),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_14] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
@@ -10215,13 +8758,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout14),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout14},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout14),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_15] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
@@ -10229,13 +8770,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout15),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout15},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout15),
},
[TRAINER_GRUNT_MAGMA_HIDEOUT_16] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TEAM_MAGMA,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
@@ -10243,13 +8782,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout16),
- .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout16),
},
[TRAINER_TABITHA_MAGMA_HIDEOUT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_ADMIN,
@@ -10257,13 +8794,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_TabithaMagmaHideout),
- .party = {.NoItemDefaultMoves = sParty_TabithaMagmaHideout},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMagmaHideout),
},
[TRAINER_DARCY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -10271,13 +8806,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Darcy),
- .party = {.NoItemDefaultMoves = sParty_Darcy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Darcy),
},
[TRAINER_MAXIE_MOSSDEEP] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
.trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
@@ -10285,13 +8818,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MaxieMossdeep),
- .party = {.NoItemDefaultMoves = sParty_MaxieMossdeep},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMossdeep),
},
[TRAINER_PETE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_M,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_M,
@@ -10299,13 +8830,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pete),
- .party = {.NoItemDefaultMoves = sParty_Pete},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pete),
},
[TRAINER_ISABELLE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SWIMMER_F,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMER_F,
@@ -10313,13 +8842,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Isabelle),
- .party = {.NoItemDefaultMoves = sParty_Isabelle},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Isabelle),
},
[TRAINER_ANDRES_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -10327,13 +8854,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andres1),
- .party = {.NoItemDefaultMoves = sParty_Andres1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres1),
},
[TRAINER_JOSUE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -10341,13 +8866,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Josue),
- .party = {.NoItemDefaultMoves = sParty_Josue},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Josue),
},
[TRAINER_CAMRON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -10355,13 +8878,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Camron),
- .party = {.NoItemDefaultMoves = sParty_Camron},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Camron),
},
[TRAINER_CORY_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -10369,13 +8890,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cory1),
- .party = {.NoItemDefaultMoves = sParty_Cory1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory1),
},
[TRAINER_CAROLINA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -10383,13 +8902,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Carolina),
- .party = {.NoItemDefaultMoves = sParty_Carolina},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Carolina),
},
[TRAINER_ELIJAH] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -10397,13 +8914,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Elijah),
- .party = {.NoItemDefaultMoves = sParty_Elijah},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Elijah),
},
[TRAINER_CELIA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PICNICKER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
.trainerPic = TRAINER_PIC_PICNICKER,
@@ -10411,13 +8926,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Celia),
- .party = {.NoItemDefaultMoves = sParty_Celia},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Celia),
},
[TRAINER_BRYAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -10425,13 +8938,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bryan),
- .party = {.NoItemDefaultMoves = sParty_Bryan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bryan),
},
[TRAINER_BRANDEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
@@ -10439,13 +8950,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Branden),
- .party = {.NoItemDefaultMoves = sParty_Branden},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Branden),
},
[TRAINER_BRYANT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -10453,13 +8962,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Bryant),
- .party = {.NoItemDefaultMoves = sParty_Bryant},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Bryant),
},
[TRAINER_SHAYLA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AROMA_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_AROMA_LADY,
@@ -10467,13 +8974,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Shayla),
- .party = {.NoItemDefaultMoves = sParty_Shayla},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Shayla),
},
[TRAINER_KYRA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -10481,13 +8986,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Kyra),
- .party = {.NoItemDefaultMoves = sParty_Kyra},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Kyra),
},
[TRAINER_JAIDEN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_NINJA_BOY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_NINJA_BOY,
@@ -10495,13 +8998,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Jaiden),
- .party = {.NoItemDefaultMoves = sParty_Jaiden},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Jaiden),
},
[TRAINER_ALIX] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -10509,13 +9010,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Alix),
- .party = {.NoItemDefaultMoves = sParty_Alix},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alix),
},
[TRAINER_HELENE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -10523,13 +9022,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Helene),
- .party = {.NoItemDefaultMoves = sParty_Helene},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Helene),
},
[TRAINER_MARLENE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -10537,13 +9034,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Marlene),
- .party = {.NoItemDefaultMoves = sParty_Marlene},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Marlene),
},
[TRAINER_DEVAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -10551,13 +9046,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Devan),
- .party = {.NoItemDefaultMoves = sParty_Devan},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Devan),
},
[TRAINER_JOHNSON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_YOUNGSTER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_YOUNGSTER,
@@ -10565,13 +9058,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Johnson),
- .party = {.NoItemDefaultMoves = sParty_Johnson},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Johnson),
},
[TRAINER_MELINA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
@@ -10579,13 +9070,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Melina),
- .party = {.NoItemDefaultMoves = sParty_Melina},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Melina),
},
[TRAINER_BRANDI] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -10593,13 +9082,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Brandi),
- .party = {.NoItemDefaultMoves = sParty_Brandi},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brandi),
},
[TRAINER_AISHA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -10607,13 +9094,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Aisha),
- .party = {.NoItemDefaultMoves = sParty_Aisha},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Aisha),
},
[TRAINER_MAKAYLA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_EXPERT,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_EXPERT_F,
@@ -10621,13 +9106,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Makayla),
- .party = {.NoItemDefaultMoves = sParty_Makayla},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Makayla),
},
[TRAINER_FABIAN] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -10635,13 +9118,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Fabian),
- .party = {.NoItemDefaultMoves = sParty_Fabian},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fabian),
},
[TRAINER_DAYTON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_KINDLER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_KINDLER,
@@ -10649,13 +9130,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Dayton),
- .party = {.NoItemDefaultMoves = sParty_Dayton},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Dayton),
},
[TRAINER_RACHEL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PARASOL_LADY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_PARASOL_LADY,
@@ -10663,13 +9142,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Rachel),
- .party = {.NoItemDefaultMoves = sParty_Rachel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Rachel),
},
[TRAINER_LEONEL] =
{
- .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_M,
@@ -10677,13 +9154,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Leonel),
- .party = {.NoItemCustomMoves = sParty_Leonel},
+ .party = NO_ITEM_CUSTOM_MOVES(sParty_Leonel),
},
[TRAINER_CALLIE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
@@ -10691,13 +9166,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Callie),
- .party = {.NoItemDefaultMoves = sParty_Callie},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Callie),
},
[TRAINER_CALE] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -10705,13 +9178,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cale),
- .party = {.NoItemDefaultMoves = sParty_Cale},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cale),
},
[TRAINER_MYLES] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
@@ -10719,13 +9190,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Myles),
- .party = {.NoItemDefaultMoves = sParty_Myles},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Myles),
},
[TRAINER_PAT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -10733,13 +9202,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pat),
- .party = {.NoItemDefaultMoves = sParty_Pat},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pat),
},
[TRAINER_CRISTIN_1] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -10747,13 +9214,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Cristin1),
- .party = {.NoItemDefaultMoves = sParty_Cristin1},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristin1),
},
[TRAINER_MAY_RUSTBORO_TREECKO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -10761,13 +9226,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRustboroTreecko),
- .party = {.NoItemDefaultMoves = sParty_MayRustboroTreecko},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroTreecko),
},
[TRAINER_MAY_RUSTBORO_TORCHIC] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_MAY,
@@ -10775,13 +9238,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_MayRustboroTorchic),
- .party = {.NoItemDefaultMoves = sParty_MayRustboroTorchic},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroTorchic),
},
[TRAINER_ROXANNE_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_ROXANNE,
@@ -10789,13 +9250,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Roxanne2),
- .party = {.ItemCustomMoves = sParty_Roxanne2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Roxanne2),
},
[TRAINER_ROXANNE_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_ROXANNE,
@@ -10803,13 +9262,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Roxanne3),
- .party = {.ItemCustomMoves = sParty_Roxanne3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Roxanne3),
},
[TRAINER_ROXANNE_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_ROXANNE,
@@ -10817,13 +9274,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Roxanne4),
- .party = {.ItemCustomMoves = sParty_Roxanne4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Roxanne4),
},
[TRAINER_ROXANNE_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_ROXANNE,
@@ -10831,13 +9286,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Roxanne5),
- .party = {.ItemCustomMoves = sParty_Roxanne5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Roxanne5),
},
[TRAINER_BRAWLY_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_BRAWLY,
@@ -10845,13 +9298,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brawly2),
- .party = {.ItemCustomMoves = sParty_Brawly2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Brawly2),
},
[TRAINER_BRAWLY_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_BRAWLY,
@@ -10859,13 +9310,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brawly3),
- .party = {.ItemCustomMoves = sParty_Brawly3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Brawly3),
},
[TRAINER_BRAWLY_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_BRAWLY,
@@ -10873,13 +9322,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brawly4),
- .party = {.ItemCustomMoves = sParty_Brawly4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Brawly4),
},
[TRAINER_BRAWLY_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_BRAWLY,
@@ -10887,13 +9334,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brawly5),
- .party = {.ItemCustomMoves = sParty_Brawly5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Brawly5),
},
[TRAINER_WATTSON_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_WATTSON,
@@ -10901,13 +9346,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wattson2),
- .party = {.ItemCustomMoves = sParty_Wattson2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Wattson2),
},
[TRAINER_WATTSON_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_WATTSON,
@@ -10915,13 +9358,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wattson3),
- .party = {.ItemCustomMoves = sParty_Wattson3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Wattson3),
},
[TRAINER_WATTSON_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_WATTSON,
@@ -10929,13 +9370,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wattson4),
- .party = {.ItemCustomMoves = sParty_Wattson4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Wattson4),
},
[TRAINER_WATTSON_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_WATTSON,
@@ -10943,13 +9382,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Wattson5),
- .party = {.ItemCustomMoves = sParty_Wattson5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Wattson5),
},
[TRAINER_FLANNERY_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_FLANNERY,
@@ -10957,13 +9394,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Flannery2),
- .party = {.ItemCustomMoves = sParty_Flannery2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Flannery2),
},
[TRAINER_FLANNERY_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_FLANNERY,
@@ -10971,13 +9406,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Flannery3),
- .party = {.ItemCustomMoves = sParty_Flannery3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Flannery3),
},
[TRAINER_FLANNERY_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_FLANNERY,
@@ -10985,13 +9418,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Flannery4),
- .party = {.ItemCustomMoves = sParty_Flannery4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Flannery4),
},
[TRAINER_FLANNERY_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_FLANNERY,
@@ -10999,13 +9430,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Flannery5),
- .party = {.ItemCustomMoves = sParty_Flannery5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Flannery5),
},
[TRAINER_NORMAN_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_NORMAN,
@@ -11013,13 +9442,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Norman2),
- .party = {.ItemCustomMoves = sParty_Norman2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Norman2),
},
[TRAINER_NORMAN_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_NORMAN,
@@ -11027,13 +9454,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Norman3),
- .party = {.ItemCustomMoves = sParty_Norman3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Norman3),
},
[TRAINER_NORMAN_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_NORMAN,
@@ -11041,13 +9466,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Norman4),
- .party = {.ItemCustomMoves = sParty_Norman4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Norman4),
},
[TRAINER_NORMAN_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_NORMAN,
@@ -11055,13 +9478,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Norman5),
- .party = {.ItemCustomMoves = sParty_Norman5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Norman5),
},
[TRAINER_WINONA_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_WINONA,
@@ -11069,13 +9490,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
- .partySize = ARRAY_COUNT(sParty_Winona2),
- .party = {.ItemCustomMoves = sParty_Winona2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Winona2),
},
[TRAINER_WINONA_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_WINONA,
@@ -11083,13 +9502,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
- .partySize = ARRAY_COUNT(sParty_Winona3),
- .party = {.ItemCustomMoves = sParty_Winona3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Winona3),
},
[TRAINER_WINONA_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_WINONA,
@@ -11097,13 +9514,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
- .partySize = ARRAY_COUNT(sParty_Winona4),
- .party = {.ItemCustomMoves = sParty_Winona4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Winona4),
},
[TRAINER_WINONA_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_WINONA,
@@ -11111,13 +9526,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
- .partySize = ARRAY_COUNT(sParty_Winona5),
- .party = {.ItemCustomMoves = sParty_Winona5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Winona5),
},
[TRAINER_TATE_AND_LIZA_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
@@ -11125,13 +9538,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_TateAndLiza2),
- .party = {.ItemCustomMoves = sParty_TateAndLiza2},
+ .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza2),
},
[TRAINER_TATE_AND_LIZA_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
@@ -11139,13 +9550,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_TateAndLiza3),
- .party = {.ItemCustomMoves = sParty_TateAndLiza3},
+ .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza3),
},
[TRAINER_TATE_AND_LIZA_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
@@ -11153,13 +9562,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_TateAndLiza4),
- .party = {.ItemCustomMoves = sParty_TateAndLiza4},
+ .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza4),
},
[TRAINER_TATE_AND_LIZA_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
@@ -11167,13 +9574,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_TateAndLiza5),
- .party = {.ItemCustomMoves = sParty_TateAndLiza5},
+ .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza5),
},
[TRAINER_JUAN_2] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_JUAN,
@@ -11181,13 +9586,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Juan2),
- .party = {.ItemCustomMoves = sParty_Juan2},
+ .party = ITEM_CUSTOM_MOVES(sParty_Juan2),
},
[TRAINER_JUAN_3] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_JUAN,
@@ -11195,13 +9598,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Juan3),
- .party = {.ItemCustomMoves = sParty_Juan3},
+ .party = ITEM_CUSTOM_MOVES(sParty_Juan3),
},
[TRAINER_JUAN_4] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_JUAN,
@@ -11209,13 +9610,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Juan4),
- .party = {.ItemCustomMoves = sParty_Juan4},
+ .party = ITEM_CUSTOM_MOVES(sParty_Juan4),
},
[TRAINER_JUAN_5] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_LEADER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEADER_JUAN,
@@ -11223,13 +9622,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Juan5),
- .party = {.ItemCustomMoves = sParty_Juan5},
+ .party = ITEM_CUSTOM_MOVES(sParty_Juan5),
},
[TRAINER_ANGELO] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_BUG_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
.trainerPic = TRAINER_PIC_BUG_MANIAC,
@@ -11237,13 +9634,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Angelo),
- .party = {.ItemCustomMoves = sParty_Angelo},
+ .party = ITEM_CUSTOM_MOVES(sParty_Angelo),
},
[TRAINER_DARIUS] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BIRD_KEEPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BIRD_KEEPER,
@@ -11251,13 +9646,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Darius),
- .party = {.NoItemDefaultMoves = sParty_Darius},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Darius),
},
[TRAINER_STEVEN] =
{
- .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_STEVEN,
@@ -11265,13 +9658,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Steven),
- .party = {.ItemCustomMoves = sParty_Steven},
+ .party = ITEM_CUSTOM_MOVES(sParty_Steven),
},
[TRAINER_ANABEL] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SALON_MAIDEN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SALON_MAIDEN_ANABEL,
@@ -11279,13 +9670,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Anabel),
- .party = {.NoItemDefaultMoves = sParty_Anabel},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Anabel),
},
[TRAINER_TUCKER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_DOME_ACE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_DOME_ACE_TUCKER,
@@ -11293,13 +9682,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Tucker),
- .party = {.NoItemDefaultMoves = sParty_Tucker},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Tucker),
},
[TRAINER_SPENSER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PALACE_MAVEN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_PALACE_MAVEN_SPENSER,
@@ -11307,13 +9694,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Spenser),
- .party = {.NoItemDefaultMoves = sParty_Spenser},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Spenser),
},
[TRAINER_GRETA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_ARENA_TYCOON,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_ARENA_TYCOON_GRETA,
@@ -11321,13 +9706,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Greta),
- .party = {.NoItemDefaultMoves = sParty_Greta},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Greta),
},
[TRAINER_NOLAND] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_FACTORY_HEAD,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_FACTORY_HEAD_NOLAND,
@@ -11335,13 +9718,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Noland),
- .party = {.NoItemDefaultMoves = sParty_Noland},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Noland),
},
[TRAINER_LUCY] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PIKE_QUEEN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_PIKE_QUEEN_LUCY,
@@ -11349,13 +9730,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Lucy),
- .party = {.NoItemDefaultMoves = sParty_Lucy},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Lucy),
},
[TRAINER_BRANDON] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PYRAMID_KING,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_PYRAMID_KING_BRANDON,
@@ -11363,13 +9742,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Brandon),
- .party = {.NoItemDefaultMoves = sParty_Brandon},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Brandon),
},
[TRAINER_ANDRES_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -11377,13 +9754,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andres2),
- .party = {.NoItemDefaultMoves = sParty_Andres2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres2),
},
[TRAINER_ANDRES_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -11391,13 +9766,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andres3),
- .party = {.NoItemDefaultMoves = sParty_Andres3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres3),
},
[TRAINER_ANDRES_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -11405,13 +9778,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andres4),
- .party = {.NoItemDefaultMoves = sParty_Andres4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres4),
},
[TRAINER_ANDRES_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RUIN_MANIAC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_RUIN_MANIAC,
@@ -11419,13 +9790,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Andres5),
- .party = {.NoItemDefaultMoves = sParty_Andres5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres5),
},
[TRAINER_CORY_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -11433,13 +9802,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cory2),
- .party = {.NoItemDefaultMoves = sParty_Cory2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory2),
},
[TRAINER_CORY_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -11447,13 +9814,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cory3),
- .party = {.NoItemDefaultMoves = sParty_Cory3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory3),
},
[TRAINER_CORY_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -11461,13 +9826,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cory4),
- .party = {.NoItemDefaultMoves = sParty_Cory4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory4),
},
[TRAINER_CORY_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_SAILOR,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_SAILOR,
@@ -11475,13 +9838,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Cory5),
- .party = {.NoItemDefaultMoves = sParty_Cory5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory5),
},
[TRAINER_PABLO_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -11489,13 +9850,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pablo2),
- .party = {.NoItemDefaultMoves = sParty_Pablo2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo2),
},
[TRAINER_PABLO_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -11503,13 +9862,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pablo3),
- .party = {.NoItemDefaultMoves = sParty_Pablo3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo3),
},
[TRAINER_PABLO_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -11517,13 +9874,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pablo4),
- .party = {.NoItemDefaultMoves = sParty_Pablo4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo4),
},
[TRAINER_PABLO_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
.trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
@@ -11531,13 +9886,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Pablo5),
- .party = {.NoItemDefaultMoves = sParty_Pablo5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo5),
},
[TRAINER_KOJI_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -11545,13 +9898,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Koji2),
- .party = {.NoItemDefaultMoves = sParty_Koji2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji2),
},
[TRAINER_KOJI_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -11559,13 +9910,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Koji3),
- .party = {.NoItemDefaultMoves = sParty_Koji3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji3),
},
[TRAINER_KOJI_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -11573,13 +9922,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Koji4),
- .party = {.NoItemDefaultMoves = sParty_Koji4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji4),
},
[TRAINER_KOJI_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BLACK_BELT,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_BLACK_BELT,
@@ -11587,13 +9934,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Koji5),
- .party = {.NoItemDefaultMoves = sParty_Koji5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji5),
},
[TRAINER_CRISTIN_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -11601,13 +9946,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Cristin2),
- .party = {.NoItemDefaultMoves = sParty_Cristin2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristin2),
},
[TRAINER_CRISTIN_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -11615,13 +9958,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Cristin3),
- .party = {.NoItemDefaultMoves = sParty_Cristin3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristin3),
},
[TRAINER_CRISTIN_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -11629,13 +9970,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Cristin4),
- .party = {.NoItemDefaultMoves = sParty_Cristin4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristin4),
},
[TRAINER_CRISTIN_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_COOLTRAINER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_COOLTRAINER_F,
@@ -11643,13 +9982,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Cristin5),
- .party = {.NoItemDefaultMoves = sParty_Cristin5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristin5),
},
[TRAINER_FERNANDO_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -11657,13 +9994,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Fernando2),
- .party = {.NoItemDefaultMoves = sParty_Fernando2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando2),
},
[TRAINER_FERNANDO_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -11671,13 +10006,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Fernando3),
- .party = {.NoItemDefaultMoves = sParty_Fernando3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando3),
},
[TRAINER_FERNANDO_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -11685,13 +10018,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Fernando4),
- .party = {.NoItemDefaultMoves = sParty_Fernando4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando4),
},
[TRAINER_FERNANDO_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GUITARIST,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_GUITARIST,
@@ -11699,13 +10030,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Fernando5),
- .party = {.NoItemDefaultMoves = sParty_Fernando5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando5),
},
[TRAINER_SAWYER_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -11713,13 +10042,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sawyer2),
- .party = {.NoItemDefaultMoves = sParty_Sawyer2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer2),
},
[TRAINER_SAWYER_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -11727,13 +10054,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sawyer3),
- .party = {.NoItemDefaultMoves = sParty_Sawyer3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer3),
},
[TRAINER_SAWYER_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -11741,13 +10066,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sawyer4),
- .party = {.NoItemDefaultMoves = sParty_Sawyer4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer4),
},
[TRAINER_SAWYER_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_HIKER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
.trainerPic = TRAINER_PIC_HIKER,
@@ -11755,13 +10078,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
- .partySize = ARRAY_COUNT(sParty_Sawyer5),
- .party = {.NoItemDefaultMoves = sParty_Sawyer5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer5),
},
[TRAINER_GABRIELLE_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -11769,13 +10090,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gabrielle2),
- .party = {.NoItemDefaultMoves = sParty_Gabrielle2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle2),
},
[TRAINER_GABRIELLE_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -11783,13 +10102,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gabrielle3),
- .party = {.NoItemDefaultMoves = sParty_Gabrielle3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle3),
},
[TRAINER_GABRIELLE_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -11797,13 +10114,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gabrielle4),
- .party = {.NoItemDefaultMoves = sParty_Gabrielle4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle4),
},
[TRAINER_GABRIELLE_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_BREEDER,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
@@ -11811,13 +10126,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Gabrielle5),
- .party = {.NoItemDefaultMoves = sParty_Gabrielle5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle5),
},
[TRAINER_THALIA_2] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -11825,13 +10138,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Thalia2),
- .party = {.NoItemDefaultMoves = sParty_Thalia2},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia2),
},
[TRAINER_THALIA_3] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -11839,13 +10150,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Thalia3),
- .party = {.NoItemDefaultMoves = sParty_Thalia3},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia3),
},
[TRAINER_THALIA_4] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -11853,13 +10162,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Thalia4),
- .party = {.NoItemDefaultMoves = sParty_Thalia4},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia4),
},
[TRAINER_THALIA_5] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
@@ -11867,13 +10174,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
- .partySize = ARRAY_COUNT(sParty_Thalia5),
- .party = {.NoItemDefaultMoves = sParty_Thalia5},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia5),
},
[TRAINER_MARIELA] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_F,
@@ -11881,13 +10186,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Mariela),
- .party = {.NoItemDefaultMoves = sParty_Mariela},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Mariela),
},
[TRAINER_ALVARO] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PSYCHIC,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_PSYCHIC_M,
@@ -11895,13 +10198,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Alvaro),
- .party = {.NoItemDefaultMoves = sParty_Alvaro},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Alvaro),
},
[TRAINER_EVERETT] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_GENTLEMAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
.trainerPic = TRAINER_PIC_GENTLEMAN,
@@ -11909,13 +10210,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Everett),
- .party = {.NoItemDefaultMoves = sParty_Everett},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Everett),
},
[TRAINER_RED] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RED,
@@ -11923,13 +10222,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Red),
- .party = {.NoItemDefaultMoves = sParty_Red},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Red),
},
[TRAINER_LEAF] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RIVAL,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_LEAF,
@@ -11937,13 +10234,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_Leaf),
- .party = {.NoItemDefaultMoves = sParty_Leaf},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_Leaf),
},
[TRAINER_BRENDAN_PLACEHOLDER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PROTAG,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RS_BRENDAN,
@@ -11951,13 +10246,11 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_BrendanLinkPlaceholder),
- .party = {.NoItemDefaultMoves = sParty_BrendanLinkPlaceholder},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLinkPlaceholder),
},
[TRAINER_MAY_PLACEHOLDER] =
{
- .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PROTAG,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RS_MAY,
@@ -11965,7 +10258,6 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
- .partySize = ARRAY_COUNT(sParty_MayLinkPlaceholder),
- .party = {.NoItemDefaultMoves = sParty_MayLinkPlaceholder},
+ .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLinkPlaceholder),
},
};
diff --git a/src/daycare.c b/src/daycare.c
index f169ef695e..d293e51175 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1301,7 +1301,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
else if (JOY_NEW(B_BUTTON))
{
@@ -1310,7 +1310,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
diff --git a/src/decompress.c b/src/decompress.c
index d9d5f8c139..4f17edcf86 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -45,7 +45,7 @@ void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src)
struct SpritePalette dest;
LZ77UnCompWram(src->data, gDecompressionBuffer);
- dest.data = (void*) gDecompressionBuffer;
+ dest.data = (void *) gDecompressionBuffer;
dest.tag = src->tag;
LoadSpritePalette(&dest);
}
@@ -60,7 +60,7 @@ void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePale
LoadSpritePalette(&dest);
}
-void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species)
+void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer, s32 species)
{
if (species > NUM_SPECIES)
LZ77UnCompWram(gMonFrontPicTable[0].data, buffer);
@@ -308,12 +308,12 @@ u32 GetDecompressedDataSize(const u32 *ptr)
return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]);
}
-bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src)
+bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet *src)
{
struct SpriteSheet dest;
- void* buffer;
+ void *buffer;
- buffer = AllocZeroed(*((u32*)(&src->data[0])) >> 8);
+ buffer = AllocZeroed(*((u32 *)(&src->data[0])) >> 8);
LZ77UnCompWram(src->data, buffer);
dest.data = buffer;
@@ -328,9 +328,9 @@ bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src
bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src)
{
struct SpritePalette dest;
- void* buffer;
+ void *buffer;
- buffer = AllocZeroed(*((u32*)(&src->data[0])) >> 8);
+ buffer = AllocZeroed(*((u32 *)(&src->data[0])) >> 8);
LZ77UnCompWram(src->data, buffer);
dest.data = buffer;
dest.tag = src->tag;
diff --git a/src/decoration.c b/src/decoration.c
index 547b05acf4..cc740f189e 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -563,7 +563,7 @@ static void AddDecorationActionsWindow(void)
static void InitDecorationActionsWindow(void)
{
sDecorationActionsCursorPos = 0;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
AddDecorationActionsWindow();
PrintCurMainMenuDescription();
}
@@ -615,7 +615,7 @@ static void HandleDecorationActionsMenuInput(u8 taskId)
static void PrintCurMainMenuDescription(void)
{
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sSecretBasePCMenuItemDescriptions[sDecorationActionsCursorPos], 0, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sSecretBasePCMenuItemDescriptions[sDecorationActionsCursorPos], 0, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
static void DecorationMenuAction_Decorate(u8 taskId)
@@ -643,7 +643,7 @@ static void DecorationMenuAction_PutAway(u8 taskId)
else
{
RemoveDecorationWindow(WINDOW_MAIN_MENU);
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].tState = 0;
gTasks[taskId].func = Task_ContinuePuttingAwayDecorations;
@@ -670,7 +670,7 @@ static void DecorationMenuAction_Cancel(u8 taskId)
RemoveDecorationWindow(WINDOW_MAIN_MENU);
if (!sDecorationContext.isPlayerRoom)
{
- ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel);
+ ScriptContext_SetupScript(SecretBase_EventScript_PCCancel);
DestroyTask(taskId);
}
else
@@ -688,7 +688,7 @@ static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId)
static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId)
{
LoadPalette(sDecorationMenuPalette, 0xd0, 0x20);
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
RemoveDecorationWindow(WINDOW_MAIN_MENU);
InitDecorationCategoriesWindow(taskId);
}
@@ -810,7 +810,7 @@ static void SelectDecorationCategory(u8 taskId)
static void ReturnToDecorationCategoriesAfterInvalidSelection(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
InitDecorationCategoriesWindow(taskId);
}
@@ -834,7 +834,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId)
void ShowDecorationCategoriesWindow(u8 taskId)
{
LoadPalette(sDecorationMenuPalette, 0xd0, 0x20);
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
gTasks[taskId].tDecorationMenuCommand = DECOR_MENU_TRADE;
sCurDecorationCategory = DECORCAT_DESK;
InitDecorationCategoriesWindow(taskId);
@@ -1141,7 +1141,7 @@ static void Task_ShowDecorationItemsWindow(u8 taskId)
static void DontTossDecoration(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
gTasks[taskId].func = Task_ShowDecorationItemsWindow;
}
@@ -1149,7 +1149,7 @@ static void ReturnToDecorationItemsAfterInvalidSelection(u8 taskId)
{
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
AddDecorationWindow(WINDOW_DECORATION_CATEGORIES);
ShowDecorationItemsWindow(taskId);
}
@@ -1640,7 +1640,7 @@ static void PlaceDecorationPrompt(u8 taskId)
static void PlaceDecoration(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
PlaceDecoration_(taskId);
if (gDecorations[gCurDecorationItems[gCurDecorationIndex]].permission != DECORPERM_SPRITE)
{
@@ -1650,7 +1650,7 @@ static void PlaceDecoration(u8 taskId)
{
sCurDecorMapX = gTasks[taskId].tCursorX - MAP_OFFSET;
sCurDecorMapY = gTasks[taskId].tCursorY - MAP_OFFSET;
- ScriptContext1_SetupScript(SecretBase_EventScript_SetDecoration);
+ ScriptContext_SetupScript(SecretBase_EventScript_SetDecoration);
}
gSprites[sDecor_CameraSpriteObjectIdx1].y += 2;
@@ -1706,7 +1706,7 @@ static void CancelDecoratingPrompt(u8 taskId)
static void CancelDecorating(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
CancelDecorating_(taskId);
}
@@ -1722,7 +1722,7 @@ static void c1_overworld_prev_quest(u8 taskId)
switch (gTasks[taskId].tState)
{
case 0:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
if (!gPaletteFade.active)
{
WarpToInitialPosition(taskId);
@@ -1749,11 +1749,11 @@ static void Task_InitDecorationItemsWindow(u8 taskId)
tState++;
break;
case 1:
- ScriptContext1_SetupScript(SecretBase_EventScript_InitDecorations);
+ ScriptContext_SetupScript(SecretBase_EventScript_InitDecorations);
tState++;
break;
case 2:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
tState++;
break;
case 3:
@@ -1767,7 +1767,7 @@ static void FieldCB_InitDecorationItemsWindow(void)
{
u8 taskId;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeInFromBlack();
taskId = CreateTask(Task_InitDecorationItemsWindow, 8);
AddDecorationItemsWindow(taskId);
@@ -1891,7 +1891,7 @@ static void Task_SelectLocation(u8 taskId)
static void ContinueDecorating(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
gTasks[taskId].tButton = 0;
gTasks[taskId].func = Task_SelectLocation;
@@ -1985,7 +1985,7 @@ static void SetDecorSelectionBoxOamAttributes(u8 decorShape)
sDecorSelectorOam.y = 0;
sDecorSelectorOam.affineMode = ST_OAM_AFFINE_OFF;
sDecorSelectorOam.objMode = ST_OAM_OBJ_NORMAL;
- sDecorSelectorOam.mosaic = 0;
+ sDecorSelectorOam.mosaic = FALSE;
sDecorSelectorOam.bpp = ST_OAM_4BPP;
sDecorSelectorOam.shape = sDecorationMovementInfo[decorShape].shape;
sDecorSelectorOam.x = 0;
@@ -2246,13 +2246,13 @@ static void Task_PutAwayDecoration(u8 taskId)
case 1:
if (!gPaletteFade.active) {
DrawWholeMapView();
- ScriptContext1_SetupScript(SecretBase_EventScript_PutAwayDecoration);
- ClearDialogWindowAndFrame(0, 1);
+ ScriptContext_SetupScript(SecretBase_EventScript_PutAwayDecoration);
+ ClearDialogWindowAndFrame(0, TRUE);
gTasks[taskId].tState = 2;
}
break;
case 2:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId);
FadeInFromBlack();
gTasks[taskId].tState = 3;
@@ -2331,7 +2331,7 @@ static void Task_ContinuePuttingAwayDecorations(u8 taskId)
static void ContinuePuttingAwayDecorations(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE;
gSprites[sDecor_CameraSpriteObjectIdx1].callback = InitializeCameraSprite1;
@@ -2604,7 +2604,7 @@ static void StopPuttingAwayDecorationsPrompt(u8 taskId)
static void StopPuttingAwayDecorations(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
StopPuttingAwayDecorations_(taskId);
}
@@ -2645,11 +2645,11 @@ static void Task_ReinitializeDecorationMenuHandler(u8 taskId)
tState++;
break;
case 1:
- ScriptContext1_SetupScript(SecretBase_EventScript_InitDecorations);
+ ScriptContext_SetupScript(SecretBase_EventScript_InitDecorations);
tState++;
break;
case 2:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
tState++;
break;
case 3:
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c
index f887dafb95..f68f0446c3 100644
--- a/src/digit_obj_util.c
+++ b/src/digit_obj_util.c
@@ -138,7 +138,7 @@ bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemp
{
struct CompressedSpriteSheet compSpriteSheet;
- compSpriteSheet = *(struct CompressedSpriteSheet*)(template->spriteSheet);
+ compSpriteSheet = *(struct CompressedSpriteSheet *)(template->spriteSheet);
compSpriteSheet.size = GetDecompressedDataSize(template->spriteSheet->data);
sOamWork->array[id].tileStart = LoadCompressedSpriteSheet(&compSpriteSheet);
}
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index b87fe3092b..11bf12925b 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -323,7 +323,7 @@ static bool32 TryPickBerry(u8, u8, u8);
static void UpdateFallingBerries(void);
static void UpdateGame_Leader(void);
static void UpdateGame_Member(void);
-static void GetActiveBerryColumns(u8, u8*, u8*);
+static void GetActiveBerryColumns(u8, u8 *, u8 *);
static bool32 AllPlayersReadyToStart(void);
static void ResetReadyToStart(void);
static bool32 ReadyToEndGame_Leader(void);
@@ -1795,7 +1795,7 @@ static void VBlankCB_DodrioGame(void)
ProcessSpriteCopyRequests();
}
-static void InitMonInfo(struct DodrioGame_MonInfo * monInfo, struct Pokemon * mon)
+static void InitMonInfo(struct DodrioGame_MonInfo * monInfo, struct Pokemon *mon)
{
monInfo->isShiny = IsMonShiny(mon);
}
@@ -2988,7 +2988,7 @@ static void Task_ShowDodrioBerryPickingRecords(u8 taskId)
{
RemoveWindow(tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
break;
}
@@ -3608,7 +3608,7 @@ static const struct OamData sOamData_Dodrio =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -3626,7 +3626,7 @@ static const struct OamData sOamData_16x16_Priority0 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -3643,7 +3643,7 @@ static const struct OamData sOamData_Berry =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -3660,7 +3660,7 @@ static const struct OamData sOamData_Cloud =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -5025,7 +5025,7 @@ static void Msg_SavingDontTurnOff(void)
{
case 0:
DrawDialogueFrame(0, FALSE);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
sGfx->state++;
break;
case 1:
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 2bbd16cb27..91b44fb26b 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -932,7 +932,7 @@ static const struct OamData sOamData_TriangleCursor = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -958,7 +958,7 @@ static const struct OamData sOamData_RectangleCursor = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -1019,7 +1019,7 @@ static const struct OamData sOamData_ModeWindow = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -1089,7 +1089,7 @@ static const struct OamData sOamData_ButtonWindow = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -1115,7 +1115,7 @@ static const struct OamData sOamData_StartSelectButton = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -1131,7 +1131,7 @@ static const struct OamData sOamData_ScrollIndicator = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index f99f8bee38..e280ef315b 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -69,14 +69,14 @@ extern const u8 gText_NicknameHatchPrompt[];
static void Task_EggHatch(u8);
static void CB2_LoadEggHatch(void);
static void CB2_EggHatch(void);
-static void SpriteCB_Egg_Shake1(struct Sprite*);
-static void SpriteCB_Egg_Shake2(struct Sprite*);
-static void SpriteCB_Egg_Shake3(struct Sprite*);
-static void SpriteCB_Egg_WaitHatch(struct Sprite*);
-static void SpriteCB_Egg_Hatch(struct Sprite*);
-static void SpriteCB_Egg_Reveal(struct Sprite*);
-static void SpriteCB_EggShard(struct Sprite*);
-static void EggHatchPrintMessage(u8, u8*, u8, u8, u8);
+static void SpriteCB_Egg_Shake1(struct Sprite *);
+static void SpriteCB_Egg_Shake2(struct Sprite *);
+static void SpriteCB_Egg_Shake3(struct Sprite *);
+static void SpriteCB_Egg_WaitHatch(struct Sprite *);
+static void SpriteCB_Egg_Hatch(struct Sprite *);
+static void SpriteCB_Egg_Reveal(struct Sprite *);
+static void SpriteCB_EggShard(struct Sprite *);
+static void EggHatchPrintMessage(u8, u8 *, u8, u8, u8);
static void CreateRandomEggShardSprite(void);
static void CreateEggShardSprite(u8, u8, s16, s16, s16, u8);
@@ -91,7 +91,7 @@ static const struct OamData sOamData_Egg =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -178,7 +178,7 @@ static const struct OamData sOamData_EggShard =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -363,7 +363,7 @@ static void AddHatchedMonToParty(u8 id)
u16 ball;
u16 metLevel;
u8 metLocation;
- struct Pokemon* mon = &gPlayerParty[id];
+ struct Pokemon *mon = &gPlayerParty[id];
CreateHatchedMon(mon, &gEnemyParty[0]);
SetMonData(mon, MON_DATA_IS_EGG, &isEgg);
@@ -420,11 +420,11 @@ bool8 CheckDaycareMonReceivedMail(void)
return _CheckDaycareMonReceivedMail(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
}
-static u8 EggHatchCreateMonSprite(u8 useAlt, u8 state, u8 partyId, u16* speciesLoc)
+static u8 EggHatchCreateMonSprite(u8 useAlt, u8 state, u8 partyId, u16 *speciesLoc)
{
u8 position = 0;
u8 spriteId = 0;
- struct Pokemon* mon = NULL;
+ struct Pokemon *mon = NULL;
if (useAlt == FALSE)
{
@@ -471,7 +471,7 @@ static void VBlankCB_EggHatch(void)
void EggHatch(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_EggHatch, 10);
FadeScreen(FADE_TO_BLACK, 0);
}
@@ -728,7 +728,7 @@ static void CB2_EggHatch(void)
#define sSinIdx data[1]
#define sDelayTimer data[2]
-static void SpriteCB_Egg_Shake1(struct Sprite* sprite)
+static void SpriteCB_Egg_Shake1(struct Sprite *sprite)
{
if (++sprite->sTimer > 20)
{
@@ -750,7 +750,7 @@ static void SpriteCB_Egg_Shake1(struct Sprite* sprite)
}
}
-static void SpriteCB_Egg_Shake2(struct Sprite* sprite)
+static void SpriteCB_Egg_Shake2(struct Sprite *sprite)
{
if (++sprite->sDelayTimer > 30)
{
@@ -775,7 +775,7 @@ static void SpriteCB_Egg_Shake2(struct Sprite* sprite)
}
}
-static void SpriteCB_Egg_Shake3(struct Sprite* sprite)
+static void SpriteCB_Egg_Shake3(struct Sprite *sprite)
{
if (++sprite->sDelayTimer > 30)
{
@@ -813,7 +813,7 @@ static void SpriteCB_Egg_Shake3(struct Sprite* sprite)
}
}
-static void SpriteCB_Egg_WaitHatch(struct Sprite* sprite)
+static void SpriteCB_Egg_WaitHatch(struct Sprite *sprite)
{
if (++sprite->sTimer > 50)
{
@@ -822,7 +822,7 @@ static void SpriteCB_Egg_WaitHatch(struct Sprite* sprite)
}
}
-static void SpriteCB_Egg_Hatch(struct Sprite* sprite)
+static void SpriteCB_Egg_Hatch(struct Sprite *sprite)
{
s16 i;
@@ -849,7 +849,7 @@ static void SpriteCB_Egg_Hatch(struct Sprite* sprite)
}
}
-static void SpriteCB_Egg_Reveal(struct Sprite* sprite)
+static void SpriteCB_Egg_Reveal(struct Sprite *sprite)
{
if (sprite->sTimer == 0)
{
@@ -877,7 +877,7 @@ static void SpriteCB_Egg_Reveal(struct Sprite* sprite)
#define sDeltaX data[4]
#define sDeltaY data[5]
-static void SpriteCB_EggShard(struct Sprite* sprite)
+static void SpriteCB_EggShard(struct Sprite *sprite)
{
sprite->sDeltaX += sprite->sVelocX;
sprite->sDeltaY += sprite->sVelocY;
@@ -914,7 +914,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 velocityX, s16 velocityY, s16 a
StartSpriteAnim(&gSprites[spriteId], spriteAnimIndex);
}
-static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
+static void EggHatchPrintMessage(u8 windowId, u8 *string, u8 x, u8 y, u8 speed)
{
FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
sEggHatchData->textColor[0] = 0;
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index 314fb17342..aaaaf00eeb 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -15,7 +15,8 @@
#include "constants/items.h"
#include "constants/trainer_hill.h"
-STATIC_ASSERT(sizeof(struct TrainerHillChallenge) <= SECTOR_DATA_SIZE, TrainerHillChallengeFreeSpace);
+// Save data using TryWriteSpecialSaveSector is allowed to exceed SECTOR_DATA_SIZE (up to the counter field)
+STATIC_ASSERT(sizeof(struct TrainerHillChallenge) <= SECTOR_COUNTER_OFFSET, TrainerHillChallengeFreeSpace);
struct SendRecvMgr
{
@@ -472,7 +473,7 @@ bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet * hillSet)
return result;
}
-static bool32 TryReadTrainerHill_Internal(struct EReaderTrainerHillSet * dest, u8 * buffer)
+static bool32 TryReadTrainerHill_Internal(struct EReaderTrainerHillSet * dest, u8 *buffer)
{
if (TryReadSpecialSaveSector(SECTOR_ID_TRAINER_HILL, buffer) != SAVE_STATUS_OK)
return FALSE;
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index a22b85babd..3baff84a85 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -397,8 +397,8 @@ static void Task_EReader(u8 taskId)
break;
case ER_STATE_CONNECTING:
AddTextPrinterToWindow1(gJPText_Connecting);
- // XXX: This (u32*) cast is discarding the const qualifier from gMultiBootProgram_EReader_Start
- EReader_Load(&gEReaderData, gMultiBootProgram_EReader_End - gMultiBootProgram_EReader_Start, (u32*)gMultiBootProgram_EReader_Start);
+ // XXX: This (u32 *) cast is discarding the const qualifier from gMultiBootProgram_EReader_Start
+ EReader_Load(&gEReaderData, gMultiBootProgram_EReader_End - gMultiBootProgram_EReader_Start, (u32 *)gMultiBootProgram_EReader_Start);
data->state = ER_STATE_TRANSFER;
break;
case ER_STATE_TRANSFER:
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 90e713e638..87249af010 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -93,33 +93,33 @@ static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *, s16, s16, u
static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16);
static void UpdateObjectEventOffscreen(struct ObjectEvent *, struct Sprite *);
static void UpdateObjectEventSpriteVisibility(struct ObjectEvent *, struct Sprite *);
-static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*);
-static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32*);
-static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32*);
-static u8 ObjectEventGetNearbyReflectionType(struct ObjectEvent*);
+static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *);
+static void GetGroundEffectFlags_Reflection(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_SandHeap(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_Tracks(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_Puddle(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_Ripple(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *, u32 *);
+static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *, u32 *);
+static u8 ObjectEventGetNearbyReflectionType(struct ObjectEvent *);
static u8 GetReflectionTypeByMetatileBehavior(u32);
static void InitObjectPriorityByElevation(struct Sprite *, u8);
-static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*);
-static void DoTracksGroundEffect_None(struct ObjectEvent*, struct Sprite*, u8);
-static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8);
-static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8);
-static void DoRippleFieldEffect(struct ObjectEvent*, struct Sprite*);
-static void DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*);
-static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*);
-static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*);
-static void VirtualObject_UpdateAnim(struct Sprite*);
+static void ObjectEventUpdateSubpriority(struct ObjectEvent *, struct Sprite *);
+static void DoTracksGroundEffect_None(struct ObjectEvent *, struct Sprite *, u8);
+static void DoTracksGroundEffect_Footprints(struct ObjectEvent *, struct Sprite *, u8);
+static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *, struct Sprite *, u8);
+static void DoRippleFieldEffect(struct ObjectEvent *, struct Sprite *);
+static void DoGroundEffects_OnSpawn(struct ObjectEvent *, struct Sprite *);
+static void DoGroundEffects_OnBeginStep(struct ObjectEvent *, struct Sprite *);
+static void DoGroundEffects_OnFinishStep(struct ObjectEvent *, struct Sprite *);
+static void VirtualObject_UpdateAnim(struct Sprite *);
static void ApplyLevitateMovement(u8);
static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *);
static bool8 MovementType_Buried_Callback(struct ObjectEvent *, struct Sprite *);
@@ -1911,9 +1911,9 @@ void SetObjectInvisibility(u8 localId, u8 mapNum, u8 mapGroup, bool8 invisible)
void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup)
{
- *(u8*)(localId) = objectEvent->localId;
- *(u8*)(mapNum) = objectEvent->mapNum;
- *(u8*)(mapGroup) = objectEvent->mapGroup;
+ *(u8 *)(localId) = objectEvent->localId;
+ *(u8 *)(mapNum) = objectEvent->mapNum;
+ *(u8 *)(mapGroup) = objectEvent->mapGroup;
}
void AllowObjectAtPosTriggerGroundEffects(s16 x, s16 y)
@@ -4630,7 +4630,7 @@ u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir)
u8 direction = dir;
if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y))
return COLLISION_OUTSIDE_RANGE;
- else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == CONNECTION_INVALID || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction))
+ else if (MapGridGetCollisionAt(x, y) || GetMapBorderIdAt(x, y) == CONNECTION_INVALID || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction))
return COLLISION_IMPASSABLE;
else if (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction))
return COLLISION_IMPASSABLE;
@@ -4647,7 +4647,7 @@ u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 d
if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y))
flags |= 1 << (COLLISION_OUTSIDE_RANGE - 1);
- if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == CONNECTION_INVALID || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction) || (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)))
+ if (MapGridGetCollisionAt(x, y) || GetMapBorderIdAt(x, y) == CONNECTION_INVALID || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction) || (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)))
flags |= 1 << (COLLISION_IMPASSABLE - 1);
if (IsElevationMismatchAt(objectEvent->currentElevation, x, y))
flags |= 1 << (COLLISION_ELEVATION_MISMATCH - 1);
@@ -8746,13 +8746,13 @@ static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *
FieldEffectStart(FLDEFF_RIPPLE);
}
-u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *) = {
- MovementAction_StoreAndLockAnim_Step0,
+u8 (*const gMovementActionFuncs_LockAnim[])(struct ObjectEvent *, struct Sprite *) = {
+ MovementAction_LockAnim_Step0,
MovementAction_Finish,
};
-u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *) = {
- MovementAction_FreeAndUnlockAnim_Step0,
+u8 (*const gMovementActionFuncs_UnlockAnim[])(struct ObjectEvent *, struct Sprite *) = {
+ MovementAction_UnlockAnim_Step0,
MovementAction_Finish,
};
@@ -8768,36 +8768,36 @@ u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *
MovementAction_Fly_Finish,
};
-u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+u8 MovementAction_LockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
bool32 ableToStore = FALSE;
if (sLockedAnimObjectEvents == NULL)
{
sLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents));
- sLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId;
+ sLockedAnimObjectEvents->localIds[0] = objectEvent->localId;
sLockedAnimObjectEvents->count = 1;
ableToStore = TRUE;
}
else
{
u8 i;
- u8 firstFreeSlot;
- bool32 found;
- for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
+ u8 firstFreeSlot = OBJECT_EVENTS_COUNT;
+ bool32 found = FALSE;
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- if (firstFreeSlot == 16 && sLockedAnimObjectEvents->objectEventIds[i] == 0)
+ if (firstFreeSlot == OBJECT_EVENTS_COUNT && sLockedAnimObjectEvents->localIds[i] == 0)
firstFreeSlot = i;
- if (sLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId)
+ if (sLockedAnimObjectEvents->localIds[i] == objectEvent->localId)
{
found = TRUE;
break;
}
}
- if (!found && firstFreeSlot != 16)
+ if (!found && firstFreeSlot != OBJECT_EVENTS_COUNT)
{
- sLockedAnimObjectEvents->objectEventIds[firstFreeSlot] = objectEvent->localId;
+ sLockedAnimObjectEvents->localIds[firstFreeSlot] = objectEvent->localId;
sLockedAnimObjectEvents->count++;
ableToStore = TRUE;
}
@@ -8813,7 +8813,7 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct
return TRUE;
}
-u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+u8 MovementAction_UnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
bool32 ableToStore;
u8 index;
@@ -8823,9 +8823,9 @@ u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struc
{
ableToStore = FALSE;
index = FindLockedObjectEventIndex(objectEvent);
- if (index != 16)
+ if (index != OBJECT_EVENTS_COUNT)
{
- sLockedAnimObjectEvents->objectEventIds[index] = 0;
+ sLockedAnimObjectEvents->localIds[index] = 0;
sLockedAnimObjectEvents->count--;
ableToStore = TRUE;
}
@@ -8848,7 +8848,7 @@ u8 FindLockedObjectEventIndex(struct ObjectEvent *objectEvent)
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- if (sLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId)
+ if (sLockedAnimObjectEvents->localIds[i] == objectEvent->localId)
return i;
}
return OBJECT_EVENTS_COUNT;
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index a6b558195b..a86f16201f 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -10,7 +10,7 @@
#include "palette.h"
#include "constants/rgb.h"
-static void SpriteCB_Sparkle_Dummy(struct Sprite* sprite);
+static void SpriteCB_Sparkle_Dummy(struct Sprite *sprite);
static void Task_Sparkles_SpiralUpward_Init(u8 taskId);
static void Task_Sparkles_SpiralUpward(u8 taskId);
@@ -58,7 +58,7 @@ static const struct OamData sOamData_EvoSparkle =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -127,7 +127,7 @@ static void SetEvoSparklesMatrices(void)
#define sTrigIdx data[6]
#define sTimer data[7]
-static void SpriteCB_Sparkle_SpiralUpward(struct Sprite* sprite)
+static void SpriteCB_Sparkle_SpiralUpward(struct Sprite *sprite)
{
if (sprite->y > 8)
{
@@ -167,7 +167,7 @@ static void CreateSparkle_SpiralUpward(u8 trigIdx)
}
}
-static void SpriteCB_Sparkle_ArcDown(struct Sprite* sprite)
+static void SpriteCB_Sparkle_ArcDown(struct Sprite *sprite)
{
if (sprite->y < 88)
{
@@ -196,7 +196,7 @@ static void CreateSparkle_ArcDown(u8 trigIdx)
}
}
-static void SpriteCB_Sparkle_CircleInward(struct Sprite* sprite)
+static void SpriteCB_Sparkle_CircleInward(struct Sprite *sprite)
{
if (sprite->sAmplitude > 8)
{
@@ -225,7 +225,7 @@ static void CreateSparkle_CircleInward(u8 trigIdx, u8 speed)
}
}
-static void SpriteCB_Sparkle_Spray(struct Sprite* sprite)
+static void SpriteCB_Sparkle_Spray(struct Sprite *sprite)
{
if (!(sprite->sTimer & 3))
sprite->y++;
@@ -492,7 +492,7 @@ static void Task_Sparkles_SprayAndFlashTrade(u8 taskId)
#undef tTimer
#undef tSpecies
-static void SpriteCB_EvolutionMonSprite(struct Sprite* sprite)
+static void SpriteCB_EvolutionMonSprite(struct Sprite *sprite)
{
}
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index a380170264..c9c2641c67 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -171,7 +171,7 @@ static void CB2_BeginEvolutionScene(void)
static void Task_BeginEvolutionScene(u8 taskId)
{
- struct Pokemon* mon = NULL;
+ struct Pokemon *mon = NULL;
switch (gTasks[taskId].tState)
{
case 0:
@@ -197,7 +197,7 @@ static void Task_BeginEvolutionScene(u8 taskId)
}
}
-void BeginEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId)
+void BeginEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId)
{
u8 taskId = CreateTask(Task_BeginEvolutionScene, 0);
gTasks[taskId].tState = 0;
@@ -207,17 +207,17 @@ void BeginEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopE
SetMainCallback2(CB2_BeginEvolutionScene);
}
-void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId)
+void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId)
{
u8 name[20];
u16 currSpecies;
u32 trainerId, personality;
const struct CompressedSpritePalette* pokePal;
- u8 ID;
+ u8 id;
SetHBlankCallback(NULL);
SetVBlankCallback(NULL);
- CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFill32(0, (void *)(VRAM), VRAM_SIZE);
SetGpuReg(REG_OFFSET_MOSAIC, 0);
SetGpuReg(REG_OFFSET_WIN0H, 0);
@@ -268,11 +268,11 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->preEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->preEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
- gSprites[ID].callback = SpriteCallbackDummy_2;
- gSprites[ID].oam.paletteNum = 1;
- gSprites[ID].invisible = TRUE;
+ gSprites[id].callback = SpriteCallbackDummy_2;
+ gSprites[id].oam.paletteNum = 1;
+ gSprites[id].invisible = TRUE;
// postEvo sprite
DecompressPicFromTableGender(gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT],
@@ -283,21 +283,21 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
- gSprites[ID].callback = SpriteCallbackDummy_2;
- gSprites[ID].oam.paletteNum = 2;
- gSprites[ID].invisible = TRUE;
+ sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ gSprites[id].callback = SpriteCallbackDummy_2;
+ gSprites[id].oam.paletteNum = 2;
+ gSprites[id].invisible = TRUE;
LoadEvoSparkleSpriteAndPal();
- sEvoStructPtr->evoTaskId = ID = CreateTask(Task_EvolutionScene, 0);
- gTasks[ID].tState = 0;
- gTasks[ID].tPreEvoSpecies = currSpecies;
- gTasks[ID].tPostEvoSpecies = postEvoSpecies;
- gTasks[ID].tCanStop = canStopEvo;
- gTasks[ID].tLearnsFirstMove = TRUE;
- gTasks[ID].tEvoWasStopped = FALSE;
- gTasks[ID].tPartyId = partyId;
+ sEvoStructPtr->evoTaskId = id = CreateTask(Task_EvolutionScene, 0);
+ gTasks[id].tState = 0;
+ gTasks[id].tPreEvoSpecies = currSpecies;
+ gTasks[id].tPostEvoSpecies = postEvoSpecies;
+ gTasks[id].tCanStop = canStopEvo;
+ gTasks[id].tLearnsFirstMove = TRUE;
+ gTasks[id].tEvoWasStopped = FALSE;
+ gTasks[id].tPartyId = partyId;
memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], sizeof(sEvoStructPtr->savedPalette));
@@ -311,11 +311,11 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
static void CB2_EvolutionSceneLoadGraphics(void)
{
- u8 ID;
+ u8 id;
const struct CompressedSpritePalette* pokePal;
u16 postEvoSpecies;
u32 trainerId, personality;
- struct Pokemon* mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId];
+ struct Pokemon *mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId];
postEvoSpecies = gTasks[sEvoStructPtr->evoTaskId].tPostEvoSpecies;
trainerId = GetMonData(mon, MON_DATA_OT_ID);
@@ -323,7 +323,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
SetHBlankCallback(NULL);
SetVBlankCallback(NULL);
- CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFill32(0, (void *)(VRAM), VRAM_SIZE);
SetGpuReg(REG_OFFSET_MOSAIC, 0);
SetGpuReg(REG_OFFSET_WIN0H, 0);
@@ -361,10 +361,10 @@ static void CB2_EvolutionSceneLoadGraphics(void)
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
- gSprites[ID].callback = SpriteCallbackDummy_2;
- gSprites[ID].oam.paletteNum = 2;
+ gSprites[id].callback = SpriteCallbackDummy_2;
+ gSprites[id].oam.paletteNum = 2;
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP);
@@ -382,7 +382,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
static void CB2_TradeEvolutionSceneLoadGraphics(void)
{
- struct Pokemon* mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId];
+ struct Pokemon *mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId];
u16 postEvoSpecies = gTasks[sEvoStructPtr->evoTaskId].tPostEvoSpecies;
switch (gMain.state)
@@ -411,7 +411,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
gMain.state++;
break;
case 2:
- InitTradeBg();
+ LoadTradeAnimGfx();
gMain.state++;
break;
case 3:
@@ -434,14 +434,14 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
break;
case 5:
{
- u8 ID;
+ u8 id;
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
- gSprites[ID].callback = SpriteCallbackDummy_2;
- gSprites[ID].oam.paletteNum = 2;
+ gSprites[id].callback = SpriteCallbackDummy_2;
+ gSprites[id].oam.paletteNum = 2;
gMain.state++;
LinkTradeDrawWindow();
}
@@ -452,7 +452,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
}
- BlendPalettes(PALETTES_ALL, 0x10, 0);
+ BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
gMain.state++;
break;
case 7:
@@ -466,13 +466,13 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
}
}
-void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSpriteId, u8 partyId)
+void TradeEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, u8 preEvoSpriteId, u8 partyId)
{
u8 name[20];
u16 currSpecies;
u32 trainerId, personality;
const struct CompressedSpritePalette* pokePal;
- u8 ID;
+ u8 id;
GetMonData(mon, MON_DATA_NICKNAME, name);
StringCopy_Nickname(gStringVar1, name);
@@ -497,21 +497,21 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
- gSprites[ID].callback = SpriteCallbackDummy_2;
- gSprites[ID].oam.paletteNum = 2;
- gSprites[ID].invisible = TRUE;
+ gSprites[id].callback = SpriteCallbackDummy_2;
+ gSprites[id].oam.paletteNum = 2;
+ gSprites[id].invisible = TRUE;
LoadEvoSparkleSpriteAndPal();
- sEvoStructPtr->evoTaskId = ID = CreateTask(Task_TradeEvolutionScene, 0);
- gTasks[ID].tState = 0;
- gTasks[ID].tPreEvoSpecies = currSpecies;
- gTasks[ID].tPostEvoSpecies = postEvoSpecies;
- gTasks[ID].tLearnsFirstMove = TRUE;
- gTasks[ID].tEvoWasStopped = FALSE;
- gTasks[ID].tPartyId = partyId;
+ sEvoStructPtr->evoTaskId = id = CreateTask(Task_TradeEvolutionScene, 0);
+ gTasks[id].tState = 0;
+ gTasks[id].tPreEvoSpecies = currSpecies;
+ gTasks[id].tPostEvoSpecies = postEvoSpecies;
+ gTasks[id].tLearnsFirstMove = TRUE;
+ gTasks[id].tEvoWasStopped = FALSE;
+ gTasks[id].tPartyId = partyId;
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
@@ -522,7 +522,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
gBattle_BG3_X = 256;
gBattle_BG3_Y = 0;
- gTextFlags.useAlternateDownArrow = 1;
+ gTextFlags.useAlternateDownArrow = TRUE;
SetVBlankCallback(VBlankCB_TradeEvolutionScene);
SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
@@ -546,7 +546,7 @@ static void CB2_TradeEvolutionSceneUpdate(void)
RunTasks();
}
-static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
+static void CreateShedinja(u16 preEvoSpecies, struct Pokemon *mon)
{
u32 data = 0;
u16 ball = ITEM_POKE_BALL;
@@ -554,7 +554,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
&& (P_SHEDINJA_BALL == GEN_3 || CheckBagHasItem(ball, 1)))
{
s32 i;
- struct Pokemon* shedinja = &gPlayerParty[gPlayerPartyCount];
+ struct Pokemon *shedinja = &gPlayerParty[gPlayerPartyCount];
CopyMon(&gPlayerParty[gPlayerPartyCount], mon, sizeof(struct Pokemon));
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, &gEvolutionTable[preEvoSpecies][1].targetSpecies);
@@ -640,7 +640,7 @@ enum {
static void Task_EvolutionScene(u8 taskId)
{
u32 var;
- struct Pokemon* mon = &gPlayerParty[gTasks[taskId].tPartyId];
+ struct Pokemon *mon = &gPlayerParty[gTasks[taskId].tPartyId];
// check if B Button was held, so the evolution gets stopped
if (gMain.heldKeys == B_BUTTON
@@ -769,7 +769,7 @@ static void Task_EvolutionScene(u8 taskId)
BattlePutTextOnWindow(gStringVar4, B_WIN_MSG);
PlayBGM(MUS_EVOLVED);
gTasks[taskId].tState++;
- SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskId].tPostEvoSpecies));
+ SetMonData(mon, MON_DATA_SPECIES, (void *)(&gTasks[taskId].tPostEvoSpecies));
CalculateMonStats(mon);
EvolutionRenameMon(mon, gTasks[taskId].tPreEvoSpecies, gTasks[taskId].tPostEvoSpecies);
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskId].tPostEvoSpecies), FLAG_SET_SEEN);
@@ -847,9 +847,9 @@ static void Task_EvolutionScene(u8 taskId)
case EVOSTATE_CANCEL_MSG:
if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId))
{
- if (gTasks[taskId].tEvoWasStopped)
+ if (gTasks[taskId].tEvoWasStopped) // FRLG auto cancellation
StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark);
- else // Fire Red leftover probably
+ else
StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving);
BattlePutTextOnWindow(gStringVar4, B_WIN_MSG);
@@ -907,7 +907,7 @@ static void Task_EvolutionScene(u8 taskId)
case MVSTATE_PRINT_YES_NO:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
+ HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gTasks[taskId].tLearnMoveState++;
sEvoCursorPos = 0;
@@ -936,7 +936,7 @@ static void Task_EvolutionScene(u8 taskId)
}
if (JOY_NEW(A_BUTTON))
{
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
PlaySE(SE_SELECT);
if (sEvoCursorPos != 0)
@@ -955,7 +955,7 @@ static void Task_EvolutionScene(u8 taskId)
if (JOY_NEW(B_BUTTON))
{
// Equivalent to selecting NO
- HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+ HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
PlaySE(SE_SELECT);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
}
@@ -1089,7 +1089,7 @@ enum {
static void Task_TradeEvolutionScene(u8 taskId)
{
u32 var = 0;
- struct Pokemon* mon = &gPlayerParty[gTasks[taskId].tPartyId];
+ struct Pokemon *mon = &gPlayerParty[gTasks[taskId].tPartyId];
switch (gTasks[taskId].tState)
{
@@ -1231,7 +1231,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
{
DestroyTask(taskId);
FREE_AND_SET_NULL(sEvoStructPtr);
- gTextFlags.useAlternateDownArrow = 0;
+ gTextFlags.useAlternateDownArrow = FALSE;
SetMainCallback2(gCB2_AfterEvolution);
}
break;
@@ -1652,7 +1652,7 @@ static void PauseBgPaletteAnim(void)
if (taskId != TASK_NONE)
gTasks[taskId].tPaused = TRUE;
- FillPalette(0, 0xA0, 0x20);
+ FillPalette(RGB_BLACK, 0xA0, 0x20);
}
#undef tPaused
@@ -1666,7 +1666,7 @@ static void StopBgAnimation(void)
if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE)
DestroyTask(taskId);
- FillPalette(0, 0xA0, 0x20);
+ FillPalette(RGB_BLACK, 0xA0, 0x20);
RestoreBgAfterAnim();
}
diff --git a/src/faraway_island.c b/src/faraway_island.c
index 9ddb66de5c..4f34cf30e6 100755
--- a/src/faraway_island.c
+++ b/src/faraway_island.c
@@ -10,10 +10,10 @@
#include "constants/metatile_behaviors.h"
static u8 GetValidMewMoveDirection(u8);
-static bool8 ShouldMewMoveNorth(struct ObjectEvent*, u8);
-static bool8 ShouldMewMoveSouth(struct ObjectEvent*, u8);
-static bool8 ShouldMewMoveEast(struct ObjectEvent*, u8);
-static bool8 ShouldMewMoveWest(struct ObjectEvent*, u8);
+static bool8 ShouldMewMoveNorth(struct ObjectEvent *, u8);
+static bool8 ShouldMewMoveSouth(struct ObjectEvent *, u8);
+static bool8 ShouldMewMoveEast(struct ObjectEvent *, u8);
+static bool8 ShouldMewMoveWest(struct ObjectEvent *, u8);
static u8 GetRandomMewDirectionCandidate(u8);
static bool8 CanMewMoveToCoords(s16, s16);
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index cdb0db6d14..2ba4c29cd0 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -43,8 +43,8 @@ u8 gSelectedObjectEvent;
static void GetPlayerPosition(struct MapPosition *);
static void GetInFrontOfPlayerPosition(struct MapPosition *);
static u16 GetPlayerCurMetatileBehavior(int);
-static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8);
-static const u8 *GetInteractionScript(struct MapPosition*, u8, u8);
+static bool8 TryStartInteractionScript(struct MapPosition *, u16, u8);
+static const u8 *GetInteractionScript(struct MapPosition *, u8, u8);
static const u8 *GetInteractedObjectEventScript(struct MapPosition *, u8, u8);
static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8);
static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8);
@@ -233,7 +233,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
&& script != EventScript_PC)
PlaySE(SE_SELECT);
- ScriptContext1_SetupScript(script);
+ ScriptContext_SetupScript(script);
return TRUE;
}
@@ -464,7 +464,7 @@ static bool32 TrySetupDiveDownScript(void)
{
if (FlagGet(FLAG_BADGE07_GET) && TrySetDiveWarp() == 2)
{
- ScriptContext1_SetupScript(EventScript_UseDive);
+ ScriptContext_SetupScript(EventScript_UseDive);
return TRUE;
}
return FALSE;
@@ -474,7 +474,7 @@ static bool32 TrySetupDiveEmergeScript(void)
{
if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && TrySetDiveWarp() == 1)
{
- ScriptContext1_SetupScript(EventScript_UseDiveUnderwater);
+ ScriptContext_SetupScript(EventScript_UseDiveUnderwater);
return TRUE;
}
return FALSE;
@@ -501,7 +501,7 @@ static bool8 TryStartCoordEventScript(struct MapPosition *position)
if (script == NULL)
return FALSE;
- ScriptContext1_SetupScript(script);
+ ScriptContext_SetupScript(script);
return TRUE;
}
@@ -511,12 +511,12 @@ static bool8 TryStartMiscWalkingScripts(u16 metatileBehavior)
if (MetatileBehavior_IsCrackedFloorHole(metatileBehavior))
{
- ScriptContext1_SetupScript(EventScript_FallDownHole);
+ ScriptContext_SetupScript(EventScript_FallDownHole);
return TRUE;
}
else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior))
{
- ScriptContext1_SetupScript(BattlePyramid_WarpToNextFloor);
+ ScriptContext_SetupScript(BattlePyramid_WarpToNextFloor);
return TRUE;
}
else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE)
@@ -548,48 +548,48 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
{
if (UpdatePoisonStepCounter() == TRUE)
{
- ScriptContext1_SetupScript(EventScript_FieldPoison);
+ ScriptContext_SetupScript(EventScript_FieldPoison);
return TRUE;
}
if (ShouldEggHatch())
{
IncrementGameStat(GAME_STAT_HATCHED_EGGS);
- ScriptContext1_SetupScript(EventScript_EggHatch);
+ ScriptContext_SetupScript(EventScript_EggHatch);
return TRUE;
}
if (AbnormalWeatherHasExpired() == TRUE)
{
- ScriptContext1_SetupScript(AbnormalWeather_EventScript_EndEventAndCleanup_1);
+ ScriptContext_SetupScript(AbnormalWeather_EventScript_EndEventAndCleanup_1);
return TRUE;
}
if (ShouldDoBrailleRegicePuzzle() == TRUE)
{
- ScriptContext1_SetupScript(IslandCave_EventScript_OpenRegiEntrance);
+ ScriptContext_SetupScript(IslandCave_EventScript_OpenRegiEntrance);
return TRUE;
}
if (ShouldDoWallyCall() == TRUE)
{
- ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
+ ScriptContext_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
return TRUE;
}
if (ShouldDoScottFortreeCall() == TRUE)
{
- ScriptContext1_SetupScript(Route119_EventScript_ScottWonAtFortreeGymCall);
+ ScriptContext_SetupScript(Route119_EventScript_ScottWonAtFortreeGymCall);
return TRUE;
}
if (ShouldDoScottBattleFrontierCall() == TRUE)
{
- ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall);
+ ScriptContext_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall);
return TRUE;
}
if (ShouldDoRoxanneCall() == TRUE)
{
- ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_RegisterRoxanne);
+ ScriptContext_SetupScript(RustboroCity_Gym_EventScript_RegisterRoxanne);
return TRUE;
}
if (ShouldDoRivalRayquazaCall() == TRUE)
{
- ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall);
+ ScriptContext_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall);
return TRUE;
}
}
@@ -598,7 +598,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
return TRUE;
if (CountSSTidalStep(1) == TRUE)
{
- ScriptContext1_SetupScript(SSTidalCorridor_EventScript_ReachedStepCount);
+ ScriptContext_SetupScript(SSTidalCorridor_EventScript_ReachedStepCount);
return TRUE;
}
if (TryStartMatchCall())
@@ -735,7 +735,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB
}
if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE)
{
- ScriptContext1_SetupScript(EventScript_FallDownHoleMtPyre);
+ ScriptContext_SetupScript(EventScript_FallDownHoleMtPyre);
return TRUE;
}
if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE)
@@ -886,7 +886,7 @@ static u8 *TryRunCoordEventScript(struct CoordEvent *coordEvent)
}
if (coordEvent->trigger == 0)
{
- ScriptContext2_RunNewScript(coordEvent->script);
+ RunScriptImmediately(coordEvent->script);
return NULL;
}
if (VarGet(coordEvent->trigger) == (u8)coordEvent->index)
diff --git a/src/field_effect.c b/src/field_effect.c
index db0f996281..2a1937f205 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -146,10 +146,10 @@ static void EscapeRopeWarpInEffect_Init(struct Task *);
static void EscapeRopeWarpInEffect_Spin(struct Task *);
static void Task_TeleportWarpOut(u8);
-static void TeleportWarpOutFieldEffect_Init(struct Task*);
-static void TeleportWarpOutFieldEffect_SpinGround(struct Task*);
-static void TeleportWarpOutFieldEffect_SpinExit(struct Task*);
-static void TeleportWarpOutFieldEffect_End(struct Task*);
+static void TeleportWarpOutFieldEffect_Init(struct Task *);
+static void TeleportWarpOutFieldEffect_SpinGround(struct Task *);
+static void TeleportWarpOutFieldEffect_SpinExit(struct Task *);
+static void TeleportWarpOutFieldEffect_End(struct Task *);
static void FieldCallback_TeleportWarpIn(void);
static void Task_TeleportWarpIn(u8);
@@ -223,11 +223,11 @@ static void FlyInFieldEffect_WaitBirdReturn(struct Task *);
static void FlyInFieldEffect_End(struct Task *);
static void Task_DestroyDeoxysRock(u8 taskId);
-static void DestroyDeoxysRockEffect_CameraShake(s16*, u8);
-static void DestroyDeoxysRockEffect_RockFragments(s16*, u8);
-static void DestroyDeoxysRockEffect_WaitAndEnd(s16*, u8);
-static void CreateDeoxysRockFragments(struct Sprite*);
-static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite);
+static void DestroyDeoxysRockEffect_CameraShake(s16 *, u8);
+static void DestroyDeoxysRockEffect_RockFragments(s16 *, u8);
+static void DestroyDeoxysRockEffect_WaitAndEnd(s16 *, u8);
+static void CreateDeoxysRockFragments(struct Sprite *);
+static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite);
static void Task_MoveDeoxysRock(u8 taskId);
@@ -904,7 +904,7 @@ u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority)
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
{
- s32 spriteId = CreateMonPicSprite(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag);
+ s32 spriteId = CreateMonPicSprite(species, 0, 0x8000, TRUE, x, y, 0, gMonPaletteTable[species].tag);
PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10);
if (spriteId == 0xFFFF)
return MAX_SPRITES;
@@ -915,7 +915,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
u8 CreateMonSprite_FieldMove(u16 species, u32 otId, u32 personality, s16 x, s16 y, u8 subpriority)
{
const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, otId, personality);
- u16 spriteId = CreateMonPicSprite(species, otId, personality, 1, x, y, 0, spritePalette->tag);
+ u16 spriteId = CreateMonPicSprite(species, otId, personality, TRUE, x, y, 0, spritePalette->tag);
PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
if (spriteId == 0xFFFF)
return MAX_SPRITES;
@@ -1337,7 +1337,7 @@ static void FieldCallback_UseFly(void)
{
FadeInFromBlack();
CreateTask(Task_UseFly, 0);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
gFieldCallback = NULL;
}
@@ -1378,7 +1378,7 @@ static void FieldCallback_FlyIntoMap(void)
{
ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST);
}
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
gFieldCallback = NULL;
}
@@ -1398,7 +1398,7 @@ static void Task_FlyIntoMap(u8 taskId)
}
if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
{
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
UnfreezeObjectEvents();
DestroyTask(taskId);
}
@@ -1417,7 +1417,7 @@ void FieldCB_FallWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
CreateTask(Task_FallWarpFieldEffect, 0);
gFieldCallback = NULL;
@@ -1531,7 +1531,7 @@ static bool8 FallWarpEffect_CameraShake(struct Task *task)
static bool8 FallWarpEffect_End(struct Task *task)
{
gPlayerAvatar.preventStep = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
CameraObjectReset1();
UnfreezeObjectEvents();
InstallCameraPanAheadCallback();
@@ -1683,7 +1683,7 @@ static void FieldCallback_EscalatorWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_EscalatorWarpIn, 0);
gFieldCallback = NULL;
}
@@ -1804,7 +1804,7 @@ static bool8 EscalatorWarpIn_End(struct Task *task)
if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
CameraObjectReset1();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST));
DestroyTask(FindTaskIdByFunc(Task_EscalatorWarpIn));
}
@@ -1832,7 +1832,7 @@ static void Task_UseWaterfall(u8 taskId)
static bool8 WaterfallFieldEffect_Init(struct Task *task, struct ObjectEvent *objectEvent)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE;
task->tState++;
return FALSE;
@@ -1840,7 +1840,7 @@ static bool8 WaterfallFieldEffect_Init(struct Task *task, struct ObjectEvent *ob
static bool8 WaterfallFieldEffect_ShowMon(struct Task *task, struct ObjectEvent *objectEvent)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
if (!ObjectEventIsMovementOverridden(objectEvent))
{
ObjectEventClearHeldMovementIfFinished(objectEvent);
@@ -1880,7 +1880,7 @@ static bool8 WaterfallFieldEffect_ContinueRideOrEnd(struct Task *task, struct Ob
return TRUE;
}
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
gPlayerAvatar.preventStep = FALSE;
DestroyTask(FindTaskIdByFunc(Task_UseWaterfall));
FieldEffectActiveListRemove(FLDEFF_USE_WATERFALL);
@@ -1914,7 +1914,7 @@ static bool8 DiveFieldEffect_Init(struct Task *task)
static bool8 DiveFieldEffect_ShowMon(struct Task *task)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gFieldEffectArguments[0] = task->data[15];
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
task->data[0]++;
@@ -2052,7 +2052,7 @@ static void FieldCB_LavaridgeGymB1FWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gFieldCallback = NULL;
CreateTask(Task_LavaridgeGymB1FWarpExit, 0);
}
@@ -2105,7 +2105,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_End(struct Task *task, struct ObjectE
if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
gPlayerAvatar.preventStep = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(Task_LavaridgeGymB1FWarpExit));
}
@@ -2229,7 +2229,7 @@ void SpriteCB_AshPuff(struct Sprite *sprite)
void StartEscapeRopeFieldEffect(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
CreateTask(Task_EscapeRopeWarpOut, 80);
}
@@ -2286,7 +2286,7 @@ static void FieldCallback_EscapeRopeWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
gFieldCallback = NULL;
gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
@@ -2320,7 +2320,7 @@ static void EscapeRopeWarpInEffect_Spin(struct Task *task)
if (task->tNumTurns >= 32 && task->tStartDir == GetPlayerFacingDirection())
{
objectEvent->invisible = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(Task_EscapeRopeWarpIn));
return;
@@ -2360,7 +2360,7 @@ static void Task_TeleportWarpOut(u8 taskId)
static void TeleportWarpOutFieldEffect_Init(struct Task *task)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
CameraObjectReset2();
task->data[15] = GetPlayerFacingDirection();
@@ -2440,7 +2440,7 @@ static void FieldCallback_TeleportWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
gFieldCallback = NULL;
gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
@@ -2527,7 +2527,7 @@ static void TeleportWarpInFieldEffect_SpinGround(struct Task *task)
task->data[1] = 8;
if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection)
{
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
CameraObjectReset1();
UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(Task_TeleportWarpIn));
@@ -2993,7 +2993,7 @@ static void Task_SurfFieldEffect(u8 taskId)
static void SurfFieldEffect_Init(struct Task *task)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
gPlayerAvatar.preventStep = TRUE;
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
@@ -3054,7 +3054,7 @@ static void SurfFieldEffect_End(struct Task *task)
ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection));
SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_PLAYER_AND_MON);
UnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
FieldEffectActiveListRemove(FLDEFF_USE_SURF);
DestroyTask(FindTaskIdByFunc(Task_SurfFieldEffect));
}
@@ -3088,15 +3088,15 @@ u8 FldEff_RayquazaSpotlight(void)
{
for (j = 12; j < 18; j++)
{
- ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1;
+ ((u16 *)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1;
}
}
for (k = 0; k < 90; k++)
{
for (i = 0; i < 8; i++)
{
- *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4) = (sSpotlight_Gfx[k * 32 + i * 4 + 1] << 8) + sSpotlight_Gfx[k * 32 + i * 4];
- *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4 + 2) = (sSpotlight_Gfx[k * 32 + i * 4 + 3] << 8) + sSpotlight_Gfx[k * 32 + i * 4 + 2];
+ *(u16 *)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4) = (sSpotlight_Gfx[k * 32 + i * 4 + 1] << 8) + sSpotlight_Gfx[k * 32 + i * 4];
+ *(u16 *)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4 + 2) = (sSpotlight_Gfx[k * 32 + i * 4 + 3] << 8) + sSpotlight_Gfx[k * 32 + i * 4 + 2];
}
}
return spriteId;
@@ -3675,7 +3675,7 @@ static void StartEndingDeoxysRockCameraShake(u8 taskId)
#undef tEndDelay
#undef tEnding
-static void (*const sDestroyDeoxysRockEffectFuncs[])(s16*, u8) = {
+static void (*const sDestroyDeoxysRockEffectFuncs[])(s16 *, u8) = {
DestroyDeoxysRockEffect_CameraShake,
DestroyDeoxysRockEffect_RockFragments,
DestroyDeoxysRockEffect_WaitAndEnd,
@@ -3689,7 +3689,7 @@ static void Task_DestroyDeoxysRock(u8 taskId)
sDestroyDeoxysRockEffectFuncs[tState](data, taskId);
}
-static void DestroyDeoxysRockEffect_CameraShake(s16* data, u8 taskId)
+static void DestroyDeoxysRockEffect_CameraShake(s16 *data, u8 taskId)
{
u8 newTaskId = CreateTask(Task_DeoxysRockCameraShake, 90);
PlaySE(SE_THUNDER2);
@@ -3697,7 +3697,7 @@ static void DestroyDeoxysRockEffect_CameraShake(s16* data, u8 taskId)
tState++;
}
-static void DestroyDeoxysRockEffect_RockFragments(s16* data, u8 taskId)
+static void DestroyDeoxysRockEffect_RockFragments(s16 *data, u8 taskId)
{
if (++tTimer > 120)
{
@@ -3713,7 +3713,7 @@ static void DestroyDeoxysRockEffect_RockFragments(s16* data, u8 taskId)
}
}
-static void DestroyDeoxysRockEffect_WaitAndEnd(s16* data, u8 taskId)
+static void DestroyDeoxysRockEffect_WaitAndEnd(s16 *data, u8 taskId)
{
if (!gPaletteFade.active && !FuncIsActiveTask(Task_DeoxysRockCameraShake))
{
@@ -3776,7 +3776,7 @@ static const struct SpriteTemplate sSpriteTemplate_DeoxysRockFragment = {
.callback = SpriteCB_DeoxysRockFragment
};
-static void CreateDeoxysRockFragments(struct Sprite* sprite)
+static void CreateDeoxysRockFragments(struct Sprite *sprite)
{
int i;
int xPos = (s16)gTotalCameraPixelOffsetX + sprite->x + sprite->x2;
@@ -3794,7 +3794,7 @@ static void CreateDeoxysRockFragments(struct Sprite* sprite)
}
}
-static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite)
+static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite)
{
// 1 case for each fragment, fly off in 4 different directions
switch (sprite->data[0])
@@ -3816,11 +3816,11 @@ static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite)
sprite->y += 12;
break;
}
- if ((u16)(sprite->x + 4) > DISPLAY_WIDTH + 8 || sprite->y < -4 || sprite->y > DISPLAY_HEIGHT + 4)
+ if (sprite->x < -4 || sprite->x > DISPLAY_WIDTH + 4 || sprite->y < -4 || sprite->y > DISPLAY_HEIGHT + 4)
DestroySprite(sprite);
}
-bool8 FldEff_MoveDeoxysRock(struct Sprite* sprite)
+bool8 FldEff_MoveDeoxysRock(struct Sprite *sprite)
{
u8 objectEventIdBuffer;
if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index c3332c7fc6..5b8123a71d 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1525,7 +1525,7 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
{
for (j = 12; j < 18; j++)
{
- ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1;
+ ((u16 *)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1;
}
}
}
@@ -1611,7 +1611,7 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
{
for (j = 12; j < 18; j++)
{
- ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0;
+ ((u16 *)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0;
}
}
SetGpuReg(REG_OFFSET_BG0VOFS, 0);
diff --git a/src/field_message_box.c b/src/field_message_box.c
index 95d0a94c96..64734cc209 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -8,7 +8,7 @@
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
-static void ExpandStringAndStartDrawFieldMessage(const u8*, bool32);
+static void ExpandStringAndStartDrawFieldMessage(const u8 *, bool32);
static void StartDrawFieldMessage(void);
void InitFieldMessageBox(void)
@@ -116,7 +116,7 @@ bool8 ShowFieldMessageFromBuffer(void)
return TRUE;
}
-static void ExpandStringAndStartDrawFieldMessage(const u8* str, bool32 allowSkippingDelayWithButtonPress)
+static void ExpandStringAndStartDrawFieldMessage(const u8 *str, bool32 allowSkippingDelayWithButtonPress)
{
StringExpandPlaceholders(gStringVar4, str);
AddTextPrinterForMessage(allowSkippingDelayWithButtonPress);
@@ -132,7 +132,7 @@ static void StartDrawFieldMessage(void)
void HideFieldMessageBox(void)
{
DestroyTask_DrawFieldMessage();
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
sFieldMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
}
@@ -152,7 +152,7 @@ bool8 IsFieldMessageBoxHidden(void)
static void ReplaceFieldMessageWithFrame(void)
{
DestroyTask_DrawFieldMessage();
- DrawStdWindowFrame(0, 1);
+ DrawStdWindowFrame(0, TRUE);
sFieldMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 93f94aa15e..0f087799e3 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1468,7 +1468,7 @@ static void Task_PushBoulder(u8 taskId)
static bool8 PushBoulder_Start(struct Task *task, struct ObjectEvent *player, struct ObjectEvent *boulder)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE;
task->tState++;
return FALSE;
@@ -1508,7 +1508,7 @@ static bool8 PushBoulder_End(struct Task *task, struct ObjectEvent *player, stru
ObjectEventClearHeldMovementIfFinished(player);
ObjectEventClearHeldMovementIfFinished(boulder);
gPlayerAvatar.preventStep = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(FindTaskIdByFunc(Task_PushBoulder));
}
return FALSE;
@@ -1570,7 +1570,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec
task->data[0]++;
task->data[1] = objectEvent->movementDirection;
gPlayerAvatar.preventStep = TRUE;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
PlaySE(SE_WARP_IN);
return TRUE;
}
@@ -1616,7 +1616,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct Objec
if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
gPlayerAvatar.preventStep = FALSE;
DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
}
@@ -1627,7 +1627,7 @@ static void CreateStopSurfingTask(u8 direction)
{
u8 taskId;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_ClearSavedMusic();
Overworld_ChangeMusicToDefault();
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_SURFING;
@@ -1661,7 +1661,7 @@ static void Task_WaitStopSurfing(u8 taskId)
ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
ObjectEventSetHeldMovement(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection));
gPlayerAvatar.preventStep = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]);
DestroyTask(taskId);
}
@@ -1720,7 +1720,7 @@ static void Task_Fishing(u8 taskId)
static bool8 Fishing_Init(struct Task *task)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE;
task->tStep++;
return FALSE;
@@ -1911,7 +1911,7 @@ static bool8 Fishing_MonOnHook(struct Task *task)
{
AlignFishingAnimationFrames();
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PokemonOnHook, 1, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++;
task->tFrameCounter = 0;
return FALSE;
@@ -1945,7 +1945,7 @@ static bool8 Fishing_StartEncounter(struct Task *task)
if (task->tFrameCounter != 0)
{
gPlayerAvatar.preventStep = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
FishingWildEncounter(task->tFishingRod);
RecordFishingAttemptForTV(TRUE);
DestroyTask(FindTaskIdByFunc(Task_Fishing));
@@ -1958,7 +1958,7 @@ static bool8 Fishing_NotEvenNibble(struct Task *task)
AlignFishingAnimationFrames();
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_NotEvenANibble, 1, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_NotEvenANibble, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep = FISHING_SHOW_RESULT;
return TRUE;
}
@@ -1968,7 +1968,7 @@ static bool8 Fishing_GotAway(struct Task *task)
AlignFishingAnimationFrames();
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_ItGotAway, 1, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_ItGotAway, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++;
return TRUE;
}
@@ -2004,7 +2004,7 @@ static bool8 Fishing_EndNoMon(struct Task *task)
if (!IsTextPrinterActive(0))
{
gPlayerAvatar.preventStep = FALSE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
UnfreezeObjectEvents();
ClearDialogWindowAndFrame(0, TRUE);
RecordFishingAttemptForTV(FALSE);
diff --git a/src/field_poison.c b/src/field_poison.c
index 90013243cd..e29e1ac988 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -21,9 +21,8 @@ static bool32 IsMonValidSpecies(struct Pokemon *pokemon)
{
u16 species = GetMonData(pokemon, MON_DATA_SPECIES2);
if (species == SPECIES_NONE || species == SPECIES_EGG)
- {
return FALSE;
- }
+
return TRUE;
}
@@ -35,16 +34,14 @@ static bool32 AllMonsFainted(void)
for (i = 0; i < PARTY_SIZE; i++, pokemon++)
{
if (IsMonValidSpecies(pokemon) && GetMonData(pokemon, MON_DATA_HP) != 0)
- {
return FALSE;
- }
}
return TRUE;
}
static void FaintFromFieldPoison(u8 partyIdx)
{
- struct Pokemon *pokemon = gPlayerParty + partyIdx;
+ struct Pokemon *pokemon = &gPlayerParty[partyIdx];
u32 status = STATUS1_NONE;
AdjustFriendship(pokemon, FRIENDSHIP_EVENT_FAINT_FIELD_PSN);
@@ -55,64 +52,65 @@ static void FaintFromFieldPoison(u8 partyIdx)
static bool32 MonFaintedFromPoison(u8 partyIdx)
{
- struct Pokemon *pokemon = gPlayerParty + partyIdx;
+ struct Pokemon *pokemon = &gPlayerParty[partyIdx];
if (IsMonValidSpecies(pokemon) && GetMonData(pokemon, MON_DATA_HP) == 0 && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
- {
return TRUE;
- }
+
return FALSE;
}
+#define tState data[0]
+#define tPartyIdx data[1]
+
static void Task_TryFieldPoisonWhiteOut(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- switch (data[0])
+ switch (tState)
{
case 0:
- for (; data[1] < PARTY_SIZE; data[1]++)
+ for (; tPartyIdx < PARTY_SIZE; tPartyIdx++)
{
- if (MonFaintedFromPoison(data[1]))
+ if (MonFaintedFromPoison(tPartyIdx))
{
- FaintFromFieldPoison(data[1]);
- ShowFieldMessage(gText_PkmnFainted3);
- data[0]++;
+ FaintFromFieldPoison(tPartyIdx);
+ ShowFieldMessage(gText_PkmnFainted_FldPsn);
+ tState++;
return;
}
}
- data[0] = 2;
+ tState = 2; // Finished checking party
break;
case 1:
+ // Wait for "{mon} fainted" message, then return to party loop
if (IsFieldMessageBoxHidden())
- {
- data[0]--;
- }
+ tState--;
break;
case 2:
if (AllMonsFainted())
{
+ // Battle facilities have their own white out script to handle the challenge loss
if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge())
- {
gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT;
- }
else
- {
gSpecialVar_Result = FLDPSN_WHITEOUT;
- }
}
else
{
gSpecialVar_Result = FLDPSN_NO_WHITEOUT;
}
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
break;
}
}
+#undef tState
+#undef tPartyIdx
+
void TryFieldPoisonWhiteOut(void)
{
CreateTask(Task_TryFieldPoisonWhiteOut, 80);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
}
s32 DoPoisonFieldEffect(void)
@@ -122,31 +120,31 @@ s32 DoPoisonFieldEffect(void)
struct Pokemon *pokemon = gPlayerParty;
u32 numPoisoned = 0;
u32 numFainted = 0;
+
for (i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
{
+ // Apply poison damage
hp = GetMonData(pokemon, MON_DATA_HP);
if (hp == 0 || --hp == 0)
- {
numFainted++;
- }
+
SetMonData(pokemon, MON_DATA_HP, &hp);
numPoisoned++;
}
pokemon++;
}
+
+ // Do screen flash effect
if (numFainted != 0 || numPoisoned != 0)
- {
FldEffPoison_Start();
- }
+
if (numFainted != 0)
- {
return FLDPSN_FNT;
- }
+
if (numPoisoned != 0)
- {
return FLDPSN_PSN;
- }
+
return FLDPSN_NONE;
}
diff --git a/src/field_region_map.c b/src/field_region_map.c
index adf5e4ed7a..5e14920fba 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -150,11 +150,11 @@ static void FieldUpdateRegionMap(void)
sFieldRegionMapHandler->state++;
break;
case 1:
- DrawStdFrameWithCustomTileAndPalette(1, 0, 0x27, 0xd);
+ DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x27, 0xd);
offset = GetStringCenterAlignXOffset(FONT_NORMAL, gText_Hoenn, 0x38);
AddTextPrinterParameterized(1, FONT_NORMAL, gText_Hoenn, offset, 1, 0, NULL);
ScheduleBgCopyTilemapToVram(0);
- DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd);
+ DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x27, 0xd);
PrintRegionMapSecName();
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sFieldRegionMapHandler->state++;
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 77978c2690..948d812e81 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -124,7 +124,7 @@ static void Task_WaitForUnionRoomFade(u8 taskId)
void FieldCB_ContinueScriptUnionRoom(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic();
FadeInFromBlack();
CreateTask(Task_WaitForUnionRoomFade, 10);
@@ -135,13 +135,13 @@ static void Task_WaitForFadeAndEnableScriptCtx(u8 taskID)
if (WaitForWeatherFadeIn() == TRUE)
{
DestroyTask(taskID);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
void FieldCB_ContinueScriptHandleMusic(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic();
FadeInFromBlack();
CreateTask(Task_WaitForFadeAndEnableScriptCtx, 10);
@@ -149,7 +149,7 @@ void FieldCB_ContinueScriptHandleMusic(void)
void FieldCB_ContinueScript(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeInFromBlack();
CreateTask(Task_WaitForFadeAndEnableScriptCtx, 10);
}
@@ -174,7 +174,7 @@ static void Task_ReturnToFieldCableLink(u8 taskId)
case 2:
if (WaitForWeatherFadeIn() == TRUE)
{
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
break;
@@ -183,7 +183,7 @@ static void Task_ReturnToFieldCableLink(u8 taskId)
void FieldCB_ReturnToFieldCableLink(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic();
FillPalBufferBlack();
CreateTask(Task_ReturnToFieldCableLink, 10);
@@ -215,7 +215,7 @@ static void Task_ReturnToFieldWirelessLink(u8 taskId)
if (WaitForWeatherFadeIn() == TRUE)
{
StartSendingKeysToLink();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
break;
@@ -239,7 +239,7 @@ void Task_ReturnToFieldRecordMixing(u8 taskId)
case 2:
StartSendingKeysToLink();
ResetAllMultiplayerState();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
break;
}
@@ -247,7 +247,7 @@ void Task_ReturnToFieldRecordMixing(u8 taskId)
void FieldCB_ReturnToFieldWirelessLink(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic();
FillPalBufferBlack();
CreateTask(Task_ReturnToFieldWirelessLink, 10);
@@ -275,7 +275,7 @@ void FieldCB_DefaultWarpExit(void)
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
SetUpWarpExitTask();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void FieldCB_WarpExitFadeFromWhite(void)
@@ -283,7 +283,7 @@ void FieldCB_WarpExitFadeFromWhite(void)
Overworld_PlaySpecialMapMusic();
FadeInFromWhite();
SetUpWarpExitTask();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void FieldCB_WarpExitFadeFromBlack(void)
@@ -292,7 +292,7 @@ void FieldCB_WarpExitFadeFromBlack(void)
Overworld_PlaySpecialMapMusic();
FadeInFromBlack();
SetUpWarpExitTask();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static void FieldCB_SpinEnterWarp(void)
@@ -301,7 +301,7 @@ static void FieldCB_SpinEnterWarp(void)
WarpFadeInScreen();
PlaySE(SE_WARP_OUT);
CreateTask(Task_SpinEnterWarp, 10);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static void FieldCB_MossdeepGymWarpExit(void)
@@ -310,7 +310,7 @@ static void FieldCB_MossdeepGymWarpExit(void)
WarpFadeInScreen();
PlaySE(SE_WARP_OUT);
CreateTask(Task_ExitNonDoor, 10);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
SetObjectEventLoadFlag((~SKIP_OBJECT_EVENT_LOAD) & 0xF);
}
@@ -357,7 +357,7 @@ static void Task_ExitDoor(u8 taskId)
}
break;
case 4:
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
break;
}
@@ -395,7 +395,7 @@ static void Task_ExitNonAnimDoor(u8 taskId)
}
break;
case 3:
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
break;
}
@@ -407,14 +407,14 @@ static void Task_ExitNonDoor(u8 taskId)
{
case 0:
FreezeObjectEvents();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gTasks[taskId].tState++;
break;
case 1:
if (WaitForWeatherFadeIn())
{
UnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
break;
@@ -434,7 +434,7 @@ void ReturnToFieldOpenStartMenu(void)
{
FadeInFromBlack();
CreateTask(Task_WaitForFadeShowStartMenu, 0x50);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
bool8 FieldCB_ReturnToFieldOpenStartMenu(void)
@@ -447,7 +447,7 @@ static void Task_ReturnToFieldNoScript(u8 taskId)
{
if (WaitForWeatherFadeIn() == 1)
{
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
ScriptUnfreezeObjectEvents();
}
@@ -455,14 +455,14 @@ static void Task_ReturnToFieldNoScript(u8 taskId)
void FieldCB_ReturnToFieldNoScript(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeInFromBlack();
CreateTask(Task_ReturnToFieldNoScript, 10);
}
void FieldCB_ReturnToFieldNoScriptCheckMusic(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic();
FadeInFromBlack();
CreateTask(Task_ReturnToFieldNoScript, 10);
@@ -483,7 +483,7 @@ static bool32 WaitForWeatherFadeIn(void)
void DoWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
@@ -494,7 +494,7 @@ void DoWarp(void)
void DoDiveWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
@@ -504,7 +504,7 @@ void DoDiveWarp(void)
void DoWhiteFadeWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
TryFadeOutOldMapMusic();
FadeScreen(FADE_TO_WHITE, 8);
PlayRainStoppingSoundEffect();
@@ -514,7 +514,7 @@ void DoWhiteFadeWarp(void)
void DoDoorWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(Task_DoDoorWarp, 10);
}
@@ -527,19 +527,19 @@ void DoFallWarp(void)
void DoEscalatorWarp(u8 metatileBehavior)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
StartEscalatorWarp(metatileBehavior, 10);
}
void DoLavaridgeGymB1FWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
StartLavaridgeGymB1FWarp(10);
}
void DoLavaridgeGym1FWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
StartLavaridgeGym1FWarp(10);
}
@@ -548,7 +548,7 @@ void DoLavaridgeGym1FWarp(void)
// Used by teleporting tiles, e.g. in Aqua Hideout (For the move Teleport see FldEff_TeleportWarpOut)
void DoTeleportTileWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlaySE(SE_WARP_IN);
@@ -559,7 +559,7 @@ void DoTeleportTileWarp(void)
void DoMossdeepGymWarp(void)
{
SetObjectEventLoadFlag(SKIP_OBJECT_EVENT_LOAD);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
SaveObjectEvents();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
@@ -570,7 +570,7 @@ void DoMossdeepGymWarp(void)
void DoPortholeWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
WarpFadeOutScreen();
CreateTask(Task_WarpAndLoadMap, 10);
gFieldCallback = FieldCB_ShowPortholeView;
@@ -583,7 +583,7 @@ static void Task_DoCableClubWarp(u8 taskId)
switch (task->tState)
{
case 0:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
task->tState++;
break;
case 1:
@@ -600,7 +600,7 @@ static void Task_DoCableClubWarp(u8 taskId)
void DoCableClubWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlaySE(SE_EXIT);
@@ -651,7 +651,7 @@ static void Task_WarpAndLoadMap(u8 taskId)
{
case 0:
FreezeObjectEvents();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
task->tState++;
break;
case 1:
@@ -735,7 +735,7 @@ static void Task_DoContestHallWarp(u8 taskId)
{
case 0:
FreezeObjectEvents();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
task->tState++;
break;
case 1:
@@ -754,7 +754,7 @@ static void Task_DoContestHallWarp(u8 taskId)
void DoContestHallWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
@@ -916,7 +916,7 @@ static void Task_WaitForFlashUpdate(u8 taskId)
{
if (!FuncIsActiveTask(UpdateFlashLevelEffect))
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
@@ -979,7 +979,7 @@ void AnimateFlash(u8 newFlashLevel)
fullBrightness = TRUE;
StartUpdateFlashLevelEffect(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelToRadius[curFlashLevel], sFlashLevelToRadius[newFlashLevel], fullBrightness, 1);
StartWaitForFlashUpdate();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void WriteFlashScanlineEffectBuffer(u8 flashLevel)
@@ -1003,7 +1003,7 @@ static void Task_SpinEnterWarp(u8 taskId)
{
case 0:
FreezeObjectEvents();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
DoPlayerSpinEntrance();
gTasks[taskId].tState++;
break;
@@ -1011,7 +1011,7 @@ static void Task_SpinEnterWarp(u8 taskId)
if (WaitForWeatherFadeIn() && IsPlayerSpinEntranceActive() != TRUE)
{
UnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
break;
@@ -1026,7 +1026,7 @@ static void Task_SpinExitWarp(u8 taskId)
{
case 0:
FreezeObjectEvents();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
PlaySE(SE_WARP_IN);
DoPlayerSpinExit();
task->tState++;
@@ -1054,7 +1054,7 @@ static void Task_SpinExitWarp(u8 taskId)
// DoTeleportTileWarp is used instead
void DoSpinEnterWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_WarpAndLoadMap, 10);
gFieldCallback = FieldCB_SpinEnterWarp;
}
@@ -1063,7 +1063,7 @@ void DoSpinEnterWarp(void)
// Player exits current map by spinning up offscreen, enters new map with a fade in
void DoSpinExitWarp(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(Task_SpinExitWarp, 10);
}
@@ -1152,7 +1152,7 @@ static void Task_OrbEffect(u8 taskId)
case 2:
if (!FuncIsActiveTask(UpdateOrbFlashEffect))
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
tState = 3;
}
break;
@@ -1200,7 +1200,7 @@ static void Task_OrbEffect(u8 taskId)
SetGpuReg(REG_OFFSET_BLDALPHA, tBldAlpha);
SetGpuReg(REG_OFFSET_WININ, tWinIn);
SetGpuReg(REG_OFFSET_WINOUT, tWinOut);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
break;
}
@@ -1263,6 +1263,6 @@ static void Task_EnableScriptAfterMusicFade(u8 taskId)
if (BGMusicStopped() == TRUE)
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 7493467288..7c98703c6b 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -251,7 +251,7 @@ static void Task_HandleTruckSequence(u8 taskId)
DrawWholeMapView();
PlaySE(SE_TRUCK_DOOR);
DestroyTask(taskId);
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
break;
}
@@ -263,7 +263,7 @@ void ExecuteTruckSequence(void)
MapGridSetMetatileIdAt(4 + MAP_OFFSET, 2 + MAP_OFFSET, METATILE_InsideOfTruck_DoorClosedFloor_Mid);
MapGridSetMetatileIdAt(4 + MAP_OFFSET, 3 + MAP_OFFSET, METATILE_InsideOfTruck_DoorClosedFloor_Bottom);
DrawWholeMapView();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CpuFastFill(0, gPlttBufferFaded, 0x400);
CreateTask(Task_HandleTruckSequence, 0xA);
}
@@ -371,7 +371,7 @@ void FieldCB_ShowPortholeView(void)
gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
FadeInFromBlack();
CreateTask(Task_HandlePorthole, 80);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void LookThroughPorthole(void)
diff --git a/src/field_specials.c b/src/field_specials.c
index 4ed2a2e03d..7c226e7a39 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -132,14 +132,14 @@ static void BufferFanClubTrainerName_(struct LinkBattleRecords *, u8, u8);
void Special_ShowDiploma(void)
{
SetMainCallback2(CB2_ShowDiploma);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void Special_ViewWallClock(void)
{
gMain.savedCallback = CB2_ReturnToField;
SetMainCallback2(CB2_ViewWallClock);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void ResetCyclingRoadChallengeData(void)
@@ -182,7 +182,7 @@ static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions)
if (numFrames < 3600)
{
ConvertIntToDecimalStringN(gStringVar2, numFrames / 60, STR_CONV_MODE_RIGHT_ALIGN, 2);
- gStringVar2[2] = CHAR_PERIOD;
+ gStringVar2[2] = CHAR_DEC_SEPARATOR;
ConvertIntToDecimalStringN(&gStringVar2[3], ((numFrames % 60) * 100) / 60, STR_CONV_MODE_LEADING_ZEROS, 2);
StringAppend(gStringVar2, gText_SpaceSeconds);
}
@@ -799,7 +799,7 @@ static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId)
if ((++sSlidingDoorFrame) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles))
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
else
@@ -1412,7 +1412,7 @@ bool8 ScriptCheckFreePokemonStorageSpace(void)
bool8 IsPokerusInParty(void)
{
- if (!CheckPartyPokerus(gPlayerParty, 0x3f))
+ if (!CheckPartyPokerus(gPlayerParty, (1 << PARTY_SIZE) - 1))
return FALSE;
return TRUE;
@@ -1459,7 +1459,7 @@ static void Task_ShakeCamera(u8 taskId)
static void StopCameraShake(u8 taskId)
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
#undef horizontalPan
@@ -1814,7 +1814,7 @@ static void Task_MoveElevator(u8 taskId)
{
PlaySE(SE_DING_DONG);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
InstallCameraPanAheadCallback();
}
}
@@ -1825,7 +1825,7 @@ void ShowDeptStoreElevatorFloorSelect(void)
int xPos;
sTutorMoveAndElevatorWindowId = AddWindow(&gElevatorFloor_WindowTemplate);
- SetStandardWindowBorderStyle(sTutorMoveAndElevatorWindowId, 0);
+ SetStandardWindowBorderStyle(sTutorMoveAndElevatorWindowId, FALSE);
xPos = GetStringCenterAlignXOffset(FONT_NORMAL, gText_ElevatorNowOn, 64);
AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, FONT_NORMAL, gText_ElevatorNowOn, xPos, 1, TEXT_SKIP_DRAW, NULL);
@@ -2476,7 +2476,7 @@ static void Task_ShowScrollableMultichoice(u8 taskId)
struct WindowTemplate template;
struct Task *task = &gTasks[taskId];
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
sScrollableMultichoice_ScrollOffset = 0;
sScrollableMultichoice_ItemSpriteId = MAX_SPRITES;
FillFrontierExchangeCornerWindowAndItemIcon(task->tScrollMultiId, 0);
@@ -2507,7 +2507,7 @@ static void Task_ShowScrollableMultichoice(u8 taskId)
template = CreateWindowTemplate(0, task->tLeft, task->tTop, task->tWidth, task->tHeight, 0xF, 0x64);
windowId = AddWindow(&template);
task->tWindowId = windowId;
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
gScrollableMultichoice_ListMenuTemplate.totalItems = task->tNumItems;
gScrollableMultichoice_ListMenuTemplate.maxShowed = task->tMaxItemsOnScreen;
@@ -2591,7 +2591,7 @@ static void ScrollableMultichoice_ProcessInput(u8 taskId)
// Handle selection while keeping the menu open
ScrollableMultichoice_RemoveScrollArrows(taskId);
task->func = Task_ScrollableMultichoice_WaitReturnToList;
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
break;
}
@@ -2606,12 +2606,12 @@ static void CloseScrollableMultichoice(u8 taskId)
ScrollableMultichoice_RemoveScrollArrows(taskId);
DestroyListMenuTask(task->tListTaskId, NULL, NULL);
Free(sScrollableMultichoice_ListMenuItem);
- ClearStdWindowAndFrameToTransparent(task->tWindowId, 1);
+ ClearStdWindowAndFrameToTransparent(task->tWindowId, TRUE);
FillWindowPixelBuffer(task->tWindowId, PIXEL_FILL(0));
CopyWindowToVram(task->tWindowId, COPYWIN_GFX);
RemoveWindow(task->tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
// Never run, tKeepOpenAfterSelect is FALSE for all scrollable multichoices.
@@ -2634,14 +2634,14 @@ void ScrollableMultichoice_TryReturnToList(void)
{
u8 taskId = FindTaskIdByFunc(Task_ScrollableMultichoice_WaitReturnToList);
if (taskId == TASK_NONE)
- EnableBothScriptContexts();
+ ScriptContext_Enable();
else
gTasks[taskId].tKeepOpenAfterSelect++; // Return to list
}
static void Task_ScrollableMultichoice_ReturnToList(u8 taskId)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
ScrollableMultichoice_UpdateScrollArrows(taskId);
gTasks[taskId].func = ScrollableMultichoice_ProcessInput;
}
@@ -2850,7 +2850,7 @@ void ShowBattlePointsWindow(void)
};
sBattlePointsWindowId = AddWindow(&sBattlePoints_WindowTemplate);
- SetStandardWindowBorderStyle(sBattlePointsWindowId, 0);
+ SetStandardWindowBorderStyle(sBattlePointsWindowId, FALSE);
UpdateBattlePointsWindow();
CopyWindowToVram(sBattlePointsWindowId, COPYWIN_GFX);
}
@@ -2896,7 +2896,7 @@ void ShowFrontierExchangeCornerItemIconWindow(void)
};
sFrontierExchangeCorner_ItemIconWindowId = AddWindow(&sFrontierExchangeCorner_ItemIconWindowTemplate);
- SetStandardWindowBorderStyle(sFrontierExchangeCorner_ItemIconWindowId, 0);
+ SetStandardWindowBorderStyle(sFrontierExchangeCorner_ItemIconWindowId, FALSE);
CopyWindowToVram(sFrontierExchangeCorner_ItemIconWindowId, COPYWIN_GFX);
}
@@ -2918,7 +2918,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
switch (menu)
{
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
if (sFrontierExchangeCorner_Decor1[selection] == 0xFFFF)
{
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor1[selection]);
@@ -2931,7 +2931,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
}
break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
if (sFrontierExchangeCorner_Decor2[selection] == 0xFFFF)
{
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor2[selection]);
@@ -2944,11 +2944,11 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
}
break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_VitaminsDescriptions[selection], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_VitaminsDescriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Vitamins[selection]);
break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]);
break;
}
@@ -3040,7 +3040,7 @@ static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection)
if (gSpecialVar_0x8006 == 0)
{
sTutorMoveAndElevatorWindowId = AddWindow(&sBattleFrontierTutor_WindowTemplate);
- SetStandardWindowBorderStyle(sTutorMoveAndElevatorWindowId, 0);
+ SetStandardWindowBorderStyle(sTutorMoveAndElevatorWindowId, FALSE);
}
ShowBattleFrontierTutorMoveDescription(menu, selection);
}
@@ -3104,7 +3104,7 @@ void ScrollableMultichoice_RedrawPersistentMenu(void)
{
struct Task *task = &gTasks[taskId];
ListMenuGetScrollAndRow(task->tListTaskId, &scrollOffset, &selectedRow);
- SetStandardWindowBorderStyle(task->tWindowId, 0);
+ SetStandardWindowBorderStyle(task->tWindowId, FALSE);
for (i = 0; i < MAX_SCROLL_MULTI_ON_SCREEN; i++)
AddTextPrinterParameterized5(task->tWindowId, FONT_NORMAL, sScrollableMultichoiceOptions[gSpecialVar_0x8004][scrollOffset + i], 10, i * 16, TEXT_SKIP_DRAW, NULL, 0, 0);
@@ -3228,7 +3228,7 @@ static void Task_DeoxysRockInteraction(u8 taskId)
if (FlagGet(FLAG_DEOXYS_ROCK_COMPLETE) == TRUE)
{
gSpecialVar_Result = 3;
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
else
@@ -3249,7 +3249,7 @@ static void Task_DeoxysRockInteraction(u8 taskId)
{
FlagSet(FLAG_DEOXYS_ROCK_COMPLETE);
gSpecialVar_Result = 2;
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
else
@@ -3294,7 +3294,7 @@ static void WaitForDeoxysRockMovement(u8 taskId)
{
if (FieldEffectActiveListContains(FLDEFF_MOVE_DEOXYS_ROCK) == FALSE)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
@@ -3700,7 +3700,7 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
SetCloseLinkCallback();
gBattleTypeFlags = sBattleTowerMultiBattleTypeFlags;
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
break;
}
@@ -3786,7 +3786,7 @@ static void Task_CloseBattlePikeCurtain(u8 taskId)
if (tCurrentFrame == 3)
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 8e8875993d..099014a4d4 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -166,7 +166,7 @@ static void Task_RunTimeBasedEvents(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- if (!ScriptContext2_IsEnabled())
+ if (!ArePlayerFieldControlsLocked())
{
RunTimeBasedEvents(data);
UpdateAmbientCry(&tAmbientCryState, &tAmbientCryDelay);
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 8349de559f..820628ff83 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -58,7 +58,7 @@ static const struct OamData sCloudSpriteOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -339,7 +339,7 @@ static void UpdateDroughtBlend(u8 taskId)
task->tState++;
break;
case 4:
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
break;
}
@@ -393,7 +393,7 @@ static const struct OamData sRainSpriteOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32),
.x = 0,
@@ -839,7 +839,7 @@ static const struct OamData sSnowflakeSpriteOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -1272,7 +1272,7 @@ static const struct OamData sOamData_FogH =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/fieldmap.c b/src/fieldmap.c
index a02355e721..2b981dc6e5 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -43,7 +43,7 @@ static void FillWestConnection(struct MapHeader const *mapHeader, struct MapHead
static void FillEastConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset);
static void InitBackupMapLayoutConnections(struct MapHeader *mapHeader);
static void LoadSavedMapView(void);
-static bool8 SkipCopyingMetatileFromSavedMap(u16* mapBlock, u16 mapWidth, u8 yMode);
+static bool8 SkipCopyingMetatileFromSavedMap(u16 *mapBlock, u16 mapWidth, u8 yMode);
static struct MapConnection *GetIncomingConnection(u8 direction, int x, int y);
static bool8 IsPosInIncomingConnectingMap(u8 direction, int x, int y, struct MapConnection *connection);
static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax, int offset);
@@ -352,7 +352,7 @@ u8 MapGridGetElevationAt(int x, int y)
return block >> MAPGRID_ELEVATION_SHIFT;
}
-bool8 MapGridIsImpassableAt(int x, int y)
+u8 MapGridGetCollisionAt(int x, int y)
{
u16 block = GetMapGridBlockAt(x, y);
@@ -823,7 +823,7 @@ void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable)
}
}
-static bool8 SkipCopyingMetatileFromSavedMap(u16* mapBlock, u16 mapWidth, u8 yMode)
+static bool8 SkipCopyingMetatileFromSavedMap(u16 *mapBlock, u16 mapWidth, u8 yMode)
{
if (yMode == 0xFF)
return FALSE;
@@ -879,17 +879,17 @@ void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size)
if (tileset->isSecondary == FALSE)
{
LoadPalette(&black, destOffset, 2);
- LoadPalette(((u16*)tileset->palettes) + 1, destOffset + 1, size - 2);
+ LoadPalette(((u16 *)tileset->palettes) + 1, destOffset + 1, size - 2);
FieldmapPaletteDummy(destOffset + 1, (size - 2) >> 1);
}
else if (tileset->isSecondary == TRUE)
{
- LoadPalette(((u16*)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size);
+ LoadPalette(((u16 *)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size);
FieldmapPaletteDummy(destOffset, size >> 1);
}
else
{
- LoadCompressedPalette((u32*)tileset->palettes, destOffset, size);
+ LoadCompressedPalette((u32 *)tileset->palettes, destOffset, size);
FieldmapPaletteDummy(destOffset, size >> 1);
}
}
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index fea9e31ea4..2304381673 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -93,7 +93,7 @@ static const struct OamData sOamData_CutGrass =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -191,7 +191,12 @@ bool8 SetUpFieldMove_Cut(void)
sHyperCutTiles[6 + (i * 5) + j] = TRUE;
ret = TRUE;
}
- if (MapGridIsImpassableAt(x, y) == TRUE)
+ #ifdef BUGFIX
+ // Collision has a range 0-3, any value != 0 is impassable
+ if (MapGridGetCollisionAt(x, y))
+ #else
+ if (MapGridGetCollisionAt(x, y) == 1)
+ #endif
{
cutTiles[i * 3 + j] = FALSE;
}
@@ -289,7 +294,7 @@ bool8 FldEff_UseCutOnGrass(void)
static void FieldCallback_CutTree(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(EventScript_UseCut);
+ ScriptContext_SetupScript(EventScript_UseCut);
}
bool8 FldEff_UseCutOnTree(void)
@@ -578,10 +583,10 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS);
FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr);
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
if (IsMewPlayingHideAndSeek() == TRUE)
- ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_HideMewWhenGrassCut);
+ ScriptContext_SetupScript(FarawayIsland_Interior_EventScript_HideMewWhenGrassCut);
}
void FixLongGrassMetatilesWindowTop(s16 x, s16 y)
@@ -638,5 +643,5 @@ static void StartCutTreeFieldEffect(void)
{
PlaySE(SE_M_CUT);
FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index a303b8423b..abdca2a88a 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -102,7 +102,7 @@ static void FldEff_UseFlash(void)
{
PlaySE(SE_M_REFLECT);
FlagSet(FLAG_SYS_USE_FLASH);
- ScriptContext1_SetupScript(EventScript_UseFlash);
+ ScriptContext_SetupScript(EventScript_UseFlash);
}
static void CB2_ChangeMapMain(void)
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 4f3f53fa60..c01e88b512 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -586,7 +586,7 @@ bool8 SetUpFieldMove_SecretPower(void)
static void FieldCallback_SecretBaseCave(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(SecretBase_EventScript_CaveUseSecretPower);
+ ScriptContext_SetupScript(SecretBase_EventScript_CaveUseSecretPower);
}
bool8 FldEff_UseSecretPowerCave(void)
@@ -640,13 +640,13 @@ static void SpriteCB_CaveEntranceOpen(struct Sprite *sprite)
static void SpriteCB_CaveEntranceEnd(struct Sprite *sprite)
{
FieldEffectStop(sprite, FLDEFF_SECRET_POWER_CAVE);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static void FieldCallback_SecretBaseTree(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(SecretBase_EventScript_TreeUseSecretPower);
+ ScriptContext_SetupScript(SecretBase_EventScript_TreeUseSecretPower);
}
bool8 FldEff_UseSecretPowerTree(void)
@@ -714,13 +714,13 @@ static void SpriteCB_TreeEntranceOpen(struct Sprite *sprite)
static void SpriteCB_TreeEntranceEnd(struct Sprite *sprite)
{
FieldEffectStop(sprite, FLDEFF_SECRET_POWER_TREE);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static void FieldCallback_SecretBaseShrub(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(SecretBase_EventScript_ShrubUseSecretPower);
+ ScriptContext_SetupScript(SecretBase_EventScript_ShrubUseSecretPower);
}
bool8 FldEff_UseSecretPowerShrub(void)
@@ -778,7 +778,7 @@ static void SpriteCB_ShrubEntranceOpen(struct Sprite *sprite)
static void SpriteCB_ShrubEntranceEnd(struct Sprite *sprite)
{
FieldEffectStop(sprite, FLDEFF_SECRET_POWER_SHRUB);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
#define tX data[0]
@@ -820,7 +820,7 @@ static void Task_SecretBasePCTurnOn(u8 taskId)
MapGridSetMetatileIdAt(tX, tY, METATILE_SecretBase_PC_On);
CurrentMapDrawMetatileAt(tX, tY);
FieldEffectActiveListRemove(FLDEFF_PCTURN_ON);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
return;
}
@@ -1034,7 +1034,7 @@ bool8 FldEff_SandPillar(void)
{
s16 x, y;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
gFieldEffectArguments[5] = x;
@@ -1113,7 +1113,7 @@ static void SpriteCB_SandPillar_BreakBase(struct Sprite *sprite)
static void SpriteCB_SandPillar_End(struct Sprite *sprite)
{
FieldEffectStop(sprite, FLDEFF_SAND_PILLAR);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void InteractWithShieldOrTVDecoration(void)
@@ -1200,29 +1200,35 @@ bool8 IsLargeBreakableDecoration(u16 metatileId, bool8 checkBase)
return FALSE;
}
+#define tState data[0]
+#define tMosaic data[1]
+
static void Task_FieldPoisonEffect(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- switch (data[0])
+ switch (tState)
{
case 0:
- data[1] += 2;
- if (data[1] > 8)
- data[0]++;
+ tMosaic += 2;
+ if (tMosaic > 8)
+ tState++;
break;
case 1:
- data[1] -= 2;
- if (data[1] == 0)
- data[0]++;
+ tMosaic -= 2;
+ if (tMosaic == 0)
+ tState++;
break;
case 2:
DestroyTask(taskId);
return;
}
- SetGpuReg(REG_OFFSET_MOSAIC, (data[1] << 4) | data[1]);
+ SetGpuReg(REG_OFFSET_MOSAIC, (tMosaic << 4) | tMosaic);
}
+#undef tState
+#undef tMosaic
+
void FldEffPoison_Start(void)
{
PlaySE(SE_FIELD_POISON);
@@ -1273,7 +1279,7 @@ static void Task_WateringBerryTreeAnim_End(u8 taskId)
{
SetPlayerAvatarTransitionFlags(GetPlayerAvatarFlags());
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void DoWateringBerryTreeAnim(void)
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index a30000e526..27689b02e3 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -55,7 +55,7 @@ static void Task_DoFieldMove_Init(u8 taskId)
{
u8 objEventId;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE;
objEventId = gPlayerAvatar.objectEventId;
if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId])
@@ -144,7 +144,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void FieldCallback_RockSmash(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(EventScript_UseRockSmash);
+ ScriptContext_SetupScript(EventScript_UseRockSmash);
}
bool8 FldEff_UseRockSmash(void)
@@ -162,5 +162,5 @@ static void FieldMove_RockSmash(void)
{
PlaySE(SE_M_ROCK_THROW);
FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 61960d0ffc..9312150403 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -30,7 +30,7 @@ bool8 SetUpFieldMove_Strength(void)
static void FieldCallback_Strength(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(EventScript_UseStrength);
+ ScriptContext_SetupScript(EventScript_UseStrength);
}
bool8 FldEff_UseStrength(void)
@@ -46,5 +46,5 @@ bool8 FldEff_UseStrength(void)
static void StartStrengthFieldEffect(void)
{
FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index e34d195045..7e93526094 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -93,7 +93,7 @@ static void FailSweetScentEncounter(u8 taskId)
{
CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
SetWeatherPalStateIdle();
- ScriptContext1_SetupScript(EventScript_FailSweetScent);
+ ScriptContext_SetupScript(EventScript_FailSweetScent);
DestroyTask(taskId);
}
}
diff --git a/src/fonts.c b/src/fonts.c
index df904bacaf..8ef32bfef2 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -110,38 +110,38 @@ ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = {
ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/short.latfont");
ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = {
- 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6,
- 8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3,
- 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 8, 8, 3,
- 3, 3, 3, 3, 10, 8, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6,
- 3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3,
- 4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5,
- 6, 6, 6, 3, 3, 6, 6, 8, 5, 9, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5,
- 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 8,
- 5, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
+ 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6,
+ 8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3,
+ 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 8, 8, 3,
+ 3, 3, 3, 3, 10, 8, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6,
+ 3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3,
+ 4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5,
+ 6, 6, 6, 3, 3, 6, 6, 8, 5, 9, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5,
+ 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 8,
+ 5, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
};
ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/normal.latfont");
diff --git a/src/graphics.c b/src/graphics.c
index 3d72f96921..9e858deecb 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1894,17 +1894,31 @@ const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_stora
// naming screen
-const u16 gNamingScreenMenu_Pal[] = INCBIN_U16("graphics/naming_screen/menu.gbapal");
-const u32 gNamingScreenMenu_Gfx[] = INCBIN_U32("graphics/naming_screen/menu.4bpp.lz");
-const u8 gNamingScreenRWindow_Gfx[] = INCBIN_U8("graphics/naming_screen/rwindow.4bpp");
-const u8 gNamingScreenROptions_Gfx[] = INCBIN_U8("graphics/naming_screen/roptions.4bpp");
-const u8 gNamingScreenCursor_Gfx[] = INCBIN_U8("graphics/naming_screen/cursor.4bpp");
-const u8 gNamingScreenPageButton_Gfx[] = INCBIN_U8("graphics/naming_screen/page_button.4bpp");
-const u8 gNamingScreenInputArrow_Gfx[] = INCBIN_U8("graphics/naming_screen/input_arrow.4bpp");
-const u8 gNamingScreenUnderscore_Gfx[] = INCBIN_U8("graphics/naming_screen/underscore.4bpp");
-const u32 gNamingScreenBackground_Tilemap[] = INCBIN_U32("graphics/naming_screen/background.bin.lz");
-const u32 gNamingScreenKeyboardUpper_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_upper.bin.lz");
-const u32 gNamingScreenKeyboardLower_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_lower.bin.lz");
+const u16 gNamingScreenMenu_Pal[6][16] =
+{
+ INCBIN_U16("graphics/naming_screen/menu.gbapal"),
+ INCBIN_U16("graphics/naming_screen/page_swap_upper.gbapal"),
+ INCBIN_U16("graphics/naming_screen/page_swap_lower.gbapal"),
+ INCBIN_U16("graphics/naming_screen/page_swap_others.gbapal"),
+ INCBIN_U16("graphics/naming_screen/buttons.gbapal"),
+ INCBIN_U16("graphics/naming_screen/cursor.gbapal"),
+};
+const u32 gNamingScreenMenu_Gfx[] = INCBIN_U32("graphics/naming_screen/menu.4bpp.lz");
+const u32 gNamingScreenPageSwapFrame_Gfx[] = INCBIN_U32("graphics/naming_screen/page_swap_frame.4bpp");
+const u32 gNamingScreenBackButton_Gfx[] = INCBIN_U32("graphics/naming_screen/back_button.4bpp");
+const u32 gNamingScreenOKButton_Gfx[] = INCBIN_U32("graphics/naming_screen/ok_button.4bpp");
+const u32 gNamingScreenPageSwapUpper_Gfx[] = INCBIN_U32("graphics/naming_screen/page_swap_upper.4bpp");
+const u32 gNamingScreenPageSwapLower_Gfx[] = INCBIN_U32("graphics/naming_screen/page_swap_lower.4bpp");
+const u32 gNamingScreenPageSwapOthers_Gfx[] = INCBIN_U32("graphics/naming_screen/page_swap_others.4bpp");
+const u32 gNamingScreenCursor_Gfx[] = INCBIN_U32("graphics/naming_screen/cursor.4bpp");
+const u32 gNamingScreenCursorSquished_Gfx[] = INCBIN_U32("graphics/naming_screen/cursor_squished.4bpp");
+const u32 gNamingScreenCursorFilled_Gfx[] = INCBIN_U32("graphics/naming_screen/cursor_filled.4bpp");
+const u32 gNamingScreenPageSwapButton_Gfx[] = INCBIN_U32("graphics/naming_screen/page_swap_button.4bpp");
+const u32 gNamingScreenInputArrow_Gfx[] = INCBIN_U32("graphics/naming_screen/input_arrow.4bpp");
+const u32 gNamingScreenUnderscore_Gfx[] = INCBIN_U32("graphics/naming_screen/underscore.4bpp");
+const u32 gNamingScreenBackground_Tilemap[] = INCBIN_U32("graphics/naming_screen/background.bin.lz");
+const u32 gNamingScreenKeyboardUpper_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_upper.bin.lz");
+const u32 gNamingScreenKeyboardLower_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_lower.bin.lz");
const u32 gNamingScreenKeyboardSymbols_Tilemap[] = INCBIN_U32("graphics/naming_screen/keyboard_symbols.bin.lz");
// union room chat
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index dcf0039a71..42e17e93db 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -101,7 +101,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2);
static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2);
static void Task_DoDomeConfetti(u8 taskId);
-static void SpriteCB_HofConfetti(struct Sprite* sprite);
+static void SpriteCB_HofConfetti(struct Sprite *sprite);
static const struct BgTemplate sHof_BgTemplates[] =
{
@@ -182,7 +182,7 @@ static const struct OamData sOamData_Confetti =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -484,7 +484,7 @@ static void Task_Hof_InitMonData(u8 taskId)
static void Task_Hof_InitTeamSaveData(u8 taskId)
{
u16 i;
- struct HallofFameTeam* lastSavedTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
+ struct HallofFameTeam *lastSavedTeam = (struct HallofFameTeam *)(gDecompressionBuffer);
if (!gHasHallOfFameRecords)
{
@@ -503,8 +503,8 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
}
if (i >= HALL_OF_FAME_MAX_TEAMS)
{
- struct HallofFameTeam *afterTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
- struct HallofFameTeam *beforeTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
+ struct HallofFameTeam *afterTeam = (struct HallofFameTeam *)(gDecompressionBuffer);
+ struct HallofFameTeam *beforeTeam = (struct HallofFameTeam *)(gDecompressionBuffer);
afterTeam++;
for (i = 0; i < HALL_OF_FAME_MAX_TEAMS - 1; i++, beforeTeam++, afterTeam++)
{
@@ -515,7 +515,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
*lastSavedTeam = *sHofMonPtr;
DrawDialogueFrame(0, FALSE);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_TrySaveData;
}
@@ -700,7 +700,7 @@ static void Task_Hof_DisplayPlayer(u8 taskId)
ShowBg(0);
ShowBg(1);
ShowBg(3);
- gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), 1, 120, 72, 6, TAG_NONE);
+ gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), TRUE, 120, 72, 6, TAG_NONE);
AddWindow(&sHof_WindowTemplate);
LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
LoadPalette(GetTextWindowPalette(1), 0xE0, 0x20);
@@ -723,7 +723,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2);
DrawDialogueFrame(0, FALSE);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
}
@@ -821,7 +821,7 @@ void CB2_DoHallOfFamePC(void)
case 3:
if (!LoadHofBgs())
{
- struct HallofFameTeam *fameTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
+ struct HallofFameTeam *fameTeam = (struct HallofFameTeam *)(gDecompressionBuffer);
fameTeam->mon[0] = sDummyFameMon;
ComputerScreenOpenEffect(0, 0, 0);
SetVBlankCallback(VBlankCB_HallOfFame);
@@ -867,7 +867,7 @@ static void Task_HofPC_CopySaveData(u8 taskId)
else
{
u16 i;
- struct HallofFameTeam* savedTeams;
+ struct HallofFameTeam *savedTeams;
CpuCopy16(gDecompressionBuffer, sHofMonPtr, SECTOR_SIZE * NUM_HOF_SECTORS);
savedTeams = sHofMonPtr;
@@ -890,7 +890,7 @@ static void Task_HofPC_CopySaveData(u8 taskId)
static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
{
- struct HallofFameTeam* savedTeams = sHofMonPtr;
+ struct HallofFameTeam *savedTeams = sHofMonPtr;
struct HallofFameMon* currMon;
u16 i;
@@ -931,7 +931,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
if (currMon->species == SPECIES_EGG)
posY += 10;
- spriteId = CreateMonPicSprite(currMon->species, currMon->tid, currMon->personality, 1, posX, posY, i, TAG_NONE);
+ spriteId = CreateMonPicSprite(currMon->species, currMon->tid, currMon->personality, TRUE, posX, posY, i, TAG_NONE);
gSprites[spriteId].oam.priority = 1;
gTasks[taskId].tMonSpriteId(i) = spriteId;
}
@@ -956,7 +956,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
static void Task_HofPC_PrintMonInfo(u8 taskId)
{
- struct HallofFameTeam* savedTeams = sHofMonPtr;
+ struct HallofFameTeam *savedTeams = sHofMonPtr;
struct HallofFameMon* currMon;
u16 i;
u16 currMonID;
@@ -1042,10 +1042,10 @@ static void Task_HofPC_HandleInput(u8 taskId)
static void Task_HofPC_HandlePaletteOnExit(u8 taskId)
{
- struct HallofFameTeam* fameTeam;
+ struct HallofFameTeam *fameTeam;
CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
- fameTeam = (struct HallofFameTeam*)(gDecompressionBuffer);
+ fameTeam = (struct HallofFameTeam *)(gDecompressionBuffer);
fameTeam->mon[0] = sDummyFameMon;
ComputerScreenCloseEffect(0, 0, 0);
gTasks[taskId].func = Task_HofPC_HandleExit;
@@ -1088,7 +1088,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{
HofPCTopBar_Print(gText_AButtonExit, 8, TRUE);
DrawDialogueFrame(0, FALSE);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
}
@@ -1369,7 +1369,7 @@ static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
#define sSineIdx data[0]
#define sExtraY data[1]
-static void SpriteCB_HofConfetti(struct Sprite* sprite)
+static void SpriteCB_HofConfetti(struct Sprite *sprite)
{
if (sprite->y2 > 120)
{
@@ -1394,7 +1394,7 @@ static void SpriteCB_HofConfetti(struct Sprite* sprite)
static bool8 CreateHofConfettiSprite(void)
{
u8 spriteID;
- struct Sprite* sprite;
+ struct Sprite *sprite;
s16 posX = Random() % DISPLAY_WIDTH;
s16 posY = -(Random() % 8);
diff --git a/src/hof_pc.c b/src/hof_pc.c
index f74448cca6..79ba4b4b46 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -14,7 +14,7 @@ static void Task_WaitForPaletteFade(u8);
void AccessHallOfFamePC(void)
{
SetMainCallback2(CB2_DoHallOfFamePC);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
void ReturnFromHallOfFamePC(void)
@@ -25,7 +25,7 @@ void ReturnFromHallOfFamePC(void)
static void ReshowPCMenuAfterHallOfFamePC(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
Overworld_PlaySpecialMapMusic();
ScriptMenu_CreatePCMultichoice();
ScriptMenu_DisplayPCStartupPrompt();
diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c
index 60b105163e..51a5d13993 100644
--- a/src/image_processing_effects.c
+++ b/src/image_processing_effects.c
@@ -28,14 +28,14 @@ static void ApplyImageEffect_PersonalityColor(u8);
static void ApplyImageEffect_RedChannelGrayscale(u8);
static void ApplyImageEffect_RedChannelGrayscaleHighlight(u8);
static void AddPointillismPoints(u16);
-static u16 ConvertColorToGrayscale(u16*);
-static u16 QuantizePixel_Blur(u16*, u16*, u16*);
-static u16 QuantizePixel_PersonalityColor(u16*, u8);
-static u16 QuantizePixel_BlackAndWhite(u16*);
-static u16 QuantizePixel_BlackOutline(u16*, u16*);
-static u16 QuantizePixel_Invert(u16*);
-static u16 QuantizePixel_BlurHard(u16*, u16*, u16*);
-static u16 QuantizePixel_MotionBlur(u16*, u16*);
+static u16 ConvertColorToGrayscale(u16 *);
+static u16 QuantizePixel_Blur(u16 *, u16 *, u16 *);
+static u16 QuantizePixel_PersonalityColor(u16 *, u8);
+static u16 QuantizePixel_BlackAndWhite(u16 *);
+static u16 QuantizePixel_BlackOutline(u16 *, u16 *);
+static u16 QuantizePixel_Invert(u16 *);
+static u16 QuantizePixel_BlurHard(u16 *, u16 *, u16 *);
+static u16 QuantizePixel_MotionBlur(u16 *, u16 *);
static u16 GetColorFromPersonality(u8);
static void QuantizePalette_Standard(bool8);
static void SetPresetPalette_PrimaryColors(void);
@@ -46,10 +46,10 @@ static void SetPresetPalette_GrayscaleSmall(void);
static void QuantizePalette_GrayscaleSmall(void);
static void SetPresetPalette_BlackAndWhite(void);
static void QuantizePalette_BlackAndWhite(void);
-static u16 QuantizePixel_Standard(u16*);
-static u16 QuantizePixel_GrayscaleSmall(u16*);
-static u16 QuantizePixel_Grayscale(u16*);
-static u16 QuantizePixel_PrimaryColors(u16*);
+static u16 QuantizePixel_Standard(u16 *);
+static u16 QuantizePixel_GrayscaleSmall(u16 *);
+static u16 QuantizePixel_Grayscale(u16 *);
+static u16 QuantizePixel_PrimaryColors(u16 *);
#define MAX_DIMENSION 64
@@ -1091,7 +1091,7 @@ static u16 QuantizePixel_Standard(u16 *pixel)
return RGB2(red, green, blue);
}
-static u16 QuantizePixel_PrimaryColors(u16* color)
+static u16 QuantizePixel_PrimaryColors(u16 *color)
{
u16 red = GET_R(*color);
u16 green = GET_G(*color);
diff --git a/src/international_string_util.c b/src/international_string_util.c
index e4b793b66c..f71734fa7e 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -48,7 +48,7 @@ int GetMaxWidthInMenuTable(const struct MenuAction *actions, int numActions)
return ConvertPixelWidthToTileWidth(maxWidth);
}
-int GetMaxWidthInSubsetOfMenuTable(const struct MenuAction *actions, const u8* actionIds, int numActions)
+int GetMaxWidthInSubsetOfMenuTable(const struct MenuAction *actions, const u8 *actionIds, int numActions)
{
int i, maxWidth;
@@ -206,12 +206,13 @@ void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language)
ConvertInternationalString(dest, language);
}
+// It's impossible to distinguish between Latin languages just from a string alone, so the function defaults to LANGUAGE_ENGLISH. This is the case in all of the versions of the game.
int GetNicknameLanguage(u8 *str)
{
if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN)
return LANGUAGE_JAPANESE;
else
- return GAME_LANGUAGE;
+ return LANGUAGE_ENGLISH;
}
// Used by Pokénav's Match Call to erase the previous trainer's flavor text when switching between their info pages.
diff --git a/src/intro.c b/src/intro.c
index a1d0508f4f..7e9a751690 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -216,7 +216,7 @@ static const struct OamData sOamData_Sparkle =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -284,7 +284,7 @@ static const struct OamData sOamData_Volbeat =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -320,7 +320,7 @@ static const struct OamData sOamData_Torchic =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -380,7 +380,7 @@ static const struct OamData sOamData_Manectric =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -428,7 +428,7 @@ static const struct OamData sOamData_Lightning =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -519,7 +519,7 @@ static const struct OamData sOamData_Bubbles =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32),
.x = 0,
@@ -558,7 +558,7 @@ static const struct OamData sOamData_WaterDrop =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -660,7 +660,7 @@ static const struct OamData sOamData_GameFreakLetter =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -676,7 +676,7 @@ static const struct OamData sOamData_PresentsLetter =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -692,7 +692,7 @@ static const struct OamData sOamData_GameFreakLogo =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x64),
.x = 0,
@@ -931,7 +931,7 @@ static const struct OamData sOamData_FlygonSilhouette =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -983,7 +983,7 @@ static const struct OamData sOamData_RayquazaOrb =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c
index 0942e82f17..cf193018a4 100644
--- a/src/intro_credits_graphics.c
+++ b/src/intro_credits_graphics.c
@@ -1106,7 +1106,7 @@ static void SpriteCB_Player(struct Sprite *sprite)
#define sPlayerSpriteId data[0]
-static void SpriteCB_Bicycle(struct Sprite* sprite)
+static void SpriteCB_Bicycle(struct Sprite *sprite)
{
sprite->invisible = gSprites[sprite->sPlayerSpriteId].invisible;
sprite->x = gSprites[sprite->sPlayerSpriteId].x;
@@ -1139,7 +1139,7 @@ static void SpriteCB_FlygonLeftHalf(struct Sprite *sprite)
#define sLeftSpriteId data[0]
-static void SpriteCB_FlygonRightHalf(struct Sprite* sprite)
+static void SpriteCB_FlygonRightHalf(struct Sprite *sprite)
{
sprite->invisible = gSprites[sprite->sLeftSpriteId].invisible;
sprite->y = gSprites[sprite->sLeftSpriteId].y;
diff --git a/src/item_icon.c b/src/item_icon.c
index dc69d03318..274ed03b36 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -18,7 +18,7 @@ static const struct OamData sOamData_ItemIcon =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
diff --git a/src/item_menu.c b/src/item_menu.c
index adedf6c98d..afd9d3cec6 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -128,7 +128,7 @@ static bool8 LoadBagMenu_Graphics(void);
static void LoadBagMenuTextWindows(void);
static void AllocateBagItemListBuffers(void);
static void LoadBagItemListBuffers(u8);
-static void PrintPocketNames(const u8*, const u8*);
+static void PrintPocketNames(const u8 *, const u8 *);
static void CopyPocketNameToWindow(u32);
static void DrawPocketIndicatorSquare(u8, bool8);
static void CreatePocketScrollArrowPair(void);
@@ -138,10 +138,10 @@ static void PrepareTMHMMoveWindow(void);
static bool8 IsWallysBag(void);
static void Task_WallyTutorialBagMenu(u8);
static void Task_BagMenu_HandleInput(u8);
-static void GetItemName(s8*, u16);
+static void GetItemName(s8 *, u16);
static void PrintItemDescription(int);
static void BagMenu_PrintCursorAtPos(u8, u8);
-static void BagMenu_Print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8);
+static void BagMenu_Print(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8);
static void Task_CloseBagMenu(u8);
static u8 AddItemMessageWindow(u8);
static void RemoveItemMessageWindow(u8);
@@ -189,7 +189,7 @@ static void InitPocketListPositions(void);
static void InitPocketScrollPositions(void);
static u8 CreateBagInputHandlerTask(u8);
static void DrawItemListBgRow(u8);
-static void BagMenu_MoveCursorCallback(s32, bool8, struct ListMenu*);
+static void BagMenu_MoveCursorCallback(s32, bool8, struct ListMenu *);
static void BagMenu_ItemPrintCallback(u8, u32, u8);
static void ItemMenu_UseOutOfBattle(u8);
static void ItemMenu_Toss(u8);
@@ -1080,7 +1080,7 @@ void Task_FadeAndCloseBagMenu(u8 taskId)
static void Task_CloseBagMenu(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (!gPaletteFade.active)
{
DestroyListMenuTask(tListTaskId, &gBagPosition.scrollPosition[gBagPosition.pocket], &gBagPosition.cursorPosition[gBagPosition.pocket]);
@@ -1162,7 +1162,7 @@ u8 GetItemListPosition(u8 pocketId)
void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void (*callback)(u8 taskId))
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
tMsgWindowId = AddItemMessageWindow(ITEMWIN_MESSAGE);
FillWindowPixelBuffer(tMsgWindowId, PIXEL_FILL(1));
@@ -1172,9 +1172,9 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void (*callback)(u8
void CloseItemMessage(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
RemoveItemMessageWindow(ITEMWIN_MESSAGE);
DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
UpdatePocketItemList(gBagPosition.pocket);
@@ -1210,9 +1210,9 @@ static void PrintItemSoldAmount(int windowId, int numSold, int moneyEarned)
static void Task_BagMenu_HandleInput(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
s32 listPosition;
if (MenuHelpers_ShouldWaitForLinkRecv() != TRUE && !gPaletteFade.active)
@@ -1313,7 +1313,7 @@ static void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId)
static void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, bool16 skipEraseList)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
u8 newPocket;
tPocketSwitchState = 0;
@@ -1352,7 +1352,7 @@ static void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, bool16 skipEraseLis
static void Task_SwitchBagPocket(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (!MenuHelpers_IsLinkActive() && !IsWallysBag())
{
@@ -1430,7 +1430,7 @@ static bool8 CanSwapItems(void)
static void StartItemSwap(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
ListMenuSetUnkIndicatorsStructField(tListTaskId, 16, 1);
tListPosition = gBagPosition.scrollPosition[gBagPosition.pocket] + gBagPosition.cursorPosition[gBagPosition.pocket];
@@ -1447,7 +1447,7 @@ static void StartItemSwap(u8 taskId)
static void Task_HandleSwappingItemsInput(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (MenuHelpers_ShouldWaitForLinkRecv() != TRUE)
{
@@ -1485,9 +1485,9 @@ static void Task_HandleSwappingItemsInput(u8 taskId)
static void DoItemSwap(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
u16 realPos = (*scrollPos + *cursorPos);
if (tListPosition == realPos || tListPosition == realPos - 1)
@@ -1512,9 +1512,9 @@ static void DoItemSwap(u8 taskId)
static void CancelItemSwap(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
gBagMenu->toSwapPos = NOT_SWAPPING;
DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
@@ -1806,7 +1806,7 @@ static void ItemMenu_UseOutOfBattle(u8 taskId)
static void ItemMenu_Toss(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
RemoveContextWindow();
tItemCount = 1;
@@ -1827,7 +1827,7 @@ static void ItemMenu_Toss(u8 taskId)
static void AskTossItems(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS);
@@ -1839,7 +1839,7 @@ static void AskTossItems(u8 taskId)
static void CancelToss(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
PrintItemDescription(tListPosition);
BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
@@ -1848,7 +1848,7 @@ static void CancelToss(u8 taskId)
static void Task_ChooseHowManyToToss(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
{
@@ -1870,7 +1870,7 @@ static void Task_ChooseHowManyToToss(u8 taskId)
static void ConfirmToss(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS);
@@ -1884,9 +1884,9 @@ static void ConfirmToss(u8 taskId)
// For when items are tossed or deposited
static void Task_RemoveItemFromBag(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
@@ -1904,9 +1904,9 @@ static void Task_RemoveItemFromBag(u8 taskId)
static void ItemMenu_Register(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
gSaveBlock1Ptr->registeredItem = 0;
@@ -1973,7 +1973,7 @@ static void ItemMenu_CheckTag(u8 taskId)
static void ItemMenu_Cancel(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
RemoveContextWindow();
PrintItemDescription(tListPosition);
@@ -2044,7 +2044,7 @@ bool8 UseRegisteredKeyItemOnField(void)
{
if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
PlayerFreeze();
StopPlayerAvatar();
@@ -2058,7 +2058,7 @@ bool8 UseRegisteredKeyItemOnField(void)
gSaveBlock1Ptr->registeredItem = ITEM_NONE;
}
}
- ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem);
+ ScriptContext_SetupScript(EventScript_SelectWithoutRegisteredItem);
return TRUE;
}
@@ -2066,7 +2066,7 @@ bool8 UseRegisteredKeyItemOnField(void)
static void Task_ItemContext_Sell(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (ItemId_GetPrice(gSpecialVar_ItemId) == 0)
{
@@ -2093,7 +2093,7 @@ static void Task_ItemContext_Sell(u8 taskId)
static void DisplaySellItemPriceAndConfirm(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1);
@@ -2107,7 +2107,7 @@ static void AskSellItems(u8 taskId)
static void CancelSell(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
RemoveMoneyWindow();
RemoveItemMessageWindow(ITEMWIN_MESSAGE);
@@ -2117,7 +2117,7 @@ static void CancelSell(u8 taskId)
static void InitSellHowManyInput(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
u8 windowId = BagMenu_AddWindow(ITEMWIN_QUANTITY_WIDE);
PrintItemSoldAmount(windowId, 1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
@@ -2127,7 +2127,7 @@ static void InitSellHowManyInput(u8 taskId)
static void Task_ChooseHowManyToSell(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
{
@@ -2152,7 +2152,7 @@ static void Task_ChooseHowManyToSell(u8 taskId)
static void ConfirmSell(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar2);
ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
@@ -2162,9 +2162,9 @@ static void ConfirmSell(u8 taskId)
static void SellItem(u8 taskId)
{
- s16* data = gTasks[taskId].data;
- u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
- u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+ s16 *data = gTasks[taskId].data;
+ u16 *scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+ u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, tItemCount);
@@ -2191,7 +2191,7 @@ static void WaitAfterItemSell(u8 taskId)
static void Task_ItemContext_Deposit(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
tItemCount = 1;
if (tQuantity == 1)
@@ -2211,7 +2211,7 @@ static void Task_ItemContext_Deposit(u8 taskId)
static void Task_ChooseHowManyToDeposit(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
{
@@ -2235,7 +2235,7 @@ static void Task_ChooseHowManyToDeposit(u8 taskId)
static void TryDepositItem(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
if (ItemId_GetImportance(gSpecialVar_ItemId))
@@ -2263,7 +2263,7 @@ static void TryDepositItem(u8 taskId)
static void WaitDepositErrorMessage(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
@@ -2327,7 +2327,7 @@ void DoWallyTutorialBagMenu(void)
static void Task_WallyTutorialBagMenu(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (!gPaletteFade.active)
{
@@ -2373,7 +2373,7 @@ static void ItemMenu_Show(u8 taskId)
static void CB2_ApprenticeExitBagMenu(void)
{
- gFieldCallback = Apprentice_EnableBothScriptContexts;
+ gFieldCallback = Apprentice_ScriptContext_Enable;
SetMainCallback2(CB2_ReturnToField);
}
@@ -2423,19 +2423,19 @@ static void PrintPocketNames(const u8 *pocketName1, const u8 *pocketName2)
offset = GetStringCenterAlignXOffset(FONT_NORMAL, pocketName2, 0x40);
BagMenu_Print(windowId, FONT_NORMAL, pocketName2, offset + 0x40, 1, 0, 0, TEXT_SKIP_DRAW, COLORID_POCKET_NAME);
}
- CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gBagMenu->pocketNameBuffer, sizeof(gBagMenu->pocketNameBuffer));
+ CpuCopy32((u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gBagMenu->pocketNameBuffer, sizeof(gBagMenu->pocketNameBuffer));
RemoveWindow(windowId);
}
static void CopyPocketNameToWindow(u32 a)
{
u8 (* tileDataBuffer)[32][32];
- u8* windowTileData;
+ u8 *windowTileData;
int b;
if (a > 8)
a = 8;
tileDataBuffer = &gBagMenu->pocketNameBuffer;
- windowTileData = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA);
+ windowTileData = (u8 *)GetWindowAttribute(2, WINDOW_TILE_DATA);
CpuCopy32(tileDataBuffer[0][a], windowTileData, 0x100); // Top half of pocket name
b = a + 16;
CpuCopy32(tileDataBuffer[0][b], windowTileData + 0x100, 0x100); // Bottom half of pocket name
@@ -2478,7 +2478,7 @@ static u8 BagMenu_AddWindow(u8 windowType)
if (*windowId == WINDOW_NONE)
{
*windowId = AddWindow(&sContextMenuWindowTemplates[windowType]);
- DrawStdFrameWithCustomTileAndPalette(*windowId, 0, 1, 14);
+ DrawStdFrameWithCustomTileAndPalette(*windowId, FALSE, 1, 14);
ScheduleBgCopyTilemapToVram(1);
}
return *windowId;
@@ -2551,7 +2551,7 @@ static void PrintTMHMMoveData(u16 itemId)
{
u8 i;
u16 moveId;
- const u8* text;
+ const u8 *text;
FillWindowPixelBuffer(WIN_TMHM_INFO, PIXEL_FILL(0));
if (itemId == ITEM_NONE)
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index 1d157ed088..ff23c37925 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -43,7 +43,7 @@ static const struct OamData sBagOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -93,12 +93,12 @@ static const union AnimCmd sSpriteAnim_Bag_Berries[] =
static const union AnimCmd *const sBagSpriteAnimTable[] =
{
- sSpriteAnim_Bag_Closed,
- sSpriteAnim_Bag_Items,
- sSpriteAnim_Bag_Pokeballs,
- sSpriteAnim_Bag_TMsHMs,
- sSpriteAnim_Bag_Berries,
- sSpriteAnim_Bag_KeyItems
+ [POCKET_NONE] = sSpriteAnim_Bag_Closed,
+ [POCKET_ITEMS] = sSpriteAnim_Bag_Items,
+ [POCKET_POKE_BALLS] = sSpriteAnim_Bag_Pokeballs,
+ [POCKET_TM_HM] = sSpriteAnim_Bag_TMsHMs,
+ [POCKET_BERRIES] = sSpriteAnim_Bag_Berries,
+ [POCKET_KEY_ITEMS] = sSpriteAnim_Bag_KeyItems,
};
static const union AffineAnimCmd sSpriteAffineAnim_BagNormal[] =
@@ -116,10 +116,15 @@ static const union AffineAnimCmd sSpriteAffineAnim_BagShake[] =
AFFINEANIMCMD_END
};
+enum {
+ ANIM_BAG_NORMAL,
+ ANIM_BAG_SHAKE,
+};
+
static const union AffineAnimCmd *const sBagAffineAnimCmds[] =
{
- sSpriteAffineAnim_BagNormal,
- sSpriteAffineAnim_BagShake
+ [ANIM_BAG_NORMAL] = sSpriteAffineAnim_BagNormal,
+ [ANIM_BAG_SHAKE] = sSpriteAffineAnim_BagShake
};
const struct CompressedSpriteSheet gBagMaleSpriteSheet =
@@ -153,7 +158,7 @@ static const struct OamData sRotatingBallOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -224,7 +229,7 @@ static const struct OamData sBerryPicOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -241,7 +246,7 @@ static const struct OamData sBerryPicRotatingOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -406,7 +411,7 @@ static const struct OamData sBerryCheckCircleOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -461,6 +466,8 @@ void AddBagVisualSprite(u8 bagPocketId)
SetBagVisualPocketId(bagPocketId, FALSE);
}
+#define sPocketId data[0]
+
void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
{
struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]];
@@ -468,8 +475,8 @@ void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
{
sprite->y2 = -5;
sprite->callback = SpriteCB_BagVisualSwitchingPockets;
- sprite->data[0] = bagPocketId + 1;
- StartSpriteAnim(sprite, 0);
+ sprite->sPocketId = bagPocketId + 1;
+ StartSpriteAnim(sprite, POCKET_NONE);
}
else
{
@@ -485,26 +492,29 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite)
}
else
{
- StartSpriteAnim(sprite, sprite->data[0]);
+ StartSpriteAnim(sprite, sprite->sPocketId);
sprite->callback = SpriteCallbackDummy;
}
}
+#undef sPocketId
+
void ShakeBagSprite(void)
{
struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]];
if (sprite->affineAnimEnded)
{
- StartSpriteAffineAnim(sprite, 1);
+ StartSpriteAffineAnim(sprite, ANIM_BAG_SHAKE);
sprite->callback = SpriteCB_ShakeBagSprite;
}
}
static void SpriteCB_ShakeBagSprite(struct Sprite *sprite)
{
+ // Wait for shaking to end
if (sprite->affineAnimEnded)
{
- StartSpriteAffineAnim(sprite, 0);
+ StartSpriteAffineAnim(sprite, ANIM_BAG_NORMAL);
sprite->callback = SpriteCallbackDummy;
}
}
diff --git a/src/item_use.c b/src/item_use.c
index 02446b4ce2..7cc4bb32d3 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -164,10 +164,10 @@ static void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredK
static void Task_CloseCantUseKeyItemMessage(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
DestroyTask(taskId);
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
@@ -185,7 +185,7 @@ static void CB2_CheckMail(void)
{
struct Mail mail;
mail.itemId = gSpecialVar_ItemId;
- ReadMail(&mail, CB2_ReturnToBagMenuPocket, 0);
+ ReadMail(&mail, CB2_ReturnToBagMenuPocket, FALSE);
}
void ItemUseOutOfBattle_Mail(u8 taskId)
@@ -196,7 +196,7 @@ void ItemUseOutOfBattle_Mail(u8 taskId)
void ItemUseOutOfBattle_Bike(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
s16 coordsY;
s16 coordsX;
u8 behavior;
@@ -223,7 +223,7 @@ static void ItemUseOnFieldCB_Bike(u8 taskId)
else // ACRO_BIKE
GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE);
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
@@ -248,7 +248,7 @@ static bool32 CanFish(void)
}
else
{
- if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior) && !MapGridIsImpassableAt(x, y))
+ if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior) && MapGridGetCollisionAt(x, y) == 0)
return TRUE;
if (MetatileBehavior_IsBridgeOverWaterNoEdge(tileBehavior) == TRUE)
return TRUE;
@@ -302,7 +302,7 @@ static void Task_UseItemfinder(u8 taskId)
u8 playerDir;
u8 playerDirToItem;
u8 i;
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (tCounter == 0)
{
if (tItemfinderBeeps == 4)
@@ -336,9 +336,9 @@ static void Task_UseItemfinder(u8 taskId)
static void Task_CloseItemfinderMessage(u8 taskId)
{
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
@@ -693,8 +693,8 @@ void ItemUseOutOfBattle_Berry(u8 taskId)
static void ItemUseOnFieldCB_Berry(u8 taskId)
{
RemoveBagItem(gSpecialVar_ItemId, 1);
- ScriptContext2_Enable();
- ScriptContext1_SetupScript(BerryTree_EventScript_ItemUsePlantBerry);
+ LockPlayerFieldControls();
+ ScriptContext_SetupScript(BerryTree_EventScript_ItemUsePlantBerry);
DestroyTask(taskId);
}
@@ -718,8 +718,8 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
static void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId)
{
- ScriptContext2_Enable();
- ScriptContext1_SetupScript(BerryTree_EventScript_ItemUseWailmerPail);
+ LockPlayerFieldControls();
+ ScriptContext_SetupScript(BerryTree_EventScript_ItemUseWailmerPail);
DestroyTask(taskId);
}
@@ -739,8 +739,8 @@ static bool8 TryToWaterSudowoodo(void)
static void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId)
{
- ScriptContext2_Enable();
- ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_WaterSudowoodo);
+ LockPlayerFieldControls();
+ ScriptContext_SetupScript(BattleFrontier_OutsideEast_EventScript_WaterSudowoodo);
DestroyTask(taskId);
}
@@ -856,7 +856,7 @@ void ItemUseOutOfBattle_Repel(u8 taskId)
static void Task_StartUseRepel(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (++data[8] > 7)
{
diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index 7a70cf41fa..6fb9d5ec08 100644
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -160,7 +160,7 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
/*
void NoCashGBAPrint(const char *pBuf)
{
- *(volatile u32*)NOCASHGBAPRINTADDR2 = (u32)pBuf;
+ *(volatile u32 *)NOCASHGBAPRINTADDR2 = (u32)pBuf;
}
void NoCashGBAPrintf(const char *pBuf, ...)
diff --git a/src/librfu_intr.c b/src/librfu_intr.c
index d902b1c45b..ab4392e229 100644
--- a/src/librfu_intr.c
+++ b/src/librfu_intr.c
@@ -41,7 +41,7 @@ static void sio32intr_clock_master(void)
{
if (gSTWIStatus->reqNext <= gSTWIStatus->reqLength)
{
- REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket->rfuPacket8.data)[gSTWIStatus->reqNext];
+ REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket->rfuPacket8.data)[gSTWIStatus->reqNext];
gSTWIStatus->reqNext++;
}
else
@@ -62,7 +62,7 @@ static void sio32intr_clock_master(void)
if ((regSIODATA32 & 0xFFFF0000) == 0x99660000)
{
gSTWIStatus->ackNext = 0;
- ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32;
+ ((u32 *)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32;
gSTWIStatus->ackNext++;
gSTWIStatus->ackActiveCommand = regSIODATA32;
gSTWIStatus->ackLength = ackLen = regSIODATA32 >> 8;
@@ -85,7 +85,7 @@ static void sio32intr_clock_master(void)
}
else if (gSTWIStatus->state == 2) // master receive ack
{
- ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32;
+ ((u32 *)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32;
gSTWIStatus->ackNext++;
if (gSTWIStatus->ackLength < gSTWIStatus->ackNext)
gSTWIStatus->state = 3; // master done ack
@@ -158,7 +158,7 @@ static void sio32intr_clock_slave(void)
regSIODATA32 = REG_SIODATA32;
if (gSTWIStatus->state == 5) // slave receive req init
{
- ((u32*)gSTWIStatus->rxPacket)[0] = regSIODATA32;
+ ((u32 *)gSTWIStatus->rxPacket)[0] = regSIODATA32;
gSTWIStatus->reqNext = 1;
r0 = 0x99660000;
// variable reuse required
@@ -179,24 +179,24 @@ static void sio32intr_clock_slave(void)
)
{
gSTWIStatus->ackActiveCommand = gSTWIStatus->reqActiveCommand + 0x80;
- ((u32*)gSTWIStatus->txPacket)[0] = 0x99660000 + gSTWIStatus->ackActiveCommand;
+ ((u32 *)gSTWIStatus->txPacket)[0] = 0x99660000 + gSTWIStatus->ackActiveCommand;
gSTWIStatus->ackLength = 0;
}
else
{
- ((u32*)gSTWIStatus->txPacket)[0] = 0x996601EE;
+ ((u32 *)gSTWIStatus->txPacket)[0] = 0x996601EE;
if (gSTWIStatus->reqActiveCommand >= 0x10 && gSTWIStatus->reqActiveCommand <= 0x3D)
{
- ((u32*)gSTWIStatus->txPacket)[1] = 1;
+ ((u32 *)gSTWIStatus->txPacket)[1] = 1;
}
else
{
- ((u32*)gSTWIStatus->txPacket)[1] = 2;
+ ((u32 *)gSTWIStatus->txPacket)[1] = 2;
}
gSTWIStatus->ackLength = 1;
gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION;
}
- REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[0];
+ REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket)[0];
gSTWIStatus->ackNext = 1;
gSTWIStatus->state = 7; // slave send ack
}
@@ -216,7 +216,7 @@ static void sio32intr_clock_slave(void)
}
else if (gSTWIStatus->state == 6) // slave receive req
{
- ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->reqNext] = regSIODATA32;
+ ((u32 *)gSTWIStatus->rxPacket)[gSTWIStatus->reqNext] = regSIODATA32;
gSTWIStatus->reqNext++;
if (gSTWIStatus->reqLength < gSTWIStatus->reqNext)
{
@@ -227,24 +227,24 @@ static void sio32intr_clock_slave(void)
)
{
gSTWIStatus->ackActiveCommand = gSTWIStatus->reqActiveCommand + 0x80;
- ((u32*)gSTWIStatus->txPacket)[0] = 0x99660000 | gSTWIStatus->ackActiveCommand;
+ ((u32 *)gSTWIStatus->txPacket)[0] = 0x99660000 | gSTWIStatus->ackActiveCommand;
gSTWIStatus->ackLength = 0;
}
else
{
- ((u32*)gSTWIStatus->txPacket)[0] = 0x996601EE;
+ ((u32 *)gSTWIStatus->txPacket)[0] = 0x996601EE;
if (gSTWIStatus->reqActiveCommand >= 0x10 && gSTWIStatus->reqActiveCommand <= 0x3D)
{
- ((u32*)gSTWIStatus->txPacket)[1] = 1;
+ ((u32 *)gSTWIStatus->txPacket)[1] = 1;
}
else
{
- ((u32*)gSTWIStatus->txPacket)[1] = 2;
+ ((u32 *)gSTWIStatus->txPacket)[1] = 2;
}
gSTWIStatus->ackLength = 1;
gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION;
}
- REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[0];
+ REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket)[0];
gSTWIStatus->ackNext = 1;
gSTWIStatus->state = 7; // slave send ack
}
@@ -263,7 +263,7 @@ static void sio32intr_clock_slave(void)
}
else
{
- REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[gSTWIStatus->ackNext];
+ REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket)[gSTWIStatus->ackNext];
gSTWIStatus->ackNext++;
}
}
@@ -336,8 +336,8 @@ static u16 handshake_wait(u16 slot)
static void STWI_set_timer_in_RAM(u8 count)
{
- vu16* regTMCNTL = ®_TMCNT_L(gSTWIStatus->timerSelect);
- vu16* regTMCNTH = ®_TMCNT_H(gSTWIStatus->timerSelect);
+ vu16 *regTMCNTL = ®_TMCNT_L(gSTWIStatus->timerSelect);
+ vu16 *regTMCNTH = ®_TMCNT_H(gSTWIStatus->timerSelect);
REG_IME = 0;
switch (count)
{
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index 9a5db6d9df..319743d0d2 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -16,7 +16,7 @@ struct LLSFStruct
u8 connSlotFlagShift;
u8 slotStateShift;
u8 ackShift;
- u8 phaseShit;
+ u8 phaseShift;
u8 nShift;
u8 recvFirstMask;
u8 connSlotFlagMask;
@@ -89,7 +89,7 @@ static const struct LLSFStruct llsf_struct[2] = {
.connSlotFlagShift = 0,
.slotStateShift = 10,
.ackShift = 9,
- .phaseShit = 5,
+ .phaseShift = 5,
.nShift = 7,
.recvFirstMask = 2,
.connSlotFlagMask = 0,
@@ -105,7 +105,7 @@ static const struct LLSFStruct llsf_struct[2] = {
.connSlotFlagShift = 18,
.slotStateShift = 14,
.ackShift = 13,
- .phaseShit = 9,
+ .phaseShift = 9,
.nShift = 11,
.recvFirstMask = 3,
.connSlotFlagMask = 15,
@@ -1809,7 +1809,7 @@ static u16 rfu_STC_NI_constructLLSF(u8 bm_slot_id, u8 **dest_pp, struct NIComm *
}
frame = (NI_comm->state & 0xF) << llsf->slotStateShift
| NI_comm->ack << llsf->ackShift
- | NI_comm->phase << llsf->phaseShit
+ | NI_comm->phase << llsf->phaseShift
| NI_comm->n[NI_comm->phase] << llsf->nShift
| size;
if (gRfuLinkStatus->parentChild == MODE_PARENT)
@@ -1978,7 +1978,7 @@ static u16 rfu_STC_analyzeLLSF(u8 slot_id, const u8 *src, u16 last_frame)
llsf_NI.connSlotFlag = (frames >> llsf_p->connSlotFlagShift) & llsf_p->connSlotFlagMask;
llsf_NI.slotState = (frames >> llsf_p->slotStateShift) & llsf_p->slotStateMask;
llsf_NI.ack = (frames >> llsf_p->ackShift) & llsf_p->ackMask;
- llsf_NI.phase = (frames >> llsf_p->phaseShit) & llsf_p->phaseMask;
+ llsf_NI.phase = (frames >> llsf_p->phaseShift) & llsf_p->phaseMask;
llsf_NI.n = (frames >> llsf_p->nShift) & llsf_p->nMask;
llsf_NI.frame = (frames & llsf_p->framesMask) & frames;
retVal = llsf_NI.frame + llsf_p->frameSize;
diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c
index 8d8d10c406..b515f338e0 100644
--- a/src/librfu_stwi.c
+++ b/src/librfu_stwi.c
@@ -235,7 +235,7 @@ void STWI_send_SystemConfigREQ(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer)
packetBytes += sizeof(u32);
*packetBytes++ = mcTimer;
*packetBytes++ = maxMFrame;
- *(u16*)packetBytes = availSlotFlag;
+ *(u16 *)packetBytes = availSlotFlag;
STWI_start_Command();
}
}
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 85340ed96e..e7a5862f07 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -294,7 +294,7 @@ void SetFavorLadyState_Complete(void)
void FieldCallback_FavorLadyEnableScriptContexts(void)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static void QuizLadyPickQuestion(void)
@@ -571,7 +571,7 @@ void BufferQuizCorrectAnswer(void)
void FieldCallback_QuizLadyEnableScriptContexts(void)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void QuizLadyClearQuestionForRecordMix(const LilycoveLady *lilycoveLady)
diff --git a/src/link.c b/src/link.c
index e88cde55a3..57e33c8115 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1595,7 +1595,7 @@ void CB2_LinkError(void)
ResetSpriteData();
FreeAllSpritePalettes();
ResetPaletteFadeControl();
- FillPalette(0, 0, 2);
+ FillPalette(RGB_BLACK, 0, 2);
ResetTasks();
ScanlineEffect_Stop();
if (gWirelessCommType)
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index 87e9f8e9d2..c54d6c3d34 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -2004,7 +2004,7 @@ static void RfuMain1_UnionRoom(void)
{
rfu_REQ_recvData();
rfu_waitREQComplete();
- rfu_LMAN_REQ_sendData(0);
+ rfu_LMAN_REQ_sendData(FALSE);
}
}
@@ -2747,7 +2747,7 @@ static void Task_RfuReconnectWithParent(u8 taskId)
if (CanTryReconnectParent())
{
- u8 id = GetPartnerIndexByNameAndTrainerID((u8*)data, ReadU16(&data[8]));
+ u8 id = GetPartnerIndexByNameAndTrainerID((u8 *)data, ReadU16(&data[8]));
if (id != 0xFF)
{
if (gRfuLinkStatus->partner[id].slot != 0xFF)
@@ -2797,7 +2797,7 @@ void CreateTask_RfuReconnectWithParent(const u8 *name, u16 trainerId)
gRfu.status = RFU_STATUS_OK;
taskId = CreateTask(Task_RfuReconnectWithParent, 3);
data = gTasks[taskId].data;
- StringCopy((u8*)(data), name);
+ StringCopy((u8 *)(data), name);
data[8] = trainerId;
}
@@ -2947,7 +2947,7 @@ static void Debug_PrintStatus(void)
if ((gRfuLinkStatus->getNameFlag >> i) & 1)
{
Debug_PrintNum(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4);
- Debug_PrintString((void*)gRfuLinkStatus->partner[i].gname, 6, i + 3);
+ Debug_PrintString((void *)gRfuLinkStatus->partner[i].gname, 6, i + 3);
Debug_PrintString(gRfuLinkStatus->partner[i].uname, 22, i + 3);
}
}
@@ -2967,7 +2967,7 @@ static void Debug_PrintStatus(void)
Debug_PrintString(sASCII_8Spaces, 22, i + 3);
}
Debug_PrintNum(gRfuLinkStatus->partner[gRfu.childSlot].serialNo, 1, 3, 4);
- Debug_PrintString((void*)gRfuLinkStatus->partner[gRfu.childSlot].gname, 6, 3);
+ Debug_PrintString((void *)gRfuLinkStatus->partner[gRfu.childSlot].gname, 6, 3);
Debug_PrintString(gRfuLinkStatus->partner[gRfu.childSlot].uname, 22, 3);
}
else
diff --git a/src/list_menu.c b/src/list_menu.c
index 8ba13a6cf8..64692ce1f6 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -127,7 +127,7 @@ static const struct OamData sOamData_ScrollArrowIndicator =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -267,7 +267,7 @@ static const struct OamData sOamData_RedArrowCursor =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -408,7 +408,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu
s32 ListMenu_ProcessInput(u8 listTaskId)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
if (JOY_NEW(A_BUTTON))
{
@@ -469,7 +469,7 @@ s32 ListMenu_ProcessInput(u8 listTaskId)
void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
if (scrollOffset != NULL)
*scrollOffset = list->scrollOffset;
@@ -484,7 +484,7 @@ void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
void RedrawListMenu(u8 listTaskId)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
FillWindowPixelBuffer(list->template.windowId, PIXEL_FILL(list->template.fillValue));
ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
@@ -495,7 +495,7 @@ void RedrawListMenu(u8 listTaskId)
// unused
void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
list->template.cursorPal = cursorPal;
list->template.fillValue = fillValue;
@@ -505,7 +505,7 @@ void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShad
// unused
void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
SetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT, x);
SetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP, y);
@@ -537,7 +537,7 @@ s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 s
void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
if (arrayId != NULL)
*arrayId = list->scrollOffset + list->selectedRow;
@@ -545,7 +545,7 @@ void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId)
void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
if (scrollOffset != NULL)
*scrollOffset = list->scrollOffset;
@@ -555,7 +555,7 @@ void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId)
{
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding;
return list->selectedRow * yMultiplier + list->template.upText_Y;
@@ -564,7 +564,7 @@ u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId)
static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
{
u8 listTaskId = CreateTask(ListMenuDummyTask, 0);
- struct ListMenu *list = (void*) gTasks[listTaskId].data;
+ struct ListMenu *list = (void *) gTasks[listTaskId].data;
list->template = *listMenuTemplate;
list->scrollOffset = scrollOffset;
@@ -902,7 +902,7 @@ void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu
// unused
s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field)
{
- struct UnkIndicatorsStruct *data = (void*) gTasks[taskId].data;
+ struct UnkIndicatorsStruct *data = (void *) gTasks[taskId].data;
switch (field)
{
@@ -946,13 +946,13 @@ s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field)
void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value)
{
- struct UnkIndicatorsStruct *data = (void*) &gTasks[taskId].data;
+ struct UnkIndicatorsStruct *data = (void *) &gTasks[taskId].data;
switch (field)
{
case 0:
case 1:
- data->field_4 = (void*)(value);
+ data->field_4 = (void *)(value);
break;
case 2:
data->field_C = value;
@@ -1088,7 +1088,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
}
taskId = CreateTask(Task_ScrollIndicatorArrowPair, 0);
- data = (void*) gTasks[taskId].data;
+ data = (void *) gTasks[taskId].data;
data->field_0 = 0;
data->scrollOffset = scrollOffset;
@@ -1140,7 +1140,7 @@ u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 fi
static void Task_ScrollIndicatorArrowPair(u8 taskId)
{
- struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data;
+ struct ScrollIndicatorPair *data = (void *) gTasks[taskId].data;
u16 currItem = (*data->scrollOffset);
if (currItem == data->fullyUpThreshold && currItem != 0xFFFF)
@@ -1159,7 +1159,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId)
void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- struct ScrollIndicatorPair *scrollData = (void*) data;
+ struct ScrollIndicatorPair *scrollData = (void *) data;
if (tIsScrolled)
{
@@ -1177,7 +1177,7 @@ void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId)
void RemoveScrollIndicatorArrowPair(u8 taskId)
{
- struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data;
+ struct ScrollIndicatorPair *data = (void *) gTasks[taskId].data;
if (data->tileTag != TAG_NONE)
FreeSpriteTilesByTag(data->tileTag);
@@ -1334,7 +1334,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
}
taskId = CreateTask(Task_RedOutlineCursor, 0);
- data = (void*) gTasks[taskId].data;
+ data = (void *) gTasks[taskId].data;
data->tileTag = cursor->tileTag;
data->palTag = cursor->palTag;
@@ -1362,7 +1362,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y)
{
- struct RedOutlineCursor *data = (void*) gTasks[taskId].data;
+ struct RedOutlineCursor *data = (void *) gTasks[taskId].data;
gSprites[data->spriteId].x = x + 120;
gSprites[data->spriteId].y = y + 120;
@@ -1370,7 +1370,7 @@ static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y)
static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
{
- struct RedOutlineCursor *data = (void*) gTasks[taskId].data;
+ struct RedOutlineCursor *data = (void *) gTasks[taskId].data;
Free(data->subspritesPtr);
@@ -1419,7 +1419,7 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
}
taskId = CreateTask(Task_RedArrowCursor, 0);
- data = (void*) gTasks[taskId].data;
+ data = (void *) gTasks[taskId].data;
data->tileTag = cursor->tileTag;
data->palTag = cursor->palTag;
@@ -1442,7 +1442,7 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y)
{
- struct RedArrowCursor *data = (void*) gTasks[taskId].data;
+ struct RedArrowCursor *data = (void *) gTasks[taskId].data;
gSprites[data->spriteId].x = x;
gSprites[data->spriteId].y = y;
@@ -1450,7 +1450,7 @@ static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y)
static void ListMenuRemoveRedArrowCursorObject(u8 taskId)
{
- struct RedArrowCursor *data = (void*) gTasks[taskId].data;
+ struct RedArrowCursor *data = (void *) gTasks[taskId].data;
if (data->tileTag != TAG_NONE)
FreeSpriteTilesByTag(data->tileTag);
diff --git a/src/load_save.c b/src/load_save.c
index f2b12acf0c..494a61bcf2 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -73,9 +73,9 @@ void SetSaveBlocksPointers(u16 offset)
offset = (offset + Random()) & (SAVEBLOCK_MOVE_RANGE - 4);
- gSaveBlock2Ptr = (void*)(&gSaveblock2) + offset;
- *sav1_LocalVar = (void*)(&gSaveblock1) + offset;
- gPokemonStoragePtr = (void*)(&gPokemonStorage) + offset;
+ gSaveBlock2Ptr = (void *)(&gSaveblock2) + offset;
+ *sav1_LocalVar = (void *)(&gSaveblock1) + offset;
+ gPokemonStoragePtr = (void *)(&gPokemonStorage) + offset;
SetBagItemsPointers();
SetDecorationInventoriesPointers();
diff --git a/src/m4a.c b/src/m4a.c
index faeef83e79..7774d09cba 100644
--- a/src/m4a.c
+++ b/src/m4a.c
@@ -1178,7 +1178,7 @@ void CgbSound(void)
*nrx3ptr = channels->frequency;
else
*nrx3ptr = (*nrx3ptr & 0x08) | channels->frequency;
- channels->n4 = (channels->n4 & 0xC0) + (*((u8*)(&channels->frequency) + 1));
+ channels->n4 = (channels->n4 & 0xC0) + (*((u8 *)(&channels->frequency) + 1));
*nrx4ptr = (s8)(channels->n4 & mask);
}
diff --git a/src/mail.c b/src/mail.c
index c04bd0b7cf..c697ff4c4e 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -69,8 +69,8 @@ struct MailRead
/*0x021c*/ u8 monIconSpriteId;
/*0x021d*/ u8 language;
/*0x021e*/ bool8 international;
- /*0x0220*/ u8 * (*parserSingle)(u8 *dest, u16 word);
- /*0x0224*/ u8 * (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2);
+ /*0x0220*/ u8 *(*parserSingle)(u8 *dest, u16 word);
+ /*0x0224*/ u8 *(*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2);
/*0x0228*/ const struct MailLayout *layout;
/*0x022c*/ u8 bg1TilemapBuffer[0x1000];
/*0x122c*/ u8 bg2TilemapBuffer[0x1000];
diff --git a/src/main_menu.c b/src/main_menu.c
index d11784133c..b8abffda57 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -178,8 +178,8 @@ static u32 InitMainMenu(bool8);
static void Task_MainMenuCheckSaveFile(u8);
static void Task_MainMenuCheckBattery(u8);
static void Task_WaitForSaveFileErrorWindow(u8);
-static void CreateMainMenuErrorWindow(const u8*);
-static void ClearMainMenuWindowTilemap(const struct WindowTemplate*);
+static void CreateMainMenuErrorWindow(const u8 *);
+static void ClearMainMenuWindowTilemap(const struct WindowTemplate *);
static void Task_DisplayMainMenu(u8);
static void Task_WaitForBatteryDryErrorWindow(u8);
static void MainMenu_FormatSavegameText(void);
@@ -209,7 +209,7 @@ static void Task_NewGameBirchSpeech_StartPlayerFadeIn(u8);
static void Task_NewGameBirchSpeech_WaitForPlayerFadeIn(u8);
static void Task_NewGameBirchSpeech_BoyOrGirl(u8);
static void LoadMainMenuWindowFrameTiles(u8, u16);
-static void DrawMainMenuWindowBorder(const struct WindowTemplate*, u16);
+static void DrawMainMenuWindowBorder(const struct WindowTemplate *, u16);
static void Task_HighlightSelectedMainMenuItem(u8);
static void Task_NewGameBirchSpeech_WaitToShowGenderMenu(u8);
static void Task_NewGameBirchSpeech_ChooseGender(u8);
@@ -232,7 +232,7 @@ static void Task_NewGameBirchSpeech_ReshowBirchLotad(u8);
static void Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter(u8);
static void Task_NewGameBirchSpeech_AreYouReady(u8);
static void Task_NewGameBirchSpeech_ShrinkPlayer(u8);
-static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite*);
+static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *);
static void Task_NewGameBirchSpeech_WaitForPlayerShrink(u8);
static void Task_NewGameBirchSpeech_FadePlayerToWhite(u8);
static void Task_NewGameBirchSpeech_Cleanup(u8);
@@ -621,7 +621,7 @@ static u32 InitMainMenu(bool8 returningFromOptionsMenu)
static void Task_MainMenuCheckSaveFile(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (!gPaletteFade.active)
{
@@ -736,7 +736,7 @@ static void Task_WaitForBatteryDryErrorWindow(u8 taskId)
static void Task_DisplayMainMenu(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
u16 palette;
if (!gPaletteFade.active)
@@ -880,7 +880,7 @@ static void Task_HighlightSelectedMainMenuItem(u8 taskId)
static bool8 HandleMainMenuInput(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (JOY_NEW(A_BUTTON))
{
@@ -1272,8 +1272,8 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId)
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
SetGpuReg(REG_OFFSET_BLDY, 0);
- LZ77UnCompVram(sBirchSpeechShadowGfx, (void*)VRAM);
- LZ77UnCompVram(sBirchSpeechBgMap, (void*)(BG_SCREEN_ADDR(7)));
+ LZ77UnCompVram(sBirchSpeechShadowGfx, (void *)VRAM);
+ LZ77UnCompVram(sBirchSpeechBgMap, (void *)(BG_SCREEN_ADDR(7)));
LoadPalette(sBirchSpeechBgPals, 0, 64);
LoadPalette(sBirchSpeechPlatformBlackPal, 1, 16);
ScanlineEffect_Stop();
@@ -1333,7 +1333,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId)
CopyWindowToVram(0, COPYWIN_GFX);
NewGameBirchSpeech_ClearWindow(0);
StringExpandPlaceholders(gStringVar4, gText_Birch_Welcome);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_ThisIsAPokemon;
}
}
@@ -1345,7 +1345,7 @@ static void Task_NewGameBirchSpeech_ThisIsAPokemon(u8 taskId)
{
gTasks[taskId].func = Task_NewGameBirchSpeech_MainSpeech;
StringExpandPlaceholders(gStringVar4, gText_ThisIsAPokemon);
- AddTextPrinterWithCallbackForMessage(1, NewGameBirchSpeech_WaitForThisIsPokemonText);
+ AddTextPrinterWithCallbackForMessage(TRUE, NewGameBirchSpeech_WaitForThisIsPokemonText);
sBirchSpeechMainTaskId = taskId;
}
}
@@ -1355,7 +1355,7 @@ static void Task_NewGameBirchSpeech_MainSpeech(u8 taskId)
if (!RunTextPrintersAndIsPrinter0Active())
{
StringExpandPlaceholders(gStringVar4, gText_Birch_MainSpeech);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_AndYouAre;
}
}
@@ -1410,7 +1410,7 @@ static void Task_NewGameBirchSpeech_AndYouAre(u8 taskId)
{
sStartedPokeBallTask = FALSE;
StringExpandPlaceholders(gStringVar4, gText_Birch_AndYouAre);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_StartBirchLotadPlatformFade;
}
}
@@ -1482,7 +1482,7 @@ static void Task_NewGameBirchSpeech_BoyOrGirl(u8 taskId)
{
NewGameBirchSpeech_ClearWindow(0);
StringExpandPlaceholders(gStringVar4, gText_Birch_BoyOrGirl);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_WaitToShowGenderMenu;
}
@@ -1572,7 +1572,7 @@ static void Task_NewGameBirchSpeech_WhatsYourName(u8 taskId)
{
NewGameBirchSpeech_ClearWindow(0);
StringExpandPlaceholders(gStringVar4, gText_Birch_WhatsYourName);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint;
}
@@ -1607,7 +1607,7 @@ static void Task_NewGameBirchSpeech_SoItsPlayerName(u8 taskId)
{
NewGameBirchSpeech_ClearWindow(0);
StringExpandPlaceholders(gStringVar4, gText_Birch_SoItsPlayer);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_CreateNameYesNo;
}
@@ -1673,7 +1673,7 @@ static void Task_NewGameBirchSpeech_ReshowBirchLotad(u8 taskId)
NewGameBirchSpeech_StartFadePlatformOut(taskId, 1);
NewGameBirchSpeech_ClearWindow(0);
StringExpandPlaceholders(gStringVar4, gText_Birch_YourePlayer);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter;
}
}
@@ -1721,7 +1721,7 @@ static void Task_NewGameBirchSpeech_AreYouReady(u8 taskId)
NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2);
NewGameBirchSpeech_StartFadePlatformOut(taskId, 1);
StringExpandPlaceholders(gStringVar4, gText_Birch_AreYouReady);
- AddTextPrinterForMessage(1);
+ AddTextPrinterForMessage(TRUE);
gTasks[taskId].func = Task_NewGameBirchSpeech_ShrinkPlayer;
}
}
@@ -1807,8 +1807,8 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void)
DmaFill32(3, 0, OAM, OAM_SIZE);
DmaFill16(3, 0, PLTT, PLTT_SIZE);
ResetPaletteFade();
- LZ77UnCompVram(sBirchSpeechShadowGfx, (u8*)VRAM);
- LZ77UnCompVram(sBirchSpeechBgMap, (u8*)(BG_SCREEN_ADDR(7)));
+ LZ77UnCompVram(sBirchSpeechShadowGfx, (u8 *)VRAM);
+ LZ77UnCompVram(sBirchSpeechBgMap, (u8 *)(BG_SCREEN_ADDR(7)));
LoadPalette(sBirchSpeechBgPals, 0, 64);
LoadPalette(&sBirchSpeechBgGradientPal[1], 1, 16);
ResetTasks();
@@ -2102,7 +2102,7 @@ static s8 NewGameBirchSpeech_ProcessGenderMenuInput(void)
static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId)
{
- const u8* name;
+ const u8 *name;
u8 i;
if (gSaveBlock2Ptr->playerGender == MALE)
@@ -2114,7 +2114,7 @@ static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId)
gSaveBlock2Ptr->playerName[PLAYER_NAME_LENGTH] = EOS;
}
-static void CreateMainMenuErrorWindow(const u8* str)
+static void CreateMainMenuErrorWindow(const u8 *str)
{
FillWindowPixelBuffer(7, PIXEL_FILL(1));
AddTextPrinterParameterized(7, FONT_NORMAL, str, 0, 1, 2, 0);
@@ -2143,7 +2143,7 @@ static void MainMenu_FormatSavegamePlayer(void)
static void MainMenu_FormatSavegameTime(void)
{
u8 str[0x20];
- u8* ptr;
+ u8 *ptr;
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime);
AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4);
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 9eaa035caf..866072a2c3 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -186,7 +186,7 @@ static const u8 sText_PyramidFloor6[] = _("PYRAMID FLOOR 6");
static const u8 sText_PyramidFloor7[] = _("PYRAMID FLOOR 7");
static const u8 sText_Pyramid[] = _("PYRAMID");
-static const u8 * const sBattlePyramid_MapHeaderStrings[FRONTIER_STAGES_PER_CHALLENGE + 1] =
+static const u8 *const sBattlePyramid_MapHeaderStrings[FRONTIER_STAGES_PER_CHALLENGE + 1] =
{
sText_PyramidFloor1,
sText_PyramidFloor2,
@@ -303,7 +303,7 @@ static void ShowMapNamePopUpWindow(void)
u8 mapDisplayHeader[24];
u8 *withoutPrefixPtr;
u8 x;
- const u8* mapDisplayHeaderSource;
+ const u8 *mapDisplayHeaderSource;
if (InBattlePyramid())
{
diff --git a/src/match_call.c b/src/match_call.c
index 8b25d5b44d..4f6a7b9821 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1183,7 +1183,7 @@ static void StartMatchCall(void)
{
if (!sMatchCallState.triggeredFromScript)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjectEvents();
PlayerFreeze();
StopPlayerAvatar();
@@ -1371,7 +1371,7 @@ static bool32 MatchCall_EndCall(u8 taskId)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
return TRUE;
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 2b6c71c8a2..0fb80342f8 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -46,7 +46,7 @@ static const u16 sDefaultBardSongLyrics[BARD_SONG_LENGTH] = {
EC_WORD_DANCE
};
-static const u8 * const sGiddyAdjectives[] = {
+static const u8 *const sGiddyAdjectives[] = {
GiddyText_SoPretty,
GiddyText_SoDarling,
GiddyText_SoRelaxed,
@@ -60,7 +60,7 @@ static const u8 * const sGiddyAdjectives[] = {
// Non-random lines Giddy can say. Not all are strictly
// questions, but most are, and the player will receive
// a Yes/No prompt afterwards regardless.
-static const u8 * const sGiddyQuestions[GIDDY_MAX_QUESTIONS] = {
+static const u8 *const sGiddyQuestions[GIDDY_MAX_QUESTIONS] = {
GiddyText_ISoWantToGoOnAVacation,
GiddyText_IBoughtCrayonsWith120Colors,
GiddyText_WouldntItBeNiceIfWeCouldFloat,
@@ -174,8 +174,8 @@ static void PrepareSongText(void)
{
struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
u16 * lyrics = gSpecialVar_0x8004 == 0 ? bard->songLyrics : bard->temporaryLyrics;
- u8 * wordEnd = gStringVar4;
- u8 * str = wordEnd;
+ u8 *wordEnd = gStringVar4;
+ u8 *str = wordEnd;
u16 lineNum;
// Put three words on each line
@@ -222,7 +222,7 @@ static void PrepareSongText(void)
void PlayBardSong(void)
{
StartBardSong(gSpecialVar_0x8004);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
}
void GetHipsterSpokenFlag(void)
@@ -443,7 +443,7 @@ static void DisableTextPrinters(struct TextPrinterTemplate * printer, u16 render
gDisableTextPrinters = TRUE;
}
-static void DrawSongTextWindow(const u8 * str)
+static void DrawSongTextWindow(const u8 *str)
{
DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, str, 0, 1, 1, DisableTextPrinters);
@@ -627,7 +627,7 @@ static void Task_BardSong(u8 taskId)
// End song
FadeInBGM(6);
m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
else if (gStringVar4[task->tCharIndex] == CHAR_SPACE)
@@ -843,7 +843,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language
{
for (i = 0; i < NUM_TRADER_ITEMS; i++)
{
- u8 * str = trader->playerNames[i];
+ u8 *str = trader->playerNames[i];
if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN)
{
StripExtCtrlCodes(str);
@@ -1247,9 +1247,9 @@ static void GetStoryByStattellerPlayerName(u32 player, void *dst)
memcpy(dst, name, PLAYER_NAME_LENGTH);
}
-static void StorytellerSetPlayerName(u32 player, const u8 * src)
+static void StorytellerSetPlayerName(u32 player, const u8 *src)
{
- u8 * name = sStorytellerPtr->trainerNames[player];
+ u8 *name = sStorytellerPtr->trainerNames[player];
memset(name, EOS, PLAYER_NAME_LENGTH);
memcpy(name, src, PLAYER_NAME_LENGTH);
}
@@ -1265,7 +1265,7 @@ static void StorytellerRecordNewStat(u32 player, u32 stat)
sStorytellerPtr->language[player] = gGameLanguage;
}
-static void ScrambleStatList(u8 * arr, s32 count)
+static void ScrambleStatList(u8 *arr, s32 count)
{
s32 i;
@@ -1336,7 +1336,7 @@ static void PrintStoryList(void)
width = curWidth;
}
sStorytellerWindowId = CreateWindowFromRect(0, 0, ConvertPixelWidthToTileWidth(width), GetFreeStorySlot() * 2 + 2);
- SetStandardWindowBorderStyle(sStorytellerWindowId, 0);
+ SetStandardWindowBorderStyle(sStorytellerWindowId, FALSE);
for (i = 0; i < NUM_STORYTELLER_TALES; i++)
{
u16 gameStatID = sStorytellerPtr->gameStatIDs[i];
@@ -1375,7 +1375,7 @@ static void Task_StoryListMenu(u8 taskId)
}
ClearToTransparentAndRemoveWindow(sStorytellerWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
break;
}
}
diff --git a/src/menu.c b/src/menu.c
index a5cebac958..4afda8cc89 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -192,19 +192,19 @@ void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress)
{
void (*callback)(struct TextPrinterTemplate *, u16) = NULL;
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress)
{
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed)
{
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, speed, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
void LoadMessageBoxAndBorderGfx(void)
@@ -546,7 +546,7 @@ void RemoveMapNamePopUpWindow(void)
void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(struct TextPrinterTemplate *, u16))
{
gTextFlags.canABSpeedUpPrint = canSpeedUp;
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
void EraseFieldMessageBox(bool8 copyToVram)
@@ -2032,14 +2032,14 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u
for (loopSrcX = srcX, loopDstX = dstX; loopSrcX < xEnd; loopSrcX++, loopDstX++)
{
pixelsSrc = src->pixels + ((loopSrcX >> 1) & 3) + ((loopSrcX >> 3) << 5) + (((loopSrcY >> 3) * multiplierSrcY) << 5) + ((u32)(loopSrcY << 29) >> 27);
- pixelsDst = (void*) dst->pixels + ((loopDstX >> 1) & 3) + ((loopDstX >> 3) << 5) + ((( loopDstY >> 3) * multiplierDstY) << 5) + ((u32)(loopDstY << 29) >> 27);
+ pixelsDst = (void *) dst->pixels + ((loopDstX >> 1) & 3) + ((loopDstX >> 3) << 5) + ((( loopDstY >> 3) * multiplierDstY) << 5) + ((u32)(loopDstY << 29) >> 27);
if ((uintptr_t)pixelsDst & 1)
{
pixelsDst--;
if (loopDstX & 1)
{
- toOrr = *(vu16*)pixelsDst;
+ toOrr = *(vu16 *)pixelsDst;
toOrr &= 0x0fff;
if (loopSrcX & 1)
toOrr |= ((*pixelsSrc & 0xf0) << 8);
@@ -2048,7 +2048,7 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u
}
else
{
- toOrr = *(vu16*)pixelsDst;
+ toOrr = *(vu16 *)pixelsDst;
toOrr &= 0xf0ff;
if (loopSrcX & 1)
toOrr |= ((*pixelsSrc & 0xf0) << 4);
@@ -2060,7 +2060,7 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u
{
if (loopDstX & 1)
{
- toOrr = *(vu16*)pixelsDst;
+ toOrr = *(vu16 *)pixelsDst;
toOrr &= 0xff0f;
if (loopSrcX & 1)
toOrr |= ((*pixelsSrc & 0xf0) << 0);
@@ -2069,7 +2069,7 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u
}
else
{
- toOrr = *(vu16*)pixelsDst;
+ toOrr = *(vu16 *)pixelsDst;
toOrr &= 0xfff0;
if (loopSrcX & 1)
toOrr |= ((*pixelsSrc & 0xf0) >> 4);
@@ -2077,7 +2077,7 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u
toOrr |= ((*pixelsSrc & 0x0f) >> 0);
}
}
- *(vu16*)pixelsDst = toOrr;
+ *(vu16 *)pixelsDst = toOrr;
}
}
}
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index d3dff31d76..98284ebd3a 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -32,7 +32,7 @@ static const struct OamData sOamData_SwapLine =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -98,9 +98,9 @@ void ResetVramOamAndBgCntRegs(void)
SetGpuReg(REG_OFFSET_BG2CNT, 0);
SetGpuReg(REG_OFFSET_BG1CNT, 0);
SetGpuReg(REG_OFFSET_BG0CNT, 0);
- CpuFill16(0, (void*) VRAM, VRAM_SIZE);
- CpuFill32(0, (void*) OAM, OAM_SIZE);
- CpuFill16(0, (void*) PLTT, PLTT_SIZE);
+ CpuFill16(0, (void *) VRAM, VRAM_SIZE);
+ CpuFill32(0, (void *) OAM, OAM_SIZE);
+ CpuFill16(0, (void *) PLTT, PLTT_SIZE);
}
void ResetAllBgsCoordinates(void)
@@ -130,7 +130,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet
StringExpandPlaceholders(gStringVar4, string);
gTextFlags.canABSpeedUpPrint = 1;
- AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
sMessageNextTask = taskFunc;
gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints;
}
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index cd77f4a59c..42c80b5ee3 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -223,14 +223,14 @@ u8 MailboxMenu_AddWindow(u8 windowIdx)
{
sMailboxWindowIds[windowIdx] = AddWindow(&sWindowTemplates_MailboxMenu[windowIdx]);
}
- SetStandardWindowBorderStyle(sMailboxWindowIds[windowIdx], 0);
+ SetStandardWindowBorderStyle(sMailboxWindowIds[windowIdx], FALSE);
}
return sMailboxWindowIds[windowIdx];
}
void MailboxMenu_RemoveWindow(u8 windowIdx)
{
- ClearStdWindowAndFrameToTransparent(sMailboxWindowIds[windowIdx], 0);
+ ClearStdWindowAndFrameToTransparent(sMailboxWindowIds[windowIdx], FALSE);
ClearWindowTilemap(sMailboxWindowIds[windowIdx]);
RemoveWindow(sMailboxWindowIds[windowIdx]);
sMailboxWindowIds[windowIdx] = WINDOW_NONE;
@@ -716,17 +716,17 @@ void InitMoveRelearnerWindows(bool8 useContextWindow)
if (!useContextWindow)
{
PutWindowTilemap(0);
- DrawStdFrameWithCustomTileAndPalette(0, 0, 0x1, 0xE);
+ DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x1, 0xE);
}
else
{
PutWindowTilemap(1);
- DrawStdFrameWithCustomTileAndPalette(1, 0, 1, 0xE);
+ DrawStdFrameWithCustomTileAndPalette(1, FALSE, 1, 0xE);
}
PutWindowTilemap(2);
PutWindowTilemap(3);
- DrawStdFrameWithCustomTileAndPalette(2, 0, 1, 0xE);
- DrawStdFrameWithCustomTileAndPalette(3, 0, 1, 0xE);
+ DrawStdFrameWithCustomTileAndPalette(2, FALSE, 1, 0xE);
+ DrawStdFrameWithCustomTileAndPalette(3, FALSE, 1, 0xE);
MoveRelearnerDummy();
ScheduleBgCopyTilemapToVram(1);
}
@@ -1124,7 +1124,7 @@ static const struct OamData sOam_ConditionMonPic =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -1141,7 +1141,7 @@ static const struct OamData sOam_ConditionSelectionIcon =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
index 4c72136d4c..5aaed0cb23 100644
--- a/src/minigame_countdown.c
+++ b/src/minigame_countdown.c
@@ -618,7 +618,7 @@ static const struct OamData sOamData_Numbers =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -635,7 +635,7 @@ static const struct OamData sOamData_Start =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index 7300262988..69c2e81540 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -67,12 +67,12 @@ static void IncrementCeilingCrumbleFinishedCount(void);
static void WaitCeilingCrumble(u8);
static void FinishCeilingCrumbleTask(u8);
static void CreateCeilingCrumbleSprites(void);
-static void SpriteCB_CeilingCrumble(struct Sprite*);
+static void SpriteCB_CeilingCrumble(struct Sprite *);
static void DoMirageTowerDisintegration(u8);
static void InitMirageTowerShake(u8);
static void Task_FossilFallAndSink(u8);
static void SpriteCB_FallingFossil(struct Sprite *);
-static void UpdateDisintegrationEffect(u8*, u16, u8, u8, u8);
+static void UpdateDisintegrationEffect(u8 *, u16, u8, u8, u8);
static const u8 sBlankTile_Gfx[32] = {0};
static const u8 sMirageTower_Gfx[] = INCBIN_U8("graphics/misc/mirage_tower.4bpp");
@@ -133,7 +133,7 @@ static const struct OamData sOamData_FallingFossil =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -189,7 +189,7 @@ static const struct OamData sOamData_CeilingCrumbleSmall =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -227,7 +227,7 @@ static const struct OamData sOamData_CeilingCrumbleLarge =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -249,8 +249,8 @@ static const struct SpriteTemplate sSpriteTemplate_CeilingCrumbleLarge = {
.callback = SpriteCB_CeilingCrumble
};
-EWRAM_DATA static u8* sMirageTowerGfxBuffer = NULL;
-EWRAM_DATA static u8* sMirageTowerTilemapBuffer = NULL;
+EWRAM_DATA static u8 *sMirageTowerGfxBuffer = NULL;
+EWRAM_DATA static u8 *sMirageTowerTilemapBuffer = NULL;
EWRAM_DATA static struct FallAnim_Fossil *sFallingFossil = NULL;
EWRAM_DATA static struct FallAnim_Tower *sFallingTower = NULL;
EWRAM_DATA static struct BgRegOffsets *sBgShakeOffsets = NULL;
@@ -361,7 +361,7 @@ static void PlayerDescendMirageTower(u8 taskId)
(gSprites[player->spriteId].y + gSprites[player->spriteId].y2))
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
@@ -439,7 +439,7 @@ static void FinishCeilingCrumbleTask(u8 taskId)
{
FreeSpriteTilesByTag(TAG_CEILING_CRUMBLE);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static void CreateCeilingCrumbleSprites(void)
@@ -463,7 +463,7 @@ static void CreateCeilingCrumbleSprites(void)
}
}
-static void SpriteCB_CeilingCrumble(struct Sprite* sprite)
+static void SpriteCB_CeilingCrumble(struct Sprite *sprite)
{
sprite->data[1] += 2;
sprite->y2 = sprite->data[1] / 2;
@@ -565,7 +565,7 @@ static void InitMirageTowerShake(u8 taskId)
sBgShakeOffsets->bgVOFS = zero;
CreateTask(UpdateBgShake, 10);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
break;
}
}
@@ -654,7 +654,7 @@ static void DoMirageTowerDisintegration(u8 taskId)
break;
case 8:
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
break;
}
gTasks[taskId].tState++;
@@ -719,7 +719,7 @@ static void Task_FossilFallAndSink(u8 taskId)
FREE_AND_SET_NULL(sFallingFossil);
break;
case 8:
- EnableBothScriptContexts();
+ ScriptContext_Enable();
break;
}
gTasks[taskId].tState++;
@@ -748,7 +748,7 @@ static void SpriteCB_FallingFossil(struct Sprite *sprite)
}
}
-static void UpdateDisintegrationEffect(u8* tiles, u16 randId, u8 c, u8 size, u8 offset)
+static void UpdateDisintegrationEffect(u8 *tiles, u16 randId, u8 c, u8 size, u8 offset)
{
u8 heightTiles, height, widthTiles, width;
u16 var, baseOffset;
diff --git a/src/mon_markings.c b/src/mon_markings.c
index 1e03179e94..d7a61c27e7 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -30,7 +30,7 @@ static const struct OamData sOamData_MenuWindow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -48,7 +48,7 @@ static const struct OamData sOamData_8x8 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -157,7 +157,7 @@ static const struct OamData sOamData_MarkingCombo =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -396,20 +396,16 @@ bool8 HandleMonMarkingsMenuInput(void)
if (JOY_NEW(DPAD_UP))
{
- s8 pos;
PlaySE(SE_SELECT);
- pos = --sMenu->cursorPos;
- if (pos < 0)
+ if (--sMenu->cursorPos < 0)
sMenu->cursorPos = SELECTION_CANCEL;
return TRUE;
}
if (JOY_NEW(DPAD_DOWN))
{
- s8 pos;
PlaySE(SE_SELECT);
- pos = ++sMenu->cursorPos;
- if (pos > SELECTION_CANCEL)
+ if (++sMenu->cursorPos > SELECTION_CANCEL)
sMenu->cursorPos = 0;
return TRUE;
}
@@ -495,7 +491,6 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
}
sMenu->windowSprites[1]->y = y + 96;
-
// Create marking sprites
template.tileTag++;
template.paletteTag++;
@@ -548,7 +543,6 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
{
sMenu->cursorSprite = NULL;
}
-
}
static void SpriteCB_Dummy(struct Sprite *sprite)
@@ -610,7 +604,7 @@ static struct Sprite *CreateMarkingComboSprite(u16 tileTag, u16 paletteTag, cons
spriteId = CreateSprite(&template, 0, 0, 0);
if (spriteId != MAX_SPRITES)
- return &gSprites[spriteId];
+ return &gSprites[spriteId];
else
return NULL;
}
diff --git a/src/money.c b/src/money.c
index 5723974a83..88e1fea640 100644
--- a/src/money.c
+++ b/src/money.c
@@ -22,7 +22,7 @@ static const struct OamData sOamData_MoneyLabel =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -69,17 +69,17 @@ static const struct CompressedSpritePalette sSpritePalette_MoneyLabel =
.tag = MONEY_LABEL_TAG
};
-u32 GetMoney(u32* moneyPtr)
+u32 GetMoney(u32 *moneyPtr)
{
return *moneyPtr ^ gSaveBlock2Ptr->encryptionKey;
}
-void SetMoney(u32* moneyPtr, u32 newValue)
+void SetMoney(u32 *moneyPtr, u32 newValue)
{
*moneyPtr = gSaveBlock2Ptr->encryptionKey ^ newValue;
}
-bool8 IsEnoughMoney(u32* moneyPtr, u32 cost)
+bool8 IsEnoughMoney(u32 *moneyPtr, u32 cost)
{
if (GetMoney(moneyPtr) >= cost)
return TRUE;
@@ -87,7 +87,7 @@ bool8 IsEnoughMoney(u32* moneyPtr, u32 cost)
return FALSE;
}
-void AddMoney(u32* moneyPtr, u32 toAdd)
+void AddMoney(u32 *moneyPtr, u32 toAdd)
{
u32 toSet = GetMoney(moneyPtr);
@@ -107,7 +107,7 @@ void AddMoney(u32* moneyPtr, u32 toAdd)
SetMoney(moneyPtr, toSet);
}
-void RemoveMoney(u32* moneyPtr, u32 toSub)
+void RemoveMoney(u32 *moneyPtr, u32 toSub)
{
u32 toSet = GetMoney(moneyPtr);
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 2b925135f0..d9c943b576 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -185,7 +185,7 @@ static const struct OamData sHeartSpriteOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -202,7 +202,7 @@ static const struct OamData sUnusedOam1 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16),
.x = 0,
@@ -219,7 +219,7 @@ static const struct OamData sUnusedOam2 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8),
.x = 0,
@@ -365,7 +365,7 @@ static void VBlankCB_MoveRelearner(void)
// Script arguments: The pokemon to teach is in VAR_0x8004
void TeachMoveRelearnerMove(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_WaitForFadeOut, 10);
// Fade to black
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 0007664ba1..c35fe8ed80 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -102,7 +102,7 @@ void CB2_InitMysteryEventMenu(void)
BuildOamBuffer();
RunTextPrinters();
UpdatePaletteFade();
- FillPalette(0, 0, 2);
+ FillPalette(RGB_BLACK, 0, 2);
SetMainCallback2(CB2_MysteryEventMenu);
}
}
@@ -131,7 +131,7 @@ static void CB2_MysteryEventMenu(void)
switch (gMain.state)
{
case 0:
- DrawStdFrameWithCustomTileAndPalette(0, 1, 1, 0xD);
+ DrawStdFrameWithCustomTileAndPalette(0, TRUE, 1, 0xD);
PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_FULL);
ShowBg(0);
@@ -178,7 +178,7 @@ static void CB2_MysteryEventMenu(void)
{
PlaySE(SE_SELECT);
CheckShouldAdvanceLinkState();
- DrawStdFrameWithCustomTileAndPalette(1, 1, 1, 0xD);
+ DrawStdFrameWithCustomTileAndPalette(1, TRUE, 1, 0xD);
PrintMysteryMenuText(1, gText_LoadingEvent, 1, 2, 0);
PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_FULL);
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index e0f789bcbd..d1b514a173 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -104,7 +104,7 @@ static int CalcRecordMixingGiftChecksum(void)
{
unsigned int i;
int sum = 0;
- u8 *data = (u8*)(&gSaveBlock1Ptr->recordMixingGift.data);
+ u8 *data = (u8 *)(&gSaveBlock1Ptr->recordMixingGift.data);
for (i = 0; i < sizeof(gSaveBlock1Ptr->recordMixingGift.data); i++)
sum += data[i];
@@ -220,7 +220,7 @@ bool8 MEScrCmd_setmsg(struct ScriptContext *ctx)
bool8 MEScrCmd_runscript(struct ScriptContext *ctx)
{
u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase);
- ScriptContext2_RunNewScript(script);
+ RunScriptImmediately(script);
return FALSE;
}
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index b970711fd3..62f12a5cfc 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -58,7 +58,7 @@ struct MysteryGiftTaskData
bool8 isWonderNews;
bool8 sourceIsFriend;
u8 msgId;
- u8 * clientMsg;
+ u8 *clientMsg;
};
static const struct BgTemplate sBGTemplates[] = {
@@ -476,8 +476,8 @@ void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void)
void PrintMysteryGiftOrEReaderTopMenu(bool8 isEReader, bool32 useCancel)
{
- const u8 * header;
- const u8 * options;
+ const u8 *header;
+ const u8 *options;
FillWindowPixelBuffer(0, 0);
if (!isEReader)
{
@@ -589,7 +589,7 @@ static void ShowDownArrow(void)
}
// Unused
-static bool32 HideDownArrowAndWaitButton(u8 * textState)
+static bool32 HideDownArrowAndWaitButton(u8 *textState)
{
switch (*textState)
{
@@ -606,7 +606,7 @@ static bool32 HideDownArrowAndWaitButton(u8 * textState)
return FALSE;
}
-static bool32 PrintStringAndWait2Seconds(u8 * counter, const u8 * str)
+static bool32 PrintStringAndWait2Seconds(u8 *counter, const u8 *str)
{
if (*counter == 0)
AddTextPrinterToWindow1(str);
@@ -623,7 +623,7 @@ static bool32 PrintStringAndWait2Seconds(u8 * counter, const u8 * str)
}
}
-static u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whichMenu)
+static u32 MysteryGift_HandleThreeOptionMenu(u8 *unused0, u16 * unused1, u8 whichMenu)
{
struct ListMenuTemplate listMenuTemplate = sListMenuTemplate_ThreeOptions;
struct WindowTemplate windowTemplate = sWindowTemplate_ThreeOptions;
@@ -654,7 +654,7 @@ static u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whi
return response;
}
-s8 DoMysteryGiftYesNo(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, const u8 * str)
+s8 DoMysteryGiftYesNo(u8 *textState, u16 * windowId, bool8 yesNoBoxPlacement, const u8 *str)
{
struct WindowTemplate windowTemplate;
s8 input;
@@ -711,7 +711,7 @@ s8 DoMysteryGiftYesNo(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, c
}
// Handle the "Receive/Send/Toss" menu that appears when selecting Wonder Card/News
-static s32 HandleGiftSelectMenu(u8 * textState, u16 * windowId, bool32 cannotToss, bool32 cannotSend)
+static s32 HandleGiftSelectMenu(u8 *textState, u16 * windowId, bool32 cannotToss, bool32 cannotSend)
{
struct WindowTemplate windowTemplate;
s32 input;
@@ -778,7 +778,7 @@ static bool32 ValidateCardOrNews(bool32 isWonderNews)
return ValidateSavedWonderNews();
}
-static bool32 HandleLoadWonderCardOrNews(u8 * state, bool32 isWonderNews)
+static bool32 HandleLoadWonderCardOrNews(u8 *state, bool32 isWonderNews)
{
switch (*state)
{
@@ -844,7 +844,7 @@ static bool32 ExitWonderCardOrNews(bool32 isWonderNews, bool32 useCancel)
}
}
-static s32 AskDiscardGift(u8 * textState, u16 * windowId, bool32 isWonderNews)
+static s32 AskDiscardGift(u8 *textState, u16 * windowId, bool32 isWonderNews)
{
if (!isWonderNews)
return DoMysteryGiftYesNo(textState, windowId, TRUE, gText_IfThrowAwayCardEventWontHappen);
@@ -852,7 +852,7 @@ static s32 AskDiscardGift(u8 * textState, u16 * windowId, bool32 isWonderNews)
return DoMysteryGiftYesNo(textState, windowId, TRUE, gText_OkayToDiscardNews);
}
-static bool32 PrintThrownAway(u8 * textState, bool32 isWonderNews)
+static bool32 PrintThrownAway(u8 *textState, bool32 isWonderNews)
{
if (!isWonderNews)
return PrintMysteryGiftMenuMessage(textState, gText_WonderCardThrownAway);
@@ -860,7 +860,7 @@ static bool32 PrintThrownAway(u8 * textState, bool32 isWonderNews)
return PrintMysteryGiftMenuMessage(textState, gText_WonderNewsThrownAway);
}
-static bool32 SaveOnMysteryGiftMenu(u8 * state)
+static bool32 SaveOnMysteryGiftMenu(u8 *state)
{
switch (*state)
{
@@ -889,9 +889,9 @@ static bool32 SaveOnMysteryGiftMenu(u8 * state)
return FALSE;
}
-static const u8 * GetClientResultMessage(bool32 * successMsg, bool8 isWonderNews, bool8 sourceIsFriend, u32 msgId)
+static const u8 *GetClientResultMessage(bool32 * successMsg, bool8 isWonderNews, bool8 sourceIsFriend, u32 msgId)
{
- const u8 * msg = NULL;
+ const u8 *msg = NULL;
*successMsg = FALSE;
switch (msgId)
@@ -961,7 +961,7 @@ static const u8 * GetClientResultMessage(bool32 * successMsg, bool8 isWonderNews
return msg;
}
-static bool32 PrintSuccessMessage(u8 * state, const u8 * msg, u16 * timer)
+static bool32 PrintSuccessMessage(u8 *state, const u8 *msg, u16 * timer)
{
switch (*state)
{
@@ -988,9 +988,9 @@ static bool32 PrintSuccessMessage(u8 * state, const u8 * msg, u16 * timer)
return FALSE;
}
-static const u8 * GetServerResultMessage(bool32 * wonderSuccess, bool8 sourceIsFriend, u32 msgId)
+static const u8 *GetServerResultMessage(bool32 * wonderSuccess, bool8 sourceIsFriend, u32 msgId)
{
- const u8 * result = gText_CommunicationError;
+ const u8 *result = gText_CommunicationError;
*wonderSuccess = FALSE;
switch (msgId)
{
@@ -1045,10 +1045,10 @@ static const u8 * GetServerResultMessage(bool32 * wonderSuccess, bool8 sourceIsF
return result;
}
-static bool32 PrintServerResultMessage(u8 * state, u16 * timer, bool8 sourceIsFriend, u32 msgId)
+static bool32 PrintServerResultMessage(u8 *state, u16 * timer, bool8 sourceIsFriend, u32 msgId)
{
bool32 wonderSuccess;
- const u8 * str = GetServerResultMessage(&wonderSuccess, sourceIsFriend, msgId);
+ const u8 *str = GetServerResultMessage(&wonderSuccess, sourceIsFriend, msgId);
if (wonderSuccess)
return PrintSuccessMessage(state, str, timer);
else
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 6badae8d7a..a6e55eed60 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -26,6 +26,7 @@
#include "text_window.h"
#include "overworld.h"
#include "walda_phrase.h"
+#include "main.h"
#include "constants/event_objects.h"
#include "constants/rgb.h"
@@ -61,10 +62,10 @@ enum {
};
enum {
- PALTAG_PC_ICON,
+ PALTAG_MENU, // Also the PC icon
PALTAG_PAGE_SWAP_UPPER,
PALTAG_PAGE_SWAP_LOWER,
- PALTAG_PAGE_SWAP_OTHERS,
+ PALTAG_PAGE_SWAP_OTHERS, // Also the input arrow/underscore
PALTAG_PAGE_SWAP,
PALTAG_CURSOR,
PALTAG_BACK_BUTTON,
@@ -180,21 +181,11 @@ struct NamingScreenData
};
EWRAM_DATA static struct NamingScreenData *sNamingScreen = NULL;
-extern u16 gKeyRepeatStartDelay;
-// extern text
-extern const u8 gText_MoveOkBack[];
-extern const u8 gText_YourName[];
-extern const u8 gText_BoxName[];
-extern const u8 gText_PkmnsNickname[];
-extern const u8 gText_TellHimTheWords[];
-
-
-// start of .rodata
-static const u8 sPCIconOff_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon/off.4bpp");
-static const u8 sPCIconOn_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon/on.4bpp");
+static const u8 sPCIconOff_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon_off.4bpp");
+static const u8 sPCIconOn_Gfx[] = INCBIN_U8("graphics/naming_screen/pc_icon_on.4bpp");
static const u16 sKeyboard_Pal[] = INCBIN_U16("graphics/naming_screen/keyboard.gbapal");
-static const u16 sUnused_Pal[] = INCBIN_U16("graphics/naming_screen/unused.gbapal");
+static const u16 sRival_Pal[] = INCBIN_U16("graphics/naming_screen/rival.gbapal"); // Unused, leftover from FRLG rival
static const u8 *const sTransferredToPCMessages[] =
{
@@ -312,13 +303,12 @@ static const u8 sPageColumnCounts[KBPAGE_COUNT] = {
[KEYBOARD_LETTERS_UPPER] = KBCOL_COUNT,
[KEYBOARD_SYMBOLS] = 6
};
-static const u8 sPageColumnXPos[KBPAGE_COUNT * KBCOL_COUNT] = {
- 0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_LOWER
- 0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_UPPER
- 0, 22, 44, 66, 88, 110 // KEYBOARD_SYMBOLS
+static const u8 sPageColumnXPos[KBPAGE_COUNT][KBCOL_COUNT] = {
+ [KEYBOARD_LETTERS_LOWER] = {0, 12, 24, 56, 68, 80, 92, 123},
+ [KEYBOARD_LETTERS_UPPER] = {0, 12, 24, 56, 68, 80, 92, 123},
+ [KEYBOARD_SYMBOLS] = {0, 22, 44, 66, 88, 110}
};
-// forward declarations
static const struct NamingScreenTemplate *const sNamingScreenTemplates[];
static const struct SubspriteTable sSubspriteTable_PageSwapFrame[];
static const struct SubspriteTable sSubspriteTable_PageSwapText[];
@@ -333,7 +323,7 @@ static const struct SpriteTemplate sSpriteTemplate_Cursor;
static const struct SpriteTemplate sSpriteTemplate_InputArrow;
static const struct SpriteTemplate sSpriteTemplate_Underscore;
static const struct SpriteTemplate sSpriteTemplate_PCIcon;
-static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT];
+static const u8 *const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT];
static const struct SpriteSheet sSpriteSheets[];
static const struct SpritePalette sSpritePalettes[];
@@ -738,9 +728,9 @@ static void DisplaySentToPCMessage(void)
stringToDisplay++;
StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
- DrawDialogueFrame(0, 0);
+ DrawDialogueFrame(0, FALSE);
gTextFlags.canABSpeedUpPrint = TRUE;
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
}
@@ -1142,7 +1132,7 @@ static void SetCursorPos(s16 x, s16 y)
struct Sprite *cursorSprite = &gSprites[sNamingScreen->cursorSpriteId];
if (x < sPageColumnCounts[CurrentPageToKeyboardId()])
- cursorSprite->x = sPageColumnXPos[x + CurrentPageToKeyboardId() * KBCOL_COUNT] + 38;
+ cursorSprite->x = sPageColumnXPos[CurrentPageToKeyboardId()][x] + 38;
else
cursorSprite->x = 0;
@@ -1890,7 +1880,7 @@ static void CreateHelperTasks(void)
static void LoadPalettes(void)
{
- LoadPalette(gNamingScreenMenu_Pal, 0, 0xC0);
+ LoadPalette(gNamingScreenMenu_Pal, 0, sizeof(gNamingScreenMenu_Pal));
LoadPalette(sKeyboard_Pal, 0xA0, sizeof(sKeyboard_Pal));
LoadPalette(GetTextWindowPalette(2), 0xB0, 0x20);
}
@@ -2512,7 +2502,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore =
static const struct SpriteTemplate sSpriteTemplate_PCIcon =
{
.tileTag = TAG_NONE,
- .paletteTag = PALTAG_PC_ICON,
+ .paletteTag = PALTAG_MENU,
.oam = &sOam_8x8,
.anims = sAnims_PCIcon,
.images = sImageTable_PCIcon,
@@ -2520,7 +2510,7 @@ static const struct SpriteTemplate sSpriteTemplate_PCIcon =
.callback = SpriteCallbackDummy
};
-static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
+static const u8 *const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
{
[KEYBOARD_LETTERS_LOWER] =
{
@@ -2547,31 +2537,31 @@ static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
static const struct SpriteSheet sSpriteSheets[] =
{
- {gNamingScreenRWindow_Gfx + 0x280, 0x1E0, GFXTAG_BACK_BUTTON},
- {gNamingScreenRWindow_Gfx + 0x460, 0x1E0, GFXTAG_OK_BUTTON},
- {gNamingScreenRWindow_Gfx, 0x280, GFXTAG_PAGE_SWAP_FRAME},
- {gNamingScreenPageButton_Gfx + 0x20, 0x100, GFXTAG_PAGE_SWAP_BUTTON},
- {gNamingScreenROptions_Gfx, 0x060, GFXTAG_PAGE_SWAP_UPPER},
- {gNamingScreenROptions_Gfx + 0xA0, 0x060, GFXTAG_PAGE_SWAP_LOWER},
- {gNamingScreenROptions_Gfx + 0x140, 0x060, GFXTAG_PAGE_SWAP_OTHERS},
- {gNamingScreenCursor_Gfx, 0x080, GFXTAG_CURSOR},
- {gNamingScreenCursor_Gfx + 0xA0, 0x080, GFXTAG_CURSOR_SQUISHED},
- {gNamingScreenCursor_Gfx + 0x140, 0x080, GFXTAG_CURSOR_FILLED},
- {gNamingScreenInputArrow_Gfx, 0x020, GFXTAG_INPUT_ARROW},
- {gNamingScreenUnderscore_Gfx, 0x020, GFXTAG_UNDERSCORE},
+ {gNamingScreenBackButton_Gfx, 0x1E0, GFXTAG_BACK_BUTTON},
+ {gNamingScreenOKButton_Gfx, 0x1E0, GFXTAG_OK_BUTTON},
+ {gNamingScreenPageSwapFrame_Gfx, 0x280, GFXTAG_PAGE_SWAP_FRAME},
+ {gNamingScreenPageSwapButton_Gfx, 0x100, GFXTAG_PAGE_SWAP_BUTTON},
+ {gNamingScreenPageSwapUpper_Gfx, 0x060, GFXTAG_PAGE_SWAP_UPPER},
+ {gNamingScreenPageSwapLower_Gfx, 0x060, GFXTAG_PAGE_SWAP_LOWER},
+ {gNamingScreenPageSwapOthers_Gfx, 0x060, GFXTAG_PAGE_SWAP_OTHERS},
+ {gNamingScreenCursor_Gfx, 0x080, GFXTAG_CURSOR},
+ {gNamingScreenCursorSquished_Gfx, 0x080, GFXTAG_CURSOR_SQUISHED},
+ {gNamingScreenCursorFilled_Gfx, 0x080, GFXTAG_CURSOR_FILLED},
+ {gNamingScreenInputArrow_Gfx, 0x020, GFXTAG_INPUT_ARROW},
+ {gNamingScreenUnderscore_Gfx, 0x020, GFXTAG_UNDERSCORE},
{}
};
static const struct SpritePalette sSpritePalettes[] =
{
- {gNamingScreenMenu_Pal, PALTAG_PC_ICON},
- {gNamingScreenMenu_Pal + 0x10, PALTAG_PAGE_SWAP_UPPER},
- {gNamingScreenMenu_Pal + 0x20, PALTAG_PAGE_SWAP_LOWER},
- {gNamingScreenMenu_Pal + 0x30, PALTAG_PAGE_SWAP_OTHERS},
- {gNamingScreenMenu_Pal + 0x40, PALTAG_PAGE_SWAP},
- {gNamingScreenMenu_Pal + 0x50, PALTAG_CURSOR},
- {gNamingScreenMenu_Pal + 0x40, PALTAG_BACK_BUTTON},
- {gNamingScreenMenu_Pal + 0x40, PALTAG_OK_BUTTON},
+ {gNamingScreenMenu_Pal[0], PALTAG_MENU},
+ {gNamingScreenMenu_Pal[1], PALTAG_PAGE_SWAP_UPPER},
+ {gNamingScreenMenu_Pal[2], PALTAG_PAGE_SWAP_LOWER},
+ {gNamingScreenMenu_Pal[3], PALTAG_PAGE_SWAP_OTHERS},
+ {gNamingScreenMenu_Pal[4], PALTAG_PAGE_SWAP},
+ {gNamingScreenMenu_Pal[5], PALTAG_CURSOR},
+ {gNamingScreenMenu_Pal[4], PALTAG_BACK_BUTTON},
+ {gNamingScreenMenu_Pal[4], PALTAG_OK_BUTTON},
{}
};
diff --git a/src/new_game.c b/src/new_game.c
index 235333fdc5..8f8aa9b82b 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -193,7 +193,7 @@ void NewGameInitData(void)
ResetFanClub();
ResetLotteryCorner();
WarpToTruck();
- ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
+ RunScriptImmediately(EventScript_ResetAllMapFlags);
ResetMiniGamesRecords();
InitUnionRoomChatRegisteredTexts();
InitLilycoveLady();
diff --git a/src/option_menu.c b/src/option_menu.c
index 2991913d78..3ca9857e84 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -167,7 +167,7 @@ void CB2_InitOptionMenu(void)
gMain.state++;
break;
case 1:
- DmaClearLarge16(3, (void*)(VRAM), VRAM_SIZE, 0x1000);
+ DmaClearLarge16(3, (void *)(VRAM), VRAM_SIZE, 0x1000);
DmaClear32(3, OAM, OAM_SIZE);
DmaClear16(3, PLTT, PLTT_SIZE);
SetGpuReg(REG_OFFSET_DISPCNT, 0);
diff --git a/src/overworld.c b/src/overworld.c
index 8d4b7961d5..5bf7262dcb 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -127,9 +127,9 @@ static void CreateLinkPlayerSprites(void);
static void ClearAllPlayerKeys(void);
static void ResetAllPlayerLinkStates(void);
static void UpdateHeldKeyCode(u16);
-static void UpdateAllLinkPlayers(u16*, s32);
+static void UpdateAllLinkPlayers(u16 *, s32);
static u8 FlipVerticalAndClearForced(u8, u8);
-static u8 LinkPlayerDetectCollision(u8, u8, s16, s16);
+static u8 LinkPlayerGetCollision(u8, u8, s16, s16);
static void CreateLinkPlayerSprite(u8, u8);
static void GetLinkPlayerCoords(u8, u16 *, u16 *);
static u8 GetLinkPlayerFacingDirection(u8);
@@ -360,7 +360,7 @@ static void (*const sMovementStatusHandler[])(struct LinkPlayerObjectEvent *, st
// code
void DoWhiteOut(void)
{
- ScriptContext2_RunNewScript(EventScript_WhiteOut);
+ RunScriptImmediately(EventScript_WhiteOut);
#if B_WHITEOUT_MONEY == GEN_3
SetMoney(&gSaveBlock1Ptr->money, GetMoney(&gSaveBlock1Ptr->money) / 2);
#endif
@@ -388,7 +388,7 @@ void Overworld_ResetStateAfterTeleport(void)
FlagClear(FLAG_SYS_SAFARI_MODE);
FlagClear(FLAG_SYS_USE_STRENGTH);
FlagClear(FLAG_SYS_USE_FLASH);
- ScriptContext2_RunNewScript(EventScript_ResetMrBriney);
+ RunScriptImmediately(EventScript_ResetMrBriney);
}
void Overworld_ResetStateAfterDigEscRope(void)
@@ -1437,11 +1437,11 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
UpdatePlayerAvatarTransitionState();
FieldClearPlayerInput(&inputStruct);
FieldGetPlayerInput(&inputStruct, newKeys, heldKeys);
- if (!ScriptContext2_IsEnabled())
+ if (!ArePlayerFieldControlsLocked())
{
if (ProcessPlayerFieldInput(&inputStruct) == 1)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
HideMapNamePopUpWindow();
}
else
@@ -1459,7 +1459,7 @@ void CB1_Overworld(void)
static void OverworldBasic(void)
{
- ScriptContext2_RunScript();
+ ScriptContext_RunScript();
RunTasks();
AnimateSprites();
CameraUpdate();
@@ -1532,8 +1532,8 @@ void CB2_NewGame(void)
NewGameInitData();
ResetInitialPlayerAvatarState();
PlayTimeCounter_Start();
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
gFieldCallback = ExecuteTruckSequence;
gFieldCallback2 = NULL;
DoMapLoadLoop(&gMain.state);
@@ -1553,8 +1553,8 @@ void CB2_WhiteOut(void)
ResetSafariZoneFlag_();
DoWhiteOut();
ResetInitialPlayerAvatarState();
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
gFieldCallback = FieldCB_WarpExitFadeFromBlack;
state = 0;
DoMapLoadLoop(&state);
@@ -1567,8 +1567,8 @@ void CB2_WhiteOut(void)
void CB2_LoadMap(void)
{
FieldClearVBlankHBlankCallbacks();
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
SetMainCallback1(NULL);
SetMainCallback2(CB2_DoChangeMap);
gMain.savedCallback = CB2_LoadMap2;
@@ -1587,8 +1587,8 @@ void CB2_ReturnToFieldContestHall(void)
if (!gMain.state)
{
FieldClearVBlankHBlankCallbacks();
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
SetMainCallback1(NULL);
}
if (LoadMapInStepsLocal(&gMain.state, TRUE))
@@ -1657,8 +1657,8 @@ void CB2_ReturnToFieldFromMultiplayer(void)
else
gFieldCallback = FieldCB_ReturnToFieldCableLink;
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
CB2_ReturnToField();
}
@@ -1728,8 +1728,8 @@ void CB2_ContinueSavedGame(void)
InitMapFromSavedGame();
PlayTimeCounter_Start();
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
InitMatchCallCounters();
if (UseContinueGameWarp() == TRUE)
{
@@ -1808,8 +1808,8 @@ static bool32 LoadMapInStepsLink(u8 *state)
{
case 0:
InitOverworldBgs();
- ScriptContext1_Init();
- ScriptContext2_Disable();
+ ScriptContext_Init();
+ UnlockPlayerFieldControls();
ResetMirageTowerAndSaveBlockPtrs();
ResetScreenForMapLoad();
(*state)++;
@@ -2510,7 +2510,7 @@ static void ResetPlayerHeldKeys(u16 *keys)
static u16 KeyInterCB_SelfIdle(u32 key)
{
- if (ScriptContext2_IsEnabled() == TRUE)
+ if (ArePlayerFieldControlsLocked() == TRUE)
return LINK_KEY_CODE_EMPTY;
if (GetLinkRecvQueueLength() > 4)
return LINK_KEY_CODE_HANDLE_RECV_QUEUE;
@@ -2530,7 +2530,7 @@ static u16 KeyInterCB_Idle(u32 key)
static u16 KeyInterCB_DeferToEventScript(u32 key)
{
u16 retVal;
- if (ScriptContext2_IsEnabled() == TRUE)
+ if (ArePlayerFieldControlsLocked() == TRUE)
{
retVal = LINK_KEY_CODE_EMPTY;
}
@@ -2553,7 +2553,7 @@ static u16 KeyInterCB_DeferToRecvQueue(u32 key)
else
{
retVal = LINK_KEY_CODE_IDLE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
SetKeyInterceptCallback(KeyInterCB_Idle);
}
return retVal;
@@ -2570,7 +2570,7 @@ static u16 KeyInterCB_DeferToSendQueue(u32 key)
else
{
retVal = LINK_KEY_CODE_IDLE;
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
SetKeyInterceptCallback(KeyInterCB_Idle);
}
return retVal;
@@ -2623,7 +2623,7 @@ static u16 KeyInterCB_WaitForPlayersToExit(u32 keyOrPlayerId)
CheckRfuKeepAliveTimer();
if (AreAllPlayersInLinkState(PLAYER_LINK_STATE_EXITING_ROOM) == TRUE)
{
- ScriptContext1_SetupScript(EventScript_DoLinkRoomExit);
+ ScriptContext_SetupScript(EventScript_DoLinkRoomExit);
SetKeyInterceptCallback(KeyInterCB_SendNothing);
}
return LINK_KEY_CODE_EMPTY;
@@ -2802,41 +2802,41 @@ static u16 GetDirectionForEventScript(const u8 *script)
static void InitLinkPlayerQueueScript(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static void InitLinkRoomStartMenuScript(void)
{
PlaySE(SE_WIN_OPEN);
ShowStartMenu();
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static void RunInteractLocalPlayerScript(const u8 *script)
{
PlaySE(SE_SELECT);
- ScriptContext1_SetupScript(script);
- ScriptContext2_Enable();
+ ScriptContext_SetupScript(script);
+ LockPlayerFieldControls();
}
static void RunConfirmLeaveCableClubScript(void)
{
PlaySE(SE_WIN_OPEN);
- ScriptContext1_SetupScript(EventScript_ConfirmLeaveCableClubRoom);
- ScriptContext2_Enable();
+ ScriptContext_SetupScript(EventScript_ConfirmLeaveCableClubRoom);
+ LockPlayerFieldControls();
}
static void InitMenuBasedScript(const u8 *script)
{
PlaySE(SE_SELECT);
- ScriptContext1_SetupScript(script);
- ScriptContext2_Enable();
+ ScriptContext_SetupScript(script);
+ LockPlayerFieldControls();
}
static void RunTerminateLinkScript(void)
{
- ScriptContext1_SetupScript(EventScript_TerminateLink);
- ScriptContext2_Enable();
+ ScriptContext_SetupScript(EventScript_TerminateLink);
+ LockPlayerFieldControls();
}
bool32 Overworld_IsRecvQueueAtMax(void)
@@ -2928,7 +2928,7 @@ static void ZeroObjectEvent(struct ObjectEvent *objEvent)
// conflict with the usual Event Object struct, thus the definitions.
#define linkGender(obj) obj->singleMovementActive
// not even one can reference *byte* aligned bitfield members...
-#define linkDirection(obj) ((u8*)obj)[offsetof(typeof(*obj), fieldEffectSpriteId) - 1] // -> rangeX
+#define linkDirection(obj) ((u8 *)obj)[offsetof(typeof(*obj), fieldEffectSpriteId) - 1] // -> rangeX
static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 gender)
{
@@ -3092,7 +3092,7 @@ static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayer
linkDirection(objEvent) = FlipVerticalAndClearForced(dir, linkDirection(objEvent));
ObjectEventMoveDestCoords(objEvent, linkDirection(objEvent), &x, &y);
- if (LinkPlayerDetectCollision(linkPlayerObjEvent->objEventId, linkDirection(objEvent), x, y))
+ if (LinkPlayerGetCollision(linkPlayerObjEvent->objEventId, linkDirection(objEvent), x, y))
{
return FALSE;
}
@@ -3152,7 +3152,7 @@ static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing)
return oldFacing;
}
-static bool8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 direction, s16 x, s16 y)
+static u8 LinkPlayerGetCollision(u8 selfObjEventId, u8 direction, s16 x, s16 y)
{
u8 i;
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
@@ -3162,11 +3162,11 @@ static bool8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 direction, s16 x, s
if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y)
|| (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y))
{
- return TRUE;
+ return 1;
}
}
}
- return MapGridIsImpassableAt(x, y);
+ return MapGridGetCollisionAt(x, y);
}
static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion)
@@ -3214,7 +3214,7 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite)
else
StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(linkDirection(objEvent)));
- UpdateObjectEventSpriteInvisibility(sprite, 0);
+ UpdateObjectEventSpriteInvisibility(sprite, FALSE);
if (objEvent->triggerGroundEffectsOnMove)
{
sprite->invisible = ((sprite->data[7] & 4) >> 2);
diff --git a/src/party_menu.c b/src/party_menu.c
index 4856a81ed4..db20e0932c 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -73,6 +73,80 @@
#include "constants/rgb.h"
#include "constants/songs.h"
+enum {
+ MENU_SUMMARY,
+ MENU_SWITCH,
+ MENU_CANCEL1,
+ MENU_ITEM,
+ MENU_GIVE,
+ MENU_TAKE_ITEM,
+ MENU_MAIL,
+ MENU_TAKE_MAIL,
+ MENU_READ,
+ MENU_CANCEL2,
+ MENU_SHIFT,
+ MENU_SEND_OUT,
+ MENU_ENTER,
+ MENU_NO_ENTRY,
+ MENU_STORE,
+ MENU_REGISTER,
+ MENU_TRADE1,
+ MENU_TRADE2,
+ MENU_TOSS,
+ MENU_FIELD_MOVES
+};
+
+// IDs for the action lists that appear when a party mon is selected
+enum {
+ ACTIONS_NONE,
+ ACTIONS_SWITCH,
+ ACTIONS_SHIFT,
+ ACTIONS_SEND_OUT,
+ ACTIONS_ENTER,
+ ACTIONS_NO_ENTRY,
+ ACTIONS_STORE,
+ ACTIONS_SUMMARY_ONLY,
+ ACTIONS_ITEM,
+ ACTIONS_MAIL,
+ ACTIONS_REGISTER,
+ ACTIONS_TRADE,
+ ACTIONS_SPIN_TRADE,
+ ACTIONS_TAKEITEM_TOSS,
+};
+
+// In CursorCb_FieldMove, field moves <= FIELD_MOVE_WATERFALL are assumed to line up with the badge flags.
+// Badge flag names are commented here for people searching for references to remove the badge requirement.
+enum {
+ FIELD_MOVE_CUT, // FLAG_BADGE01_GET
+ FIELD_MOVE_FLASH, // FLAG_BADGE02_GET
+ FIELD_MOVE_ROCK_SMASH, // FLAG_BADGE03_GET
+ FIELD_MOVE_STRENGTH, // FLAG_BADGE04_GET
+ FIELD_MOVE_SURF, // FLAG_BADGE05_GET
+ FIELD_MOVE_FLY, // FLAG_BADGE06_GET
+ FIELD_MOVE_DIVE, // FLAG_BADGE07_GET
+ FIELD_MOVE_WATERFALL, // FLAG_BADGE08_GET
+ FIELD_MOVE_TELEPORT,
+ FIELD_MOVE_DIG,
+ FIELD_MOVE_SECRET_POWER,
+ FIELD_MOVE_MILK_DRINK,
+ FIELD_MOVE_SOFT_BOILED,
+ FIELD_MOVE_SWEET_SCENT,
+ FIELD_MOVES_COUNT
+};
+
+enum {
+ PARTY_BOX_LEFT_COLUMN,
+ PARTY_BOX_RIGHT_COLUMN,
+};
+
+enum {
+ TAG_POKEBALL = 1200,
+ TAG_POKEBALL_SMALL,
+ TAG_STATUS_ICONS,
+};
+
+#define TAG_HELD_ITEM 55120
+
#define PARTY_PAL_SELECTED (1 << 0)
#define PARTY_PAL_FAINTED (1 << 1)
#define PARTY_PAL_TO_SWITCH (1 << 2)
@@ -193,9 +267,9 @@ static void DisplayPartyPokemonDescriptionText(u8, struct PartyMenuBox *, u8);
static bool8 IsMonAllowedInMinigame(u8);
static void DisplayPartyPokemonDataToTeachMove(u8, u16, u8);
static u8 CanMonLearnTMTutor(struct Pokemon *, u16, u8);
-static void DisplayPartyPokemonBarDetail(u8, const u8*, u8, const u8*);
+static void DisplayPartyPokemonBarDetail(u8, const u8 *, u8, const u8 *);
static void DisplayPartyPokemonLevel(u8, struct PartyMenuBox *);
-static void DisplayPartyPokemonGender(u8, u16, u8*, struct PartyMenuBox *);
+static void DisplayPartyPokemonGender(u8, u16, u8 *, struct PartyMenuBox *);
static void DisplayPartyPokemonHP(u16, struct PartyMenuBox *);
static void DisplayPartyPokemonMaxHP(u16, struct PartyMenuBox *);
static void DisplayPartyPokemonHPBar(u16, u16, struct PartyMenuBox *);
@@ -220,12 +294,12 @@ static u8 GetPartyIdFromBattleSlot(u8);
static void Task_ClosePartyMenuAndSetCB2(u8);
static void UpdatePartyToFieldOrder(void);
static void MoveCursorToConfirm(void);
-static void HandleChooseMonCancel(u8, s8*);
-static void HandleChooseMonSelection(u8, s8*);
-static u16 PartyMenuButtonHandler(s8*);
-static s8* GetCurrentPartySlotPtr(void);
-static bool8 IsSelectedMonNotEgg(u8*);
-static void PartyMenuRemoveWindow(u8*);
+static void HandleChooseMonCancel(u8, s8 *);
+static void HandleChooseMonSelection(u8, s8 *);
+static u16 PartyMenuButtonHandler(s8 *);
+static s8 *GetCurrentPartySlotPtr(void);
+static bool8 IsSelectedMonNotEgg(u8 *);
+static void PartyMenuRemoveWindow(u8 *);
static void CB2_SetUpExitToBattleScreen(void);
static void Task_ClosePartyMenuAfterText(u8);
static void TryTutorSelectedMon(u8);
@@ -237,26 +311,26 @@ static void Task_TryCreateSelectionWindow(u8);
static void FinishTwoMonAction(u8);
static void CancelParticipationPrompt(u8);
static bool8 DisplayCancelChooseMonYesNo(u8);
-static const u8* GetFacilityCancelString(void);
+static const u8 *GetFacilityCancelString(void);
static void Task_CancelChooseMonYesNo(u8);
static void PartyMenuDisplayYesNoMenu(void);
static void Task_HandleCancelChooseMonYesNoInput(u8);
static void Task_ReturnToChooseMonAfterText(u8);
-static void UpdateCurrentPartySelection(s8*, s8);
-static void UpdatePartySelectionSingleLayout(s8*, s8);
-static void UpdatePartySelectionDoubleLayout(s8*, s8);
+static void UpdateCurrentPartySelection(s8 *, s8);
+static void UpdatePartySelectionSingleLayout(s8 *, s8);
+static void UpdatePartySelectionDoubleLayout(s8 *, s8);
static s8 GetNewSlotDoubleLayout(s8, s8);
-static void PartyMenuPrintText(const u8*);
+static void PartyMenuPrintText(const u8 *);
static void Task_PrintAndWaitForText(u8);
-static bool16 IsMonAllowedInPokemonJump(struct Pokemon*);
-static bool16 IsMonAllowedInDodrioBerryPicking(struct Pokemon*);
+static bool16 IsMonAllowedInPokemonJump(struct Pokemon *);
+static bool16 IsMonAllowedInDodrioBerryPicking(struct Pokemon *);
static void Task_CancelParticipationYesNo(u8);
static void Task_HandleCancelParticipationYesNoInput(u8);
static bool8 CanLearnTutorMove(u16, u8);
static u16 GetTutorMove(u8);
static bool8 ShouldUseChooseMonText(void);
-static void SetPartyMonFieldSelectionActions(struct Pokemon*, u8);
-static u8 GetPartyMenuActionsTypeInBattle(struct Pokemon*);
+static void SetPartyMonFieldSelectionActions(struct Pokemon *, u8);
+static u8 GetPartyMenuActionsTypeInBattle(struct Pokemon *);
static u8 GetPartySlotEntryStatus(s8);
static void Task_UpdateHeldItemSprite(u8);
static void Task_HandleSelectionMenuInput(u8);
@@ -277,7 +351,7 @@ static void Task_HandleSwitchItemsYesNoInput(u8);
static void Task_WriteMailToGiveMonAfterText(u8);
static void CB2_ReturnToPartyMenuFromWritingMail(void);
static void Task_DisplayGaveMailFromPartyMessage(u8);
-static void UpdatePartyMonHeldItemSprite(struct Pokemon*, struct PartyMenuBox*);
+static void UpdatePartyMonHeldItemSprite(struct Pokemon *, struct PartyMenuBox *);
static void Task_TossHeldItemYesNo(u8 taskId);
static void Task_HandleTossHeldItemYesNoInput(u8);
static void Task_TossHeldItem(u8);
@@ -298,20 +372,20 @@ static void Task_FieldMoveExitAreaYesNo(u8);
static void Task_HandleFieldMoveExitAreaYesNoInput(u8);
static void Task_FieldMoveWaitForFade(u8);
static u16 GetFieldMoveMonSpecies(void);
-static void UpdatePartyMonHPBar(u8, struct Pokemon*);
-static void SpriteCB_UpdatePartyMonIcon(struct Sprite*);
-static void SpriteCB_BouncePartyMonIcon(struct Sprite*);
-static void ShowOrHideHeldItemSprite(u16, struct PartyMenuBox*);
+static void UpdatePartyMonHPBar(u8, struct Pokemon *);
+static void SpriteCB_UpdatePartyMonIcon(struct Sprite *);
+static void SpriteCB_BouncePartyMonIcon(struct Sprite *);
+static void ShowOrHideHeldItemSprite(u16, struct PartyMenuBox *);
static void CreateHeldItemSpriteForTrade(u8, bool8);
-static void SpriteCB_HeldItem(struct Sprite*);
-static void SetPartyMonAilmentGfx(struct Pokemon*, struct PartyMenuBox*);
-static void UpdatePartyMonAilmentGfx(u8, struct PartyMenuBox*);
+static void SpriteCB_HeldItem(struct Sprite *);
+static void SetPartyMonAilmentGfx(struct Pokemon *, struct PartyMenuBox *);
+static void UpdatePartyMonAilmentGfx(u8, struct PartyMenuBox *);
static u8 GetPartyLayoutFromBattleType(void);
static void Task_SetSacredAshCB(u8);
static void CB2_ReturnToBagMenu(void);
static void Task_DisplayHPRestoredMessage(u8);
-static u16 ItemEffectToMonEv(struct Pokemon*, u8);
-static void ItemEffectToStatString(u8, u8*);
+static u16 ItemEffectToMonEv(struct Pokemon *, u8);
+static void ItemEffectToStatString(u8, u8 *);
static void ReturnToUseOnWhichMon(u8);
static void SetSelectedMoveForPPItem(u8);
static void TryUsePPItem(u8);
@@ -331,8 +405,8 @@ static void Task_PartyMenuReplaceMove(u8);
static void Task_StopLearningMoveYesNo(u8);
static void Task_HandleStopLearningMoveYesNoInput(u8);
static void Task_TryLearningNextMoveAfterText(u8);
-static void BufferMonStatsToTaskData(struct Pokemon*, s16*);
-static void UpdateMonDisplayInfoAfterRareCandy(u8, struct Pokemon*);
+static void BufferMonStatsToTaskData(struct Pokemon *, s16 *);
+static void UpdateMonDisplayInfoAfterRareCandy(u8, struct Pokemon *);
static void Task_DisplayLevelUpStatsPg1(u8);
static void DisplayLevelUpStatsPg1(u8);
static void Task_DisplayLevelUpStatsPg2(u8);
@@ -356,14 +430,14 @@ static bool8 ReturnGiveItemToBagOrPC(u16);
static void Task_DisplayGaveMailFromBagMessage(u8);
static void Task_HandleSwitchItemsFromBagYesNoInput(u8);
static void Task_ValidateChosenHalfParty(u8);
-static bool8 GetBattleEntryEligibility(struct Pokemon*);
+static bool8 GetBattleEntryEligibility(struct Pokemon *);
static bool8 HasPartySlotAlreadyBeenSelected(u8);
static u8 GetBattleEntryLevelCap(void);
static u8 GetMaxBattleEntries(void);
static u8 GetMinBattleEntries(void);
static void Task_ContinueChoosingHalfParty(u8);
-static void BufferBattlePartyOrder(u8*, bool8);
-static void BufferBattlePartyOrderBySide(u8*, u8, u8);
+static void BufferBattlePartyOrder(u8 *, bool8);
+static void BufferBattlePartyOrderBySide(u8 *, u8, u8);
static void Task_InitMultiPartnerPartySlideIn(u8);
static void Task_MultiPartnerPartySlideIn(u8);
static void SlideMultiPartyMenuBoxSpritesOneStep(u8);
@@ -376,7 +450,7 @@ static void Task_ChoosePartyMon(u8 taskId);
static void Task_ChooseMonForMoveRelearner(u8);
static void CB2_ChooseMonForMoveRelearner(void);
static void Task_BattlePyramidChooseMonHeldItems(u8);
-static void ShiftMoveSlot(struct Pokemon*, u8, u8);
+static void ShiftMoveSlot(struct Pokemon *, u8, u8);
static void BlitBitmapToPartyWindow_LeftColumn(u8, u8, u8, u8, u8, bool8);
static void BlitBitmapToPartyWindow_RightColumn(u8, u8, u8, u8, u8, bool8);
static void CursorCb_Summary(u8);
@@ -973,7 +1047,7 @@ static bool8 RenderPartyMenuBoxes(void)
return FALSE;
}
-static u8* GetPartyMenuBgTile(u16 tileId)
+static u8 *GetPartyMenuBgTile(u16 tileId)
{
return &sPartyBgGfxTilemap[tileId << 5];
}
@@ -1187,13 +1261,13 @@ void Task_HandleChooseMonInput(u8 taskId)
switch (PartyMenuButtonHandler(slotPtr))
{
- case 1: // Selected mon
+ case A_BUTTON: // Selected mon
HandleChooseMonSelection(taskId, slotPtr);
break;
- case 2: // Selected Cancel
+ case B_BUTTON: // Selected Cancel / pressed B
HandleChooseMonCancel(taskId, slotPtr);
break;
- case 8: // Start button
+ case START_BUTTON:
if (sPartyMenuInternal->chooseHalf)
{
PlaySE(SE_SELECT);
@@ -1204,7 +1278,7 @@ void Task_HandleChooseMonInput(u8 taskId)
}
}
-static s8* GetCurrentPartySlotPtr(void)
+static s8 *GetCurrentPartySlotPtr(void)
{
if (gPartyMenu.action == PARTY_ACTION_SWITCH || gPartyMenu.action == PARTY_ACTION_SOFTBOILED)
return &gPartyMenu.slotId2;
@@ -1223,14 +1297,14 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
switch (gPartyMenu.action)
{
case PARTY_ACTION_SOFTBOILED:
- if (IsSelectedMonNotEgg((u8*)slotPtr))
+ if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
Task_TryUseSoftboiledOnPartyMon(taskId);
}
break;
case PARTY_ACTION_USE_ITEM:
- if (IsSelectedMonNotEgg((u8*)slotPtr))
+ if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
sPartyMenuInternal->exitCallback = CB2_SetUpExitToBattleScreen;
@@ -1240,7 +1314,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
}
break;
case PARTY_ACTION_MOVE_TUTOR:
- if (IsSelectedMonNotEgg((u8*)slotPtr))
+ if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PlaySE(SE_SELECT);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
@@ -1248,7 +1322,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
}
break;
case PARTY_ACTION_GIVE_MAILBOX_MAIL:
- if (IsSelectedMonNotEgg((u8*)slotPtr))
+ if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PlaySE(SE_SELECT);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
@@ -1257,7 +1331,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
break;
case PARTY_ACTION_GIVE_ITEM:
case PARTY_ACTION_GIVE_PC_ITEM:
- if (IsSelectedMonNotEgg((u8*)slotPtr))
+ if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
PlaySE(SE_SELECT);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
@@ -1273,7 +1347,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
Task_ClosePartyMenu(taskId);
break;
case PARTY_ACTION_MINIGAME:
- if (IsSelectedMonNotEgg((u8*)slotPtr))
+ if (IsSelectedMonNotEgg((u8 *)slotPtr))
{
TryEnterMonForMinigame(taskId, (u8)*slotPtr);
}
@@ -1330,7 +1404,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
static bool8 DisplayCancelChooseMonYesNo(u8 taskId)
{
- const u8* stringPtr = NULL;
+ const u8 *stringPtr = NULL;
if (gPartyMenu.menuType == PARTY_MENU_TYPE_CONTEST)
stringPtr = gText_CancelParticipation;
@@ -1410,7 +1484,7 @@ static u16 PartyMenuButtonHandler(s8 *slotPtr)
}
if (JOY_NEW(START_BUTTON))
- return 8;
+ return START_BUTTON;
if (movementDir)
{
@@ -1419,8 +1493,8 @@ static u16 PartyMenuButtonHandler(s8 *slotPtr)
}
// Pressed Cancel
- if ((JOY_NEW(A_BUTTON)) && *slotPtr == PARTY_SIZE + 1)
- return 2;
+ if (JOY_NEW(A_BUTTON) && *slotPtr == PARTY_SIZE + 1)
+ return B_BUTTON;
return JOY_NEW(A_BUTTON | B_BUTTON);
}
@@ -1618,7 +1692,7 @@ static s8 GetNewSlotDoubleLayout(s8 slotId, s8 movementDir)
}
}
-u8* GetMonNickname(struct Pokemon *mon, u8 *dest)
+u8 *GetMonNickname(struct Pokemon *mon, u8 *dest)
{
GetMonData(mon, MON_DATA_NICKNAME, dest);
return StringGet_Nickname(dest);
@@ -1626,7 +1700,7 @@ u8* GetMonNickname(struct Pokemon *mon, u8 *dest)
#define tKeepOpen data[0]
-u8 DisplayPartyMenuMessage(const u8* str, bool8 keepOpen)
+u8 DisplayPartyMenuMessage(const u8 *str, bool8 keepOpen)
{
u8 taskId;
@@ -1642,7 +1716,7 @@ static void Task_PrintAndWaitForText(u8 taskId)
{
if (gTasks[taskId].tKeepOpen == FALSE)
{
- ClearStdWindowAndFrameToTransparent(6, 0);
+ ClearStdWindowAndFrameToTransparent(6, FALSE);
ClearWindowTilemap(6);
}
DestroyTask(taskId);
@@ -1669,7 +1743,7 @@ static void Task_ReturnToChooseMonAfterText(u8 taskId)
{
if (IsPartyMenuTextPrinterActive() != TRUE)
{
- ClearStdWindowAndFrameToTransparent(6, 0);
+ ClearStdWindowAndFrameToTransparent(6, FALSE);
ClearWindowTilemap(6);
if (MenuHelpers_IsLinkActive() == TRUE)
{
@@ -1734,7 +1808,7 @@ static void GiveItemToMon(struct Pokemon *mon, u16 item)
TryItemHoldFormChange(&gPlayerParty[gPartyMenu.slotId]);
}
-static u8 TryTakeMonItem(struct Pokemon* mon)
+static u8 TryTakeMonItem(struct Pokemon *mon)
{
u16 item = GetMonData(mon, MON_DATA_HELD_ITEM);
@@ -1964,7 +2038,7 @@ static u8 CanMonLearnTMTutor(struct Pokemon *mon, u16 item, u8 tutor)
if (item >= ITEM_TM01)
{
- if (!CanMonLearnTMHM(mon, item - ITEM_TM01 - ((item > ITEM_TM100) ? NUM_TECHNICAL_MACHINES : 0)))
+ if (!CanMonLearnTMHM(mon, item - ITEM_TM01 - ((item > ITEM_TM100) ? 50 : 0)))
return CANNOT_LEARN_MOVE;
else
move = ItemIdToBattleMoveId(item);
@@ -2067,7 +2141,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf)
}
}
-static u16* GetPartyMenuPalBufferPtr(u8 paletteId)
+static u16 *GetPartyMenuPalBufferPtr(u8 paletteId)
{
return &sPartyMenuInternal->palBuffer[paletteId];
}
@@ -2374,7 +2448,7 @@ static void PartyMenuRemoveWindow(u8 *ptr)
{
if (*ptr != WINDOW_NONE)
{
- ClearStdWindowAndFrameToTransparent(*ptr, 0);
+ ClearStdWindowAndFrameToTransparent(*ptr, FALSE);
RemoveWindow(*ptr);
*ptr = WINDOW_NONE;
ScheduleBgCopyTilemapToVram(2);
@@ -2492,7 +2566,7 @@ static void PartyMenuPrintText(const u8 *text)
{
DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13);
gTextFlags.canABSpeedUpPrint = TRUE;
- AddTextPrinterParameterized2(6, FONT_NORMAL, text, GetPlayerTextSpeedDelay(), 0, 2, 1, 3);
+ AddTextPrinterParameterized2(6, FONT_NORMAL, text, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
static void PartyMenuDisplayYesNoMenu(void)
@@ -2539,7 +2613,7 @@ static void SetPartyMonFieldSelectionActions(struct Pokemon *mons, u8 slotId)
// Add field moves to action list
for (i = 0; i < MAX_MON_MOVES; i++)
{
- for (j = 0; sFieldMoves[j] != FIELD_MOVE_TERMINATOR; j++)
+ for (j = 0; sFieldMoves[j] != FIELD_MOVES_COUNT; j++)
{
if (GetMonData(&mons[slotId], i + MON_DATA_MOVE1) == sFieldMoves[j])
{
@@ -3312,7 +3386,7 @@ static void CursorCb_Read(u8 taskId)
static void CB2_ReadHeldMail(void)
{
- ReadMail(&gSaveBlock1Ptr->mail[GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAIL)], CB2_ReturnToPartyMenuFromReadingMail, 1);
+ ReadMail(&gSaveBlock1Ptr->mail[GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAIL)], CB2_ReturnToPartyMenuFromReadingMail, TRUE);
}
static void CB2_ReturnToPartyMenuFromReadingMail(void)
@@ -4488,17 +4562,11 @@ void Task_AbilityPatch(u8 taskId)
switch (tState)
{
case 0:
-
- // If Hidden Abilities have been implemented without the use of Pokémon Expansion and added to the `abilities` field
- // as ability no. 3 (eg. {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL} )
- // you can remove this #ifdef.
- #ifdef POKEMON_EXPANSION
// Can't use.
if (gBaseStats[tSpecies].abilities[tAbilityNum] == 0
|| !tSpecies
|| GetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, NULL) > 1
)
- #endif
{
gPartyMenuUseExitCallback = FALSE;
PlaySE(SE_SELECT);
@@ -5544,11 +5612,7 @@ u8 GetItemEffectType(u16 item)
else
itemEffect = gItemEffectTable[item - ITEM_POTION];
-#ifndef ITEM_EXPANSION
- if ((itemEffect[0] & (ITEM0_DIRE_HIT | ITEM0_X_ATTACK)) || itemEffect[1] || itemEffect[2] || (itemEffect[3] & ITEM3_GUARD_SPEC))
-#else
if ((itemEffect[0] & ITEM0_DIRE_HIT) || itemEffect[1] || (itemEffect[3] & ITEM3_GUARD_SPEC))
-#endif
return ITEM_EFFECT_X_ITEM;
else if (itemEffect[0] & ITEM0_SACRED_ASH)
return ITEM_EFFECT_SACRED_ASH;
@@ -6022,7 +6086,7 @@ static u8 GetBattleEntryLevelCap(void)
}
}
-static const u8* GetFacilityCancelString(void)
+static const u8 *GetFacilityCancelString(void)
{
u8 facilityNum = VarGet(VAR_FRONTIER_FACILITY);
@@ -6515,14 +6579,14 @@ static void Task_PartyMenuWaitForFade(u8 taskId)
if (IsWeatherNotFadingIn())
{
DestroyTask(taskId);
- ScriptContext2_Disable();
- EnableBothScriptContexts();
+ UnlockPlayerFieldControls();
+ ScriptContext_Enable();
}
}
void ChooseContestMon(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
CreateTask(Task_ChooseContestMon, 10);
}
@@ -6550,7 +6614,7 @@ static void CB2_ChooseContestMon(void)
// Used as a script special for showing a party mon to various npcs (e.g. in-game trades, move deleter)
void ChoosePartyMon(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
CreateTask(Task_ChoosePartyMon, 10);
}
@@ -6567,7 +6631,7 @@ static void Task_ChoosePartyMon(u8 taskId)
void ChooseMonForMoveRelearner(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
CreateTask(Task_ChooseMonForMoveRelearner, 10);
}
@@ -6612,7 +6676,7 @@ void DoBattlePyramidMonsHaveHeldItem(void)
// The player can then select to toss items from the bag or take/toss held items from the party
void BattlePyramidChooseMonHeldItems(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
CreateTask(Task_BattlePyramidChooseMonHeldItems, 10);
}
diff --git a/src/player_pc.c b/src/player_pc.c
index 0ca78dea86..9ec36d61d2 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -161,7 +161,7 @@ static void ItemStorage_HandleRemoveItem(u8);
static void ItemStorage_HandleErrorMessageInput(u8);
static void ItemStorage_ReturnToListInput(u8);
-static const u8* ItemStorage_GetMessage(u16);
+static const u8 *ItemStorage_GetMessage(u16);
static void CopyItemName_PlayerPC(u8 *, u16);
static void ItemStorage_Init(void);
@@ -398,7 +398,7 @@ static void InitPlayerPCMenu(u8 taskId)
windowTemplate.width = GetMaxWidthInSubsetOfMenuTable(sPlayerPCMenuActions, sTopMenuOptionOrder, sTopMenuNumOptions);
tWindowId = AddWindow(&windowTemplate);
- SetStandardWindowBorderStyle(tWindowId, 0);
+ SetStandardWindowBorderStyle(tWindowId, FALSE);
PrintMenuActionTextsInUpperLeftCorner(tWindowId, sTopMenuNumOptions, sPlayerPCMenuActions, sTopMenuOptionOrder);
InitMenuInUpperLeftCornerNormal(tWindowId, sTopMenuNumOptions, 0);
ScheduleBgCopyTilemapToVram(0);
@@ -467,7 +467,7 @@ static void PlayerPC_Mailbox(u8 taskId)
SetPlayerPCListCount(taskId);
if (MailboxMenu_Alloc(gPlayerPCItemPageInfo.count) == TRUE)
{
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
Mailbox_DrawMailboxMenu(taskId);
gTasks[taskId].func = Mailbox_ProcessInput;
}
@@ -489,13 +489,13 @@ static void PlayerPC_TurnOff(u8 taskId)
if (sTopMenuNumOptions == NUM_BEDROOM_PC_OPTIONS) // Flimsy way to determine if Bedroom PC is in use
{
if (gSaveBlock2Ptr->playerGender == MALE)
- ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC);
+ ScriptContext_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC);
else
- ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC);
+ ScriptContext_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC);
}
else
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
DestroyTask(taskId);
}
@@ -509,7 +509,7 @@ static void InitItemStorageMenu(u8 taskId, u8 var)
windowTemplate = sWindowTemplates_MainMenus[WIN_ITEM_STORAGE_MENU];
windowTemplate.width = GetMaxWidthInMenuTable(sItemStorage_MenuActions, ARRAY_COUNT(sItemStorage_MenuActions));
tWindowId = AddWindow(&windowTemplate);
- SetStandardWindowBorderStyle(tWindowId, 0);
+ SetStandardWindowBorderStyle(tWindowId, FALSE);
PrintMenuTable(tWindowId, ARRAY_COUNT(sItemStorage_MenuActions), sItemStorage_MenuActions);
InitMenuInUpperLeftCornerNormal(tWindowId, ARRAY_COUNT(sItemStorage_MenuActions), var);
ScheduleBgCopyTilemapToVram(0);
@@ -632,7 +632,7 @@ static void ItemStorage_Enter(u8 taskId, bool8 toss)
FreeAndReserveObjectSpritePalettes();
LoadListMenuSwapLineGfx();
CreateSwapLineSprites(sItemStorageMenu->swapLineSpriteIds, SWAP_LINE_LENGTH);
- ClearDialogWindowAndFrame(0,0);
+ ClearDialogWindowAndFrame(0, FALSE);
gTasks[taskId].func = ItemStorage_CreateListMenu;
}
@@ -928,7 +928,7 @@ static void Mailbox_NoPokemonForMail(u8 taskId)
static void Mailbox_Cancel(u8 taskId)
{
MailboxMenu_RemoveWindow(MAILBOXWIN_OPTIONS);
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
Mailbox_DrawMailboxMenu(taskId);
ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Mailbox_ProcessInput;
@@ -1039,7 +1039,7 @@ static void ItemStorage_PrintMenuItem(u8 windowId, u32 id, u8 yOffset)
static void ItemStorage_PrintDescription(s32 id)
{
- const u8* description;
+ const u8 *description;
u8 windowId = sItemStorageMenu->windowIds[ITEMPC_WIN_MESSAGE];
// Get item description (or Cancel text)
@@ -1088,7 +1088,7 @@ static void ItemStorage_DrawSwapArrow(u8 y, u8 b, u8 speed)
static void ItemStorage_DrawItemIcon(u16 itemId)
{
u8 spriteId;
- u8* spriteIdLoc = &sItemStorageMenu->spriteId;
+ u8 *spriteIdLoc = &sItemStorageMenu->spriteId;
if (*spriteIdLoc == SPRITE_NONE)
{
@@ -1107,7 +1107,7 @@ static void ItemStorage_DrawItemIcon(u16 itemId)
static void ItemStorage_EraseItemIcon(void)
{
- u8* spriteIdLoc = &sItemStorageMenu->spriteId;
+ u8 *spriteIdLoc = &sItemStorageMenu->spriteId;
if (*spriteIdLoc != SPRITE_NONE)
{
FreeSpriteTilesByTag(TAG_ITEM_ICON);
@@ -1133,7 +1133,7 @@ static void ItemStorage_CreateListMenu(u8 taskId)
s16 *data;
bool32 toss;
u32 i, x;
- const u8* text;
+ const u8 *text;
data = gTasks[taskId].data;
for (i = 0; i <= ITEMPC_WIN_LIST_END; i++)
@@ -1154,7 +1154,7 @@ static void ItemStorage_CreateListMenu(u8 taskId)
gTasks[taskId].func = ItemStorage_ProcessInput;
}
-static const u8* ItemStorage_GetMessage(u16 itemId)
+static const u8 *ItemStorage_GetMessage(u16 itemId)
{
const u8 *string;
diff --git a/src/pokeball.c b/src/pokeball.c
index 9371f59c26..0f893eda2e 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -44,94 +44,94 @@ static u16 GetBattlerPokeballItemId(u8 battlerId);
// rom const data
-#define GFX_TAG_POKEBALL 55000
-#define GFX_TAG_GREATBALL 55001
-#define GFX_TAG_ULTRABALL 55002
-#define GFX_TAG_MASTERBALL 55003
-#define GFX_TAG_PREMIERBALL 55004
-#define GFX_TAG_HEALBALL 55005
-#define GFX_TAG_NETBALL 55006
-#define GFX_TAG_NESTBALL 55007
-#define GFX_TAG_DIVEBALL 55008
-#define GFX_TAG_DUSKBALL 55009
-#define GFX_TAG_TIMERBALL 55010
-#define GFX_TAG_QUICKBALL 55011
-#define GFX_TAG_REPEATBALL 55012
-#define GFX_TAG_LUXURYBALL 55013
-#define GFX_TAG_LEVELBALL 55014
-#define GFX_TAG_LUREBALL 55015
-#define GFX_TAG_MOONBALL 55016
-#define GFX_TAG_FRIENDBALL 55017
-#define GFX_TAG_LOVEBALL 55018
-#define GFX_TAG_FASTBALL 55019
-#define GFX_TAG_HEAVYBALL 55020
-#define GFX_TAG_DREAMBALL 55021
-#define GFX_TAG_SAFARIBALL 55022
-#define GFX_TAG_SPORTBALL 55023
-#define GFX_TAG_PARKBALL 55024
-#define GFX_TAG_BEASTBALL 55025
-#define GFX_TAG_CHERISHBALL 55026
+#define GFX_TAG_POKE_BALL 55000
+#define GFX_TAG_GREAT_BALL 55001
+#define GFX_TAG_ULTRA_BALL 55002
+#define GFX_TAG_MASTER_BALL 55003
+#define GFX_TAG_PREMIER_BALL 55004
+#define GFX_TAG_HEAL_BALL 55005
+#define GFX_TAG_NET_BALL 55006
+#define GFX_TAG_NEST_BALL 55007
+#define GFX_TAG_DIVE_BALL 55008
+#define GFX_TAG_DUSK_BALL 55009
+#define GFX_TAG_TIMER_BALL 55010
+#define GFX_TAG_QUICK_BALL 55011
+#define GFX_TAG_REPEAT_BALL 55012
+#define GFX_TAG_LUXURY_BALL 55013
+#define GFX_TAG_LEVEL_BALL 55014
+#define GFX_TAG_LURE_BALL 55015
+#define GFX_TAG_MOON_BALL 55016
+#define GFX_TAG_FRIEND_BALL 55017
+#define GFX_TAG_LOVE_BALL 55018
+#define GFX_TAG_FAST_BALL 55019
+#define GFX_TAG_HEAVY_BALL 55020
+#define GFX_TAG_DREAM_BALL 55021
+#define GFX_TAG_SAFARI_BALL 55022
+#define GFX_TAG_SPORT_BALL 55023
+#define GFX_TAG_PARK_BALL 55024
+#define GFX_TAG_BEAST_BALL 55025
+#define GFX_TAG_CHERISH_BALL 55026
const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] =
{
- [BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKEBALL},
- [BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREATBALL},
- [BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRABALL},
- [BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTERBALL},
- [BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIERBALL},
- [BALL_HEAL] = {gBallGfx_Heal, 384, GFX_TAG_HEALBALL},
- [BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NETBALL},
- [BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NESTBALL},
- [BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVEBALL},
- [BALL_DUSK] = {gBallGfx_Dusk, 384, GFX_TAG_DUSKBALL},
- [BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMERBALL},
- [BALL_QUICK] = {gBallGfx_Quick, 384, GFX_TAG_QUICKBALL},
- [BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEATBALL},
- [BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURYBALL},
- [BALL_LEVEL] = {gBallGfx_Level, 384, GFX_TAG_LEVELBALL},
- [BALL_LURE] = {gBallGfx_Lure, 384, GFX_TAG_LUREBALL},
- [BALL_MOON] = {gBallGfx_Moon, 384, GFX_TAG_MOONBALL},
- [BALL_FRIEND] = {gBallGfx_Friend, 384, GFX_TAG_FRIENDBALL},
- [BALL_LOVE] = {gBallGfx_Love, 384, GFX_TAG_LOVEBALL},
- [BALL_FAST] = {gBallGfx_Fast, 384, GFX_TAG_FASTBALL},
- [BALL_HEAVY] = {gBallGfx_Heavy, 384, GFX_TAG_HEAVYBALL},
- [BALL_DREAM] = {gBallGfx_Dream, 384, GFX_TAG_DREAMBALL},
- [BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARIBALL},
- [BALL_SPORT] = {gBallGfx_Sport, 384, GFX_TAG_SPORTBALL},
- [BALL_PARK] = {gBallGfx_Park, 384, GFX_TAG_PARKBALL},
- [BALL_BEAST] = {gBallGfx_Beast, 384, GFX_TAG_BEASTBALL},
- [BALL_CHERISH] = {gBallGfx_Cherish, 384, GFX_TAG_CHERISHBALL},
+ [BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKE_BALL},
+ [BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREAT_BALL},
+ [BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRA_BALL},
+ [BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTER_BALL},
+ [BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIER_BALL},
+ [BALL_HEAL] = {gBallGfx_Heal, 384, GFX_TAG_HEAL_BALL},
+ [BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NET_BALL},
+ [BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NEST_BALL},
+ [BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVE_BALL},
+ [BALL_DUSK] = {gBallGfx_Dusk, 384, GFX_TAG_DUSK_BALL},
+ [BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMER_BALL},
+ [BALL_QUICK] = {gBallGfx_Quick, 384, GFX_TAG_QUICK_BALL},
+ [BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEAT_BALL},
+ [BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURY_BALL},
+ [BALL_LEVEL] = {gBallGfx_Level, 384, GFX_TAG_LEVEL_BALL},
+ [BALL_LURE] = {gBallGfx_Lure, 384, GFX_TAG_LURE_BALL},
+ [BALL_MOON] = {gBallGfx_Moon, 384, GFX_TAG_MOON_BALL},
+ [BALL_FRIEND] = {gBallGfx_Friend, 384, GFX_TAG_FRIEND_BALL},
+ [BALL_LOVE] = {gBallGfx_Love, 384, GFX_TAG_LOVE_BALL},
+ [BALL_FAST] = {gBallGfx_Fast, 384, GFX_TAG_FAST_BALL},
+ [BALL_HEAVY] = {gBallGfx_Heavy, 384, GFX_TAG_HEAVY_BALL},
+ [BALL_DREAM] = {gBallGfx_Dream, 384, GFX_TAG_DREAM_BALL},
+ [BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARI_BALL},
+ [BALL_SPORT] = {gBallGfx_Sport, 384, GFX_TAG_SPORT_BALL},
+ [BALL_PARK] = {gBallGfx_Park, 384, GFX_TAG_PARK_BALL},
+ [BALL_BEAST] = {gBallGfx_Beast, 384, GFX_TAG_BEAST_BALL},
+ [BALL_CHERISH] = {gBallGfx_Cherish, 384, GFX_TAG_CHERISH_BALL},
};
const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
{
- [BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKEBALL},
- [BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREATBALL},
- [BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRABALL},
- [BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTERBALL},
- [BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIERBALL},
- [BALL_HEAL] = {gBallPal_Heal, GFX_TAG_HEALBALL},
- [BALL_NET] = {gBallPal_Net, GFX_TAG_NETBALL},
- [BALL_NEST] = {gBallPal_Nest, GFX_TAG_NESTBALL},
- [BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVEBALL},
- [BALL_DUSK] = {gBallPal_Dusk, GFX_TAG_DUSKBALL},
- [BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMERBALL},
- [BALL_QUICK] = {gBallPal_Quick, GFX_TAG_QUICKBALL},
- [BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEATBALL},
- [BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURYBALL},
- [BALL_LEVEL] = {gBallPal_Level, GFX_TAG_LEVELBALL},
- [BALL_LURE] = {gBallPal_Lure, GFX_TAG_LUREBALL},
- [BALL_MOON] = {gBallPal_Moon, GFX_TAG_MOONBALL},
- [BALL_FRIEND] = {gBallPal_Friend, GFX_TAG_FRIENDBALL},
- [BALL_LOVE] = {gBallPal_Love, GFX_TAG_LOVEBALL},
- [BALL_FAST] = {gBallPal_Fast, GFX_TAG_FASTBALL},
- [BALL_HEAVY] = {gBallPal_Heavy, GFX_TAG_HEAVYBALL},
- [BALL_DREAM] = {gBallPal_Dream, GFX_TAG_DREAMBALL},
- [BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARIBALL},
- [BALL_SPORT] = {gBallPal_Sport, GFX_TAG_SPORTBALL},
- [BALL_PARK] = {gBallPal_Park, GFX_TAG_PARKBALL},
- [BALL_BEAST] = {gBallPal_Beast, GFX_TAG_BEASTBALL},
- [BALL_CHERISH] = {gBallPal_Cherish, GFX_TAG_CHERISHBALL},
+ [BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKE_BALL},
+ [BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREAT_BALL},
+ [BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRA_BALL},
+ [BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTER_BALL},
+ [BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIER_BALL},
+ [BALL_HEAL] = {gBallPal_Heal, GFX_TAG_HEAL_BALL},
+ [BALL_NET] = {gBallPal_Net, GFX_TAG_NET_BALL},
+ [BALL_NEST] = {gBallPal_Nest, GFX_TAG_NEST_BALL},
+ [BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVE_BALL},
+ [BALL_DUSK] = {gBallPal_Dusk, GFX_TAG_DUSK_BALL},
+ [BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMER_BALL},
+ [BALL_QUICK] = {gBallPal_Quick, GFX_TAG_QUICK_BALL},
+ [BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEAT_BALL},
+ [BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURY_BALL},
+ [BALL_LEVEL] = {gBallPal_Level, GFX_TAG_LEVEL_BALL},
+ [BALL_LURE] = {gBallPal_Lure, GFX_TAG_LURE_BALL},
+ [BALL_MOON] = {gBallPal_Moon, GFX_TAG_MOON_BALL},
+ [BALL_FRIEND] = {gBallPal_Friend, GFX_TAG_FRIEND_BALL},
+ [BALL_LOVE] = {gBallPal_Love, GFX_TAG_LOVE_BALL},
+ [BALL_FAST] = {gBallPal_Fast, GFX_TAG_FAST_BALL},
+ [BALL_HEAVY] = {gBallPal_Heavy, GFX_TAG_HEAVY_BALL},
+ [BALL_DREAM] = {gBallPal_Dream, GFX_TAG_DREAM_BALL},
+ [BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARI_BALL},
+ [BALL_SPORT] = {gBallPal_Sport, GFX_TAG_SPORT_BALL},
+ [BALL_PARK] = {gBallPal_Park, GFX_TAG_PARK_BALL},
+ [BALL_BEAST] = {gBallPal_Beast, GFX_TAG_BEAST_BALL},
+ [BALL_CHERISH] = {gBallPal_Cherish, GFX_TAG_CHERISH_BALL},
};
static const struct OamData sBallOamData =
@@ -139,7 +139,7 @@ static const struct OamData sBallOamData =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -251,8 +251,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
{
[BALL_POKE] =
{
- .tileTag = GFX_TAG_POKEBALL,
- .paletteTag = GFX_TAG_POKEBALL,
+ .tileTag = GFX_TAG_POKE_BALL,
+ .paletteTag = GFX_TAG_POKE_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -261,8 +261,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_GREAT] =
{
- .tileTag = GFX_TAG_GREATBALL,
- .paletteTag = GFX_TAG_GREATBALL,
+ .tileTag = GFX_TAG_GREAT_BALL,
+ .paletteTag = GFX_TAG_GREAT_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -271,8 +271,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_ULTRA] =
{
- .tileTag = GFX_TAG_ULTRABALL,
- .paletteTag = GFX_TAG_ULTRABALL,
+ .tileTag = GFX_TAG_ULTRA_BALL,
+ .paletteTag = GFX_TAG_ULTRA_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -281,8 +281,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_MASTER] =
{
- .tileTag = GFX_TAG_MASTERBALL,
- .paletteTag = GFX_TAG_MASTERBALL,
+ .tileTag = GFX_TAG_MASTER_BALL,
+ .paletteTag = GFX_TAG_MASTER_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -291,8 +291,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_PREMIER] =
{
- .tileTag = GFX_TAG_PREMIERBALL,
- .paletteTag = GFX_TAG_PREMIERBALL,
+ .tileTag = GFX_TAG_PREMIER_BALL,
+ .paletteTag = GFX_TAG_PREMIER_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -301,8 +301,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_HEAL] =
{
- .tileTag = GFX_TAG_HEALBALL,
- .paletteTag = GFX_TAG_HEALBALL,
+ .tileTag = GFX_TAG_HEAL_BALL,
+ .paletteTag = GFX_TAG_HEAL_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -311,8 +311,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_NET] =
{
- .tileTag = GFX_TAG_NETBALL,
- .paletteTag = GFX_TAG_NETBALL,
+ .tileTag = GFX_TAG_NET_BALL,
+ .paletteTag = GFX_TAG_NET_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -321,8 +321,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_NEST] =
{
- .tileTag = GFX_TAG_NESTBALL,
- .paletteTag = GFX_TAG_NESTBALL,
+ .tileTag = GFX_TAG_NEST_BALL,
+ .paletteTag = GFX_TAG_NEST_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -331,8 +331,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_DIVE] =
{
- .tileTag = GFX_TAG_DIVEBALL,
- .paletteTag = GFX_TAG_DIVEBALL,
+ .tileTag = GFX_TAG_DIVE_BALL,
+ .paletteTag = GFX_TAG_DIVE_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -341,8 +341,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_DUSK] =
{
- .tileTag = GFX_TAG_DUSKBALL,
- .paletteTag = GFX_TAG_DUSKBALL,
+ .tileTag = GFX_TAG_DUSK_BALL,
+ .paletteTag = GFX_TAG_DUSK_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -351,8 +351,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_TIMER] =
{
- .tileTag = GFX_TAG_TIMERBALL,
- .paletteTag = GFX_TAG_TIMERBALL,
+ .tileTag = GFX_TAG_TIMER_BALL,
+ .paletteTag = GFX_TAG_TIMER_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -361,8 +361,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_QUICK] =
{
- .tileTag = GFX_TAG_QUICKBALL,
- .paletteTag = GFX_TAG_QUICKBALL,
+ .tileTag = GFX_TAG_QUICK_BALL,
+ .paletteTag = GFX_TAG_QUICK_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -371,8 +371,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_REPEAT] =
{
- .tileTag = GFX_TAG_REPEATBALL,
- .paletteTag = GFX_TAG_REPEATBALL,
+ .tileTag = GFX_TAG_REPEAT_BALL,
+ .paletteTag = GFX_TAG_REPEAT_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -381,8 +381,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_LUXURY] =
{
- .tileTag = GFX_TAG_LUXURYBALL,
- .paletteTag = GFX_TAG_LUXURYBALL,
+ .tileTag = GFX_TAG_LUXURY_BALL,
+ .paletteTag = GFX_TAG_LUXURY_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -391,8 +391,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_LEVEL] =
{
- .tileTag = GFX_TAG_LEVELBALL,
- .paletteTag = GFX_TAG_LEVELBALL,
+ .tileTag = GFX_TAG_LEVEL_BALL,
+ .paletteTag = GFX_TAG_LEVEL_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -401,8 +401,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_LURE] =
{
- .tileTag = GFX_TAG_LUREBALL,
- .paletteTag = GFX_TAG_LUREBALL,
+ .tileTag = GFX_TAG_LURE_BALL,
+ .paletteTag = GFX_TAG_LURE_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -411,8 +411,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_MOON] =
{
- .tileTag = GFX_TAG_MOONBALL,
- .paletteTag = GFX_TAG_MOONBALL,
+ .tileTag = GFX_TAG_MOON_BALL,
+ .paletteTag = GFX_TAG_MOON_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -421,8 +421,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_FRIEND] =
{
- .tileTag = GFX_TAG_FRIENDBALL,
- .paletteTag = GFX_TAG_FRIENDBALL,
+ .tileTag = GFX_TAG_FRIEND_BALL,
+ .paletteTag = GFX_TAG_FRIEND_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -431,8 +431,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_LOVE] =
{
- .tileTag = GFX_TAG_LOVEBALL,
- .paletteTag = GFX_TAG_LOVEBALL,
+ .tileTag = GFX_TAG_LOVE_BALL,
+ .paletteTag = GFX_TAG_LOVE_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -441,8 +441,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_FAST] =
{
- .tileTag = GFX_TAG_FASTBALL,
- .paletteTag = GFX_TAG_FASTBALL,
+ .tileTag = GFX_TAG_FAST_BALL,
+ .paletteTag = GFX_TAG_FAST_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -451,8 +451,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_HEAVY] =
{
- .tileTag = GFX_TAG_HEAVYBALL,
- .paletteTag = GFX_TAG_HEAVYBALL,
+ .tileTag = GFX_TAG_HEAVY_BALL,
+ .paletteTag = GFX_TAG_HEAVY_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -461,8 +461,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_DREAM] =
{
- .tileTag = GFX_TAG_DREAMBALL,
- .paletteTag = GFX_TAG_DREAMBALL,
+ .tileTag = GFX_TAG_DREAM_BALL,
+ .paletteTag = GFX_TAG_DREAM_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -471,8 +471,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_SAFARI] =
{
- .tileTag = GFX_TAG_SAFARIBALL,
- .paletteTag = GFX_TAG_SAFARIBALL,
+ .tileTag = GFX_TAG_SAFARI_BALL,
+ .paletteTag = GFX_TAG_SAFARI_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -481,8 +481,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_SPORT] =
{
- .tileTag = GFX_TAG_SPORTBALL,
- .paletteTag = GFX_TAG_SPORTBALL,
+ .tileTag = GFX_TAG_SPORT_BALL,
+ .paletteTag = GFX_TAG_SPORT_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -491,8 +491,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_PARK] =
{
- .tileTag = GFX_TAG_PARKBALL,
- .paletteTag = GFX_TAG_PARKBALL,
+ .tileTag = GFX_TAG_PARK_BALL,
+ .paletteTag = GFX_TAG_PARK_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -501,8 +501,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_BEAST] =
{
- .tileTag = GFX_TAG_BEASTBALL,
- .paletteTag = GFX_TAG_BEASTBALL,
+ .tileTag = GFX_TAG_BEAST_BALL,
+ .paletteTag = GFX_TAG_BEAST_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -511,8 +511,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
},
[BALL_CHERISH] =
{
- .tileTag = GFX_TAG_CHERISHBALL,
- .paletteTag = GFX_TAG_CHERISHBALL,
+ .tileTag = GFX_TAG_CHERISH_BALL,
+ .paletteTag = GFX_TAG_CHERISH_BALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
@@ -532,7 +532,7 @@ u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
u8 taskId;
gDoingBattleAnim = TRUE;
- gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = 1;
+ gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = TRUE;
taskId = CreateTask(Task_DoPokeballSendOutAnim, 5);
gTasks[taskId].tPan = pan;
@@ -593,7 +593,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
}
// this will perform an unused ball throw animation
- gSprites[ballSpriteId].data[0] = 0x22;
+ gSprites[ballSpriteId].data[0] = 34;
gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_X);
gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_Y) - 16;
gSprites[ballSpriteId].data[5] = -40;
@@ -617,7 +617,7 @@ static void SpriteCB_BallThrow(struct Sprite *sprite)
u8 noOfShakes = gTasks[taskId].tThrowId;
StartSpriteAnim(sprite, 1);
- sprite->affineAnimPaused = 1;
+ sprite->affineAnimPaused = TRUE;
sprite->x += sprite->x2;
sprite->y += sprite->y2;
sprite->x2 = 0;
@@ -661,6 +661,7 @@ static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite)
sprite->data[5]++;
if (sprite->data[5] == 11)
PlaySE(SE_BALL_TRADE);
+
if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded)
{
StartSpriteAnim(sprite, 2);
@@ -830,6 +831,7 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite)
StartSpriteAffineAnim(sprite, 2);
else
StartSpriteAffineAnim(sprite, 1);
+
PlaySE(SE_BALL);
}
break;
@@ -853,7 +855,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
u16 species = gTasks[taskId].tCryTaskSpecies;
u8 battlerId = gTasks[taskId].tCryTaskBattler;
u8 monSpriteId = gTasks[taskId].tCryTaskMonSpriteId;
- struct Pokemon *mon = (void*)(u32)((gTasks[taskId].tCryTaskMonPtr1 << 16) | (u16)(gTasks[taskId].tCryTaskMonPtr2));
+ struct Pokemon *mon = (void *)(u32)((gTasks[taskId].tCryTaskMonPtr1 << 16) | (u16)(gTasks[taskId].tCryTaskMonPtr2));
switch (gTasks[taskId].tCryTaskState)
{
@@ -1054,13 +1056,13 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
gSprites[gBattlerSpriteIds[battlerId]].y2 = 0;
gDoingBattleAnim = FALSE;
- gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0;
+ gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = FALSE;
FreeSpriteOamMatrix(sprite);
DestroySprite(sprite);
for (doneBattlers = 0, i = 0; i < MAX_BATTLERS_COUNT; i++)
{
- if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == 0)
+ if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == FALSE)
doneBattlers++;
}
if (doneBattlers == MAX_BATTLERS_COUNT)
@@ -1092,7 +1094,7 @@ static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite)
DestroySprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]);
DestroySpriteAndFreeResources(sprite);
if (gMain.inBattle)
- gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0;
+ gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = FALSE;
}
}
@@ -1257,7 +1259,7 @@ static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite)
StartSpriteAnim(sprite, 1);
AnimateBallOpenParticlesForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, subpriority);
// sDelay re-used to store task id but never read
- sprite->sDelay = LaunchBallFadeMonTaskForPokeball(1, monPalNum, selectedPalettes);
+ sprite->sDelay = LaunchBallFadeMonTaskForPokeball(TRUE, monPalNum, selectedPalettes);
sprite->callback = SpriteCB_ReleasedMonFlyOut;
gSprites[spriteId].invisible = FALSE;
StartSpriteAffineAnim(&gSprites[spriteId], BATTLER_AFFINE_EMERGE);
@@ -1324,7 +1326,6 @@ static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite)
#undef sFinalMonY
#undef sTrigIdx
-
#define sTimer data[5]
u8 CreateTradePokeballSprite(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 delay, u32 fadePalettes)
@@ -1361,7 +1362,7 @@ static void SpriteCB_TradePokeball(struct Sprite *sprite)
StartSpriteAnim(sprite, 1);
AnimateBallOpenParticlesForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, subpriority);
// sDelay re-used to store task id but never read
- sprite->sDelay = LaunchBallFadeMonTaskForPokeball(1, monPalNum, selectedPalettes);
+ sprite->sDelay = LaunchBallFadeMonTaskForPokeball(TRUE, monPalNum, selectedPalettes);
sprite->callback = SpriteCB_TradePokeballSendOff;
#ifdef BUGFIX
// FIX: If this is used on a sprite that has previously had an affine animation, it will not
@@ -1414,7 +1415,8 @@ static void SpriteCB_TradePokeballEnd(struct Sprite *sprite)
#undef sFadePalsHi
#undef sTimer
-static void Unref_DestroySpriteAndFreeResources(struct Sprite *sprite)
+// Unreferenced here and in RS, but used in FRLG, possibly by mistake.
+static void DestroySpriteAndFreeResources_Ball(struct Sprite *sprite)
{
DestroySpriteAndFreeResources(sprite);
}
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 58348e1cc5..cf0513f80e 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -237,7 +237,7 @@ static const struct OamData sOamData_PokeblockCase =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -1148,7 +1148,7 @@ static void ShowPokeblockActionsWindow(u8 taskId)
tWindowId = WIN_ACTIONS;
DestroyScrollArrows();
- DrawStdFrameWithCustomTileAndPalette(tWindowId, 0, 1, 0xE);
+ DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 1, 0xE);
PrintMenuActionTextsInUpperLeftCorner(tWindowId, sPokeblockMenu->numActions, sPokeblockMenuActions, sPokeblockMenu->pokeblockActionIds);
InitMenuInUpperLeftCornerNormal(tWindowId, sPokeblockMenu->numActions, 0);
PutWindowTilemap(tWindowId);
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 719486ad2f..00597e8d38 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -466,7 +466,7 @@ static const struct WindowTemplate sWindowTemplates[] =
};
// - 1 excludes PBLOCK_CLR_NONE
-static const u32* const sPokeblocksPals[] =
+static const u32 *const sPokeblocksPals[] =
{
[PBLOCK_CLR_RED - 1] = gPokeblockRed_Pal,
[PBLOCK_CLR_BLUE - 1] = gPokeblockBlue_Pal,
@@ -545,7 +545,7 @@ static const struct OamData sOamData_Pokeblock =
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -660,7 +660,7 @@ static bool8 LoadPokeblockFeedScene(void)
gMain.state++;
break;
case 10:
- DrawStdFrameWithCustomTileAndPalette(0, 1, 1, 14);
+ DrawStdFrameWithCustomTileAndPalette(0, TRUE, 1, 14);
gMain.state++;
break;
case 11:
@@ -872,7 +872,7 @@ static void Task_PrintAtePokeblockMessage(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);
gTextFlags.canABSpeedUpPrint = TRUE;
- AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
gTasks[taskId].func = Task_WaitForAtePokeblockMessage;
}
@@ -905,7 +905,7 @@ static void Task_FadeOutPokeblockFeed(u8 taskId)
#define sAccel data[1]
#define sSpecies data[2]
-static u8 CreateMonSprite(struct Pokemon* mon)
+static u8 CreateMonSprite(struct Pokemon *mon)
{
u16 species = GetMonData(mon, MON_DATA_SPECIES2);
u8 spriteId = CreateSprite(&gMultiuseSpriteTemplate, MON_X, MON_Y, 2);
@@ -937,7 +937,7 @@ static void StartMonJumpForPokeblock(u8 spriteId)
gSprites[spriteId].callback = SpriteCB_MonJumpForPokeblock;
}
-static void SpriteCB_MonJumpForPokeblock(struct Sprite* sprite)
+static void SpriteCB_MonJumpForPokeblock(struct Sprite *sprite)
{
sprite->x += 4;
sprite->y += sprite->sSpeed;
@@ -982,7 +982,7 @@ static u8 CreatePokeblockSprite(void)
return spriteId;
}
-static void SpriteCB_ThrownPokeblock(struct Sprite* sprite)
+static void SpriteCB_ThrownPokeblock(struct Sprite *sprite)
{
sprite->x -= 4;
sprite->y += sprite->sSpeed;
diff --git a/src/pokedex.c b/src/pokedex.c
index a0231f8ac1..4b6ce78cad 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -239,9 +239,9 @@ static void SpriteCB_RotatingPokeBall(struct Sprite *sprite);
static void SpriteCB_SeenOwnInfo(struct Sprite *sprite);
static void SpriteCB_DexListStartMenuCursor(struct Sprite *sprite);
static void SpriteCB_PokedexListMonSprite(struct Sprite *sprite);
-static u8 LoadInfoScreen(struct PokedexListItem*, u8 monSpriteId);
+static u8 LoadInfoScreen(struct PokedexListItem *, u8 monSpriteId);
static bool8 IsInfoScreenScrolling(u8);
-static u8 StartInfoScreenScroll(struct PokedexListItem*, u8);
+static u8 StartInfoScreenScroll(struct PokedexListItem *, u8);
static void Task_LoadInfoScreen(u8);
static void Task_HandleInfoScreenInput(u8);
static void Task_SwitchScreensFromInfoScreen(u8);
@@ -270,6 +270,7 @@ static void PrintMonHeight(u16 height, u8 left, u8 top);
static void PrintMonWeight(u16 weight, u8 left, u8 top);
static void ResetOtherVideoRegisters(u16);
static u8 PrintCryScreenSpeciesName(u8, u16, u8, u8);
+static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top);
static void DrawFootprint(u8 windowId, u16 dexNum);
static u16 CreateSizeScreenTrainerPic(u16, s16, s16, s8);
static u16 GetNextPosition(u8, u16, u16, u16);
@@ -294,10 +295,10 @@ static void PrintSearchParameterText(u8);
static u8 GetSearchModeSelection(u8 taskId, u8 option);
static void SetDefaultSearchModeAndOrder(u8);
static void CreateSearchParameterScrollArrows(u8);
-static void EraseAndPrintSearchTextBox(const u8*);
+static void EraseAndPrintSearchTextBox(const u8 *);
static void EraseSelectorArrow(u32);
static void PrintSelectorArrow(u32);
-static void PrintSearchParameterTitle(u32, const u8*);
+static void PrintSearchParameterTitle(u32, const u8 *);
static void ClearSearchParameterBoxText(void);
// const rom data
@@ -308,7 +309,7 @@ static const struct OamData sOamData_ScrollBar =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -325,7 +326,7 @@ static const struct OamData sOamData_ScrollArrow =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8),
.x = 0,
@@ -342,7 +343,7 @@ static const struct OamData sOamData_InterfaceText =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -359,7 +360,7 @@ static const struct OamData sOamData_RotatingPokeBall =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_WINDOW,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -376,7 +377,7 @@ static const struct OamData sOamData_SeenOwnText =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -393,7 +394,7 @@ static const struct OamData sOamData_Dex8x16 =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16),
.x = 0,
@@ -2154,7 +2155,7 @@ static void LoadPokedexBgPalette(bool8 isSearchResults)
static void FreeWindowAndBgBuffers(void)
{
- void* tilemapBuffer;
+ void *tilemapBuffer;
FreeAllWindowBuffers();
tilemapBuffer = GetBgTilemapBuffer(0);
@@ -2242,7 +2243,7 @@ static void CreatePokedexList(u8 dexMode, u8 order)
{
temp_dexNum = gPokedexOrder_Alphabetical[i];
- if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
+ if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@@ -2256,7 +2257,7 @@ static void CreatePokedexList(u8 dexMode, u8 order)
{
temp_dexNum = gPokedexOrder_Weight[i];
- if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
+ if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@@ -2270,7 +2271,7 @@ static void CreatePokedexList(u8 dexMode, u8 order)
{
temp_dexNum = gPokedexOrder_Weight[i];
- if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
+ if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@@ -2284,7 +2285,7 @@ static void CreatePokedexList(u8 dexMode, u8 order)
{
temp_dexNum = gPokedexOrder_Height[i];
- if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
+ if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@@ -2298,7 +2299,7 @@ static void CreatePokedexList(u8 dexMode, u8 order)
{
temp_dexNum = gPokedexOrder_Height[i];
- if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
+ if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT))
{
sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum;
sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE;
@@ -2317,7 +2318,7 @@ static void CreatePokedexList(u8 dexMode, u8 order)
}
}
-static void PrintMonDexNumAndName(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top)
+static void PrintMonDexNumAndName(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top)
{
u8 color[3];
@@ -2440,7 +2441,7 @@ static void CreateCaughtBall(bool16 owned, u8 x, u8 y, u16 unused)
static u8 CreateMonName(u16 num, u8 left, u8 top)
{
- const u8* str;
+ const u8 *str;
num = NationalPokedexNumToSpecies(num);
if (num)
@@ -3160,7 +3161,7 @@ static void SpriteCB_DexListStartMenuCursor(struct Sprite *sprite)
}
}
-static void PrintInfoScreenText(const u8* str, u8 left, u8 top)
+static void PrintInfoScreenText(const u8 *str, u8 left, u8 top)
{
u8 color[3];
color[0] = TEXT_COLOR_TRANSPARENT;
@@ -3177,7 +3178,7 @@ static void PrintInfoScreenText(const u8* str, u8 left, u8 top)
#define tMonSpriteId data[4]
#define tTrainerSpriteId data[5]
-static u8 LoadInfoScreen(struct PokedexListItem* item, u8 monSpriteId)
+static u8 LoadInfoScreen(struct PokedexListItem *item, u8 monSpriteId)
{
u8 taskId;
@@ -3872,7 +3873,7 @@ static void HighlightScreenSelectBarItem(u8 selectedScreen, u16 unused)
{
u8 i;
u8 j;
- u16* ptr = GetBgTilemapBuffer(1);
+ u16 *ptr = GetBgTilemapBuffer(1);
for (i = 0; i < SCREEN_COUNT; i++)
{
@@ -3899,7 +3900,7 @@ static void HighlightSubmenuScreenSelectBarItem(u8 a, u16 b)
{
u8 i;
u8 j;
- u16* ptr = GetBgTilemapBuffer(1);
+ u16 *ptr = GetBgTilemapBuffer(1);
for (i = 0; i < 4; i++)
{
@@ -4482,7 +4483,7 @@ static u8 PrintCryScreenSpeciesName(u8 windowId, u16 num, u8 left, u8 top)
return i;
}
-static void UnusedPrintMonName(u8 windowId, const u8* name, u8 left, u8 top)
+static void UnusedPrintMonName(u8 windowId, const u8 *name, u8 left, u8 top)
{
u8 str[POKEMON_NAME_LENGTH + 1];
u8 i;
@@ -4502,13 +4503,14 @@ static void UnusedPrintMonName(u8 windowId, const u8* name, u8 left, u8 top)
PrintInfoSubMenuText(windowId, str, left, top);
}
-static void UnusedPrintDecimalNum(u8 windowId, u16 b, u8 left, u8 top)
+// Unused in the English version, used to print height/weight in versions which use metric system.
+static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top)
{
u8 str[6];
bool8 outputted = FALSE;
u8 result;
- result = b / 1000;
+ result = num / 1000;
if (result == 0)
{
str[0] = CHAR_SPACER;
@@ -4520,7 +4522,7 @@ static void UnusedPrintDecimalNum(u8 windowId, u16 b, u8 left, u8 top)
outputted = TRUE;
}
- result = (b % 1000) / 100;
+ result = (num % 1000) / 100;
if (result == 0 && !outputted)
{
str[1] = CHAR_SPACER;
@@ -4532,9 +4534,9 @@ static void UnusedPrintDecimalNum(u8 windowId, u16 b, u8 left, u8 top)
outputted = TRUE;
}
- str[2] = CHAR_0 + ((b % 1000) % 100) / 10;
- str[3] = CHAR_PERIOD;
- str[4] = CHAR_0 + ((b % 1000) % 100) % 10;
+ str[2] = CHAR_0 + ((num % 1000) % 100) / 10;
+ str[3] = CHAR_DEC_SEPARATOR;
+ str[4] = CHAR_0 + ((num % 1000) % 100) % 10;
str[5] = EOS;
PrintInfoSubMenuText(windowId, str, left, top);
}
@@ -4542,7 +4544,7 @@ static void UnusedPrintDecimalNum(u8 windowId, u16 b, u8 left, u8 top)
static void DrawFootprint(u8 windowId, u16 dexNum)
{
u8 footprint[32 * 4] = {0};
- const u8 * footprintGfx = gMonFootprintTable[NationalPokedexNumToSpecies(dexNum)];
+ const u8 *footprintGfx = gMonFootprintTable[NationalPokedexNumToSpecies(dexNum)];
u32 i, j, tileIdx = 0;
if (footprintGfx != NULL)
@@ -4853,7 +4855,7 @@ static void Task_LoadSearchMenu(u8 taskId)
static void FreeSearchWindowAndBgBuffers(void)
{
- void* tilemapBuffer;
+ void *tilemapBuffer;
FreeAllWindowBuffers();
tilemapBuffer = GetBgTilemapBuffer(0);
@@ -5392,7 +5394,7 @@ static void DrawOrEraseSearchParameterBox(bool8 erase)
{
u16 i;
u16 j;
- u16* ptr = GetBgTilemapBuffer(3);
+ u16 *ptr = GetBgTilemapBuffer(3);
if (!erase)
{
@@ -5585,7 +5587,7 @@ static void CreateSearchParameterScrollArrows(u8 taskId)
#undef sTaskId
#undef sIsDownArrow
-static void EraseAndPrintSearchTextBox(const u8* str)
+static void EraseAndPrintSearchTextBox(const u8 *str)
{
ClearSearchMenuRect(8, 120, 224, 32);
PrintSearchText(str, 8, 121);
@@ -5601,7 +5603,7 @@ static void PrintSelectorArrow(u32 y)
PrintSearchText(gText_SelectorArrow, 144, y * 16 + 9);
}
-static void PrintSearchParameterTitle(u32 y, const u8* str)
+static void PrintSearchParameterTitle(u32 y, const u8 *str)
{
PrintSearchText(str, 152, y * 16 + 9);
}
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 28e2bd1632..406d1377d6 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -234,7 +234,7 @@ bool8 LoadCryWaveformWindow(struct CryScreenWindow *window, u8 windowId)
if (!sDexCryScreen)
{
sDexCryScreen = AllocZeroed(sizeof(*sDexCryScreen));
- sCryWaveformWindowTiledata = (u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA);
+ sCryWaveformWindowTiledata = (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA);
}
sDexCryScreen->unk = window->unk0;
diff --git a/src/pokemon.c b/src/pokemon.c
index ade2e29ca5..c781a80078 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -65,7 +65,7 @@ static void DecryptBoxMon(struct BoxPokemon *boxMon);
static void Task_PlayMapChosenOrBattleBGM(u8 taskId);
static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
static bool8 ShouldSkipFriendshipChange(void);
-static u8 SendMonToPC(struct Pokemon* mon);
+static u8 SendMonToPC(struct Pokemon *mon);
static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv);
void TrySpecialOverworldEvo();
@@ -136,7 +136,9 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(RALTS),
SPECIES_TO_HOENN(KIRLIA),
SPECIES_TO_HOENN(GARDEVOIR),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(GALLADE),
+#endif
SPECIES_TO_HOENN(SURSKIT),
SPECIES_TO_HOENN(MASQUERAIN),
SPECIES_TO_HOENN(SHROOMISH),
@@ -166,7 +168,9 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(GRAVELER),
SPECIES_TO_HOENN(GOLEM),
SPECIES_TO_HOENN(NOSEPASS),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(PROBOPASS),
+#endif
SPECIES_TO_HOENN(SKITTY),
SPECIES_TO_HOENN(DELCATTY),
SPECIES_TO_HOENN(ZUBAT),
@@ -190,7 +194,9 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(MINUN),
SPECIES_TO_HOENN(MAGNEMITE),
SPECIES_TO_HOENN(MAGNETON),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(MAGNEZONE),
+#endif
SPECIES_TO_HOENN(VOLTORB),
SPECIES_TO_HOENN(ELECTRODE),
SPECIES_TO_HOENN(VOLBEAT),
@@ -201,9 +207,13 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(BELLOSSOM),
SPECIES_TO_HOENN(DODUO),
SPECIES_TO_HOENN(DODRIO),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(BUDEW),
SPECIES_TO_HOENN(ROSELIA),
SPECIES_TO_HOENN(ROSERADE),
+#else
+ SPECIES_TO_HOENN(ROSELIA),
+#endif
SPECIES_TO_HOENN(GULPIN),
SPECIES_TO_HOENN(SWALOT),
SPECIES_TO_HOENN(CARVANHA),
@@ -259,9 +269,13 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(BANETTE),
SPECIES_TO_HOENN(DUSKULL),
SPECIES_TO_HOENN(DUSCLOPS),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(DUSKNOIR),
SPECIES_TO_HOENN(TROPIUS),
SPECIES_TO_HOENN(CHINGLING),
+#else
+ SPECIES_TO_HOENN(TROPIUS),
+#endif
SPECIES_TO_HOENN(CHIMECHO),
SPECIES_TO_HOENN(ABSOL),
SPECIES_TO_HOENN(VULPIX),
@@ -282,10 +296,14 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_HOENN(HERACROSS),
SPECIES_TO_HOENN(RHYHORN),
SPECIES_TO_HOENN(RHYDON),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(RHYPERIOR),
+#endif
SPECIES_TO_HOENN(SNORUNT),
SPECIES_TO_HOENN(GLALIE),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_HOENN(FROSLASS),
+#endif
SPECIES_TO_HOENN(SPHEAL),
SPECIES_TO_HOENN(SEALEO),
SPECIES_TO_HOENN(WALREIN),
@@ -707,6 +725,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(RAYQUAZA),
SPECIES_TO_NATIONAL(JIRACHI),
SPECIES_TO_NATIONAL(DEOXYS),
+#if P_NEW_POKEMON == TRUE
SPECIES_TO_NATIONAL(TURTWIG),
SPECIES_TO_NATIONAL(GROTLE),
SPECIES_TO_NATIONAL(TORTERRA),
@@ -1329,6 +1348,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_PIKACHU_WORLD_CAP - 1] = NATIONAL_DEX_PIKACHU,
// Pichu
[SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU,
+#endif
// Unown
[SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN,
[SPECIES_UNOWN_C - 1] = NATIONAL_DEX_UNOWN,
@@ -1365,6 +1385,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_DEOXYS_ATTACK - 1] = NATIONAL_DEX_DEOXYS,
[SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS,
[SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS,
+#if P_NEW_POKEMON == TRUE
// Burmy
[SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY,
[SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY,
@@ -1592,6 +1613,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
// Calyrex
[SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX,
+#endif
};
// Assigns all Hoenn Dex Indexes to a National Dex Index
@@ -1628,7 +1650,9 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(RALTS),
HOENN_TO_NATIONAL(KIRLIA),
HOENN_TO_NATIONAL(GARDEVOIR),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(GALLADE),
+#endif
HOENN_TO_NATIONAL(SURSKIT),
HOENN_TO_NATIONAL(MASQUERAIN),
HOENN_TO_NATIONAL(SHROOMISH),
@@ -1658,7 +1682,9 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(GRAVELER),
HOENN_TO_NATIONAL(GOLEM),
HOENN_TO_NATIONAL(NOSEPASS),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(PROBOPASS),
+#endif
HOENN_TO_NATIONAL(SKITTY),
HOENN_TO_NATIONAL(DELCATTY),
HOENN_TO_NATIONAL(ZUBAT),
@@ -1682,7 +1708,9 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(MINUN),
HOENN_TO_NATIONAL(MAGNEMITE),
HOENN_TO_NATIONAL(MAGNETON),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(MAGNEZONE),
+#endif
HOENN_TO_NATIONAL(VOLTORB),
HOENN_TO_NATIONAL(ELECTRODE),
HOENN_TO_NATIONAL(VOLBEAT),
@@ -1693,9 +1721,13 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(BELLOSSOM),
HOENN_TO_NATIONAL(DODUO),
HOENN_TO_NATIONAL(DODRIO),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(BUDEW),
HOENN_TO_NATIONAL(ROSELIA),
HOENN_TO_NATIONAL(ROSERADE),
+#else
+ HOENN_TO_NATIONAL(ROSELIA),
+#endif
HOENN_TO_NATIONAL(GULPIN),
HOENN_TO_NATIONAL(SWALOT),
HOENN_TO_NATIONAL(CARVANHA),
@@ -1751,9 +1783,13 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(BANETTE),
HOENN_TO_NATIONAL(DUSKULL),
HOENN_TO_NATIONAL(DUSCLOPS),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(DUSKNOIR),
HOENN_TO_NATIONAL(TROPIUS),
HOENN_TO_NATIONAL(CHINGLING),
+#else
+ HOENN_TO_NATIONAL(TROPIUS),
+#endif
HOENN_TO_NATIONAL(CHIMECHO),
HOENN_TO_NATIONAL(ABSOL),
HOENN_TO_NATIONAL(VULPIX),
@@ -1774,10 +1810,14 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] =
HOENN_TO_NATIONAL(HERACROSS),
HOENN_TO_NATIONAL(RHYHORN),
HOENN_TO_NATIONAL(RHYDON),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(RHYPERIOR),
+#endif
HOENN_TO_NATIONAL(SNORUNT),
HOENN_TO_NATIONAL(GLALIE),
+#if P_NEW_POKEMON == TRUE
HOENN_TO_NATIONAL(FROSLASS),
+#endif
HOENN_TO_NATIONAL(SPHEAL),
HOENN_TO_NATIONAL(SEALEO),
HOENN_TO_NATIONAL(WALREIN),
@@ -1855,7 +1895,11 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] =
#include "data/pokemon/experience_tables.h"
#include "data/pokemon/base_stats.h"
#include "data/pokemon/level_up_learnsets.h"
+#if P_NEW_POKEMON == TRUE
#include "data/pokemon/evolution.h"
+#else
+#include "data/pokemon/evolution_old.h"
+#endif
#include "data/pokemon/level_up_learnset_pointers.h"
#include "data/pokemon/form_species_tables.h"
#include "data/pokemon/form_species_table_pointers.h"
@@ -2256,6 +2300,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_JIRACHI - 1] = ANIM_SWING_CONVEX,
[SPECIES_DEOXYS - 1] = ANIM_H_PIVOT,
+#if P_NEW_POKEMON == TRUE
// Gen 4
[SPECIES_TURTWIG - 1] = ANIM_V_SLIDE,
[SPECIES_GROTLE - 1] = ANIM_H_SLIDE,
@@ -2801,6 +2846,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_ARCEUS_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE,
[SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE,
[SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE,
+#endif
};
static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
@@ -2860,8 +2906,10 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
[SPECIES_SALAMENCE - 1] = 70,
[SPECIES_KYOGRE - 1] = 60,
[SPECIES_RAYQUAZA - 1] = 60,
+#if P_NEW_POKEMON == TRUE
[SPECIES_TAPU_FINI - 1] = 5,
[SPECIES_ROTOM_FAN - 1] = 7,
+#endif
};
#define PP_UP_SHIFTS(val) val, (val) << 2, (val) << 4, (val) << 6
@@ -2935,7 +2983,7 @@ const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
.anims = NULL,
.images = gBattlerPicTable_OpponentLeft,
.affineAnims = gAffineAnims_BattleSpriteOpponentSide,
- .callback = SpriteCb_WildMon,
+ .callback = SpriteCB_WildMon,
},
[B_POSITION_PLAYER_RIGHT] = {
.tileTag = TAG_NONE,
@@ -2953,7 +3001,7 @@ const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
.anims = NULL,
.images = gBattlerPicTable_OpponentRight,
.affineAnims = gAffineAnims_BattleSpriteOpponentSide,
- .callback = SpriteCb_WildMon
+ .callback = SpriteCB_WildMon
},
};
@@ -3065,11 +3113,7 @@ static const u8 sGetMonDataEVConstants[] =
// For stat-raising items
static const u8 sStatsToRaise[] =
{
-#ifndef ITEM_EXPANSION
- STAT_ATK, STAT_ATK, STAT_SPEED, STAT_DEF, STAT_SPATK, STAT_ACC
-#else
STAT_ATK, STAT_ATK, STAT_DEF, STAT_SPEED, STAT_SPATK, STAT_SPDEF, STAT_ACC
-#endif
};
// 3 modifiers each for how much to change friendship for different ranges
@@ -3113,7 +3157,7 @@ static const struct OamData sOamData_64x64 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -4343,7 +4387,7 @@ static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 perso
return substruct;
}
-u32 GetMonData(struct Pokemon *mon, s32 field, u8* data)
+u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data)
{
u32 ret;
@@ -5103,7 +5147,7 @@ u8 GiveMonToPlayer(struct Pokemon *mon)
return MON_GIVEN_TO_PARTY;
}
-static u8 SendMonToPC(struct Pokemon* mon)
+static u8 SendMonToPC(struct Pokemon *mon)
{
s32 boxNo, boxPos;
@@ -5524,80 +5568,8 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
gBattleMons[gActiveBattler].status2 |= STATUS2_FOCUS_ENERGY;
retVal = FALSE;
}
- #ifndef ITEM_EXPANSION
- // X Attack
- if ((itemEffect[i] & ITEM0_X_ATTACK)
- && gBattleMons[gActiveBattler].statStages[STAT_ATK] < MAX_STAT_STAGE)
- {
- if (B_X_ITEMS_BUFF >= GEN_7)
- gBattleMons[gActiveBattler].statStages[STAT_ATK] += 2;
- else
- gBattleMons[gActiveBattler].statStages[STAT_ATK] += itemEffect[i] & ITEM0_X_ATTACK;
- if (gBattleMons[gActiveBattler].statStages[STAT_ATK] > MAX_STAT_STAGE)
- gBattleMons[gActiveBattler].statStages[STAT_ATK] = MAX_STAT_STAGE;
- retVal = FALSE;
- }
- #endif
break;
- // Handle ITEM1 effects (in-battle stat boosting effects)
- #ifndef ITEM_EXPANSION
- case 1:
- // X Defend
- if ((itemEffect[i] & ITEM1_X_DEFEND)
- && gBattleMons[gActiveBattler].statStages[STAT_DEF] < MAX_STAT_STAGE)
- {
- if (B_X_ITEMS_BUFF >= GEN_7)
- gBattleMons[gActiveBattler].statStages[STAT_DEF] += 2;
- else
- gBattleMons[gActiveBattler].statStages[STAT_DEF] += (itemEffect[i] & ITEM1_X_DEFEND) >> 4;
- if (gBattleMons[gActiveBattler].statStages[STAT_DEF] > MAX_STAT_STAGE)
- gBattleMons[gActiveBattler].statStages[STAT_DEF] = MAX_STAT_STAGE;
- retVal = FALSE;
- }
-
- // X Speed
- if ((itemEffect[i] & ITEM1_X_SPEED)
- && gBattleMons[gActiveBattler].statStages[STAT_SPEED] < MAX_STAT_STAGE)
- {
- if (B_X_ITEMS_BUFF >= GEN_7)
- gBattleMons[gActiveBattler].statStages[STAT_SPEED] += 2;
- else
- gBattleMons[gActiveBattler].statStages[STAT_SPEED] += itemEffect[i] & ITEM1_X_SPEED;
- if (gBattleMons[gActiveBattler].statStages[STAT_SPEED] > MAX_STAT_STAGE)
- gBattleMons[gActiveBattler].statStages[STAT_SPEED] = MAX_STAT_STAGE;
- retVal = FALSE;
- }
- break;
- // Handle ITEM2 effects (more stat boosting effects)
- case 2:
- // X Accuracy
- if ((itemEffect[i] & ITEM2_X_ACCURACY)
- && gBattleMons[gActiveBattler].statStages[STAT_ACC] < MAX_STAT_STAGE)
- {
- if (B_X_ITEMS_BUFF >= GEN_7)
- gBattleMons[gActiveBattler].statStages[STAT_ACC] += 2;
- else
- gBattleMons[gActiveBattler].statStages[STAT_ACC] += (itemEffect[i] & ITEM2_X_ACCURACY) >> 4;
- if (gBattleMons[gActiveBattler].statStages[STAT_ACC] > MAX_STAT_STAGE)
- gBattleMons[gActiveBattler].statStages[STAT_ACC] = MAX_STAT_STAGE;
- retVal = FALSE;
- }
-
- // X Sp Attack
- if ((itemEffect[i] & ITEM2_X_SPATK)
- && gBattleMons[gActiveBattler].statStages[STAT_SPATK] < MAX_STAT_STAGE)
- {
- if (B_X_ITEMS_BUFF >= GEN_7)
- gBattleMons[gActiveBattler].statStages[STAT_SPATK] += 2;
- else
- gBattleMons[gActiveBattler].statStages[STAT_SPATK] += itemEffect[i] & ITEM2_X_SPATK;
- if (gBattleMons[gActiveBattler].statStages[STAT_SPATK] > MAX_STAT_STAGE)
- gBattleMons[gActiveBattler].statStages[STAT_SPATK] = MAX_STAT_STAGE;
- retVal = FALSE;
- }
- break;
- #else
// Handle ITEM1 effects (in-battle stat boosting effects)
case 1:
// X Attack
@@ -5681,7 +5653,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
// Formerly used by the item effects of the X Sp. Atk and the X Accuracy
case 2:
break;
- #endif
+
// Handle ITEM3 effects (Guard Spec, Rare Candy, cure status)
case 3:
// Guard Spec
@@ -6263,32 +6235,6 @@ u8 *UseStatIncreaseItem(u16 itemId)
gPotentialItemEffectBattler = gBattlerInMenuId;
-#ifndef ITEM_EXPANSION
- for (i = 0; i < 3; i++)
- {
- if (itemEffect[i] & (ITEM0_X_ATTACK | ITEM1_X_SPEED | ITEM2_X_SPATK))
- BufferStatRoseMessage(i * 2);
-
- if (itemEffect[i] & (ITEM0_DIRE_HIT | ITEM1_X_DEFEND | ITEM2_X_ACCURACY))
- {
- if (i != 0) // Dire Hit is the only ITEM0 above
- {
- BufferStatRoseMessage(i * 2 + 1);
- }
- else
- {
- gBattlerAttacker = gBattlerInMenuId;
- BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnGettingPumped);
- }
- }
- }
-
- if (itemEffect[3] & ITEM3_GUARD_SPEC)
- {
- gBattlerAttacker = gBattlerInMenuId;
- BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
- }
-#else
if (itemEffect[0] & ITEM0_DIRE_HIT)
{
gBattlerAttacker = gBattlerInMenuId;
@@ -6322,7 +6268,6 @@ u8 *UseStatIncreaseItem(u16 itemId)
gBattlerAttacker = gBattlerInMenuId;
BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
}
-#endif
return gDisplayedStringBattle;
}
@@ -6630,7 +6575,6 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s
}
}
break;
- #ifdef BATTLE_ENGINE
// Battle evolution without leveling; party slot is being passed into the evolutionItem arg.
case EVO_MODE_BATTLE_SPECIAL:
for (i = 0; i < EVOS_PER_MON; i++)
@@ -6644,7 +6588,6 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s
}
}
break;
- #endif
// Overworld evolution without leveling; evolution method is being passed into the evolutionItem arg.
case EVO_MODE_OVERWORLD_SPECIAL:
for (i = 0; i < EVOS_PER_MON; i++)
@@ -7830,7 +7773,7 @@ const u8 *GetTrainerPartnerName(void)
}
#define READ_PTR_FROM_TASK(taskId, dataId) \
- (void*)( \
+ (void *)( \
((u16)(gTasks[taskId].data[dataId]) | \
((u16)(gTasks[taskId].data[dataId + 1]) << 16)))
@@ -7862,7 +7805,7 @@ static void Task_PokemonSummaryAnimateAfterDelay(u8 taskId)
}
}
-void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 panMode)
+void BattleAnimateFrontSprite(struct Sprite *sprite, u16 species, bool8 noCry, u8 panMode)
{
if (gHitMarker & HITMARKER_NO_ANIMATIONS && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)))
DoMonFrontSpriteAnimation(sprite, species, noCry, panMode | SKIP_FRONT_ANIM);
@@ -7870,7 +7813,7 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u
DoMonFrontSpriteAnimation(sprite, species, noCry, panMode);
}
-void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 panModeAnimFlag)
+void DoMonFrontSpriteAnimation(struct Sprite *sprite, u16 species, bool8 noCry, u8 panModeAnimFlag)
{
s8 pan;
switch (panModeAnimFlag & (u8)~SKIP_FRONT_ANIM) // Exclude anim flag to get pan mode
@@ -7917,7 +7860,7 @@ void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry,
}
}
-void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneFrame)
+void PokemonSummaryDoMonAnimation(struct Sprite *sprite, u16 species, bool8 oneFrame)
{
if (!oneFrame && HasTwoFramesAnimation(species))
StartSpriteAnim(sprite, 1);
@@ -7945,7 +7888,7 @@ void StopPokemonAnimationDelayTask(void)
DestroyTask(delayTaskId);
}
-void BattleAnimateBackSprite(struct Sprite* sprite, u16 species)
+void BattleAnimateBackSprite(struct Sprite *sprite, u16 species)
{
if (gHitMarker & HITMARKER_NO_ANIMATIONS && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)))
{
diff --git a/src/pokemon_debug.c b/src/pokemon_debug.c
index 77e83303d7..fa4460ed83 100644
--- a/src/pokemon_debug.c
+++ b/src/pokemon_debug.c
@@ -52,7 +52,7 @@ static const u16 sBgColor[] = {RGB_WHITE};
static struct PokemonDebugMenu *GetStructPtr(u8 taskId)
{
- u8 *taskDataPtr = (u8*)(&gTasks[taskId].data[0]);
+ u8 *taskDataPtr = (u8 *)(&gTasks[taskId].data[0]);
return (struct PokemonDebugMenu*)(T1_READ_PTR(taskDataPtr));
}
@@ -463,7 +463,7 @@ static void VBlankCB(void)
static void SetStructPtr(u8 taskId, void *ptr)
{
u32 structPtr = (u32)(ptr);
- u8 *taskDataPtr = (u8*)(&gTasks[taskId].data[0]);
+ u8 *taskDataPtr = (u8 *)(&gTasks[taskId].data[0]);
taskDataPtr[0] = structPtr >> 0;
taskDataPtr[1] = structPtr >> 8;
@@ -849,7 +849,7 @@ static void LoadAndCreateEnemyShadowSpriteCustom(struct PokemonDebugMenu *data,
static void DrawFootprintCustom(u8 windowId, u16 species)
{
u8 footprint[32 * 4] = {0};
- const u8 * footprintGfx = gMonFootprintTable[species];
+ const u8 *footprintGfx = gMonFootprintTable[species];
u32 i, j, tileIdx = 0;
if (footprintGfx != NULL)
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 0faebfe74b..291f3f861a 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -25,7 +25,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
static void FreeAndDestroyMonIconSprite_(struct Sprite *sprite);
#if P_ENABLE_DEBUG == TRUE
static const u8 *GetMonIconPtrCustom(u16 species, u32 personality, bool8 isFemale);
-static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale);
+static const u8 *GetMonIconTilesCustom(u16 species, bool8 isFemale);
#endif
const u8 *const gMonIconTable[] =
@@ -417,6 +417,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_JIRACHI] = gMonIcon_Jirachi,
[SPECIES_DEOXYS] = gMonIcon_Deoxys,
[SPECIES_CHIMECHO] = gMonIcon_Chimecho,
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = gMonIcon_Turtwig,
[SPECIES_GROTLE] = gMonIcon_Grotle,
[SPECIES_TORTERRA] = gMonIcon_Torterra,
@@ -1031,6 +1032,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap,
[SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark,
[SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared,
+#endif
[SPECIES_UNOWN_B] = gMonIcon_UnownB,
[SPECIES_UNOWN_C] = gMonIcon_UnownC,
[SPECIES_UNOWN_D] = gMonIcon_UnownD,
@@ -1064,6 +1066,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack,
[SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense,
[SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed,
+#if P_NEW_POKEMON == TRUE
[SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak,
[SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak,
[SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak,
@@ -1237,12 +1240,14 @@ const u8 *const gMonIconTable[] =
[SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada,
[SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider,
[SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider,
+#endif
[SPECIES_EGG] = gMonIcon_Egg,
};
const u8 *const gMonIconTableFemale[] =
{
[SPECIES_EEVEE] = gMonIcon_Eevee,
+#if P_NEW_POKEMON == TRUE
[SPECIES_STARLY] = gMonIcon_Starly,
[SPECIES_STARAVIA] = gMonIcon_Staravia,
[SPECIES_STARAPTOR] = gMonIcon_Staraptor,
@@ -1257,6 +1262,7 @@ const u8 *const gMonIconTableFemale[] =
[SPECIES_FRILLISH] = gMonIcon_FrillishF,
[SPECIES_JELLICENT] = gMonIcon_JellicentF,
[SPECIES_PYROAR] = gMonIcon_PyroarF,
+#endif
};
const u8 gMonIconPaletteIndices[] =
@@ -1647,6 +1653,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_JIRACHI] = 0,
[SPECIES_DEOXYS] = 0,
[SPECIES_CHIMECHO] = 0,
+#if P_NEW_POKEMON == TRUE
[SPECIES_TURTWIG] = 1,
[SPECIES_GROTLE] = 1,
[SPECIES_TORTERRA] = 1,
@@ -2261,10 +2268,15 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_PIKACHU_PARTNER_CAP] = 0,
[SPECIES_PIKACHU_WORLD_CAP] = 0,
[SPECIES_PICHU_SPIKY_EARED] = 1,
+#endif
[SPECIES_UNOWN_B ... SPECIES_UNOWN_QMARK] = 0,
[SPECIES_CASTFORM_SUNNY] = 0,
[SPECIES_CASTFORM_RAINY] = 0,
[SPECIES_CASTFORM_SNOWY] = 0,
+ [SPECIES_DEOXYS_ATTACK] = 0,
+ [SPECIES_DEOXYS_DEFENSE] = 0,
+ [SPECIES_DEOXYS_SPEED] = 0,
+#if P_NEW_POKEMON == TRUE
[SPECIES_BURMY_SANDY_CLOAK] = 1,
[SPECIES_BURMY_TRASH_CLOAK] = 0,
[SPECIES_WORMADAM_SANDY_CLOAK] = 1,
@@ -2432,12 +2444,14 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ZARUDE_DADA] = 1,
[SPECIES_CALYREX_ICE_RIDER] = 0,
[SPECIES_CALYREX_SHADOW_RIDER] = 0,
+#endif
[SPECIES_EGG] = 1,
};
const u8 gMonIconPaletteIndicesFemale[] =
{
[SPECIES_EEVEE] = 2,
+#if P_NEW_POKEMON == TRUE
[SPECIES_STARLY] = 0,
[SPECIES_STARAVIA] = 0,
[SPECIES_BIDOOF] = 2,
@@ -2451,6 +2465,7 @@ const u8 gMonIconPaletteIndicesFemale[] =
[SPECIES_FRILLISH] = 1,
[SPECIES_JELLICENT] = 1,
[SPECIES_PYROAR] = 2,
+#endif
};
const struct SpritePalette gMonIconPaletteTable[] =
@@ -2755,9 +2770,9 @@ void SpriteCB_MonIcon(struct Sprite *sprite)
UpdateMonIconFrame(sprite);
}
-const u8* GetMonIconTiles(u16 species, u32 personality)
+const u8 *GetMonIconTiles(u16 species, u32 personality)
{
- const u8* iconSprite = gMonIconTable[species];
+ const u8 *iconSprite = gMonIconTable[species];
if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE)
{
iconSprite = gMonIconTableFemale[species];
@@ -2765,9 +2780,9 @@ const u8* GetMonIconTiles(u16 species, u32 personality)
return iconSprite;
}
#if P_ENABLE_DEBUG == TRUE
-static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale)
+static const u8 *GetMonIconTilesCustom(u16 species, bool8 isFemale)
{
- const u8* iconSprite = gMonIconTable[species];
+ const u8 *iconSprite = gMonIconTable[species];
if ((gBaseStats[species].flags & FLAG_GENDER_DIFFERENCE) && isFemale)
{
iconSprite = gMonIconTableFemale[species];
@@ -2805,7 +2820,7 @@ u8 GetMonIconPaletteIndexFromSpecies(u16 species)
return gMonIconPaletteIndices[species];
}
-const u16* GetValidMonIconPalettePtr(u16 species)
+const u16 *GetValidMonIconPalettePtr(u16 species)
{
if (species > NUM_SPECIES)
species = INVALID_ICON_SPECIES;
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index adfef95886..e3ae6623c3 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -2613,7 +2613,7 @@ static const struct OamData sOamData_JumpMon =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -2630,7 +2630,7 @@ static const struct OamData sOamData_Vine16x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32),
.x = 0,
@@ -2647,7 +2647,7 @@ static const struct OamData sOamData_Vine32x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -2664,7 +2664,7 @@ static const struct OamData sOamData_Vine32x16 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -2818,7 +2818,7 @@ static const struct OamData sOamData_Star =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -3947,7 +3947,7 @@ static void InitDigitPrinters(void)
.xDelta = 8,
.x = 108,
.y = 6,
- .spriteSheet = (void*) &sSpriteSheet_Digits,
+ .spriteSheet = (void *) &sSpriteSheet_Digits,
.spritePal = &sSpritePalette_Digits,
};
@@ -4377,7 +4377,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId)
{
RemoveWindow(tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
break;
}
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index e613a8295f..39b55463c5 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -473,7 +473,7 @@ struct PokemonStorageSystemData
u8 iconScrollCurColumn;
s8 iconScrollDirection; // Unnecessary duplicate of scrollDirection
u8 iconScrollState;
- u8 iconScrollToBoxId; // Unnecessary duplicate of scrollToBoxId
+ u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId
struct WindowTemplate menuWindow;
struct StorageMenu menuItems[7];
u8 menuItemsCount;
@@ -1119,7 +1119,7 @@ static const struct OamData sOamData_DisplayMon =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -1136,7 +1136,7 @@ static const struct OamData sOamData_Waveform =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8),
.x = 0,
@@ -1212,7 +1212,7 @@ static const struct OamData sOamData_MonIcon =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -1343,7 +1343,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero
winTemplate.height = 2;
windowId = AddWindow(&winTemplate);
FillWindowPixelBuffer(windowId, PIXEL_FILL(zero2));
- tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
+ tileData1 = (u8 *) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
tileData2 = (winTemplate.width * TILE_SIZE_4BPP) + tileData1;
if (!zero1)
@@ -1391,7 +1391,7 @@ static void UnusedDrawTextWindow(const u8 *string, void *dst, u16 offset, u8 bgC
tilesSize = winTemplate.width * TILE_SIZE_4BPP;
windowId = AddWindow(&winTemplate);
FillWindowPixelBuffer(windowId, PIXEL_FILL(bgColor));
- tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
+ tileData1 = (u8 *) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
tileData2 = (winTemplate.width * TILE_SIZE_4BPP) + tileData1;
txtColor[0] = bgColor;
txtColor[1] = fgColor;
@@ -1553,9 +1553,9 @@ static void Task_PCMainMenu(u8 taskId)
case STATE_LOAD:
CreateMainMenu(task->tSelectedOption, &task->tWindowId);
LoadMessageBoxAndBorderGfx();
- DrawDialogueFrame(0, 0);
+ DrawDialogueFrame(0, FALSE);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL);
CopyWindowToVram(task->tWindowId, COPYWIN_FULL);
task->tState++;
@@ -1579,14 +1579,14 @@ static void Task_PCMainMenu(u8 taskId)
{
task->tSelectedOption = task->tNextOption;
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
break;
case MENU_B_PRESSED:
case OPTION_EXIT:
ClearStdWindowAndFrame(task->tWindowId, TRUE);
- ScriptContext2_Disable();
- EnableBothScriptContexts();
+ UnlockPlayerFieldControls();
+ ScriptContext_Enable();
RemoveWindow(task->tWindowId);
DestroyTask(taskId);
break;
@@ -1595,14 +1595,14 @@ static void Task_PCMainMenu(u8 taskId)
{
// Can't withdraw
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PartyFull, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_ERROR_MSG;
}
else if (task->tInput == OPTION_DEPOSIT && CountPartyMons() == 1)
{
// Can't deposit
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_JustOnePkmn, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_ERROR_MSG;
}
else
@@ -1620,7 +1620,7 @@ static void Task_PCMainMenu(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT;
}
else if (JOY_NEW(DPAD_UP))
@@ -1630,7 +1630,7 @@ static void Task_PCMainMenu(u8 taskId)
Menu_MoveCursor(-1);
task->tSelectedOption = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT;
}
else if (JOY_NEW(DPAD_DOWN))
@@ -1640,7 +1640,7 @@ static void Task_PCMainMenu(u8 taskId)
Menu_MoveCursor(1);
task->tSelectedOption = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT;
}
break;
@@ -1661,7 +1661,7 @@ void ShowPokemonStorageSystemPC(void)
u8 taskId = CreateTask(Task_PCMainMenu, 80);
gTasks[taskId].tState = 0;
gTasks[taskId].tSelectedOption = 0;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static void FieldTask_ReturnToPcMenu(void)
@@ -3886,7 +3886,7 @@ static void CreateMarkingComboSprite(void)
sStorage->markingComboSprite->subpriority = 1;
sStorage->markingComboSprite->x = 40;
sStorage->markingComboSprite->y = 150;
- sStorage->markingComboTilesPtr = (void*) OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(GFXTAG_MARKING_COMBO);
+ sStorage->markingComboTilesPtr = (void *) OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(GFXTAG_MARKING_COMBO);
}
static void CreateWaveformSprites(void)
@@ -3974,7 +3974,7 @@ static void CreateDisplayMonSprite(void)
sStorage->displayMonSprite = &gSprites[spriteId];
sStorage->displayMonPalOffset = palSlot * 16 + 0x100;
- sStorage->displayMonTilePtr = (void*) OBJ_VRAM0 + tileStart * TILE_SIZE_4BPP;
+ sStorage->displayMonTilePtr = (void *) OBJ_VRAM0 + tileStart * TILE_SIZE_4BPP;
} while (0);
if (sStorage->displayMonSprite == NULL)
@@ -5139,7 +5139,7 @@ static u16 TryLoadMonIconTiles(u16 species, u32 personality)
sStorage->numIconsPerSpecies[i]++;
offset = 16 * i;
species &= GENDER_MASK;
- CpuCopy32(GetMonIconTiles(species, personality), (void*)(OBJ_VRAM0) + offset * TILE_SIZE_4BPP, 0x200);
+ CpuCopy32(GetMonIconTiles(species, personality), (void *)(OBJ_VRAM0) + offset * TILE_SIZE_4BPP, 0x200);
return offset;
}
@@ -6593,7 +6593,7 @@ static void InitCanReleaseMonVars(void)
}
GetRestrictedReleaseMoves(sStorage->restrictedMoveList);
- sStorage->restrictedReleaseMonMoves = GetMonData(&sStorage->tempMon, MON_DATA_KNOWN_MOVES, (u8*)sStorage->restrictedMoveList);
+ sStorage->restrictedReleaseMonMoves = GetMonData(&sStorage->tempMon, MON_DATA_KNOWN_MOVES, (u8 *)sStorage->restrictedMoveList);
if (sStorage->restrictedReleaseMonMoves != 0)
{
// Pokémon knows at least one restricted release move
@@ -6659,7 +6659,7 @@ static s8 RunCanReleaseMon(void)
// Make sure party Pokémon isn't the one we're releasing first
if (sStorage->releaseBoxId != TOTAL_BOXES_COUNT || sStorage->releaseBoxPos != i)
{
- knownMoves = GetMonData(&gPlayerParty[i], MON_DATA_KNOWN_MOVES, (u8*)sStorage->restrictedMoveList);
+ knownMoves = GetMonData(&gPlayerParty[i], MON_DATA_KNOWN_MOVES, (u8 *)sStorage->restrictedMoveList);
sStorage->restrictedReleaseMonMoves &= ~(knownMoves);
}
}
@@ -6684,7 +6684,7 @@ static s8 RunCanReleaseMon(void)
// moves the release Pokémon knows
for (i = 0; i < IN_BOX_COUNT; i++)
{
- knownMoves = GetAndCopyBoxMonDataAt(sStorage->releaseCheckBoxId, sStorage->releaseCheckBoxPos, MON_DATA_KNOWN_MOVES, (u8*)sStorage->restrictedMoveList);
+ knownMoves = GetAndCopyBoxMonDataAt(sStorage->releaseCheckBoxId, sStorage->releaseCheckBoxPos, MON_DATA_KNOWN_MOVES, (u8 *)sStorage->restrictedMoveList);
if (knownMoves != 0 && !(sStorage->releaseBoxId == sStorage->releaseCheckBoxId
&& sStorage->releaseBoxPos == sStorage->releaseCheckBoxPos))
{
@@ -8061,7 +8061,7 @@ static void AddMenu(void)
sStorage->menuWindowId = AddWindow(&sStorage->menuWindow);
ClearWindowTilemap(sStorage->menuWindowId);
DrawStdFrameWithCustomTileAndPalette(sStorage->menuWindowId, FALSE, 11, 14);
- PrintMenuTable(sStorage->menuWindowId, sStorage->menuItemsCount, (void*)sStorage->menuItems);
+ PrintMenuTable(sStorage->menuWindowId, sStorage->menuItemsCount, (void *)sStorage->menuItems);
InitMenuInUpperLeftCornerNormal(sStorage->menuWindowId, sStorage->menuItemsCount, 0);
ScheduleBgCopyTilemapToVram(0);
sStorage->menuUnusedField = 0;
@@ -8694,7 +8694,7 @@ static const struct OamData sOamData_ItemIcon =
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -8794,7 +8794,7 @@ static void CreateItemIconSprites(void)
{
spriteSheet.tag = GFXTAG_ITEM_ICON_0 + i;
LoadCompressedSpriteSheet(&spriteSheet);
- sStorage->itemIcons[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * TILE_SIZE_4BPP + (void*)(OBJ_VRAM0);
+ sStorage->itemIcons[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * TILE_SIZE_4BPP + (void *)(OBJ_VRAM0);
sStorage->itemIcons[i].palIndex = AllocSpritePalette(PALTAG_ITEM_ICON_0 + i);
sStorage->itemIcons[i].palIndex *= 16;
sStorage->itemIcons[i].palIndex += 0x100;
@@ -9304,16 +9304,16 @@ static bool8 UpdateItemInfoWindowSlideOut(void)
return TRUE;
}
-static void DrawItemInfoWindow(u32 pos)
+static void DrawItemInfoWindow(u32 x)
{
- if (pos != 0)
+ if (x != 0)
{
- FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, pos, 1, 0xFu);
- FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, pos, 1, 0xFu);
+ FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 0xFu);
+ FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 0xFu);
}
- FillBgTilemapBufferRect(0, 0x13B, pos, 0xD, 1, 7, 0xFu);
- FillBgTilemapBufferRect(0, 0x13C, pos, 0xC, 1, 1, 0xFu);
- FillBgTilemapBufferRect(0, 0x13D, pos, 0x14, 1, 1, 0xFu);
+ FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 0xFu);
+ FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 0xFu);
+ FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 0xFu);
ScheduleBgCopyTilemapToVram(0);
}
@@ -9711,7 +9711,7 @@ bool32 AnyStorageMonWithMove(u16 moveId)
{
if (GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SANITY_HAS_SPECIES)
&& !GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SANITY_IS_EGG)
- && GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_KNOWN_MOVES, (u8*)moves))
+ && GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_KNOWN_MOVES, (u8 *)moves))
return TRUE;
}
}
@@ -10095,7 +10095,7 @@ static void UnkUtil_CpuRun(struct UnkUtilData *data)
for (i = 0; i < data->height; i++)
{
- CpuSet(data->src, data->dest, data->size / 2);
+ CpuCopy16(data->src, data->dest, data->size);
data->dest += 64;
data->src += data->unk * 2;
}
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 69a58abc18..2befc159f5 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -199,8 +199,8 @@ static bool8 LoadGraphics(void);
static void CB2_InitSummaryScreen(void);
static void InitBGs(void);
static bool8 DecompressGraphics(void);
-static void CopyMonToSummaryStruct(struct Pokemon*);
-static bool8 ExtractMonDataToSummaryStruct(struct Pokemon*);
+static void CopyMonToSummaryStruct(struct Pokemon *);
+static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *);
static void SetDefaultTilemaps(void);
static void CloseSummaryScreen(u8);
static void Task_HandleInput(u8);
@@ -208,7 +208,7 @@ static void ChangeSummaryPokemon(u8, s8);
static void Task_ChangeSummaryMon(u8);
static s8 AdvanceMonIndex(s8);
static s8 AdvanceMultiBattleMonIndex(s8);
-static bool8 IsValidToViewInMulti(struct Pokemon*);
+static bool8 IsValidToViewInMulti(struct Pokemon *);
static void ChangePage(u8, s8);
static void PssScrollRight(u8);
static void PssScrollRightEnd(u8);
@@ -238,8 +238,8 @@ static void Task_ShowAppealJamWindow(u8);
static void HandleStatusTilemap(u16, s16);
static void Task_ShowStatusWindow(u8);
static void TilemapFiveMovesDisplay(u16 *, u16, bool8);
-static void DrawPokerusCuredSymbol(struct Pokemon*);
-static void DrawExperienceProgressBar(struct Pokemon*);
+static void DrawPokerusCuredSymbol(struct Pokemon *);
+static void DrawExperienceProgressBar(struct Pokemon *);
static void DrawContestMoveHearts(u16);
static void LimitEggSummaryPageDisplay(void);
static void ResetWindows(void);
@@ -309,7 +309,7 @@ static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *);
static void CreateCaughtBallSprite(struct Pokemon *);
static void CreateSetStatusSprite(void);
static void CreateMoveSelectorSprites(u8);
-static void SpriteCb_MoveSelector(struct Sprite *);
+static void SpriteCB_MoveSelector(struct Sprite *);
static void DestroyMoveSelectorSprites(u8);
static void SetMainMoveSelectorColor(u8);
static void KeepMoveSelectorVisible(u8);
@@ -800,7 +800,7 @@ static const struct OamData sOamData_MoveTypes =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -982,7 +982,7 @@ static const struct OamData sOamData_MoveSelector =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -1072,7 +1072,7 @@ static const struct OamData sOamData_StatusCondition =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -1824,7 +1824,7 @@ static s8 AdvanceMultiBattleMonIndex(s8 delta)
}
}
-static bool8 IsValidToViewInMulti(struct Pokemon* mon)
+static bool8 IsValidToViewInMulti(struct Pokemon *mon)
{
if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NONE)
return FALSE;
@@ -2128,7 +2128,7 @@ static void SwitchToMovePositionSwitchMode(u8 taskId)
static void Task_HandleInput_MovePositionSwitch(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (MenuHelpers_ShouldWaitForLinkRecv() != TRUE)
{
@@ -2269,7 +2269,7 @@ static void Task_SetHandleReplaceMoveInput(u8 taskId)
static void Task_HandleReplaceMoveInput(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
if (MenuHelpers_ShouldWaitForLinkRecv() != TRUE)
{
@@ -2346,7 +2346,7 @@ static void ShowCantForgetHMsWindow(u8 taskId)
// This redraws the power/accuracy window when the player scrolls out of the "HM Moves can't be forgotten" message
static void Task_HandleInputCantForgetHMsMoves(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
u16 move;
if (FuncIsActiveTask(Task_ShowPowerAccWindow) != 1)
{
@@ -4171,14 +4171,14 @@ static void CreateMoveSelectorSprites(u8 idArrayStart)
else
StartSpriteAnim(&gSprites[spriteIds[i]], 6); // middle
- gSprites[spriteIds[i]].callback = SpriteCb_MoveSelector;
+ gSprites[spriteIds[i]].callback = SpriteCB_MoveSelector;
gSprites[spriteIds[i]].data[0] = idArrayStart;
gSprites[spriteIds[i]].data[1] = 0;
}
}
}
-static void SpriteCb_MoveSelector(struct Sprite *sprite)
+static void SpriteCB_MoveSelector(struct Sprite *sprite)
{
if (sprite->animNum > 3 && sprite->animNum < 7)
{
diff --git a/src/pokenav_conditions_gfx.c b/src/pokenav_conditions_gfx.c
index d2fb715ab8..5631f5bb2a 100644
--- a/src/pokenav_conditions_gfx.c
+++ b/src/pokenav_conditions_gfx.c
@@ -299,8 +299,8 @@ static u32 LoopedTask_OpenConditionGraphMenu(s32 state)
if (!IsConditionMenuSearchMode())
{
LoadLeftHeaderGfxForIndex(POKENAV_GFX_PARTY_MENU);
- ShowLeftHeaderGfx(POKENAV_GFX_CONDITION_MENU, TRUE, 0);
- ShowLeftHeaderGfx(POKENAV_GFX_PARTY_MENU, TRUE, 0);
+ ShowLeftHeaderGfx(POKENAV_GFX_CONDITION_MENU, TRUE, FALSE);
+ ShowLeftHeaderGfx(POKENAV_GFX_PARTY_MENU, TRUE, FALSE);
}
return LT_INC_AND_PAUSE;
case 16:
@@ -826,7 +826,7 @@ static void CreateConditionMonPic(u8 id)
{
menu->monPicSpriteId = spriteId;
gSprites[menu->monPicSpriteId].callback = MonPicGfxSpriteCallback;
- menu->monGfxPtr = (void*)VRAM + BG_VRAM_SIZE + (menu->monGfxTileStart * 32);
+ menu->monGfxPtr = (void *)VRAM + BG_VRAM_SIZE + (menu->monGfxTileStart * 32);
menu->monPalIndex = (menu->monPalIndex * 16) + 0x100;
}
}
diff --git a/src/pokenav_conditions_search_results.c b/src/pokenav_conditions_search_results.c
index bbc07df2c3..f1d4421111 100644
--- a/src/pokenav_conditions_search_results.c
+++ b/src/pokenav_conditions_search_results.c
@@ -267,7 +267,7 @@ static u32 BuildPartyMonSearchResults(s32 state)
item.boxId = TOTAL_BOXES_COUNT;
for (i = 0; i < PARTY_SIZE; i++)
{
- struct Pokemon * pokemon = &gPlayerParty[i];
+ struct Pokemon *pokemon = &gPlayerParty[i];
if (!GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES))
return LT_INC_AND_CONTINUE;
if (!GetMonData(pokemon, MON_DATA_SANITY_IS_EGG))
@@ -464,8 +464,8 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state)
{
u8 searchGfxId = GetSelectedConditionSearch() + POKENAV_MENUITEM_CONDITION_SEARCH_COOL;
LoadLeftHeaderGfxForIndex(searchGfxId);
- ShowLeftHeaderGfx(searchGfxId, 1, 0);
- ShowLeftHeaderGfx(POKENAV_GFX_CONDITION_MENU, 1, 0);
+ ShowLeftHeaderGfx(searchGfxId, TRUE, FALSE);
+ ShowLeftHeaderGfx(POKENAV_GFX_CONDITION_MENU, TRUE, FALSE);
}
PokenavFadeScreen(POKENAV_FADE_FROM_BLACK);
return LT_INC_AND_PAUSE;
@@ -687,17 +687,17 @@ static void CreateSearchResultsList(void)
CreatePokenavList(&sConditionSearchResultBgTemplates[1], &template, 0);
}
-static void BufferSearchMonListItem(struct PokenavMonListItem * item, u8 * dest)
+static void BufferSearchMonListItem(struct PokenavMonListItem * item, u8 *dest)
{
u8 gender;
u8 level;
- u8 * s;
- const u8 * genderStr;
+ u8 *s;
+ const u8 *genderStr;
// Mon is in party
if (item->boxId == TOTAL_BOXES_COUNT)
{
- struct Pokemon * mon = &gPlayerParty[item->monId];
+ struct Pokemon *mon = &gPlayerParty[item->monId];
gender = GetMonGender(mon);
level = GetLevelFromMonExp(mon);
GetMonData(mon, MON_DATA_NICKNAME, gStringVar3);
diff --git a/src/pokenav_list.c b/src/pokenav_list.c
index 350a785042..ed3d40dee2 100644
--- a/src/pokenav_list.c
+++ b/src/pokenav_list.c
@@ -72,7 +72,7 @@ static void InitPokenavListWindowState(struct PokenavListWindowState *, struct P
static void SpriteCB_UpArrow(struct Sprite *);
static void SpriteCB_DownArrow(struct Sprite *);
static void SpriteCB_RightArrow(struct Sprite *);
-static void ToggleListArrows(struct PokenavListSub *, u32);
+static void ToggleListArrows(struct PokenavListSub *, bool32);
static void DestroyListArrows(struct PokenavListSub *);
static void CreateListArrowSprites(struct PokenavListWindowState *, struct PokenavListSub *);
static void LoadListArrowGfx(void);
@@ -503,7 +503,7 @@ static u32 LoopedTask_EraseListForCheckPage(s32 state)
switch (state)
{
case 0:
- ToggleListArrows(&list->sub, 1);
+ ToggleListArrows(&list->sub, TRUE);
// fall-through
case 1:
if (list->eraseIndex != list->windowState.selectedIndexOffset)
@@ -656,7 +656,7 @@ static u32 LoopedTask_ReshowListFromCheckPage(s32 state)
return LT_INC_AND_CONTINUE;
return LT_SET_STATE(4);
case 6:
- ToggleListArrows(subPtr, 0);
+ ToggleListArrows(subPtr, FALSE);
return LT_FINISH;
}
@@ -665,7 +665,7 @@ static u32 LoopedTask_ReshowListFromCheckPage(s32 state)
static void EraseListEntry(struct PokenavListMenuWindow *listWindow, s32 offset, s32 entries)
{
- u8 *tileData = (u8*)GetWindowAttribute(listWindow->windowId, WINDOW_TILE_DATA);
+ u8 *tileData = (u8 *)GetWindowAttribute(listWindow->windowId, WINDOW_TILE_DATA);
u32 width = listWindow->width * 64;
offset = (listWindow->unkA + offset) & 0xF;
@@ -694,7 +694,7 @@ static void EraseListEntry(struct PokenavListMenuWindow *listWindow, s32 offset,
static void SetListMarginTile(struct PokenavListMenuWindow *listWindow, bool32 draw)
{
u16 var;
- u16 *tilemapBuffer = (u16*)GetBgTilemapBuffer(GetWindowAttribute(listWindow->windowId, WINDOW_BG));
+ u16 *tilemapBuffer = (u16 *)GetBgTilemapBuffer(GetWindowAttribute(listWindow->windowId, WINDOW_BG));
tilemapBuffer += (listWindow->unkA << 6) + listWindow->x - 1;
if (draw)
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index 7d668c67f2..c51ab10bae 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -50,7 +50,7 @@ static void InitHelpBar(void);
static u32 LoopedTask_SlideMenuHeaderUp(s32);
static u32 LoopedTask_SlideMenuHeaderDown(s32);
static void DrawHelpBar(u32);
-static void SpriteCB_SpinningPokenav(struct Sprite*);
+static void SpriteCB_SpinningPokenav(struct Sprite *);
static u32 LoopedTask_InitPokenavMenu(s32);
static const u16 sSpinningPokenav_Pal[] = INCBIN_U16("graphics/pokenav/nav_icon.gbapal");
diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c
index 056ab2f1d2..fd5b36fae0 100755
--- a/src/pokenav_match_call_gfx.c
+++ b/src/pokenav_match_call_gfx.c
@@ -379,7 +379,7 @@ static u32 LoopedTask_OpenMatchCall(s32 state)
ShowBg(1);
AllocMatchCallSprites();
LoadLeftHeaderGfxForIndex(3);
- ShowLeftHeaderGfx(POKENAV_GFX_MATCH_CALL_MENU, 1, 0);
+ ShowLeftHeaderGfx(POKENAV_GFX_MATCH_CALL_MENU, TRUE, FALSE);
PokenavFadeScreen(POKENAV_FADE_FROM_BLACK);
return LT_INC_AND_PAUSE;
case 7:
diff --git a/src/pokenav_match_call_list.c b/src/pokenav_match_call_list.c
index d56cfdb62e..b00c76b48a 100755
--- a/src/pokenav_match_call_list.c
+++ b/src/pokenav_match_call_list.c
@@ -24,7 +24,7 @@ struct Pokenav_MatchCallMenu
u16 numSpecialTrainers;
bool32 initFinished;
u32 loopedTaskId;
- u32 (*callback)(struct Pokenav_MatchCallMenu*);
+ u32 (*callback)(struct Pokenav_MatchCallMenu *);
struct PokenavMatchCallEntry matchCallEntries[MAX_REMATCH_ENTRIES - 1];
};
diff --git a/src/pokenav_menu_handler.c b/src/pokenav_menu_handler.c
index b72247742c..b81b4c892f 100644
--- a/src/pokenav_menu_handler.c
+++ b/src/pokenav_menu_handler.c
@@ -12,7 +12,7 @@ struct Pokenav_Menu
u16 currMenuItem;
u16 helpBarIndex;
u32 menuId;
- u32 (*callback)(struct Pokenav_Menu*);
+ u32 (*callback)(struct Pokenav_Menu *);
};
static bool32 UpdateMenuCursorPos(struct Pokenav_Menu *);
@@ -28,7 +28,7 @@ static u32 HandleCantOpenRibbonsInput(struct Pokenav_Menu *);
static u32 HandleMainMenuInputEndTutorial(struct Pokenav_Menu *);
static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *);
static u32 HandleMainMenuInput(struct Pokenav_Menu *);
-static u32 (*GetMainMenuInputHandler(void))(struct Pokenav_Menu*);
+static u32 (*GetMainMenuInputHandler(void))(struct Pokenav_Menu *);
static void SetMenuInputHandler(struct Pokenav_Menu *);
// Number of entries - 1 for that menu type
@@ -186,7 +186,7 @@ static void SetMenuInputHandler(struct Pokenav_Menu *menu)
}
}
-static u32 (*GetMainMenuInputHandler(void))(struct Pokenav_Menu*)
+static u32 (*GetMainMenuInputHandler(void))(struct Pokenav_Menu *)
{
switch (GetPokenavMode())
{
diff --git a/src/pokenav_menu_handler_gfx.c b/src/pokenav_menu_handler_gfx.c
index b9dd130468..7d78426dcf 100644
--- a/src/pokenav_menu_handler_gfx.c
+++ b/src/pokenav_menu_handler_gfx.c
@@ -579,7 +579,7 @@ static u32 LoopedTask_OpenConditionMenu(s32 state)
case 0:
ResetBldCnt();
StartOptionAnimations_Exit();
- HideMainOrSubMenuLeftHeader(POKENAV_GFX_MAIN_MENU, 0);
+ HideMainOrSubMenuLeftHeader(POKENAV_GFX_MAIN_MENU, FALSE);
PlaySE(SE_SELECT);
return LT_INC_AND_PAUSE;
case 1:
@@ -618,7 +618,7 @@ static u32 LoopedTask_ReturnToMainMenu(s32 state)
case 0:
ResetBldCnt();
StartOptionAnimations_Exit();
- HideMainOrSubMenuLeftHeader(POKENAV_GFX_CONDITION_MENU, 0);
+ HideMainOrSubMenuLeftHeader(POKENAV_GFX_CONDITION_MENU, FALSE);
return LT_INC_AND_PAUSE;
case 1:
if (AreMenuOptionSpritesMoving())
@@ -689,7 +689,7 @@ static u32 LoopedTask_ReturnToConditionMenu(s32 state)
case 0:
ResetBldCnt();
StartOptionAnimations_Exit();
- HideMainOrSubMenuLeftHeader(POKENAV_GFX_SEARCH_MENU, 0);
+ HideMainOrSubMenuLeftHeader(POKENAV_GFX_SEARCH_MENU, FALSE);
return LT_INC_AND_PAUSE;
case 1:
if (AreMenuOptionSpritesMoving())
@@ -1222,7 +1222,7 @@ static void PrintCurrentOptionDescription(void)
{
struct Pokenav_MenuGfx * gfx = GetSubstructPtr(POKENAV_SUBSTRUCT_MENU_GFX);
int menuItem = GetCurrentMenuItemId();
- const u8 * desc = sPageDescriptions[menuItem];
+ const u8 *desc = sPageDescriptions[menuItem];
u32 width = GetStringWidth(FONT_NORMAL, desc, -1);
FillWindowPixelBuffer(gfx->optionDescWindowId, PIXEL_FILL(6));
AddTextPrinterParameterized3(gfx->optionDescWindowId, FONT_NORMAL, (192 - width) / 2, 1, sOptionDescTextColors, 0, desc);
@@ -1233,7 +1233,7 @@ static void PrintCurrentOptionDescription(void)
static void PrintNoRibbonWinners(void)
{
struct Pokenav_MenuGfx * gfx = GetSubstructPtr(POKENAV_SUBSTRUCT_MENU_GFX);
- const u8 * s = gText_NoRibbonWinners;
+ const u8 *s = gText_NoRibbonWinners;
u32 width = GetStringWidth(FONT_NORMAL, s, -1);
FillWindowPixelBuffer(gfx->optionDescWindowId, PIXEL_FILL(6));
AddTextPrinterParameterized3(gfx->optionDescWindowId, FONT_NORMAL, (192 - width) / 2, 1, sOptionDescTextColors2, 0, s);
diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c
index 828bd525df..39c1659a9a 100755
--- a/src/pokenav_region_map.c
+++ b/src/pokenav_region_map.c
@@ -366,7 +366,7 @@ static u32 LoopedTask_OpenRegionMap(s32 taskState)
menuGfxId = POKENAV_GFX_MAP_MENU_ZOOMED_IN;
LoadLeftHeaderGfxForIndex(menuGfxId);
- ShowLeftHeaderGfx(menuGfxId, 1, 1);
+ ShowLeftHeaderGfx(menuGfxId, TRUE, TRUE);
PokenavFadeScreen(POKENAV_FADE_FROM_BLACK);
return LT_INC_AND_PAUSE;
case 7:
diff --git a/src/pokenav_ribbons_list.c b/src/pokenav_ribbons_list.c
index 724ced507e..cf5f99104e 100644
--- a/src/pokenav_ribbons_list.c
+++ b/src/pokenav_ribbons_list.c
@@ -22,7 +22,7 @@ enum
struct Pokenav_RibbonsMonList
{
- u32 (*callback)(struct Pokenav_RibbonsMonList*);
+ u32 (*callback)(struct Pokenav_RibbonsMonList *);
u32 loopedTaskId;
u16 winid;
s32 boxId;
@@ -256,7 +256,7 @@ static u32 BuildPartyMonRibbonList(s32 state)
item.boxId = TOTAL_BOXES_COUNT;
for (i = 0; i < PARTY_SIZE; i++)
{
- struct Pokemon * pokemon = &gPlayerParty[i];
+ struct Pokemon *pokemon = &gPlayerParty[i];
if (!GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES))
return LT_INC_AND_CONTINUE;
if (!GetMonData(pokemon, MON_DATA_SANITY_IS_EGG) && !GetMonData(pokemon, MON_DATA_SANITY_IS_BAD_EGG))
@@ -464,7 +464,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state)
if (!menu->fromSummary)
{
LoadLeftHeaderGfxForIndex(POKENAV_GFX_RIBBONS_MENU);
- ShowLeftHeaderGfx(POKENAV_GFX_RIBBONS_MENU, 1, 0);
+ ShowLeftHeaderGfx(POKENAV_GFX_RIBBONS_MENU, TRUE, FALSE);
}
return LT_INC_AND_PAUSE;
case 5:
@@ -669,7 +669,7 @@ static void DrawListIndexNumber(s32 windowId, s32 index, s32 max)
u8 strbuf[16];
u32 x;
- u8 * ptr = strbuf;
+ u8 *ptr = strbuf;
ptr = ConvertIntToDecimalStringN(ptr, index, STR_CONV_MODE_RIGHT_ALIGN, 3);
*ptr++ = CHAR_SLASH;
ConvertIntToDecimalStringN(ptr, max, STR_CONV_MODE_RIGHT_ALIGN, 3);
@@ -696,18 +696,18 @@ static void CreateRibbonMonsList(void)
}
// Buffers the "Nickname gender/level" text for the ribbon mon list
-static void BufferRibbonMonInfoText(struct PokenavListItem * listItem, u8 * dest)
+static void BufferRibbonMonInfoText(struct PokenavListItem * listItem, u8 *dest)
{
u8 gender;
u8 level;
- u8 * s;
- const u8 * genderStr;
+ u8 *s;
+ const u8 *genderStr;
struct PokenavMonListItem * item = (struct PokenavMonListItem *)listItem;
// Mon is in party
if (item->boxId == TOTAL_BOXES_COUNT)
{
- struct Pokemon * mon = &gPlayerParty[item->monId];
+ struct Pokemon *mon = &gPlayerParty[item->monId];
gender = GetMonGender(mon);
level = GetLevelFromMonExp(mon);
GetMonData(mon, MON_DATA_NICKNAME, gStringVar3);
diff --git a/src/pokenav_ribbons_summary.c b/src/pokenav_ribbons_summary.c
index c2673db6ae..3bc7cb236c 100644
--- a/src/pokenav_ribbons_summary.c
+++ b/src/pokenav_ribbons_summary.c
@@ -1154,7 +1154,7 @@ static const struct OamData sOamData_RibbonIconBig =
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 5572ef8338..83298b03df 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -154,7 +154,7 @@ static const struct OamData sOam_64x64 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -171,7 +171,7 @@ static const struct OamData sOam_32x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -188,7 +188,7 @@ static const struct OamData sOam_64x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -205,7 +205,7 @@ static const struct OamData sOam_32x16 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
@@ -222,7 +222,7 @@ static const struct OamData sOam_16x8 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8),
.x = 0,
@@ -239,7 +239,7 @@ static const struct OamData sOam_16x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32),
.x = 0,
@@ -256,7 +256,7 @@ static const struct OamData sOam_16x16 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -273,7 +273,7 @@ static const struct OamData sOam_32x8 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -1627,7 +1627,7 @@ static void Task_DuoFightAnim(u8 taskId)
StopMapMusic();
}
- BlendPalettes(PALETTES_ALL, 0x10, 0);
+ BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB_DuoFight);
PlaySE(SE_DOWNPOUR);
@@ -2284,7 +2284,7 @@ static void Task_RayDescendsAnim(u8 taskId)
LoadDescendsSceneGfx();
SetGpuRegBits(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
- BlendPalettes(PALETTES_ALL, 0x10, 0);
+ BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
SetVBlankCallback(VBlankCB_RayquazaScene);
sRayScene->revealedLightLine = 0;
sRayScene->revealedLightTimer = 0;
@@ -2501,7 +2501,7 @@ static void Task_RayChargesAnim(u8 taskId)
InitChargesSceneBgs();
LoadChargesSceneGfx();
SetWindowsHideVertBorders();
- BlendPalettes(PALETTES_ALL, 0x10, 0);
+ BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
SetVBlankCallback(VBlankCB_RayquazaScene);
tState = 0;
tTimer = 0;
@@ -2697,7 +2697,7 @@ static void Task_RayChasesAwayAnim(u8 taskId)
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 14));
- BlendPalettes(PALETTES_ALL, 0x10, 0);
+ BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
SetVBlankCallback(VBlankCB_RayquazaScene);
tState = 0;
tTimer = 0;
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 4365f2cb3d..3a831c8ce1 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -363,9 +363,9 @@ static void Task_RecordMixing_Main(u8 taskId)
SetLinkWaitingForScript();
if (gWirelessCommType != 0)
CreateTask(Task_ReturnToFieldRecordMixing, 10);
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
break;
}
@@ -1174,7 +1174,7 @@ static void ReceiveApprenticeData(struct Apprentice *records, size_t recordSize,
u32 apprenticeSaveId;
ShufflePlayerIndices(mixIndices);
- mixApprentice = (void*)records + (recordSize * mixIndices[multiplayerId]);
+ mixApprentice = (void *)records + (recordSize * mixIndices[multiplayerId]);
numApprentices = 0;
apprenticeId = 0;
for (i = 0; i < 2; i++)
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 951572636a..e8785b5f82 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -67,7 +67,8 @@ struct RecordedBattleSave
u32 checksum;
};
-STATIC_ASSERT(sizeof(struct RecordedBattleSave) <= SECTOR_DATA_SIZE, RecordedBattleSaveFreeSpace);
+// Save data using TryWriteSpecialSaveSector is allowed to exceed SECTOR_DATA_SIZE (up to the counter field)
+STATIC_ASSERT(sizeof(struct RecordedBattleSave) <= SECTOR_COUNTER_OFFSET, RecordedBattleSaveFreeSpace);
EWRAM_DATA u32 gRecordedBattleRngSeed = 0;
EWRAM_DATA u32 gBattlePalaceMoveSelectionRngValue = 0;
@@ -302,7 +303,7 @@ static bool32 IsRecordedBattleSaveValid(struct RecordedBattleSave *save)
return FALSE;
if (save->battleFlags & ILLEGAL_BATTLE_TYPES)
return FALSE;
- if (CalcByteArraySum((void*)(save), sizeof(*save) - 4) != save->checksum)
+ if (CalcByteArraySum((void *)(save), sizeof(*save) - 4) != save->checksum)
return FALSE;
return TRUE;
@@ -313,9 +314,9 @@ static bool32 RecordedBattleToSave(struct RecordedBattleSave *battleSave, struct
memset(saveSector, 0, SECTOR_SIZE);
memcpy(saveSector, battleSave, sizeof(*battleSave));
- saveSector->checksum = CalcByteArraySum((void*)(saveSector), sizeof(*saveSector) - 4);
+ saveSector->checksum = CalcByteArraySum((void *)(saveSector), sizeof(*saveSector) - 4);
- if (TryWriteSpecialSaveSector(SECTOR_ID_RECORDED_BATTLE, (void*)(saveSector)) != SAVE_STATUS_OK)
+ if (TryWriteSpecialSaveSector(SECTOR_ID_RECORDED_BATTLE, (void *)(saveSector)) != SAVE_STATUS_OK)
return FALSE;
else
return TRUE;
@@ -481,7 +482,7 @@ bool32 MoveRecordedBattleToSaveData(void)
static bool32 TryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst, struct SaveSector *saveBuffer)
{
- if (TryReadSpecialSaveSector(SECTOR_ID_RECORDED_BATTLE, (void*)(saveBuffer)) != SAVE_STATUS_OK)
+ if (TryReadSpecialSaveSector(SECTOR_ID_RECORDED_BATTLE, (void *)(saveBuffer)) != SAVE_STATUS_OK)
return FALSE;
memcpy(dst, saveBuffer, sizeof(struct RecordedBattleSave));
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index e817fdd143..5c93148675 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -159,7 +159,7 @@ static const struct OamData sOamData_Arrow =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 3a67feeab2..84f2480035 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -63,7 +63,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
gBattle_BG3_Y = 0;
break;
case 1:
- CpuFastFill(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFastFill(0, (void *)(VRAM), VRAM_SIZE);
break;
case 2:
LoadBattleTextboxAndBackground();
diff --git a/src/rom_header.s b/src/rom_header.s
index 9ab7240fba..c5fa5ddf40 100644
--- a/src/rom_header.s
+++ b/src/rom_header.s
@@ -1,5 +1,5 @@
@ Note: ROM header data is empty space here.
-@ It's populated by gbafix using data provided in the Makefile.
+@ It's populated by gbafix using data provided in the Makefile.
.global Start
Start:
@@ -41,20 +41,20 @@ RomHeaderChecksum:
RomHeaderReserved2:
.space 2
- .word 0
+ .word 0
- .global GPIOPortData
+ .global GPIOPortData
GPIOPortData:
- .2byte 0
+ .2byte 0
- .global GPIOPortDirection
+ .global GPIOPortDirection
GPIOPortDirection:
- .2byte 0
+ .2byte 0
- .global GPIOPortReadEnable
+ .global GPIOPortReadEnable
GPIOPortReadEnable:
- .2byte 0
+ .2byte 0
- .2byte 0
+ .2byte 0
- .space 0x34
+ .space 0x34
diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c
index a1dcf4babf..d769d47f82 100644
--- a/src/rom_header_gf.c
+++ b/src/rom_header_gf.c
@@ -15,8 +15,8 @@ struct GFRomHeader
const struct CompressedSpriteSheet * monBackPics;
const struct CompressedSpritePalette * monNormalPalettes;
const struct CompressedSpritePalette * monShinyPalettes;
- const u8 * const * monIcons;
- const u8 * monIconPaletteIds;
+ const u8 *const * monIcons;
+ const u8 *monIconPaletteIds;
const struct SpritePalette * monIconPalettes;
const u8 (* monSpeciesNames)[];
const u8 (* moveNames)[];
@@ -30,7 +30,7 @@ struct GFRomHeader
u32 mysteryEventFlag;
u32 pokedexCount;
u8 playerNameLength;
- u8 unk2;
+ u8 trainerNameLength;
u8 pokemonNameLength1;
u8 pokemonNameLength2;
u8 unk5;
@@ -61,7 +61,7 @@ struct GFRomHeader
u32 unk18;
const struct BaseStats * baseStats;
const u8 (* abilityNames)[];
- const u8 * const * abilityDescriptions;
+ const u8 *const * abilityDescriptions;
const struct Item * items;
const struct BattleMove * moves;
const struct CompressedSpriteSheet * ballGfx;
@@ -79,7 +79,7 @@ struct GFRomHeader
u32 giftRibbonsOffset;
u32 enigmaBerryOffset;
u32 enigmaBerrySize;
- const u8 * moveDescriptions;
+ const u8 *moveDescriptions;
u32 unk20;
};
@@ -109,7 +109,7 @@ static const struct GFRomHeader sGFRomHeader = {
.mysteryEventFlag = FLAG_SYS_MYSTERY_EVENT_ENABLE,
.pokedexCount = NATIONAL_DEX_COUNT,
.playerNameLength = PLAYER_NAME_LENGTH,
- .unk2 = 10,
+ .trainerNameLength = TRAINER_NAME_LENGTH,
.pokemonNameLength1 = POKEMON_NAME_LENGTH,
.pokemonNameLength2 = POKEMON_NAME_LENGTH,
// Two of the below 12s are likely move/ability name length, given their presence in this header
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index e2fd575a18..d1184dae01 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -233,7 +233,7 @@ static const struct OamData sOamData_RotatingGateLarge =
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
@@ -250,7 +250,7 @@ static const struct OamData sOamData_RotatingGateRegular =
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -874,7 +874,12 @@ static s32 RotatingGate_CanRotate(u8 gateId, s32 rotationDirection)
if (sRotatingGate_ArmLayout[shape][2 * i + j])
{
- if (MapGridIsImpassableAt(x + armPos[armIndex].x, y + armPos[armIndex].y) == TRUE)
+ #ifdef BUGFIX
+ // Collision has a range 0-3, any value != 0 is impassable
+ if (MapGridGetCollisionAt(x + armPos[armIndex].x, y + armPos[armIndex].y))
+ #else
+ if (MapGridGetCollisionAt(x + armPos[armIndex].x, y + armPos[armIndex].y) == 1)
+ #endif
return FALSE;
}
}
diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c
index 4581f6e5be..7581b81072 100644
--- a/src/rotating_tile_puzzle.c
+++ b/src/rotating_tile_puzzle.c
@@ -27,33 +27,33 @@ struct RotatingTilePuzzle
static const u8 sMovement_ShiftRight[] =
{
- MOVEMENT_ACTION_STORE_AND_LOCK_ANIM,
+ MOVEMENT_ACTION_LOCK_ANIM,
MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
- MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM,
+ MOVEMENT_ACTION_UNLOCK_ANIM,
MOVEMENT_ACTION_STEP_END
};
static const u8 sMovement_ShiftDown[] =
{
- MOVEMENT_ACTION_STORE_AND_LOCK_ANIM,
+ MOVEMENT_ACTION_LOCK_ANIM,
MOVEMENT_ACTION_WALK_NORMAL_DOWN,
- MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM,
+ MOVEMENT_ACTION_UNLOCK_ANIM,
MOVEMENT_ACTION_STEP_END
};
static const u8 sMovement_ShiftLeft[] =
{
- MOVEMENT_ACTION_STORE_AND_LOCK_ANIM,
+ MOVEMENT_ACTION_LOCK_ANIM,
MOVEMENT_ACTION_WALK_NORMAL_LEFT,
- MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM,
+ MOVEMENT_ACTION_UNLOCK_ANIM,
MOVEMENT_ACTION_STEP_END
};
static const u8 sMovement_ShiftUp[] =
{
- MOVEMENT_ACTION_STORE_AND_LOCK_ANIM,
+ MOVEMENT_ACTION_LOCK_ANIM,
MOVEMENT_ACTION_WALK_NORMAL_UP,
- MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM,
+ MOVEMENT_ACTION_UNLOCK_ANIM,
MOVEMENT_ACTION_STEP_END
};
diff --git a/src/roulette.c b/src/roulette.c
index 5b870fb604..a8be6ad7ca 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1040,11 +1040,11 @@ static const struct YesNoFuncTable sYesNoTable_KeepPlaying =
static void CB2_Roulette(void)
{
- RunTasks();
- AnimateSprites();
- BuildOamBuffer();
- if (sRoulette->flashUtil.enabled)
- RouletteFlash_Run(&sRoulette->flashUtil);
+ RunTasks();
+ AnimateSprites();
+ BuildOamBuffer();
+ if (sRoulette->flashUtil.enabled)
+ RouletteFlash_Run(&sRoulette->flashUtil);
}
static void VBlankCB_Roulette(void)
@@ -1293,7 +1293,7 @@ static void Task_StartPlaying(u8 taskId)
static void Task_AskKeepPlaying(u8 taskId)
{
DisplayYesNoMenuDefaultYes();
- DrawStdWindowFrame(sTextWindowId, 0);
+ DrawStdWindowFrame(sTextWindowId, FALSE);
AddTextPrinterParameterized(sTextWindowId, FONT_NORMAL, Roulette_Text_KeepPlaying, 0, 1, TEXT_SKIP_DRAW, 0);
CopyWindowToVram(sTextWindowId, COPYWIN_FULL);
DoYesNoFuncWithChoice(taskId, &sYesNoTable_KeepPlaying);
@@ -3401,7 +3401,7 @@ static void Task_DeclineMinBet(u8 taskId)
{
ClearStdWindowAndFrame(0, FALSE);
HideCoinsWindow();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
@@ -3413,7 +3413,7 @@ static void Task_NotEnoughForMinBet(u8 taskId)
gSpecialVar_0x8004 = 1;
HideCoinsWindow();
ClearStdWindowAndFrame(0, TRUE);
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
}
}
@@ -3475,7 +3475,7 @@ static void Task_PrintRouletteEntryMsg(u8 taskId)
void PlayRoulette(void)
{
u8 taskId;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
ShowCoinsWindow(GetCoins(), 1, 1);
taskId = CreateTask(Task_PrintRouletteEntryMsg, 0);
gTasks[taskId].tCoins = GetCoins();
@@ -4516,7 +4516,7 @@ static void SpriteCB_ShroomishExit(struct Sprite *sprite)
// Delay for screen shaking, then exit left
if (sprite->data[1]++ >= sprite->data[3])
{
- sprite->x -= 2;
+ sprite->x -= 2;
if (sprite->x < -16)
{
if (!sRoulette->ballUnstuck)
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 1f13976569..ab4d4736ce 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -83,7 +83,7 @@ bool8 SafariZoneTakeStep(void)
sSafariZoneStepCounter--;
if (sSafariZoneStepCounter == 0)
{
- ScriptContext1_SetupScript(SafariZone_EventScript_TimesUp);
+ ScriptContext_SetupScript(SafariZone_EventScript_TimesUp);
return TRUE;
}
return FALSE;
@@ -91,7 +91,7 @@ bool8 SafariZoneTakeStep(void)
void SafariZoneRetirePrompt(void)
{
- ScriptContext1_SetupScript(SafariZone_EventScript_RetirePrompt);
+ ScriptContext_SetupScript(SafariZone_EventScript_RetirePrompt);
}
void CB2_EndSafariBattle(void)
@@ -105,15 +105,15 @@ void CB2_EndSafariBattle(void)
}
else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS)
{
- ScriptContext2_RunNewScript(SafariZone_EventScript_OutOfBallsMidBattle);
+ RunScriptImmediately(SafariZone_EventScript_OutOfBallsMidBattle);
WarpIntoMap();
gFieldCallback = FieldCB_ReturnToFieldNoScriptCheckMusic;
SetMainCallback2(CB2_LoadMap);
}
else if (gBattleOutcome == B_OUTCOME_CAUGHT)
{
- ScriptContext1_SetupScript(SafariZone_EventScript_OutOfBalls);
- ScriptContext1_Stop();
+ ScriptContext_SetupScript(SafariZone_EventScript_OutOfBalls);
+ ScriptContext_Stop();
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
}
diff --git a/src/save.c b/src/save.c
index 52cdaa5ddc..e7c91580e5 100644
--- a/src/save.c
+++ b/src/save.c
@@ -196,7 +196,7 @@ static u8 HandleWriteSector(u16 sectorId, const struct SaveSectorLocation *locat
// Set footer data
gReadWriteSector->id = sectorId;
- gReadWriteSector->security = SECTOR_SECURITY_NUM;
+ gReadWriteSector->signature = SECTOR_SIGNATURE;
gReadWriteSector->counter = gSaveCounter;
// Copy current data to temp buffer for writing
@@ -217,7 +217,7 @@ static u8 HandleWriteSectorNBytes(u8 sectorId, u8 *data, u16 size)
for (i = 0; i < SECTOR_SIZE; i++)
((u8 *)sector)[i] = 0;
- sector->security = SECTOR_SECURITY_NUM;
+ sector->signature = SECTOR_SIGNATURE;
// Copy data to temp buffer for writing
for (i = 0; i < size; i++)
@@ -306,7 +306,7 @@ static u8 HandleReplaceSectorAndVerify(u16 sectorId, const struct SaveSectorLoca
return status;
}
-// Similar to HandleWriteSector, but fully erases the sector first, and skips writing the first security byte
+// Similar to HandleWriteSector, but fully erases the sector first, and skips writing the first signature byte
static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *locations)
{
u16 i;
@@ -330,7 +330,7 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc
// Set footer data
gReadWriteSector->id = sectorId;
- gReadWriteSector->security = SECTOR_SECURITY_NUM;
+ gReadWriteSector->signature = SECTOR_SIGNATURE;
gReadWriteSector->counter = gSaveCounter;
// Copy current data to temp buffer for writing
@@ -344,8 +344,8 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc
status = SAVE_STATUS_OK;
- // Write new save data up to security field
- for (i = 0; i < SECTOR_SECURITY_OFFSET; i++)
+ // Write new save data up to signature field
+ for (i = 0; i < SECTOR_SIGNATURE_OFFSET; i++)
{
if (ProgramFlashByte(sector, i, ((u8 *)gReadWriteSector)[i]))
{
@@ -362,14 +362,14 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc
}
else
{
- // Writing save data succeeded, write security and counter
+ // Writing save data succeeded, write signature and counter
status = SAVE_STATUS_OK;
- // Write security (skipping the first byte) and counter fields.
- // The byte of security that is skipped is instead written by WriteSectorSecurityByte or WriteSectorSecurityByte_NoOffset
- for (i = 0; i < SECTOR_SIZE - (SECTOR_SECURITY_OFFSET + 1); i++)
+ // Write signature (skipping the first byte) and counter fields.
+ // The byte of signature that is skipped is instead written by WriteSectorSignatureByte or WriteSectorSignatureByte_NoOffset
+ for (i = 0; i < SECTOR_SIZE - (SECTOR_SIGNATURE_OFFSET + 1); i++)
{
- if (ProgramFlashByte(sector, SECTOR_SECURITY_OFFSET + 1 + i, ((u8 *)gReadWriteSector)[SECTOR_SECURITY_OFFSET + 1 + i]))
+ if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET + 1 + i, ((u8 *)gReadWriteSector)[SECTOR_SIGNATURE_OFFSET + 1 + i]))
{
status = SAVE_STATUS_ERROR;
break;
@@ -378,7 +378,7 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc
if (status == SAVE_STATUS_ERROR)
{
- // Writing security/counter failed
+ // Writing signature/counter failed
SetDamagedSectorBits(ENABLE, sector);
return SAVE_STATUS_ERROR;
}
@@ -391,16 +391,16 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc
}
}
-static u8 WriteSectorSecurityByte_NoOffset(u16 sectorId, const struct SaveSectorLocation *locations)
+static u8 WriteSectorSignatureByte_NoOffset(u16 sectorId, const struct SaveSectorLocation *locations)
{
// Adjust sector id for current save slot
- // This first line lacking -1 is the only difference from WriteSectorSecurityByte
+ // This first line lacking -1 is the only difference from WriteSectorSignatureByte
u16 sector = sectorId + gLastWrittenSector;
sector %= NUM_SECTORS_PER_SLOT;
sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS);
- // Write just the first byte of the security field, which was skipped by HandleReplaceSector
- if (ProgramFlashByte(sector, SECTOR_SECURITY_OFFSET, SECTOR_SECURITY_NUM & 0xFF))
+ // Write just the first byte of the signature field, which was skipped by HandleReplaceSector
+ if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, SECTOR_SIGNATURE & 0xFF))
{
// Sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter.
SetDamagedSectorBits(ENABLE, sector);
@@ -416,15 +416,15 @@ static u8 WriteSectorSecurityByte_NoOffset(u16 sectorId, const struct SaveSector
}
}
-static u8 CopySectorSecurityByte(u16 sectorId, const struct SaveSectorLocation *locations)
+static u8 CopySectorSignatureByte(u16 sectorId, const struct SaveSectorLocation *locations)
{
// Adjust sector id for current save slot
u16 sector = sectorId + gLastWrittenSector - 1;
sector %= NUM_SECTORS_PER_SLOT;
sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS);
- // Copy just the first byte of the security field from the read/write buffer
- if (ProgramFlashByte(sector, SECTOR_SECURITY_OFFSET, ((u8 *)gReadWriteSector)[SECTOR_SECURITY_OFFSET]))
+ // Copy just the first byte of the signature field from the read/write buffer
+ if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, ((u8 *)gReadWriteSector)[SECTOR_SIGNATURE_OFFSET]))
{
// Sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter.
SetDamagedSectorBits(ENABLE, sector);
@@ -440,15 +440,15 @@ static u8 CopySectorSecurityByte(u16 sectorId, const struct SaveSectorLocation *
}
}
-static u8 WriteSectorSecurityByte(u16 sectorId, const struct SaveSectorLocation *locations)
+static u8 WriteSectorSignatureByte(u16 sectorId, const struct SaveSectorLocation *locations)
{
// Adjust sector id for current save slot
u16 sector = sectorId + gLastWrittenSector - 1;
sector %= NUM_SECTORS_PER_SLOT;
sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS);
- // Write just the first byte of the security field, which was skipped by HandleReplaceSector
- if (ProgramFlashByte(sector, SECTOR_SECURITY_OFFSET, SECTOR_SECURITY_NUM & 0xFF))
+ // Write just the first byte of the signature field, which was skipped by HandleReplaceSector
+ if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, SECTOR_SIGNATURE & 0xFF))
{
// Sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter.
SetDamagedSectorBits(ENABLE, sector);
@@ -500,8 +500,8 @@ static u8 CopySaveSlotData(u16 sectorId, struct SaveSectorLocation *locations)
checksum = CalculateChecksum(gReadWriteSector->data, locations[id].size);
- // Only copy data for sectors whose security and checksum fields are correct
- if (gReadWriteSector->security == SECTOR_SECURITY_NUM && gReadWriteSector->checksum == checksum)
+ // Only copy data for sectors whose signature and checksum fields are correct
+ if (gReadWriteSector->signature == SECTOR_SIGNATURE && gReadWriteSector->checksum == checksum)
{
u16 j;
for (j = 0; j < locations[id].size; j++)
@@ -519,7 +519,7 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations)
u32 saveSlot1Counter = 0;
u32 saveSlot2Counter = 0;
u32 validSectorFlags = 0;
- bool8 securityPassed = FALSE;
+ bool8 signatureValid = FALSE;
u8 saveSlot1Status;
u8 saveSlot2Status;
@@ -527,9 +527,9 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations)
for (i = 0; i < NUM_SECTORS_PER_SLOT; i++)
{
ReadFlashSector(i, gReadWriteSector);
- if (gReadWriteSector->security == SECTOR_SECURITY_NUM)
+ if (gReadWriteSector->signature == SECTOR_SIGNATURE)
{
- securityPassed = TRUE;
+ signatureValid = TRUE;
checksum = CalculateChecksum(gReadWriteSector->data, locations[gReadWriteSector->id].size);
if (gReadWriteSector->checksum == checksum)
{
@@ -539,7 +539,7 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations)
}
}
- if (securityPassed)
+ if (signatureValid)
{
if (validSectorFlags == (1 << NUM_SECTORS_PER_SLOT) - 1)
saveSlot1Status = SAVE_STATUS_OK;
@@ -548,20 +548,20 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations)
}
else
{
- // No sectors in slot 1 have the security number, treat it as empty
+ // No sectors in slot 1 have the correct signature, treat it as empty
saveSlot1Status = SAVE_STATUS_EMPTY;
}
validSectorFlags = 0;
- securityPassed = FALSE;
+ signatureValid = FALSE;
// Check save slot 2
for (i = 0; i < NUM_SECTORS_PER_SLOT; i++)
{
ReadFlashSector(i + NUM_SECTORS_PER_SLOT, gReadWriteSector);
- if (gReadWriteSector->security == SECTOR_SECURITY_NUM)
+ if (gReadWriteSector->signature == SECTOR_SIGNATURE)
{
- securityPassed = TRUE;
+ signatureValid = TRUE;
checksum = CalculateChecksum(gReadWriteSector->data, locations[gReadWriteSector->id].size);
if (gReadWriteSector->checksum == checksum)
{
@@ -571,7 +571,7 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations)
}
}
- if (securityPassed)
+ if (signatureValid)
{
if (validSectorFlags == (1 << NUM_SECTORS_PER_SLOT) - 1)
saveSlot2Status = SAVE_STATUS_OK;
@@ -580,7 +580,7 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations)
}
else
{
- // No sectors in slot 2 have the security number, treat it as empty.
+ // No sectors in slot 2 have the correct signature, treat it as empty.
saveSlot2Status = SAVE_STATUS_EMPTY;
}
@@ -642,12 +642,12 @@ static u8 TryLoadSaveSector(u8 sectorId, u8 *data, u16 size)
u16 i;
struct SaveSector *sector = &gSaveDataBuffer;
ReadFlashSector(sectorId, sector);
- if (sector->security == SECTOR_SECURITY_NUM)
+ if (sector->signature == SECTOR_SIGNATURE)
{
u16 checksum = CalculateChecksum(sector->data, size);
if (sector->id == checksum)
{
- // Security and checksum are correct, copy data
+ // Signature and checksum are correct, copy data
for (i = 0; i < size; i++)
data[i] = sector->data[i];
return SAVE_STATUS_OK;
@@ -660,7 +660,7 @@ static u8 TryLoadSaveSector(u8 sectorId, u8 *data, u16 size)
}
else
{
- // Incorrect security value
+ // Incorrect signature value
return SAVE_STATUS_EMPTY;
}
}
@@ -689,18 +689,18 @@ static u16 CalculateChecksum(void *data, u16 size)
static void UpdateSaveAddresses(void)
{
int i = SECTOR_ID_SAVEBLOCK2;
- gRamSaveSectorLocations[i].data = (void*)(gSaveBlock2Ptr) + sSaveSlotLayout[i].offset;
+ gRamSaveSectorLocations[i].data = (void *)(gSaveBlock2Ptr) + sSaveSlotLayout[i].offset;
gRamSaveSectorLocations[i].size = sSaveSlotLayout[i].size;
for (i = SECTOR_ID_SAVEBLOCK1_START; i <= SECTOR_ID_SAVEBLOCK1_END; i++)
{
- gRamSaveSectorLocations[i].data = (void*)(gSaveBlock1Ptr) + sSaveSlotLayout[i].offset;
+ gRamSaveSectorLocations[i].data = (void *)(gSaveBlock1Ptr) + sSaveSlotLayout[i].offset;
gRamSaveSectorLocations[i].size = sSaveSlotLayout[i].size;
}
for (; i <= SECTOR_ID_PKMN_STORAGE_END; i++) //setting i to SECTOR_ID_PKMN_STORAGE_START does not match
{
- gRamSaveSectorLocations[i].data = (void*)(gPokemonStoragePtr) + sSaveSlotLayout[i].offset;
+ gRamSaveSectorLocations[i].data = (void *)(gPokemonStoragePtr) + sSaveSlotLayout[i].offset;
gRamSaveSectorLocations[i].size = sSaveSlotLayout[i].size;
}
}
@@ -747,7 +747,7 @@ u8 HandleSavingData(u8 saveType)
for(i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++)
HandleReplaceSector(i, gRamSaveSectorLocations);
for(i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++)
- WriteSectorSecurityByte_NoOffset(i, gRamSaveSectorLocations);
+ WriteSectorSignatureByte_NoOffset(i, gRamSaveSectorLocations);
break;
case SAVE_OVERWRITE_DIFFERENT_FILE:
// Erase Hall of Fame
@@ -818,9 +818,9 @@ bool8 LinkFullSave_ReplaceLastSector(void)
return FALSE;
}
-bool8 LinkFullSave_SetLastSectorSecurity(void)
+bool8 LinkFullSave_SetLastSectorSignature(void)
{
- CopySectorSecurityByte(NUM_SECTORS_PER_SLOT, gRamSaveSectorLocations);
+ CopySectorSignatureByte(NUM_SECTORS_PER_SLOT, gRamSaveSectorLocations);
if (gDamagedSaveSectors)
DoSaveFailedScreen(SAVE_NORMAL);
return FALSE;
@@ -852,14 +852,14 @@ bool8 WriteSaveBlock1Sector(void)
{
// Write a single sector of SaveBlock1
HandleReplaceSectorAndVerify(gIncrementalSectorId + 1, gRamSaveSectorLocations);
- WriteSectorSecurityByte(sectorId, gRamSaveSectorLocations);
+ WriteSectorSignatureByte(sectorId, gRamSaveSectorLocations);
}
else
{
// Beyond SaveBlock1, don't write the sector.
- // Does write 1 byte of the next sector's security field, but as these
+ // Does write 1 byte of the next sector's signature field, but as these
// are the same for all valid sectors it doesn't matter.
- WriteSectorSecurityByte(sectorId, gRamSaveSectorLocations);
+ WriteSectorSignatureByte(sectorId, gRamSaveSectorLocations);
finished = TRUE;
}
@@ -924,17 +924,17 @@ u16 GetSaveBlocksPointersBaseOffset(void)
return 0;
}
-u32 TryReadSpecialSaveSector(u8 sector, u8* dst)
+u32 TryReadSpecialSaveSector(u8 sector, u8 *dst)
{
s32 i;
s32 size;
- u8* savData;
+ u8 *savData;
if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE)
return SAVE_STATUS_ERROR;
ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, SECTOR_SIZE);
- if (*(u32*)(&gSaveDataBuffer.data[0]) != SPECIAL_SECTOR_SENTINEL)
+ if (*(u32 *)(&gSaveDataBuffer.data[0]) != SPECIAL_SECTOR_SENTINEL)
return SAVE_STATUS_ERROR;
// Copies whole save sector except u32 counter
@@ -946,18 +946,18 @@ u32 TryReadSpecialSaveSector(u8 sector, u8* dst)
return SAVE_STATUS_OK;
}
-u32 TryWriteSpecialSaveSector(u8 sector, u8* src)
+u32 TryWriteSpecialSaveSector(u8 sector, u8 *src)
{
s32 i;
s32 size;
- u8* savData;
- void* savDataBuffer;
+ u8 *savData;
+ void *savDataBuffer;
if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE)
return SAVE_STATUS_ERROR;
savDataBuffer = &gSaveDataBuffer;
- *(u32*)(savDataBuffer) = SPECIAL_SECTOR_SENTINEL;
+ *(u32 *)(savDataBuffer) = SPECIAL_SECTOR_SENTINEL;
// Copies whole save sector except u32 counter
i = 0;
@@ -978,7 +978,7 @@ u32 TryWriteSpecialSaveSector(u8 sector, u8* src)
// Most notably it does save the PC data.
void Task_LinkFullSave(u8 taskId)
{
- s16* data = gTasks[taskId].data;
+ s16 *data = gTasks[taskId].data;
switch (tState)
{
@@ -1030,7 +1030,7 @@ void Task_LinkFullSave(u8 taskId)
case 8:
if (IsLinkTaskFinished())
{
- LinkFullSave_SetLastSectorSecurity();
+ LinkFullSave_SetLastSectorSignature();
tState = 9;
}
break;
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 9b32a938ff..877482728f 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -50,7 +50,7 @@ static const struct OamData sClockOamData =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 6941742ca1..a1262730ad 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -85,7 +85,7 @@ static const u8 sScriptConditionTable[6][3] =
1, 0, 1, // !=
};
-static u8 * const sScriptStringVars[] =
+static u8 *const sScriptStringVars[] =
{
gStringVar1,
gStringVar2,
@@ -142,7 +142,7 @@ bool8 ScrCmd_callnative(struct ScriptContext *ctx)
bool8 ScrCmd_waitstate(struct ScriptContext *ctx)
{
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -606,7 +606,7 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
{
AnimateFlash(ScriptReadByte(ctx));
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1306,7 +1306,7 @@ bool8 ScrCmd_messageinstant(struct ScriptContext *ctx)
if (msg == NULL)
msg = (const u8 *)ctx->data[0];
LoadMessageBoxAndBorderGfx();
- DrawDialogueFrame(0, 1);
+ DrawDialogueFrame(0, TRUE);
AddTextPrinterParameterized(0, FONT_NORMAL, msg, 0, 1, 0, NULL);
return FALSE;
}
@@ -1345,7 +1345,7 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
if (ScriptMenu_YesNo(left, top) == TRUE)
{
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
else
@@ -1363,7 +1363,7 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
if (ScriptMenu_Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
{
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
else
@@ -1382,7 +1382,7 @@ bool8 ScrCmd_multichoicedefault(struct ScriptContext *ctx)
if (ScriptMenu_MultichoiceWithDefault(left, top, multichoiceId, ignoreBPress, defaultChoice) == TRUE)
{
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
else
@@ -1412,7 +1412,7 @@ bool8 ScrCmd_multichoicegrid(struct ScriptContext *ctx)
if (ScriptMenu_MultichoiceGrid(left, top, multichoiceId, ignoreBPress, numColumns) == TRUE)
{
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
else
@@ -1441,7 +1441,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
/*if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
{
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}*/
return FALSE;
@@ -1478,7 +1478,7 @@ bool8 ScrCmd_showcontestpainting(struct ScriptContext *ctx)
SetContestWinnerForPainting(contestWinnerId);
ShowContestPainting();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1528,7 +1528,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
winTemplate = CreateWindowTemplate(0, xWindow, yWindow + 1, width, height, 0xF, 0x1);
sBrailleWindowId = AddWindow(&winTemplate);
LoadUserWindowBorderGfx(sBrailleWindowId, 0x214, 0xE0);
- DrawStdWindowFrame(sBrailleWindowId, 0);
+ DrawStdWindowFrame(sBrailleWindowId, FALSE);
PutWindowTilemap(sBrailleWindowId);
FillWindowPixelBuffer(sBrailleWindowId, PIXEL_FILL(1));
AddTextPrinterParameterized(sBrailleWindowId, FONT_BRAILLE, gStringVar4, xText, yText, TEXT_SKIP_DRAW, NULL);
@@ -1895,16 +1895,12 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
{
- if(gIsScriptedWildDouble == FALSE)
- {
+ if (gIsScriptedWildDouble == FALSE)
BattleSetup_StartScriptedWildBattle();
- ScriptContext1_Stop();
- }
else
- {
BattleSetup_StartScriptedDoubleWildBattle();
- ScriptContext1_Stop();
- }
+
+ ScriptContext_Stop();
return TRUE;
}
@@ -1914,7 +1910,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx)
const void *ptr = (void *)ScriptReadWord(ctx);
CreatePokemartMenu(ptr);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1923,7 +1919,7 @@ bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx)
const void *ptr = (void *)ScriptReadWord(ctx);
CreateDecorationShop1Menu(ptr);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1933,7 +1929,7 @@ bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
const void *ptr = (void *)ScriptReadWord(ctx);
CreateDecorationShop2Menu(ptr);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1942,7 +1938,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx)
u8 machineId = VarGet(ScriptReadHalfword(ctx));
PlaySlotMachine(machineId, CB2_ReturnToFieldContinueScriptPlayMapMusic);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1970,7 +1966,7 @@ bool8 ScrCmd_getpokenewsactive(struct ScriptContext *ctx)
bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
{
ChooseContestMon();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -1978,21 +1974,21 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
{
StartContest();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx)
{
ShowContestResults();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
{
ContestLinkTransfer(gSpecialVar_ContestCategory);
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;
}
@@ -2147,7 +2143,7 @@ bool8 ScrCmd_addelevmenuitem(struct ScriptContext *ctx)
bool8 ScrCmd_showelevmenu(struct ScriptContext *ctx)
{
/*ScriptShowElevatorMenu();
- ScriptContext1_Stop();
+ ScriptContext_Stop();
return TRUE;*/
return FALSE;
}
@@ -2252,7 +2248,7 @@ bool8 ScrCmd_checkmoneventlegal(struct ScriptContext *ctx)
bool8 ScrCmd_trywondercardscript(struct ScriptContext *ctx)
{
- const u8* script = GetSavedRamScriptIfValid();
+ const u8 *script = GetSavedRamScriptIfValid();
if (script)
{
@@ -2291,7 +2287,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx)
static void CloseBrailleWindow(void)
{
- ClearStdWindowAndFrame(sBrailleWindowId, 1);
+ ClearStdWindowAndFrame(sBrailleWindowId, TRUE);
RemoveWindow(sBrailleWindowId);
}
diff --git a/src/script.c b/src/script.c
index 4728e739cd..484f8e9662 100644
--- a/src/script.c
+++ b/src/script.c
@@ -14,12 +14,18 @@ enum {
SCRIPT_MODE_NATIVE,
};
-extern const u8* gRamScriptRetAddr;
+enum {
+ CONTEXT_RUNNING,
+ CONTEXT_WAITING,
+ CONTEXT_SHUTDOWN,
+};
-static u8 sScriptContext1Status;
-static struct ScriptContext sScriptContext1;
-static struct ScriptContext sScriptContext2;
-static bool8 sScriptContext2Enabled;
+extern const u8 *gRamScriptRetAddr;
+
+static u8 sGlobalScriptContextStatus;
+static struct ScriptContext sGlobalScriptContext;
+static struct ScriptContext sImmediateScriptContext;
+static bool8 sLockFieldControls;
extern ScrCmdFunc gScriptCmdTable[];
extern ScrCmdFunc gScriptCmdTableEnd[];
@@ -173,79 +179,94 @@ u32 ScriptReadWord(struct ScriptContext *ctx)
return (((((value3 << 8) + value2) << 8) + value1) << 8) + value0;
}
-void ScriptContext2_Enable(void)
+void LockPlayerFieldControls(void)
{
- sScriptContext2Enabled = TRUE;
+ sLockFieldControls = TRUE;
}
-void ScriptContext2_Disable(void)
+void UnlockPlayerFieldControls(void)
{
- sScriptContext2Enabled = FALSE;
+ sLockFieldControls = FALSE;
}
-bool8 ScriptContext2_IsEnabled(void)
+bool8 ArePlayerFieldControlsLocked(void)
{
- return sScriptContext2Enabled;
+ return sLockFieldControls;
}
-bool8 ScriptContext1_IsScriptSetUp(void)
+// The ScriptContext_* functions work with the primary script context,
+// which yields control back to native code should the script make a wait call.
+
+// Checks if the global script context is able to be run right now.
+bool8 ScriptContext_IsEnabled(void)
{
- if (sScriptContext1Status == 0)
+ if (sGlobalScriptContextStatus == CONTEXT_RUNNING)
return TRUE;
else
return FALSE;
}
-void ScriptContext1_Init(void)
+// Re-initializes the global script context to zero.
+void ScriptContext_Init(void)
{
- InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
- sScriptContext1Status = 2;
+ InitScriptContext(&sGlobalScriptContext, gScriptCmdTable, gScriptCmdTableEnd);
+ sGlobalScriptContextStatus = CONTEXT_SHUTDOWN;
}
-bool8 ScriptContext2_RunScript(void)
+// Runs the script until the script makes a wait* call, then returns true if
+// there's more script to run, or false if the script has hit the end.
+// This function also returns false if the context is finished
+// or waiting (after a call to _Stop)
+bool8 ScriptContext_RunScript(void)
{
- if (sScriptContext1Status == 2)
+ if (sGlobalScriptContextStatus == CONTEXT_SHUTDOWN)
return FALSE;
- if (sScriptContext1Status == 1)
+ if (sGlobalScriptContextStatus == CONTEXT_WAITING)
return FALSE;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
- if (!RunScriptCommand(&sScriptContext1))
+ if (!RunScriptCommand(&sGlobalScriptContext))
{
- sScriptContext1Status = 2;
- ScriptContext2_Disable();
+ sGlobalScriptContextStatus = CONTEXT_SHUTDOWN;
+ UnlockPlayerFieldControls();
return FALSE;
}
return TRUE;
}
-void ScriptContext1_SetupScript(const u8 *ptr)
+// Sets up a new script in the global context and enables the context
+void ScriptContext_SetupScript(const u8 *ptr)
{
- InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
- SetupBytecodeScript(&sScriptContext1, ptr);
- ScriptContext2_Enable();
- sScriptContext1Status = 0;
+ InitScriptContext(&sGlobalScriptContext, gScriptCmdTable, gScriptCmdTableEnd);
+ SetupBytecodeScript(&sGlobalScriptContext, ptr);
+ LockPlayerFieldControls();
+ sGlobalScriptContextStatus = CONTEXT_RUNNING;
}
-void ScriptContext1_Stop(void)
+// Puts the script into waiting mode; usually called from a wait* script command.
+void ScriptContext_Stop(void)
{
- sScriptContext1Status = 1;
+ sGlobalScriptContextStatus = CONTEXT_WAITING;
}
-void EnableBothScriptContexts(void)
+// Puts the script into running mode.
+void ScriptContext_Enable(void)
{
- sScriptContext1Status = 0;
- ScriptContext2_Enable();
+ sGlobalScriptContextStatus = CONTEXT_RUNNING;
+ LockPlayerFieldControls();
}
-void ScriptContext2_RunNewScript(const u8 *ptr)
+// Sets up and runs a script in its own context immediately. The script will be
+// finished when this function returns. Used mainly by all of the map header
+// scripts (except the frame table scripts).
+void RunScriptImmediately(const u8 *ptr)
{
- InitScriptContext(&sScriptContext2, gScriptCmdTable, gScriptCmdTableEnd);
- SetupBytecodeScript(&sScriptContext2, ptr);
- while (RunScriptCommand(&sScriptContext2) == TRUE);
+ InitScriptContext(&sImmediateScriptContext, gScriptCmdTable, gScriptCmdTableEnd);
+ SetupBytecodeScript(&sImmediateScriptContext, ptr);
+ while (RunScriptCommand(&sImmediateScriptContext) == TRUE);
}
u8 *MapHeaderGetScriptTable(u8 tag)
@@ -272,7 +293,7 @@ void MapHeaderRunScriptType(u8 tag)
{
u8 *ptr = MapHeaderGetScriptTable(tag);
if (ptr)
- ScriptContext2_RunNewScript(ptr);
+ RunScriptImmediately(ptr);
}
u8 *MapHeaderCheckScriptTable(u8 tag)
@@ -336,7 +357,7 @@ bool8 TryRunOnFrameMapScript(void)
if (!ptr)
return FALSE;
- ScriptContext1_SetupScript(ptr);
+ ScriptContext_SetupScript(ptr);
return TRUE;
}
@@ -344,12 +365,12 @@ void TryRunOnWarpIntoMapScript(void)
{
u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE);
if (ptr)
- ScriptContext2_RunNewScript(ptr);
+ RunScriptImmediately(ptr);
}
u32 CalculateRamScriptChecksum(void)
{
- return CalcCRC16WithTable((u8*)(&gSaveBlock1Ptr->ramScript.data), sizeof(gSaveBlock1Ptr->ramScript.data));
+ return CalcCRC16WithTable((u8 *)(&gSaveBlock1Ptr->ramScript.data), sizeof(gSaveBlock1Ptr->ramScript.data));
}
void ClearRamScript(void)
diff --git a/src/script_menu.c b/src/script_menu.c
index 1680758f21..d25f28cb29 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -107,7 +107,7 @@ static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreB
newWidth = ConvertPixelWidthToTileWidth(width);
left = ScriptMenu_AdjustLeftCoordFromWidth(left, newWidth);
windowId = CreateWindowFromRect(left, top, newWidth, count * 2);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
PrintMenuTable(windowId, count, actions);
InitMenuInUpperLeftCornerNormal(windowId, count, cursorPos);
ScheduleBgCopyTilemapToVram(0);
@@ -190,7 +190,7 @@ static void Task_HandleMultichoiceInput(u8 taskId)
}
ClearToTransparentAndRemoveWindow(tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
}
@@ -245,7 +245,7 @@ static void Task_HandleYesNoInput(u8 taskId)
}
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 columnCount)
@@ -277,7 +277,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, bool8 ignore
gTasks[taskId].tIgnoreBPress = ignoreBPress;
gTasks[taskId].tWindowId = CreateWindowFromRect(left, top, columnCount * newWidth, rowCount * 2);
- SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, 0);
+ SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, FALSE);
PrintMenuGridTable(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, sMultichoiceLists[multichoiceId].list);
InitMenuActionGrid(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, 0);
CopyWindowToVram(gTasks[taskId].tWindowId, COPYWIN_FULL);
@@ -307,7 +307,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId)
ClearToTransparentAndRemoveWindow(tWindowId);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
#undef tWindowId
@@ -352,7 +352,7 @@ static void CreatePCMultichoice(void)
{
numChoices = 4;
windowId = CreateWindowFromRect(0, 0, width, 8);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_HallOfFame, y, 33, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_LogOff, y, 49, TEXT_SKIP_DRAW, NULL);
}
@@ -360,7 +360,7 @@ static void CreatePCMultichoice(void)
{
numChoices = 3;
windowId = CreateWindowFromRect(0, 0, width, 6);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_LogOff, y, 33, TEXT_SKIP_DRAW, NULL);
}
@@ -380,7 +380,7 @@ static void CreatePCMultichoice(void)
void ScriptMenu_DisplayPCStartupPrompt(void)
{
LoadMessageBoxAndFrameGfx(0, TRUE);
- AddTextPrinterParameterized2(0, FONT_NORMAL, gText_WhichPCShouldBeAccessed, 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, gText_WhichPCShouldBeAccessed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
}
bool8 ScriptMenu_CreateLilycoveSSTidalMultichoice(void)
@@ -521,7 +521,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
width = ConvertPixelWidthToTileWidth(pixelWidth);
windowId = CreateWindowFromRect(MAX_MULTICHOICE_WIDTH - width, (6 - count) * 2, width, count * 2);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
for (selectionCount = 0, i = 0; i < SSTIDAL_SELECTION_COUNT; i++)
{
@@ -595,7 +595,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y)
gTasks[taskId].tMonSpriteId = spriteId;
gSprites[spriteId].callback = SpriteCallbackDummy;
gSprites[spriteId].oam.priority = 0;
- SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, 1);
+ SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, TRUE);
ScheduleBgCopyTilemapToVram(0);
return TRUE;
}
@@ -646,27 +646,27 @@ static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId)
{
case MULTI_WIRELESS_NO_BERRY:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptionsNoBerryCrush[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptionsNoBerryCrush[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break;
case MULTI_CABLE_CLUB_WITH_RECORD_MIX:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_WithRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_WithRecordMix[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break;
case MULTI_WIRELESS_NO_RECORD:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break;
case MULTI_WIRELESS_ALL_SERVICES:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_AllServices[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_AllServices[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break;
case MULTI_WIRELESS_NO_RECORD_BERRY:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMixBerryCrush[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMixBerryCrush[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break;
case MULTI_CABLE_CLUB_NO_RECORD_MIX:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break;
}
}
@@ -688,7 +688,7 @@ bool16 ScriptMenu_CreateStartMenuForPokenavTutorial(void)
static void CreateStartMenuForPokenavTutorial(void)
{
u8 windowId = CreateWindowFromRect(21, 0, 7, 18);
- SetStandardWindowBorderStyle(windowId, 0);
+ SetStandardWindowBorderStyle(windowId, FALSE);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionPokedex, 8, 9, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionPokemon, 8, 25, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_MenuOptionBag, 8, 41, TEXT_SKIP_DRAW, NULL);
diff --git a/src/secret_base.c b/src/secret_base.c
index fa424889e0..74129d3ff5 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -461,7 +461,7 @@ static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId)
ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH);
if (IsWeatherNotFadingIn() == TRUE)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
@@ -470,7 +470,7 @@ static void EnterNewlyCreatedSecretBase_StartFadeIn(void)
{
s16 x, y;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
HideMapNamePopUpWindow();
FindMetatileIdMapCoords(&x, &y, METATILE_SecretBase_PC);
x += MAP_OFFSET;
@@ -673,7 +673,7 @@ void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEven
{
SetCurSecretBaseIdFromPosition(position, events);
TrySetCurSecretBaseIndex();
- ScriptContext1_SetupScript(SecretBase_EventScript_Enter);
+ ScriptContext_SetupScript(SecretBase_EventScript_Enter);
}
bool8 TrySetCurSecretBase(void)
@@ -691,7 +691,7 @@ static void Task_WarpOutOfSecretBase(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
gTasks[taskId].data[0] = 1;
break;
case 1:
@@ -703,7 +703,7 @@ static void Task_WarpOutOfSecretBase(u8 taskId)
WarpIntoMap();
gFieldCallback = FieldCB_DefaultWarpExit;
SetMainCallback2(CB2_LoadMap);
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
break;
}
@@ -914,13 +914,13 @@ void ShowSecretBaseRegistryMenu(void)
static void Task_ShowSecretBaseRegistryMenu(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
tNumBases = GetNumRegisteredSecretBases();
if (tNumBases != 0)
{
tSelectedRow = 0;
tScrollOffset = 0;
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
sRegistryMenu = calloc(1, sizeof(*sRegistryMenu));
tMainWindowId = AddWindow(&sRegistryWindowTemplates[0]);
BuildRegistryMenuItems(taskId);
@@ -976,7 +976,7 @@ static void RegistryMenu_OnCursorMove(s32 unused, bool8 flag, struct ListMenu *m
static void FinalizeRegistryMenu(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- SetStandardWindowBorderStyle(tMainWindowId, 0);
+ SetStandardWindowBorderStyle(tMainWindowId, FALSE);
tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, tScrollOffset, tSelectedRow);
AddRegistryMenuScrollArrows(taskId);
ScheduleBgCopyTilemapToVram(0);
@@ -1002,7 +1002,7 @@ static void HandleRegistryMenuInput(u8 taskId)
PlaySE(SE_SELECT);
DestroyListMenuTask(tListTaskId, NULL, NULL);
RemoveScrollIndicatorArrowPair(tArrowTaskId);
- ClearStdWindowAndFrame(tMainWindowId, 0);
+ ClearStdWindowAndFrame(tMainWindowId, FALSE);
ClearWindowTilemap(tMainWindowId);
RemoveWindow(tMainWindowId);
ScheduleBgCopyTilemapToVram(0);
@@ -1025,7 +1025,7 @@ static void ShowRegistryMenuActions(u8 taskId)
template = sRegistryWindowTemplates[1];
template.width = GetMaxWidthInMenuTable(sRegistryMenuActions, 2);
tActionWindowId = AddWindow(&template);
- SetStandardWindowBorderStyle(tActionWindowId, 0);
+ SetStandardWindowBorderStyle(tActionWindowId, FALSE);
PrintMenuTable(tActionWindowId, ARRAY_COUNT(sRegistryMenuActions), sRegistryMenuActions);
InitMenuInUpperLeftCornerNormal(tActionWindowId, ARRAY_COUNT(sRegistryMenuActions), 0);
ScheduleBgCopyTilemapToVram(0);
@@ -1073,7 +1073,7 @@ static void ShowRegistryMenuDeleteYesNo(u8 taskId)
void DeleteRegistry_Yes_Callback(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
DestroyListMenuTask(tListTaskId, &tScrollOffset, &tSelectedRow);
gSaveBlock1Ptr->secretBases[tSelectedBaseId].registryStatus = UNREGISTERED;
BuildRegistryMenuItems(taskId);
@@ -1090,7 +1090,7 @@ static void DeleteRegistry_Yes(u8 taskId)
static void DeleteRegistry_No(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- ClearDialogWindowAndFrame(0, 0);
+ ClearDialogWindowAndFrame(0, FALSE);
DestroyListMenuTask(tListTaskId, &tScrollOffset, &tSelectedRow);
FinalizeRegistryMenu(taskId);
gTasks[taskId].func = HandleRegistryMenuInput;
@@ -1100,7 +1100,7 @@ static void ReturnToMainRegistryMenu(u8 taskId)
{
s16 *data = gTasks[taskId].data;
AddRegistryMenuScrollArrows(taskId);
- ClearStdWindowAndFrame(tActionWindowId, 0);
+ ClearStdWindowAndFrame(tActionWindowId, FALSE);
ClearWindowTilemap(tActionWindowId);
RemoveWindow(tActionWindowId);
ScheduleBgCopyTilemapToVram(0);
@@ -1110,9 +1110,9 @@ static void ReturnToMainRegistryMenu(u8 taskId)
static void GoToSecretBasePCRegisterMenu(u8 taskId)
{
if (VarGet(VAR_CURRENT_SECRET_BASE) == 0)
- ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel);
+ ScriptContext_SetupScript(SecretBase_EventScript_PCCancel);
else
- ScriptContext1_SetupScript(SecretBase_EventScript_ShowRegisterMenu);
+ ScriptContext_SetupScript(SecretBase_EventScript_ShowRegisterMenu);
DestroyTask(taskId);
}
diff --git a/src/shop.c b/src/shop.c
index 700a53e37a..451fa171cb 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -63,7 +63,7 @@ static void BuyMenuBuildListMenuTemplate(void);
static void BuyMenuInitBgs(void);
static void BuyMenuInitWindows(void);
static void BuyMenuDecompressBgGraphics(void);
-static void BuyMenuSetListEntry(struct ListMenuItem*, u16, u8*);
+static void BuyMenuSetListEntry(struct ListMenuItem *, u16, u8 *);
static void BuyMenuAddItemIcon(u16, u8);
static void BuyMenuRemoveItemIcon(u16, u8);
static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet);
@@ -73,7 +73,7 @@ static void BuyMenuCollectObjectEventData(void);
static void BuyMenuDrawObjectEvents(void);
static void BuyMenuDrawMapBg(void);
static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int);
-static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8);
+static void BuyMenuDrawMapMetatile(s16, s16, const u16 *, u8);
static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src);
static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *);
static void ExitBuyMenu(u8 taskId);
@@ -277,7 +277,7 @@ static u8 CreateShopMenu(u8 martType)
{
int numMenuItems;
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
sMartInfo.martType = martType;
if (martType == MART_TYPE_NORMAL)
@@ -299,7 +299,7 @@ static u8 CreateShopMenu(u8 martType)
numMenuItems = ARRAY_COUNT(sShopMenuActions_BuyQuit);
}
- SetStandardWindowBorderStyle(sMartInfo.windowId, 0);
+ SetStandardWindowBorderStyle(sMartInfo.windowId, FALSE);
PrintMenuTable(sMartInfo.windowId, numMenuItems, sMartInfo.menuActions);
InitMenuInUpperLeftCornerNormal(sMartInfo.windowId, numMenuItems, 0);
PutWindowTilemap(sMartInfo.windowId);
@@ -370,10 +370,10 @@ void CB2_ExitSellMenu(void)
static void Task_HandleShopMenuQuit(u8 taskId)
{
- ClearStdWindowAndFrameToTransparent(sMartInfo.windowId, 2);
+ ClearStdWindowAndFrameToTransparent(sMartInfo.windowId, 2); // Incorrect use, making it not copy it to vram.
RemoveWindow(sMartInfo.windowId);
TryPutSmartShopperOnAir();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
DestroyTask(taskId);
if (sMartInfo.callback)
@@ -747,11 +747,11 @@ static void BuyMenuDrawMapBg(void)
if (metatile < NUM_METATILES_IN_PRIMARY)
{
- BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
+ BuyMenuDrawMapMetatile(i, j, (u16 *)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
}
else
{
- BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
+ BuyMenuDrawMapMetatile(i, j, (u16 *)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
}
}
}
@@ -1022,8 +1022,8 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
- ClearStdWindowAndFrameToTransparent(4, 0);
- ClearStdWindowAndFrameToTransparent(3, 0);
+ ClearStdWindowAndFrameToTransparent(4, FALSE);
+ ClearStdWindowAndFrameToTransparent(3, FALSE);
ClearWindowTilemap(4);
ClearWindowTilemap(3);
PutWindowTilemap(1);
@@ -1035,8 +1035,8 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
- ClearStdWindowAndFrameToTransparent(4, 0);
- ClearStdWindowAndFrameToTransparent(3, 0);
+ ClearStdWindowAndFrameToTransparent(4, FALSE);
+ ClearStdWindowAndFrameToTransparent(3, FALSE);
ClearWindowTilemap(4);
ClearWindowTilemap(3);
BuyMenuReturnToItemList(taskId);
@@ -1131,7 +1131,7 @@ static void BuyMenuReturnToItemList(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- ClearDialogWindowAndFrameToTransparent(5, 0);
+ ClearDialogWindowAndFrameToTransparent(5, FALSE);
BuyMenuPrintCursor(tListTaskId, 1);
PutWindowTilemap(1);
PutWindowTilemap(2);
@@ -1210,19 +1210,19 @@ void CreatePokemartMenu(const u16 *itemsForSale)
CreateShopMenu(MART_TYPE_NORMAL);
SetShopItemsForSale(itemsForSale);
ClearItemPurchases();
- SetShopMenuCallback(EnableBothScriptContexts);
+ SetShopMenuCallback(ScriptContext_Enable);
}
void CreateDecorationShop1Menu(const u16 *itemsForSale)
{
CreateShopMenu(MART_TYPE_DECOR);
SetShopItemsForSale(itemsForSale);
- SetShopMenuCallback(EnableBothScriptContexts);
+ SetShopMenuCallback(ScriptContext_Enable);
}
void CreateDecorationShop2Menu(const u16 *itemsForSale)
{
CreateShopMenu(MART_TYPE_DECOR2);
SetShopItemsForSale(itemsForSale);
- SetShopMenuCallback(EnableBothScriptContexts);
+ SetShopMenuCallback(ScriptContext_Enable);
}
diff --git a/src/slot_machine.c b/src/slot_machine.c
index cb6a380d67..dd2622e2be 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -605,7 +605,7 @@ static bool8 IsReelTimeSmokeAnimFinished(void);
static void DestroyReelTimeSmokeSprite(void);
static u8 CreatePikaPowerBoltSprite(s16, s16);
static void DestroyPikaPowerBoltSprite(u8);
-static u8 CreateDigitalDisplaySprite(u8, void (*callback)(struct Sprite*), s16, s16, s16);
+static u8 CreateDigitalDisplaySprite(u8, void (*callback)(struct Sprite *), s16, s16, s16);
static void LoadSlotMachineGfx(void);
static void LoadReelBackground(void);
static void LoadMenuGfx(void);
@@ -5672,7 +5672,7 @@ static const struct OamData sOam_8x8 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
@@ -5689,7 +5689,7 @@ static const struct OamData sOam_8x16 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16),
.x = 0,
@@ -5706,7 +5706,7 @@ static const struct OamData sOam_16x16 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -5723,7 +5723,7 @@ static const struct OamData sOam_16x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32),
.x = 0,
@@ -5740,7 +5740,7 @@ static const struct OamData sOam_32x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -5757,7 +5757,7 @@ static const struct OamData sOam_32x64 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x64),
.x = 0,
@@ -5774,7 +5774,7 @@ static const struct OamData sOam_64x32 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -5791,7 +5791,7 @@ static const struct OamData sOam_64x64 =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/sound.c b/src/sound.c
index 731b673342..955895c637 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -156,7 +156,8 @@ void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed)
sMapMusicFadeInSpeed = fadeInSpeed;
}
-void FadeInNewMapMusic(u16 songNum, u8 speed)
+// Unused
+static void FadeInNewMapMusic(u16 songNum, u8 speed)
{
FadeInNewBGM(songNum, speed);
sCurrentMapMusic = songNum;
diff --git a/src/start_menu.c b/src/start_menu.c
index 11189ee831..2a45f8d69c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -139,7 +139,7 @@ static bool8 FieldCB_ReturnToFieldStartMenu(void);
static const struct WindowTemplate sSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
-static const u8* const sPyramidFloorNames[FRONTIER_STAGES_PER_CHALLENGE + 1] =
+static const u8 *const sPyramidFloorNames[FRONTIER_STAGES_PER_CHALLENGE + 1] =
{
gText_Floor1,
gText_Floor2,
@@ -156,19 +156,19 @@ static const struct WindowTemplate sPyramidFloorWindowTemplate_1 = {0, 1, 1, 0xC
static const struct MenuAction sStartMenuItems[] =
{
- {gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback}},
- {gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback}},
- {gText_MenuBag, {.u8_void = StartMenuBagCallback}},
- {gText_MenuPokenav, {.u8_void = StartMenuPokeNavCallback}},
- {gText_MenuPlayer, {.u8_void = StartMenuPlayerNameCallback}},
- {gText_MenuSave, {.u8_void = StartMenuSaveCallback}},
- {gText_MenuOption, {.u8_void = StartMenuOptionCallback}},
- {gText_MenuExit, {.u8_void = StartMenuExitCallback}},
- {gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback}},
- {gText_MenuPlayer, {.u8_void = StartMenuLinkModePlayerNameCallback}},
- {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
- {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
- {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}
+ [MENU_ACTION_POKEDEX] = {gText_MenuPokedex, {.u8_void = StartMenuPokedexCallback}},
+ [MENU_ACTION_POKEMON] = {gText_MenuPokemon, {.u8_void = StartMenuPokemonCallback}},
+ [MENU_ACTION_BAG] = {gText_MenuBag, {.u8_void = StartMenuBagCallback}},
+ [MENU_ACTION_POKENAV] = {gText_MenuPokenav, {.u8_void = StartMenuPokeNavCallback}},
+ [MENU_ACTION_PLAYER] = {gText_MenuPlayer, {.u8_void = StartMenuPlayerNameCallback}},
+ [MENU_ACTION_SAVE] = {gText_MenuSave, {.u8_void = StartMenuSaveCallback}},
+ [MENU_ACTION_OPTION] = {gText_MenuOption, {.u8_void = StartMenuOptionCallback}},
+ [MENU_ACTION_EXIT] = {gText_MenuExit, {.u8_void = StartMenuExitCallback}},
+ [MENU_ACTION_RETIRE_SAFARI] = {gText_MenuRetire, {.u8_void = StartMenuSafariZoneRetireCallback}},
+ [MENU_ACTION_PLAYER_LINK] = {gText_MenuPlayer, {.u8_void = StartMenuLinkModePlayerNameCallback}},
+ [MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
+ [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
+ [MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}
};
static const struct BgTemplate sBgTemplates_LinkBattleSave[] =
@@ -535,7 +535,7 @@ void ShowReturnToFieldStartMenu(void)
void Task_ShowStartMenu(u8 taskId)
{
- struct Task* task = &gTasks[taskId];
+ struct Task *task = &gTasks[taskId];
switch(task->data[0])
{
@@ -562,7 +562,7 @@ void ShowStartMenu(void)
StopPlayerAvatar();
}
CreateStartMenuTask(Task_ShowStartMenu);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static bool8 HandleStartMenuInput(void)
@@ -763,7 +763,7 @@ void ShowBattlePyramidStartMenu(void)
ClearDialogWindowAndFrameToTransparent(0, FALSE);
ScriptUnfreezeObjectEvents();
CreateStartMenuTask(Task_ShowStartMenu);
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
}
static bool8 StartMenuBattlePyramidBagCallback(void)
@@ -804,7 +804,7 @@ static bool8 SaveCallback(void)
case SAVE_ERROR: // Close start menu
ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
SoftResetInBattlePyramid();
return TRUE;
}
@@ -841,8 +841,8 @@ static bool8 BattlePyramidRetireCallback(void)
case SAVE_CANCELED: // Yes (Retire from battle pyramid)
ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
- ScriptContext1_SetupScript(BattlePyramid_Retire);
+ UnlockPlayerFieldControls();
+ ScriptContext_SetupScript(BattlePyramid_Retire);
return TRUE;
}
@@ -901,7 +901,7 @@ static void SaveGameTask(u8 taskId)
}
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static void HideSaveMessageWindow(void)
@@ -1378,7 +1378,7 @@ static void Task_WaitForBattleTowerLinkSave(u8 taskId)
if (!FuncIsActiveTask(Task_LinkFullSave))
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
}
@@ -1398,7 +1398,7 @@ static void HideStartMenuWindow(void)
ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE);
RemoveStartMenuWindow();
ScriptUnfreezeObjectEvents();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
void HideStartMenu(void)
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 81a88e7714..cbe0c7ee61 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -160,7 +160,7 @@ static const struct OamData sOam_Hand =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -177,7 +177,7 @@ static const struct OamData sOam_Pokeball =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
@@ -194,7 +194,7 @@ static const struct OamData sOam_StarterCircle =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/strings.c b/src/strings.c
index 853c6a3b1b..92253de878 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1187,7 +1187,7 @@ const u8 gText_PsychUp48BP[] = _("PSYCH UP{CLEAR_TO 0x4E}48BP");
const u8 gText_IcePunch48BP[] = _("ICE PUNCH{CLEAR_TO 0x4E}48BP");
const u8 gText_ThunderPunch48BP[] = _("THUNDERPUNCH{CLEAR_TO 0x4E}48BP");
const u8 gText_FirePunch48BP[] = _("FIRE PUNCH{CLEAR_TO 0x4E}48BP");
-const u8 gText_PkmnFainted3[] = _("{STR_VAR_1} fainted…\p\n");
+const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} fainted…\p\n");
const u8 gText_Marco[] = _("MARCO");
const u8 gText_TrainerCardName[] = _("NAME: ");
const u8 gText_TrainerCardIDNo[] = _("IDNo.");
diff --git a/src/time_events.c b/src/time_events.c
index 3f56d3ab5e..cec6a44c34 100644
--- a/src/time_events.c
+++ b/src/time_events.c
@@ -95,7 +95,7 @@ static void Task_WaitWeather(u8 taskId)
{
if (IsWeatherChangeComplete())
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
}
diff --git a/src/title_screen.c b/src/title_screen.c
index d64ee6024f..25a1d60d05 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -105,7 +105,7 @@ static const struct OamData sVersionBannerLeftOamData =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_8BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -122,7 +122,7 @@ static const struct OamData sVersionBannerRightOamData =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_8BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
@@ -193,7 +193,7 @@ static const struct OamData sOamData_CopyrightBanner =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
@@ -305,7 +305,7 @@ static const struct OamData sPokemonLogoShineOamData =
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
diff --git a/src/trade.c b/src/trade.c
index 1b2b38bd96..ad990e980b 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -4701,7 +4701,7 @@ static void CB2_SaveAndEndTrade(void)
case 42:
if (_IsLinkTaskFinished())
{
- LinkFullSave_SetLastSectorSecurity();
+ LinkFullSave_SetLastSectorSignature();
gMain.state = 5;
}
break;
@@ -4787,7 +4787,7 @@ static void CB2_FreeTradeData(void)
void DoInGameTradeScene(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
CreateTask(Task_InGameTrade, 10);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
@@ -4814,7 +4814,7 @@ static void CheckPartnersMonForRibbons(void)
FlagSet(FLAG_SYS_RIBBON_GET);
}
-void InitTradeBg(void)
+void LoadTradeAnimGfx(void)
{
InitTradeBgInternal();
}
@@ -5005,7 +5005,7 @@ static void CB2_SaveAndEndWirelessTrade(void)
case 8:
if (_IsLinkTaskFinished())
{
- LinkFullSave_SetLastSectorSecurity();
+ LinkFullSave_SetLastSectorSignature();
gMain.state = 9;
}
break;
diff --git a/src/trader.c b/src/trader.c
index 040ee695b3..48ce5d2681 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -15,7 +15,7 @@
#include "task.h"
#include "script_menu.h"
-static const u8 * const sDefaultTraderNames[NUM_TRADER_ITEMS] =
+static const u8 *const sDefaultTraderNames[NUM_TRADER_ITEMS] =
{
gText_Tristan,
gText_Philip,
@@ -109,7 +109,7 @@ void Task_BufferDecorSelectionAndCloseWindow(u8 taskId, u8 decorationId)
RemoveWindow(tWindowId);
ScheduleBgCopyTilemapToVram(0);
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void Task_HandleGetDecorationMenuInput(u8 taskId)
@@ -186,14 +186,14 @@ void DecorationItemsMenuAction_Trade(u8 taskId)
gSpecialVar_0x8006 = 0xFFFF;
}
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void ExitTraderMenu(u8 taskId)
{
gSpecialVar_0x8006 = 0;
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void TraderDoDecorationTrade(void)
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 264f15742a..ab7b3c9131 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -97,8 +97,8 @@ static void CloseTrainerCard(u8 task);
static bool8 PrintAllOnCardFront(void);
static void DrawTrainerCardWindow(u8);
static void CreateTrainerCardTrainerPic(void);
-static void DrawCardScreenBackground(u16*);
-static void DrawCardFrontOrBack(u16*);
+static void DrawCardScreenBackground(u16 *);
+static void DrawCardFrontOrBack(u16 *);
static void DrawStarsAndBadgesOnCard(void);
static void PrintTimeOnCard(void);
static void FlipTrainerCard(void);
@@ -107,10 +107,10 @@ static bool8 LoadCardGfx(void);
static void CB2_InitTrainerCard(void);
static u32 GetCappedGameStat(u8 statId, u32 maxValue);
static bool8 HasAllFrontierSymbols(void);
-static u8 GetRubyTrainerStars(struct TrainerCard*);
+static u8 GetRubyTrainerStars(struct TrainerCard *);
static u16 GetCaughtMonsCount(void);
-static void SetPlayerCardData(struct TrainerCard*, u8);
-static void TrainerCard_GenerateCardForPlayer(struct TrainerCard*);
+static void SetPlayerCardData(struct TrainerCard *, u8);
+static void TrainerCard_GenerateCardForPlayer(struct TrainerCard *);
static u8 VersionToCardType(u8);
static void SetDataFromTrainerCard(void);
static void InitGpuRegs(void);
@@ -147,17 +147,17 @@ static void BufferUnionRoomStats(void);
static void BufferLinkPokeblocksNum(void);
static void BufferLinkContestNum(void);
static void BufferBattleFacilityStats(void);
-static void PrintStatOnBackOfCard(u8 top, const u8* str1, u8* str2, const u8* color);
+static void PrintStatOnBackOfCard(u8 top, const u8 *str1, u8 *str2, const u8 *color);
static void LoadStickerGfx(void);
static u8 SetCardBgsAndPals(void);
static void DrawCardBackStats(void);
static void Task_DoCardFlipTask(u8);
-static bool8 Task_BeginCardFlip(struct Task* task);
-static bool8 Task_AnimateCardFlipDown(struct Task* task);
-static bool8 Task_DrawFlippedCardSide(struct Task* task);
-static bool8 Task_SetCardFlipped(struct Task* task);
-static bool8 Task_AnimateCardFlipUp(struct Task* task);
-static bool8 Task_EndCardFlip(struct Task* task);
+static bool8 Task_BeginCardFlip(struct Task *task);
+static bool8 Task_AnimateCardFlipDown(struct Task *task);
+static bool8 Task_DrawFlippedCardSide(struct Task *task);
+static bool8 Task_SetCardFlipped(struct Task *task);
+static bool8 Task_AnimateCardFlipUp(struct Task *task);
+static bool8 Task_EndCardFlip(struct Task *task);
static void UpdateCardFlipRegs(u16);
static void LoadMonIconGfx(void);
@@ -496,7 +496,7 @@ static void Task_TrainerCard(u8 taskId)
break;
case STATE_WAIT_LINK_PARTNER:
SetCloseLinkCallback();
- DrawDialogueFrame(0, 1);
+ DrawDialogueFrame(0, TRUE);
AddTextPrinterParameterized(0, FONT_NORMAL, gText_WaitingTrainerFinishReading, 0, 1, 255, 0);
CopyWindowToVram(0, COPYWIN_FULL);
sData->mainState = STATE_CLOSE_CARD_LINK;
@@ -772,7 +772,7 @@ void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCard)
trainerCard->version = GAME_VERSION;
SetPlayerCardData(trainerCard, CARD_TYPE_EMERALD);
trainerCard->linkHasAllFrontierSymbols = HasAllFrontierSymbols();
- *((u16*)&trainerCard->linkPoints.frontier) = gSaveBlock2Ptr->frontier.cardBattlePoints;
+ *((u16 *)&trainerCard->linkPoints.frontier) = gSaveBlock2Ptr->frontier.cardBattlePoints;
if (trainerCard->linkHasAllFrontierSymbols)
trainerCard->stars++;
@@ -799,7 +799,7 @@ void CopyTrainerCardData(struct TrainerCard *dst, struct TrainerCard *src, u8 ga
memcpy(dst, src, 0x60);
dst->linkPoints.frontier = 0;
dst->hasAllFrontierSymbols = src->linkHasAllFrontierSymbols;
- dst->frontierBP = *((u16*)&src->linkPoints.frontier);
+ dst->frontierBP = *((u16 *)&src->linkPoints.frontier);
break;
}
}
@@ -996,7 +996,7 @@ static void BufferTextsVarsForCardPage2(void)
static void PrintNameOnCardFront(void)
{
u8 buffer[32];
- u8* txtPtr;
+ u8 *txtPtr;
txtPtr = StringCopy(buffer, gText_TrainerCardName);
StringCopy(txtPtr, sData->trainerCard.playerName);
ConvertInternationalString(txtPtr, sData->language);
@@ -1009,7 +1009,7 @@ static void PrintNameOnCardFront(void)
static void PrintIdOnCard(void)
{
u8 buffer[32];
- u8* txtPtr;
+ u8 *txtPtr;
s32 xPos;
u32 top;
txtPtr = StringCopy(buffer, gText_TrainerCardIDNo);
@@ -1186,7 +1186,7 @@ static void BufferHofDebutTime(void)
}
}
-static void PrintStatOnBackOfCard(u8 top, const u8* statName, u8* stat, const u8* color)
+static void PrintStatOnBackOfCard(u8 top, const u8 *statName, u8 *stat, const u8 *color)
{
static const u8 xOffsets[] = {8, 16};
static const u8 widths[] = {216, 216};
@@ -1471,7 +1471,7 @@ static void DrawCardScreenBackground(u16 *ptr)
CopyBgTilemapBufferToVram(2);
}
-static void DrawCardFrontOrBack(u16* ptr)
+static void DrawCardFrontOrBack(u16 *ptr)
{
s16 i, j;
u16 *dst = sData->cardTilemapBuffer;
@@ -1570,7 +1570,7 @@ static void BlinkTimeColon(void)
u8 GetTrainerCardStars(u8 cardId)
{
- struct TrainerCard* trainerCards = gTrainerCards;
+ struct TrainerCard *trainerCards = gTrainerCards;
return trainerCards[cardId].stars;
}
@@ -1598,7 +1598,7 @@ static void Task_DoCardFlipTask(u8 taskId)
;
}
-static bool8 Task_BeginCardFlip(struct Task* task)
+static bool8 Task_BeginCardFlip(struct Task *task)
{
u32 i;
@@ -1615,7 +1615,7 @@ static bool8 Task_BeginCardFlip(struct Task* task)
// Note: Cannot be DISPLAY_HEIGHT / 2, or cardHeight will be 0
#define CARD_FLIP_Y ((DISPLAY_HEIGHT / 2) - 3)
-static bool8 Task_AnimateCardFlipDown(struct Task* task)
+static bool8 Task_AnimateCardFlipDown(struct Task *task)
{
u32 cardHeight, r5, r10, cardTop, r6, var_24, cardBottom, var;
s16 i;
@@ -1660,7 +1660,7 @@ static bool8 Task_AnimateCardFlipDown(struct Task* task)
return FALSE;
}
-static bool8 Task_DrawFlippedCardSide(struct Task* task)
+static bool8 Task_DrawFlippedCardSide(struct Task *task)
{
sData->allowDMACopy = FALSE;
if (Overworld_IsRecvQueueAtMax() == TRUE)
@@ -1714,7 +1714,7 @@ static bool8 Task_DrawFlippedCardSide(struct Task* task)
return FALSE;
}
-static bool8 Task_SetCardFlipped(struct Task* task)
+static bool8 Task_SetCardFlipped(struct Task *task)
{
sData->allowDMACopy = FALSE;
@@ -1734,7 +1734,7 @@ static bool8 Task_SetCardFlipped(struct Task* task)
return FALSE;
}
-static bool8 Task_AnimateCardFlipUp(struct Task* task)
+static bool8 Task_AnimateCardFlipUp(struct Task *task)
{
u32 cardHeight, r5, r10, cardTop, r6, var_24, cardBottom, var;
s16 i;
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 91d0347fe4..206060f1b7 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -36,7 +36,7 @@
struct FloorTrainers
{
- u8 name[HILL_TRAINERS_PER_FLOOR][HILL_TRAINER_NAME_LENGTH];
+ u8 name[HILL_TRAINERS_PER_FLOOR][TRAINER_NAME_LENGTH + 1];
u8 facilityClass[HILL_TRAINERS_PER_FLOOR];
};
@@ -165,30 +165,30 @@ static const u16 sPrizeListAttract[] = {ITEM_TM45_ATTRACT, ITEM_ETHER, I
static const u16 *const sPrizeLists1[NUM_TRAINER_HILL_PRIZE_LISTS] =
{
- sPrizeListRareCandy1,
- sPrizeListLuxuryBall1,
- sPrizeListMaxRevive1,
- sPrizeListMaxEther1,
- sPrizeListElixir1,
- sPrizeListRoar,
- sPrizeListSludgeBomb,
- sPrizeListToxic,
- sPrizeListSunnyDay,
- sPrizeListEarthQuake
+ sPrizeListRareCandy1,
+ sPrizeListLuxuryBall1,
+ sPrizeListMaxRevive1,
+ sPrizeListMaxEther1,
+ sPrizeListElixir1,
+ sPrizeListRoar,
+ sPrizeListSludgeBomb,
+ sPrizeListToxic,
+ sPrizeListSunnyDay,
+ sPrizeListEarthQuake
};
static const u16 *const sPrizeLists2[NUM_TRAINER_HILL_PRIZE_LISTS] =
{
- sPrizeListRareCandy2,
- sPrizeListLuxuryBall2,
- sPrizeListMaxRevive2,
- sPrizeListMaxEther2,
- sPrizeListElixir2,
- sPrizeListBrickBreak,
- sPrizeListTorment,
- sPrizeListSkillSwap,
- sPrizeListGigaDrain,
- sPrizeListAttract
+ sPrizeListRareCandy2,
+ sPrizeListLuxuryBall2,
+ sPrizeListMaxRevive2,
+ sPrizeListMaxEther2,
+ sPrizeListElixir2,
+ sPrizeListBrickBreak,
+ sPrizeListTorment,
+ sPrizeListSkillSwap,
+ sPrizeListGigaDrain,
+ sPrizeListAttract
};
static const u16 *const *const sPrizeListSets[] =
@@ -305,7 +305,7 @@ void GetTrainerHillTrainerName(u8 *dst, u16 trainerId)
s32 i;
u8 id = trainerId - 1;
- for (i = 0; i < HILL_TRAINER_NAME_LENGTH; i++)
+ for (i = 0; i < TRAINER_NAME_LENGTH + 1; i++)
dst[i] = sFloorTrainers->name[id][i];
}
@@ -330,7 +330,7 @@ void InitTrainerHillBattleStruct(void)
for (i = 0; i < HILL_TRAINERS_PER_FLOOR; i++)
{
- for (j = 0; j < HILL_TRAINER_NAME_LENGTH; j++)
+ for (j = 0; j < TRAINER_NAME_LENGTH + 1; j++)
sFloorTrainers->name[i][j] = sHillData->floors[sHillData->floorId].trainers[i].name[j];
sFloorTrainers->facilityClass[i] = sHillData->floors[sHillData->floorId].trainers[i].facilityClass;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index dc6c3b9177..b333e03241 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -115,7 +115,7 @@ static const struct OamData sOamData_Icons =
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
@@ -660,7 +660,7 @@ void DoTrainerApproach(void)
static void Task_EndTrainerApproach(u8 taskId)
{
DestroyTask(taskId);
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
void TryPrepareSecondApproachingTrainer(void)
diff --git a/src/union_room.c b/src/union_room.c
index 05b41a0880..53fb951707 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -275,7 +275,7 @@ static s32 IsRequestedTypeOrEggInPlayerParty(u32, u32);
static bool32 UR_PrintFieldMessage(const u8 *);
static s32 GetChatLeaderActionRequestMessage(u8 *, u32, u16 *, struct WirelessLink_URoom *);
static void Task_InitUnionRoom(u8 taskId);
-static bool8 ArePlayersDifferent(struct RfuPlayerData*, const struct RfuPlayerData*);
+static bool8 ArePlayersDifferent(struct RfuPlayerData *, const struct RfuPlayerData *);
static void ItemPrintFunc_PossibleGroupMembers(u8, u32, u8);
static void ListMenuItemPrintFunc_UnionRoomGroups(u8, u32, u8);
static void TradeBoardListMenuItemPrintFunc(u8, u32, u8);
@@ -289,19 +289,19 @@ static void PrintNumPlayersWaitingForMsg(u8 windowId, u8 capacityCode, u8 string
switch (capacityCode << 8)
{
case LINK_GROUP_CAPACITY(0, 2):
- PrintUnionRoomText(windowId, 1, sPlayersNeededOrModeTexts[0][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sPlayersNeededOrModeTexts[0][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
break;
case LINK_GROUP_CAPACITY(0, 4):
- PrintUnionRoomText(windowId, 1, sPlayersNeededOrModeTexts[1][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sPlayersNeededOrModeTexts[1][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
break;
case LINK_GROUP_CAPACITY(2, 5):
- PrintUnionRoomText(windowId, 1, sPlayersNeededOrModeTexts[2][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sPlayersNeededOrModeTexts[2][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
break;
case LINK_GROUP_CAPACITY(3, 5):
- PrintUnionRoomText(windowId, 1, sPlayersNeededOrModeTexts[3][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sPlayersNeededOrModeTexts[3][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
break;
case LINK_GROUP_CAPACITY(2, 4):
- PrintUnionRoomText(windowId, 1, sPlayersNeededOrModeTexts[4][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sPlayersNeededOrModeTexts[4][stringId - 1], 0, 1, UR_COLOR_DEFAULT);
break;
}
@@ -313,10 +313,10 @@ static void PrintPlayerNameAndIdOnWindow(u8 windowId)
u8 text[30];
u8 *txtPtr;
- PrintUnionRoomText(windowId, 1, gSaveBlock2Ptr->playerName, 0, 1, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gSaveBlock2Ptr->playerName, 0, 1, UR_COLOR_DEFAULT);
txtPtr = StringCopy(text, sText_ID);
ConvertIntToDecimalStringN(txtPtr, ReadAsU16(gSaveBlock2Ptr->playerTrainerId), STR_CONV_MODE_LEADING_ZEROS, 5);
- PrintUnionRoomText(windowId, 1, text, 0, 17, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, text, 0, 17, UR_COLOR_DEFAULT);
}
static void GetAwaitingCommunicationText(u8 *dst, u8 caseId)
@@ -378,7 +378,7 @@ void TryBecomeLinkLeader(void)
struct WirelessLink_Leader *data;
taskId = CreateTask(Task_TryBecomeLinkLeader, 0);
- sWirelessLinkMain.leader = data = (void*)(gTasks[taskId].data);
+ sWirelessLinkMain.leader = data = (void *)(gTasks[taskId].data);
sLeader = data;
data->state = LL_STATE_INIT;
@@ -431,7 +431,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
data->nPlayerModeWindowId = AddWindow(&sWindowTemplate_NumPlayerMode);
FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
- PrintUnionRoomText(data->bButtonCancelWindowId, 0, sText_BButtonCancel, 8, 1, UR_COLOR_CANCEL);
+ PrintUnionRoomText(data->bButtonCancelWindowId, FONT_SMALL, sText_BButtonCancel, 8, 1, UR_COLOR_CANCEL);
PutWindowTilemap(data->bButtonCancelWindowId);
CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX);
@@ -686,12 +686,12 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
data->state++; // LL_STATE_RETRY or LL_STATE_FAILED
break;
case LL_STATE_FAILED:
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
gSpecialVar_Result = LINKUP_FAILED;
break;
case LL_STATE_RETRY:
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
gSpecialVar_Result = LINKUP_RETRY_ROLE_ASSIGN;
break;
@@ -971,7 +971,7 @@ void TryJoinLinkGroup(void)
struct WirelessLink_Group *data;
taskId = CreateTask(Task_TryJoinLinkGroup, 0);
- sWirelessLinkMain.group = data = (void*)(gTasks[taskId].data);
+ sWirelessLinkMain.group = data = (void *)(gTasks[taskId].data);
sGroup = data;
data->state = LG_STATE_INIT;
@@ -1011,7 +1011,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
data->playerNameAndIdWindowId = AddWindow(&sWindowTemplate_PlayerNameAndId);
FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
- PrintUnionRoomText(data->bButtonCancelWindowId, 0, sText_ChooseJoinCancel, 8, 1, UR_COLOR_CANCEL);
+ PrintUnionRoomText(data->bButtonCancelWindowId, FONT_SMALL, sText_ChooseJoinCancel, 8, 1, UR_COLOR_CANCEL);
PutWindowTilemap(data->bButtonCancelWindowId);
CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX);
@@ -1297,7 +1297,7 @@ u8 CreateTask_ListenToWireless(void)
struct WirelessLink_Group *data;
taskId = CreateTask(Task_ListenToWireless, 0);
- sWirelessLinkMain.group = data = (void*)(gTasks[taskId].data);
+ sWirelessLinkMain.group = data = (void *)(gTasks[taskId].data);
data->state = 0;
data->textState = 0;
@@ -1487,7 +1487,7 @@ static void Task_StartUnionRoomTrade(u8 taskId)
case 1:
if (GetBlockReceivedStatus() == 3)
{
- gEnemyParty[0] = *(struct Pokemon*)(gBlockRecvBuffer[GetMultiplayerId() ^ 1]);
+ gEnemyParty[0] = *(struct Pokemon *)(gBlockRecvBuffer[GetMultiplayerId() ^ 1]);
IncrementGameStat(GAME_STAT_NUM_UNION_ROOM_BATTLES);
ResetBlockReceivedFlags();
gTasks[taskId].data[0]++;
@@ -1744,13 +1744,13 @@ static void Task_StartActivity(u8 taskId)
DestroyTask(taskId);
gSpecialVar_Result = LINKUP_SUCCESS;
if (gPlayerCurrActivity != (ACTIVITY_TRADE | IN_UNION_ROOM))
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
}
static void Task_RunScriptAndFadeToActivity(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- u16 *sendBuff = (u16*)(gBlockSendBuffer);
+ u16 *sendBuff = (u16 *)(gBlockSendBuffer);
switch (data[0])
{
@@ -1779,13 +1779,13 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
SaveLinkTrainerNames();
DestroyTask(taskId);
default:
- EnableBothScriptContexts();
+ ScriptContext_Enable();
data[0] = 1;
break;
}
break;
case 1:
- if (!ScriptContext1_IsScriptSetUp())
+ if (!ScriptContext_IsEnabled())
{
FadeScreen(FADE_TO_BLACK, 0);
data[0] = 2;
@@ -1833,7 +1833,7 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
}
break;
case 6:
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
break;
case 7:
@@ -1844,7 +1844,7 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
if (gReceivedRemoteLinkPlayers == 0)
{
DestroyWirelessStatusIndicatorSprite();
- EnableBothScriptContexts();
+ ScriptContext_Enable();
DestroyTask(taskId);
}
break;
@@ -1869,7 +1869,7 @@ void CreateTask_SendMysteryGift(u32 activity)
struct WirelessLink_Leader *data;
taskId = CreateTask(Task_SendMysteryGift, 0);
- sWirelessLinkMain.leader = data = (void*)(gTasks[taskId].data);
+ sWirelessLinkMain.leader = data = (void *)(gTasks[taskId].data);
data->state = 0;
data->textState = 0;
@@ -1950,7 +1950,7 @@ static void Task_SendMysteryGift(u8 taskId)
data->state = 7;
break;
case 7:
- switch (DoMysteryGiftYesNo(&data->textState, &data->yesNoWindowId, 0, gStringVar4))
+ switch (DoMysteryGiftYesNo(&data->textState, &data->yesNoWindowId, FALSE, gStringVar4))
{
case 0:
LoadWirelessStatusIndicatorSpriteGfx();
@@ -2077,7 +2077,7 @@ void CreateTask_LinkMysteryGiftWithFriend(u32 activity)
struct WirelessLink_Group *data;
taskId = CreateTask(Task_CardOrNewsWithFriend, 0);
- sWirelessLinkMain.group = data = (void*)(gTasks[taskId].data);
+ sWirelessLinkMain.group = data = (void *)(gTasks[taskId].data);
sGroup = data;
data->state = 0;
@@ -2246,7 +2246,7 @@ void CreateTask_LinkMysteryGiftOverWireless(u32 activity)
struct WirelessLink_Group *data;
taskId = CreateTask(Task_CardOrNewsOverWireless, 0);
- sWirelessLinkMain.group = data = (void*)(gTasks[taskId].data);
+ sWirelessLinkMain.group = data = (void *)(gTasks[taskId].data);
sGroup = data;
data->state = 0;
@@ -2469,7 +2469,7 @@ static void ScheduleFieldMessageAndExit(const u8 *src)
static void CopyPlayerListToBuffer(struct WirelessLink_URoom *uroom)
{
memcpy(&gDecompressionBuffer[sizeof(gDecompressionBuffer) - (MAX_UNION_ROOM_LEADERS * sizeof(struct RfuPlayer))],
- uroom->playerList,
+ uroom->playerList,
MAX_UNION_ROOM_LEADERS * sizeof(struct RfuPlayer));
}
@@ -2592,7 +2592,7 @@ static void Task_RunUnionRoom(u8 taskId)
gSpecialVar_Result = 0;
}
}
- else if (ScriptContext2_IsEnabled() != TRUE)
+ else if (ArePlayerFieldControlsLocked() != TRUE)
{
if (JOY_NEW(A_BUTTON))
{
@@ -3467,7 +3467,7 @@ static void Task_SearchForChildOrParent(u8 taskId)
{
s32 i, j;
struct RfuPlayerData rfu;
- struct RfuIncomingPlayerList **list = (void*) gTasks[taskId].data;
+ struct RfuIncomingPlayerList **list = (void *) gTasks[taskId].data;
bool8 isParent;
for (i = 0; i < RFU_CHILD_MAX; i++)
@@ -3510,7 +3510,7 @@ static u8 CreateTask_SearchForChildOrParent(struct RfuIncomingPlayerList * paren
static void Task_ListenForCompatiblePartners(u8 taskId)
{
s32 i, j;
- struct RfuIncomingPlayerList **list = (void*) gTasks[taskId].data;
+ struct RfuIncomingPlayerList **list = (void *) gTasks[taskId].data;
for (i = 0; i < RFU_CHILD_MAX; i++)
{
@@ -3553,7 +3553,7 @@ static bool32 HasWonderCardOrNewsByLinkGroup(struct RfuGameData *data, s16 linkG
static void Task_ListenForWonderDistributor(u8 taskId)
{
s32 i;
- struct RfuIncomingPlayerList **list = (void*) gTasks[taskId].data;
+ struct RfuIncomingPlayerList **list = (void *) gTasks[taskId].data;
for (i = 0; i < RFU_CHILD_MAX; i++)
{
@@ -3567,7 +3567,7 @@ static void Task_ListenForWonderDistributor(u8 taskId)
static u8 CreateTask_ListenForCompatiblePartners(struct RfuIncomingPlayerList * list, u32 linkGroup)
{
u8 taskId = CreateTask(Task_ListenForCompatiblePartners, 0);
- struct RfuIncomingPlayerList **oldList = (void*) gTasks[taskId].data;
+ struct RfuIncomingPlayerList **oldList = (void *) gTasks[taskId].data;
oldList[0] = list;
gTasks[taskId].data[2] = linkGroup;
return taskId;
@@ -3576,7 +3576,7 @@ static u8 CreateTask_ListenForCompatiblePartners(struct RfuIncomingPlayerList *
static u8 CreateTask_ListenForWonderDistributor(struct RfuIncomingPlayerList * list, u32 linkGroup)
{
u8 taskId = CreateTask(Task_ListenForWonderDistributor, 0);
- struct RfuIncomingPlayerList **oldList = (void*) gTasks[taskId].data;
+ struct RfuIncomingPlayerList **oldList = (void *) gTasks[taskId].data;
oldList[0] = list;
gTasks[taskId].data[2] = linkGroup;
return taskId;
@@ -3585,7 +3585,7 @@ static u8 CreateTask_ListenForWonderDistributor(struct RfuIncomingPlayerList * l
static bool32 UR_PrintFieldMessage(const u8 *src)
{
LoadMessageBoxAndBorderGfx();
- DrawDialogueFrame(0, 1);
+ DrawDialogueFrame(0, TRUE);
StringExpandPlaceholders(gStringVar4, src);
AddTextPrinterWithCustomSpeedForMessage(FALSE, 1);
return FALSE;
@@ -3605,7 +3605,7 @@ static bool8 PrintOnTextbox(u8 *textState, const u8 *str)
{
case 0:
LoadMessageBoxAndBorderGfx();
- DrawDialogueFrame(0, 1);
+ DrawDialogueFrame(0, TRUE);
StringExpandPlaceholders(gStringVar4, str);
AddTextPrinterForMessage_2(TRUE);
(*textState)++;
@@ -3656,7 +3656,7 @@ static u8 CreateTradeBoardWindow(const struct WindowTemplate * template)
u8 windowId = AddWindow(template);
DrawStdWindowFrame(windowId, FALSE);
FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
- PrintUnionRoomText(windowId, 1, sText_NameWantedOfferLv, 8, 1, UR_COLOR_TRADE_BOARD_OTHER);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sText_NameWantedOfferLv, 8, 1, UR_COLOR_TRADE_BOARD_OTHER);
CopyWindowToVram(windowId, COPYWIN_GFX);
PutWindowTilemap(windowId);
return windowId;
@@ -3781,7 +3781,7 @@ static void UR_ClearBg0(void)
static void JoinGroup_EnableScriptContexts(void)
{
- EnableBothScriptContexts();
+ ScriptContext_Enable();
}
static void PrintUnionRoomText(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 colorIdx)
@@ -3971,17 +3971,17 @@ static void PrintGroupMemberOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlayer *
ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringAppend(gStringVar4, sText_Colon);
- PrintUnionRoomText(windowId, 1, gStringVar4, x, y, UR_COLOR_DEFAULT);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, UR_COLOR_DEFAULT);
x += 18;
activity = player->rfu.data.activity;
if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN && !(activity & IN_UNION_ROOM))
{
CopyAndTranslatePlayerName(gStringVar4, player);
- PrintUnionRoomText(windowId, 1, gStringVar4, x, y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, colorIdx);
ConvertIntToDecimalStringN(trainerId, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
StringCopy(gStringVar4, sText_ID);
StringAppend(gStringVar4, trainerId);
- PrintUnionRoomText(windowId, 1, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x88), y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x88), y, colorIdx);
}
}
@@ -3992,11 +3992,11 @@ static void PrintGroupCandidateOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlaye
if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN)
{
CopyAndTranslatePlayerName(gStringVar4, player);
- PrintUnionRoomText(windowId, 1, gStringVar4, x, y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, colorIdx);
ConvertIntToDecimalStringN(trainerId, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
StringCopy(gStringVar4, sText_ID);
StringAppend(gStringVar4, trainerId);
- PrintUnionRoomText(windowId, 1, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x68), y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x68), y, colorIdx);
}
}
@@ -4094,24 +4094,24 @@ void ItemPrintFunc_EmptyList(u8 windowId, u32 itemId, u8 y)
{
}
-static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct RfuGameData * data, const u8 * playerName, u8 colorIdx)
+static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct RfuGameData * data, const u8 *playerName, u8 colorIdx)
{
u8 levelStr[4];
u16 species = data->tradeSpecies;
u8 type = data->tradeType;
u8 level = data->tradeLevel;
- PrintUnionRoomText(windowId, 1, playerName, 8, y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, playerName, 8, y, colorIdx);
if (species == SPECIES_EGG)
{
- PrintUnionRoomText(windowId, 1, sText_EggTrade, 68, y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, sText_EggTrade, 68, y, colorIdx);
}
else
{
BlitMenuInfoIcon(windowId, type + 1, 68, y);
- PrintUnionRoomText(windowId, 1, gSpeciesNames[species], 118, y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, gSpeciesNames[species], 118, y, colorIdx);
ConvertIntToDecimalStringN(levelStr, level, STR_CONV_MODE_RIGHT_ALIGN, 3);
- PrintUnionRoomText(windowId, 1, levelStr, 198, y, colorIdx);
+ PrintUnionRoomText(windowId, FONT_NORMAL, levelStr, 198, y, colorIdx);
}
}
@@ -4403,7 +4403,7 @@ static u32 GetPartyPositionOfRegisteredMon(struct UnionRoomTrade *trade, u8 mult
static void HandleCancelActivity(bool32 setData)
{
UR_ClearBg0();
- ScriptContext2_Disable();
+ UnlockPlayerFieldControls();
UnionRoom_UnlockPlayerAndChatPartner();
gPlayerCurrActivity = ACTIVITY_NONE;
if (setData)
@@ -4415,7 +4415,7 @@ static void HandleCancelActivity(bool32 setData)
static void StartScriptInteraction(void)
{
- ScriptContext2_Enable();
+ LockPlayerFieldControls();
FreezeObjects_WaitForPlayer();
}
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index 1ec8be77b5..38866c940d 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -73,7 +73,7 @@ static void CB2_SetUpPartiesAndStartBattle(void)
SetMainCallback2(CB2_InitBattle);
}
-static void AddTextPrinterForUnionRoomBattle(u8 windowId, const u8 * str, u8 x, u8 y, s32 speed)
+static void AddTextPrinterForUnionRoomBattle(u8 windowId, const u8 *str, u8 x, u8 y, s32 speed)
{
s32 letterSpacing = 0;
s32 lineSpacing = 1;
@@ -81,7 +81,7 @@ static void AddTextPrinterForUnionRoomBattle(u8 windowId, const u8 * str, u8 x,
AddTextPrinterParameterized4(windowId, FONT_NORMAL, x, y, letterSpacing, lineSpacing, sTextColors, speed, str);
}
-static bool32 PrintUnionRoomBattleMessage(s16 * state, const u8 * str, s32 speed)
+static bool32 PrintUnionRoomBattleMessage(s16 * state, const u8 *str, s32 speed)
{
switch (*state)
{
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index 908eb8f21f..923f6692f1 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -180,7 +180,7 @@ static void RemoveUnionRoomPlayerObjectEvent(u32 leaderId)
RemoveObjectEventByLocalIdAndMap(sUnionRoomLocalIds[leaderId], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
-static bool32 SetUnionRoomPlayerEnterExitMovement(u32 leaderId, const u8 * movement)
+static bool32 SetUnionRoomPlayerEnterExitMovement(u32 leaderId, const u8 *movement)
{
u8 objectId;
struct ObjectEvent * object;
@@ -205,7 +205,7 @@ static bool32 TryReleaseUnionRoomPlayerObjectEvent(u32 leaderId)
if (!ObjectEventClearHeldMovementIfFinished(object))
return FALSE;
- if (!ScriptContext2_IsEnabled())
+ if (!ArePlayerFieldControlsLocked())
UnfreezeObjectEvent(object);
else
FreezeObjectEvent(object);
@@ -394,7 +394,7 @@ void DestroyUnionRoomPlayerObjects(void)
DestroyTask_AnimateUnionRoomPlayers();
}
-void CreateUnionRoomPlayerSprites(u8 * spriteIds, s32 leaderId)
+void CreateUnionRoomPlayerSprites(u8 *spriteIds, s32 leaderId)
{
s32 memberId;
for (memberId = 0; memberId < MAX_RFU_PLAYERS; memberId++)
@@ -409,7 +409,7 @@ void CreateUnionRoomPlayerSprites(u8 * spriteIds, s32 leaderId)
}
}
-void DestroyUnionRoomPlayerSprites(u8 * spriteIds)
+void DestroyUnionRoomPlayerSprites(u8 *spriteIds)
{
s32 i;
for (i = 0; i < NUM_UNION_ROOM_SPRITES; i++)
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 8f041a6ff2..2f16f220aa 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -497,7 +497,7 @@ static void LoadUsePokeblockMenu(void)
break;
case 2:
SetVBlankCallback(NULL);
- CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+ CpuFill32(0, (void *)(VRAM), VRAM_SIZE);
sInfo->mainState++;
break;
case 3:
@@ -1232,7 +1232,7 @@ static void UpdateMonPic(u8 loadId)
sMenu->curMonSpriteId = spriteId;
gSprites[sMenu->curMonSpriteId].callback = SpriteCB_MonPic;
gSprites[sMenu->curMonSpriteId].y2 -= 34;
- sMenu->curMonTileStart = (void*)(OBJ_VRAM0 + (sMenu->curMonSheet * 32));
+ sMenu->curMonTileStart = (void *)(OBJ_VRAM0 + (sMenu->curMonSheet * 32));
sMenu->curMonPalette = (sMenu->curMonPalette * 16) + 0x100;
}
}
diff --git a/src/util.c b/src/util.c
index a4e3fa4cfc..32f31a26dd 100644
--- a/src/util.c
+++ b/src/util.c
@@ -253,7 +253,7 @@ u16 CalcCRC16WithTable(const u8 *data, u32 length)
return ~crc;
}
-u32 CalcByteArraySum(const u8* data, u32 length)
+u32 CalcByteArraySum(const u8 *data, u32 length)
{
u32 sum, i;
for (sum = 0, i = 0; i < length; i++)
diff --git a/src/walda_phrase.c b/src/walda_phrase.c
index aa85c0d60b..025f900e5a 100644
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -140,7 +140,7 @@ static u8 GetLetterTableId(u8 letter)
#define KEY data[8]
#define NUM_WALLPAPER_DATA_BYTES 9
#define TO_BIT_OFFSET(i) (3 + (8 * (i))) // Convert a position in the phrase to a bit number into the wallpaper data array
-static bool32 TryCalculateWallpaper(u16* backgroundClr, u16 *foregroundClr, u8 *iconId, u8 *patternId, u16 trainerId, u8 *phrase)
+static bool32 TryCalculateWallpaper(u16 *backgroundClr, u16 *foregroundClr, u8 *iconId, u8 *patternId, u16 trainerId, u8 *phrase)
{
s32 i;
ALIGNED(2) u8 data[NUM_WALLPAPER_DATA_BYTES];
@@ -186,10 +186,10 @@ static bool32 TryCalculateWallpaper(u16* backgroundClr, u16 *foregroundClr, u8 *
return FALSE;
// Successful phrase, save resulting wallpaper
- ptr = (u16*) &BG_COLOR_LO;
+ ptr = (u16 *) &BG_COLOR_LO;
*backgroundClr = *ptr;
- ptr = (u16*) &FG_COLOR_LO;
+ ptr = (u16 *) &FG_COLOR_LO;
*foregroundClr = *ptr;
*iconId = ICON_ID;
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 663577a2fc..8e197d547e 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -716,7 +716,7 @@ void RockSmashWildEncounter(void)
{
gSpecialVar_Result = FALSE;
}
- else if (DoWildEncounterRateTest(wildPokemonInfo->encounterRate, 1) == TRUE
+ else if (DoWildEncounterRateTest(wildPokemonInfo->encounterRate, TRUE) == TRUE
&& TryGenerateWildMon(wildPokemonInfo, WILD_AREA_ROCKS, WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE) == TRUE)
{
BattleSetup_StartWildBattle();
@@ -904,7 +904,7 @@ bool8 UpdateRepelCounter(void)
VarSet(VAR_REPEL_STEP_COUNT, steps);
if (steps == 0)
{
- ScriptContext1_SetupScript(EventScript_RepelWoreOff);
+ ScriptContext_SetupScript(EventScript_RepelWoreOff);
return TRUE;
}
}
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index 1fbd83fcda..40e4bb84df 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -311,7 +311,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
#undef tState
-static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 mode)
+static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 mode)
{
u8 color[3];
diff --git a/sym_common.txt b/sym_common.txt
index 938b78fbe4..407b183a7f 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -3,35 +3,35 @@
@ ../gflib/bg.o
.align 2
gWindowTileAutoAllocEnabled:
- .space 4
+ .space 4
@ ../gflib/window.o
- .align 4
+ .align 4
gTransparentTileNumber:
- .space 1
- .align 4
+ .space 1
+ .align 4
gWindowBgTilemapBuffers:
- .space 16
+ .space 16
@ ../gflib/text.o
- .align 4
+ .align 4
gFonts:
- .space 4
- .align 2
+ .space 4
+ .align 2
gDisableTextPrinters:
- .space 1
- .align 4
+ .space 1
+ .align 4
gCurGlyph:
- .space 132
- .align 2
+ .space 132
+ .align 2
gTextFlags:
- .space 4
+ .space 4
@ ../gflib/sprite.o
- .align 2
+ .align 2
gOamMatrixAllocBitmap:
- .space 4
- .align 2
+ .space 4
+ .align 2
gReservedSpritePaletteCount:
- .space 1
- .align 4
+ .space 1
+ .align 4
.include "link.o"
.include "AgbRfu_LinkManager.o"
.include "link_rfu_2.o"
diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c
index 4e85953fdc..832e9bb397 100644
--- a/tools/gbagfx/gfx.c
+++ b/tools/gbagfx/gfx.c
@@ -397,7 +397,7 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int
free(buffer);
}
-void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors)
+void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors)
{
int tileSize = bitDepth * 8;
@@ -424,7 +424,8 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles);
int bufferSize = numTiles * tileSize;
- unsigned char *buffer = malloc(bufferSize);
+ int maxBufferSize = maxNumTiles * tileSize;
+ unsigned char *buffer = malloc(maxBufferSize);
if (buffer == NULL)
FATAL_ERROR("Failed to allocate memory for pixels.\n");
@@ -433,17 +434,36 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
switch (bitDepth) {
case 1:
- ConvertToTiles1Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+ ConvertToTiles1Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
break;
case 4:
- ConvertToTiles4Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+ ConvertToTiles4Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
break;
case 8:
- ConvertToTiles8Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+ ConvertToTiles8Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
break;
}
- WriteWholeFile(path, buffer, bufferSize);
+ bool zeroPadded = true;
+ for (int i = bufferSize; i < maxBufferSize && zeroPadded; i++) {
+ if (buffer[i] != 0)
+ {
+ switch (numTilesMode)
+ {
+ case NUM_TILES_IGNORE:
+ break;
+ case NUM_TILES_WARN:
+ fprintf(stderr, "Ignoring -num_tiles %d because tile %d contains non-transparent pixels.\n", numTiles, 1 + i / tileSize);
+ zeroPadded = false;
+ break;
+ case NUM_TILES_ERROR:
+ FATAL_ERROR("Tile %d contains non-transparent pixels.\n", 1 + i / tileSize);
+ break;
+ }
+ }
+ }
+
+ WriteWholeFile(path, buffer, zeroPadded ? bufferSize : maxBufferSize);
free(buffer);
}
diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h
index edb9e62c41..f1dbfcf4f7 100644
--- a/tools/gbagfx/gfx.h
+++ b/tools/gbagfx/gfx.h
@@ -44,8 +44,14 @@ struct Image {
bool isAffine;
};
+enum NumTilesMode {
+ NUM_TILES_IGNORE,
+ NUM_TILES_WARN,
+ NUM_TILES_ERROR,
+};
+
void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
-void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
+void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
void FreeImage(struct Image *image);
void ReadGbaPalette(char *path, struct Palette *palette);
void WriteGbaPalette(char *path, struct Palette *palette);
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c
index cf30316961..5d4faacab0 100644
--- a/tools/gbagfx/main.c
+++ b/tools/gbagfx/main.c
@@ -77,7 +77,7 @@ void ConvertPngToGba(char *inputPath, char *outputPath, struct PngToGbaOptions *
ReadPng(inputPath, &image);
- WriteImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette);
+ WriteImage(outputPath, options->numTilesMode, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette);
FreeImage(&image);
}
@@ -179,6 +179,7 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
char *outputFileExtension = GetFileExtensionAfterDot(outputPath);
int bitDepth = outputFileExtension[0] - '0';
struct PngToGbaOptions options;
+ options.numTilesMode = NUM_TILES_IGNORE;
options.numTiles = 0;
options.bitDepth = bitDepth;
options.metatileWidth = 1;
@@ -203,6 +204,12 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
if (options.numTiles < 1)
FATAL_ERROR("Number of tiles must be positive.\n");
}
+ else if (strcmp(option, "-Wnum_tiles") == 0) {
+ options.numTilesMode = NUM_TILES_WARN;
+ }
+ else if (strcmp(option, "-Werror=num_tiles") == 0) {
+ options.numTilesMode = NUM_TILES_ERROR;
+ }
else if (strcmp(option, "-mwidth") == 0)
{
if (i + 1 >= argc)
diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h
index 3b038f572d..250b723450 100644
--- a/tools/gbagfx/options.h
+++ b/tools/gbagfx/options.h
@@ -4,6 +4,7 @@
#define OPTIONS_H
#include
+#include "gfx.h"
struct GbaToPngOptions {
char *paletteFilePath;
@@ -18,6 +19,7 @@ struct GbaToPngOptions {
struct PngToGbaOptions {
int numTiles;
+ enum NumTilesMode numTilesMode;
int bitDepth;
int metatileWidth;
int metatileHeight;