From 3aff112127ddb67882bfce31d046eb886e0aa2c1 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 16 Oct 2018 14:55:16 +0100 Subject: Begin synchronising with pokeruby --- include/field_camera.h | 10 +++++----- include/field_effect_helpers.h | 2 +- include/metatile_behavior.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/field_camera.h b/include/field_camera.h index fcc19ce9a..fdc4c5450 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -7,16 +7,16 @@ struct CameraObject { void (*callback)(struct CameraObject *); u32 spriteId; - s32 unk8; - s32 unkC; + s32 movementSpeedX; + s32 movementSpeedY; s32 x; s32 y; }; // Exported RAM declarations -extern struct CameraObject gUnknown_03005DD0; -extern u16 gUnknown_03005DEC; -extern u16 gUnknown_03005DE8; +extern struct CameraObject gFieldCamera; +extern u16 gTotalCameraPixelOffsetX; +extern u16 gTotalCameraPixelOffsetY; // Exported ROM declarations void DrawWholeMapView(void); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 9c354159b..105dcd610 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -17,7 +17,7 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s void sub_8155F80(struct Sprite*); void UpdateShadowFieldEffect(struct Sprite*); void UpdateTallGrassFieldEffect(struct Sprite*); -void sub_81561D0(struct Sprite*); +void WaitFieldEffectSpriteAnim(struct Sprite*); void UpdateAshFieldEffect(struct Sprite*); void UpdateSurfBlobFieldEffect(struct Sprite*); void sub_8156194(struct Sprite*); diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index edffc711f..82617268a 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -77,7 +77,7 @@ bool8 MetatileBehavior_IsBerryTreeSoil(u8); bool8 MetatileBehavior_IsAshGrass(u8); bool8 MetatileBehavior_IsFootprints(u8); bool8 MetatileBehavior_IsBridge(u8); -u8 MetatileBehavior_GetBridgeSth(u8); +u8 MetatileBehavior_GetBridgeType(u8); u8 MetatileBehavior_8089510(u8); bool8 MetatileBehavior_IsLandWildEncounter(u8); bool8 MetatileBehavior_IsWaterWildEncounter(u8); -- cgit v1.2.3 From 1435c96b41049da3a05ed97d9a07b355aacbac4f Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Wed, 17 Oct 2018 01:11:44 +0100 Subject: Further synchronisation --- include/event_object_movement.h | 2 +- include/field_control_avatar.h | 2 +- include/field_effect.h | 4 ++-- include/field_poison.h | 4 ++-- include/fldeff_80F9BCC.h | 2 +- include/global.fieldmap.h | 16 ++++++++-------- include/overworld.h | 16 ++++++++-------- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index ddccfe39b..8a66d140c 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -82,7 +82,7 @@ struct LockedAnimEventObjects extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; extern const u8 gReflectionEffectPaletteMap[]; -void sub_808D438(void); +void ResetEventObjects(void); u8 GetMoveDirectionAnimNum(u8); u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 0ff1834ca..14245a8a2 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -25,7 +25,7 @@ struct FieldInput void FieldClearPlayerInput(struct FieldInput *pStruct); void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); -int sub_809C014(struct FieldInput *pStruct); +int ProcessPlayerFieldInput(struct FieldInput *pStruct); u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void prev_quest_postbuffer_cursor_backup_reset(void); diff --git a/include/field_effect.h b/include/field_effect.h index e05ded621..f049d6966 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -179,8 +179,8 @@ bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); -void sub_80B7D14(struct Task *); -void sub_80B7D34(struct Task *); +static void EscapeRopeFieldEffect_Step0(struct Task *); +static void EscapeRopeFieldEffect_Step1(struct Task *); void sub_80B7EC4(struct Task *); void sub_80B7EE8(struct Task *); diff --git a/include/field_poison.h b/include/field_poison.h index d1a4c823b..90d017ac7 100644 --- a/include/field_poison.h +++ b/include/field_poison.h @@ -13,7 +13,7 @@ enum { FLDPSN_FNT }; -void sub_80F972C(void); -unsigned int overworld_poison(void); +void ExecuteWhiteOut(void); +u32 DoPoisonFieldEffect(void); #endif //GUARD_FIELD_POISON_H diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h index ba775cd6d..67e0de85f 100644 --- a/include/fldeff_80F9BCC.h +++ b/include/fldeff_80F9BCC.h @@ -11,7 +11,7 @@ void sub_80FA5E4(s16 id, s16 x, s16 y); void sub_80FA794(s16 x, s16 y); void CreateRecordMixingSprite(void); void DestroyRecordMixingSprite(void); -void overworld_poison_effect(void); +void FldeffPoison_Start(void); bool8 sub_80FADE4(u16, u8); #endif //GUARD_FLDEFF_80F9BCC_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 4bec8e0c7..3f0b61ea7 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -230,14 +230,14 @@ struct EventObjectGraphicsInfo /*0x20*/ const union AffineAnimCmd *const *affineAnims; }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) -#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) -#define PLAYER_AVATAR_FLAG_4 (1 << 4) -#define PLAYER_AVATAR_FLAG_5 (1 << 5) -#define PLAYER_AVATAR_FLAG_6 (1 << 6) -#define PLAYER_AVATAR_FLAG_DASH (1 << 7) +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) +#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) +#define PLAYER_AVATAR_FLAG_5 (1 << 5) +#define PLAYER_AVATAR_FLAG_6 (1 << 6) +#define PLAYER_AVATAR_FLAG_DASH (1 << 7) enum { diff --git a/include/overworld.h b/include/overworld.h index 3dce20ab2..6b38a8782 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -47,13 +47,13 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); -void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -bool32 IsDummyWarp(struct WarpData *warp); +static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +static bool32 IsDummyWarp(struct WarpData *warp); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const GetDestinationWarpMapHeader(void); -void LoadCurrentMapData(void); -void LoadSaveblockMapHeader(void); -void SetPlayerCoordsFromWarp(void); +static void LoadCurrentMapData(void); +static void LoadSaveblockMapHeader(void); +static void SetPlayerCoordsFromWarp(void); void WarpIntoMap(void); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); @@ -67,7 +67,7 @@ void sub_8084D5C(s16 a1, s16 a2); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084E14(void); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void SetFixedDiveWarpAsDestination(void); +static void SetFixedDiveWarpAsDestination(void); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarpAsDestination(s16 x, s16 y); void warp1_set_to_sav1w(void); @@ -75,7 +75,7 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084F6C(u8 a1); void sub_8084FAC(void); const struct MapConnection *GetMapConnection(u8 dir); -bool8 SetDiveWarp(u8 dir, u16 x, u16 y); +static bool8 SetDiveWarp(u8 dir, u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); void mliX_load_map(u8 mapGroup, u8 mapNum); @@ -105,7 +105,7 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter); u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 Overworld_GetMapTypeOfSaveblockLocation(void); -u8 get_map_light_from_warp0(void); +u8 GetLastUsedWarpMapType(void); bool8 is_map_type_1_2_3_5_or_6(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); -- cgit v1.2.3 From b7b1d609d035ab7f125808fb653e972546b05a6a Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Wed, 17 Oct 2018 13:52:26 +0100 Subject: More synchronisation --- include/berry.h | 29 +++++++++++++++++++---------- include/event_object_movement.h | 2 +- include/fldeff_teleport.h | 7 ------- include/global.fieldmap.h | 4 +--- include/global.h | 26 +++++++++++++------------- 5 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 include/fldeff_teleport.h (limited to 'include') diff --git a/include/berry.h b/include/berry.h index 1a8b7fa25..cfd66c61e 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,6 +1,13 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H +#define BERRY_NONE 0 +#define FIRST_BERRY ITEM_CHERI_BERRY +#define LAST_BERRY ITEM_ENIGMA_BERRY + +#define GETBERRYID(berry) ((berry - FIRST_BERRY) + 1) +#define GETITEMID(berry) ((berry + FIRST_BERRY) - 1) + enum { BERRY_FIRMNESS_UNKNOWN, @@ -21,6 +28,17 @@ enum FLAVOR_COUNT }; +enum +{ + BERRY_STAGE_NO_BERRY, // there is no tree planted and the soil is completely flat. + BERRY_STAGE_PLANTED, + BERRY_STAGE_SPROUTED, + BERRY_STAGE_TALLER, + BERRY_STAGE_FLOWERING, + BERRY_STAGE_BERRIES, + BERRY_STAGE_SPARKLING = 0xFF, +}; + #define NUM_BERRIES 44 extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; @@ -29,7 +47,6 @@ extern const u8 *const gBerryTreePaletteSlotTablePointers[]; void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); -u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); @@ -37,28 +54,20 @@ bool32 EventObjectInteractionWaterBerryTree(void); bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); -bool32 BerryTreeGrow(struct BerryTree *tree); void BerryTreeTimeUpdate(s32 minutes); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); void RemoveBerryTree(u8 id); u8 GetBerryTypeByBerryTreeId(u8 id); u8 GetStageByBerryTreeId(u8); u8 ItemIdToBerryType(u16 item); -u16 BerryTypeToItemId(u16 berry); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); -u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree); -u8 GetNumStagesWateredByBerryTreeId(u8 id); -u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water); -u8 CalcBerryYield(struct BerryTree *tree); -u8 GetBerryCountByBerryTreeId(u8 id); -u16 GetStageDurationByBerryType(u8); void Bag_ChooseBerry(void); void EventObjectInteractionGetBerryTreeData(void); void EventObjectInteractionPlantBerryTree(void); void EventObjectInteractionPickBerryTree(void); void EventObjectInteractionRemoveBerryTree(void); -u8 PlayerHasBerries(void); +bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); extern const struct Berry gBerries[]; diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 8a66d140c..98395593b 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -75,7 +75,7 @@ struct PairedPalettes struct LockedAnimEventObjects { - u8 eventObjectIds[NUM_EVENT_OBJECTS]; + u8 eventObjectIds[EVENT_OBJECTS_COUNT]; u8 count; }; diff --git a/include/fldeff_teleport.h b/include/fldeff_teleport.h deleted file mode 100644 index 71fb64ad2..000000000 --- a/include/fldeff_teleport.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_FLDEFF_TELEPORT_H -#define GUARD_FLDEFF_TELEPORT_H - -void hm_teleport_run_dp02scr(void); -void sub_817C94C(void); - -#endif // GUARD_FLDEFF_TELEPORT_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 3f0b61ea7..055f29f40 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,8 +1,6 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#define NUM_EVENT_OBJECTS 16 - enum { CONNECTION_SOUTH = 1, @@ -313,7 +311,7 @@ struct Camera s32 y; }; -extern struct EventObject gEventObjects[NUM_EVENT_OBJECTS]; +extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT]; extern u8 gSelectedEventObject; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; diff --git a/include/global.h b/include/global.h index 027065481..f77b3159e 100644 --- a/include/global.h +++ b/include/global.h @@ -119,22 +119,22 @@ enum LanguageId #define GAME_LANGUAGE (LANGUAGE_ENGLISH) // capacities of various saveblock objects -#define DAYCARE_MON_COUNT 2 -#define POKEBLOCKS_COUNT 40 -#define EVENT_OBJECTS_COUNT 16 +#define DAYCARE_MON_COUNT 2 +#define POKEBLOCKS_COUNT 40 +#define EVENT_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 #define VARS_COUNT 256 -#define MAIL_COUNT 16 -#define SECRET_BASES_COUNT 20 -#define TV_SHOWS_COUNT 25 -#define POKE_NEWS_COUNT 16 -#define PC_ITEMS_COUNT 50 -#define BAG_ITEMS_COUNT 30 -#define BAG_KEYITEMS_COUNT 30 -#define BAG_POKEBALLS_COUNT 16 -#define BAG_TMHM_COUNT 64 -#define BAG_BERRIES_COUNT 46 +#define MAIL_COUNT 16 +#define SECRET_BASES_COUNT 20 +#define TV_SHOWS_COUNT 25 +#define POKE_NEWS_COUNT 16 +#define PC_ITEMS_COUNT 50 +#define BAG_ITEMS_COUNT 30 +#define BAG_KEYITEMS_COUNT 30 +#define BAG_POKEBALLS_COUNT 16 +#define BAG_TMHM_COUNT 64 +#define BAG_BERRIES_COUNT 46 #define PYRAMID_BAG_ITEMS_COUNT 10 -- cgit v1.2.3 From ff97873c309e28beec91efe11393c093a08b19d3 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 12:25:12 -0400 Subject: label temp flags, test replace script --- include/constants/flags.h | 73 ++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 33 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index a74dffccf..bbc5d5175 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1,38 +1,45 @@ #ifndef GUARD_CONSTANTS_FLAGS_H #define GUARD_CONSTANTS_FLAGS_H -#define FLAG_0x001 0x1 -#define FLAG_0x002 0x2 -#define FLAG_0x003 0x3 -#define FLAG_0x004 0x4 -#define FLAG_0x005 0x5 -#define FLAG_0x006 0x6 -#define FLAG_0x007 0x7 -#define FLAG_0x008 0x8 -#define FLAG_0x009 0x9 -#define FLAG_0x00A 0xA -#define FLAG_0x00B 0xB -#define FLAG_0x00C 0xC -#define FLAG_0x00D 0xD -#define FLAG_0x00E 0xE -#define FLAG_0x00F 0xF -#define FLAG_0x010 0x10 -#define FLAG_0x011 0x11 -#define FLAG_0x012 0x12 -#define FLAG_0x013 0x13 -#define FLAG_0x014 0x14 -#define FLAG_0x015 0x15 -#define FLAG_0x016 0x16 -#define FLAG_0x017 0x17 -#define FLAG_0x018 0x18 -#define FLAG_0x019 0x19 -#define FLAG_0x01A 0x1A -#define FLAG_0x01B 0x1B -#define FLAG_0x01C 0x1C -#define FLAG_0x01D 0x1D -#define FLAG_0x01E 0x1E -#define FLAG_0x01F 0x1F -#define FLAG_0x020 0x20 +// temporary flags +// These temporary flags are are cleared every time a map is loaded. They are used +// for things like shortening an NPCs introduction text if the player already spoke +// to them once. +#define FLAG_TEMP_1 0x1 +#define FLAG_TEMP_2 0x2 +#define FLAG_TEMP_3 0x3 +#define FLAG_TEMP_4 0x4 +#define FLAG_TEMP_5 0x5 +#define FLAG_TEMP_6 0x6 +#define FLAG_TEMP_7 0x7 +#define FLAG_TEMP_8 0x8 +#define FLAG_TEMP_9 0x9 +#define FLAG_TEMP_A 0xA +#define FLAG_TEMP_B 0xB +#define FLAG_TEMP_C 0xC +#define FLAG_TEMP_D 0xD +#define FLAG_TEMP_E 0xE +#define FLAG_TEMP_F 0xF +#define FLAG_TEMP_10 0x10 +#define FLAG_TEMP_11 0x11 +#define FLAG_TEMP_12 0x12 +#define FLAG_TEMP_13 0x13 +#define FLAG_TEMP_14 0x14 +#define FLAG_TEMP_15 0x15 +#define FLAG_TEMP_16 0x16 +#define FLAG_TEMP_17 0x17 +#define FLAG_TEMP_18 0x18 +#define FLAG_TEMP_19 0x19 +#define FLAG_TEMP_1A 0x1A +#define FLAG_TEMP_1B 0x1B +#define FLAG_TEMP_1C 0x1C +#define FLAG_TEMP_1D 0x1D +#define FLAG_TEMP_1E 0x1E +#define FLAG_TEMP_1F 0x1F +#define FLAG_TEMP_20 0x20 + + + #define FLAG_0x021 0x21 #define FLAG_0x022 0x22 #define FLAG_0x023 0x23 @@ -502,7 +509,7 @@ #define FLAG_0x1F2 0x1F2 #define FLAG_0x1F3 0x1F3 #define FLAG_0x1F4 0x1F4 -#define FLAG_0x1F5 0x1F5 +#define FLAG_0x1F5 0x1F5 // trick house end room? #define FLAG_0x1F6 0x1F6 #define FLAG_0x1F7 0x1F7 #define FLAG_0x1F8 0x1F8 -- cgit v1.2.3 From d1b7f32b0ae88e3f2c4d9ed03513cbd30f8f4a74 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 22:07:23 -0400 Subject: begin event flag names, add temporary hidden item macro --- include/constants/flags.h | 230 ++++++++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 102 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index f95a80188..001ba5f91 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -35,11 +35,11 @@ #define FLAG_TEMP_1C 0x1C #define FLAG_TEMP_1D 0x1D #define FLAG_TEMP_1E 0x1E + +// ??? #define FLAG_TEMP_1F 0x1F #define FLAG_TEMP_20 0x20 - - #define FLAG_0x021 0x21 #define FLAG_0x022 0x22 #define FLAG_0x023 0x23 @@ -237,7 +237,7 @@ #define FLAG_0x0E3 0xE3 #define FLAG_0x0E4 0xE4 #define FLAG_0x0E5 0xE5 -#define FLAG_0x0E6 0xE6 +#define FLAG_RECEIVED_TM_36 0xE6 #define FLAG_0x0E7 0xE7 #define FLAG_0x0E8 0xE8 #define FLAG_0x0E9 0xE9 @@ -299,6 +299,8 @@ #define FLAG_0x121 0x121 #define FLAG_0x122 0x122 #define FLAG_0x123 0x123 + +// upper flags? #define FLAG_0x124 0x124 #define FLAG_0x125 0x125 #define FLAG_0x126 0x126 @@ -342,8 +344,8 @@ #define FLAG_0x14C 0x14C #define FLAG_0x14D 0x14D #define FLAG_0x14E 0x14E -#define FLAG_0x14F 0x14F -#define FLAG_0x150 0x150 +#define FLAG_0x14F 0x14F// PLAYER CHOSE CLAW FOSSIL +#define FLAG_0x150 0x150// PLAYER CHOSE ROOT FOSSIL #define FLAG_0x151 0x151 #define FLAG_0x152 0x152 #define FLAG_0x153 0x153 @@ -508,8 +510,12 @@ #define FLAG_0x1F1 0x1F1 #define FLAG_0x1F2 0x1F2 #define FLAG_0x1F3 0x1F3 + + + #define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_0x1F5 0x1F5 // trick house end room? + #define FLAG_0x1F6 0x1F6 #define FLAG_0x1F7 0x1F7 #define FLAG_0x1F8 0x1F8 @@ -539,14 +545,33 @@ #define FLAG_0x210 0x210 #define FLAG_0x211 0x211 #define FLAG_0x212 0x212 -#define FLAG_HIDDEN_ITEM_1F 0x213 -#define FLAG_HIDDEN_ITEM_20 0x214 -#define FLAG_HIDDEN_ITEM_21 0x215 -#define FLAG_HIDDEN_ITEM_22 0x216 -#define FLAG_0x217 0x217 -#define FLAG_0x218 0x218 -#define FLAG_0x219 0x219 -#define FLAG_0x21A 0x21A + +#define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00) + +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F) +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY (FLAG_HIDDEN_ITEMS_START + 0x20) +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY (FLAG_HIDDEN_ITEMS_START + 0x21) +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY (FLAG_HIDDEN_ITEMS_START + 0x22) + +#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x65) +#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC (FLAG_HIDDEN_ITEMS_START + 0x66) +#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x67) +#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON (FLAG_HIDDEN_ITEMS_START + 0x68) + +#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 (FLAG_HIDDEN_ITEMS_START + 0x30) +#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 (FLAG_HIDDEN_ITEMS_START + 0x31) + +#define FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x4C) +#define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x4D) + +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x1B) +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x1B) +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x1B) + +#define FLAG_0x217 0x217//23 +#define FLAG_0x218 0x218//24 +#define FLAG_0x219 0x219//25 +#define FLAG_0x21A 0x21A//26 #define FLAG_0x21B 0x21B #define FLAG_0x21C 0x21C #define FLAG_0x21D 0x21D @@ -709,8 +734,8 @@ #define FLAG_0x2BA 0x2BA #define FLAG_0x2BB 0x2BB #define FLAG_0x2BC 0x2BC -#define FLAG_0x2BD 0x2BD -#define FLAG_0x2BE 0x2BE +#define FLAG_HIDE_APPRENTICE 0x2BD +#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE #define FLAG_0x2BF 0x2BF #define FLAG_0x2C0 0x2C0 #define FLAG_0x2C1 0x2C1 @@ -719,14 +744,14 @@ #define FLAG_0x2C4 0x2C4 #define FLAG_0x2C5 0x2C5 #define FLAG_0x2C6 0x2C6 -#define FLAG_0x2C7 0x2C7 -#define FLAG_0x2C8 0x2C8 -#define FLAG_0x2C9 0x2C9 -#define FLAG_0x2CA 0x2CA -#define FLAG_0x2CB 0x2CB -#define FLAG_0x2CC 0x2CC +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 0x2C7 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 0x2C8 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 0x2C9 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 0x2CA +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 0x2CB +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 0x2CC #define FLAG_0x2CD 0x2CD -#define FLAG_0x2CE 0x2CE +#define FLAG_HIDE_MEW 0x2CE #define FLAG_0x2CF 0x2CF #define FLAG_0x2D0 0x2D0 #define FLAG_0x2D1 0x2D1 @@ -738,7 +763,7 @@ #define FLAG_0x2D7 0x2D7 #define FLAG_0x2D8 0x2D8 #define FLAG_0x2D9 0x2D9 -#define FLAG_0x2DA 0x2DA +#define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER 0x2DA #define FLAG_0x2DB 0x2DB #define FLAG_0x2DC 0x2DC #define FLAG_0x2DD 0x2DD @@ -748,15 +773,15 @@ #define FLAG_0x2E1 0x2E1 #define FLAG_0x2E2 0x2E2 #define FLAG_0x2E3 0x2E3 -#define FLAG_0x2E4 0x2E4 +#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 #define FLAG_0x2E5 0x2E5 #define FLAG_0x2E6 0x2E6 -#define FLAG_0x2E7 0x2E7 +#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 #define FLAG_0x2E8 0x2E8 #define FLAG_0x2E9 0x2E9 #define FLAG_0x2EA 0x2EA #define FLAG_0x2EB 0x2EB -#define FLAG_0x2EC 0x2EC +#define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC #define FLAG_0x2ED 0x2ED #define FLAG_0x2EE 0x2EE #define FLAG_0x2EF 0x2EF @@ -771,37 +796,37 @@ #define FLAG_0x2F8 0x2F8 #define FLAG_0x2F9 0x2F9 #define FLAG_0x2FA 0x2FA -#define FLAG_0x2FB 0x2FB -#define FLAG_0x2FC 0x2FC +#define FLAG_HIDE_DEOXYS 0x2FB +#define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC #define FLAG_0x2FD 0x2FD #define FLAG_0x2FE 0x2FE -#define FLAG_0x2FF 0x2FF +#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF #define FLAG_0x300 0x300 #define FLAG_0x301 0x301 #define FLAG_0x302 0x302 #define FLAG_0x303 0x303 #define FLAG_0x304 0x304 #define FLAG_0x305 0x305 -#define FLAG_0x306 0x306 -#define FLAG_0x307 0x307 -#define FLAG_0x308 0x308 -#define FLAG_0x309 0x309 -#define FLAG_0x30A 0x30A -#define FLAG_0x30B 0x30B -#define FLAG_0x30C 0x30C +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 +#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 0x308 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 0x309 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 0x30A +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 0x30B +#define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS 0x30C #define FLAG_0x30D 0x30D #define FLAG_0x30E 0x30E #define FLAG_0x30F 0x30F #define FLAG_0x310 0x310 #define FLAG_0x311 0x311 #define FLAG_0x312 0x312 -#define FLAG_0x313 0x313 +#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 #define FLAG_0x314 0x314 #define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 #define FLAG_HIDE_FANCLUB_BOY 0x316 #define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317 #define FLAG_HIDE_FANCLUB_LADY 0x318 -#define FLAG_0x319 0x319 +#define FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT 0x319 #define FLAG_0x31A 0x31A #define FLAG_0x31B 0x31B #define FLAG_0x31C 0x31C @@ -810,7 +835,7 @@ #define FLAG_0x31F 0x31F #define FLAG_0x320 0x320 #define FLAG_0x321 0x321 -#define FLAG_0x322 0x322 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 #define FLAG_0x323 0x323 #define FLAG_0x324 0x324 #define FLAG_0x325 0x325 @@ -828,9 +853,9 @@ #define FLAG_0x331 0x331 #define FLAG_0x332 0x332 #define FLAG_0x333 0x333 -#define FLAG_0x334 0x334 -#define FLAG_0x335 0x335 -#define FLAG_0x336 0x336 +#define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE 0x334 +#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335 +#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 #define FLAG_0x337 0x337 #define FLAG_0x338 0x338 #define FLAG_0x339 0x339 @@ -840,11 +865,11 @@ #define FLAG_0x33D 0x33D #define FLAG_0x33E 0x33E #define FLAG_0x33F 0x33F -#define FLAG_0x340 0x340 -#define FLAG_0x341 0x341 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 +#define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 #define FLAG_0x342 0x342 #define FLAG_0x343 0x343 -#define FLAG_0x344 0x344 +#define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 #define FLAG_0x345 0x345 #define FLAG_0x346 0x346 #define FLAG_0x347 0x347 @@ -855,12 +880,12 @@ #define FLAG_0x34C 0x34C #define FLAG_0x34D 0x34D #define FLAG_0x34E 0x34E -#define FLAG_0x34F 0x34F +#define FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD 0x34F #define FLAG_0x350 0x350 #define FLAG_0x351 0x351 #define FLAG_0x352 0x352 #define FLAG_0x353 0x353 -#define FLAG_0x354 0x354 +#define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 #define FLAG_0x355 0x355 #define FLAG_0x356 0x356 #define FLAG_0x357 0x357 @@ -869,20 +894,20 @@ #define FLAG_0x35A 0x35A #define FLAG_0x35B 0x35B #define FLAG_0x35C 0x35C -#define FLAG_0x35D 0x35D +#define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL 0x35D #define FLAG_0x35E 0x35E #define FLAG_0x35F 0x35F -#define FLAG_0x360 0x360 -#define FLAG_0x361 0x361 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 0x360 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 0x361 #define FLAG_0x362 0x362 #define FLAG_0x363 0x363 #define FLAG_0x364 0x364 #define FLAG_0x365 0x365 #define FLAG_0x366 0x366 -#define FLAG_0x367 0x367 +#define FLAG_HIDE_LANETTE 0x367 #define FLAG_0x368 0x368 -#define FLAG_0x369 0x369 -#define FLAG_0x36A 0x36A +#define FLAG_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 +#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A #define FLAG_0x36B 0x36B #define FLAG_0x36C 0x36C #define FLAG_0x36D 0x36D @@ -896,14 +921,14 @@ #define FLAG_0x375 0x375 #define FLAG_0x376 0x376 #define FLAG_0x377 0x377 -#define FLAG_0x378 0x378 +#define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 #define FLAG_0x379 0x379 #define FLAG_0x37A 0x37A #define FLAG_0x37B 0x37B #define FLAG_0x37C 0x37C #define FLAG_0x37D 0x37D #define FLAG_0x37E 0x37E -#define FLAG_0x37F 0x37F +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F #define FLAG_0x380 0x380 #define FLAG_0x381 0x381 #define FLAG_0x382 0x382 @@ -915,9 +940,9 @@ #define FLAG_0x388 0x388 #define FLAG_0x389 0x389 #define FLAG_0x38A 0x38A -#define FLAG_0x38B 0x38B -#define FLAG_0x38C 0x38C -#define FLAG_0x38D 0x38D +#define FLAG_HIDE_FALLARBOR_AZURILL 0x38B +#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT 0x38C +#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR 0x38D #define FLAG_0x38E 0x38E #define FLAG_0x38F 0x38F #define FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON 0x390 @@ -926,32 +951,32 @@ #define FLAG_0x393 0x393 #define FLAG_0x394 0x394 #define FLAG_0x395 0x395 -#define FLAG_0x396 0x396 +#define FLAG_HIDE_BATTLE_TOWER_REPORTER 0x396 #define FLAG_0x397 0x397 -#define FLAG_0x398 0x398 -#define FLAG_0x399 0x399 +#define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 +#define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 #define FLAG_0x39A 0x39A #define FLAG_0x39B 0x39B -#define FLAG_0x39C 0x39C -#define FLAG_0x39D 0x39D +#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C +#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D #define FLAG_0x39E 0x39E #define FLAG_0x39F 0x39F -#define FLAG_0x3A0 0x3A0 -#define FLAG_0x3A1 0x3A1 -#define FLAG_0x3A2 0x3A2 +#define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO 0x3A0 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 -#define FLAG_0x3A5 0x3A5 +#define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 #define FLAG_0x3A6 0x3A6 -#define FLAG_0x3A7 0x3A7 -#define FLAG_0x3A8 0x3A8 -#define FLAG_0x3A9 0x3A9 +#define FLAG_HIDE_REGIROCK 0x3A7 +#define FLAG_HIDE_REGICE 0x3A8 +#define FLAG_HIDE_REGISTEEL 0x3A9 #define FLAG_0x3AA 0x3AA #define FLAG_0x3AB 0x3AB -#define FLAG_0x3AC 0x3AC +#define FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN 0x3AC #define FLAG_0x3AD 0x3AD #define FLAG_0x3AE 0x3AE -#define FLAG_0x3AF 0x3AF +#define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW 0x3AF #define FLAG_0x3B0 0x3B0 #define FLAG_0x3B1 0x3B1 #define FLAG_0x3B2 0x3B2 @@ -970,23 +995,23 @@ #define FLAG_0x3BF 0x3BF #define FLAG_0x3C0 0x3C0 #define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION 0x3C1 -#define FLAG_0x3C2 0x3C2 +#define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2 #define FLAG_0x3C3 0x3C3 #define FLAG_0x3C4 0x3C4 #define FLAG_0x3C5 0x3C5 #define FLAG_0x3C6 0x3C6 #define FLAG_0x3C7 0x3C7 #define FLAG_0x3C8 0x3C8 -#define FLAG_0x3C9 0x3C9 +#define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9 #define FLAG_0x3CA 0x3CA -#define FLAG_0x3CB 0x3CB +#define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB #define FLAG_0x3CC 0x3CC #define FLAG_0x3CD 0x3CD #define FLAG_0x3CE 0x3CE #define FLAG_0x3CF 0x3CF #define FLAG_0x3D0 0x3D0 -#define FLAG_0x3D1 0x3D1 -#define FLAG_0x3D2 0x3D2 +#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 0x3D1 +#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 #define FLAG_0x3D3 0x3D3 #define FLAG_0x3D4 0x3D4 #define FLAG_0x3D5 0x3D5 @@ -1001,7 +1026,7 @@ #define FLAG_0x3DE 0x3DE #define FLAG_0x3DF 0x3DF #define FLAG_0x3E0 0x3E0 -#define FLAG_0x3E1 0x3E1 +#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY 0x3E1 #define FLAG_0x3E2 0x3E2 #define FLAG_0x3E3 0x3E3 #define FLAG_0x3E4 0x3E4 @@ -1050,7 +1075,7 @@ #define FLAG_0x40F 0x40F #define FLAG_0x410 0x410 #define FLAG_0x411 0x411 -#define FLAG_0x412 0x412 +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_MAX_REPEL 0x412 #define FLAG_0x413 0x413 #define FLAG_0x414 0x414 #define FLAG_0x415 0x415 @@ -1058,11 +1083,11 @@ #define FLAG_0x417 0x417 #define FLAG_0x418 0x418 #define FLAG_0x419 0x419 -#define FLAG_0x41A 0x41A -#define FLAG_0x41B 0x41B +#define FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE 0x41A +#define FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL 0x41B #define FLAG_0x41C 0x41C -#define FLAG_0x41D 0x41D -#define FLAG_0x41E 0x41E +#define FLAG_ITEM_GRANITE_CAVE_B2F_REPEL 0x41D +#define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY 0x41E #define FLAG_0x41F 0x41F #define FLAG_0x420 0x420 #define FLAG_0x421 0x421 @@ -1078,15 +1103,16 @@ #define FLAG_0x42B 0x42B #define FLAG_0x42C 0x42C #define FLAG_0x42D 0x42D -#define FLAG_0x42E 0x42E -#define FLAG_0x42F 0x42F -#define FLAG_0x430 0x430 +#define FLAG_ITEM_JAGGED_PASS_BURN_HEAL 0x42E +#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR 0x42F +#define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL 0x430 #define FLAG_0x431 0x431 #define FLAG_0x432 0x432 #define FLAG_0x433 0x433 #define FLAG_0x434 0x434 -#define FLAG_0x435 0x435 -#define FLAG_0x436 0x436 + +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER 0x436 #define FLAG_0x437 0x437 #define FLAG_0x438 0x438 #define FLAG_0x439 0x439 @@ -1099,18 +1125,18 @@ #define FLAG_0x440 0x440 #define FLAG_0x441 0x441 #define FLAG_0x442 0x442 -#define FLAG_0x443 0x443 +#define FLAG_ITEM_FIERY_PATH_TM06 0x443 #define FLAG_0x444 0x444 #define FLAG_0x445 0x445 #define FLAG_0x446 0x446 -#define FLAG_0x447 0x447 -#define FLAG_0x448 0x448 -#define FLAG_0x449 0x449 -#define FLAG_0x44A 0x44A -#define FLAG_0x44B 0x44B -#define FLAG_0x44C 0x44C -#define FLAG_0x44D 0x44D -#define FLAG_0x44E 0x44E +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B +#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E #define FLAG_0x44F 0x44F #define FLAG_0x450 0x450 #define FLAG_0x451 0x451 @@ -1119,7 +1145,7 @@ #define FLAG_0x454 0x454 #define FLAG_0x455 0x455 #define FLAG_0x456 0x456 -#define FLAG_0x457 0x457 +#define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 #define FLAG_0x458 0x458 #define FLAG_0x459 0x459 #define FLAG_0x45A 0x45A @@ -1132,7 +1158,7 @@ #define FLAG_0x461 0x461 #define FLAG_0x462 0x462 #define FLAG_0x463 0x463 -#define FLAG_0x464 0x464 +#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL 0x464 #define FLAG_0x465 0x465 #define FLAG_0x466 0x466 #define FLAG_0x467 0x467 @@ -1140,7 +1166,7 @@ #define FLAG_0x469 0x469 #define FLAG_0x46A 0x46A #define FLAG_0x46B 0x46B -#define FLAG_0x46C 0x46C +#define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET 0x46C #define FLAG_0x46D 0x46D #define FLAG_0x46E 0x46E #define FLAG_0x46F 0x46F @@ -1170,8 +1196,8 @@ #define FLAG_0x487 0x487 #define FLAG_0x488 0x488 #define FLAG_0x489 0x489 -#define FLAG_0x48A 0x48A -#define FLAG_0x48B 0x48B +#define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A +#define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B #define FLAG_0x48C 0x48C #define FLAG_0x48D 0x48D #define FLAG_0x48E 0x48E -- cgit v1.2.3 From 6206acd2d20af143698e4b5ae1dfe04af6360d27 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 18 Oct 2018 12:05:02 -0500 Subject: Finish shop and fldeff_escalator --- include/graphics.h | 4 ++++ include/item_menu.h | 1 + include/party_menu.h | 1 - include/shop.h | 37 +++++++++++++++++++++---------------- include/strings.h | 16 ++++++++++++++++ 5 files changed, 42 insertions(+), 17 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 4cbee1c34..07900977d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4029,4 +4029,8 @@ extern const u8 gUnknown_08D97CF4[]; extern const u8 gStatusGfx_Icons[]; extern const u8 gStatusPal_Icons[]; +extern const u8 gBuyMenuFrame_Gfx[]; +extern const u16 gBuyMenuFrame_Tilemap[]; +extern const u16 gMenuMoneyPal[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/item_menu.h b/include/item_menu.h index b80d0628e..649eb934c 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -59,5 +59,6 @@ void bag_menu_mail_related(void); void CB2_BagMenuFromStartMenu(void); u8 sub_81ABB2C(u8 pocketId); bool8 UseRegisteredKeyItemOnField(void); +void CB2_GoToSellMenu(void); #endif //GUARD_item_menu_H diff --git a/include/party_menu.h b/include/party_menu.h index 170fcafc1..cb82eb82c 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -70,6 +70,5 @@ extern void sub_81B67C8(u8, u16, TaskFunc); extern void sub_81B79E8(u8, u16, TaskFunc); extern void sub_81B6DC4(u8, u16, TaskFunc); extern void sub_81B7C74(u8, u16, TaskFunc); -extern u16 ItemIdToBattleMoveId(u16); #endif // GUARD_PARTY_MENU_H diff --git a/include/shop.h b/include/shop.h index 067b8fee4..7f2d877dc 100644 --- a/include/shop.h +++ b/include/shop.h @@ -1,7 +1,7 @@ #ifndef GUARD_SHOP_H #define GUARD_SHOP_H -extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3]; +extern EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3]; enum { @@ -10,9 +10,19 @@ enum MART_TYPE_2, }; +// shop view window NPC info enum +enum +{ + EVENT_OBJ_ID, + X_COORD, + Y_COORD, + ANIM_NUM, + LAYER_TYPE +}; + struct MartInfo { - /*0x0*/ void (* callback) (void); + /*0x0*/ void (*callback)(void); /*0x4*/ const struct MenuAction *menuActions; /*0x8*/ const u16 *itemList; /*0xC*/ u16 itemCount; @@ -20,23 +30,18 @@ struct MartInfo /*0xF*/ u8 martType; }; -struct BuyMenuLabel -{ - u8 label[16]; -}; - struct ShopData { - /*0x0000*/ u8 tilemapBuffers[4][0x800]; - /*0x2000*/ u8 filler2000[0x4]; - /*0x2004*/ u16 unk2004; - /*0x2006*/ u8 filler2006[0x2]; - /*0x2008*/ u16 unk2008; - /*0x200A*/ u8 filler200A; + /*0x0000*/ u16 tilemapBuffers[4][0x400]; + /*0x2000*/ u32 totalCost; + /*0x2004*/ u16 itemsShowed; + /*0x2006*/ u16 selectedRow; + /*0x2008*/ u16 scrollOffset; + /*0x200A*/ u8 maxQuantity; /*0x200B*/ u8 scrollIndicatorsTaskId; - /*0x200C*/ u8 unk200C; - /*0x200D*/ u8 unk200D[2]; - /*0x200F*/ u8 filler200F[0xA1]; + /*0x200C*/ u8 iconSlot; + /*0x200D*/ u8 itemSpriteIds[2]; + /*0x2010*/ s16 viewportObjects[16][5]; }; void CreatePokemartMenu(const u16 *); diff --git a/include/strings.h b/include/strings.h index 4ea33635b..0b037287a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -855,5 +855,21 @@ extern const u8 gText_CanIHelpWithAnythingElse[]; extern const u8 gText_AnythingElseICanHelp[]; extern const u8 gText_QuitShopping[]; extern const u8 gText_PokedollarVar1[]; +extern const u8 gText_YouDontHaveMoney[]; +extern const u8 gText_Var1CertainlyHowMany2[]; +extern const u8 gText_Var1CertainlyHowMany[]; +extern const u8 gText_Var1IsItThatllBeVar2[]; +extern const u8 gText_YouWantedVar1ThatllBeVar2[]; +extern const u8 gText_InBagVar1[]; +extern const u8 gText_Var1AndYouWantedVar2[]; +extern const u8 gText_HereYouGoThankYou[]; +extern const u8 gText_NoMoreRoomForThis[]; +extern const u8 gText_ThankYouIllSendItHome[]; +extern const u8 gText_ThanksIllSendItHome[]; +extern const u8 gText_SpaceForVar1Full[]; +extern const u8 gText_ThrowInPremierBall[]; +extern const u8 gText_ShopBuy[]; +extern const u8 gText_ShopSell[]; +extern const u8 gText_ShopQuit[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From dfee5deca8e5c6f5b35b75d56e215638b66320b0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 18 Oct 2018 21:24:37 +0200 Subject: Move Bitmap struct and clear sprite/text files --- include/blit.h | 7 +++++++ include/global.h | 9 --------- include/sprite.h | 8 ++++++-- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/blit.h b/include/blit.h index e7f384cc8..2fe99d7bd 100644 --- a/include/blit.h +++ b/include/blit.h @@ -1,6 +1,13 @@ #ifndef GUARD_BLIT_H #define GUARD_BLIT_H +struct Bitmap +{ + u8* pixels; + u32 width:16; + u32 height:16; +}; + void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height); void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey); void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue); diff --git a/include/global.h b/include/global.h index 027065481..b92f1097f 100644 --- a/include/global.h +++ b/include/global.h @@ -976,13 +976,4 @@ struct UnkStruct_8054FF8 u16 field_C; }; -struct Bitmap // TODO: Find a better spot for this -{ - u8* pixels; - u32 width:16; - u32 height:16; -}; - -extern u8 gReservedSpritePaletteCount; - #endif // GUARD_GLOBAL_H diff --git a/include/sprite.h b/include/sprite.h index 8fc45d501..4ffcd2884 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -235,11 +235,15 @@ extern const struct OamData gDummyOamData; extern const union AnimCmd *const gDummySpriteAnimTable[]; extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; extern const struct SpriteTemplate gDummySpriteTemplate; -extern s16 gSpriteCoordOffsetX; -extern s16 gSpriteCoordOffsetY; +extern u8 gReservedSpritePaletteCount; extern struct Sprite gSprites[]; +extern u8 gOamLimit; +extern u16 gReservedSpriteTileCount; +extern s16 gSpriteCoordOffsetX; +extern s16 gSpriteCoordOffsetY; extern struct OamMatrix gOamMatrices[]; +extern bool8 gAffineAnimsDisabled; void ResetSpriteData(void); void AnimateSprites(void); -- cgit v1.2.3 From c27043bd3cf51d00b846d5ed38d8bf7c079992bc Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Oct 2018 15:28:59 -0400 Subject: more event flags --- include/constants/flags.h | 379 ++++++++++++++++++++++++---------------------- 1 file changed, 201 insertions(+), 178 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index 001ba5f91..be0e3b85a 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -87,13 +87,13 @@ #define FLAG_0x04D 0x4D #define FLAG_0x04E 0x4E #define FLAG_0x04F 0x4F -#define FLAG_0x050 0x50 +#define FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT 0x50 #define FLAG_0x051 0x51 #define FLAG_0x052 0x52 #define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53 #define FLAG_0x054 0x54 #define FLAG_0x055 0x55 -#define FLAG_0x056 0x56 +#define FLAG_LINK_CONTEST_POKE_BALL 0x56 #define FLAG_0x057 0x57 #define FLAG_0x058 0x58 #define FLAG_0x059 0x59 @@ -180,21 +180,22 @@ #define FLAG_0x0AA 0xAA #define FLAG_0x0AB 0xAB #define FLAG_0x0AC 0xAC -#define FLAG_0x0AD 0xAD -#define FLAG_0x0AE 0xAE -#define FLAG_0x0AF 0xAF -#define FLAG_0x0B0 0xB0 -#define FLAG_0x0B1 0xB1 -#define FLAG_0x0B2 0xB2 -#define FLAG_0x0B3 0xB3 -#define FLAG_0x0B4 0xB4 -#define FLAG_0x0B5 0xB5 -#define FLAG_0x0B6 0xB6 -#define FLAG_0x0B7 0xB7 -#define FLAG_0x0B8 0xB8 -#define FLAG_0x0B9 0xB9 -#define FLAG_0x0BA 0xBA -#define FLAG_0x0BB 0xBB + +#define FLAG_DECORATION_0 0xAD +#define FLAG_DECORATION_1 0xAE +#define FLAG_DECORATION_2 0xAF +#define FLAG_DECORATION_3 0xB0 +#define FLAG_DECORATION_4 0xB1 +#define FLAG_DECORATION_5 0xB2 +#define FLAG_DECORATION_6 0xB3 +#define FLAG_DECORATION_7 0xB4 +#define FLAG_DECORATION_8 0xB5 +#define FLAG_DECORATION_9 0xB6 +#define FLAG_DECORATION_10 0xB7 +#define FLAG_DECORATION_11 0xB8 +#define FLAG_DECORATION_12 0xB9 +#define FLAG_DECORATION_13 0xBA +#define FLAG_DECORATION_14 0xBB #define FLAG_0x0BC 0xBC #define FLAG_0x0BD 0xBD #define FLAG_0x0BE 0xBE @@ -565,8 +566,29 @@ #define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x4D) #define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x1B) -#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x1B) -#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x1B) +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x2B) +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x4B) + +#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x1D) +#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x4E) + +#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC (FLAG_HIDDEN_ITEMS_START + 0x4F) +#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x50) + +#define FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH (FLAG_HIDDEN_ITEMS_START + 0x6D) + +#define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x5F) + +#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION (FLAG_HIDDEN_ITEMS_START + 0x3A) +#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 (FLAG_HIDDEN_ITEMS_START + 0x3B) +#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 0x3C) +#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3D) + +#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6A) +#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC (FLAG_HIDDEN_ITEMS_START + 0x6B) + +#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x6C) +#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69) #define FLAG_0x217 0x217//23 #define FLAG_0x218 0x218//24 @@ -750,27 +772,27 @@ #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 0x2CA #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 0x2CB #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 0x2CC -#define FLAG_0x2CD 0x2CD +#define FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS 0x2CD #define FLAG_HIDE_MEW 0x2CE #define FLAG_0x2CF 0x2CF #define FLAG_0x2D0 0x2D0 -#define FLAG_0x2D1 0x2D1 -#define FLAG_0x2D2 0x2D2 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 0x2D1 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM 0x2D2 #define FLAG_0x2D3 0x2D3 -#define FLAG_0x2D4 0x2D4 -#define FLAG_0x2D5 0x2D5 -#define FLAG_0x2D6 0x2D6 -#define FLAG_0x2D7 0x2D7 -#define FLAG_0x2D8 0x2D8 +#define FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE 0x2D4 +#define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT 0x2D5 +#define FLAG_HIDE_PETALBURG_CITY_WALLY 0x2D6 +#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY 0x2D7 +#define FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT 0x2D8 #define FLAG_0x2D9 0x2D9 #define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER 0x2DA -#define FLAG_0x2DB 0x2DB -#define FLAG_0x2DC 0x2DC -#define FLAG_0x2DD 0x2DD -#define FLAG_0x2DE 0x2DE -#define FLAG_0x2DF 0x2DF -#define FLAG_0x2E0 0x2E0 -#define FLAG_0x2E1 0x2E1 +#define FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT 0x2DB +#define FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 0x2DC +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 0x2DD +#define FLAG_HIDE_PLAYERS_HOUSE_DAD 0x2DE +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING 0x2DF +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING 0x2E0 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY 0x2E1 #define FLAG_0x2E2 0x2E2 #define FLAG_0x2E3 0x2E3 #define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 @@ -778,35 +800,35 @@ #define FLAG_0x2E6 0x2E6 #define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 #define FLAG_0x2E8 0x2E8 -#define FLAG_0x2E9 0x2E9 -#define FLAG_0x2EA 0x2EA -#define FLAG_0x2EB 0x2EB +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN 0x2E9 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN 0x2EA +#define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION 0x2EB #define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC -#define FLAG_0x2ED 0x2ED +#define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED #define FLAG_0x2EE 0x2EE #define FLAG_0x2EF 0x2EF -#define FLAG_0x2F0 0x2F0 -#define FLAG_0x2F1 0x2F1 -#define FLAG_0x2F2 0x2F2 -#define FLAG_0x2F3 0x2F3 -#define FLAG_0x2F4 0x2F4 -#define FLAG_0x2F5 0x2F5 -#define FLAG_0x2F6 0x2F6 -#define FLAG_0x2F7 0x2F7 -#define FLAG_0x2F8 0x2F8 -#define FLAG_0x2F9 0x2F9 -#define FLAG_0x2FA 0x2FA +#define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE 0x2F0 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN 0x2F1 +#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 0x2F2 +#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 0x2F3 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA 0x2F4 +#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM 0x2F5 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM 0x2F6 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM 0x2F7 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM 0x2F8 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK 0x2F9 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK 0x2FA #define FLAG_HIDE_DEOXYS 0x2FB #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC -#define FLAG_0x2FD 0x2FD +#define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD #define FLAG_0x2FE 0x2FE #define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF #define FLAG_0x300 0x300 #define FLAG_0x301 0x301 #define FLAG_0x302 0x302 #define FLAG_0x303 0x303 -#define FLAG_0x304 0x304 -#define FLAG_0x305 0x305 +#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304 +#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 #define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 #define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 0x308 @@ -814,115 +836,115 @@ #define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 0x30A #define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 0x30B #define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS 0x30C -#define FLAG_0x30D 0x30D -#define FLAG_0x30E 0x30E +#define FLAG_HIDE_PETALBURG_GYM_GREETER 0x30D +#define FLAG_HIDE_MARINE_CAVE_KYOGRE 0x30E #define FLAG_0x30F 0x30F -#define FLAG_0x310 0x310 -#define FLAG_0x311 0x311 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311 #define FLAG_0x312 0x312 #define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 -#define FLAG_0x314 0x314 +#define FLAG_HIDE_MOSSDEEP_CITY_SCOTT 0x314 #define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 #define FLAG_HIDE_FANCLUB_BOY 0x316 #define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317 #define FLAG_HIDE_FANCLUB_LADY 0x318 #define FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT 0x319 -#define FLAG_0x31A 0x31A -#define FLAG_0x31B 0x31B +#define FLAG_HIDE_LITTLEROOT_TOWN_RIVAL 0x31A +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH 0x31B #define FLAG_0x31C 0x31C #define FLAG_0x31D 0x31D #define FLAG_0x31E 0x31E #define FLAG_0x31F 0x31F -#define FLAG_0x320 0x320 -#define FLAG_0x321 0x321 +#define FLAG_HIDE_LUGIA 0x320 +#define FLAG_HIDE_HOOH 0x321 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 #define FLAG_0x323 0x323 -#define FLAG_0x324 0x324 -#define FLAG_0x325 0x325 +#define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 +#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 #define FLAG_0x326 0x326 -#define FLAG_0x327 0x327 +#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 #define FLAG_0x328 0x328 #define FLAG_0x329 0x329 #define FLAG_0x32A 0x32A -#define FLAG_0x32B 0x32B -#define FLAG_0x32C 0x32C +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C #define FLAG_0x32D 0x32D -#define FLAG_0x32E 0x32E -#define FLAG_0x32F 0x32F +#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F #define FLAG_0x330 0x330 -#define FLAG_0x331 0x331 -#define FLAG_0x332 0x332 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL 0x332 #define FLAG_0x333 0x333 #define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE 0x334 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 -#define FLAG_0x337 0x337 -#define FLAG_0x338 0x338 +#define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 +#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 #define FLAG_0x339 0x339 #define FLAG_0x33A 0x33A #define FLAG_0x33B 0x33B -#define FLAG_0x33C 0x33C -#define FLAG_0x33D 0x33D -#define FLAG_0x33E 0x33E -#define FLAG_0x33F 0x33F +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D +#define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 #define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 #define FLAG_0x342 0x342 -#define FLAG_0x343 0x343 +#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 #define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 #define FLAG_0x345 0x345 -#define FLAG_0x346 0x346 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 #define FLAG_0x347 0x347 -#define FLAG_0x348 0x348 -#define FLAG_0x349 0x349 +#define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN 0x348 +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN 0x349 #define FLAG_0x34A 0x34A #define FLAG_0x34B 0x34B -#define FLAG_0x34C 0x34C -#define FLAG_0x34D 0x34D -#define FLAG_0x34E 0x34E +#define FLAG_HIDE_RUSTBORO_CITY_SCIENTIST 0x34C +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT 0x34D +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE 0x34E #define FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD 0x34F -#define FLAG_0x350 0x350 -#define FLAG_0x351 0x351 -#define FLAG_0x352 0x352 +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW 0x350 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL 0x351 +#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 0x352 #define FLAG_0x353 0x353 #define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 -#define FLAG_0x355 0x355 +#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 #define FLAG_0x356 0x356 -#define FLAG_0x357 0x357 -#define FLAG_0x358 0x358 -#define FLAG_0x359 0x359 +#define FLAG_HIDE_SKY_PILLAR_WALLACE 0x357 +#define FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE 0x358 +#define FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS 0x359 #define FLAG_0x35A 0x35A -#define FLAG_0x35B 0x35B -#define FLAG_0x35C 0x35C +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 0x35B +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL 0x35C #define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL 0x35D -#define FLAG_0x35E 0x35E -#define FLAG_0x35F 0x35F +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA 0x35E +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN 0x35F #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 0x360 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 0x361 -#define FLAG_0x362 0x362 +#define FLAG_HIDE_PETALBURG_GYM_WALLY 0x362 #define FLAG_0x363 0x363 -#define FLAG_0x364 0x364 +#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 #define FLAG_0x365 0x365 #define FLAG_0x366 0x366 #define FLAG_HIDE_LANETTE 0x367 #define FLAG_0x368 0x368 -#define FLAG_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A #define FLAG_0x36B 0x36B #define FLAG_0x36C 0x36C -#define FLAG_0x36D 0x36D -#define FLAG_0x36E 0x36E -#define FLAG_0x36F 0x36F -#define FLAG_0x370 0x370 +#define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D +#define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E +#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN 0x36F +#define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 #define FLAG_0x371 0x371 -#define FLAG_0x372 0x372 +#define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 #define FLAG_0x373 0x373 #define FLAG_0x374 0x374 #define FLAG_0x375 0x375 #define FLAG_0x376 0x376 #define FLAG_0x377 0x377 #define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 -#define FLAG_0x379 0x379 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL 0x379 #define FLAG_0x37A 0x37A #define FLAG_0x37B 0x37B #define FLAG_0x37C 0x37C @@ -938,19 +960,19 @@ #define FLAG_0x386 0x386 #define FLAG_0x387 0x387 #define FLAG_0x388 0x388 -#define FLAG_0x389 0x389 +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS 0x389 #define FLAG_0x38A 0x38A #define FLAG_HIDE_FALLARBOR_AZURILL 0x38B #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT 0x38C #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR 0x38D #define FLAG_0x38E 0x38E #define FLAG_0x38F 0x38F -#define FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON 0x390 -#define FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON 0x391 +#define FLAG_HIDE_MAUVILLE_CITY_WATTSON 0x390 +#define FLAG_HIDE_MAUVILLE_GYM_WATTSON 0x391 #define FLAG_0x392 0x392 #define FLAG_0x393 0x393 -#define FLAG_0x394 0x394 -#define FLAG_0x395 0x395 +#define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE 0x394 +#define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA 0x395 #define FLAG_HIDE_BATTLE_TOWER_REPORTER 0x396 #define FLAG_0x397 0x397 #define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 @@ -959,30 +981,30 @@ #define FLAG_0x39B 0x39B #define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C #define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D -#define FLAG_0x39E 0x39E -#define FLAG_0x39F 0x39F +#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E +#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F #define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO 0x3A0 #define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 #define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 -#define FLAG_0x3A6 0x3A6 +#define FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL 0x3A6 #define FLAG_HIDE_REGIROCK 0x3A7 #define FLAG_HIDE_REGICE 0x3A8 #define FLAG_HIDE_REGISTEEL 0x3A9 -#define FLAG_0x3AA 0x3AA -#define FLAG_0x3AB 0x3AB +#define FLAG_HIDE_METEOR_FALLS_TEAM_AQUA 0x3AA +#define FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA 0x3AB #define FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN 0x3AC -#define FLAG_0x3AD 0x3AD -#define FLAG_0x3AE 0x3AE +#define FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT 0x3AD +#define FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO 0x3AE #define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW 0x3AF #define FLAG_0x3B0 0x3B0 #define FLAG_0x3B1 0x3B1 -#define FLAG_0x3B2 0x3B2 +#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS 0x3B2 #define FLAG_0x3B3 0x3B3 -#define FLAG_0x3B4 0x3B4 -#define FLAG_0x3B5 0x3B5 +#define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 +#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 #define FLAG_0x3B6 0x3B6 #define FLAG_0x3B7 0x3B7 #define FLAG_0x3B8 0x3B8 @@ -996,27 +1018,27 @@ #define FLAG_0x3C0 0x3C0 #define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION 0x3C1 #define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2 -#define FLAG_0x3C3 0x3C3 -#define FLAG_0x3C4 0x3C4 +#define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL 0x3C3 +#define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL 0x3C4 #define FLAG_0x3C5 0x3C5 #define FLAG_0x3C6 0x3C6 -#define FLAG_0x3C7 0x3C7 -#define FLAG_0x3C8 0x3C8 +#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7 +#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8 #define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9 #define FLAG_0x3CA 0x3CA #define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB #define FLAG_0x3CC 0x3CC #define FLAG_0x3CD 0x3CD -#define FLAG_0x3CE 0x3CE -#define FLAG_0x3CF 0x3CF -#define FLAG_0x3D0 0x3D0 +#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 0x3CE +#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 0x3CF +#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 0x3D0 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 0x3D1 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 -#define FLAG_0x3D3 0x3D3 +#define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3 #define FLAG_0x3D4 0x3D4 #define FLAG_0x3D5 0x3D5 #define FLAG_0x3D6 0x3D6 -#define FLAG_0x3D7 0x3D7 +#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 #define FLAG_0x3D8 0x3D8 #define FLAG_0x3D9 0x3D9 #define FLAG_0x3DA 0x3DA @@ -1027,12 +1049,12 @@ #define FLAG_0x3DF 0x3DF #define FLAG_0x3E0 0x3E0 #define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY 0x3E1 -#define FLAG_0x3E2 0x3E2 -#define FLAG_0x3E3 0x3E3 +#define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY 0x3E2 +#define FLAG_HIDE_PETALBURG_CITY_SCOTT 0x3E3 #define FLAG_0x3E4 0x3E4 #define FLAG_0x3E5 0x3E5 #define FLAG_0x3E6 0x3E6 -#define FLAG_0x3E7 0x3E7 +#define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT 0x3E7 #define FLAG_0x3E8 0x3E8 #define FLAG_0x3E9 0x3E9 #define FLAG_0x3EA 0x3EA @@ -1072,27 +1094,28 @@ #define FLAG_0x40C 0x40C #define FLAG_0x40D 0x40D #define FLAG_0x40E 0x40E -#define FLAG_0x40F 0x40F -#define FLAG_0x410 0x410 -#define FLAG_0x411 0x411 -#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_MAX_REPEL 0x412 -#define FLAG_0x413 0x413 -#define FLAG_0x414 0x414 -#define FLAG_0x415 0x415 -#define FLAG_0x416 0x416 -#define FLAG_0x417 0x417 -#define FLAG_0x418 0x418 -#define FLAG_0x419 0x419 +#define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE 0x40F +#define FLAG_ITEM_PETALBURG_CITY_ETHER 0x410 +#define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND 0x411 +#define FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL 0x412 +#define FLAG_ITEM_MOSSDEEP_CITY_NET_BALL 0x413 + +#define FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 0x414 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL 0x415 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE 0x416 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP 0x417 +#define FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL 0x418 +#define FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER 0x419 #define FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE 0x41A #define FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL 0x41B -#define FLAG_0x41C 0x41C +#define FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE 0x41C #define FLAG_ITEM_GRANITE_CAVE_B2F_REPEL 0x41D #define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY 0x41E -#define FLAG_0x41F 0x41F -#define FLAG_0x420 0x420 +#define FLAG_ITEM_PETALBURG_WOODS_X_ATTACK 0x41F +#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL 0x420 #define FLAG_0x421 0x421 -#define FLAG_0x422 0x422 -#define FLAG_0x423 0x423 +#define FLAG_ITEM_PETALBURG_WOODS_ETHER 0x422 +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE 0x423 #define FLAG_0x424 0x424 #define FLAG_0x425 0x425 #define FLAG_0x426 0x426 @@ -1106,29 +1129,29 @@ #define FLAG_ITEM_JAGGED_PASS_BURN_HEAL 0x42E #define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR 0x42F #define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL 0x430 -#define FLAG_0x431 0x431 -#define FLAG_0x432 0x432 -#define FLAG_0x433 0x433 -#define FLAG_0x434 0x434 +#define FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION 0x431 +#define FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 0x432 +#define FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL 0x433 +#define FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE 0x434 #define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 #define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER 0x436 -#define FLAG_0x437 0x437 -#define FLAG_0x438 0x438 -#define FLAG_0x439 0x439 -#define FLAG_0x43A 0x43A -#define FLAG_0x43B 0x43B +#define FLAG_ITEM_SCORCHED_SLAB_TM_11 0x437 +#define FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 0x438 +#define FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL 0x439 +#define FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY 0x43A +#define FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL 0x43B #define FLAG_0x43C 0x43C #define FLAG_0x43D 0x43D #define FLAG_0x43E 0x43E #define FLAG_0x43F 0x43F #define FLAG_0x440 0x440 -#define FLAG_0x441 0x441 -#define FLAG_0x442 0x442 +#define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441 +#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442 #define FLAG_ITEM_FIERY_PATH_TM06 0x443 #define FLAG_0x444 0x444 #define FLAG_0x445 0x445 -#define FLAG_0x446 0x446 +#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449 @@ -1144,28 +1167,28 @@ #define FLAG_0x453 0x453 #define FLAG_0x454 0x454 #define FLAG_0x455 0x455 -#define FLAG_0x456 0x456 +#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE 0x456 #define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 -#define FLAG_0x458 0x458 -#define FLAG_0x459 0x459 +#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 0x458 +#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE 0x459 #define FLAG_0x45A 0x45A #define FLAG_0x45B 0x45B -#define FLAG_0x45C 0x45C -#define FLAG_0x45D 0x45D +#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED 0x45C +#define FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL 0x45D #define FLAG_0x45E 0x45E -#define FLAG_0x45F 0x45F -#define FLAG_0x460 0x460 +#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM 0x45F +#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL 0x460 #define FLAG_0x461 0x461 -#define FLAG_0x462 0x462 -#define FLAG_0x463 0x463 +#define FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL 0x462 +#define FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL 0x463 #define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL 0x464 #define FLAG_0x465 0x465 #define FLAG_0x466 0x466 #define FLAG_0x467 0x467 #define FLAG_0x468 0x468 -#define FLAG_0x469 0x469 -#define FLAG_0x46A 0x46A -#define FLAG_0x46B 0x46B +#define FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL 0x469 +#define FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE 0x46A +#define FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE 0x46B #define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET 0x46C #define FLAG_0x46D 0x46D #define FLAG_0x46E 0x46E @@ -1185,7 +1208,7 @@ #define FLAG_0x47C 0x47C #define FLAG_0x47D 0x47D #define FLAG_0x47E 0x47E -#define FLAG_0x47F 0x47F +#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY 0x47F #define FLAG_0x480 0x480 #define FLAG_0x481 0x481 #define FLAG_0x482 0x482 @@ -1198,13 +1221,13 @@ #define FLAG_0x489 0x489 #define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A #define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B -#define FLAG_0x48C 0x48C -#define FLAG_0x48D 0x48D -#define FLAG_0x48E 0x48E -#define FLAG_0x48F 0x48F -#define FLAG_0x490 0x490 -#define FLAG_0x491 0x491 -#define FLAG_0x492 0x492 +#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR 0x48C +#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE 0x48D +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET 0x48E +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX 0x48F +#define FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE 0x490 +#define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET 0x491 +#define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL 0x492 #define FLAG_0x493 0x493 #define FLAG_0x494 0x494 #define FLAG_0x495 0x495 -- cgit v1.2.3 From cb5981cdf26f7681f1d67ac3c63e1605b4311c8a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Oct 2018 21:32:21 -0400 Subject: name more event flags --- include/constants/flags.h | 120 +++++++++++++++++++++++++++++----------------- 1 file changed, 77 insertions(+), 43 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index be0e3b85a..abf244ddb 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -547,6 +547,33 @@ #define FLAG_0x211 0x211 #define FLAG_0x212 0x212 +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08) +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09) +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A) +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0B) +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D) +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x24) +#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26) + +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON (FLAG_HIDDEN_ITEMS_START + 0x13) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C) + +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15) +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16) +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17) +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18) + +#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19) +#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) + + + #define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F) @@ -584,12 +611,19 @@ #define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 0x3C) #define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3D) +#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 0x52) +#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL (FLAG_HIDDEN_ITEMS_START + 0x53) + #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6A) #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC (FLAG_HIDDEN_ITEMS_START + 0x6B) #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x6C) #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69) +#define FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS (FLAG_HIDDEN_ITEMS_START + 0x23) + +#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x51) + #define FLAG_0x217 0x217//23 #define FLAG_0x218 0x218//24 #define FLAG_0x219 0x219//25 @@ -758,14 +792,14 @@ #define FLAG_0x2BC 0x2BC #define FLAG_HIDE_APPRENTICE 0x2BD #define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE -#define FLAG_0x2BF 0x2BF -#define FLAG_0x2C0 0x2C0 -#define FLAG_0x2C1 0x2C1 -#define FLAG_0x2C2 0x2C2 -#define FLAG_0x2C3 0x2C3 -#define FLAG_0x2C4 0x2C4 -#define FLAG_0x2C5 0x2C5 -#define FLAG_0x2C6 0x2C6 +#define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF +#define FLAG_HIDE_UNION_ROOM_PLAYER_2 0x2C0 +#define FLAG_HIDE_UNION_ROOM_PLAYER_3 0x2C1 +#define FLAG_HIDE_UNION_ROOM_PLAYER_4 0x2C2 +#define FLAG_HIDE_UNION_ROOM_PLAYER_5 0x2C3 +#define FLAG_HIDE_UNION_ROOM_PLAYER_6 0x2C4 +#define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x2C5 +#define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x2C6 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 0x2C7 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 0x2C8 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 0x2C9 @@ -806,7 +840,7 @@ #define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC #define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED #define FLAG_0x2EE 0x2EE -#define FLAG_0x2EF 0x2EF +#define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY 0x2EF #define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE 0x2F0 #define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN 0x2F1 #define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 0x2F2 @@ -821,7 +855,7 @@ #define FLAG_HIDE_DEOXYS 0x2FB #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC #define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD -#define FLAG_0x2FE 0x2FE +#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE #define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF #define FLAG_0x300 0x300 #define FLAG_0x301 0x301 @@ -838,7 +872,7 @@ #define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS 0x30C #define FLAG_HIDE_PETALBURG_GYM_GREETER 0x30D #define FLAG_HIDE_MARINE_CAVE_KYOGRE 0x30E -#define FLAG_0x30F 0x30F +#define FLAG_HIDE_TERRA_CAVE_GROUDON 0x30F #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311 #define FLAG_0x312 0x312 @@ -861,17 +895,17 @@ #define FLAG_0x323 0x323 #define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 #define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 -#define FLAG_0x326 0x326 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326 #define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 -#define FLAG_0x328 0x328 -#define FLAG_0x329 0x329 -#define FLAG_0x32A 0x32A +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN 0x328 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE 0x329 +#define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT 0x32A #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C #define FLAG_0x32D 0x32D #define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F -#define FLAG_0x330 0x330 +#define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE 0x330 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL 0x332 #define FLAG_0x333 0x333 @@ -881,8 +915,8 @@ #define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 #define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 #define FLAG_0x339 0x339 -#define FLAG_0x33A 0x33A -#define FLAG_0x33B 0x33B +#define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE 0x33A +#define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE 0x33B #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D #define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E @@ -894,7 +928,7 @@ #define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 #define FLAG_0x345 0x345 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 -#define FLAG_0x347 0x347 +#define FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 0x347 #define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN 0x348 #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN 0x349 #define FLAG_0x34A 0x34A @@ -909,11 +943,11 @@ #define FLAG_0x353 0x353 #define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 #define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 -#define FLAG_0x356 0x356 +#define FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS 0x356 #define FLAG_HIDE_SKY_PILLAR_WALLACE 0x357 #define FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE 0x358 #define FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS 0x359 -#define FLAG_0x35A 0x35A +#define FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY 0x35A #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 0x35B #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL 0x35C #define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL 0x35D @@ -924,7 +958,7 @@ #define FLAG_HIDE_PETALBURG_GYM_WALLY 0x362 #define FLAG_0x363 0x363 #define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 -#define FLAG_0x365 0x365 +#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY 0x365 #define FLAG_0x366 0x366 #define FLAG_HIDE_LANETTE 0x367 #define FLAG_0x368 0x368 @@ -938,11 +972,11 @@ #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 #define FLAG_0x371 0x371 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 -#define FLAG_0x373 0x373 -#define FLAG_0x374 0x374 -#define FLAG_0x375 0x375 -#define FLAG_0x376 0x376 -#define FLAG_0x377 0x377 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS 0x373 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 0x374 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 0x375 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE 0x376 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN 0x377 #define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL 0x379 #define FLAG_0x37A 0x37A @@ -965,8 +999,8 @@ #define FLAG_HIDE_FALLARBOR_AZURILL 0x38B #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT 0x38C #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR 0x38D -#define FLAG_0x38E 0x38E -#define FLAG_0x38F 0x38F +#define FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE 0x38E +#define FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON 0x38F #define FLAG_HIDE_MAUVILLE_CITY_WATTSON 0x390 #define FLAG_HIDE_MAUVILLE_GYM_WATTSON 0x391 #define FLAG_0x392 0x392 @@ -1005,8 +1039,8 @@ #define FLAG_0x3B3 0x3B3 #define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 #define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 -#define FLAG_0x3B6 0x3B6 -#define FLAG_0x3B7 0x3B7 +#define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY 0x3B6 +#define FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER 0x3B7 #define FLAG_0x3B8 0x3B8 #define FLAG_0x3B9 0x3B9 #define FLAG_0x3BA 0x3BA @@ -1020,7 +1054,7 @@ #define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2 #define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL 0x3C3 #define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL 0x3C4 -#define FLAG_0x3C5 0x3C5 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 #define FLAG_0x3C6 0x3C6 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8 @@ -1028,18 +1062,18 @@ #define FLAG_0x3CA 0x3CA #define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB #define FLAG_0x3CC 0x3CC -#define FLAG_0x3CD 0x3CD +#define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN 0x3CD #define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 0x3CE #define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 0x3CF #define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 0x3D0 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 0x3D1 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 #define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3 -#define FLAG_0x3D4 0x3D4 +#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 #define FLAG_0x3D5 0x3D5 #define FLAG_0x3D6 0x3D6 #define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 -#define FLAG_0x3D8 0x3D8 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 #define FLAG_0x3D9 0x3D9 #define FLAG_0x3DA 0x3DA #define FLAG_0x3DB 0x3DB @@ -1051,9 +1085,9 @@ #define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY 0x3E1 #define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY 0x3E2 #define FLAG_HIDE_PETALBURG_CITY_SCOTT 0x3E3 -#define FLAG_0x3E4 0x3E4 -#define FLAG_0x3E5 0x3E5 -#define FLAG_0x3E6 0x3E6 +#define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA 0x3E4 +#define FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE 0x3E5 +#define FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON 0x3E6 #define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT 0x3E7 #define FLAG_0x3E8 0x3E8 #define FLAG_0x3E9 0x3E9 @@ -1141,11 +1175,11 @@ #define FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL 0x439 #define FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY 0x43A #define FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL 0x43B -#define FLAG_0x43C 0x43C -#define FLAG_0x43D 0x43D -#define FLAG_0x43E 0x43E -#define FLAG_0x43F 0x43F -#define FLAG_0x440 0x440 +#define FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR 0x43C +#define FLAG_ITEM_VICTORY_ROAD_1F_PP_UP 0x43D +#define FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 0x43E +#define FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE 0x43F +#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL 0x440 #define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441 #define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442 #define FLAG_ITEM_FIERY_PATH_TM06 0x443 -- cgit v1.2.3 From dd3689fdbf98b0a60190bf10e3bed3158692818e Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 19 Oct 2018 00:05:54 -0500 Subject: Finish porting/decompiling field_player_avatar --- include/event_object_movement.h | 19 +++++++++++++++++++ include/field_effect_helpers.h | 6 +++++- include/field_player_avatar.h | 31 ++++++++++++------------------- include/global.fieldmap.h | 2 +- include/strings.h | 5 +++++ 5 files changed, 42 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index ddccfe39b..6d38d072d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -143,9 +143,27 @@ u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 d u8 GetFaceDirectionMovementAction(u32); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); +u8 GetRideWaterCurrentMovementAction(u32); u8 GetWalkFastestMovementAction(u32); +u8 GetPlayerRunMovementAction(u32); u8 GetJumpInPlaceMovementAction(u32); +u8 GetAcroWheelieFaceDirectionMovementAction(u32); +u8 GetAcroPopWheelieFaceDirectionMovementAction(u32); +u8 GetAcroEndWheelieFaceDirectionMovementAction(u32); +u8 GetAcroWheelieHopFaceDirectionMovementAction(u32); +u8 GetAcroWheelieHopDirectionMovementAction(u32); +u8 GetAcroWheelieJumpDirectionMovementAction(u32); +u8 GetJumpInPlaceTurnAroundMovementAction(u32); +u8 GetAcroWheelieInPlaceDirectionMovementAction(u32); +u8 GetAcroPopWheelieMoveDirectionMovementAction(u32); +u8 GetAcroWheelieMoveDirectionMovementAction(u32); +u8 GetAcroEndWheelieMoveDirectionMovementAction(u32); +u8 GetFishingDirectionAnimNum(u8 direction); +u8 GetAcroWheelieDirectionAnimNum(u8 direction); +u8 GetFishingBiteDirectionAnimNum(u8 direction); +u8 GetFishingNoCatchDirectionAnimNum(u8 direction); bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); +void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId); bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject); @@ -194,6 +212,7 @@ u16 GetObjectPaletteTag(u8 palSlot); void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); s16 sub_809773C(s16 a1); s16 sub_8097728(s16 a1); +void CameraObjectReset2(void); void MovementType_None(struct Sprite *); void MovementType_LookAround(struct Sprite *); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 9c354159b..223350042 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -7,9 +7,10 @@ // Exported ROM declarations u8 CreateWarpArrowSprite(void); +u8 sub_8155800(u8 oldSpriteId); +void sub_81555AC(u8, u8); bool8 sub_8155DA0(struct EventObject *); void sub_8155D78(struct EventObject *); -void sub_81555AC(u8, u8); void StartAshFieldEffect(s16, s16, u16, s16); void SetUpReflection(struct EventObject*, struct Sprite*, u8); u32 StartFieldEffectForEventObject(u8, struct EventObject*); @@ -30,5 +31,8 @@ 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); +void sub_8155604(u8 spriteId, u8 value, s16 data1); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index ee2cbb3c8..adb51f889 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -1,6 +1,17 @@ #ifndef GUARD_FIELD_PLAYER_AVATAR_H #define GUARD_FIELD_PLAYER_AVATAR_H +enum { + PLAYER_AVATAR_STATE_NORMAL, + PLAYER_AVATAR_STATE_MACH_BIKE, + PLAYER_AVATAR_STATE_ACRO_BIKE, + PLAYER_AVATAR_STATE_SURFING, + PLAYER_AVATAR_STATE_UNDERWATER, + PLAYER_AVATAR_STATE_FIELD_MOVE, + PLAYER_AVATAR_STATE_FISHING, + PLAYER_AVATAR_STATE_WATERING, +}; + void player_step(u8 a, u16 b, u16 c); void ClearPlayerAvatarInfo(void); void SetPlayerAvatarExtraStateTransition(u8, u8); @@ -13,7 +24,7 @@ u8 GetPlayerMovementDirection(void); u8 PlayerGetCopyableMovement(void); void PlayerGoSpeed1(u8); void PlayerGoSpeed2(u8); -void PlayerGoSpeed3(u8); +void PlayerRideWaterCurrent(u8); void PlayerGoSpeed4(u8); void PlayerOnBikeCollide(u8); void PlayerFaceDirection(u8 a); @@ -48,22 +59,4 @@ bool8 PartyHasMonWithSurf(void); bool8 IsPlayerFacingSurfableFishableWater(void); bool8 IsPlayerSurfingNorth(void); -bool8 ForcedMovement_None(void); -bool8 ForcedMovement_Slip(void); -bool8 ForcedMovement_WalkSouth(void); -bool8 ForcedMovement_WalkNorth(void); -bool8 ForcedMovement_WalkWest(void); -bool8 ForcedMovement_WalkEast(void); -bool8 ForcedMovement_PushedSouthByCurrent(void); -bool8 ForcedMovement_PushedNorthByCurrent(void); -bool8 ForcedMovement_PushedWestByCurrent(void); -bool8 ForcedMovement_PushedEastByCurrent(void); -bool8 ForcedMovement_SlideSouth(void); -bool8 ForcedMovement_SlideNorth(void); -bool8 ForcedMovement_SlideWest(void); -bool8 ForcedMovement_SlideEast(void); -bool8 ForcedMovement_0xBB(void); -bool8 ForcedMovement_0xBC(void); -bool8 ForcedMovement_MuddySlope(void); - #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 66d5b5e4c..bb120c62c 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -232,7 +232,7 @@ struct EventObjectGraphicsInfo #define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) #define PLAYER_AVATAR_FLAG_SURFING (1 << 3) -#define PLAYER_AVATAR_FLAG_4 (1 << 4) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) #define PLAYER_AVATAR_FLAG_5 (1 << 5) #define PLAYER_AVATAR_FLAG_6 (1 << 6) #define PLAYER_AVATAR_FLAG_DASH (1 << 7) diff --git a/include/strings.h b/include/strings.h index 0b037287a..c563353ec 100644 --- a/include/strings.h +++ b/include/strings.h @@ -872,4 +872,9 @@ extern const u8 gText_ShopBuy[]; extern const u8 gText_ShopSell[]; extern const u8 gText_ShopQuit[]; +extern const u8 gText_OhABite[]; +extern const u8 gText_PokemonOnHook[]; +extern const u8 gText_NotEvenANibble[]; +extern const u8 gText_ItGotAway[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 1441ee6bc3731387f7a3cb31f0058d81a38a8db5 Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 13:04:47 -0400 Subject: finish event object flags --- include/constants/flags.h | 386 ++++++++++++++++++++++++++++------------------ 1 file changed, 232 insertions(+), 154 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index abf244ddb..f3c0f75ac 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -35,8 +35,6 @@ #define FLAG_TEMP_1C 0x1C #define FLAG_TEMP_1D 0x1D #define FLAG_TEMP_1E 0x1E - -// ??? #define FLAG_TEMP_1F 0x1F #define FLAG_TEMP_20 0x20 @@ -547,6 +545,55 @@ #define FLAG_0x211 0x211 #define FLAG_0x212 0x212 +#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x02) +#define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x38) +#define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x39) + +#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER (FLAG_HIDDEN_ITEMS_START + 0x03) +#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 (FLAG_HIDDEN_ITEMS_START + 0x1E) +#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x62) + +#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x04) +#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A) + +#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x61) + +#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2D) +#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES (FLAG_HIDDEN_ITEMS_START + 0x60) + +#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL (FLAG_HIDDEN_ITEMS_START + 0x48) + +#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x42) +#define FLAG_HIDDEN_ITEM_ROUTE_118_IRON (FLAG_HIDDEN_ITEMS_START + 0x43) + +#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x05) +#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x06) +#define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x44) +#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x57) + +#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 (FLAG_HIDDEN_ITEMS_START + 0x47) +#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x54) +#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 (FLAG_HIDDEN_ITEMS_START + 0x45) +#define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC (FLAG_HIDDEN_ITEMS_START + 0x46) + +#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_121_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x49) +#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x64) + +#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL (FLAG_HIDDEN_ITEMS_START + 0x07) +#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x29) +#define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x4A) +#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x63) +#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6E) + +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x5C) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E) + + + + #define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A) @@ -572,8 +619,6 @@ #define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19) #define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) - - #define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F) @@ -624,6 +669,37 @@ #define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x51) +#define FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2C) +#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3E) +#define FLAG_HIDDEN_ITEM_ROUTE_104_POTION (FLAG_HIDDEN_ITEMS_START + 0x25) +#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 0x55) +#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x58) + +#define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x59) +#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x6F) + +#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3F) +#define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x2E) +#define FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x2F) + +#define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x56) + +#define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x32) +#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x34) +#define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x33) +#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER (FLAG_HIDDEN_ITEMS_START + 0x40) +#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5A) +#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5B) + +#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x36) +#define FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x35) +#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x41) +#define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x37) + +#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) + + + #define FLAG_0x217 0x217//23 #define FLAG_0x218 0x218//24 #define FLAG_0x219 0x219//25 @@ -789,7 +865,7 @@ #define FLAG_0x2B9 0x2B9 #define FLAG_0x2BA 0x2BA #define FLAG_0x2BB 0x2BB -#define FLAG_0x2BC 0x2BC +#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC #define FLAG_HIDE_APPRENTICE 0x2BD #define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE #define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF @@ -808,11 +884,11 @@ #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 0x2CC #define FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS 0x2CD #define FLAG_HIDE_MEW 0x2CE -#define FLAG_0x2CF 0x2CF -#define FLAG_0x2D0 0x2D0 +#define FLAG_HIDE_ROUTE_104_RIVAL 0x2CF +#define FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE 0x2D0 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 0x2D1 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM 0x2D2 -#define FLAG_0x2D3 0x2D3 +#define FLAG_HIDE_ROUTE_103_RIVAL 0x2D3 #define FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE 0x2D4 #define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT 0x2D5 #define FLAG_HIDE_PETALBURG_CITY_WALLY 0x2D6 @@ -827,19 +903,19 @@ #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING 0x2DF #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING 0x2E0 #define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY 0x2E1 -#define FLAG_0x2E2 0x2E2 -#define FLAG_0x2E3 0x2E3 +#define FLAG_HIDE_ROUTE_104_MR_BRINEY 0x2E2 +#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 #define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 -#define FLAG_0x2E5 0x2E5 -#define FLAG_0x2E6 0x2E6 +#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5 +#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6 #define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 -#define FLAG_0x2E8 0x2E8 +#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN 0x2E9 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN 0x2EA #define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION 0x2EB #define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC #define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED -#define FLAG_0x2EE 0x2EE +#define FLAG_HIDE_ROUTE_101_ZIGZAGOON 0x2EE #define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY 0x2EF #define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE 0x2F0 #define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN 0x2F1 @@ -857,10 +933,10 @@ #define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD #define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE #define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF -#define FLAG_0x300 0x300 -#define FLAG_0x301 0x301 -#define FLAG_0x302 0x302 -#define FLAG_0x303 0x303 +#define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 +#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 +#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 +#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 #define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304 #define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 @@ -875,7 +951,7 @@ #define FLAG_HIDE_TERRA_CAVE_GROUDON 0x30F #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311 -#define FLAG_0x312 0x312 +#define FLAG_HIDE_ROUTE_119_SCOTT 0x312 #define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 #define FLAG_HIDE_MOSSDEEP_CITY_SCOTT 0x314 #define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 @@ -885,10 +961,10 @@ #define FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT 0x319 #define FLAG_HIDE_LITTLEROOT_TOWN_RIVAL 0x31A #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH 0x31B -#define FLAG_0x31C 0x31C -#define FLAG_0x31D 0x31D -#define FLAG_0x31E 0x31E -#define FLAG_0x31F 0x31F +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 0x31C +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 0x31D +#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 0x31E +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 0x31F #define FLAG_HIDE_LUGIA 0x320 #define FLAG_HIDE_HOOH 0x321 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 @@ -902,13 +978,13 @@ #define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT 0x32A #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C -#define FLAG_0x32D 0x32D +#define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D #define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F #define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE 0x330 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL 0x332 -#define FLAG_0x333 0x333 +#define FLAG_HIDE_ROUTE_112_TEAM_MAGMA 0x333 #define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE 0x334 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 @@ -923,16 +999,16 @@ #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 #define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 -#define FLAG_0x342 0x342 +#define FLAG_HIDE_ROUTE_128_STEVEN 0x342 #define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 #define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 -#define FLAG_0x345 0x345 +#define FLAG_HIDE_ROUTE_110_BIRCH 0x345 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 #define FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 0x347 #define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN 0x348 #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN 0x349 #define FLAG_0x34A 0x34A -#define FLAG_0x34B 0x34B +#define FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY 0x34B #define FLAG_HIDE_RUSTBORO_CITY_SCIENTIST 0x34C #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT 0x34D #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE 0x34E @@ -940,7 +1016,7 @@ #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW 0x350 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL 0x351 #define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 0x352 -#define FLAG_0x353 0x353 +#define FLAG_HIDE_ROUTE_119_RIVAL 0x353 #define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 #define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 #define FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS 0x356 @@ -959,18 +1035,18 @@ #define FLAG_0x363 0x363 #define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 #define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY 0x365 -#define FLAG_0x366 0x366 -#define FLAG_HIDE_LANETTE 0x367 -#define FLAG_0x368 0x368 +#define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 +#define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 +#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A -#define FLAG_0x36B 0x36B -#define FLAG_0x36C 0x36C +#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL 0x36B +#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C #define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D #define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E #define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN 0x36F #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 -#define FLAG_0x371 0x371 +#define FLAG_HIDE_BRINEYS_HOUSE_PEEKO 0x371 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 #define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS 0x373 #define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 0x374 @@ -979,23 +1055,23 @@ #define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN 0x377 #define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL 0x379 -#define FLAG_0x37A 0x37A -#define FLAG_0x37B 0x37B -#define FLAG_0x37C 0x37C -#define FLAG_0x37D 0x37D -#define FLAG_0x37E 0x37E +#define FLAG_HIDE_ROUTE_119_TEAM_AQUA 0x37A +#define FLAG_HIDE_ROUTE_116_MR_BRINEY 0x37B +#define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS 0x37C +#define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS 0x37D +#define FLAG_HIDE_ROUTE_116_TUNNELER 0x37E #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F #define FLAG_0x380 0x380 -#define FLAG_0x381 0x381 -#define FLAG_0x382 0x382 -#define FLAG_0x383 0x383 -#define FLAG_0x384 0x384 -#define FLAG_0x385 0x385 -#define FLAG_0x386 0x386 -#define FLAG_0x387 0x387 -#define FLAG_0x388 0x388 +#define FLAG_HIDE_ROUTE_101_BIRCH 0x381 +#define FLAG_HIDE_ROUTE_103_BIRCH 0x382 +#define FLAG_HIDE_TRICK_HOUSE_END_MAN 0x383 +#define FLAG_HIDE_ROUTE_110_TEAM_AQUA 0x384 +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 0x385 +#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 0x386 +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 0x387 +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 0x388 #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS 0x389 -#define FLAG_0x38A 0x38A +#define FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST 0x38A #define FLAG_HIDE_FALLARBOR_AZURILL 0x38B #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT 0x38C #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR 0x38D @@ -1008,11 +1084,11 @@ #define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE 0x394 #define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA 0x395 #define FLAG_HIDE_BATTLE_TOWER_REPORTER 0x396 -#define FLAG_0x397 0x397 +#define FLAG_HIDE_ROUTE_110_RIVAL_1 0x397 #define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 #define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 -#define FLAG_0x39A 0x39A -#define FLAG_0x39B 0x39B +#define FLAG_HIDE_ROUTE_110_RIVAL_2 0x39A +#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B #define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C #define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E @@ -1033,10 +1109,10 @@ #define FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT 0x3AD #define FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO 0x3AE #define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW 0x3AF -#define FLAG_0x3B0 0x3B0 -#define FLAG_0x3B1 0x3B1 +#define FLAG_HIDE_ROUTE_128_ARCHIE 0x3B0 +#define FLAG_HIDE_ROUTE_128_MAXIE 0x3B1 #define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS 0x3B2 -#define FLAG_0x3B3 0x3B3 +#define FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE 0x3B3 #define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 #define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 #define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY 0x3B6 @@ -1049,17 +1125,17 @@ #define FLAG_0x3BD 0x3BD #define FLAG_0x3BE 0x3BE #define FLAG_0x3BF 0x3BF -#define FLAG_0x3C0 0x3C0 -#define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION 0x3C1 +#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN 0x3C0 +#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION 0x3C1 #define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2 #define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL 0x3C3 #define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL 0x3C4 #define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 -#define FLAG_0x3C6 0x3C6 +#define FLAG_HIDE_ROUTE_118_STEVEN 0x3C6 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8 #define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9 -#define FLAG_0x3CA 0x3CA +#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3CA #define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB #define FLAG_0x3CC 0x3CC #define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN 0x3CD @@ -1070,18 +1146,18 @@ #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 #define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3 #define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 -#define FLAG_0x3D5 0x3D5 -#define FLAG_0x3D6 0x3D6 +#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5 +#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6 #define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 -#define FLAG_0x3D9 0x3D9 -#define FLAG_0x3DA 0x3DA -#define FLAG_0x3DB 0x3DB -#define FLAG_0x3DC 0x3DC -#define FLAG_0x3DD 0x3DD -#define FLAG_0x3DE 0x3DE -#define FLAG_0x3DF 0x3DF -#define FLAG_0x3E0 0x3E0 +#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9 +#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA +#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB +#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC +#define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD +#define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE +#define FLAG_HIDE_ROUTE_101_BOY 0x3DF +#define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M 0x3E0 #define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY 0x3E1 #define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY 0x3E2 #define FLAG_HIDE_PETALBURG_CITY_SCOTT 0x3E3 @@ -1089,45 +1165,46 @@ #define FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE 0x3E5 #define FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON 0x3E6 #define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT 0x3E7 -#define FLAG_0x3E8 0x3E8 -#define FLAG_0x3E9 0x3E9 -#define FLAG_0x3EA 0x3EA -#define FLAG_0x3EB 0x3EB -#define FLAG_0x3EC 0x3EC -#define FLAG_0x3ED 0x3ED -#define FLAG_0x3EE 0x3EE -#define FLAG_0x3EF 0x3EF -#define FLAG_0x3F0 0x3F0 -#define FLAG_0x3F1 0x3F1 -#define FLAG_0x3F2 0x3F2 -#define FLAG_0x3F3 0x3F3 -#define FLAG_0x3F4 0x3F4 -#define FLAG_0x3F5 0x3F5 -#define FLAG_0x3F6 0x3F6 -#define FLAG_0x3F7 0x3F7 -#define FLAG_0x3F8 0x3F8 -#define FLAG_0x3F9 0x3F9 -#define FLAG_0x3FA 0x3FA -#define FLAG_0x3FB 0x3FB -#define FLAG_0x3FC 0x3FC -#define FLAG_0x3FD 0x3FD -#define FLAG_0x3FE 0x3FE -#define FLAG_0x3FF 0x3FF -#define FLAG_0x400 0x400 -#define FLAG_0x401 0x401 -#define FLAG_0x402 0x402 -#define FLAG_0x403 0x403 -#define FLAG_0x404 0x404 -#define FLAG_0x405 0x405 -#define FLAG_0x406 0x406 -#define FLAG_0x407 0x407 -#define FLAG_0x408 0x408 + +#define FLAG_ITEM_ROUTE_102_POTION 0x3E8 +#define FLAG_ITEM_ROUTE_116_X_SPECIAL 0x3E9 +#define FLAG_ITEM_ROUTE_104_PP_UP 0x3EA +#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_DIRE_HIT 0x3EF +#define FLAG_ITEM_ROUTE_111_TM_37 0x3F0 +#define FLAG_ITEM_ROUTE_111_STARDUST 0x3F1 +#define FLAG_ITEM_ROUTE_111_HP_UP 0x3F2 +#define FLAG_ITEM_ROUTE_112_NUGGET 0x3F3 +#define FLAG_ITEM_ROUTE_113_MAX_ETHER 0x3F4 +#define FLAG_ITEM_ROUTE_113_SUPER_REPEL 0x3F5 +#define FLAG_ITEM_ROUTE_114_RARE_CANDY 0x3F6 +#define FLAG_ITEM_ROUTE_114_PROTEIN 0x3F7 +#define FLAG_ITEM_ROUTE_115_SUPER_POTION 0x3F8 +#define FLAG_ITEM_ROUTE_115_TM_01 0x3F9 +#define FLAG_ITEM_ROUTE_115_IRON 0x3FA +#define FLAG_ITEM_ROUTE_116_ETHER 0x3FB +#define FLAG_ITEM_ROUTE_116_REPEL 0x3FC +#define FLAG_ITEM_ROUTE_116_HP_UP 0x3FD +#define FLAG_ITEM_ROUTE_117_GREAT_BALL 0x3FE +#define FLAG_ITEM_ROUTE_117_REVIVE 0x3FF +#define FLAG_ITEM_ROUTE_119_SUPER_REPEL 0x400 +#define FLAG_ITEM_ROUTE_119_ZINC 0x401 +#define FLAG_ITEM_ROUTE_119_ELIXIR_1 0x402 +#define FLAG_ITEM_ROUTE_119_LEAF_STONE 0x403 +#define FLAG_ITEM_ROUTE_119_RARE_CANDY 0x404 +#define FLAG_ITEM_ROUTE_119_HYPER_POTION_1 0x405 +#define FLAG_ITEM_ROUTE_120_NUGGET 0x406 +#define FLAG_ITEM_ROUTE_120_FULL_HEAL 0x407 +#define FLAG_ITEM_ROUTE_123_CALCIUM 0x408 #define FLAG_0x409 0x409 -#define FLAG_0x40A 0x40A -#define FLAG_0x40B 0x40B -#define FLAG_0x40C 0x40C -#define FLAG_0x40D 0x40D -#define FLAG_0x40E 0x40E +#define FLAG_ITEM_ROUTE_127_ZINC 0x40A +#define FLAG_ITEM_ROUTE_127_CARBOS 0x40B +#define FLAG_ITEM_ROUTE_132_RARE_CANDY 0x40C +#define FLAG_ITEM_ROUTE_133_BIG_PEARL 0x40D +#define FLAG_ITEM_ROUTE_133_STAR_PIECE 0x40E #define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE 0x40F #define FLAG_ITEM_PETALBURG_CITY_ETHER 0x410 #define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND 0x411 @@ -1147,19 +1224,19 @@ #define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY 0x41E #define FLAG_ITEM_PETALBURG_WOODS_X_ATTACK 0x41F #define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL 0x420 -#define FLAG_0x421 0x421 +#define FLAG_ITEM_ROUTE_104_POKE_BALL 0x421 #define FLAG_ITEM_PETALBURG_WOODS_ETHER 0x422 #define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE 0x423 -#define FLAG_0x424 0x424 -#define FLAG_0x425 0x425 -#define FLAG_0x426 0x426 -#define FLAG_0x427 0x427 -#define FLAG_0x428 0x428 -#define FLAG_0x429 0x429 -#define FLAG_0x42A 0x42A -#define FLAG_0x42B 0x42B -#define FLAG_0x42C 0x42C -#define FLAG_0x42D 0x42D +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL 0x424 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL 0x425 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL 0x426 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL 0x427 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL 0x428 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL 0x429 +#define FLAG_ITEM_ROUTE_124_YELLOW_SHARD 0x42A +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL 0x42B +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL 0x42C +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL 0x42D #define FLAG_ITEM_JAGGED_PASS_BURN_HEAL 0x42E #define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR 0x42F #define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL 0x430 @@ -1183,8 +1260,8 @@ #define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441 #define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442 #define FLAG_ITEM_FIERY_PATH_TM06 0x443 -#define FLAG_0x444 0x444 -#define FLAG_0x445 0x445 +#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444 +#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445 #define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448 @@ -1194,25 +1271,25 @@ #define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C #define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D #define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E -#define FLAG_0x44F 0x44F -#define FLAG_0x450 0x450 -#define FLAG_0x451 0x451 -#define FLAG_0x452 0x452 -#define FLAG_0x453 0x453 -#define FLAG_0x454 0x454 -#define FLAG_0x455 0x455 +#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F +#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450 +#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451 +#define FLAG_ITEM_ROUTE_119_HYPER_POTION_2 0x452 +#define FLAG_ITEM_ROUTE_120_HYPER_POTION 0x453 +#define FLAG_ITEM_ROUTE_120_NEST_BALL 0x454 +#define FLAG_ITEM_ROUTE_123_ELIXIR 0x455 #define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE 0x456 #define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 #define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 0x458 #define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE 0x459 -#define FLAG_0x45A 0x45A -#define FLAG_0x45B 0x45B +#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_0x45E 0x45E +#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 -#define FLAG_0x461 0x461 +#define FLAG_ITEM_ROUTE_118_HYPER_POTION 0x461 #define FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL 0x462 #define FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL 0x463 #define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL 0x464 @@ -1225,34 +1302,34 @@ #define FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE 0x46B #define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET 0x46C #define FLAG_0x46D 0x46D -#define FLAG_0x46E 0x46E -#define FLAG_0x46F 0x46F +#define FLAG_ITEM_ROUTE_119_NUGGET 0x46E +#define FLAG_ITEM_ROUTE_104_POTION 0x46F #define FLAG_0x470 0x470 -#define FLAG_0x471 0x471 +#define FLAG_ITEM_ROUTE_103_PP_UP 0x471 #define FLAG_0x472 0x472 -#define FLAG_0x473 0x473 +#define FLAG_ITEM_ROUTE_108_STAR_PIECE 0x473 #define FLAG_0x474 0x474 -#define FLAG_0x475 0x475 -#define FLAG_0x476 0x476 -#define FLAG_0x477 0x477 -#define FLAG_0x478 0x478 +#define FLAG_ITEM_ROUTE_110_ELIXIR 0x475 +#define FLAG_ITEM_ROUTE_111_ELIXIR 0x476 +#define FLAG_ITEM_ROUTE_113_HYPER_POTION 0x477 +#define FLAG_ITEM_ROUTE_115_HEAL_POWDER 0x478 #define FLAG_0x479 0x479 -#define FLAG_0x47A 0x47A -#define FLAG_0x47B 0x47B -#define FLAG_0x47C 0x47C -#define FLAG_0x47D 0x47D -#define FLAG_0x47E 0x47E +#define FLAG_ITEM_ROUTE_116_POTION 0x47A +#define FLAG_ITEM_ROUTE_119_ELIXIR_2 0x47B +#define FLAG_ITEM_ROUTE_120_REVIVE 0x47C +#define FLAG_ITEM_ROUTE_121_REVIVE 0x47D +#define FLAG_ITEM_ROUTE_121_ZINC 0x47E #define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY 0x47F -#define FLAG_0x480 0x480 -#define FLAG_0x481 0x481 -#define FLAG_0x482 0x482 -#define FLAG_0x483 0x483 -#define FLAG_0x484 0x484 -#define FLAG_0x485 0x485 -#define FLAG_0x486 0x486 -#define FLAG_0x487 0x487 -#define FLAG_0x488 0x488 -#define FLAG_0x489 0x489 +#define FLAG_ITEM_ROUTE_123_PP_UP 0x480 +#define FLAG_ITEM_ROUTE_123_REVIVAL_HERB 0x481 +#define FLAG_ITEM_ROUTE_125_BIG_PEARL 0x482 +#define FLAG_ITEM_ROUTE_127_RARE_CANDY 0x483 +#define FLAG_ITEM_ROUTE_132_PROTEIN 0x484 +#define FLAG_ITEM_ROUTE_133_MAX_REVIVE 0x485 +#define FLAG_ITEM_ROUTE_134_CARBOS 0x486 +#define FLAG_ITEM_ROUTE_134_STAR_PIECE 0x487 +#define FLAG_ITEM_ROUTE_114_ENERGY_POWDER 0x488 +#define FLAG_ITEM_ROUTE_115_PP_UP 0x489 #define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A #define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B #define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR 0x48C @@ -1262,6 +1339,7 @@ #define FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE 0x490 #define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET 0x491 #define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL 0x492 + #define FLAG_0x493 0x493 #define FLAG_0x494 0x494 #define FLAG_0x495 0x495 -- cgit v1.2.3 From 113a8d1efd45ed387a0ede7b7aa8744b622c662f Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 14:59:18 -0400 Subject: clean flags and remove temp macro --- include/constants/flags.h | 1320 +++++++++++++++++++-------------------------- 1 file changed, 542 insertions(+), 778 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index f3c0f75ac..c21affd61 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -194,6 +194,8 @@ #define FLAG_DECORATION_12 0xB9 #define FLAG_DECORATION_13 0xBA #define FLAG_DECORATION_14 0xBB + +// scripts #define FLAG_0x0BC 0xBC #define FLAG_0x0BD 0xBD #define FLAG_0x0BE 0xBE @@ -302,7 +304,7 @@ // upper flags? #define FLAG_0x124 0x124 #define FLAG_0x125 0x125 -#define FLAG_0x126 0x126 +#define FLAG_TRADED_SCANNER_TO_STERN 0x126 #define FLAG_0x127 0x127 #define FLAG_0x128 0x128 #define FLAG_0x129 0x129 @@ -509,91 +511,11 @@ #define FLAG_0x1F1 0x1F1 #define FLAG_0x1F2 0x1F2 #define FLAG_0x1F3 0x1F3 - - - -#define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_0x1F5 0x1F5 // trick house end room? -#define FLAG_0x1F6 0x1F6 -#define FLAG_0x1F7 0x1F7 -#define FLAG_0x1F8 0x1F8 -#define FLAG_0x1F9 0x1F9 -#define FLAG_0x1FA 0x1FA -#define FLAG_0x1FB 0x1FB -#define FLAG_0x1FC 0x1FC -#define FLAG_0x1FD 0x1FD -#define FLAG_0x1FE 0x1FE -#define FLAG_0x1FF 0x1FF -#define FLAG_0x200 0x200 -#define FLAG_0x201 0x201 -#define FLAG_0x202 0x202 -#define FLAG_0x203 0x203 -#define FLAG_0x204 0x204 -#define FLAG_0x205 0x205 -#define FLAG_0x206 0x206 -#define FLAG_0x207 0x207 -#define FLAG_0x208 0x208 -#define FLAG_0x209 0x209 -#define FLAG_0x20A 0x20A -#define FLAG_0x20B 0x20B -#define FLAG_0x20C 0x20C -#define FLAG_0x20D 0x20D -#define FLAG_0x20E 0x20E -#define FLAG_0x20F 0x20F -#define FLAG_0x210 0x210 -#define FLAG_0x211 0x211 -#define FLAG_0x212 0x212 - -#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x02) -#define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x38) -#define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x39) - -#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER (FLAG_HIDDEN_ITEMS_START + 0x03) -#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 (FLAG_HIDDEN_ITEMS_START + 0x1E) -#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x62) - -#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x04) -#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A) - -#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x61) - -#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2D) -#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES (FLAG_HIDDEN_ITEMS_START + 0x60) - -#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL (FLAG_HIDDEN_ITEMS_START + 0x48) - -#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x42) -#define FLAG_HIDDEN_ITEM_ROUTE_118_IRON (FLAG_HIDDEN_ITEMS_START + 0x43) - -#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x05) -#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x06) -#define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x44) -#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x57) - -#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 (FLAG_HIDDEN_ITEMS_START + 0x47) -#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x54) -#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 (FLAG_HIDDEN_ITEMS_START + 0x45) -#define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC (FLAG_HIDDEN_ITEMS_START + 0x46) - -#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_121_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x49) -#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x64) - -#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL (FLAG_HIDDEN_ITEMS_START + 0x07) -#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x29) -#define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x4A) -#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x63) -#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6E) - -#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x5C) -#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D) -#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E) - - - - +// Hidden Items -- sorted by location +#define FLAG_HIDDEN_ITEMS_START 0x1F4 +#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A) @@ -601,744 +523,586 @@ #define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x24) #define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26) - -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON (FLAG_HIDDEN_ITEMS_START + 0x13) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON (FLAG_HIDDEN_ITEMS_START + 0x13) #define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14) -#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C) - -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15) -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14) +#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C) +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15) +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16) #define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17) -#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18) - +#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18) #define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19) -#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) - +#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) +#define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x1C) #define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00) - #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY (FLAG_HIDDEN_ITEMS_START + 0x20) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY (FLAG_HIDDEN_ITEMS_START + 0x21) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY (FLAG_HIDDEN_ITEMS_START + 0x22) - #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x65) #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC (FLAG_HIDDEN_ITEMS_START + 0x66) #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x67) #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON (FLAG_HIDDEN_ITEMS_START + 0x68) - #define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 (FLAG_HIDDEN_ITEMS_START + 0x30) #define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 (FLAG_HIDDEN_ITEMS_START + 0x31) - #define FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x4C) #define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x4D) - #define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x1B) #define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x2B) #define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x4B) - #define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x1D) #define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x4E) - #define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC (FLAG_HIDDEN_ITEMS_START + 0x4F) #define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x50) - #define FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH (FLAG_HIDDEN_ITEMS_START + 0x6D) - #define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x5F) - -#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION (FLAG_HIDDEN_ITEMS_START + 0x3A) +#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION (FLAG_HIDDEN_ITEMS_START + 0x3A) #define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 (FLAG_HIDDEN_ITEMS_START + 0x3B) #define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 0x3C) -#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3D) - -#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 0x52) +#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3D) +#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 0x52) #define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL (FLAG_HIDDEN_ITEMS_START + 0x53) - #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6A) #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC (FLAG_HIDDEN_ITEMS_START + 0x6B) - #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x6C) #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69) - #define FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS (FLAG_HIDDEN_ITEMS_START + 0x23) - #define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x51) - #define FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2C) -#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3E) -#define FLAG_HIDDEN_ITEM_ROUTE_104_POTION (FLAG_HIDDEN_ITEMS_START + 0x25) -#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 0x55) -#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x58) - +#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3E) +#define FLAG_HIDDEN_ITEM_ROUTE_104_POTION (FLAG_HIDDEN_ITEMS_START + 0x25) +#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 0x55) +#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x58) #define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x59) -#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x6F) - -#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3F) -#define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x2E) +#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x6F) +#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3F) +#define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x2E) #define FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x2F) - #define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x56) - -#define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x32) +#define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x32) #define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x34) -#define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x33) -#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER (FLAG_HIDDEN_ITEMS_START + 0x40) +#define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x33) +#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER (FLAG_HIDDEN_ITEMS_START + 0x40) #define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5A) #define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5B) - -#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x36) +#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x36) #define FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x35) -#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x41) -#define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x37) - -#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) - - - -#define FLAG_0x217 0x217//23 -#define FLAG_0x218 0x218//24 -#define FLAG_0x219 0x219//25 -#define FLAG_0x21A 0x21A//26 -#define FLAG_0x21B 0x21B -#define FLAG_0x21C 0x21C -#define FLAG_0x21D 0x21D -#define FLAG_0x21E 0x21E -#define FLAG_0x21F 0x21F -#define FLAG_0x220 0x220 -#define FLAG_0x221 0x221 -#define FLAG_0x222 0x222 -#define FLAG_0x223 0x223 -#define FLAG_0x224 0x224 -#define FLAG_0x225 0x225 -#define FLAG_0x226 0x226 -#define FLAG_0x227 0x227 -#define FLAG_0x228 0x228 -#define FLAG_0x229 0x229 -#define FLAG_0x22A 0x22A -#define FLAG_0x22B 0x22B -#define FLAG_0x22C 0x22C -#define FLAG_0x22D 0x22D -#define FLAG_0x22E 0x22E -#define FLAG_0x22F 0x22F -#define FLAG_0x230 0x230 -#define FLAG_0x231 0x231 -#define FLAG_0x232 0x232 -#define FLAG_0x233 0x233 -#define FLAG_0x234 0x234 -#define FLAG_0x235 0x235 -#define FLAG_0x236 0x236 -#define FLAG_0x237 0x237 -#define FLAG_0x238 0x238 -#define FLAG_0x239 0x239 -#define FLAG_0x23A 0x23A -#define FLAG_0x23B 0x23B -#define FLAG_0x23C 0x23C -#define FLAG_0x23D 0x23D -#define FLAG_0x23E 0x23E -#define FLAG_0x23F 0x23F -#define FLAG_0x240 0x240 -#define FLAG_0x241 0x241 -#define FLAG_0x242 0x242 -#define FLAG_0x243 0x243 -#define FLAG_0x244 0x244 -#define FLAG_0x245 0x245 -#define FLAG_0x246 0x246 -#define FLAG_0x247 0x247 -#define FLAG_0x248 0x248 -#define FLAG_0x249 0x249 -#define FLAG_0x24A 0x24A -#define FLAG_0x24B 0x24B -#define FLAG_0x24C 0x24C -#define FLAG_0x24D 0x24D -#define FLAG_0x24E 0x24E -#define FLAG_0x24F 0x24F -#define FLAG_0x250 0x250 -#define FLAG_0x251 0x251 -#define FLAG_0x252 0x252 -#define FLAG_0x253 0x253 -#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254 -#define FLAG_0x255 0x255 -#define FLAG_0x256 0x256 -#define FLAG_0x257 0x257 -#define FLAG_0x258 0x258 -#define FLAG_0x259 0x259 -#define FLAG_0x25A 0x25A -#define FLAG_0x25B 0x25B -#define FLAG_0x25C 0x25C -#define FLAG_0x25D 0x25D -#define FLAG_0x25E 0x25E -#define FLAG_0x25F 0x25F -#define FLAG_0x260 0x260 -#define FLAG_0x261 0x261 -#define FLAG_0x262 0x262 -#define FLAG_0x263 0x263 -#define FLAG_0x264 0x264 -#define FLAG_0x265 0x265 -#define FLAG_0x266 0x266 -#define FLAG_0x267 0x267 -#define FLAG_0x268 0x268 -#define FLAG_0x269 0x269 -#define FLAG_0x26A 0x26A -#define FLAG_0x26B 0x26B -#define FLAG_0x26C 0x26C -#define FLAG_0x26D 0x26D -#define FLAG_0x26E 0x26E -#define FLAG_0x26F 0x26F -#define FLAG_0x270 0x270 -#define FLAG_0x271 0x271 -#define FLAG_0x272 0x272 -#define FLAG_0x273 0x273 -#define FLAG_0x274 0x274 -#define FLAG_0x275 0x275 -#define FLAG_0x276 0x276 -#define FLAG_0x277 0x277 -#define FLAG_0x278 0x278 -#define FLAG_0x279 0x279 -#define FLAG_0x27A 0x27A -#define FLAG_0x27B 0x27B -#define FLAG_0x27C 0x27C -#define FLAG_0x27D 0x27D -#define FLAG_0x27E 0x27E -#define FLAG_0x27F 0x27F -#define FLAG_0x280 0x280 -#define FLAG_0x281 0x281 -#define FLAG_0x282 0x282 -#define FLAG_0x283 0x283 -#define FLAG_0x284 0x284 -#define FLAG_0x285 0x285 -#define FLAG_0x286 0x286 -#define FLAG_0x287 0x287 -#define FLAG_0x288 0x288 -#define FLAG_0x289 0x289 -#define FLAG_0x28A 0x28A -#define FLAG_0x28B 0x28B -#define FLAG_0x28C 0x28C -#define FLAG_0x28D 0x28D -#define FLAG_0x28E 0x28E -#define FLAG_0x28F 0x28F -#define FLAG_0x290 0x290 -#define FLAG_0x291 0x291 -#define FLAG_0x292 0x292 -#define FLAG_0x293 0x293 -#define FLAG_0x294 0x294 -#define FLAG_0x295 0x295 -#define FLAG_0x296 0x296 -#define FLAG_0x297 0x297 -#define FLAG_0x298 0x298 -#define FLAG_0x299 0x299 -#define FLAG_0x29A 0x29A -#define FLAG_0x29B 0x29B -#define FLAG_0x29C 0x29C -#define FLAG_0x29D 0x29D -#define FLAG_0x29E 0x29E -#define FLAG_0x29F 0x29F -#define FLAG_0x2A0 0x2A0 -#define FLAG_0x2A1 0x2A1 -#define FLAG_0x2A2 0x2A2 -#define FLAG_0x2A3 0x2A3 -#define FLAG_0x2A4 0x2A4 -#define FLAG_0x2A5 0x2A5 -#define FLAG_0x2A6 0x2A6 -#define FLAG_0x2A7 0x2A7 -#define FLAG_0x2A8 0x2A8 -#define FLAG_0x2A9 0x2A9 -#define FLAG_0x2AA 0x2AA -#define FLAG_0x2AB 0x2AB -#define FLAG_0x2AC 0x2AC -#define FLAG_0x2AD 0x2AD -#define FLAG_0x2AE 0x2AE -#define FLAG_0x2AF 0x2AF -#define FLAG_0x2B0 0x2B0 -#define FLAG_0x2B1 0x2B1 -#define FLAG_0x2B2 0x2B2 -#define FLAG_0x2B3 0x2B3 -#define FLAG_0x2B4 0x2B4 -#define FLAG_0x2B5 0x2B5 -#define FLAG_0x2B6 0x2B6 -#define FLAG_0x2B7 0x2B7 -#define FLAG_0x2B8 0x2B8 -#define FLAG_0x2B9 0x2B9 -#define FLAG_0x2BA 0x2BA -#define FLAG_0x2BB 0x2BB -#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC -#define FLAG_HIDE_APPRENTICE 0x2BD -#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE -#define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF -#define FLAG_HIDE_UNION_ROOM_PLAYER_2 0x2C0 -#define FLAG_HIDE_UNION_ROOM_PLAYER_3 0x2C1 -#define FLAG_HIDE_UNION_ROOM_PLAYER_4 0x2C2 -#define FLAG_HIDE_UNION_ROOM_PLAYER_5 0x2C3 -#define FLAG_HIDE_UNION_ROOM_PLAYER_6 0x2C4 -#define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x2C5 -#define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x2C6 -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 0x2C7 -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 0x2C8 -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 0x2C9 -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 0x2CA -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 0x2CB -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 0x2CC -#define FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS 0x2CD -#define FLAG_HIDE_MEW 0x2CE -#define FLAG_HIDE_ROUTE_104_RIVAL 0x2CF -#define FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE 0x2D0 -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 0x2D1 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM 0x2D2 -#define FLAG_HIDE_ROUTE_103_RIVAL 0x2D3 -#define FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE 0x2D4 -#define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT 0x2D5 -#define FLAG_HIDE_PETALBURG_CITY_WALLY 0x2D6 -#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY 0x2D7 -#define FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT 0x2D8 -#define FLAG_0x2D9 0x2D9 -#define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER 0x2DA -#define FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT 0x2DB -#define FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 0x2DC -#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 0x2DD -#define FLAG_HIDE_PLAYERS_HOUSE_DAD 0x2DE -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING 0x2DF -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING 0x2E0 -#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY 0x2E1 -#define FLAG_HIDE_ROUTE_104_MR_BRINEY 0x2E2 -#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 -#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 -#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5 -#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6 -#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 -#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8 -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN 0x2E9 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN 0x2EA -#define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION 0x2EB -#define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC -#define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED -#define FLAG_HIDE_ROUTE_101_ZIGZAGOON 0x2EE -#define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY 0x2EF -#define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE 0x2F0 -#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN 0x2F1 -#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 0x2F2 -#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 0x2F3 -#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA 0x2F4 -#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM 0x2F5 -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM 0x2F6 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM 0x2F7 -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM 0x2F8 -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK 0x2F9 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK 0x2FA -#define FLAG_HIDE_DEOXYS 0x2FB -#define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC -#define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD -#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE -#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF -#define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 -#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 -#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 -#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 -#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304 -#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 -#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 0x308 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 0x309 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 0x30A -#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 0x30B -#define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS 0x30C -#define FLAG_HIDE_PETALBURG_GYM_GREETER 0x30D -#define FLAG_HIDE_MARINE_CAVE_KYOGRE 0x30E -#define FLAG_HIDE_TERRA_CAVE_GROUDON 0x30F -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311 -#define FLAG_HIDE_ROUTE_119_SCOTT 0x312 -#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 -#define FLAG_HIDE_MOSSDEEP_CITY_SCOTT 0x314 -#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 -#define FLAG_HIDE_FANCLUB_BOY 0x316 -#define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317 -#define FLAG_HIDE_FANCLUB_LADY 0x318 -#define FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT 0x319 -#define FLAG_HIDE_LITTLEROOT_TOWN_RIVAL 0x31A -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH 0x31B -#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 0x31C -#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 0x31D -#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 0x31E -#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 0x31F -#define FLAG_HIDE_LUGIA 0x320 -#define FLAG_HIDE_HOOH 0x321 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 -#define FLAG_0x323 0x323 -#define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 -#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326 -#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN 0x328 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE 0x329 -#define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT 0x32A -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C -#define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D -#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F -#define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE 0x330 -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL 0x332 -#define FLAG_HIDE_ROUTE_112_TEAM_MAGMA 0x333 -#define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE 0x334 -#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335 -#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 -#define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 -#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 -#define FLAG_0x339 0x339 -#define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE 0x33A -#define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE 0x33B -#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C -#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D -#define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E -#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 -#define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 -#define FLAG_HIDE_ROUTE_128_STEVEN 0x342 -#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 -#define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 -#define FLAG_HIDE_ROUTE_110_BIRCH 0x345 -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 -#define FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 0x347 -#define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN 0x348 -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN 0x349 -#define FLAG_0x34A 0x34A -#define FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY 0x34B -#define FLAG_HIDE_RUSTBORO_CITY_SCIENTIST 0x34C -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT 0x34D -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE 0x34E -#define FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD 0x34F -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW 0x350 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL 0x351 -#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 0x352 -#define FLAG_HIDE_ROUTE_119_RIVAL 0x353 -#define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 -#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 -#define FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS 0x356 -#define FLAG_HIDE_SKY_PILLAR_WALLACE 0x357 -#define FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE 0x358 -#define FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS 0x359 -#define FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY 0x35A -#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 0x35B -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL 0x35C -#define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL 0x35D -#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA 0x35E -#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN 0x35F -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 0x360 -#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 0x361 -#define FLAG_HIDE_PETALBURG_GYM_WALLY 0x362 -#define FLAG_0x363 0x363 -#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 -#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY 0x365 -#define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 -#define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 -#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 -#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A -#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL 0x36B -#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C -#define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D -#define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E -#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN 0x36F -#define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 -#define FLAG_HIDE_BRINEYS_HOUSE_PEEKO 0x371 -#define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 -#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS 0x373 -#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 0x374 -#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 0x375 -#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE 0x376 -#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN 0x377 -#define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL 0x379 -#define FLAG_HIDE_ROUTE_119_TEAM_AQUA 0x37A -#define FLAG_HIDE_ROUTE_116_MR_BRINEY 0x37B -#define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS 0x37C -#define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS 0x37D -#define FLAG_HIDE_ROUTE_116_TUNNELER 0x37E -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F -#define FLAG_0x380 0x380 -#define FLAG_HIDE_ROUTE_101_BIRCH 0x381 -#define FLAG_HIDE_ROUTE_103_BIRCH 0x382 -#define FLAG_HIDE_TRICK_HOUSE_END_MAN 0x383 -#define FLAG_HIDE_ROUTE_110_TEAM_AQUA 0x384 -#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 0x385 -#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 0x386 -#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 0x387 -#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 0x388 -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS 0x389 -#define FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST 0x38A -#define FLAG_HIDE_FALLARBOR_AZURILL 0x38B -#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT 0x38C -#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR 0x38D -#define FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE 0x38E -#define FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON 0x38F -#define FLAG_HIDE_MAUVILLE_CITY_WATTSON 0x390 -#define FLAG_HIDE_MAUVILLE_GYM_WATTSON 0x391 -#define FLAG_0x392 0x392 -#define FLAG_0x393 0x393 -#define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE 0x394 -#define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA 0x395 -#define FLAG_HIDE_BATTLE_TOWER_REPORTER 0x396 -#define FLAG_HIDE_ROUTE_110_RIVAL_1 0x397 -#define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 -#define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 -#define FLAG_HIDE_ROUTE_110_RIVAL_2 0x39A -#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B -#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C -#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D -#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E -#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F -#define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO 0x3A0 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 -#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 -#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 -#define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 -#define FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL 0x3A6 -#define FLAG_HIDE_REGIROCK 0x3A7 -#define FLAG_HIDE_REGICE 0x3A8 -#define FLAG_HIDE_REGISTEEL 0x3A9 -#define FLAG_HIDE_METEOR_FALLS_TEAM_AQUA 0x3AA -#define FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA 0x3AB -#define FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN 0x3AC -#define FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT 0x3AD -#define FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO 0x3AE -#define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW 0x3AF -#define FLAG_HIDE_ROUTE_128_ARCHIE 0x3B0 -#define FLAG_HIDE_ROUTE_128_MAXIE 0x3B1 -#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS 0x3B2 -#define FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE 0x3B3 -#define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 -#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 -#define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY 0x3B6 -#define FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER 0x3B7 -#define FLAG_0x3B8 0x3B8 -#define FLAG_0x3B9 0x3B9 -#define FLAG_0x3BA 0x3BA -#define FLAG_0x3BB 0x3BB -#define FLAG_0x3BC 0x3BC -#define FLAG_0x3BD 0x3BD -#define FLAG_0x3BE 0x3BE -#define FLAG_0x3BF 0x3BF -#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN 0x3C0 -#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION 0x3C1 -#define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2 -#define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL 0x3C3 -#define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL 0x3C4 -#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 -#define FLAG_HIDE_ROUTE_118_STEVEN 0x3C6 -#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7 -#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8 -#define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9 -#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3CA -#define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB -#define FLAG_0x3CC 0x3CC -#define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN 0x3CD -#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 0x3CE -#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 0x3CF -#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 0x3D0 -#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 0x3D1 -#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 -#define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3 -#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 -#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5 -#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6 -#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 -#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9 -#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA -#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB -#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC -#define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD -#define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE -#define FLAG_HIDE_ROUTE_101_BOY 0x3DF -#define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M 0x3E0 -#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY 0x3E1 -#define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY 0x3E2 -#define FLAG_HIDE_PETALBURG_CITY_SCOTT 0x3E3 -#define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA 0x3E4 -#define FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE 0x3E5 -#define FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON 0x3E6 -#define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT 0x3E7 - -#define FLAG_ITEM_ROUTE_102_POTION 0x3E8 -#define FLAG_ITEM_ROUTE_116_X_SPECIAL 0x3E9 -#define FLAG_ITEM_ROUTE_104_PP_UP 0x3EA -#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_DIRE_HIT 0x3EF -#define FLAG_ITEM_ROUTE_111_TM_37 0x3F0 -#define FLAG_ITEM_ROUTE_111_STARDUST 0x3F1 -#define FLAG_ITEM_ROUTE_111_HP_UP 0x3F2 -#define FLAG_ITEM_ROUTE_112_NUGGET 0x3F3 -#define FLAG_ITEM_ROUTE_113_MAX_ETHER 0x3F4 -#define FLAG_ITEM_ROUTE_113_SUPER_REPEL 0x3F5 -#define FLAG_ITEM_ROUTE_114_RARE_CANDY 0x3F6 -#define FLAG_ITEM_ROUTE_114_PROTEIN 0x3F7 -#define FLAG_ITEM_ROUTE_115_SUPER_POTION 0x3F8 -#define FLAG_ITEM_ROUTE_115_TM_01 0x3F9 -#define FLAG_ITEM_ROUTE_115_IRON 0x3FA -#define FLAG_ITEM_ROUTE_116_ETHER 0x3FB -#define FLAG_ITEM_ROUTE_116_REPEL 0x3FC -#define FLAG_ITEM_ROUTE_116_HP_UP 0x3FD -#define FLAG_ITEM_ROUTE_117_GREAT_BALL 0x3FE -#define FLAG_ITEM_ROUTE_117_REVIVE 0x3FF -#define FLAG_ITEM_ROUTE_119_SUPER_REPEL 0x400 -#define FLAG_ITEM_ROUTE_119_ZINC 0x401 -#define FLAG_ITEM_ROUTE_119_ELIXIR_1 0x402 -#define FLAG_ITEM_ROUTE_119_LEAF_STONE 0x403 -#define FLAG_ITEM_ROUTE_119_RARE_CANDY 0x404 -#define FLAG_ITEM_ROUTE_119_HYPER_POTION_1 0x405 -#define FLAG_ITEM_ROUTE_120_NUGGET 0x406 -#define FLAG_ITEM_ROUTE_120_FULL_HEAL 0x407 -#define FLAG_ITEM_ROUTE_123_CALCIUM 0x408 -#define FLAG_0x409 0x409 -#define FLAG_ITEM_ROUTE_127_ZINC 0x40A -#define FLAG_ITEM_ROUTE_127_CARBOS 0x40B -#define FLAG_ITEM_ROUTE_132_RARE_CANDY 0x40C -#define FLAG_ITEM_ROUTE_133_BIG_PEARL 0x40D -#define FLAG_ITEM_ROUTE_133_STAR_PIECE 0x40E -#define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE 0x40F -#define FLAG_ITEM_PETALBURG_CITY_ETHER 0x410 -#define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND 0x411 -#define FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL 0x412 -#define FLAG_ITEM_MOSSDEEP_CITY_NET_BALL 0x413 +#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x41) +#define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x37) +#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x02) +#define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x38) +#define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x39) +#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER (FLAG_HIDDEN_ITEMS_START + 0x03) +#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 (FLAG_HIDDEN_ITEMS_START + 0x1E) +#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x62) +#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x04) +#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A) +#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x61) +#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2D) +#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES (FLAG_HIDDEN_ITEMS_START + 0x60) +#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL (FLAG_HIDDEN_ITEMS_START + 0x48) +#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x42) +#define FLAG_HIDDEN_ITEM_ROUTE_118_IRON (FLAG_HIDDEN_ITEMS_START + 0x43) +#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x05) +#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x06) +#define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x44) +#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x57) +#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 (FLAG_HIDDEN_ITEMS_START + 0x47) +#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x54) +#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 (FLAG_HIDDEN_ITEMS_START + 0x45) +#define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC (FLAG_HIDDEN_ITEMS_START + 0x46) +#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_121_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x49) +#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x64) +#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL (FLAG_HIDDEN_ITEMS_START + 0x07) +#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x29) +#define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x4A) +#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x63) +#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6E) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x5C) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E) -#define FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 0x414 -#define FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL 0x415 -#define FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE 0x416 -#define FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP 0x417 -#define FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL 0x418 -#define FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER 0x419 -#define FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE 0x41A -#define FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL 0x41B -#define FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE 0x41C -#define FLAG_ITEM_GRANITE_CAVE_B2F_REPEL 0x41D -#define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY 0x41E -#define FLAG_ITEM_PETALBURG_WOODS_X_ATTACK 0x41F -#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL 0x420 -#define FLAG_ITEM_ROUTE_104_POKE_BALL 0x421 -#define FLAG_ITEM_PETALBURG_WOODS_ETHER 0x422 -#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE 0x423 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL 0x424 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL 0x425 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL 0x426 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL 0x427 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL 0x428 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL 0x429 -#define FLAG_ITEM_ROUTE_124_YELLOW_SHARD 0x42A -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL 0x42B -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL 0x42C -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL 0x42D -#define FLAG_ITEM_JAGGED_PASS_BURN_HEAL 0x42E -#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR 0x42F -#define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL 0x430 -#define FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION 0x431 -#define FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 0x432 -#define FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL 0x433 -#define FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE 0x434 +// Event Flags +#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC +#define FLAG_HIDE_APPRENTICE 0x2BD +#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE +#define FLAG_HIDE_UNION_ROOM_PLAYER_1 0x2BF +#define FLAG_HIDE_UNION_ROOM_PLAYER_2 0x2C0 +#define FLAG_HIDE_UNION_ROOM_PLAYER_3 0x2C1 +#define FLAG_HIDE_UNION_ROOM_PLAYER_4 0x2C2 +#define FLAG_HIDE_UNION_ROOM_PLAYER_5 0x2C3 +#define FLAG_HIDE_UNION_ROOM_PLAYER_6 0x2C4 +#define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x2C5 +#define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x2C6 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 0x2C7 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 0x2C8 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 0x2C9 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 0x2CA +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 0x2CB +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 0x2CC +#define FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS 0x2CD +#define FLAG_HIDE_MEW 0x2CE +#define FLAG_HIDE_ROUTE_104_RIVAL 0x2CF +#define FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE 0x2D0 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 0x2D1 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM 0x2D2 +#define FLAG_HIDE_ROUTE_103_RIVAL 0x2D3 +#define FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE 0x2D4 +#define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT 0x2D5 +#define FLAG_HIDE_PETALBURG_CITY_WALLY 0x2D6 +#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY 0x2D7 +#define FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT 0x2D8 +#define FLAG_UNUSED_0x2D9 0x2D9 +#define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER 0x2DA +#define FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT 0x2DB +#define FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 0x2DC +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 0x2DD +#define FLAG_HIDE_PLAYERS_HOUSE_DAD 0x2DE +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING 0x2DF +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING 0x2E0 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY 0x2E1 +#define FLAG_HIDE_ROUTE_104_MR_BRINEY 0x2E2 +#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 +#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 +#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5 +#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6 +#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 +#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN 0x2E9 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN 0x2EA +#define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION 0x2EB +#define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC +#define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED +#define FLAG_HIDE_ROUTE_101_ZIGZAGOON 0x2EE +#define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY 0x2EF +#define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE 0x2F0 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN 0x2F1 +#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 0x2F2 +#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 0x2F3 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA 0x2F4 +#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM 0x2F5 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM 0x2F6 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM 0x2F7 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM 0x2F8 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK 0x2F9 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK 0x2FA +#define FLAG_HIDE_DEOXYS 0x2FB +#define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC +#define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD +#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE +#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF +#define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 +#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 +#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 +#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 +#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304 +#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 +#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 0x308 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 0x309 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 0x30A +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 0x30B +#define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS 0x30C +#define FLAG_HIDE_PETALBURG_GYM_GREETER 0x30D +#define FLAG_HIDE_MARINE_CAVE_KYOGRE 0x30E +#define FLAG_HIDE_TERRA_CAVE_GROUDON 0x30F +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311 +#define FLAG_HIDE_ROUTE_119_SCOTT 0x312 +#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 +#define FLAG_HIDE_MOSSDEEP_CITY_SCOTT 0x314 +#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 +#define FLAG_HIDE_FANCLUB_BOY 0x316 +#define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317 +#define FLAG_HIDE_FANCLUB_LADY 0x318 +#define FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT 0x319 +#define FLAG_HIDE_LITTLEROOT_TOWN_RIVAL 0x31A +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH 0x31B +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 0x31C +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 0x31D +#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 0x31E +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 0x31F +#define FLAG_HIDE_LUGIA 0x320 +#define FLAG_HIDE_HOOH 0x321 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 +#define FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER 0x323 +#define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 +#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326 +#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN 0x328 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE 0x329 +#define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT 0x32A +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C +#define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D +#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F +#define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE 0x330 +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL 0x332 +#define FLAG_HIDE_ROUTE_112_TEAM_MAGMA 0x333 +#define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE 0x334 +#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE 0x335 +#define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 +#define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 +#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 +#define FLAG_UNUSED_0x339 0x339 +#define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE 0x33A +#define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE 0x33B +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D +#define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 +#define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 +#define FLAG_HIDE_ROUTE_128_STEVEN 0x342 +#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 +#define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 +#define FLAG_HIDE_ROUTE_110_BIRCH 0x345 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 +#define FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 0x347 +#define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN 0x348 +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN 0x349 +#define FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO 0x34A +#define FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY 0x34B +#define FLAG_HIDE_RUSTBORO_CITY_SCIENTIST 0x34C +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT 0x34D +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE 0x34E +#define FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD 0x34F +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW 0x350 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL 0x351 +#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 0x352 +#define FLAG_HIDE_ROUTE_119_RIVAL 0x353 +#define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 +#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 +#define FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS 0x356 +#define FLAG_HIDE_SKY_PILLAR_WALLACE 0x357 +#define FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE 0x358 +#define FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS 0x359 +#define FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY 0x35A +#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 0x35B +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL 0x35C +#define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL 0x35D +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA 0x35E +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN 0x35F +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 0x360 +#define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 0x361 +#define FLAG_HIDE_PETALBURG_GYM_WALLY 0x362 +#define FLAG_UNKNOWN_0x363 0x363 +#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 +#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY 0x365 +#define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 +#define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 +#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 +#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A +#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL 0x36B +#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C +#define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D +#define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E +#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN 0x36F +#define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 +#define FLAG_HIDE_BRINEYS_HOUSE_PEEKO 0x371 +#define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS 0x373 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 0x374 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 0x375 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE 0x376 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN 0x377 +#define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL 0x379 +#define FLAG_HIDE_ROUTE_119_TEAM_AQUA 0x37A +#define FLAG_HIDE_ROUTE_116_MR_BRINEY 0x37B +#define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS 0x37C +#define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS 0x37D +#define FLAG_HIDE_ROUTE_116_TUNNELER 0x37E +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 0x380 +#define FLAG_HIDE_ROUTE_101_BIRCH 0x381 +#define FLAG_HIDE_ROUTE_103_BIRCH 0x382 +#define FLAG_HIDE_TRICK_HOUSE_END_MAN 0x383 +#define FLAG_HIDE_ROUTE_110_TEAM_AQUA 0x384 +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 0x385 +#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 0x386 +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 0x387 +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 0x388 +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS 0x389 +#define FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST 0x38A +#define FLAG_HIDE_FALLARBOR_AZURILL 0x38B +#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT 0x38C +#define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR 0x38D +#define FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE 0x38E +#define FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON 0x38F +#define FLAG_HIDE_MAUVILLE_CITY_WATTSON 0x390 +#define FLAG_HIDE_MAUVILLE_GYM_WATTSON 0x391 +#define FLAG_0x392 0x392 +#define FLAG_0x393 0x393 +#define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE 0x394 +#define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA 0x395 +#define FLAG_HIDE_BATTLE_TOWER_REPORTER 0x396 +#define FLAG_HIDE_ROUTE_110_RIVAL_1 0x397 +#define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 +#define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 +#define FLAG_HIDE_ROUTE_110_RIVAL_2 0x39A +#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B +#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C +#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D +#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E +#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F +#define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO 0x3A0 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 +#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 +#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 +#define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 +#define FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL 0x3A6 +#define FLAG_HIDE_REGIROCK 0x3A7 +#define FLAG_HIDE_REGICE 0x3A8 +#define FLAG_HIDE_REGISTEEL 0x3A9 +#define FLAG_HIDE_METEOR_FALLS_TEAM_AQUA 0x3AA +#define FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA 0x3AB +#define FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN 0x3AC +#define FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT 0x3AD +#define FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO 0x3AE +#define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW 0x3AF +#define FLAG_HIDE_ROUTE_128_ARCHIE 0x3B0 +#define FLAG_HIDE_ROUTE_128_MAXIE 0x3B1 +#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS 0x3B2 +#define FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE 0x3B3 +#define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 +#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 +#define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY 0x3B6 +#define FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER 0x3B7 +#define FLAG_0x3B8 0x3B8 +#define FLAG_0x3B9 0x3B9 +#define FLAG_0x3BA 0x3BA +#define FLAG_0x3BB 0x3BB +#define FLAG_0x3BC 0x3BC +#define FLAG_0x3BD 0x3BD +#define FLAG_0x3BE 0x3BE +#define FLAG_0x3BF 0x3BF +#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN 0x3C0 +#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION 0x3C1 +#define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN 0x3C2 +#define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL 0x3C3 +#define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL 0x3C4 +#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 +#define FLAG_HIDE_ROUTE_118_STEVEN 0x3C6 +#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7 +#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8 +#define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9 +#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3CA +#define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB +#define FLAG_0x3CC 0x3CC +#define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN 0x3CD +#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 0x3CE +#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 0x3CF +#define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 0x3D0 +#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 0x3D1 +#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 +#define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3 +#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 +#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5 +#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6 +#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 +#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9 +#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA +#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB +#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC +#define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD +#define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE +#define FLAG_HIDE_ROUTE_101_BOY 0x3DF +#define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M 0x3E0 +#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY 0x3E1 +#define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY 0x3E2 +#define FLAG_HIDE_PETALBURG_CITY_SCOTT 0x3E3 +#define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA 0x3E4 +#define FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE 0x3E5 +#define FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON 0x3E6 +#define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT 0x3E7 + +// Item Ball Flags +#define FLAG_ITEM_ROUTE_102_POTION 0x3E8 +#define FLAG_ITEM_ROUTE_116_X_SPECIAL 0x3E9 +#define FLAG_ITEM_ROUTE_104_PP_UP 0x3EA +#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_DIRE_HIT 0x3EF +#define FLAG_ITEM_ROUTE_111_TM_37 0x3F0 +#define FLAG_ITEM_ROUTE_111_STARDUST 0x3F1 +#define FLAG_ITEM_ROUTE_111_HP_UP 0x3F2 +#define FLAG_ITEM_ROUTE_112_NUGGET 0x3F3 +#define FLAG_ITEM_ROUTE_113_MAX_ETHER 0x3F4 +#define FLAG_ITEM_ROUTE_113_SUPER_REPEL 0x3F5 +#define FLAG_ITEM_ROUTE_114_RARE_CANDY 0x3F6 +#define FLAG_ITEM_ROUTE_114_PROTEIN 0x3F7 +#define FLAG_ITEM_ROUTE_115_SUPER_POTION 0x3F8 +#define FLAG_ITEM_ROUTE_115_TM_01 0x3F9 +#define FLAG_ITEM_ROUTE_115_IRON 0x3FA +#define FLAG_ITEM_ROUTE_116_ETHER 0x3FB +#define FLAG_ITEM_ROUTE_116_REPEL 0x3FC +#define FLAG_ITEM_ROUTE_116_HP_UP 0x3FD +#define FLAG_ITEM_ROUTE_117_GREAT_BALL 0x3FE +#define FLAG_ITEM_ROUTE_117_REVIVE 0x3FF +#define FLAG_ITEM_ROUTE_119_SUPER_REPEL 0x400 +#define FLAG_ITEM_ROUTE_119_ZINC 0x401 +#define FLAG_ITEM_ROUTE_119_ELIXIR_1 0x402 +#define FLAG_ITEM_ROUTE_119_LEAF_STONE 0x403 +#define FLAG_ITEM_ROUTE_119_RARE_CANDY 0x404 +#define FLAG_ITEM_ROUTE_119_HYPER_POTION_1 0x405 +#define FLAG_ITEM_ROUTE_120_NUGGET 0x406 +#define FLAG_ITEM_ROUTE_120_FULL_HEAL 0x407 +#define FLAG_ITEM_ROUTE_123_CALCIUM 0x408 +#define FLAG_UNUSED_0x409 0x409 +#define FLAG_ITEM_ROUTE_127_ZINC 0x40A +#define FLAG_ITEM_ROUTE_127_CARBOS 0x40B +#define FLAG_ITEM_ROUTE_132_RARE_CANDY 0x40C +#define FLAG_ITEM_ROUTE_133_BIG_PEARL 0x40D +#define FLAG_ITEM_ROUTE_133_STAR_PIECE 0x40E +#define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE 0x40F +#define FLAG_ITEM_PETALBURG_CITY_ETHER 0x410 +#define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND 0x411 +#define FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL 0x412 +#define FLAG_ITEM_MOSSDEEP_CITY_NET_BALL 0x413 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 0x414 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL 0x415 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE 0x416 +#define FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP 0x417 +#define FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL 0x418 +#define FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER 0x419 +#define FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE 0x41A +#define FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL 0x41B +#define FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE 0x41C +#define FLAG_ITEM_GRANITE_CAVE_B2F_REPEL 0x41D +#define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY 0x41E +#define FLAG_ITEM_PETALBURG_WOODS_X_ATTACK 0x41F +#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL 0x420 +#define FLAG_ITEM_ROUTE_104_POKE_BALL 0x421 +#define FLAG_ITEM_PETALBURG_WOODS_ETHER 0x422 +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE 0x423 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL 0x424 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL 0x425 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL 0x426 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL 0x427 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL 0x428 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL 0x429 +#define FLAG_ITEM_ROUTE_124_YELLOW_SHARD 0x42A +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL 0x42B +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL 0x42C +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL 0x42D +#define FLAG_ITEM_JAGGED_PASS_BURN_HEAL 0x42E +#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR 0x42F +#define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL 0x430 +#define FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION 0x431 +#define FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 0x432 +#define FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL 0x433 +#define FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE 0x434 +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER 0x436 +#define FLAG_ITEM_SCORCHED_SLAB_TM_11 0x437 +#define FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 0x438 +#define FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL 0x439 +#define FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY 0x43A +#define FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL 0x43B +#define FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR 0x43C +#define FLAG_ITEM_VICTORY_ROAD_1F_PP_UP 0x43D +#define FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 0x43E +#define FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE 0x43F +#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL 0x440 +#define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441 +#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442 +#define FLAG_ITEM_FIERY_PATH_TM06 0x443 +#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444 +#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445 +#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B +#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E +#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F +#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450 +#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451 +#define FLAG_ITEM_ROUTE_119_HYPER_POTION_2 0x452 +#define FLAG_ITEM_ROUTE_120_HYPER_POTION 0x453 +#define FLAG_ITEM_ROUTE_120_NEST_BALL 0x454 +#define FLAG_ITEM_ROUTE_123_ELIXIR 0x455 +#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE 0x456 +#define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 +#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 0x458 +#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE 0x459 +#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_ROUTE_115_GREAT_BALL 0x45E +#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM 0x45F +#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL 0x460 +#define FLAG_ITEM_ROUTE_118_HYPER_POTION 0x461 +#define FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL 0x462 +#define FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL 0x463 +#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL 0x464 +#define FLAG_UNUSED_0x465 0x465 +#define FLAG_UNUSED_0x466 0x466 +#define FLAG_UNUSED_0x467 0x467 +#define FLAG_UNUSED_0x468 0x468 +#define FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL 0x469 +#define FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE 0x46A +#define FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE 0x46B +#define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET 0x46C +#define FLAG_UNUSED_0x46D 0x46D +#define FLAG_ITEM_ROUTE_119_NUGGET 0x46E +#define FLAG_ITEM_ROUTE_104_POTION 0x46F +#define FLAG_UNUSED_0x470 0x470 +#define FLAG_ITEM_ROUTE_103_PP_UP 0x471 +#define FLAG_UNUSED_0x472 0x472 +#define FLAG_ITEM_ROUTE_108_STAR_PIECE 0x473 +#define FLAG_0x474 0x474 +#define FLAG_ITEM_ROUTE_110_ELIXIR 0x475 +#define FLAG_ITEM_ROUTE_111_ELIXIR 0x476 +#define FLAG_ITEM_ROUTE_113_HYPER_POTION 0x477 +#define FLAG_ITEM_ROUTE_115_HEAL_POWDER 0x478 +#define FLAG_UNUSED_0x479 0x479 +#define FLAG_ITEM_ROUTE_116_POTION 0x47A +#define FLAG_ITEM_ROUTE_119_ELIXIR_2 0x47B +#define FLAG_ITEM_ROUTE_120_REVIVE 0x47C +#define FLAG_ITEM_ROUTE_121_REVIVE 0x47D +#define FLAG_ITEM_ROUTE_121_ZINC 0x47E +#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY 0x47F +#define FLAG_ITEM_ROUTE_123_PP_UP 0x480 +#define FLAG_ITEM_ROUTE_123_REVIVAL_HERB 0x481 +#define FLAG_ITEM_ROUTE_125_BIG_PEARL 0x482 +#define FLAG_ITEM_ROUTE_127_RARE_CANDY 0x483 +#define FLAG_ITEM_ROUTE_132_PROTEIN 0x484 +#define FLAG_ITEM_ROUTE_133_MAX_REVIVE 0x485 +#define FLAG_ITEM_ROUTE_134_CARBOS 0x486 +#define FLAG_ITEM_ROUTE_134_STAR_PIECE 0x487 +#define FLAG_ITEM_ROUTE_114_ENERGY_POWDER 0x488 +#define FLAG_ITEM_ROUTE_115_PP_UP 0x489 +#define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A +#define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B +#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR 0x48C +#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE 0x48D +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET 0x48E +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX 0x48F +#define FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE 0x490 +#define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET 0x491 +#define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL 0x492 -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER 0x436 -#define FLAG_ITEM_SCORCHED_SLAB_TM_11 0x437 -#define FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 0x438 -#define FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL 0x439 -#define FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY 0x43A -#define FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL 0x43B -#define FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR 0x43C -#define FLAG_ITEM_VICTORY_ROAD_1F_PP_UP 0x43D -#define FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 0x43E -#define FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE 0x43F -#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL 0x440 -#define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441 -#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442 -#define FLAG_ITEM_FIERY_PATH_TM06 0x443 -#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444 -#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445 -#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B -#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E -#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F -#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450 -#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451 -#define FLAG_ITEM_ROUTE_119_HYPER_POTION_2 0x452 -#define FLAG_ITEM_ROUTE_120_HYPER_POTION 0x453 -#define FLAG_ITEM_ROUTE_120_NEST_BALL 0x454 -#define FLAG_ITEM_ROUTE_123_ELIXIR 0x455 -#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE 0x456 -#define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 -#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 0x458 -#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE 0x459 -#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_ROUTE_115_GREAT_BALL 0x45E -#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM 0x45F -#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL 0x460 -#define FLAG_ITEM_ROUTE_118_HYPER_POTION 0x461 -#define FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL 0x462 -#define FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL 0x463 -#define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL 0x464 -#define FLAG_0x465 0x465 -#define FLAG_0x466 0x466 -#define FLAG_0x467 0x467 -#define FLAG_0x468 0x468 -#define FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL 0x469 -#define FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE 0x46A -#define FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE 0x46B -#define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET 0x46C -#define FLAG_0x46D 0x46D -#define FLAG_ITEM_ROUTE_119_NUGGET 0x46E -#define FLAG_ITEM_ROUTE_104_POTION 0x46F -#define FLAG_0x470 0x470 -#define FLAG_ITEM_ROUTE_103_PP_UP 0x471 -#define FLAG_0x472 0x472 -#define FLAG_ITEM_ROUTE_108_STAR_PIECE 0x473 -#define FLAG_0x474 0x474 -#define FLAG_ITEM_ROUTE_110_ELIXIR 0x475 -#define FLAG_ITEM_ROUTE_111_ELIXIR 0x476 -#define FLAG_ITEM_ROUTE_113_HYPER_POTION 0x477 -#define FLAG_ITEM_ROUTE_115_HEAL_POWDER 0x478 -#define FLAG_0x479 0x479 -#define FLAG_ITEM_ROUTE_116_POTION 0x47A -#define FLAG_ITEM_ROUTE_119_ELIXIR_2 0x47B -#define FLAG_ITEM_ROUTE_120_REVIVE 0x47C -#define FLAG_ITEM_ROUTE_121_REVIVE 0x47D -#define FLAG_ITEM_ROUTE_121_ZINC 0x47E -#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY 0x47F -#define FLAG_ITEM_ROUTE_123_PP_UP 0x480 -#define FLAG_ITEM_ROUTE_123_REVIVAL_HERB 0x481 -#define FLAG_ITEM_ROUTE_125_BIG_PEARL 0x482 -#define FLAG_ITEM_ROUTE_127_RARE_CANDY 0x483 -#define FLAG_ITEM_ROUTE_132_PROTEIN 0x484 -#define FLAG_ITEM_ROUTE_133_MAX_REVIVE 0x485 -#define FLAG_ITEM_ROUTE_134_CARBOS 0x486 -#define FLAG_ITEM_ROUTE_134_STAR_PIECE 0x487 -#define FLAG_ITEM_ROUTE_114_ENERGY_POWDER 0x488 -#define FLAG_ITEM_ROUTE_115_PP_UP 0x489 -#define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A -#define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B -#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR 0x48C -#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE 0x48D -#define FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET 0x48E -#define FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX 0x48F -#define FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE 0x490 -#define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET 0x491 -#define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL 0x492 #define FLAG_0x493 0x493 #define FLAG_0x494 0x494 -- cgit v1.2.3 From 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 15:57:19 -0400 Subject: use sound panning constants in battle_anim_scripts --- include/battle_anim.h | 3 --- include/constants/battle_anim.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index f690cf10c..3d27e0d25 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -31,9 +31,6 @@ struct BattleAnimBackground #define ANIM_ARGS_COUNT 8 -#define PAN_SIDE_PLAYER -64 -#define PAN_SIDE_OPPONENT 63 - extern void (*gAnimScriptCallback)(void); extern bool8 gAnimScriptActive; extern u8 gAnimVisualTaskCount; diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 270ac55e0..93ae70f94 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -7,6 +7,20 @@ #define ANIM_ATK_PARTNER 2 #define ANIM_DEF_PARTNER 3 +// stereo panning constants [0-255] +// +// 0 +// . . +// . . +// 192 . . 63 +// . . +// . . +// . . +// 127 +// +#define SOUND_PAN_ATTACKER -64 +#define SOUND_PAN_TARGET 63 + // move background ids #define BG_DARK_ 0 // the same as BG_DARK but is unused #define BG_DARK 1 -- cgit v1.2.3 From f4e55999a5282dc1d2b94e0ca14081de6aae93ba Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 20 Oct 2018 00:33:51 +0200 Subject: begin porting and decomping battle tower --- include/battle_tower.h | 6 +++++- include/global.h | 29 ++++++----------------------- 2 files changed, 11 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 5879a73bb..6af87210b 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,6 +1,10 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H +#define BATTLE_TOWER_EREADER_TRAINER_ID 200 +#define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 +#define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 + struct RSBattleTowerRecord { /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 @@ -46,7 +50,7 @@ struct FacilityMon extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; -u16 sub_8164FCC(u8, u8); +u16 GetCurrentBattleTowerWinStreak(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); diff --git a/include/global.h b/include/global.h index b92f1097f..35e34e722 100644 --- a/include/global.h +++ b/include/global.h @@ -275,26 +275,6 @@ struct BerryCrush u32 unk; }; -struct UnknownSaveBlock2Struct -{ - u8 field_0; - u8 field_1; - u8 field_2[2]; - u8 field_4[8]; - u8 field_C[16]; - u16 field_1C[6]; - u16 field_28[6]; - u8 field_34[176]; - u8 field_E4; - u8 field_E5; - u8 field_E6; - u8 field_E7; - u8 field_E8; - u8 field_E9; - u8 field_EA; - u8 field_EB; -}; // sizeof = 0xEC - struct ApprenticeMon { u16 species; @@ -345,7 +325,7 @@ struct UnknownPokemonStruct struct EmeraldBattleTowerRecord { - /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 + /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 /*0x01*/ u8 trainerClass; /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; @@ -387,7 +367,7 @@ struct BattleDomeTrainer struct BattleFrontier { /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; - /*0x738*/ struct UnknownSaveBlock2Struct field_738[5]; // No idea here, it's probably wrong, no clue. + /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // No idea here, it's probably wrong, no clue. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; @@ -415,7 +395,10 @@ struct BattleFrontier /*0xCF0*/ u16 field_CF0[2]; /*0xCF4*/ u16 field_CF4[2]; /*0xCF8*/ u16 field_CF8[2]; - /*0xCFC*/ u16 field_CFC[5]; + /*0xCFC*/ u16 field_CFC[2]; + /*0xD06*/ u16 field_D00; + /*0xD06*/ u16 field_D02; + /*0xD06*/ u16 field_D04; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; /*0xD08*/ u8 field_D08_0:1; -- cgit v1.2.3 From 7a072d4527387cf21a019142caf67ce516be861d Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sat, 20 Oct 2018 21:01:45 +0100 Subject: Continue synchronising --- include/event_object_movement.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 98395593b..0fabcf95a 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -162,9 +162,7 @@ u8 ZCoordToPriority(u8); void EventObjectUpdateZCoord(struct EventObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); -void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); void UnfreezeEventObject(struct EventObject *); -void oamt_npc_ministep_reset(struct Sprite *, u8, u8); u8 FindLockedEventObjectIndex(struct EventObject *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); -- cgit v1.2.3 From 16026fe91d5628f138be434841ae764534946b2c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 21 Oct 2018 00:06:42 +0200 Subject: More battle tower. --- include/battle_frontier_2.h | 1 + include/battle_tower.h | 24 +++++++++++++----------- include/global.h | 32 ++++++++++++++++++++------------ 3 files changed, 34 insertions(+), 23 deletions(-) (limited to 'include') diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 573053f10..3bd605829 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -14,5 +14,6 @@ bool8 InBattlePike(void); void sub_81AA078(u16*, u8); void sub_81A4C30(void); bool8 sub_81A6BF4(void); +u8 sub_81A6CA8(u8, u8); #endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/battle_tower.h b/include/battle_tower.h index 6af87210b..f79fbb8c4 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,9 +1,9 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H -#define BATTLE_TOWER_EREADER_TRAINER_ID 200 #define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 #define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 +#define BATTLE_TOWER_EREADER_TRAINER_ID 500 struct RSBattleTowerRecord { @@ -12,9 +12,7 @@ struct RSBattleTowerRecord /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; - /*0x10*/ struct { - u16 easyChat[6]; - } greeting; + /*0x10*/ u16 greeting[6]; /*0x1C*/ struct UnknownPokemonStruct party[3]; /*0xA0*/ u32 checksum; /*0xA4*/ u16 unk_11c8; @@ -26,16 +24,15 @@ union BattleTowerRecord struct EmeraldBattleTowerRecord emerald; }; -#define FRONTIER_TRAINER_NAME_LENGTH 7 - struct BattleFrontierTrainer { - u32 facilityClass; - u8 trainerName[FRONTIER_TRAINER_NAME_LENGTH + 1]; + u8 facilityClass; + u8 filler1[3]; + u8 trainerName[PLAYER_NAME_LENGTH + 1]; u16 speechBefore[6]; u16 speechWin[6]; u16 speechLose[6]; - const u16 *btMonPool; + const u16 *bfMonPool; }; struct FacilityMon @@ -47,6 +44,11 @@ struct FacilityMon u8 nature; }; +extern const u8 gTowerMaleFacilityClasses[30]; +extern const u8 gTowerMaleTrainerGfxIds[30]; +extern const u8 gTowerFemaleFacilityClasses[20]; +extern const u8 gTowerFemaleTrainerGfxIds[20]; + extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; @@ -54,8 +56,8 @@ u16 GetCurrentBattleTowerWinStreak(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); -void sub_81628A0(union BattleTowerRecord *); -void sub_8162614(u16 trainerId, u8); +void PutNewBattleTowerRecord(union BattleTowerRecord *); +void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); void ConvertBattleFrontierTrainerSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); diff --git a/include/global.h b/include/global.h index 35e34e722..ef5a944d0 100644 --- a/include/global.h +++ b/include/global.h @@ -326,19 +326,31 @@ struct UnknownPokemonStruct struct EmeraldBattleTowerRecord { /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 - /*0x01*/ u8 trainerClass; + /*0x01*/ u8 facilityClass; /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; - /*0x10*/ struct { - u16 easyChat[6]; - } greeting; + /*0x10*/ u16 greeting[6]; /*0x1C*/ u8 filler_1c[0x18]; /*0x34*/ struct UnknownPokemonStruct party[4]; /*0xE4*/ u8 language; /*0xE8*/ u32 checksum; }; +struct BattleTowerEReaderTrainer +{ + /*0x00*/ u8 unk0; + /*0x01*/ u8 facilityClass; + /*0x02*/ u16 winStreak; + /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; + /*0x0C*/ u8 trainerId[4]; + /*0x10*/ u16 greeting[6]; + /*0x1C*/ u16 farewellPlayerLost[6]; + /*0x28*/ u16 farewellPlayerWon[6]; + /*0x34*/ struct UnknownPokemonStruct party[3]; + /*0xB8*/ u32 checksum; +}; + struct FrontierMonData { u16 moves[4]; @@ -367,17 +379,13 @@ struct BattleDomeTrainer struct BattleFrontier { /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; - /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // No idea here, it's probably wrong, no clue. + /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // From record mixing. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; /*0xBE3*/ u8 field_BE3[8]; /*0xBEB*/ u8 field_BEB; - /*0xBEC*/ u8 filler_BEC[16]; - /*0xBFC*/ u16 ecwords_BFC[6]; - /*0xC08*/ u16 ecwords_C08[6]; - /*0xC14*/ u16 ecwords_C14[6]; - /*0xC20*/ u8 filler_C20[0x88]; + /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer; /*0xCA8*/ u8 field_CA8; /*0xCA9*/ u8 lvlMode:2; // 0x1, 0x2 -> 0x3 /*0xCA9*/ u8 field_CA9_a:1; // 0x4 @@ -388,8 +396,8 @@ struct BattleFrontier /*0xCA9*/ u8 field_CA9_f:1; // 0x80 /*0xCAA*/ u16 field_CAA[3]; /*0xCB0*/ u16 field_CB0; - /*0xCB2*/ u16 field_CB2; - /*0xCB4*/ u16 field_CB4[20]; + /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. + /*0xCB4*/ u16 battledTrainerIds[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 field_CE0[4][2]; /*0xCF0*/ u16 field_CF0[2]; -- cgit v1.2.3 From 97bbb326b8c94e0fc90bceb4e5dea1b80f86822f Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 20 Oct 2018 19:53:41 -0500 Subject: GameClear nonsense --- include/load_save.h | 2 +- include/script_pokemon_util_80F87D8.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/load_save.h b/include/load_save.h index 5fb5f6c42..b8b27ade5 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -17,7 +17,7 @@ void SetSaveBlocksPointers(u16 offset); void MoveSaveBlocks_ResetHeap(void); u32 GetSecretBase2Field_9(void); void ClearSecretBase2Field_9(void); -void sub_8076D48(void); +void SetSecretBase2Field_9(void); void sub_8076D5C(void); void sav2_gender2_inplace_and_xFE(void); void SavePlayerParty(void); diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h index 68aec7eb6..7c2a1ff66 100644 --- a/include/script_pokemon_util_80F87D8.h +++ b/include/script_pokemon_util_80F87D8.h @@ -4,5 +4,6 @@ u16 sub_80F903C(void); void ReducePlayerPartyToThree(void); +void HealPlayerParty(void); #endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H -- cgit v1.2.3 From 8e7202ec3d289305190aedc66d02435571747a76 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Oct 2018 02:24:57 -0500 Subject: Fix LZ compressed data alignment --- include/gba/syscall.h | 4 +- include/graphics.h | 6272 +++++++++++++++++++++++----------------------- include/pokemon.h | 4 +- include/sprite.h | 8 +- include/starter_choose.h | 6 +- include/window.h | 2 +- 6 files changed, 3181 insertions(+), 3115 deletions(-) (limited to 'include') diff --git a/include/gba/syscall.h b/include/gba/syscall.h index deddec5ba..f3382b874 100644 --- a/include/gba/syscall.h +++ b/include/gba/syscall.h @@ -35,9 +35,9 @@ void BgAffineSet(struct BgAffineSrcData *src, struct BgAffineDstData *dest, s32 void ObjAffineSet(struct ObjAffineSrcData *src, void *dest, s32 count, s32 offset); -void LZ77UnCompWram(const void *src, void *dest); +void LZ77UnCompWram(const u32 *src, void *dest); -void LZ77UnCompVram(const void *src, void *dest); +void LZ77UnCompVram(const u32 *src, void *dest); void RLUnCompWram(const void *src, void *dest); diff --git a/include/graphics.h b/include/graphics.h index 07900977d..8c29dc57c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -6,3055 +6,3055 @@ extern const u32 gMessageBox_Gfx[]; extern const u16 gMessageBox_Pal[]; // interface pokeballs -extern const u8 gInterfaceGfx_PokeBall[]; -extern const u8 gInterfacePal_PokeBall[]; -extern const u8 gInterfaceGfx_GreatBall[]; -extern const u8 gInterfacePal_GreatBall[]; -extern const u8 gInterfaceGfx_SafariBall[]; -extern const u8 gInterfacePal_SafariBall[]; -extern const u8 gInterfaceGfx_UltraBall[]; -extern const u8 gInterfacePal_UltraBall[]; -extern const u8 gInterfaceGfx_MasterBall[]; -extern const u8 gInterfacePal_MasterBall[]; -extern const u8 gInterfaceGfx_NetBall[]; -extern const u8 gInterfacePal_NetBall[]; -extern const u8 gInterfaceGfx_DiveBall[]; -extern const u8 gInterfacePal_DiveBall[]; -extern const u8 gInterfaceGfx_NestBall[]; -extern const u8 gInterfacePal_NestBall[]; -extern const u8 gInterfaceGfx_RepeatBall[]; -extern const u8 gInterfacePal_RepeatBall[]; -extern const u8 gInterfaceGfx_TimerBall[]; -extern const u8 gInterfacePal_TimerBall[]; -extern const u8 gInterfaceGfx_LuxuryBall[]; -extern const u8 gInterfacePal_LuxuryBall[]; -extern const u8 gInterfaceGfx_PremierBall[]; -extern const u8 gInterfacePal_PremierBall[]; -extern const u8 gOpenPokeballGfx[]; +extern const u32 gInterfaceGfx_PokeBall[]; +extern const u32 gInterfacePal_PokeBall[]; +extern const u32 gInterfaceGfx_GreatBall[]; +extern const u32 gInterfacePal_GreatBall[]; +extern const u32 gInterfaceGfx_SafariBall[]; +extern const u32 gInterfacePal_SafariBall[]; +extern const u32 gInterfaceGfx_UltraBall[]; +extern const u32 gInterfacePal_UltraBall[]; +extern const u32 gInterfaceGfx_MasterBall[]; +extern const u32 gInterfacePal_MasterBall[]; +extern const u32 gInterfaceGfx_NetBall[]; +extern const u32 gInterfacePal_NetBall[]; +extern const u32 gInterfaceGfx_DiveBall[]; +extern const u32 gInterfacePal_DiveBall[]; +extern const u32 gInterfaceGfx_NestBall[]; +extern const u32 gInterfacePal_NestBall[]; +extern const u32 gInterfaceGfx_RepeatBall[]; +extern const u32 gInterfacePal_RepeatBall[]; +extern const u32 gInterfaceGfx_TimerBall[]; +extern const u32 gInterfacePal_TimerBall[]; +extern const u32 gInterfaceGfx_LuxuryBall[]; +extern const u32 gInterfacePal_LuxuryBall[]; +extern const u32 gInterfaceGfx_PremierBall[]; +extern const u32 gInterfacePal_PremierBall[]; +extern const u32 gOpenPokeballGfx[]; // pokemon gfx -extern const u8 gMonFrontPic_Bulbasaur[]; -extern const u8 gMonPalette_Bulbasaur[]; -extern const u8 gMonBackPic_Bulbasaur[]; -extern const u8 gMonShinyPalette_Bulbasaur[]; -extern const u8 gMonStillFrontPic_Bulbasaur[]; +extern const u32 gMonFrontPic_Bulbasaur[]; +extern const u32 gMonPalette_Bulbasaur[]; +extern const u32 gMonBackPic_Bulbasaur[]; +extern const u32 gMonShinyPalette_Bulbasaur[]; +extern const u32 gMonStillFrontPic_Bulbasaur[]; extern const u8 gMonIcon_Bulbasaur[]; extern const u8 gMonFootprint_Bulbasaur[]; -extern const u8 gMonFrontPic_Ivysaur[]; -extern const u8 gMonPalette_Ivysaur[]; -extern const u8 gMonBackPic_Ivysaur[]; -extern const u8 gMonShinyPalette_Ivysaur[]; -extern const u8 gMonStillFrontPic_Ivysaur[]; +extern const u32 gMonFrontPic_Ivysaur[]; +extern const u32 gMonPalette_Ivysaur[]; +extern const u32 gMonBackPic_Ivysaur[]; +extern const u32 gMonShinyPalette_Ivysaur[]; +extern const u32 gMonStillFrontPic_Ivysaur[]; extern const u8 gMonIcon_Ivysaur[]; extern const u8 gMonFootprint_Ivysaur[]; -extern const u8 gMonFrontPic_Venusaur[]; -extern const u8 gMonPalette_Venusaur[]; -extern const u8 gMonBackPic_Venusaur[]; -extern const u8 gMonShinyPalette_Venusaur[]; -extern const u8 gMonStillFrontPic_Venusaur[]; +extern const u32 gMonFrontPic_Venusaur[]; +extern const u32 gMonPalette_Venusaur[]; +extern const u32 gMonBackPic_Venusaur[]; +extern const u32 gMonShinyPalette_Venusaur[]; +extern const u32 gMonStillFrontPic_Venusaur[]; extern const u8 gMonIcon_Venusaur[]; extern const u8 gMonFootprint_Venusaur[]; -extern const u8 gMonFrontPic_Charmander[]; -extern const u8 gMonPalette_Charmander[]; -extern const u8 gMonBackPic_Charmander[]; -extern const u8 gMonShinyPalette_Charmander[]; -extern const u8 gMonStillFrontPic_Charmander[]; +extern const u32 gMonFrontPic_Charmander[]; +extern const u32 gMonPalette_Charmander[]; +extern const u32 gMonBackPic_Charmander[]; +extern const u32 gMonShinyPalette_Charmander[]; +extern const u32 gMonStillFrontPic_Charmander[]; extern const u8 gMonIcon_Charmander[]; extern const u8 gMonFootprint_Charmander[]; -extern const u8 gMonFrontPic_Charmeleon[]; -extern const u8 gMonPalette_Charmeleon[]; -extern const u8 gMonBackPic_Charmeleon[]; -extern const u8 gMonShinyPalette_Charmeleon[]; -extern const u8 gMonStillFrontPic_Charmeleon[]; +extern const u32 gMonFrontPic_Charmeleon[]; +extern const u32 gMonPalette_Charmeleon[]; +extern const u32 gMonBackPic_Charmeleon[]; +extern const u32 gMonShinyPalette_Charmeleon[]; +extern const u32 gMonStillFrontPic_Charmeleon[]; extern const u8 gMonIcon_Charmeleon[]; extern const u8 gMonFootprint_Charmeleon[]; -extern const u8 gMonFrontPic_Charizard[]; -extern const u8 gMonPalette_Charizard[]; -extern const u8 gMonBackPic_Charizard[]; -extern const u8 gMonShinyPalette_Charizard[]; -extern const u8 gMonStillFrontPic_Charizard[]; +extern const u32 gMonFrontPic_Charizard[]; +extern const u32 gMonPalette_Charizard[]; +extern const u32 gMonBackPic_Charizard[]; +extern const u32 gMonShinyPalette_Charizard[]; +extern const u32 gMonStillFrontPic_Charizard[]; extern const u8 gMonIcon_Charizard[]; extern const u8 gMonFootprint_Charizard[]; -extern const u8 gMonFrontPic_Squirtle[]; -extern const u8 gMonPalette_Squirtle[]; -extern const u8 gMonBackPic_Squirtle[]; -extern const u8 gMonShinyPalette_Squirtle[]; -extern const u8 gMonStillFrontPic_Squirtle[]; +extern const u32 gMonFrontPic_Squirtle[]; +extern const u32 gMonPalette_Squirtle[]; +extern const u32 gMonBackPic_Squirtle[]; +extern const u32 gMonShinyPalette_Squirtle[]; +extern const u32 gMonStillFrontPic_Squirtle[]; extern const u8 gMonIcon_Squirtle[]; extern const u8 gMonFootprint_Squirtle[]; -extern const u8 gMonFrontPic_Wartortle[]; -extern const u8 gMonPalette_Wartortle[]; -extern const u8 gMonBackPic_Wartortle[]; -extern const u8 gMonShinyPalette_Wartortle[]; -extern const u8 gMonStillFrontPic_Wartortle[]; +extern const u32 gMonFrontPic_Wartortle[]; +extern const u32 gMonPalette_Wartortle[]; +extern const u32 gMonBackPic_Wartortle[]; +extern const u32 gMonShinyPalette_Wartortle[]; +extern const u32 gMonStillFrontPic_Wartortle[]; extern const u8 gMonIcon_Wartortle[]; extern const u8 gMonFootprint_Wartortle[]; -extern const u8 gMonFrontPic_Blastoise[]; -extern const u8 gMonPalette_Blastoise[]; -extern const u8 gMonBackPic_Blastoise[]; -extern const u8 gMonShinyPalette_Blastoise[]; -extern const u8 gMonStillFrontPic_Blastoise[]; +extern const u32 gMonFrontPic_Blastoise[]; +extern const u32 gMonPalette_Blastoise[]; +extern const u32 gMonBackPic_Blastoise[]; +extern const u32 gMonShinyPalette_Blastoise[]; +extern const u32 gMonStillFrontPic_Blastoise[]; extern const u8 gMonIcon_Blastoise[]; extern const u8 gMonFootprint_Blastoise[]; -extern const u8 gMonFrontPic_Caterpie[]; -extern const u8 gMonPalette_Caterpie[]; -extern const u8 gMonBackPic_Caterpie[]; -extern const u8 gMonShinyPalette_Caterpie[]; -extern const u8 gMonStillFrontPic_Caterpie[]; +extern const u32 gMonFrontPic_Caterpie[]; +extern const u32 gMonPalette_Caterpie[]; +extern const u32 gMonBackPic_Caterpie[]; +extern const u32 gMonShinyPalette_Caterpie[]; +extern const u32 gMonStillFrontPic_Caterpie[]; extern const u8 gMonIcon_Caterpie[]; extern const u8 gMonFootprint_Caterpie[]; -extern const u8 gMonFrontPic_Metapod[]; -extern const u8 gMonPalette_Metapod[]; -extern const u8 gMonBackPic_Metapod[]; -extern const u8 gMonShinyPalette_Metapod[]; -extern const u8 gMonStillFrontPic_Metapod[]; +extern const u32 gMonFrontPic_Metapod[]; +extern const u32 gMonPalette_Metapod[]; +extern const u32 gMonBackPic_Metapod[]; +extern const u32 gMonShinyPalette_Metapod[]; +extern const u32 gMonStillFrontPic_Metapod[]; extern const u8 gMonIcon_Metapod[]; extern const u8 gMonFootprint_Metapod[]; -extern const u8 gMonFrontPic_Butterfree[]; -extern const u8 gMonPalette_Butterfree[]; -extern const u8 gMonBackPic_Butterfree[]; -extern const u8 gMonShinyPalette_Butterfree[]; -extern const u8 gMonStillFrontPic_Butterfree[]; +extern const u32 gMonFrontPic_Butterfree[]; +extern const u32 gMonPalette_Butterfree[]; +extern const u32 gMonBackPic_Butterfree[]; +extern const u32 gMonShinyPalette_Butterfree[]; +extern const u32 gMonStillFrontPic_Butterfree[]; extern const u8 gMonIcon_Butterfree[]; extern const u8 gMonFootprint_Butterfree[]; -extern const u8 gMonFrontPic_Weedle[]; -extern const u8 gMonPalette_Weedle[]; -extern const u8 gMonBackPic_Weedle[]; -extern const u8 gMonShinyPalette_Weedle[]; -extern const u8 gMonStillFrontPic_Weedle[]; +extern const u32 gMonFrontPic_Weedle[]; +extern const u32 gMonPalette_Weedle[]; +extern const u32 gMonBackPic_Weedle[]; +extern const u32 gMonShinyPalette_Weedle[]; +extern const u32 gMonStillFrontPic_Weedle[]; extern const u8 gMonIcon_Weedle[]; extern const u8 gMonFootprint_Weedle[]; -extern const u8 gMonFrontPic_Kakuna[]; -extern const u8 gMonPalette_Kakuna[]; -extern const u8 gMonBackPic_Kakuna[]; -extern const u8 gMonShinyPalette_Kakuna[]; -extern const u8 gMonStillFrontPic_Kakuna[]; +extern const u32 gMonFrontPic_Kakuna[]; +extern const u32 gMonPalette_Kakuna[]; +extern const u32 gMonBackPic_Kakuna[]; +extern const u32 gMonShinyPalette_Kakuna[]; +extern const u32 gMonStillFrontPic_Kakuna[]; extern const u8 gMonIcon_Kakuna[]; extern const u8 gMonFootprint_Kakuna[]; -extern const u8 gMonFrontPic_Beedrill[]; -extern const u8 gMonPalette_Beedrill[]; -extern const u8 gMonBackPic_Beedrill[]; -extern const u8 gMonShinyPalette_Beedrill[]; -extern const u8 gMonStillFrontPic_Beedrill[]; +extern const u32 gMonFrontPic_Beedrill[]; +extern const u32 gMonPalette_Beedrill[]; +extern const u32 gMonBackPic_Beedrill[]; +extern const u32 gMonShinyPalette_Beedrill[]; +extern const u32 gMonStillFrontPic_Beedrill[]; extern const u8 gMonIcon_Beedrill[]; extern const u8 gMonFootprint_Beedrill[]; -extern const u8 gMonFrontPic_Pidgey[]; -extern const u8 gMonPalette_Pidgey[]; -extern const u8 gMonBackPic_Pidgey[]; -extern const u8 gMonShinyPalette_Pidgey[]; -extern const u8 gMonStillFrontPic_Pidgey[]; +extern const u32 gMonFrontPic_Pidgey[]; +extern const u32 gMonPalette_Pidgey[]; +extern const u32 gMonBackPic_Pidgey[]; +extern const u32 gMonShinyPalette_Pidgey[]; +extern const u32 gMonStillFrontPic_Pidgey[]; extern const u8 gMonIcon_Pidgey[]; extern const u8 gMonFootprint_Pidgey[]; -extern const u8 gMonFrontPic_Pidgeotto[]; -extern const u8 gMonPalette_Pidgeotto[]; -extern const u8 gMonBackPic_Pidgeotto[]; -extern const u8 gMonShinyPalette_Pidgeotto[]; -extern const u8 gMonStillFrontPic_Pidgeotto[]; +extern const u32 gMonFrontPic_Pidgeotto[]; +extern const u32 gMonPalette_Pidgeotto[]; +extern const u32 gMonBackPic_Pidgeotto[]; +extern const u32 gMonShinyPalette_Pidgeotto[]; +extern const u32 gMonStillFrontPic_Pidgeotto[]; extern const u8 gMonIcon_Pidgeotto[]; extern const u8 gMonFootprint_Pidgeotto[]; -extern const u8 gMonFrontPic_Pidgeot[]; -extern const u8 gMonPalette_Pidgeot[]; -extern const u8 gMonBackPic_Pidgeot[]; -extern const u8 gMonShinyPalette_Pidgeot[]; -extern const u8 gMonStillFrontPic_Pidgeot[]; +extern const u32 gMonFrontPic_Pidgeot[]; +extern const u32 gMonPalette_Pidgeot[]; +extern const u32 gMonBackPic_Pidgeot[]; +extern const u32 gMonShinyPalette_Pidgeot[]; +extern const u32 gMonStillFrontPic_Pidgeot[]; extern const u8 gMonIcon_Pidgeot[]; extern const u8 gMonFootprint_Pidgeot[]; -extern const u8 gMonFrontPic_Rattata[]; -extern const u8 gMonPalette_Rattata[]; -extern const u8 gMonBackPic_Rattata[]; -extern const u8 gMonShinyPalette_Rattata[]; -extern const u8 gMonStillFrontPic_Rattata[]; +extern const u32 gMonFrontPic_Rattata[]; +extern const u32 gMonPalette_Rattata[]; +extern const u32 gMonBackPic_Rattata[]; +extern const u32 gMonShinyPalette_Rattata[]; +extern const u32 gMonStillFrontPic_Rattata[]; extern const u8 gMonIcon_Rattata[]; extern const u8 gMonFootprint_Rattata[]; -extern const u8 gMonFrontPic_Raticate[]; -extern const u8 gMonPalette_Raticate[]; -extern const u8 gMonBackPic_Raticate[]; -extern const u8 gMonShinyPalette_Raticate[]; -extern const u8 gMonStillFrontPic_Raticate[]; +extern const u32 gMonFrontPic_Raticate[]; +extern const u32 gMonPalette_Raticate[]; +extern const u32 gMonBackPic_Raticate[]; +extern const u32 gMonShinyPalette_Raticate[]; +extern const u32 gMonStillFrontPic_Raticate[]; extern const u8 gMonIcon_Raticate[]; extern const u8 gMonFootprint_Raticate[]; -extern const u8 gMonFrontPic_Spearow[]; -extern const u8 gMonPalette_Spearow[]; -extern const u8 gMonBackPic_Spearow[]; -extern const u8 gMonShinyPalette_Spearow[]; -extern const u8 gMonStillFrontPic_Spearow[]; +extern const u32 gMonFrontPic_Spearow[]; +extern const u32 gMonPalette_Spearow[]; +extern const u32 gMonBackPic_Spearow[]; +extern const u32 gMonShinyPalette_Spearow[]; +extern const u32 gMonStillFrontPic_Spearow[]; extern const u8 gMonIcon_Spearow[]; extern const u8 gMonFootprint_Spearow[]; -extern const u8 gMonFrontPic_Fearow[]; -extern const u8 gMonPalette_Fearow[]; -extern const u8 gMonBackPic_Fearow[]; -extern const u8 gMonShinyPalette_Fearow[]; -extern const u8 gMonStillFrontPic_Fearow[]; +extern const u32 gMonFrontPic_Fearow[]; +extern const u32 gMonPalette_Fearow[]; +extern const u32 gMonBackPic_Fearow[]; +extern const u32 gMonShinyPalette_Fearow[]; +extern const u32 gMonStillFrontPic_Fearow[]; extern const u8 gMonIcon_Fearow[]; extern const u8 gMonFootprint_Fearow[]; -extern const u8 gMonFrontPic_Ekans[]; -extern const u8 gMonPalette_Ekans[]; -extern const u8 gMonBackPic_Ekans[]; -extern const u8 gMonShinyPalette_Ekans[]; -extern const u8 gMonStillFrontPic_Ekans[]; +extern const u32 gMonFrontPic_Ekans[]; +extern const u32 gMonPalette_Ekans[]; +extern const u32 gMonBackPic_Ekans[]; +extern const u32 gMonShinyPalette_Ekans[]; +extern const u32 gMonStillFrontPic_Ekans[]; extern const u8 gMonIcon_Ekans[]; extern const u8 gMonFootprint_Ekans[]; -extern const u8 gMonFrontPic_Arbok[]; -extern const u8 gMonPalette_Arbok[]; -extern const u8 gMonBackPic_Arbok[]; -extern const u8 gMonShinyPalette_Arbok[]; +extern const u32 gMonFrontPic_Arbok[]; +extern const u32 gMonPalette_Arbok[]; +extern const u32 gMonBackPic_Arbok[]; +extern const u32 gMonShinyPalette_Arbok[]; extern const u8 gMonIcon_Arbok[]; extern const u8 gMonFootprint_Arbok[]; -extern const u8 gMonFrontPic_Pikachu[]; -extern const u8 gMonPalette_Pikachu[]; -extern const u8 gMonBackPic_Pikachu[]; -extern const u8 gMonShinyPalette_Pikachu[]; -extern const u8 gMonStillFrontPic_Arbok[]; +extern const u32 gMonFrontPic_Pikachu[]; +extern const u32 gMonPalette_Pikachu[]; +extern const u32 gMonBackPic_Pikachu[]; +extern const u32 gMonShinyPalette_Pikachu[]; +extern const u32 gMonStillFrontPic_Arbok[]; extern const u8 gMonIcon_Pikachu[]; extern const u8 gMonFootprint_Pikachu[]; -extern const u8 gMonStillFrontPic_Pikachu[]; -extern const u8 gMonFrontPic_Raichu[]; -extern const u8 gMonPalette_Raichu[]; -extern const u8 gMonBackPic_Raichu[]; -extern const u8 gMonShinyPalette_Raichu[]; -extern const u8 gMonStillFrontPic_Raichu[]; +extern const u32 gMonStillFrontPic_Pikachu[]; +extern const u32 gMonFrontPic_Raichu[]; +extern const u32 gMonPalette_Raichu[]; +extern const u32 gMonBackPic_Raichu[]; +extern const u32 gMonShinyPalette_Raichu[]; +extern const u32 gMonStillFrontPic_Raichu[]; extern const u8 gMonIcon_Raichu[]; extern const u8 gMonFootprint_Raichu[]; -extern const u8 gMonFrontPic_Sandshrew[]; -extern const u8 gMonPalette_Sandshrew[]; -extern const u8 gMonBackPic_Sandshrew[]; -extern const u8 gMonShinyPalette_Sandshrew[]; -extern const u8 gMonStillFrontPic_Sandshrew[]; +extern const u32 gMonFrontPic_Sandshrew[]; +extern const u32 gMonPalette_Sandshrew[]; +extern const u32 gMonBackPic_Sandshrew[]; +extern const u32 gMonShinyPalette_Sandshrew[]; +extern const u32 gMonStillFrontPic_Sandshrew[]; extern const u8 gMonIcon_Sandshrew[]; extern const u8 gMonFootprint_Sandshrew[]; -extern const u8 gMonFrontPic_Sandslash[]; -extern const u8 gMonPalette_Sandslash[]; -extern const u8 gMonBackPic_Sandslash[]; -extern const u8 gMonShinyPalette_Sandslash[]; -extern const u8 gMonStillFrontPic_Sandslash[]; +extern const u32 gMonFrontPic_Sandslash[]; +extern const u32 gMonPalette_Sandslash[]; +extern const u32 gMonBackPic_Sandslash[]; +extern const u32 gMonShinyPalette_Sandslash[]; +extern const u32 gMonStillFrontPic_Sandslash[]; extern const u8 gMonIcon_Sandslash[]; extern const u8 gMonFootprint_Sandslash[]; -extern const u8 gMonFrontPic_NidoranF[]; -extern const u8 gMonPalette_NidoranF[]; -extern const u8 gMonBackPic_NidoranF[]; -extern const u8 gMonShinyPalette_NidoranF[]; -extern const u8 gMonStillFrontPic_NidoranF[]; +extern const u32 gMonFrontPic_NidoranF[]; +extern const u32 gMonPalette_NidoranF[]; +extern const u32 gMonBackPic_NidoranF[]; +extern const u32 gMonShinyPalette_NidoranF[]; +extern const u32 gMonStillFrontPic_NidoranF[]; extern const u8 gMonIcon_NidoranF[]; extern const u8 gMonFootprint_NidoranF[]; -extern const u8 gMonFrontPic_Nidorina[]; -extern const u8 gMonPalette_Nidorina[]; -extern const u8 gMonBackPic_Nidorina[]; -extern const u8 gMonShinyPalette_Nidorina[]; -extern const u8 gMonStillFrontPic_Nidorina[]; +extern const u32 gMonFrontPic_Nidorina[]; +extern const u32 gMonPalette_Nidorina[]; +extern const u32 gMonBackPic_Nidorina[]; +extern const u32 gMonShinyPalette_Nidorina[]; +extern const u32 gMonStillFrontPic_Nidorina[]; extern const u8 gMonIcon_Nidorina[]; extern const u8 gMonFootprint_Nidorina[]; -extern const u8 gMonFrontPic_Nidoqueen[]; -extern const u8 gMonPalette_Nidoqueen[]; -extern const u8 gMonBackPic_Nidoqueen[]; -extern const u8 gMonShinyPalette_Nidoqueen[]; -extern const u8 gMonStillFrontPic_Nidoqueen[]; +extern const u32 gMonFrontPic_Nidoqueen[]; +extern const u32 gMonPalette_Nidoqueen[]; +extern const u32 gMonBackPic_Nidoqueen[]; +extern const u32 gMonShinyPalette_Nidoqueen[]; +extern const u32 gMonStillFrontPic_Nidoqueen[]; extern const u8 gMonIcon_Nidoqueen[]; extern const u8 gMonFootprint_Nidoqueen[]; -extern const u8 gMonFrontPic_NidoranM[]; -extern const u8 gMonPalette_NidoranM[]; -extern const u8 gMonBackPic_NidoranM[]; -extern const u8 gMonShinyPalette_NidoranM[]; -extern const u8 gMonStillFrontPic_NidoranM[]; +extern const u32 gMonFrontPic_NidoranM[]; +extern const u32 gMonPalette_NidoranM[]; +extern const u32 gMonBackPic_NidoranM[]; +extern const u32 gMonShinyPalette_NidoranM[]; +extern const u32 gMonStillFrontPic_NidoranM[]; extern const u8 gMonIcon_NidoranM[]; extern const u8 gMonFootprint_NidoranM[]; -extern const u8 gMonFrontPic_Nidorino[]; -extern const u8 gMonPalette_Nidorino[]; -extern const u8 gMonBackPic_Nidorino[]; -extern const u8 gMonShinyPalette_Nidorino[]; -extern const u8 gMonStillFrontPic_Nidorino[]; +extern const u32 gMonFrontPic_Nidorino[]; +extern const u32 gMonPalette_Nidorino[]; +extern const u32 gMonBackPic_Nidorino[]; +extern const u32 gMonShinyPalette_Nidorino[]; +extern const u32 gMonStillFrontPic_Nidorino[]; extern const u8 gMonIcon_Nidorino[]; extern const u8 gMonFootprint_Nidorino[]; -extern const u8 gMonFrontPic_Nidoking[]; -extern const u8 gMonPalette_Nidoking[]; -extern const u8 gMonBackPic_Nidoking[]; -extern const u8 gMonShinyPalette_Nidoking[]; -extern const u8 gMonStillFrontPic_Nidoking[]; +extern const u32 gMonFrontPic_Nidoking[]; +extern const u32 gMonPalette_Nidoking[]; +extern const u32 gMonBackPic_Nidoking[]; +extern const u32 gMonShinyPalette_Nidoking[]; +extern const u32 gMonStillFrontPic_Nidoking[]; extern const u8 gMonIcon_Nidoking[]; extern const u8 gMonFootprint_Nidoking[]; -extern const u8 gMonFrontPic_Clefairy[]; -extern const u8 gMonPalette_Clefairy[]; -extern const u8 gMonBackPic_Clefairy[]; -extern const u8 gMonShinyPalette_Clefairy[]; -extern const u8 gMonStillFrontPic_Clefairy[]; +extern const u32 gMonFrontPic_Clefairy[]; +extern const u32 gMonPalette_Clefairy[]; +extern const u32 gMonBackPic_Clefairy[]; +extern const u32 gMonShinyPalette_Clefairy[]; +extern const u32 gMonStillFrontPic_Clefairy[]; extern const u8 gMonIcon_Clefairy[]; extern const u8 gMonFootprint_Clefairy[]; -extern const u8 gMonFrontPic_Clefable[]; -extern const u8 gMonPalette_Clefable[]; -extern const u8 gMonBackPic_Clefable[]; -extern const u8 gMonShinyPalette_Clefable[]; -extern const u8 gMonStillFrontPic_Clefable[]; +extern const u32 gMonFrontPic_Clefable[]; +extern const u32 gMonPalette_Clefable[]; +extern const u32 gMonBackPic_Clefable[]; +extern const u32 gMonShinyPalette_Clefable[]; +extern const u32 gMonStillFrontPic_Clefable[]; extern const u8 gMonIcon_Clefable[]; extern const u8 gMonFootprint_Clefable[]; -extern const u8 gMonFrontPic_Vulpix[]; -extern const u8 gMonPalette_Vulpix[]; -extern const u8 gMonBackPic_Vulpix[]; -extern const u8 gMonShinyPalette_Vulpix[]; -extern const u8 gMonStillFrontPic_Vulpix[]; +extern const u32 gMonFrontPic_Vulpix[]; +extern const u32 gMonPalette_Vulpix[]; +extern const u32 gMonBackPic_Vulpix[]; +extern const u32 gMonShinyPalette_Vulpix[]; +extern const u32 gMonStillFrontPic_Vulpix[]; extern const u8 gMonIcon_Vulpix[]; extern const u8 gMonFootprint_Vulpix[]; -extern const u8 gMonFrontPic_Ninetales[]; -extern const u8 gMonPalette_Ninetales[]; -extern const u8 gMonBackPic_Ninetales[]; -extern const u8 gMonShinyPalette_Ninetales[]; -extern const u8 gMonStillFrontPic_Ninetales[]; +extern const u32 gMonFrontPic_Ninetales[]; +extern const u32 gMonPalette_Ninetales[]; +extern const u32 gMonBackPic_Ninetales[]; +extern const u32 gMonShinyPalette_Ninetales[]; +extern const u32 gMonStillFrontPic_Ninetales[]; extern const u8 gMonIcon_Ninetales[]; extern const u8 gMonFootprint_Ninetales[]; -extern const u8 gMonFrontPic_Jigglypuff[]; -extern const u8 gMonPalette_Jigglypuff[]; -extern const u8 gMonBackPic_Jigglypuff[]; -extern const u8 gMonShinyPalette_Jigglypuff[]; -extern const u8 gMonStillFrontPic_Jigglypuff[]; +extern const u32 gMonFrontPic_Jigglypuff[]; +extern const u32 gMonPalette_Jigglypuff[]; +extern const u32 gMonBackPic_Jigglypuff[]; +extern const u32 gMonShinyPalette_Jigglypuff[]; +extern const u32 gMonStillFrontPic_Jigglypuff[]; extern const u8 gMonIcon_Jigglypuff[]; extern const u8 gMonFootprint_Jigglypuff[]; -extern const u8 gMonFrontPic_Wigglytuff[]; -extern const u8 gMonPalette_Wigglytuff[]; -extern const u8 gMonBackPic_Wigglytuff[]; -extern const u8 gMonShinyPalette_Wigglytuff[]; -extern const u8 gMonStillFrontPic_Wigglytuff[]; +extern const u32 gMonFrontPic_Wigglytuff[]; +extern const u32 gMonPalette_Wigglytuff[]; +extern const u32 gMonBackPic_Wigglytuff[]; +extern const u32 gMonShinyPalette_Wigglytuff[]; +extern const u32 gMonStillFrontPic_Wigglytuff[]; extern const u8 gMonIcon_Wigglytuff[]; extern const u8 gMonFootprint_Wigglytuff[]; -extern const u8 gMonFrontPic_Zubat[]; -extern const u8 gMonPalette_Zubat[]; -extern const u8 gMonBackPic_Zubat[]; -extern const u8 gMonShinyPalette_Zubat[]; -extern const u8 gMonStillFrontPic_Zubat[]; +extern const u32 gMonFrontPic_Zubat[]; +extern const u32 gMonPalette_Zubat[]; +extern const u32 gMonBackPic_Zubat[]; +extern const u32 gMonShinyPalette_Zubat[]; +extern const u32 gMonStillFrontPic_Zubat[]; extern const u8 gMonIcon_Zubat[]; extern const u8 gMonFootprint_Zubat[]; -extern const u8 gMonFrontPic_Golbat[]; -extern const u8 gMonPalette_Golbat[]; -extern const u8 gMonBackPic_Golbat[]; -extern const u8 gMonShinyPalette_Golbat[]; -extern const u8 gMonStillFrontPic_Golbat[]; +extern const u32 gMonFrontPic_Golbat[]; +extern const u32 gMonPalette_Golbat[]; +extern const u32 gMonBackPic_Golbat[]; +extern const u32 gMonShinyPalette_Golbat[]; +extern const u32 gMonStillFrontPic_Golbat[]; extern const u8 gMonIcon_Golbat[]; extern const u8 gMonFootprint_Golbat[]; -extern const u8 gMonFrontPic_Oddish[]; -extern const u8 gMonPalette_Oddish[]; -extern const u8 gMonBackPic_Oddish[]; -extern const u8 gMonShinyPalette_Oddish[]; -extern const u8 gMonStillFrontPic_Oddish[]; +extern const u32 gMonFrontPic_Oddish[]; +extern const u32 gMonPalette_Oddish[]; +extern const u32 gMonBackPic_Oddish[]; +extern const u32 gMonShinyPalette_Oddish[]; +extern const u32 gMonStillFrontPic_Oddish[]; extern const u8 gMonIcon_Oddish[]; extern const u8 gMonFootprint_Oddish[]; -extern const u8 gMonFrontPic_Gloom[]; -extern const u8 gMonPalette_Gloom[]; -extern const u8 gMonBackPic_Gloom[]; -extern const u8 gMonShinyPalette_Gloom[]; -extern const u8 gMonStillFrontPic_Gloom[]; +extern const u32 gMonFrontPic_Gloom[]; +extern const u32 gMonPalette_Gloom[]; +extern const u32 gMonBackPic_Gloom[]; +extern const u32 gMonShinyPalette_Gloom[]; +extern const u32 gMonStillFrontPic_Gloom[]; extern const u8 gMonIcon_Gloom[]; extern const u8 gMonFootprint_Gloom[]; -extern const u8 gMonFrontPic_Vileplume[]; -extern const u8 gMonPalette_Vileplume[]; -extern const u8 gMonBackPic_Vileplume[]; -extern const u8 gMonShinyPalette_Vileplume[]; -extern const u8 gMonStillFrontPic_Vileplume[]; +extern const u32 gMonFrontPic_Vileplume[]; +extern const u32 gMonPalette_Vileplume[]; +extern const u32 gMonBackPic_Vileplume[]; +extern const u32 gMonShinyPalette_Vileplume[]; +extern const u32 gMonStillFrontPic_Vileplume[]; extern const u8 gMonIcon_Vileplume[]; extern const u8 gMonFootprint_Vileplume[]; -extern const u8 gMonFrontPic_Paras[]; -extern const u8 gMonPalette_Paras[]; -extern const u8 gMonBackPic_Paras[]; -extern const u8 gMonShinyPalette_Paras[]; -extern const u8 gMonStillFrontPic_Paras[]; +extern const u32 gMonFrontPic_Paras[]; +extern const u32 gMonPalette_Paras[]; +extern const u32 gMonBackPic_Paras[]; +extern const u32 gMonShinyPalette_Paras[]; +extern const u32 gMonStillFrontPic_Paras[]; extern const u8 gMonIcon_Paras[]; extern const u8 gMonFootprint_Paras[]; -extern const u8 gMonFrontPic_Parasect[]; -extern const u8 gMonPalette_Parasect[]; -extern const u8 gMonBackPic_Parasect[]; -extern const u8 gMonShinyPalette_Parasect[]; -extern const u8 gMonStillFrontPic_Parasect[]; +extern const u32 gMonFrontPic_Parasect[]; +extern const u32 gMonPalette_Parasect[]; +extern const u32 gMonBackPic_Parasect[]; +extern const u32 gMonShinyPalette_Parasect[]; +extern const u32 gMonStillFrontPic_Parasect[]; extern const u8 gMonIcon_Parasect[]; extern const u8 gMonFootprint_Parasect[]; -extern const u8 gMonFrontPic_Venonat[]; -extern const u8 gMonPalette_Venonat[]; -extern const u8 gMonBackPic_Venonat[]; -extern const u8 gMonShinyPalette_Venonat[]; -extern const u8 gMonStillFrontPic_Venonat[]; +extern const u32 gMonFrontPic_Venonat[]; +extern const u32 gMonPalette_Venonat[]; +extern const u32 gMonBackPic_Venonat[]; +extern const u32 gMonShinyPalette_Venonat[]; +extern const u32 gMonStillFrontPic_Venonat[]; extern const u8 gMonIcon_Venonat[]; extern const u8 gMonFootprint_Venonat[]; -extern const u8 gMonFrontPic_Venomoth[]; -extern const u8 gMonPalette_Venomoth[]; -extern const u8 gMonBackPic_Venomoth[]; -extern const u8 gMonShinyPalette_Venomoth[]; -extern const u8 gMonStillFrontPic_Venomoth[]; +extern const u32 gMonFrontPic_Venomoth[]; +extern const u32 gMonPalette_Venomoth[]; +extern const u32 gMonBackPic_Venomoth[]; +extern const u32 gMonShinyPalette_Venomoth[]; +extern const u32 gMonStillFrontPic_Venomoth[]; extern const u8 gMonIcon_Venomoth[]; extern const u8 gMonFootprint_Venomoth[]; -extern const u8 gMonFrontPic_Diglett[]; -extern const u8 gMonPalette_Diglett[]; -extern const u8 gMonBackPic_Diglett[]; -extern const u8 gMonShinyPalette_Diglett[]; -extern const u8 gMonStillFrontPic_Diglett[]; +extern const u32 gMonFrontPic_Diglett[]; +extern const u32 gMonPalette_Diglett[]; +extern const u32 gMonBackPic_Diglett[]; +extern const u32 gMonShinyPalette_Diglett[]; +extern const u32 gMonStillFrontPic_Diglett[]; extern const u8 gMonIcon_Diglett[]; extern const u8 gMonFootprint_Diglett[]; -extern const u8 gMonFrontPic_Dugtrio[]; -extern const u8 gMonPalette_Dugtrio[]; -extern const u8 gMonBackPic_Dugtrio[]; -extern const u8 gMonShinyPalette_Dugtrio[]; -extern const u8 gMonStillFrontPic_Dugtrio[]; +extern const u32 gMonFrontPic_Dugtrio[]; +extern const u32 gMonPalette_Dugtrio[]; +extern const u32 gMonBackPic_Dugtrio[]; +extern const u32 gMonShinyPalette_Dugtrio[]; +extern const u32 gMonStillFrontPic_Dugtrio[]; extern const u8 gMonIcon_Dugtrio[]; extern const u8 gMonFootprint_Dugtrio[]; -extern const u8 gMonFrontPic_Meowth[]; -extern const u8 gMonPalette_Meowth[]; -extern const u8 gMonBackPic_Meowth[]; -extern const u8 gMonShinyPalette_Meowth[]; -extern const u8 gMonStillFrontPic_Meowth[]; +extern const u32 gMonFrontPic_Meowth[]; +extern const u32 gMonPalette_Meowth[]; +extern const u32 gMonBackPic_Meowth[]; +extern const u32 gMonShinyPalette_Meowth[]; +extern const u32 gMonStillFrontPic_Meowth[]; extern const u8 gMonIcon_Meowth[]; extern const u8 gMonFootprint_Meowth[]; -extern const u8 gMonFrontPic_Persian[]; -extern const u8 gMonPalette_Persian[]; -extern const u8 gMonBackPic_Persian[]; -extern const u8 gMonShinyPalette_Persian[]; -extern const u8 gMonStillFrontPic_Persian[]; +extern const u32 gMonFrontPic_Persian[]; +extern const u32 gMonPalette_Persian[]; +extern const u32 gMonBackPic_Persian[]; +extern const u32 gMonShinyPalette_Persian[]; +extern const u32 gMonStillFrontPic_Persian[]; extern const u8 gMonIcon_Persian[]; extern const u8 gMonFootprint_Persian[]; -extern const u8 gMonFrontPic_Psyduck[]; -extern const u8 gMonPalette_Psyduck[]; -extern const u8 gMonBackPic_Psyduck[]; -extern const u8 gMonShinyPalette_Psyduck[]; -extern const u8 gMonStillFrontPic_Psyduck[]; +extern const u32 gMonFrontPic_Psyduck[]; +extern const u32 gMonPalette_Psyduck[]; +extern const u32 gMonBackPic_Psyduck[]; +extern const u32 gMonShinyPalette_Psyduck[]; +extern const u32 gMonStillFrontPic_Psyduck[]; extern const u8 gMonIcon_Psyduck[]; extern const u8 gMonFootprint_Psyduck[]; -extern const u8 gMonFrontPic_Golduck[]; -extern const u8 gMonPalette_Golduck[]; -extern const u8 gMonBackPic_Golduck[]; -extern const u8 gMonShinyPalette_Golduck[]; -extern const u8 gMonStillFrontPic_Golduck[]; +extern const u32 gMonFrontPic_Golduck[]; +extern const u32 gMonPalette_Golduck[]; +extern const u32 gMonBackPic_Golduck[]; +extern const u32 gMonShinyPalette_Golduck[]; +extern const u32 gMonStillFrontPic_Golduck[]; extern const u8 gMonIcon_Golduck[]; extern const u8 gMonFootprint_Golduck[]; -extern const u8 gMonFrontPic_Mankey[]; -extern const u8 gMonPalette_Mankey[]; -extern const u8 gMonBackPic_Mankey[]; -extern const u8 gMonShinyPalette_Mankey[]; -extern const u8 gMonStillFrontPic_Mankey[]; +extern const u32 gMonFrontPic_Mankey[]; +extern const u32 gMonPalette_Mankey[]; +extern const u32 gMonBackPic_Mankey[]; +extern const u32 gMonShinyPalette_Mankey[]; +extern const u32 gMonStillFrontPic_Mankey[]; extern const u8 gMonIcon_Mankey[]; extern const u8 gMonFootprint_Mankey[]; -extern const u8 gMonFrontPic_Primeape[]; -extern const u8 gMonPalette_Primeape[]; -extern const u8 gMonBackPic_Primeape[]; -extern const u8 gMonShinyPalette_Primeape[]; -extern const u8 gMonStillFrontPic_Primeape[]; +extern const u32 gMonFrontPic_Primeape[]; +extern const u32 gMonPalette_Primeape[]; +extern const u32 gMonBackPic_Primeape[]; +extern const u32 gMonShinyPalette_Primeape[]; +extern const u32 gMonStillFrontPic_Primeape[]; extern const u8 gMonIcon_Primeape[]; extern const u8 gMonFootprint_Primeape[]; -extern const u8 gMonFrontPic_Growlithe[]; -extern const u8 gMonPalette_Growlithe[]; -extern const u8 gMonBackPic_Growlithe[]; -extern const u8 gMonShinyPalette_Growlithe[]; -extern const u8 gMonStillFrontPic_Growlithe[]; +extern const u32 gMonFrontPic_Growlithe[]; +extern const u32 gMonPalette_Growlithe[]; +extern const u32 gMonBackPic_Growlithe[]; +extern const u32 gMonShinyPalette_Growlithe[]; +extern const u32 gMonStillFrontPic_Growlithe[]; extern const u8 gMonIcon_Growlithe[]; extern const u8 gMonFootprint_Growlithe[]; -extern const u8 gMonFrontPic_Arcanine[]; -extern const u8 gMonPalette_Arcanine[]; -extern const u8 gMonBackPic_Arcanine[]; -extern const u8 gMonShinyPalette_Arcanine[]; -extern const u8 gMonStillFrontPic_Arcanine[]; +extern const u32 gMonFrontPic_Arcanine[]; +extern const u32 gMonPalette_Arcanine[]; +extern const u32 gMonBackPic_Arcanine[]; +extern const u32 gMonShinyPalette_Arcanine[]; +extern const u32 gMonStillFrontPic_Arcanine[]; extern const u8 gMonIcon_Arcanine[]; extern const u8 gMonFootprint_Arcanine[]; -extern const u8 gMonFrontPic_Poliwag[]; -extern const u8 gMonPalette_Poliwag[]; -extern const u8 gMonBackPic_Poliwag[]; -extern const u8 gMonShinyPalette_Poliwag[]; -extern const u8 gMonStillFrontPic_Poliwag[]; +extern const u32 gMonFrontPic_Poliwag[]; +extern const u32 gMonPalette_Poliwag[]; +extern const u32 gMonBackPic_Poliwag[]; +extern const u32 gMonShinyPalette_Poliwag[]; +extern const u32 gMonStillFrontPic_Poliwag[]; extern const u8 gMonIcon_Poliwag[]; extern const u8 gMonFootprint_Poliwag[]; -extern const u8 gMonFrontPic_Poliwhirl[]; -extern const u8 gMonPalette_Poliwhirl[]; -extern const u8 gMonBackPic_Poliwhirl[]; -extern const u8 gMonShinyPalette_Poliwhirl[]; -extern const u8 gMonStillFrontPic_Poliwhirl[]; +extern const u32 gMonFrontPic_Poliwhirl[]; +extern const u32 gMonPalette_Poliwhirl[]; +extern const u32 gMonBackPic_Poliwhirl[]; +extern const u32 gMonShinyPalette_Poliwhirl[]; +extern const u32 gMonStillFrontPic_Poliwhirl[]; extern const u8 gMonIcon_Poliwhirl[]; extern const u8 gMonFootprint_Poliwhirl[]; -extern const u8 gMonFrontPic_Poliwrath[]; -extern const u8 gMonPalette_Poliwrath[]; -extern const u8 gMonBackPic_Poliwrath[]; -extern const u8 gMonShinyPalette_Poliwrath[]; -extern const u8 gMonStillFrontPic_Poliwrath[]; +extern const u32 gMonFrontPic_Poliwrath[]; +extern const u32 gMonPalette_Poliwrath[]; +extern const u32 gMonBackPic_Poliwrath[]; +extern const u32 gMonShinyPalette_Poliwrath[]; +extern const u32 gMonStillFrontPic_Poliwrath[]; extern const u8 gMonIcon_Poliwrath[]; extern const u8 gMonFootprint_Poliwrath[]; -extern const u8 gMonFrontPic_Abra[]; -extern const u8 gMonPalette_Abra[]; -extern const u8 gMonBackPic_Abra[]; -extern const u8 gMonShinyPalette_Abra[]; -extern const u8 gMonStillFrontPic_Abra[]; +extern const u32 gMonFrontPic_Abra[]; +extern const u32 gMonPalette_Abra[]; +extern const u32 gMonBackPic_Abra[]; +extern const u32 gMonShinyPalette_Abra[]; +extern const u32 gMonStillFrontPic_Abra[]; extern const u8 gMonIcon_Abra[]; extern const u8 gMonFootprint_Abra[]; -extern const u8 gMonFrontPic_Kadabra[]; -extern const u8 gMonPalette_Kadabra[]; -extern const u8 gMonBackPic_Kadabra[]; -extern const u8 gMonShinyPalette_Kadabra[]; -extern const u8 gMonStillFrontPic_Kadabra[]; +extern const u32 gMonFrontPic_Kadabra[]; +extern const u32 gMonPalette_Kadabra[]; +extern const u32 gMonBackPic_Kadabra[]; +extern const u32 gMonShinyPalette_Kadabra[]; +extern const u32 gMonStillFrontPic_Kadabra[]; extern const u8 gMonIcon_Kadabra[]; extern const u8 gMonFootprint_Kadabra[]; -extern const u8 gMonFrontPic_Alakazam[]; -extern const u8 gMonPalette_Alakazam[]; -extern const u8 gMonBackPic_Alakazam[]; -extern const u8 gMonShinyPalette_Alakazam[]; -extern const u8 gMonStillFrontPic_Alakazam[]; +extern const u32 gMonFrontPic_Alakazam[]; +extern const u32 gMonPalette_Alakazam[]; +extern const u32 gMonBackPic_Alakazam[]; +extern const u32 gMonShinyPalette_Alakazam[]; +extern const u32 gMonStillFrontPic_Alakazam[]; extern const u8 gMonIcon_Alakazam[]; extern const u8 gMonFootprint_Alakazam[]; -extern const u8 gMonFrontPic_Machop[]; -extern const u8 gMonPalette_Machop[]; -extern const u8 gMonBackPic_Machop[]; -extern const u8 gMonShinyPalette_Machop[]; -extern const u8 gMonStillFrontPic_Machop[]; +extern const u32 gMonFrontPic_Machop[]; +extern const u32 gMonPalette_Machop[]; +extern const u32 gMonBackPic_Machop[]; +extern const u32 gMonShinyPalette_Machop[]; +extern const u32 gMonStillFrontPic_Machop[]; extern const u8 gMonIcon_Machop[]; extern const u8 gMonFootprint_Machop[]; -extern const u8 gMonFrontPic_Machoke[]; -extern const u8 gMonPalette_Machoke[]; -extern const u8 gMonBackPic_Machoke[]; -extern const u8 gMonShinyPalette_Machoke[]; -extern const u8 gMonStillFrontPic_Machoke[]; +extern const u32 gMonFrontPic_Machoke[]; +extern const u32 gMonPalette_Machoke[]; +extern const u32 gMonBackPic_Machoke[]; +extern const u32 gMonShinyPalette_Machoke[]; +extern const u32 gMonStillFrontPic_Machoke[]; extern const u8 gMonIcon_Machoke[]; extern const u8 gMonFootprint_Machoke[]; -extern const u8 gMonFrontPic_Machamp[]; -extern const u8 gMonPalette_Machamp[]; -extern const u8 gMonBackPic_Machamp[]; -extern const u8 gMonShinyPalette_Machamp[]; -extern const u8 gMonStillFrontPic_Machamp[]; +extern const u32 gMonFrontPic_Machamp[]; +extern const u32 gMonPalette_Machamp[]; +extern const u32 gMonBackPic_Machamp[]; +extern const u32 gMonShinyPalette_Machamp[]; +extern const u32 gMonStillFrontPic_Machamp[]; extern const u8 gMonIcon_Machamp[]; extern const u8 gMonFootprint_Machamp[]; -extern const u8 gMonFrontPic_Bellsprout[]; -extern const u8 gMonPalette_Bellsprout[]; -extern const u8 gMonBackPic_Bellsprout[]; -extern const u8 gMonShinyPalette_Bellsprout[]; -extern const u8 gMonStillFrontPic_Bellsprout[]; +extern const u32 gMonFrontPic_Bellsprout[]; +extern const u32 gMonPalette_Bellsprout[]; +extern const u32 gMonBackPic_Bellsprout[]; +extern const u32 gMonShinyPalette_Bellsprout[]; +extern const u32 gMonStillFrontPic_Bellsprout[]; extern const u8 gMonIcon_Bellsprout[]; extern const u8 gMonFootprint_Bellsprout[]; -extern const u8 gMonFrontPic_Weepinbell[]; -extern const u8 gMonPalette_Weepinbell[]; -extern const u8 gMonBackPic_Weepinbell[]; -extern const u8 gMonShinyPalette_Weepinbell[]; -extern const u8 gMonStillFrontPic_Weepinbell[]; +extern const u32 gMonFrontPic_Weepinbell[]; +extern const u32 gMonPalette_Weepinbell[]; +extern const u32 gMonBackPic_Weepinbell[]; +extern const u32 gMonShinyPalette_Weepinbell[]; +extern const u32 gMonStillFrontPic_Weepinbell[]; extern const u8 gMonIcon_Weepinbell[]; extern const u8 gMonFootprint_Weepinbell[]; -extern const u8 gMonFrontPic_Victreebel[]; -extern const u8 gMonPalette_Victreebel[]; -extern const u8 gMonBackPic_Victreebel[]; -extern const u8 gMonShinyPalette_Victreebel[]; -extern const u8 gMonStillFrontPic_Victreebel[]; +extern const u32 gMonFrontPic_Victreebel[]; +extern const u32 gMonPalette_Victreebel[]; +extern const u32 gMonBackPic_Victreebel[]; +extern const u32 gMonShinyPalette_Victreebel[]; +extern const u32 gMonStillFrontPic_Victreebel[]; extern const u8 gMonIcon_Victreebel[]; extern const u8 gMonFootprint_Victreebel[]; -extern const u8 gMonFrontPic_Tentacool[]; -extern const u8 gMonPalette_Tentacool[]; -extern const u8 gMonBackPic_Tentacool[]; -extern const u8 gMonShinyPalette_Tentacool[]; -extern const u8 gMonStillFrontPic_Tentacool[]; +extern const u32 gMonFrontPic_Tentacool[]; +extern const u32 gMonPalette_Tentacool[]; +extern const u32 gMonBackPic_Tentacool[]; +extern const u32 gMonShinyPalette_Tentacool[]; +extern const u32 gMonStillFrontPic_Tentacool[]; extern const u8 gMonIcon_Tentacool[]; extern const u8 gMonFootprint_Tentacool[]; -extern const u8 gMonFrontPic_Tentacruel[]; -extern const u8 gMonPalette_Tentacruel[]; -extern const u8 gMonBackPic_Tentacruel[]; -extern const u8 gMonShinyPalette_Tentacruel[]; -extern const u8 gMonStillFrontPic_Tentacruel[]; +extern const u32 gMonFrontPic_Tentacruel[]; +extern const u32 gMonPalette_Tentacruel[]; +extern const u32 gMonBackPic_Tentacruel[]; +extern const u32 gMonShinyPalette_Tentacruel[]; +extern const u32 gMonStillFrontPic_Tentacruel[]; extern const u8 gMonIcon_Tentacruel[]; extern const u8 gMonFootprint_Tentacruel[]; -extern const u8 gMonFrontPic_Geodude[]; -extern const u8 gMonPalette_Geodude[]; -extern const u8 gMonBackPic_Geodude[]; -extern const u8 gMonShinyPalette_Geodude[]; -extern const u8 gMonStillFrontPic_Geodude[]; +extern const u32 gMonFrontPic_Geodude[]; +extern const u32 gMonPalette_Geodude[]; +extern const u32 gMonBackPic_Geodude[]; +extern const u32 gMonShinyPalette_Geodude[]; +extern const u32 gMonStillFrontPic_Geodude[]; extern const u8 gMonIcon_Geodude[]; extern const u8 gMonFootprint_Geodude[]; -extern const u8 gMonFrontPic_Graveler[]; -extern const u8 gMonPalette_Graveler[]; -extern const u8 gMonBackPic_Graveler[]; -extern const u8 gMonShinyPalette_Graveler[]; -extern const u8 gMonStillFrontPic_Graveler[]; +extern const u32 gMonFrontPic_Graveler[]; +extern const u32 gMonPalette_Graveler[]; +extern const u32 gMonBackPic_Graveler[]; +extern const u32 gMonShinyPalette_Graveler[]; +extern const u32 gMonStillFrontPic_Graveler[]; extern const u8 gMonIcon_Graveler[]; extern const u8 gMonFootprint_Graveler[]; -extern const u8 gMonFrontPic_Golem[]; -extern const u8 gMonPalette_Golem[]; -extern const u8 gMonBackPic_Golem[]; -extern const u8 gMonShinyPalette_Golem[]; -extern const u8 gMonStillFrontPic_Golem[]; +extern const u32 gMonFrontPic_Golem[]; +extern const u32 gMonPalette_Golem[]; +extern const u32 gMonBackPic_Golem[]; +extern const u32 gMonShinyPalette_Golem[]; +extern const u32 gMonStillFrontPic_Golem[]; extern const u8 gMonIcon_Golem[]; extern const u8 gMonFootprint_Golem[]; -extern const u8 gMonFrontPic_Ponyta[]; -extern const u8 gMonPalette_Ponyta[]; -extern const u8 gMonBackPic_Ponyta[]; -extern const u8 gMonShinyPalette_Ponyta[]; -extern const u8 gMonStillFrontPic_Ponyta[]; +extern const u32 gMonFrontPic_Ponyta[]; +extern const u32 gMonPalette_Ponyta[]; +extern const u32 gMonBackPic_Ponyta[]; +extern const u32 gMonShinyPalette_Ponyta[]; +extern const u32 gMonStillFrontPic_Ponyta[]; extern const u8 gMonIcon_Ponyta[]; extern const u8 gMonFootprint_Ponyta[]; -extern const u8 gMonFrontPic_Rapidash[]; -extern const u8 gMonPalette_Rapidash[]; -extern const u8 gMonBackPic_Rapidash[]; -extern const u8 gMonShinyPalette_Rapidash[]; -extern const u8 gMonStillFrontPic_Rapidash[]; +extern const u32 gMonFrontPic_Rapidash[]; +extern const u32 gMonPalette_Rapidash[]; +extern const u32 gMonBackPic_Rapidash[]; +extern const u32 gMonShinyPalette_Rapidash[]; +extern const u32 gMonStillFrontPic_Rapidash[]; extern const u8 gMonIcon_Rapidash[]; extern const u8 gMonFootprint_Rapidash[]; -extern const u8 gMonFrontPic_Slowpoke[]; -extern const u8 gMonPalette_Slowpoke[]; -extern const u8 gMonBackPic_Slowpoke[]; -extern const u8 gMonShinyPalette_Slowpoke[]; -extern const u8 gMonStillFrontPic_Slowpoke[]; +extern const u32 gMonFrontPic_Slowpoke[]; +extern const u32 gMonPalette_Slowpoke[]; +extern const u32 gMonBackPic_Slowpoke[]; +extern const u32 gMonShinyPalette_Slowpoke[]; +extern const u32 gMonStillFrontPic_Slowpoke[]; extern const u8 gMonIcon_Slowpoke[]; extern const u8 gMonFootprint_Slowpoke[]; -extern const u8 gMonFrontPic_Slowbro[]; -extern const u8 gMonPalette_Slowbro[]; -extern const u8 gMonBackPic_Slowbro[]; -extern const u8 gMonShinyPalette_Slowbro[]; -extern const u8 gMonStillFrontPic_Slowbro[]; +extern const u32 gMonFrontPic_Slowbro[]; +extern const u32 gMonPalette_Slowbro[]; +extern const u32 gMonBackPic_Slowbro[]; +extern const u32 gMonShinyPalette_Slowbro[]; +extern const u32 gMonStillFrontPic_Slowbro[]; extern const u8 gMonIcon_Slowbro[]; extern const u8 gMonFootprint_Slowbro[]; -extern const u8 gMonFrontPic_Magnemite[]; -extern const u8 gMonPalette_Magnemite[]; -extern const u8 gMonBackPic_Magnemite[]; -extern const u8 gMonShinyPalette_Magnemite[]; -extern const u8 gMonStillFrontPic_Magnemite[]; +extern const u32 gMonFrontPic_Magnemite[]; +extern const u32 gMonPalette_Magnemite[]; +extern const u32 gMonBackPic_Magnemite[]; +extern const u32 gMonShinyPalette_Magnemite[]; +extern const u32 gMonStillFrontPic_Magnemite[]; extern const u8 gMonIcon_Magnemite[]; extern const u8 gMonFootprint_Magnemite[]; -extern const u8 gMonFrontPic_Magneton[]; -extern const u8 gMonPalette_Magneton[]; -extern const u8 gMonBackPic_Magneton[]; -extern const u8 gMonShinyPalette_Magneton[]; -extern const u8 gMonStillFrontPic_Magneton[]; +extern const u32 gMonFrontPic_Magneton[]; +extern const u32 gMonPalette_Magneton[]; +extern const u32 gMonBackPic_Magneton[]; +extern const u32 gMonShinyPalette_Magneton[]; +extern const u32 gMonStillFrontPic_Magneton[]; extern const u8 gMonIcon_Magneton[]; extern const u8 gMonFootprint_Magneton[]; -extern const u8 gMonFrontPic_Farfetchd[]; -extern const u8 gMonPalette_Farfetchd[]; -extern const u8 gMonBackPic_Farfetchd[]; -extern const u8 gMonShinyPalette_Farfetchd[]; -extern const u8 gMonStillFrontPic_Farfetchd[]; +extern const u32 gMonFrontPic_Farfetchd[]; +extern const u32 gMonPalette_Farfetchd[]; +extern const u32 gMonBackPic_Farfetchd[]; +extern const u32 gMonShinyPalette_Farfetchd[]; +extern const u32 gMonStillFrontPic_Farfetchd[]; extern const u8 gMonIcon_Farfetchd[]; extern const u8 gMonFootprint_Farfetchd[]; -extern const u8 gMonFrontPic_Doduo[]; -extern const u8 gMonPalette_Doduo[]; -extern const u8 gMonBackPic_Doduo[]; -extern const u8 gMonShinyPalette_Doduo[]; -extern const u8 gMonStillFrontPic_Doduo[]; +extern const u32 gMonFrontPic_Doduo[]; +extern const u32 gMonPalette_Doduo[]; +extern const u32 gMonBackPic_Doduo[]; +extern const u32 gMonShinyPalette_Doduo[]; +extern const u32 gMonStillFrontPic_Doduo[]; extern const u8 gMonIcon_Doduo[]; extern const u8 gMonFootprint_Doduo[]; -extern const u8 gMonFrontPic_Dodrio[]; -extern const u8 gMonPalette_Dodrio[]; -extern const u8 gMonBackPic_Dodrio[]; -extern const u8 gMonShinyPalette_Dodrio[]; -extern const u8 gMonStillFrontPic_Dodrio[]; +extern const u32 gMonFrontPic_Dodrio[]; +extern const u32 gMonPalette_Dodrio[]; +extern const u32 gMonBackPic_Dodrio[]; +extern const u32 gMonShinyPalette_Dodrio[]; +extern const u32 gMonStillFrontPic_Dodrio[]; extern const u8 gMonIcon_Dodrio[]; extern const u8 gMonFootprint_Dodrio[]; -extern const u8 gMonFrontPic_Seel[]; -extern const u8 gMonPalette_Seel[]; -extern const u8 gMonBackPic_Seel[]; -extern const u8 gMonShinyPalette_Seel[]; -extern const u8 gMonStillFrontPic_Seel[]; +extern const u32 gMonFrontPic_Seel[]; +extern const u32 gMonPalette_Seel[]; +extern const u32 gMonBackPic_Seel[]; +extern const u32 gMonShinyPalette_Seel[]; +extern const u32 gMonStillFrontPic_Seel[]; extern const u8 gMonIcon_Seel[]; extern const u8 gMonFootprint_Seel[]; -extern const u8 gMonFrontPic_Dewgong[]; -extern const u8 gMonPalette_Dewgong[]; -extern const u8 gMonBackPic_Dewgong[]; -extern const u8 gMonShinyPalette_Dewgong[]; -extern const u8 gMonStillFrontPic_Dewgong[]; +extern const u32 gMonFrontPic_Dewgong[]; +extern const u32 gMonPalette_Dewgong[]; +extern const u32 gMonBackPic_Dewgong[]; +extern const u32 gMonShinyPalette_Dewgong[]; +extern const u32 gMonStillFrontPic_Dewgong[]; extern const u8 gMonIcon_Dewgong[]; extern const u8 gMonFootprint_Dewgong[]; -extern const u8 gMonFrontPic_Grimer[]; -extern const u8 gMonPalette_Grimer[]; -extern const u8 gMonBackPic_Grimer[]; -extern const u8 gMonShinyPalette_Grimer[]; -extern const u8 gMonStillFrontPic_Grimer[]; +extern const u32 gMonFrontPic_Grimer[]; +extern const u32 gMonPalette_Grimer[]; +extern const u32 gMonBackPic_Grimer[]; +extern const u32 gMonShinyPalette_Grimer[]; +extern const u32 gMonStillFrontPic_Grimer[]; extern const u8 gMonIcon_Grimer[]; extern const u8 gMonFootprint_Grimer[]; -extern const u8 gMonStillFrontPic_Muk[]; -extern const u8 gMonFrontPic_Muk[]; -extern const u8 gMonPalette_Muk[]; -extern const u8 gMonBackPic_Muk[]; -extern const u8 gMonShinyPalette_Muk[]; -extern const u8 gMonStillFrontPic_Shellder[]; +extern const u32 gMonStillFrontPic_Muk[]; +extern const u32 gMonFrontPic_Muk[]; +extern const u32 gMonPalette_Muk[]; +extern const u32 gMonBackPic_Muk[]; +extern const u32 gMonShinyPalette_Muk[]; +extern const u32 gMonStillFrontPic_Shellder[]; extern const u8 gMonIcon_Muk[]; extern const u8 gMonFootprint_Muk[]; -extern const u8 gMonFrontPic_Shellder[]; -extern const u8 gMonPalette_Shellder[]; -extern const u8 gMonBackPic_Shellder[]; -extern const u8 gMonShinyPalette_Shellder[]; -extern const u8 gMonStillFrontPic_Cloyster[]; +extern const u32 gMonFrontPic_Shellder[]; +extern const u32 gMonPalette_Shellder[]; +extern const u32 gMonBackPic_Shellder[]; +extern const u32 gMonShinyPalette_Shellder[]; +extern const u32 gMonStillFrontPic_Cloyster[]; extern const u8 gMonIcon_Shellder[]; extern const u8 gMonFootprint_Shellder[]; -extern const u8 gMonFrontPic_Cloyster[]; -extern const u8 gMonPalette_Cloyster[]; -extern const u8 gMonBackPic_Cloyster[]; -extern const u8 gMonShinyPalette_Cloyster[]; -extern const u8 gMonStillFrontPic_Gastly[]; +extern const u32 gMonFrontPic_Cloyster[]; +extern const u32 gMonPalette_Cloyster[]; +extern const u32 gMonBackPic_Cloyster[]; +extern const u32 gMonShinyPalette_Cloyster[]; +extern const u32 gMonStillFrontPic_Gastly[]; extern const u8 gMonIcon_Cloyster[]; extern const u8 gMonFootprint_Cloyster[]; -extern const u8 gMonFrontPic_Gastly[]; -extern const u8 gMonPalette_Gastly[]; -extern const u8 gMonBackPic_Gastly[]; -extern const u8 gMonShinyPalette_Gastly[]; -extern const u8 gMonStillFrontPic_Haunter[]; +extern const u32 gMonFrontPic_Gastly[]; +extern const u32 gMonPalette_Gastly[]; +extern const u32 gMonBackPic_Gastly[]; +extern const u32 gMonShinyPalette_Gastly[]; +extern const u32 gMonStillFrontPic_Haunter[]; extern const u8 gMonIcon_Gastly[]; extern const u8 gMonFootprint_Gastly[]; -extern const u8 gMonFrontPic_Haunter[]; -extern const u8 gMonPalette_Haunter[]; -extern const u8 gMonBackPic_Haunter[]; -extern const u8 gMonShinyPalette_Haunter[]; -extern const u8 gMonStillFrontPic_Haunter[]; +extern const u32 gMonFrontPic_Haunter[]; +extern const u32 gMonPalette_Haunter[]; +extern const u32 gMonBackPic_Haunter[]; +extern const u32 gMonShinyPalette_Haunter[]; +extern const u32 gMonStillFrontPic_Haunter[]; extern const u8 gMonIcon_Haunter[]; extern const u8 gMonFootprint_Haunter[]; -extern const u8 gMonFrontPic_Gengar[]; -extern const u8 gMonPalette_Gengar[]; -extern const u8 gMonBackPic_Gengar[]; -extern const u8 gMonShinyPalette_Gengar[]; -extern const u8 gMonStillFrontPic_Gengar[]; +extern const u32 gMonFrontPic_Gengar[]; +extern const u32 gMonPalette_Gengar[]; +extern const u32 gMonBackPic_Gengar[]; +extern const u32 gMonShinyPalette_Gengar[]; +extern const u32 gMonStillFrontPic_Gengar[]; extern const u8 gMonIcon_Gengar[]; extern const u8 gMonFootprint_Gengar[]; -extern const u8 gMonFrontPic_Onix[]; -extern const u8 gMonPalette_Onix[]; -extern const u8 gMonBackPic_Onix[]; -extern const u8 gMonShinyPalette_Onix[]; -extern const u8 gMonStillFrontPic_Onix[]; +extern const u32 gMonFrontPic_Onix[]; +extern const u32 gMonPalette_Onix[]; +extern const u32 gMonBackPic_Onix[]; +extern const u32 gMonShinyPalette_Onix[]; +extern const u32 gMonStillFrontPic_Onix[]; extern const u8 gMonIcon_Onix[]; extern const u8 gMonFootprint_Onix[]; -extern const u8 gMonFrontPic_Drowzee[]; -extern const u8 gMonPalette_Drowzee[]; -extern const u8 gMonBackPic_Drowzee[]; -extern const u8 gMonShinyPalette_Drowzee[]; -extern const u8 gMonStillFrontPic_Drowzee[]; +extern const u32 gMonFrontPic_Drowzee[]; +extern const u32 gMonPalette_Drowzee[]; +extern const u32 gMonBackPic_Drowzee[]; +extern const u32 gMonShinyPalette_Drowzee[]; +extern const u32 gMonStillFrontPic_Drowzee[]; extern const u8 gMonIcon_Drowzee[]; extern const u8 gMonFootprint_Drowzee[]; -extern const u8 gMonFrontPic_Hypno[]; -extern const u8 gMonPalette_Hypno[]; -extern const u8 gMonBackPic_Hypno[]; -extern const u8 gMonShinyPalette_Hypno[]; -extern const u8 gMonStillFrontPic_Hypno[]; +extern const u32 gMonFrontPic_Hypno[]; +extern const u32 gMonPalette_Hypno[]; +extern const u32 gMonBackPic_Hypno[]; +extern const u32 gMonShinyPalette_Hypno[]; +extern const u32 gMonStillFrontPic_Hypno[]; extern const u8 gMonIcon_Hypno[]; extern const u8 gMonFootprint_Hypno[]; -extern const u8 gMonFrontPic_Krabby[]; -extern const u8 gMonPalette_Krabby[]; -extern const u8 gMonBackPic_Krabby[]; -extern const u8 gMonShinyPalette_Krabby[]; -extern const u8 gMonStillFrontPic_Krabby[]; +extern const u32 gMonFrontPic_Krabby[]; +extern const u32 gMonPalette_Krabby[]; +extern const u32 gMonBackPic_Krabby[]; +extern const u32 gMonShinyPalette_Krabby[]; +extern const u32 gMonStillFrontPic_Krabby[]; extern const u8 gMonIcon_Krabby[]; extern const u8 gMonFootprint_Krabby[]; -extern const u8 gMonFrontPic_Kingler[]; -extern const u8 gMonPalette_Kingler[]; -extern const u8 gMonBackPic_Kingler[]; -extern const u8 gMonShinyPalette_Kingler[]; -extern const u8 gMonStillFrontPic_Kingler[]; +extern const u32 gMonFrontPic_Kingler[]; +extern const u32 gMonPalette_Kingler[]; +extern const u32 gMonBackPic_Kingler[]; +extern const u32 gMonShinyPalette_Kingler[]; +extern const u32 gMonStillFrontPic_Kingler[]; extern const u8 gMonIcon_Kingler[]; extern const u8 gMonFootprint_Kingler[]; -extern const u8 gMonFrontPic_Voltorb[]; -extern const u8 gMonPalette_Voltorb[]; -extern const u8 gMonBackPic_Voltorb[]; -extern const u8 gMonShinyPalette_Voltorb[]; -extern const u8 gMonStillFrontPic_Voltorb[]; +extern const u32 gMonFrontPic_Voltorb[]; +extern const u32 gMonPalette_Voltorb[]; +extern const u32 gMonBackPic_Voltorb[]; +extern const u32 gMonShinyPalette_Voltorb[]; +extern const u32 gMonStillFrontPic_Voltorb[]; extern const u8 gMonIcon_Voltorb[]; extern const u8 gMonFootprint_Voltorb[]; -extern const u8 gMonFrontPic_Electrode[]; -extern const u8 gMonPalette_Electrode[]; -extern const u8 gMonBackPic_Electrode[]; -extern const u8 gMonShinyPalette_Electrode[]; -extern const u8 gMonStillFrontPic_Electrode[]; +extern const u32 gMonFrontPic_Electrode[]; +extern const u32 gMonPalette_Electrode[]; +extern const u32 gMonBackPic_Electrode[]; +extern const u32 gMonShinyPalette_Electrode[]; +extern const u32 gMonStillFrontPic_Electrode[]; extern const u8 gMonIcon_Electrode[]; extern const u8 gMonFootprint_Electrode[]; -extern const u8 gMonFrontPic_Exeggcute[]; -extern const u8 gMonPalette_Exeggcute[]; -extern const u8 gMonBackPic_Exeggcute[]; -extern const u8 gMonShinyPalette_Exeggcute[]; -extern const u8 gMonStillFrontPic_Exeggcute[]; +extern const u32 gMonFrontPic_Exeggcute[]; +extern const u32 gMonPalette_Exeggcute[]; +extern const u32 gMonBackPic_Exeggcute[]; +extern const u32 gMonShinyPalette_Exeggcute[]; +extern const u32 gMonStillFrontPic_Exeggcute[]; extern const u8 gMonIcon_Exeggcute[]; extern const u8 gMonFootprint_Exeggcute[]; -extern const u8 gMonFrontPic_Exeggutor[]; -extern const u8 gMonPalette_Exeggutor[]; -extern const u8 gMonBackPic_Exeggutor[]; -extern const u8 gMonShinyPalette_Exeggutor[]; -extern const u8 gMonStillFrontPic_Exeggutor[]; +extern const u32 gMonFrontPic_Exeggutor[]; +extern const u32 gMonPalette_Exeggutor[]; +extern const u32 gMonBackPic_Exeggutor[]; +extern const u32 gMonShinyPalette_Exeggutor[]; +extern const u32 gMonStillFrontPic_Exeggutor[]; extern const u8 gMonIcon_Exeggutor[]; extern const u8 gMonFootprint_Exeggutor[]; -extern const u8 gMonFrontPic_Cubone[]; -extern const u8 gMonPalette_Cubone[]; -extern const u8 gMonBackPic_Cubone[]; -extern const u8 gMonShinyPalette_Cubone[]; -extern const u8 gMonStillFrontPic_Cubone[]; +extern const u32 gMonFrontPic_Cubone[]; +extern const u32 gMonPalette_Cubone[]; +extern const u32 gMonBackPic_Cubone[]; +extern const u32 gMonShinyPalette_Cubone[]; +extern const u32 gMonStillFrontPic_Cubone[]; extern const u8 gMonIcon_Cubone[]; extern const u8 gMonFootprint_Cubone[]; -extern const u8 gMonFrontPic_Marowak[]; -extern const u8 gMonPalette_Marowak[]; -extern const u8 gMonBackPic_Marowak[]; -extern const u8 gMonShinyPalette_Marowak[]; -extern const u8 gMonStillFrontPic_Marowak[]; +extern const u32 gMonFrontPic_Marowak[]; +extern const u32 gMonPalette_Marowak[]; +extern const u32 gMonBackPic_Marowak[]; +extern const u32 gMonShinyPalette_Marowak[]; +extern const u32 gMonStillFrontPic_Marowak[]; extern const u8 gMonIcon_Marowak[]; extern const u8 gMonFootprint_Marowak[]; -extern const u8 gMonFrontPic_Hitmonlee[]; -extern const u8 gMonPalette_Hitmonlee[]; -extern const u8 gMonBackPic_Hitmonlee[]; -extern const u8 gMonShinyPalette_Hitmonlee[]; -extern const u8 gMonStillFrontPic_Hitmonlee[]; +extern const u32 gMonFrontPic_Hitmonlee[]; +extern const u32 gMonPalette_Hitmonlee[]; +extern const u32 gMonBackPic_Hitmonlee[]; +extern const u32 gMonShinyPalette_Hitmonlee[]; +extern const u32 gMonStillFrontPic_Hitmonlee[]; extern const u8 gMonIcon_Hitmonlee[]; extern const u8 gMonFootprint_Hitmonlee[]; -extern const u8 gMonFrontPic_Hitmonchan[]; -extern const u8 gMonPalette_Hitmonchan[]; -extern const u8 gMonBackPic_Hitmonchan[]; -extern const u8 gMonShinyPalette_Hitmonchan[]; -extern const u8 gMonStillFrontPic_Hitmonchan[]; +extern const u32 gMonFrontPic_Hitmonchan[]; +extern const u32 gMonPalette_Hitmonchan[]; +extern const u32 gMonBackPic_Hitmonchan[]; +extern const u32 gMonShinyPalette_Hitmonchan[]; +extern const u32 gMonStillFrontPic_Hitmonchan[]; extern const u8 gMonIcon_Hitmonchan[]; extern const u8 gMonFootprint_Hitmonchan[]; -extern const u8 gMonFrontPic_Lickitung[]; -extern const u8 gMonPalette_Lickitung[]; -extern const u8 gMonBackPic_Lickitung[]; -extern const u8 gMonShinyPalette_Lickitung[]; -extern const u8 gMonStillFrontPic_Lickitung[]; +extern const u32 gMonFrontPic_Lickitung[]; +extern const u32 gMonPalette_Lickitung[]; +extern const u32 gMonBackPic_Lickitung[]; +extern const u32 gMonShinyPalette_Lickitung[]; +extern const u32 gMonStillFrontPic_Lickitung[]; extern const u8 gMonIcon_Lickitung[]; extern const u8 gMonFootprint_Lickitung[]; -extern const u8 gMonFrontPic_Koffing[]; -extern const u8 gMonPalette_Koffing[]; -extern const u8 gMonBackPic_Koffing[]; -extern const u8 gMonShinyPalette_Koffing[]; -extern const u8 gMonStillFrontPic_Koffing[]; +extern const u32 gMonFrontPic_Koffing[]; +extern const u32 gMonPalette_Koffing[]; +extern const u32 gMonBackPic_Koffing[]; +extern const u32 gMonShinyPalette_Koffing[]; +extern const u32 gMonStillFrontPic_Koffing[]; extern const u8 gMonIcon_Koffing[]; extern const u8 gMonFootprint_Koffing[]; -extern const u8 gMonFrontPic_Weezing[]; -extern const u8 gMonPalette_Weezing[]; -extern const u8 gMonBackPic_Weezing[]; -extern const u8 gMonShinyPalette_Weezing[]; -extern const u8 gMonStillFrontPic_Weezing[]; +extern const u32 gMonFrontPic_Weezing[]; +extern const u32 gMonPalette_Weezing[]; +extern const u32 gMonBackPic_Weezing[]; +extern const u32 gMonShinyPalette_Weezing[]; +extern const u32 gMonStillFrontPic_Weezing[]; extern const u8 gMonIcon_Weezing[]; extern const u8 gMonFootprint_Weezing[]; -extern const u8 gMonFrontPic_Rhyhorn[]; -extern const u8 gMonPalette_Rhyhorn[]; -extern const u8 gMonBackPic_Rhyhorn[]; -extern const u8 gMonShinyPalette_Rhyhorn[]; -extern const u8 gMonStillFrontPic_Rhyhorn[]; +extern const u32 gMonFrontPic_Rhyhorn[]; +extern const u32 gMonPalette_Rhyhorn[]; +extern const u32 gMonBackPic_Rhyhorn[]; +extern const u32 gMonShinyPalette_Rhyhorn[]; +extern const u32 gMonStillFrontPic_Rhyhorn[]; extern const u8 gMonIcon_Rhyhorn[]; extern const u8 gMonFootprint_Rhyhorn[]; -extern const u8 gMonFrontPic_Rhydon[]; -extern const u8 gMonPalette_Rhydon[]; -extern const u8 gMonBackPic_Rhydon[]; -extern const u8 gMonShinyPalette_Rhydon[]; -extern const u8 gMonStillFrontPic_Rhydon[]; +extern const u32 gMonFrontPic_Rhydon[]; +extern const u32 gMonPalette_Rhydon[]; +extern const u32 gMonBackPic_Rhydon[]; +extern const u32 gMonShinyPalette_Rhydon[]; +extern const u32 gMonStillFrontPic_Rhydon[]; extern const u8 gMonIcon_Rhydon[]; extern const u8 gMonFootprint_Rhydon[]; -extern const u8 gMonFrontPic_Chansey[]; -extern const u8 gMonPalette_Chansey[]; -extern const u8 gMonBackPic_Chansey[]; -extern const u8 gMonShinyPalette_Chansey[]; -extern const u8 gMonStillFrontPic_Chansey[]; +extern const u32 gMonFrontPic_Chansey[]; +extern const u32 gMonPalette_Chansey[]; +extern const u32 gMonBackPic_Chansey[]; +extern const u32 gMonShinyPalette_Chansey[]; +extern const u32 gMonStillFrontPic_Chansey[]; extern const u8 gMonIcon_Chansey[]; extern const u8 gMonFootprint_Chansey[]; -extern const u8 gMonFrontPic_Tangela[]; -extern const u8 gMonPalette_Tangela[]; -extern const u8 gMonBackPic_Tangela[]; -extern const u8 gMonShinyPalette_Tangela[]; -extern const u8 gMonStillFrontPic_Tangela[]; +extern const u32 gMonFrontPic_Tangela[]; +extern const u32 gMonPalette_Tangela[]; +extern const u32 gMonBackPic_Tangela[]; +extern const u32 gMonShinyPalette_Tangela[]; +extern const u32 gMonStillFrontPic_Tangela[]; extern const u8 gMonIcon_Tangela[]; extern const u8 gMonFootprint_Tangela[]; -extern const u8 gMonFrontPic_Kangaskhan[]; -extern const u8 gMonPalette_Kangaskhan[]; -extern const u8 gMonBackPic_Kangaskhan[]; -extern const u8 gMonShinyPalette_Kangaskhan[]; -extern const u8 gMonStillFrontPic_Kangaskhan[]; +extern const u32 gMonFrontPic_Kangaskhan[]; +extern const u32 gMonPalette_Kangaskhan[]; +extern const u32 gMonBackPic_Kangaskhan[]; +extern const u32 gMonShinyPalette_Kangaskhan[]; +extern const u32 gMonStillFrontPic_Kangaskhan[]; extern const u8 gMonIcon_Kangaskhan[]; extern const u8 gMonFootprint_Kangaskhan[]; -extern const u8 gMonFrontPic_Horsea[]; -extern const u8 gMonPalette_Horsea[]; -extern const u8 gMonBackPic_Horsea[]; -extern const u8 gMonShinyPalette_Horsea[]; -extern const u8 gMonStillFrontPic_Horsea[]; +extern const u32 gMonFrontPic_Horsea[]; +extern const u32 gMonPalette_Horsea[]; +extern const u32 gMonBackPic_Horsea[]; +extern const u32 gMonShinyPalette_Horsea[]; +extern const u32 gMonStillFrontPic_Horsea[]; extern const u8 gMonIcon_Horsea[]; extern const u8 gMonFootprint_Horsea[]; -extern const u8 gMonFrontPic_Seadra[]; -extern const u8 gMonPalette_Seadra[]; -extern const u8 gMonBackPic_Seadra[]; -extern const u8 gMonShinyPalette_Seadra[]; -extern const u8 gMonStillFrontPic_Seadra[]; +extern const u32 gMonFrontPic_Seadra[]; +extern const u32 gMonPalette_Seadra[]; +extern const u32 gMonBackPic_Seadra[]; +extern const u32 gMonShinyPalette_Seadra[]; +extern const u32 gMonStillFrontPic_Seadra[]; extern const u8 gMonIcon_Seadra[]; extern const u8 gMonFootprint_Seadra[]; -extern const u8 gMonFrontPic_Goldeen[]; -extern const u8 gMonPalette_Goldeen[]; -extern const u8 gMonBackPic_Goldeen[]; -extern const u8 gMonShinyPalette_Goldeen[]; -extern const u8 gMonStillFrontPic_Goldeen[]; +extern const u32 gMonFrontPic_Goldeen[]; +extern const u32 gMonPalette_Goldeen[]; +extern const u32 gMonBackPic_Goldeen[]; +extern const u32 gMonShinyPalette_Goldeen[]; +extern const u32 gMonStillFrontPic_Goldeen[]; extern const u8 gMonIcon_Goldeen[]; extern const u8 gMonFootprint_Goldeen[]; -extern const u8 gMonFrontPic_Seaking[]; -extern const u8 gMonPalette_Seaking[]; -extern const u8 gMonBackPic_Seaking[]; -extern const u8 gMonShinyPalette_Seaking[]; -extern const u8 gMonStillFrontPic_Seaking[]; +extern const u32 gMonFrontPic_Seaking[]; +extern const u32 gMonPalette_Seaking[]; +extern const u32 gMonBackPic_Seaking[]; +extern const u32 gMonShinyPalette_Seaking[]; +extern const u32 gMonStillFrontPic_Seaking[]; extern const u8 gMonIcon_Seaking[]; extern const u8 gMonFootprint_Seaking[]; -extern const u8 gMonFrontPic_Staryu[]; -extern const u8 gMonPalette_Staryu[]; -extern const u8 gMonBackPic_Staryu[]; -extern const u8 gMonShinyPalette_Staryu[]; -extern const u8 gMonStillFrontPic_Staryu[]; +extern const u32 gMonFrontPic_Staryu[]; +extern const u32 gMonPalette_Staryu[]; +extern const u32 gMonBackPic_Staryu[]; +extern const u32 gMonShinyPalette_Staryu[]; +extern const u32 gMonStillFrontPic_Staryu[]; extern const u8 gMonIcon_Staryu[]; extern const u8 gMonFootprint_Staryu[]; -extern const u8 gMonFrontPic_Starmie[]; -extern const u8 gMonPalette_Starmie[]; -extern const u8 gMonBackPic_Starmie[]; -extern const u8 gMonShinyPalette_Starmie[]; -extern const u8 gMonStillFrontPic_Starmie[]; +extern const u32 gMonFrontPic_Starmie[]; +extern const u32 gMonPalette_Starmie[]; +extern const u32 gMonBackPic_Starmie[]; +extern const u32 gMonShinyPalette_Starmie[]; +extern const u32 gMonStillFrontPic_Starmie[]; extern const u8 gMonIcon_Starmie[]; extern const u8 gMonFootprint_Starmie[]; -extern const u8 gMonFrontPic_Mrmime[]; -extern const u8 gMonPalette_Mrmime[]; -extern const u8 gMonBackPic_Mrmime[]; -extern const u8 gMonShinyPalette_Mrmime[]; -extern const u8 gMonStillFrontPic_Mrmime[]; +extern const u32 gMonFrontPic_Mrmime[]; +extern const u32 gMonPalette_Mrmime[]; +extern const u32 gMonBackPic_Mrmime[]; +extern const u32 gMonShinyPalette_Mrmime[]; +extern const u32 gMonStillFrontPic_Mrmime[]; extern const u8 gMonIcon_Mrmime[]; extern const u8 gMonFootprint_Mrmime[]; -extern const u8 gMonFrontPic_Scyther[]; -extern const u8 gMonPalette_Scyther[]; -extern const u8 gMonBackPic_Scyther[]; -extern const u8 gMonShinyPalette_Scyther[]; -extern const u8 gMonStillFrontPic_Scyther[]; +extern const u32 gMonFrontPic_Scyther[]; +extern const u32 gMonPalette_Scyther[]; +extern const u32 gMonBackPic_Scyther[]; +extern const u32 gMonShinyPalette_Scyther[]; +extern const u32 gMonStillFrontPic_Scyther[]; extern const u8 gMonIcon_Scyther[]; extern const u8 gMonFootprint_Scyther[]; -extern const u8 gMonFrontPic_Jynx[]; -extern const u8 gMonPalette_Jynx[]; -extern const u8 gMonBackPic_Jynx[]; -extern const u8 gMonShinyPalette_Jynx[]; -extern const u8 gMonStillFrontPic_Jynx[]; +extern const u32 gMonFrontPic_Jynx[]; +extern const u32 gMonPalette_Jynx[]; +extern const u32 gMonBackPic_Jynx[]; +extern const u32 gMonShinyPalette_Jynx[]; +extern const u32 gMonStillFrontPic_Jynx[]; extern const u8 gMonIcon_Jynx[]; extern const u8 gMonFootprint_Jynx[]; -extern const u8 gMonFrontPic_Electabuzz[]; -extern const u8 gMonPalette_Electabuzz[]; -extern const u8 gMonBackPic_Electabuzz[]; -extern const u8 gMonShinyPalette_Electabuzz[]; -extern const u8 gMonStillFrontPic_Electabuzz[]; +extern const u32 gMonFrontPic_Electabuzz[]; +extern const u32 gMonPalette_Electabuzz[]; +extern const u32 gMonBackPic_Electabuzz[]; +extern const u32 gMonShinyPalette_Electabuzz[]; +extern const u32 gMonStillFrontPic_Electabuzz[]; extern const u8 gMonIcon_Electabuzz[]; extern const u8 gMonFootprint_Electabuzz[]; -extern const u8 gMonFrontPic_Magmar[]; -extern const u8 gMonPalette_Magmar[]; -extern const u8 gMonBackPic_Magmar[]; -extern const u8 gMonShinyPalette_Magmar[]; -extern const u8 gMonStillFrontPic_Magmar[]; +extern const u32 gMonFrontPic_Magmar[]; +extern const u32 gMonPalette_Magmar[]; +extern const u32 gMonBackPic_Magmar[]; +extern const u32 gMonShinyPalette_Magmar[]; +extern const u32 gMonStillFrontPic_Magmar[]; extern const u8 gMonIcon_Magmar[]; extern const u8 gMonFootprint_Magmar[]; -extern const u8 gMonFrontPic_Pinsir[]; -extern const u8 gMonPalette_Pinsir[]; -extern const u8 gMonBackPic_Pinsir[]; -extern const u8 gMonShinyPalette_Pinsir[]; -extern const u8 gMonStillFrontPic_Pinsir[]; +extern const u32 gMonFrontPic_Pinsir[]; +extern const u32 gMonPalette_Pinsir[]; +extern const u32 gMonBackPic_Pinsir[]; +extern const u32 gMonShinyPalette_Pinsir[]; +extern const u32 gMonStillFrontPic_Pinsir[]; extern const u8 gMonIcon_Pinsir[]; extern const u8 gMonFootprint_Pinsir[]; -extern const u8 gMonFrontPic_Tauros[]; -extern const u8 gMonPalette_Tauros[]; -extern const u8 gMonBackPic_Tauros[]; -extern const u8 gMonShinyPalette_Tauros[]; -extern const u8 gMonStillFrontPic_Tauros[]; +extern const u32 gMonFrontPic_Tauros[]; +extern const u32 gMonPalette_Tauros[]; +extern const u32 gMonBackPic_Tauros[]; +extern const u32 gMonShinyPalette_Tauros[]; +extern const u32 gMonStillFrontPic_Tauros[]; extern const u8 gMonIcon_Tauros[]; extern const u8 gMonFootprint_Tauros[]; -extern const u8 gMonFrontPic_Magikarp[]; -extern const u8 gMonPalette_Magikarp[]; -extern const u8 gMonBackPic_Magikarp[]; -extern const u8 gMonShinyPalette_Magikarp[]; -extern const u8 gMonStillFrontPic_Magikarp[]; +extern const u32 gMonFrontPic_Magikarp[]; +extern const u32 gMonPalette_Magikarp[]; +extern const u32 gMonBackPic_Magikarp[]; +extern const u32 gMonShinyPalette_Magikarp[]; +extern const u32 gMonStillFrontPic_Magikarp[]; extern const u8 gMonIcon_Magikarp[]; extern const u8 gMonFootprint_Magikarp[]; -extern const u8 gMonFrontPic_Gyarados[]; -extern const u8 gMonPalette_Gyarados[]; -extern const u8 gMonBackPic_Gyarados[]; -extern const u8 gMonShinyPalette_Gyarados[]; -extern const u8 gMonStillFrontPic_Gyarados[]; +extern const u32 gMonFrontPic_Gyarados[]; +extern const u32 gMonPalette_Gyarados[]; +extern const u32 gMonBackPic_Gyarados[]; +extern const u32 gMonShinyPalette_Gyarados[]; +extern const u32 gMonStillFrontPic_Gyarados[]; extern const u8 gMonIcon_Gyarados[]; extern const u8 gMonFootprint_Gyarados[]; -extern const u8 gMonFrontPic_Lapras[]; -extern const u8 gMonPalette_Lapras[]; -extern const u8 gMonBackPic_Lapras[]; -extern const u8 gMonShinyPalette_Lapras[]; -extern const u8 gMonStillFrontPic_Lapras[]; +extern const u32 gMonFrontPic_Lapras[]; +extern const u32 gMonPalette_Lapras[]; +extern const u32 gMonBackPic_Lapras[]; +extern const u32 gMonShinyPalette_Lapras[]; +extern const u32 gMonStillFrontPic_Lapras[]; extern const u8 gMonIcon_Lapras[]; extern const u8 gMonFootprint_Lapras[]; -extern const u8 gMonFrontPic_Ditto[]; -extern const u8 gMonPalette_Ditto[]; -extern const u8 gMonBackPic_Ditto[]; -extern const u8 gMonShinyPalette_Ditto[]; -extern const u8 gMonStillFrontPic_Ditto[]; +extern const u32 gMonFrontPic_Ditto[]; +extern const u32 gMonPalette_Ditto[]; +extern const u32 gMonBackPic_Ditto[]; +extern const u32 gMonShinyPalette_Ditto[]; +extern const u32 gMonStillFrontPic_Ditto[]; extern const u8 gMonIcon_Ditto[]; extern const u8 gMonFootprint_Ditto[]; -extern const u8 gMonFrontPic_Eevee[]; -extern const u8 gMonPalette_Eevee[]; -extern const u8 gMonBackPic_Eevee[]; -extern const u8 gMonShinyPalette_Eevee[]; -extern const u8 gMonStillFrontPic_Eevee[]; +extern const u32 gMonFrontPic_Eevee[]; +extern const u32 gMonPalette_Eevee[]; +extern const u32 gMonBackPic_Eevee[]; +extern const u32 gMonShinyPalette_Eevee[]; +extern const u32 gMonStillFrontPic_Eevee[]; extern const u8 gMonIcon_Eevee[]; extern const u8 gMonFootprint_Eevee[]; -extern const u8 gMonFrontPic_Vaporeon[]; -extern const u8 gMonPalette_Vaporeon[]; -extern const u8 gMonBackPic_Vaporeon[]; -extern const u8 gMonShinyPalette_Vaporeon[]; -extern const u8 gMonStillFrontPic_Vaporeon[]; +extern const u32 gMonFrontPic_Vaporeon[]; +extern const u32 gMonPalette_Vaporeon[]; +extern const u32 gMonBackPic_Vaporeon[]; +extern const u32 gMonShinyPalette_Vaporeon[]; +extern const u32 gMonStillFrontPic_Vaporeon[]; extern const u8 gMonIcon_Vaporeon[]; extern const u8 gMonFootprint_Vaporeon[]; -extern const u8 gMonFrontPic_Jolteon[]; -extern const u8 gMonPalette_Jolteon[]; -extern const u8 gMonBackPic_Jolteon[]; -extern const u8 gMonShinyPalette_Jolteon[]; -extern const u8 gMonStillFrontPic_Jolteon[]; +extern const u32 gMonFrontPic_Jolteon[]; +extern const u32 gMonPalette_Jolteon[]; +extern const u32 gMonBackPic_Jolteon[]; +extern const u32 gMonShinyPalette_Jolteon[]; +extern const u32 gMonStillFrontPic_Jolteon[]; extern const u8 gMonIcon_Jolteon[]; extern const u8 gMonFootprint_Jolteon[]; -extern const u8 gMonFrontPic_Flareon[]; -extern const u8 gMonPalette_Flareon[]; -extern const u8 gMonBackPic_Flareon[]; -extern const u8 gMonShinyPalette_Flareon[]; -extern const u8 gMonStillFrontPic_Flareon[]; +extern const u32 gMonFrontPic_Flareon[]; +extern const u32 gMonPalette_Flareon[]; +extern const u32 gMonBackPic_Flareon[]; +extern const u32 gMonShinyPalette_Flareon[]; +extern const u32 gMonStillFrontPic_Flareon[]; extern const u8 gMonIcon_Flareon[]; extern const u8 gMonFootprint_Flareon[]; -extern const u8 gMonFrontPic_Porygon[]; -extern const u8 gMonPalette_Porygon[]; -extern const u8 gMonBackPic_Porygon[]; -extern const u8 gMonShinyPalette_Porygon[]; -extern const u8 gMonStillFrontPic_Porygon[]; +extern const u32 gMonFrontPic_Porygon[]; +extern const u32 gMonPalette_Porygon[]; +extern const u32 gMonBackPic_Porygon[]; +extern const u32 gMonShinyPalette_Porygon[]; +extern const u32 gMonStillFrontPic_Porygon[]; extern const u8 gMonIcon_Porygon[]; extern const u8 gMonFootprint_Porygon[]; -extern const u8 gMonFrontPic_Omanyte[]; -extern const u8 gMonPalette_Omanyte[]; -extern const u8 gMonBackPic_Omanyte[]; -extern const u8 gMonShinyPalette_Omanyte[]; -extern const u8 gMonStillFrontPic_Omanyte[]; +extern const u32 gMonFrontPic_Omanyte[]; +extern const u32 gMonPalette_Omanyte[]; +extern const u32 gMonBackPic_Omanyte[]; +extern const u32 gMonShinyPalette_Omanyte[]; +extern const u32 gMonStillFrontPic_Omanyte[]; extern const u8 gMonIcon_Omanyte[]; extern const u8 gMonFootprint_Omanyte[]; -extern const u8 gMonFrontPic_Omastar[]; -extern const u8 gMonPalette_Omastar[]; -extern const u8 gMonBackPic_Omastar[]; -extern const u8 gMonShinyPalette_Omastar[]; -extern const u8 gMonStillFrontPic_Omastar[]; +extern const u32 gMonFrontPic_Omastar[]; +extern const u32 gMonPalette_Omastar[]; +extern const u32 gMonBackPic_Omastar[]; +extern const u32 gMonShinyPalette_Omastar[]; +extern const u32 gMonStillFrontPic_Omastar[]; extern const u8 gMonIcon_Omastar[]; extern const u8 gMonFootprint_Omastar[]; -extern const u8 gMonFrontPic_Kabuto[]; -extern const u8 gMonPalette_Kabuto[]; -extern const u8 gMonBackPic_Kabuto[]; -extern const u8 gMonShinyPalette_Kabuto[]; -extern const u8 gMonStillFrontPic_Kabuto[]; +extern const u32 gMonFrontPic_Kabuto[]; +extern const u32 gMonPalette_Kabuto[]; +extern const u32 gMonBackPic_Kabuto[]; +extern const u32 gMonShinyPalette_Kabuto[]; +extern const u32 gMonStillFrontPic_Kabuto[]; extern const u8 gMonIcon_Kabuto[]; extern const u8 gMonFootprint_Kabuto[]; -extern const u8 gMonFrontPic_Kabutops[]; -extern const u8 gMonPalette_Kabutops[]; -extern const u8 gMonBackPic_Kabutops[]; -extern const u8 gMonShinyPalette_Kabutops[]; -extern const u8 gMonStillFrontPic_Kabutops[]; +extern const u32 gMonFrontPic_Kabutops[]; +extern const u32 gMonPalette_Kabutops[]; +extern const u32 gMonBackPic_Kabutops[]; +extern const u32 gMonShinyPalette_Kabutops[]; +extern const u32 gMonStillFrontPic_Kabutops[]; extern const u8 gMonIcon_Kabutops[]; extern const u8 gMonFootprint_Kabutops[]; -extern const u8 gMonFrontPic_Aerodactyl[]; -extern const u8 gMonPalette_Aerodactyl[]; -extern const u8 gMonBackPic_Aerodactyl[]; -extern const u8 gMonShinyPalette_Aerodactyl[]; -extern const u8 gMonStillFrontPic_Aerodactyl[]; +extern const u32 gMonFrontPic_Aerodactyl[]; +extern const u32 gMonPalette_Aerodactyl[]; +extern const u32 gMonBackPic_Aerodactyl[]; +extern const u32 gMonShinyPalette_Aerodactyl[]; +extern const u32 gMonStillFrontPic_Aerodactyl[]; extern const u8 gMonIcon_Aerodactyl[]; extern const u8 gMonFootprint_Aerodactyl[]; -extern const u8 gMonFrontPic_Snorlax[]; -extern const u8 gMonPalette_Snorlax[]; -extern const u8 gMonBackPic_Snorlax[]; -extern const u8 gMonShinyPalette_Snorlax[]; -extern const u8 gMonStillFrontPic_Snorlax[]; +extern const u32 gMonFrontPic_Snorlax[]; +extern const u32 gMonPalette_Snorlax[]; +extern const u32 gMonBackPic_Snorlax[]; +extern const u32 gMonShinyPalette_Snorlax[]; +extern const u32 gMonStillFrontPic_Snorlax[]; extern const u8 gMonIcon_Snorlax[]; extern const u8 gMonFootprint_Snorlax[]; -extern const u8 gMonFrontPic_Articuno[]; -extern const u8 gMonPalette_Articuno[]; -extern const u8 gMonBackPic_Articuno[]; -extern const u8 gMonShinyPalette_Articuno[]; -extern const u8 gMonStillFrontPic_Articuno[]; +extern const u32 gMonFrontPic_Articuno[]; +extern const u32 gMonPalette_Articuno[]; +extern const u32 gMonBackPic_Articuno[]; +extern const u32 gMonShinyPalette_Articuno[]; +extern const u32 gMonStillFrontPic_Articuno[]; extern const u8 gMonIcon_Articuno[]; extern const u8 gMonFootprint_Articuno[]; -extern const u8 gMonFrontPic_Zapdos[]; -extern const u8 gMonPalette_Zapdos[]; -extern const u8 gMonBackPic_Zapdos[]; -extern const u8 gMonShinyPalette_Zapdos[]; -extern const u8 gMonStillFrontPic_Zapdos[]; +extern const u32 gMonFrontPic_Zapdos[]; +extern const u32 gMonPalette_Zapdos[]; +extern const u32 gMonBackPic_Zapdos[]; +extern const u32 gMonShinyPalette_Zapdos[]; +extern const u32 gMonStillFrontPic_Zapdos[]; extern const u8 gMonIcon_Zapdos[]; extern const u8 gMonFootprint_Zapdos[]; -extern const u8 gMonFrontPic_Moltres[]; -extern const u8 gMonPalette_Moltres[]; -extern const u8 gMonBackPic_Moltres[]; -extern const u8 gMonShinyPalette_Moltres[]; -extern const u8 gMonStillFrontPic_Moltres[]; +extern const u32 gMonFrontPic_Moltres[]; +extern const u32 gMonPalette_Moltres[]; +extern const u32 gMonBackPic_Moltres[]; +extern const u32 gMonShinyPalette_Moltres[]; +extern const u32 gMonStillFrontPic_Moltres[]; extern const u8 gMonIcon_Moltres[]; extern const u8 gMonFootprint_Moltres[]; -extern const u8 gMonFrontPic_Dratini[]; -extern const u8 gMonPalette_Dratini[]; -extern const u8 gMonBackPic_Dratini[]; -extern const u8 gMonShinyPalette_Dratini[]; -extern const u8 gMonStillFrontPic_Dratini[]; +extern const u32 gMonFrontPic_Dratini[]; +extern const u32 gMonPalette_Dratini[]; +extern const u32 gMonBackPic_Dratini[]; +extern const u32 gMonShinyPalette_Dratini[]; +extern const u32 gMonStillFrontPic_Dratini[]; extern const u8 gMonIcon_Dratini[]; extern const u8 gMonFootprint_Dratini[]; -extern const u8 gMonFrontPic_Dragonair[]; -extern const u8 gMonPalette_Dragonair[]; -extern const u8 gMonBackPic_Dragonair[]; -extern const u8 gMonShinyPalette_Dragonair[]; -extern const u8 gMonStillFrontPic_Dragonair[]; +extern const u32 gMonFrontPic_Dragonair[]; +extern const u32 gMonPalette_Dragonair[]; +extern const u32 gMonBackPic_Dragonair[]; +extern const u32 gMonShinyPalette_Dragonair[]; +extern const u32 gMonStillFrontPic_Dragonair[]; extern const u8 gMonIcon_Dragonair[]; extern const u8 gMonFootprint_Dragonair[]; -extern const u8 gMonFrontPic_Dragonite[]; -extern const u8 gMonPalette_Dragonite[]; -extern const u8 gMonBackPic_Dragonite[]; -extern const u8 gMonShinyPalette_Dragonite[]; -extern const u8 gMonStillFrontPic_Dragonite[]; +extern const u32 gMonFrontPic_Dragonite[]; +extern const u32 gMonPalette_Dragonite[]; +extern const u32 gMonBackPic_Dragonite[]; +extern const u32 gMonShinyPalette_Dragonite[]; +extern const u32 gMonStillFrontPic_Dragonite[]; extern const u8 gMonIcon_Dragonite[]; extern const u8 gMonFootprint_Dragonite[]; -extern const u8 gMonFrontPic_Mewtwo[]; -extern const u8 gMonPalette_Mewtwo[]; -extern const u8 gMonBackPic_Mewtwo[]; -extern const u8 gMonShinyPalette_Mewtwo[]; -extern const u8 gMonStillFrontPic_Mewtwo[]; +extern const u32 gMonFrontPic_Mewtwo[]; +extern const u32 gMonPalette_Mewtwo[]; +extern const u32 gMonBackPic_Mewtwo[]; +extern const u32 gMonShinyPalette_Mewtwo[]; +extern const u32 gMonStillFrontPic_Mewtwo[]; extern const u8 gMonIcon_Mewtwo[]; extern const u8 gMonFootprint_Mewtwo[]; -extern const u8 gMonFrontPic_Mew[]; -extern const u8 gMonPalette_Mew[]; -extern const u8 gMonBackPic_Mew[]; -extern const u8 gMonShinyPalette_Mew[]; -extern const u8 gMonStillFrontPic_Mew[]; +extern const u32 gMonFrontPic_Mew[]; +extern const u32 gMonPalette_Mew[]; +extern const u32 gMonBackPic_Mew[]; +extern const u32 gMonShinyPalette_Mew[]; +extern const u32 gMonStillFrontPic_Mew[]; extern const u8 gMonIcon_Mew[]; extern const u8 gMonFootprint_Mew[]; -extern const u8 gMonFrontPic_Chikorita[]; -extern const u8 gMonPalette_Chikorita[]; -extern const u8 gMonBackPic_Chikorita[]; -extern const u8 gMonShinyPalette_Chikorita[]; -extern const u8 gMonStillFrontPic_Chikorita[]; +extern const u32 gMonFrontPic_Chikorita[]; +extern const u32 gMonPalette_Chikorita[]; +extern const u32 gMonBackPic_Chikorita[]; +extern const u32 gMonShinyPalette_Chikorita[]; +extern const u32 gMonStillFrontPic_Chikorita[]; extern const u8 gMonIcon_Chikorita[]; extern const u8 gMonFootprint_Chikorita[]; -extern const u8 gMonFrontPic_Bayleef[]; -extern const u8 gMonPalette_Bayleef[]; -extern const u8 gMonBackPic_Bayleef[]; -extern const u8 gMonShinyPalette_Bayleef[]; -extern const u8 gMonStillFrontPic_Bayleef[]; +extern const u32 gMonFrontPic_Bayleef[]; +extern const u32 gMonPalette_Bayleef[]; +extern const u32 gMonBackPic_Bayleef[]; +extern const u32 gMonShinyPalette_Bayleef[]; +extern const u32 gMonStillFrontPic_Bayleef[]; extern const u8 gMonIcon_Bayleef[]; extern const u8 gMonFootprint_Bayleef[]; -extern const u8 gMonFrontPic_Meganium[]; -extern const u8 gMonPalette_Meganium[]; -extern const u8 gMonBackPic_Meganium[]; -extern const u8 gMonShinyPalette_Meganium[]; -extern const u8 gMonStillFrontPic_Meganium[]; +extern const u32 gMonFrontPic_Meganium[]; +extern const u32 gMonPalette_Meganium[]; +extern const u32 gMonBackPic_Meganium[]; +extern const u32 gMonShinyPalette_Meganium[]; +extern const u32 gMonStillFrontPic_Meganium[]; extern const u8 gMonIcon_Meganium[]; extern const u8 gMonFootprint_Meganium[]; -extern const u8 gMonFrontPic_Cyndaquil[]; -extern const u8 gMonPalette_Cyndaquil[]; -extern const u8 gMonBackPic_Cyndaquil[]; -extern const u8 gMonShinyPalette_Cyndaquil[]; -extern const u8 gMonStillFrontPic_Cyndaquil[]; +extern const u32 gMonFrontPic_Cyndaquil[]; +extern const u32 gMonPalette_Cyndaquil[]; +extern const u32 gMonBackPic_Cyndaquil[]; +extern const u32 gMonShinyPalette_Cyndaquil[]; +extern const u32 gMonStillFrontPic_Cyndaquil[]; extern const u8 gMonIcon_Cyndaquil[]; extern const u8 gMonFootprint_Cyndaquil[]; -extern const u8 gMonFrontPic_Quilava[]; -extern const u8 gMonPalette_Quilava[]; -extern const u8 gMonBackPic_Quilava[]; -extern const u8 gMonShinyPalette_Quilava[]; -extern const u8 gMonStillFrontPic_Quilava[]; +extern const u32 gMonFrontPic_Quilava[]; +extern const u32 gMonPalette_Quilava[]; +extern const u32 gMonBackPic_Quilava[]; +extern const u32 gMonShinyPalette_Quilava[]; +extern const u32 gMonStillFrontPic_Quilava[]; extern const u8 gMonIcon_Quilava[]; extern const u8 gMonFootprint_Quilava[]; -extern const u8 gMonFrontPic_Typhlosion[]; -extern const u8 gMonPalette_Typhlosion[]; -extern const u8 gMonBackPic_Typhlosion[]; -extern const u8 gMonShinyPalette_Typhlosion[]; -extern const u8 gMonStillFrontPic_Typhlosion[]; +extern const u32 gMonFrontPic_Typhlosion[]; +extern const u32 gMonPalette_Typhlosion[]; +extern const u32 gMonBackPic_Typhlosion[]; +extern const u32 gMonShinyPalette_Typhlosion[]; +extern const u32 gMonStillFrontPic_Typhlosion[]; extern const u8 gMonIcon_Typhlosion[]; extern const u8 gMonFootprint_Typhlosion[]; -extern const u8 gMonFrontPic_Totodile[]; -extern const u8 gMonPalette_Totodile[]; -extern const u8 gMonBackPic_Totodile[]; -extern const u8 gMonShinyPalette_Totodile[]; -extern const u8 gMonStillFrontPic_Totodile[]; +extern const u32 gMonFrontPic_Totodile[]; +extern const u32 gMonPalette_Totodile[]; +extern const u32 gMonBackPic_Totodile[]; +extern const u32 gMonShinyPalette_Totodile[]; +extern const u32 gMonStillFrontPic_Totodile[]; extern const u8 gMonIcon_Totodile[]; extern const u8 gMonFootprint_Totodile[]; -extern const u8 gMonFrontPic_Croconaw[]; -extern const u8 gMonPalette_Croconaw[]; -extern const u8 gMonBackPic_Croconaw[]; -extern const u8 gMonShinyPalette_Croconaw[]; -extern const u8 gMonStillFrontPic_Croconaw[]; +extern const u32 gMonFrontPic_Croconaw[]; +extern const u32 gMonPalette_Croconaw[]; +extern const u32 gMonBackPic_Croconaw[]; +extern const u32 gMonShinyPalette_Croconaw[]; +extern const u32 gMonStillFrontPic_Croconaw[]; extern const u8 gMonIcon_Croconaw[]; extern const u8 gMonFootprint_Croconaw[]; -extern const u8 gMonFrontPic_Feraligatr[]; -extern const u8 gMonPalette_Feraligatr[]; -extern const u8 gMonBackPic_Feraligatr[]; -extern const u8 gMonShinyPalette_Feraligatr[]; -extern const u8 gMonStillFrontPic_Feraligatr[]; +extern const u32 gMonFrontPic_Feraligatr[]; +extern const u32 gMonPalette_Feraligatr[]; +extern const u32 gMonBackPic_Feraligatr[]; +extern const u32 gMonShinyPalette_Feraligatr[]; +extern const u32 gMonStillFrontPic_Feraligatr[]; extern const u8 gMonIcon_Feraligatr[]; extern const u8 gMonFootprint_Feraligatr[]; -extern const u8 gMonFrontPic_Sentret[]; -extern const u8 gMonPalette_Sentret[]; -extern const u8 gMonBackPic_Sentret[]; -extern const u8 gMonShinyPalette_Sentret[]; -extern const u8 gMonStillFrontPic_Sentret[]; +extern const u32 gMonFrontPic_Sentret[]; +extern const u32 gMonPalette_Sentret[]; +extern const u32 gMonBackPic_Sentret[]; +extern const u32 gMonShinyPalette_Sentret[]; +extern const u32 gMonStillFrontPic_Sentret[]; extern const u8 gMonIcon_Sentret[]; extern const u8 gMonFootprint_Sentret[]; -extern const u8 gMonFrontPic_Furret[]; -extern const u8 gMonPalette_Furret[]; -extern const u8 gMonBackPic_Furret[]; -extern const u8 gMonShinyPalette_Furret[]; -extern const u8 gMonStillFrontPic_Furret[]; +extern const u32 gMonFrontPic_Furret[]; +extern const u32 gMonPalette_Furret[]; +extern const u32 gMonBackPic_Furret[]; +extern const u32 gMonShinyPalette_Furret[]; +extern const u32 gMonStillFrontPic_Furret[]; extern const u8 gMonIcon_Furret[]; extern const u8 gMonFootprint_Furret[]; -extern const u8 gMonFrontPic_Hoothoot[]; -extern const u8 gMonPalette_Hoothoot[]; -extern const u8 gMonBackPic_Hoothoot[]; -extern const u8 gMonShinyPalette_Hoothoot[]; -extern const u8 gMonStillFrontPic_Hoothoot[]; +extern const u32 gMonFrontPic_Hoothoot[]; +extern const u32 gMonPalette_Hoothoot[]; +extern const u32 gMonBackPic_Hoothoot[]; +extern const u32 gMonShinyPalette_Hoothoot[]; +extern const u32 gMonStillFrontPic_Hoothoot[]; extern const u8 gMonIcon_Hoothoot[]; extern const u8 gMonFootprint_Hoothoot[]; -extern const u8 gMonFrontPic_Noctowl[]; -extern const u8 gMonPalette_Noctowl[]; -extern const u8 gMonBackPic_Noctowl[]; -extern const u8 gMonShinyPalette_Noctowl[]; -extern const u8 gMonStillFrontPic_Noctowl[]; +extern const u32 gMonFrontPic_Noctowl[]; +extern const u32 gMonPalette_Noctowl[]; +extern const u32 gMonBackPic_Noctowl[]; +extern const u32 gMonShinyPalette_Noctowl[]; +extern const u32 gMonStillFrontPic_Noctowl[]; extern const u8 gMonIcon_Noctowl[]; extern const u8 gMonFootprint_Noctowl[]; -extern const u8 gMonFrontPic_Ledyba[]; -extern const u8 gMonPalette_Ledyba[]; -extern const u8 gMonBackPic_Ledyba[]; -extern const u8 gMonShinyPalette_Ledyba[]; -extern const u8 gMonStillFrontPic_Ledyba[]; +extern const u32 gMonFrontPic_Ledyba[]; +extern const u32 gMonPalette_Ledyba[]; +extern const u32 gMonBackPic_Ledyba[]; +extern const u32 gMonShinyPalette_Ledyba[]; +extern const u32 gMonStillFrontPic_Ledyba[]; extern const u8 gMonIcon_Ledyba[]; extern const u8 gMonFootprint_Ledyba[]; -extern const u8 gMonFrontPic_Ledian[]; -extern const u8 gMonPalette_Ledian[]; -extern const u8 gMonBackPic_Ledian[]; -extern const u8 gMonShinyPalette_Ledian[]; -extern const u8 gMonStillFrontPic_Ledian[]; +extern const u32 gMonFrontPic_Ledian[]; +extern const u32 gMonPalette_Ledian[]; +extern const u32 gMonBackPic_Ledian[]; +extern const u32 gMonShinyPalette_Ledian[]; +extern const u32 gMonStillFrontPic_Ledian[]; extern const u8 gMonIcon_Ledian[]; extern const u8 gMonFootprint_Ledian[]; -extern const u8 gMonFrontPic_Spinarak[]; -extern const u8 gMonPalette_Spinarak[]; -extern const u8 gMonBackPic_Spinarak[]; -extern const u8 gMonShinyPalette_Spinarak[]; -extern const u8 gMonStillFrontPic_Spinarak[]; +extern const u32 gMonFrontPic_Spinarak[]; +extern const u32 gMonPalette_Spinarak[]; +extern const u32 gMonBackPic_Spinarak[]; +extern const u32 gMonShinyPalette_Spinarak[]; +extern const u32 gMonStillFrontPic_Spinarak[]; extern const u8 gMonIcon_Spinarak[]; extern const u8 gMonFootprint_Spinarak[]; -extern const u8 gMonFrontPic_Ariados[]; -extern const u8 gMonPalette_Ariados[]; -extern const u8 gMonBackPic_Ariados[]; -extern const u8 gMonShinyPalette_Ariados[]; -extern const u8 gMonStillFrontPic_Ariados[]; +extern const u32 gMonFrontPic_Ariados[]; +extern const u32 gMonPalette_Ariados[]; +extern const u32 gMonBackPic_Ariados[]; +extern const u32 gMonShinyPalette_Ariados[]; +extern const u32 gMonStillFrontPic_Ariados[]; extern const u8 gMonIcon_Ariados[]; extern const u8 gMonFootprint_Ariados[]; -extern const u8 gMonFrontPic_Crobat[]; -extern const u8 gMonPalette_Crobat[]; -extern const u8 gMonBackPic_Crobat[]; -extern const u8 gMonShinyPalette_Crobat[]; -extern const u8 gMonStillFrontPic_Crobat[]; +extern const u32 gMonFrontPic_Crobat[]; +extern const u32 gMonPalette_Crobat[]; +extern const u32 gMonBackPic_Crobat[]; +extern const u32 gMonShinyPalette_Crobat[]; +extern const u32 gMonStillFrontPic_Crobat[]; extern const u8 gMonIcon_Crobat[]; extern const u8 gMonFootprint_Crobat[]; -extern const u8 gMonFrontPic_Chinchou[]; -extern const u8 gMonPalette_Chinchou[]; -extern const u8 gMonBackPic_Chinchou[]; -extern const u8 gMonShinyPalette_Chinchou[]; -extern const u8 gMonStillFrontPic_Chinchou[]; +extern const u32 gMonFrontPic_Chinchou[]; +extern const u32 gMonPalette_Chinchou[]; +extern const u32 gMonBackPic_Chinchou[]; +extern const u32 gMonShinyPalette_Chinchou[]; +extern const u32 gMonStillFrontPic_Chinchou[]; extern const u8 gMonIcon_Chinchou[]; extern const u8 gMonFootprint_Chinchou[]; -extern const u8 gMonFrontPic_Lanturn[]; -extern const u8 gMonPalette_Lanturn[]; -extern const u8 gMonBackPic_Lanturn[]; -extern const u8 gMonShinyPalette_Lanturn[]; -extern const u8 gMonStillFrontPic_Lanturn[]; +extern const u32 gMonFrontPic_Lanturn[]; +extern const u32 gMonPalette_Lanturn[]; +extern const u32 gMonBackPic_Lanturn[]; +extern const u32 gMonShinyPalette_Lanturn[]; +extern const u32 gMonStillFrontPic_Lanturn[]; extern const u8 gMonIcon_Lanturn[]; extern const u8 gMonFootprint_Lanturn[]; -extern const u8 gMonFrontPic_Pichu[]; -extern const u8 gMonPalette_Pichu[]; -extern const u8 gMonBackPic_Pichu[]; -extern const u8 gMonShinyPalette_Pichu[]; -extern const u8 gMonStillFrontPic_Pichu[]; +extern const u32 gMonFrontPic_Pichu[]; +extern const u32 gMonPalette_Pichu[]; +extern const u32 gMonBackPic_Pichu[]; +extern const u32 gMonShinyPalette_Pichu[]; +extern const u32 gMonStillFrontPic_Pichu[]; extern const u8 gMonIcon_Pichu[]; -extern const u8 gMonFootprint_Pichu[]; -extern const u8 gMonFrontPic_Cleffa[]; -extern const u8 gMonPalette_Cleffa[]; -extern const u8 gMonBackPic_Cleffa[]; -extern const u8 gMonShinyPalette_Cleffa[]; -extern const u8 gMonStillFrontPic_Cleffa[]; +extern const u32 gMonFootprint_Pichu[]; +extern const u32 gMonFrontPic_Cleffa[]; +extern const u32 gMonPalette_Cleffa[]; +extern const u32 gMonBackPic_Cleffa[]; +extern const u32 gMonShinyPalette_Cleffa[]; +extern const u32 gMonStillFrontPic_Cleffa[]; extern const u8 gMonIcon_Cleffa[]; extern const u8 gMonFootprint_Cleffa[]; -extern const u8 gMonFrontPic_Igglybuff[]; -extern const u8 gMonPalette_Igglybuff[]; -extern const u8 gMonBackPic_Igglybuff[]; -extern const u8 gMonShinyPalette_Igglybuff[]; -extern const u8 gMonStillFrontPic_Igglybuff[]; +extern const u32 gMonFrontPic_Igglybuff[]; +extern const u32 gMonPalette_Igglybuff[]; +extern const u32 gMonBackPic_Igglybuff[]; +extern const u32 gMonShinyPalette_Igglybuff[]; +extern const u32 gMonStillFrontPic_Igglybuff[]; extern const u8 gMonIcon_Igglybuff[]; extern const u8 gMonFootprint_Igglybuff[]; -extern const u8 gMonFrontPic_Togepi[]; -extern const u8 gMonPalette_Togepi[]; -extern const u8 gMonBackPic_Togepi[]; -extern const u8 gMonShinyPalette_Togepi[]; -extern const u8 gMonStillFrontPic_Togepi[]; +extern const u32 gMonFrontPic_Togepi[]; +extern const u32 gMonPalette_Togepi[]; +extern const u32 gMonBackPic_Togepi[]; +extern const u32 gMonShinyPalette_Togepi[]; +extern const u32 gMonStillFrontPic_Togepi[]; extern const u8 gMonIcon_Togepi[]; extern const u8 gMonFootprint_Togepi[]; -extern const u8 gMonFrontPic_Togetic[]; -extern const u8 gMonPalette_Togetic[]; -extern const u8 gMonBackPic_Togetic[]; -extern const u8 gMonShinyPalette_Togetic[]; -extern const u8 gMonStillFrontPic_Togetic[]; +extern const u32 gMonFrontPic_Togetic[]; +extern const u32 gMonPalette_Togetic[]; +extern const u32 gMonBackPic_Togetic[]; +extern const u32 gMonShinyPalette_Togetic[]; +extern const u32 gMonStillFrontPic_Togetic[]; extern const u8 gMonIcon_Togetic[]; extern const u8 gMonFootprint_Togetic[]; -extern const u8 gMonFrontPic_Natu[]; -extern const u8 gMonPalette_Natu[]; -extern const u8 gMonBackPic_Natu[]; -extern const u8 gMonShinyPalette_Natu[]; -extern const u8 gMonStillFrontPic_Natu[]; +extern const u32 gMonFrontPic_Natu[]; +extern const u32 gMonPalette_Natu[]; +extern const u32 gMonBackPic_Natu[]; +extern const u32 gMonShinyPalette_Natu[]; +extern const u32 gMonStillFrontPic_Natu[]; extern const u8 gMonIcon_Natu[]; extern const u8 gMonFootprint_Natu[]; -extern const u8 gMonFrontPic_Xatu[]; -extern const u8 gMonPalette_Xatu[]; -extern const u8 gMonBackPic_Xatu[]; -extern const u8 gMonShinyPalette_Xatu[]; -extern const u8 gMonStillFrontPic_Xatu[]; +extern const u32 gMonFrontPic_Xatu[]; +extern const u32 gMonPalette_Xatu[]; +extern const u32 gMonBackPic_Xatu[]; +extern const u32 gMonShinyPalette_Xatu[]; +extern const u32 gMonStillFrontPic_Xatu[]; extern const u8 gMonIcon_Xatu[]; extern const u8 gMonFootprint_Xatu[]; -extern const u8 gMonFrontPic_Mareep[]; -extern const u8 gMonPalette_Mareep[]; -extern const u8 gMonBackPic_Mareep[]; -extern const u8 gMonShinyPalette_Mareep[]; -extern const u8 gMonStillFrontPic_Mareep[]; +extern const u32 gMonFrontPic_Mareep[]; +extern const u32 gMonPalette_Mareep[]; +extern const u32 gMonBackPic_Mareep[]; +extern const u32 gMonShinyPalette_Mareep[]; +extern const u32 gMonStillFrontPic_Mareep[]; extern const u8 gMonIcon_Mareep[]; extern const u8 gMonFootprint_Mareep[]; -extern const u8 gMonFrontPic_Flaaffy[]; -extern const u8 gMonPalette_Flaaffy[]; -extern const u8 gMonBackPic_Flaaffy[]; -extern const u8 gMonShinyPalette_Flaaffy[]; -extern const u8 gMonStillFrontPic_Flaaffy[]; +extern const u32 gMonFrontPic_Flaaffy[]; +extern const u32 gMonPalette_Flaaffy[]; +extern const u32 gMonBackPic_Flaaffy[]; +extern const u32 gMonShinyPalette_Flaaffy[]; +extern const u32 gMonStillFrontPic_Flaaffy[]; extern const u8 gMonIcon_Flaaffy[]; extern const u8 gMonFootprint_Flaaffy[]; -extern const u8 gMonFrontPic_Ampharos[]; -extern const u8 gMonPalette_Ampharos[]; -extern const u8 gMonBackPic_Ampharos[]; -extern const u8 gMonShinyPalette_Ampharos[]; -extern const u8 gMonStillFrontPic_Ampharos[]; +extern const u32 gMonFrontPic_Ampharos[]; +extern const u32 gMonPalette_Ampharos[]; +extern const u32 gMonBackPic_Ampharos[]; +extern const u32 gMonShinyPalette_Ampharos[]; +extern const u32 gMonStillFrontPic_Ampharos[]; extern const u8 gMonIcon_Ampharos[]; extern const u8 gMonFootprint_Ampharos[]; -extern const u8 gMonFrontPic_Bellossom[]; -extern const u8 gMonPalette_Bellossom[]; -extern const u8 gMonBackPic_Bellossom[]; -extern const u8 gMonShinyPalette_Bellossom[]; -extern const u8 gMonStillFrontPic_Bellossom[]; +extern const u32 gMonFrontPic_Bellossom[]; +extern const u32 gMonPalette_Bellossom[]; +extern const u32 gMonBackPic_Bellossom[]; +extern const u32 gMonShinyPalette_Bellossom[]; +extern const u32 gMonStillFrontPic_Bellossom[]; extern const u8 gMonIcon_Bellossom[]; extern const u8 gMonFootprint_Bellossom[]; -extern const u8 gMonFrontPic_Marill[]; -extern const u8 gMonPalette_Marill[]; -extern const u8 gMonBackPic_Marill[]; -extern const u8 gMonShinyPalette_Marill[]; -extern const u8 gMonStillFrontPic_Marill[]; +extern const u32 gMonFrontPic_Marill[]; +extern const u32 gMonPalette_Marill[]; +extern const u32 gMonBackPic_Marill[]; +extern const u32 gMonShinyPalette_Marill[]; +extern const u32 gMonStillFrontPic_Marill[]; extern const u8 gMonIcon_Marill[]; extern const u8 gMonFootprint_Marill[]; -extern const u8 gMonFrontPic_Azumarill[]; -extern const u8 gMonPalette_Azumarill[]; -extern const u8 gMonBackPic_Azumarill[]; -extern const u8 gMonShinyPalette_Azumarill[]; -extern const u8 gMonStillFrontPic_Azumarill[]; +extern const u32 gMonFrontPic_Azumarill[]; +extern const u32 gMonPalette_Azumarill[]; +extern const u32 gMonBackPic_Azumarill[]; +extern const u32 gMonShinyPalette_Azumarill[]; +extern const u32 gMonStillFrontPic_Azumarill[]; extern const u8 gMonIcon_Azumarill[]; extern const u8 gMonFootprint_Azumarill[]; -extern const u8 gMonFrontPic_Sudowoodo[]; -extern const u8 gMonPalette_Sudowoodo[]; -extern const u8 gMonBackPic_Sudowoodo[]; -extern const u8 gMonShinyPalette_Sudowoodo[]; -extern const u8 gMonStillFrontPic_Sudowoodo[]; +extern const u32 gMonFrontPic_Sudowoodo[]; +extern const u32 gMonPalette_Sudowoodo[]; +extern const u32 gMonBackPic_Sudowoodo[]; +extern const u32 gMonShinyPalette_Sudowoodo[]; +extern const u32 gMonStillFrontPic_Sudowoodo[]; extern const u8 gMonIcon_Sudowoodo[]; extern const u8 gMonFootprint_Sudowoodo[]; -extern const u8 gMonFrontPic_Politoed[]; -extern const u8 gMonPalette_Politoed[]; -extern const u8 gMonBackPic_Politoed[]; -extern const u8 gMonShinyPalette_Politoed[]; -extern const u8 gMonStillFrontPic_Politoed[]; +extern const u32 gMonFrontPic_Politoed[]; +extern const u32 gMonPalette_Politoed[]; +extern const u32 gMonBackPic_Politoed[]; +extern const u32 gMonShinyPalette_Politoed[]; +extern const u32 gMonStillFrontPic_Politoed[]; extern const u8 gMonIcon_Politoed[]; extern const u8 gMonFootprint_Politoed[]; -extern const u8 gMonFrontPic_Hoppip[]; -extern const u8 gMonPalette_Hoppip[]; -extern const u8 gMonBackPic_Hoppip[]; -extern const u8 gMonShinyPalette_Hoppip[]; -extern const u8 gMonStillFrontPic_Hoppip[]; +extern const u32 gMonFrontPic_Hoppip[]; +extern const u32 gMonPalette_Hoppip[]; +extern const u32 gMonBackPic_Hoppip[]; +extern const u32 gMonShinyPalette_Hoppip[]; +extern const u32 gMonStillFrontPic_Hoppip[]; extern const u8 gMonIcon_Hoppip[]; extern const u8 gMonFootprint_Hoppip[]; -extern const u8 gMonFrontPic_Skiploom[]; -extern const u8 gMonPalette_Skiploom[]; -extern const u8 gMonBackPic_Skiploom[]; -extern const u8 gMonShinyPalette_Skiploom[]; -extern const u8 gMonStillFrontPic_Skiploom[]; +extern const u32 gMonFrontPic_Skiploom[]; +extern const u32 gMonPalette_Skiploom[]; +extern const u32 gMonBackPic_Skiploom[]; +extern const u32 gMonShinyPalette_Skiploom[]; +extern const u32 gMonStillFrontPic_Skiploom[]; extern const u8 gMonIcon_Skiploom[]; extern const u8 gMonFootprint_Skiploom[]; -extern const u8 gMonFrontPic_Jumpluff[]; -extern const u8 gMonPalette_Jumpluff[]; -extern const u8 gMonBackPic_Jumpluff[]; -extern const u8 gMonShinyPalette_Jumpluff[]; -extern const u8 gMonStillFrontPic_Jumpluff[]; +extern const u32 gMonFrontPic_Jumpluff[]; +extern const u32 gMonPalette_Jumpluff[]; +extern const u32 gMonBackPic_Jumpluff[]; +extern const u32 gMonShinyPalette_Jumpluff[]; +extern const u32 gMonStillFrontPic_Jumpluff[]; extern const u8 gMonIcon_Jumpluff[]; extern const u8 gMonFootprint_Jumpluff[]; -extern const u8 gMonFrontPic_Aipom[]; -extern const u8 gMonPalette_Aipom[]; -extern const u8 gMonBackPic_Aipom[]; -extern const u8 gMonShinyPalette_Aipom[]; -extern const u8 gMonStillFrontPic_Aipom[]; +extern const u32 gMonFrontPic_Aipom[]; +extern const u32 gMonPalette_Aipom[]; +extern const u32 gMonBackPic_Aipom[]; +extern const u32 gMonShinyPalette_Aipom[]; +extern const u32 gMonStillFrontPic_Aipom[]; extern const u8 gMonIcon_Aipom[]; extern const u8 gMonFootprint_Aipom[]; -extern const u8 gMonFrontPic_Sunkern[]; -extern const u8 gMonPalette_Sunkern[]; -extern const u8 gMonBackPic_Sunkern[]; -extern const u8 gMonShinyPalette_Sunkern[]; -extern const u8 gMonStillFrontPic_Sunkern[]; +extern const u32 gMonFrontPic_Sunkern[]; +extern const u32 gMonPalette_Sunkern[]; +extern const u32 gMonBackPic_Sunkern[]; +extern const u32 gMonShinyPalette_Sunkern[]; +extern const u32 gMonStillFrontPic_Sunkern[]; extern const u8 gMonIcon_Sunkern[]; extern const u8 gMonFootprint_Sunkern[]; -extern const u8 gMonFrontPic_Sunflora[]; -extern const u8 gMonPalette_Sunflora[]; -extern const u8 gMonBackPic_Sunflora[]; -extern const u8 gMonShinyPalette_Sunflora[]; -extern const u8 gMonStillFrontPic_Sunflora[]; +extern const u32 gMonFrontPic_Sunflora[]; +extern const u32 gMonPalette_Sunflora[]; +extern const u32 gMonBackPic_Sunflora[]; +extern const u32 gMonShinyPalette_Sunflora[]; +extern const u32 gMonStillFrontPic_Sunflora[]; extern const u8 gMonIcon_Sunflora[]; extern const u8 gMonFootprint_Sunflora[]; -extern const u8 gMonFrontPic_Yanma[]; -extern const u8 gMonPalette_Yanma[]; -extern const u8 gMonBackPic_Yanma[]; -extern const u8 gMonShinyPalette_Yanma[]; -extern const u8 gMonStillFrontPic_Yanma[]; +extern const u32 gMonFrontPic_Yanma[]; +extern const u32 gMonPalette_Yanma[]; +extern const u32 gMonBackPic_Yanma[]; +extern const u32 gMonShinyPalette_Yanma[]; +extern const u32 gMonStillFrontPic_Yanma[]; extern const u8 gMonIcon_Yanma[]; extern const u8 gMonFootprint_Yanma[]; -extern const u8 gMonFrontPic_Wooper[]; -extern const u8 gMonPalette_Wooper[]; -extern const u8 gMonBackPic_Wooper[]; -extern const u8 gMonShinyPalette_Wooper[]; -extern const u8 gMonStillFrontPic_Wooper[]; +extern const u32 gMonFrontPic_Wooper[]; +extern const u32 gMonPalette_Wooper[]; +extern const u32 gMonBackPic_Wooper[]; +extern const u32 gMonShinyPalette_Wooper[]; +extern const u32 gMonStillFrontPic_Wooper[]; extern const u8 gMonIcon_Wooper[]; extern const u8 gMonFootprint_Wooper[]; -extern const u8 gMonFrontPic_Quagsire[]; -extern const u8 gMonPalette_Quagsire[]; -extern const u8 gMonBackPic_Quagsire[]; -extern const u8 gMonShinyPalette_Quagsire[]; -extern const u8 gMonStillFrontPic_Quagsire[]; +extern const u32 gMonFrontPic_Quagsire[]; +extern const u32 gMonPalette_Quagsire[]; +extern const u32 gMonBackPic_Quagsire[]; +extern const u32 gMonShinyPalette_Quagsire[]; +extern const u32 gMonStillFrontPic_Quagsire[]; extern const u8 gMonIcon_Quagsire[]; extern const u8 gMonFootprint_Quagsire[]; -extern const u8 gMonFrontPic_Espeon[]; -extern const u8 gMonPalette_Espeon[]; -extern const u8 gMonBackPic_Espeon[]; -extern const u8 gMonShinyPalette_Espeon[]; -extern const u8 gMonStillFrontPic_Espeon[]; +extern const u32 gMonFrontPic_Espeon[]; +extern const u32 gMonPalette_Espeon[]; +extern const u32 gMonBackPic_Espeon[]; +extern const u32 gMonShinyPalette_Espeon[]; +extern const u32 gMonStillFrontPic_Espeon[]; extern const u8 gMonIcon_Espeon[]; extern const u8 gMonFootprint_Espeon[]; -extern const u8 gMonFrontPic_Umbreon[]; -extern const u8 gMonPalette_Umbreon[]; -extern const u8 gMonBackPic_Umbreon[]; -extern const u8 gMonShinyPalette_Umbreon[]; -extern const u8 gMonStillFrontPic_Umbreon[]; +extern const u32 gMonFrontPic_Umbreon[]; +extern const u32 gMonPalette_Umbreon[]; +extern const u32 gMonBackPic_Umbreon[]; +extern const u32 gMonShinyPalette_Umbreon[]; +extern const u32 gMonStillFrontPic_Umbreon[]; extern const u8 gMonIcon_Umbreon[]; extern const u8 gMonFootprint_Umbreon[]; -extern const u8 gMonFrontPic_Murkrow[]; -extern const u8 gMonPalette_Murkrow[]; -extern const u8 gMonBackPic_Murkrow[]; -extern const u8 gMonShinyPalette_Murkrow[]; -extern const u8 gMonStillFrontPic_Murkrow[]; +extern const u32 gMonFrontPic_Murkrow[]; +extern const u32 gMonPalette_Murkrow[]; +extern const u32 gMonBackPic_Murkrow[]; +extern const u32 gMonShinyPalette_Murkrow[]; +extern const u32 gMonStillFrontPic_Murkrow[]; extern const u8 gMonIcon_Murkrow[]; extern const u8 gMonFootprint_Murkrow[]; -extern const u8 gMonFrontPic_Slowking[]; -extern const u8 gMonPalette_Slowking[]; -extern const u8 gMonBackPic_Slowking[]; -extern const u8 gMonShinyPalette_Slowking[]; -extern const u8 gMonStillFrontPic_Slowking[]; +extern const u32 gMonFrontPic_Slowking[]; +extern const u32 gMonPalette_Slowking[]; +extern const u32 gMonBackPic_Slowking[]; +extern const u32 gMonShinyPalette_Slowking[]; +extern const u32 gMonStillFrontPic_Slowking[]; extern const u8 gMonIcon_Slowking[]; extern const u8 gMonFootprint_Slowking[]; -extern const u8 gMonFrontPic_Misdreavus[]; -extern const u8 gMonPalette_Misdreavus[]; -extern const u8 gMonBackPic_Misdreavus[]; -extern const u8 gMonShinyPalette_Misdreavus[]; -extern const u8 gMonStillFrontPic_Misdreavus[]; +extern const u32 gMonFrontPic_Misdreavus[]; +extern const u32 gMonPalette_Misdreavus[]; +extern const u32 gMonBackPic_Misdreavus[]; +extern const u32 gMonShinyPalette_Misdreavus[]; +extern const u32 gMonStillFrontPic_Misdreavus[]; extern const u8 gMonIcon_Misdreavus[]; extern const u8 gMonFootprint_Misdreavus[]; -extern const u8 gMonFrontPic_UnownA[]; -extern const u8 gMonPalette_Unown[]; -extern const u8 gMonBackPic_UnownA[]; -extern const u8 gMonShinyPalette_Unown[]; -extern const u8 gMonStillFrontPic_UnownA[]; +extern const u32 gMonFrontPic_UnownA[]; +extern const u32 gMonPalette_Unown[]; +extern const u32 gMonBackPic_UnownA[]; +extern const u32 gMonShinyPalette_Unown[]; +extern const u32 gMonStillFrontPic_UnownA[]; extern const u8 gMonIcon_UnownA[]; extern const u8 gMonFootprint_Unown[]; -extern const u8 gMonFrontPic_Wobbuffet[]; -extern const u8 gMonPalette_Wobbuffet[]; -extern const u8 gMonBackPic_Wobbuffet[]; -extern const u8 gMonShinyPalette_Wobbuffet[]; -extern const u8 gMonStillFrontPic_Wobbuffet[]; +extern const u32 gMonFrontPic_Wobbuffet[]; +extern const u32 gMonPalette_Wobbuffet[]; +extern const u32 gMonBackPic_Wobbuffet[]; +extern const u32 gMonShinyPalette_Wobbuffet[]; +extern const u32 gMonStillFrontPic_Wobbuffet[]; extern const u8 gMonIcon_Wobbuffet[]; extern const u8 gMonFootprint_Wobbuffet[]; -extern const u8 gMonFrontPic_Girafarig[]; -extern const u8 gMonPalette_Girafarig[]; -extern const u8 gMonBackPic_Girafarig[]; -extern const u8 gMonShinyPalette_Girafarig[]; -extern const u8 gMonStillFrontPic_Girafarig[]; +extern const u32 gMonFrontPic_Girafarig[]; +extern const u32 gMonPalette_Girafarig[]; +extern const u32 gMonBackPic_Girafarig[]; +extern const u32 gMonShinyPalette_Girafarig[]; +extern const u32 gMonStillFrontPic_Girafarig[]; extern const u8 gMonIcon_Girafarig[]; extern const u8 gMonFootprint_Girafarig[]; -extern const u8 gMonFrontPic_Pineco[]; -extern const u8 gMonPalette_Pineco[]; -extern const u8 gMonBackPic_Pineco[]; -extern const u8 gMonShinyPalette_Pineco[]; -extern const u8 gMonStillFrontPic_Pineco[]; +extern const u32 gMonFrontPic_Pineco[]; +extern const u32 gMonPalette_Pineco[]; +extern const u32 gMonBackPic_Pineco[]; +extern const u32 gMonShinyPalette_Pineco[]; +extern const u32 gMonStillFrontPic_Pineco[]; extern const u8 gMonIcon_Pineco[]; extern const u8 gMonFootprint_Pineco[]; -extern const u8 gMonFrontPic_Forretress[]; -extern const u8 gMonPalette_Forretress[]; -extern const u8 gMonBackPic_Forretress[]; -extern const u8 gMonShinyPalette_Forretress[]; -extern const u8 gMonStillFrontPic_Forretress[]; +extern const u32 gMonFrontPic_Forretress[]; +extern const u32 gMonPalette_Forretress[]; +extern const u32 gMonBackPic_Forretress[]; +extern const u32 gMonShinyPalette_Forretress[]; +extern const u32 gMonStillFrontPic_Forretress[]; extern const u8 gMonIcon_Forretress[]; extern const u8 gMonFootprint_Forretress[]; -extern const u8 gMonFrontPic_Dunsparce[]; -extern const u8 gMonPalette_Dunsparce[]; -extern const u8 gMonBackPic_Dunsparce[]; -extern const u8 gMonShinyPalette_Dunsparce[]; -extern const u8 gMonStillFrontPic_Dunsparce[]; +extern const u32 gMonFrontPic_Dunsparce[]; +extern const u32 gMonPalette_Dunsparce[]; +extern const u32 gMonBackPic_Dunsparce[]; +extern const u32 gMonShinyPalette_Dunsparce[]; +extern const u32 gMonStillFrontPic_Dunsparce[]; extern const u8 gMonIcon_Dunsparce[]; extern const u8 gMonFootprint_Dunsparce[]; -extern const u8 gMonFrontPic_Gligar[]; -extern const u8 gMonPalette_Gligar[]; -extern const u8 gMonBackPic_Gligar[]; -extern const u8 gMonShinyPalette_Gligar[]; -extern const u8 gMonStillFrontPic_Gligar[]; +extern const u32 gMonFrontPic_Gligar[]; +extern const u32 gMonPalette_Gligar[]; +extern const u32 gMonBackPic_Gligar[]; +extern const u32 gMonShinyPalette_Gligar[]; +extern const u32 gMonStillFrontPic_Gligar[]; extern const u8 gMonIcon_Gligar[]; extern const u8 gMonFootprint_Gligar[]; -extern const u8 gMonFrontPic_Steelix[]; -extern const u8 gMonPalette_Steelix[]; -extern const u8 gMonBackPic_Steelix[]; -extern const u8 gMonShinyPalette_Steelix[]; -extern const u8 gMonStillFrontPic_Steelix[]; +extern const u32 gMonFrontPic_Steelix[]; +extern const u32 gMonPalette_Steelix[]; +extern const u32 gMonBackPic_Steelix[]; +extern const u32 gMonShinyPalette_Steelix[]; +extern const u32 gMonStillFrontPic_Steelix[]; extern const u8 gMonIcon_Steelix[]; extern const u8 gMonFootprint_Steelix[]; -extern const u8 gMonFrontPic_Snubbull[]; -extern const u8 gMonPalette_Snubbull[]; -extern const u8 gMonBackPic_Snubbull[]; -extern const u8 gMonShinyPalette_Snubbull[]; -extern const u8 gMonStillFrontPic_Snubbull[]; +extern const u32 gMonFrontPic_Snubbull[]; +extern const u32 gMonPalette_Snubbull[]; +extern const u32 gMonBackPic_Snubbull[]; +extern const u32 gMonShinyPalette_Snubbull[]; +extern const u32 gMonStillFrontPic_Snubbull[]; extern const u8 gMonIcon_Snubbull[]; extern const u8 gMonFootprint_Snubbull[]; -extern const u8 gMonFrontPic_Granbull[]; -extern const u8 gMonPalette_Granbull[]; -extern const u8 gMonBackPic_Granbull[]; -extern const u8 gMonShinyPalette_Granbull[]; -extern const u8 gMonStillFrontPic_Granbull[]; +extern const u32 gMonFrontPic_Granbull[]; +extern const u32 gMonPalette_Granbull[]; +extern const u32 gMonBackPic_Granbull[]; +extern const u32 gMonShinyPalette_Granbull[]; +extern const u32 gMonStillFrontPic_Granbull[]; extern const u8 gMonIcon_Granbull[]; extern const u8 gMonFootprint_Granbull[]; -extern const u8 gMonFrontPic_Qwilfish[]; -extern const u8 gMonPalette_Qwilfish[]; -extern const u8 gMonBackPic_Qwilfish[]; -extern const u8 gMonShinyPalette_Qwilfish[]; -extern const u8 gMonStillFrontPic_Qwilfish[]; +extern const u32 gMonFrontPic_Qwilfish[]; +extern const u32 gMonPalette_Qwilfish[]; +extern const u32 gMonBackPic_Qwilfish[]; +extern const u32 gMonShinyPalette_Qwilfish[]; +extern const u32 gMonStillFrontPic_Qwilfish[]; extern const u8 gMonIcon_Qwilfish[]; extern const u8 gMonFootprint_Qwilfish[]; -extern const u8 gMonFrontPic_Scizor[]; -extern const u8 gMonPalette_Scizor[]; -extern const u8 gMonBackPic_Scizor[]; -extern const u8 gMonShinyPalette_Scizor[]; -extern const u8 gMonStillFrontPic_Scizor[]; +extern const u32 gMonFrontPic_Scizor[]; +extern const u32 gMonPalette_Scizor[]; +extern const u32 gMonBackPic_Scizor[]; +extern const u32 gMonShinyPalette_Scizor[]; +extern const u32 gMonStillFrontPic_Scizor[]; extern const u8 gMonIcon_Scizor[]; extern const u8 gMonFootprint_Scizor[]; -extern const u8 gMonFrontPic_Shuckle[]; -extern const u8 gMonPalette_Shuckle[]; -extern const u8 gMonBackPic_Shuckle[]; -extern const u8 gMonShinyPalette_Shuckle[]; -extern const u8 gMonStillFrontPic_Shuckle[]; +extern const u32 gMonFrontPic_Shuckle[]; +extern const u32 gMonPalette_Shuckle[]; +extern const u32 gMonBackPic_Shuckle[]; +extern const u32 gMonShinyPalette_Shuckle[]; +extern const u32 gMonStillFrontPic_Shuckle[]; extern const u8 gMonIcon_Shuckle[]; extern const u8 gMonFootprint_Shuckle[]; -extern const u8 gMonFrontPic_Heracross[]; -extern const u8 gMonPalette_Heracross[]; -extern const u8 gMonBackPic_Heracross[]; -extern const u8 gMonShinyPalette_Heracross[]; -extern const u8 gMonStillFrontPic_Heracross[]; +extern const u32 gMonFrontPic_Heracross[]; +extern const u32 gMonPalette_Heracross[]; +extern const u32 gMonBackPic_Heracross[]; +extern const u32 gMonShinyPalette_Heracross[]; +extern const u32 gMonStillFrontPic_Heracross[]; extern const u8 gMonIcon_Heracross[]; extern const u8 gMonFootprint_Heracross[]; -extern const u8 gMonFrontPic_Sneasel[]; -extern const u8 gMonPalette_Sneasel[]; -extern const u8 gMonBackPic_Sneasel[]; -extern const u8 gMonShinyPalette_Sneasel[]; -extern const u8 gMonStillFrontPic_Sneasel[]; +extern const u32 gMonFrontPic_Sneasel[]; +extern const u32 gMonPalette_Sneasel[]; +extern const u32 gMonBackPic_Sneasel[]; +extern const u32 gMonShinyPalette_Sneasel[]; +extern const u32 gMonStillFrontPic_Sneasel[]; extern const u8 gMonIcon_Sneasel[]; extern const u8 gMonFootprint_Sneasel[]; -extern const u8 gMonFrontPic_Teddiursa[]; -extern const u8 gMonPalette_Teddiursa[]; -extern const u8 gMonBackPic_Teddiursa[]; -extern const u8 gMonShinyPalette_Teddiursa[]; -extern const u8 gMonStillFrontPic_Teddiursa[]; +extern const u32 gMonFrontPic_Teddiursa[]; +extern const u32 gMonPalette_Teddiursa[]; +extern const u32 gMonBackPic_Teddiursa[]; +extern const u32 gMonShinyPalette_Teddiursa[]; +extern const u32 gMonStillFrontPic_Teddiursa[]; extern const u8 gMonIcon_Teddiursa[]; extern const u8 gMonFootprint_Teddiursa[]; -extern const u8 gMonFrontPic_Ursaring[]; -extern const u8 gMonPalette_Ursaring[]; -extern const u8 gMonBackPic_Ursaring[]; -extern const u8 gMonShinyPalette_Ursaring[]; -extern const u8 gMonStillFrontPic_Ursaring[]; +extern const u32 gMonFrontPic_Ursaring[]; +extern const u32 gMonPalette_Ursaring[]; +extern const u32 gMonBackPic_Ursaring[]; +extern const u32 gMonShinyPalette_Ursaring[]; +extern const u32 gMonStillFrontPic_Ursaring[]; extern const u8 gMonIcon_Ursaring[]; extern const u8 gMonFootprint_Ursaring[]; -extern const u8 gMonFrontPic_Slugma[]; -extern const u8 gMonPalette_Slugma[]; -extern const u8 gMonBackPic_Slugma[]; -extern const u8 gMonShinyPalette_Slugma[]; -extern const u8 gMonStillFrontPic_Slugma[]; +extern const u32 gMonFrontPic_Slugma[]; +extern const u32 gMonPalette_Slugma[]; +extern const u32 gMonBackPic_Slugma[]; +extern const u32 gMonShinyPalette_Slugma[]; +extern const u32 gMonStillFrontPic_Slugma[]; extern const u8 gMonIcon_Slugma[]; extern const u8 gMonFootprint_Slugma[]; -extern const u8 gMonFrontPic_Magcargo[]; -extern const u8 gMonPalette_Magcargo[]; -extern const u8 gMonBackPic_Magcargo[]; -extern const u8 gMonShinyPalette_Magcargo[]; -extern const u8 gMonStillFrontPic_Magcargo[]; +extern const u32 gMonFrontPic_Magcargo[]; +extern const u32 gMonPalette_Magcargo[]; +extern const u32 gMonBackPic_Magcargo[]; +extern const u32 gMonShinyPalette_Magcargo[]; +extern const u32 gMonStillFrontPic_Magcargo[]; extern const u8 gMonIcon_Magcargo[]; extern const u8 gMonFootprint_Magcargo[]; -extern const u8 gMonFrontPic_Swinub[]; -extern const u8 gMonPalette_Swinub[]; -extern const u8 gMonBackPic_Swinub[]; -extern const u8 gMonShinyPalette_Swinub[]; -extern const u8 gMonStillFrontPic_Swinub[]; +extern const u32 gMonFrontPic_Swinub[]; +extern const u32 gMonPalette_Swinub[]; +extern const u32 gMonBackPic_Swinub[]; +extern const u32 gMonShinyPalette_Swinub[]; +extern const u32 gMonStillFrontPic_Swinub[]; extern const u8 gMonIcon_Swinub[]; extern const u8 gMonFootprint_Swinub[]; -extern const u8 gMonFrontPic_Piloswine[]; -extern const u8 gMonPalette_Piloswine[]; -extern const u8 gMonBackPic_Piloswine[]; -extern const u8 gMonShinyPalette_Piloswine[]; -extern const u8 gMonStillFrontPic_Piloswine[]; +extern const u32 gMonFrontPic_Piloswine[]; +extern const u32 gMonPalette_Piloswine[]; +extern const u32 gMonBackPic_Piloswine[]; +extern const u32 gMonShinyPalette_Piloswine[]; +extern const u32 gMonStillFrontPic_Piloswine[]; extern const u8 gMonIcon_Piloswine[]; extern const u8 gMonFootprint_Piloswine[]; -extern const u8 gMonFrontPic_Corsola[]; -extern const u8 gMonPalette_Corsola[]; -extern const u8 gMonBackPic_Corsola[]; -extern const u8 gMonShinyPalette_Corsola[]; -extern const u8 gMonStillFrontPic_Corsola[]; +extern const u32 gMonFrontPic_Corsola[]; +extern const u32 gMonPalette_Corsola[]; +extern const u32 gMonBackPic_Corsola[]; +extern const u32 gMonShinyPalette_Corsola[]; +extern const u32 gMonStillFrontPic_Corsola[]; extern const u8 gMonIcon_Corsola[]; extern const u8 gMonFootprint_Corsola[]; -extern const u8 gMonFrontPic_Remoraid[]; -extern const u8 gMonPalette_Remoraid[]; -extern const u8 gMonBackPic_Remoraid[]; -extern const u8 gMonShinyPalette_Remoraid[]; -extern const u8 gMonStillFrontPic_Remoraid[]; +extern const u32 gMonFrontPic_Remoraid[]; +extern const u32 gMonPalette_Remoraid[]; +extern const u32 gMonBackPic_Remoraid[]; +extern const u32 gMonShinyPalette_Remoraid[]; +extern const u32 gMonStillFrontPic_Remoraid[]; extern const u8 gMonIcon_Remoraid[]; extern const u8 gMonFootprint_Remoraid[]; -extern const u8 gMonFrontPic_Octillery[]; -extern const u8 gMonPalette_Octillery[]; -extern const u8 gMonBackPic_Octillery[]; -extern const u8 gMonShinyPalette_Octillery[]; -extern const u8 gMonStillFrontPic_Octillery[]; +extern const u32 gMonFrontPic_Octillery[]; +extern const u32 gMonPalette_Octillery[]; +extern const u32 gMonBackPic_Octillery[]; +extern const u32 gMonShinyPalette_Octillery[]; +extern const u32 gMonStillFrontPic_Octillery[]; extern const u8 gMonIcon_Octillery[]; extern const u8 gMonFootprint_Octillery[]; -extern const u8 gMonFrontPic_Delibird[]; -extern const u8 gMonPalette_Delibird[]; -extern const u8 gMonBackPic_Delibird[]; -extern const u8 gMonShinyPalette_Delibird[]; -extern const u8 gMonStillFrontPic_Delibird[]; +extern const u32 gMonFrontPic_Delibird[]; +extern const u32 gMonPalette_Delibird[]; +extern const u32 gMonBackPic_Delibird[]; +extern const u32 gMonShinyPalette_Delibird[]; +extern const u32 gMonStillFrontPic_Delibird[]; extern const u8 gMonIcon_Delibird[]; extern const u8 gMonFootprint_Delibird[]; -extern const u8 gMonFrontPic_Mantine[]; -extern const u8 gMonPalette_Mantine[]; -extern const u8 gMonBackPic_Mantine[]; -extern const u8 gMonShinyPalette_Mantine[]; -extern const u8 gMonStillFrontPic_Mantine[]; +extern const u32 gMonFrontPic_Mantine[]; +extern const u32 gMonPalette_Mantine[]; +extern const u32 gMonBackPic_Mantine[]; +extern const u32 gMonShinyPalette_Mantine[]; +extern const u32 gMonStillFrontPic_Mantine[]; extern const u8 gMonIcon_Mantine[]; extern const u8 gMonFootprint_Mantine[]; -extern const u8 gMonFrontPic_Skarmory[]; -extern const u8 gMonPalette_Skarmory[]; -extern const u8 gMonBackPic_Skarmory[]; -extern const u8 gMonShinyPalette_Skarmory[]; -extern const u8 gMonStillFrontPic_Skarmory[]; +extern const u32 gMonFrontPic_Skarmory[]; +extern const u32 gMonPalette_Skarmory[]; +extern const u32 gMonBackPic_Skarmory[]; +extern const u32 gMonShinyPalette_Skarmory[]; +extern const u32 gMonStillFrontPic_Skarmory[]; extern const u8 gMonIcon_Skarmory[]; extern const u8 gMonFootprint_Skarmory[]; -extern const u8 gMonFrontPic_Houndour[]; -extern const u8 gMonPalette_Houndour[]; -extern const u8 gMonBackPic_Houndour[]; -extern const u8 gMonShinyPalette_Houndour[]; -extern const u8 gMonStillFrontPic_Houndour[]; +extern const u32 gMonFrontPic_Houndour[]; +extern const u32 gMonPalette_Houndour[]; +extern const u32 gMonBackPic_Houndour[]; +extern const u32 gMonShinyPalette_Houndour[]; +extern const u32 gMonStillFrontPic_Houndour[]; extern const u8 gMonIcon_Houndour[]; extern const u8 gMonFootprint_Houndour[]; -extern const u8 gMonFrontPic_Houndoom[]; -extern const u8 gMonPalette_Houndoom[]; -extern const u8 gMonBackPic_Houndoom[]; -extern const u8 gMonShinyPalette_Houndoom[]; -extern const u8 gMonStillFrontPic_Houndoom[]; +extern const u32 gMonFrontPic_Houndoom[]; +extern const u32 gMonPalette_Houndoom[]; +extern const u32 gMonBackPic_Houndoom[]; +extern const u32 gMonShinyPalette_Houndoom[]; +extern const u32 gMonStillFrontPic_Houndoom[]; extern const u8 gMonIcon_Houndoom[]; extern const u8 gMonFootprint_Houndoom[]; -extern const u8 gMonFrontPic_Kingdra[]; -extern const u8 gMonPalette_Kingdra[]; -extern const u8 gMonBackPic_Kingdra[]; -extern const u8 gMonShinyPalette_Kingdra[]; -extern const u8 gMonStillFrontPic_Kingdra[]; +extern const u32 gMonFrontPic_Kingdra[]; +extern const u32 gMonPalette_Kingdra[]; +extern const u32 gMonBackPic_Kingdra[]; +extern const u32 gMonShinyPalette_Kingdra[]; +extern const u32 gMonStillFrontPic_Kingdra[]; extern const u8 gMonIcon_Kingdra[]; extern const u8 gMonFootprint_Kingdra[]; -extern const u8 gMonFrontPic_Phanpy[]; -extern const u8 gMonPalette_Phanpy[]; -extern const u8 gMonBackPic_Phanpy[]; -extern const u8 gMonShinyPalette_Phanpy[]; -extern const u8 gMonStillFrontPic_Phanpy[]; +extern const u32 gMonFrontPic_Phanpy[]; +extern const u32 gMonPalette_Phanpy[]; +extern const u32 gMonBackPic_Phanpy[]; +extern const u32 gMonShinyPalette_Phanpy[]; +extern const u32 gMonStillFrontPic_Phanpy[]; extern const u8 gMonIcon_Phanpy[]; extern const u8 gMonFootprint_Phanpy[]; -extern const u8 gMonFrontPic_Donphan[]; -extern const u8 gMonPalette_Donphan[]; -extern const u8 gMonBackPic_Donphan[]; -extern const u8 gMonShinyPalette_Donphan[]; -extern const u8 gMonStillFrontPic_Donphan[]; +extern const u32 gMonFrontPic_Donphan[]; +extern const u32 gMonPalette_Donphan[]; +extern const u32 gMonBackPic_Donphan[]; +extern const u32 gMonShinyPalette_Donphan[]; +extern const u32 gMonStillFrontPic_Donphan[]; extern const u8 gMonIcon_Donphan[]; extern const u8 gMonFootprint_Donphan[]; -extern const u8 gMonFrontPic_Porygon2[]; -extern const u8 gMonPalette_Porygon2[]; -extern const u8 gMonBackPic_Porygon2[]; -extern const u8 gMonShinyPalette_Porygon2[]; -extern const u8 gMonStillFrontPic_Porygon2[]; +extern const u32 gMonFrontPic_Porygon2[]; +extern const u32 gMonPalette_Porygon2[]; +extern const u32 gMonBackPic_Porygon2[]; +extern const u32 gMonShinyPalette_Porygon2[]; +extern const u32 gMonStillFrontPic_Porygon2[]; extern const u8 gMonIcon_Porygon2[]; extern const u8 gMonFootprint_Porygon2[]; -extern const u8 gMonFrontPic_Stantler[]; -extern const u8 gMonPalette_Stantler[]; -extern const u8 gMonBackPic_Stantler[]; -extern const u8 gMonShinyPalette_Stantler[]; -extern const u8 gMonStillFrontPic_Stantler[]; +extern const u32 gMonFrontPic_Stantler[]; +extern const u32 gMonPalette_Stantler[]; +extern const u32 gMonBackPic_Stantler[]; +extern const u32 gMonShinyPalette_Stantler[]; +extern const u32 gMonStillFrontPic_Stantler[]; extern const u8 gMonIcon_Stantler[]; extern const u8 gMonFootprint_Stantler[]; -extern const u8 gMonFrontPic_Smeargle[]; -extern const u8 gMonPalette_Smeargle[]; -extern const u8 gMonBackPic_Smeargle[]; -extern const u8 gMonShinyPalette_Smeargle[]; -extern const u8 gMonStillFrontPic_Smeargle[]; +extern const u32 gMonFrontPic_Smeargle[]; +extern const u32 gMonPalette_Smeargle[]; +extern const u32 gMonBackPic_Smeargle[]; +extern const u32 gMonShinyPalette_Smeargle[]; +extern const u32 gMonStillFrontPic_Smeargle[]; extern const u8 gMonIcon_Smeargle[]; extern const u8 gMonFootprint_Smeargle[]; -extern const u8 gMonFrontPic_Tyrogue[]; -extern const u8 gMonPalette_Tyrogue[]; -extern const u8 gMonBackPic_Tyrogue[]; -extern const u8 gMonShinyPalette_Tyrogue[]; -extern const u8 gMonStillFrontPic_Tyrogue[]; +extern const u32 gMonFrontPic_Tyrogue[]; +extern const u32 gMonPalette_Tyrogue[]; +extern const u32 gMonBackPic_Tyrogue[]; +extern const u32 gMonShinyPalette_Tyrogue[]; +extern const u32 gMonStillFrontPic_Tyrogue[]; extern const u8 gMonIcon_Tyrogue[]; extern const u8 gMonFootprint_Tyrogue[]; -extern const u8 gMonFrontPic_Hitmontop[]; -extern const u8 gMonPalette_Hitmontop[]; -extern const u8 gMonBackPic_Hitmontop[]; -extern const u8 gMonShinyPalette_Hitmontop[]; -extern const u8 gMonStillFrontPic_Hitmontop[]; +extern const u32 gMonFrontPic_Hitmontop[]; +extern const u32 gMonPalette_Hitmontop[]; +extern const u32 gMonBackPic_Hitmontop[]; +extern const u32 gMonShinyPalette_Hitmontop[]; +extern const u32 gMonStillFrontPic_Hitmontop[]; extern const u8 gMonIcon_Hitmontop[]; extern const u8 gMonFootprint_Hitmontop[]; -extern const u8 gMonFrontPic_Smoochum[]; -extern const u8 gMonPalette_Smoochum[]; -extern const u8 gMonBackPic_Smoochum[]; -extern const u8 gMonShinyPalette_Smoochum[]; -extern const u8 gMonStillFrontPic_Smoochum[]; +extern const u32 gMonFrontPic_Smoochum[]; +extern const u32 gMonPalette_Smoochum[]; +extern const u32 gMonBackPic_Smoochum[]; +extern const u32 gMonShinyPalette_Smoochum[]; +extern const u32 gMonStillFrontPic_Smoochum[]; extern const u8 gMonIcon_Smoochum[]; extern const u8 gMonFootprint_Smoochum[]; -extern const u8 gMonFrontPic_Elekid[]; -extern const u8 gMonPalette_Elekid[]; -extern const u8 gMonBackPic_Elekid[]; -extern const u8 gMonShinyPalette_Elekid[]; -extern const u8 gMonStillFrontPic_Elekid[]; +extern const u32 gMonFrontPic_Elekid[]; +extern const u32 gMonPalette_Elekid[]; +extern const u32 gMonBackPic_Elekid[]; +extern const u32 gMonShinyPalette_Elekid[]; +extern const u32 gMonStillFrontPic_Elekid[]; extern const u8 gMonIcon_Elekid[]; extern const u8 gMonFootprint_Elekid[]; -extern const u8 gMonFrontPic_Magby[]; -extern const u8 gMonPalette_Magby[]; -extern const u8 gMonBackPic_Magby[]; -extern const u8 gMonShinyPalette_Magby[]; -extern const u8 gMonStillFrontPic_Magby[]; +extern const u32 gMonFrontPic_Magby[]; +extern const u32 gMonPalette_Magby[]; +extern const u32 gMonBackPic_Magby[]; +extern const u32 gMonShinyPalette_Magby[]; +extern const u32 gMonStillFrontPic_Magby[]; extern const u8 gMonIcon_Magby[]; extern const u8 gMonFootprint_Magby[]; -extern const u8 gMonFrontPic_Miltank[]; -extern const u8 gMonPalette_Miltank[]; -extern const u8 gMonBackPic_Miltank[]; -extern const u8 gMonShinyPalette_Miltank[]; -extern const u8 gMonStillFrontPic_Miltank[]; +extern const u32 gMonFrontPic_Miltank[]; +extern const u32 gMonPalette_Miltank[]; +extern const u32 gMonBackPic_Miltank[]; +extern const u32 gMonShinyPalette_Miltank[]; +extern const u32 gMonStillFrontPic_Miltank[]; extern const u8 gMonIcon_Miltank[]; extern const u8 gMonFootprint_Miltank[]; -extern const u8 gMonFrontPic_Blissey[]; -extern const u8 gMonPalette_Blissey[]; -extern const u8 gMonBackPic_Blissey[]; -extern const u8 gMonShinyPalette_Blissey[]; -extern const u8 gMonStillFrontPic_Blissey[]; +extern const u32 gMonFrontPic_Blissey[]; +extern const u32 gMonPalette_Blissey[]; +extern const u32 gMonBackPic_Blissey[]; +extern const u32 gMonShinyPalette_Blissey[]; +extern const u32 gMonStillFrontPic_Blissey[]; extern const u8 gMonIcon_Blissey[]; extern const u8 gMonFootprint_Blissey[]; -extern const u8 gMonFrontPic_Raikou[]; -extern const u8 gMonPalette_Raikou[]; -extern const u8 gMonBackPic_Raikou[]; -extern const u8 gMonShinyPalette_Raikou[]; -extern const u8 gMonStillFrontPic_Raikou[]; +extern const u32 gMonFrontPic_Raikou[]; +extern const u32 gMonPalette_Raikou[]; +extern const u32 gMonBackPic_Raikou[]; +extern const u32 gMonShinyPalette_Raikou[]; +extern const u32 gMonStillFrontPic_Raikou[]; extern const u8 gMonIcon_Raikou[]; extern const u8 gMonFootprint_Raikou[]; -extern const u8 gMonFrontPic_Entei[]; -extern const u8 gMonPalette_Entei[]; -extern const u8 gMonBackPic_Entei[]; -extern const u8 gMonShinyPalette_Entei[]; -extern const u8 gMonStillFrontPic_Entei[]; +extern const u32 gMonFrontPic_Entei[]; +extern const u32 gMonPalette_Entei[]; +extern const u32 gMonBackPic_Entei[]; +extern const u32 gMonShinyPalette_Entei[]; +extern const u32 gMonStillFrontPic_Entei[]; extern const u8 gMonIcon_Entei[]; extern const u8 gMonFootprint_Entei[]; -extern const u8 gMonFrontPic_Suicune[]; -extern const u8 gMonPalette_Suicune[]; -extern const u8 gMonBackPic_Suicune[]; -extern const u8 gMonShinyPalette_Suicune[]; -extern const u8 gMonStillFrontPic_Suicune[]; +extern const u32 gMonFrontPic_Suicune[]; +extern const u32 gMonPalette_Suicune[]; +extern const u32 gMonBackPic_Suicune[]; +extern const u32 gMonShinyPalette_Suicune[]; +extern const u32 gMonStillFrontPic_Suicune[]; extern const u8 gMonIcon_Suicune[]; extern const u8 gMonFootprint_Suicune[]; -extern const u8 gMonFrontPic_Larvitar[]; -extern const u8 gMonPalette_Larvitar[]; -extern const u8 gMonBackPic_Larvitar[]; -extern const u8 gMonShinyPalette_Larvitar[]; -extern const u8 gMonStillFrontPic_Larvitar[]; +extern const u32 gMonFrontPic_Larvitar[]; +extern const u32 gMonPalette_Larvitar[]; +extern const u32 gMonBackPic_Larvitar[]; +extern const u32 gMonShinyPalette_Larvitar[]; +extern const u32 gMonStillFrontPic_Larvitar[]; extern const u8 gMonIcon_Larvitar[]; extern const u8 gMonFootprint_Larvitar[]; -extern const u8 gMonFrontPic_Pupitar[]; -extern const u8 gMonPalette_Pupitar[]; -extern const u8 gMonBackPic_Pupitar[]; -extern const u8 gMonShinyPalette_Pupitar[]; -extern const u8 gMonStillFrontPic_Pupitar[]; +extern const u32 gMonFrontPic_Pupitar[]; +extern const u32 gMonPalette_Pupitar[]; +extern const u32 gMonBackPic_Pupitar[]; +extern const u32 gMonShinyPalette_Pupitar[]; +extern const u32 gMonStillFrontPic_Pupitar[]; extern const u8 gMonIcon_Pupitar[]; extern const u8 gMonFootprint_Pupitar[]; -extern const u8 gMonFrontPic_Tyranitar[]; -extern const u8 gMonPalette_Tyranitar[]; -extern const u8 gMonBackPic_Tyranitar[]; -extern const u8 gMonShinyPalette_Tyranitar[]; -extern const u8 gMonStillFrontPic_Tyranitar[]; +extern const u32 gMonFrontPic_Tyranitar[]; +extern const u32 gMonPalette_Tyranitar[]; +extern const u32 gMonBackPic_Tyranitar[]; +extern const u32 gMonShinyPalette_Tyranitar[]; +extern const u32 gMonStillFrontPic_Tyranitar[]; extern const u8 gMonIcon_Tyranitar[]; extern const u8 gMonFootprint_Tyranitar[]; -extern const u8 gMonFrontPic_Lugia[]; -extern const u8 gMonPalette_Lugia[]; -extern const u8 gMonBackPic_Lugia[]; -extern const u8 gMonShinyPalette_Lugia[]; -extern const u8 gMonStillFrontPic_Lugia[]; +extern const u32 gMonFrontPic_Lugia[]; +extern const u32 gMonPalette_Lugia[]; +extern const u32 gMonBackPic_Lugia[]; +extern const u32 gMonShinyPalette_Lugia[]; +extern const u32 gMonStillFrontPic_Lugia[]; extern const u8 gMonIcon_Lugia[]; extern const u8 gMonFootprint_Lugia[]; -extern const u8 gMonFrontPic_HoOh[]; -extern const u8 gMonPalette_HoOh[]; -extern const u8 gMonBackPic_HoOh[]; -extern const u8 gMonShinyPalette_HoOh[]; -extern const u8 gMonStillFrontPic_HoOh[]; +extern const u32 gMonFrontPic_HoOh[]; +extern const u32 gMonPalette_HoOh[]; +extern const u32 gMonBackPic_HoOh[]; +extern const u32 gMonShinyPalette_HoOh[]; +extern const u32 gMonStillFrontPic_HoOh[]; extern const u8 gMonIcon_HoOh[]; extern const u8 gMonFootprint_HoOh[]; -extern const u8 gMonFrontPic_Celebi[]; -extern const u8 gMonPalette_Celebi[]; -extern const u8 gMonBackPic_Celebi[]; -extern const u8 gMonShinyPalette_Celebi[]; -extern const u8 gMonStillFrontPic_Celebi[]; +extern const u32 gMonFrontPic_Celebi[]; +extern const u32 gMonPalette_Celebi[]; +extern const u32 gMonBackPic_Celebi[]; +extern const u32 gMonShinyPalette_Celebi[]; +extern const u32 gMonStillFrontPic_Celebi[]; extern const u8 gMonIcon_Celebi[]; extern const u8 gMonFootprint_Celebi[]; -extern const u8 gMonFrontPic_QuestionMark[]; -extern const u8 gMonPalette_QuestionMark[]; -extern const u8 gMonBackPic_QuestionMark[]; -extern const u8 gMonShinyPalette_QuestionMark[]; -extern const u8 gMonFrontPic_Treecko[]; -extern const u8 gMonPalette_Treecko[]; -extern const u8 gMonBackPic_Treecko[]; -extern const u8 gMonShinyPalette_Treecko[]; -extern const u8 gMonStillFrontPic_Treecko[]; +extern const u32 gMonFrontPic_QuestionMark[]; +extern const u32 gMonPalette_QuestionMark[]; +extern const u32 gMonBackPic_QuestionMark[]; +extern const u32 gMonShinyPalette_QuestionMark[]; +extern const u32 gMonFrontPic_Treecko[]; +extern const u32 gMonPalette_Treecko[]; +extern const u32 gMonBackPic_Treecko[]; +extern const u32 gMonShinyPalette_Treecko[]; +extern const u32 gMonStillFrontPic_Treecko[]; extern const u8 gMonIcon_Treecko[]; extern const u8 gMonFootprint_Treecko[]; -extern const u8 gMonFrontPic_Grovyle[]; -extern const u8 gMonPalette_Grovyle[]; -extern const u8 gMonBackPic_Grovyle[]; -extern const u8 gMonShinyPalette_Grovyle[]; -extern const u8 gMonStillFrontPic_Grovyle[]; +extern const u32 gMonFrontPic_Grovyle[]; +extern const u32 gMonPalette_Grovyle[]; +extern const u32 gMonBackPic_Grovyle[]; +extern const u32 gMonShinyPalette_Grovyle[]; +extern const u32 gMonStillFrontPic_Grovyle[]; extern const u8 gMonIcon_Grovyle[]; extern const u8 gMonFootprint_Grovyle[]; -extern const u8 gMonFrontPic_Sceptile[]; -extern const u8 gMonPalette_Sceptile[]; -extern const u8 gMonBackPic_Sceptile[]; -extern const u8 gMonShinyPalette_Sceptile[]; -extern const u8 gMonStillFrontPic_Sceptile[]; +extern const u32 gMonFrontPic_Sceptile[]; +extern const u32 gMonPalette_Sceptile[]; +extern const u32 gMonBackPic_Sceptile[]; +extern const u32 gMonShinyPalette_Sceptile[]; +extern const u32 gMonStillFrontPic_Sceptile[]; extern const u8 gMonIcon_Sceptile[]; extern const u8 gMonFootprint_Sceptile[]; -extern const u8 gMonFrontPic_Torchic[]; -extern const u8 gMonPalette_Torchic[]; -extern const u8 gMonBackPic_Torchic[]; -extern const u8 gMonShinyPalette_Torchic[]; -extern const u8 gMonStillFrontPic_Torchic[]; +extern const u32 gMonFrontPic_Torchic[]; +extern const u32 gMonPalette_Torchic[]; +extern const u32 gMonBackPic_Torchic[]; +extern const u32 gMonShinyPalette_Torchic[]; +extern const u32 gMonStillFrontPic_Torchic[]; extern const u8 gMonIcon_Torchic[]; extern const u8 gMonFootprint_Torchic[]; -extern const u8 gMonFrontPic_Combusken[]; -extern const u8 gMonPalette_Combusken[]; -extern const u8 gMonBackPic_Combusken[]; -extern const u8 gMonShinyPalette_Combusken[]; -extern const u8 gMonStillFrontPic_Combusken[]; +extern const u32 gMonFrontPic_Combusken[]; +extern const u32 gMonPalette_Combusken[]; +extern const u32 gMonBackPic_Combusken[]; +extern const u32 gMonShinyPalette_Combusken[]; +extern const u32 gMonStillFrontPic_Combusken[]; extern const u8 gMonIcon_Combusken[]; extern const u8 gMonFootprint_Combusken[]; -extern const u8 gMonFrontPic_Blaziken[]; -extern const u8 gMonPalette_Blaziken[]; -extern const u8 gMonBackPic_Blaziken[]; -extern const u8 gMonShinyPalette_Blaziken[]; -extern const u8 gMonStillFrontPic_Blaziken[]; +extern const u32 gMonFrontPic_Blaziken[]; +extern const u32 gMonPalette_Blaziken[]; +extern const u32 gMonBackPic_Blaziken[]; +extern const u32 gMonShinyPalette_Blaziken[]; +extern const u32 gMonStillFrontPic_Blaziken[]; extern const u8 gMonIcon_Blaziken[]; extern const u8 gMonFootprint_Blaziken[]; -extern const u8 gMonFrontPic_Mudkip[]; -extern const u8 gMonPalette_Mudkip[]; -extern const u8 gMonBackPic_Mudkip[]; -extern const u8 gMonShinyPalette_Mudkip[]; -extern const u8 gMonStillFrontPic_Mudkip[]; +extern const u32 gMonFrontPic_Mudkip[]; +extern const u32 gMonPalette_Mudkip[]; +extern const u32 gMonBackPic_Mudkip[]; +extern const u32 gMonShinyPalette_Mudkip[]; +extern const u32 gMonStillFrontPic_Mudkip[]; extern const u8 gMonIcon_Mudkip[]; extern const u8 gMonFootprint_Mudkip[]; -extern const u8 gMonFrontPic_Marshtomp[]; -extern const u8 gMonPalette_Marshtomp[]; -extern const u8 gMonBackPic_Marshtomp[]; -extern const u8 gMonShinyPalette_Marshtomp[]; -extern const u8 gMonStillFrontPic_Marshtomp[]; +extern const u32 gMonFrontPic_Marshtomp[]; +extern const u32 gMonPalette_Marshtomp[]; +extern const u32 gMonBackPic_Marshtomp[]; +extern const u32 gMonShinyPalette_Marshtomp[]; +extern const u32 gMonStillFrontPic_Marshtomp[]; extern const u8 gMonIcon_Marshtomp[]; extern const u8 gMonFootprint_Marshtomp[]; -extern const u8 gMonFrontPic_Swampert[]; -extern const u8 gMonPalette_Swampert[]; -extern const u8 gMonBackPic_Swampert[]; -extern const u8 gMonShinyPalette_Swampert[]; -extern const u8 gMonStillFrontPic_Swampert[]; +extern const u32 gMonFrontPic_Swampert[]; +extern const u32 gMonPalette_Swampert[]; +extern const u32 gMonBackPic_Swampert[]; +extern const u32 gMonShinyPalette_Swampert[]; +extern const u32 gMonStillFrontPic_Swampert[]; extern const u8 gMonIcon_Swampert[]; extern const u8 gMonFootprint_Swampert[]; -extern const u8 gMonFrontPic_Poochyena[]; -extern const u8 gMonPalette_Poochyena[]; -extern const u8 gMonBackPic_Poochyena[]; -extern const u8 gMonShinyPalette_Poochyena[]; -extern const u8 gMonStillFrontPic_Poochyena[]; +extern const u32 gMonFrontPic_Poochyena[]; +extern const u32 gMonPalette_Poochyena[]; +extern const u32 gMonBackPic_Poochyena[]; +extern const u32 gMonShinyPalette_Poochyena[]; +extern const u32 gMonStillFrontPic_Poochyena[]; extern const u8 gMonIcon_Poochyena[]; extern const u8 gMonFootprint_Poochyena[]; -extern const u8 gMonFrontPic_Mightyena[]; -extern const u8 gMonPalette_Mightyena[]; -extern const u8 gMonBackPic_Mightyena[]; -extern const u8 gMonShinyPalette_Mightyena[]; -extern const u8 gMonStillFrontPic_Mightyena[]; +extern const u32 gMonFrontPic_Mightyena[]; +extern const u32 gMonPalette_Mightyena[]; +extern const u32 gMonBackPic_Mightyena[]; +extern const u32 gMonShinyPalette_Mightyena[]; +extern const u32 gMonStillFrontPic_Mightyena[]; extern const u8 gMonIcon_Mightyena[]; extern const u8 gMonFootprint_Mightyena[]; -extern const u8 gMonFrontPic_Zigzagoon[]; -extern const u8 gMonPalette_Zigzagoon[]; -extern const u8 gMonBackPic_Zigzagoon[]; -extern const u8 gMonShinyPalette_Zigzagoon[]; -extern const u8 gMonStillFrontPic_Zigzagoon[]; +extern const u32 gMonFrontPic_Zigzagoon[]; +extern const u32 gMonPalette_Zigzagoon[]; +extern const u32 gMonBackPic_Zigzagoon[]; +extern const u32 gMonShinyPalette_Zigzagoon[]; +extern const u32 gMonStillFrontPic_Zigzagoon[]; extern const u8 gMonIcon_Zigzagoon[]; extern const u8 gMonFootprint_Zigzagoon[]; -extern const u8 gMonFrontPic_Linoone[]; -extern const u8 gMonPalette_Linoone[]; -extern const u8 gMonBackPic_Linoone[]; -extern const u8 gMonShinyPalette_Linoone[]; -extern const u8 gMonStillFrontPic_Linoone[]; +extern const u32 gMonFrontPic_Linoone[]; +extern const u32 gMonPalette_Linoone[]; +extern const u32 gMonBackPic_Linoone[]; +extern const u32 gMonShinyPalette_Linoone[]; +extern const u32 gMonStillFrontPic_Linoone[]; extern const u8 gMonIcon_Linoone[]; extern const u8 gMonFootprint_Linoone[]; -extern const u8 gMonFrontPic_Wurmple[]; -extern const u8 gMonPalette_Wurmple[]; -extern const u8 gMonBackPic_Wurmple[]; -extern const u8 gMonShinyPalette_Wurmple[]; -extern const u8 gMonStillFrontPic_Wurmple[]; +extern const u32 gMonFrontPic_Wurmple[]; +extern const u32 gMonPalette_Wurmple[]; +extern const u32 gMonBackPic_Wurmple[]; +extern const u32 gMonShinyPalette_Wurmple[]; +extern const u32 gMonStillFrontPic_Wurmple[]; extern const u8 gMonIcon_Wurmple[]; extern const u8 gMonFootprint_Wurmple[]; -extern const u8 gMonFrontPic_Silcoon[]; -extern const u8 gMonPalette_Silcoon[]; -extern const u8 gMonBackPic_Silcoon[]; -extern const u8 gMonShinyPalette_Silcoon[]; -extern const u8 gMonStillFrontPic_Silcoon[]; +extern const u32 gMonFrontPic_Silcoon[]; +extern const u32 gMonPalette_Silcoon[]; +extern const u32 gMonBackPic_Silcoon[]; +extern const u32 gMonShinyPalette_Silcoon[]; +extern const u32 gMonStillFrontPic_Silcoon[]; extern const u8 gMonIcon_Silcoon[]; extern const u8 gMonFootprint_Silcoon[]; -extern const u8 gMonFrontPic_Beautifly[]; -extern const u8 gMonPalette_Beautifly[]; -extern const u8 gMonBackPic_Beautifly[]; -extern const u8 gMonShinyPalette_Beautifly[]; -extern const u8 gMonStillFrontPic_Beautifly[]; +extern const u32 gMonFrontPic_Beautifly[]; +extern const u32 gMonPalette_Beautifly[]; +extern const u32 gMonBackPic_Beautifly[]; +extern const u32 gMonShinyPalette_Beautifly[]; +extern const u32 gMonStillFrontPic_Beautifly[]; extern const u8 gMonIcon_Beautifly[]; extern const u8 gMonFootprint_Beautifly[]; -extern const u8 gMonFrontPic_Cascoon[]; -extern const u8 gMonPalette_Cascoon[]; -extern const u8 gMonBackPic_Cascoon[]; -extern const u8 gMonShinyPalette_Cascoon[]; -extern const u8 gMonStillFrontPic_Cascoon[]; +extern const u32 gMonFrontPic_Cascoon[]; +extern const u32 gMonPalette_Cascoon[]; +extern const u32 gMonBackPic_Cascoon[]; +extern const u32 gMonShinyPalette_Cascoon[]; +extern const u32 gMonStillFrontPic_Cascoon[]; extern const u8 gMonIcon_Cascoon[]; extern const u8 gMonFootprint_Cascoon[]; -extern const u8 gMonFrontPic_Dustox[]; -extern const u8 gMonPalette_Dustox[]; -extern const u8 gMonBackPic_Dustox[]; -extern const u8 gMonShinyPalette_Dustox[]; -extern const u8 gMonStillFrontPic_Dustox[]; +extern const u32 gMonFrontPic_Dustox[]; +extern const u32 gMonPalette_Dustox[]; +extern const u32 gMonBackPic_Dustox[]; +extern const u32 gMonShinyPalette_Dustox[]; +extern const u32 gMonStillFrontPic_Dustox[]; extern const u8 gMonIcon_Dustox[]; extern const u8 gMonFootprint_Dustox[]; -extern const u8 gMonFrontPic_Lotad[]; -extern const u8 gMonPalette_Lotad[]; -extern const u8 gMonBackPic_Lotad[]; -extern const u8 gMonShinyPalette_Lotad[]; -extern const u8 gMonStillFrontPic_Lotad[]; +extern const u32 gMonFrontPic_Lotad[]; +extern const u32 gMonPalette_Lotad[]; +extern const u32 gMonBackPic_Lotad[]; +extern const u32 gMonShinyPalette_Lotad[]; +extern const u32 gMonStillFrontPic_Lotad[]; extern const u8 gMonIcon_Lotad[]; extern const u8 gMonFootprint_Lotad[]; -extern const u8 gMonFrontPic_Lombre[]; -extern const u8 gMonPalette_Lombre[]; -extern const u8 gMonBackPic_Lombre[]; -extern const u8 gMonShinyPalette_Lombre[]; -extern const u8 gMonStillFrontPic_Lombre[]; +extern const u32 gMonFrontPic_Lombre[]; +extern const u32 gMonPalette_Lombre[]; +extern const u32 gMonBackPic_Lombre[]; +extern const u32 gMonShinyPalette_Lombre[]; +extern const u32 gMonStillFrontPic_Lombre[]; extern const u8 gMonIcon_Lombre[]; extern const u8 gMonFootprint_Lombre[]; -extern const u8 gMonFrontPic_Ludicolo[]; -extern const u8 gMonPalette_Ludicolo[]; -extern const u8 gMonBackPic_Ludicolo[]; -extern const u8 gMonShinyPalette_Ludicolo[]; -extern const u8 gMonStillFrontPic_Ludicolo[]; +extern const u32 gMonFrontPic_Ludicolo[]; +extern const u32 gMonPalette_Ludicolo[]; +extern const u32 gMonBackPic_Ludicolo[]; +extern const u32 gMonShinyPalette_Ludicolo[]; +extern const u32 gMonStillFrontPic_Ludicolo[]; extern const u8 gMonIcon_Ludicolo[]; extern const u8 gMonFootprint_Ludicolo[]; -extern const u8 gMonFrontPic_Seedot[]; -extern const u8 gMonPalette_Seedot[]; -extern const u8 gMonBackPic_Seedot[]; -extern const u8 gMonShinyPalette_Seedot[]; -extern const u8 gMonStillFrontPic_Seedot[]; +extern const u32 gMonFrontPic_Seedot[]; +extern const u32 gMonPalette_Seedot[]; +extern const u32 gMonBackPic_Seedot[]; +extern const u32 gMonShinyPalette_Seedot[]; +extern const u32 gMonStillFrontPic_Seedot[]; extern const u8 gMonIcon_Seedot[]; extern const u8 gMonFootprint_Seedot[]; -extern const u8 gMonFrontPic_Nuzleaf[]; -extern const u8 gMonPalette_Nuzleaf[]; -extern const u8 gMonBackPic_Nuzleaf[]; -extern const u8 gMonShinyPalette_Nuzleaf[]; -extern const u8 gMonStillFrontPic_Nuzleaf[]; +extern const u32 gMonFrontPic_Nuzleaf[]; +extern const u32 gMonPalette_Nuzleaf[]; +extern const u32 gMonBackPic_Nuzleaf[]; +extern const u32 gMonShinyPalette_Nuzleaf[]; +extern const u32 gMonStillFrontPic_Nuzleaf[]; extern const u8 gMonIcon_Nuzleaf[]; extern const u8 gMonFootprint_Nuzleaf[]; -extern const u8 gMonFrontPic_Shiftry[]; -extern const u8 gMonPalette_Shiftry[]; -extern const u8 gMonBackPic_Shiftry[]; -extern const u8 gMonShinyPalette_Shiftry[]; -extern const u8 gMonStillFrontPic_Shiftry[]; +extern const u32 gMonFrontPic_Shiftry[]; +extern const u32 gMonPalette_Shiftry[]; +extern const u32 gMonBackPic_Shiftry[]; +extern const u32 gMonShinyPalette_Shiftry[]; +extern const u32 gMonStillFrontPic_Shiftry[]; extern const u8 gMonIcon_Shiftry[]; extern const u8 gMonFootprint_Shiftry[]; -extern const u8 gMonFrontPic_Nincada[]; -extern const u8 gMonPalette_Nincada[]; -extern const u8 gMonBackPic_Nincada[]; -extern const u8 gMonShinyPalette_Nincada[]; -extern const u8 gMonStillFrontPic_Nincada[]; +extern const u32 gMonFrontPic_Nincada[]; +extern const u32 gMonPalette_Nincada[]; +extern const u32 gMonBackPic_Nincada[]; +extern const u32 gMonShinyPalette_Nincada[]; +extern const u32 gMonStillFrontPic_Nincada[]; extern const u8 gMonIcon_Nincada[]; extern const u8 gMonFootprint_Nincada[]; -extern const u8 gMonFrontPic_Ninjask[]; -extern const u8 gMonPalette_Ninjask[]; -extern const u8 gMonBackPic_Ninjask[]; -extern const u8 gMonShinyPalette_Ninjask[]; -extern const u8 gMonStillFrontPic_Ninjask[]; +extern const u32 gMonFrontPic_Ninjask[]; +extern const u32 gMonPalette_Ninjask[]; +extern const u32 gMonBackPic_Ninjask[]; +extern const u32 gMonShinyPalette_Ninjask[]; +extern const u32 gMonStillFrontPic_Ninjask[]; extern const u8 gMonIcon_Ninjask[]; extern const u8 gMonFootprint_Ninjask[]; -extern const u8 gMonFrontPic_Shedinja[]; -extern const u8 gMonPalette_Shedinja[]; -extern const u8 gMonBackPic_Shedinja[]; -extern const u8 gMonShinyPalette_Shedinja[]; -extern const u8 gMonStillFrontPic_Shedinja[]; +extern const u32 gMonFrontPic_Shedinja[]; +extern const u32 gMonPalette_Shedinja[]; +extern const u32 gMonBackPic_Shedinja[]; +extern const u32 gMonShinyPalette_Shedinja[]; +extern const u32 gMonStillFrontPic_Shedinja[]; extern const u8 gMonIcon_Shedinja[]; extern const u8 gMonFootprint_Shedinja[]; -extern const u8 gMonFrontPic_Taillow[]; -extern const u8 gMonPalette_Taillow[]; -extern const u8 gMonBackPic_Taillow[]; -extern const u8 gMonShinyPalette_Taillow[]; -extern const u8 gMonStillFrontPic_Taillow[]; +extern const u32 gMonFrontPic_Taillow[]; +extern const u32 gMonPalette_Taillow[]; +extern const u32 gMonBackPic_Taillow[]; +extern const u32 gMonShinyPalette_Taillow[]; +extern const u32 gMonStillFrontPic_Taillow[]; extern const u8 gMonIcon_Taillow[]; extern const u8 gMonFootprint_Taillow[]; -extern const u8 gMonFrontPic_Swellow[]; -extern const u8 gMonPalette_Swellow[]; -extern const u8 gMonBackPic_Swellow[]; -extern const u8 gMonShinyPalette_Swellow[]; -extern const u8 gMonStillFrontPic_Swellow[]; +extern const u32 gMonFrontPic_Swellow[]; +extern const u32 gMonPalette_Swellow[]; +extern const u32 gMonBackPic_Swellow[]; +extern const u32 gMonShinyPalette_Swellow[]; +extern const u32 gMonStillFrontPic_Swellow[]; extern const u8 gMonIcon_Swellow[]; extern const u8 gMonFootprint_Swellow[]; -extern const u8 gMonFrontPic_Shroomish[]; -extern const u8 gMonPalette_Shroomish[]; -extern const u8 gMonBackPic_Shroomish[]; -extern const u8 gMonShinyPalette_Shroomish[]; -extern const u8 gMonStillFrontPic_Shroomish[]; +extern const u32 gMonFrontPic_Shroomish[]; +extern const u32 gMonPalette_Shroomish[]; +extern const u32 gMonBackPic_Shroomish[]; +extern const u32 gMonShinyPalette_Shroomish[]; +extern const u32 gMonStillFrontPic_Shroomish[]; extern const u8 gMonIcon_Shroomish[]; extern const u8 gMonFootprint_Shroomish[]; -extern const u8 gMonFrontPic_Breloom[]; -extern const u8 gMonPalette_Breloom[]; -extern const u8 gMonBackPic_Breloom[]; -extern const u8 gMonShinyPalette_Breloom[]; -extern const u8 gMonStillFrontPic_Breloom[]; +extern const u32 gMonFrontPic_Breloom[]; +extern const u32 gMonPalette_Breloom[]; +extern const u32 gMonBackPic_Breloom[]; +extern const u32 gMonShinyPalette_Breloom[]; +extern const u32 gMonStillFrontPic_Breloom[]; extern const u8 gMonIcon_Breloom[]; extern const u8 gMonFootprint_Breloom[]; -extern const u8 gMonFrontPic_Spinda[]; -extern const u8 gMonPalette_Spinda[]; -extern const u8 gMonBackPic_Spinda[]; -extern const u8 gMonShinyPalette_Spinda[]; -extern const u8 gMonStillFrontPic_Spinda[]; +extern const u32 gMonFrontPic_Spinda[]; +extern const u32 gMonPalette_Spinda[]; +extern const u32 gMonBackPic_Spinda[]; +extern const u32 gMonShinyPalette_Spinda[]; +extern const u32 gMonStillFrontPic_Spinda[]; extern const u8 gMonIcon_Spinda[]; extern const u8 gMonFootprint_Spinda[]; -extern const u8 gMonFrontPic_Wingull[]; -extern const u8 gMonPalette_Wingull[]; -extern const u8 gMonBackPic_Wingull[]; -extern const u8 gMonShinyPalette_Wingull[]; -extern const u8 gMonStillFrontPic_Wingull[]; +extern const u32 gMonFrontPic_Wingull[]; +extern const u32 gMonPalette_Wingull[]; +extern const u32 gMonBackPic_Wingull[]; +extern const u32 gMonShinyPalette_Wingull[]; +extern const u32 gMonStillFrontPic_Wingull[]; extern const u8 gMonIcon_Wingull[]; extern const u8 gMonFootprint_Wingull[]; -extern const u8 gMonFrontPic_Pelipper[]; -extern const u8 gMonPalette_Pelipper[]; -extern const u8 gMonBackPic_Pelipper[]; -extern const u8 gMonShinyPalette_Pelipper[]; -extern const u8 gMonStillFrontPic_Pelipper[]; +extern const u32 gMonFrontPic_Pelipper[]; +extern const u32 gMonPalette_Pelipper[]; +extern const u32 gMonBackPic_Pelipper[]; +extern const u32 gMonShinyPalette_Pelipper[]; +extern const u32 gMonStillFrontPic_Pelipper[]; extern const u8 gMonIcon_Pelipper[]; extern const u8 gMonFootprint_Pelipper[]; -extern const u8 gMonFrontPic_Surskit[]; -extern const u8 gMonPalette_Surskit[]; -extern const u8 gMonBackPic_Surskit[]; -extern const u8 gMonShinyPalette_Surskit[]; -extern const u8 gMonStillFrontPic_Surskit[]; +extern const u32 gMonFrontPic_Surskit[]; +extern const u32 gMonPalette_Surskit[]; +extern const u32 gMonBackPic_Surskit[]; +extern const u32 gMonShinyPalette_Surskit[]; +extern const u32 gMonStillFrontPic_Surskit[]; extern const u8 gMonIcon_Surskit[]; extern const u8 gMonFootprint_Surskit[]; -extern const u8 gMonFrontPic_Masquerain[]; -extern const u8 gMonPalette_Masquerain[]; -extern const u8 gMonBackPic_Masquerain[]; -extern const u8 gMonShinyPalette_Masquerain[]; -extern const u8 gMonStillFrontPic_Masquerain[]; +extern const u32 gMonFrontPic_Masquerain[]; +extern const u32 gMonPalette_Masquerain[]; +extern const u32 gMonBackPic_Masquerain[]; +extern const u32 gMonShinyPalette_Masquerain[]; +extern const u32 gMonStillFrontPic_Masquerain[]; extern const u8 gMonIcon_Masquerain[]; extern const u8 gMonFootprint_Masquerain[]; -extern const u8 gMonFrontPic_Wailmer[]; -extern const u8 gMonPalette_Wailmer[]; -extern const u8 gMonBackPic_Wailmer[]; -extern const u8 gMonShinyPalette_Wailmer[]; -extern const u8 gMonStillFrontPic_Wailmer[]; +extern const u32 gMonFrontPic_Wailmer[]; +extern const u32 gMonPalette_Wailmer[]; +extern const u32 gMonBackPic_Wailmer[]; +extern const u32 gMonShinyPalette_Wailmer[]; +extern const u32 gMonStillFrontPic_Wailmer[]; extern const u8 gMonIcon_Wailmer[]; extern const u8 gMonFootprint_Wailmer[]; -extern const u8 gMonFrontPic_Wailord[]; -extern const u8 gMonPalette_Wailord[]; -extern const u8 gMonBackPic_Wailord[]; -extern const u8 gMonShinyPalette_Wailord[]; -extern const u8 gMonStillFrontPic_Wailord[]; +extern const u32 gMonFrontPic_Wailord[]; +extern const u32 gMonPalette_Wailord[]; +extern const u32 gMonBackPic_Wailord[]; +extern const u32 gMonShinyPalette_Wailord[]; +extern const u32 gMonStillFrontPic_Wailord[]; extern const u8 gMonIcon_Wailord[]; extern const u8 gMonFootprint_Wailord[]; -extern const u8 gMonFrontPic_Skitty[]; -extern const u8 gMonPalette_Skitty[]; -extern const u8 gMonBackPic_Skitty[]; -extern const u8 gMonShinyPalette_Skitty[]; -extern const u8 gMonStillFrontPic_Skitty[]; +extern const u32 gMonFrontPic_Skitty[]; +extern const u32 gMonPalette_Skitty[]; +extern const u32 gMonBackPic_Skitty[]; +extern const u32 gMonShinyPalette_Skitty[]; +extern const u32 gMonStillFrontPic_Skitty[]; extern const u8 gMonIcon_Skitty[]; extern const u8 gMonFootprint_Skitty[]; -extern const u8 gMonFrontPic_Delcatty[]; -extern const u8 gMonPalette_Delcatty[]; -extern const u8 gMonBackPic_Delcatty[]; -extern const u8 gMonShinyPalette_Delcatty[]; -extern const u8 gMonStillFrontPic_Delcatty[]; +extern const u32 gMonFrontPic_Delcatty[]; +extern const u32 gMonPalette_Delcatty[]; +extern const u32 gMonBackPic_Delcatty[]; +extern const u32 gMonShinyPalette_Delcatty[]; +extern const u32 gMonStillFrontPic_Delcatty[]; extern const u8 gMonIcon_Delcatty[]; extern const u8 gMonFootprint_Delcatty[]; -extern const u8 gMonFrontPic_Kecleon[]; -extern const u8 gMonPalette_Kecleon[]; -extern const u8 gMonBackPic_Kecleon[]; -extern const u8 gMonShinyPalette_Kecleon[]; -extern const u8 gMonStillFrontPic_Kecleon[]; +extern const u32 gMonFrontPic_Kecleon[]; +extern const u32 gMonPalette_Kecleon[]; +extern const u32 gMonBackPic_Kecleon[]; +extern const u32 gMonShinyPalette_Kecleon[]; +extern const u32 gMonStillFrontPic_Kecleon[]; extern const u8 gMonIcon_Kecleon[]; extern const u8 gMonFootprint_Kecleon[]; -extern const u8 gMonFrontPic_Baltoy[]; -extern const u8 gMonPalette_Baltoy[]; -extern const u8 gMonBackPic_Baltoy[]; -extern const u8 gMonShinyPalette_Baltoy[]; -extern const u8 gMonStillFrontPic_Baltoy[]; +extern const u32 gMonFrontPic_Baltoy[]; +extern const u32 gMonPalette_Baltoy[]; +extern const u32 gMonBackPic_Baltoy[]; +extern const u32 gMonShinyPalette_Baltoy[]; +extern const u32 gMonStillFrontPic_Baltoy[]; extern const u8 gMonIcon_Baltoy[]; extern const u8 gMonFootprint_Baltoy[]; -extern const u8 gMonFrontPic_Claydol[]; -extern const u8 gMonPalette_Claydol[]; -extern const u8 gMonBackPic_Claydol[]; -extern const u8 gMonShinyPalette_Claydol[]; -extern const u8 gMonStillFrontPic_Claydol[]; +extern const u32 gMonFrontPic_Claydol[]; +extern const u32 gMonPalette_Claydol[]; +extern const u32 gMonBackPic_Claydol[]; +extern const u32 gMonShinyPalette_Claydol[]; +extern const u32 gMonStillFrontPic_Claydol[]; extern const u8 gMonIcon_Claydol[]; extern const u8 gMonFootprint_Claydol[]; -extern const u8 gMonFrontPic_Nosepass[]; -extern const u8 gMonPalette_Nosepass[]; -extern const u8 gMonBackPic_Nosepass[]; -extern const u8 gMonShinyPalette_Nosepass[]; -extern const u8 gMonStillFrontPic_Nosepass[]; +extern const u32 gMonFrontPic_Nosepass[]; +extern const u32 gMonPalette_Nosepass[]; +extern const u32 gMonBackPic_Nosepass[]; +extern const u32 gMonShinyPalette_Nosepass[]; +extern const u32 gMonStillFrontPic_Nosepass[]; extern const u8 gMonIcon_Nosepass[]; extern const u8 gMonFootprint_Nosepass[]; -extern const u8 gMonFrontPic_Torkoal[]; -extern const u8 gMonPalette_Torkoal[]; -extern const u8 gMonBackPic_Torkoal[]; -extern const u8 gMonShinyPalette_Torkoal[]; -extern const u8 gMonStillFrontPic_Torkoal[]; +extern const u32 gMonFrontPic_Torkoal[]; +extern const u32 gMonPalette_Torkoal[]; +extern const u32 gMonBackPic_Torkoal[]; +extern const u32 gMonShinyPalette_Torkoal[]; +extern const u32 gMonStillFrontPic_Torkoal[]; extern const u8 gMonIcon_Torkoal[]; extern const u8 gMonFootprint_Torkoal[]; -extern const u8 gMonFrontPic_Sableye[]; -extern const u8 gMonPalette_Sableye[]; -extern const u8 gMonBackPic_Sableye[]; -extern const u8 gMonShinyPalette_Sableye[]; -extern const u8 gMonStillFrontPic_Sableye[]; +extern const u32 gMonFrontPic_Sableye[]; +extern const u32 gMonPalette_Sableye[]; +extern const u32 gMonBackPic_Sableye[]; +extern const u32 gMonShinyPalette_Sableye[]; +extern const u32 gMonStillFrontPic_Sableye[]; extern const u8 gMonIcon_Sableye[]; extern const u8 gMonFootprint_Sableye[]; -extern const u8 gMonFrontPic_Barboach[]; -extern const u8 gMonPalette_Barboach[]; -extern const u8 gMonBackPic_Barboach[]; -extern const u8 gMonShinyPalette_Barboach[]; -extern const u8 gMonStillFrontPic_Barboach[]; +extern const u32 gMonFrontPic_Barboach[]; +extern const u32 gMonPalette_Barboach[]; +extern const u32 gMonBackPic_Barboach[]; +extern const u32 gMonShinyPalette_Barboach[]; +extern const u32 gMonStillFrontPic_Barboach[]; extern const u8 gMonIcon_Barboach[]; extern const u8 gMonFootprint_Barboach[]; -extern const u8 gMonFrontPic_Whiscash[]; -extern const u8 gMonPalette_Whiscash[]; -extern const u8 gMonBackPic_Whiscash[]; -extern const u8 gMonShinyPalette_Whiscash[]; -extern const u8 gMonStillFrontPic_Whiscash[]; +extern const u32 gMonFrontPic_Whiscash[]; +extern const u32 gMonPalette_Whiscash[]; +extern const u32 gMonBackPic_Whiscash[]; +extern const u32 gMonShinyPalette_Whiscash[]; +extern const u32 gMonStillFrontPic_Whiscash[]; extern const u8 gMonIcon_Whiscash[]; extern const u8 gMonFootprint_Whiscash[]; -extern const u8 gMonFrontPic_Luvdisc[]; -extern const u8 gMonPalette_Luvdisc[]; -extern const u8 gMonBackPic_Luvdisc[]; -extern const u8 gMonShinyPalette_Luvdisc[]; -extern const u8 gMonStillFrontPic_Luvdisc[]; +extern const u32 gMonFrontPic_Luvdisc[]; +extern const u32 gMonPalette_Luvdisc[]; +extern const u32 gMonBackPic_Luvdisc[]; +extern const u32 gMonShinyPalette_Luvdisc[]; +extern const u32 gMonStillFrontPic_Luvdisc[]; extern const u8 gMonIcon_Luvdisc[]; extern const u8 gMonFootprint_Luvdisc[]; -extern const u8 gMonFrontPic_Corphish[]; -extern const u8 gMonPalette_Corphish[]; -extern const u8 gMonBackPic_Corphish[]; -extern const u8 gMonShinyPalette_Corphish[]; -extern const u8 gMonStillFrontPic_Corphish[]; +extern const u32 gMonFrontPic_Corphish[]; +extern const u32 gMonPalette_Corphish[]; +extern const u32 gMonBackPic_Corphish[]; +extern const u32 gMonShinyPalette_Corphish[]; +extern const u32 gMonStillFrontPic_Corphish[]; extern const u8 gMonIcon_Corphish[]; extern const u8 gMonFootprint_Corphish[]; -extern const u8 gMonFrontPic_Crawdaunt[]; -extern const u8 gMonPalette_Crawdaunt[]; -extern const u8 gMonBackPic_Crawdaunt[]; -extern const u8 gMonShinyPalette_Crawdaunt[]; -extern const u8 gMonStillFrontPic_Crawdaunt[]; +extern const u32 gMonFrontPic_Crawdaunt[]; +extern const u32 gMonPalette_Crawdaunt[]; +extern const u32 gMonBackPic_Crawdaunt[]; +extern const u32 gMonShinyPalette_Crawdaunt[]; +extern const u32 gMonStillFrontPic_Crawdaunt[]; extern const u8 gMonIcon_Crawdaunt[]; extern const u8 gMonFootprint_Crawdaunt[]; -extern const u8 gMonFrontPic_Feebas[]; -extern const u8 gMonPalette_Feebas[]; -extern const u8 gMonBackPic_Feebas[]; -extern const u8 gMonShinyPalette_Feebas[]; -extern const u8 gMonStillFrontPic_Feebas[]; +extern const u32 gMonFrontPic_Feebas[]; +extern const u32 gMonPalette_Feebas[]; +extern const u32 gMonBackPic_Feebas[]; +extern const u32 gMonShinyPalette_Feebas[]; +extern const u32 gMonStillFrontPic_Feebas[]; extern const u8 gMonIcon_Feebas[]; extern const u8 gMonFootprint_Feebas[]; -extern const u8 gMonFrontPic_Milotic[]; -extern const u8 gMonPalette_Milotic[]; -extern const u8 gMonBackPic_Milotic[]; -extern const u8 gMonShinyPalette_Milotic[]; -extern const u8 gMonStillFrontPic_Milotic[]; +extern const u32 gMonFrontPic_Milotic[]; +extern const u32 gMonPalette_Milotic[]; +extern const u32 gMonBackPic_Milotic[]; +extern const u32 gMonShinyPalette_Milotic[]; +extern const u32 gMonStillFrontPic_Milotic[]; extern const u8 gMonIcon_Milotic[]; extern const u8 gMonFootprint_Milotic[]; -extern const u8 gMonFrontPic_Carvanha[]; -extern const u8 gMonPalette_Carvanha[]; -extern const u8 gMonBackPic_Carvanha[]; -extern const u8 gMonShinyPalette_Carvanha[]; -extern const u8 gMonStillFrontPic_Carvanha[]; +extern const u32 gMonFrontPic_Carvanha[]; +extern const u32 gMonPalette_Carvanha[]; +extern const u32 gMonBackPic_Carvanha[]; +extern const u32 gMonShinyPalette_Carvanha[]; +extern const u32 gMonStillFrontPic_Carvanha[]; extern const u8 gMonIcon_Carvanha[]; extern const u8 gMonFootprint_Carvanha[]; -extern const u8 gMonFrontPic_Sharpedo[]; -extern const u8 gMonPalette_Sharpedo[]; -extern const u8 gMonBackPic_Sharpedo[]; -extern const u8 gMonShinyPalette_Sharpedo[]; -extern const u8 gMonStillFrontPic_Sharpedo[]; +extern const u32 gMonFrontPic_Sharpedo[]; +extern const u32 gMonPalette_Sharpedo[]; +extern const u32 gMonBackPic_Sharpedo[]; +extern const u32 gMonShinyPalette_Sharpedo[]; +extern const u32 gMonStillFrontPic_Sharpedo[]; extern const u8 gMonIcon_Sharpedo[]; extern const u8 gMonFootprint_Sharpedo[]; -extern const u8 gMonFrontPic_Trapinch[]; -extern const u8 gMonPalette_Trapinch[]; -extern const u8 gMonBackPic_Trapinch[]; -extern const u8 gMonShinyPalette_Trapinch[]; -extern const u8 gMonStillFrontPic_Trapinch[]; +extern const u32 gMonFrontPic_Trapinch[]; +extern const u32 gMonPalette_Trapinch[]; +extern const u32 gMonBackPic_Trapinch[]; +extern const u32 gMonShinyPalette_Trapinch[]; +extern const u32 gMonStillFrontPic_Trapinch[]; extern const u8 gMonIcon_Trapinch[]; extern const u8 gMonFootprint_Trapinch[]; -extern const u8 gMonFrontPic_Vibrava[]; -extern const u8 gMonPalette_Vibrava[]; -extern const u8 gMonBackPic_Vibrava[]; -extern const u8 gMonShinyPalette_Vibrava[]; -extern const u8 gMonStillFrontPic_Vibrava[]; +extern const u32 gMonFrontPic_Vibrava[]; +extern const u32 gMonPalette_Vibrava[]; +extern const u32 gMonBackPic_Vibrava[]; +extern const u32 gMonShinyPalette_Vibrava[]; +extern const u32 gMonStillFrontPic_Vibrava[]; extern const u8 gMonIcon_Vibrava[]; extern const u8 gMonFootprint_Vibrava[]; -extern const u8 gMonFrontPic_Flygon[]; -extern const u8 gMonPalette_Flygon[]; -extern const u8 gMonBackPic_Flygon[]; -extern const u8 gMonShinyPalette_Flygon[]; -extern const u8 gMonStillFrontPic_Flygon[]; +extern const u32 gMonFrontPic_Flygon[]; +extern const u32 gMonPalette_Flygon[]; +extern const u32 gMonBackPic_Flygon[]; +extern const u32 gMonShinyPalette_Flygon[]; +extern const u32 gMonStillFrontPic_Flygon[]; extern const u8 gMonIcon_Flygon[]; extern const u8 gMonFootprint_Flygon[]; -extern const u8 gMonFrontPic_Makuhita[]; -extern const u8 gMonPalette_Makuhita[]; -extern const u8 gMonBackPic_Makuhita[]; -extern const u8 gMonShinyPalette_Makuhita[]; -extern const u8 gMonStillFrontPic_Makuhita[]; +extern const u32 gMonFrontPic_Makuhita[]; +extern const u32 gMonPalette_Makuhita[]; +extern const u32 gMonBackPic_Makuhita[]; +extern const u32 gMonShinyPalette_Makuhita[]; +extern const u32 gMonStillFrontPic_Makuhita[]; extern const u8 gMonIcon_Makuhita[]; extern const u8 gMonFootprint_Makuhita[]; -extern const u8 gMonFrontPic_Hariyama[]; -extern const u8 gMonPalette_Hariyama[]; -extern const u8 gMonBackPic_Hariyama[]; -extern const u8 gMonShinyPalette_Hariyama[]; -extern const u8 gMonStillFrontPic_Hariyama[]; +extern const u32 gMonFrontPic_Hariyama[]; +extern const u32 gMonPalette_Hariyama[]; +extern const u32 gMonBackPic_Hariyama[]; +extern const u32 gMonShinyPalette_Hariyama[]; +extern const u32 gMonStillFrontPic_Hariyama[]; extern const u8 gMonIcon_Hariyama[]; extern const u8 gMonFootprint_Hariyama[]; -extern const u8 gMonFrontPic_Electrike[]; -extern const u8 gMonPalette_Electrike[]; -extern const u8 gMonBackPic_Electrike[]; -extern const u8 gMonShinyPalette_Electrike[]; -extern const u8 gMonStillFrontPic_Electrike[]; +extern const u32 gMonFrontPic_Electrike[]; +extern const u32 gMonPalette_Electrike[]; +extern const u32 gMonBackPic_Electrike[]; +extern const u32 gMonShinyPalette_Electrike[]; +extern const u32 gMonStillFrontPic_Electrike[]; extern const u8 gMonIcon_Electrike[]; extern const u8 gMonFootprint_Electrike[]; -extern const u8 gMonFrontPic_Manectric[]; -extern const u8 gMonPalette_Manectric[]; -extern const u8 gMonBackPic_Manectric[]; -extern const u8 gMonShinyPalette_Manectric[]; -extern const u8 gMonStillFrontPic_Manectric[]; +extern const u32 gMonFrontPic_Manectric[]; +extern const u32 gMonPalette_Manectric[]; +extern const u32 gMonBackPic_Manectric[]; +extern const u32 gMonShinyPalette_Manectric[]; +extern const u32 gMonStillFrontPic_Manectric[]; extern const u8 gMonIcon_Manectric[]; extern const u8 gMonFootprint_Manectric[]; -extern const u8 gMonFrontPic_Numel[]; -extern const u8 gMonPalette_Numel[]; -extern const u8 gMonBackPic_Numel[]; -extern const u8 gMonShinyPalette_Numel[]; -extern const u8 gMonStillFrontPic_Numel[]; +extern const u32 gMonFrontPic_Numel[]; +extern const u32 gMonPalette_Numel[]; +extern const u32 gMonBackPic_Numel[]; +extern const u32 gMonShinyPalette_Numel[]; +extern const u32 gMonStillFrontPic_Numel[]; extern const u8 gMonIcon_Numel[]; extern const u8 gMonFootprint_Numel[]; -extern const u8 gMonFrontPic_Camerupt[]; -extern const u8 gMonPalette_Camerupt[]; -extern const u8 gMonBackPic_Camerupt[]; -extern const u8 gMonShinyPalette_Camerupt[]; -extern const u8 gMonStillFrontPic_Camerupt[]; +extern const u32 gMonFrontPic_Camerupt[]; +extern const u32 gMonPalette_Camerupt[]; +extern const u32 gMonBackPic_Camerupt[]; +extern const u32 gMonShinyPalette_Camerupt[]; +extern const u32 gMonStillFrontPic_Camerupt[]; extern const u8 gMonIcon_Camerupt[]; extern const u8 gMonFootprint_Camerupt[]; -extern const u8 gMonFrontPic_Spheal[]; -extern const u8 gMonPalette_Spheal[]; -extern const u8 gMonBackPic_Spheal[]; -extern const u8 gMonShinyPalette_Spheal[]; -extern const u8 gMonStillFrontPic_Spheal[]; +extern const u32 gMonFrontPic_Spheal[]; +extern const u32 gMonPalette_Spheal[]; +extern const u32 gMonBackPic_Spheal[]; +extern const u32 gMonShinyPalette_Spheal[]; +extern const u32 gMonStillFrontPic_Spheal[]; extern const u8 gMonIcon_Spheal[]; extern const u8 gMonFootprint_Spheal[]; -extern const u8 gMonFrontPic_Sealeo[]; -extern const u8 gMonPalette_Sealeo[]; -extern const u8 gMonBackPic_Sealeo[]; -extern const u8 gMonShinyPalette_Sealeo[]; -extern const u8 gMonStillFrontPic_Sealeo[]; +extern const u32 gMonFrontPic_Sealeo[]; +extern const u32 gMonPalette_Sealeo[]; +extern const u32 gMonBackPic_Sealeo[]; +extern const u32 gMonShinyPalette_Sealeo[]; +extern const u32 gMonStillFrontPic_Sealeo[]; extern const u8 gMonIcon_Sealeo[]; extern const u8 gMonFootprint_Sealeo[]; -extern const u8 gMonFrontPic_Walrein[]; -extern const u8 gMonPalette_Walrein[]; -extern const u8 gMonBackPic_Walrein[]; -extern const u8 gMonShinyPalette_Walrein[]; -extern const u8 gMonStillFrontPic_Walrein[]; +extern const u32 gMonFrontPic_Walrein[]; +extern const u32 gMonPalette_Walrein[]; +extern const u32 gMonBackPic_Walrein[]; +extern const u32 gMonShinyPalette_Walrein[]; +extern const u32 gMonStillFrontPic_Walrein[]; extern const u8 gMonIcon_Walrein[]; extern const u8 gMonFootprint_Walrein[]; -extern const u8 gMonFrontPic_Cacnea[]; -extern const u8 gMonPalette_Cacnea[]; -extern const u8 gMonBackPic_Cacnea[]; -extern const u8 gMonShinyPalette_Cacnea[]; -extern const u8 gMonStillFrontPic_Cacnea[]; +extern const u32 gMonFrontPic_Cacnea[]; +extern const u32 gMonPalette_Cacnea[]; +extern const u32 gMonBackPic_Cacnea[]; +extern const u32 gMonShinyPalette_Cacnea[]; +extern const u32 gMonStillFrontPic_Cacnea[]; extern const u8 gMonIcon_Cacnea[]; extern const u8 gMonFootprint_Cacnea[]; -extern const u8 gMonFrontPic_Cacturne[]; -extern const u8 gMonPalette_Cacturne[]; -extern const u8 gMonBackPic_Cacturne[]; -extern const u8 gMonShinyPalette_Cacturne[]; -extern const u8 gMonStillFrontPic_Cacturne[]; +extern const u32 gMonFrontPic_Cacturne[]; +extern const u32 gMonPalette_Cacturne[]; +extern const u32 gMonBackPic_Cacturne[]; +extern const u32 gMonShinyPalette_Cacturne[]; +extern const u32 gMonStillFrontPic_Cacturne[]; extern const u8 gMonIcon_Cacturne[]; extern const u8 gMonFootprint_Cacturne[]; -extern const u8 gMonFrontPic_Snorunt[]; -extern const u8 gMonPalette_Snorunt[]; -extern const u8 gMonBackPic_Snorunt[]; -extern const u8 gMonShinyPalette_Snorunt[]; -extern const u8 gMonStillFrontPic_Snorunt[]; +extern const u32 gMonFrontPic_Snorunt[]; +extern const u32 gMonPalette_Snorunt[]; +extern const u32 gMonBackPic_Snorunt[]; +extern const u32 gMonShinyPalette_Snorunt[]; +extern const u32 gMonStillFrontPic_Snorunt[]; extern const u8 gMonIcon_Snorunt[]; extern const u8 gMonFootprint_Snorunt[]; -extern const u8 gMonFrontPic_Glalie[]; -extern const u8 gMonPalette_Glalie[]; -extern const u8 gMonBackPic_Glalie[]; -extern const u8 gMonShinyPalette_Glalie[]; -extern const u8 gMonStillFrontPic_Glalie[]; +extern const u32 gMonFrontPic_Glalie[]; +extern const u32 gMonPalette_Glalie[]; +extern const u32 gMonBackPic_Glalie[]; +extern const u32 gMonShinyPalette_Glalie[]; +extern const u32 gMonStillFrontPic_Glalie[]; extern const u8 gMonIcon_Glalie[]; extern const u8 gMonFootprint_Glalie[]; -extern const u8 gMonFrontPic_Lunatone[]; -extern const u8 gMonPalette_Lunatone[]; -extern const u8 gMonBackPic_Lunatone[]; -extern const u8 gMonShinyPalette_Lunatone[]; -extern const u8 gMonStillFrontPic_Lunatone[]; +extern const u32 gMonFrontPic_Lunatone[]; +extern const u32 gMonPalette_Lunatone[]; +extern const u32 gMonBackPic_Lunatone[]; +extern const u32 gMonShinyPalette_Lunatone[]; +extern const u32 gMonStillFrontPic_Lunatone[]; extern const u8 gMonIcon_Lunatone[]; extern const u8 gMonFootprint_Lunatone[]; -extern const u8 gMonFrontPic_Solrock[]; -extern const u8 gMonPalette_Solrock[]; -extern const u8 gMonBackPic_Solrock[]; -extern const u8 gMonShinyPalette_Solrock[]; -extern const u8 gMonStillFrontPic_Solrock[]; +extern const u32 gMonFrontPic_Solrock[]; +extern const u32 gMonPalette_Solrock[]; +extern const u32 gMonBackPic_Solrock[]; +extern const u32 gMonShinyPalette_Solrock[]; +extern const u32 gMonStillFrontPic_Solrock[]; extern const u8 gMonIcon_Solrock[]; extern const u8 gMonFootprint_Solrock[]; -extern const u8 gMonFrontPic_Azurill[]; -extern const u8 gMonPalette_Azurill[]; -extern const u8 gMonBackPic_Azurill[]; -extern const u8 gMonShinyPalette_Azurill[]; -extern const u8 gMonStillFrontPic_Azurill[]; +extern const u32 gMonFrontPic_Azurill[]; +extern const u32 gMonPalette_Azurill[]; +extern const u32 gMonBackPic_Azurill[]; +extern const u32 gMonShinyPalette_Azurill[]; +extern const u32 gMonStillFrontPic_Azurill[]; extern const u8 gMonIcon_Azurill[]; extern const u8 gMonFootprint_Azurill[]; -extern const u8 gMonFrontPic_Spoink[]; -extern const u8 gMonPalette_Spoink[]; -extern const u8 gMonBackPic_Spoink[]; -extern const u8 gMonShinyPalette_Spoink[]; -extern const u8 gMonStillFrontPic_Spoink[]; +extern const u32 gMonFrontPic_Spoink[]; +extern const u32 gMonPalette_Spoink[]; +extern const u32 gMonBackPic_Spoink[]; +extern const u32 gMonShinyPalette_Spoink[]; +extern const u32 gMonStillFrontPic_Spoink[]; extern const u8 gMonIcon_Spoink[]; extern const u8 gMonFootprint_Spoink[]; -extern const u8 gMonFrontPic_Grumpig[]; -extern const u8 gMonPalette_Grumpig[]; -extern const u8 gMonBackPic_Grumpig[]; -extern const u8 gMonShinyPalette_Grumpig[]; -extern const u8 gMonStillFrontPic_Grumpig[]; +extern const u32 gMonFrontPic_Grumpig[]; +extern const u32 gMonPalette_Grumpig[]; +extern const u32 gMonBackPic_Grumpig[]; +extern const u32 gMonShinyPalette_Grumpig[]; +extern const u32 gMonStillFrontPic_Grumpig[]; extern const u8 gMonIcon_Grumpig[]; extern const u8 gMonFootprint_Grumpig[]; -extern const u8 gMonFrontPic_Plusle[]; -extern const u8 gMonPalette_Plusle[]; -extern const u8 gMonBackPic_Plusle[]; -extern const u8 gMonShinyPalette_Plusle[]; -extern const u8 gMonStillFrontPic_Plusle[]; +extern const u32 gMonFrontPic_Plusle[]; +extern const u32 gMonPalette_Plusle[]; +extern const u32 gMonBackPic_Plusle[]; +extern const u32 gMonShinyPalette_Plusle[]; +extern const u32 gMonStillFrontPic_Plusle[]; extern const u8 gMonIcon_Plusle[]; extern const u8 gMonFootprint_Plusle[]; -extern const u8 gMonFrontPic_Minun[]; -extern const u8 gMonPalette_Minun[]; -extern const u8 gMonBackPic_Minun[]; -extern const u8 gMonShinyPalette_Minun[]; -extern const u8 gMonStillFrontPic_Minun[]; +extern const u32 gMonFrontPic_Minun[]; +extern const u32 gMonPalette_Minun[]; +extern const u32 gMonBackPic_Minun[]; +extern const u32 gMonShinyPalette_Minun[]; +extern const u32 gMonStillFrontPic_Minun[]; extern const u8 gMonIcon_Minun[]; extern const u8 gMonFootprint_Minun[]; -extern const u8 gMonFrontPic_Mawile[]; -extern const u8 gMonPalette_Mawile[]; -extern const u8 gMonBackPic_Mawile[]; -extern const u8 gMonShinyPalette_Mawile[]; -extern const u8 gMonStillFrontPic_Mawile[]; +extern const u32 gMonFrontPic_Mawile[]; +extern const u32 gMonPalette_Mawile[]; +extern const u32 gMonBackPic_Mawile[]; +extern const u32 gMonShinyPalette_Mawile[]; +extern const u32 gMonStillFrontPic_Mawile[]; extern const u8 gMonIcon_Mawile[]; extern const u8 gMonFootprint_Mawile[]; -extern const u8 gMonFrontPic_Meditite[]; -extern const u8 gMonPalette_Meditite[]; -extern const u8 gMonBackPic_Meditite[]; -extern const u8 gMonShinyPalette_Meditite[]; -extern const u8 gMonStillFrontPic_Meditite[]; +extern const u32 gMonFrontPic_Meditite[]; +extern const u32 gMonPalette_Meditite[]; +extern const u32 gMonBackPic_Meditite[]; +extern const u32 gMonShinyPalette_Meditite[]; +extern const u32 gMonStillFrontPic_Meditite[]; extern const u8 gMonIcon_Meditite[]; extern const u8 gMonFootprint_Meditite[]; -extern const u8 gMonFrontPic_Medicham[]; -extern const u8 gMonPalette_Medicham[]; -extern const u8 gMonBackPic_Medicham[]; -extern const u8 gMonShinyPalette_Medicham[]; -extern const u8 gMonStillFrontPic_Medicham[]; +extern const u32 gMonFrontPic_Medicham[]; +extern const u32 gMonPalette_Medicham[]; +extern const u32 gMonBackPic_Medicham[]; +extern const u32 gMonShinyPalette_Medicham[]; +extern const u32 gMonStillFrontPic_Medicham[]; extern const u8 gMonIcon_Medicham[]; extern const u8 gMonFootprint_Medicham[]; -extern const u8 gMonFrontPic_Swablu[]; -extern const u8 gMonPalette_Swablu[]; -extern const u8 gMonBackPic_Swablu[]; -extern const u8 gMonShinyPalette_Swablu[]; -extern const u8 gMonStillFrontPic_Swablu[]; +extern const u32 gMonFrontPic_Swablu[]; +extern const u32 gMonPalette_Swablu[]; +extern const u32 gMonBackPic_Swablu[]; +extern const u32 gMonShinyPalette_Swablu[]; +extern const u32 gMonStillFrontPic_Swablu[]; extern const u8 gMonIcon_Swablu[]; extern const u8 gMonFootprint_Swablu[]; -extern const u8 gMonFrontPic_Altaria[]; -extern const u8 gMonPalette_Altaria[]; -extern const u8 gMonBackPic_Altaria[]; -extern const u8 gMonShinyPalette_Altaria[]; -extern const u8 gMonStillFrontPic_Altaria[]; +extern const u32 gMonFrontPic_Altaria[]; +extern const u32 gMonPalette_Altaria[]; +extern const u32 gMonBackPic_Altaria[]; +extern const u32 gMonShinyPalette_Altaria[]; +extern const u32 gMonStillFrontPic_Altaria[]; extern const u8 gMonIcon_Altaria[]; extern const u8 gMonFootprint_Altaria[]; -extern const u8 gMonFrontPic_Wynaut[]; -extern const u8 gMonPalette_Wynaut[]; -extern const u8 gMonBackPic_Wynaut[]; -extern const u8 gMonShinyPalette_Wynaut[]; -extern const u8 gMonStillFrontPic_Wynaut[]; +extern const u32 gMonFrontPic_Wynaut[]; +extern const u32 gMonPalette_Wynaut[]; +extern const u32 gMonBackPic_Wynaut[]; +extern const u32 gMonShinyPalette_Wynaut[]; +extern const u32 gMonStillFrontPic_Wynaut[]; extern const u8 gMonIcon_Wynaut[]; extern const u8 gMonFootprint_Wynaut[]; -extern const u8 gMonFrontPic_Duskull[]; -extern const u8 gMonPalette_Duskull[]; -extern const u8 gMonBackPic_Duskull[]; -extern const u8 gMonShinyPalette_Duskull[]; -extern const u8 gMonStillFrontPic_Duskull[]; +extern const u32 gMonFrontPic_Duskull[]; +extern const u32 gMonPalette_Duskull[]; +extern const u32 gMonBackPic_Duskull[]; +extern const u32 gMonShinyPalette_Duskull[]; +extern const u32 gMonStillFrontPic_Duskull[]; extern const u8 gMonIcon_Duskull[]; extern const u8 gMonFootprint_Duskull[]; -extern const u8 gMonFrontPic_Dusclops[]; -extern const u8 gMonPalette_Dusclops[]; -extern const u8 gMonBackPic_Dusclops[]; -extern const u8 gMonShinyPalette_Dusclops[]; -extern const u8 gMonStillFrontPic_Dusclops[]; +extern const u32 gMonFrontPic_Dusclops[]; +extern const u32 gMonPalette_Dusclops[]; +extern const u32 gMonBackPic_Dusclops[]; +extern const u32 gMonShinyPalette_Dusclops[]; +extern const u32 gMonStillFrontPic_Dusclops[]; extern const u8 gMonIcon_Dusclops[]; extern const u8 gMonFootprint_Dusclops[]; -extern const u8 gMonFrontPic_Roselia[]; -extern const u8 gMonPalette_Roselia[]; -extern const u8 gMonBackPic_Roselia[]; -extern const u8 gMonShinyPalette_Roselia[]; -extern const u8 gMonStillFrontPic_Roselia[]; +extern const u32 gMonFrontPic_Roselia[]; +extern const u32 gMonPalette_Roselia[]; +extern const u32 gMonBackPic_Roselia[]; +extern const u32 gMonShinyPalette_Roselia[]; +extern const u32 gMonStillFrontPic_Roselia[]; extern const u8 gMonIcon_Roselia[]; extern const u8 gMonFootprint_Roselia[]; -extern const u8 gMonFrontPic_Slakoth[]; -extern const u8 gMonPalette_Slakoth[]; -extern const u8 gMonBackPic_Slakoth[]; -extern const u8 gMonShinyPalette_Slakoth[]; -extern const u8 gMonStillFrontPic_Slakoth[]; +extern const u32 gMonFrontPic_Slakoth[]; +extern const u32 gMonPalette_Slakoth[]; +extern const u32 gMonBackPic_Slakoth[]; +extern const u32 gMonShinyPalette_Slakoth[]; +extern const u32 gMonStillFrontPic_Slakoth[]; extern const u8 gMonIcon_Slakoth[]; extern const u8 gMonFootprint_Slakoth[]; -extern const u8 gMonFrontPic_Vigoroth[]; -extern const u8 gMonPalette_Vigoroth[]; -extern const u8 gMonBackPic_Vigoroth[]; -extern const u8 gMonShinyPalette_Vigoroth[]; -extern const u8 gMonStillFrontPic_Vigoroth[]; +extern const u32 gMonFrontPic_Vigoroth[]; +extern const u32 gMonPalette_Vigoroth[]; +extern const u32 gMonBackPic_Vigoroth[]; +extern const u32 gMonShinyPalette_Vigoroth[]; +extern const u32 gMonStillFrontPic_Vigoroth[]; extern const u8 gMonIcon_Vigoroth[]; extern const u8 gMonFootprint_Vigoroth[]; -extern const u8 gMonFrontPic_Slaking[]; -extern const u8 gMonPalette_Slaking[]; -extern const u8 gMonBackPic_Slaking[]; -extern const u8 gMonShinyPalette_Slaking[]; -extern const u8 gMonStillFrontPic_Slaking[]; +extern const u32 gMonFrontPic_Slaking[]; +extern const u32 gMonPalette_Slaking[]; +extern const u32 gMonBackPic_Slaking[]; +extern const u32 gMonShinyPalette_Slaking[]; +extern const u32 gMonStillFrontPic_Slaking[]; extern const u8 gMonIcon_Slaking[]; extern const u8 gMonFootprint_Slaking[]; -extern const u8 gMonFrontPic_Gulpin[]; -extern const u8 gMonPalette_Gulpin[]; -extern const u8 gMonBackPic_Gulpin[]; -extern const u8 gMonShinyPalette_Gulpin[]; -extern const u8 gMonStillFrontPic_Gulpin[]; +extern const u32 gMonFrontPic_Gulpin[]; +extern const u32 gMonPalette_Gulpin[]; +extern const u32 gMonBackPic_Gulpin[]; +extern const u32 gMonShinyPalette_Gulpin[]; +extern const u32 gMonStillFrontPic_Gulpin[]; extern const u8 gMonIcon_Gulpin[]; extern const u8 gMonFootprint_Gulpin[]; -extern const u8 gMonFrontPic_Swalot[]; -extern const u8 gMonPalette_Swalot[]; -extern const u8 gMonBackPic_Swalot[]; -extern const u8 gMonShinyPalette_Swalot[]; -extern const u8 gMonStillFrontPic_Swalot[]; +extern const u32 gMonFrontPic_Swalot[]; +extern const u32 gMonPalette_Swalot[]; +extern const u32 gMonBackPic_Swalot[]; +extern const u32 gMonShinyPalette_Swalot[]; +extern const u32 gMonStillFrontPic_Swalot[]; extern const u8 gMonIcon_Swalot[]; extern const u8 gMonFootprint_Swalot[]; -extern const u8 gMonFrontPic_Tropius[]; -extern const u8 gMonPalette_Tropius[]; -extern const u8 gMonBackPic_Tropius[]; -extern const u8 gMonShinyPalette_Tropius[]; -extern const u8 gMonStillFrontPic_Tropius[]; +extern const u32 gMonFrontPic_Tropius[]; +extern const u32 gMonPalette_Tropius[]; +extern const u32 gMonBackPic_Tropius[]; +extern const u32 gMonShinyPalette_Tropius[]; +extern const u32 gMonStillFrontPic_Tropius[]; extern const u8 gMonIcon_Tropius[]; extern const u8 gMonFootprint_Tropius[]; -extern const u8 gMonFrontPic_Whismur[]; -extern const u8 gMonPalette_Whismur[]; -extern const u8 gMonBackPic_Whismur[]; -extern const u8 gMonShinyPalette_Whismur[]; -extern const u8 gMonStillFrontPic_Whismur[]; +extern const u32 gMonFrontPic_Whismur[]; +extern const u32 gMonPalette_Whismur[]; +extern const u32 gMonBackPic_Whismur[]; +extern const u32 gMonShinyPalette_Whismur[]; +extern const u32 gMonStillFrontPic_Whismur[]; extern const u8 gMonIcon_Whismur[]; extern const u8 gMonFootprint_Whismur[]; -extern const u8 gMonFrontPic_Loudred[]; -extern const u8 gMonPalette_Loudred[]; -extern const u8 gMonBackPic_Loudred[]; -extern const u8 gMonShinyPalette_Loudred[]; -extern const u8 gMonStillFrontPic_Loudred[]; +extern const u32 gMonFrontPic_Loudred[]; +extern const u32 gMonPalette_Loudred[]; +extern const u32 gMonBackPic_Loudred[]; +extern const u32 gMonShinyPalette_Loudred[]; +extern const u32 gMonStillFrontPic_Loudred[]; extern const u8 gMonIcon_Loudred[]; extern const u8 gMonFootprint_Loudred[]; -extern const u8 gMonFrontPic_Exploud[]; -extern const u8 gMonPalette_Exploud[]; -extern const u8 gMonBackPic_Exploud[]; -extern const u8 gMonShinyPalette_Exploud[]; -extern const u8 gMonStillFrontPic_Exploud[]; +extern const u32 gMonFrontPic_Exploud[]; +extern const u32 gMonPalette_Exploud[]; +extern const u32 gMonBackPic_Exploud[]; +extern const u32 gMonShinyPalette_Exploud[]; +extern const u32 gMonStillFrontPic_Exploud[]; extern const u8 gMonIcon_Exploud[]; extern const u8 gMonFootprint_Exploud[]; -extern const u8 gMonFrontPic_Clamperl[]; -extern const u8 gMonPalette_Clamperl[]; -extern const u8 gMonBackPic_Clamperl[]; -extern const u8 gMonShinyPalette_Clamperl[]; -extern const u8 gMonStillFrontPic_Clamperl[]; +extern const u32 gMonFrontPic_Clamperl[]; +extern const u32 gMonPalette_Clamperl[]; +extern const u32 gMonBackPic_Clamperl[]; +extern const u32 gMonShinyPalette_Clamperl[]; +extern const u32 gMonStillFrontPic_Clamperl[]; extern const u8 gMonIcon_Clamperl[]; extern const u8 gMonFootprint_Clamperl[]; -extern const u8 gMonFrontPic_Huntail[]; -extern const u8 gMonPalette_Huntail[]; -extern const u8 gMonBackPic_Huntail[]; -extern const u8 gMonShinyPalette_Huntail[]; -extern const u8 gMonStillFrontPic_Huntail[]; +extern const u32 gMonFrontPic_Huntail[]; +extern const u32 gMonPalette_Huntail[]; +extern const u32 gMonBackPic_Huntail[]; +extern const u32 gMonShinyPalette_Huntail[]; +extern const u32 gMonStillFrontPic_Huntail[]; extern const u8 gMonIcon_Huntail[]; extern const u8 gMonFootprint_Huntail[]; -extern const u8 gMonFrontPic_Gorebyss[]; -extern const u8 gMonPalette_Gorebyss[]; -extern const u8 gMonBackPic_Gorebyss[]; -extern const u8 gMonShinyPalette_Gorebyss[]; -extern const u8 gMonStillFrontPic_Gorebyss[]; +extern const u32 gMonFrontPic_Gorebyss[]; +extern const u32 gMonPalette_Gorebyss[]; +extern const u32 gMonBackPic_Gorebyss[]; +extern const u32 gMonShinyPalette_Gorebyss[]; +extern const u32 gMonStillFrontPic_Gorebyss[]; extern const u8 gMonIcon_Gorebyss[]; extern const u8 gMonFootprint_Gorebyss[]; -extern const u8 gMonFrontPic_Absol[]; -extern const u8 gMonPalette_Absol[]; -extern const u8 gMonBackPic_Absol[]; -extern const u8 gMonShinyPalette_Absol[]; -extern const u8 gMonStillFrontPic_Absol[]; +extern const u32 gMonFrontPic_Absol[]; +extern const u32 gMonPalette_Absol[]; +extern const u32 gMonBackPic_Absol[]; +extern const u32 gMonShinyPalette_Absol[]; +extern const u32 gMonStillFrontPic_Absol[]; extern const u8 gMonIcon_Absol[]; extern const u8 gMonFootprint_Absol[]; -extern const u8 gMonFrontPic_Shuppet[]; -extern const u8 gMonPalette_Shuppet[]; -extern const u8 gMonBackPic_Shuppet[]; -extern const u8 gMonShinyPalette_Shuppet[]; -extern const u8 gMonStillFrontPic_Shuppet[]; +extern const u32 gMonFrontPic_Shuppet[]; +extern const u32 gMonPalette_Shuppet[]; +extern const u32 gMonBackPic_Shuppet[]; +extern const u32 gMonShinyPalette_Shuppet[]; +extern const u32 gMonStillFrontPic_Shuppet[]; extern const u8 gMonIcon_Shuppet[]; extern const u8 gMonFootprint_Shuppet[]; -extern const u8 gMonFrontPic_Banette[]; -extern const u8 gMonPalette_Banette[]; -extern const u8 gMonBackPic_Banette[]; -extern const u8 gMonShinyPalette_Banette[]; -extern const u8 gMonStillFrontPic_Banette[]; +extern const u32 gMonFrontPic_Banette[]; +extern const u32 gMonPalette_Banette[]; +extern const u32 gMonBackPic_Banette[]; +extern const u32 gMonShinyPalette_Banette[]; +extern const u32 gMonStillFrontPic_Banette[]; extern const u8 gMonIcon_Banette[]; extern const u8 gMonFootprint_Banette[]; -extern const u8 gMonFrontPic_Seviper[]; -extern const u8 gMonPalette_Seviper[]; -extern const u8 gMonBackPic_Seviper[]; -extern const u8 gMonShinyPalette_Seviper[]; -extern const u8 gMonStillFrontPic_Seviper[]; +extern const u32 gMonFrontPic_Seviper[]; +extern const u32 gMonPalette_Seviper[]; +extern const u32 gMonBackPic_Seviper[]; +extern const u32 gMonShinyPalette_Seviper[]; +extern const u32 gMonStillFrontPic_Seviper[]; extern const u8 gMonIcon_Seviper[]; extern const u8 gMonFootprint_Seviper[]; -extern const u8 gMonFrontPic_Zangoose[]; -extern const u8 gMonPalette_Zangoose[]; -extern const u8 gMonBackPic_Zangoose[]; -extern const u8 gMonShinyPalette_Zangoose[]; -extern const u8 gMonStillFrontPic_Zangoose[]; +extern const u32 gMonFrontPic_Zangoose[]; +extern const u32 gMonPalette_Zangoose[]; +extern const u32 gMonBackPic_Zangoose[]; +extern const u32 gMonShinyPalette_Zangoose[]; +extern const u32 gMonStillFrontPic_Zangoose[]; extern const u8 gMonIcon_Zangoose[]; extern const u8 gMonFootprint_Zangoose[]; -extern const u8 gMonFrontPic_Relicanth[]; -extern const u8 gMonPalette_Relicanth[]; -extern const u8 gMonBackPic_Relicanth[]; -extern const u8 gMonShinyPalette_Relicanth[]; -extern const u8 gMonStillFrontPic_Relicanth[]; +extern const u32 gMonFrontPic_Relicanth[]; +extern const u32 gMonPalette_Relicanth[]; +extern const u32 gMonBackPic_Relicanth[]; +extern const u32 gMonShinyPalette_Relicanth[]; +extern const u32 gMonStillFrontPic_Relicanth[]; extern const u8 gMonIcon_Relicanth[]; extern const u8 gMonFootprint_Relicanth[]; -extern const u8 gMonFrontPic_Aron[]; -extern const u8 gMonPalette_Aron[]; -extern const u8 gMonBackPic_Aron[]; -extern const u8 gMonShinyPalette_Aron[]; -extern const u8 gMonStillFrontPic_Aron[]; +extern const u32 gMonFrontPic_Aron[]; +extern const u32 gMonPalette_Aron[]; +extern const u32 gMonBackPic_Aron[]; +extern const u32 gMonShinyPalette_Aron[]; +extern const u32 gMonStillFrontPic_Aron[]; extern const u8 gMonIcon_Aron[]; extern const u8 gMonFootprint_Aron[]; -extern const u8 gMonFrontPic_Lairon[]; -extern const u8 gMonPalette_Lairon[]; -extern const u8 gMonBackPic_Lairon[]; -extern const u8 gMonShinyPalette_Lairon[]; -extern const u8 gMonStillFrontPic_Lairon[]; +extern const u32 gMonFrontPic_Lairon[]; +extern const u32 gMonPalette_Lairon[]; +extern const u32 gMonBackPic_Lairon[]; +extern const u32 gMonShinyPalette_Lairon[]; +extern const u32 gMonStillFrontPic_Lairon[]; extern const u8 gMonIcon_Lairon[]; extern const u8 gMonFootprint_Lairon[]; -extern const u8 gMonFrontPic_Aggron[]; -extern const u8 gMonPalette_Aggron[]; -extern const u8 gMonBackPic_Aggron[]; -extern const u8 gMonShinyPalette_Aggron[]; -extern const u8 gMonStillFrontPic_Aggron[]; +extern const u32 gMonFrontPic_Aggron[]; +extern const u32 gMonPalette_Aggron[]; +extern const u32 gMonBackPic_Aggron[]; +extern const u32 gMonShinyPalette_Aggron[]; +extern const u32 gMonStillFrontPic_Aggron[]; extern const u8 gMonIcon_Aggron[]; extern const u8 gMonFootprint_Aggron[]; -extern const u8 gMonFrontPic_Castform[]; -extern const u8 gMonPalette_Castform[]; -extern const u8 gMonBackPic_Castform[]; -extern const u8 gMonShinyPalette_Castform[]; -extern const u8 gMonStillFrontPic_Castform[]; +extern const u32 gMonFrontPic_Castform[]; +extern const u32 gMonPalette_Castform[]; +extern const u32 gMonBackPic_Castform[]; +extern const u32 gMonShinyPalette_Castform[]; +extern const u32 gMonStillFrontPic_Castform[]; extern const u8 gMonIcon_Castform[]; extern const u8 gMonFootprint_Castform[]; -extern const u8 gMonFrontPic_Volbeat[]; -extern const u8 gMonPalette_Volbeat[]; -extern const u8 gMonBackPic_Volbeat[]; -extern const u8 gMonShinyPalette_Volbeat[]; -extern const u8 gMonStillFrontPic_Volbeat[]; +extern const u32 gMonFrontPic_Volbeat[]; +extern const u32 gMonPalette_Volbeat[]; +extern const u32 gMonBackPic_Volbeat[]; +extern const u32 gMonShinyPalette_Volbeat[]; +extern const u32 gMonStillFrontPic_Volbeat[]; extern const u8 gMonIcon_Volbeat[]; extern const u8 gMonFootprint_Volbeat[]; -extern const u8 gMonFrontPic_Illumise[]; -extern const u8 gMonPalette_Illumise[]; -extern const u8 gMonBackPic_Illumise[]; -extern const u8 gMonShinyPalette_Illumise[]; -extern const u8 gMonStillFrontPic_Illumise[]; +extern const u32 gMonFrontPic_Illumise[]; +extern const u32 gMonPalette_Illumise[]; +extern const u32 gMonBackPic_Illumise[]; +extern const u32 gMonShinyPalette_Illumise[]; +extern const u32 gMonStillFrontPic_Illumise[]; extern const u8 gMonIcon_Illumise[]; extern const u8 gMonFootprint_Illumise[]; -extern const u8 gMonFrontPic_Lileep[]; -extern const u8 gMonPalette_Lileep[]; -extern const u8 gMonBackPic_Lileep[]; -extern const u8 gMonShinyPalette_Lileep[]; -extern const u8 gMonStillFrontPic_Lileep[]; +extern const u32 gMonFrontPic_Lileep[]; +extern const u32 gMonPalette_Lileep[]; +extern const u32 gMonBackPic_Lileep[]; +extern const u32 gMonShinyPalette_Lileep[]; +extern const u32 gMonStillFrontPic_Lileep[]; extern const u8 gMonIcon_Lileep[]; extern const u8 gMonFootprint_Lileep[]; -extern const u8 gMonFrontPic_Cradily[]; -extern const u8 gMonPalette_Cradily[]; -extern const u8 gMonBackPic_Cradily[]; -extern const u8 gMonShinyPalette_Cradily[]; -extern const u8 gMonStillFrontPic_Cradily[]; +extern const u32 gMonFrontPic_Cradily[]; +extern const u32 gMonPalette_Cradily[]; +extern const u32 gMonBackPic_Cradily[]; +extern const u32 gMonShinyPalette_Cradily[]; +extern const u32 gMonStillFrontPic_Cradily[]; extern const u8 gMonIcon_Cradily[]; extern const u8 gMonFootprint_Cradily[]; -extern const u8 gMonFrontPic_Anorith[]; -extern const u8 gMonPalette_Anorith[]; -extern const u8 gMonBackPic_Anorith[]; -extern const u8 gMonShinyPalette_Anorith[]; -extern const u8 gMonStillFrontPic_Anorith[]; +extern const u32 gMonFrontPic_Anorith[]; +extern const u32 gMonPalette_Anorith[]; +extern const u32 gMonBackPic_Anorith[]; +extern const u32 gMonShinyPalette_Anorith[]; +extern const u32 gMonStillFrontPic_Anorith[]; extern const u8 gMonIcon_Anorith[]; extern const u8 gMonFootprint_Anorith[]; -extern const u8 gMonFrontPic_Armaldo[]; -extern const u8 gMonPalette_Armaldo[]; -extern const u8 gMonBackPic_Armaldo[]; -extern const u8 gMonShinyPalette_Armaldo[]; -extern const u8 gMonStillFrontPic_Armaldo[]; +extern const u32 gMonFrontPic_Armaldo[]; +extern const u32 gMonPalette_Armaldo[]; +extern const u32 gMonBackPic_Armaldo[]; +extern const u32 gMonShinyPalette_Armaldo[]; +extern const u32 gMonStillFrontPic_Armaldo[]; extern const u8 gMonIcon_Armaldo[]; extern const u8 gMonFootprint_Armaldo[]; -extern const u8 gMonFrontPic_Ralts[]; -extern const u8 gMonPalette_Ralts[]; -extern const u8 gMonBackPic_Ralts[]; -extern const u8 gMonShinyPalette_Ralts[]; -extern const u8 gMonStillFrontPic_Ralts[]; +extern const u32 gMonFrontPic_Ralts[]; +extern const u32 gMonPalette_Ralts[]; +extern const u32 gMonBackPic_Ralts[]; +extern const u32 gMonShinyPalette_Ralts[]; +extern const u32 gMonStillFrontPic_Ralts[]; extern const u8 gMonIcon_Ralts[]; extern const u8 gMonFootprint_Ralts[]; -extern const u8 gMonFrontPic_Kirlia[]; -extern const u8 gMonPalette_Kirlia[]; -extern const u8 gMonBackPic_Kirlia[]; -extern const u8 gMonShinyPalette_Kirlia[]; -extern const u8 gMonStillFrontPic_Kirlia[]; +extern const u32 gMonFrontPic_Kirlia[]; +extern const u32 gMonPalette_Kirlia[]; +extern const u32 gMonBackPic_Kirlia[]; +extern const u32 gMonShinyPalette_Kirlia[]; +extern const u32 gMonStillFrontPic_Kirlia[]; extern const u8 gMonIcon_Kirlia[]; extern const u8 gMonFootprint_Kirlia[]; -extern const u8 gMonFrontPic_Gardevoir[]; -extern const u8 gMonPalette_Gardevoir[]; -extern const u8 gMonBackPic_Gardevoir[]; -extern const u8 gMonShinyPalette_Gardevoir[]; -extern const u8 gMonStillFrontPic_Gardevoir[]; +extern const u32 gMonFrontPic_Gardevoir[]; +extern const u32 gMonPalette_Gardevoir[]; +extern const u32 gMonBackPic_Gardevoir[]; +extern const u32 gMonShinyPalette_Gardevoir[]; +extern const u32 gMonStillFrontPic_Gardevoir[]; extern const u8 gMonIcon_Gardevoir[]; extern const u8 gMonFootprint_Gardevoir[]; -extern const u8 gMonFrontPic_Bagon[]; -extern const u8 gMonPalette_Bagon[]; -extern const u8 gMonBackPic_Bagon[]; -extern const u8 gMonShinyPalette_Bagon[]; -extern const u8 gMonStillFrontPic_Bagon[]; +extern const u32 gMonFrontPic_Bagon[]; +extern const u32 gMonPalette_Bagon[]; +extern const u32 gMonBackPic_Bagon[]; +extern const u32 gMonShinyPalette_Bagon[]; +extern const u32 gMonStillFrontPic_Bagon[]; extern const u8 gMonIcon_Bagon[]; extern const u8 gMonFootprint_Bagon[]; -extern const u8 gMonFrontPic_Shelgon[]; -extern const u8 gMonPalette_Shelgon[]; -extern const u8 gMonBackPic_Shelgon[]; -extern const u8 gMonShinyPalette_Shelgon[]; -extern const u8 gMonStillFrontPic_Shelgon[]; +extern const u32 gMonFrontPic_Shelgon[]; +extern const u32 gMonPalette_Shelgon[]; +extern const u32 gMonBackPic_Shelgon[]; +extern const u32 gMonShinyPalette_Shelgon[]; +extern const u32 gMonStillFrontPic_Shelgon[]; extern const u8 gMonIcon_Shelgon[]; extern const u8 gMonFootprint_Shelgon[]; -extern const u8 gMonFrontPic_Salamence[]; -extern const u8 gMonPalette_Salamence[]; -extern const u8 gMonBackPic_Salamence[]; -extern const u8 gMonShinyPalette_Salamence[]; -extern const u8 gMonStillFrontPic_Salamence[]; +extern const u32 gMonFrontPic_Salamence[]; +extern const u32 gMonPalette_Salamence[]; +extern const u32 gMonBackPic_Salamence[]; +extern const u32 gMonShinyPalette_Salamence[]; +extern const u32 gMonStillFrontPic_Salamence[]; extern const u8 gMonIcon_Salamence[]; extern const u8 gMonFootprint_Salamence[]; -extern const u8 gMonFrontPic_Beldum[]; -extern const u8 gMonPalette_Beldum[]; -extern const u8 gMonBackPic_Beldum[]; -extern const u8 gMonShinyPalette_Beldum[]; -extern const u8 gMonStillFrontPic_Beldum[]; +extern const u32 gMonFrontPic_Beldum[]; +extern const u32 gMonPalette_Beldum[]; +extern const u32 gMonBackPic_Beldum[]; +extern const u32 gMonShinyPalette_Beldum[]; +extern const u32 gMonStillFrontPic_Beldum[]; extern const u8 gMonIcon_Beldum[]; extern const u8 gMonFootprint_Beldum[]; -extern const u8 gMonFrontPic_Metang[]; -extern const u8 gMonPalette_Metang[]; -extern const u8 gMonBackPic_Metang[]; -extern const u8 gMonShinyPalette_Metang[]; -extern const u8 gMonStillFrontPic_Metang[]; +extern const u32 gMonFrontPic_Metang[]; +extern const u32 gMonPalette_Metang[]; +extern const u32 gMonBackPic_Metang[]; +extern const u32 gMonShinyPalette_Metang[]; +extern const u32 gMonStillFrontPic_Metang[]; extern const u8 gMonIcon_Metang[]; extern const u8 gMonFootprint_Metang[]; -extern const u8 gMonFrontPic_Metagross[]; -extern const u8 gMonPalette_Metagross[]; -extern const u8 gMonBackPic_Metagross[]; -extern const u8 gMonShinyPalette_Metagross[]; -extern const u8 gMonStillFrontPic_Metagross[]; +extern const u32 gMonFrontPic_Metagross[]; +extern const u32 gMonPalette_Metagross[]; +extern const u32 gMonBackPic_Metagross[]; +extern const u32 gMonShinyPalette_Metagross[]; +extern const u32 gMonStillFrontPic_Metagross[]; extern const u8 gMonIcon_Metagross[]; extern const u8 gMonFootprint_Metagross[]; -extern const u8 gMonFrontPic_Regirock[]; -extern const u8 gMonPalette_Regirock[]; -extern const u8 gMonBackPic_Regirock[]; -extern const u8 gMonShinyPalette_Regirock[]; -extern const u8 gMonStillFrontPic_Regirock[]; +extern const u32 gMonFrontPic_Regirock[]; +extern const u32 gMonPalette_Regirock[]; +extern const u32 gMonBackPic_Regirock[]; +extern const u32 gMonShinyPalette_Regirock[]; +extern const u32 gMonStillFrontPic_Regirock[]; extern const u8 gMonIcon_Regirock[]; extern const u8 gMonFootprint_Regirock[]; -extern const u8 gMonFrontPic_Regice[]; -extern const u8 gMonPalette_Regice[]; -extern const u8 gMonBackPic_Regice[]; -extern const u8 gMonShinyPalette_Regice[]; -extern const u8 gMonStillFrontPic_Regice[]; +extern const u32 gMonFrontPic_Regice[]; +extern const u32 gMonPalette_Regice[]; +extern const u32 gMonBackPic_Regice[]; +extern const u32 gMonShinyPalette_Regice[]; +extern const u32 gMonStillFrontPic_Regice[]; extern const u8 gMonIcon_Regice[]; extern const u8 gMonFootprint_Regice[]; -extern const u8 gMonFrontPic_Registeel[]; -extern const u8 gMonPalette_Registeel[]; -extern const u8 gMonBackPic_Registeel[]; -extern const u8 gMonShinyPalette_Registeel[]; -extern const u8 gMonStillFrontPic_Registeel[]; +extern const u32 gMonFrontPic_Registeel[]; +extern const u32 gMonPalette_Registeel[]; +extern const u32 gMonBackPic_Registeel[]; +extern const u32 gMonShinyPalette_Registeel[]; +extern const u32 gMonStillFrontPic_Registeel[]; extern const u8 gMonIcon_Registeel[]; extern const u8 gMonFootprint_Registeel[]; -extern const u8 gMonFrontPic_Kyogre[]; -extern const u8 gMonPalette_Kyogre[]; -extern const u8 gMonBackPic_Kyogre[]; -extern const u8 gMonShinyPalette_Kyogre[]; -extern const u8 gMonStillFrontPic_Kyogre[]; +extern const u32 gMonFrontPic_Kyogre[]; +extern const u32 gMonPalette_Kyogre[]; +extern const u32 gMonBackPic_Kyogre[]; +extern const u32 gMonShinyPalette_Kyogre[]; +extern const u32 gMonStillFrontPic_Kyogre[]; extern const u8 gMonIcon_Kyogre[]; extern const u8 gMonFootprint_Kyogre[]; -extern const u8 gMonFrontPic_Groudon[]; -extern const u8 gMonPalette_Groudon[]; -extern const u8 gMonBackPic_Groudon[]; -extern const u8 gMonShinyPalette_Groudon[]; -extern const u8 gMonStillFrontPic_Groudon[]; +extern const u32 gMonFrontPic_Groudon[]; +extern const u32 gMonPalette_Groudon[]; +extern const u32 gMonBackPic_Groudon[]; +extern const u32 gMonShinyPalette_Groudon[]; +extern const u32 gMonStillFrontPic_Groudon[]; extern const u8 gMonIcon_Groudon[]; extern const u8 gMonFootprint_Groudon[]; -extern const u8 gMonFrontPic_Rayquaza[]; -extern const u8 gMonPalette_Rayquaza[]; -extern const u8 gMonBackPic_Rayquaza[]; -extern const u8 gMonShinyPalette_Rayquaza[]; -extern const u8 gMonStillFrontPic_Rayquaza[]; +extern const u32 gMonFrontPic_Rayquaza[]; +extern const u32 gMonPalette_Rayquaza[]; +extern const u32 gMonBackPic_Rayquaza[]; +extern const u32 gMonShinyPalette_Rayquaza[]; +extern const u32 gMonStillFrontPic_Rayquaza[]; extern const u8 gMonIcon_Rayquaza[]; extern const u8 gMonFootprint_Rayquaza[]; -extern const u8 gMonFrontPic_Latias[]; -extern const u8 gMonPalette_Latias[]; -extern const u8 gMonBackPic_Latias[]; -extern const u8 gMonShinyPalette_Latias[]; -extern const u8 gMonStillFrontPic_Latias[]; +extern const u32 gMonFrontPic_Latias[]; +extern const u32 gMonPalette_Latias[]; +extern const u32 gMonBackPic_Latias[]; +extern const u32 gMonShinyPalette_Latias[]; +extern const u32 gMonStillFrontPic_Latias[]; extern const u8 gMonIcon_Latias[]; extern const u8 gMonFootprint_Latias[]; -extern const u8 gMonFrontPic_Latios[]; -extern const u8 gMonPalette_Latios[]; -extern const u8 gMonBackPic_Latios[]; -extern const u8 gMonShinyPalette_Latios[]; -extern const u8 gMonStillFrontPic_Latios[]; +extern const u32 gMonFrontPic_Latios[]; +extern const u32 gMonPalette_Latios[]; +extern const u32 gMonBackPic_Latios[]; +extern const u32 gMonShinyPalette_Latios[]; +extern const u32 gMonStillFrontPic_Latios[]; extern const u8 gMonIcon_Latios[]; extern const u8 gMonFootprint_Latios[]; -extern const u8 gMonFrontPic_Jirachi[]; -extern const u8 gMonPalette_Jirachi[]; -extern const u8 gMonBackPic_Jirachi[]; -extern const u8 gMonShinyPalette_Jirachi[]; -extern const u8 gMonStillFrontPic_Jirachi[]; +extern const u32 gMonFrontPic_Jirachi[]; +extern const u32 gMonPalette_Jirachi[]; +extern const u32 gMonBackPic_Jirachi[]; +extern const u32 gMonShinyPalette_Jirachi[]; +extern const u32 gMonStillFrontPic_Jirachi[]; extern const u8 gMonIcon_Jirachi[]; extern const u8 gMonFootprint_Jirachi[]; -extern const u8 gMonFrontPic_Deoxys[]; -extern const u8 gMonPalette_Deoxys[]; -extern const u8 gMonBackPic_Deoxys[]; -extern const u8 gMonShinyPalette_Deoxys[]; -extern const u8 gMonStillFrontPic_Deoxys[]; +extern const u32 gMonFrontPic_Deoxys[]; +extern const u32 gMonPalette_Deoxys[]; +extern const u32 gMonBackPic_Deoxys[]; +extern const u32 gMonShinyPalette_Deoxys[]; +extern const u32 gMonStillFrontPic_Deoxys[]; extern const u8 gMonIcon_Deoxys[]; extern const u8 gMonFootprint_Deoxys[]; -extern const u8 gMonFrontPic_Chimecho[]; -extern const u8 gMonPalette_Chimecho[]; -extern const u8 gMonBackPic_Chimecho[]; -extern const u8 gMonShinyPalette_Chimecho[]; -extern const u8 gMonStillFrontPic_Chimecho[]; +extern const u32 gMonFrontPic_Chimecho[]; +extern const u32 gMonPalette_Chimecho[]; +extern const u32 gMonBackPic_Chimecho[]; +extern const u32 gMonShinyPalette_Chimecho[]; +extern const u32 gMonStillFrontPic_Chimecho[]; extern const u8 gMonIcon_Chimecho[]; extern const u8 gMonFootprint_Chimecho[]; -extern const u8 gMonPic_Egg[]; -extern const u8 gMonPalette_Egg[]; -extern const u8 gMonFrontPic_Egg[]; -extern const u8 gMonStillFrontPic_Egg[]; +extern const u32 gMonPic_Egg[]; +extern const u32 gMonPalette_Egg[]; +extern const u32 gMonFrontPic_Egg[]; +extern const u32 gMonStillFrontPic_Egg[]; extern const u8 gMonIcon_Egg[]; -extern const u8 gMonFrontPic_UnownB[]; -extern const u8 gMonBackPic_UnownB[]; -extern const u8 gMonStillFrontPic_UnownB[]; +extern const u32 gMonFrontPic_UnownB[]; +extern const u32 gMonBackPic_UnownB[]; +extern const u32 gMonStillFrontPic_UnownB[]; extern const u8 gMonIcon_UnownB[]; -extern const u8 gMonFrontPic_UnownC[]; -extern const u8 gMonBackPic_UnownC[]; -extern const u8 gMonStillFrontPic_UnownC[]; +extern const u32 gMonFrontPic_UnownC[]; +extern const u32 gMonBackPic_UnownC[]; +extern const u32 gMonStillFrontPic_UnownC[]; extern const u8 gMonIcon_UnownC[]; -extern const u8 gMonFrontPic_UnownD[]; -extern const u8 gMonBackPic_UnownD[]; -extern const u8 gMonStillFrontPic_UnownD[]; +extern const u32 gMonFrontPic_UnownD[]; +extern const u32 gMonBackPic_UnownD[]; +extern const u32 gMonStillFrontPic_UnownD[]; extern const u8 gMonIcon_UnownD[]; -extern const u8 gMonFrontPic_UnownE[]; -extern const u8 gMonBackPic_UnownE[]; -extern const u8 gMonStillFrontPic_UnownE[]; +extern const u32 gMonFrontPic_UnownE[]; +extern const u32 gMonBackPic_UnownE[]; +extern const u32 gMonStillFrontPic_UnownE[]; extern const u8 gMonIcon_UnownE[]; -extern const u8 gMonFrontPic_UnownF[]; -extern const u8 gMonBackPic_UnownF[]; -extern const u8 gMonStillFrontPic_UnownF[]; +extern const u32 gMonFrontPic_UnownF[]; +extern const u32 gMonBackPic_UnownF[]; +extern const u32 gMonStillFrontPic_UnownF[]; extern const u8 gMonIcon_UnownF[]; -extern const u8 gMonFrontPic_UnownG[]; -extern const u8 gMonBackPic_UnownG[]; -extern const u8 gMonStillFrontPic_UnownG[]; +extern const u32 gMonFrontPic_UnownG[]; +extern const u32 gMonBackPic_UnownG[]; +extern const u32 gMonStillFrontPic_UnownG[]; extern const u8 gMonIcon_UnownG[]; -extern const u8 gMonFrontPic_UnownH[]; -extern const u8 gMonBackPic_UnownH[]; -extern const u8 gMonStillFrontPic_UnownH[]; +extern const u32 gMonFrontPic_UnownH[]; +extern const u32 gMonBackPic_UnownH[]; +extern const u32 gMonStillFrontPic_UnownH[]; extern const u8 gMonIcon_UnownH[]; -extern const u8 gMonFrontPic_UnownI[]; -extern const u8 gMonBackPic_UnownI[]; -extern const u8 gMonStillFrontPic_UnownI[]; +extern const u32 gMonFrontPic_UnownI[]; +extern const u32 gMonBackPic_UnownI[]; +extern const u32 gMonStillFrontPic_UnownI[]; extern const u8 gMonIcon_UnownI[]; -extern const u8 gMonFrontPic_UnownJ[]; -extern const u8 gMonBackPic_UnownJ[]; -extern const u8 gMonStillFrontPic_UnownJ[]; +extern const u32 gMonFrontPic_UnownJ[]; +extern const u32 gMonBackPic_UnownJ[]; +extern const u32 gMonStillFrontPic_UnownJ[]; extern const u8 gMonIcon_UnownJ[]; -extern const u8 gMonFrontPic_UnownK[]; -extern const u8 gMonBackPic_UnownK[]; -extern const u8 gMonStillFrontPic_UnownK[]; +extern const u32 gMonFrontPic_UnownK[]; +extern const u32 gMonBackPic_UnownK[]; +extern const u32 gMonStillFrontPic_UnownK[]; extern const u8 gMonIcon_UnownK[]; -extern const u8 gMonFrontPic_UnownL[]; -extern const u8 gMonBackPic_UnownL[]; -extern const u8 gMonStillFrontPic_UnownL[]; +extern const u32 gMonFrontPic_UnownL[]; +extern const u32 gMonBackPic_UnownL[]; +extern const u32 gMonStillFrontPic_UnownL[]; extern const u8 gMonIcon_UnownL[]; -extern const u8 gMonFrontPic_UnownM[]; -extern const u8 gMonBackPic_UnownM[]; -extern const u8 gMonStillFrontPic_UnownM[]; +extern const u32 gMonFrontPic_UnownM[]; +extern const u32 gMonBackPic_UnownM[]; +extern const u32 gMonStillFrontPic_UnownM[]; extern const u8 gMonIcon_UnownM[]; -extern const u8 gMonFrontPic_UnownN[]; -extern const u8 gMonBackPic_UnownN[]; -extern const u8 gMonStillFrontPic_UnownN[]; +extern const u32 gMonFrontPic_UnownN[]; +extern const u32 gMonBackPic_UnownN[]; +extern const u32 gMonStillFrontPic_UnownN[]; extern const u8 gMonIcon_UnownN[]; -extern const u8 gMonFrontPic_UnownO[]; -extern const u8 gMonBackPic_UnownO[]; -extern const u8 gMonStillFrontPic_UnownO[]; +extern const u32 gMonFrontPic_UnownO[]; +extern const u32 gMonBackPic_UnownO[]; +extern const u32 gMonStillFrontPic_UnownO[]; extern const u8 gMonIcon_UnownO[]; -extern const u8 gMonFrontPic_UnownP[]; -extern const u8 gMonBackPic_UnownP[]; -extern const u8 gMonStillFrontPic_UnownP[]; +extern const u32 gMonFrontPic_UnownP[]; +extern const u32 gMonBackPic_UnownP[]; +extern const u32 gMonStillFrontPic_UnownP[]; extern const u8 gMonIcon_UnownP[]; -extern const u8 gMonFrontPic_UnownQ[]; -extern const u8 gMonBackPic_UnownQ[]; -extern const u8 gMonStillFrontPic_UnownQ[]; +extern const u32 gMonFrontPic_UnownQ[]; +extern const u32 gMonBackPic_UnownQ[]; +extern const u32 gMonStillFrontPic_UnownQ[]; extern const u8 gMonIcon_UnownQ[]; -extern const u8 gMonFrontPic_UnownR[]; -extern const u8 gMonBackPic_UnownR[]; -extern const u8 gMonStillFrontPic_UnownR[]; +extern const u32 gMonFrontPic_UnownR[]; +extern const u32 gMonBackPic_UnownR[]; +extern const u32 gMonStillFrontPic_UnownR[]; extern const u8 gMonIcon_UnownR[]; -extern const u8 gMonFrontPic_UnownS[]; -extern const u8 gMonBackPic_UnownS[]; -extern const u8 gMonStillFrontPic_UnownS[]; +extern const u32 gMonFrontPic_UnownS[]; +extern const u32 gMonBackPic_UnownS[]; +extern const u32 gMonStillFrontPic_UnownS[]; extern const u8 gMonIcon_UnownS[]; -extern const u8 gMonFrontPic_UnownT[]; -extern const u8 gMonBackPic_UnownT[]; -extern const u8 gMonStillFrontPic_UnownT[]; +extern const u32 gMonFrontPic_UnownT[]; +extern const u32 gMonBackPic_UnownT[]; +extern const u32 gMonStillFrontPic_UnownT[]; extern const u8 gMonIcon_UnownT[]; -extern const u8 gMonFrontPic_UnownU[]; -extern const u8 gMonBackPic_UnownU[]; -extern const u8 gMonStillFrontPic_UnownU[]; +extern const u32 gMonFrontPic_UnownU[]; +extern const u32 gMonBackPic_UnownU[]; +extern const u32 gMonStillFrontPic_UnownU[]; extern const u8 gMonIcon_UnownU[]; -extern const u8 gMonFrontPic_UnownV[]; -extern const u8 gMonBackPic_UnownV[]; -extern const u8 gMonStillFrontPic_UnownV[]; +extern const u32 gMonFrontPic_UnownV[]; +extern const u32 gMonBackPic_UnownV[]; +extern const u32 gMonStillFrontPic_UnownV[]; extern const u8 gMonIcon_UnownV[]; -extern const u8 gMonFrontPic_UnownW[]; -extern const u8 gMonBackPic_UnownW[]; -extern const u8 gMonStillFrontPic_UnownW[]; +extern const u32 gMonFrontPic_UnownW[]; +extern const u32 gMonBackPic_UnownW[]; +extern const u32 gMonStillFrontPic_UnownW[]; extern const u8 gMonIcon_UnownW[]; -extern const u8 gMonFrontPic_UnownX[]; -extern const u8 gMonBackPic_UnownX[]; -extern const u8 gMonStillFrontPic_UnownX[]; +extern const u32 gMonFrontPic_UnownX[]; +extern const u32 gMonBackPic_UnownX[]; +extern const u32 gMonStillFrontPic_UnownX[]; extern const u8 gMonIcon_UnownX[]; -extern const u8 gMonFrontPic_UnownY[]; -extern const u8 gMonBackPic_UnownY[]; -extern const u8 gMonStillFrontPic_UnownY[]; +extern const u32 gMonFrontPic_UnownY[]; +extern const u32 gMonBackPic_UnownY[]; +extern const u32 gMonStillFrontPic_UnownY[]; extern const u8 gMonIcon_UnownY[]; -extern const u8 gMonFrontPic_UnownZ[]; -extern const u8 gMonBackPic_UnownZ[]; -extern const u8 gMonStillFrontPic_UnownZ[]; +extern const u32 gMonFrontPic_UnownZ[]; +extern const u32 gMonBackPic_UnownZ[]; +extern const u32 gMonStillFrontPic_UnownZ[]; extern const u8 gMonIcon_UnownZ[]; -extern const u8 gMonFrontPic_UnownExclamationMark[]; -extern const u8 gMonBackPic_UnownExclamationMark[]; -extern const u8 gMonStillFrontPic_UnownExclamationMark[]; +extern const u32 gMonFrontPic_UnownExclamationMark[]; +extern const u32 gMonBackPic_UnownExclamationMark[]; +extern const u32 gMonStillFrontPic_UnownExclamationMark[]; extern const u8 gMonIcon_UnownExclamationMark[]; -extern const u8 gMonFrontPic_UnownQuestionMark[]; -extern const u8 gMonStillFrontPic_UnownQuestionMark[]; -extern const u8 gMonBackPic_UnownQuestionMark[]; +extern const u32 gMonFrontPic_UnownQuestionMark[]; +extern const u32 gMonStillFrontPic_UnownQuestionMark[]; +extern const u32 gMonBackPic_UnownQuestionMark[]; extern const u8 gMonIcon_UnownQuestionMark[]; -extern const u8 gMonFrontPic_CircledQuestionMark[]; -extern const u8 gMonBackPic_CircledQuestionMark[]; -extern const u8 gMonPalette_CircledQuestionMark[]; -extern const u8 gMonShinyPalette_CircledQuestionMark[]; -extern const u8 gMonStillFrontPic_CircledQuestionMark[]; +extern const u32 gMonFrontPic_CircledQuestionMark[]; +extern const u32 gMonBackPic_CircledQuestionMark[]; +extern const u32 gMonPalette_CircledQuestionMark[]; +extern const u32 gMonShinyPalette_CircledQuestionMark[]; +extern const u32 gMonStillFrontPic_CircledQuestionMark[]; extern const u8 gMonIcon_QuestionMark[]; -extern const u8 gMonFrontPic_DoubleQuestionMark[]; -extern const u8 gMonBackPic_DoubleQuestionMark[]; -extern const u8 gMonPalette_DoubleQuestionMark[]; -extern const u8 gMonShinyPalette_DoubleQuestionMark[]; -extern const u8 gMonStillFrontPic_DoubleQuestionMark[]; +extern const u32 gMonFrontPic_DoubleQuestionMark[]; +extern const u32 gMonBackPic_DoubleQuestionMark[]; +extern const u32 gMonPalette_DoubleQuestionMark[]; +extern const u32 gMonShinyPalette_DoubleQuestionMark[]; +extern const u32 gMonStillFrontPic_DoubleQuestionMark[]; extern const u16 gMonIconPalettes[][16]; // trainer sprites -extern const u8 gTrainerFrontPic_Hiker[]; -extern const u8 gTrainerFrontPic_AquaGruntM[]; -extern const u8 gTrainerFrontPic_PokemonBreederF[]; -extern const u8 gTrainerFrontPic_CoolTrainerM[]; -extern const u8 gTrainerFrontPic_BirdKeeper[]; -extern const u8 gTrainerFrontPic_Collector[]; -extern const u8 gTrainerFrontPic_AquaGruntF[]; -extern const u8 gTrainerFrontPic_SwimmerM[]; -extern const u8 gTrainerFrontPic_MagmaGruntM[]; -extern const u8 gTrainerFrontPic_ExpertM[]; -extern const u8 gTrainerFrontPic_AquaAdminM[]; -extern const u8 gTrainerFrontPic_BlackBelt[]; -extern const u8 gTrainerFrontPic_AquaAdminF[]; -extern const u8 gTrainerFrontPic_AquaLeaderArchie[]; -extern const u8 gTrainerFrontPic_HexManiac[]; -extern const u8 gTrainerFrontPic_AromaLady[]; -extern const u8 gTrainerFrontPic_RuinManiac[]; -extern const u8 gTrainerFrontPic_Interviewer[]; -extern const u8 gTrainerFrontPic_TuberF[]; -extern const u8 gTrainerFrontPic_TuberM[]; -extern const u8 gTrainerFrontPic_CoolTrainerF[]; -extern const u8 gTrainerFrontPic_Lady[]; -extern const u8 gTrainerFrontPic_Beauty[]; -extern const u8 gTrainerFrontPic_RichBoy[]; -extern const u8 gTrainerFrontPic_ExpertF[]; -extern const u8 gTrainerFrontPic_Pokemaniac[]; -extern const u8 gTrainerFrontPic_MagmaGruntF[]; -extern const u8 gTrainerFrontPic_Guitarist[]; -extern const u8 gTrainerFrontPic_Kindler[]; -extern const u8 gTrainerFrontPic_Camper[]; -extern const u8 gTrainerFrontPic_Picnicker[]; -extern const u8 gTrainerFrontPic_BugManiac[]; -extern const u8 gTrainerFrontPic_PokemonBreederM[]; -extern const u8 gTrainerFrontPic_PsychicM[]; -extern const u8 gTrainerFrontPic_PsychicF[]; -extern const u8 gTrainerFrontPic_Gentleman[]; -extern const u8 gTrainerFrontPic_EliteFourSidney[]; -extern const u8 gTrainerFrontPic_EliteFourPhoebe[]; -extern const u8 gTrainerFrontPic_EliteFourGlacia[]; -extern const u8 gTrainerFrontPic_EliteFourDrake[]; -extern const u8 gTrainerFrontPic_LeaderRoxanne[]; -extern const u8 gTrainerFrontPic_LeaderBrawly[]; -extern const u8 gTrainerFrontPic_LeaderWattson[]; -extern const u8 gTrainerFrontPic_LeaderFlannery[]; -extern const u8 gTrainerFrontPic_LeaderNorman[]; -extern const u8 gTrainerFrontPic_LeaderWinona[]; -extern const u8 gTrainerFrontPic_LeaderTateAndLiza[]; -extern const u8 gTrainerFrontPic_LeaderJuan[]; -extern const u8 gTrainerFrontPic_SchoolKidM[]; -extern const u8 gTrainerFrontPic_SchoolKidF[]; -extern const u8 gTrainerFrontPic_SrAndJr[]; -extern const u8 gTrainerFrontPic_WinstrateM[]; -extern const u8 gTrainerFrontPic_WinstrateF[]; -extern const u8 gTrainerFrontPic_Youngster[]; -extern const u8 gTrainerFrontPic_ChampionWallace[]; -extern const u8 gTrainerFrontPic_Fisherman[]; -extern const u8 gTrainerFrontPic_CyclingTriathleteM[]; -extern const u8 gTrainerFrontPic_CyclingTriathleteF[]; -extern const u8 gTrainerFrontPic_RunningTriathleteM[]; -extern const u8 gTrainerFrontPic_RunningTriathleteF[]; -extern const u8 gTrainerFrontPic_SwimmingTriathleteM[]; -extern const u8 gTrainerFrontPic_SwimmingTriathleteF[]; -extern const u8 gTrainerFrontPic_DragonTamer[]; -extern const u8 gTrainerFrontPic_NinjaBoy[]; -extern const u8 gTrainerFrontPic_BattleGirl[]; -extern const u8 gTrainerFrontPic_ParasolLady[]; -extern const u8 gTrainerFrontPic_SwimmerF[]; -extern const u8 gTrainerFrontPic_Twins[]; -extern const u8 gTrainerFrontPic_Sailor[]; -extern const u8 gTrainerFrontPic_MagmaAdmin[]; -extern const u8 gTrainerFrontPic_Wally[]; -extern const u8 gTrainerFrontPic_Brendan[]; -extern const u8 gTrainerFrontPic_May[]; -extern const u8 gTrainerFrontPic_BugCatcher[]; -extern const u8 gTrainerFrontPic_PokemonRangerM[]; -extern const u8 gTrainerFrontPic_PokemonRangerF[]; -extern const u8 gTrainerFrontPic_MagmaLeaderMaxie[]; -extern const u8 gTrainerFrontPic_Lass[]; -extern const u8 gTrainerFrontPic_YoungCouple[]; -extern const u8 gTrainerFrontPic_OldCouple[]; -extern const u8 gTrainerFrontPic_SisAndBro[]; -extern const u8 gTrainerFrontPic_Steven[]; -extern const u8 gTrainerFrontPic_SalonMaidenAnabel[]; -extern const u8 gTrainerFrontPic_DomeAceTucker[]; -extern const u8 gTrainerFrontPic_PalaceMavenSpenser[]; -extern const u8 gTrainerFrontPic_ArenaTycoonGreta[]; -extern const u8 gTrainerFrontPic_FactoryHeadNoland[]; -extern const u8 gTrainerFrontPic_PikeQueenLucy[]; -extern const u8 gTrainerFrontPic_PyramidKingBrandon[]; -extern const u8 gTrainerFrontPic_Red[]; -extern const u8 gTrainerFrontPic_Leaf[]; -extern const u8 gTrainerFrontPic_RubySapphireBrendan[]; -extern const u8 gTrainerFrontPic_RubySapphireMay[]; +extern const u32 gTrainerFrontPic_Hiker[]; +extern const u32 gTrainerFrontPic_AquaGruntM[]; +extern const u32 gTrainerFrontPic_PokemonBreederF[]; +extern const u32 gTrainerFrontPic_CoolTrainerM[]; +extern const u32 gTrainerFrontPic_BirdKeeper[]; +extern const u32 gTrainerFrontPic_Collector[]; +extern const u32 gTrainerFrontPic_AquaGruntF[]; +extern const u32 gTrainerFrontPic_SwimmerM[]; +extern const u32 gTrainerFrontPic_MagmaGruntM[]; +extern const u32 gTrainerFrontPic_ExpertM[]; +extern const u32 gTrainerFrontPic_AquaAdminM[]; +extern const u32 gTrainerFrontPic_BlackBelt[]; +extern const u32 gTrainerFrontPic_AquaAdminF[]; +extern const u32 gTrainerFrontPic_AquaLeaderArchie[]; +extern const u32 gTrainerFrontPic_HexManiac[]; +extern const u32 gTrainerFrontPic_AromaLady[]; +extern const u32 gTrainerFrontPic_RuinManiac[]; +extern const u32 gTrainerFrontPic_Interviewer[]; +extern const u32 gTrainerFrontPic_TuberF[]; +extern const u32 gTrainerFrontPic_TuberM[]; +extern const u32 gTrainerFrontPic_CoolTrainerF[]; +extern const u32 gTrainerFrontPic_Lady[]; +extern const u32 gTrainerFrontPic_Beauty[]; +extern const u32 gTrainerFrontPic_RichBoy[]; +extern const u32 gTrainerFrontPic_ExpertF[]; +extern const u32 gTrainerFrontPic_Pokemaniac[]; +extern const u32 gTrainerFrontPic_MagmaGruntF[]; +extern const u32 gTrainerFrontPic_Guitarist[]; +extern const u32 gTrainerFrontPic_Kindler[]; +extern const u32 gTrainerFrontPic_Camper[]; +extern const u32 gTrainerFrontPic_Picnicker[]; +extern const u32 gTrainerFrontPic_BugManiac[]; +extern const u32 gTrainerFrontPic_PokemonBreederM[]; +extern const u32 gTrainerFrontPic_PsychicM[]; +extern const u32 gTrainerFrontPic_PsychicF[]; +extern const u32 gTrainerFrontPic_Gentleman[]; +extern const u32 gTrainerFrontPic_EliteFourSidney[]; +extern const u32 gTrainerFrontPic_EliteFourPhoebe[]; +extern const u32 gTrainerFrontPic_EliteFourGlacia[]; +extern const u32 gTrainerFrontPic_EliteFourDrake[]; +extern const u32 gTrainerFrontPic_LeaderRoxanne[]; +extern const u32 gTrainerFrontPic_LeaderBrawly[]; +extern const u32 gTrainerFrontPic_LeaderWattson[]; +extern const u32 gTrainerFrontPic_LeaderFlannery[]; +extern const u32 gTrainerFrontPic_LeaderNorman[]; +extern const u32 gTrainerFrontPic_LeaderWinona[]; +extern const u32 gTrainerFrontPic_LeaderTateAndLiza[]; +extern const u32 gTrainerFrontPic_LeaderJuan[]; +extern const u32 gTrainerFrontPic_SchoolKidM[]; +extern const u32 gTrainerFrontPic_SchoolKidF[]; +extern const u32 gTrainerFrontPic_SrAndJr[]; +extern const u32 gTrainerFrontPic_WinstrateM[]; +extern const u32 gTrainerFrontPic_WinstrateF[]; +extern const u32 gTrainerFrontPic_Youngster[]; +extern const u32 gTrainerFrontPic_ChampionWallace[]; +extern const u32 gTrainerFrontPic_Fisherman[]; +extern const u32 gTrainerFrontPic_CyclingTriathleteM[]; +extern const u32 gTrainerFrontPic_CyclingTriathleteF[]; +extern const u32 gTrainerFrontPic_RunningTriathleteM[]; +extern const u32 gTrainerFrontPic_RunningTriathleteF[]; +extern const u32 gTrainerFrontPic_SwimmingTriathleteM[]; +extern const u32 gTrainerFrontPic_SwimmingTriathleteF[]; +extern const u32 gTrainerFrontPic_DragonTamer[]; +extern const u32 gTrainerFrontPic_NinjaBoy[]; +extern const u32 gTrainerFrontPic_BattleGirl[]; +extern const u32 gTrainerFrontPic_ParasolLady[]; +extern const u32 gTrainerFrontPic_SwimmerF[]; +extern const u32 gTrainerFrontPic_Twins[]; +extern const u32 gTrainerFrontPic_Sailor[]; +extern const u32 gTrainerFrontPic_MagmaAdmin[]; +extern const u32 gTrainerFrontPic_Wally[]; +extern const u32 gTrainerFrontPic_Brendan[]; +extern const u32 gTrainerFrontPic_May[]; +extern const u32 gTrainerFrontPic_BugCatcher[]; +extern const u32 gTrainerFrontPic_PokemonRangerM[]; +extern const u32 gTrainerFrontPic_PokemonRangerF[]; +extern const u32 gTrainerFrontPic_MagmaLeaderMaxie[]; +extern const u32 gTrainerFrontPic_Lass[]; +extern const u32 gTrainerFrontPic_YoungCouple[]; +extern const u32 gTrainerFrontPic_OldCouple[]; +extern const u32 gTrainerFrontPic_SisAndBro[]; +extern const u32 gTrainerFrontPic_Steven[]; +extern const u32 gTrainerFrontPic_SalonMaidenAnabel[]; +extern const u32 gTrainerFrontPic_DomeAceTucker[]; +extern const u32 gTrainerFrontPic_PalaceMavenSpenser[]; +extern const u32 gTrainerFrontPic_ArenaTycoonGreta[]; +extern const u32 gTrainerFrontPic_FactoryHeadNoland[]; +extern const u32 gTrainerFrontPic_PikeQueenLucy[]; +extern const u32 gTrainerFrontPic_PyramidKingBrandon[]; +extern const u32 gTrainerFrontPic_Red[]; +extern const u32 gTrainerFrontPic_Leaf[]; +extern const u32 gTrainerFrontPic_RubySapphireBrendan[]; +extern const u32 gTrainerFrontPic_RubySapphireMay[]; -extern const u8 gTrainerPalette_Hiker[]; -extern const u8 gTrainerPalette_AquaGruntM[]; -extern const u8 gTrainerPalette_PokemonBreederF[]; -extern const u8 gTrainerPalette_CoolTrainerM[]; -extern const u8 gTrainerPalette_BirdKeeper[]; -extern const u8 gTrainerPalette_Collector[]; -extern const u8 gTrainerPalette_AquaGruntF[]; -extern const u8 gTrainerPalette_SwimmerM[]; -extern const u8 gTrainerPalette_MagmaGruntM[]; -extern const u8 gTrainerPalette_ExpertM[]; -extern const u8 gTrainerPalette_AquaAdminM[]; -extern const u8 gTrainerPalette_BlackBelt[]; -extern const u8 gTrainerPalette_AquaAdminF[]; -extern const u8 gTrainerPalette_AquaLeaderArchie[]; -extern const u8 gTrainerPalette_HexManiac[]; -extern const u8 gTrainerPalette_AromaLady[]; -extern const u8 gTrainerPalette_RuinManiac[]; -extern const u8 gTrainerPalette_Interviewer[]; -extern const u8 gTrainerPalette_TuberF[]; -extern const u8 gTrainerPalette_TuberM[]; -extern const u8 gTrainerPalette_CoolTrainerF[]; -extern const u8 gTrainerPalette_Lady[]; -extern const u8 gTrainerPalette_Beauty[]; -extern const u8 gTrainerPalette_RichBoy[]; -extern const u8 gTrainerPalette_ExpertF[]; -extern const u8 gTrainerPalette_Pokemaniac[]; -extern const u8 gTrainerPalette_MagmaGruntF[]; -extern const u8 gTrainerPalette_Guitarist[]; -extern const u8 gTrainerPalette_Kindler[]; -extern const u8 gTrainerPalette_Camper[]; -extern const u8 gTrainerPalette_Picnicker[]; -extern const u8 gTrainerPalette_BugManiac[]; -extern const u8 gTrainerPalette_PokemonBreederM[]; -extern const u8 gTrainerPalette_PsychicM[]; -extern const u8 gTrainerPalette_PsychicF[]; -extern const u8 gTrainerPalette_Gentleman[]; -extern const u8 gTrainerPalette_EliteFourSidney[]; -extern const u8 gTrainerPalette_EliteFourPhoebe[]; -extern const u8 gTrainerPalette_EliteFourGlacia[]; -extern const u8 gTrainerPalette_EliteFourDrake[]; -extern const u8 gTrainerPalette_LeaderRoxanne[]; -extern const u8 gTrainerPalette_LeaderBrawly[]; -extern const u8 gTrainerPalette_LeaderWattson[]; -extern const u8 gTrainerPalette_LeaderFlannery[]; -extern const u8 gTrainerPalette_LeaderNorman[]; -extern const u8 gTrainerPalette_LeaderWinona[]; -extern const u8 gTrainerPalette_LeaderTateAndLiza[]; -extern const u8 gTrainerPalette_LeaderJuan[]; -extern const u8 gTrainerPalette_SchoolKidM[]; -extern const u8 gTrainerPalette_SchoolKidF[]; -extern const u8 gTrainerPalette_SrAndJr[]; -extern const u8 gTrainerPalette_WinstrateM[]; -extern const u8 gTrainerPalette_WinstrateF[]; -extern const u8 gTrainerPalette_Youngster[]; -extern const u8 gTrainerPalette_ChampionWallace[]; -extern const u8 gTrainerPalette_Fisherman[]; -extern const u8 gTrainerPalette_CyclingTriathleteM[]; -extern const u8 gTrainerPalette_CyclingTriathleteF[]; -extern const u8 gTrainerPalette_RunningTriathleteM[]; -extern const u8 gTrainerPalette_RunningTriathleteF[]; -extern const u8 gTrainerPalette_SwimmingTriathleteM[]; -extern const u8 gTrainerPalette_SwimmingTriathleteF[]; -extern const u8 gTrainerPalette_DragonTamer[]; -extern const u8 gTrainerPalette_NinjaBoy[]; -extern const u8 gTrainerPalette_BattleGirl[]; -extern const u8 gTrainerPalette_ParasolLady[]; -extern const u8 gTrainerPalette_SwimmerF[]; -extern const u8 gTrainerPalette_Twins[]; -extern const u8 gTrainerPalette_Sailor[]; -extern const u8 gTrainerPalette_MagmaAdmin[]; -extern const u8 gTrainerPalette_Wally[]; -extern const u8 gTrainerPalette_Brendan[]; -extern const u8 gTrainerPalette_May[]; -extern const u8 gTrainerPalette_BugCatcher[]; -extern const u8 gTrainerPalette_PokemonRangerM[]; -extern const u8 gTrainerPalette_PokemonRangerF[]; -extern const u8 gTrainerPalette_MagmaLeaderMaxie[]; -extern const u8 gTrainerPalette_Lass[]; -extern const u8 gTrainerPalette_YoungCouple[]; -extern const u8 gTrainerPalette_OldCouple[]; -extern const u8 gTrainerPalette_SisAndBro[]; -extern const u8 gTrainerPalette_Steven[]; -extern const u8 gTrainerPalette_SalonMaidenAnabel[]; -extern const u8 gTrainerPalette_DomeAceTucker[]; -extern const u8 gTrainerPalette_PalaceMavenSpenser[]; -extern const u8 gTrainerPalette_ArenaTycoonGreta[]; -extern const u8 gTrainerPalette_FactoryHeadNoland[]; -extern const u8 gTrainerPalette_PikeQueenLucy[]; -extern const u8 gTrainerPalette_PyramidKingBrandon[]; -extern const u8 gTrainerPalette_Red[]; -extern const u8 gTrainerPalette_Leaf[]; -extern const u8 gTrainerPalette_RubySapphireBrendan[]; -extern const u8 gTrainerPalette_RubySapphireMay[]; +extern const u32 gTrainerPalette_Hiker[]; +extern const u32 gTrainerPalette_AquaGruntM[]; +extern const u32 gTrainerPalette_PokemonBreederF[]; +extern const u32 gTrainerPalette_CoolTrainerM[]; +extern const u32 gTrainerPalette_BirdKeeper[]; +extern const u32 gTrainerPalette_Collector[]; +extern const u32 gTrainerPalette_AquaGruntF[]; +extern const u32 gTrainerPalette_SwimmerM[]; +extern const u32 gTrainerPalette_MagmaGruntM[]; +extern const u32 gTrainerPalette_ExpertM[]; +extern const u32 gTrainerPalette_AquaAdminM[]; +extern const u32 gTrainerPalette_BlackBelt[]; +extern const u32 gTrainerPalette_AquaAdminF[]; +extern const u32 gTrainerPalette_AquaLeaderArchie[]; +extern const u32 gTrainerPalette_HexManiac[]; +extern const u32 gTrainerPalette_AromaLady[]; +extern const u32 gTrainerPalette_RuinManiac[]; +extern const u32 gTrainerPalette_Interviewer[]; +extern const u32 gTrainerPalette_TuberF[]; +extern const u32 gTrainerPalette_TuberM[]; +extern const u32 gTrainerPalette_CoolTrainerF[]; +extern const u32 gTrainerPalette_Lady[]; +extern const u32 gTrainerPalette_Beauty[]; +extern const u32 gTrainerPalette_RichBoy[]; +extern const u32 gTrainerPalette_ExpertF[]; +extern const u32 gTrainerPalette_Pokemaniac[]; +extern const u32 gTrainerPalette_MagmaGruntF[]; +extern const u32 gTrainerPalette_Guitarist[]; +extern const u32 gTrainerPalette_Kindler[]; +extern const u32 gTrainerPalette_Camper[]; +extern const u32 gTrainerPalette_Picnicker[]; +extern const u32 gTrainerPalette_BugManiac[]; +extern const u32 gTrainerPalette_PokemonBreederM[]; +extern const u32 gTrainerPalette_PsychicM[]; +extern const u32 gTrainerPalette_PsychicF[]; +extern const u32 gTrainerPalette_Gentleman[]; +extern const u32 gTrainerPalette_EliteFourSidney[]; +extern const u32 gTrainerPalette_EliteFourPhoebe[]; +extern const u32 gTrainerPalette_EliteFourGlacia[]; +extern const u32 gTrainerPalette_EliteFourDrake[]; +extern const u32 gTrainerPalette_LeaderRoxanne[]; +extern const u32 gTrainerPalette_LeaderBrawly[]; +extern const u32 gTrainerPalette_LeaderWattson[]; +extern const u32 gTrainerPalette_LeaderFlannery[]; +extern const u32 gTrainerPalette_LeaderNorman[]; +extern const u32 gTrainerPalette_LeaderWinona[]; +extern const u32 gTrainerPalette_LeaderTateAndLiza[]; +extern const u32 gTrainerPalette_LeaderJuan[]; +extern const u32 gTrainerPalette_SchoolKidM[]; +extern const u32 gTrainerPalette_SchoolKidF[]; +extern const u32 gTrainerPalette_SrAndJr[]; +extern const u32 gTrainerPalette_WinstrateM[]; +extern const u32 gTrainerPalette_WinstrateF[]; +extern const u32 gTrainerPalette_Youngster[]; +extern const u32 gTrainerPalette_ChampionWallace[]; +extern const u32 gTrainerPalette_Fisherman[]; +extern const u32 gTrainerPalette_CyclingTriathleteM[]; +extern const u32 gTrainerPalette_CyclingTriathleteF[]; +extern const u32 gTrainerPalette_RunningTriathleteM[]; +extern const u32 gTrainerPalette_RunningTriathleteF[]; +extern const u32 gTrainerPalette_SwimmingTriathleteM[]; +extern const u32 gTrainerPalette_SwimmingTriathleteF[]; +extern const u32 gTrainerPalette_DragonTamer[]; +extern const u32 gTrainerPalette_NinjaBoy[]; +extern const u32 gTrainerPalette_BattleGirl[]; +extern const u32 gTrainerPalette_ParasolLady[]; +extern const u32 gTrainerPalette_SwimmerF[]; +extern const u32 gTrainerPalette_Twins[]; +extern const u32 gTrainerPalette_Sailor[]; +extern const u32 gTrainerPalette_MagmaAdmin[]; +extern const u32 gTrainerPalette_Wally[]; +extern const u32 gTrainerPalette_Brendan[]; +extern const u32 gTrainerPalette_May[]; +extern const u32 gTrainerPalette_BugCatcher[]; +extern const u32 gTrainerPalette_PokemonRangerM[]; +extern const u32 gTrainerPalette_PokemonRangerF[]; +extern const u32 gTrainerPalette_MagmaLeaderMaxie[]; +extern const u32 gTrainerPalette_Lass[]; +extern const u32 gTrainerPalette_YoungCouple[]; +extern const u32 gTrainerPalette_OldCouple[]; +extern const u32 gTrainerPalette_SisAndBro[]; +extern const u32 gTrainerPalette_Steven[]; +extern const u32 gTrainerPalette_SalonMaidenAnabel[]; +extern const u32 gTrainerPalette_DomeAceTucker[]; +extern const u32 gTrainerPalette_PalaceMavenSpenser[]; +extern const u32 gTrainerPalette_ArenaTycoonGreta[]; +extern const u32 gTrainerPalette_FactoryHeadNoland[]; +extern const u32 gTrainerPalette_PikeQueenLucy[]; +extern const u32 gTrainerPalette_PyramidKingBrandon[]; +extern const u32 gTrainerPalette_Red[]; +extern const u32 gTrainerPalette_Leaf[]; +extern const u32 gTrainerPalette_RubySapphireBrendan[]; +extern const u32 gTrainerPalette_RubySapphireMay[]; extern const u8 gTrainerBackPic_Brendan[]; extern const u8 gTrainerBackPic_May[]; @@ -3065,223 +3065,222 @@ extern const u8 gTrainerBackPic_RubySapphireMay[]; extern const u8 gTrainerBackPic_Wally[]; extern const u8 gTrainerBackPic_Steven[]; -extern const u8 gTrainerBackPicPalette_Red[]; -extern const u8 gTrainerBackPicPalette_Leaf[]; +extern const u32 gTrainerBackPicPalette_Red[]; +extern const u32 gTrainerBackPicPalette_Leaf[]; // pokeblock -extern const u8 gMenuPokeblock_Gfx[]; +extern const u32 gMenuPokeblock_Gfx[]; extern const u8 gMenuPokeblock_Pal[]; -extern const u8 gMenuPokeblock_Tilemap[]; -extern const u8 gMenuPokeblockDevice_Gfx[]; -extern const u8 gMenuPokeblockDevice_Pal[]; -extern const u8 gPokeblockRed_Pal[]; -extern const u8 gPokeblockBlue_Pal[]; -extern const u8 gPokeblockPink_Pal[]; -extern const u8 gPokeblockGreen_Pal[]; -extern const u8 gPokeblockYellow_Pal[]; -extern const u8 gPokeblockPurple_Pal[]; -extern const u8 gPokeblockIndigo_Pal[]; -extern const u8 gPokeblockBrown_Pal[]; -extern const u8 gPokeblockLiteBlue_Pal[]; -extern const u8 gPokeblockOlive_Pal[]; -extern const u8 gPokeblockGray_Pal[]; -extern const u8 gPokeblockBlack_Pal[]; -extern const u8 gPokeblockWhite_Pal[]; -extern const u8 gPokeblockGold_Pal[]; -extern const u8 gPokeblock_Gfx[]; +extern const u32 gMenuPokeblock_Tilemap[]; +extern const u32 gMenuPokeblockDevice_Gfx[]; +extern const u32 gMenuPokeblockDevice_Pal[]; +extern const u32 gPokeblockRed_Pal[]; +extern const u32 gPokeblockBlue_Pal[]; +extern const u32 gPokeblockPink_Pal[]; +extern const u32 gPokeblockGreen_Pal[]; +extern const u32 gPokeblockYellow_Pal[]; +extern const u32 gPokeblockPurple_Pal[]; +extern const u32 gPokeblockIndigo_Pal[]; +extern const u32 gPokeblockBrown_Pal[]; +extern const u32 gPokeblockLiteBlue_Pal[]; +extern const u32 gPokeblockOlive_Pal[]; +extern const u32 gPokeblockGray_Pal[]; +extern const u32 gPokeblockBlack_Pal[]; +extern const u32 gPokeblockWhite_Pal[]; +extern const u32 gPokeblockGold_Pal[]; +extern const u32 gPokeblock_Gfx[]; -extern const u8 gItemIcon_QuestionMark[]; -extern const u8 gItemIconPalette_QuestionMark[]; -extern const u8 gUnknown_08DB7AA0[]; -extern const u8 gUnknown_08DB7B34[]; -extern const u8 gUnknown_08DB7B5C[]; -extern const u8 gUnknown_08DB7BEC[]; -extern const u8 gUnknown_08DB7C08[]; -extern const u8 gUnknown_08DB7CE8[]; -extern const u8 gUnknown_08DB7D08[]; -extern const u8 gUnknown_08DB7DCC[]; -extern const u8 gUnknown_08DB7DF4[]; -extern const u8 gUnknown_08DB7EA0[]; -extern const u8 gUnknown_08DB7EC4[]; -extern const u8 gUnknown_08DB7F60[]; -extern const u8 gUnknown_08DB7F7C[]; -extern const u8 gUnknown_08DB8070[]; -extern const u8 gUnknown_08DB808C[]; -extern const u8 gUnknown_08DB8138[]; -extern const u8 gUnknown_08DB8160[]; -extern const u8 gUnknown_08DB8218[]; -extern const u8 gUnknown_08DB823C[]; -extern const u8 gUnknown_08DB8300[]; -extern const u8 gUnknown_08DB8328[]; -extern const u8 gUnknown_08DB8430[]; -extern const u8 gUnknown_08DB8458[]; -extern const u8 gUnknown_08DB8528[]; -extern const u8 gUnknown_08DB854C[]; -extern const u8 gUnknown_08DB862C[]; -extern const u8 gUnknown_08DB8654[]; -extern const u8 gUnknown_08DB86C4[]; -extern const u8 gUnknown_08DB86E0[]; -extern const u8 gUnknown_08DB8750[]; -extern const u8 gUnknown_08DB876C[]; -extern const u8 gUnknown_08DB87DC[]; -extern const u8 gUnknown_08DB87F8[]; -extern const u8 gUnknown_08DB88D8[]; -extern const u8 gUnknown_08DB8900[]; -extern const u8 gUnknown_08DB89E0[]; -extern const u8 gUnknown_08DB8A08[]; -extern const u8 gUnknown_08DB8A68[]; -extern const u8 gUnknown_08DB8A84[]; -extern const u8 gUnknown_08DB8B40[]; -extern const u8 gUnknown_08DB8B68[]; -extern const u8 gUnknown_08DB8C40[]; -extern const u8 gUnknown_08DB8C5C[]; -extern const u8 gUnknown_08DB8CF4[]; -extern const u8 gUnknown_08DB8D18[]; -extern const u8 gUnknown_08DB8DB0[]; -extern const u8 gUnknown_08DB8DD4[]; -extern const u8 gUnknown_08DB8E80[]; -extern const u8 gUnknown_08DB8EA0[]; -extern const u8 gUnknown_08DB8F58[]; -extern const u8 gUnknown_08DB8F7C[]; -extern const u8 gUnknown_08DB9038[]; -extern const u8 gUnknown_08DB9058[]; -extern const u8 gUnknown_08DB9130[]; -extern const u8 gUnknown_08DB9154[]; -extern const u8 gUnknown_08DB9218[]; -extern const u8 gUnknown_08DB9234[]; -extern const u8 gUnknown_08DB92FC[]; -extern const u8 gUnknown_08DB931C[]; -extern const u8 gUnknown_08DB93E8[]; -extern const u8 gUnknown_08DB940C[]; -extern const u8 gUnknown_08DB94CC[]; -extern const u8 gUnknown_08DB94E8[]; -extern const u8 gUnknown_08DB95AC[]; -extern const u8 gUnknown_08DB95D0[]; -extern const u8 gUnknown_08DB96C4[]; -extern const u8 gUnknown_08DB96EC[]; -extern const u8 gUnknown_08DB97F4[]; -extern const u8 gUnknown_08DB981C[]; -extern const u8 gUnknown_08DB9908[]; -extern const u8 gUnknown_08DB9930[]; -extern const u8 gUnknown_08DB9A54[]; -extern const u8 gUnknown_08DB9A7C[]; -extern const u8 gUnknown_08DB9B7C[]; -extern const u8 gUnknown_08DB9BA4[]; -extern const u8 gUnknown_08DB9CB0[]; -extern const u8 gUnknown_08DB9CD8[]; -extern const u8 gUnknown_08DB9DAC[]; -extern const u8 gUnknown_08DB9DD4[]; -extern const u8 gUnknown_08DB9EE4[]; -extern const u8 gUnknown_08DB9F08[]; -extern const u8 gUnknown_08DB9FFC[]; -extern const u8 gUnknown_08DBA020[]; -extern const u8 gUnknown_08DBA12C[]; -extern const u8 gWallclock_Gfx[]; +extern const u32 gItemIcon_QuestionMark[]; +extern const u32 gItemIconPalette_QuestionMark[]; +extern const u32 gUnknown_08DB7AA0[]; +extern const u32 gUnknown_08DB7B34[]; +extern const u32 gUnknown_08DB7B5C[]; +extern const u32 gUnknown_08DB7BEC[]; +extern const u32 gUnknown_08DB7C08[]; +extern const u32 gUnknown_08DB7CE8[]; +extern const u32 gUnknown_08DB7D08[]; +extern const u32 gUnknown_08DB7DCC[]; +extern const u32 gUnknown_08DB7DF4[]; +extern const u32 gUnknown_08DB7EA0[]; +extern const u32 gUnknown_08DB7EC4[]; +extern const u32 gUnknown_08DB7F60[]; +extern const u32 gUnknown_08DB7F7C[]; +extern const u32 gUnknown_08DB8070[]; +extern const u32 gUnknown_08DB808C[]; +extern const u32 gUnknown_08DB8138[]; +extern const u32 gUnknown_08DB8160[]; +extern const u32 gUnknown_08DB8218[]; +extern const u32 gUnknown_08DB823C[]; +extern const u32 gUnknown_08DB8300[]; +extern const u32 gUnknown_08DB8328[]; +extern const u32 gUnknown_08DB8430[]; +extern const u32 gUnknown_08DB8458[]; +extern const u32 gUnknown_08DB8528[]; +extern const u32 gUnknown_08DB854C[]; +extern const u32 gUnknown_08DB862C[]; +extern const u32 gUnknown_08DB8654[]; +extern const u32 gUnknown_08DB86C4[]; +extern const u32 gUnknown_08DB86E0[]; +extern const u32 gUnknown_08DB8750[]; +extern const u32 gUnknown_08DB876C[]; +extern const u32 gUnknown_08DB87DC[]; +extern const u32 gUnknown_08DB87F8[]; +extern const u32 gUnknown_08DB88D8[]; +extern const u32 gUnknown_08DB8900[]; +extern const u32 gUnknown_08DB89E0[]; +extern const u32 gUnknown_08DB8A08[]; +extern const u32 gUnknown_08DB8A68[]; +extern const u32 gUnknown_08DB8A84[]; +extern const u32 gUnknown_08DB8B40[]; +extern const u32 gUnknown_08DB8B68[]; +extern const u32 gUnknown_08DB8C40[]; +extern const u32 gUnknown_08DB8C5C[]; +extern const u32 gUnknown_08DB8CF4[]; +extern const u32 gUnknown_08DB8D18[]; +extern const u32 gUnknown_08DB8DB0[]; +extern const u32 gUnknown_08DB8DD4[]; +extern const u32 gUnknown_08DB8E80[]; +extern const u32 gUnknown_08DB8EA0[]; +extern const u32 gUnknown_08DB8F58[]; +extern const u32 gUnknown_08DB8F7C[]; +extern const u32 gUnknown_08DB9038[]; +extern const u32 gUnknown_08DB9058[]; +extern const u32 gUnknown_08DB9130[]; +extern const u32 gUnknown_08DB9154[]; +extern const u32 gUnknown_08DB9218[]; +extern const u32 gUnknown_08DB9234[]; +extern const u32 gUnknown_08DB92FC[]; +extern const u32 gUnknown_08DB931C[]; +extern const u32 gUnknown_08DB93E8[]; +extern const u32 gUnknown_08DB940C[]; +extern const u32 gUnknown_08DB94CC[]; +extern const u32 gUnknown_08DB94E8[]; +extern const u32 gUnknown_08DB95AC[]; +extern const u32 gUnknown_08DB95D0[]; +extern const u32 gUnknown_08DB96C4[]; +extern const u32 gUnknown_08DB96EC[]; +extern const u32 gUnknown_08DB97F4[]; +extern const u32 gUnknown_08DB981C[]; +extern const u32 gUnknown_08DB9908[]; +extern const u32 gUnknown_08DB9930[]; +extern const u32 gUnknown_08DB9A54[]; +extern const u32 gUnknown_08DB9A7C[]; +extern const u32 gUnknown_08DB9B7C[]; +extern const u32 gUnknown_08DB9BA4[]; +extern const u32 gUnknown_08DB9CB0[]; +extern const u32 gUnknown_08DB9CD8[]; +extern const u32 gUnknown_08DB9DAC[]; +extern const u32 gUnknown_08DB9DD4[]; +extern const u32 gUnknown_08DB9EE4[]; +extern const u32 gUnknown_08DB9F08[]; +extern const u32 gUnknown_08DB9FFC[]; +extern const u32 gUnknown_08DBA020[]; +extern const u32 gUnknown_08DBA12C[]; +extern const u32 gWallclock_Gfx[]; extern const u16 gWallclockMale_Pal[]; extern const u16 gWallclockFemale_Pal[]; -extern const u8 gUnknown_08DCC648[]; -extern const u8 gUnknown_08DCC908[]; -extern const u8 gBerryFixGameboy_Gfx[]; -extern const u8 gBerryFixGameboy_Tilemap[]; +extern const u32 gUnknown_08DCC648[]; +extern const u32 gUnknown_08DCC908[]; +extern const u32 gBerryFixGameboy_Gfx[]; +extern const u32 gBerryFixGameboy_Tilemap[]; extern const u16 gBerryFixGameboy_Pal[]; -extern const u8 gBerryFixGameboyLogo_Gfx[]; -extern const u8 gBerryFixGameboyLogo_Tilemap[]; +extern const u32 gBerryFixGameboyLogo_Gfx[]; +extern const u32 gBerryFixGameboyLogo_Tilemap[]; extern const u16 gBerryFixGameboyLogo_Pal[]; -extern const u8 gBerryFixGbaTransfer_Gfx[]; -extern const u8 gBerryFixGbaTransfer_Tilemap[]; +extern const u32 gBerryFixGbaTransfer_Gfx[]; +extern const u32 gBerryFixGbaTransfer_Tilemap[]; extern const u16 gBerryFixGbaTransfer_Pal[]; -extern const u8 gBerryFixGbaTransferHighlight_Gfx[]; -extern const u8 gBerryFixGbaTransferHighlight_Tilemap[]; +extern const u32 gBerryFixGbaTransferHighlight_Gfx[]; +extern const u32 gBerryFixGbaTransferHighlight_Tilemap[]; extern const u16 gBerryFixGbaTransferHighlight_Pal[]; -extern const u8 gBerryFixGbaTransferError_Gfx[]; -extern const u8 gBerryFixGbaTransferError_Tilemap[]; +extern const u32 gBerryFixGbaTransferError_Gfx[]; +extern const u32 gBerryFixGbaTransferError_Tilemap[]; extern const u16 gBerryFixGbaTransferError_Pal[]; -extern const u8 gBerryFixWindow_Gfx[]; -extern const u8 gBerryFixWindow_Tilemap[]; +extern const u32 gBerryFixWindow_Gfx[]; +extern const u32 gBerryFixWindow_Tilemap[]; extern const u16 gBerryFixWindow_Pal[]; -extern const u8 gBattleTextboxTiles[]; -extern const u8 gBattleTextboxTilemap[]; -extern const u8 gBattleTextboxPalette[]; -extern const u8 gUnknown_08D778F0[]; -extern const u8 gUnknown_08D77B0C[]; -extern const u8 gUnknown_08D77AE4[]; -extern const u8 gUnknown_08D779D8[]; -extern const u8 gUnknown_08D857A8[]; -extern const u8 gUnknown_08D85A1C[]; -extern const u8 gUnknown_08D85600[]; +extern const u32 gBattleTextboxTiles[]; +extern const u32 gBattleTextboxTilemap[]; +extern const u32 gBattleTextboxPalette[]; +extern const u32 gUnknown_08D778F0[]; +extern const u32 gUnknown_08D77B0C[]; +extern const u32 gUnknown_08D77AE4[]; +extern const u32 gUnknown_08D779D8[]; +extern const u32 gUnknown_08D857A8[]; +extern const u32 gUnknown_08D85A1C[]; // battle terrains -extern const u8 gBattleTerrainTiles_TallGrass[]; -extern const u8 gBattleTerrainTilemap_TallGrass[]; -extern const u8 gBattleTerrainAnimTiles_TallGrass[]; -extern const u8 gBattleTerrainAnimTilemap_TallGrass[]; -extern const u8 gBattleTerrainPalette_TallGrass[]; -extern const u8 gBattleTerrainTiles_LongGrass[]; -extern const u8 gBattleTerrainTilemap_LongGrass[]; -extern const u8 gBattleTerrainAnimTiles_LongGrass[]; -extern const u8 gBattleTerrainAnimTilemap_LongGrass[]; -extern const u8 gBattleTerrainPalette_LongGrass[]; -extern const u8 gBattleTerrainTiles_Sand[]; -extern const u8 gBattleTerrainTilemap_Sand[]; -extern const u8 gBattleTerrainAnimTiles_Sand[]; -extern const u8 gBattleTerrainAnimTilemap_Sand[]; -extern const u8 gBattleTerrainPalette_Sand[]; -extern const u8 gBattleTerrainTiles_Underwater[]; -extern const u8 gBattleTerrainTilemap_Underwater[]; -extern const u8 gBattleTerrainAnimTiles_Underwater[]; -extern const u8 gBattleTerrainAnimTilemap_Underwater[]; -extern const u8 gBattleTerrainPalette_Underwater[]; -extern const u8 gBattleTerrainTiles_Water[]; -extern const u8 gBattleTerrainTilemap_Water[]; -extern const u8 gBattleTerrainAnimTiles_Water[]; -extern const u8 gBattleTerrainAnimTilemap_Water[]; -extern const u8 gBattleTerrainPalette_Water[]; -extern const u8 gBattleTerrainTiles_PondWater[]; -extern const u8 gBattleTerrainTilemap_PondWater[]; -extern const u8 gBattleTerrainAnimTiles_PondWater[]; -extern const u8 gBattleTerrainAnimTilemap_PondWater[]; -extern const u8 gBattleTerrainPalette_PondWater[]; -extern const u8 gBattleTerrainTiles_Rock[]; -extern const u8 gBattleTerrainTilemap_Rock[]; -extern const u8 gBattleTerrainAnimTiles_Rock[]; -extern const u8 gBattleTerrainAnimTilemap_Rock[]; -extern const u8 gBattleTerrainPalette_Rock[]; -extern const u8 gBattleTerrainTiles_Cave[]; -extern const u8 gBattleTerrainTilemap_Cave[]; -extern const u8 gBattleTerrainAnimTiles_Cave[]; -extern const u8 gBattleTerrainAnimTilemap_Cave[]; -extern const u8 gBattleTerrainPalette_Cave[]; -extern const u8 gBattleTerrainTiles_Building[]; -extern const u8 gBattleTerrainTilemap_Building[]; -extern const u8 gBattleTerrainAnimTiles_Building[]; -extern const u8 gBattleTerrainAnimTilemap_Building[]; -extern const u8 gBattleTerrainPalette_Building[]; -extern const u8 gBattleTerrainPalette_Plain[]; -extern const u8 gBattleTerrainPalette_Frontier[]; -extern const u8 gBattleTerrainTiles_Stadium[]; -extern const u8 gBattleTerrainTilemap_Stadium[]; -extern const u8 gBattleTerrainTiles_Rayquaza[]; -extern const u8 gBattleTerrainTilemap_Rayquaza[]; -extern const u8 gBattleTerrainAnimTiles_Rayquaza[]; -extern const u8 gBattleTerrainAnimTilemap_Rayquaza[]; -extern const u8 gBattleTerrainPalette_Rayquaza[]; -extern const u8 gBattleTerrainPalette_Kyogre[]; -extern const u8 gBattleTerrainPalette_Groudon[]; -extern const u8 gBattleTerrainPalette_BuildingGym[]; -extern const u8 gBattleTerrainPalette_BuildingLeader[]; -extern const u8 gBattleTerrainPalette_StadiumAqua[]; -extern const u8 gBattleTerrainPalette_StadiumMagma[]; -extern const u8 gBattleTerrainPalette_StadiumSidney[]; -extern const u8 gBattleTerrainPalette_StadiumPhoebe[]; -extern const u8 gBattleTerrainPalette_StadiumGlacia[]; -extern const u8 gBattleTerrainPalette_StadiumDrake[]; -extern const u8 gBattleTerrainPalette_StadiumWallace[]; +extern const u32 gBattleTerrainTiles_TallGrass[]; +extern const u32 gBattleTerrainTilemap_TallGrass[]; +extern const u32 gBattleTerrainAnimTiles_TallGrass[]; +extern const u32 gBattleTerrainAnimTilemap_TallGrass[]; +extern const u32 gBattleTerrainPalette_TallGrass[]; +extern const u32 gBattleTerrainTiles_LongGrass[]; +extern const u32 gBattleTerrainTilemap_LongGrass[]; +extern const u32 gBattleTerrainAnimTiles_LongGrass[]; +extern const u32 gBattleTerrainAnimTilemap_LongGrass[]; +extern const u32 gBattleTerrainPalette_LongGrass[]; +extern const u32 gBattleTerrainTiles_Sand[]; +extern const u32 gBattleTerrainTilemap_Sand[]; +extern const u32 gBattleTerrainAnimTiles_Sand[]; +extern const u32 gBattleTerrainAnimTilemap_Sand[]; +extern const u32 gBattleTerrainPalette_Sand[]; +extern const u32 gBattleTerrainTiles_Underwater[]; +extern const u32 gBattleTerrainTilemap_Underwater[]; +extern const u32 gBattleTerrainAnimTiles_Underwater[]; +extern const u32 gBattleTerrainAnimTilemap_Underwater[]; +extern const u32 gBattleTerrainPalette_Underwater[]; +extern const u32 gBattleTerrainTiles_Water[]; +extern const u32 gBattleTerrainTilemap_Water[]; +extern const u32 gBattleTerrainAnimTiles_Water[]; +extern const u32 gBattleTerrainAnimTilemap_Water[]; +extern const u32 gBattleTerrainPalette_Water[]; +extern const u32 gBattleTerrainTiles_PondWater[]; +extern const u32 gBattleTerrainTilemap_PondWater[]; +extern const u32 gBattleTerrainAnimTiles_PondWater[]; +extern const u32 gBattleTerrainAnimTilemap_PondWater[]; +extern const u32 gBattleTerrainPalette_PondWater[]; +extern const u32 gBattleTerrainTiles_Rock[]; +extern const u32 gBattleTerrainTilemap_Rock[]; +extern const u32 gBattleTerrainAnimTiles_Rock[]; +extern const u32 gBattleTerrainAnimTilemap_Rock[]; +extern const u32 gBattleTerrainPalette_Rock[]; +extern const u32 gBattleTerrainTiles_Cave[]; +extern const u32 gBattleTerrainTilemap_Cave[]; +extern const u32 gBattleTerrainAnimTiles_Cave[]; +extern const u32 gBattleTerrainAnimTilemap_Cave[]; +extern const u32 gBattleTerrainPalette_Cave[]; +extern const u32 gBattleTerrainTiles_Building[]; +extern const u32 gBattleTerrainTilemap_Building[]; +extern const u32 gBattleTerrainAnimTiles_Building[]; +extern const u32 gBattleTerrainAnimTilemap_Building[]; +extern const u32 gBattleTerrainPalette_Building[]; +extern const u32 gBattleTerrainPalette_Plain[]; +extern const u32 gBattleTerrainPalette_Frontier[]; +extern const u32 gBattleTerrainTiles_Stadium[]; +extern const u32 gBattleTerrainTilemap_Stadium[]; +extern const u32 gBattleTerrainTiles_Rayquaza[]; +extern const u32 gBattleTerrainTilemap_Rayquaza[]; +extern const u32 gBattleTerrainAnimTiles_Rayquaza[]; +extern const u32 gBattleTerrainAnimTilemap_Rayquaza[]; +extern const u32 gBattleTerrainPalette_Rayquaza[]; +extern const u32 gBattleTerrainPalette_Kyogre[]; +extern const u32 gBattleTerrainPalette_Groudon[]; +extern const u32 gBattleTerrainPalette_BuildingGym[]; +extern const u32 gBattleTerrainPalette_BuildingLeader[]; +extern const u32 gBattleTerrainPalette_StadiumAqua[]; +extern const u32 gBattleTerrainPalette_StadiumMagma[]; +extern const u32 gBattleTerrainPalette_StadiumSidney[]; +extern const u32 gBattleTerrainPalette_StadiumPhoebe[]; +extern const u32 gBattleTerrainPalette_StadiumGlacia[]; +extern const u32 gBattleTerrainPalette_StadiumDrake[]; +extern const u32 gBattleTerrainPalette_StadiumWallace[]; // pokedex -extern const u8 gPokedexMenu2_Gfx[]; +extern const u32 gPokedexMenu2_Gfx[]; extern const u16 gPokedexText_Pal[]; -extern const u8 gPokedexMenu_Gfx[]; +extern const u32 gPokedexMenu_Gfx[]; extern const u8 gUnknown_08DC2C5C[]; extern const u8 gUnknown_08DC2DAC[]; extern const u8 gUnknown_08DC2A08[]; @@ -3295,564 +3294,561 @@ extern const u8 gUnknown_08DC2E6C[]; extern const u8 gUnknown_08DC2F5C[]; extern const u8 gUnknown_08DC2FEC[]; extern const u16 gPokedexCaughtScreenFade_Pal[]; -extern const u8 gPokedexSearchMenu_Gfx[]; -extern const u8 gPokedexSearch2_Tilemap[]; -extern const u8 gPokedexSearch1_Tilemap[]; +extern const u32 gPokedexSearchMenu_Gfx[]; +extern const u32 gPokedexSearch2_Tilemap[]; +extern const u32 gPokedexSearch1_Tilemap[]; extern const u16 gPokedexSearchMenu_Pal[]; // berry tag screen -extern const u8 gUnknown_08D9BB44[]; -extern const u8 gUnknown_08D9BF98[]; -extern const u8 gUnknown_08D9C13C[]; -extern const u8 gUnknown_08D9BEF0[]; +extern const u32 gUnknown_08D9BB44[]; +extern const u32 gUnknown_08D9BF98[]; +extern const u32 gUnknown_08D9C13C[]; +extern const u32 gUnknown_08D9BEF0[]; // rayquaza scene gfx -extern const u8 gRaySceneGroudon_Gfx[]; -extern const u8 gRaySceneGroudon2_Gfx[]; -extern const u8 gRaySceneGroudon3_Gfx[]; -extern const u8 gRaySceneKyogre_Gfx[]; -extern const u8 gRaySceneKyogre2_Gfx[]; -extern const u8 gRaySceneKyogre3_Gfx[]; -extern const u8 gRaySceneGroudon_Pal[]; -extern const u8 gRaySceneKyogre_Pal[]; -extern const u8 gRaySceneSmoke_Gfx[]; -extern const u8 gRaySceneSmoke_Pal[]; -extern const u8 gRaySceneRayquaza_Pal[]; -extern const u8 gRaySceneRayquazaFly1_Gfx[]; -extern const u8 gRaySceneRayquazaTail_Gfx[]; -extern const u8 gRaySceneGroudonLeft_Gfx[]; -extern const u8 gRaySceneGroudonTail_Gfx[]; -extern const u8 gRaySceneKyogreRight_Gfx[]; -extern const u8 gRaySceneRayquazaHover_Gfx[]; -extern const u8 gRaySceneRayquazaFlyIn_Gfx[]; -extern const u8 gRaySceneOvercast_Gfx[]; -extern const u8 gRaySceneOvercast_Tilemap[]; -extern const u8 gRaySceneRayquaza_Gfx[]; -extern const u8 gRaySceneRayquaza_Tilemap[]; -extern const u8 gRaySceneSplash_Gfx[]; -extern const u8 gRaySceneGroudonLeft_Pal[]; -extern const u8 gRaySceneKyogreRight_Pal[]; -extern const u8 gRaySceneRayquazaHover_Pal[]; -extern const u8 gRaySceneSplash_Pal[]; -extern const u8 gRaySceneClouds_Gfx[]; -extern const u8 gRaySceneClouds_Pal[]; -extern const u8 gRaySceneClouds2_Tilemap[]; -extern const u8 gRaySceneClouds1_Tilemap[]; -extern const u8 gRaySceneClouds3_Tilemap[]; -extern const u8 gRaySceneRayquazaLight_Gfx[]; -extern const u8 gRaySceneRayquazaLight_Tilemap[]; -extern const u8 gRaySceneOvercast2_Gfx[]; -extern const u8 gRaySceneOvercast2_Tilemap[]; -extern const u8 gRaySceneOvercast2_Pal[]; -extern const u8 gRaySceneRayquazaChase_Gfx[]; -extern const u8 gRaySceneChaseStreaks_Gfx[]; -extern const u8 gRaySceneChaseBg_Gfx[]; -extern const u8 gRayChaseRayquazaChase2_Tilemap[]; -extern const u8 gRayChaseRayquazaChase_Tilemap[]; -extern const u8 gRaySceneChaseStreaks_Tilemap[]; -extern const u8 gRaySceneChaseBg_Tilemap[]; -extern const u8 gRaySceneChase_Pal[]; -extern const u8 gRaySceneHushRing_Tilemap[]; -extern const u8 gRaySceneHushBg_Tilemap[]; -extern const u8 gRaySceneHushRing_Map[]; -extern const u8 gRaySceneHushBg_Pal[]; -extern const u8 gRaySceneHushBg_Gfx[]; -extern const u8 gRaySceneHushRing_Gfx[]; +extern const u32 gRaySceneGroudon_Gfx[]; +extern const u32 gRaySceneGroudon2_Gfx[]; +extern const u32 gRaySceneGroudon3_Gfx[]; +extern const u32 gRaySceneKyogre_Gfx[]; +extern const u32 gRaySceneKyogre2_Gfx[]; +extern const u32 gRaySceneKyogre3_Gfx[]; +extern const u32 gRaySceneGroudon_Pal[]; +extern const u32 gRaySceneKyogre_Pal[]; +extern const u32 gRaySceneSmoke_Gfx[]; +extern const u32 gRaySceneSmoke_Pal[]; +extern const u32 gRaySceneRayquaza_Pal[]; +extern const u32 gRaySceneRayquazaFly1_Gfx[]; +extern const u32 gRaySceneRayquazaTail_Gfx[]; +extern const u32 gRaySceneGroudonLeft_Gfx[]; +extern const u32 gRaySceneGroudonTail_Gfx[]; +extern const u32 gRaySceneKyogreRight_Gfx[]; +extern const u32 gRaySceneRayquazaHover_Gfx[]; +extern const u32 gRaySceneRayquazaFlyIn_Gfx[]; +extern const u32 gRaySceneOvercast_Gfx[]; +extern const u32 gRaySceneOvercast_Tilemap[]; +extern const u32 gRaySceneRayquaza_Gfx[]; +extern const u32 gRaySceneRayquaza_Tilemap[]; +extern const u32 gRaySceneSplash_Gfx[]; +extern const u32 gRaySceneGroudonLeft_Pal[]; +extern const u32 gRaySceneKyogreRight_Pal[]; +extern const u32 gRaySceneRayquazaHover_Pal[]; +extern const u32 gRaySceneSplash_Pal[]; +extern const u32 gRaySceneClouds_Gfx[]; +extern const u32 gRaySceneClouds_Pal[]; +extern const u32 gRaySceneClouds2_Tilemap[]; +extern const u32 gRaySceneClouds1_Tilemap[]; +extern const u32 gRaySceneClouds3_Tilemap[]; +extern const u32 gRaySceneRayquazaLight_Gfx[]; +extern const u32 gRaySceneRayquazaLight_Tilemap[]; +extern const u32 gRaySceneOvercast2_Gfx[]; +extern const u32 gRaySceneOvercast2_Tilemap[]; +extern const u32 gRaySceneOvercast2_Pal[]; +extern const u32 gRaySceneRayquazaChase_Gfx[]; +extern const u32 gRaySceneChaseStreaks_Gfx[]; +extern const u32 gRaySceneChaseBg_Gfx[]; +extern const u32 gRayChaseRayquazaChase2_Tilemap[]; +extern const u32 gRayChaseRayquazaChase_Tilemap[]; +extern const u32 gRaySceneChaseStreaks_Tilemap[]; +extern const u32 gRaySceneChaseBg_Tilemap[]; +extern const u32 gRaySceneChase_Pal[]; +extern const u32 gRaySceneHushRing_Tilemap[]; +extern const u32 gRaySceneHushBg_Tilemap[]; +extern const u32 gRaySceneHushRing_Map[]; +extern const u32 gRaySceneHushBg_Pal[]; +extern const u32 gRaySceneHushBg_Gfx[]; +extern const u32 gRaySceneHushRing_Gfx[]; -// Item icons -extern const u8 gItemIcon_QuestionMark[]; -extern const u8 gItemIconPalette_QuestionMark[]; // Pokeballs -extern const u8 gItemIcon_MasterBall[]; -extern const u8 gItemIconPalette_MasterBall[]; -extern const u8 gItemIcon_UltraBall[]; -extern const u8 gItemIconPalette_UltraBall[]; -extern const u8 gItemIcon_GreatBall[]; -extern const u8 gItemIconPalette_GreatBall[]; -extern const u8 gItemIcon_PokeBall[]; -extern const u8 gItemIconPalette_PokeBall[]; -extern const u8 gItemIcon_SafariBall[]; -extern const u8 gItemIconPalette_SafariBall[]; -extern const u8 gItemIcon_NetBall[]; -extern const u8 gItemIconPalette_NetBall[]; -extern const u8 gItemIcon_DiveBall[]; -extern const u8 gItemIconPalette_DiveBall[]; -extern const u8 gItemIcon_NestBall[]; -extern const u8 gItemIconPalette_NestBall[]; -extern const u8 gItemIcon_RepeatBall[]; -extern const u8 gItemIconPalette_RepeatBall[]; -extern const u8 gItemIcon_TimerBall[]; -extern const u8 gItemIcon_LuxuryBall[]; -extern const u8 gItemIconPalette_LuxuryBall[]; -extern const u8 gItemIcon_PremierBall[]; +extern const u32 gItemIcon_MasterBall[]; +extern const u32 gItemIconPalette_MasterBall[]; +extern const u32 gItemIcon_UltraBall[]; +extern const u32 gItemIconPalette_UltraBall[]; +extern const u32 gItemIcon_GreatBall[]; +extern const u32 gItemIconPalette_GreatBall[]; +extern const u32 gItemIcon_PokeBall[]; +extern const u32 gItemIconPalette_PokeBall[]; +extern const u32 gItemIcon_SafariBall[]; +extern const u32 gItemIconPalette_SafariBall[]; +extern const u32 gItemIcon_NetBall[]; +extern const u32 gItemIconPalette_NetBall[]; +extern const u32 gItemIcon_DiveBall[]; +extern const u32 gItemIconPalette_DiveBall[]; +extern const u32 gItemIcon_NestBall[]; +extern const u32 gItemIconPalette_NestBall[]; +extern const u32 gItemIcon_RepeatBall[]; +extern const u32 gItemIconPalette_RepeatBall[]; +extern const u32 gItemIcon_TimerBall[]; +extern const u32 gItemIcon_LuxuryBall[]; +extern const u32 gItemIconPalette_LuxuryBall[]; +extern const u32 gItemIcon_PremierBall[]; // Medicine -extern const u8 gItemIcon_Potion[]; -extern const u8 gItemIconPalette_Potion[]; -extern const u8 gItemIcon_Antidote[]; -extern const u8 gItemIconPalette_Antidote[]; -extern const u8 gItemIcon_StatusHeal[]; -extern const u8 gItemIconPalette_BurnHeal[]; -extern const u8 gItemIconPalette_IceHeal[]; -extern const u8 gItemIconPalette_Awakening[]; -extern const u8 gItemIconPalette_ParalyzeHeal[]; -extern const u8 gItemIcon_LargePotion[]; -extern const u8 gItemIconPalette_FullRestore[]; -extern const u8 gItemIconPalette_MaxPotion[]; -extern const u8 gItemIconPalette_HyperPotion[]; -extern const u8 gItemIconPalette_SuperPotion[]; -extern const u8 gItemIcon_FullHeal[]; -extern const u8 gItemIconPalette_FullHeal[]; -extern const u8 gItemIcon_Revive[]; -extern const u8 gItemIconPalette_Revive[]; -extern const u8 gItemIcon_MaxRevive[]; -extern const u8 gItemIcon_FreshWater[]; -extern const u8 gItemIconPalette_FreshWater[]; -extern const u8 gItemIcon_SodaPop[]; -extern const u8 gItemIconPalette_SodaPop[]; -extern const u8 gItemIcon_Lemonade[]; -extern const u8 gItemIconPalette_Lemonade[]; -extern const u8 gItemIcon_MoomooMilk[]; -extern const u8 gItemIconPalette_MoomooMilk[]; -extern const u8 gItemIcon_Powder[]; -extern const u8 gItemIconPalette_EnergyPowder[]; -extern const u8 gItemIcon_EnergyRoot[]; -extern const u8 gItemIconPalette_EnergyRoot[]; -extern const u8 gItemIconPalette_HealPowder[]; -extern const u8 gItemIcon_RevivalHerb[]; -extern const u8 gItemIconPalette_RevivalHerb[]; -extern const u8 gItemIcon_Ether[]; -extern const u8 gItemIconPalette_Ether[]; -extern const u8 gItemIconPalette_MaxEther[]; -extern const u8 gItemIconPalette_Elixir[]; -extern const u8 gItemIconPalette_MaxElixir[]; -extern const u8 gItemIcon_LavaCookie[]; -extern const u8 gItemIconPalette_LavaCookieAndLetter[]; -extern const u8 gItemIcon_Flute[]; -extern const u8 gItemIconPalette_BlueFlute[]; -extern const u8 gItemIconPalette_YellowFlute[]; -extern const u8 gItemIconPalette_RedFlute[]; -extern const u8 gItemIconPalette_BlackFlute[]; -extern const u8 gItemIconPalette_WhiteFlute[]; -extern const u8 gItemIcon_BerryJuice[]; -extern const u8 gItemIconPalette_BerryJuice[]; -extern const u8 gItemIcon_SacredAsh[]; -extern const u8 gItemIconPalette_SacredAsh[]; +extern const u32 gItemIcon_Potion[]; +extern const u32 gItemIconPalette_Potion[]; +extern const u32 gItemIcon_Antidote[]; +extern const u32 gItemIconPalette_Antidote[]; +extern const u32 gItemIcon_StatusHeal[]; +extern const u32 gItemIconPalette_BurnHeal[]; +extern const u32 gItemIconPalette_IceHeal[]; +extern const u32 gItemIconPalette_Awakening[]; +extern const u32 gItemIconPalette_ParalyzeHeal[]; +extern const u32 gItemIcon_LargePotion[]; +extern const u32 gItemIconPalette_FullRestore[]; +extern const u32 gItemIconPalette_MaxPotion[]; +extern const u32 gItemIconPalette_HyperPotion[]; +extern const u32 gItemIconPalette_SuperPotion[]; +extern const u32 gItemIcon_FullHeal[]; +extern const u32 gItemIconPalette_FullHeal[]; +extern const u32 gItemIcon_Revive[]; +extern const u32 gItemIconPalette_Revive[]; +extern const u32 gItemIcon_MaxRevive[]; +extern const u32 gItemIcon_FreshWater[]; +extern const u32 gItemIconPalette_FreshWater[]; +extern const u32 gItemIcon_SodaPop[]; +extern const u32 gItemIconPalette_SodaPop[]; +extern const u32 gItemIcon_Lemonade[]; +extern const u32 gItemIconPalette_Lemonade[]; +extern const u32 gItemIcon_MoomooMilk[]; +extern const u32 gItemIconPalette_MoomooMilk[]; +extern const u32 gItemIcon_Powder[]; +extern const u32 gItemIconPalette_EnergyPowder[]; +extern const u32 gItemIcon_EnergyRoot[]; +extern const u32 gItemIconPalette_EnergyRoot[]; +extern const u32 gItemIconPalette_HealPowder[]; +extern const u32 gItemIcon_RevivalHerb[]; +extern const u32 gItemIconPalette_RevivalHerb[]; +extern const u32 gItemIcon_Ether[]; +extern const u32 gItemIconPalette_Ether[]; +extern const u32 gItemIconPalette_MaxEther[]; +extern const u32 gItemIconPalette_Elixir[]; +extern const u32 gItemIconPalette_MaxElixir[]; +extern const u32 gItemIcon_LavaCookie[]; +extern const u32 gItemIconPalette_LavaCookieAndLetter[]; +extern const u32 gItemIcon_Flute[]; +extern const u32 gItemIconPalette_BlueFlute[]; +extern const u32 gItemIconPalette_YellowFlute[]; +extern const u32 gItemIconPalette_RedFlute[]; +extern const u32 gItemIconPalette_BlackFlute[]; +extern const u32 gItemIconPalette_WhiteFlute[]; +extern const u32 gItemIcon_BerryJuice[]; +extern const u32 gItemIconPalette_BerryJuice[]; +extern const u32 gItemIcon_SacredAsh[]; +extern const u32 gItemIconPalette_SacredAsh[]; // Collectibles -extern const u8 gItemIconPalette_ShoalSalt[]; -extern const u8 gItemIcon_ShoalShell[]; -extern const u8 gItemIconPalette_Shell[]; -extern const u8 gItemIcon_Shard[]; -extern const u8 gItemIconPalette_RedShard[]; -extern const u8 gItemIconPalette_BlueShard[]; -extern const u8 gItemIconPalette_YellowShard[]; -extern const u8 gItemIconPalette_GreenShard[]; +extern const u32 gItemIconPalette_ShoalSalt[]; +extern const u32 gItemIcon_ShoalShell[]; +extern const u32 gItemIconPalette_Shell[]; +extern const u32 gItemIcon_Shard[]; +extern const u32 gItemIconPalette_RedShard[]; +extern const u32 gItemIconPalette_BlueShard[]; +extern const u32 gItemIconPalette_YellowShard[]; +extern const u32 gItemIconPalette_GreenShard[]; // Vitamins -extern const u8 gItemIcon_HPUp[]; -extern const u8 gItemIconPalette_HPUp[]; -extern const u8 gItemIcon_Vitamin[]; -extern const u8 gItemIconPalette_Protein[]; -extern const u8 gItemIconPalette_Iron[]; -extern const u8 gItemIconPalette_Carbos[]; -extern const u8 gItemIconPalette_Calcium[]; -extern const u8 gItemIcon_RareCandy[]; -extern const u8 gItemIconPalette_RareCandy[]; -extern const u8 gItemIcon_PPUp[]; -extern const u8 gItemIconPalette_PPUp[]; -extern const u8 gItemIconPalette_Zinc[]; -extern const u8 gItemIcon_PPMax[]; -extern const u8 gItemIconPalette_PPMax[]; +extern const u32 gItemIcon_HPUp[]; +extern const u32 gItemIconPalette_HPUp[]; +extern const u32 gItemIcon_Vitamin[]; +extern const u32 gItemIconPalette_Protein[]; +extern const u32 gItemIconPalette_Iron[]; +extern const u32 gItemIconPalette_Carbos[]; +extern const u32 gItemIconPalette_Calcium[]; +extern const u32 gItemIcon_RareCandy[]; +extern const u32 gItemIconPalette_RareCandy[]; +extern const u32 gItemIcon_PPUp[]; +extern const u32 gItemIconPalette_PPUp[]; +extern const u32 gItemIconPalette_Zinc[]; +extern const u32 gItemIcon_PPMax[]; +extern const u32 gItemIconPalette_PPMax[]; // Battle items -extern const u8 gItemIcon_BattleStatItem[]; -extern const u8 gItemIconPalette_GuardSpec[]; -extern const u8 gItemIconPalette_DireHit[]; -extern const u8 gItemIconPalette_XAttack[]; -extern const u8 gItemIconPalette_XDefend[]; -extern const u8 gItemIconPalette_XSpeed[]; -extern const u8 gItemIconPalette_XAccuracy[]; -extern const u8 gItemIconPalette_XSpecial[]; -extern const u8 gItemIcon_PokeDoll[]; -extern const u8 gItemIconPalette_PokeDoll[]; -extern const u8 gItemIcon_FluffyTail[]; -extern const u8 gItemIconPalette_FluffyTail[]; +extern const u32 gItemIcon_BattleStatItem[]; +extern const u32 gItemIconPalette_GuardSpec[]; +extern const u32 gItemIconPalette_DireHit[]; +extern const u32 gItemIconPalette_XAttack[]; +extern const u32 gItemIconPalette_XDefend[]; +extern const u32 gItemIconPalette_XSpeed[]; +extern const u32 gItemIconPalette_XAccuracy[]; +extern const u32 gItemIconPalette_XSpecial[]; +extern const u32 gItemIcon_PokeDoll[]; +extern const u32 gItemIconPalette_PokeDoll[]; +extern const u32 gItemIcon_FluffyTail[]; +extern const u32 gItemIconPalette_FluffyTail[]; // Field items -extern const u8 gItemIcon_Repel[]; -extern const u8 gItemIconPalette_SuperRepel[]; -extern const u8 gItemIconPalette_MaxRepel[]; -extern const u8 gItemIcon_EscapeRope[]; -extern const u8 gItemIconPalette_EscapeRope[]; -extern const u8 gItemIcon_Repel[]; -extern const u8 gItemIconPalette_Repel[]; +extern const u32 gItemIcon_Repel[]; +extern const u32 gItemIconPalette_SuperRepel[]; +extern const u32 gItemIconPalette_MaxRepel[]; +extern const u32 gItemIcon_EscapeRope[]; +extern const u32 gItemIconPalette_EscapeRope[]; +extern const u32 gItemIcon_Repel[]; +extern const u32 gItemIconPalette_Repel[]; // Evolution stones -extern const u8 gItemIcon_SunStone[]; -extern const u8 gItemIconPalette_SunStone[]; -extern const u8 gItemIcon_MoonStone[]; -extern const u8 gItemIconPalette_MoonStone[]; -extern const u8 gItemIcon_FireStone[]; -extern const u8 gItemIconPalette_FireStone[]; -extern const u8 gItemIcon_ThunderStone[]; -extern const u8 gItemIconPalette_ThunderStone[]; -extern const u8 gItemIcon_WaterStone[]; -extern const u8 gItemIconPalette_WaterStone[]; -extern const u8 gItemIcon_LeafStone[]; -extern const u8 gItemIconPalette_LeafStone[]; +extern const u32 gItemIcon_SunStone[]; +extern const u32 gItemIconPalette_SunStone[]; +extern const u32 gItemIcon_MoonStone[]; +extern const u32 gItemIconPalette_MoonStone[]; +extern const u32 gItemIcon_FireStone[]; +extern const u32 gItemIconPalette_FireStone[]; +extern const u32 gItemIcon_ThunderStone[]; +extern const u32 gItemIconPalette_ThunderStone[]; +extern const u32 gItemIcon_WaterStone[]; +extern const u32 gItemIconPalette_WaterStone[]; +extern const u32 gItemIcon_LeafStone[]; +extern const u32 gItemIconPalette_LeafStone[]; // Valuables -extern const u8 gItemIcon_TinyMushroom[]; -extern const u8 gItemIconPalette_Mushroom[]; -extern const u8 gItemIcon_BigMushroom[]; -extern const u8 gItemIcon_Pearl[]; -extern const u8 gItemIconPalette_Pearl[]; -extern const u8 gItemIcon_BigPearl[]; -extern const u8 gItemIcon_Stardust[]; -extern const u8 gItemIconPalette_Star[]; -extern const u8 gItemIcon_StarPiece[]; -extern const u8 gItemIcon_Nugget[]; -extern const u8 gItemIconPalette_Nugget[]; -extern const u8 gItemIcon_HeartScale[]; -extern const u8 gItemIconPalette_HeartScale[]; +extern const u32 gItemIcon_TinyMushroom[]; +extern const u32 gItemIconPalette_Mushroom[]; +extern const u32 gItemIcon_BigMushroom[]; +extern const u32 gItemIcon_Pearl[]; +extern const u32 gItemIconPalette_Pearl[]; +extern const u32 gItemIcon_BigPearl[]; +extern const u32 gItemIcon_Stardust[]; +extern const u32 gItemIconPalette_Star[]; +extern const u32 gItemIcon_StarPiece[]; +extern const u32 gItemIcon_Nugget[]; +extern const u32 gItemIconPalette_Nugget[]; +extern const u32 gItemIcon_HeartScale[]; +extern const u32 gItemIconPalette_HeartScale[]; // Mail -extern const u8 gItemIcon_OrangeMail[]; -extern const u8 gItemIconPalette_OrangeMail[]; -extern const u8 gItemIcon_HarborMail[]; -extern const u8 gItemIconPalette_HarborMail[]; -extern const u8 gItemIcon_GlitterMail[]; -extern const u8 gItemIconPalette_GlitterMail[]; -extern const u8 gItemIcon_MechMail[]; -extern const u8 gItemIconPalette_MechMail[]; -extern const u8 gItemIcon_WoodMail[]; -extern const u8 gItemIconPalette_WoodMail[]; -extern const u8 gItemIcon_WaveMail[]; -extern const u8 gItemIconPalette_WaveMail[]; -extern const u8 gItemIcon_BeadMail[]; -extern const u8 gItemIconPalette_BeadMail[]; -extern const u8 gItemIcon_ShadowMail[]; -extern const u8 gItemIconPalette_ShadowMail[]; -extern const u8 gItemIcon_TropicMail[]; -extern const u8 gItemIconPalette_TropicMail[]; -extern const u8 gItemIcon_DreamMail[]; -extern const u8 gItemIconPalette_DreamMail[]; -extern const u8 gItemIcon_FabMail[]; -extern const u8 gItemIconPalette_FabMail[]; -extern const u8 gItemIcon_RetroMail[]; -extern const u8 gItemIconPalette_RetroMail[]; +extern const u32 gItemIcon_OrangeMail[]; +extern const u32 gItemIconPalette_OrangeMail[]; +extern const u32 gItemIcon_HarborMail[]; +extern const u32 gItemIconPalette_HarborMail[]; +extern const u32 gItemIcon_GlitterMail[]; +extern const u32 gItemIconPalette_GlitterMail[]; +extern const u32 gItemIcon_MechMail[]; +extern const u32 gItemIconPalette_MechMail[]; +extern const u32 gItemIcon_WoodMail[]; +extern const u32 gItemIconPalette_WoodMail[]; +extern const u32 gItemIcon_WaveMail[]; +extern const u32 gItemIconPalette_WaveMail[]; +extern const u32 gItemIcon_BeadMail[]; +extern const u32 gItemIconPalette_BeadMail[]; +extern const u32 gItemIcon_ShadowMail[]; +extern const u32 gItemIconPalette_ShadowMail[]; +extern const u32 gItemIcon_TropicMail[]; +extern const u32 gItemIconPalette_TropicMail[]; +extern const u32 gItemIcon_DreamMail[]; +extern const u32 gItemIconPalette_DreamMail[]; +extern const u32 gItemIcon_FabMail[]; +extern const u32 gItemIconPalette_FabMail[]; +extern const u32 gItemIcon_RetroMail[]; +extern const u32 gItemIconPalette_RetroMail[]; // Berries -extern const u8 gItemIcon_CheriBerry[]; -extern const u8 gItemIconPalette_CheriBerry[]; -extern const u8 gItemIcon_ChestoBerry[]; -extern const u8 gItemIconPalette_ChestoBerry[]; -extern const u8 gItemIcon_PechaBerry[]; -extern const u8 gItemIconPalette_PechaBerry[]; -extern const u8 gItemIcon_RawstBerry[]; -extern const u8 gItemIconPalette_RawstBerry[]; -extern const u8 gItemIcon_AspearBerry[]; -extern const u8 gItemIconPalette_AspearBerry[]; -extern const u8 gItemIcon_LeppaBerry[]; -extern const u8 gItemIconPalette_LeppaBerry[]; -extern const u8 gItemIcon_OranBerry[]; -extern const u8 gItemIconPalette_OranBerry[]; -extern const u8 gItemIcon_PersimBerry[]; -extern const u8 gItemIconPalette_PersimBerry[]; -extern const u8 gItemIcon_LumBerry[]; -extern const u8 gItemIconPalette_LumBerry[]; -extern const u8 gItemIcon_SitrusBerry[]; -extern const u8 gItemIconPalette_SitrusBerry[]; -extern const u8 gItemIcon_FigyBerry[]; -extern const u8 gItemIconPalette_FigyBerry[]; -extern const u8 gItemIcon_WikiBerry[]; -extern const u8 gItemIconPalette_WikiBerry[]; -extern const u8 gItemIcon_MagoBerry[]; -extern const u8 gItemIconPalette_MagoBerry[]; -extern const u8 gItemIcon_AguavBerry[]; -extern const u8 gItemIconPalette_AguavBerry[]; -extern const u8 gItemIcon_IapapaBerry[]; -extern const u8 gItemIconPalette_IapapaBerry[]; -extern const u8 gItemIcon_RazzBerry[]; -extern const u8 gItemIconPalette_RazzBerry[]; -extern const u8 gItemIcon_BlukBerry[]; -extern const u8 gItemIconPalette_BlukBerry[]; -extern const u8 gItemIcon_NanabBerry[]; -extern const u8 gItemIconPalette_NanabBerry[]; -extern const u8 gItemIcon_WepearBerry[]; -extern const u8 gItemIconPalette_WepearBerry[]; -extern const u8 gItemIcon_PinapBerry[]; -extern const u8 gItemIconPalette_PinapBerry[]; -extern const u8 gItemIcon_PomegBerry[]; -extern const u8 gItemIconPalette_PomegBerry[]; -extern const u8 gItemIcon_KelpsyBerry[]; -extern const u8 gItemIconPalette_KelpsyBerry[]; -extern const u8 gItemIcon_QualotBerry[]; -extern const u8 gItemIconPalette_QualotBerry[]; -extern const u8 gItemIcon_HondewBerry[]; -extern const u8 gItemIconPalette_HondewBerry[]; -extern const u8 gItemIcon_GrepaBerry[]; -extern const u8 gItemIconPalette_GrepaBerry[]; -extern const u8 gItemIcon_TamatoBerry[]; -extern const u8 gItemIconPalette_TamatoBerry[]; -extern const u8 gItemIcon_CornnBerry[]; -extern const u8 gItemIconPalette_CornnBerry[]; -extern const u8 gItemIcon_MagostBerry[]; -extern const u8 gItemIconPalette_MagostBerry[]; -extern const u8 gItemIcon_RabutaBerry[]; -extern const u8 gItemIconPalette_RabutaBerry[]; -extern const u8 gItemIcon_NomelBerry[]; -extern const u8 gItemIconPalette_NomelBerry[]; -extern const u8 gItemIcon_SpelonBerry[]; -extern const u8 gItemIconPalette_SpelonBerry[]; -extern const u8 gItemIcon_PamtreBerry[]; -extern const u8 gItemIconPalette_PamtreBerry[]; -extern const u8 gItemIcon_WatmelBerry[]; -extern const u8 gItemIconPalette_WatmelBerry[]; -extern const u8 gItemIcon_DurinBerry[]; -extern const u8 gItemIconPalette_DurinBerry[]; -extern const u8 gItemIcon_BelueBerry[]; -extern const u8 gItemIconPalette_BelueBerry[]; -extern const u8 gItemIcon_LiechiBerry[]; -extern const u8 gItemIconPalette_LiechiBerry[]; -extern const u8 gItemIcon_GanlonBerry[]; -extern const u8 gItemIconPalette_GanlonBerry[]; -extern const u8 gItemIcon_SalacBerry[]; -extern const u8 gItemIconPalette_SalacBerry[]; -extern const u8 gItemIcon_PetayaBerry[]; -extern const u8 gItemIconPalette_PetayaBerry[]; -extern const u8 gItemIcon_ApicotBerry[]; -extern const u8 gItemIconPalette_ApicotBerry[]; -extern const u8 gItemIcon_LansatBerry[]; -extern const u8 gItemIconPalette_LansatBerry[]; -extern const u8 gItemIcon_StarfBerry[]; -extern const u8 gItemIconPalette_StarfBerry[]; -extern const u8 gItemIcon_EnigmaBerry[]; -extern const u8 gItemIconPalette_EnigmaBerry[]; +extern const u32 gItemIcon_CheriBerry[]; +extern const u32 gItemIconPalette_CheriBerry[]; +extern const u32 gItemIcon_ChestoBerry[]; +extern const u32 gItemIconPalette_ChestoBerry[]; +extern const u32 gItemIcon_PechaBerry[]; +extern const u32 gItemIconPalette_PechaBerry[]; +extern const u32 gItemIcon_RawstBerry[]; +extern const u32 gItemIconPalette_RawstBerry[]; +extern const u32 gItemIcon_AspearBerry[]; +extern const u32 gItemIconPalette_AspearBerry[]; +extern const u32 gItemIcon_LeppaBerry[]; +extern const u32 gItemIconPalette_LeppaBerry[]; +extern const u32 gItemIcon_OranBerry[]; +extern const u32 gItemIconPalette_OranBerry[]; +extern const u32 gItemIcon_PersimBerry[]; +extern const u32 gItemIconPalette_PersimBerry[]; +extern const u32 gItemIcon_LumBerry[]; +extern const u32 gItemIconPalette_LumBerry[]; +extern const u32 gItemIcon_SitrusBerry[]; +extern const u32 gItemIconPalette_SitrusBerry[]; +extern const u32 gItemIcon_FigyBerry[]; +extern const u32 gItemIconPalette_FigyBerry[]; +extern const u32 gItemIcon_WikiBerry[]; +extern const u32 gItemIconPalette_WikiBerry[]; +extern const u32 gItemIcon_MagoBerry[]; +extern const u32 gItemIconPalette_MagoBerry[]; +extern const u32 gItemIcon_AguavBerry[]; +extern const u32 gItemIconPalette_AguavBerry[]; +extern const u32 gItemIcon_IapapaBerry[]; +extern const u32 gItemIconPalette_IapapaBerry[]; +extern const u32 gItemIcon_RazzBerry[]; +extern const u32 gItemIconPalette_RazzBerry[]; +extern const u32 gItemIcon_BlukBerry[]; +extern const u32 gItemIconPalette_BlukBerry[]; +extern const u32 gItemIcon_NanabBerry[]; +extern const u32 gItemIconPalette_NanabBerry[]; +extern const u32 gItemIcon_WepearBerry[]; +extern const u32 gItemIconPalette_WepearBerry[]; +extern const u32 gItemIcon_PinapBerry[]; +extern const u32 gItemIconPalette_PinapBerry[]; +extern const u32 gItemIcon_PomegBerry[]; +extern const u32 gItemIconPalette_PomegBerry[]; +extern const u32 gItemIcon_KelpsyBerry[]; +extern const u32 gItemIconPalette_KelpsyBerry[]; +extern const u32 gItemIcon_QualotBerry[]; +extern const u32 gItemIconPalette_QualotBerry[]; +extern const u32 gItemIcon_HondewBerry[]; +extern const u32 gItemIconPalette_HondewBerry[]; +extern const u32 gItemIcon_GrepaBerry[]; +extern const u32 gItemIconPalette_GrepaBerry[]; +extern const u32 gItemIcon_TamatoBerry[]; +extern const u32 gItemIconPalette_TamatoBerry[]; +extern const u32 gItemIcon_CornnBerry[]; +extern const u32 gItemIconPalette_CornnBerry[]; +extern const u32 gItemIcon_MagostBerry[]; +extern const u32 gItemIconPalette_MagostBerry[]; +extern const u32 gItemIcon_RabutaBerry[]; +extern const u32 gItemIconPalette_RabutaBerry[]; +extern const u32 gItemIcon_NomelBerry[]; +extern const u32 gItemIconPalette_NomelBerry[]; +extern const u32 gItemIcon_SpelonBerry[]; +extern const u32 gItemIconPalette_SpelonBerry[]; +extern const u32 gItemIcon_PamtreBerry[]; +extern const u32 gItemIconPalette_PamtreBerry[]; +extern const u32 gItemIcon_WatmelBerry[]; +extern const u32 gItemIconPalette_WatmelBerry[]; +extern const u32 gItemIcon_DurinBerry[]; +extern const u32 gItemIconPalette_DurinBerry[]; +extern const u32 gItemIcon_BelueBerry[]; +extern const u32 gItemIconPalette_BelueBerry[]; +extern const u32 gItemIcon_LiechiBerry[]; +extern const u32 gItemIconPalette_LiechiBerry[]; +extern const u32 gItemIcon_GanlonBerry[]; +extern const u32 gItemIconPalette_GanlonBerry[]; +extern const u32 gItemIcon_SalacBerry[]; +extern const u32 gItemIconPalette_SalacBerry[]; +extern const u32 gItemIcon_PetayaBerry[]; +extern const u32 gItemIconPalette_PetayaBerry[]; +extern const u32 gItemIcon_ApicotBerry[]; +extern const u32 gItemIconPalette_ApicotBerry[]; +extern const u32 gItemIcon_LansatBerry[]; +extern const u32 gItemIconPalette_LansatBerry[]; +extern const u32 gItemIcon_StarfBerry[]; +extern const u32 gItemIconPalette_StarfBerry[]; +extern const u32 gItemIcon_EnigmaBerry[]; +extern const u32 gItemIconPalette_EnigmaBerry[]; // Hold items -extern const u8 gItemIcon_BrightPowder[]; -extern const u8 gItemIconPalette_BrightPowder[]; -extern const u8 gItemIcon_InBattleHerb[]; -extern const u8 gItemIconPalette_WhiteHerb[]; -extern const u8 gItemIcon_MachoBrace[]; -extern const u8 gItemIconPalette_MachoBrace[]; -extern const u8 gItemIcon_ExpShare[]; -extern const u8 gItemIconPalette_ExpShare[]; -extern const u8 gItemIcon_QuickClaw[]; -extern const u8 gItemIconPalette_QuickClaw[]; -extern const u8 gItemIcon_SootheBell[]; -extern const u8 gItemIconPalette_SootheBell[]; -extern const u8 gItemIcon_InBattleHerb[]; -extern const u8 gItemIconPalette_MentalHerb[]; -extern const u8 gItemIcon_ChoiceBand[]; -extern const u8 gItemIconPalette_ChoiceBand[]; -extern const u8 gItemIcon_KingsRock[]; -extern const u8 gItemIconPalette_KingsRock[]; -extern const u8 gItemIcon_SilverPowder[]; -extern const u8 gItemIconPalette_SilverPowder[]; -extern const u8 gItemIcon_AmuletCoin[]; -extern const u8 gItemIconPalette_AmuletCoin[]; -extern const u8 gItemIcon_CleanseTag[]; -extern const u8 gItemIconPalette_CleanseTag[]; -extern const u8 gItemIcon_SoulDew[]; -extern const u8 gItemIconPalette_SoulDew[]; -extern const u8 gItemIcon_DeepSeaTooth[]; -extern const u8 gItemIconPalette_DeepSeaTooth[]; -extern const u8 gItemIcon_DeepSeaScale[]; -extern const u8 gItemIconPalette_DeepSeaScale[]; -extern const u8 gItemIcon_SmokeBall[]; -extern const u8 gItemIconPalette_SmokeBall[]; -extern const u8 gItemIcon_Everstone[]; -extern const u8 gItemIconPalette_Everstone[]; -extern const u8 gItemIcon_FocusBand[]; -extern const u8 gItemIconPalette_FocusBand[]; -extern const u8 gItemIcon_LuckyEgg[]; -extern const u8 gItemIconPalette_LuckyEgg[]; -extern const u8 gItemIcon_ScopeLens[]; -extern const u8 gItemIconPalette_ScopeLens[]; -extern const u8 gItemIcon_MetalCoat[]; -extern const u8 gItemIconPalette_MetalCoat[]; -extern const u8 gItemIcon_Leftovers[]; -extern const u8 gItemIconPalette_Leftovers[]; -extern const u8 gItemIcon_DragonScale[]; -extern const u8 gItemIconPalette_DragonScale[]; -extern const u8 gItemIcon_LightBall[]; -extern const u8 gItemIconPalette_LightBall[]; -extern const u8 gItemIcon_SoftSand[]; -extern const u8 gItemIconPalette_SoftSand[]; -extern const u8 gItemIcon_HardStone[]; -extern const u8 gItemIconPalette_HardStone[]; -extern const u8 gItemIcon_MiracleSeed[]; -extern const u8 gItemIconPalette_MiracleSeed[]; -extern const u8 gItemIcon_BlackGlasses[]; -extern const u8 gItemIconPalette_BlackTypeEnhancingItem[]; -extern const u8 gItemIcon_BlackBelt[]; -extern const u8 gItemIconPalette_BlackTypeEnhancingItem[]; -extern const u8 gItemIcon_Magnet[]; -extern const u8 gItemIconPalette_Magnet[]; -extern const u8 gItemIcon_MysticWater[]; -extern const u8 gItemIconPalette_MysticWater[]; -extern const u8 gItemIcon_SharpBeak[]; -extern const u8 gItemIconPalette_SharpBeak[]; -extern const u8 gItemIcon_PoisonBarb[]; -extern const u8 gItemIconPalette_PoisonBarb[]; -extern const u8 gItemIcon_NeverMeltIce[]; -extern const u8 gItemIconPalette_NeverMeltIce[]; -extern const u8 gItemIcon_SpellTag[]; -extern const u8 gItemIconPalette_SpellTag[]; -extern const u8 gItemIcon_TwistedSpoon[]; -extern const u8 gItemIconPalette_TwistedSpoon[]; -extern const u8 gItemIcon_Charcoal[]; -extern const u8 gItemIconPalette_Charcoal[]; -extern const u8 gItemIcon_DragonFang[]; -extern const u8 gItemIconPalette_DragonFang[]; -extern const u8 gItemIcon_SilkScarf[]; -extern const u8 gItemIconPalette_SilkScarf[]; -extern const u8 gItemIcon_UpGrade[]; -extern const u8 gItemIconPalette_UpGrade[]; -extern const u8 gItemIcon_ShellBell[]; -extern const u8 gItemIconPalette_Shell[]; -extern const u8 gItemIcon_SeaIncense[]; -extern const u8 gItemIconPalette_SeaIncense[]; -extern const u8 gItemIcon_LaxIncense[]; -extern const u8 gItemIconPalette_LaxIncense[]; -extern const u8 gItemIcon_LuckyPunch[]; -extern const u8 gItemIconPalette_LuckyPunch[]; -extern const u8 gItemIcon_MetalPowder[]; -extern const u8 gItemIconPalette_MetalPowder[]; -extern const u8 gItemIcon_ThickClub[]; -extern const u8 gItemIconPalette_ThickClub[]; -extern const u8 gItemIcon_Stick[]; -extern const u8 gItemIconPalette_Stick[]; +extern const u32 gItemIcon_BrightPowder[]; +extern const u32 gItemIconPalette_BrightPowder[]; +extern const u32 gItemIcon_InBattleHerb[]; +extern const u32 gItemIconPalette_WhiteHerb[]; +extern const u32 gItemIcon_MachoBrace[]; +extern const u32 gItemIconPalette_MachoBrace[]; +extern const u32 gItemIcon_ExpShare[]; +extern const u32 gItemIconPalette_ExpShare[]; +extern const u32 gItemIcon_QuickClaw[]; +extern const u32 gItemIconPalette_QuickClaw[]; +extern const u32 gItemIcon_SootheBell[]; +extern const u32 gItemIconPalette_SootheBell[]; +extern const u32 gItemIcon_InBattleHerb[]; +extern const u32 gItemIconPalette_MentalHerb[]; +extern const u32 gItemIcon_ChoiceBand[]; +extern const u32 gItemIconPalette_ChoiceBand[]; +extern const u32 gItemIcon_KingsRock[]; +extern const u32 gItemIconPalette_KingsRock[]; +extern const u32 gItemIcon_SilverPowder[]; +extern const u32 gItemIconPalette_SilverPowder[]; +extern const u32 gItemIcon_AmuletCoin[]; +extern const u32 gItemIconPalette_AmuletCoin[]; +extern const u32 gItemIcon_CleanseTag[]; +extern const u32 gItemIconPalette_CleanseTag[]; +extern const u32 gItemIcon_SoulDew[]; +extern const u32 gItemIconPalette_SoulDew[]; +extern const u32 gItemIcon_DeepSeaTooth[]; +extern const u32 gItemIconPalette_DeepSeaTooth[]; +extern const u32 gItemIcon_DeepSeaScale[]; +extern const u32 gItemIconPalette_DeepSeaScale[]; +extern const u32 gItemIcon_SmokeBall[]; +extern const u32 gItemIconPalette_SmokeBall[]; +extern const u32 gItemIcon_Everstone[]; +extern const u32 gItemIconPalette_Everstone[]; +extern const u32 gItemIcon_FocusBand[]; +extern const u32 gItemIconPalette_FocusBand[]; +extern const u32 gItemIcon_LuckyEgg[]; +extern const u32 gItemIconPalette_LuckyEgg[]; +extern const u32 gItemIcon_ScopeLens[]; +extern const u32 gItemIconPalette_ScopeLens[]; +extern const u32 gItemIcon_MetalCoat[]; +extern const u32 gItemIconPalette_MetalCoat[]; +extern const u32 gItemIcon_Leftovers[]; +extern const u32 gItemIconPalette_Leftovers[]; +extern const u32 gItemIcon_DragonScale[]; +extern const u32 gItemIconPalette_DragonScale[]; +extern const u32 gItemIcon_LightBall[]; +extern const u32 gItemIconPalette_LightBall[]; +extern const u32 gItemIcon_SoftSand[]; +extern const u32 gItemIconPalette_SoftSand[]; +extern const u32 gItemIcon_HardStone[]; +extern const u32 gItemIconPalette_HardStone[]; +extern const u32 gItemIcon_MiracleSeed[]; +extern const u32 gItemIconPalette_MiracleSeed[]; +extern const u32 gItemIcon_BlackGlasses[]; +extern const u32 gItemIconPalette_BlackTypeEnhancingItem[]; +extern const u32 gItemIcon_BlackBelt[]; +extern const u32 gItemIconPalette_BlackTypeEnhancingItem[]; +extern const u32 gItemIcon_Magnet[]; +extern const u32 gItemIconPalette_Magnet[]; +extern const u32 gItemIcon_MysticWater[]; +extern const u32 gItemIconPalette_MysticWater[]; +extern const u32 gItemIcon_SharpBeak[]; +extern const u32 gItemIconPalette_SharpBeak[]; +extern const u32 gItemIcon_PoisonBarb[]; +extern const u32 gItemIconPalette_PoisonBarb[]; +extern const u32 gItemIcon_NeverMeltIce[]; +extern const u32 gItemIconPalette_NeverMeltIce[]; +extern const u32 gItemIcon_SpellTag[]; +extern const u32 gItemIconPalette_SpellTag[]; +extern const u32 gItemIcon_TwistedSpoon[]; +extern const u32 gItemIconPalette_TwistedSpoon[]; +extern const u32 gItemIcon_Charcoal[]; +extern const u32 gItemIconPalette_Charcoal[]; +extern const u32 gItemIcon_DragonFang[]; +extern const u32 gItemIconPalette_DragonFang[]; +extern const u32 gItemIcon_SilkScarf[]; +extern const u32 gItemIconPalette_SilkScarf[]; +extern const u32 gItemIcon_UpGrade[]; +extern const u32 gItemIconPalette_UpGrade[]; +extern const u32 gItemIcon_ShellBell[]; +extern const u32 gItemIconPalette_Shell[]; +extern const u32 gItemIcon_SeaIncense[]; +extern const u32 gItemIconPalette_SeaIncense[]; +extern const u32 gItemIcon_LaxIncense[]; +extern const u32 gItemIconPalette_LaxIncense[]; +extern const u32 gItemIcon_LuckyPunch[]; +extern const u32 gItemIconPalette_LuckyPunch[]; +extern const u32 gItemIcon_MetalPowder[]; +extern const u32 gItemIconPalette_MetalPowder[]; +extern const u32 gItemIcon_ThickClub[]; +extern const u32 gItemIconPalette_ThickClub[]; +extern const u32 gItemIcon_Stick[]; +extern const u32 gItemIconPalette_Stick[]; // Contest hold items -extern const u8 gItemIcon_Scarf[]; -extern const u8 gItemIconPalette_RedScarf[]; -extern const u8 gItemIconPalette_BlueScarf[]; -extern const u8 gItemIconPalette_PinkScarf[]; -extern const u8 gItemIconPalette_GreenScarf[]; -extern const u8 gItemIconPalette_YellowScarf[]; +extern const u32 gItemIcon_Scarf[]; +extern const u32 gItemIconPalette_RedScarf[]; +extern const u32 gItemIconPalette_BlueScarf[]; +extern const u32 gItemIconPalette_PinkScarf[]; +extern const u32 gItemIconPalette_GreenScarf[]; +extern const u32 gItemIconPalette_YellowScarf[]; // Key items -extern const u8 gItemIcon_MachBike[]; -extern const u8 gItemIconPalette_MachBike[]; -extern const u8 gItemIcon_CoinCase[]; -extern const u8 gItemIconPalette_CoinCase[]; -extern const u8 gItemIcon_Itemfinder[]; -extern const u8 gItemIconPalette_Itemfinder[]; -extern const u8 gItemIcon_OldRod[]; -extern const u8 gItemIconPalette_OldRod[]; -extern const u8 gItemIcon_GoodRod[]; -extern const u8 gItemIconPalette_GoodRod[]; -extern const u8 gItemIcon_SuperRod[]; -extern const u8 gItemIconPalette_SuperRod[]; -extern const u8 gItemIcon_SSTicket[]; -extern const u8 gItemIconPalette_SSTicket[]; -extern const u8 gItemIcon_ContestPass[]; -extern const u8 gItemIconPalette_ContestPass[]; -extern const u8 gItemIcon_WailmerPail[]; -extern const u8 gItemIconPalette_WailmerPail[]; -extern const u8 gItemIcon_DevonGoods[]; -extern const u8 gItemIconPalette_DevonGoods[]; -extern const u8 gItemIcon_SootSack[]; -extern const u8 gItemIconPalette_SootSack[]; -extern const u8 gItemIcon_BasementKey[]; -extern const u8 gItemIconPalette_OldKey[]; -extern const u8 gItemIcon_AcroBike[]; -extern const u8 gItemIconPalette_AcroBike[]; -extern const u8 gItemIcon_PokeblockCase[]; -extern const u8 gItemIconPalette_PokeblockCase[]; -extern const u8 gItemIcon_Letter[]; -extern const u8 gItemIcon_EonTicket[]; -extern const u8 gItemIconPalette_EonTicket[]; -extern const u8 gItemIcon_Orb[]; -extern const u8 gItemIconPalette_RedOrb[]; -extern const u8 gItemIconPalette_BlueOrb[]; -extern const u8 gItemIcon_Scanner[]; -extern const u8 gItemIconPalette_Scanner[]; -extern const u8 gItemIcon_GoGoggles[]; -extern const u8 gItemIconPalette_GoGoggles[]; -extern const u8 gItemIcon_Meteorite[]; -extern const u8 gItemIconPalette_Meteorite[]; -extern const u8 gItemIcon_Room1Key[]; -extern const u8 gItemIconPalette_Key[]; -extern const u8 gItemIcon_Room2Key[]; -extern const u8 gItemIcon_Room4Key[]; -extern const u8 gItemIcon_Room6Key[]; -extern const u8 gItemIcon_StorageKey[]; -extern const u8 gItemIcon_RootFossil[]; -extern const u8 gItemIconPalette_HoennFossil[]; -extern const u8 gItemIcon_ClawFossil[]; -extern const u8 gItemIcon_DevonScope[]; -extern const u8 gItemIconPalette_DevonScope[]; +extern const u32 gItemIcon_MachBike[]; +extern const u32 gItemIconPalette_MachBike[]; +extern const u32 gItemIcon_CoinCase[]; +extern const u32 gItemIconPalette_CoinCase[]; +extern const u32 gItemIcon_Itemfinder[]; +extern const u32 gItemIconPalette_Itemfinder[]; +extern const u32 gItemIcon_OldRod[]; +extern const u32 gItemIconPalette_OldRod[]; +extern const u32 gItemIcon_GoodRod[]; +extern const u32 gItemIconPalette_GoodRod[]; +extern const u32 gItemIcon_SuperRod[]; +extern const u32 gItemIconPalette_SuperRod[]; +extern const u32 gItemIcon_SSTicket[]; +extern const u32 gItemIconPalette_SSTicket[]; +extern const u32 gItemIcon_ContestPass[]; +extern const u32 gItemIconPalette_ContestPass[]; +extern const u32 gItemIcon_WailmerPail[]; +extern const u32 gItemIconPalette_WailmerPail[]; +extern const u32 gItemIcon_DevonGoods[]; +extern const u32 gItemIconPalette_DevonGoods[]; +extern const u32 gItemIcon_SootSack[]; +extern const u32 gItemIconPalette_SootSack[]; +extern const u32 gItemIcon_BasementKey[]; +extern const u32 gItemIconPalette_OldKey[]; +extern const u32 gItemIcon_AcroBike[]; +extern const u32 gItemIconPalette_AcroBike[]; +extern const u32 gItemIcon_PokeblockCase[]; +extern const u32 gItemIconPalette_PokeblockCase[]; +extern const u32 gItemIcon_Letter[]; +extern const u32 gItemIcon_EonTicket[]; +extern const u32 gItemIconPalette_EonTicket[]; +extern const u32 gItemIcon_Orb[]; +extern const u32 gItemIconPalette_RedOrb[]; +extern const u32 gItemIconPalette_BlueOrb[]; +extern const u32 gItemIcon_Scanner[]; +extern const u32 gItemIconPalette_Scanner[]; +extern const u32 gItemIcon_GoGoggles[]; +extern const u32 gItemIconPalette_GoGoggles[]; +extern const u32 gItemIcon_Meteorite[]; +extern const u32 gItemIconPalette_Meteorite[]; +extern const u32 gItemIcon_Room1Key[]; +extern const u32 gItemIconPalette_Key[]; +extern const u32 gItemIcon_Room2Key[]; +extern const u32 gItemIcon_Room4Key[]; +extern const u32 gItemIcon_Room6Key[]; +extern const u32 gItemIcon_StorageKey[]; +extern const u32 gItemIcon_RootFossil[]; +extern const u32 gItemIconPalette_HoennFossil[]; +extern const u32 gItemIcon_ClawFossil[]; +extern const u32 gItemIcon_DevonScope[]; +extern const u32 gItemIconPalette_DevonScope[]; // TMs/HMs -extern const u8 gItemIcon_TM[]; -extern const u8 gItemIconPalette_FightingTMHM[]; -extern const u8 gItemIconPalette_DragonTMHM[]; -extern const u8 gItemIconPalette_WaterTMHM[]; -extern const u8 gItemIconPalette_PsychicTMHM[]; -extern const u8 gItemIconPalette_NormalTMHM[]; -extern const u8 gItemIconPalette_PoisonTMHM[]; -extern const u8 gItemIconPalette_IceTMHM[]; -extern const u8 gItemIconPalette_GrassTMHM[]; -extern const u8 gItemIconPalette_FireTMHM[]; -extern const u8 gItemIconPalette_DarkTMHM[]; -extern const u8 gItemIconPalette_SteelTMHM[]; -extern const u8 gItemIconPalette_ElectricTMHM[]; -extern const u8 gItemIconPalette_GroundTMHM[]; -extern const u8 gItemIconPalette_GhostTMHM[]; -extern const u8 gItemIconPalette_RockTMHM[]; -extern const u8 gItemIconPalette_FlyingTMHM[]; -extern const u8 gItemIcon_HM[]; +extern const u32 gItemIcon_TM[]; +extern const u32 gItemIconPalette_FightingTMHM[]; +extern const u32 gItemIconPalette_DragonTMHM[]; +extern const u32 gItemIconPalette_WaterTMHM[]; +extern const u32 gItemIconPalette_PsychicTMHM[]; +extern const u32 gItemIconPalette_NormalTMHM[]; +extern const u32 gItemIconPalette_PoisonTMHM[]; +extern const u32 gItemIconPalette_IceTMHM[]; +extern const u32 gItemIconPalette_GrassTMHM[]; +extern const u32 gItemIconPalette_FireTMHM[]; +extern const u32 gItemIconPalette_DarkTMHM[]; +extern const u32 gItemIconPalette_SteelTMHM[]; +extern const u32 gItemIconPalette_ElectricTMHM[]; +extern const u32 gItemIconPalette_GroundTMHM[]; +extern const u32 gItemIconPalette_GhostTMHM[]; +extern const u32 gItemIconPalette_RockTMHM[]; +extern const u32 gItemIconPalette_FlyingTMHM[]; +extern const u32 gItemIcon_HM[]; // FireRed/LeafGreen key items -extern const u8 gItemIcon_OaksParcel[]; -extern const u8 gItemIconPalette_OaksParcel[]; -extern const u8 gItemIcon_PokeFlute[]; -extern const u8 gItemIconPalette_PokeFlute[]; -extern const u8 gItemIcon_SecretKey[]; -extern const u8 gItemIconPalette_SecretKey[]; -extern const u8 gItemIcon_BikeVoucher[]; -extern const u8 gItemIconPalette_BikeVoucher[]; -extern const u8 gItemIcon_GoldTeeth[]; -extern const u8 gItemIconPalette_GoldTeeth[]; -extern const u8 gItemIcon_OldAmber[]; -extern const u8 gItemIconPalette_OldAmber[]; -extern const u8 gItemIcon_CardKey[]; -extern const u8 gItemIconPalette_CardKey[]; -extern const u8 gItemIcon_LiftKey[]; -extern const u8 gItemIconPalette_Key[]; -extern const u8 gItemIcon_HelixFossil[]; -extern const u8 gItemIconPalette_KantoFossil[]; -extern const u8 gItemIcon_DomeFossil[]; -extern const u8 gItemIcon_SilphScope[]; -extern const u8 gItemIconPalette_SilphScope[]; -extern const u8 gItemIcon_Bicycle[]; -extern const u8 gItemIconPalette_Bicycle[]; -extern const u8 gItemIcon_TownMap[]; -extern const u8 gItemIconPalette_TownMap[]; -extern const u8 gItemIcon_VSSeeker[]; -extern const u8 gItemIconPalette_VSSeeker[]; -extern const u8 gItemIcon_FameChecker[]; -extern const u8 gItemIconPalette_FameChecker[]; -extern const u8 gItemIcon_TMCase[]; -extern const u8 gItemIconPalette_TMCase[]; -extern const u8 gItemIcon_BerryPouch[]; -extern const u8 gItemIconPalette_BerryPouch[]; -extern const u8 gItemIcon_TeachyTV[]; -extern const u8 gItemIconPalette_TeachyTV[]; -extern const u8 gItemIcon_TriPass[]; -extern const u8 gItemIconPalette_TriPass[]; -extern const u8 gItemIcon_RainbowPass[]; -extern const u8 gItemIconPalette_RainbowPass[]; -extern const u8 gItemIcon_Tea[]; -extern const u8 gItemIconPalette_Tea[]; -extern const u8 gItemIcon_MysticTicket[]; -extern const u8 gItemIconPalette_MysticTicket[]; -extern const u8 gItemIcon_AuroraTicket[]; -extern const u8 gItemIconPalette_AuroraTicket[]; -extern const u8 gItemIcon_PowderJar[]; -extern const u8 gItemIconPalette_PowderJar[]; -extern const u8 gItemIcon_Gem[]; -extern const u8 gItemIconPalette_Ruby[]; -extern const u8 gItemIconPalette_Sapphire[]; +extern const u32 gItemIcon_OaksParcel[]; +extern const u32 gItemIconPalette_OaksParcel[]; +extern const u32 gItemIcon_PokeFlute[]; +extern const u32 gItemIconPalette_PokeFlute[]; +extern const u32 gItemIcon_SecretKey[]; +extern const u32 gItemIconPalette_SecretKey[]; +extern const u32 gItemIcon_BikeVoucher[]; +extern const u32 gItemIconPalette_BikeVoucher[]; +extern const u32 gItemIcon_GoldTeeth[]; +extern const u32 gItemIconPalette_GoldTeeth[]; +extern const u32 gItemIcon_OldAmber[]; +extern const u32 gItemIconPalette_OldAmber[]; +extern const u32 gItemIcon_CardKey[]; +extern const u32 gItemIconPalette_CardKey[]; +extern const u32 gItemIcon_LiftKey[]; +extern const u32 gItemIconPalette_Key[]; +extern const u32 gItemIcon_HelixFossil[]; +extern const u32 gItemIconPalette_KantoFossil[]; +extern const u32 gItemIcon_DomeFossil[]; +extern const u32 gItemIcon_SilphScope[]; +extern const u32 gItemIconPalette_SilphScope[]; +extern const u32 gItemIcon_Bicycle[]; +extern const u32 gItemIconPalette_Bicycle[]; +extern const u32 gItemIcon_TownMap[]; +extern const u32 gItemIconPalette_TownMap[]; +extern const u32 gItemIcon_VSSeeker[]; +extern const u32 gItemIconPalette_VSSeeker[]; +extern const u32 gItemIcon_FameChecker[]; +extern const u32 gItemIconPalette_FameChecker[]; +extern const u32 gItemIcon_TMCase[]; +extern const u32 gItemIconPalette_TMCase[]; +extern const u32 gItemIcon_BerryPouch[]; +extern const u32 gItemIconPalette_BerryPouch[]; +extern const u32 gItemIcon_TeachyTV[]; +extern const u32 gItemIconPalette_TeachyTV[]; +extern const u32 gItemIcon_TriPass[]; +extern const u32 gItemIconPalette_TriPass[]; +extern const u32 gItemIcon_RainbowPass[]; +extern const u32 gItemIconPalette_RainbowPass[]; +extern const u32 gItemIcon_Tea[]; +extern const u32 gItemIconPalette_Tea[]; +extern const u32 gItemIcon_MysticTicket[]; +extern const u32 gItemIconPalette_MysticTicket[]; +extern const u32 gItemIcon_AuroraTicket[]; +extern const u32 gItemIconPalette_AuroraTicket[]; +extern const u32 gItemIcon_PowderJar[]; +extern const u32 gItemIconPalette_PowderJar[]; +extern const u32 gItemIcon_Gem[]; +extern const u32 gItemIconPalette_Ruby[]; +extern const u32 gItemIconPalette_Sapphire[]; // Emerald-only key items -extern const u8 gItemIcon_MagmaEmblem[]; -extern const u8 gItemIconPalette_MagmaEmblem[]; -extern const u8 gItemIcon_OldSeaMap[]; -extern const u8 gItemIconPalette_OldSeaMap[]; +extern const u32 gItemIcon_MagmaEmblem[]; +extern const u32 gItemIconPalette_MagmaEmblem[]; +extern const u32 gItemIcon_OldSeaMap[]; +extern const u32 gItemIconPalette_OldSeaMap[]; -extern const u8 gItemIcon_ReturnToFieldArrow[]; -extern const u8 gItemIconPalette_ReturnToFieldArrow[]; +extern const u32 gItemIcon_ReturnToFieldArrow[]; +extern const u32 gItemIconPalette_ReturnToFieldArrow[]; //menu graphics extern const u16 gFireRedMenuElements1_Pal[16]; @@ -3861,149 +3857,149 @@ extern const u16 gFireRedMenuElements3_Pal[16]; extern const u8 gFireRedMenuElements_Gfx[]; // item menu graphics -extern const u8 gBagScreen_Gfx[]; +extern const u32 gBagScreen_Gfx[]; extern const u16 gBagScreenFemale_Pal[]; extern const u16 gBagScreenMale_Pal[]; extern const u8 gBagMenuHMIcon_Gfx[]; // item menu icons graphics -extern const u8 gBagMaleTiles[]; -extern const u8 gBagFemaleTiles[]; -extern const u8 gBagPalette[]; -extern const u8 gBerryCheckCircle_Gfx[]; +extern const u32 gBagMaleTiles[]; +extern const u32 gBagFemaleTiles[]; +extern const u32 gBagPalette[]; +extern const u32 gBerryCheckCircle_Gfx[]; //intro graphics -extern const u8 gIntro1SparkleGfx[]; -extern const u8 gIntro1FlygonGfx[]; +extern const u32 gIntro1SparkleGfx[]; +extern const u32 gIntro1FlygonGfx[]; extern const u16 gIntro3LightningPal[]; -extern const u8 gIntroCopyright_Gfx[]; -extern const u8 gIntroCopyright_Tilemap[]; +extern const u32 gIntroCopyright_Gfx[]; +extern const u32 gIntroCopyright_Tilemap[]; extern const u16 gIntroCopyright_Pal[16]; -extern const u8 gIntro2VolbeatGfx[]; -extern const u8 gIntro2TorchicGfx[]; -extern const u8 gIntro2ManectricGfx[]; +extern const u32 gIntro2VolbeatGfx[]; +extern const u32 gIntro2TorchicGfx[]; +extern const u32 gIntro2ManectricGfx[]; extern const u16 gIntro2VolbeatPal[]; extern const u16 gIntro2TorchicPal[]; extern const u16 gIntro2ManectricPal[]; -extern const u8 gIntro2BubblesGfx[]; +extern const u32 gIntro2BubblesGfx[]; extern const u16 gIntro2BubblesPal[]; -extern const u8 gIntro3LightningGfx[]; -extern const u8 gIntro3GroudonGfx[]; -extern const u8 gIntro3GroudonTilemap[]; -extern const u8 gIntro3LegendBgGfx[]; -extern const u8 gIntro3GroudonBgTilemap[]; -extern const u8 gIntro3GroudonBgTilemap[]; +extern const u32 gIntro3LightningGfx[]; +extern const u32 gIntro3GroudonGfx[]; +extern const u32 gIntro3GroudonTilemap[]; +extern const u32 gIntro3LegendBgGfx[]; +extern const u32 gIntro3GroudonBgTilemap[]; +extern const u32 gIntro3GroudonBgTilemap[]; extern const u8 gIntro3BgPal[0x200]; -extern const u8 gIntro3KyogreGfx[]; -extern const u8 gIntro3KyogreTilemap[]; -extern const u8 gIntro3KyogreBgTilemap[]; -extern const u8 gIntro3CloudsGfx[]; -extern const u8 gIntro3Clouds1Tilemap[]; -extern const u8 gIntro3Clouds2Tilemap[]; -extern const u8 gIntro3Clouds3Tilemap[]; -extern const u8 gIntro3Clouds4Tilemap[]; -extern const u8 gIntro3RayquazaTilemap[]; -extern const u8 gIntro3RayquazaGfx[]; -extern const u8 gIntro3Clouds2Gfx[]; +extern const u32 gIntro3KyogreGfx[]; +extern const u32 gIntro3KyogreTilemap[]; +extern const u32 gIntro3KyogreBgTilemap[]; +extern const u32 gIntro3CloudsGfx[]; +extern const u32 gIntro3Clouds1Tilemap[]; +extern const u32 gIntro3Clouds2Tilemap[]; +extern const u32 gIntro3Clouds3Tilemap[]; +extern const u32 gIntro3Clouds4Tilemap[]; +extern const u32 gIntro3RayquazaTilemap[]; +extern const u32 gIntro3RayquazaGfx[]; +extern const u32 gIntro3Clouds2Gfx[]; extern const u16 gIntro1GameFreakTextFadePal[]; //intro/credits graphics -extern const u8 gIntro2BrendanNoTurnGfx[]; -extern const u8 gIntro2MayNoTurnGfx[]; +extern const u32 gIntro2BrendanNoTurnGfx[]; +extern const u32 gIntro2MayNoTurnGfx[]; extern const u16 gIntro2BrendanNoTurnPal[]; extern const u16 gIntro2FlygonPal[]; -extern const u8 gIntro2FlygonGfx[]; +extern const u32 gIntro2FlygonGfx[]; // berry pics -extern const u8 gBerryPic_Cheri[]; -extern const u8 gBerryPalette_Cheri[]; -extern const u8 gBerryPic_Chesto[]; -extern const u8 gBerryPalette_Chesto[]; -extern const u8 gBerryPic_Pecha[]; -extern const u8 gBerryPalette_Pecha[]; -extern const u8 gBerryPic_Rawst[]; -extern const u8 gBerryPalette_Rawst[]; -extern const u8 gBerryPic_Aspear[]; -extern const u8 gBerryPalette_Aspear[]; -extern const u8 gBerryPic_Leppa[]; -extern const u8 gBerryPalette_Leppa[]; -extern const u8 gBerryPic_Oran[]; -extern const u8 gBerryPalette_Oran[]; -extern const u8 gBerryPic_Persim[]; -extern const u8 gBerryPalette_Persim[]; -extern const u8 gBerryPic_Lum[]; -extern const u8 gBerryPalette_Lum[]; -extern const u8 gBerryPic_Sitrus[]; -extern const u8 gBerryPalette_Sitrus[]; -extern const u8 gBerryPic_Figy[]; -extern const u8 gBerryPalette_Figy[]; -extern const u8 gBerryPic_Wiki[]; -extern const u8 gBerryPalette_Wiki[]; -extern const u8 gBerryPic_Mago[]; -extern const u8 gBerryPalette_Mago[]; -extern const u8 gBerryPic_Aguav[]; -extern const u8 gBerryPalette_Aguav[]; -extern const u8 gBerryPic_Iapapa[]; -extern const u8 gBerryPalette_Iapapa[]; -extern const u8 gBerryPic_Razz[]; -extern const u8 gBerryPalette_Razz[]; -extern const u8 gBerryPic_Bluk[]; -extern const u8 gBerryPalette_Bluk[]; -extern const u8 gBerryPic_Nanab[]; -extern const u8 gBerryPalette_Nanab[]; -extern const u8 gBerryPic_Wepear[]; -extern const u8 gBerryPalette_Wepear[]; -extern const u8 gBerryPic_Pinap[]; -extern const u8 gBerryPalette_Pinap[]; -extern const u8 gBerryPic_Pomeg[]; -extern const u8 gBerryPalette_Pomeg[]; -extern const u8 gBerryPic_Kelpsy[]; -extern const u8 gBerryPalette_Kelpsy[]; -extern const u8 gBerryPic_Qualot[]; -extern const u8 gBerryPalette_Qualot[]; -extern const u8 gBerryPic_Hondew[]; -extern const u8 gBerryPalette_Hondew[]; -extern const u8 gBerryPic_Grepa[]; -extern const u8 gBerryPalette_Grepa[]; -extern const u8 gBerryPic_Tamato[]; -extern const u8 gBerryPalette_Tamato[]; -extern const u8 gBerryPic_Cornn[]; -extern const u8 gBerryPalette_Cornn[]; -extern const u8 gBerryPic_Magost[]; -extern const u8 gBerryPalette_Magost[]; -extern const u8 gBerryPic_Rabuta[]; -extern const u8 gBerryPalette_Rabuta[]; -extern const u8 gBerryPic_Nomel[]; -extern const u8 gBerryPalette_Nomel[]; -extern const u8 gBerryPic_Spelon[]; -extern const u8 gBerryPalette_Spelon[]; -extern const u8 gBerryPic_Pamtre[]; -extern const u8 gBerryPalette_Pamtre[]; -extern const u8 gBerryPic_Watmel[]; -extern const u8 gBerryPalette_Watmel[]; -extern const u8 gBerryPic_Durin[]; -extern const u8 gBerryPalette_Durin[]; -extern const u8 gBerryPic_Belue[]; -extern const u8 gBerryPalette_Belue[]; -extern const u8 gBerryPic_Liechi[]; -extern const u8 gBerryPalette_Liechi[]; -extern const u8 gBerryPic_Ganlon[]; -extern const u8 gBerryPalette_Ganlon[]; -extern const u8 gBerryPic_Salac[]; -extern const u8 gBerryPalette_Salac[]; -extern const u8 gBerryPic_Petaya[]; -extern const u8 gBerryPalette_Petaya[]; -extern const u8 gBerryPic_Apicot[]; -extern const u8 gBerryPalette_Apicot[]; -extern const u8 gBerryPic_Lansat[]; -extern const u8 gBerryPalette_Lansat[]; -extern const u8 gBerryPic_Starf[]; -extern const u8 gBerryPalette_Starf[]; -extern const u8 gBerryPic_Enigma[]; -extern const u8 gBerryPalette_Enigma[]; +extern const u32 gBerryPic_Cheri[]; +extern const u32 gBerryPalette_Cheri[]; +extern const u32 gBerryPic_Chesto[]; +extern const u32 gBerryPalette_Chesto[]; +extern const u32 gBerryPic_Pecha[]; +extern const u32 gBerryPalette_Pecha[]; +extern const u32 gBerryPic_Rawst[]; +extern const u32 gBerryPalette_Rawst[]; +extern const u32 gBerryPic_Aspear[]; +extern const u32 gBerryPalette_Aspear[]; +extern const u32 gBerryPic_Leppa[]; +extern const u32 gBerryPalette_Leppa[]; +extern const u32 gBerryPic_Oran[]; +extern const u32 gBerryPalette_Oran[]; +extern const u32 gBerryPic_Persim[]; +extern const u32 gBerryPalette_Persim[]; +extern const u32 gBerryPic_Lum[]; +extern const u32 gBerryPalette_Lum[]; +extern const u32 gBerryPic_Sitrus[]; +extern const u32 gBerryPalette_Sitrus[]; +extern const u32 gBerryPic_Figy[]; +extern const u32 gBerryPalette_Figy[]; +extern const u32 gBerryPic_Wiki[]; +extern const u32 gBerryPalette_Wiki[]; +extern const u32 gBerryPic_Mago[]; +extern const u32 gBerryPalette_Mago[]; +extern const u32 gBerryPic_Aguav[]; +extern const u32 gBerryPalette_Aguav[]; +extern const u32 gBerryPic_Iapapa[]; +extern const u32 gBerryPalette_Iapapa[]; +extern const u32 gBerryPic_Razz[]; +extern const u32 gBerryPalette_Razz[]; +extern const u32 gBerryPic_Bluk[]; +extern const u32 gBerryPalette_Bluk[]; +extern const u32 gBerryPic_Nanab[]; +extern const u32 gBerryPalette_Nanab[]; +extern const u32 gBerryPic_Wepear[]; +extern const u32 gBerryPalette_Wepear[]; +extern const u32 gBerryPic_Pinap[]; +extern const u32 gBerryPalette_Pinap[]; +extern const u32 gBerryPic_Pomeg[]; +extern const u32 gBerryPalette_Pomeg[]; +extern const u32 gBerryPic_Kelpsy[]; +extern const u32 gBerryPalette_Kelpsy[]; +extern const u32 gBerryPic_Qualot[]; +extern const u32 gBerryPalette_Qualot[]; +extern const u32 gBerryPic_Hondew[]; +extern const u32 gBerryPalette_Hondew[]; +extern const u32 gBerryPic_Grepa[]; +extern const u32 gBerryPalette_Grepa[]; +extern const u32 gBerryPic_Tamato[]; +extern const u32 gBerryPalette_Tamato[]; +extern const u32 gBerryPic_Cornn[]; +extern const u32 gBerryPalette_Cornn[]; +extern const u32 gBerryPic_Magost[]; +extern const u32 gBerryPalette_Magost[]; +extern const u32 gBerryPic_Rabuta[]; +extern const u32 gBerryPalette_Rabuta[]; +extern const u32 gBerryPic_Nomel[]; +extern const u32 gBerryPalette_Nomel[]; +extern const u32 gBerryPic_Spelon[]; +extern const u32 gBerryPalette_Spelon[]; +extern const u32 gBerryPic_Pamtre[]; +extern const u32 gBerryPalette_Pamtre[]; +extern const u32 gBerryPic_Watmel[]; +extern const u32 gBerryPalette_Watmel[]; +extern const u32 gBerryPic_Durin[]; +extern const u32 gBerryPalette_Durin[]; +extern const u32 gBerryPic_Belue[]; +extern const u32 gBerryPalette_Belue[]; +extern const u32 gBerryPic_Liechi[]; +extern const u32 gBerryPalette_Liechi[]; +extern const u32 gBerryPic_Ganlon[]; +extern const u32 gBerryPalette_Ganlon[]; +extern const u32 gBerryPic_Salac[]; +extern const u32 gBerryPalette_Salac[]; +extern const u32 gBerryPic_Petaya[]; +extern const u32 gBerryPalette_Petaya[]; +extern const u32 gBerryPic_Apicot[]; +extern const u32 gBerryPalette_Apicot[]; +extern const u32 gBerryPic_Lansat[]; +extern const u32 gBerryPalette_Lansat[]; +extern const u32 gBerryPic_Starf[]; +extern const u32 gBerryPalette_Starf[]; +extern const u32 gBerryPic_Enigma[]; +extern const u32 gBerryPalette_Enigma[]; //credits -extern const u8 gCreditsCopyrightEnd_Gfx[]; +extern const u32 gCreditsCopyrightEnd_Gfx[]; //pokenav condition marker extern const u8 gPokenavConditionMarker_Gfx[]; @@ -4023,14 +4019,84 @@ extern const u8 gUnknown_08D97D0C[]; extern const u16 gSummaryScreenPowAcc_Tilemap[]; extern const u16 gUnknown_08DC3C34[]; -extern const u8 gMoveTypes_Gfx[]; -extern const u8 gUnknown_08D97BEC[]; -extern const u8 gUnknown_08D97CF4[]; -extern const u8 gStatusGfx_Icons[]; -extern const u8 gStatusPal_Icons[]; +extern const u32 gMoveTypes_Gfx[]; +extern const u32 gUnknown_08D97BEC[]; +extern const u32 gUnknown_08D97CF4[]; +extern const u32 gStatusGfx_Icons[]; +extern const u32 gStatusPal_Icons[]; -extern const u8 gBuyMenuFrame_Gfx[]; +extern const u32 gBuyMenuFrame_Gfx[]; extern const u16 gBuyMenuFrame_Tilemap[]; -extern const u16 gMenuMoneyPal[]; +extern const u32 gMenuMoneyGfx[]; +extern const u32 gMenuMoneyPal[]; + +extern const u32 gBattleInterface_BallStatusBarGfx[]; +extern const u8 gBattleInterface_BallDisplayGfx[]; +extern const u16 gBattleInterface_BallStatusBarPal[]; +extern const u16 gBattleInterface_BallDisplayPal[]; +extern const u8 gHealthboxElementsGfxTable[][32]; + +extern const u16 gNamingScreenMenu_Pal[]; +extern const u32 gNamingScreenMenu_Gfx[]; +extern const u32 gUnknown_08DD4544[]; +extern const u8 gUnknown_08DD4620[]; +extern const u8 gUnknown_08DD46E0[]; +extern const u8 gUnknown_08DD47A0[]; +extern const u8 gNamingScreenRWindow_Gfx[]; +extern const u8 gNamingScreenKeyboardButton_Gfx[]; +extern const u8 gNamingScreenROptions_Gfx[]; +extern const u8 gNamingScreenCursor_Gfx[]; +extern const u8 gNamingScreenRightPointingTriangleTiles[]; +extern const u8 gNamingScreenUnderscoreTiles[]; + +extern const u32 gUnknown_08D9BA44[]; + +extern const u32 gContestConfetti_Gfx[]; +extern const u32 gContestConfetti_Pal[]; + +extern const u32 gUnknown_08C093F0[]; +extern const u32 gSubstituteDollTilemap[]; +extern const u32 gSubstituteDollGfx[]; +extern const u16 gSubstituteDollPal[]; +extern const u32 gHealthboxSinglesPlayerGfx[]; +extern const u32 gHealthboxSinglesOpponentGfx[]; +extern const u32 gHealthboxDoublesPlayerGfx[]; +extern const u32 gHealthboxDoublesOpponentGfx[]; +extern const u32 gHealthboxSafariGfx[]; +extern const u32 gBlankGfxCompressed[]; +extern const u16 gBattleInterface_BallStatusBarPal[]; +extern const u16 gBattleInterface_BallDisplayPal[]; + +extern const u32 gBagSwapLineGfx[]; +extern const u32 gBagSwapLinePal[]; + +extern const u32 gUnknown_08D9ADD0[]; +extern const u32 gUnknown_08D9AE04[]; +extern const u32 gUnknown_08D9AF44[]; +extern const u16 gUnknown_0860F074[]; +extern const u32 gBattleFrontierGfx_PyramidBag[]; + +extern const u32 gTitleScreenEmeraldVersionGfx[]; +extern const u32 gTitleScreenPressStartGfx[]; +extern const u32 gTitleScreenPokemonLogoGfx[]; +extern const u32 gUnknown_08DE0644[]; +extern const u32 gUnknown_08DDE458[]; +extern const u16 gTitleScreenBgPalettes[]; +extern const u16 gTitleScreenPressStartPal[]; +extern const u16 gTitleScreenEmeraldVersionPal[]; + +extern const u32 gUnknown_08D83D50[]; +extern const u32 gUnknown_08D84970[]; +extern const u32 gUnknown_08D84F00[]; +extern const u32 gUnknown_08D85444[]; +extern const u32 gUnknown_08D85358[]; +extern const u32 gUnknown_08D85600[]; +extern const u32 gUnknown_08D854C8[]; +extern const u32 gUnknown_08D82F10[]; +extern const u32 gUnknown_08D834FC[]; +extern const u32 gUnknown_08D83B2C[]; +extern const u32 gUnknown_08D83C3C[]; +extern const u32 gUnknown_08D83900[]; +extern const u32 gBattleFrontierGfx_DomeOptions[]; #endif //GUARD_GRAPHICS_H diff --git a/include/pokemon.h b/include/pokemon.h index 8259e7d34..0155f7430 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -595,8 +595,8 @@ u16 GetBattleBGM(void); void PlayBattleBGM(void); void PlayMapChosenOrBattleBGM(u16 songId); void sub_806E694(u16 songId); -const u8 *GetMonFrontSpritePal(struct Pokemon *mon); -const u8 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality); +const u32 *GetMonFrontSpritePal(struct Pokemon *mon); +const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality); const struct CompressedSpritePalette *GetMonSpritePalStruct(struct Pokemon *mon); const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality); bool32 IsHMMove2(u16 move); diff --git a/include/sprite.h b/include/sprite.h index 4ffcd2884..085faff68 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -6,21 +6,21 @@ struct SpriteSheet { - const u8 *data; // Raw uncompressed pixel data + const void *data; // Raw uncompressed pixel data u16 size; u16 tag; }; struct CompressedSpriteSheet { - const u8 *data; // LZ77 compressed pixel data + const u32 *data; // LZ77 compressed pixel data u16 size; // Uncompressed size of pixel data u16 tag; }; struct SpriteFrameImage { - const u8 *data; + const void *data; u16 size; }; @@ -36,7 +36,7 @@ struct SpritePalette struct CompressedSpritePalette { - const u8 *data; // LZ77 compressed palette data + const u32 *data; // LZ77 compressed palette data u16 tag; }; diff --git a/include/starter_choose.h b/include/starter_choose.h index 18af478aa..535e272b7 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -2,9 +2,9 @@ #define GUARD_STARTER_CHOOSE_H extern const u16 gBirchBagGrassPal[2][16]; -extern const u8 gBirchBagTilemap[]; -extern const u8 gBirchGrassTilemap[]; -extern const u8 gBirchHelpGfx[]; +extern const u32 gBirchBagTilemap[]; +extern const u32 gBirchGrassTilemap[]; +extern const u32 gBirchHelpGfx[]; u16 GetStarterPokemon(u16 chosenStarterId); void CB2_ChooseStarter(void); diff --git a/include/window.h b/include/window.h index 1a6ff3808..29fdf8833 100644 --- a/include/window.h +++ b/include/window.h @@ -55,7 +55,7 @@ void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height); void BlitBitmapToWindow(u8 windowId, const u8 *pixels, u16 x, u16 y, u16 width, u16 height); void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight); void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height); -void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset); +void CopyToWindowPixelBuffer(u8 windowId, const void *src, u16 size, u16 tileOffset); void FillWindowPixelBuffer(u8 windowId, u8 fillValue); void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue); void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8)); -- cgit v1.2.3 From 0ab27e44b14a0dc4523b5bac7fef18312ab4fdde Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 21 Oct 2018 20:13:12 +0200 Subject: more tower, fail --- include/battle.h | 1 + include/battle_tower.h | 2 +- include/constants/battle_frontier.h | 13 +++++++++++++ include/constants/battle_script_commands.h | 7 ++++--- include/global.h | 17 +++++++++-------- 5 files changed, 28 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 87aa2a45b..f34364ea6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -561,6 +561,7 @@ struct BattleScripting u8 field_23; u8 windowsType; // 0 - normal, 1 - battle arena u8 multiplayerId; + u8 specialTrainerBattleType; }; // rom_80A5C6C diff --git a/include/battle_tower.h b/include/battle_tower.h index f79fbb8c4..a47007122 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -58,7 +58,7 @@ bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void PutNewBattleTowerRecord(union BattleTowerRecord *); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); -void ConvertBattleFrontierTrainerSpeechToString(const u16 *words); +void FrontierSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 1cd750a3d..ca110aeb7 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -21,4 +21,17 @@ #define FRONTIER_MODE_MULTIS 2 #define FRONTIER_MODE_LINK_MULTIS 3 +// Special trainer battles. +#define SPECIAL_BATTLE_TOWER 0 +#define SPECIAL_BATTLE_SECRET_BASE 1 +#define SPECIAL_BATTLE_EREADER 2 +#define SPECIAL_BATTLE_DOME 3 +#define SPECIAL_BATTLE_PALACE 4 +#define SPECIAL_BATTLE_ARENA 5 +#define SPECIAL_BATTLE_FACTORY 6 +#define SPECIAL_BATTLE_PIKE_SINGLE 7 +#define SPECIAL_BATTLE_STEVEN 8 +#define SPECIAL_BATTLE_PIKE_DOUBLE 9 +#define SPECIAL_BATTLE_PYRAMID 10 + #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index bd9d8e67d..dc07fda6e 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -11,9 +11,9 @@ #define sB_ANIM_ARG2 gBattleScripting + 0x11 #define sTRIPLE_KICK_POWER gBattleScripting + 0x12 #define sMOVEEND_STATE gBattleScripting + 0x14 -#define sBANK_WITH_ABILITY gBattleScripting + 0x15 +#define sBATTLER_WITH_ABILITY gBattleScripting + 0x15 #define sMULTIHIT_EFFECT gBattleScripting + 0x16 -#define sBANK gBattleScripting + 0x17 +#define sBATTLER gBattleScripting + 0x17 #define sB_ANIM_TURN gBattleScripting + 0x18 #define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19 #define sSTATCHANGER gBattleScripting + 0x1A @@ -26,8 +26,9 @@ #define sRESHOW_MAIN_STATE gBattleScripting + 0x21 #define sRESHOW_HELPER_STATE gBattleScripting + 0x22 #define sFIELD_23 gBattleScripting + 0x23 -#define sFIELD_24 gBattleScripting + 0x24 +#define sWINDOWS_TYPE gBattleScripting + 0x24 #define sMULTIPLAYER_ID gBattleScripting + 0x25 +#define sSPECIAL_TRAINER_BATTLE_TYPE gBattleScripting + 0x26 #define cEFFECT_CHOOSER gBattleCommunication + 3 #define cMULTISTRING_CHOOSER gBattleCommunication + 5 diff --git a/include/global.h b/include/global.h index ef5a944d0..6840d5fe2 100644 --- a/include/global.h +++ b/include/global.h @@ -331,7 +331,8 @@ struct EmeraldBattleTowerRecord /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; /*0x10*/ u16 greeting[6]; - /*0x1C*/ u8 filler_1c[0x18]; + /*0x1C*/ u16 unk1C[6]; + /*0x28*/ u16 unk28[6]; /*0x34*/ struct UnknownPokemonStruct party[4]; /*0xE4*/ u8 language; /*0xE8*/ u32 checksum; @@ -378,8 +379,8 @@ struct BattleDomeTrainer struct BattleFrontier { - /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; - /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // From record mixing. + /*0x64C*/ struct EmeraldBattleTowerRecord towerPlayer; + /*0x738*/ struct EmeraldBattleTowerRecord towerRecords[5]; // From record mixing. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; @@ -397,7 +398,10 @@ struct BattleFrontier /*0xCAA*/ u16 field_CAA[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 battledTrainerIds[20]; + /*0xCB4*/ u16 battledTrainerIds[17]; + u16 field_CD6; + u16 field_CD8; + u16 field_CDA; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 field_CE0[4][2]; /*0xCF0*/ u16 field_CF0[2]; @@ -457,10 +461,7 @@ struct BattleFrontier /*0xEB8*/ u16 frontierBattlePoints; /*0xEBA*/ u8 field_EBA; /*0xEBB*/ u8 field_EBB; - /*0xEBC*/ u8 field_EBC; - /*0xEBD*/ u8 field_EBD; - /*0xEBE*/ u8 field_EBE; - /*0xEBF*/ u8 field_EBF; + /*0xEBC*/ u32 battlesCount; /*0xEC0*/ u16 field_EC0[16]; /*0xEE0*/ u8 field_EE0; /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH + 1]; -- cgit v1.2.3 From 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 21 Oct 2018 15:07:10 -0400 Subject: begin ANIM_TAG port --- include/battle_anim.h | 2 + include/constants/battle_anim.h | 591 ++++++++++++++++++++-------------------- 2 files changed, 294 insertions(+), 299 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 200b9fdb1..63901a2c4 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H +#include "constants/battle_anim.h" + enum { BG_ANIM_SCREEN_SIZE, diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 2b21aad9e..de09255d6 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -7,305 +7,298 @@ // Particle ids. #define ANIM_SPRITES_START 10000 -#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0) -#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) -#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) -#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) -#define ANIM_TAG_004 (ANIM_SPRITES_START + 4) // ? -#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) -#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) -#define ANIM_TAG_007 (ANIM_SPRITES_START + 7) // ? -#define ANIM_TAG_008 (ANIM_SPRITES_START + 8) // ? -#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) -#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) -#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) -#define ANIM_TAG_012 (ANIM_SPRITES_START + 12) // ? -#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) -#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) -#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) -#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) -#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) -#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) -#define ANIM_TAG_019 (ANIM_SPRITES_START + 19) // ? -#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) -#define ANIM_TAG_021 (ANIM_SPRITES_START + 21) // ? -#define ANIM_TAG_022 (ANIM_SPRITES_START + 22) // ? -#define ANIM_TAG_023 (ANIM_SPRITES_START + 23) // ? -#define ANIM_TAG_024 (ANIM_SPRITES_START + 24) // ? -#define ANIM_TAG_025 (ANIM_SPRITES_START + 25) // ? -#define ANIM_TAG_026 (ANIM_SPRITES_START + 26) // ? -#define ANIM_TAG_GLARE (ANIM_SPRITES_START + 27) -#define ANIM_TAG_028 (ANIM_SPRITES_START + 28) // ? -#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) -#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) -#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) -#define ANIM_TAG_032 (ANIM_SPRITES_START + 32) // ? -#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) -#define ANIM_TAG_034 (ANIM_SPRITES_START + 34) // ? -#define ANIM_TAG_035 (ANIM_SPRITES_START + 35) // ? -#define ANIM_TAG_036 (ANIM_SPRITES_START + 36) // ? -#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) -#define ANIM_TAG_038 (ANIM_SPRITES_START + 38) // ? -#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) -#define ANIM_TAG_040 (ANIM_SPRITES_START + 40) // ? -#define ANIM_TAG_041 (ANIM_SPRITES_START + 41) // ? -#define ANIM_TAG_042 (ANIM_SPRITES_START + 42) // ? -#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) -#define ANIM_TAG_044 (ANIM_SPRITES_START + 44) // ? -#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 45) // ? -#define ANIM_TAG_046 (ANIM_SPRITES_START + 46) // ? -#define ANIM_TAG_047 (ANIM_SPRITES_START + 47) // ? -#define ANIM_TAG_048 (ANIM_SPRITES_START + 48) // ? -#define ANIM_TAG_SPARKLE (ANIM_SPRITES_START + 49) -#define ANIM_TAG_050 (ANIM_SPRITES_START + 50) // ? -#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) -#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) -#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) -#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) -#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) -#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) -#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) -#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) -#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) -#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) -#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) -#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) -#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) -#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) -#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) -#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) -#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) -#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) -#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) -#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) -#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) -#define ANIM_TAG_MUSIC_NOTES2 (ANIM_SPRITES_START + 72) -#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) -#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) -#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) -#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) -#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) -#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) -#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) -#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) -#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) -#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) -#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) -#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) -#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) -#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) -#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) -#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) -#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) -#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) -#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) -#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) -#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) -#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) -#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) -#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) -#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) -#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) -#define ANIM_TAG_101 (ANIM_SPRITES_START + 101) -#define ANIM_TAG_102 (ANIM_SPRITES_START + 102) -#define ANIM_TAG_103 (ANIM_SPRITES_START + 103) -#define ANIM_TAG_104 (ANIM_SPRITES_START + 104) -#define ANIM_TAG_105 (ANIM_SPRITES_START + 105) -#define ANIM_TAG_106 (ANIM_SPRITES_START + 106) -#define ANIM_TAG_107 (ANIM_SPRITES_START + 107) -#define ANIM_TAG_108 (ANIM_SPRITES_START + 108) -#define ANIM_TAG_109 (ANIM_SPRITES_START + 109) -#define ANIM_TAG_110 (ANIM_SPRITES_START + 110) -#define ANIM_TAG_111 (ANIM_SPRITES_START + 111) -#define ANIM_TAG_112 (ANIM_SPRITES_START + 112) -#define ANIM_TAG_113 (ANIM_SPRITES_START + 113) -#define ANIM_TAG_114 (ANIM_SPRITES_START + 114) -#define ANIM_TAG_115 (ANIM_SPRITES_START + 115) -#define ANIM_TAG_116 (ANIM_SPRITES_START + 116) -#define ANIM_TAG_117 (ANIM_SPRITES_START + 117) -#define ANIM_TAG_118 (ANIM_SPRITES_START + 118) -#define ANIM_TAG_119 (ANIM_SPRITES_START + 119) -#define ANIM_TAG_ITEM_BAG2 (ANIM_SPRITES_START + 120) -#define ANIM_TAG_121 (ANIM_SPRITES_START + 121) -#define ANIM_TAG_122 (ANIM_SPRITES_START + 122) -#define ANIM_TAG_123 (ANIM_SPRITES_START + 123) -#define ANIM_TAG_124 (ANIM_SPRITES_START + 124) -#define ANIM_TAG_125 (ANIM_SPRITES_START + 125) -#define ANIM_TAG_126 (ANIM_SPRITES_START + 126) -#define ANIM_TAG_127 (ANIM_SPRITES_START + 127) -#define ANIM_TAG_128 (ANIM_SPRITES_START + 128) -#define ANIM_TAG_129 (ANIM_SPRITES_START + 129) -#define ANIM_TAG_130 (ANIM_SPRITES_START + 130) -#define ANIM_TAG_131 (ANIM_SPRITES_START + 131) -#define ANIM_TAG_132 (ANIM_SPRITES_START + 132) -#define ANIM_TAG_133 (ANIM_SPRITES_START + 133) -#define ANIM_TAG_134 (ANIM_SPRITES_START + 134) -#define ANIM_TAG_135 (ANIM_SPRITES_START + 135) -#define ANIM_TAG_136 (ANIM_SPRITES_START + 136) -#define ANIM_TAG_137 (ANIM_SPRITES_START + 137) -#define ANIM_TAG_138 (ANIM_SPRITES_START + 138) -#define ANIM_TAG_139 (ANIM_SPRITES_START + 139) -#define ANIM_TAG_140 (ANIM_SPRITES_START + 140) -#define ANIM_TAG_141 (ANIM_SPRITES_START + 141) -#define ANIM_TAG_142 (ANIM_SPRITES_START + 142) -#define ANIM_TAG_143 (ANIM_SPRITES_START + 143) -#define ANIM_TAG_144 (ANIM_SPRITES_START + 144) -#define ANIM_TAG_145 (ANIM_SPRITES_START + 145) -#define ANIM_TAG_146 (ANIM_SPRITES_START + 146) -#define ANIM_TAG_147 (ANIM_SPRITES_START + 147) -#define ANIM_TAG_148 (ANIM_SPRITES_START + 148) -#define ANIM_TAG_149 (ANIM_SPRITES_START + 149) -#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) -#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) -#define ANIM_TAG_152 (ANIM_SPRITES_START + 152) -#define ANIM_TAG_153 (ANIM_SPRITES_START + 153) -#define ANIM_TAG_154 (ANIM_SPRITES_START + 154) -#define ANIM_TAG_155 (ANIM_SPRITES_START + 155) -#define ANIM_TAG_156 (ANIM_SPRITES_START + 156) -#define ANIM_TAG_157 (ANIM_SPRITES_START + 157) -#define ANIM_TAG_158 (ANIM_SPRITES_START + 158) -#define ANIM_TAG_159 (ANIM_SPRITES_START + 159) -#define ANIM_TAG_160 (ANIM_SPRITES_START + 160) -#define ANIM_TAG_161 (ANIM_SPRITES_START + 161) -#define ANIM_TAG_162 (ANIM_SPRITES_START + 162) -#define ANIM_TAG_163 (ANIM_SPRITES_START + 163) -#define ANIM_TAG_164 (ANIM_SPRITES_START + 164) -#define ANIM_TAG_165 (ANIM_SPRITES_START + 165) -#define ANIM_TAG_166 (ANIM_SPRITES_START + 166) -#define ANIM_TAG_167 (ANIM_SPRITES_START + 167) -#define ANIM_TAG_168 (ANIM_SPRITES_START + 168) -#define ANIM_TAG_169 (ANIM_SPRITES_START + 169) -#define ANIM_TAG_170 (ANIM_SPRITES_START + 170) -#define ANIM_TAG_171 (ANIM_SPRITES_START + 171) -#define ANIM_TAG_172 (ANIM_SPRITES_START + 172) -#define ANIM_TAG_173 (ANIM_SPRITES_START + 173) -#define ANIM_TAG_174 (ANIM_SPRITES_START + 174) -#define ANIM_TAG_175 (ANIM_SPRITES_START + 175) -#define ANIM_TAG_176 (ANIM_SPRITES_START + 176) -#define ANIM_TAG_177 (ANIM_SPRITES_START + 177) -#define ANIM_TAG_178 (ANIM_SPRITES_START + 178) -#define ANIM_TAG_179 (ANIM_SPRITES_START + 179) -#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) -#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) -#define ANIM_TAG_182 (ANIM_SPRITES_START + 182) -#define ANIM_TAG_183 (ANIM_SPRITES_START + 183) -#define ANIM_TAG_184 (ANIM_SPRITES_START + 184) -#define ANIM_TAG_185 (ANIM_SPRITES_START + 185) -#define ANIM_TAG_186 (ANIM_SPRITES_START + 186) -#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) -#define ANIM_TAG_188 (ANIM_SPRITES_START + 188) -#define ANIM_TAG_189 (ANIM_SPRITES_START + 189) -#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) -#define ANIM_TAG_191 (ANIM_SPRITES_START + 191) -#define ANIM_TAG_192 (ANIM_SPRITES_START + 192) -#define ANIM_TAG_193 (ANIM_SPRITES_START + 193) -#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) -#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195) -#define ANIM_TAG_196 (ANIM_SPRITES_START + 196) -#define ANIM_TAG_197 (ANIM_SPRITES_START + 197) -#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) -#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) -#define ANIM_TAG_200 (ANIM_SPRITES_START + 200) -#define ANIM_TAG_201 (ANIM_SPRITES_START + 201) -#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) -#define ANIM_TAG_203 (ANIM_SPRITES_START + 203) -#define ANIM_TAG_204 (ANIM_SPRITES_START + 204) -#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) -#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 206) -#define ANIM_TAG_207 (ANIM_SPRITES_START + 207) -#define ANIM_TAG_208 (ANIM_SPRITES_START + 208) -#define ANIM_TAG_209 (ANIM_SPRITES_START + 209) -#define ANIM_TAG_PURPLE_HEART (ANIM_SPRITES_START + 210) -#define ANIM_TAG_211 (ANIM_SPRITES_START + 211) -#define ANIM_TAG_212 (ANIM_SPRITES_START + 212) -#define ANIM_TAG_213 (ANIM_SPRITES_START + 213) -#define ANIM_TAG_214 (ANIM_SPRITES_START + 214) -#define ANIM_TAG_215 (ANIM_SPRITES_START + 215) -#define ANIM_TAG_216 (ANIM_SPRITES_START + 216) -#define ANIM_TAG_217 (ANIM_SPRITES_START + 217) -#define ANIM_TAG_218 (ANIM_SPRITES_START + 218) -#define ANIM_TAG_219 (ANIM_SPRITES_START + 219) -#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) -#define ANIM_TAG_EVIL_ANGEL (ANIM_SPRITES_START + 221) -#define ANIM_TAG_222 (ANIM_SPRITES_START + 222) -#define ANIM_TAG_223 (ANIM_SPRITES_START + 223) -#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) -#define ANIM_TAG_225 (ANIM_SPRITES_START + 225) -#define ANIM_TAG_226 (ANIM_SPRITES_START + 226) -#define ANIM_TAG_227 (ANIM_SPRITES_START + 227) -#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) -#define ANIM_TAG_229 (ANIM_SPRITES_START + 229) -#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) -#define ANIM_TAG_231 (ANIM_SPRITES_START + 231) -#define ANIM_TAG_232 (ANIM_SPRITES_START + 232) -#define ANIM_TAG_233 (ANIM_SPRITES_START + 233) -#define ANIM_TAG_234 (ANIM_SPRITES_START + 234) -#define ANIM_TAG_235 (ANIM_SPRITES_START + 235) -#define ANIM_TAG_236 (ANIM_SPRITES_START + 236) -#define ANIM_TAG_237 (ANIM_SPRITES_START + 237) -#define ANIM_TAG_238 (ANIM_SPRITES_START + 238) -#define ANIM_TAG_239 (ANIM_SPRITES_START + 239) -#define ANIM_TAG_240 (ANIM_SPRITES_START + 240) -#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) -#define ANIM_TAG_242 (ANIM_SPRITES_START + 242) -#define ANIM_TAG_243 (ANIM_SPRITES_START + 243) -#define ANIM_TAG_244 (ANIM_SPRITES_START + 244) -#define ANIM_TAG_245 (ANIM_SPRITES_START + 245) -#define ANIM_TAG_246 (ANIM_SPRITES_START + 246) -#define ANIM_TAG_HAND (ANIM_SPRITES_START + 247) -#define ANIM_TAG_248 (ANIM_SPRITES_START + 248) -#define ANIM_TAG_249 (ANIM_SPRITES_START + 249) -#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) -#define ANIM_TAG_251 (ANIM_SPRITES_START + 251) -#define ANIM_TAG_252 (ANIM_SPRITES_START + 252) -#define ANIM_TAG_253 (ANIM_SPRITES_START + 253) -#define ANIM_TAG_254 (ANIM_SPRITES_START + 254) -#define ANIM_TAG_255 (ANIM_SPRITES_START + 255) -#define ANIM_TAG_256 (ANIM_SPRITES_START + 256) -#define ANIM_TAG_257 (ANIM_SPRITES_START + 257) -#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) -#define ANIM_TAG_259 (ANIM_SPRITES_START + 259) -#define ANIM_TAG_260 (ANIM_SPRITES_START + 260) -#define ANIM_TAG_261 (ANIM_SPRITES_START + 261) -#define ANIM_TAG_262 (ANIM_SPRITES_START + 262) -#define ANIM_TAG_263 (ANIM_SPRITES_START + 263) -#define ANIM_TAG_264 (ANIM_SPRITES_START + 264) -#define ANIM_TAG_265 (ANIM_SPRITES_START + 265) -#define ANIM_TAG_266 (ANIM_SPRITES_START + 266) -#define ANIM_TAG_267 (ANIM_SPRITES_START + 267) -#define ANIM_TAG_268 (ANIM_SPRITES_START + 268) -#define ANIM_TAG_269 (ANIM_SPRITES_START + 269) -#define ANIM_TAG_270 (ANIM_SPRITES_START + 270) -#define ANIM_TAG_271 (ANIM_SPRITES_START + 271) -#define ANIM_TAG_272 (ANIM_SPRITES_START + 272) -#define ANIM_TAG_273 (ANIM_SPRITES_START + 273) -#define ANIM_TAG_274 (ANIM_SPRITES_START + 274) -#define ANIM_TAG_275 (ANIM_SPRITES_START + 275) -#define ANIM_TAG_276 (ANIM_SPRITES_START + 276) -#define ANIM_TAG_277 (ANIM_SPRITES_START + 277) -#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) -#define ANIM_TAG_279 (ANIM_SPRITES_START + 279) -#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) -#define ANIM_TAG_281 (ANIM_SPRITES_START + 281) -#define ANIM_TAG_282 (ANIM_SPRITES_START + 282) -#define ANIM_TAG_283 (ANIM_SPRITES_START + 283) -#define ANIM_TAG_284 (ANIM_SPRITES_START + 284) -#define ANIM_TAG_285 (ANIM_SPRITES_START + 285) -#define ANIM_TAG_286 (ANIM_SPRITES_START + 286) -#define ANIM_TAG_287 (ANIM_SPRITES_START + 287) -#define ANIM_TAG_288 (ANIM_SPRITES_START + 288) -#define ANIM_TAG_289 (ANIM_SPRITES_START + 289) -#define ANIM_TAG_290 (ANIM_SPRITES_START + 290) -#define ANIM_TAG_291 (ANIM_SPRITES_START + 291) -#define ANIM_TAG_292 (ANIM_SPRITES_START + 292) -#define ANIM_TAG_293 (ANIM_SPRITES_START + 293) -#define ANIM_TAG_294 (ANIM_SPRITES_START + 294) -#define ANIM_TAG_295 (ANIM_SPRITES_START + 295) -#define ANIM_TAG_296 (ANIM_SPRITES_START + 296) -#define ANIM_TAG_297 (ANIM_SPRITES_START + 297) -#define ANIM_TAG_298 (ANIM_SPRITES_START + 298) +#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0) +#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) +#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) +#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) +#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) // ? +#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) +#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) +#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) // rename??? +#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) +#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) +#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) // unused? +#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) +#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) +#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) +#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) +#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) // unused? +#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) +#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) +#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) +#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) // ANIM_TAG_UNUSED_GLASS +#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) +#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) // ANIM_TAG_UNUSED_HIT (_1?) +#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) // ANIM_TAG_UNUSED_HIT_2 +#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) // ANIM_TAG_UNUSED_BLUE_SHARDS +#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) // ANIM_TAG_UNUSED_CLOSING_EYE +#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) // ANIM_TAG_UNUSED_WAVING_HAND +#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // ANIM_TAG_UNUSED_HIT_DUPLICATE +#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) // ANIM_TAG_LEER +#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) // ANIM_TAG_UNUSED_BLUE_BURST +#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) +#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) +#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) +#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) // ANIM_TAG_UNUSED_BUBBLE_BURST +#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) +#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) // ANIM_TAG_UNUSED_SPINNING_FIRE +#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) // ANIM_TAG_FIRE_PLUME +#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) // ANIM_TAG_UNUSED_LIGHTNING +#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) +#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) // ANIM_TAG_UNUSED_CLAW_SLASH +#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) +#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) // ANIM_TAG_UNUSED_SCRATCH +#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) // ANIM_TAG_UNUSED_SCRATCH_2 +#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // ANIM_TAG_UNUSED_BUBBLE_BURST_2 +#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) +#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) // ANIM_TAG_UNUSED_GLASS_2 +#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) // ANIM_TAG_UNUSED_PINK_HEART +#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) // ANIM_TAG_UNUSED_SAP_DRIP +#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // ANIM_TAG_UNUSED_SAP_DRIP_2 +#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) // ANIM_TAG_SPARKLE_1 +#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) // ANIM_TAG_SPARKLE_2 +#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) // ANIM_TAG_HUMANOID_FOOT + +#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT +#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND +#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE +#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK +#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST +#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT +#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING +#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS +#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z +#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2 +#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH +#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS +#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF +#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER +#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER +#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE +#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER +#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE +#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER +#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3 +#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4 +#define ANIM_TAG_MUSIC_NOTES2 (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES +#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) +#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND +#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT +#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES +#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2 +#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK +#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK +#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL +#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE +#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES +#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT +#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2 +#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE +#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH +#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) +#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL +#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE +#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD +#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING +#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE +#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA +#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING +#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL +#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL +#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) +#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB +#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) +#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN +#define ANIM_TAG_101 (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG +#define ANIM_TAG_102 (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG +#define ANIM_TAG_103 (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG +#define ANIM_TAG_104 (ANIM_SPRITES_START + 104) // ANIM_TAG_UNUSED_FANGS +#define ANIM_TAG_105 (ANIM_SPRITES_START + 105) // ANIM_TAG_UNUSED_EXPLOSION_2 +#define ANIM_TAG_106 (ANIM_SPRITES_START + 106) // ANIM_TAG_UNUSED_EXPLOSION_3 +#define ANIM_TAG_107 (ANIM_SPRITES_START + 107) // ANIM_TAG_UNUSED_WATER_DROPLET +#define ANIM_TAG_108 (ANIM_SPRITES_START + 108) // ANIM_TAG_UNUSED_WATER_DROPLET_2 +#define ANIM_TAG_109 (ANIM_SPRITES_START + 109) // ANIM_TAG_UNUSED_SEED +#define ANIM_TAG_110 (ANIM_SPRITES_START + 110) // ANIM_TAG_UNUSED_SPROUT +#define ANIM_TAG_111 (ANIM_SPRITES_START + 111) // ANIM_TAG_UNUSED_RED_WAND +#define ANIM_TAG_112 (ANIM_SPRITES_START + 112) // ANIM_TAG_UNUSED_PURPLE_GREEN_UNK +#define ANIM_TAG_113 (ANIM_SPRITES_START + 113) // ANIM_TAG_UNUSED_WATER_COLUMN +#define ANIM_TAG_114 (ANIM_SPRITES_START + 114) // ANIM_TAG_UNUSED_MUD_UNK +#define ANIM_TAG_115 (ANIM_SPRITES_START + 115) // ANIM_TAG_RAIN_DROPS +#define ANIM_TAG_116 (ANIM_SPRITES_START + 116) // ANIM_TAG_UNUSED_FURY_SWIPES +#define ANIM_TAG_117 (ANIM_SPRITES_START + 117) // ANIM_TAG_UNUSED_VINE_2 +#define ANIM_TAG_118 (ANIM_SPRITES_START + 118) // ANIM_TAG_UNUSED_TEETH +#define ANIM_TAG_119 (ANIM_SPRITES_START + 119) // ANIM_TAG_UNUSED_BONE +#define ANIM_TAG_ITEM_BAG2 (ANIM_SPRITES_START + 120) // ANIM_TAG_UNUSED_WHITE_BAG +#define ANIM_TAG_121 (ANIM_SPRITES_START + 121) // ANIM_TAG_UNUSED_UNKNOWN +#define ANIM_TAG_122 (ANIM_SPRITES_START + 122) // ANIM_TAG_UNUSED_PURPLE_CORAL +#define ANIM_TAG_123 (ANIM_SPRITES_START + 123) // ANIM_TAG_UNUSED_PURPLE_DROPLET +#define ANIM_TAG_124 (ANIM_SPRITES_START + 124) // ANIM_TAG_UNUSED_SHOCK_2 +#define ANIM_TAG_125 (ANIM_SPRITES_START + 125) // ANIM_TAG_UNUSED_CLOSING_EYE_2 +#define ANIM_TAG_126 (ANIM_SPRITES_START + 126) // ANIM_TAG_UNUSED_METAL_BALL +#define ANIM_TAG_127 (ANIM_SPRITES_START + 127) // ANIM_TAG_UNUSED_MONSTER_DOLL +#define ANIM_TAG_128 (ANIM_SPRITES_START + 128) // ANIM_TAG_UNUSED_WHIRLWIND +#define ANIM_TAG_129 (ANIM_SPRITES_START + 129) // ANIM_TAG_UNUSED_WHIRLWIND_2 +#define ANIM_TAG_130 (ANIM_SPRITES_START + 130) // ANIM_TAG_UNUSED_EXPLOSION_4 +#define ANIM_TAG_131 (ANIM_SPRITES_START + 131) // ANIM_TAG_UNUSED_EXPLOSION_5 +#define ANIM_TAG_132 (ANIM_SPRITES_START + 132) // ANIM_TAG_UNUSED_TONGUE +#define ANIM_TAG_133 (ANIM_SPRITES_START + 133) // ANIM_TAG_UNUSED_SMOKE +#define ANIM_TAG_134 (ANIM_SPRITES_START + 134) // ANIM_TAG_UNUSED_SMOKE_2 +#define ANIM_TAG_135 (ANIM_SPRITES_START + 135) // ANIM_TAG_IMPACT +#define ANIM_TAG_136 (ANIM_SPRITES_START + 136) // ANIM_TAG_CIRCLE_IMPACT +#define ANIM_TAG_137 (ANIM_SPRITES_START + 137) // ANIM_TAG_SCRATCH +#define ANIM_TAG_138 (ANIM_SPRITES_START + 138) // ANIM_TAG_CUT +#define ANIM_TAG_139 (ANIM_SPRITES_START + 139) // ANIM_TAG_SHARP_TEETH +#define ANIM_TAG_140 (ANIM_SPRITES_START + 140) // ANIM_TAG_RAINBOW_RINGS +#define ANIM_TAG_141 (ANIM_SPRITES_START + 141) // ANIM_TAG_ICE_CRYSTALS +#define ANIM_TAG_142 (ANIM_SPRITES_START + 142) // ANIM_TAG_ICE_SPIKES +#define ANIM_TAG_143 (ANIM_SPRITES_START + 143) // ANIM_TAG_HANDS_AND_FEET +#define ANIM_TAG_144 (ANIM_SPRITES_START + 144) // ANIM_TAG_MIST_CLOUD +#define ANIM_TAG_145 (ANIM_SPRITES_START + 145) // ANIM_TAG_CLAMP +#define ANIM_TAG_146 (ANIM_SPRITES_START + 146) // ANIM_TAG_BUBBLE +#define ANIM_TAG_147 (ANIM_SPRITES_START + 147) // ANIM_TAG_ORBS +#define ANIM_TAG_148 (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT +#define ANIM_TAG_149 (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB +#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) +#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) +#define ANIM_TAG_152 (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES +#define ANIM_TAG_153 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2 +#define ANIM_TAG_154 (ANIM_SPRITES_START + 154) // ANIM_TAG_AIR_WAVE_2 +#define ANIM_TAG_155 (ANIM_SPRITES_START + 155) // ANIM_TAG_SMALL_BUBBLES +#define ANIM_TAG_156 (ANIM_SPRITES_START + 156) // ANIM_TAG_ROUND_SHADOW +#define ANIM_TAG_157 (ANIM_SPRITES_START + 157) // ANIM_TAG_SUNLIGHT +#define ANIM_TAG_158 (ANIM_SPRITES_START + 158) // ANIM_TAG_SPORE +#define ANIM_TAG_159 (ANIM_SPRITES_START + 159) // ANIM_TAG_FLOWER +#define ANIM_TAG_160 (ANIM_SPRITES_START + 160) // ANIM_TAG_RAZOR_LEAF +#define ANIM_TAG_161 (ANIM_SPRITES_START + 161) // ANIM_TAG_NEEDLE +#define ANIM_TAG_162 (ANIM_SPRITES_START + 162) // ANIM_TAG_WHIRLWIND_LINES +#define ANIM_TAG_163 (ANIM_SPRITES_START + 163) // ANIM_TAG_GOLD_RING +#define ANIM_TAG_164 (ANIM_SPRITES_START + 164) // ANIM_TAG_PURPLE_RING +#define ANIM_TAG_165 (ANIM_SPRITES_START + 165) // ANIM_TAG_BLUE_RING +#define ANIM_TAG_166 (ANIM_SPRITES_START + 166) // ANIM_TAG_GREEN_LIGHT_WALL +#define ANIM_TAG_167 (ANIM_SPRITES_START + 167) // ANIM_TAG_BLUE_LIGHT_WALL +#define ANIM_TAG_168 (ANIM_SPRITES_START + 168) // ANIM_TAG_RED_LIGHT_WALL +#define ANIM_TAG_169 (ANIM_SPRITES_START + 169) // ANIM_TAG_GRAY_LIGHT_WALL +#define ANIM_TAG_170 (ANIM_SPRITES_START + 170) // ANIM_TAG_ORANGE_LIGHT_WALL +#define ANIM_TAG_171 (ANIM_SPRITES_START + 171) // ANIM_TAG_BLACK_BALL_2 +#define ANIM_TAG_172 (ANIM_SPRITES_START + 172) // ANIM_TAG_PURPLE_GAS_CLOUD +#define ANIM_TAG_173 (ANIM_SPRITES_START + 173) // ANIM_TAG_SPARK_H +#define ANIM_TAG_174 (ANIM_SPRITES_START + 174) // ANIM_TAG_YELLOW_STAR +#define ANIM_TAG_175 (ANIM_SPRITES_START + 175) // ANIM_TAG_LARGE_FRESH_EGG +#define ANIM_TAG_176 (ANIM_SPRITES_START + 176) // ANIM_TAG_SHADOW_BALL +#define ANIM_TAG_177 (ANIM_SPRITES_START + 177) // ANIM_TAG_LICK +#define ANIM_TAG_178 (ANIM_SPRITES_START + 178) // ANIM_TAG_UNUSED_VOID_LINES +#define ANIM_TAG_179 (ANIM_SPRITES_START + 179) // ANIM_TAG_STRING +#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) // ANIM_TAG_STRING_DOT +#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) // ANIM_TAG_WEB +#define ANIM_TAG_182 (ANIM_SPRITES_START + 182) // ANIM_TAG_UNUSED_LIGHTBULB +#define ANIM_TAG_183 (ANIM_SPRITES_START + 183) // ANIM_TAG_SLASH +#define ANIM_TAG_184 (ANIM_SPRITES_START + 184) // ANIM_TAG_FOCUS_ENERGY +#define ANIM_TAG_185 (ANIM_SPRITES_START + 185) // ANIM_TAG_SPHERE_TO_CUBE +#define ANIM_TAG_186 (ANIM_SPRITES_START + 186) // ANIM_TAG_TENDRILS +#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) +#define ANIM_TAG_188 (ANIM_SPRITES_START + 188) // ANIM_TAG_WHITE_SHADOW +#define ANIM_TAG_189 (ANIM_SPRITES_START + 189) // ANIM_TAG_TEAL_ALERT +#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) +#define ANIM_TAG_191 (ANIM_SPRITES_START + 191) // ANIM_TAG_ROUND_WHITE_HALO +#define ANIM_TAG_192 (ANIM_SPRITES_START + 192) // ANIM_TAG_FANG_ATTACK +#define ANIM_TAG_193 (ANIM_SPRITES_START + 193) // ANIM_TAG_PURPLE_HAND_OUTLINE +#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) +#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195) // ANIM_TAG_SPARKLE_5 +#define ANIM_TAG_196 (ANIM_SPRITES_START + 196) // ANIM_TAG_SPIRAL +#define ANIM_TAG_197 (ANIM_SPRITES_START + 197) // ANIM_TAG_SNORE_Z +#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) +#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) +#define ANIM_TAG_200 (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT +#define ANIM_TAG_201 (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK +#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) +#define ANIM_TAG_203 (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING +#define ANIM_TAG_204 (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT +#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) +#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 +#define ANIM_TAG_207 (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST +#define ANIM_TAG_208 (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL +#define ANIM_TAG_209 (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE +#define ANIM_TAG_PURPLE_HEART (ANIM_SPRITES_START + 210) // ANIM_TAG_MAGENTA_HEART +#define ANIM_TAG_211 (ANIM_SPRITES_START + 211) // ANIM_TAG_ELECTRIC_ORBS +#define ANIM_TAG_212 (ANIM_SPRITES_START + 212) // ANIM_TAG_CIRCLE_OF_LIGHT +#define ANIM_TAG_213 (ANIM_SPRITES_START + 213) // ANIM_TAG_ELECTRICITY +#define ANIM_TAG_214 (ANIM_SPRITES_START + 214) // ANIM_TAG_FINGER_2 +#define ANIM_TAG_215 (ANIM_SPRITES_START + 215) // ANIM_TAG_MOVEMENT_WAVES +#define ANIM_TAG_216 (ANIM_SPRITES_START + 216) // ANIM_TAG_RED_HEART +#define ANIM_TAG_217 (ANIM_SPRITES_START + 217) // ANIM_TAG_RED_ORB +#define ANIM_TAG_218 (ANIM_SPRITES_START + 218) // ANIM_TAG_EYE_SPARKLE +#define ANIM_TAG_219 (ANIM_SPRITES_START + 219) // ANIM_TAG_PINK_HEART +#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) +#define ANIM_TAG_EVIL_ANGEL (ANIM_SPRITES_START + 221) // ANIM_TAG_DEVIL +#define ANIM_TAG_222 (ANIM_SPRITES_START + 222) // ANIM_TAG_SWIPE +#define ANIM_TAG_223 (ANIM_SPRITES_START + 223) // ANIM_TAG_ROOTS +#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) // ANIM_TAG_ITEM_BAG +#define ANIM_TAG_225 (ANIM_SPRITES_START + 225) // ANIM_TAG_JAGGED_MUSIC_NOTE +#define ANIM_TAG_226 (ANIM_SPRITES_START + 226) // ANIM_TAG_POKEBALL +#define ANIM_TAG_227 (ANIM_SPRITES_START + 227) // ANIM_TAG_SPOTLIGHT +#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) +#define ANIM_TAG_229 (ANIM_SPRITES_START + 229) // ANIM_TAG_RAPID_SPIN +#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) +#define ANIM_TAG_231 (ANIM_SPRITES_START + 231) // ANIM_TAG_WISP_ORB +#define ANIM_TAG_232 (ANIM_SPRITES_START + 232) // ANIM_TAG_WISP_FIRE +#define ANIM_TAG_233 (ANIM_SPRITES_START + 233) // ANIM_TAG_GOLD_STARS +#define ANIM_TAG_234 (ANIM_SPRITES_START + 234) // ANIM_TAG_ECLIPSING_ORB +#define ANIM_TAG_235 (ANIM_SPRITES_START + 235) // ANIM_TAG_GRAY_ORB +#define ANIM_TAG_236 (ANIM_SPRITES_START + 236) // ANIM_TAG_BLUE_ORB +#define ANIM_TAG_237 (ANIM_SPRITES_START + 237) // ANIM_TAG_RED_ORB_2 +#define ANIM_TAG_238 (ANIM_SPRITES_START + 238) // ANIM_TAG_PINK_PETAL +#define ANIM_TAG_239 (ANIM_SPRITES_START + 239) // ANIM_TAG_PAIN_SPLIT +#define ANIM_TAG_240 (ANIM_SPRITES_START + 240) // ANIM_TAG_CONFETTI +#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) +#define ANIM_TAG_242 (ANIM_SPRITES_START + 242) // ANIM_TAG_PINK_CLOUD +#define ANIM_TAG_243 (ANIM_SPRITES_START + 243) // ANIM_TAG_SWEAT_DROP +#define ANIM_TAG_244 (ANIM_SPRITES_START + 244) // ANIM_TAG_GUARD_RING +#define ANIM_TAG_245 (ANIM_SPRITES_START + 245) // ANIM_TAG_PURPLE_SCRATCH +#define ANIM_TAG_246 (ANIM_SPRITES_START + 246) // ANIM_TAG_PURPLE_SWIPE +#define ANIM_TAG_HAND (ANIM_SPRITES_START + 247) // ANIM_TAG_TAG_HAND +#define ANIM_TAG_248 (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE +#define ANIM_TAG_249 (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB +#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) +#define ANIM_TAG_251 (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB +#define ANIM_TAG_252 (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT +#define ANIM_TAG_253 (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME +#define ANIM_TAG_254 (ANIM_SPRITES_START + 254) // ANIM_TAG_RED_BALL +#define ANIM_TAG_255 (ANIM_SPRITES_START + 255) // ANIM_TAG_SMELLINGSALT_EFFECT +#define ANIM_TAG_256 (ANIM_SPRITES_START + 256) // ANIM_TAG_METEOR +#define ANIM_TAG_257 (ANIM_SPRITES_START + 257) // ANIM_TAG_FLAT_ROCK +#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) +#define ANIM_TAG_259 (ANIM_SPRITES_START + 259) // ANIM_TAG_BROWN_ORB +#define ANIM_TAG_260 (ANIM_SPRITES_START + 260) // ANIM_TAG_METAL_SOUND_WAVES +#define ANIM_TAG_261 (ANIM_SPRITES_START + 261) // ANIM_TAG_FLYING_DIRT +#define ANIM_TAG_262 (ANIM_SPRITES_START + 262) // ANIM_TAG_ICICLE_SPEAR +#define ANIM_TAG_263 (ANIM_SPRITES_START + 263) // ANIM_TAG_HAIL +#define ANIM_TAG_264 (ANIM_SPRITES_START + 264) // ANIM_TAG_GLOWY_RED_ORB +#define ANIM_TAG_265 (ANIM_SPRITES_START + 265) // ANIM_TAG_GLOWY_GREEN_ORB +#define ANIM_TAG_266 (ANIM_SPRITES_START + 266) // ANIM_TAG_GREEN_SPIKE +#define ANIM_TAG_267 (ANIM_SPRITES_START + 267) // ANIM_TAG_WHITE_CIRCLE_OF_LIGHT +#define ANIM_TAG_268 (ANIM_SPRITES_START + 268) // ANIM_TAG_GLOWY_BLUE_ORB +#define ANIM_TAG_269 (ANIM_SPRITES_START + 269) // ANIM_TAG_UNUSED_RED_BRICK +#define ANIM_TAG_270 (ANIM_SPRITES_START + 270) // ANIM_TAG_WHITE_FEATHER +#define ANIM_TAG_271 (ANIM_SPRITES_START + 271) // ANIM_TAG_SPARKLE_6 +#define ANIM_TAG_272 (ANIM_SPRITES_START + 272) // ANIM_TAG_SPLASH +#define ANIM_TAG_273 (ANIM_SPRITES_START + 273) // ANIM_TAG_SWEAT_BEAD +#define ANIM_TAG_274 (ANIM_SPRITES_START + 274) // ANIM_TAG_UNUSED_GEM_1 +#define ANIM_TAG_275 (ANIM_SPRITES_START + 275) // ANIM_TAG_UNUSED_GEM_2 +#define ANIM_TAG_276 (ANIM_SPRITES_START + 276) // ANIM_TAG_UNUSED_GEM_3 +#define ANIM_TAG_277 (ANIM_SPRITES_START + 277) // ANIM_TAG_SLAM_HIT_2 +#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) +#define ANIM_TAG_279 (ANIM_SPRITES_START + 279) // ANIM_TAG_UNUSED_RED_PARTICLES +#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) +#define ANIM_TAG_281 (ANIM_SPRITES_START + 281) // ANIM_TAG_DIRT_MOUND +#define ANIM_TAG_282 (ANIM_SPRITES_START + 282) // ANIM_TAG_SHOCK_3 +#define ANIM_TAG_283 (ANIM_SPRITES_START + 283) // ANIM_TAG_WEATHER_BALL +#define ANIM_TAG_284 (ANIM_SPRITES_START + 284) // ANIM_TAG_BIRD +#define ANIM_TAG_285 (ANIM_SPRITES_START + 285) // ANIM_TAG_CROSS_IMPACT +#define ANIM_TAG_286 (ANIM_SPRITES_START + 286) // ANIM_TAG_SLASH_2 +#define ANIM_TAG_287 (ANIM_SPRITES_START + 287) // ANIM_TAG_WHIP_HIT +#define ANIM_TAG_288 (ANIM_SPRITES_START + 288) // ANIM_TAG_BLUE_RING_2 + + // battlers #define ANIM_ATTACKER 0 -- cgit v1.2.3 From f2363f598200236bd9a2a10929073f387a207459 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 21 Oct 2018 19:30:27 -0400 Subject: more tag names --- include/constants/battle_anim.h | 98 +++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 47 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 760822225..1ad375a8f 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -59,56 +59,57 @@ #define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) // ANIM_TAG_SPARKLE_2 #define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) // ANIM_TAG_HUMANOID_FOOT -#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT -#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND -#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE -#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK -#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST -#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT -#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING -#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS -#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z -#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2 -#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH -#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS -#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF -#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER -#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER -#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE -#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER -#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE -#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER -#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3 -#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4 -#define ANIM_TAG_MUSIC_NOTES2 (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES +#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT +#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND +#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE +#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK +#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST +#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT +#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING +#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS +#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z +#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2 +#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH +#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS +#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF +#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER +#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER +#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE +#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER +#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE +#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER +#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3 +#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4 +#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES #define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) -#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND -#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT -#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES -#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2 -#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK -#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK -#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL -#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE -#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES -#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT -#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2 -#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE -#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH +#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND +#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT +#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES +#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2 +#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK +#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK +#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL +#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE +#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES +#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT +#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2 +#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE +#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH #define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL -#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE -#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD -#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING -#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE -#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA -#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING -#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL -#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL +#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL +#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE +#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD +#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING +#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE +#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA +#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING +#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL +#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL #define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB +#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB #define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) -#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN +#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN + #define ANIM_TAG_101 (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG #define ANIM_TAG_102 (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG #define ANIM_TAG_103 (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG @@ -159,6 +160,7 @@ #define ANIM_TAG_148 (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT #define ANIM_TAG_149 (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB #define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) + #define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) #define ANIM_TAG_152 (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES #define ANIM_TAG_153 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2 @@ -209,12 +211,13 @@ #define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) #define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) #define ANIM_TAG_200 (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT + #define ANIM_TAG_201 (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK #define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) #define ANIM_TAG_203 (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING #define ANIM_TAG_204 (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT #define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) -#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 +#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 #define ANIM_TAG_207 (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST #define ANIM_TAG_208 (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL #define ANIM_TAG_209 (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE @@ -259,6 +262,7 @@ #define ANIM_TAG_248 (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE #define ANIM_TAG_249 (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB #define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) + #define ANIM_TAG_251 (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB #define ANIM_TAG_252 (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT #define ANIM_TAG_253 (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME -- cgit v1.2.3 From 2b9fd18dd4a62e872a566b5fc8a8cf178d4a5ca5 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 21 Oct 2018 22:30:20 -0400 Subject: battle_anims.s data to C --- include/graphics.h | 598 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 598 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 8c29dc57c..d17899a9c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4099,4 +4099,602 @@ extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; +extern const u32 gBattleAnimSpriteSheet_000[]; +extern const u32 gBattleAnimSpriteSheet_001[]; +extern const u32 gBattleAnimSpriteSheet_002[]; +extern const u32 gBattleAnimSpriteSheet_003[]; +extern const u32 gBattleAnimSpriteSheet_004[]; +extern const u32 gBattleAnimSpriteSheet_005[]; +extern const u32 gBattleAnimSpriteSheet_006[]; +extern const u32 gBattleAnimSpriteSheet_007[]; +extern const u32 gBattleAnimSpriteSheet_008[]; +extern const u32 gBattleAnimSpriteSheet_009[]; +extern const u32 gBattleAnimSpriteSheet_010[]; +extern const u32 gBattleAnimSpriteSheet_011[]; +extern const u32 gBattleAnimSpriteSheet_012[]; +extern const u32 gBattleAnimSpriteSheet_013[]; +extern const u32 gBattleAnimSpriteSheet_014[]; +extern const u32 gBattleAnimSpriteSheet_015[]; +extern const u32 gBattleAnimSpriteSheet_016[]; +extern const u32 gBattleAnimSpriteSheet_017[]; +extern const u32 gBattleAnimSpriteSheet_018[]; +extern const u32 gBattleAnimSpriteSheet_019[]; +extern const u32 gBattleAnimSpriteSheet_020[]; +extern const u32 gBattleAnimSpriteSheet_021[]; +extern const u32 gBattleAnimSpriteSheet_021[]; +extern const u32 gBattleAnimSpriteSheet_023[]; +extern const u32 gBattleAnimSpriteSheet_024[]; +extern const u32 gBattleAnimSpriteSheet_025[]; +extern const u32 gBattleAnimSpriteSheet_026[]; +extern const u32 gBattleAnimSpriteSheet_027[]; +extern const u32 gBattleAnimSpriteSheet_028[]; +extern const u32 gBattleAnimSpriteSheet_029[]; +extern const u32 gBattleAnimSpriteSheet_030[]; +extern const u32 gBattleAnimSpriteSheet_031[]; +extern const u32 gBattleAnimSpriteSheet_032[]; +extern const u32 gBattleAnimSpriteSheet_033[]; +extern const u32 gBattleAnimSpriteSheet_034[]; +extern const u32 gBattleAnimSpriteSheet_035[]; +extern const u32 gBattleAnimSpriteSheet_036[]; +extern const u32 gBattleAnimSpriteSheet_037[]; +extern const u32 gBattleAnimSpriteSheet_038[]; +extern const u32 gBattleAnimSpriteSheet_039[]; +extern const u32 gBattleAnimSpriteSheet_040[]; +extern const u32 gBattleAnimSpriteSheet_041[]; +extern const u32 gBattleAnimSpriteSheet_042[]; +extern const u32 gBattleAnimSpriteSheet_043[]; +extern const u32 gBattleAnimSpriteSheet_044[]; +extern const u32 gBattleAnimSpriteSheet_045[]; +extern const u32 gBattleAnimSpriteSheet_046[]; +extern const u32 gBattleAnimSpriteSheet_046[]; +extern const u32 gBattleAnimSpriteSheet_048[]; +extern const u32 gBattleAnimSpriteSheet_048[]; +extern const u32 gBattleAnimSpriteSheet_050[]; +extern const u32 gBattleAnimSpriteSheet_051[]; +extern const u32 gBattleAnimSpriteSheet_052[]; +extern const u32 gBattleAnimSpriteSheet_053[]; +extern const u32 gBattleAnimSpriteSheet_054[]; +extern const u32 gBattleAnimSpriteSheet_055[]; +extern const u32 gBattleAnimSpriteSheet_056[]; +extern const u32 gBattleAnimSpriteSheet_057[]; +extern const u32 gBattleAnimSpriteSheet_058[]; +extern const u32 gBattleAnimSpriteSheet_059[]; +extern const u32 gBattleAnimSpriteSheet_060[]; +extern const u32 gBattleAnimSpriteSheet_061[]; +extern const u32 gBattleAnimSpriteSheet_062[]; +extern const u32 gBattleAnimSpriteSheet_063[]; +extern const u32 gBattleAnimSpriteSheet_064[]; +extern const u32 gBattleAnimSpriteSheet_065[]; +extern const u32 gBattleAnimSpriteSheet_066[]; +extern const u32 gBattleAnimSpriteSheet_070[]; +extern const u32 gBattleAnimSpriteSheet_071[]; +extern const u32 gBattleAnimSpriteSheet_072[]; +extern const u32 gBattleAnimSpriteSheet_073[]; +extern const u32 gBattleAnimSpriteSheet_074[]; +extern const u32 gBattleAnimSpriteSheet_075[]; +extern const u32 gBattleAnimSpriteSheet_076[]; +extern const u32 gBattleAnimSpriteSheet_077[]; +extern const u32 gBattleAnimSpriteSheet_078[]; +extern const u32 gBattleAnimSpriteSheet_079[]; +extern const u32 gBattleAnimSpriteSheet_080[]; +extern const u32 gBattleAnimSpriteSheet_081[]; +extern const u32 gBattleAnimSpriteSheet_082[]; +extern const u32 gBattleAnimSpriteSheet_083[]; +extern const u32 gBattleAnimSpriteSheet_084[]; +extern const u32 gBattleAnimSpriteSheet_085[]; +extern const u32 gBattleAnimSpriteSheet_086[]; +extern const u32 gBattleAnimSpriteSheet_087[]; +extern const u32 gBattleAnimSpriteSheet_088[]; +extern const u32 gBattleAnimSpriteSheet_089[]; +extern const u32 gBattleAnimSpriteSheet_090[]; +extern const u32 gBattleAnimSpriteSheet_091[]; +extern const u32 gBattleAnimSpriteSheet_092[]; +extern const u32 gBattleAnimSpriteSheet_093[]; +extern const u32 gBattleAnimSpriteSheet_094[]; +extern const u32 gBattleAnimSpriteSheet_095[]; +extern const u32 gBattleAnimSpriteSheet_096[]; +extern const u32 gBattleAnimSpriteSheet_097[]; +extern const u32 gBattleAnimSpriteSheet_098[]; +extern const u32 gBattleAnimSpriteSheet_099[]; +extern const u32 gBattleAnimSpriteSheet_100[]; +extern const u32 gBattleAnimSpriteSheet_101[]; +extern const u32 gBattleAnimSpriteSheet_102[]; +extern const u32 gBattleAnimSpriteSheet_103[]; +extern const u32 gBattleAnimSpriteSheet_104[]; +extern const u32 gBattleAnimSpriteSheet_105[]; +extern const u32 gBattleAnimSpriteSheet_106[]; +extern const u32 gBattleAnimSpriteSheet_107[]; +extern const u32 gBattleAnimSpriteSheet_108[]; +extern const u32 gBattleAnimSpriteSheet_109[]; +extern const u32 gBattleAnimSpriteSheet_110[]; +extern const u32 gBattleAnimSpriteSheet_111[]; +extern const u32 gBattleAnimSpriteSheet_112[]; +extern const u32 gBattleAnimSpriteSheet_113[]; +extern const u32 gBattleAnimSpriteSheet_114[]; +extern const u32 gBattleAnimSpriteSheet_115[]; +extern const u32 gBattleAnimSpriteSheet_116[]; +extern const u32 gBattleAnimSpriteSheet_117[]; +extern const u32 gBattleAnimSpriteSheet_118[]; +extern const u32 gBattleAnimSpriteSheet_119[]; +extern const u32 gBattleAnimSpriteSheet_120[]; +extern const u32 gBattleAnimSpriteSheet_121[]; +extern const u32 gBattleAnimSpriteSheet_122[]; +extern const u32 gBattleAnimSpriteSheet_123[]; +extern const u32 gBattleAnimSpriteSheet_124[]; +extern const u32 gBattleAnimSpriteSheet_125[]; +extern const u32 gBattleAnimSpriteSheet_126[]; +extern const u32 gBattleAnimSpriteSheet_127[]; +extern const u32 gBattleAnimSpriteSheet_128[]; +extern const u32 gBattleAnimSpriteSheet_129[]; +extern const u32 gBattleAnimSpriteSheet_130[]; +extern const u32 gBattleAnimSpriteSheet_131[]; +extern const u32 gBattleAnimSpriteSheet_132[]; +extern const u32 gBattleAnimSpriteSheet_133[]; +extern const u32 gBattleAnimSpriteSheet_134[]; +extern const u32 gBattleAnimSpriteSheet_135[]; +extern const u32 gBattleAnimSpriteSheet_136[]; +extern const u32 gBattleAnimSpriteSheet_137[]; +extern const u32 gBattleAnimSpriteSheet_138[]; +extern const u32 gBattleAnimSpriteSheet_139[]; +extern const u32 gBattleAnimSpriteSheet_140[]; +extern const u32 gBattleAnimSpriteSheet_141[]; +extern const u32 gBattleAnimSpriteSheet_142[]; +extern const u32 gBattleAnimSpriteSheet_143[]; +extern const u32 gBattleAnimSpriteSheet_144[]; +extern const u32 gBattleAnimSpriteSheet_145[]; +//extern const struct CompressedSpriteSheet gBattleAnimSpriteSheet_146[]; +extern const u32 gBattleAnimSpriteSheet_146[]; +extern const u32 gBattleAnimSpriteSheet_147[]; +extern const u32 gBattleAnimSpriteSheet_148[]; +extern const u32 gBattleAnimSpriteSheet_149[]; +extern const u32 gBattleAnimSpriteSheet_150[]; +extern const u32 gBattleAnimSpriteSheet_151[]; +extern const u32 gBattleAnimSpriteSheet_152[]; +extern const u32 gBattleAnimSpriteSheet_153[]; +extern const u32 gBattleAnimSpriteSheet_154[]; +extern const u32 gBattleAnimSpriteSheet_155[]; +extern const u32 gBattleAnimSpriteSheet_156[]; +extern const u32 gBattleAnimSpriteSheet_157[]; +extern const u32 gBattleAnimSpriteSheet_158[]; +extern const u32 gBattleAnimSpriteSheet_159[]; +extern const u32 gBattleAnimSpriteSheet_160[]; +extern const u32 gBattleAnimSpriteSheet_161[]; +extern const u32 gBattleAnimSpriteSheet_162[]; +extern const u32 gBattleAnimSpriteSheet_163[]; +extern const u32 gBattleAnimSpriteSheet_166[]; +extern const u32 gBattleAnimSpriteSheet_171[]; +extern const u32 gBattleAnimSpriteSheet_173[]; +extern const u32 gBattleAnimSpriteSheet_174[]; +extern const u32 gBattleAnimSpriteSheet_175[]; +extern const u32 gBattleAnimSpriteSheet_176[]; +extern const u32 gBattleAnimSpriteSheet_177[]; +extern const u32 gBattleAnimSpriteSheet_178[]; +extern const u32 gBattleAnimSpriteSheet_179[]; +extern const u32 gBattleAnimSpriteSheet_180[]; +extern const u32 gBattleAnimSpriteSheet_181[]; +extern const u32 gBattleAnimSpriteSheet_182[]; +extern const u32 gBattleAnimSpriteSheet_183[]; +extern const u32 gBattleAnimSpriteSheet_184[]; +extern const u32 gBattleAnimSpriteSheet_185[]; +extern const u32 gBattleAnimSpriteSheet_186[]; +extern const u32 gBattleAnimSpriteSheet_187[]; +extern const u32 gBattleAnimSpriteSheet_188[]; +extern const u32 gBattleAnimSpriteSheet_189[]; +extern const u32 gBattleAnimSpriteSheet_190[]; +extern const u32 gBattleAnimSpriteSheet_191[]; +extern const u32 gBattleAnimSpriteSheet_192[]; +extern const u32 gBattleAnimSpriteSheet_193[]; +extern const u32 gBattleAnimSpriteSheet_194[]; +extern const u32 gBattleAnimSpriteSheet_195[]; +extern const u32 gBattleAnimSpriteSheet_196[]; +extern const u32 gBattleAnimSpriteSheet_197[]; +extern const u32 gBattleAnimSpriteSheet_198[]; +extern const u32 gBattleAnimSpriteSheet_199[]; +extern const u32 gBattleAnimSpriteSheet_200[]; +extern const u32 gBattleAnimSpriteSheet_201[]; +extern const u32 gBattleAnimSpriteSheet_202[]; +extern const u32 gBattleAnimSpriteSheet_203[]; +extern const u32 gBattleAnimSpriteSheet_204[]; +extern const u32 gBattleAnimSpriteSheet_205[]; +extern const u32 gBattleAnimSpriteSheet_206[]; +extern const u32 gBattleAnimSpriteSheet_207[]; +extern const u32 gBattleAnimSpriteSheet_208[]; +extern const u32 gBattleAnimSpriteSheet_209[]; +extern const u32 gBattleAnimSpriteSheet_210[]; +extern const u32 gBattleAnimSpriteSheet_211[]; +extern const u32 gBattleAnimSpriteSheet_212[]; +extern const u32 gBattleAnimSpriteSheet_213[]; +extern const u32 gBattleAnimSpriteSheet_214[]; +extern const u32 gBattleAnimSpriteSheet_215[]; +extern const u32 gBattleAnimSpriteSheet_210[]; +extern const u32 gBattleAnimSpriteSheet_217[]; +extern const u32 gBattleAnimSpriteSheet_218[]; +extern const u32 gBattleAnimSpriteSheet_210[]; +extern const u32 gBattleAnimSpriteSheet_220[]; +extern const u32 gBattleAnimSpriteSheet_221[]; +extern const u32 gBattleAnimSpriteSheet_222[]; +extern const u32 gBattleAnimSpriteSheet_223[]; +extern const u32 gBattleAnimSpriteSheet_224[]; +extern const u32 gBattleAnimSpriteSheet_225[]; +extern const u32 gBattleAnimSpriteSheet_226[]; +extern const u32 gBattleAnimSpriteSheet_227[]; +extern const u32 gBattleAnimSpriteSheet_228[]; +extern const u32 gBattleAnimSpriteSheet_229[]; +extern const u32 gBattleAnimSpriteSheet_230[]; +extern const u32 gBattleAnimSpriteSheet_231[]; +extern const u32 gBattleAnimSpriteSheet_232[]; +extern const u32 gBattleAnimSpriteSheet_233[]; +extern const u32 gBattleAnimSpriteSheet_234[]; +extern const u32 gBattleAnimSpriteSheet_235[]; +extern const u32 gBattleAnimSpriteSheet_235[]; +extern const u32 gBattleAnimSpriteSheet_235[]; +extern const u32 gBattleAnimSpriteSheet_238[]; +extern const u32 gBattleAnimSpriteSheet_239[]; +extern const u32 gBattleAnimSpriteSheet_240[]; +extern const u32 gBattleAnimSpriteSheet_241[]; +extern const u32 gBattleAnimSpriteSheet_242[]; +extern const u32 gBattleAnimSpriteSheet_243[]; +extern const u32 gBattleAnimSpriteSheet_244[]; +extern const u32 gBattleAnimSpriteSheet_245[]; +extern const u32 gBattleAnimSpriteSheet_246[]; +extern const u32 gBattleAnimSpriteSheet_247[]; +extern const u32 gBattleAnimSpriteSheet_248[]; +extern const u32 gBattleAnimSpriteSheet_249[]; +extern const u32 gBattleAnimSpriteSheet_250[]; +extern const u32 gBattleAnimSpriteSheet_251[]; +extern const u32 gBattleAnimSpriteSheet_252[]; +extern const u32 gBattleAnimSpriteSheet_253[]; +extern const u32 gBattleAnimSpriteSheet_254[]; +extern const u32 gBattleAnimSpriteSheet_255[]; +extern const u32 gBattleAnimSpriteSheet_256[]; +extern const u32 gBattleAnimSpriteSheet_257[]; +extern const u32 gBattleAnimSpriteSheet_258[]; +extern const u32 gBattleAnimSpriteSheet_260[]; +extern const u32 gBattleAnimSpriteSheet_261[]; +extern const u32 gBattleAnimSpriteSheet_262[]; +extern const u32 gBattleAnimSpriteSheet_263[]; +extern const u32 gBattleAnimSpriteSheet_264[]; +extern const u32 gBattleAnimSpriteSheet_266[]; +extern const u32 gBattleAnimSpriteSheet_269[]; +extern const u32 gBattleAnimSpriteSheet_270[]; +extern const u32 gBattleAnimSpriteSheet_271[]; +extern const u32 gBattleAnimSpriteSheet_272[]; +extern const u32 gBattleAnimSpriteSheet_273[]; +extern const u32 gBattleAnimSpriteSheet_274[]; +extern const u32 gBattleAnimSpriteSheet_275[]; +extern const u32 gBattleAnimSpriteSheet_276[]; +extern const u32 gBattleAnimSpriteSheet_277[]; +extern const u32 gBattleAnimSpriteSheet_278[]; +extern const u32 gBattleAnimSpriteSheet_279[]; +extern const u32 gBattleAnimSpriteSheet_280[]; +extern const u32 gBattleAnimSpriteSheet_281[]; +extern const u32 gBattleAnimSpriteSheet_282[]; +extern const u32 gBattleAnimSpriteSheet_283[]; +extern const u32 gBattleAnimSpriteSheet_284[]; +extern const u32 gBattleAnimSpriteSheet_285[]; + +extern const u32 gBattleAnimSpritePalette_000[]; +extern const u32 gBattleAnimSpritePalette_001[]; +extern const u32 gBattleAnimSpritePalette_002[]; +extern const u32 gBattleAnimSpritePalette_003[]; +extern const u32 gBattleAnimSpritePalette_004[]; +extern const u32 gBattleAnimSpritePalette_005[]; +extern const u32 gBattleAnimSpritePalette_006[]; +extern const u32 gBattleAnimSpritePalette_007[]; +extern const u32 gBattleAnimSpritePalette_008[]; +extern const u32 gBattleAnimSpritePalette_009[]; +extern const u32 gBattleAnimSpritePalette_010[]; +extern const u32 gBattleAnimSpritePalette_011[]; +extern const u32 gBattleAnimSpritePalette_012[]; +extern const u32 gBattleAnimSpritePalette_013[]; +extern const u32 gBattleAnimSpritePalette_014[]; +extern const u32 gBattleAnimSpritePalette_015[]; +extern const u32 gBattleAnimSpritePalette_016[]; +extern const u32 gBattleAnimSpritePalette_016[]; +extern const u32 gBattleAnimSpritePalette_018[]; +extern const u32 gBattleAnimSpritePalette_019[]; +extern const u32 gBattleAnimSpritePalette_020[]; +extern const u32 gBattleAnimSpritePalette_021[]; +extern const u32 gBattleAnimSpritePalette_022[]; +extern const u32 gBattleAnimSpritePalette_023[]; +extern const u32 gBattleAnimSpritePalette_024[]; +extern const u32 gBattleAnimSpritePalette_025[]; +extern const u32 gBattleAnimSpritePalette_026[]; +extern const u32 gBattleAnimSpritePalette_027[]; +extern const u32 gBattleAnimSpritePalette_028[]; +extern const u32 gBattleAnimSpritePalette_029[]; +extern const u32 gBattleAnimSpritePalette_030[]; +extern const u32 gBattleAnimSpritePalette_031[]; +extern const u32 gBattleAnimSpritePalette_032[]; +extern const u32 gBattleAnimSpritePalette_033[]; +extern const u32 gBattleAnimSpritePalette_033[]; +extern const u32 gBattleAnimSpritePalette_033[]; +extern const u32 gBattleAnimSpritePalette_036[]; +extern const u32 gBattleAnimSpritePalette_036[]; +extern const u32 gBattleAnimSpritePalette_038[]; +extern const u32 gBattleAnimSpritePalette_039[]; +extern const u32 gBattleAnimSpritePalette_038[]; +extern const u32 gBattleAnimSpritePalette_038[]; +extern const u32 gBattleAnimSpritePalette_042[]; +extern const u32 gBattleAnimSpritePalette_043[]; +extern const u32 gBattleAnimSpritePalette_044[]; +extern const u32 gBattleAnimSpritePalette_045[]; +extern const u32 gBattleAnimSpritePalette_046[]; +extern const u32 gBattleAnimSpritePalette_047[]; +extern const u32 gBattleAnimSpritePalette_048[]; +extern const u32 gBattleAnimSpritePalette_049[]; +extern const u32 gBattleAnimSpritePalette_050[]; +extern const u32 gBattleAnimSpritePalette_050[]; +extern const u32 gBattleAnimSpritePalette_050[]; +extern const u32 gBattleAnimSpritePalette_026[]; +extern const u32 gBattleAnimSpritePalette_054[]; +extern const u32 gBattleAnimSpritePalette_050[]; +extern const u32 gBattleAnimSpritePalette_056[]; +extern const u32 gBattleAnimSpritePalette_057[]; +extern const u32 gBattleAnimSpritePalette_058[]; +extern const u32 gBattleAnimSpritePalette_059[]; +extern const u32 gBattleAnimSpritePalette_060[]; +extern const u32 gBattleAnimSpritePalette_061[]; +extern const u32 gBattleAnimSpritePalette_062[]; +extern const u32 gBattleAnimSpritePalette_063[]; +extern const u32 gBattleAnimSpritePalette_064[]; +extern const u32 gBattleAnimSpritePalette_065[]; +extern const u32 gBattleAnimSpritePalette_066[]; +extern const u32 gBattleAnimSpritePalette_067[]; +extern const u32 gBattleAnimSpritePalette_068[]; +extern const u32 gBattleAnimSpritePalette_065[]; +extern const u32 gBattleAnimSpritePalette_070[]; +extern const u32 gBattleAnimSpritePalette_070[]; +extern const u32 gBattleAnimSpritePalette_072[]; +extern const u32 gBattleAnimSpritePalette_073[]; +extern const u32 gBattleAnimSpritePalette_074[]; +extern const u32 gBattleAnimSpritePalette_075[]; +extern const u32 gBattleAnimSpritePalette_076[]; +extern const u32 gBattleAnimSpritePalette_076[]; +extern const u32 gBattleAnimSpritePalette_078[]; +extern const u32 gBattleAnimSpritePalette_078[]; +extern const u32 gBattleAnimSpritePalette_080[]; +extern const u32 gBattleAnimSpritePalette_081[]; +extern const u32 gBattleAnimSpritePalette_082[]; +extern const u32 gBattleAnimSpritePalette_083[]; +extern const u32 gBattleAnimSpritePalette_084[]; +extern const u32 gBattleAnimSpritePalette_085[]; +extern const u32 gBattleAnimSpritePalette_086[]; +extern const u32 gBattleAnimSpritePalette_087[]; +extern const u32 gBattleAnimSpritePalette_088[]; +extern const u32 gBattleAnimSpritePalette_089[]; +extern const u32 gBattleAnimSpritePalette_090[]; +extern const u32 gBattleAnimSpritePalette_091[]; +extern const u32 gBattleAnimSpritePalette_092[]; +extern const u32 gBattleAnimSpritePalette_093[]; +extern const u32 gBattleAnimSpritePalette_094[]; +extern const u32 gBattleAnimSpritePalette_095[]; +extern const u32 gBattleAnimSpritePalette_096[]; +extern const u32 gBattleAnimSpritePalette_097[]; +extern const u32 gBattleAnimSpritePalette_094[]; +extern const u32 gBattleAnimSpritePalette_099[]; +extern const u32 gBattleAnimSpritePalette_100[]; +extern const u32 gBattleAnimSpritePalette_101[]; +extern const u32 gBattleAnimSpritePalette_101[]; +extern const u32 gBattleAnimSpritePalette_103[]; +extern const u32 gBattleAnimSpritePalette_104[]; +extern const u32 gBattleAnimSpritePalette_105[]; +extern const u32 gBattleAnimSpritePalette_105[]; +extern const u32 gBattleAnimSpritePalette_107[]; +extern const u32 gBattleAnimSpritePalette_107[]; +extern const u32 gBattleAnimSpritePalette_109[]; +extern const u32 gBattleAnimSpritePalette_109[]; +extern const u32 gBattleAnimSpritePalette_111[]; +extern const u32 gBattleAnimSpritePalette_112[]; +extern const u32 gBattleAnimSpritePalette_113[]; +extern const u32 gBattleAnimSpritePalette_114[]; +extern const u32 gBattleAnimSpritePalette_115[]; +extern const u32 gBattleAnimSpritePalette_116[]; +extern const u32 gBattleAnimSpritePalette_117[]; +extern const u32 gBattleAnimSpritePalette_118[]; +extern const u32 gBattleAnimSpritePalette_119[]; +extern const u32 gBattleAnimSpritePalette_120[]; +extern const u32 gBattleAnimSpritePalette_121[]; +extern const u32 gBattleAnimSpritePalette_122[]; +extern const u32 gBattleAnimSpritePalette_122[]; +extern const u32 gBattleAnimSpritePalette_124[]; +extern const u32 gBattleAnimSpritePalette_125[]; +extern const u32 gBattleAnimSpritePalette_126[]; +extern const u32 gBattleAnimSpritePalette_127[]; +extern const u32 gBattleAnimSpritePalette_128[]; +extern const u32 gBattleAnimSpritePalette_128[]; +extern const u32 gBattleAnimSpritePalette_130[]; +extern const u32 gBattleAnimSpritePalette_130[]; +extern const u32 gBattleAnimSpritePalette_132[]; +extern const u32 gBattleAnimSpritePalette_133[]; +extern const u32 gBattleAnimSpritePalette_133[]; +extern const u32 gBattleAnimSpritePalette_135[]; +extern const u32 gBattleAnimSpritePalette_136[]; +extern const u32 gBattleAnimSpritePalette_135[]; +extern const u32 gBattleAnimSpritePalette_135[]; +extern const u32 gBattleAnimSpritePalette_139[]; +extern const u32 gBattleAnimSpritePalette_140[]; +extern const u32 gBattleAnimSpritePalette_141[]; +extern const u32 gBattleAnimSpritePalette_141[]; +extern const u32 gBattleAnimSpritePalette_143[]; +extern const u32 gBattleAnimSpritePalette_144[]; +extern const u32 gBattleAnimSpritePalette_139[]; +extern const u32 gBattleAnimSpritePalette_115[]; +extern const u32 gBattleAnimSpritePalette_147[]; +extern const u32 gBattleAnimSpritePalette_148[]; +extern const u32 gBattleAnimSpritePalette_148[]; +extern const u32 gBattleAnimSpritePalette_150[]; +extern const u32 gBattleAnimSpritePalette_150[]; +extern const u32 gBattleAnimSpritePalette_152[]; +extern const u32 gBattleAnimSpritePalette_153[]; +extern const u32 gBattleAnimSpritePalette_154[]; +extern const u32 gBattleAnimSpritePalette_155[]; +extern const u32 gBattleAnimSpritePalette_156[]; +extern const u32 gBattleAnimSpritePalette_157[]; +extern const u32 gBattleAnimSpritePalette_158[]; +extern const u32 gBattleAnimSpritePalette_159[]; +extern const u32 gBattleAnimSpritePalette_160[]; +extern const u32 gBattleAnimSpritePalette_161[]; +extern const u32 gBattleAnimSpritePalette_162[]; +extern const u32 gBattleAnimSpritePalette_163[]; +extern const u32 gBattleAnimSpritePalette_164[]; +extern const u32 gBattleAnimSpritePalette_165[]; +extern const u32 gBattleAnimSpritePalette_166[]; +extern const u32 gBattleAnimSpritePalette_167[]; +extern const u32 gBattleAnimSpritePalette_168[]; +extern const u32 gBattleAnimSpritePalette_169[]; +extern const u32 gBattleAnimSpritePalette_170[]; +extern const u32 gBattleAnimSpritePalette_171[]; +extern const u32 gBattleAnimSpritePalette_172[]; +extern const u32 gBattleAnimSpritePalette_174[]; +extern const u32 gBattleAnimSpritePalette_175[]; +extern const u32 gBattleAnimSpritePalette_176[]; +extern const u32 gBattleAnimSpritePalette_177[]; +extern const u32 gBattleAnimSpritePalette_178[]; +extern const u32 gBattleAnimSpritePalette_179[]; +extern const u32 gBattleAnimSpritePalette_182[]; +extern const u32 gBattleAnimSpritePalette_183[]; +extern const u32 gBattleAnimSpritePalette_184[]; +extern const u32 gBattleAnimSpritePalette_185[]; +extern const u32 gBattleAnimSpritePalette_186[]; +extern const u32 gBattleAnimSpritePalette_187[]; +extern const u32 gBattleAnimSpritePalette_188[]; +extern const u32 gBattleAnimSpritePalette_189[]; +extern const u32 gBattleAnimSpritePalette_190[]; +extern const u32 gBattleAnimSpritePalette_191[]; +extern const u32 gBattleAnimSpritePalette_192[]; +extern const u32 gBattleAnimSpritePalette_193[]; +extern const u32 gBattleAnimSpritePalette_194[]; +extern const u32 gBattleAnimSpritePalette_195[]; +extern const u32 gBattleAnimSpritePalette_196[]; +extern const u32 gBattleAnimSpritePalette_197[]; +extern const u32 gBattleAnimSpritePalette_198[]; +extern const u32 gBattleAnimSpritePalette_199[]; +extern const u32 gBattleAnimSpritePalette_200[]; +extern const u32 gBattleAnimSpritePalette_201[]; +extern const u32 gBattleAnimSpritePalette_202[]; +extern const u32 gBattleAnimSpritePalette_203[]; +extern const u32 gBattleAnimSpritePalette_204[]; +extern const u32 gBattleAnimSpritePalette_205[]; +extern const u32 gBattleAnimSpritePalette_206[]; +extern const u32 gBattleAnimSpritePalette_207[]; +extern const u32 gBattleAnimSpritePalette_209[]; +extern const u32 gBattleAnimSpritePalette_210[]; +extern const u32 gBattleAnimSpritePalette_211[]; +extern const u32 gBattleAnimSpritePalette_215[]; +extern const u32 gBattleAnimSpritePalette_216[]; +extern const u32 gBattleAnimSpritePalette_217[]; +extern const u32 gBattleAnimSpritePalette_218[]; +extern const u32 gBattleAnimSpritePalette_219[]; +extern const u32 gBattleAnimSpritePalette_220[]; +extern const u32 gBattleAnimSpritePalette_221[]; +extern const u32 gBattleAnimSpritePalette_222[]; +extern const u32 gBattleAnimSpritePalette_223[]; +extern const u32 gBattleAnimSpritePalette_224[]; +extern const u32 gBattleAnimSpritePalette_225[]; +extern const u32 gBattleAnimSpritePalette_226[]; +extern const u32 gBattleAnimSpritePalette_228[]; +extern const u32 gBattleAnimSpritePalette_229[]; +extern const u32 gBattleAnimSpritePalette_230[]; +extern const u32 gBattleAnimSpritePalette_231[]; +extern const u32 gBattleAnimSpritePalette_233[]; +extern const u32 gBattleAnimSpritePalette_234[]; +extern const u32 gBattleAnimSpritePalette_235[]; +extern const u32 gBattleAnimSpritePalette_236[]; +extern const u32 gBattleAnimSpritePalette_237[]; +extern const u32 gBattleAnimSpritePalette_238[]; +extern const u32 gBattleAnimSpritePalette_239[]; +extern const u32 gBattleAnimSpritePalette_240[]; +extern const u32 gBattleAnimSpritePalette_241[]; +extern const u32 gBattleAnimSpritePalette_242[]; +extern const u32 gBattleAnimSpritePalette_243[]; +extern const u32 gBattleAnimSpritePalette_244[]; +extern const u32 gBattleAnimSpritePalette_245[]; +extern const u32 gBattleAnimSpritePalette_248[]; +extern const u32 gBattleAnimSpritePalette_249[]; +extern const u32 gBattleAnimSpritePalette_251[]; +extern const u32 gBattleAnimSpritePalette_252[]; +extern const u32 gBattleAnimSpritePalette_253[]; +extern const u32 gBattleAnimSpritePalette_254[]; +extern const u32 gBattleAnimSpritePalette_255[]; +extern const u32 gBattleAnimSpritePalette_256[]; +extern const u32 gBattleAnimSpritePalette_257[]; +extern const u32 gBattleAnimSpritePalette_258[]; +extern const u32 gBattleAnimSpritePalette_259[]; +extern const u32 gBattleAnimSpritePalette_260[]; +extern const u32 gBattleAnimSpritePalette_261[]; +extern const u32 gBattleAnimSpritePalette_262[]; +extern const u32 gBattleAnimSpritePalette_263[]; +extern const u32 gBattleAnimSpritePalette_264[]; +extern const u32 gBattleAnimSpritePalette_265[]; +extern const u32 gBattleAnimSpritePalette_266[]; +extern const u32 gBattleAnimSpritePalette_267[]; +extern const u32 gBattleAnimSpritePalette_268[]; +extern const u32 gBattleAnimSpritePalette_269[]; +extern const u32 gBattleAnimSpritePalette_270[]; +extern const u32 gBattleAnimSpritePalette_271[]; +extern const u32 gBattleAnimSpritePalette_272[]; +extern const u32 gBattleAnimSpritePalette_274[]; +extern const u32 gBattleAnimSpritePalette_277[]; +extern const u32 gBattleAnimSpritePalette_278[]; +extern const u32 gBattleAnimSpritePalette_279[]; +extern const u32 gBattleAnimSpritePalette_280[]; +extern const u32 gBattleAnimSpritePalette_281[]; +extern const u32 gBattleAnimSpritePalette_282[]; +extern const u32 gBattleAnimSpritePalette_283[]; +extern const u32 gBattleAnimSpritePalette_284[]; +extern const u32 gBattleAnimSpritePalette_285[]; +extern const u32 gBattleAnimSpritePalette_286[]; +extern const u32 gBattleAnimSpritePalette_287[]; +extern const u32 gBattleAnimSpritePalette_288[]; + +extern struct BattleAnimBackground gBattleAnimBackgroundImage_00[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_02[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_03[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_04[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_07[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_09[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_11[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_12[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_15[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_16[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_17[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_20[]; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_21[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_00[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_02[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_03[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_04[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_07[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_09[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_11[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_12[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_15[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_16[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_17[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_18[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_20[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_21[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_22[]; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_24[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_00[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_02[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_03[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_04[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_05[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_06[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_07[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_08[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_09[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_10[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_11[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_12[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_13[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_14[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_15[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_16[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20[]; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From d267fcbfb10d3bbc4ecc560fb189986351024455 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 22 Oct 2018 10:36:43 -0400 Subject: name remaining tags --- include/constants/battle_anim.h | 333 ++++++++++++++++++++-------------------- 1 file changed, 167 insertions(+), 166 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 1ad375a8f..740c2f193 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -110,197 +110,198 @@ #define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) #define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN -#define ANIM_TAG_101 (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG -#define ANIM_TAG_102 (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG -#define ANIM_TAG_103 (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG -#define ANIM_TAG_104 (ANIM_SPRITES_START + 104) // ANIM_TAG_UNUSED_FANGS -#define ANIM_TAG_105 (ANIM_SPRITES_START + 105) // ANIM_TAG_UNUSED_EXPLOSION_2 -#define ANIM_TAG_106 (ANIM_SPRITES_START + 106) // ANIM_TAG_UNUSED_EXPLOSION_3 -#define ANIM_TAG_107 (ANIM_SPRITES_START + 107) // ANIM_TAG_UNUSED_WATER_DROPLET -#define ANIM_TAG_108 (ANIM_SPRITES_START + 108) // ANIM_TAG_UNUSED_WATER_DROPLET_2 -#define ANIM_TAG_109 (ANIM_SPRITES_START + 109) // ANIM_TAG_UNUSED_SEED -#define ANIM_TAG_110 (ANIM_SPRITES_START + 110) // ANIM_TAG_UNUSED_SPROUT -#define ANIM_TAG_111 (ANIM_SPRITES_START + 111) // ANIM_TAG_UNUSED_RED_WAND -#define ANIM_TAG_112 (ANIM_SPRITES_START + 112) // ANIM_TAG_UNUSED_PURPLE_GREEN_UNK -#define ANIM_TAG_113 (ANIM_SPRITES_START + 113) // ANIM_TAG_UNUSED_WATER_COLUMN -#define ANIM_TAG_114 (ANIM_SPRITES_START + 114) // ANIM_TAG_UNUSED_MUD_UNK -#define ANIM_TAG_115 (ANIM_SPRITES_START + 115) // ANIM_TAG_RAIN_DROPS -#define ANIM_TAG_116 (ANIM_SPRITES_START + 116) // ANIM_TAG_UNUSED_FURY_SWIPES -#define ANIM_TAG_117 (ANIM_SPRITES_START + 117) // ANIM_TAG_UNUSED_VINE_2 -#define ANIM_TAG_118 (ANIM_SPRITES_START + 118) // ANIM_TAG_UNUSED_TEETH -#define ANIM_TAG_119 (ANIM_SPRITES_START + 119) // ANIM_TAG_UNUSED_BONE -#define ANIM_TAG_ITEM_BAG2 (ANIM_SPRITES_START + 120) // ANIM_TAG_UNUSED_WHITE_BAG -#define ANIM_TAG_121 (ANIM_SPRITES_START + 121) // ANIM_TAG_UNUSED_UNKNOWN -#define ANIM_TAG_122 (ANIM_SPRITES_START + 122) // ANIM_TAG_UNUSED_PURPLE_CORAL -#define ANIM_TAG_123 (ANIM_SPRITES_START + 123) // ANIM_TAG_UNUSED_PURPLE_DROPLET -#define ANIM_TAG_124 (ANIM_SPRITES_START + 124) // ANIM_TAG_UNUSED_SHOCK_2 -#define ANIM_TAG_125 (ANIM_SPRITES_START + 125) // ANIM_TAG_UNUSED_CLOSING_EYE_2 -#define ANIM_TAG_126 (ANIM_SPRITES_START + 126) // ANIM_TAG_UNUSED_METAL_BALL -#define ANIM_TAG_127 (ANIM_SPRITES_START + 127) // ANIM_TAG_UNUSED_MONSTER_DOLL -#define ANIM_TAG_128 (ANIM_SPRITES_START + 128) // ANIM_TAG_UNUSED_WHIRLWIND -#define ANIM_TAG_129 (ANIM_SPRITES_START + 129) // ANIM_TAG_UNUSED_WHIRLWIND_2 -#define ANIM_TAG_130 (ANIM_SPRITES_START + 130) // ANIM_TAG_UNUSED_EXPLOSION_4 -#define ANIM_TAG_131 (ANIM_SPRITES_START + 131) // ANIM_TAG_UNUSED_EXPLOSION_5 -#define ANIM_TAG_132 (ANIM_SPRITES_START + 132) // ANIM_TAG_UNUSED_TONGUE -#define ANIM_TAG_133 (ANIM_SPRITES_START + 133) // ANIM_TAG_UNUSED_SMOKE -#define ANIM_TAG_134 (ANIM_SPRITES_START + 134) // ANIM_TAG_UNUSED_SMOKE_2 -#define ANIM_TAG_135 (ANIM_SPRITES_START + 135) // ANIM_TAG_IMPACT -#define ANIM_TAG_136 (ANIM_SPRITES_START + 136) // ANIM_TAG_CIRCLE_IMPACT -#define ANIM_TAG_137 (ANIM_SPRITES_START + 137) // ANIM_TAG_SCRATCH -#define ANIM_TAG_138 (ANIM_SPRITES_START + 138) // ANIM_TAG_CUT -#define ANIM_TAG_139 (ANIM_SPRITES_START + 139) // ANIM_TAG_SHARP_TEETH -#define ANIM_TAG_140 (ANIM_SPRITES_START + 140) // ANIM_TAG_RAINBOW_RINGS -#define ANIM_TAG_141 (ANIM_SPRITES_START + 141) // ANIM_TAG_ICE_CRYSTALS -#define ANIM_TAG_142 (ANIM_SPRITES_START + 142) // ANIM_TAG_ICE_SPIKES -#define ANIM_TAG_143 (ANIM_SPRITES_START + 143) // ANIM_TAG_HANDS_AND_FEET -#define ANIM_TAG_144 (ANIM_SPRITES_START + 144) // ANIM_TAG_MIST_CLOUD -#define ANIM_TAG_145 (ANIM_SPRITES_START + 145) // ANIM_TAG_CLAMP -#define ANIM_TAG_146 (ANIM_SPRITES_START + 146) // ANIM_TAG_BUBBLE -#define ANIM_TAG_147 (ANIM_SPRITES_START + 147) // ANIM_TAG_ORBS -#define ANIM_TAG_148 (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT -#define ANIM_TAG_149 (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB +#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG +#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG +#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG +#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) // ANIM_TAG_UNUSED_FANGS +#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) // ANIM_TAG_UNUSED_EXPLOSION_2 +#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) // ANIM_TAG_UNUSED_EXPLOSION_3 +#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) // ANIM_TAG_UNUSED_WATER_DROPLET +#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // ANIM_TAG_UNUSED_WATER_DROPLET_2 +#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) // ANIM_TAG_UNUSED_SEED +#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) // ANIM_TAG_UNUSED_SPROUT +#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) // ANIM_TAG_UNUSED_RED_WAND +#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // ANIM_TAG_UNUSED_PURPLE_GREEN_UNK +#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) // ANIM_TAG_UNUSED_WATER_COLUMN +#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) // ANIM_TAG_UNUSED_MUD_UNK +#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) // ANIM_TAG_RAIN_DROPS +#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) // ANIM_TAG_UNUSED_FURY_SWIPES +#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) // ANIM_TAG_UNUSED_VINE_2 +#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) // ANIM_TAG_UNUSED_TEETH +#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) // ANIM_TAG_UNUSED_BONE +#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) // ANIM_TAG_UNUSED_WHITE_BAG +#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) // ANIM_TAG_UNUSED_UNKNOWN +#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) // ANIM_TAG_UNUSED_PURPLE_CORAL +#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // ANIM_TAG_UNUSED_PURPLE_DROPLET +#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) // ANIM_TAG_UNUSED_SHOCK_2 +#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // ANIM_TAG_UNUSED_CLOSING_EYE_2 +#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) // ANIM_TAG_UNUSED_METAL_BALL +#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) // ANIM_TAG_UNUSED_MONSTER_DOLL +#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) // ANIM_TAG_UNUSED_WHIRLWIND +#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // ANIM_TAG_UNUSED_WHIRLWIND_2 +#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) // ANIM_TAG_UNUSED_EXPLOSION_4 +#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) // ANIM_TAG_UNUSED_EXPLOSION_5 +#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) // ANIM_TAG_UNUSED_TONGUE +#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) // ANIM_TAG_UNUSED_SMOKE +#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) // ANIM_TAG_UNUSED_SMOKE_2 +#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) // ANIM_TAG_IMPACT +#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) // ANIM_TAG_CIRCLE_IMPACT +#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) // ANIM_TAG_SCRATCH +#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138) // ANIM_TAG_CUT +#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139) // ANIM_TAG_SHARP_TEETH +#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140) // ANIM_TAG_RAINBOW_RINGS +#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141) // ANIM_TAG_ICE_CRYSTALS +#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142) // ANIM_TAG_ICE_SPIKES +#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143) // ANIM_TAG_HANDS_AND_FEET +#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144) // ANIM_TAG_MIST_CLOUD +#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145) // ANIM_TAG_CLAMP +#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146) // ANIM_TAG_BUBBLE +#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147) // ANIM_TAG_ORBS +#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT +#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB #define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) #define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) -#define ANIM_TAG_152 (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES -#define ANIM_TAG_153 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2 -#define ANIM_TAG_154 (ANIM_SPRITES_START + 154) // ANIM_TAG_AIR_WAVE_2 -#define ANIM_TAG_155 (ANIM_SPRITES_START + 155) // ANIM_TAG_SMALL_BUBBLES -#define ANIM_TAG_156 (ANIM_SPRITES_START + 156) // ANIM_TAG_ROUND_SHADOW -#define ANIM_TAG_157 (ANIM_SPRITES_START + 157) // ANIM_TAG_SUNLIGHT -#define ANIM_TAG_158 (ANIM_SPRITES_START + 158) // ANIM_TAG_SPORE -#define ANIM_TAG_159 (ANIM_SPRITES_START + 159) // ANIM_TAG_FLOWER -#define ANIM_TAG_160 (ANIM_SPRITES_START + 160) // ANIM_TAG_RAZOR_LEAF -#define ANIM_TAG_161 (ANIM_SPRITES_START + 161) // ANIM_TAG_NEEDLE -#define ANIM_TAG_162 (ANIM_SPRITES_START + 162) // ANIM_TAG_WHIRLWIND_LINES -#define ANIM_TAG_163 (ANIM_SPRITES_START + 163) // ANIM_TAG_GOLD_RING -#define ANIM_TAG_164 (ANIM_SPRITES_START + 164) // ANIM_TAG_PURPLE_RING -#define ANIM_TAG_165 (ANIM_SPRITES_START + 165) // ANIM_TAG_BLUE_RING -#define ANIM_TAG_166 (ANIM_SPRITES_START + 166) // ANIM_TAG_GREEN_LIGHT_WALL -#define ANIM_TAG_167 (ANIM_SPRITES_START + 167) // ANIM_TAG_BLUE_LIGHT_WALL -#define ANIM_TAG_168 (ANIM_SPRITES_START + 168) // ANIM_TAG_RED_LIGHT_WALL -#define ANIM_TAG_169 (ANIM_SPRITES_START + 169) // ANIM_TAG_GRAY_LIGHT_WALL -#define ANIM_TAG_170 (ANIM_SPRITES_START + 170) // ANIM_TAG_ORANGE_LIGHT_WALL -#define ANIM_TAG_171 (ANIM_SPRITES_START + 171) // ANIM_TAG_BLACK_BALL_2 -#define ANIM_TAG_172 (ANIM_SPRITES_START + 172) // ANIM_TAG_PURPLE_GAS_CLOUD -#define ANIM_TAG_173 (ANIM_SPRITES_START + 173) // ANIM_TAG_SPARK_H -#define ANIM_TAG_174 (ANIM_SPRITES_START + 174) // ANIM_TAG_YELLOW_STAR -#define ANIM_TAG_175 (ANIM_SPRITES_START + 175) // ANIM_TAG_LARGE_FRESH_EGG -#define ANIM_TAG_176 (ANIM_SPRITES_START + 176) // ANIM_TAG_SHADOW_BALL -#define ANIM_TAG_177 (ANIM_SPRITES_START + 177) // ANIM_TAG_LICK -#define ANIM_TAG_178 (ANIM_SPRITES_START + 178) // ANIM_TAG_UNUSED_VOID_LINES -#define ANIM_TAG_179 (ANIM_SPRITES_START + 179) // ANIM_TAG_STRING +#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES +#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2 +#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154) // ANIM_TAG_AIR_WAVE_2 +#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155) // ANIM_TAG_SMALL_BUBBLES +#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156) // ANIM_TAG_ROUND_SHADOW +#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157) // ANIM_TAG_SUNLIGHT +#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158) // ANIM_TAG_SPORE +#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159) // ANIM_TAG_FLOWER +#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160) // ANIM_TAG_RAZOR_LEAF +#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161) // ANIM_TAG_NEEDLE +#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162) // ANIM_TAG_WHIRLWIND_LINES +#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163) // ANIM_TAG_GOLD_RING +#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164) // ANIM_TAG_PURPLE_RING +#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165) // ANIM_TAG_BLUE_RING +#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166) // ANIM_TAG_GREEN_LIGHT_WALL +#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167) // ANIM_TAG_BLUE_LIGHT_WALL +#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168) // ANIM_TAG_RED_LIGHT_WALL +#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169) // ANIM_TAG_GRAY_LIGHT_WALL +#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170) // ANIM_TAG_ORANGE_LIGHT_WALL +#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171) // ANIM_TAG_BLACK_BALL_2 +#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172) // ANIM_TAG_PURPLE_GAS_CLOUD +#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173) // ANIM_TAG_SPARK_H +#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174) // ANIM_TAG_YELLOW_STAR +#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) // ANIM_TAG_LARGE_FRESH_EGG +#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) // ANIM_TAG_SHADOW_BALL +#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) // ANIM_TAG_LICK +#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) // ANIM_TAG_UNUSED_VOID_LINES +#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) // ANIM_TAG_STRING #define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) // ANIM_TAG_STRING_DOT #define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) // ANIM_TAG_WEB -#define ANIM_TAG_182 (ANIM_SPRITES_START + 182) // ANIM_TAG_UNUSED_LIGHTBULB -#define ANIM_TAG_183 (ANIM_SPRITES_START + 183) // ANIM_TAG_SLASH -#define ANIM_TAG_184 (ANIM_SPRITES_START + 184) // ANIM_TAG_FOCUS_ENERGY -#define ANIM_TAG_185 (ANIM_SPRITES_START + 185) // ANIM_TAG_SPHERE_TO_CUBE -#define ANIM_TAG_186 (ANIM_SPRITES_START + 186) // ANIM_TAG_TENDRILS +#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) // ANIM_TAG_UNUSED_LIGHTBULB +#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) // ANIM_TAG_SLASH +#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) // ANIM_TAG_FOCUS_ENERGY +#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) // ANIM_TAG_SPHERE_TO_CUBE +#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186) // ANIM_TAG_TENDRILS #define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) -#define ANIM_TAG_188 (ANIM_SPRITES_START + 188) // ANIM_TAG_WHITE_SHADOW -#define ANIM_TAG_189 (ANIM_SPRITES_START + 189) // ANIM_TAG_TEAL_ALERT +#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188) // ANIM_TAG_WHITE_SHADOW +#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189) // ANIM_TAG_TEAL_ALERT #define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) -#define ANIM_TAG_191 (ANIM_SPRITES_START + 191) // ANIM_TAG_ROUND_WHITE_HALO -#define ANIM_TAG_192 (ANIM_SPRITES_START + 192) // ANIM_TAG_FANG_ATTACK -#define ANIM_TAG_193 (ANIM_SPRITES_START + 193) // ANIM_TAG_PURPLE_HAND_OUTLINE +#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191) // ANIM_TAG_ROUND_WHITE_HALO +#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192) // ANIM_TAG_FANG_ATTACK +#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193) // ANIM_TAG_PURPLE_HAND_OUTLINE #define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) #define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195) // ANIM_TAG_SPARKLE_5 -#define ANIM_TAG_196 (ANIM_SPRITES_START + 196) // ANIM_TAG_SPIRAL -#define ANIM_TAG_197 (ANIM_SPRITES_START + 197) // ANIM_TAG_SNORE_Z +#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196) // ANIM_TAG_SPIRAL +#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197) // ANIM_TAG_SNORE_Z #define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) #define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) -#define ANIM_TAG_200 (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT +#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT -#define ANIM_TAG_201 (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK +#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK #define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) -#define ANIM_TAG_203 (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING -#define ANIM_TAG_204 (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT +#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING +#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT #define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) #define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 -#define ANIM_TAG_207 (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST -#define ANIM_TAG_208 (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL -#define ANIM_TAG_209 (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE -#define ANIM_TAG_PURPLE_HEART (ANIM_SPRITES_START + 210) // ANIM_TAG_MAGENTA_HEART -#define ANIM_TAG_211 (ANIM_SPRITES_START + 211) // ANIM_TAG_ELECTRIC_ORBS -#define ANIM_TAG_212 (ANIM_SPRITES_START + 212) // ANIM_TAG_CIRCLE_OF_LIGHT -#define ANIM_TAG_213 (ANIM_SPRITES_START + 213) // ANIM_TAG_ELECTRICITY -#define ANIM_TAG_214 (ANIM_SPRITES_START + 214) // ANIM_TAG_FINGER_2 -#define ANIM_TAG_215 (ANIM_SPRITES_START + 215) // ANIM_TAG_MOVEMENT_WAVES -#define ANIM_TAG_216 (ANIM_SPRITES_START + 216) // ANIM_TAG_RED_HEART -#define ANIM_TAG_217 (ANIM_SPRITES_START + 217) // ANIM_TAG_RED_ORB -#define ANIM_TAG_218 (ANIM_SPRITES_START + 218) // ANIM_TAG_EYE_SPARKLE -#define ANIM_TAG_219 (ANIM_SPRITES_START + 219) // ANIM_TAG_PINK_HEART +#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST +#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL +#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE +#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210) // ANIM_TAG_MAGENTA_HEART +#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211) // ANIM_TAG_ELECTRIC_ORBS +#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212) // ANIM_TAG_CIRCLE_OF_LIGHT +#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213) // ANIM_TAG_ELECTRICITY +#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214) // ANIM_TAG_FINGER_2 +#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215) // ANIM_TAG_MOVEMENT_WAVES +#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216) // ANIM_TAG_RED_HEART +#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217) // ANIM_TAG_RED_ORB +#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218) // ANIM_TAG_EYE_SPARKLE +#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219) // ANIM_TAG_PINK_HEART #define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) -#define ANIM_TAG_EVIL_ANGEL (ANIM_SPRITES_START + 221) // ANIM_TAG_DEVIL -#define ANIM_TAG_222 (ANIM_SPRITES_START + 222) // ANIM_TAG_SWIPE -#define ANIM_TAG_223 (ANIM_SPRITES_START + 223) // ANIM_TAG_ROOTS +#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221) // ANIM_TAG_DEVIL +#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222) // ANIM_TAG_SWIPE +#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223) // ANIM_TAG_ROOTS #define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) // ANIM_TAG_ITEM_BAG -#define ANIM_TAG_225 (ANIM_SPRITES_START + 225) // ANIM_TAG_JAGGED_MUSIC_NOTE -#define ANIM_TAG_226 (ANIM_SPRITES_START + 226) // ANIM_TAG_POKEBALL -#define ANIM_TAG_227 (ANIM_SPRITES_START + 227) // ANIM_TAG_SPOTLIGHT +#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225) // ANIM_TAG_JAGGED_MUSIC_NOTE + +#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226) // ANIM_TAG_POKEBALL +#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) // ANIM_TAG_SPOTLIGHT #define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) -#define ANIM_TAG_229 (ANIM_SPRITES_START + 229) // ANIM_TAG_RAPID_SPIN +#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) // ANIM_TAG_RAPID_SPIN #define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) -#define ANIM_TAG_231 (ANIM_SPRITES_START + 231) // ANIM_TAG_WISP_ORB -#define ANIM_TAG_232 (ANIM_SPRITES_START + 232) // ANIM_TAG_WISP_FIRE -#define ANIM_TAG_233 (ANIM_SPRITES_START + 233) // ANIM_TAG_GOLD_STARS -#define ANIM_TAG_234 (ANIM_SPRITES_START + 234) // ANIM_TAG_ECLIPSING_ORB -#define ANIM_TAG_235 (ANIM_SPRITES_START + 235) // ANIM_TAG_GRAY_ORB -#define ANIM_TAG_236 (ANIM_SPRITES_START + 236) // ANIM_TAG_BLUE_ORB -#define ANIM_TAG_237 (ANIM_SPRITES_START + 237) // ANIM_TAG_RED_ORB_2 -#define ANIM_TAG_238 (ANIM_SPRITES_START + 238) // ANIM_TAG_PINK_PETAL -#define ANIM_TAG_239 (ANIM_SPRITES_START + 239) // ANIM_TAG_PAIN_SPLIT -#define ANIM_TAG_240 (ANIM_SPRITES_START + 240) // ANIM_TAG_CONFETTI +#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) // ANIM_TAG_WISP_ORB +#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) // ANIM_TAG_WISP_FIRE +#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) // ANIM_TAG_GOLD_STARS +#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234) // ANIM_TAG_ECLIPSING_ORB +#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235) // ANIM_TAG_GRAY_ORB +#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236) // ANIM_TAG_BLUE_ORB +#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237) // ANIM_TAG_RED_ORB_2 +#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238) // ANIM_TAG_PINK_PETAL +#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239) // ANIM_TAG_PAIN_SPLIT +#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240) // ANIM_TAG_CONFETTI #define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) -#define ANIM_TAG_242 (ANIM_SPRITES_START + 242) // ANIM_TAG_PINK_CLOUD -#define ANIM_TAG_243 (ANIM_SPRITES_START + 243) // ANIM_TAG_SWEAT_DROP -#define ANIM_TAG_244 (ANIM_SPRITES_START + 244) // ANIM_TAG_GUARD_RING -#define ANIM_TAG_245 (ANIM_SPRITES_START + 245) // ANIM_TAG_PURPLE_SCRATCH -#define ANIM_TAG_246 (ANIM_SPRITES_START + 246) // ANIM_TAG_PURPLE_SWIPE -#define ANIM_TAG_HAND (ANIM_SPRITES_START + 247) // ANIM_TAG_TAG_HAND -#define ANIM_TAG_248 (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE -#define ANIM_TAG_249 (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB +#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242) // ANIM_TAG_PINK_CLOUD +#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243) // ANIM_TAG_SWEAT_DROP +#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244) // ANIM_TAG_GUARD_RING +#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245) // ANIM_TAG_PURPLE_SCRATCH +#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246) // ANIM_TAG_PURPLE_SWIPE +#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247) // ANIM_TAG_TAG_HAND +#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE +#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB #define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) -#define ANIM_TAG_251 (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB -#define ANIM_TAG_252 (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT -#define ANIM_TAG_253 (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME -#define ANIM_TAG_254 (ANIM_SPRITES_START + 254) // ANIM_TAG_RED_BALL -#define ANIM_TAG_255 (ANIM_SPRITES_START + 255) // ANIM_TAG_SMELLINGSALT_EFFECT -#define ANIM_TAG_256 (ANIM_SPRITES_START + 256) // ANIM_TAG_METEOR -#define ANIM_TAG_257 (ANIM_SPRITES_START + 257) // ANIM_TAG_FLAT_ROCK +#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB +#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT +#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME +#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254) // ANIM_TAG_RED_BALL +#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255) // ANIM_TAG_SMELLINGSALT_EFFECT +#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256) // ANIM_TAG_METEOR +#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257) // ANIM_TAG_FLAT_ROCK #define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) -#define ANIM_TAG_259 (ANIM_SPRITES_START + 259) // ANIM_TAG_BROWN_ORB -#define ANIM_TAG_260 (ANIM_SPRITES_START + 260) // ANIM_TAG_METAL_SOUND_WAVES -#define ANIM_TAG_261 (ANIM_SPRITES_START + 261) // ANIM_TAG_FLYING_DIRT -#define ANIM_TAG_262 (ANIM_SPRITES_START + 262) // ANIM_TAG_ICICLE_SPEAR -#define ANIM_TAG_263 (ANIM_SPRITES_START + 263) // ANIM_TAG_HAIL -#define ANIM_TAG_264 (ANIM_SPRITES_START + 264) // ANIM_TAG_GLOWY_RED_ORB -#define ANIM_TAG_265 (ANIM_SPRITES_START + 265) // ANIM_TAG_GLOWY_GREEN_ORB -#define ANIM_TAG_266 (ANIM_SPRITES_START + 266) // ANIM_TAG_GREEN_SPIKE -#define ANIM_TAG_267 (ANIM_SPRITES_START + 267) // ANIM_TAG_WHITE_CIRCLE_OF_LIGHT -#define ANIM_TAG_268 (ANIM_SPRITES_START + 268) // ANIM_TAG_GLOWY_BLUE_ORB -#define ANIM_TAG_269 (ANIM_SPRITES_START + 269) // ANIM_TAG_UNUSED_RED_BRICK -#define ANIM_TAG_270 (ANIM_SPRITES_START + 270) // ANIM_TAG_WHITE_FEATHER -#define ANIM_TAG_271 (ANIM_SPRITES_START + 271) // ANIM_TAG_SPARKLE_6 -#define ANIM_TAG_272 (ANIM_SPRITES_START + 272) // ANIM_TAG_SPLASH -#define ANIM_TAG_273 (ANIM_SPRITES_START + 273) // ANIM_TAG_SWEAT_BEAD -#define ANIM_TAG_274 (ANIM_SPRITES_START + 274) // ANIM_TAG_UNUSED_GEM_1 -#define ANIM_TAG_275 (ANIM_SPRITES_START + 275) // ANIM_TAG_UNUSED_GEM_2 -#define ANIM_TAG_276 (ANIM_SPRITES_START + 276) // ANIM_TAG_UNUSED_GEM_3 -#define ANIM_TAG_277 (ANIM_SPRITES_START + 277) // ANIM_TAG_SLAM_HIT_2 +#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259) // ANIM_TAG_BROWN_ORB +#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260) // ANIM_TAG_METAL_SOUND_WAVES +#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261) // ANIM_TAG_FLYING_DIRT +#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262) // ANIM_TAG_ICICLE_SPEAR +#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263) // ANIM_TAG_HAIL +#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264) // ANIM_TAG_GLOWY_RED_ORB +#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265) // ANIM_TAG_GLOWY_GREEN_ORB +#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) // ANIM_TAG_GREEN_SPIKE +#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) // ANIM_TAG_WHITE_CIRCLE_OF_LIGHT +#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) // ANIM_TAG_GLOWY_BLUE_ORB +#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) // ANIM_TAG_UNUSED_RED_BRICK +#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) // ANIM_TAG_WHITE_FEATHER +#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) // ANIM_TAG_SPARKLE_6 +#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) // ANIM_TAG_SPLASH +#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) // ANIM_TAG_SWEAT_BEAD +#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) // ANIM_TAG_UNUSED_GEM_1 +#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) // ANIM_TAG_UNUSED_GEM_2 +#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) // ANIM_TAG_UNUSED_GEM_3 +#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) // ANIM_TAG_SLAM_HIT_2 #define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) -#define ANIM_TAG_279 (ANIM_SPRITES_START + 279) // ANIM_TAG_UNUSED_RED_PARTICLES +#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) // ANIM_TAG_UNUSED_RED_PARTICLES #define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) -#define ANIM_TAG_281 (ANIM_SPRITES_START + 281) // ANIM_TAG_DIRT_MOUND -#define ANIM_TAG_282 (ANIM_SPRITES_START + 282) // ANIM_TAG_SHOCK_3 -#define ANIM_TAG_283 (ANIM_SPRITES_START + 283) // ANIM_TAG_WEATHER_BALL -#define ANIM_TAG_284 (ANIM_SPRITES_START + 284) // ANIM_TAG_BIRD -#define ANIM_TAG_285 (ANIM_SPRITES_START + 285) // ANIM_TAG_CROSS_IMPACT -#define ANIM_TAG_286 (ANIM_SPRITES_START + 286) // ANIM_TAG_SLASH_2 -#define ANIM_TAG_287 (ANIM_SPRITES_START + 287) // ANIM_TAG_WHIP_HIT -#define ANIM_TAG_288 (ANIM_SPRITES_START + 288) // ANIM_TAG_BLUE_RING_2 +#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) // ANIM_TAG_DIRT_MOUND +#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) // ANIM_TAG_SHOCK_3 +#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283) // ANIM_TAG_WEATHER_BALL +#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284) // ANIM_TAG_BIRD +#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285) // ANIM_TAG_CROSS_IMPACT +#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286) // ANIM_TAG_SLASH_2 +#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287) // ANIM_TAG_WHIP_HIT +#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // ANIM_TAG_BLUE_RING_2 -- cgit v1.2.3 From 6cf39e8a6ed3b0cb882e2d71d2ecd6c10152a489 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 22 Oct 2018 10:51:40 -0400 Subject: clean up sprite tags --- include/constants/battle_anim.h | 586 ++++++++++++++++++++-------------------- 1 file changed, 289 insertions(+), 297 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 740c2f193..a3d774818 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -7,303 +7,295 @@ // Particle ids. #define ANIM_SPRITES_START 10000 -#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0) -#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) -#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) -#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) -#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) // ? -#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) -#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) -#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) // rename??? -#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) -#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) -#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) // unused? -#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) -#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) -#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) -#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) -#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) // unused? -#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) -#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) -#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) -#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) // ANIM_TAG_UNUSED_GLASS -#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) -#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) // ANIM_TAG_UNUSED_HIT (_1?) -#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) // ANIM_TAG_UNUSED_HIT_2 -#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) // ANIM_TAG_UNUSED_BLUE_SHARDS -#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) // ANIM_TAG_UNUSED_CLOSING_EYE -#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) // ANIM_TAG_UNUSED_WAVING_HAND -#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // ANIM_TAG_UNUSED_HIT_DUPLICATE -#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) // ANIM_TAG_LEER -#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) // ANIM_TAG_UNUSED_BLUE_BURST -#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) -#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) -#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) -#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) // ANIM_TAG_UNUSED_BUBBLE_BURST -#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) -#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) // ANIM_TAG_UNUSED_SPINNING_FIRE -#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) // ANIM_TAG_FIRE_PLUME -#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) // ANIM_TAG_UNUSED_LIGHTNING -#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) -#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) // ANIM_TAG_UNUSED_CLAW_SLASH -#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) -#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) // ANIM_TAG_UNUSED_SCRATCH -#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) // ANIM_TAG_UNUSED_SCRATCH_2 -#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // ANIM_TAG_UNUSED_BUBBLE_BURST_2 -#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) -#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) // ANIM_TAG_UNUSED_GLASS_2 -#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) // ANIM_TAG_UNUSED_PINK_HEART -#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) // ANIM_TAG_UNUSED_SAP_DRIP -#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // ANIM_TAG_UNUSED_SAP_DRIP_2 -#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) // ANIM_TAG_SPARKLE_1 -#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) // ANIM_TAG_SPARKLE_2 -#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) // ANIM_TAG_HUMANOID_FOOT - -#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT -#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND -#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE -#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK -#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST -#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT -#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING -#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS -#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z -#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2 -#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH -#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS -#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF -#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER -#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER -#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE -#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER -#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE -#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER -#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3 -#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4 -#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES -#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) -#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND -#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT -#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES -#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2 -#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK -#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK -#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL -#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE -#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES -#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT -#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2 -#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE -#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH -#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL -#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE -#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD -#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING -#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE -#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA -#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING -#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL -#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL -#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB -#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) -#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN - -#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG -#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG -#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG -#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) // ANIM_TAG_UNUSED_FANGS -#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) // ANIM_TAG_UNUSED_EXPLOSION_2 -#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) // ANIM_TAG_UNUSED_EXPLOSION_3 -#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) // ANIM_TAG_UNUSED_WATER_DROPLET -#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // ANIM_TAG_UNUSED_WATER_DROPLET_2 -#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) // ANIM_TAG_UNUSED_SEED -#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) // ANIM_TAG_UNUSED_SPROUT -#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) // ANIM_TAG_UNUSED_RED_WAND -#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // ANIM_TAG_UNUSED_PURPLE_GREEN_UNK -#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) // ANIM_TAG_UNUSED_WATER_COLUMN -#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) // ANIM_TAG_UNUSED_MUD_UNK -#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) // ANIM_TAG_RAIN_DROPS -#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) // ANIM_TAG_UNUSED_FURY_SWIPES -#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) // ANIM_TAG_UNUSED_VINE_2 -#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) // ANIM_TAG_UNUSED_TEETH -#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) // ANIM_TAG_UNUSED_BONE -#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) // ANIM_TAG_UNUSED_WHITE_BAG -#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) // ANIM_TAG_UNUSED_UNKNOWN -#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) // ANIM_TAG_UNUSED_PURPLE_CORAL -#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // ANIM_TAG_UNUSED_PURPLE_DROPLET -#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) // ANIM_TAG_UNUSED_SHOCK_2 -#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // ANIM_TAG_UNUSED_CLOSING_EYE_2 -#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) // ANIM_TAG_UNUSED_METAL_BALL -#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) // ANIM_TAG_UNUSED_MONSTER_DOLL -#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) // ANIM_TAG_UNUSED_WHIRLWIND -#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // ANIM_TAG_UNUSED_WHIRLWIND_2 -#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) // ANIM_TAG_UNUSED_EXPLOSION_4 -#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) // ANIM_TAG_UNUSED_EXPLOSION_5 -#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) // ANIM_TAG_UNUSED_TONGUE -#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) // ANIM_TAG_UNUSED_SMOKE -#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) // ANIM_TAG_UNUSED_SMOKE_2 -#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) // ANIM_TAG_IMPACT -#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) // ANIM_TAG_CIRCLE_IMPACT -#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) // ANIM_TAG_SCRATCH -#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138) // ANIM_TAG_CUT -#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139) // ANIM_TAG_SHARP_TEETH -#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140) // ANIM_TAG_RAINBOW_RINGS -#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141) // ANIM_TAG_ICE_CRYSTALS -#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142) // ANIM_TAG_ICE_SPIKES -#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143) // ANIM_TAG_HANDS_AND_FEET -#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144) // ANIM_TAG_MIST_CLOUD -#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145) // ANIM_TAG_CLAMP -#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146) // ANIM_TAG_BUBBLE -#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147) // ANIM_TAG_ORBS -#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT -#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB -#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) - -#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) -#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES -#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2 -#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154) // ANIM_TAG_AIR_WAVE_2 -#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155) // ANIM_TAG_SMALL_BUBBLES -#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156) // ANIM_TAG_ROUND_SHADOW -#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157) // ANIM_TAG_SUNLIGHT -#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158) // ANIM_TAG_SPORE -#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159) // ANIM_TAG_FLOWER -#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160) // ANIM_TAG_RAZOR_LEAF -#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161) // ANIM_TAG_NEEDLE -#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162) // ANIM_TAG_WHIRLWIND_LINES -#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163) // ANIM_TAG_GOLD_RING -#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164) // ANIM_TAG_PURPLE_RING -#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165) // ANIM_TAG_BLUE_RING -#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166) // ANIM_TAG_GREEN_LIGHT_WALL -#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167) // ANIM_TAG_BLUE_LIGHT_WALL -#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168) // ANIM_TAG_RED_LIGHT_WALL -#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169) // ANIM_TAG_GRAY_LIGHT_WALL -#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170) // ANIM_TAG_ORANGE_LIGHT_WALL -#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171) // ANIM_TAG_BLACK_BALL_2 -#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172) // ANIM_TAG_PURPLE_GAS_CLOUD -#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173) // ANIM_TAG_SPARK_H -#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174) // ANIM_TAG_YELLOW_STAR -#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) // ANIM_TAG_LARGE_FRESH_EGG -#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) // ANIM_TAG_SHADOW_BALL -#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) // ANIM_TAG_LICK -#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) // ANIM_TAG_UNUSED_VOID_LINES -#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) // ANIM_TAG_STRING -#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) // ANIM_TAG_STRING_DOT -#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) // ANIM_TAG_WEB -#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) // ANIM_TAG_UNUSED_LIGHTBULB -#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) // ANIM_TAG_SLASH -#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) // ANIM_TAG_FOCUS_ENERGY -#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) // ANIM_TAG_SPHERE_TO_CUBE -#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186) // ANIM_TAG_TENDRILS -#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) -#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188) // ANIM_TAG_WHITE_SHADOW -#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189) // ANIM_TAG_TEAL_ALERT -#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) -#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191) // ANIM_TAG_ROUND_WHITE_HALO -#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192) // ANIM_TAG_FANG_ATTACK -#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193) // ANIM_TAG_PURPLE_HAND_OUTLINE -#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) -#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195) // ANIM_TAG_SPARKLE_5 -#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196) // ANIM_TAG_SPIRAL -#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197) // ANIM_TAG_SNORE_Z -#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) -#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) -#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT - -#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK -#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) -#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING -#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT -#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) -#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 -#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST -#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL -#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE -#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210) // ANIM_TAG_MAGENTA_HEART -#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211) // ANIM_TAG_ELECTRIC_ORBS -#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212) // ANIM_TAG_CIRCLE_OF_LIGHT -#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213) // ANIM_TAG_ELECTRICITY -#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214) // ANIM_TAG_FINGER_2 -#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215) // ANIM_TAG_MOVEMENT_WAVES -#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216) // ANIM_TAG_RED_HEART -#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217) // ANIM_TAG_RED_ORB -#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218) // ANIM_TAG_EYE_SPARKLE -#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219) // ANIM_TAG_PINK_HEART -#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) -#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221) // ANIM_TAG_DEVIL -#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222) // ANIM_TAG_SWIPE -#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223) // ANIM_TAG_ROOTS -#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) // ANIM_TAG_ITEM_BAG -#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225) // ANIM_TAG_JAGGED_MUSIC_NOTE - -#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226) // ANIM_TAG_POKEBALL -#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) // ANIM_TAG_SPOTLIGHT -#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) -#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) // ANIM_TAG_RAPID_SPIN -#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) -#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) // ANIM_TAG_WISP_ORB -#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) // ANIM_TAG_WISP_FIRE -#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) // ANIM_TAG_GOLD_STARS -#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234) // ANIM_TAG_ECLIPSING_ORB -#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235) // ANIM_TAG_GRAY_ORB -#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236) // ANIM_TAG_BLUE_ORB -#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237) // ANIM_TAG_RED_ORB_2 -#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238) // ANIM_TAG_PINK_PETAL -#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239) // ANIM_TAG_PAIN_SPLIT -#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240) // ANIM_TAG_CONFETTI -#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) -#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242) // ANIM_TAG_PINK_CLOUD -#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243) // ANIM_TAG_SWEAT_DROP -#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244) // ANIM_TAG_GUARD_RING -#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245) // ANIM_TAG_PURPLE_SCRATCH -#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246) // ANIM_TAG_PURPLE_SWIPE -#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247) // ANIM_TAG_TAG_HAND -#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE -#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB -#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) - -#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB -#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT -#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME -#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254) // ANIM_TAG_RED_BALL -#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255) // ANIM_TAG_SMELLINGSALT_EFFECT -#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256) // ANIM_TAG_METEOR -#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257) // ANIM_TAG_FLAT_ROCK -#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) -#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259) // ANIM_TAG_BROWN_ORB -#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260) // ANIM_TAG_METAL_SOUND_WAVES -#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261) // ANIM_TAG_FLYING_DIRT -#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262) // ANIM_TAG_ICICLE_SPEAR -#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263) // ANIM_TAG_HAIL -#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264) // ANIM_TAG_GLOWY_RED_ORB -#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265) // ANIM_TAG_GLOWY_GREEN_ORB -#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) // ANIM_TAG_GREEN_SPIKE -#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) // ANIM_TAG_WHITE_CIRCLE_OF_LIGHT -#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) // ANIM_TAG_GLOWY_BLUE_ORB -#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) // ANIM_TAG_UNUSED_RED_BRICK -#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) // ANIM_TAG_WHITE_FEATHER -#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) // ANIM_TAG_SPARKLE_6 -#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) // ANIM_TAG_SPLASH -#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) // ANIM_TAG_SWEAT_BEAD -#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) // ANIM_TAG_UNUSED_GEM_1 -#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) // ANIM_TAG_UNUSED_GEM_2 -#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) // ANIM_TAG_UNUSED_GEM_3 -#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) // ANIM_TAG_SLAM_HIT_2 -#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) -#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) // ANIM_TAG_UNUSED_RED_PARTICLES -#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) -#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) // ANIM_TAG_DIRT_MOUND -#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) // ANIM_TAG_SHOCK_3 -#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283) // ANIM_TAG_WEATHER_BALL -#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284) // ANIM_TAG_BIRD -#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285) // ANIM_TAG_CROSS_IMPACT -#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286) // ANIM_TAG_SLASH_2 -#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287) // ANIM_TAG_WHIP_HIT -#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // ANIM_TAG_BLUE_RING_2 - - +#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0) +#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) +#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) +#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) +#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) +#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) +#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) +#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) +#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) +#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) +#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) +#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) +#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) +#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) +#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) +#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) +#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) +#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) +#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) +#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) +#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) +#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) +#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) +#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) +#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) +#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) +#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) +#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) +#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) +#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) +#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) +#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) +#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) +#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) +#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) +#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) +#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) +#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) +#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) +#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) +#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) +#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) +#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) +#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) +#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) +#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) +#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) +#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) +#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) +#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) +#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) +#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) +#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) +#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) +#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) +#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) +#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) +#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) +#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) +#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) +#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) +#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) +#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) +#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) +#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) +#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) +#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) +#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) +#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) +#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) +#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) +#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) +#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) +#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) +#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) +#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) +#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) +#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) +#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) +#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) +#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) +#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) +#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) +#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) +#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) +#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) +#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) +#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) +#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) +#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) +#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) +#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) +#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) +#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) +#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) +#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) +#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) +#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) +#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) +#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) +#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) +#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) +#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) +#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) +#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) +#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) +#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) +#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) +#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) +#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) +#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) +#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) +#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) +#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) +#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) +#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) +#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) +#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) +#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) +#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) +#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) +#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) +#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) +#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) +#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) +#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) +#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) +#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) +#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) +#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) +#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) +#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) +#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) +#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) +#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) +#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) +#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) +#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) +#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138) +#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139) +#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140) +#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141) +#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142) +#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143) +#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144) +#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145) +#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146) +#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147) +#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148) +#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149) +#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) +#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) +#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152) +#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153) +#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154) +#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155) +#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156) +#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157) +#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158) +#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159) +#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160) +#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161) +#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162) +#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163) +#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164) +#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165) +#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166) +#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167) +#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168) +#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169) +#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170) +#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171) +#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172) +#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173) +#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174) +#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) +#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) +#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) +#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) +#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) +#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) +#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) +#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) +#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) +#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) +#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) +#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186) +#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) +#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188) +#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189) +#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) +#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191) +#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192) +#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193) +#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) +#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195) +#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196) +#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197) +#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) +#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) +#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200) +#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) +#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) +#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) +#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) +#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) +#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) +#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) +#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208) +#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209) +#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210) +#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211) +#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212) +#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213) +#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214) +#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215) +#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216) +#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217) +#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218) +#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219) +#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) +#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221) +#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222) +#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223) +#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) +#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225) +#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226) +#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) +#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) +#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) +#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) +#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) +#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) +#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) +#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234) +#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235) +#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236) +#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237) +#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238) +#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239) +#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240) +#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) +#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242) +#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243) +#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244) +#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245) +#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246) +#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247) +#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248) +#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249) +#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) +#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251) +#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252) +#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253) +#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254) +#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255) +#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256) +#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257) +#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) +#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259) +#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260) +#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261) +#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262) +#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263) +#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264) +#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265) +#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) +#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) +#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) +#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) +#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) +#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) +#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) +#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) +#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) +#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) +#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) +#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) +#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) +#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) +#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) +#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) +#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283) +#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284) +#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285) +#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286) +#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287) +#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers #define ANIM_ATTACKER 0 -- cgit v1.2.3 From b330bdba51b86959e702e904c4a5d8039e6395c7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 22 Oct 2018 19:22:57 +0200 Subject: More and more battle tower --- include/battle_tower.h | 11 ++++++----- include/global.h | 15 ++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index a47007122..4b68be923 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -7,15 +7,14 @@ struct RSBattleTowerRecord { - /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 - /*0x01*/ u8 trainerClass; + /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 + /*0x01*/ u8 facilityClass; /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; /*0x10*/ u16 greeting[6]; /*0x1C*/ struct UnknownPokemonStruct party[3]; /*0xA0*/ u32 checksum; - /*0xA4*/ u16 unk_11c8; }; union BattleTowerRecord @@ -54,12 +53,14 @@ extern const struct FacilityMon *gFacilityTrainerMons; u16 GetCurrentBattleTowerWinStreak(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); -bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); +bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); -void PutNewBattleTowerRecord(union BattleTowerRecord *); +void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); void FrontierSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); +void FillFrontierTrainerParty(u8 monsCount); +void FillFrontierTrainersParties(u8 monsCount); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/global.h b/include/global.h index 6840d5fe2..a7b50278c 100644 --- a/include/global.h +++ b/include/global.h @@ -288,7 +288,7 @@ struct Apprentice u8 lvlMode:2; // + 1 u8 field_1; u8 number; - struct ApprenticeMon monData[3]; + struct ApprenticeMon party[3]; u16 easyChatWords[6]; u8 playerId[4]; u8 playerName[PLAYER_NAME_LENGTH]; @@ -383,8 +383,8 @@ struct BattleFrontier /*0x738*/ struct EmeraldBattleTowerRecord towerRecords[5]; // From record mixing. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; - /*0xBD8*/ u8 field_BD8[11]; - /*0xBE3*/ u8 field_BE3[8]; + /*0xBD8*/ u8 field_BD8[PLAYER_NAME_LENGTH + 1]; + /*0xBE3*/ u8 field_BE0[POKEMON_NAME_LENGTH + 1]; /*0xBEB*/ u8 field_BEB; /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer; /*0xCA8*/ u8 field_CA8; @@ -395,15 +395,12 @@ struct BattleFrontier /*0xCA9*/ u8 field_CA9_d:1; // 0x20 /*0xCA9*/ u8 field_CA9_e:1; // 0x40 /*0xCA9*/ u8 field_CA9_f:1; // 0x80 - /*0xCAA*/ u16 field_CAA[3]; + /*0xCAA*/ u16 selectedPartyMons[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 battledTrainerIds[17]; - u16 field_CD6; - u16 field_CD8; - u16 field_CDA; + /*0xCB4*/ u16 field_CB4[20]; /*0xCDC*/ u32 field_CDC; - /*0xCE0*/ u16 field_CE0[4][2]; + /*0xCE0*/ u16 winStreaks[4][2]; /*0xCF0*/ u16 field_CF0[2]; /*0xCF4*/ u16 field_CF4[2]; /*0xCF8*/ u16 field_CF8[2]; -- cgit v1.2.3 From 68814c42ded612c0336bef6686556c35b7fea80a Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 23 Oct 2018 08:25:51 -0400 Subject: begin 80FE840 data --- include/battle_anim.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index fcb430816..1cb19200d 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,7 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H +#include "battle.h" #include "constants/battle_anim.h" enum @@ -128,4 +129,14 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); u8 GetBattlerSpriteFinal_Y(u8, u16, u8); +extern const struct OamData gUnknown_08524944; +extern const struct OamData gUnknown_08524A8C; +extern const struct OamData gUnknown_08524904; +extern const struct OamData gUnknown_085249C4; +extern const struct OamData gUnknown_0852490C; +extern const struct OamData gUnknown_08524934; +extern const struct OamData gUnknown_08524974; +extern const struct OamData gUnknown_0852499C; +extern const struct OamData gUnknown_085249CC; + #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 2f4b00e34b650bbc42228280a7a4bbb8e8ebf9c6 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 23 Oct 2018 12:17:31 -0400 Subject: finish effects_1 data --- include/battle_anim.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 1cb19200d..c7884aa18 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -138,5 +138,17 @@ extern const struct OamData gUnknown_08524934; extern const struct OamData gUnknown_08524974; extern const struct OamData gUnknown_0852499C; extern const struct OamData gUnknown_085249CC; +extern const struct OamData gUnknown_08524914; +extern const struct OamData gUnknown_0852496C; +extern const struct OamData gUnknown_08524A34; +extern const struct OamData gUnknown_08524A3C; +extern const struct OamData gUnknown_08524A94; +extern const struct OamData gUnknown_0852490C; +extern const struct OamData gUnknown_08524974; +extern const struct OamData gUnknown_08524954; +extern const struct OamData gUnknown_08524AE4; +extern const struct OamData gUnknown_08524914; +extern const struct OamData gUnknown_085249CC; +extern const struct OamData gUnknown_085249D4; #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 22a0b58e57a26f8636b0afcb841aef8ae4910192 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 24 Oct 2018 15:52:21 -0400 Subject: effects_2 and water data --- include/battle_anim.h | 19 +++++++++++++++---- include/sprite.h | 9 +++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index c7884aa18..61659c350 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -143,12 +143,23 @@ extern const struct OamData gUnknown_0852496C; extern const struct OamData gUnknown_08524A34; extern const struct OamData gUnknown_08524A3C; extern const struct OamData gUnknown_08524A94; -extern const struct OamData gUnknown_0852490C; -extern const struct OamData gUnknown_08524974; extern const struct OamData gUnknown_08524954; extern const struct OamData gUnknown_08524AE4; -extern const struct OamData gUnknown_08524914; -extern const struct OamData gUnknown_085249CC; extern const struct OamData gUnknown_085249D4; +extern const struct OamData gUnknown_08524A9C; +extern const struct OamData gUnknown_08524ADC; +extern const struct OamData gUnknown_08524B14; +extern const struct OamData gUnknown_08524A54; +extern const struct OamData gUnknown_08524A14; +extern const struct OamData gUnknown_08524A1C; +extern const struct OamData gUnknown_085249BC; +extern const struct OamData gUnknown_08524AF4; +extern const struct OamData gUnknown_085249DC; +extern const struct OamData gUnknown_08524AFC; +extern const struct OamData gUnknown_08524B1C; +extern const struct OamData gUnknown_08524A04; +extern const struct OamData gUnknown_08524A2C; +extern const struct OamData gUnknown_08524AEC; +extern const struct OamData gUnknown_08524964; #endif // GUARD_BATTLE_ANIM_H diff --git a/include/sprite.h b/include/sprite.h index 085faff68..32bdd9c55 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -103,12 +103,19 @@ struct AffineAnimJumpCmd u16 target; }; +struct AffineAnimEndCmdAlt +{ + s16 type; + u16 val; +}; + union AffineAnimCmd { s16 type; struct AffineAnimFrameCmd frame; struct AffineAnimLoopCmd loop; struct AffineAnimJumpCmd jump; + struct AffineAnimEndCmdAlt end; // unused in code }; #define AFFINEANIMCMDTYPE_LOOP 0x7FFD @@ -123,6 +130,8 @@ union AffineAnimCmd {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} +#define AFFINEANIMCMD_END_ALT(_val) \ + {.end = {.type = AFFINEANIMCMDTYPE_END, .val = _val}} struct AffineAnimState { -- cgit v1.2.3 From 549b669f2aa397c9d784de2ff9b91459ab26c060 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 24 Oct 2018 23:14:45 +0200 Subject: battle tower, match sth and dumb loop instead of goto --- include/battle_tower.h | 2 +- include/constants/battle_frontier.h | 4 ++++ include/global.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 4b68be923..39d75f8be 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -52,7 +52,7 @@ extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; u16 GetCurrentBattleTowerWinStreak(u8, u8); -void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); +bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index ca110aeb7..204a09f60 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -10,6 +10,10 @@ #define FRONTIER_FACILITY_PIKE 5 #define FRONTIER_FACILITY_PYRAMID 6 +#define TENT_VERDANTURF 2 +#define TENT_FALLARBOR 3 +#define TENT_SLATEPORT 4 + // Battle Frontier lvl modes. #define FRONTIER_LVL_50 0 #define FRONTIER_LVL_OPEN 1 diff --git a/include/global.h b/include/global.h index a7b50278c..0cff281e7 100644 --- a/include/global.h +++ b/include/global.h @@ -293,7 +293,7 @@ struct Apprentice u8 playerId[4]; u8 playerName[PLAYER_NAME_LENGTH]; u8 language; - u32 unk40; + u32 checksum; }; struct UnknownPokemonStruct -- cgit v1.2.3 From 17c26fae1a71d4b95b044b70c03656ef44194da5 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 24 Oct 2018 20:01:40 -0400 Subject: fire, electric, ice data --- include/battle_anim.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 61659c350..8d6785a44 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -161,5 +161,11 @@ extern const struct OamData gUnknown_08524A04; extern const struct OamData gUnknown_08524A2C; extern const struct OamData gUnknown_08524AEC; extern const struct OamData gUnknown_08524964; +extern const struct OamData gUnknown_08524B24; +extern const struct OamData gUnknown_08524A24; +extern const struct OamData gUnknown_08524AC4; +extern const struct OamData gUnknown_08524A84; +extern const struct OamData gUnknown_08524A64; +extern const struct OamData gUnknown_0852496C; #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From 1efdaebe2395c8c202b2086d485b7f348dc42783 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 25 Oct 2018 21:27:10 +0200 Subject: finish decompiling battle tower --- include/battle_tower.h | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 39d75f8be..137ce8a54 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -17,12 +17,6 @@ struct RSBattleTowerRecord /*0xA0*/ u32 checksum; }; -union BattleTowerRecord -{ - struct RSBattleTowerRecord ruby_sapphire; - struct EmeraldBattleTowerRecord emerald; -}; - struct BattleFrontierTrainer { u8 facilityClass; @@ -51,16 +45,39 @@ extern const u8 gTowerFemaleTrainerGfxIds[20]; extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; -u16 GetCurrentBattleTowerWinStreak(u8, u8); -bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); -bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); -void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); -void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); +void sub_8161F74(void); +u16 sub_8162548(u8 challengeNum, u8 battleNum); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); -void FrontierSpeechToString(const u16 *words); -void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); -void GetEreaderTrainerName(u8 *dest); +void SetEReaderTrainerGfxId(void); +u8 GetBattleFacilityTrainerGfxId(u16 trainerId); +void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); +u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); +u8 GetFrontierOpponentClass(u16 trainerId); +void GetFrontierTrainerName(u8 *dst, u16 trainerId); void FillFrontierTrainerParty(u8 monsCount); void FillFrontierTrainersParties(u8 monsCount); +u16 RandomizeFacilityTrainerMonId(u16 trainerId); +void FrontierSpeechToString(const u16 *words); +void DoSpecialTrainerBattle(void); +void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record); +void CalcRubyBattleTowerChecksum(struct RSBattleTowerRecord *record); +u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode); +u8 GetEreaderTrainerFrontSpriteId(void); +u8 GetEreaderTrainerClassId(void); +void GetEreaderTrainerName(u8 *dst); +void ValidateEReaderTrainer(void); +void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer); +void CopyEReaderTrainerGreeting(void); +void sub_81653CC(void); +bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); +bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); +void CalcApprenticeChecksum(struct Apprentice *apprentice); +void GetBattleTowerTrainerLanguage(u8 *dst, u16 trainerId); +u8 SetFacilityPtrsGetLevel(void); +u8 GetFrontierEnemyMonLevel(u8 lvlMode); +s32 GetHighestLevelInPlayerParty(void); +u8 sub_81660B8(u8 facilityClass); +bool32 ValidateBattleTowerRecord(u8 recordId); // unused +void sub_8166188(void); #endif //GUARD_BATTLE_TOWER_H -- cgit v1.2.3 From de90ce912319b219b1c9f00cca618755bc68b3e3 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 25 Oct 2018 17:46:23 -0400 Subject: finish 80FE840 data (almost) --- include/battle_anim.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 8d6785a44..6484bd6c2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -166,6 +166,12 @@ extern const struct OamData gUnknown_08524A24; extern const struct OamData gUnknown_08524AC4; extern const struct OamData gUnknown_08524A84; extern const struct OamData gUnknown_08524A64; -extern const struct OamData gUnknown_0852496C; +extern const struct OamData gUnknown_0852491C; +extern const struct OamData gUnknown_0852495C; +extern const struct OamData gUnknown_0852497C; +extern const struct OamData gUnknown_085249F4; +extern const struct OamData gUnknown_0852493C; +extern const struct OamData gUnknown_08524A5C; +extern const struct OamData gUnknown_08524A74; #endif // GUARD_BATTLE_ANIM_H -- cgit v1.2.3 From dc273cc19d842e8831548a1342af857aae2886c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 26 Oct 2018 23:54:41 +0200 Subject: Battle tower - ewram variables --- include/battle_tower.h | 4 ---- include/constants/trainers.h | 15 +++++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 137ce8a54..5fe8d1190 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,10 +1,6 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H -#define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 -#define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 -#define BATTLE_TOWER_EREADER_TRAINER_ID 500 - struct RSBattleTowerRecord { /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 diff --git a/include/constants/trainers.h b/include/constants/trainers.h index f79216d94..2ea9f7c62 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -4,12 +4,15 @@ #include "constants/opponents.h" // Special Trainer Ids. -#define TRAINER_FRONTIER_BRAIN 1022 -#define TRAINER_PLAYER 1023 -#define TRAINER_SECRET_BASE 1024 -#define TRAINER_LINK_OPPONENT 2048 -#define TRAINER_OPPONENT_C00 3072 -#define TRAINER_STEVEN_PARTNER 3075 +#define TRAINER_RECORD_MIXING_FRIEND 300 +#define TRAINER_RECORD_MIXING_APPRENTICE 400 +#define TRAINER_EREADER 500 +#define TRAINER_FRONTIER_BRAIN 1022 +#define TRAINER_PLAYER 1023 +#define TRAINER_SECRET_BASE 1024 +#define TRAINER_LINK_OPPONENT 2048 +#define TRAINER_OPPONENT_C00 3072 +#define TRAINER_STEVEN_PARTNER 3075 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 -- cgit v1.2.3 From b252bd029279b6f28518c59df1ba03caf44d756f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 00:53:07 +0200 Subject: Window priority to window bg --- include/window.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/window.h b/include/window.h index 29fdf8833..692ca1d81 100644 --- a/include/window.h +++ b/include/window.h @@ -3,7 +3,7 @@ enum { - WINDOW_PRIORITY, + WINDOW_BG, WINDOW_TILEMAP_LEFT, WINDOW_TILEMAP_TOP, WINDOW_WIDTH, @@ -15,7 +15,7 @@ enum struct WindowTemplate { - u8 priority; + u8 bg; u8 tilemapLeft; u8 tilemapTop; u8 width; -- cgit v1.2.3 From 826d0ea2abe1ef505fb6b2b9b78e36c5c7a76c0e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 15:44:29 +0200 Subject: Begin frontier records --- include/field_specials.h | 1 + include/global.h | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/field_specials.h b/include/field_specials.h index 0e2daf9c3..50823ba7d 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -15,5 +15,6 @@ bool32 sub_8138168(void); bool32 sub_81381B0(void); bool32 sub_81381F8(void); bool32 CountSSTidalStep(u16 delta); +void sub_813A878(u8 a0); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/global.h b/include/global.h index 0cff281e7..d23800139 100644 --- a/include/global.h +++ b/include/global.h @@ -401,10 +401,7 @@ struct BattleFrontier /*0xCB4*/ u16 field_CB4[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 winStreaks[4][2]; - /*0xCF0*/ u16 field_CF0[2]; - /*0xCF4*/ u16 field_CF4[2]; - /*0xCF8*/ u16 field_CF8[2]; - /*0xCFC*/ u16 field_CFC[2]; + /*0xCF0*/ u16 field_CF0[4][2]; /*0xD06*/ u16 field_D00; /*0xD06*/ u16 field_D02; /*0xD06*/ u16 field_D04; -- cgit v1.2.3 From e85051712361063b04aa7a35ff5c25aed068cab9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 21:01:35 +0200 Subject: more battle frontier 2 --- include/apprentice.h | 4 +++- include/battle_frontier_2.h | 6 +++-- include/global.h | 53 ++++++++++++++++++++------------------------- include/tv.h | 2 ++ 4 files changed, 33 insertions(+), 32 deletions(-) (limited to 'include') diff --git a/include/apprentice.h b/include/apprentice.h index ca0b04800..23e1fc8f2 100644 --- a/include/apprentice.h +++ b/include/apprentice.h @@ -9,7 +9,9 @@ struct ApprenticeTrainer u16 otId; u8 facilityClass; u16 species[APPRENTICE_SPECIES_COUNT]; - u8 rest[14]; + u8 unk; + u8 unk_; + u16 easyChatWords[6]; }; extern const struct ApprenticeTrainer gApprentices[]; diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 3bd605829..c4639aded 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -2,8 +2,8 @@ #define GUARD_BATTLE_FRONTIER_2_H #define FRONTIER_BEFORE_TEXT 0 -#define FRONTIER_WIN_TEXT 1 -#define FRONTIER_LOSE_TEXT 2 +#define FRONTIER_PLAYER_LOST_TEXT 1 +#define FRONTIER_PLAYER_WON_TEXT 2 void CopyFrontierTrainerText(u8 whichText, u16 trainerId); void sub_81A8934(u8); @@ -15,5 +15,7 @@ void sub_81AA078(u16*, u8); void sub_81A4C30(void); bool8 sub_81A6BF4(void); u8 sub_81A6CA8(u8, u8); +void sub_81A3908(void); +u32 GetCurrentFacilityWinStreak(void); #endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/global.h b/include/global.h index d23800139..7f5a025be 100644 --- a/include/global.h +++ b/include/global.h @@ -331,8 +331,8 @@ struct EmeraldBattleTowerRecord /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; /*0x10*/ u16 greeting[6]; - /*0x1C*/ u16 unk1C[6]; - /*0x28*/ u16 unk28[6]; + /*0x1C*/ u16 speechWon[6]; + /*0x28*/ u16 speechLost[6]; /*0x34*/ struct UnknownPokemonStruct party[4]; /*0xE4*/ u8 language; /*0xE8*/ u32 checksum; @@ -400,8 +400,8 @@ struct BattleFrontier /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. /*0xCB4*/ u16 field_CB4[20]; /*0xCDC*/ u32 field_CDC; - /*0xCE0*/ u16 winStreaks[4][2]; - /*0xCF0*/ u16 field_CF0[4][2]; + /*0xCE0*/ u16 towerWinStreaks[4][2]; + /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; /*0xD06*/ u16 field_D00; /*0xD06*/ u16 field_D02; /*0xD06*/ u16 field_D04; @@ -418,34 +418,29 @@ struct BattleFrontier /*0xD09*/ u8 filler_D09; /*0xD0A*/ u8 field_D0A; /*0xD0B*/ u8 field_D0B; - /*0xD0C*/ u16 field_D0C[2][2]; - /*0xD14*/ u16 field_D14[2][2]; - /*0xD1C*/ u16 field_D1C[2][2]; + /*0xD0C*/ u16 domeWinStreaks[2][2]; + /*0xD14*/ u16 domeRecordWinStreaks[2][2]; + /*0xD1C*/ u16 domeTotalChampionships[2][2]; /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT]; - /*0xD64*/ u16 domeMonId[DOME_TOURNAMENT_TRAINERS_COUNT][3]; + /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][3]; /*0xD64*/ u16 field_DC4[2]; - /*0xDC8*/ u16 field_DC8[2][2]; - /*0xDD0*/ u16 field_DD0[2][2]; + /*0xDC8*/ u16 palaceWinStreaks[2][2]; + /*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; /*0xDD8*/ u16 field_DD8; - /*0xDDA*/ u16 field_DDA[2]; - /*0xDDE*/ u16 field_DDE[2]; - /*0xDE2*/ u16 field_DE2[2][2]; - /*0xDEA*/ u16 field_DEA[2]; - /*0xDEE*/ u16 field_DEE; - /*0xDF0*/ u16 field_DF0; - /*0xDF2*/ u16 field_DF2; - /*0xDF4*/ u16 field_DF4; - /*0xDF6*/ u16 field_DF6; - /*0xDF8*/ u16 field_DF8; - /*0xDFA*/ u16 field_DFA; - /*0xDFC*/ u16 field_DFC; - /*0xDFE*/ u16 field_DFE; - /*0xE00*/ u16 field_E00; + /*0xDDA*/ u16 arenaWinStreaks[2]; + /*0xDDE*/ u16 arenaRecordStreaks[2]; + /*0xDE2*/ u16 factoryWinStreaks[2][2]; + /*0xDEA*/ u16 factoryRecordWinStreaks[2][2]; + /*0xDF6*/ u16 factoryRentsCount[2][2]; + /*0xDFA*/ u16 factoryRecordRentsCount[2][2]; /*0xE02*/ u16 field_E02; - /*0xE04*/ u16 field_E04[2]; - /*0xE08*/ u16 field_E08[9]; - /*0xE1A*/ u16 field_E1A[2]; - /*0xE1E*/ u16 field_E1E[7]; + /*0xE04*/ u16 pikeWinStreaks[2]; + /*0xE08*/ u16 pikeRecordStreaks[2]; + /*0xE0C*/ u16 pikeTotalStreaks[2]; + /*0xE10*/ u16 field_E10[5]; + /*0xE1A*/ u16 pyramidWinStreaks[2]; + /*0xE1E*/ u16 pyramidRecordStreaks[2]; + /*0xE1E*/ u16 field_E1F[5]; /*0xE2C*/ struct PyramidBag pyramidBag; /*0xE58*/ u16 field_E58; /*0xE6A*/ u16 field_E6A; @@ -517,7 +512,7 @@ struct SaveBlock2 /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; /*0x21C*/ u8 field_21C[1032]; - /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array + /*0x624*/ u16 contestLinkResults[5][4]; // 4 positions for 5 categories. /*0x64C*/ struct BattleFrontier frontier; }; // sizeof=0xF2C diff --git a/include/tv.h b/include/tv.h index 4f1d7730f..5528bada7 100644 --- a/include/tv.h +++ b/include/tv.h @@ -51,5 +51,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 move); void UpdateTVScreensOnMap(int, int); void TV_PrintIntToStringVar(u8 varIdx, int value); void SaveRecordedItemPurchasesForTVShow(void); +bool8 sub_80EE818(void); +void sub_80EE8C8(u16 winStreak, u8 facilityAndMode); #endif //GUARD_TV_H -- cgit v1.2.3 From 98d8dbfd8a2e6759a38d70573256c22fb386e07d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 28 Oct 2018 00:50:06 +0200 Subject: Up to sub_81a443c --- include/global.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 7f5a025be..9a03300b2 100644 --- a/include/global.h +++ b/include/global.h @@ -447,9 +447,8 @@ struct BattleFrontier /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; /*0xE70*/ struct Struct_field_E70 field_E70[6]; - /*0xEB8*/ u16 frontierBattlePoints; - /*0xEBA*/ u8 field_EBA; - /*0xEBB*/ u8 field_EBB; + /*0xEB8*/ u16 battlePoints; + /*0xEBA*/ u16 field_EBA; /*0xEBC*/ u32 battlesCount; /*0xEC0*/ u16 field_EC0[16]; /*0xEE0*/ u8 field_EE0; -- cgit v1.2.3 From 3a9eeef84447c222a4638546d014e12b0098fe51 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 28 Oct 2018 21:11:53 +0100 Subject: Frontier, finish ranking hall --- include/battle_frontier_2.h | 21 --------------------- include/frontier_util.h | 21 +++++++++++++++++++++ include/global.h | 30 +++++++++++++++++++++++++----- include/menu.h | 1 - include/record_mixing.h | 30 ++++-------------------------- include/strings.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 93 insertions(+), 53 deletions(-) delete mode 100644 include/battle_frontier_2.h create mode 100644 include/frontier_util.h (limited to 'include') diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h deleted file mode 100644 index c4639aded..000000000 --- a/include/battle_frontier_2.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef GUARD_BATTLE_FRONTIER_2_H -#define GUARD_BATTLE_FRONTIER_2_H - -#define FRONTIER_BEFORE_TEXT 0 -#define FRONTIER_PLAYER_LOST_TEXT 1 -#define FRONTIER_PLAYER_WON_TEXT 2 - -void CopyFrontierTrainerText(u8 whichText, u16 trainerId); -void sub_81A8934(u8); -void sub_81A895C(void); -u16 sub_81A89A0(u8); -void sub_81A8AF8(void); -bool8 InBattlePike(void); -void sub_81AA078(u16*, u8); -void sub_81A4C30(void); -bool8 sub_81A6BF4(void); -u8 sub_81A6CA8(u8, u8); -void sub_81A3908(void); -u32 GetCurrentFacilityWinStreak(void); - -#endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/frontier_util.h b/include/frontier_util.h new file mode 100644 index 000000000..6740e5cda --- /dev/null +++ b/include/frontier_util.h @@ -0,0 +1,21 @@ +#ifndef GUARD_FRONTIER_UTIL_H +#define GUARD_FRONTIER_UTIL_H + +#define FRONTIER_BEFORE_TEXT 0 +#define FRONTIER_PLAYER_LOST_TEXT 1 +#define FRONTIER_PLAYER_WON_TEXT 2 + +void CopyFrontierTrainerText(u8 whichText, u16 trainerId); +void sub_81A8934(u8); +void sub_81A895C(void); +u16 sub_81A89A0(u8); +void sub_81A8AF8(void); +bool8 InBattlePike(void); +void sub_81AA078(u16*, u8); +void sub_81A4C30(void); +bool8 sub_81A6BF4(void); +u8 sub_81A6CA8(u8, u8); +void sub_81A3908(void); +u32 GetCurrentFacilityWinStreak(void); + +#endif // GUARD_FRONTIER_UTIL_H diff --git a/include/global.h b/include/global.h index 9a03300b2..c2b139e7a 100644 --- a/include/global.h +++ b/include/global.h @@ -137,6 +137,7 @@ enum LanguageId #define BAG_BERRIES_COUNT 46 #define PYRAMID_BAG_ITEMS_COUNT 10 +#define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. // string lengths #define ITEM_NAME_LENGTH 14 @@ -402,9 +403,9 @@ struct BattleFrontier /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 towerWinStreaks[4][2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; - /*0xD06*/ u16 field_D00; - /*0xD06*/ u16 field_D02; - /*0xD06*/ u16 field_D04; + /*0xD00*/ u16 field_D00; + /*0xD02*/ u16 field_D02; + /*0xD04*/ u16 field_D04; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; /*0xD08*/ u8 field_D08_0:1; @@ -482,6 +483,24 @@ struct PlayersApprentice /*0xB8*/ struct Sav2_B8 field_B8[9]; }; +struct RankingHall1P +{ + u8 id[4]; + u16 winStreak; + u8 name[PLAYER_NAME_LENGTH + 1]; + u8 language; +}; + +struct RankingHall2P +{ + u8 id1[4]; + u8 id2[4]; + u16 winStreak; + u8 name1[PLAYER_NAME_LENGTH + 1]; + u8 name2[PLAYER_NAME_LENGTH + 1]; + u8 language; +}; + struct SaveBlock2 { /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; @@ -506,11 +525,12 @@ struct SaveBlock2 /*0xA8*/ u32 field_A8; /*0xAC*/ u32 encryptionKey; /*0xB0*/ struct PlayersApprentice playerApprentice; - /*0xDC*/ struct Apprentice apprentices[4]; + /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing. /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; - /*0x21C*/ u8 field_21C[1032]; + /*0x21C*/ struct RankingHall1P hallRecords1P[HALL_FACILITIES_COUNT][2][3]; // From record mixing. + /*0x57C*/ struct RankingHall2P hallRecords2P[2][3]; // From record mixing. /*0x624*/ u16 contestLinkResults[5][4]; // 4 positions for 5 categories. /*0x64C*/ struct BattleFrontier frontier; }; // sizeof=0xF2C diff --git a/include/menu.h b/include/menu.h index d105eb5ec..175eabc07 100644 --- a/include/menu.h +++ b/include/menu.h @@ -26,7 +26,6 @@ u16 RunTextPrintersAndIsPrinter0Active(void); void sub_81973A4(void); void NewMenuHelpers_DrawDialogueFrame(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); -void NewMenuHelpers_DrawStdWindowFrame(u8, u8); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); diff --git a/include/record_mixing.h b/include/record_mixing.h index f1b74c143..0d50f46f9 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -1,35 +1,13 @@ #ifndef GUARD_RECORD_MIXING_H #define GUARD_RECORD_MIXING_H -// Exported type declarations -struct UnkRecordMixingStruct2a +struct PlayerHallRecords { - u8 playerId[4]; - u16 field_4; - u8 playerName[PLAYER_NAME_LENGTH + 1]; - u8 language; + struct RankingHall1P onePlayer[9][2]; + struct RankingHall2P twoPlayers[2]; }; -struct UnkRecordMixingStruct2b -{ - u8 playerId1[4]; - u8 playerId2[4]; - u16 field_8; - u8 playerName1[PLAYER_NAME_LENGTH + 1]; - u8 playerName2[PLAYER_NAME_LENGTH + 1]; - u8 language; -}; - -struct UnkRecordMixingStruct2 -{ - struct UnkRecordMixingStruct2a field_0[9][2]; - struct UnkRecordMixingStruct2b field_120[2]; -}; - -// Exported RAM declarations - -// Exported ROM declarations void sub_80E6BE8(void); -void sub_80E8260(struct UnkRecordMixingStruct2 *arg0); +void GetPlayerHallRecords(struct PlayerHallRecords *dst); #endif //GUARD_RECORD_MIXING_H diff --git a/include/strings.h b/include/strings.h index c563353ec..9338ae624 100644 --- a/include/strings.h +++ b/include/strings.h @@ -877,4 +877,47 @@ extern const u8 gText_PokemonOnHook[]; extern const u8 gText_NotEvenANibble[]; extern const u8 gText_ItGotAway[]; +// Frontier records. +extern const u8 gText_WinStreak[]; +extern const u8 gText_Record[]; +extern const u8 gText_Current[]; +extern const u8 gText_RoomsCleared[]; +extern const u8 gText_Prev[]; +extern const u8 gText_SingleBattleRoomResults[]; +extern const u8 gText_DoubleBattleRoomResults[]; +extern const u8 gText_MultiBattleRoomResults[]; +extern const u8 gText_LinkMultiBattleRoomResults[]; +extern const u8 gText_Lv502[]; +extern const u8 gText_OpenLv[]; +extern const u8 gText_RentalSwap[]; +extern const u8 gText_ClearStreak[]; +extern const u8 gText_Total[]; +extern const u8 gText_Championships[]; +extern const u8 gText_SingleBattleTourneyResults[]; +extern const u8 gText_DoubleBattleTourneyResults[]; +extern const u8 gText_SingleBattleHallResults[]; +extern const u8 gText_DoubleBattleHallResults[]; +extern const u8 gText_BattleChoiceResults[]; +extern const u8 gText_TimesCleared[]; +extern const u8 gText_KOsInARow[]; +extern const u8 gText_SetKOTourneyResults[]; +extern const u8 gText_TimesVar1[]; +extern const u8 gText_BattleSwapSingleResults[]; +extern const u8 gText_BattleSwapDoubleResults[]; +extern const u8 gText_FloorsCleared[]; +extern const u8 gText_BattleQuestResults[]; +extern const u8 gText_LinkContestResults[]; +extern const u8 gText_4th[]; +extern const u8 gText_3rd[]; +extern const u8 gText_2nd[]; +extern const u8 gText_1st[]; +extern const u8 gText_SpaceAndSpace[]; +extern const u8 gText_CommaSpace[]; +extern const u8 gText_NewLine[]; +extern const u8 gText_ScrollTextUp[]; +extern const u8 gText_Space2[]; +extern const u8 gText_Are[]; +extern const u8 gText_Are2[]; +extern const u8 gText_123Dot[][3]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 3cb7a33f4267127e2a222417865cfe34c7cab74d Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 30 Oct 2018 12:37:53 -0400 Subject: label back animations --- include/constants/battle_anim.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index a3d774818..496a5ed0a 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -410,4 +410,33 @@ #define ANIM_WEATHER_SANDSTORM 3 #define ANIM_WEATHER_HAIL 4 +// Battle mon back animations. +#define BACK_ANIM_NONE 0x00 +#define BACK_ANIM_H_SLIDE_QUICK 0x01 +#define BACK_ANIM_H_SLIDE 0x02 +#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03 +#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04 +#define BACK_ANIM_SHRINK_GROW_1 0x05 +#define BACK_ANIM_GROW_1 0x06 +#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07 +#define BACK_ANIM_HORIZONTAL_SHAKE 0x08 +#define BACK_ANIM_VERTICAL_SHAKE 0x09 +#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a +#define BACK_ANIM_VERTICAL_STRETCH 0x0b +#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c +#define BACK_ANIM_GROW_2 0x0d +#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e +#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f +#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10 +#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11 +#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12 +#define BACK_ANIM_DIP_RIGHT_SIDE 0x13 +#define BACK_ANIM_SHRINK_GROW_2 0x14 +#define BACK_ANIM_JOLT_RIGHT 0x15 +#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16 +#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17 +#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18 +#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19 + + #endif // GUARD_CONSTANTS_BATTLE_ANIM_H -- cgit v1.2.3 From 0da7d7e6ae7cb50ca0b52d1ea27d98e3f02e50d2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 30 Oct 2018 21:45:26 +0100 Subject: why is this function so hard to match --- include/frontier_util.h | 1 + include/save.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/frontier_util.h b/include/frontier_util.h index 6740e5cda..019210691 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -17,5 +17,6 @@ bool8 sub_81A6BF4(void); u8 sub_81A6CA8(u8, u8); void sub_81A3908(void); u32 GetCurrentFacilityWinStreak(void); +void ClearnRankingHallRecords(void); #endif // GUARD_FRONTIER_UTIL_H diff --git a/include/save.h b/include/save.h index a87e31e99..a5f014904 100644 --- a/include/save.h +++ b/include/save.h @@ -94,7 +94,7 @@ u16 CalculateChecksum(void *data, u16 size); void UpdateSaveAddresses(void); u8 HandleSavingData(u8 saveType); u8 TrySavingData(u8 saveType); -u8 sub_8153380(void); +bool8 sub_8153380(void); bool8 sub_81533AC(void); u8 sub_81533E0(void); u8 sub_8153408(void); -- cgit v1.2.3 From 7de1c4bd141bc793873b12acd7f1eaae7474bfbc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 30 Oct 2018 22:17:03 +0100 Subject: Make frontier util compile --- include/apprentice.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/apprentice.h b/include/apprentice.h index 23e1fc8f2..195106c53 100644 --- a/include/apprentice.h +++ b/include/apprentice.h @@ -9,8 +9,7 @@ struct ApprenticeTrainer u16 otId; u8 facilityClass; u16 species[APPRENTICE_SPECIES_COUNT]; - u8 unk; - u8 unk_; + u8 id; u16 easyChatWords[6]; }; -- cgit v1.2.3 From 645830624d78f9241a43aaf1f09b483c8b5e9422 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 31 Oct 2018 23:03:41 -0500 Subject: Continue script_menu.c --- include/script_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/script_menu.h b/include/script_menu.h index 8870e80b9..8dd65263a 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -13,6 +13,6 @@ s32 convert_pixel_width_to_tile_width(s32); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); u32 display_text_and_get_width(const u8*, u32); -u8 sub_80E2D5C(u8 arg0, u8 tileWidth); +u32 sub_80E2D5C(u8 arg0, u8 tileWidth); #endif //GUARD_SCRIPT_MENU_H -- cgit v1.2.3 From 37d742cbd86eab628e0d84d5957a805c407b0948 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 1 Nov 2018 15:06:50 +0100 Subject: Document recorded battle --- include/frontier_util.h | 1 + include/recorded_battle.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/frontier_util.h b/include/frontier_util.h index 019210691..d60ba11dc 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -18,5 +18,6 @@ u8 sub_81A6CA8(u8, u8); void sub_81A3908(void); u32 GetCurrentFacilityWinStreak(void); void ClearnRankingHallRecords(void); +s32 GetFronterBrainSymbol(void); #endif // GUARD_FRONTIER_UTIL_H diff --git a/include/recorded_battle.h b/include/recorded_battle.h index 81c88a15e..84c5c2ea2 100644 --- a/include/recorded_battle.h +++ b/include/recorded_battle.h @@ -14,16 +14,16 @@ u8 sub_81850D0(void); u8 sub_81850DC(u8 *arg0); void sub_81851A8(u8 *arg0); bool32 CanCopyRecordedBattleSaveData(void); -u32 MoveRecordedBattleToSaveData(void); +bool32 MoveRecordedBattleToSaveData(void); void PlayRecordedBattle(void (*CB2_After)(void)); u8 GetRecordedBattleFrontierFacility(void); -u8 sub_8185EAC(void); +u8 GetRecordedBattleFronterBrainSymbol(void); void RecordedBattle_SaveParties(void); u8 GetActiveBattlerLinkPlayerGender(void); void sub_8185F84(void); void sub_8185F90(u16 arg0); u8 sub_8185FAC(void); -u8 GetBattleStyleInRecordedBattle(void); +u8 GetBattleSceneInRecordedBattle(void); u8 GetTextSpeedInRecordedBattle(void); void RecordedBattle_CopyBattlerMoves(void); void sub_818603C(u8 arg0); @@ -31,11 +31,11 @@ u32 GetAiScriptsInRecordedBattle(void); void sub_8186444(void); bool8 sub_8186450(void); void sub_8186468(u8 *dst); -u8 sub_818649C(void); -u8 sub_81864A8(void); -u8 sub_81864B4(void); -u8 sub_81864C0(void); -void sub_81864CC(void); -u16 *sub_81864E0(void); +u8 GetRecordedBattleRecordMixFriendClass(void); +u8 GetRecordedBattleApprenticeId(void); +u8 GetRecordedBattleRecordMixFriendLanguage(void); +u8 GetRecordedBattleApprenticeLanguage(void); +void RecordedBattle_SaveBattleOutcome(void); +u16 *GetRecordedBattleEasyChatSpeech(void); #endif // GUARD_RECORDED_BATTLE_H -- cgit v1.2.3 From 0bb51037d7d3e257a84b1488016441aafd34b020 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 1 Nov 2018 21:31:10 +0100 Subject: Finish frontier util --- include/battle_dome.h | 2 +- include/battle_frontier_1.h | 6 ------ include/frontier_util.h | 26 +++++++++++++++++--------- include/new_game.h | 6 +++--- 4 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 include/battle_frontier_1.h (limited to 'include') diff --git a/include/battle_dome.h b/include/battle_dome.h index d05b08689..2265f14ce 100644 --- a/include/battle_dome.h +++ b/include/battle_dome.h @@ -3,7 +3,7 @@ extern u32 gUnknown_0203CD70; -s32 GetTrainerMonCountInBits(u16 tournamentTrainerId); +s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); s32 TrainerIdToDomeTournamentId(u16 trainerId); #endif // GUARD_BATTLE_DOME_H diff --git a/include/battle_frontier_1.h b/include/battle_frontier_1.h deleted file mode 100644 index bc777914a..000000000 --- a/include/battle_frontier_1.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GUARD_BATTLE_FRONTIER_1_H -#define GUARD_BATTLE_FRONTIER_1_H - -bool32 sub_8196034(void); - -#endif // GUARD_BATTLE_FRONTIER_1_H diff --git a/include/frontier_util.h b/include/frontier_util.h index d60ba11dc..ab85b3881 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -5,19 +5,27 @@ #define FRONTIER_PLAYER_LOST_TEXT 1 #define FRONTIER_PLAYER_WON_TEXT 2 +void CallFrontierUtilFunc(void); +u8 sub_81A3610(void); void CopyFrontierTrainerText(u8 whichText, u16 trainerId); -void sub_81A8934(u8); -void sub_81A895C(void); -u16 sub_81A89A0(u8); -void sub_81A8AF8(void); -bool8 InBattlePike(void); -void sub_81AA078(u16*, u8); -void sub_81A4C30(void); -bool8 sub_81A6BF4(void); -u8 sub_81A6CA8(u8, u8); void sub_81A3908(void); u32 GetCurrentFacilityWinStreak(void); +void sub_81A3ACC(void); +u8 GetPlayerSymbolCountForFacility(u8 facility); +void ShowRankingHallRecordsWindow(void); +void ScrollRankingHallRecordsWindow(void); void ClearnRankingHallRecords(void); +u8 GetFrontierBrainTrainerPicIndex(void); +u8 GetFrontierBrainTrainerClass(void); +void CopyFrontierBrainTrainerName(u8 *dst); +bool8 IsFrontierBrainFemale(void); +void SetFrontierBrainEventObjGfx_2(void); +void CreateFrontierBrainPokemon(void); +u16 GetFrontierBrainMonSpecies(u8 monId); +void SetFrontierBrainEventObjGfx(u8 facility); +u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId); +u8 GetFrontierBrainMonNature(u8 monId); +u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId); s32 GetFronterBrainSymbol(void); #endif // GUARD_FRONTIER_UTIL_H diff --git a/include/new_game.h b/include/new_game.h index 7e1169ec3..7032647ea 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -1,9 +1,9 @@ #ifndef GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H -void WriteUnalignedWord(u32 var, u8 *dataPtr); -u32 ReadUnalignedWord(u8* dataPtr); -void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom); +void SetTrainerId(u32 trainerId, u8 *dst); +u32 GetTrainerId(u8 *trainerId); +void CopyTrainerId(u8 *dst, u8 *src); void NewGameInitData(void); void sub_808447C(void); void Sav2_ClearSetDefault(void); -- cgit v1.2.3 From 6d0d69f3a5c83ae44fbbc5d29e384306ea031ab4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 4 Nov 2018 23:09:10 +0100 Subject: Match Render Text --- include/text.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/text.h b/include/text.h index f677f2ced..23873ce54 100644 --- a/include/text.h +++ b/include/text.h @@ -120,7 +120,7 @@ enum { FONTATTR_COLOR_SHADOW }; -struct TextPrinterSubStruct +struct TextPrinterSubSubStruct { u8 font_type:4; // 0x14 u8 font_type_upper:1; @@ -130,6 +130,11 @@ struct TextPrinterSubStruct u8 field_1_top:1; u8 frames_visible_counter; u8 field_3; +}; + +struct TextPrinterSubStruct +{ + struct TextPrinterSubSubStruct sub; u8 field_4; // 0x18 u8 field_5; u8 field_6; @@ -216,7 +221,7 @@ extern u8 gStringVar3[]; extern u8 gStringVar4[]; u8 gUnknown_03002F84; -u8 gUnknown_03002F90[0x20]; +u8 gUnknown_03002F90[]; u8 gUnknown_03002FB0[0x20]; u8 gUnknown_03002FD0[0x20]; u8 gUnknown_03002FF0[0x20]; -- cgit v1.2.3 From 487a6c2b2c641a9b022ec47f809ac4a3e68f8ac7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 5 Nov 2018 21:42:12 +0100 Subject: this file is --- include/text.h | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/text.h b/include/text.h index 23873ce54..db0d48bfc 100644 --- a/include/text.h +++ b/include/text.h @@ -120,7 +120,7 @@ enum { FONTATTR_COLOR_SHADOW }; -struct TextPrinterSubSubStruct +struct TextPrinterSubStruct { u8 font_type:4; // 0x14 u8 font_type_upper:1; @@ -129,16 +129,6 @@ struct TextPrinterSubSubStruct u8 field_1_upmid:2; u8 field_1_top:1; u8 frames_visible_counter; - u8 field_3; -}; - -struct TextPrinterSubStruct -{ - struct TextPrinterSubSubStruct sub; - u8 field_4; // 0x18 - u8 field_5; - u8 field_6; - u8 active; }; struct TextSubPrinter // TODO: Better name @@ -164,14 +154,14 @@ struct TextPrinter void (*callback)(struct TextSubPrinter *, u16); // 0x10 - union { + union __attribute__((packed)) { struct TextPrinterSubStruct sub; - - u8 sub_fields[8]; + u8 sub_fields[7]; } sub_union; + u8 active; u8 state; // 0x1C - u8 text_speed; + u8 textSpeed; u8 delayCounter; u8 scrollDistance; u8 minLetterSpacing; // 0x20 @@ -213,6 +203,16 @@ typedef struct { u8 flag_3:1; } TextFlags; +struct Struct_03002F90 +{ + u8 unk0[0x20]; + u8 unk20[0x20]; + u8 unk40[0x20]; + u8 unk60[0x20]; + u8 unk80; + u8 unk81; +}; + extern TextFlags gTextFlags; extern u8 gStringVar1[]; @@ -220,12 +220,8 @@ extern u8 gStringVar2[]; extern u8 gStringVar3[]; extern u8 gStringVar4[]; -u8 gUnknown_03002F84; -u8 gUnknown_03002F90[]; -u8 gUnknown_03002FB0[0x20]; -u8 gUnknown_03002FD0[0x20]; -u8 gUnknown_03002FF0[0x20]; -u8 gGlyphDimensions[0x2]; +extern u8 gUnknown_03002F84; +extern struct Struct_03002F90 gUnknown_03002F90; void SetFontsPointer(const struct FontInfo *fonts); void DeactivateAllTextPrinters(void); -- cgit v1.2.3 From 7dd4ed70601039d0c811752211b4aefa1d09b69b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 5 Nov 2018 14:45:54 -0600 Subject: r5/r6 swap on sub_80E2578 --- include/field_specials.h | 1 + include/menu.h | 10 ++++++---- include/script_menu.h | 2 +- include/strings.h | 7 +++++++ 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/field_specials.h b/include/field_specials.h index 0e2daf9c3..8422af061 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -15,5 +15,6 @@ bool32 sub_8138168(void); bool32 sub_81381B0(void); bool32 sub_81381F8(void); bool32 CountSSTidalStep(u16 delta); +void sub_813A128(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/menu.h b/include/menu.h index d105eb5ec..f4960119e 100644 --- a/include/menu.h +++ b/include/menu.h @@ -32,7 +32,7 @@ void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -void sub_8197930(void); +void DisplayYesNoMenu(void); u8 GetPlayerTextSpeed(void); void sub_81978B0(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16)); @@ -44,8 +44,8 @@ void schedule_bg_copy_tilemap_to_vram(u8 bgNum); void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs); u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos); u8 GetMenuCursorPos(void); -s8 ProcessMenuInput(void); -s8 Menu_ProcessInputNoWrapAround(void); +s8 Menu_ProcessInput(void); +s8 Menu_ProcessInputNoWrap(void); void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y); void reset_temp_tile_data_buffers(void); void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode); @@ -53,7 +53,7 @@ bool8 free_temp_tile_data_buffers_if_possible(void); struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock); void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, int size, u16 offset, u8 mode); -s8 Menu_ProcessInputNoWrap_(void); +s8 Menu_ProcessInputNoWrapClearOnChoose(void); s8 ProcessMenuInput_other(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); @@ -88,5 +88,7 @@ void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP); void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram); void sub_8197AE8(bool8 copyToVram); +void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs); +s8 Menu_ProcessInputGridLayout(void); #endif // GUARD_MENU_H diff --git a/include/script_menu.h b/include/script_menu.h index 8dd65263a..587e3e08b 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -13,6 +13,6 @@ s32 convert_pixel_width_to_tile_width(s32); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); u32 display_text_and_get_width(const u8*, u32); -u32 sub_80E2D5C(u8 arg0, u8 tileWidth); +u32 sub_80E2D5C(u8 arg0, u32 tileWidth); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/strings.h b/include/strings.h index c563353ec..3600dd891 100644 --- a/include/strings.h +++ b/include/strings.h @@ -877,4 +877,11 @@ extern const u8 gText_PokemonOnHook[]; extern const u8 gText_NotEvenANibble[]; extern const u8 gText_ItGotAway[]; +extern const u8 gText_HallOfFame[]; +extern const u8 gText_LogOff[]; +extern const u8 gText_LanettesPC[]; +extern const u8 gText_SomeonesPC[]; +extern const u8 gText_PlayersPC[]; +extern const u8 gText_WhichPCShouldBeAccessed[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 258ec3162f981932a83d08e404f1944a12b3f952 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 5 Nov 2018 22:13:59 +0100 Subject: frontier util review changes --- include/constants/battle_frontier.h | 3 +++ include/frontier_util.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 204a09f60..b5ad4f072 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -38,4 +38,7 @@ #define SPECIAL_BATTLE_PIKE_DOUBLE 9 #define SPECIAL_BATTLE_PYRAMID 10 +// For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. +#define RESULTS_LINK_CONTEST 7 + #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/frontier_util.h b/include/frontier_util.h index ab85b3881..cfc3a8af4 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -14,7 +14,7 @@ void sub_81A3ACC(void); u8 GetPlayerSymbolCountForFacility(u8 facility); void ShowRankingHallRecordsWindow(void); void ScrollRankingHallRecordsWindow(void); -void ClearnRankingHallRecords(void); +void ClearRankingHallRecords(void); u8 GetFrontierBrainTrainerPicIndex(void); u8 GetFrontierBrainTrainerClass(void); void CopyFrontierBrainTrainerName(u8 *dst); -- cgit v1.2.3 From 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 10:44:48 -0600 Subject: Begin cleaning text.c --- include/menu.h | 6 +++--- include/text.h | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index d105eb5ec..9becfc582 100644 --- a/include/menu.h +++ b/include/menu.h @@ -27,7 +27,7 @@ void sub_81973A4(void); void NewMenuHelpers_DrawDialogueFrame(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); void NewMenuHelpers_DrawStdWindowFrame(u8, u8); -u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); +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 DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); @@ -35,7 +35,7 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_81978B0(u16 arg0); -void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16)); +void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); void sub_8198070(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); @@ -83,7 +83,7 @@ void sub_819A344(u8 a0, u8 *dest, u8 color); void RemoveMapNamePopUpWindow(void); u8 GetMapNamePopUpWindowId(void); u8 AddMapNamePopUpWindow(void); -void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing); +void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing); void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP); void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram); diff --git a/include/text.h b/include/text.h index db0d48bfc..658a32147 100644 --- a/include/text.h +++ b/include/text.h @@ -122,18 +122,18 @@ enum { struct TextPrinterSubStruct { - u8 font_type:4; // 0x14 - u8 font_type_upper:1; + u8 glyphId:4; // 0x14 + bool8 hasPrintBeenSpedUp:1; u8 font_type_5:3; - u8 field_1:5; - u8 field_1_upmid:2; - u8 field_1_top:1; + u8 downArrowDelay:5; + u8 downArrowYPosIdx:2; + bool8 hasGlyphIdBeenSet:1; u8 frames_visible_counter; }; -struct TextSubPrinter // TODO: Better name +struct TextPrinterTemplate { - const u8* current_text_offset; + const u8* currentChar; u8 windowId; u8 fontId; u8 x; @@ -150,9 +150,9 @@ struct TextSubPrinter // TODO: Better name struct TextPrinter { - struct TextSubPrinter subPrinter; + struct TextPrinterTemplate printerTemplate; - void (*callback)(struct TextSubPrinter *, u16); // 0x10 + void (*callback)(struct TextPrinterTemplate *, u16); // 0x10 union __attribute__((packed)) { struct TextPrinterSubStruct sub; @@ -197,7 +197,7 @@ struct KeypadIcon }; typedef struct { - u8 flag_0:1; + u8 canABSpeedUpPrint:1; u8 flag_1:1; u8 flag_2:1; u8 flag_3:1; @@ -225,8 +225,8 @@ extern struct Struct_03002F90 gUnknown_03002F90; void SetFontsPointer(const struct FontInfo *fonts); void DeactivateAllTextPrinters(void); -u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); -bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); +u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)); +bool16 AddTextPrinter(struct TextPrinterTemplate *template, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)); void RunTextPrinters(void); bool16 IsTextPrinterActive(u8 id); u32 RenderFont(struct TextPrinter *textPrinter); -- cgit v1.2.3 From f8d337e491f531285f6067e2e7f39a8d606036d6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 11:30:21 -0600 Subject: Finish cleaning up text.c --- include/menu.h | 2 +- include/text.h | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index 9becfc582..bc62eddf6 100644 --- a/include/menu.h +++ b/include/menu.h @@ -33,7 +33,7 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); -u8 GetPlayerTextSpeed(void); +u8 GetPlayerTextSpeedDelay(void); void sub_81978B0(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); diff --git a/include/text.h b/include/text.h index 658a32147..4946f1c5f 100644 --- a/include/text.h +++ b/include/text.h @@ -114,7 +114,7 @@ enum { FONTATTR_MAX_LETTER_HEIGHT, FONTATTR_LETTER_SPACING, FONTATTR_LINE_SPACING, - FONTATTR_COLOR_LOWNIBBLE, // dunno what this is yet + FONTATTR_UNKNOWN, // dunno what this is yet FONTATTR_COLOR_FOREGROUND, FONTATTR_COLOR_BACKGROUND, FONTATTR_COLOR_SHADOW @@ -124,11 +124,11 @@ struct TextPrinterSubStruct { u8 glyphId:4; // 0x14 bool8 hasPrintBeenSpedUp:1; - u8 font_type_5:3; + u8 unk:3; u8 downArrowDelay:5; u8 downArrowYPosIdx:2; bool8 hasGlyphIdBeenSet:1; - u8 frames_visible_counter; + u8 autoScrollDelay; }; struct TextPrinterTemplate @@ -142,7 +142,7 @@ struct TextPrinterTemplate u8 currentY; u8 letterSpacing; u8 lineSpacing; - u8 fontColor_l:4; // 0xC + u8 unk:4; // 0xC u8 fgColor:4; u8 bgColor:4; u8 shadowColor:4; @@ -156,8 +156,8 @@ struct TextPrinter union __attribute__((packed)) { struct TextPrinterSubStruct sub; - u8 sub_fields[7]; - } sub_union; + u8 fields[7]; + } subUnion; u8 active; u8 state; // 0x1C @@ -175,7 +175,7 @@ struct FontInfo u8 maxLetterHeight; u8 letterSpacing; u8 lineSpacing; - u8 fontColor_l:4; + u8 unk:4; u8 fgColor:4; u8 bgColor:4; u8 shadowColor:4; @@ -185,22 +185,22 @@ extern const struct FontInfo *gFonts; struct GlyphWidthFunc { - u32 font_id; + u32 fontId; u32 (*func)(u16 glyphId, bool32 isJapanese); }; struct KeypadIcon { - u16 tile_offset; + u16 tileOffset; u8 width; u8 height; }; typedef struct { - u8 canABSpeedUpPrint:1; - u8 flag_1:1; - u8 flag_2:1; - u8 flag_3:1; + bool8 canABSpeedUpPrint:1; + bool8 useAlternateDownArrow:1; + bool8 autoScroll:1; + bool8 forceMidTextSpeed:1; } TextFlags; struct Struct_03002F90 -- cgit v1.2.3 From 15117a8d09743141595b3a8a1075b2fb74ccc8f7 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 6 Nov 2018 23:15:57 +0000 Subject: Remove redundancy in berry.c --- include/berry.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/berry.h b/include/berry.h index cfd66c61e..bef56ae41 100644 --- a/include/berry.h +++ b/include/berry.h @@ -2,11 +2,6 @@ #define GUARD_BERRY_H #define BERRY_NONE 0 -#define FIRST_BERRY ITEM_CHERI_BERRY -#define LAST_BERRY ITEM_ENIGMA_BERRY - -#define GETBERRYID(berry) ((berry - FIRST_BERRY) + 1) -#define GETITEMID(berry) ((berry + FIRST_BERRY) - 1) enum { -- cgit v1.2.3 From 054a015c950ca9869ce28245a2f13c3f72cddb37 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 20:13:40 -0600 Subject: Finish decompiling/porting script_menu --- include/field_effect.h | 2 + include/script_menu.h | 8 +- include/strings.h | 254 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/field_effect.h b/include/field_effect.h index e05ded621..3fa39aae0 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -237,5 +237,7 @@ void sub_80B7CAC(struct Sprite*); void sub_80B7A58(struct Sprite*); void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); +void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); +u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/script_menu.h b/include/script_menu.h index 587e3e08b..a6d52c31e 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -1,7 +1,7 @@ #ifndef GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H -extern const u8 *const gUnknown_0858BAF0[9]; +extern const u8 *const gUnknown_0858BAF0[]; bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); @@ -9,10 +9,10 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); -s32 convert_pixel_width_to_tile_width(s32); +int convert_pixel_width_to_tile_width(int); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); -u32 display_text_and_get_width(const u8*, u32); -u32 sub_80E2D5C(u8 arg0, u32 tileWidth); +int display_text_and_get_width(const u8*, int); +int sub_80E2D5C(int arg0, int tileWidth); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/strings.h b/include/strings.h index 3600dd891..9147f9a8c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -15,6 +15,28 @@ extern const u8 gText_Cute[]; extern const u8 gText_Smart[]; extern const u8 gText_Tough[]; +extern const u8 gText_Normal[]; +extern const u8 gText_Super[]; +extern const u8 gText_Hyper[]; +extern const u8 gText_Master[]; + +extern const u8 gText_Cool2[]; +extern const u8 gText_Beauty2[]; +extern const u8 gText_Cute2[]; +extern const u8 gText_Smart2[]; +extern const u8 gText_Tough2[]; + +extern const u8 gText_Items[]; +extern const u8 gText_Key_Items[]; +extern const u8 gText_Poke_Balls[]; +extern const u8 gText_TMs_Hms[]; +extern const u8 gText_Berries2[]; + +extern const u8 gText_Single2[]; +extern const u8 gText_Double2[]; +extern const u8 gText_Multi[]; +extern const u8 gText_MultiLink[]; + extern const u8 gText_Single[]; extern const u8 gText_Double[]; @@ -201,6 +223,14 @@ extern const u8 gText_Peak[]; extern const u8 gText_SafariBallStock[]; extern const u8 gText_BattlePyramidFloor[]; +extern const u8 gText_MenuOptionPokedex[]; +extern const u8 gText_MenuOptionPokemon[]; +extern const u8 gText_MenuOptionBag[]; +extern const u8 gText_MenuOptionPokenav[]; +extern const u8 gText_MenuOptionSave[]; +extern const u8 gText_MenuOptionOption[]; +extern const u8 gText_MenuOptionExit[]; + // save menu texts extern const u8 gText_ConfirmSave[]; extern const u8 gText_DifferentSaveFile[]; @@ -884,4 +914,228 @@ extern const u8 gText_SomeonesPC[]; extern const u8 gText_PlayersPC[]; extern const u8 gText_WhichPCShouldBeAccessed[]; +extern const u8 gUnknown_085EAD37[]; +extern const u8 gUnknown_085EAD41[]; +extern const u8 gUnknown_085EAD67[]; +extern const u8 gUnknown_085EAD6D[]; +extern const u8 gUnknown_085EAD72[]; +extern const u8 gUnknown_085EAD84[]; +extern const u8 gUnknown_085EAD96[]; +extern const u8 gUnknown_085EADA4[]; +extern const u8 gUnknown_085EADB5[]; +extern const u8 gUnknown_085EADC4[]; +extern const u8 gUnknown_085EADD5[]; +extern const u8 gUnknown_085EADE7[]; +extern const u8 gUnknown_085EADF9[]; +extern const u8 gUnknown_085EAE04[]; +extern const u8 gUnknown_085EAE12[]; +extern const u8 gUnknown_085EAE1B[]; +extern const u8 gUnknown_085EAE27[]; +extern const u8 gUnknown_085EAE2C[]; +extern const u8 gUnknown_085EAE31[]; +extern const u8 gUnknown_085EAE35[]; +extern const u8 gUnknown_085EAE39[]; +extern const u8 gUnknown_085EAE3D[]; +extern const u8 gUnknown_085EAE41[]; +extern const u8 gUnknown_085EAD5F[]; +extern const u8 gUnknown_085EAE53[]; +extern const u8 gUnknown_085EAE5A[]; +extern const u8 gText_Yes[]; +extern const u8 gText_No[]; +extern const u8 gUnknown_085EAEA2[]; +extern const u8 gUnknown_085EAEAC[]; +extern const u8 gUnknown_0827ECBC[]; +extern const u8 gUnknown_0827ECC3[]; +extern const u8 gUnknown_0827ECCD[]; +extern const u8 gUnknown_0827ECD5[]; +extern const u8 gUnknown_0827ECDD[]; +extern const u8 gUnknown_0827ECE3[]; +extern const u8 gUnknown_0827ECEB[]; +extern const u8 gUnknown_0827ECF2[]; +extern const u8 gUnknown_0827ECF8[]; +extern const u8 gUnknown_0827ED00[]; +extern const u8 gUnknown_0827ED06[]; +extern const u8 gUnknown_0827ED10[]; +extern const u8 gUnknown_0827ED18[]; +extern const u8 gUnknown_0827ED22[]; +extern const u8 gUnknown_0827ED2C[]; +extern const u8 gUnknown_0827ED36[]; +extern const u8 gUnknown_0827ED40[]; +extern const u8 gUnknown_0827ED46[]; +extern const u8 gUnknown_0827ED4F[]; +extern const u8 gUnknown_0827ED59[]; +extern const u8 gUnknown_0827ED65[]; +extern const u8 gUnknown_0827ED70[]; +extern const u8 gUnknown_0827ED74[]; +extern const u8 gUnknown_0827ED78[]; +extern const u8 gUnknown_0827ED80[]; +extern const u8 gUnknown_0827ED95[]; +extern const u8 gUnknown_0827EDAA[]; +extern const u8 gUnknown_0827EDB5[]; +extern const u8 gUnknown_0827EDBA[]; +extern const u8 gUnknown_0827EDC1[]; +extern const u8 gUnknown_0827EDC9[]; +extern const u8 gUnknown_0827EDD5[]; +extern const u8 gUnknown_0827EDE4[]; +extern const u8 gUnknown_0827EDF0[]; +extern const u8 gUnknown_0827EDF5[]; +extern const u8 gUnknown_0827EDF7[]; +extern const u8 gUnknown_0827EDF9[]; +extern const u8 gUnknown_0827EDFB[]; +extern const u8 gUnknown_0827EDFD[]; +extern const u8 gUnknown_0827EDFF[]; +extern const u8 gUnknown_0827EE01[]; +extern const u8 gUnknown_0827EE03[]; +extern const u8 gUnknown_0827EE05[]; +extern const u8 gUnknown_0827EE07[]; +extern const u8 gUnknown_0827EE09[]; +extern const u8 gUnknown_085EAEC3[]; +extern const u8 gUnknown_085EAED6[]; +extern const u8 gUnknown_085EAEE6[]; +extern const u8 gUnknown_085EAEF6[]; +extern const u8 gUnknown_085EAF02[]; +extern const u8 gUnknown_085EAF0E[]; +extern const u8 gUnknown_085EAF1B[]; +extern const u8 gUnknown_085EAF24[]; +extern const u8 gUnknown_085EAF2F[]; +extern const u8 gUnknown_085EAF34[]; +extern const u8 gUnknown_085EAF3E[]; +extern const u8 gUnknown_085EAF4B[]; +extern const u8 gUnknown_085EAF58[]; +extern const u8 gUnknown_085EAF65[]; +extern const u8 gUnknown_085EAF70[]; +extern const u8 gUnknown_085EAF7D[]; +extern const u8 gUnknown_085EAF87[]; +extern const u8 gUnknown_085EAF93[]; +extern const u8 gUnknown_085EAF9F[]; +extern const u8 gUnknown_085EAFAB[]; +extern const u8 gUnknown_085EAFB6[]; +extern const u8 gUnknown_085EAFCF[]; +extern const u8 gUnknown_085EAFE8[]; +extern const u8 gUnknown_085EB089[]; +extern const u8 gUnknown_085EB09C[]; +extern const u8 gUnknown_085EB0AF[]; +extern const u8 gUnknown_085EB0C2[]; +extern const u8 gUnknown_085EB0D5[]; +extern const u8 gUnknown_085EB002[]; +extern const u8 gUnknown_085EB017[]; +extern const u8 gUnknown_085EB02A[]; +extern const u8 gUnknown_085EB034[]; +extern const u8 gText_LilycoveCity[]; +extern const u8 gUnknown_085EB07E[]; +extern const u8 gUnknown_085EB084[]; +extern const u8 gUnknown_085EB040[]; +extern const u8 gUnknown_085EB04A[]; +extern const u8 gUnknown_085EB057[]; +extern const u8 gUnknown_085EB062[]; +extern const u8 gText_Opponent[]; +extern const u8 gText_Tourney_Tree[]; +extern const u8 gText_ReadyToStart[]; +extern const u8 gUnknown_085EB5BC[]; +extern const u8 gUnknown_085EB5C3[]; +extern const u8 gUnknown_085EB5C8[]; +extern const u8 gUnknown_085EB29A[]; +extern const u8 gUnknown_085EB2A3[]; +extern const u8 gUnknown_085EB372[]; +extern const u8 gUnknown_085EB37F[]; +extern const u8 gUnknown_085EB389[]; +extern const u8 gUnknown_085EAE6E[]; +extern const u8 gUnknown_085EAE7C[]; +extern const u8 gUnknown_085EAE8A[]; +extern const u8 gUnknown_085EAD6D[]; +extern const u8 gUnknown_085EB397[]; +extern const u8 gUnknown_085EB3A4[]; +extern const u8 gUnknown_085EB3B1[]; +extern const u8 gUnknown_085EB3D4[]; +extern const u8 gUnknown_085EB3C6[]; +extern const u8 gText_NormalRank[]; +extern const u8 gText_SuperRank[]; +extern const u8 gText_HyperRank[]; +extern const u8 gText_MasterRank[]; +extern const u8 gText_BattleBag[]; +extern const u8 gText_HeldItem[]; +extern const u8 gText_LinkContest[]; +extern const u8 gText_AboutE_Mode[]; +extern const u8 gText_AboutG_Mode[]; +extern const u8 gText_E_Mode[]; +extern const u8 gText_G_Mode[]; +extern const u8 gUnknown_085EB278[]; +extern const u8 gUnknown_085EB28A[]; +extern const u8 gUnknown_085EB290[]; +extern const u8 gUnknown_085EB295[]; +extern const u8 gUnknown_085EB2E4[]; +extern const u8 gUnknown_085EB2F0[]; +extern const u8 gUnknown_085EB2FC[]; +extern const u8 gUnknown_085EB3DF[]; +extern const u8 gUnknown_085EB3EA[]; +extern const u8 gUnknown_085EB3F1[]; +extern const u8 gUnknown_085EB3FC[]; +extern const u8 gUnknown_085EB40A[]; +extern const u8 gUnknown_085EB415[]; +extern const u8 gUnknown_085EB41D[]; +extern const u8 gUnknown_085EB424[]; +extern const u8 gUnknown_085EB45C[]; +extern const u8 gUnknown_085EB469[]; +extern const u8 gUnknown_085EB475[]; +extern const u8 gUnknown_085EB482[]; +extern const u8 gUnknown_085EB42F[]; +extern const u8 gUnknown_085EB43A[]; +extern const u8 gUnknown_085EB444[]; +extern const u8 gUnknown_085EB451[]; +extern const u8 gUnknown_085EB48E[]; +extern const u8 gUnknown_085EB496[]; +extern const u8 gUnknown_085EB4A3[]; +extern const u8 gUnknown_085EB4AD[]; +extern const u8 gUnknown_085EB4B9[]; +extern const u8 gUnknown_085EB4C7[]; +extern const u8 gUnknown_085EB4D4[]; +extern const u8 gUnknown_085EB4E0[]; +extern const u8 gUnknown_085EB532[]; +extern const u8 gUnknown_085EB543[]; +extern const u8 gUnknown_085EB555[]; +extern const u8 gUnknown_085EB563[]; +extern const u8 gUnknown_085EB56E[]; +extern const u8 gUnknown_085EB57E[]; +extern const u8 gUnknown_085EB589[]; +extern const u8 gUnknown_085EB5B6[]; +extern const u8 gUnknown_085EE14B[]; +extern const u8 gUnknown_085EE14F[]; +extern const u8 gUnknown_085EB2FF[]; +extern const u8 gUnknown_085EB310[]; +extern const u8 gUnknown_085EB317[]; +extern const u8 gUnknown_085EB31F[]; +extern const u8 gText_CaveOfOrigin[]; +extern const u8 gText_MtPyre[]; +extern const u8 gText_SkyPillar[]; +extern const u8 gText_DontRemember[]; +extern const u8 gUnknown_085EB597[]; +extern const u8 gUnknown_085EB32D[]; +extern const u8 gUnknown_085EB33E[]; +extern const u8 gUnknown_085EB350[]; +extern const u8 gUnknown_085EB361[]; + +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F96[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_278831[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787FC[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_278831[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787FC[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 9f50ba1ce38dfad92477acf16e2f159c9f410072 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 7 Nov 2018 12:35:31 -0600 Subject: Fix incorrect compressed types, part 2 --- include/battle_anim.h | 6 +-- include/decompress.h | 6 +-- include/graphics.h | 137 +++++++++++++++++++++++++++++--------------------- 3 files changed, 85 insertions(+), 64 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 6484bd6c2..653be10b8 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -27,9 +27,9 @@ struct UnknownAnimStruct2 struct BattleAnimBackground { - void *image; - void *palette; - void *tilemap; + const u32 *image; + const u32 *palette; + const u32 *tilemap; }; #define ANIM_ARGS_COUNT 8 diff --git a/include/decompress.h b/include/decompress.h index e98181c82..853230aea 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -5,8 +5,8 @@ extern u8 gDecompressionBuffer[0x4000]; -void LZDecompressWram(const void *src, void *dest); -void LZDecompressVram(const void *src, void *dest); +void LZDecompressWram(const u32 *src, void *dest); +void LZDecompressVram(const u32 *src, void *dest); u16 LoadCompressedObjectPic(const struct CompressedSpriteSheet *src); void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer); @@ -28,6 +28,6 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); -u32 GetDecompressedDataSize(const u8 *ptr); +u32 GetDecompressedDataSize(const u32 *ptr); #endif // GUARD_DECOMPRESS_H diff --git a/include/graphics.h b/include/graphics.h index d17899a9c..a2c86a67d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4005,16 +4005,16 @@ extern const u32 gCreditsCopyrightEnd_Gfx[]; extern const u8 gPokenavConditionMarker_Gfx[]; extern const u16 gPokenavConditionMarker_Pal[]; -extern const u8 gUnknown_08D9862C[]; -extern const u8 gUnknown_08D98CC8[]; -extern const u8 gUnknown_08D987FC[]; -extern const u8 gUnknown_08D9898C[]; -extern const u8 gUnknown_08D98B28[]; -extern const u8 gUnknown_08D9853C[]; -extern const u8 gUnknown_08D85620[]; +extern const u32 gUnknown_08D9862C[]; +extern const u32 gUnknown_08D98CC8[]; +extern const u32 gUnknown_08D987FC[]; +extern const u32 gUnknown_08D9898C[]; +extern const u32 gUnknown_08D98B28[]; +extern const u32 gUnknown_08D9853C[]; +extern const u16 gUnknown_08D85620[]; extern const u16 gSummaryScreenWindow_Tilemap[]; -extern const u16 gMoveTypes_Pal[]; -extern const u8 gUnknown_08D97D0C[]; +extern const u32 gMoveTypes_Pal[]; +extern const u32 gUnknown_08D97D0C[]; extern const u16 gSummaryScreenPowAcc_Tilemap[]; extern const u16 gUnknown_08DC3C34[]; @@ -4026,7 +4026,7 @@ extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusPal_Icons[]; extern const u32 gBuyMenuFrame_Gfx[]; -extern const u16 gBuyMenuFrame_Tilemap[]; +extern const u32 gBuyMenuFrame_Tilemap[]; extern const u32 gMenuMoneyGfx[]; extern const u32 gMenuMoneyPal[]; @@ -4648,53 +4648,74 @@ extern const u32 gBattleAnimSpritePalette_286[]; extern const u32 gBattleAnimSpritePalette_287[]; extern const u32 gBattleAnimSpritePalette_288[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_00[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_02[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_03[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_04[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_07[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_09[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_11[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_12[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_15[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_16[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_17[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_20[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_21[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_00[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_02[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_03[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_04[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_07[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_09[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_11[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_12[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_15[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_16[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_17[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_18[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_20[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_21[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_22[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_24[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_00[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_02[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_03[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_04[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_05[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_06[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_07[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_08[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_09[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_10[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_11[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_12[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_13[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_14[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_15[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_16[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21[]; +extern const u32 gBattleAnimBackgroundImage_00[]; +extern const u32 gBattleAnimBackgroundImage_02[]; +extern const u32 gBattleAnimBackgroundImage_03[]; +extern const u32 gBattleAnimBackgroundImage_04[]; +extern const u32 gBattleAnimBackgroundImage_07[]; +extern const u32 gBattleAnimBackgroundImage_09[]; +extern const u32 gBattleAnimBackgroundImage_11[]; +extern const u32 gBattleAnimBackgroundImage_12[]; +extern const u32 gBattleAnimBackgroundImage_15[]; +extern const u32 gBattleAnimBackgroundImage_16[]; +extern const u32 gBattleAnimBackgroundImage_17[]; +extern const u32 gBattleAnimBackgroundImage_20[]; +extern const u32 gBattleAnimBackgroundImage_21[]; +extern const u32 gBattleAnimBackgroundPalette_00[]; +extern const u32 gBattleAnimBackgroundPalette_02[]; +extern const u32 gBattleAnimBackgroundPalette_03[]; +extern const u32 gBattleAnimBackgroundPalette_04[]; +extern const u32 gBattleAnimBackgroundPalette_07[]; +extern const u32 gBattleAnimBackgroundPalette_09[]; +extern const u32 gBattleAnimBackgroundPalette_11[]; +extern const u32 gBattleAnimBackgroundPalette_12[]; +extern const u32 gBattleAnimBackgroundPalette_15[]; +extern const u32 gBattleAnimBackgroundPalette_16[]; +extern const u32 gBattleAnimBackgroundPalette_17[]; +extern const u32 gBattleAnimBackgroundPalette_18[]; +extern const u32 gBattleAnimBackgroundPalette_20[]; +extern const u32 gBattleAnimBackgroundPalette_21[]; +extern const u32 gBattleAnimBackgroundPalette_22[]; +extern const u32 gBattleAnimBackgroundPalette_24[]; +extern const u32 gBattleAnimBackgroundTilemap_00[]; +extern const u32 gBattleAnimBackgroundTilemap_02[]; +extern const u32 gBattleAnimBackgroundTilemap_03[]; +extern const u32 gBattleAnimBackgroundTilemap_04[]; +extern const u32 gBattleAnimBackgroundTilemap_05[]; +extern const u32 gBattleAnimBackgroundTilemap_06[]; +extern const u32 gBattleAnimBackgroundTilemap_07[]; +extern const u32 gBattleAnimBackgroundTilemap_08[]; +extern const u32 gBattleAnimBackgroundTilemap_09[]; +extern const u32 gBattleAnimBackgroundTilemap_10[]; +extern const u32 gBattleAnimBackgroundTilemap_11[]; +extern const u32 gBattleAnimBackgroundTilemap_12[]; +extern const u32 gBattleAnimBackgroundTilemap_13[]; +extern const u32 gBattleAnimBackgroundTilemap_14[]; +extern const u32 gBattleAnimBackgroundTilemap_15[]; +extern const u32 gBattleAnimBackgroundTilemap_16[]; +extern const u32 gBattleAnimBackgroundTilemap_17[]; +extern const u32 gBattleAnimBackgroundTilemap_20[]; +extern const u32 gBattleAnimBackgroundTilemap_21[]; + +extern const u32 gUnknown_08D9A88C[]; +extern const u32 gContestMiscGfx[]; +extern const u32 gContestAudienceGfx[]; +extern const u32 gUnknown_08C16FA8[]; +extern const u32 gUnknown_08C16E90[]; +extern const u32 gUnknown_08C17170[]; + +// Berry blender +extern const u32 gBerryBlenderArrowTiles[]; +extern const u32 gBerryBlenderStartTiles[]; +extern const u32 gBerryBlenderMarubatsuTiles[]; +extern const u32 gBerryBlenderParticlesTiles[]; +extern const u32 gBerryBlenderCountdownNumbersTiles[]; +extern const u16 gBerryBlenderMiscPalette[]; +extern const u16 gBerryBlenderArrowPalette[]; +extern const u32 sBlenderCenterGfx[]; +extern const u32 gUnknown_08D91DB8[]; +extern const u32 gUnknown_08D927EC[]; + +extern const u32 gSlotMachineReelTime_Gfx[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 81410fee17547726e551204dcadc7271a9334aa2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 11 Nov 2018 16:44:27 +0100 Subject: Factory done --- include/battle.h | 4 +++- include/battle_factory.h | 11 ++++++++--- include/battle_factory_screen.h | 7 +++++++ include/battle_tower.h | 4 ++-- include/frontier_util.h | 1 + include/pokemon.h | 2 +- 6 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 include/battle_factory_screen.h (limited to 'include') diff --git a/include/battle.h b/include/battle.h index f34364ea6..5f925b925 100644 --- a/include/battle.h +++ b/include/battle.h @@ -498,7 +498,9 @@ struct BattleStruct struct BattleTv tv; u8 notSureWhatFieldLol[0x28]; u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT]; - u8 field_298[8]; + s8 field_298[2]; + s8 field_29A[2]; + u16 field_29C[2]; u8 field_2A0; u8 field_2A1; u8 field_2A2; diff --git a/include/battle_factory.h b/include/battle_factory.h index 1b0e44943..b2d3fc10f 100644 --- a/include/battle_factory.h +++ b/include/battle_factory.h @@ -1,7 +1,12 @@ #ifndef GUARD_BATTLE_FACTORY_H #define GUARD_BATTLE_FACTORY_H -void DoBattleFactorySelectScreen(void); -void DoBattleFactorySwapScreen(void); +void CallBattleFactoryFunction(void); +bool8 sub_81A6BF4(void); +u8 GetFactoryMonFixedIV(u8 arg0, u8 arg1); +void FillFactoryBrainParty(void); +u8 sub_81A6F70(u8 battleMode, u8 lvlMode); +u32 GetAiScriptsInBattleFactory(void); +void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 moveArg, u8 moveSlot); -#endif // GUARD_BATTLE_FACTORY_H +#endif //GUARD_BATTLE_FACTORY_H diff --git a/include/battle_factory_screen.h b/include/battle_factory_screen.h new file mode 100644 index 000000000..86d6177f6 --- /dev/null +++ b/include/battle_factory_screen.h @@ -0,0 +1,7 @@ +#ifndef GUARD_BATTLE_FACTORY_SCREEN_H +#define GUARD_BATTLE_FACTORY_SCREEN_H + +void DoBattleFactorySelectScreen(void); +void DoBattleFactorySwapScreen(void); + +#endif // GUARD_BATTLE_FACTORY_SCREEN_H diff --git a/include/battle_tower.h b/include/battle_tower.h index 5fe8d1190..90c22c982 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -21,7 +21,7 @@ struct BattleFrontierTrainer u16 speechBefore[6]; u16 speechWin[6]; u16 speechLose[6]; - const u16 *bfMonPool; + const u16 *monSets; }; struct FacilityMon @@ -52,7 +52,7 @@ u8 GetFrontierOpponentClass(u16 trainerId); void GetFrontierTrainerName(u8 *dst, u16 trainerId); void FillFrontierTrainerParty(u8 monsCount); void FillFrontierTrainersParties(u8 monsCount); -u16 RandomizeFacilityTrainerMonId(u16 trainerId); +u16 RandomizeFacilityTrainerMonSet(u16 trainerId); void FrontierSpeechToString(const u16 *words); void DoSpecialTrainerBattle(void); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record); diff --git a/include/frontier_util.h b/include/frontier_util.h index cfc3a8af4..6b6a2ea39 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -15,6 +15,7 @@ u8 GetPlayerSymbolCountForFacility(u8 facility); void ShowRankingHallRecordsWindow(void); void ScrollRankingHallRecordsWindow(void); void ClearRankingHallRecords(void); +void sub_81A4C30(void); u8 GetFrontierBrainTrainerPicIndex(void); u8 GetFrontierBrainTrainerClass(void); void CopyFrontierBrainTrainerName(u8 *dst); diff --git a/include/pokemon.h b/include/pokemon.h index 0155f7430..7cf043ba3 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -486,7 +486,7 @@ void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedI void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src); void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50); void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId); -void CreateMonWithEVSpreadPersonalityOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); +void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest); void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId); bool8 sub_80688F8(u8 caseId, u8 battlerId); -- cgit v1.2.3 From a4235c9ff85cc54f8cc1f4a832f19e64eda74b59 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 11 Nov 2018 18:33:16 +0100 Subject: Document battle arena --- include/battle.h | 12 ++++++------ include/battle_arena.h | 14 ++++++++++++++ include/battle_scripts.h | 2 +- include/constants/battle_script_commands.h | 7 +++++++ 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 include/battle_arena.h (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 5f925b925..90bef24ac 100644 --- a/include/battle.h +++ b/include/battle.h @@ -498,12 +498,12 @@ struct BattleStruct struct BattleTv tv; u8 notSureWhatFieldLol[0x28]; u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT]; - s8 field_298[2]; - s8 field_29A[2]; - u16 field_29C[2]; - u8 field_2A0; - u8 field_2A1; - u8 field_2A2; + s8 arenaMindPoints[2]; + s8 arenaSkillPoints[2]; + u16 arenaStartHp[2]; + u8 arenaLostPlayerMons; // Bits for party member, lost as in referee's decision, not by fainting. + u8 arenaLostOpponentMons; + u8 alreadyStatusedMoveAttempt; // As bits for battlers; For example when using Thunder Wave on an already paralyzed pokemon. }; #define GET_MOVE_TYPE(move, typeArg) \ diff --git a/include/battle_arena.h b/include/battle_arena.h new file mode 100644 index 000000000..bf305ea4e --- /dev/null +++ b/include/battle_arena.h @@ -0,0 +1,14 @@ +#ifndef GUARD_BATTLE_ARENA_H +#define GUARD_BATTLE_ARENA_H + +void CallBattleArenaFunction(void); +u8 BattleArena_ShowJudgmentWindow(u8 *state); +void BattleArena_InitPoints(void); +void BattleArena_AddMindPoints(u8 battler); +void BattleArena_AddSkillPoints(u8 battler); +void BattleArena_DeductMindPoints(u8 battler, u16 stringId); +void sub_81A586C(u8 battler); +void sub_81A5BF8(void); +void sub_81A5D44(void); + +#endif //GUARD_BATTLE_ARENA_H diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 9c4537363..a23fa6948 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -206,7 +206,7 @@ extern const u8 BattleScript_BerryFocusEnergyEnd2[]; extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[]; extern const u8 BattleScript_ArenaTurnBeginning[]; extern const u8 BattleScript_82DB881[]; -extern const u8 BattleScript_82DB8F3[]; +extern const u8 BattleScript_ArenaDoJudgment[]; extern const u8 BattleScript_82DAA0B[]; extern const u8 BattleScript_AskIfWantsToForfeitMatch[]; extern const u8 BattleScript_PrintPlayerForfeited[]; diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index dc07fda6e..e8a2980a5 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -68,12 +68,19 @@ #define VARIOUS_GET_MOVE_TARGET 3 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 +#define VARIOUS_ARENA_JUDGMENT_WINDOW 9 +#define VARIOUS_ARENA_OPPONENT_MON_LOST 10 +#define VARIOUS_ARENA_PLAYER_MON_LOST 11 +#define VARIOUS_ARENA_BOTH_MONS_LOST 12 #define VARIOUS_EMIT_YESNOBOX 13 +#define VARIOUS_ARENA_JUDGMENT_STRING 16 +#define VARIOUS_ARENA_WAIT_STRING 17 #define VARIOUS_WAIT_CRY 18 #define VARIOUS_RETURN_OPPONENT_MON1 19 #define VARIOUS_RETURN_OPPONENT_MON2 20 #define VARIOUS_VOLUME_DOWN 21 #define VARIOUS_VOLUME_UP 22 +#define VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT 23 #define VARIOUS_SET_TELEPORT_OUTCOME 25 #define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC 26 -- cgit v1.2.3 From 4fb463377c0d4e46deda797af2eb0f661d26465b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 12 Nov 2018 00:46:02 +0100 Subject: Start battle pike --- include/battle_factory.h | 2 +- include/fieldmap.h | 1 + include/global.h | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_factory.h b/include/battle_factory.h index b2d3fc10f..2db041b06 100644 --- a/include/battle_factory.h +++ b/include/battle_factory.h @@ -9,4 +9,4 @@ u8 sub_81A6F70(u8 battleMode, u8 lvlMode); u32 GetAiScriptsInBattleFactory(void); void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 moveArg, u8 moveSlot); -#endif //GUARD_BATTLE_FACTORY_H +#endif // GUARD_BATTLE_FACTORY_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 8287229ed..a50c79b43 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -35,6 +35,7 @@ bool8 sub_8088BF0(u16*, u16, u8); struct MapConnection *sub_8088950(u8 direction, int x, int y); bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection); bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset); +void save_serialize_map(void); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/global.h b/include/global.h index c2b139e7a..fd8284094 100644 --- a/include/global.h +++ b/include/global.h @@ -438,7 +438,10 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u16 field_E10[5]; + /*0xE10*/ u16 field_E10_1:3; + /*0xE10*/ u16 field_E10_2:4; + /*0xE10*/ u16 field_E10_3:1; + /*0xE10*/ u8 field_E10[9]; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; /*0xE1E*/ u16 field_E1F[5]; -- cgit v1.2.3 From 3b3cffac444a653e71c83e0621d7f0c52e8f4c3a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 12 Nov 2018 14:07:31 +0100 Subject: Decompile battle pike --- include/global.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index fd8284094..748021556 100644 --- a/include/global.h +++ b/include/global.h @@ -438,10 +438,10 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u16 field_E10_1:3; - /*0xE10*/ u16 field_E10_2:4; - /*0xE10*/ u16 field_E10_3:1; - /*0xE10*/ u8 field_E10[9]; + /*0xE10*/ u8 field_E10_1:3; + /*0xE10*/ u8 field_E10_2:4; + /*0xE10*/ u8 field_E10_3:1; + /*0xE12*/ u16 field_E12[4]; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; /*0xE1E*/ u16 field_E1F[5]; -- cgit v1.2.3 From d5abd7b6965eceb3dc7a808699c6114ec967733a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 12 Nov 2018 14:35:56 +0100 Subject: Document Battle Pie --- include/battle_pike.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/battle_pike.h (limited to 'include') diff --git a/include/battle_pike.h b/include/battle_pike.h new file mode 100644 index 000000000..ada5b2441 --- /dev/null +++ b/include/battle_pike.h @@ -0,0 +1,9 @@ +#ifndef GUARD_BATTLE_PIKE_H +#define GUARD_BATTLE_PIKE_H + +void CallBattlePikeFunction(void); +u8 GetBattlePikeWildMonHeaderId(void); +bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate); +bool8 InBattlePike(void); + +#endif // GUARD_BATTLE_PIKE_H -- cgit v1.2.3 From 69683f957288ae28114300552787d0f5355cd0fe Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 12 Nov 2018 15:41:19 +0100 Subject: Decompile Battle Palace --- include/global.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 748021556..3fb137425 100644 --- a/include/global.h +++ b/include/global.h @@ -424,7 +424,8 @@ struct BattleFrontier /*0xD1C*/ u16 domeTotalChampionships[2][2]; /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT]; /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][3]; - /*0xD64*/ u16 field_DC4[2]; + /*0xDC4*/ u16 field_DC4; + /*0xDC6*/ u16 field_DC6; /*0xDC8*/ u16 palaceWinStreaks[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; /*0xDD8*/ u16 field_DD8; -- cgit v1.2.3 From 1d4650711071b8f142ffccea30de20d45dd87978 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 13 Nov 2018 14:19:04 +0000 Subject: Move field effects enum to defines --- include/constants/field_effects.h | 72 ++++++++++++++ include/field_effect.h | 193 -------------------------------------- include/field_region_map.h | 6 -- 3 files changed, 72 insertions(+), 199 deletions(-) create mode 100644 include/constants/field_effects.h delete mode 100644 include/field_region_map.h (limited to 'include') diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h new file mode 100644 index 000000000..b93b98201 --- /dev/null +++ b/include/constants/field_effects.h @@ -0,0 +1,72 @@ +#ifndef GUARD_FIELD_EFFECT_CONSTANTS_H +#define GUARD_FIELD_EFFECT_CONSTANTS_H + +#define FLDEFF_EXCLAMATION_MARK_ICON 0 +#define FLDEFF_USE_CUT_ON_GRASS 1 +#define FLDEFF_USE_CUT_ON_TREE 2 +#define FLDEFF_SHADOW 3 +#define FLDEFF_TALL_GRASS 4 +#define FLDEFF_RIPPLE 5 +#define FLDEFF_FIELD_MOVE_SHOW_MON 6 +#define FLDEFF_ASH 7 +#define FLDEFF_SURF_BLOB 8 +#define FLDEFF_USE_SURF 9 +#define FLDEFF_DUST 10 +#define FLDEFF_USE_SECRET_POWER_CAVE 11 +#define FLDEFF_JUMP_TALL_GRASS 12 +#define FLDEFF_SAND_FOOTPRINTS 13 +#define FLDEFF_JUMP_BIG_SPLASH 14 +#define FLDEFF_SPLASH 15 +#define FLDEFF_JUMP_SMALL_SPLASH 16 +#define FLDEFF_LONG_GRASS 17 +#define FLDEFF_JUMP_LONG_GRASS 18 +#define FLDEFF_UNKNOWN_19 19 +#define FLDEFF_UNKNOWN_20 20 +#define FLDEFF_UNKNOWN_21 21 +#define FLDEFF_UNKNOWN_22 22 +#define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23 +#define FLDEFF_DEEP_SAND_FOOTPRINTS 24 +#define FLDEFF_POKECENTER_HEAL 25 +#define FLDEFF_USE_SECRET_POWER_TREE 26 +#define FLDEFF_USE_SECRET_POWER_SHRUB 27 +#define FLDEFF_TREE_DISGUISE 28 +#define FLDEFF_MOUNTAIN_DISGUISE 29 +#define FLDEFF_NPCFLY_OUT 30 +#define FLDEFF_USE_FLY 31 +#define FLDEFF_FLY_IN 32 +#define FLDEFF_QUESTION_MARK_ICON 33 +#define FLDEFF_FEET_IN_FLOWING_WATER 34 +#define FLDEFF_BIKE_TIRE_TRACKS 35 +#define FLDEFF_SAND_DISGUISE 36 +#define FLDEFF_USE_ROCK_SMASH 37 +#define FLDEFF_USE_DIG 38 +#define FLDEFF_SAND_PILE 39 +#define FLDEFF_USE_STRENGTH 40 +#define FLDEFF_SHORT_GRASS 41 +#define FLDEFF_HOT_SPRINGS_WATER 42 +#define FLDEFF_USE_WATERFALL 43 +#define FLDEFF_USE_DIVE 44 +#define FLDEFF_POKEBALL 45 +#define FLDEFF_HEART_ICON 46 +#define FLDEFF_NOP_47 47 +#define FLDEFF_NOP_48 48 +#define FLDEFF_POP_OUT_OF_ASH 49 +#define FLDEFF_LAVARIDGE_GYM_WARP 50 +#define FLDEFF_SWEET_SCENT 51 +#define FLDEFF_SAND_PILLAR 52 +#define FLDEFF_BUBBLES 53 +#define FLDEFF_SPARKLE 54 +#define FLDEFF_SECRET_POWER_CAVE 55 +#define FLDEFF_SECRET_POWER_TREE 56 +#define FLDEFF_SECRET_POWER_SHRUB 57 +#define FLDEFF_CUT_GRASS 58 +#define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59 +#define FLDEFF_USE_FLY_ANCIENT_TOMB 60 +#define FLDEFF_PCTURN_ON 61 +#define FLDEFF_HALL_OF_FAME_RECORD 62 +#define FLDEFF_USE_TELEPORT 63 +#define FLDEFF_64 64 +#define FLDEFF_65 65 +#define FLDEFF_66 66 + +#endif diff --git a/include/field_effect.h b/include/field_effect.h index 2881a2cd7..7620cedcd 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -1,85 +1,12 @@ #ifndef GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H -#include "task.h" - extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2]; extern const struct SpritePalette gNewGameBirchObjectPaletteInfo; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2]; extern const struct SpriteTemplate gNewGameBirchObjectTemplate; extern const struct OamData gNewGameBirchOamAttributes; -enum FieldEffectScriptIdx -{ - FLDEFF_EXCLAMATION_MARK_ICON, - FLDEFF_USE_CUT_ON_GRASS, - FLDEFF_USE_CUT_ON_TREE, - FLDEFF_SHADOW, - FLDEFF_TALL_GRASS, - FLDEFF_RIPPLE, - FLDEFF_FIELD_MOVE_SHOW_MON, - FLDEFF_ASH, - FLDEFF_SURF_BLOB, - FLDEFF_USE_SURF, - FLDEFF_DUST, - FLDEFF_USE_SECRET_POWER_CAVE, - FLDEFF_JUMP_TALL_GRASS, - FLDEFF_SAND_FOOTPRINTS, - FLDEFF_JUMP_BIG_SPLASH, - FLDEFF_SPLASH, - FLDEFF_JUMP_SMALL_SPLASH, - FLDEFF_LONG_GRASS, - FLDEFF_JUMP_LONG_GRASS, - FLDEFF_UNKNOWN_19, - FLDEFF_UNKNOWN_20, - FLDEFF_UNKNOWN_21, - FLDEFF_UNKNOWN_22, - FLDEFF_BERRY_TREE_GROWTH_SPARKLE, - FLDEFF_DEEP_SAND_FOOTPRINTS, - FLDEFF_POKECENTER_HEAL, - FLDEFF_USE_SECRET_POWER_TREE, - FLDEFF_USE_SECRET_POWER_SHRUB, - FLDEFF_TREE_DISGUISE, - FLDEFF_MOUNTAIN_DISGUISE, - FLDEFF_NPCFLY_OUT, - FLDEFF_USE_FLY, - FLDEFF_FLY_IN, - FLDEFF_QUESTION_MARK_ICON, - FLDEFF_FEET_IN_FLOWING_WATER, - FLDEFF_BIKE_TIRE_TRACKS, - FLDEFF_SAND_DISGUISE, - FLDEFF_USE_ROCK_SMASH, - FLDEFF_USE_DIG, - FLDEFF_SAND_PILE, - FLDEFF_USE_STRENGTH, - FLDEFF_SHORT_GRASS, - FLDEFF_HOT_SPRINGS_WATER, - FLDEFF_USE_WATERFALL, - FLDEFF_USE_DIVE, - FLDEFF_POKEBALL, - FLDEFF_HEART_ICON, - FLDEFF_NOP_47, - FLDEFF_NOP_48, - FLDEFF_POP_OUT_OF_ASH, - FLDEFF_LAVARIDGE_GYM_WARP, - FLDEFF_SWEET_SCENT, - FLDEFF_SAND_PILLAR, - FLDEFF_BUBBLES, - FLDEFF_SPARKLE, - FLDEFF_SECRET_POWER_CAVE, - FLDEFF_SECRET_POWER_TREE, - FLDEFF_SECRET_POWER_SHRUB, - FLDEFF_CUT_GRASS, - FLDEFF_FIELD_MOVE_SHOW_MON_INIT, - FLDEFF_USE_FLY_ANCIENT_TOMB, - FLDEFF_PCTURN_ON, - FLDEFF_HALL_OF_FAME_RECORD, - FLDEFF_USE_TELEPORT, - FLDEFF_64, - FLDEFF_65, - FLDEFF_66, -}; - extern s32 gFieldEffectArguments[8]; extern void (*gPostMenuFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); @@ -109,126 +36,6 @@ bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val); bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val); bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val); -void PokecenterHealEffect_0(struct Task *); -void PokecenterHealEffect_1(struct Task *); -void PokecenterHealEffect_2(struct Task *); -void PokecenterHealEffect_3(struct Task *); - -void HallOfFameRecordEffect_0(struct Task *); -void HallOfFameRecordEffect_1(struct Task *); -void HallOfFameRecordEffect_2(struct Task *); -void HallOfFameRecordEffect_3(struct Task *); - -void PokeballGlowEffect_0(struct Sprite *); -void PokeballGlowEffect_1(struct Sprite *); -void PokeballGlowEffect_2(struct Sprite *); -void PokeballGlowEffect_3(struct Sprite *); -void PokeballGlowEffect_4(struct Sprite *); -void PokeballGlowEffect_5(struct Sprite *); -void PokeballGlowEffect_6(struct Sprite *); -void PokeballGlowEffect_7(struct Sprite *); - -bool8 sub_80B6BCC(struct Task *); -bool8 sub_80B6C74(struct Task *); -bool8 sub_80B6C90(struct Task *); -bool8 sub_80B6D04(struct Task *); -bool8 sub_80B6DBC(struct Task *); -bool8 sub_80B6DD8(struct Task *); -bool8 sub_80B6E18(struct Task *); - -bool8 sub_80B6EC0(struct Task *); -bool8 sub_80B6EE0(struct Task *); -bool8 sub_80B6F50(struct Task *); -bool8 sub_80B6F74(struct Task *); -bool8 sub_80B6F84(struct Task *); -bool8 sub_80B6FA8(struct Task *); - -bool8 sub_80B7114(struct Task *); -bool8 sub_80B7190(struct Task *); -bool8 sub_80B71D0(struct Task *); -bool8 sub_80B7230(struct Task *); -bool8 sub_80B7270(struct Task *); -bool8 sub_80B72D0(struct Task *); -bool8 sub_80B72F4(struct Task *); - -bool8 sub_80B73D0(struct Task *, struct EventObject *); -bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); -bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); -bool8 sub_80B7450(struct Task *, struct EventObject *); -bool8 sub_80B7478(struct Task *, struct EventObject *); - -bool8 dive_1_lock(struct Task *); -bool8 dive_2_unknown(struct Task *); -bool8 dive_3_unknown(struct Task *); - -bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *); - -bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *); - -bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); - -static void EscapeRopeFieldEffect_Step0(struct Task *); -static void EscapeRopeFieldEffect_Step1(struct Task *); - -void sub_80B7EC4(struct Task *); -void sub_80B7EE8(struct Task *); - -void sub_80B8280(struct Task *); -void sub_80B830C(struct Task *); -void sub_80B8410(struct Task *); - -void sub_80B8584(struct Task *); -void sub_80B85F8(struct Task *); -void sub_80B8660(struct Task *); -void sub_80B86EC(struct Task *); -void sub_80B871C(struct Task *); -void sub_80B8770(struct Task *); -void overworld_bg_setup_2(struct Task *); - -void sub_80B88E4(struct Task *); -void sub_80B8920(struct Task *); -void sub_80B898C(struct Task *); -void sub_80B89DC(struct Task *); -void sub_80B8A0C(struct Task *); -void sub_80B8A44(struct Task *); -void sub_80B8A64(struct Task *); - -void sub_80B8DB4(struct Task *); -void sub_80B8E14(struct Task *); -void sub_80B8E60(struct Task *); -void sub_80B8EA8(struct Task *); -void sub_80B8F24(struct Task *); - -void sub_80B9204(struct Task *); -void sub_80B925C(struct Task *); -void sub_80B92A0(struct Task *); -void sub_80B92F8(struct Task *); -void sub_80B933C(struct Task *); -void sub_80B9390(struct Task *); -void sub_80B9418(struct Task *); -void sub_80B9474(struct Task *); -void sub_80B9494(struct Task *); - -void sub_80B9804(struct Task *); -void sub_80B98B8(struct Task *); -void sub_80B9924(struct Task *); -void sub_80B9978(struct Task *); -void sub_80B99F0(struct Task *); -void sub_80B9A28(struct Task *); -void sub_80B9A60(struct Task *); - void sub_80B9C28(s16*, u8); void sub_80B9C54(s16*, u8); void sub_80B9CDC(s16*, u8); diff --git a/include/field_region_map.h b/include/field_region_map.h deleted file mode 100644 index d50f1265c..000000000 --- a/include/field_region_map.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GUARD_FIELD_REGION_MAP_H -#define GUARD_FIELD_REGION_MAP_H - -void FieldInitRegionMap(MainCallback callback); - -#endif // GUARD_FIELD_REGION_MAP_H -- cgit v1.2.3 From 269aebaca762b91f7b455dba2534d26b54187ec5 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 15:35:46 -0500 Subject: update createsprite macro and rename BANK to BATTLER --- include/constants/battle_anim.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 496a5ed0a..709f4b7b2 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -298,10 +298,10 @@ #define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers -#define ANIM_ATTACKER 0 -#define ANIM_TARGET 1 -#define ANIM_ATK_PARTNER 2 -#define ANIM_DEF_PARTNER 3 +#define ANIM_BATTLER_ATTACKER 0 +#define ANIM_BATTLER_TARGET 1 +#define ANIM_BATTLER_ATK_PARTNER 2 +#define ANIM_BATTLER_DEF_PARTNER 3 // stereo panning constants [0-255] // -- cgit v1.2.3 From c6833c903ca3fafbf3b8d5afd19a53785b1633e3 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 13 Nov 2018 16:19:52 -0500 Subject: remove extra macro and shorten names --- include/constants/battle_anim.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 709f4b7b2..34a45395c 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -298,10 +298,10 @@ #define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers -#define ANIM_BATTLER_ATTACKER 0 -#define ANIM_BATTLER_TARGET 1 -#define ANIM_BATTLER_ATK_PARTNER 2 -#define ANIM_BATTLER_DEF_PARTNER 3 +#define ANIM_ATTACKER 0 +#define ANIM_TARGET 1 +#define ANIM_ATK_PARTNER 2 +#define ANIM_DEF_PARTNER 3 // stereo panning constants [0-255] // -- cgit v1.2.3 From 6fcf878e2f8b4836a2652cd2c90ef5cf67c4b976 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 13 Nov 2018 22:28:46 +0000 Subject: Tidy up header files --- include/battle_controllers.h | 2 -- include/battle_interface.h | 2 -- include/event_scripts.h | 50 ++++++++++++++++++++++++++++++++++++++++++++ include/main.h | 2 -- 4 files changed, 50 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index b449bb501..ff5a629af 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -1,8 +1,6 @@ #ifndef GUARD_BATTLE_CONTROLLERS_H #define GUARD_BATTLE_CONTROLLERS_H -#include "battle.h" - enum { REQUEST_ALL_BATTLE, diff --git a/include/battle_interface.h b/include/battle_interface.h index 3145939d0..66a7f9828 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -1,8 +1,6 @@ #ifndef GUARD_BATTLE_INTERFACE_H #define GUARD_BATTLE_INTERFACE_H -#include "battle_controllers.h" - enum { HP_CURRENT, diff --git a/include/event_scripts.h b/include/event_scripts.h index 5b8b74d8b..dd0eca12f 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -528,4 +528,54 @@ extern const u8 MauvilleCity_PokemonCenter_1F_Text_290097[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[]; +extern const u8 EventScript_PlayerPCMale[]; +extern const u8 EventScript_PlayerPCFemale[]; +extern const u8 EventScript_SecretBasePC[]; +extern const u8 EventScript_RecordMixingSecretBasePC[]; +extern const u8 EventScript_SecretPower1[]; +extern const u8 EventScript_SecretPower2[]; +extern const u8 EventScript_PC[]; +extern const u8 EventScript_TestSignpostMsg[]; +extern const u8 EventScript_HiddenItemScript[]; +extern const u8 EventScript_2759F1[]; +extern const u8 EventScript_TV[]; +extern const u8 EventScript_ClosedSootopolisDoor[]; +extern const u8 SkyPillar_Outside_EventScript_2393F9[]; +extern const u8 EventScript_CableBoxResults[]; +extern const u8 EventScript_2A4BAC[]; +extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[]; +extern const u8 EventScript_RegionMap[]; +extern const u8 EventScript_RunningShoesManual[]; +extern const u8 EventScript_PictureBookShelf[]; +extern const u8 EventScript_BookShelf[]; +extern const u8 EventScript_PokemonCenterBookshelf[]; +extern const u8 EventScript_Vase[]; +extern const u8 EventScript_TrashCan[]; +extern const u8 EventScript_ShopShelf[]; +extern const u8 EventScript_Blueprint[]; +extern const u8 EventScript_WirelessBoxResults[]; +extern const u8 EventScript_CableBoxResults[]; +extern const u8 EventScript_Questionnaire[]; +extern const u8 EventScript_TrainerHillTimer[]; +extern const u8 EventScript_SecretBaseSandOrnament[]; +extern const u8 EventScript_SecretBaseShieldOrToyTV[]; +extern const u8 EventScript_UseSurf[]; +extern const u8 EventScript_UseWaterfall[]; +extern const u8 EventScript_CannotUseWaterfall[]; +extern const u8 EventScript_UseDive[]; +extern const u8 EventScript_UseDiveUnderwater[]; +extern const u8 EventScript_FallDownHole[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[]; +extern const u8 EventScript_Poison[]; +extern const u8 EventScript_EggHatch[]; +extern const u8 gUnknown_08273D1F[]; +extern const u8 IslandCave_EventScript_238EAF[]; +extern const u8 MauvilleCity_EventScript_1DF7BA[]; +extern const u8 Route119_EventScript_1F49EC[]; +extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; +extern const u8 RustboroCity_Gym_EventScript_21307B[]; +extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[]; +extern const u8 SSTidalCorridor_EventScript_23C050[]; +extern const u8 gUnknown_082A8350[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/main.h b/include/main.h index 3de34de13..47b26b1c7 100644 --- a/include/main.h +++ b/include/main.h @@ -1,8 +1,6 @@ #ifndef GUARD_MAIN_H #define GUARD_MAIN_H -#include "global.h" - typedef void (*MainCallback)(void); typedef void (*IntrCallback)(void); typedef void (*IntrFunc)(void); -- cgit v1.2.3 From eb66b60f3813dda5cd6aae92401c10300b4a3515 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 17 Nov 2018 15:30:34 +0100 Subject: Begin battle pyramid --- include/battle_pyramid_bag.h | 1 + include/global.h | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h index 2301b0aa0..48f8de3c0 100644 --- a/include/battle_pyramid_bag.h +++ b/include/battle_pyramid_bag.h @@ -34,6 +34,7 @@ struct PyramidBagCursorData extern struct PyramidBagResources *gPyramidBagResources; extern struct PyramidBagCursorData gPyramidBagCursorData; +void sub_81C4EEC(void); void CB2_PyramidBagMenuFromStartMenu(void); void sub_81C4F84(void); void sub_81C5924(void); diff --git a/include/global.h b/include/global.h index 5a86d5daa..25e8c7faa 100644 --- a/include/global.h +++ b/include/global.h @@ -442,12 +442,14 @@ struct BattleFrontier /*0xE10*/ u8 field_E10_1:3; /*0xE10*/ u8 field_E10_2:4; /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[4]; + /*0xE12*/ u16 field_E12[3]; + /*0xE18*/ u16 field_E18; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; - /*0xE1E*/ u16 field_E1F[5]; + /*0xE22*/ u16 field_E22[4]; + /*0xE2A*/ u8 field_E2A; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0xE58*/ u16 field_E58; + /*0xE68*/ u8 field_E68; /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; -- cgit v1.2.3 From 4e3772328815e4b01042239c1079395018fb8f81 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 18 Nov 2018 17:52:22 +0100 Subject: Document Battle Pyramid --- include/battle_pyramid.h | 24 ++++++++++++++++++++++++ include/global.h | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 include/battle_pyramid.h (limited to 'include') diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h new file mode 100644 index 000000000..5d38e9f35 --- /dev/null +++ b/include/battle_pyramid.h @@ -0,0 +1,24 @@ +#ifndef GUARD_BATTLE_PYRAMID_H +#define GUARD_BATTLE_PYRAMID_H + +void CallBattlePyramidFunction(void); +u16 LocalIdToPyramidTrainerId(u8 localId); +bool8 GetBattlePyramidTrainerFlag(u8 eventId); +void sub_81A9B04(void); +void GenerateBattlePyramidWildMon(void); +u8 GetPyramidRunMultiplier(void); +u8 InBattlePyramid(void); +bool8 InBattlePyramid_(void); +void sub_81A9E90(void); +void sub_81A9EC8(void); +void CopyPyramidTrainerSpeechBefore(u16 trainerId); +void CopyPyramidTrainerWinSpeech(u16 trainerId); +void CopyPyramidTrainerLoseSpeech(u16 trainerId); +u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); +void sub_81AA078(u16 *mapArg, u8 arg1); +void sub_81AA1D8(void); +void sub_81AA2F8(void); +u8 sub_81AAA40(void); +u16 GetBattlePyramidPickupItemId(void); + +#endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/global.h b/include/global.h index 25e8c7faa..3da68185f 100644 --- a/include/global.h +++ b/include/global.h @@ -135,6 +135,7 @@ enum LanguageId #define BAG_POKEBALLS_COUNT 16 #define BAG_TMHM_COUNT 64 #define BAG_BERRIES_COUNT 46 +#define EVENT_OBJECT_TEMPLATES_COUNT 64 #define PYRAMID_BAG_ITEMS_COUNT 10 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. @@ -907,7 +908,7 @@ struct SaveBlock1 /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; -- cgit v1.2.3 From 7ce3473b0e5858b98a2ac1c393dc46c54ecfdf22 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 18 Nov 2018 19:37:18 +0100 Subject: Clean up save related files --- include/decoration_inventory.h | 5 ++++- include/load_save.h | 1 - include/overworld.h | 2 +- include/save.h | 27 ++++++--------------------- include/save_location.h | 1 - 5 files changed, 11 insertions(+), 25 deletions(-) (limited to 'include') diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index e1fec36ea..7539f7240 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -1,12 +1,15 @@ #ifndef GUARD_DECORATION_INVENTORY_H #define GUARD_DECORATION_INVENTORY_H -struct DecorationInventory { + +struct DecorationInventory +{ u8 *items; u8 size; }; extern struct DecorationInventory gDecorationInventories[]; +void SetDecorationInventoriesPointers(void); void ClearDecorationInventories(void); s8 GetFirstEmptyDecorSlot(u8 idx); u8 CheckHasDecoration(u8); diff --git a/include/load_save.h b/include/load_save.h index b8b27ade5..c64a1179b 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -30,6 +30,5 @@ void LoadPlayerBag(void); void SavePlayerBag(void); void ApplyNewEncryptionKeyToHword(u16 *hWord, u32 newKey); void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey); -void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey); #endif // GUARD_LOAD_SAVE_H diff --git a/include/overworld.h b/include/overworld.h index 6b38a8782..3e9d42a22 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -73,7 +73,7 @@ void SetFixedHoleWarpAsDestination(s16 x, s16 y); void warp1_set_to_sav1w(void); void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084F6C(u8 a1); -void sub_8084FAC(void); +void sub_8084FAC(int unused); const struct MapConnection *GetMapConnection(u8 dir); static bool8 SetDiveWarp(u8 dir, u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); diff --git a/include/save.h b/include/save.h index a5f014904..b151f1064 100644 --- a/include/save.h +++ b/include/save.h @@ -54,7 +54,12 @@ enum SAVE_HALL_OF_FAME_ERASE_BEFORE // unused }; -#define SECTION_ID_RECORDED_BATTLE 31 +#define SECTOR_SAVE_SLOT_LENGTH 14 +#define SECTOR_ID_HOF_1 28 +#define SECTOR_ID_HOF_2 29 +#define SECTOR_ID_TRAINER_HILL 30 +#define SECTOR_ID_RECORDED_BATTLE 31 +#define SECTORS_COUNT 32 extern u16 gLastWrittenSector; extern u32 gLastSaveCounter; @@ -72,26 +77,6 @@ extern struct SaveSection gSaveDataBuffer; void ClearSaveData(void); void Save_ResetSaveCounters(void); -bool32 SetDamagedSectorBits(u8 op, u8 bit); -u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location); -u8 HandleWriteSector(u16 a1, const struct SaveSectionLocation *location); -u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size); -u8 TryWriteSector(u8 sector, u8 *data); -u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectionLocation *location); -u32 RestoreSaveBackupVars(const struct SaveSectionLocation *location); -u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location); -u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location); -u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location); -u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location); -u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location); -u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location); -u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location); -u8 sub_8152E10(u16 a1, const struct SaveSectionLocation *location); -u8 GetSaveValidStatus(const struct SaveSectionLocation *location); -u8 sub_81530DC(u8 a1, u8 *data, u16 size); -u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section); -u16 CalculateChecksum(void *data, u16 size); -void UpdateSaveAddresses(void); u8 HandleSavingData(u8 saveType); u8 TrySavingData(u8 saveType); bool8 sub_8153380(void); diff --git a/include/save_location.h b/include/save_location.h index 95b3a7d7d..71dbd3fd8 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -1,7 +1,6 @@ #ifndef GUARD_SAVE_LOCATION_H #define GUARD_SAVE_LOCATION_H -bool32 sub_81AFCEC(void); void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); void sub_81AFDD0(void); -- cgit v1.2.3 From 1b0cfb075723af7b457ec118eca2888df449bf9e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 18 Nov 2018 20:00:36 +0100 Subject: Party Size and Num Stats --- include/constants/pokemon.h | 7 +++++-- include/pokemon.h | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 78c1583b4..1a4741574 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -74,7 +74,10 @@ #define STAT_SPEED 3 #define STAT_SPATK 4 #define STAT_SPDEF 5 -#define STAT_ACC 6 // only in battles -#define STAT_EVASION 7 // only in battles +#define STAT_ACC 6 // Only in battles. +#define STAT_EVASION 7 // Only in battles. + +#define NUM_STATS 6 +#define NUM_BATTLE_STATS 8 #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index 7cf043ba3..3e69845e6 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -151,7 +151,6 @@ #define STATUS_PRIMARY_FAINTED 0x7 #define MAX_TOTAL_EVS 510 -#define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 struct PokemonSubstruct0 @@ -293,8 +292,6 @@ struct Unknown_806F160_Struct struct SpriteFrameImage *frameImages; }; -#define BATTLE_STATS_NO 8 - struct BattlePokemon { /*0x00*/ u16 species; @@ -312,7 +309,7 @@ struct BattlePokemon /*0x17*/ u32 spDefenseIV:5; /*0x17*/ u32 isEgg:1; /*0x17*/ u32 altAbility:1; - /*0x18*/ s8 statStages[BATTLE_STATS_NO]; + /*0x18*/ s8 statStages[NUM_BATTLE_STATS]; /*0x20*/ u8 ability; /*0x21*/ u8 type1; /*0x22*/ u8 type2; -- cgit v1.2.3 From 72f0a079a9221e314e7eecf0e920313bf83d32ac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 19 Nov 2018 09:28:55 -0600 Subject: Decompile all of battle_anim_utility_funcs --- include/battle.h | 15 ++++++++++++++- include/battle_anim.h | 17 ++++++++++++++++- include/contest.h | 2 +- include/gba/io_reg.h | 2 ++ include/graphics.h | 14 ++++++++++++++ 5 files changed, 47 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 90bef24ac..70b1856a8 100644 --- a/include/battle.h +++ b/include/battle.h @@ -660,7 +660,7 @@ struct MonSpritesGfx u8 field_F4[0x80]; u8 *barFontGfx; void *field_178; - void *field_17C; + u16 *field_17C; }; // All battle variables are declared in battle_main.c @@ -769,4 +769,17 @@ extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; + #endif // GUARD_BATTLE_H diff --git a/include/battle_anim.h b/include/battle_anim.h index 653be10b8..e164cef7a 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -9,7 +9,7 @@ enum BG_ANIM_SCREEN_SIZE, BG_ANIM_AREA_OVERFLOW_MODE, BG_ANIM2, - BG_ANIM3, + BG_ANIM_CHAR_BASE_BLOCK, BG_ANIM_PRIORITY, BG_ANIM_5, BG_ANIM_6 @@ -64,6 +64,7 @@ s8 BattleAnimAdjustPanning2(s8 pan); s16 KeepPanInRange(s16 a); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); void sub_80A4720(u16 a, u16 *b, u32 c, u8 d); +void sub_80A477C(bool8); // battle_anim_80FE840.s void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); @@ -87,6 +88,15 @@ void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); void sub_80A6E14(struct Sprite *sprite); void sub_80A7270(u8 spriteId, u8 objMode); void sub_80A73A0(u8 spriteId); +u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); +u32 sub_80A76C4(u8 a1, u8 a2, u8 a3, u8 a4); +u8 sub_80A77AC(u8 a1); +s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8); +void obj_delete_but_dont_free_vram(struct Sprite*); +u8 sub_80A89C8(int, u8, int); +void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); +void sub_80A6CC0(u32, const void*, u32); +void sub_80A6DAC(bool8); enum { @@ -127,6 +137,11 @@ u8 ItemIdToBallId(u16 itemId); u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); +// battle_anim_utility_funcs.s +void sub_8116EB4(u8); + +u32 sub_811583C(s16); + u8 GetBattlerSpriteFinal_Y(u8, u16, u8); extern const struct OamData gUnknown_08524944; diff --git a/include/contest.h b/include/contest.h index d62d33ab7..502d44b90 100644 --- a/include/contest.h +++ b/include/contest.h @@ -239,7 +239,7 @@ struct Shared18000 struct ContestStruct_field_18 { - u16 unk0; + u16 species; u16 unk2; u8 unk4_0:1; u8 unk5; diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 03faa1a87..c20b69886 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -565,12 +565,14 @@ #define WINOUT_WIN01_BG1 (1 << 1) #define WINOUT_WIN01_BG2 (1 << 2) #define WINOUT_WIN01_BG3 (1 << 3) +#define WINOUT_WIN01_BG_ALL (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3) #define WINOUT_WIN01_OBJ (1 << 4) #define WINOUT_WIN01_CLR (1 << 5) #define WINOUT_WINOBJ_BG0 (1 << 8) #define WINOUT_WINOBJ_BG1 (1 << 9) #define WINOUT_WINOBJ_BG2 (1 << 10) #define WINOUT_WINOBJ_BG3 (1 << 11) +#define WINOUT_WINOBJ_BG_ALL (WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3) #define WINOUT_WINOBJ_OBJ (1 << 12) #define WINOUT_WINOBJ_CLR (1 << 13) diff --git a/include/graphics.h b/include/graphics.h index a2c86a67d..a3af44ad7 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4697,6 +4697,20 @@ extern const u32 gBattleAnimBackgroundTilemap_17[]; extern const u32 gBattleAnimBackgroundTilemap_20[]; extern const u32 gBattleAnimBackgroundTilemap_21[]; +extern const u32 gUnknown_08C20668[]; +extern const u32 gUnknown_08C20684[]; +extern const u32 gBattleStatMask_Gfx[]; +extern const u32 gBattleStatMask1_Tilemap[]; +extern const u32 gBattleStatMask2_Tilemap[]; +extern const u32 gBattleStatMask1_Pal[]; +extern const u32 gBattleStatMask2_Pal[]; +extern const u32 gBattleStatMask3_Pal[]; +extern const u32 gBattleStatMask4_Pal[]; +extern const u32 gBattleStatMask5_Pal[]; +extern const u32 gBattleStatMask6_Pal[]; +extern const u32 gBattleStatMask7_Pal[]; +extern const u32 gBattleStatMask8_Pal[]; + extern const u32 gUnknown_08D9A88C[]; extern const u32 gContestMiscGfx[]; extern const u32 gContestAudienceGfx[]; -- cgit v1.2.3 From d22c2110de08e19618f51b0edec25bd840df58f1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 19 Nov 2018 17:16:01 +0100 Subject: Decompile mossdeep hym --- include/battle_tower.h | 2 ++ include/berry_blender.h | 2 ++ include/global.h | 5 ----- include/mossdeep_gym.h | 9 +++++++++ include/new_game.h | 3 +++ include/overworld.h | 4 ++-- include/pokedex.h | 3 +++ include/start_menu.h | 2 +- include/string_util.h | 5 +++++ 9 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 include/mossdeep_gym.h (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 90c22c982..b6adcec0c 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -38,6 +38,8 @@ extern const u8 gTowerMaleTrainerGfxIds[30]; extern const u8 gTowerFemaleFacilityClasses[20]; extern const u8 gTowerFemaleTrainerGfxIds[20]; +extern u16 gUnknown_03006298[]; + extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; diff --git a/include/berry_blender.h b/include/berry_blender.h index fb62e3fa3..e8f7bb83d 100644 --- a/include/berry_blender.h +++ b/include/berry_blender.h @@ -1,6 +1,8 @@ #ifndef GUARD_BERRY_BLENDER_H #define GUARD_BERRY_BLENDER_H +extern u8 gInGameOpponentsNo; + void DoBerryBlending(void); u16 GetBlenderArrowPosition(void); void ShowBerryBlenderRecordWindow(void); diff --git a/include/global.h b/include/global.h index 3da68185f..cc8df049f 100644 --- a/include/global.h +++ b/include/global.h @@ -61,11 +61,6 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) -extern u8 gStringVar1[]; -extern u8 gStringVar2[]; -extern u8 gStringVar3[]; -extern u8 gStringVar4[]; - // There are many quirks in the source code which have overarching behavioral differences from // a number of other files. For example, diploma.c seems to declare rodata before each use while // other files declare out of order and must be at the beginning. There are also a number of diff --git a/include/mossdeep_gym.h b/include/mossdeep_gym.h new file mode 100644 index 000000000..d729f7f59 --- /dev/null +++ b/include/mossdeep_gym.h @@ -0,0 +1,9 @@ +#ifndef GUARD_MOSSDEEP_GYM_H +#define GUARD_MOSSDEEP_GYM_H + +void sub_81A8934(u8 arg0); +void sub_81A895C(void); +u16 sub_81A89A0(u8 arg0); +void sub_81A8AF8(void); + +#endif // GUARD_MOSSDEEP_GYM_H diff --git a/include/new_game.h b/include/new_game.h index 7032647ea..f4d69cbce 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -1,6 +1,9 @@ #ifndef GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H +extern bool8 gDifferentSaveFile; +extern bool8 gUnknown_020322D5; // The purpose of this variable is unknown as it's read only 3 times(2 times in contest.c and 1 time in berry_blender.c), never written to. + void SetTrainerId(u32 trainerId, u8 *dst); u32 GetTrainerId(u8 *trainerId); void CopyTrainerId(u8 *dst, u8 *src); diff --git a/include/overworld.h b/include/overworld.h index 3e9d42a22..6f7801905 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -22,9 +22,9 @@ extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers3; - +extern u16 gUnknown_03005DA8; extern void (*gFieldCallback)(void); - +extern bool8 (*gFieldCallback2)(void); extern u8 gUnknown_03005DB4; extern u8 gFieldLinkPlayerCount; diff --git a/include/pokedex.h b/include/pokedex.h index f9e236588..11e39997c 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,6 +1,9 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H +extern u8 gUnknown_030060B0; +extern void (*gUnknown_030060B4)(void); + void ResetPokedex(void); void CopyMonCategoryText(u32 species, u8 *dst); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); diff --git a/include/start_menu.h b/include/start_menu.h index 5551b149d..2fdb3e652 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -1,7 +1,7 @@ #ifndef GUARD_START_MENU_H #define GUARD_START_MENU_H -extern bool8 (*gMenuCallback)(void); // Defined in sym_common.txt +extern bool8 (*gMenuCallback)(void); void sub_809FA18(void); void sub_809FA34(u8 taskId); diff --git a/include/string_util.h b/include/string_util.h index 7b685fcea..67149bca0 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -1,6 +1,11 @@ #ifndef GUARD_STRING_UTIL_H #define GUARD_STRING_UTIL_H +extern u8 gStringVar1[]; +extern u8 gStringVar2[]; +extern u8 gStringVar3[]; +extern u8 gStringVar4[]; + enum StringConvertMode { STR_CONV_MODE_LEFT_ALIGN, -- cgit v1.2.3 From 8a00334102f8dada18523bd3c2b57d0b68fbd6ce Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 19 Nov 2018 17:31:46 +0100 Subject: document mossdeep gym --- include/mossdeep_gym.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/mossdeep_gym.h b/include/mossdeep_gym.h index d729f7f59..c16730094 100644 --- a/include/mossdeep_gym.h +++ b/include/mossdeep_gym.h @@ -1,9 +1,9 @@ #ifndef GUARD_MOSSDEEP_GYM_H #define GUARD_MOSSDEEP_GYM_H -void sub_81A8934(u8 arg0); -void sub_81A895C(void); -u16 sub_81A89A0(u8 arg0); -void sub_81A8AF8(void); +void InitMossdeepGymTiles(bool8 arg0); +void FinishMossdeepGymTiles(void); +u16 MossdeepGym_MoveEvents(u8 arg0); +void MossdeepGym_TurnEvents(void); #endif // GUARD_MOSSDEEP_GYM_H -- cgit v1.2.3 From 37d49b34e0fafcbe6bd62f9f549efb656837ff31 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 19 Nov 2018 17:36:39 +0100 Subject: Move vars to battle_main.c --- include/battle.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 70b1856a8..c4a0fe9a5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -664,6 +664,18 @@ struct MonSpritesGfx }; // All battle variables are declared in battle_main.c +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; extern u8 gDisplayedStringBattle[300]; extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; @@ -769,17 +781,4 @@ extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; -extern u16 gBattle_WIN0H; -extern u16 gBattle_WIN0V; -extern u16 gBattle_WIN1H; -extern u16 gBattle_WIN1V; -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG0_Y; -extern u16 gBattle_BG1_X; -extern u16 gBattle_BG1_Y; -extern u16 gBattle_BG2_X; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_BG3_X; -extern u16 gBattle_BG3_Y; - #endif // GUARD_BATTLE_H -- cgit v1.2.3 From c7ca38ccf3a93c8f2880f1d0370d20aea46bd6be Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 21 Nov 2018 21:58:35 +0100 Subject: Match DecompressGlyphTile --- include/text.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/text.h b/include/text.h index 4946f1c5f..853e93e90 100644 --- a/include/text.h +++ b/include/text.h @@ -109,7 +109,8 @@ #define TEXT_SPEED_FF 0xFF -enum { +enum +{ FONTATTR_MAX_LETTER_WIDTH, FONTATTR_MAX_LETTER_HEIGHT, FONTATTR_LETTER_SPACING, @@ -205,21 +206,16 @@ typedef struct { struct Struct_03002F90 { - u8 unk0[0x20]; - u8 unk20[0x20]; - u8 unk40[0x20]; - u8 unk60[0x20]; + u32 unk0[8]; + u32 unk20[8]; + u32 unk40[8]; + u32 unk60[8]; u8 unk80; u8 unk81; }; extern TextFlags gTextFlags; -extern u8 gStringVar1[]; -extern u8 gStringVar2[]; -extern u8 gStringVar3[]; -extern u8 gStringVar4[]; - extern u8 gUnknown_03002F84; extern struct Struct_03002F90 gUnknown_03002F90; @@ -233,7 +229,7 @@ u32 RenderFont(struct TextPrinter *textPrinter); void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); -void DecompressGlyphTile(const u16 *src, u16 *dest); +void DecompressGlyphTile(const u16 *src, void *dest_); u8 GetLastTextColor(u8 colorType); void CopyGlyphToWindow(struct TextPrinter *x); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); -- cgit v1.2.3 From d70c3a94c58584a809dc90feb3b1a50cc5ca3f07 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 21 Nov 2018 23:30:04 +0100 Subject: match DecompressGlyphTile nicer --- include/text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.h b/include/text.h index 853e93e90..27a6364bb 100644 --- a/include/text.h +++ b/include/text.h @@ -229,7 +229,7 @@ u32 RenderFont(struct TextPrinter *textPrinter); void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); -void DecompressGlyphTile(const u16 *src, void *dest_); +void DecompressGlyphTile(const void *src_, void *dest_); u8 GetLastTextColor(u8 colorType); void CopyGlyphToWindow(struct TextPrinter *x); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); -- cgit v1.2.3 From 3b501cb4701cebdeaca3df9ed2b9d6833c59a4fc Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Thu, 22 Nov 2018 01:10:50 +0000 Subject: Document battle ui --- include/pokemon.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'include') diff --git a/include/pokemon.h b/include/pokemon.h index 3e69845e6..3bf728244 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -112,25 +112,6 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define TYPE_NORMAL 0x00 -#define TYPE_FIGHTING 0x01 -#define TYPE_FLYING 0x02 -#define TYPE_POISON 0x03 -#define TYPE_GROUND 0x04 -#define TYPE_ROCK 0x05 -#define TYPE_BUG 0x06 -#define TYPE_GHOST 0x07 -#define TYPE_STEEL 0x08 -#define TYPE_MYSTERY 0x09 -#define TYPE_FIRE 0x0a -#define TYPE_WATER 0x0b -#define TYPE_GRASS 0x0c -#define TYPE_ELECTRIC 0x0d -#define TYPE_PSYCHIC 0x0e -#define TYPE_ICE 0x0f -#define TYPE_DRAGON 0x10 -#define TYPE_DARK 0x11 - #define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 #define FRIENDSHIP_EVENT_VITAMIN 0x1 // unused #define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 // unused -- cgit v1.2.3 From 8e10d7c0e5171b5c6b4c5f6cfa983c2835a71890 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 25 Nov 2018 20:16:41 +0100 Subject: Match some functions --- include/bg.h | 4 ++-- include/pokemon.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/bg.h b/include/bg.h index f2d4e7948..a10abaa8d 100644 --- a/include/bg.h +++ b/include/bg.h @@ -70,14 +70,14 @@ 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_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, u16 tileOffset, u16 palette2); +void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); u16 GetBgMetricTextMode(u8 bg, u8 whichMetric); u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric); u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 screenHeight); -void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2); +void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2); u32 GetBgType(u8 bg); bool32 IsInvalidBg32(u8 bg); bool32 IsTileMapOutsideWram(u8 bg); diff --git a/include/pokemon.h b/include/pokemon.h index 3e69845e6..f9063db9e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -465,7 +465,6 @@ extern const u8 gUnknown_08329D2A[]; extern const u8 gStatStageRatios[][2]; extern const u16 gUnknown_08329D54[]; extern const struct SpriteTemplate gUnknown_08329D98[]; -extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const s8 gNatureStatTable[][5]; void ZeroBoxMonData(struct BoxPokemon *boxMon); -- cgit v1.2.3 From 256bfc3caafe1f665cc3682522d9b7ed7a0730f2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 25 Nov 2018 15:32:22 -0600 Subject: Decompile script_pokemon_util_80F87D8 --- include/contest.h | 6 ++++++ include/contest_link_80F57C4.h | 3 +++ include/contest_painting.h | 1 + include/international_string_util.h | 2 +- include/script_pokemon_util_80F87D8.h | 1 - 5 files changed, 11 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/contest.h b/include/contest.h index 502d44b90..8790d7371 100644 --- a/include/contest.h +++ b/include/contest.h @@ -226,6 +226,11 @@ extern u8 gUnknown_02039F24; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; extern u8 gUnknown_02039F30; +extern u8 gContestFinalStandings[4]; +extern u8 gContestPlayerMonIndex; +extern s16 gUnknown_02039F08[4]; +extern s16 gContestMonConditions[4]; +extern u8 gIsLinkContest; struct Shared18000 { @@ -427,5 +432,6 @@ bool8 Contest_IsMonsTurnDisabled(u8 a); bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); s8 Contest_GetMoveExcitement(u16); +void sub_80DEDA8(u8); #endif //GUARD_CONTEST_H diff --git a/include/contest_link_80F57C4.h b/include/contest_link_80F57C4.h index 3c12e5e53..b4ccf2803 100644 --- a/include/contest_link_80F57C4.h +++ b/include/contest_link_80F57C4.h @@ -1,7 +1,10 @@ #ifndef GUARD_CONTEST_LINK_80F57C4_H #define GUARD_CONTEST_LINK_80F57C4_H +void sub_80F8264(void); +void sub_80F8290(void); void sub_80F840C(void); +void sub_80F8438(void); void sub_80F8484(void); void sub_80F84C4(u8); void sub_80FC998(u8 taskId); diff --git a/include/contest_painting.h b/include/contest_painting.h index f8366a997..67a845d62 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -2,5 +2,6 @@ #define GUARD_CONTESTPAINTING_H void sub_812FDA8(u32); +void sub_812FDEC(void); #endif diff --git a/include/international_string_util.h b/include/international_string_util.h index 426a2d48c..343c5453c 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -16,7 +16,7 @@ s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2); // sub_81DB494 void PadNameString(u8 *dst, u8 padWith); void sub_81DB554(u8 *, u8); -// sub_81DB5AC +void sub_81DB5AC(u8 *); u32 sub_81DB604(const u8 *); // sub_81DB620 diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h index 7c2a1ff66..a638387c2 100644 --- a/include/script_pokemon_util_80F87D8.h +++ b/include/script_pokemon_util_80F87D8.h @@ -1,4 +1,3 @@ - #ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H #define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H -- cgit v1.2.3 From fb6120da5b2e042aba061094ca3fdf20197bc657 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 25 Nov 2018 15:50:54 -0600 Subject: Fixup some names --- include/script_pokemon_util_80F87D8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h index a638387c2..02a35ecba 100644 --- a/include/script_pokemon_util_80F87D8.h +++ b/include/script_pokemon_util_80F87D8.h @@ -2,7 +2,7 @@ #define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H u16 sub_80F903C(void); -void ReducePlayerPartyToThree(void); +void ReducePlayerPartyToSelectedMons(void); void HealPlayerParty(void); #endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H -- cgit v1.2.3 From 5947e0d229cde5e00224b3c8aff91e27f0d06dfc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 25 Nov 2018 17:00:18 -0600 Subject: Decompile rock --- include/battle_anim.h | 14 +++++++++++--- include/graphics.h | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index e164cef7a..2a6131117 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -73,9 +73,17 @@ void HandleIntroSlide(u8 terrainId); u32 GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s -void sub_80A6EEC(struct Sprite *sprite); -void sub_80A68D4(struct Sprite *sprite); +void sub_80A6450(struct Sprite *sprite); +void SetAverageBattlerPositions(u8 battlerId, bool8 a2, s16 *x, s16 *y); +void move_anim_8074EE0(struct Sprite *sprite); +void sub_80A656C(struct Sprite *sprite); +void InitAnimSpritePos(struct Sprite *sprite, u8 a2); +void sub_80A6980(struct Sprite *sprite, bool8 a2); +void StartAnimLinearTranslation(struct Sprite *sprite); +void InitAnimArcTranslation(struct Sprite *sprite); bool8 TranslateAnimLinear(struct Sprite *sprite); +void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); +void sub_80A8EE4(struct Sprite *sprite); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); @@ -85,7 +93,7 @@ void sub_80A6630(struct Sprite *sprite); void sub_80A6680(struct Sprite *sprite); void sub_80A7344(u8 spriteId); void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); -void sub_80A6E14(struct Sprite *sprite); +void InitSpriteDataForLinearTranslation(struct Sprite *sprite); void sub_80A7270(u8 spriteId, u8 objMode); void sub_80A73A0(u8 spriteId); u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); diff --git a/include/graphics.h b/include/graphics.h index a3af44ad7..ba7f87929 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4732,4 +4732,7 @@ extern const u32 gUnknown_08D927EC[]; extern const u32 gSlotMachineReelTime_Gfx[]; +extern const u32 gUnknown_08D8D410[]; +extern const u32 gUnknown_08D8D58C[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 2c2431aa4cfe13ab5e9f8c8a7665107e9e4242fd Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 26 Nov 2018 09:03:50 -0600 Subject: Decopmile bug.c (#399) --- include/battle_anim.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 2a6131117..52f4fdc22 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -84,6 +84,11 @@ void InitAnimArcTranslation(struct Sprite *sprite); bool8 TranslateAnimLinear(struct Sprite *sprite); void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void sub_80A8EE4(struct Sprite *sprite); +u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId); +void sub_80A6FD4(struct Sprite *sprite); +u16 ArcTan2Neg(s16 a, s16 b); +void sub_80A73E0(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); +void sub_80A67BC(struct Sprite *sprite); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); -- cgit v1.2.3 From 839c629d5b8c930fcc51dd342871ed59d923e54c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 26 Nov 2018 09:31:03 -0600 Subject: Decompile dragon.c --- include/battle_anim.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 52f4fdc22..f4e5d0077 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -89,6 +89,12 @@ void sub_80A6FD4(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); void sub_80A73E0(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void sub_80A67BC(struct Sprite *sprite); +void sub_80A66DC(struct Sprite *sprite); +void sub_80A6838(struct Sprite *sprite); +void sub_80A67D8(struct Sprite *sprite); +void sub_80A6864(struct Sprite *sprite, s16 a2); +s16 sub_80A861C(u8 battlerId, u8 a2); +u8 GetBattlerYCoordWithElevation(u8 battlerId); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); -- cgit v1.2.3 From 35c0fb5154e9348423ca780ec6211fc0206ad8cd Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 26 Nov 2018 09:55:31 -0600 Subject: Decompile ground.c --- include/battle_anim.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index f4e5d0077..293800623 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -95,6 +95,7 @@ void sub_80A67D8(struct Sprite *sprite); void sub_80A6864(struct Sprite *sprite, s16 a2); s16 sub_80A861C(u8 battlerId, u8 a2); u8 GetBattlerYCoordWithElevation(u8 battlerId); +void WaitAnimForDuration(struct Sprite *sprite); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); -- cgit v1.2.3 From 2425a14b1977c9e2535b2bb4ce35a0431ca24678 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 26 Nov 2018 10:25:51 -0600 Subject: Decompile fight.c --- include/battle_anim.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 293800623..16e9de0ac 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -96,6 +96,12 @@ void sub_80A6864(struct Sprite *sprite, s16 a2); s16 sub_80A861C(u8 battlerId, u8 a2); u8 GetBattlerYCoordWithElevation(u8 battlerId); void WaitAnimForDuration(struct Sprite *sprite); +void sub_80A7938(struct Sprite *sprite); +void InitAnimLinearTranslation(struct Sprite *sprite); +void sub_80A6F98(struct Sprite *sprite); +u8 sub_80A8328(u8 battlerId); +void *sub_80A8050(s16 bottom, s16 top); +void sub_80A8048(s16 *bottom, s16 *top, const void *ptr); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); -- cgit v1.2.3 From deb7adbad5fcec2ba558c3919b11d8fadf0bcbb2 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 27 Nov 2018 04:00:38 +0000 Subject: =?UTF-8?q?Convert=20pok=C3=A9dex=20data=20to=20C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/graphics.h | 3 ++- include/strings.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index ba7f87929..0620ea551 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1237,7 +1237,7 @@ extern const u32 gMonBackPic_Pichu[]; extern const u32 gMonShinyPalette_Pichu[]; extern const u32 gMonStillFrontPic_Pichu[]; extern const u8 gMonIcon_Pichu[]; -extern const u32 gMonFootprint_Pichu[]; +extern const u8 gMonFootprint_Pichu[]; extern const u32 gMonFrontPic_Cleffa[]; extern const u32 gMonPalette_Cleffa[]; extern const u32 gMonBackPic_Cleffa[]; @@ -2860,6 +2860,7 @@ extern const u32 gMonPalette_CircledQuestionMark[]; extern const u32 gMonShinyPalette_CircledQuestionMark[]; extern const u32 gMonStillFrontPic_CircledQuestionMark[]; extern const u8 gMonIcon_QuestionMark[]; +extern const u8 gMonFootprint_QuestionMark[]; extern const u32 gMonFrontPic_DoubleQuestionMark[]; extern const u32 gMonBackPic_DoubleQuestionMark[]; extern const u32 gMonPalette_DoubleQuestionMark[]; diff --git a/include/strings.h b/include/strings.h index 3746e459a..495cb3a9b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -989,6 +989,56 @@ extern const u8 gUnknown_0827EE03[]; extern const u8 gUnknown_0827EE05[]; extern const u8 gUnknown_0827EE07[]; extern const u8 gUnknown_0827EE09[]; + +// Pokedex strings +extern const u8 gUnknown_085E87A5[]; +extern const u8 gUnknown_085E87D6[]; +extern const u8 gUnknown_085E87EF[]; +extern const u8 gUnknown_085E8806[]; +extern const u8 gUnknown_085E881F[]; +extern const u8 gUnknown_085E8840[]; +extern const u8 gUnknown_085E887C[]; +extern const u8 gUnknown_085E88A6[]; +extern const u8 gUnknown_085E88C8[]; +extern const u8 gUnknown_085E88DF[]; +extern const u8 gUnknown_085E88E9[]; +extern const u8 gUnknown_085E88F6[]; +extern const u8 gUnknown_085E8905[]; +extern const u8 gUnknown_085E8911[]; +extern const u8 gUnknown_085E891F[]; +extern const u8 gUnknown_085E892D[]; +extern const u8 gUnknown_085E893A[]; +extern const u8 gUnknown_085E8948[]; +extern const u8 gUnknown_085E894C[]; +extern const u8 gUnknown_085E8950[]; +extern const u8 gUnknown_085E8954[]; +extern const u8 gUnknown_085E8958[]; +extern const u8 gUnknown_085E895C[]; +extern const u8 gUnknown_085E8960[]; +extern const u8 gUnknown_085E8964[]; +extern const u8 gUnknown_085E8968[]; +extern const u8 gUnknown_085E896B[]; +extern const u8 gUnknown_085E896F[]; +extern const u8 gUnknown_085E8974[]; +extern const u8 gUnknown_085E897B[]; +extern const u8 gUnknown_085E8981[]; +extern const u8 gUnknown_085E8987[]; +extern const u8 gUnknown_085E898D[]; +extern const u8 gUnknown_085E8994[]; +extern const u8 gUnknown_085E8999[]; +extern const u8 gUnknown_085E899F[]; +extern const u8 gUnknown_085E89A4[]; +extern const u8 gUnknown_085E89BB[]; +extern const u8 gUnknown_085E89D4[]; +extern const u8 gUnknown_085E8A02[]; +extern const u8 gUnknown_085E8A37[]; +extern const u8 gUnknown_085E8A73[]; +extern const u8 gUnknown_085E8AAF[]; +extern const u8 gUnknown_085E8AEA[]; +extern const u8 gUnknown_085E8B25[]; +extern const u8 gUnknown_085E8B26[]; +extern const u8 gUnknown_085E8B35[]; + extern const u8 gUnknown_085EAEC3[]; extern const u8 gUnknown_085EAED6[]; extern const u8 gUnknown_085EAEE6[]; -- cgit v1.2.3 From 556bdd52e1ba5bf1c1cc3b00baab3bf7fc60d9f9 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Tue, 27 Nov 2018 19:37:29 +0800 Subject: Clean up aligned variables in src/ --- include/global.fieldmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index f6273e80d..1f14880f0 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -192,8 +192,8 @@ struct EventObject struct __attribute__((packed)) { u8 x:4; u8 y:4; - } __attribute__((aligned (1))) as_nybbles; - } __attribute__((aligned (1))) range; + } ALIGNED(1) as_nybbles; + } ALIGNED(1) range; /*0x1A*/ u8 fieldEffectSpriteId; /*0x1B*/ u8 warpArrowSpriteId; /*0x1C*/ u8 movementActionId; -- cgit v1.2.3 From 091b5194e7bfc6049931202d9712541083fd61cd Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 27 Nov 2018 11:21:48 -0500 Subject: frontier pike and pyramid data --- include/battle_pyramid.h | 42 ++++++++++++++++++++++++++++++++++++++++++ include/strings.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) (limited to 'include') diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 5d38e9f35..8d8e01bfb 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -1,6 +1,33 @@ #ifndef GUARD_BATTLE_PYRAMID_H #define GUARD_BATTLE_PYRAMID_H +#define TOTAL_ROUNDS 20 +#define PICKUP_ITEMS_PER_ROUND 10 + +struct PyramidWildMon +{ + u16 species; + u8 lvl; + u8 abilityBit; + u16 moves[4]; +}; + +struct Struct_08613650 +{ + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 runMultiplier; + u8 unk5[8]; +}; + +struct ClassMusic +{ + u8 class; + u8 music; +}; + void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); @@ -21,4 +48,19 @@ void sub_81AA2F8(void); u8 sub_81AAA40(void); u16 GetBattlePyramidPickupItemId(void); +// Const rom data. +extern const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; +extern const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; +extern const u8 gUnknown_08613ABC[63][2]; +extern const u8 gUnknown_08613B3A[]; +extern const u16 gUnknown_08D856C8[][16]; +extern const u8 gUnknown_08613C1C[50][2]; +extern const u8 *const *const *const gUnknown_08613EC0[]; +extern const struct ClassMusic gUnknown_08613B44[54]; +extern const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[]; +extern const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[]; +extern const struct Struct_08613650 gUnknown_08613650[]; +extern const u8 gUnknown_08613750[34][2]; +extern const u8 gUnknown_08613794[]; + #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/strings.h b/include/strings.h index 3746e459a..c4af6f5b2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1181,4 +1181,48 @@ extern const u8 gText_Are[]; extern const u8 gText_Are2[]; extern const u8 gText_123Dot[][3]; +// Frontier util. +extern const u8 gUnknown_085ED164[]; +extern const u8 gUnknown_085ED170[]; +extern const u8 gUnknown_085ED17C[]; +extern const u8 gUnknown_085ED188[]; +extern const u8 gUnknown_085ED190[]; + +extern const u8 gText_RecordsLv50[]; +extern const u8 gText_RecordsOpenLevel[]; +extern const u8 gText_FrontierFacilityWinStreak[]; +extern const u8 gText_FrontierFacilityClearStreak[]; +extern const u8 gText_FrontierFacilityRoomsCleared[]; +extern const u8 gText_FrontierFacilityKOsStreak[]; +extern const u8 gText_FrontierFacilityFloorsCleared[]; + +extern const u8 gText_082C843F[]; +extern const u8 gText_082C848B[]; +extern const u8 gText_082C8628[]; +extern const u8 gText_082C85B4[]; +extern const u8 gText_082C8512[]; +extern const u8 gText_082C859D[]; +extern const u8 gText_082C86C3[]; +extern const u8 gText_082C8458[]; +extern const u8 gText_082C84C1[]; +extern const u8 gText_082C8662[]; +extern const u8 gText_082C85E3[]; +extern const u8 gText_082C853B[]; +extern const u8 gText_082C85A4[]; +extern const u8 gText_082C86FE[]; +extern const u8 gText_082C846C[]; +extern const u8 gText_082C84D0[]; +extern const u8 gText_082C8682[]; +extern const u8 gText_082C85F5[]; +extern const u8 gText_082C8561[]; +extern const u8 gText_082C85A9[]; +extern const u8 gText_082C8739[]; +extern const u8 gText_082C8480[]; +extern const u8 gText_082C84F7[]; +extern const u8 gText_082C86B3[]; +extern const u8 gText_082C8611[]; +extern const u8 gText_082C8589[]; +extern const u8 gText_082C85AE[]; +extern const u8 gText_082C877B[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 7cfe0342f0d56022e882324a06aaf129d621647c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 27 Nov 2018 22:45:50 +0100 Subject: Finish frontier data --- include/battle_pyramid.h | 42 ---------------- include/event_scripts.h | 11 ++-- include/frontier_util.h | 2 + include/strings.h | 128 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 47 deletions(-) (limited to 'include') diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 8d8e01bfb..5d38e9f35 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -1,33 +1,6 @@ #ifndef GUARD_BATTLE_PYRAMID_H #define GUARD_BATTLE_PYRAMID_H -#define TOTAL_ROUNDS 20 -#define PICKUP_ITEMS_PER_ROUND 10 - -struct PyramidWildMon -{ - u16 species; - u8 lvl; - u8 abilityBit; - u16 moves[4]; -}; - -struct Struct_08613650 -{ - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 runMultiplier; - u8 unk5[8]; -}; - -struct ClassMusic -{ - u8 class; - u8 music; -}; - void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); @@ -48,19 +21,4 @@ void sub_81AA2F8(void); u8 sub_81AAA40(void); u16 GetBattlePyramidPickupItemId(void); -// Const rom data. -extern const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; -extern const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; -extern const u8 gUnknown_08613ABC[63][2]; -extern const u8 gUnknown_08613B3A[]; -extern const u16 gUnknown_08D856C8[][16]; -extern const u8 gUnknown_08613C1C[50][2]; -extern const u8 *const *const *const gUnknown_08613EC0[]; -extern const struct ClassMusic gUnknown_08613B44[54]; -extern const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[]; -extern const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[]; -extern const struct Struct_08613650 gUnknown_08613650[]; -extern const u8 gUnknown_08613750[34][2]; -extern const u8 gUnknown_08613794[]; - #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/event_scripts.h b/include/event_scripts.h index dd0eca12f..058cec39b 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1,7 +1,3 @@ -// -// Created by scott on 9/12/2017. -// - #ifndef GUARD_EVENT_SCRIPTS_H #define GUARD_EVENT_SCRIPTS_H @@ -578,4 +574,9 @@ extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; extern const u8 gUnknown_082A8350[]; -#endif //GUARD_EVENT_SCRIPTS_H +// Battle Pyramid. +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; + +#endif // GUARD_EVENT_SCRIPTS_H diff --git a/include/frontier_util.h b/include/frontier_util.h index 6b6a2ea39..9464ba91c 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -29,4 +29,6 @@ u8 GetFrontierBrainMonNature(u8 monId); u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId); s32 GetFronterBrainSymbol(void); +extern const u16 gFrontierBannedSpecies[]; + #endif // GUARD_FRONTIER_UTIL_H diff --git a/include/strings.h b/include/strings.h index 1649910cc..887ccdfe6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1275,4 +1275,132 @@ extern const u8 gText_082C8589[]; extern const u8 gText_082C85AE[]; extern const u8 gText_082C877B[]; +// Battle Pyramid. +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 9fafa637438b45a48de36a4a7bf898111951ec92 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 27 Nov 2018 17:21:23 -0600 Subject: Finish decompiling internation_string_util.c --- include/international_string_util.h | 29 +++++++++++++++-------------- include/pokedex.h | 25 ++++++++++++++++++------- include/text.h | 10 +++++++--- 3 files changed, 40 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/international_string_util.h b/include/international_string_util.h index 343c5453c..2d5b1c871 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -2,22 +2,23 @@ #define GUARD_INTERNATIONAL_STRING_UTIL_H #include "menu.h" +#include "list_menu.h" -void sub_81DB52C(const u8 *src); -void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language); -s32 GetStringCenterAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); -s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); -s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); -s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); -s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1); -s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2); -// sub_81DB41C -// CopyMonCategoryText -// sub_81DB494 -void PadNameString(u8 *dst, u8 padWith); +void sub_81DB52C(u8 *src); +void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language); +int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth); +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 *str, int arg1); +int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2); +int sub_81DB41C(const struct ListMenuTemplate *listMenu); +void CopyMonCategoryText(int dexNum, u8 *dest); +u8 *sub_81DB494(u8 *str, int fontId, u8 *str2, int totalStringWidth); +void PadNameString(u8 *dest, u8 padChar); void sub_81DB554(u8 *, u8); void sub_81DB5AC(u8 *); -u32 sub_81DB604(const u8 *); -// sub_81DB620 +int sub_81DB604(u8 *); +void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows); #endif // GUARD_INTERNATIONAL_STRING_UTIL_H diff --git a/include/pokedex.h b/include/pokedex.h index 11e39997c..3f90e9508 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -4,13 +4,6 @@ extern u8 gUnknown_030060B0; extern void (*gUnknown_030060B4)(void); -void ResetPokedex(void); -void CopyMonCategoryText(u32 species, u8 *dst); -u16 GetPokedexHeightWeight(u16 dexNum, u8 data); -u16 GetNationalPokedexCount(u8); -u16 GetHoennPokedexCount(u8); -u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); - enum { FLAG_GET_SEEN, @@ -19,6 +12,24 @@ enum FLAG_SET_CAUGHT }; +struct PokedexEntry +{ + /*0x00*/ u8 categoryName[12]; + /*0x0C*/ u16 height; //in decimeters + /*0x0E*/ u16 weight; //in hectograms + /*0x10*/ const u8 *description; + /*0x14*/ u16 unused; + /*0x16*/ u16 pokemonScale; + /*0x18*/ u16 pokemonOffset; + /*0x1A*/ u16 trainerScale; + /*0x1C*/ u16 trainerOffset; +}; /*size = 0x20*/ + +void ResetPokedex(void); +u16 GetPokedexHeightWeight(u16 dexNum, u8 data); +u16 GetNationalPokedexCount(u8); +u16 GetHoennPokedexCount(u8); +u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 sub_80C0E9C(u16, s16, s16, u16); diff --git a/include/text.h b/include/text.h index 27a6364bb..69cbb87ed 100644 --- a/include/text.h +++ b/include/text.h @@ -89,6 +89,13 @@ #define EXT_CTRL_CODE_COLOR 0x1 #define EXT_CTRL_CODE_HIGHLIGHT 0x2 #define EXT_CTRL_CODE_SHADOW 0x3 +// +#define EXT_CTRL_CODE_UNKNOWN_7 0x7 +// +#define EXT_CTRL_CODE_CLEAR 0x11 +// +#define EXT_CTRL_CODE_JPN 0x15 +#define EXT_CTRL_CODE_ENG 0x16 #define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_WHITE 0x1 @@ -102,9 +109,6 @@ // battle placeholders are located in battle_message.h -#define EXT_CTRL_CODE_JPN 0x15 -#define EXT_CTRL_CODE_ENG 0x16 - #define NUM_TEXT_PRINTERS 32 #define TEXT_SPEED_FF 0xFF -- cgit v1.2.3 From 0148e389738d857d473a54d612115cd51fbb8606 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 28 Nov 2018 10:14:32 -0600 Subject: Decompile pokedex_cry_screen.c (#406) --- include/main.h | 2 +- include/pokedex_cry_screen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/main.h b/include/main.h index 47b26b1c7..0d441035d 100644 --- a/include/main.h +++ b/include/main.h @@ -51,7 +51,7 @@ extern bool8 gSoftResetDisabled; extern IntrFunc gIntrTable[]; extern u8 gLinkVSyncDisabled; extern u32 IntrMain_Buffer[]; -extern u8 gPcmDmaCounter; +extern s8 gPcmDmaCounter; void AgbMain(void); void SetMainCallback2(MainCallback callback); diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h index 6b5cc13f2..392e80a6d 100755 --- a/include/pokedex_cry_screen.h +++ b/include/pokedex_cry_screen.h @@ -13,7 +13,7 @@ struct CryRelatedStruct bool8 sub_8145354(struct CryRelatedStruct*, u8); void sub_814545C(u8); void sub_8145534(u16); -void sub_8145914(void); bool8 sub_8145850(struct CryRelatedStruct*, u8); +void sub_8145914(void); #endif -- cgit v1.2.3 From 9dd7f8f2147ffcaa0b5a347a937b269a946717b3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 30 Nov 2018 10:41:03 -0600 Subject: Decompile pokedex_area_screen.c (#412) --- include/graphics.h | 4 ++++ include/pokedex_area_screen.h | 2 +- include/region_map.h | 14 ++++++++++++++ include/unk_pokedex_area_screen_helper.h | 17 +++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 include/unk_pokedex_area_screen_helper.h (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 0620ea551..18ff8c693 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4736,4 +4736,8 @@ extern const u32 gSlotMachineReelTime_Gfx[]; extern const u32 gUnknown_08D8D410[]; extern const u32 gUnknown_08D8D58C[]; +// Pokedex Area Screen +extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[]; +extern const u16 gPokedexAreaScreenAreaUnknown_Pal[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/pokedex_area_screen.h b/include/pokedex_area_screen.h index 2fb5ade51..027d3e4a7 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 sub_813D3D8(u16, u8*); +void ShowPokedexAreaScreen(u16, u8*); #endif // GUARD_POKEDEX_AREA_SCREEN_H diff --git a/include/region_map.h b/include/region_map.h index 6339f7a88..0c82232cf 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -78,6 +78,15 @@ struct RegionMap { /*0x284*/ u8 cursorLargeImage[0x600]; }; // size = 0x884 +struct RegionMapLocation +{ + u8 x; + u8 y; + u8 width; + u8 height; + const u8 *name; +}; + // Exported RAM declarations // Exported ROM declarations @@ -95,5 +104,10 @@ u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); u8 *sub_81245DC(u8 *dest, u16 mapSecId); u8 *sub_8124610(u8 *dest, u16 mapSecId); +u16 CorrectSpecialMapSecId(u16 mapSecId); +void sub_8122D88(struct RegionMap *regionMap); +void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y); + +extern const struct RegionMapLocation gRegionMapEntries[]; #endif //GUARD_REGION_MAP_H diff --git a/include/unk_pokedex_area_screen_helper.h b/include/unk_pokedex_area_screen_helper.h new file mode 100755 index 000000000..45beed70e --- /dev/null +++ b/include/unk_pokedex_area_screen_helper.h @@ -0,0 +1,17 @@ +#ifndef GUARD_UNK_POKEDEX_AREA_SCREEN_HELPER_H +#define GUARD_UNK_POKEDEX_AREA_SCREEN_HELPER_H + +struct UnkStruct_1C4D70 +{ + u32 bg:2; + u32 unk2:8; + u32 unk10:2; + u32 unk12:20; +}; + +void sub_81C4D70(const struct UnkStruct_1C4D70 *); +bool32 sub_81C4E90(void); +void sub_81C4ED0(u32); +void sub_81C4EB4(void); + +#endif // GUARD_UNK_POKEDEX_AREA_SCREEN_HELPER_H -- cgit v1.2.3 From 0e32a3adf3e333f2271957379b568284da1a552d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 30 Nov 2018 17:29:55 -0600 Subject: Decompile normal.c (#414) --- include/battle_anim.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 16e9de0ac..c3601bbd9 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -123,6 +123,7 @@ u8 sub_80A89C8(int, u8, int); void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); void sub_80A6CC0(u32, const void*, u32); void sub_80A6DAC(bool8); +void sub_80A634C(struct Sprite *); enum { @@ -166,7 +167,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); // battle_anim_utility_funcs.s void sub_8116EB4(u8); -u32 sub_811583C(s16); +u32 UnpackSelectedBattleAnimPalettes(s16); u8 GetBattlerSpriteFinal_Y(u8, u16, u8); -- cgit v1.2.3 From b082f000afee689eb6a73ba7a938c4f371c09225 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 1 Dec 2018 18:54:59 +0100 Subject: Start working on link rfu --- include/librfu.h | 9 +++++---- include/link_rfu.h | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/librfu.h b/include/librfu.h index 9d131f027..ba6e535d4 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -81,7 +81,7 @@ struct UnkLinkRfuStruct_02022B14Substruct u8 playerTrainerId[2]; }; -struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 +struct __attribute__((packed, aligned(2))) UnkLinkRfuStruct_02022B14 { struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; @@ -169,13 +169,14 @@ struct RfuUnk3 u32 unk_dc; }; -struct RfuUnk5Sub { +struct RfuUnk5Sub +{ u16 unk_00; u8 unk_02; u16 unk_04; struct UnkLinkRfuStruct_02022B14 unk_06; - u8 fill_13[2]; - u8 unk_15[8]; + u8 fill_13[1]; + u8 playerName[PLAYER_NAME_LENGTH + 1]; }; struct RfuUnk5 diff --git a/include/link_rfu.h b/include/link_rfu.h index c3ca75604..eb24addbe 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -32,7 +32,8 @@ struct UnkLinkRfuStruct_02022B44 u8 fill_84[0x58]; }; -struct UnkRfuStruct_1 { +struct UnkRfuStruct_1 +{ /* 0x000 */ u8 unk_00; /* 0x001 */ u8 unk_01; /* 0x002 */ vu8 unk_02; @@ -75,7 +76,8 @@ struct UnkRfuStruct_1 { /* 0xeb4 */ u8 filler_e64[12]; }; -struct UnkRfuStruct_2_Sub_6c { +struct UnkRfuStruct_2_Sub_6c +{ /* 0x00 */ u16 unk_00; /* 0x02 */ u16 unk_02; /* 0x04 */ const u8 *unk_04; @@ -86,7 +88,8 @@ struct UnkRfuStruct_2_Sub_6c { /* 0x12 */ u8 unk_12; }; -struct UnkRfuStruct_2_Sub_124 { +struct UnkRfuStruct_2_Sub_124 +{ /* 0x000 */ u8 unk_00[32][70]; /* 0x8c0 */ vu8 unk_8c0; /* 0x8c1 */ vu8 unk_8c1; @@ -94,7 +97,8 @@ struct UnkRfuStruct_2_Sub_124 { /* 0x8c3 */ vu8 unk_8c3; }; -struct UnkRfuStruct_2_Sub_9e8 { +struct UnkRfuStruct_2_Sub_9e8 +{ /* 0x000 */ u8 unk_00[40][14]; /* 0x230 */ vu8 unk_230; /* 0x231 */ vu8 unk_231; @@ -102,14 +106,16 @@ struct UnkRfuStruct_2_Sub_9e8 { /* 0x233 */ vu8 unk_233; }; -struct UnkRfuStruct_2_Sub_c1c { +struct UnkRfuStruct_2_Sub_c1c +{ /* 0x00 */ u8 unk_00[2][14]; /* 0x1c */ vu8 unk_1c; /* 0x1d */ vu8 unk_1d; /* 0x1e */ vu8 unk_1e; }; -struct UnkRfuStruct_Sub_Unused { +struct UnkRfuStruct_Sub_Unused +{ /* 0x000 */ u8 unk_00[2][256]; /* 0x200 */ vu8 unk_200; /* 0x201 */ vu8 unk_201; @@ -117,7 +123,8 @@ struct UnkRfuStruct_Sub_Unused { /* 0x203 */ vu8 unk_203; }; -struct UnkRfuStruct_2 { +struct UnkRfuStruct_2 +{ /* 0x000 */ void (*unk_00)(void); /* 0x004 */ u16 unk_04; /* 0x006 */ u8 filler_06[4]; @@ -149,7 +156,9 @@ struct UnkRfuStruct_2 { /* 0x0fe */ u16 unk_fe; /* 0x100 */ u16 unk_100; /* 0x102 */ u8 unk_102; - /* 0x103 */ u8 filler_103[0x21]; + /* 0x103 */ u8 filler_103[0x10A - 0x103]; + /* 0x10A */ struct UnkLinkRfuStruct_02022B14 unk_10A; + u8 filler_120[12]; /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124; /* 0x9e8 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8; /* 0xc1c */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; @@ -252,7 +261,7 @@ void sub_800E3A8(void); void sub_800ED10(void); void sub_800ED28(void); void sub_8011090(u8 a0, u32 a1, u32 a2); -void sub_8011FC8(u8 *a0, u16 a1); +void sub_8011FC8(const u8 *src, u16 trainerId); void sub_8010FA0(bool32 a0, bool32 a1); void sub_8010F60(void); void sub_8010FCC(u32 a0, u32 a1, u32 a2); -- cgit v1.2.3 From b9cf4f27b5361408ff11e19e11921d0beb12050c Mon Sep 17 00:00:00 2001 From: Melody Date: Sat, 1 Dec 2018 22:56:42 -0500 Subject: renames the winstrate graphics names to pokefan --- include/constants/trainers.h | 4 ++-- include/graphics.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 2ea9f7c62..a87624eb6 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -65,8 +65,8 @@ #define TRAINER_PIC_SCHOOL_KID_M 48 #define TRAINER_PIC_SCHOOL_KID_F 49 #define TRAINER_PIC_SR_AND_JR 50 -#define TRAINER_PIC_WINSTRATE_M 51 -#define TRAINER_PIC_WINSTRATE_F 52 +#define TRAINER_PIC_POKEFAN_M 51 +#define TRAINER_PIC_POKEFAN_F 52 #define TRAINER_PIC_YOUNGSTER 53 #define TRAINER_PIC_CHAMPION_WALLACE 54 #define TRAINER_PIC_FISHERMAN 55 diff --git a/include/graphics.h b/include/graphics.h index 18ff8c693..6ec5c44b2 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2920,8 +2920,8 @@ extern const u32 gTrainerFrontPic_LeaderJuan[]; extern const u32 gTrainerFrontPic_SchoolKidM[]; extern const u32 gTrainerFrontPic_SchoolKidF[]; extern const u32 gTrainerFrontPic_SrAndJr[]; -extern const u32 gTrainerFrontPic_WinstrateM[]; -extern const u32 gTrainerFrontPic_WinstrateF[]; +extern const u32 gTrainerFrontPic_PokefanM[]; +extern const u32 gTrainerFrontPic_PokefanF[]; extern const u32 gTrainerFrontPic_Youngster[]; extern const u32 gTrainerFrontPic_ChampionWallace[]; extern const u32 gTrainerFrontPic_Fisherman[]; @@ -3014,8 +3014,8 @@ extern const u32 gTrainerPalette_LeaderJuan[]; extern const u32 gTrainerPalette_SchoolKidM[]; extern const u32 gTrainerPalette_SchoolKidF[]; extern const u32 gTrainerPalette_SrAndJr[]; -extern const u32 gTrainerPalette_WinstrateM[]; -extern const u32 gTrainerPalette_WinstrateF[]; +extern const u32 gTrainerPalette_PokefanM[]; +extern const u32 gTrainerPalette_PokefanF[]; extern const u32 gTrainerPalette_Youngster[]; extern const u32 gTrainerPalette_ChampionWallace[]; extern const u32 gTrainerPalette_Fisherman[]; -- cgit v1.2.3 From e17140536a392db42c5c21b568931c0b753acfda Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 11:58:50 +0100 Subject: finish link rfu and fix rom 8011dc0 --- include/librfu.h | 5 +++++ include/link_rfu.h | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/librfu.h b/include/librfu.h index ba6e535d4..49df42541 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -1,3 +1,6 @@ +#ifndef GUARD_LIBRFU_H +#define GUARD_LIBRFU_H + #include "main.h" enum @@ -253,3 +256,5 @@ void rfu_UNI_readySendData(u8 a0); void rfu_UNI_clearRecvNewDataFlag(u8 a0); void rfu_REQ_PARENT_resumeRetransmitAndChange(void); void rfu_NI_setSendData(u8, u8, u8 *, u8); + +#endif // GUARD_LIBRFU_H diff --git a/include/link_rfu.h b/include/link_rfu.h index eb24addbe..4398ca690 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -1,6 +1,8 @@ #ifndef GUARD_LINK_RFU_H #define GUARD_LINK_RFU_H +#include "librfu.h" + // Exported type declarations struct UnkLinkRfuStruct_02022B2C @@ -158,7 +160,8 @@ struct UnkRfuStruct_2 /* 0x102 */ u8 unk_102; /* 0x103 */ u8 filler_103[0x10A - 0x103]; /* 0x10A */ struct UnkLinkRfuStruct_02022B14 unk_10A; - u8 filler_120[12]; + u8 filler_; + u8 playerName[PLAYER_NAME_LENGTH + 1]; /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124; /* 0x9e8 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8; /* 0xc1c */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; @@ -193,7 +196,8 @@ struct UnkRfuStruct_2 /* 0xcee */ u8 unk_cee[4]; }; // size = 0xcf4 -struct UnkRfuStruct_8010A14 { +struct UnkRfuStruct_8010A14 +{ char unk_00[15]; u8 unk_0f; u8 unk_10[4]; @@ -266,7 +270,7 @@ void sub_8010FA0(bool32 a0, bool32 a1); void sub_8010F60(void); void sub_8010FCC(u32 a0, u32 a1, u32 a2); void sub_8011C84(void); -void sub_8012188(const u8 *a0, struct UnkLinkRfuStruct_02022B14 *arg1, u8 arg2); +void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2); bool32 sub_8011B90(void); void sub_800FE50(u16 *a0); bool32 sub_800E540(u16 id, u8 *name); -- cgit v1.2.3 From d137ebc7a9e0f4f73a1379ab667d90fbce859876 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 13:59:55 +0100 Subject: Some more rom 8011dc0 work --- include/link_rfu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/link_rfu.h b/include/link_rfu.h index 4398ca690..426565e56 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -277,5 +277,6 @@ bool32 sub_800E540(u16 id, u8 *name); void sub_8011DE0(u32 arg0); u8 sub_801100C(int a0); void sub_800EF7C(void); +bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); #endif //GUARD_LINK_RFU_H -- cgit v1.2.3 From b87e6a4e577e27d054e256464a7276665104ff83 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 18:58:33 +0100 Subject: Get rid of static functions in includes --- include/event_object_movement.h | 25 ++----------------------- include/overworld.h | 7 ------- include/string_util.h | 1 - 3 files changed, 2 insertions(+), 31 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 6515791c3..cc45f1531 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -19,7 +19,8 @@ enum SpinnerRunnerFollowPatterns RUNFOLLOW_SOUTH_EAST_WEST }; -struct UnkStruct_085094AC { +struct UnkStruct_085094AC +{ const union AnimCmd *const *anims; u8 animPos[4]; }; @@ -45,28 +46,6 @@ struct UnkStruct_085094AC { #define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18) #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) -#define movement_type_def(setup, table) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ -void setup(struct Sprite *sprite)\ -{\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ -}\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - return table[sprite->data[1]](eventObject, sprite);\ -} - -#define movement_type_empty_callback(setup) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ -void setup(struct Sprite *sprite)\ -{\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ -}\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - return 0;\ -} - struct PairedPalettes { u16 tag; diff --git a/include/overworld.h b/include/overworld.h index 6f7801905..60d9d5133 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -47,13 +47,8 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); -static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -static bool32 IsDummyWarp(struct WarpData *warp); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const GetDestinationWarpMapHeader(void); -static void LoadCurrentMapData(void); -static void LoadSaveblockMapHeader(void); -static void SetPlayerCoordsFromWarp(void); void WarpIntoMap(void); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); @@ -67,7 +62,6 @@ void sub_8084D5C(s16 a1, s16 a2); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084E14(void); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -static void SetFixedDiveWarpAsDestination(void); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarpAsDestination(s16 x, s16 y); void warp1_set_to_sav1w(void); @@ -75,7 +69,6 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084F6C(u8 a1); void sub_8084FAC(int unused); const struct MapConnection *GetMapConnection(u8 dir); -static bool8 SetDiveWarp(u8 dir, u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); void mliX_load_map(u8 mapGroup, u8 mapNum); diff --git a/include/string_util.h b/include/string_util.h index 67149bca0..d7a005ec5 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -39,7 +39,6 @@ u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color); bool32 IsStringJapanese(u8 *str); bool32 sub_800924C(u8 *str, s32 n); u8 GetExtCtrlCodeLength(u8 code); -static const u8 *SkipExtCtrlCode(const u8 *s); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); void ConvertInternationalString(u8 *s, u8 language); void StripExtCtrlCodes(u8 *str); -- cgit v1.2.3 From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- include/battle_setup.h | 17 ----------------- include/constants/battle_setup.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 include/constants/battle_setup.h (limited to 'include') diff --git a/include/battle_setup.h b/include/battle_setup.h index 0caa3df27..98c366acd 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,23 +1,6 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H -enum -{ - TRAINER_BATTLE_NORMAL, - TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, - TRAINER_BATTLE_CONTINUE_SCRIPT, - TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, - TRAINER_BATTLE_DOUBLE, - TRAINER_BATTLE_REMATCH, - TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, - TRAINER_BATTLE_REMATCH_DOUBLE, - TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, - TRAINER_BATTLE_9, - TRAINER_BATTLE_SET_TRAINER_A, - TRAINER_BATTLE_SET_TRAINER_B, - TRAINER_BATTLE_12, -}; - #define REMATCHES_COUNT 5 #define REMATCH_TABLE_ENTRIES 78 #define REMATCH_WALLY_ENTRY 64 diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h new file mode 100644 index 000000000..0256f889c --- /dev/null +++ b/include/constants/battle_setup.h @@ -0,0 +1,18 @@ +#ifndef GUARD_CONSTANTS_BATTLE_SETUP_H +#define GUARD_CONSTANTS_BATTLE_SETUP_H + +#define TRAINER_BATTLE_NORMAL 0 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 +#define TRAINER_BATTLE_CONTINUE_SCRIPT 2 +#define TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT 3 +#define TRAINER_BATTLE_DOUBLE 4 +#define TRAINER_BATTLE_REMATCH 5 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 +#define TRAINER_BATTLE_REMATCH_DOUBLE 7 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 +#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_SET_TRAINER_A 10 +#define TRAINER_BATTLE_SET_TRAINER_B 11 +#define TRAINER_BATTLE_12 12 + +#endif // GUARD_CONSTANTS_BATTLE_SETUP_H -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- include/constants/battle_setup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 0256f889c..329bfa650 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -1,10 +1,10 @@ #ifndef GUARD_CONSTANTS_BATTLE_SETUP_H #define GUARD_CONSTANTS_BATTLE_SETUP_H -#define TRAINER_BATTLE_NORMAL 0 +#define TRAINER_BATTLE_SINGLE 0 #define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 #define TRAINER_BATTLE_CONTINUE_SCRIPT 2 -#define TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT 3 +#define TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT 3 #define TRAINER_BATTLE_DOUBLE 4 #define TRAINER_BATTLE_REMATCH 5 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 -- cgit v1.2.3 From eeb6446da4384246e6b5c47b04554d82a4cd752f Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 22:35:11 -0500 Subject: add more consistent names --- include/constants/trainers.h | 90 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'include') diff --git a/include/constants/trainers.h b/include/constants/trainers.h index a87624eb6..d7832754e 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -17,7 +17,7 @@ #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 #define TRAINER_PIC_POKEMON_BREEDER_F 2 -#define TRAINER_PIC_COOL_TRAINER_M 3 +#define TRAINER_PIC_COOLTRAINER_M 3 #define TRAINER_PIC_BIRD_KEEPER 4 #define TRAINER_PIC_COLLECTOR 5 #define TRAINER_PIC_AQUA_GRUNT_F 6 @@ -34,7 +34,7 @@ #define TRAINER_PIC_INTERVIEWER 17 #define TRAINER_PIC_TUBER_F 18 #define TRAINER_PIC_TUBER_M 19 -#define TRAINER_PIC_COOL_TRAINER_F 20 +#define TRAINER_PIC_COOLTRAINER_F 20 #define TRAINER_PIC_LADY 21 #define TRAINER_PIC_BEAUTY 22 #define TRAINER_PIC_RICH_BOY 23 @@ -105,8 +105,8 @@ #define TRAINER_PIC_PYRAMID_KING_BRANDON 88 #define TRAINER_PIC_RED 89 #define TRAINER_PIC_LEAF 90 -#define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91 -#define TRAINER_PIC_RUBY_SAPPHIRE_MAY 92 +#define TRAINER_PIC_RS_BRENDAN 91 +#define TRAINER_PIC_RS_MAY 92 #define TRAINER_BACK_PIC_BRENDAN 0 #define TRAINER_BACK_PIC_MAY 1 @@ -118,30 +118,30 @@ #define TRAINER_BACK_PIC_STEVEN 7 #define FACILITY_CLASS_HIKER 0x0 -#define FACILITY_CLASS_TEAM_AQUA_1 0x1 -#define FACILITY_CLASS_PKMN_BREEDER_1 0x2 +#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 #define FACILITY_CLASS_COOLTRAINER_M 0x3 #define FACILITY_CLASS_BIRD_KEEPER 0x4 #define FACILITY_CLASS_COLLECTOR 0x5 -#define FACILITY_CLASS_TEAM_AQUA_2 0x6 +#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 #define FACILITY_CLASS_SWIMMER_M 0x7 -#define FACILITY_CLASS_TEAM_MAGMA_1 0x8 +#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 #define FACILITY_CLASS_EXPERT_M 0x9 #define FACILITY_CLASS_BLACK_BELT 0xa -#define FACILITY_CLASS_AQUA_LEADER 0xb +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb #define FACILITY_CLASS_HEX_MANIAC 0xc #define FACILITY_CLASS_AROMA_LADY 0xd #define FACILITY_CLASS_RUIN_MANIAC 0xe #define FACILITY_CLASS_INTERVIEWER 0xf -#define FACILITY_CLASS_TUBER_1 0x10 -#define FACILITY_CLASS_TUBER_2 0x11 +#define FACILITY_CLASS_TUBER_F 0x10 +#define FACILITY_CLASS_TUBER_M 0x11 #define FACILITY_CLASS_COOLTRAINER_F 0x12 #define FACILITY_CLASS_LADY 0x13 #define FACILITY_CLASS_BEAUTY 0x14 #define FACILITY_CLASS_RICH_BOY 0x15 -#define FACILITY_CLASS_EXPERT_2 0x16 +#define FACILITY_CLASS_EXPERT_F 0x16 #define FACILITY_CLASS_POKEMANIAC 0x17 -#define FACILITY_CLASS_TEAM_MAGMA_2 0x18 +#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 #define FACILITY_CLASS_GUITARIST 0x19 #define FACILITY_CLASS_KINDLER 0x1a #define FACILITY_CLASS_CAMPER 0x1b @@ -150,25 +150,25 @@ #define FACILITY_CLASS_PSYCHIC_M 0x1e #define FACILITY_CLASS_PSYCHIC_F 0x1f #define FACILITY_CLASS_GENTLEMAN 0x20 -#define FACILITY_CLASS_ELITE_FOUR_1 0x21 -#define FACILITY_CLASS_ELITE_FOUR_2 0x22 -#define FACILITY_CLASS_LEADER_1 0x23 -#define FACILITY_CLASS_LEADER_2 0x24 -#define FACILITY_CLASS_LEADER_3 0x25 +#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 +#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 +#define FACILITY_CLASS_LEADER_ROXANNE 0x23 +#define FACILITY_CLASS_LEADER_BRAWLY 0x24 +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 #define FACILITY_CLASS_SCHOOL_KID_M 0x26 #define FACILITY_CLASS_SCHOOL_KID_F 0x27 #define FACILITY_CLASS_SR_AND_JR 0x28 -#define FACILITY_CLASS_POKEFAN_1 0x29 -#define FACILITY_CLASS_POKEFAN_2 0x2a +#define FACILITY_CLASS_POKEFAN_M 0x29 +#define FACILITY_CLASS_POKEFAN_F 0x2a #define FACILITY_CLASS_YOUNGSTER 0x2b -#define FACILITY_CLASS_CHAMPION 0x2c +#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c #define FACILITY_CLASS_FISHERMAN 0x2d -#define FACILITY_CLASS_TRIATHLETE_1 0x2e -#define FACILITY_CLASS_TRIATHLETE_2 0x2f -#define FACILITY_CLASS_TRIATHLETE_3 0x30 -#define FACILITY_CLASS_TRIATHLETE_4 0x31 -#define FACILITY_CLASS_TRIATHLETE_5 0x32 -#define FACILITY_CLASS_TRIATHLETE_6 0x33 +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 #define FACILITY_CLASS_DRAGON_TAMER 0x34 #define FACILITY_CLASS_NINJA_BOY 0x35 #define FACILITY_CLASS_BATTLE_GIRL 0x36 @@ -176,36 +176,36 @@ #define FACILITY_CLASS_SWIMMER_F 0x38 #define FACILITY_CLASS_TWINS 0x39 #define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_PKMN_TRAINER_1 0x3b +#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c -#define FACILITY_CLASS_PKMN_TRAINER_3 0x3d -#define FACILITY_CLASS_PKMN_TRAINER_4 0x3e +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 0x3d +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 0x3e #define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f -#define FACILITY_CLASS_PKMN_TRAINER_6 0x40 -#define FACILITY_CLASS_PKMN_TRAINER_7 0x41 -#define FACILITY_CLASS_PKMN_BREEDER_2 0x42 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 #define FACILITY_CLASS_BUG_CATCHER 0x43 #define FACILITY_CLASS_PKMN_RANGER_M 0x44 #define FACILITY_CLASS_PKMN_RANGER_F 0x45 -#define FACILITY_CLASS_MAGMA_LEADER 0x46 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 #define FACILITY_CLASS_LASS 0x47 #define FACILITY_CLASS_YOUNG_COUPLE 0x48 #define FACILITY_CLASS_OLD_COUPLE 0x49 #define FACILITY_CLASS_SIS_AND_BRO 0x4a -#define FACILITY_CLASS_PKMN_TRAINER_STEVEN 0x4b -#define FACILITY_CLASS_SALON_MAIDEN 0x4c -#define FACILITY_CLASS_DOME_ACE 0x4d -#define FACILITY_CLASS_PKMN_TRAINER_RED 0x4e -#define FACILITY_CLASS_PKMN_TRAINER_LEAF 0x4f -#define FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN 0x50 -#define FACILITY_CLASS_PKMN_TRAINER_RS_MAY 0x51 +#define FACILITY_CLASS_STEVEN 0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d +#define FACILITY_CLASS_RED 0x4e +#define FACILITY_CLASS_LEAF 0x4f +#define FACILITY_CLASS_RS_BRENDAN 0x50 +#define FACILITY_CLASS_RS_MAY 0x51 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_PKMN_BREEDER 0x4 -#define TRAINER_CLASS_COOLTRAINER_1 0x5 +#define TRAINER_CLASS_COOLTRAINER 0x5 #define TRAINER_CLASS_BIRD_KEEPER 0x6 #define TRAINER_CLASS_COLLECTOR 0x7 #define TRAINER_CLASS_SWIMMER_M 0x8 @@ -218,8 +218,8 @@ #define TRAINER_CLASS_AROMA_LADY 0xf #define TRAINER_CLASS_RUIN_MANIAC 0x10 #define TRAINER_CLASS_INTERVIEWER 0x11 -#define TRAINER_CLASS_TUBER_1 0x12 -#define TRAINER_CLASS_TUBER_2 0x13 +#define TRAINER_CLASS_TUBER_F 0x12 +#define TRAINER_CLASS_TUBER_M 0x13 #define TRAINER_CLASS_LADY 0x14 #define TRAINER_CLASS_BEAUTY 0x15 #define TRAINER_CLASS_RICH_BOY 0x16 @@ -248,7 +248,7 @@ #define TRAINER_CLASS_SWIMMER_F 0x2d #define TRAINER_CLASS_TWINS 0x2e #define TRAINER_CLASS_SAILOR 0x2f -#define TRAINER_CLASS_COOLTRAINER_2 0x30 +#define TRAINER_CLASS_COOLTRAINER_UNUSED 0x30 #define TRAINER_CLASS_MAGMA_ADMIN 0x31 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32 #define TRAINER_CLASS_BUG_CATCHER 0x33 -- cgit v1.2.3 From 52fa5137c95a3bbdf3bf29d594e66948bf7382ae Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 00:31:15 -0500 Subject: tweak alignment --- include/constants/trainers.h | 166 +++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'include') diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d7832754e..d1ab51e4e 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -17,7 +17,7 @@ #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 #define TRAINER_PIC_POKEMON_BREEDER_F 2 -#define TRAINER_PIC_COOLTRAINER_M 3 +#define TRAINER_PIC_COOLTRAINER_M 3 #define TRAINER_PIC_BIRD_KEEPER 4 #define TRAINER_PIC_COLLECTOR 5 #define TRAINER_PIC_AQUA_GRUNT_F 6 @@ -34,7 +34,7 @@ #define TRAINER_PIC_INTERVIEWER 17 #define TRAINER_PIC_TUBER_F 18 #define TRAINER_PIC_TUBER_M 19 -#define TRAINER_PIC_COOLTRAINER_F 20 +#define TRAINER_PIC_COOLTRAINER_F 20 #define TRAINER_PIC_LADY 21 #define TRAINER_PIC_BEAUTY 22 #define TRAINER_PIC_RICH_BOY 23 @@ -105,8 +105,8 @@ #define TRAINER_PIC_PYRAMID_KING_BRANDON 88 #define TRAINER_PIC_RED 89 #define TRAINER_PIC_LEAF 90 -#define TRAINER_PIC_RS_BRENDAN 91 -#define TRAINER_PIC_RS_MAY 92 +#define TRAINER_PIC_RS_BRENDAN 91 +#define TRAINER_PIC_RS_MAY 92 #define TRAINER_BACK_PIC_BRENDAN 0 #define TRAINER_BACK_PIC_MAY 1 @@ -117,95 +117,95 @@ #define TRAINER_BACK_PIC_WALLY 6 #define TRAINER_BACK_PIC_STEVEN 7 -#define FACILITY_CLASS_HIKER 0x0 -#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 -#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 -#define FACILITY_CLASS_COOLTRAINER_M 0x3 -#define FACILITY_CLASS_BIRD_KEEPER 0x4 -#define FACILITY_CLASS_COLLECTOR 0x5 -#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 -#define FACILITY_CLASS_SWIMMER_M 0x7 -#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 -#define FACILITY_CLASS_EXPERT_M 0x9 -#define FACILITY_CLASS_BLACK_BELT 0xa -#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb -#define FACILITY_CLASS_HEX_MANIAC 0xc -#define FACILITY_CLASS_AROMA_LADY 0xd -#define FACILITY_CLASS_RUIN_MANIAC 0xe -#define FACILITY_CLASS_INTERVIEWER 0xf -#define FACILITY_CLASS_TUBER_F 0x10 -#define FACILITY_CLASS_TUBER_M 0x11 -#define FACILITY_CLASS_COOLTRAINER_F 0x12 -#define FACILITY_CLASS_LADY 0x13 -#define FACILITY_CLASS_BEAUTY 0x14 -#define FACILITY_CLASS_RICH_BOY 0x15 -#define FACILITY_CLASS_EXPERT_F 0x16 -#define FACILITY_CLASS_POKEMANIAC 0x17 -#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 -#define FACILITY_CLASS_GUITARIST 0x19 -#define FACILITY_CLASS_KINDLER 0x1a -#define FACILITY_CLASS_CAMPER 0x1b -#define FACILITY_CLASS_PICNICKER 0x1c -#define FACILITY_CLASS_BUG_MANIAC 0x1d -#define FACILITY_CLASS_PSYCHIC_M 0x1e -#define FACILITY_CLASS_PSYCHIC_F 0x1f -#define FACILITY_CLASS_GENTLEMAN 0x20 +#define FACILITY_CLASS_HIKER 0x0 +#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 +#define FACILITY_CLASS_COOLTRAINER_M 0x3 +#define FACILITY_CLASS_BIRD_KEEPER 0x4 +#define FACILITY_CLASS_COLLECTOR 0x5 +#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 +#define FACILITY_CLASS_SWIMMER_M 0x7 +#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 +#define FACILITY_CLASS_EXPERT_M 0x9 +#define FACILITY_CLASS_BLACK_BELT 0xa +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb +#define FACILITY_CLASS_HEX_MANIAC 0xc +#define FACILITY_CLASS_AROMA_LADY 0xd +#define FACILITY_CLASS_RUIN_MANIAC 0xe +#define FACILITY_CLASS_INTERVIEWER 0xf +#define FACILITY_CLASS_TUBER_F 0x10 +#define FACILITY_CLASS_TUBER_M 0x11 +#define FACILITY_CLASS_COOLTRAINER_F 0x12 +#define FACILITY_CLASS_LADY 0x13 +#define FACILITY_CLASS_BEAUTY 0x14 +#define FACILITY_CLASS_RICH_BOY 0x15 +#define FACILITY_CLASS_EXPERT_F 0x16 +#define FACILITY_CLASS_POKEMANIAC 0x17 +#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 +#define FACILITY_CLASS_GUITARIST 0x19 +#define FACILITY_CLASS_KINDLER 0x1a +#define FACILITY_CLASS_CAMPER 0x1b +#define FACILITY_CLASS_PICNICKER 0x1c +#define FACILITY_CLASS_BUG_MANIAC 0x1d +#define FACILITY_CLASS_PSYCHIC_M 0x1e +#define FACILITY_CLASS_PSYCHIC_F 0x1f +#define FACILITY_CLASS_GENTLEMAN 0x20 #define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 #define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 -#define FACILITY_CLASS_LEADER_ROXANNE 0x23 +#define FACILITY_CLASS_LEADER_ROXANNE 0x23 #define FACILITY_CLASS_LEADER_BRAWLY 0x24 -#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 -#define FACILITY_CLASS_SCHOOL_KID_M 0x26 -#define FACILITY_CLASS_SCHOOL_KID_F 0x27 -#define FACILITY_CLASS_SR_AND_JR 0x28 -#define FACILITY_CLASS_POKEFAN_M 0x29 -#define FACILITY_CLASS_POKEFAN_F 0x2a -#define FACILITY_CLASS_YOUNGSTER 0x2b -#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c -#define FACILITY_CLASS_FISHERMAN 0x2d -#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e -#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f -#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 -#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 -#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 -#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 -#define FACILITY_CLASS_DRAGON_TAMER 0x34 -#define FACILITY_CLASS_NINJA_BOY 0x35 -#define FACILITY_CLASS_BATTLE_GIRL 0x36 -#define FACILITY_CLASS_PARASOL_LADY 0x37 -#define FACILITY_CLASS_SWIMMER_F 0x38 -#define FACILITY_CLASS_TWINS 0x39 -#define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 +#define FACILITY_CLASS_SCHOOL_KID_M 0x26 +#define FACILITY_CLASS_SCHOOL_KID_F 0x27 +#define FACILITY_CLASS_SR_AND_JR 0x28 +#define FACILITY_CLASS_POKEFAN_M 0x29 +#define FACILITY_CLASS_POKEFAN_F 0x2a +#define FACILITY_CLASS_YOUNGSTER 0x2b +#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c +#define FACILITY_CLASS_FISHERMAN 0x2d +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 +#define FACILITY_CLASS_DRAGON_TAMER 0x34 +#define FACILITY_CLASS_NINJA_BOY 0x35 +#define FACILITY_CLASS_BATTLE_GIRL 0x36 +#define FACILITY_CLASS_PARASOL_LADY 0x37 +#define FACILITY_CLASS_SWIMMER_F 0x38 +#define FACILITY_CLASS_TWINS 0x39 +#define FACILITY_CLASS_SAILOR 0x3a +#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 0x3d #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 0x3e -#define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f -#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 -#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 -#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 -#define FACILITY_CLASS_BUG_CATCHER 0x43 -#define FACILITY_CLASS_PKMN_RANGER_M 0x44 -#define FACILITY_CLASS_PKMN_RANGER_F 0x45 -#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 -#define FACILITY_CLASS_LASS 0x47 -#define FACILITY_CLASS_YOUNG_COUPLE 0x48 -#define FACILITY_CLASS_OLD_COUPLE 0x49 -#define FACILITY_CLASS_SIS_AND_BRO 0x4a -#define FACILITY_CLASS_STEVEN 0x4b -#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c -#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d -#define FACILITY_CLASS_RED 0x4e -#define FACILITY_CLASS_LEAF 0x4f -#define FACILITY_CLASS_RS_BRENDAN 0x50 -#define FACILITY_CLASS_RS_MAY 0x51 +#define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f +#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 +#define FACILITY_CLASS_BUG_CATCHER 0x43 +#define FACILITY_CLASS_PKMN_RANGER_M 0x44 +#define FACILITY_CLASS_PKMN_RANGER_F 0x45 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 +#define FACILITY_CLASS_LASS 0x47 +#define FACILITY_CLASS_YOUNG_COUPLE 0x48 +#define FACILITY_CLASS_OLD_COUPLE 0x49 +#define FACILITY_CLASS_SIS_AND_BRO 0x4a +#define FACILITY_CLASS_STEVEN 0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d +#define FACILITY_CLASS_RED 0x4e +#define FACILITY_CLASS_LEAF 0x4f +#define FACILITY_CLASS_RS_BRENDAN 0x50 +#define FACILITY_CLASS_RS_MAY 0x51 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_PKMN_BREEDER 0x4 -#define TRAINER_CLASS_COOLTRAINER 0x5 +#define TRAINER_CLASS_COOLTRAINER 0x5 #define TRAINER_CLASS_BIRD_KEEPER 0x6 #define TRAINER_CLASS_COLLECTOR 0x7 #define TRAINER_CLASS_SWIMMER_M 0x8 @@ -218,7 +218,7 @@ #define TRAINER_CLASS_AROMA_LADY 0xf #define TRAINER_CLASS_RUIN_MANIAC 0x10 #define TRAINER_CLASS_INTERVIEWER 0x11 -#define TRAINER_CLASS_TUBER_F 0x12 +#define TRAINER_CLASS_TUBER_F 0x12 #define TRAINER_CLASS_TUBER_M 0x13 #define TRAINER_CLASS_LADY 0x14 #define TRAINER_CLASS_BEAUTY 0x15 -- cgit v1.2.3 From 2779421ad479312eba5a0fc5bb993473e83465ee Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 08:01:52 -0500 Subject: fix brendan/may/wally consistency issues --- include/constants/trainers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d1ab51e4e..d5b1dbba3 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -176,13 +176,13 @@ #define FACILITY_CLASS_SWIMMER_F 0x38 #define FACILITY_CLASS_TWINS 0x39 #define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 0x3d -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 0x3e -#define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f -#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 -#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 +#define FACILITY_CLASS_WALLY 0x3b +#define FACILITY_CLASS_BRENDAN 0x3c +#define FACILITY_CLASS_BRENDAN_2 0x3d +#define FACILITY_CLASS_BRENDAN_3 0x3e +#define FACILITY_CLASS_MAY 0x3f +#define FACILITY_CLASS_MAY_2 0x40 +#define FACILITY_CLASS_MAY_3 0x41 #define FACILITY_CLASS_PKMN_BREEDER_M 0x42 #define FACILITY_CLASS_BUG_CATCHER 0x43 #define FACILITY_CLASS_PKMN_RANGER_M 0x44 -- cgit v1.2.3 From 0e5e487b789f722dc5ceef6a1393ec4910753e34 Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 08:04:11 -0500 Subject: tweak alignment --- include/constants/trainers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d5b1dbba3..cf6eaf929 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -176,13 +176,13 @@ #define FACILITY_CLASS_SWIMMER_F 0x38 #define FACILITY_CLASS_TWINS 0x39 #define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_WALLY 0x3b -#define FACILITY_CLASS_BRENDAN 0x3c -#define FACILITY_CLASS_BRENDAN_2 0x3d -#define FACILITY_CLASS_BRENDAN_3 0x3e -#define FACILITY_CLASS_MAY 0x3f -#define FACILITY_CLASS_MAY_2 0x40 -#define FACILITY_CLASS_MAY_3 0x41 +#define FACILITY_CLASS_WALLY 0x3b +#define FACILITY_CLASS_BRENDAN 0x3c +#define FACILITY_CLASS_BRENDAN_2 0x3d +#define FACILITY_CLASS_BRENDAN_3 0x3e +#define FACILITY_CLASS_MAY 0x3f +#define FACILITY_CLASS_MAY_2 0x40 +#define FACILITY_CLASS_MAY_3 0x41 #define FACILITY_CLASS_PKMN_BREEDER_M 0x42 #define FACILITY_CLASS_BUG_CATCHER 0x43 #define FACILITY_CLASS_PKMN_RANGER_M 0x44 -- cgit v1.2.3 From a83fc52a7e393e44079abd0f616d75ad7fa230e8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 14:49:16 +0100 Subject: Make data easier to edit --- include/constants/species.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/constants/species.h b/include/constants/species.h index cd9b13743..02e5ea396 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -449,6 +449,7 @@ // National Dex Index Defines +#define NATIONAL_DEX_NONE 0 #define NATIONAL_DEX_BULBASAUR 1 #define NATIONAL_DEX_IVYSAUR 2 #define NATIONAL_DEX_VENUSAUR 3 @@ -865,6 +866,7 @@ // Hoenn Dex Index Defines +#define HOENN_DEX_NONE 0 #define HOENN_DEX_BULBASAUR 203 #define HOENN_DEX_IVYSAUR 204 #define HOENN_DEX_VENUSAUR 205 -- cgit v1.2.3 From 715fbb379e14feca236d30220526c125896d25b5 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 3 Dec 2018 14:58:25 +0000 Subject: Document some of pokedex.c --- include/graphics.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 6ec5c44b2..f51d7fa47 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3282,18 +3282,18 @@ extern const u32 gBattleTerrainPalette_StadiumWallace[]; extern const u32 gPokedexMenu2_Gfx[]; extern const u16 gPokedexText_Pal[]; extern const u32 gPokedexMenu_Gfx[]; -extern const u8 gUnknown_08DC2C5C[]; -extern const u8 gUnknown_08DC2DAC[]; -extern const u8 gUnknown_08DC2A08[]; -extern const u8 gUnknown_08DC2B1C[]; +extern const u8 gPokedexTilemap_Main[]; +extern const u8 gPokedexTilemap_MainUnderlay[]; +extern const u8 gPokedexTilemap_StartMenu1[]; +extern const u8 gPokedexTilemap_StartMenu2[]; extern const u16 gPokedexHoennBg_Pal[]; extern const u16 gPokedexText_Pal[]; extern const u16 gPokedexNationalBg_Pal[]; -extern const u8 gUnknown_08DC3080[]; -extern const u8 gUnknown_08DC3198[]; -extern const u8 gUnknown_08DC2E6C[]; -extern const u8 gUnknown_08DC2F5C[]; -extern const u8 gUnknown_08DC2FEC[]; +extern const u8 gPokedexTilemap_DescriptionScreen[]; +extern const u8 gPokedexTilemap_CryScreen[]; +extern const u8 gPokedexTilemap_SizeScreen[]; +extern const u8 gPokedexTilemap_ScreenSelectBar1[]; +extern const u8 gPokedexTilemap_ScreenSelectBar2[]; extern const u16 gPokedexCaughtScreenFade_Pal[]; extern const u32 gPokedexSearchMenu_Gfx[]; extern const u32 gPokedexSearch2_Tilemap[]; -- cgit v1.2.3 From dcb1d78fa9e82d65d13d8131a95a4b8ac99bd168 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 16:20:39 +0100 Subject: Add battle controllers var to src from sym_ewram --- include/battle_controllers.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index ff5a629af..9449f1986 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -175,6 +175,7 @@ enum CONTROLLER_CMDS_COUNT }; +extern struct UnusedControllerStruct gUnknown_02022D0C; // general functions void HandleLinkBattleSetup(void); -- cgit v1.2.3 From 2347e36d60258f82b0a9ee2c16619e54f5a65118 Mon Sep 17 00:00:00 2001 From: Melody Date: Wed, 5 Dec 2018 10:09:19 -0500 Subject: =?UTF-8?q?document=20pok=C3=A9dex=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/constants/pokemon.h | 2 ++ include/strings.h | 76 ++++++++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 38 deletions(-) (limited to 'include') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1a4741574..f63d755ad 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -2,6 +2,7 @@ #define GUARD_CONSTANTS_POKEMON_H // Pokemon types +#define TYPE_NONE 0xFF #define TYPE_NORMAL 0x00 #define TYPE_FIGHTING 0x01 #define TYPE_FLYING 0x02 @@ -22,6 +23,7 @@ #define TYPE_DARK 0x11 #define NUMBER_OF_MON_TYPES 0x12 + // Pokemon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 diff --git a/include/strings.h b/include/strings.h index 887ccdfe6..22d12aa18 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1000,44 +1000,44 @@ extern const u8 gUnknown_085E8840[]; extern const u8 gUnknown_085E887C[]; extern const u8 gUnknown_085E88A6[]; extern const u8 gUnknown_085E88C8[]; -extern const u8 gUnknown_085E88DF[]; -extern const u8 gUnknown_085E88E9[]; -extern const u8 gUnknown_085E88F6[]; -extern const u8 gUnknown_085E8905[]; -extern const u8 gUnknown_085E8911[]; -extern const u8 gUnknown_085E891F[]; -extern const u8 gUnknown_085E892D[]; -extern const u8 gUnknown_085E893A[]; -extern const u8 gUnknown_085E8948[]; -extern const u8 gUnknown_085E894C[]; -extern const u8 gUnknown_085E8950[]; -extern const u8 gUnknown_085E8954[]; -extern const u8 gUnknown_085E8958[]; -extern const u8 gUnknown_085E895C[]; -extern const u8 gUnknown_085E8960[]; -extern const u8 gUnknown_085E8964[]; -extern const u8 gUnknown_085E8968[]; -extern const u8 gUnknown_085E896B[]; -extern const u8 gUnknown_085E896F[]; -extern const u8 gUnknown_085E8974[]; -extern const u8 gUnknown_085E897B[]; -extern const u8 gUnknown_085E8981[]; -extern const u8 gUnknown_085E8987[]; -extern const u8 gUnknown_085E898D[]; -extern const u8 gUnknown_085E8994[]; -extern const u8 gUnknown_085E8999[]; -extern const u8 gUnknown_085E899F[]; -extern const u8 gUnknown_085E89A4[]; -extern const u8 gUnknown_085E89BB[]; -extern const u8 gUnknown_085E89D4[]; -extern const u8 gUnknown_085E8A02[]; -extern const u8 gUnknown_085E8A37[]; -extern const u8 gUnknown_085E8A73[]; -extern const u8 gUnknown_085E8AAF[]; -extern const u8 gUnknown_085E8AEA[]; -extern const u8 gUnknown_085E8B25[]; -extern const u8 gUnknown_085E8B26[]; -extern const u8 gUnknown_085E8B35[]; +extern const u8 gText_DexHoennTitle[]; +extern const u8 gText_DexNatTitle[]; +extern const u8 gText_DexSortNumericalTitle[]; +extern const u8 gText_DexSortAtoZTitle[]; +extern const u8 gText_DexSortHeaviestTitle[]; +extern const u8 gText_DexSortLightestTitle[]; +extern const u8 gText_DexSortTallestTitle[]; +extern const u8 gText_DexSortSmallestTitle[]; +extern const u8 gText_DexSearchAlphaABC[]; +extern const u8 gText_DexSearchAlphaDEF[]; +extern const u8 gText_DexSearchAlphaGHI[]; +extern const u8 gText_DexSearchAlphaJKL[]; +extern const u8 gText_DexSearchAlphaMNO[]; +extern const u8 gText_DexSearchAlphaPQR[]; +extern const u8 gText_DexSearchAlphaSTU[]; +extern const u8 gText_DexSearchAlphaVWX[]; +extern const u8 gText_DexSearchAlphaYZ[]; +extern const u8 gText_DexSearchColorRed[]; +extern const u8 gText_DexSearchColorBlue[]; +extern const u8 gText_DexSearchColorYellow[]; +extern const u8 gText_DexSearchColorGreen[]; +extern const u8 gText_DexSearchColorBlack[]; +extern const u8 gText_DexSearchColorBrown[]; +extern const u8 gText_DexSearchColorPurple[]; +extern const u8 gText_DexSearchColorGray[]; +extern const u8 gText_DexSearchColorWhite[]; +extern const u8 gText_DexSearchColorPink[]; +extern const u8 gText_DexHoennDescription[]; +extern const u8 gText_DexNatDescription[]; +extern const u8 gText_DexSortNumericalDescription[]; +extern const u8 gText_DexSortAtoZDescription[]; +extern const u8 gText_DexSortHeaviestDescription[]; +extern const u8 gText_DexSortLightestDescription[]; +extern const u8 gText_DexSortTallestDescription[]; +extern const u8 ggText_DexSortSmallestDescription[]; +extern const u8 gText_DexEmptyString[]; +extern const u8 gText_DexSearchDontSpecify[]; +extern const u8 gText_DexSearchTypeNone[]; extern const u8 gUnknown_085EAEC3[]; extern const u8 gUnknown_085EAED6[]; -- cgit v1.2.3