diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 9 | ||||
| -rw-r--r-- | include/contest_painting.h | 6 | ||||
| -rw-r--r-- | include/data2.h | 22 | ||||
| -rw-r--r-- | include/graphics.h | 76 | ||||
| -rw-r--r-- | include/trainer.h | 8 |
5 files changed, 100 insertions, 21 deletions
diff --git a/include/battle.h b/include/battle.h index 544e65b80..11bb9e387 100644 --- a/include/battle.h +++ b/include/battle.h @@ -53,7 +53,7 @@ struct Trainer /*0x18*/ bool8 doubleBattle; /*0x1C*/ u32 aiFlags; /*0x20*/ u8 partySize; - /*0x24*/ void *party; + /*0x24*/ const void *party; }; struct UnkBattleStruct1 // AI_Opponent_Info? @@ -710,11 +710,11 @@ extern u8 gBattleTextBuff1[]; // asm/battle_1.o void sub_800D6D4(); -void sub_800D74C(); +void ApplyPlayerChosenFrameToBattleMenu(); void DrawMainBattleBackground(void); -void sub_800DAB8(); +void LoadBattleTextboxAndBackground(); void sub_800DE30(u8); -void sub_800E23C(); +void LoadBattleEntryBackground(); // src/battle_2.o void sub_800E7C4(void); @@ -726,6 +726,7 @@ void BattleMainCB2(void); void sub_800F838(struct Sprite *); u8 CreateNPCTrainerParty(struct Pokemon *, u16); void sub_800FCFC(void); +void nullsub_36(struct Sprite *); void c2_8011A1C(void); void sub_80101B8(void); void c2_081284E0(void); diff --git a/include/contest_painting.h b/include/contest_painting.h index 48ab95fbc..81535ec8b 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -40,9 +40,9 @@ struct Unk2015E00 struct ContestEntry { - /*0x00*/ u8 var0; - /*0x04*/ u32 var4; - /*0x08*/ u16 var8; + /*0x00*/ u32 personality; + /*0x04*/ u32 otId; + /*0x08*/ u16 species; /*0x0A*/ u8 contestType; /*0x0B*/ u8 pokemon_name[POKEMON_NAME_LENGTH]; /*0x15*/ u8 pad15; diff --git a/include/data2.h b/include/data2.h index 2fe8d39f8..593d04480 100644 --- a/include/data2.h +++ b/include/data2.h @@ -24,32 +24,32 @@ extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[]; extern const union AnimCmd *const gSpriteAnimTable_81E7C64[]; -extern struct MonCoords gMonFrontPicCoords[]; -extern struct MonCoords gMonBackPicCoords[]; -extern struct CompressedSpriteSheet gMonFrontPicTable[]; -extern struct CompressedSpriteSheet gMonBackPicTable[]; +extern const struct MonCoords gMonFrontPicCoords[]; +extern const struct MonCoords gMonBackPicCoords[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const struct CompressedSpriteSheet gMonBackPicTable[]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const union AnimCmd *const *const gUnknown_081EC2A4[]; extern const union AnimCmd *const *const gUnknown_081ECACC[]; -extern struct MonCoords gTrainerBackPicCoords[]; -extern struct CompressedSpriteSheet gTrainerBackPicTable[]; +extern const struct MonCoords gTrainerBackPicCoords[]; +extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern u8 gEnemyMonElevation[]; +extern const u8 gEnemyMonElevation[]; extern const u8 gTrainerClassNames[][13]; extern const struct Trainer gTrainers[]; -extern u8 gSpeciesNames[][11]; +extern const u8 gSpeciesNames[][11]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; extern const struct ScanlineEffectParams gUnknown_081F9674; extern const u8 gUnknown_081F96C8[]; -extern struct CompressedSpriteSheet gUnknown_081FAEA4; -extern struct CompressedSpritePalette gUnknown_081FAEAC; +extern const struct CompressedSpriteSheet gUnknown_081FAEA4; +extern const struct CompressedSpritePalette gUnknown_081FAEAC; extern const struct SpriteTemplate gSpriteTemplate_81FAF0C; extern u8 *const gUnknown_081FAF4C[]; //extern u8 (*const gUnknown_081FAF4C[])[0x800]; -extern struct BattleMove gBattleMoves[]; +extern const struct BattleMove gBattleMoves[]; // data/graphics/trainers/front_pic_coords.inc extern const struct MonCoords gTrainerFrontPicCoords[]; diff --git a/include/graphics.h b/include/graphics.h index 889dc3916..d70aefac6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2634,9 +2634,9 @@ extern const u16 gUnknown_08EA02C8[]; extern const u16 gUnknown_08EA0348[]; extern const u16 gUnknown_08EA15C8[]; extern const u16 gTradeMonBoxTilemap[]; -extern const u8 gUnknown_08D00000[]; -extern const u16 gUnknown_08D00524[]; -extern const u8 gUnknown_08D004E0[]; +extern const u8 gBattleTextboxTiles[]; +extern const u16 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; extern const u8 gNamingScreenBackButtonTiles[]; extern const u8 gNamingScreenOKButtonTiles[]; @@ -3345,4 +3345,74 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; +extern const struct CompressedSpriteSheet gBattleTerrainTiles_TallGrass[]; +extern const u8 gBattleTerrainTilemap_TallGrass[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_TallGrass[]; +extern const u8 gBattleTerrainAnimTilemap_TallGrass[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_TallGrass[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_LongGrass[]; +extern const u8 gBattleTerrainTilemap_LongGrass[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_LongGrass[]; +extern const u8 gBattleTerrainAnimTilemap_LongGrass[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_LongGrass[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Sand[]; +extern const u8 gBattleTerrainTilemap_Sand[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Sand[]; +extern const u8 gBattleTerrainAnimTilemap_Sand[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_Sand[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Underwater[]; +extern const u8 gBattleTerrainTilemap_Underwater[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Underwater[]; +extern const u8 gBattleTerrainAnimTilemap_Underwater[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_Underwater[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Water[]; +extern const u8 gBattleTerrainTilemap_Water[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Water[]; +extern const u8 gBattleTerrainAnimTilemap_Water[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_Water[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_PondWater[]; +extern const u8 gBattleTerrainTilemap_PondWater[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_PondWater[]; +extern const u8 gBattleTerrainAnimTilemap_PondWater[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_PondWater[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Rock[]; +extern const u8 gBattleTerrainTilemap_Rock[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Rock[]; +extern const u8 gBattleTerrainAnimTilemap_Rock[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_Rock[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Cave[]; +extern const u8 gBattleTerrainTilemap_Cave[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Cave[]; +extern const u8 gBattleTerrainAnimTilemap_Cave[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_Cave[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Building[]; +extern const u8 gBattleTerrainTilemap_Building[]; +extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Building[]; +extern const u8 gBattleTerrainAnimTilemap_Building[]; +extern const struct CompressedSpritePalette gBattleTerrainPalette_Building[]; + +extern const struct CompressedSpritePalette gBattleTerrainPalette_Plain[]; + +extern const struct CompressedSpriteSheet gBattleTerrainTiles_Stadium[]; +extern const u8 gBattleTerrainTilemap_Stadium[]; + +extern const u8 gBattleWindowLargeGfx[]; +extern const u8 gBattleWindowSmallGfx[]; +extern const u8 gBattleWindowSmall2Gfx[]; +extern const u8 gBattleWindowSmall3Gfx[]; +extern const u8 gBattleWindowLarge2Gfx[]; +extern const u8 gBlankGfxCompressed[]; +extern const u8 gBattleGfx_BallStatusBar[]; +extern const u16 gUnknown_08D1212C[]; +extern const u16 gUnknown_08D1214C[]; +extern const u8 Tiles_D129AC[]; + #endif // GUARD_GRAPHICS_H diff --git a/include/trainer.h b/include/trainer.h index e8f2776d2..96143245a 100644 --- a/include/trainer.h +++ b/include/trainer.h @@ -16,6 +16,14 @@ #define TRAINER_ENCOUNTER_MUSIC_INTERVIEWER 12 #define TRAINER_ENCOUNTER_MUSIC_RICH 13 // Rich Boys and Gentlemen +#define F_TRAINER_FEMALE 1 << 7 + +// All trainer parties specify the IV, level, and species for each Pokémon in +// the party. Some trainer parties also specify held items and custom moves +// for each Pokémon. +#define F_TRAINER_PARTY_CUSTOM_MOVESET 1 << 0 +#define F_TRAINER_PARTY_HELD_ITEM 1 << 1 + enum { FACILITY_CLASS_AQUA_LEADER, FACILITY_CLASS_TEAM_AQUA_M, |