ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean some more arrays

Browse Source
This commit is contained in:
nullableVoidPtr 2018-12-08 11:33:41 +08:00
parent f24584cd31
commit 4d307a6f63
2 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/battle_script_commands.c
View File

@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] =
static const u8* const sMoveEffectBS_Ptrs[] = static const u8* const sMoveEffectBS_Ptrs[] =
{ {
BattleScript_MoveEffectSleep, // 0 [0] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison,
BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn,
BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze,
BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis,
BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic,
BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar,
BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap,
BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil,
}; };
static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};
@ -768,26 +768,26 @@ static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX /
static const u16 sMovesForbiddenToCopy[] = static const u16 sMovesForbiddenToCopy[] =
{ {
MOVE_METRONOME, MOVE_METRONOME,
MOVE_STRUGGLE, MOVE_STRUGGLE,
MOVE_SKETCH, MOVE_SKETCH,
MOVE_MIMIC, MOVE_MIMIC,
MIMIC_FORBIDDEN_END, MIMIC_FORBIDDEN_END,
MOVE_COUNTER, MOVE_COUNTER,
MOVE_MIRROR_COAT, MOVE_MIRROR_COAT,
MOVE_PROTECT, MOVE_PROTECT,
MOVE_DETECT, MOVE_DETECT,
MOVE_ENDURE, MOVE_ENDURE,
MOVE_DESTINY_BOND, MOVE_DESTINY_BOND,
MOVE_SLEEP_TALK, MOVE_SLEEP_TALK,
MOVE_THIEF, MOVE_THIEF,
MOVE_FOLLOW_ME, MOVE_FOLLOW_ME,
MOVE_SNATCH, MOVE_SNATCH,
MOVE_HELPING_HAND, MOVE_HELPING_HAND,
MOVE_COVET, MOVE_COVET,
MOVE_TRICK, MOVE_TRICK,
MOVE_FOCUS_PUNCH, MOVE_FOCUS_PUNCH,
METRONOME_FORBIDDEN_END METRONOME_FORBIDDEN_END
}; };
static const u8 sFlailHpScaleToPowerTable[] = static const u8 sFlailHpScaleToPowerTable[] =

2
src/pokemon_animation.c
View File

@ -810,7 +810,7 @@ static const u8 sBackAnimNatureModTable[] =
[NATURE_GENTLE] = 0x02, [NATURE_GENTLE] = 0x02,
[NATURE_SASSY] = 0x01, [NATURE_SASSY] = 0x01,
[NATURE_CAREFUL] = 0x02, [NATURE_CAREFUL] = 0x02,
0x01, // NATURE_QUIRKY [NATURE_QUIRKY] = 0x01,
}; };
static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] =