Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
This commit is contained in:
LOuroboros committed
commit
7ce5c5fc66
230 files changed
+6696
-5808
No files matched your search
+2
-1
@@ -662,6 +662,7 @@ struct BattleStruct
|
||||
u8 battleBondTransformed[NUM_BATTLE_SIDES]; // Bitfield for each party.
|
||||
u8 storedHealingWish:4; // Each battler as a bit.
|
||||
u8 storedLunarDance:4; // Each battler as a bit.
|
||||
u16 supremeOverlordModifier[MAX_BATTLERS_COUNT];
|
||||
};
|
||||
|
||||
#define F_DYNAMIC_TYPE_1 (1 << 6)
|
||||
@@ -853,7 +854,7 @@ struct MonSpritesGfx
|
||||
u8 *byte[MAX_BATTLERS_COUNT];
|
||||
} sprites;
|
||||
struct SpriteTemplate templates[MAX_BATTLERS_COUNT];
|
||||
struct SpriteFrameImage frameImages[MAX_BATTLERS_COUNT][4];
|
||||
struct SpriteFrameImage frameImages[MAX_BATTLERS_COUNT][MAX_MON_PIC_FRAMES];
|
||||
u8 unusedArr[0x80];
|
||||
u8 *barFontGfx;
|
||||
void *unusedPtr;
|
||||
|
||||
@@ -56,8 +56,7 @@ enum
|
||||
|
||||
#define TAG_MEGA_TRIGGER_PAL 0xD777
|
||||
#define TAG_MEGA_INDICATOR_PAL 0xD778
|
||||
#define TAG_ALPHA_INDICATOR_PAL 0xD779
|
||||
#define TAG_OMEGA_INDICATOR_PAL 0xD77A
|
||||
#define TAG_ALPHA_OMEGA_INDICATOR_PAL 0xD779 // Alpha and Omega indicators use the same palette as each of them only uses 4 different colors.
|
||||
#define TAG_ZMOVE_TRIGGER_PAL 0xD77B
|
||||
|
||||
enum
|
||||
@@ -77,7 +76,6 @@ enum
|
||||
};
|
||||
|
||||
u32 WhichBattleCoords(u32 battlerId);
|
||||
u8 GetMegaIndicatorSpriteId(u32 healthboxSpriteId);
|
||||
u8 CreateBattlerHealthboxSprites(u8 battler);
|
||||
u8 CreateSafariPlayerHealthboxSprites(void);
|
||||
void SetBattleBarStruct(u8 battler, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue);
|
||||
@@ -94,8 +92,7 @@ void CreateMegaTriggerSprite(u8 battlerId, u8 palId);
|
||||
bool32 IsMegaTriggerSpriteActive(void);
|
||||
void HideMegaTriggerSprite(void);
|
||||
void DestroyMegaTriggerSprite(void);
|
||||
u32 CreateMegaIndicatorSprite(u32 battlerId, u32 which);
|
||||
void DestroyMegaIndicatorSprite(u32 healthboxSpriteId);
|
||||
void MegaIndicator_LoadSpritesGfx(void);
|
||||
u8 CreatePartyStatusSummarySprites(u8 battler, struct HpAndStatus *partyInfo, bool8 skipPlayer, bool8 isBattleStart);
|
||||
void Task_HidePartyStatusSummary(u8 taskId);
|
||||
void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId);
|
||||
|
||||
@@ -44,6 +44,7 @@ u16 GetSecretPowerMoveEffect(void);
|
||||
void StealTargetItem(u8 battlerStealer, u8 battlerItem);
|
||||
u8 GetCatchingBattler(void);
|
||||
u32 GetHighestStatId(u32 battlerId);
|
||||
bool32 ProteanTryChangeType(u32 battler, u32 ability, u32 move, u32 moveType);
|
||||
bool32 DoSwitchInAbilitiesItems(u32 battlerId);
|
||||
|
||||
extern void (* const gBattleScriptingCommandsTable[])(void);
|
||||
|
||||
@@ -246,10 +246,8 @@ extern const u8 BattleScript_TailwindEnds[];
|
||||
extern const u8 BattleScript_TrickRoomEnds[];
|
||||
extern const u8 BattleScript_WonderRoomEnds[];
|
||||
extern const u8 BattleScript_MagicRoomEnds[];
|
||||
extern const u8 BattleScript_ElectricTerrainEnds[];
|
||||
extern const u8 BattleScript_MistyTerrainEnds[];
|
||||
extern const u8 BattleScript_GrassyTerrainEnds[];
|
||||
extern const u8 BattleScript_PsychicTerrainEnds[];
|
||||
extern const u8 BattleScript_TerrainEnds[];
|
||||
extern const u8 BattleScript_TerrainEnds_Ret[];
|
||||
extern const u8 BattleScript_MudSportEnds[];
|
||||
extern const u8 BattleScript_WaterSportEnds[];
|
||||
extern const u8 BattleScript_SturdiedMsg[];
|
||||
@@ -287,6 +285,10 @@ extern const u8 BattleScript_SelectingNotAllowedMoveHealBlockInPalace[];
|
||||
extern const u8 BattleScript_ToxicSpikesFree[];
|
||||
extern const u8 BattleScript_StickyWebFree[];
|
||||
extern const u8 BattleScript_StealthRockFree[];
|
||||
extern const u8 BattleScript_SpikesDefog[];
|
||||
extern const u8 BattleScript_ToxicSpikesDefog[];
|
||||
extern const u8 BattleScript_StickyWebDefog[];
|
||||
extern const u8 BattleScript_StealthRockDefog[];
|
||||
extern const u8 BattleScript_MegaEvolution[];
|
||||
extern const u8 BattleScript_WishMegaEvolution[];
|
||||
extern const u8 BattleScript_MoveEffectRecoilWithStatus[];
|
||||
@@ -456,6 +458,7 @@ extern const u8 BattleScript_HealingWishActivates[];
|
||||
extern const u8 BattleScript_LunarDanceActivates[];
|
||||
extern const u8 BattleScript_ShellTrapSetUp[];
|
||||
extern const u8 BattleScript_CouldntFullyProtect[];
|
||||
extern const u8 BattleScript_MoveEffectStockpileWoreOff[];
|
||||
extern const u8 BattleScript_StealthRockActivates[];
|
||||
extern const u8 BattleScript_SpikesActivates[];
|
||||
|
||||
|
||||
@@ -26,5 +26,6 @@ const u8 *GetZMoveName(u16 move);
|
||||
void SetZEffect(void);
|
||||
bool32 IsZMoveUsable(u8 battlerId, u16 moveIndex);
|
||||
void GetUsableZMoves(u8 battlerId, u16 *moves);
|
||||
u16 GetZMovePower(u16 move);
|
||||
|
||||
#endif // GUARD_BATTLE_Z_MOVE_H
|
||||
#endif // GUARD_BATTLE_Z_MOVE_H
|
||||
@@ -97,6 +97,8 @@
|
||||
#define B_BURN_HIT_THAW GEN_LATEST // In Gen6+, damaging moves with a chance of burn will thaw the target, regardless if they're fire-type moves or not.
|
||||
#define B_HEALING_WISH_SWITCH GEN_LATEST // In Gen5+, the mon receiving Healing Wish is sent out at the end of the turn.
|
||||
// Additionally, in gen8+ the Healing Wish's effect will be stored until the user switches into a statused or hurt mon.
|
||||
#define B_DEFOG_CLEARS_TERRAIN GEN_LATEST // In Gen8+, Defog also clears active Terrain.
|
||||
#define B_STOCKPILE_RAISES_DEFS GEN_LATEST // In Gen4+, Stockpile also raises Defense and Sp.Defense stats. Once Spit Up / Swallow is used, these stat changes are lost.
|
||||
|
||||
// Ability settings
|
||||
#define B_EXPANDED_ABILITY_NAMES TRUE // If TRUE, ability names are increased from 12 characters to 16 characters.
|
||||
|
||||
@@ -2,16 +2,11 @@
|
||||
#define GUARD_CONFIG_DEBUG_H
|
||||
|
||||
// Overworld Debug
|
||||
#define DEBUG_OVERWORLD_MENU TRUE // Enables a overworld debug menu for changing flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
|
||||
#define DEBUG_OVERWORLD_MENU TRUE // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
|
||||
#define DEBUG_OVERWORLD_HELD_KEYS (R_BUTTON) // The keys required to be held to open the debug menu.
|
||||
#define DEBUG_OVERWORLD_TRIGGER_EVENT pressedStartButton // The event that opens the menu when holding the key(s) defined in DEBUG_OVERWORLD_HELD_KEYS.
|
||||
#define DEBUG_OVERWORLD_IN_MENU FALSE // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
|
||||
|
||||
// Debug Flags
|
||||
// To use the following debug features, replace the 0s with the flag ID you're assigning it to.
|
||||
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
|
||||
#define DEBUG_FLAG_NO_COLLISION 0 // If this flag is set, the debug function in the Utility submenu to disable player collision can be used.
|
||||
|
||||
// Battle Debug Menu
|
||||
#define DEBUG_BATTLE_MENU TRUE // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
|
||||
|
||||
|
||||
@@ -9,5 +9,6 @@
|
||||
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
|
||||
#define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled.
|
||||
#define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to.
|
||||
#define OW_FLAG_NO_COLLISION 0 // If this flag is set, the player will be able to walk over tiles with collision. Mainly intended for debugging purposes.
|
||||
|
||||
#endif // GUARD_CONFIG_OVERWORLD_H
|
||||
@@ -372,11 +372,12 @@
|
||||
#define MOVE_EFFECT_TRAP_BOTH 70
|
||||
#define MOVE_EFFECT_DOUBLE_SHOCK 71
|
||||
#define MOVE_EFFECT_ROUND 72
|
||||
#define MOVE_EFFECT_DIRE_CLAW 73
|
||||
#define MOVE_EFFECT_STEALTH_ROCK 74
|
||||
#define MOVE_EFFECT_SPIKES 75
|
||||
#define MOVE_EFFECT_STOCKPILE_WORE_OFF 73
|
||||
#define MOVE_EFFECT_DIRE_CLAW 74
|
||||
#define MOVE_EFFECT_STEALTH_ROCK 75
|
||||
#define MOVE_EFFECT_SPIKES 76
|
||||
|
||||
#define NUM_MOVE_EFFECTS 76
|
||||
#define NUM_MOVE_EFFECTS 77
|
||||
|
||||
#define MOVE_EFFECT_AFFECTS_USER 0x4000
|
||||
#define MOVE_EFFECT_CERTAIN 0x8000
|
||||
|
||||
@@ -399,10 +399,12 @@
|
||||
#define EFFECT_TEATIME 393
|
||||
#define EFFECT_ATTACK_UP_USER_ALLY 394 // Howl 8th Gen
|
||||
#define EFFECT_SHELL_TRAP 395
|
||||
#define EFFECT_HIT_SET_ENTRY_HAZARD 396
|
||||
#define EFFECT_DIRE_CLAW 397
|
||||
#define EFFECT_BARB_BARRAGE 398
|
||||
#define EFFECT_PSYBLADE 396
|
||||
#define EFFECT_HYDRO_STEAM 397
|
||||
#define EFFECT_HIT_SET_ENTRY_HAZARD 398
|
||||
#define EFFECT_DIRE_CLAW 399
|
||||
#define EFFECT_BARB_BARRAGE 400
|
||||
|
||||
#define NUM_BATTLE_MOVE_EFFECTS 399
|
||||
#define NUM_BATTLE_MOVE_EFFECTS 401
|
||||
|
||||
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
|
||||
@@ -265,8 +265,8 @@
|
||||
#define STRINGID_ITAPPEAREDCAUGHT 264
|
||||
#define STRINGID_AARGHALMOSTHADIT 265
|
||||
#define STRINGID_SHOOTSOCLOSE 266
|
||||
#define STRINGID_GOTCHAPKMNCAUGHT 267
|
||||
#define STRINGID_GOTCHAPKMNCAUGHT2 268
|
||||
#define STRINGID_GOTCHAPKMNCAUGHTPLAYER 267
|
||||
#define STRINGID_GOTCHAPKMNCAUGHTWALLY 268
|
||||
#define STRINGID_GIVENICKNAMECAPTURED 269
|
||||
#define STRINGID_PKMNSENTTOPC 270
|
||||
#define STRINGID_PKMNDATAADDEDTODEX 271
|
||||
@@ -641,9 +641,14 @@
|
||||
#define STRINGID_PKMNSABILITYPREVENTSABILITY 639
|
||||
#define STRINGID_PREPARESHELLTRAP 640
|
||||
#define STRINGID_SHELLTRAPDIDNTWORK 641
|
||||
#define STRINGID_COULDNTFULLYPROTECT 642
|
||||
#define STRINGID_SPIKESDISAPPEAREDFROMTEAM 642
|
||||
#define STRINGID_TOXICSPIKESDISAPPEAREDFROMTEAM 643
|
||||
#define STRINGID_STICKYWEBDISAPPEAREDFROMTEAM 644
|
||||
#define STRINGID_STEALTHROCKDISAPPEAREDFROMTEAM 645
|
||||
#define STRINGID_COULDNTFULLYPROTECT 646
|
||||
#define STRINGID_STOCKPILEDEFFECTWOREOFF 647
|
||||
|
||||
#define BATTLESTRINGS_COUNT 643
|
||||
#define BATTLESTRINGS_COUNT 648
|
||||
|
||||
// This is the string id that gBattleStringsTable starts with.
|
||||
// String ids before this (e.g. STRINGID_INTROMSG) are not in the table,
|
||||
@@ -900,6 +905,13 @@
|
||||
#define B_MSG_TERRAINPREVENTS_ELECTRIC 1
|
||||
#define B_MSG_TERRAINPREVENTS_PSYCHIC 2
|
||||
|
||||
// gTerrainEndingStringIds
|
||||
#define B_MSG_TERRAINENDS_MISTY 0
|
||||
#define B_MSG_TERRAINENDS_ELECTRIC 1
|
||||
#define B_MSG_TERRAINENDS_PSYCHIC 2
|
||||
#define B_MSG_TERRAINENDS_GRASS 3
|
||||
#define B_MSG_TERRAINENDS_COUNT 4
|
||||
|
||||
// gWrappedStringIds
|
||||
#define B_MSG_WRAPPED_BIND 0
|
||||
#define B_MSG_WRAPPED_WRAP 1
|
||||
|
||||
@@ -288,6 +288,9 @@
|
||||
|
||||
#define FIRST_DECORATION_SPRITE_GFX OBJ_EVENT_GFX_PICHU_DOLL
|
||||
|
||||
#define OBJ_KIND_NORMAL 0
|
||||
#define OBJ_KIND_CLONE 255 // Exclusive to FRLG
|
||||
|
||||
// Special object event local ids
|
||||
#define OBJ_EVENT_ID_PLAYER 0xFF
|
||||
#define OBJ_EVENT_ID_CAMERA 0x7F
|
||||
|
||||
@@ -580,7 +580,7 @@
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x27)
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x28)
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x29)
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A)
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_114_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A)
|
||||
#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x2B)
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2C)
|
||||
#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2D)
|
||||
@@ -1051,7 +1051,7 @@
|
||||
#define FLAG_ITEM_ROUTE_105_IRON 0x3EB
|
||||
#define FLAG_ITEM_ROUTE_106_PROTEIN 0x3EC
|
||||
#define FLAG_ITEM_ROUTE_109_PP_UP 0x3ED
|
||||
#define FLAG_ITEM_ROUTE_109_RARE_CANDY 0x3EE
|
||||
#define FLAG_ITEM_ROUTE_110_RARE_CANDY 0x3EE
|
||||
#define FLAG_ITEM_ROUTE_110_DIRE_HIT 0x3EF
|
||||
#define FLAG_ITEM_ROUTE_111_TM37 0x3F0
|
||||
#define FLAG_ITEM_ROUTE_111_STARDUST 0x3F1
|
||||
@@ -1162,7 +1162,7 @@
|
||||
#define FLAG_ITEM_ROUTE_103_GUARD_SPEC 0x45A
|
||||
#define FLAG_ITEM_ROUTE_104_X_ACCURACY 0x45B
|
||||
#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED 0x45C
|
||||
#define FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL 0x45D
|
||||
#define FLAG_ITEM_PETALBURG_WOODS_PARALYZE_HEAL 0x45D
|
||||
#define FLAG_ITEM_ROUTE_115_GREAT_BALL 0x45E
|
||||
#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM 0x45F
|
||||
#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL 0x460
|
||||
|
||||
@@ -1001,7 +1001,4 @@
|
||||
#define ITEM_B_USE_MEDICINE 1
|
||||
#define ITEM_B_USE_OTHER 2
|
||||
|
||||
// Check if the item is one that can be used on a Pokemon.
|
||||
#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= LAST_BERRY_INDEX)
|
||||
|
||||
#endif // GUARD_CONSTANTS_ITEMS_H
|
||||
+739
-743
File diff suppressed because it is too large.
Load diff
@@ -858,8 +858,10 @@
|
||||
#define MOVE_NOXIOUS_TORQUE 824
|
||||
#define MOVE_COMBAT_TORQUE 825
|
||||
#define MOVE_MAGICAL_TORQUE 826
|
||||
#define MOVE_PSYBLADE 827
|
||||
#define MOVE_HYDRO_STEAM 828
|
||||
|
||||
#define MOVES_COUNT_GEN9 827
|
||||
#define MOVES_COUNT_GEN9 829
|
||||
|
||||
#define MOVES_COUNT MOVES_COUNT_GEN9
|
||||
|
||||
|
||||
@@ -191,6 +191,9 @@
|
||||
#define FRIENDSHIP_200_TO_254 5
|
||||
#define FRIENDSHIP_MAX 6
|
||||
|
||||
// Friendship value that the majority of species use. This was changed in Generation 8 to 50.
|
||||
#define STANDARD_FRIENDSHIP 70
|
||||
|
||||
#define MAX_FRIENDSHIP 255
|
||||
#define MAX_SHEEN 255
|
||||
#define MAX_CONDITION 255
|
||||
@@ -331,6 +334,14 @@
|
||||
#define MON_PIC_HEIGHT 64
|
||||
#define MON_PIC_SIZE (MON_PIC_WIDTH * MON_PIC_HEIGHT / 2)
|
||||
|
||||
// Most pokemon have 2 frames (a default and an alternate for their animation).
|
||||
// There are 4 exceptions:
|
||||
// - Castform has 4 frames, 1 for each form
|
||||
// - Deoxys has 2 frames, 1 for each form
|
||||
// - Spinda has 1 frame, presumably to avoid the work of animating its spots
|
||||
// - Unown has 1 frame, presumably to avoid the work of animating all 28 of its forms
|
||||
#define MAX_MON_PIC_FRAMES 4
|
||||
|
||||
#define BATTLE_ALIVE_EXCEPT_ACTIVE 0
|
||||
#define BATTLE_ALIVE_ATK_SIDE 1
|
||||
#define BATTLE_ALIVE_DEF_SIDE 2
|
||||
|
||||
+49
-49
@@ -280,47 +280,47 @@
|
||||
|
||||
// Music
|
||||
#define START_MUS 350
|
||||
#define MUS_LITTLEROOT_TEST 350 // MUS_TETSUJI
|
||||
#define MUS_GSC_ROUTE38 351 // MUS_FIELD13
|
||||
#define MUS_LITTLEROOT_TEST 350 // MUS_TETSUJI // Unused, likely a test track.
|
||||
#define MUS_GSC_ROUTE38 351 // MUS_FIELD13 // Unused, likely a test track.
|
||||
#define MUS_CAUGHT 352 // MUS_KACHI22
|
||||
#define MUS_VICTORY_WILD 353 // MUS_KACHI2
|
||||
#define MUS_VICTORY_GYM_LEADER 354 // MUS_KACHI3
|
||||
#define MUS_VICTORY_GYM_LEADER 354 // MUS_KACHI3 // Also used in Frontier Brain victories.
|
||||
#define MUS_VICTORY_LEAGUE 355 // MUS_KACHI5
|
||||
#define MUS_C_COMM_CENTER 356 // MUS_PCC
|
||||
#define MUS_GSC_PEWTER 357 // MUS_NIBI
|
||||
#define MUS_C_VS_LEGEND_BEAST 358 // MUS_SUIKUN
|
||||
#define MUS_ROUTE101 359 // MUS_DOORO1
|
||||
#define MUS_ROUTE110 360 // MUS_DOORO_X1
|
||||
#define MUS_ROUTE120 361 // MUS_DOORO_X3
|
||||
#define MUS_PETALBURG 362 // MUS_MACHI_S2
|
||||
#define MUS_OLDALE 363 // MUS_MACHI_S4
|
||||
#define MUS_C_COMM_CENTER 356 // MUS_PCC // Unused, likely a test track.
|
||||
#define MUS_GSC_PEWTER 357 // MUS_NIBI // Used in unused Contest Halls.
|
||||
#define MUS_C_VS_LEGEND_BEAST 358 // MUS_SUIKUN // Unused, likely a test track.
|
||||
#define MUS_ROUTE101 359 // MUS_DOORO1 // Also used in Routes 102 and 103.
|
||||
#define MUS_ROUTE110 360 // MUS_DOORO_X1 // Also used in Routes 112, 114, 117, 111's non-desert section and 118's west half.
|
||||
#define MUS_ROUTE120 361 // MUS_DOORO_X3 // Also used in Routes 121, 124, 125, 126, 127 and 128.
|
||||
#define MUS_PETALBURG 362 // MUS_MACHI_S2 // Also used in Mr. Briney's House and Pretty Petal Flower Shop.
|
||||
#define MUS_OLDALE 363 // MUS_MACHI_S4 // Also used in Lavaridge Town.
|
||||
#define MUS_GYM 364 // MUS_GIM
|
||||
#define MUS_SURF 365 // MUS_NAMINORI
|
||||
#define MUS_PETALBURG_WOODS 366 // MUS_DAN01
|
||||
#define MUS_PETALBURG_WOODS 366 // MUS_DAN01 // Also used in Artisan Cave, Fiery Path, Granite Cave, Jagged Pass, Marine Cave, Rusturf Tunnel, Scorched Slab and Terra Cave.
|
||||
#define MUS_LEVEL_UP 367 // MUS_FANFA1
|
||||
#define MUS_HEAL 368 // MUS_ME_ASA
|
||||
#define MUS_OBTAIN_BADGE 369 // MUS_ME_BACHI
|
||||
#define MUS_OBTAIN_ITEM 370 // MUS_FANFA4
|
||||
#define MUS_EVOLVED 371 // MUS_FANFA5
|
||||
#define MUS_EVOLVED 371 // MUS_FANFA5 // Also used in egg hatching, trades and upon catching.
|
||||
#define MUS_OBTAIN_TMHM 372 // MUS_ME_WAZA
|
||||
#define MUS_LILYCOVE_MUSEUM 373 // MUS_BIJYUTU
|
||||
#define MUS_ROUTE122 374 // MUS_DOORO_X4
|
||||
#define MUS_LILYCOVE_MUSEUM 373 // MUS_BIJYUTU // Also used in the Battle Frontier's Ranking Hall.
|
||||
#define MUS_ROUTE122 374 // MUS_DOORO_X4 // Also used in Route 123 and Birch's intro speech.
|
||||
#define MUS_OCEANIC_MUSEUM 375 // MUS_FUNE_KAN
|
||||
#define MUS_EVOLUTION_INTRO 376 // MUS_ME_SHINKA
|
||||
#define MUS_EVOLUTION 377 // MUS_SHINKA
|
||||
#define MUS_EVOLUTION_INTRO 376 // MUS_ME_SHINKA // Also used in egg hatching.
|
||||
#define MUS_EVOLUTION 377 // MUS_SHINKA // Also used in egg hatching and trades.
|
||||
#define MUS_MOVE_DELETED 378 // MUS_ME_WASURE
|
||||
#define MUS_ENCOUNTER_GIRL 379 // MUS_SYOUJOEYE
|
||||
#define MUS_ENCOUNTER_MALE 380 // MUS_BOYEYE
|
||||
#define MUS_ABANDONED_SHIP 381 // MUS_DAN02
|
||||
#define MUS_FORTREE 382 // MUS_MACHI_S3
|
||||
#define MUS_ABANDONED_SHIP 381 // MUS_DAN02 // Also used in Faraway and Southern Islands.
|
||||
#define MUS_FORTREE 382 // MUS_MACHI_S3 // Also used in Secret Bases and the Safari Zone's entrance.
|
||||
#define MUS_BIRCH_LAB 383 // MUS_ODAMAKI
|
||||
#define MUS_B_TOWER_RS 384 // MUS_B_TOWER
|
||||
#define MUS_B_TOWER_RS 384 // MUS_B_TOWER // Used in Battle Tents, Trainer Hill and Battle Frontier's lounges and Exchange Service Corner.
|
||||
#define MUS_ENCOUNTER_SWIMMER 385 // MUS_SWIMEYE
|
||||
#define MUS_CAVE_OF_ORIGIN 386 // MUS_DAN03
|
||||
#define MUS_CAVE_OF_ORIGIN 386 // MUS_DAN03 // Also used in Meteor Falls.
|
||||
#define MUS_OBTAIN_BERRY 387 // MUS_ME_KINOMI
|
||||
#define MUS_AWAKEN_LEGEND 388 // MUS_ME_TAMA
|
||||
#define MUS_SLOTS_JACKPOT 389 // MUS_ME_B_BIG
|
||||
#define MUS_SLOTS_WIN 390 // MUS_ME_B_SMALL
|
||||
#define MUS_SLOTS_JACKPOT 389 // MUS_ME_B_BIG // Also used in the Roulette.
|
||||
#define MUS_SLOTS_WIN 390 // MUS_ME_B_SMALL // Also used in the Roulette.
|
||||
#define MUS_TOO_BAD 391 // MUS_ME_ZANNEN
|
||||
#define MUS_ROULETTE 392 // MUS_BD_TIME
|
||||
#define MUS_LINK_CONTEST_P1 393 // MUS_TEST1
|
||||
@@ -329,17 +329,17 @@
|
||||
#define MUS_LINK_CONTEST_P4 396 // MUS_TEST4
|
||||
#define MUS_ENCOUNTER_RICH 397 // MUS_TEST
|
||||
#define MUS_VERDANTURF 398 // MUS_GOMACHI0
|
||||
#define MUS_RUSTBORO 399 // MUS_GOTOWN
|
||||
#define MUS_POKE_CENTER 400 // MUS_POKECEN
|
||||
#define MUS_ROUTE104 401 // MUS_NEXTROAD
|
||||
#define MUS_ROUTE119 402 // MUS_GRANROAD
|
||||
#define MUS_RUSTBORO 399 // MUS_GOTOWN // Also used in Mauville City, Mossdeep City, Daycare, Weather Institute and several Route houses.
|
||||
#define MUS_POKE_CENTER 400 // MUS_POKECEN // Also used in the Pokémon League's lobby.
|
||||
#define MUS_ROUTE104 401 // MUS_NEXTROAD // Also used in Routes 105, 106, 107, 108, 109, 115 and 116.
|
||||
#define MUS_ROUTE119 402 // MUS_GRANROAD // Also used in Routes 129, 130, 131, 132, 133, 134 and 118's east half.
|
||||
#define MUS_CYCLING 403 // MUS_CYCLING
|
||||
#define MUS_POKE_MART 404 // MUS_FRIENDLY
|
||||
#define MUS_POKE_MART 404 // MUS_FRIENDLY // Also used in Lilycove's Department Store.
|
||||
#define MUS_LITTLEROOT 405 // MUS_MISHIRO
|
||||
#define MUS_MT_CHIMNEY 406 // MUS_TOZAN
|
||||
#define MUS_MT_CHIMNEY 406 // MUS_TOZAN // Also used in Desert Underpass, Mirage Tower, Seafloor Cavern and Sky Pillar.
|
||||
#define MUS_ENCOUNTER_FEMALE 407 // MUS_GIRLEYE
|
||||
#define MUS_LILYCOVE 408 // MUS_MINAMO
|
||||
#define MUS_ROUTE111 409 // MUS_ASHROAD
|
||||
#define MUS_LILYCOVE 408 // MUS_MINAMO // Also used in Pacifidlog Town and the Diving Treasure Hunter's house.
|
||||
#define MUS_DESERT 409 // MUS_ASHROAD
|
||||
#define MUS_HELP 410 // MUS_EVENT0
|
||||
#define MUS_UNDERWATER 411 // MUS_DEEPDEEP
|
||||
#define MUS_VICTORY_TRAINER 412 // MUS_KACHI1
|
||||
@@ -352,29 +352,29 @@
|
||||
#define MUS_ENCOUNTER_AQUA 419 // MUS_AQA_0
|
||||
#define MUS_FOLLOW_ME 420 // MUS_TSURETEK
|
||||
#define MUS_ENCOUNTER_BRENDAN 421 // MUS_BOY_SUP
|
||||
#define MUS_EVER_GRANDE 422 // MUS_RAINBOW
|
||||
#define MUS_EVER_GRANDE 422 // MUS_RAINBOW // Also used in link rooms.
|
||||
#define MUS_ENCOUNTER_SUSPICIOUS 423 // MUS_AYASII
|
||||
#define MUS_VICTORY_AQUA_MAGMA 424 // MUS_KACHI4
|
||||
#define MUS_CABLE_CAR 425 // MUS_ROPEWAY
|
||||
#define MUS_GAME_CORNER 426 // MUS_CASINO
|
||||
#define MUS_DEWFORD 427 // MUS_HIGHTOWN
|
||||
#define MUS_DEWFORD 427 // MUS_HIGHTOWN // Also used in Route 109's Seashore house.
|
||||
#define MUS_SAFARI_ZONE 428 // MUS_SAFARI
|
||||
#define MUS_VICTORY_ROAD 429 // MUS_C_ROAD
|
||||
#define MUS_VICTORY_ROAD 429 // MUS_C_ROAD // Also used in Pokémon League's E4/Champion rooms and halls.
|
||||
#define MUS_AQUA_MAGMA_HIDEOUT 430 // MUS_AJITO
|
||||
#define MUS_SAILING 431 // MUS_M_BOAT
|
||||
#define MUS_MT_PYRE 432 // MUS_M_DUNGON
|
||||
#define MUS_SLATEPORT 433 // MUS_FINECITY
|
||||
#define MUS_MT_PYRE 432 // MUS_M_DUNGON // Also used in New Mauville and Shoal Cave.
|
||||
#define MUS_SLATEPORT 433 // MUS_FINECITY // Also used in Cycling Road's entrances.
|
||||
#define MUS_MT_PYRE_EXTERIOR 434 // MUS_MACHUPI
|
||||
#define MUS_SCHOOL 435 // MUS_P_SCHOOL
|
||||
#define MUS_HALL_OF_FAME 436 // MUS_DENDOU
|
||||
#define MUS_FALLARBOR 437 // MUS_TONEKUSA
|
||||
#define MUS_SEALED_CHAMBER 438 // MUS_MABOROSI
|
||||
#define MUS_FALLARBOR 437 // MUS_TONEKUSA // Also used in Route 114's houses.
|
||||
#define MUS_SEALED_CHAMBER 438 // MUS_MABOROSI // Also used in Ancient Tomb, Desert Ruins and Island Cave.
|
||||
#define MUS_CONTEST_WINNER 439 // MUS_CON_FAN
|
||||
#define MUS_CONTEST 440 // MUS_CONTEST0
|
||||
#define MUS_ENCOUNTER_MAGMA 441 // MUS_MGM0
|
||||
#define MUS_INTRO_BATTLE 442 // MUS_T_BATTLE
|
||||
#define MUS_ABNORMAL_WEATHER 443 // MUS_OOAME (Replaces MUS_WEATHER_KYOGRE from R/S)
|
||||
#define MUS_WEATHER_GROUDON 444 // MUS_HIDERI (Unused, from R/S)
|
||||
#define MUS_ABNORMAL_WEATHER 443 // MUS_OOAME // Replaces MUS_WEATHER_KYOGRE from R/S.
|
||||
#define MUS_WEATHER_GROUDON 444 // MUS_HIDERI // Unused, from R/S.
|
||||
#define MUS_SOOTOPOLIS 445 // MUS_RUNECITY
|
||||
#define MUS_CONTEST_RESULTS 446 // MUS_CON_K
|
||||
#define MUS_HALL_OF_FAME_ROOM 447 // MUS_EIKOU_R
|
||||
@@ -383,7 +383,7 @@
|
||||
#define MUS_ENCOUNTER_ELITE_FOUR 450 // MUS_SITENNOU
|
||||
#define MUS_ENCOUNTER_HIKER 451 // MUS_YAMA_EYE
|
||||
#define MUS_CONTEST_LOBBY 452 // MUS_CONLOBBY
|
||||
#define MUS_ENCOUNTER_INTERVIEWER 453 // MUS_INTER_V
|
||||
#define MUS_ENCOUNTER_INTERVIEWER 453 // MUS_INTER_V // Also used during Petalburg City report at the beginning of the game.
|
||||
#define MUS_ENCOUNTER_CHAMPION 454 // MUS_DAIGO
|
||||
#define MUS_CREDITS 455 // MUS_THANKFOR
|
||||
#define MUS_END 456 // MUS_END
|
||||
@@ -400,7 +400,7 @@
|
||||
#define MUS_B_DOME 467 // MUS_B_DOME
|
||||
#define MUS_B_PIKE 468 // MUS_B_TUBE
|
||||
#define MUS_B_FACTORY 469 // MUS_B_FACTORY
|
||||
#define MUS_VS_RAYQUAZA 470 // MUS_VS_REKKU (Identical to MUS_VS_KYOGRE_GROUDON)
|
||||
#define MUS_VS_RAYQUAZA 470 // MUS_VS_REKKU // Identical to MUS_VS_KYOGRE_GROUDON.
|
||||
#define MUS_VS_FRONTIER_BRAIN 471 // MUS_VS_FRONT
|
||||
#define MUS_VS_MEW 472 // MUS_VS_MEW
|
||||
#define MUS_B_DOME_LOBBY 473 // MUS_B_DOME1
|
||||
@@ -453,9 +453,9 @@
|
||||
#define MUS_RG_SILPH 519 // MUS_RG_SHIRUHU
|
||||
#define MUS_RG_FUCHSIA 520 // MUS_RG_HANADA
|
||||
#define MUS_RG_CELADON 521 // MUS_RG_TAMAMUSI
|
||||
#define MUS_RG_VICTORY_TRAINER 522 // MUS_RG_WIN_TRE (Identical to MUS_VICTORY_TRAINER)
|
||||
#define MUS_RG_VICTORY_WILD 523 // MUS_RG_WIN_YASEI (Identical to MUS_VICTORY_WILD)
|
||||
#define MUS_RG_VICTORY_GYM_LEADER 524 // MUS_RG_WIN_GYM (Identical to MUS_VICTORY_GYM_LEADER)
|
||||
#define MUS_RG_VICTORY_TRAINER 522 // MUS_RG_WIN_TRE // Identical to MUS_VICTORY_TRAINER.
|
||||
#define MUS_RG_VICTORY_WILD 523 // MUS_RG_WIN_YASEI // Identical to MUS_VICTORY_WILD.
|
||||
#define MUS_RG_VICTORY_GYM_LEADER 524 // MUS_RG_WIN_GYM // Identical to MUS_VICTORY_GYM_LEADER.
|
||||
#define MUS_RG_VERMILLION 525 // MUS_RG_KUCHIBA
|
||||
#define MUS_RG_PEWTER 526 // MUS_RG_NIBI
|
||||
#define MUS_RG_ENCOUNTER_RIVAL 527 // MUS_RG_RIVAL1
|
||||
@@ -474,11 +474,11 @@
|
||||
#define MUS_RG_NET_CENTER 540 // MUS_RG_NETWORK
|
||||
#define MUS_RG_MYSTERY_GIFT 541 // MUS_RG_OKURIMONO
|
||||
#define MUS_RG_BERRY_PICK 542 // MUS_RG_KINOMIKUI
|
||||
#define MUS_RG_SEVII_CAVE 543 // MUS_RG_NANADUNGEON (Identical to MUS_RG_MT_MOON)
|
||||
#define MUS_RG_TEACHY_TV_SHOW 544 // MUS_RG_OSHIE_TV (Identical to MUS_RG_FOLLOW_ME)
|
||||
#define MUS_RG_SEVII_CAVE 543 // MUS_RG_NANADUNGEON // Identical to MUS_RG_MT_MOON.
|
||||
#define MUS_RG_TEACHY_TV_SHOW 544 // MUS_RG_OSHIE_TV // Identical to MUS_RG_FOLLOW_ME.
|
||||
#define MUS_RG_SEVII_ROUTE 545 // MUS_RG_NANASHIMA
|
||||
#define MUS_RG_SEVII_DUNGEON 546 // MUS_RG_NANAISEKI (Identical to MUS_RG_VIRIDIAN_FOREST)
|
||||
#define MUS_RG_SEVII_123 547 // MUS_RG_NANA123 (Identical to MUS_RG_PEWTER)
|
||||
#define MUS_RG_SEVII_DUNGEON 546 // MUS_RG_NANAISEKI // Identical to MUS_RG_VIRIDIAN_FOREST.
|
||||
#define MUS_RG_SEVII_123 547 // MUS_RG_NANA123 // Identical to MUS_RG_PEWTER
|
||||
#define MUS_RG_SEVII_45 548 // MUS_RG_NANA45
|
||||
#define MUS_RG_SEVII_67 549 // MUS_RG_NANA67
|
||||
#define MUS_RG_POKE_FLUTE 550 // MUS_RG_POKEFUE
|
||||
|
||||
@@ -1368,8 +1368,11 @@
|
||||
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327
|
||||
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328
|
||||
|
||||
// Basculegion
|
||||
#define SPECIES_BASCULEGION_FEMALE FORMS_START + 329
|
||||
|
||||
#define FORMS_START SPECIES_ENAMORUS
|
||||
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
|
||||
#define SPECIES_EGG SPECIES_BASCULEGION_FEMALE + 1
|
||||
|
||||
#define NUM_SPECIES SPECIES_EGG
|
||||
|
||||
|
||||
@@ -7,6 +7,13 @@
|
||||
|
||||
#define MAX_TRAINER_ITEMS 4
|
||||
|
||||
#define TRAINER_PIC_WIDTH 64
|
||||
#define TRAINER_PIC_HEIGHT 64
|
||||
#define TRAINER_PIC_SIZE (TRAINER_PIC_WIDTH * TRAINER_PIC_HEIGHT / 2)
|
||||
|
||||
// Red and Leaf's back pics have 5 frames, but this is presumably irrelevant in the places this is used.
|
||||
#define MAX_TRAINER_PIC_FRAMES 4
|
||||
|
||||
enum {
|
||||
BATTLER_AFFINE_NORMAL,
|
||||
BATTLER_AFFINE_EMERGE,
|
||||
|
||||
@@ -67,7 +67,7 @@ struct ObjectEventTemplate
|
||||
{
|
||||
/*0x00*/ u8 localId;
|
||||
/*0x01*/ u8 graphicsId;
|
||||
/*0x02*/ u8 inConnection; // Leftover from FRLG
|
||||
/*0x02*/ u8 kind; // Always OBJ_KIND_NORMAL in Emerald.
|
||||
/*0x03*/ //u8 padding1;
|
||||
/*0x04*/ s16 x;
|
||||
/*0x06*/ s16 y;
|
||||
|
||||
+2
-2
@@ -27,8 +27,8 @@
|
||||
/// IDE support
|
||||
#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
|
||||
// We define these when using certain IDEs to fool preproc
|
||||
#define _(x) (x)
|
||||
#define __(x) (x)
|
||||
#define _(x) {x}
|
||||
#define __(x) {x}
|
||||
#define INCBIN(...) {0}
|
||||
#define INCBIN_U8 INCBIN
|
||||
#define INCBIN_U16 INCBIN
|
||||
|
||||
+37
-37
@@ -986,14 +986,13 @@ extern const u32 gMonFrontPic_Regidrago[];
|
||||
extern const u32 gMonFrontPic_Glastrier[];
|
||||
extern const u32 gMonFrontPic_Spectrier[];
|
||||
extern const u32 gMonFrontPic_Calyrex[];
|
||||
//extern const u32 gMonFrontPic_Wyrdeer[];
|
||||
extern const u32 gMonFrontPic_Wyrdeer[];
|
||||
extern const u32 gMonFrontPic_Kleavor[];
|
||||
extern const u32 gMonFrontPic_Ursaluna[];
|
||||
//extern const u32 gMonFrontPic_Basculegion[];
|
||||
//extern const u32 gMonFrontPic_BasculegionF[];
|
||||
//extern const u32 gMonFrontPic_Sneasler[];
|
||||
extern const u32 gMonFrontPic_Basculegion[];
|
||||
extern const u32 gMonFrontPic_Sneasler[];
|
||||
extern const u32 gMonFrontPic_Overqwil[];
|
||||
//extern const u32 gMonFrontPic_Enamorus[];
|
||||
extern const u32 gMonFrontPic_Enamorus[];
|
||||
#endif
|
||||
extern const u32 gMonFrontPic_VenusaurMega[];
|
||||
extern const u32 gMonFrontPic_CharizardMegaX[];
|
||||
@@ -1098,7 +1097,7 @@ extern const u32 gMonFrontPic_TyphlosionHisuian[];
|
||||
extern const u32 gMonFrontPic_QwilfishHisuian[];
|
||||
extern const u32 gMonFrontPic_SneaselHisuian[];
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
//extern const u32 gMonFrontPic_SamurottHisuian[];
|
||||
extern const u32 gMonFrontPic_SamurottHisuian[];
|
||||
extern const u32 gMonFrontPic_LilligantHisuian[];
|
||||
extern const u32 gMonFrontPic_ZoruaHisuian[];
|
||||
extern const u32 gMonFrontPic_ZoroarkHisuian[];
|
||||
@@ -1110,7 +1109,7 @@ extern const u32 gMonFrontPic_GoodraHisuian[];
|
||||
extern const u32 gMonFrontPic_AvaluggHisuian[];
|
||||
#endif
|
||||
#if P_GEN_7_POKEMON == TRUE
|
||||
//extern const u32 gMonFrontPic_DecidueyeHisuian[];
|
||||
extern const u32 gMonFrontPic_DecidueyeHisuian[];
|
||||
#endif
|
||||
extern const u32 gMonFrontPic_PikachuCosplay[];
|
||||
extern const u32 gMonFrontPic_PikachuRockStar[];
|
||||
@@ -1276,7 +1275,8 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[];
|
||||
extern const u32 gMonFrontPic_ZarudeDada[];
|
||||
extern const u32 gMonFrontPic_CalyrexIceRider[];
|
||||
extern const u32 gMonFrontPic_CalyrexShadowRider[];
|
||||
//extern const u32 gMonFrontPic_EnamorusTherian[];
|
||||
extern const u32 gMonFrontPic_EnamorusTherian[];
|
||||
extern const u32 gMonFrontPic_BasculegionFemale[];
|
||||
#endif
|
||||
extern const u32 gMonFrontPic_Egg[];
|
||||
|
||||
@@ -2200,14 +2200,13 @@ extern const u32 gMonBackPic_Regidrago[];
|
||||
extern const u32 gMonBackPic_Glastrier[];
|
||||
extern const u32 gMonBackPic_Spectrier[];
|
||||
extern const u32 gMonBackPic_Calyrex[];
|
||||
//extern const u32 gMonBackPic_Wyrdeer[];
|
||||
extern const u32 gMonBackPic_Wyrdeer[];
|
||||
extern const u32 gMonBackPic_Kleavor[];
|
||||
extern const u32 gMonBackPic_Ursaluna[];
|
||||
//extern const u32 gMonBackPic_Basculegion[];
|
||||
//extern const u32 gMonBackPic_BasculegionF[];
|
||||
//extern const u32 gMonBackPic_Sneasler[];
|
||||
extern const u32 gMonBackPic_Basculegion[];
|
||||
extern const u32 gMonBackPic_Sneasler[];
|
||||
extern const u32 gMonBackPic_Overqwil[];
|
||||
//extern const u32 gMonBackPic_Enamorus[];
|
||||
extern const u32 gMonBackPic_Enamorus[];
|
||||
#endif
|
||||
extern const u32 gMonBackPic_VenusaurMega[];
|
||||
extern const u32 gMonBackPic_CharizardMegaX[];
|
||||
@@ -2312,7 +2311,7 @@ extern const u32 gMonBackPic_TyphlosionHisuian[];
|
||||
extern const u32 gMonBackPic_QwilfishHisuian[];
|
||||
extern const u32 gMonBackPic_SneaselHisuian[];
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
//extern const u32 gMonBackPic_SamurottHisuian[];
|
||||
extern const u32 gMonBackPic_SamurottHisuian[];
|
||||
extern const u32 gMonBackPic_LilligantHisuian[];
|
||||
extern const u32 gMonBackPic_ZoruaHisuian[];
|
||||
extern const u32 gMonBackPic_ZoroarkHisuian[];
|
||||
@@ -2324,7 +2323,7 @@ extern const u32 gMonBackPic_GoodraHisuian[];
|
||||
extern const u32 gMonBackPic_AvaluggHisuian[];
|
||||
#endif
|
||||
#if P_GEN_7_POKEMON == TRUE
|
||||
//extern const u32 gMonBackPic_DecidueyeHisuian[];
|
||||
extern const u32 gMonBackPic_DecidueyeHisuian[];
|
||||
#endif
|
||||
extern const u32 gMonBackPic_PikachuCosplay[];
|
||||
extern const u32 gMonBackPic_PikachuRockStar[];
|
||||
@@ -2488,7 +2487,8 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[];
|
||||
extern const u32 gMonBackPic_ZarudeDada[];
|
||||
extern const u32 gMonBackPic_CalyrexIceRider[];
|
||||
extern const u32 gMonBackPic_CalyrexShadowRider[];
|
||||
//extern const u32 gMonBackPic_EnamorusTherian[];
|
||||
extern const u32 gMonBackPic_EnamorusTherian[];
|
||||
extern const u32 gMonBackPic_BasculegionFemale[];
|
||||
#endif
|
||||
|
||||
extern const u32 gMonPalette_CircledQuestionMark[];
|
||||
@@ -3406,14 +3406,13 @@ extern const u32 gMonPalette_Regidrago[];
|
||||
extern const u32 gMonPalette_Glastrier[];
|
||||
extern const u32 gMonPalette_Spectrier[];
|
||||
extern const u32 gMonPalette_Calyrex[];
|
||||
//extern const u32 gMonPalette_Wyrdeer[];
|
||||
extern const u32 gMonPalette_Wyrdeer[];
|
||||
extern const u32 gMonPalette_Kleavor[];
|
||||
extern const u32 gMonPalette_Ursaluna[];
|
||||
//extern const u32 gMonPalette_Basculegion[];
|
||||
//extern const u32 gMonPalette_BasculegionF[];
|
||||
//extern const u32 gMonPalette_Sneasler[];
|
||||
extern const u32 gMonPalette_Basculegion[];
|
||||
extern const u32 gMonPalette_Sneasler[];
|
||||
extern const u32 gMonPalette_Overqwil[];
|
||||
//extern const u32 gMonPalette_Enamorus[];
|
||||
extern const u32 gMonPalette_Enamorus[];
|
||||
#endif
|
||||
extern const u32 gMonPalette_VenusaurMega[];
|
||||
extern const u32 gMonPalette_CharizardMegaX[];
|
||||
@@ -3518,7 +3517,7 @@ extern const u32 gMonPalette_TyphlosionHisuian[];
|
||||
extern const u32 gMonPalette_QwilfishHisuian[];
|
||||
extern const u32 gMonPalette_SneaselHisuian[];
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
//extern const u32 gMonPalette_SamurottHisuian[];
|
||||
extern const u32 gMonPalette_SamurottHisuian[];
|
||||
extern const u32 gMonPalette_LilligantHisuian[];
|
||||
extern const u32 gMonPalette_ZoruaHisuian[];
|
||||
extern const u32 gMonPalette_ZoroarkHisuian[];
|
||||
@@ -3530,7 +3529,7 @@ extern const u32 gMonPalette_GoodraHisuian[];
|
||||
extern const u32 gMonPalette_AvaluggHisuian[];
|
||||
#endif
|
||||
#if P_GEN_7_POKEMON == TRUE
|
||||
//extern const u32 gMonPalette_DecidueyeHisuian[];
|
||||
extern const u32 gMonPalette_DecidueyeHisuian[];
|
||||
#endif
|
||||
extern const u32 gMonPalette_PikachuCosplay[];
|
||||
extern const u32 gMonPalette_PikachuRockStar[];
|
||||
@@ -3720,7 +3719,8 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[];
|
||||
extern const u32 gMonPalette_ZarudeDada[];
|
||||
extern const u32 gMonPalette_CalyrexIceRider[];
|
||||
extern const u32 gMonPalette_CalyrexShadowRider[];
|
||||
//extern const u32 gMonPalette_EnamorusTherian[];
|
||||
extern const u32 gMonPalette_EnamorusTherian[];
|
||||
extern const u32 gMonPalette_BasculegionFemale[];
|
||||
#endif
|
||||
extern const u32 gMonPalette_Egg[];
|
||||
|
||||
@@ -4639,14 +4639,13 @@ extern const u32 gMonShinyPalette_Regidrago[];
|
||||
extern const u32 gMonShinyPalette_Glastrier[];
|
||||
extern const u32 gMonShinyPalette_Spectrier[];
|
||||
extern const u32 gMonShinyPalette_Calyrex[];
|
||||
//extern const u32 gMonShinyPalette_Wyrdeer[];
|
||||
extern const u32 gMonShinyPalette_Wyrdeer[];
|
||||
extern const u32 gMonShinyPalette_Kleavor[];
|
||||
extern const u32 gMonShinyPalette_Ursaluna[];
|
||||
//extern const u32 gMonShinyPalette_Basculegion[];
|
||||
//extern const u32 gMonShinyPalette_BasculegionF[];
|
||||
//extern const u32 gMonShinyPalette_Sneasler[];
|
||||
extern const u32 gMonShinyPalette_Basculegion[];
|
||||
extern const u32 gMonShinyPalette_Sneasler[];
|
||||
extern const u32 gMonShinyPalette_Overqwil[];
|
||||
//extern const u32 gMonShinyPalette_Enamorus[];
|
||||
extern const u32 gMonShinyPalette_Enamorus[];
|
||||
#endif
|
||||
extern const u32 gMonShinyPalette_VenusaurMega[];
|
||||
extern const u32 gMonShinyPalette_CharizardMegaX[];
|
||||
@@ -4751,7 +4750,7 @@ extern const u32 gMonShinyPalette_TyphlosionHisuian[];
|
||||
extern const u32 gMonShinyPalette_QwilfishHisuian[];
|
||||
extern const u32 gMonShinyPalette_SneaselHisuian[];
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
//extern const u32 gMonShinyPalette_SamurottHisuian[];
|
||||
extern const u32 gMonShinyPalette_SamurottHisuian[];
|
||||
extern const u32 gMonShinyPalette_LilligantHisuian[];
|
||||
extern const u32 gMonShinyPalette_ZoruaHisuian[];
|
||||
extern const u32 gMonShinyPalette_ZoroarkHisuian[];
|
||||
@@ -4763,7 +4762,7 @@ extern const u32 gMonShinyPalette_GoodraHisuian[];
|
||||
extern const u32 gMonShinyPalette_AvaluggHisuian[];
|
||||
#endif
|
||||
#if P_GEN_7_POKEMON == TRUE
|
||||
//extern const u32 gMonShinyPalette_DecidueyeHisuian[];
|
||||
extern const u32 gMonShinyPalette_DecidueyeHisuian[];
|
||||
#endif
|
||||
extern const u32 gMonShinyPalette_PikachuCosplay[];
|
||||
extern const u32 gMonShinyPalette_PikachuRockStar[];
|
||||
@@ -4947,7 +4946,8 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[];
|
||||
extern const u32 gMonShinyPalette_ZarudeDada[];
|
||||
extern const u32 gMonShinyPalette_CalyrexIceRider[];
|
||||
extern const u32 gMonShinyPalette_CalyrexShadowRider[];
|
||||
//extern const u32 gMonShinyPalette_EnamorusTherian[];
|
||||
extern const u32 gMonShinyPalette_EnamorusTherian[];
|
||||
extern const u32 gMonShinyPalette_BasculegionFemale[];
|
||||
#endif
|
||||
|
||||
extern const u8 gMonIcon_QuestionMark[];
|
||||
@@ -5870,7 +5870,6 @@ extern const u8 gMonIcon_Wyrdeer[];
|
||||
extern const u8 gMonIcon_Kleavor[];
|
||||
extern const u8 gMonIcon_Ursaluna[];
|
||||
extern const u8 gMonIcon_Basculegion[];
|
||||
extern const u8 gMonIcon_BasculegionF[];
|
||||
extern const u8 gMonIcon_Sneasler[];
|
||||
extern const u8 gMonIcon_Overqwil[];
|
||||
extern const u8 gMonIcon_Enamorus[];
|
||||
@@ -6168,6 +6167,7 @@ extern const u8 gMonIcon_ZarudeDada[];
|
||||
extern const u8 gMonIcon_CalyrexIceRider[];
|
||||
extern const u8 gMonIcon_CalyrexShadowRider[];
|
||||
extern const u8 gMonIcon_EnamorusTherian[];
|
||||
extern const u8 gMonIcon_BasculegionFemale[];
|
||||
#endif
|
||||
extern const u8 gMonIcon_Egg[];
|
||||
|
||||
@@ -10359,10 +10359,10 @@ extern const u32 gUsePokeblockCondition_Gfx[];
|
||||
extern const u16 gUnionRoomChat_Background_Pal[];
|
||||
extern const u32 gUnionRoomChat_Background_Gfx[];
|
||||
extern const u32 gUnionRoomChat_Background_Tilemap[];
|
||||
extern const u16 gUnionRoomChat_Window_Pal1[];
|
||||
extern const u16 gUnionRoomChat_Window_Pal2[];
|
||||
extern const u32 gUnionRoomChat_Border_Gfx[];
|
||||
extern const u32 gUnionRoomChat_Border_Tilemap[];
|
||||
extern const u16 gUnionRoomChat_InputText_Pal[];
|
||||
extern const u16 gUnionRoomChat_Keyboard_Pal[];
|
||||
extern const u32 gUnionRoomChat_Keyboard_Gfx[];
|
||||
extern const u32 gUnionRoomChat_Keyboard_Tilemap[];
|
||||
extern const u32 gUnionRoomChat_RButtonLabels[];
|
||||
|
||||
// Use Pokeblock
|
||||
|
||||
+32
-26
@@ -2,6 +2,7 @@
|
||||
#define GUARD_POKEMON_H
|
||||
|
||||
#include "sprite.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/region_map_sections.h"
|
||||
#include "constants/map_groups.h"
|
||||
|
||||
@@ -75,7 +76,7 @@ enum {
|
||||
MON_DATA_SPATK,
|
||||
MON_DATA_SPDEF,
|
||||
MON_DATA_MAIL,
|
||||
MON_DATA_SPECIES2,
|
||||
MON_DATA_SPECIES_OR_EGG,
|
||||
MON_DATA_IVS,
|
||||
MON_DATA_CHAMPION_RIBBON,
|
||||
MON_DATA_WINNING_RIBBON,
|
||||
@@ -90,7 +91,7 @@ enum {
|
||||
MON_DATA_EARTH_RIBBON,
|
||||
MON_DATA_WORLD_RIBBON,
|
||||
MON_DATA_UNUSED_RIBBONS,
|
||||
MON_DATA_EVENT_LEGAL,
|
||||
MON_DATA_MODERN_FATEFUL_ENCOUNTER,
|
||||
MON_DATA_KNOWN_MOVES,
|
||||
MON_DATA_RIBBON_COUNT,
|
||||
MON_DATA_RIBBONS,
|
||||
@@ -153,27 +154,34 @@ struct PokemonSubstruct3
|
||||
/* 0x07 */ u32 isEgg:1;
|
||||
/* 0x07 */ u32 unused2:1;
|
||||
|
||||
/* 0x08 */ u32 coolRibbon:3;
|
||||
/* 0x08 */ u32 beautyRibbon:3;
|
||||
/* 0x08 */ u32 cuteRibbon:3;
|
||||
/* 0x09 */ u32 smartRibbon:3;
|
||||
/* 0x09 */ u32 toughRibbon:3;
|
||||
/* 0x09 */ u32 championRibbon:1;
|
||||
/* 0x0A */ u32 winningRibbon:1;
|
||||
/* 0x0A */ u32 victoryRibbon:1;
|
||||
/* 0x0A */ u32 artistRibbon:1;
|
||||
/* 0x0A */ u32 effortRibbon:1;
|
||||
/* 0x0A */ u32 marineRibbon:1; // never distributed
|
||||
/* 0x0A */ u32 landRibbon:1; // never distributed
|
||||
/* 0x0A */ u32 skyRibbon:1; // never distributed
|
||||
/* 0x0A */ u32 countryRibbon:1; // distributed during Pokémon Festa '04 and '05 to tournament winners
|
||||
/* 0x0B */ u32 nationalRibbon:1;
|
||||
/* 0x0B */ u32 earthRibbon:1;
|
||||
/* 0x0B */ u32 worldRibbon:1; // distributed during Pokémon Festa '04 and '05 to tournament winners
|
||||
/* 0x0B */ u32 unusedRibbons:2; // discarded in Gen 4
|
||||
/* 0x08 */ u32 coolRibbon:3; // Stores the highest contest rank achieved in the Cool category.
|
||||
/* 0x08 */ u32 beautyRibbon:3; // Stores the highest contest rank achieved in the Beauty category.
|
||||
/* 0x08 */ u32 cuteRibbon:3; // Stores the highest contest rank achieved in the Cute category.
|
||||
/* 0x09 */ u32 smartRibbon:3; // Stores the highest contest rank achieved in the Smart category.
|
||||
/* 0x09 */ u32 toughRibbon:3; // Stores the highest contest rank achieved in the Tough category.
|
||||
/* 0x09 */ u32 championRibbon:1; // Given when defeating the Champion. Because both RSE and FRLG use it, later generations don't specify from which region it comes from.
|
||||
/* 0x0A */ u32 winningRibbon:1; // Given at the Battle Tower's Level 50 challenge by winning a set of seven battles that extends the current streak to 56 or more.
|
||||
/* 0x0A */ u32 victoryRibbon:1; // Given at the Battle Tower's Level 100 challenge by winning a set of seven battles that extends the current streak to 56 or more.
|
||||
/* 0x0A */ u32 artistRibbon:1; // Given at the Contest Hall by winning a Master Rank contest with at least 800 points, and agreeing to have the Pokémon's portrait placed in the museum after being offered.
|
||||
/* 0x0A */ u32 effortRibbon:1; // Given at Slateport's market to Pokémon with maximum EVs.
|
||||
/* 0x0A */ u32 marineRibbon:1; // Never distributed.
|
||||
/* 0x0A */ u32 landRibbon:1; // Never distributed.
|
||||
/* 0x0A */ u32 skyRibbon:1; // Never distributed.
|
||||
/* 0x0A */ u32 countryRibbon:1; // Distributed during Pokémon Festa '04 and '05 to tournament winners.
|
||||
/* 0x0B */ u32 nationalRibbon:1; // Given to purified Shadow Pokémon in Colosseum/XD.
|
||||
/* 0x0B */ u32 earthRibbon:1; // Given to teams that have beaten Mt. Battle's 100-battle challenge in Colosseum/XD.
|
||||
/* 0x0B */ u32 worldRibbon:1; // Distributed during Pokémon Festa '04 and '05 to tournament winners.
|
||||
/* 0x0B */ u32 unusedRibbons:2; // Discarded in Gen 4.
|
||||
/* 0x0B */ u32 abilityNum:2;
|
||||
/* 0x0B */ u32 eventLegal:1; // controls Mew & Deoxys obedience; if set, Pokémon is a fateful encounter in Gen 4+; set for in-game event island legendaries, some distributed events, and Pokémon from XD: Gale of Darkness.
|
||||
}; /* size = 12 */
|
||||
|
||||
// The functionality of this bit changed in FRLG:
|
||||
// In RS, this bit does nothing, is never set, & is accidentally unset when hatching Eggs.
|
||||
// In FRLG & Emerald, this controls Mew & Deoxys obedience and whether they can be traded.
|
||||
// If set, a Pokémon is a fateful encounter in FRLG's summary screen if hatched & for all Pokémon in Gen 4+ summary screens.
|
||||
// Set for in-game event island legendaries, events distributed after a certain date, & Pokémon from XD: Gale of Darkness.
|
||||
// Not to be confused with METLOC_FATEFUL_ENCOUNTER.
|
||||
/* 0x0B */ u32 modernFatefulEncounter:1;
|
||||
};
|
||||
|
||||
// Number of bytes in the largest Pokémon substruct.
|
||||
// They are assumed to be the same size, and will be padded to
|
||||
@@ -339,7 +347,6 @@ struct BattleMove
|
||||
u32 flags;
|
||||
u8 split;
|
||||
u8 argument;
|
||||
u8 zMovePower;
|
||||
u8 zMoveEffect;
|
||||
};
|
||||
|
||||
@@ -395,7 +402,7 @@ extern const struct BattleMove gBattleMoves[];
|
||||
extern const u8 gFacilityClassToPicIndex[];
|
||||
extern const u8 gFacilityClassToTrainerClass[];
|
||||
extern const struct SpeciesInfo gSpeciesInfo[];
|
||||
extern const u8 *const gItemEffectTable[];
|
||||
extern const u8 *const gItemEffectTable[ITEMS_COUNT];
|
||||
extern const u32 gExperienceTables[][MAX_LEVEL + 1];
|
||||
extern const struct LevelUpMove *const gLevelUpLearnsets[];
|
||||
extern const u16 *const gTeachableLearnsets[];
|
||||
@@ -426,11 +433,10 @@ void CreateBattleTowerMon_HandleLevel(struct Pokemon *mon, struct BattleTowerPok
|
||||
void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId);
|
||||
void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
|
||||
void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest);
|
||||
void CreateEventLegalMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
|
||||
bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId);
|
||||
u16 GetUnionRoomTrainerPic(void);
|
||||
u16 GetUnionRoomTrainerClass(void);
|
||||
void CreateEventLegalEnemyMon(void);
|
||||
void CreateEnemyEventMon(void);
|
||||
void CalculateMonStats(struct Pokemon *mon);
|
||||
void BoxMonToMon(const struct BoxPokemon *src, struct Pokemon *dest);
|
||||
u8 GetLevelFromMonExp(struct Pokemon *mon);
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@ extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate;
|
||||
s32 GetGameProgressForLinkTrade(void);
|
||||
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 CanRegisterMonForTradingBoard(struct RfuGameCompatibilityData player, u16 species2, u16 species, bool8 isModernFatefulEncounter);
|
||||
int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct RfuGameCompatibilityData partner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, bool8 isModernFatefulEncounter);
|
||||
int CanSpinTradeMon(struct Pokemon *, u16);
|
||||
void InitTradeSequenceBgGpuRegs(void);
|
||||
void LinkTradeDrawWindow(void);
|
||||
|
||||
Reference in new issue
Block a user