diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 32 | ||||
| -rw-r--r-- | include/bg.h | 4 | ||||
| -rw-r--r-- | include/contest.h | 6 | ||||
| -rw-r--r-- | include/contest_link_80F57C4.h | 3 | ||||
| -rw-r--r-- | include/contest_painting.h | 1 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 4 | ||||
| -rw-r--r-- | include/graphics.h | 6 | ||||
| -rw-r--r-- | include/international_string_util.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 20 | ||||
| -rw-r--r-- | include/script_pokemon_util_80F87D8.h | 3 | ||||
| -rw-r--r-- | include/strings.h | 50 | ||||
| -rw-r--r-- | include/text.h | 18 |
12 files changed, 107 insertions, 42 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index e164cef7a..16e9de0ac 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -73,9 +73,35 @@ 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); +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_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 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); @@ -85,7 +111,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/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/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/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; diff --git a/include/graphics.h b/include/graphics.h index a3af44ad7..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[]; @@ -4732,4 +4733,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 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/pokemon.h b/include/pokemon.h index 3e69845e6..5d7f7f2ae 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 @@ -465,7 +446,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); diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h index 7c2a1ff66..02a35ecba 100644 --- a/include/script_pokemon_util_80F87D8.h +++ b/include/script_pokemon_util_80F87D8.h @@ -1,9 +1,8 @@ - #ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H #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 diff --git a/include/strings.h b/include/strings.h index c4af6f5b2..1649910cc 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[]; diff --git a/include/text.h b/include/text.h index 4946f1c5f..27a6364bb 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 void *src_, void *dest_); u8 GetLastTextColor(u8 colorType); void CopyGlyphToWindow(struct TextPrinter *x); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); |