summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h5
-rw-r--r--include/battle_anim_813F0F4.h5
-rw-r--r--include/decompress.h14
-rw-r--r--include/global.fieldmap.h6
-rw-r--r--include/macros/map.inc4
-rw-r--r--include/menu.h2
-rw-r--r--include/money.h2
-rw-r--r--include/pokemon_summary_screen.h1
-rw-r--r--include/rom_8077ABC.h12
-rw-r--r--include/strings.h3
-rw-r--r--include/text.h26
-rw-r--r--include/util.h6
12 files changed, 61 insertions, 25 deletions
diff --git a/include/battle.h b/include/battle.h
index c9bbb56eb..06a390cdf 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -458,6 +458,9 @@ struct Struct2017840
u8 filler2[6];
u8 unk8;
u8 unk9_0:1;
+ u8 unk9_1:1;
+ u8 unkA;
+ u16 unkC;
};
struct Struct20238C8
@@ -840,6 +843,8 @@ void SetBankFuncToOpponentBufferRunCommand(void);
void BattleStopLowHpSound(void);
void sub_8031FC4(u8, u8, bool8);
void sub_8032984(u8, u16);
+void refresh_graphics_maybe(u8, u8, u8);
+void sub_80324E0(u8 a);
void SetBankFuncToLinkOpponentBufferRunCommand(void);
diff --git a/include/battle_anim_813F0F4.h b/include/battle_anim_813F0F4.h
index 230a04dbb..9916f2fe6 100644
--- a/include/battle_anim_813F0F4.h
+++ b/include/battle_anim_813F0F4.h
@@ -1,6 +1,9 @@
#ifndef GUARD_BATTLE_ANIM_813F0F4_H
#define GUARD_BATTLE_ANIM_813F0F4_H
-void sub_8141828();
+void sub_8141828(u8, struct Pokemon *);
+u8 ball_number_to_ball_processing_index(u16);
+u8 sub_814086C(u8, u8, u8, u8, u8);
+u8 sub_8141314(u8, u8, u32, u8);
#endif // GUARD_BATTLE_ANIM_813F0F4_H
diff --git a/include/decompress.h b/include/decompress.h
index 01f66971c..a97dd78f1 100644
--- a/include/decompress.h
+++ b/include/decompress.h
@@ -5,13 +5,13 @@
void LZDecompressWram(const void *src, void *dest);
void LZDecompressVram(const void *src, void *dest);
-void LoadCompressedObjectPic(const struct CompressedSpriteSheet *a);
-void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *a, void *buffer);
-void LoadCompressedObjectPalette(const struct CompressedSpritePalette *a);
-void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer);
-void DecompressPicFromTable_2(const struct CompressedSpriteSheet *a, u8 b, u8 c, void *d, void *e, s32 f);
-void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *spriteSheet, u32 b, u32 c, u32 d, void *dest, s32 species, u32 pid);
-void LoadSpecialPokePic(const struct CompressedSpriteSheet *spriteSheet, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g, u32 h);
+void LoadCompressedObjectPic(const struct CompressedSpriteSheet *src);
+void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer);
+void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src);
+void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer);
+void DecompressPicFromTable_2(const struct CompressedSpriteSheet *a, u8 coords, u8 y_offset, void *d, void *dest, s32 species);
+void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *spriteSheet, u32 coords, u32 y_offset, u32 d, void *dest, s32 species, u32 pid);
+void LoadSpecialPokePic(const struct CompressedSpriteSheet *spriteSheet, u32 coords, u32 y_offset, u32 d, void *dest, s32 species, u32 pid, u32 frontOrBack);
void Unused_LZDecompressWramIndirect(const void **src, void *dest);
#endif // GUARD_DECOMPRESS_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index f15348689..15766a350 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -90,10 +90,10 @@ struct EventObjectTemplate
struct WarpEvent
{
s16 x, y;
- s8 warpId;
- u8 mapGroup;
+ u8 elevation;
+ u8 warpId;
u8 mapNum;
- u8 unk7;
+ u8 mapGroup;
};
struct CoordEvent
diff --git a/include/macros/map.inc b/include/macros/map.inc
index 80257fd23..bc54271d4 100644
--- a/include/macros/map.inc
+++ b/include/macros/map.inc
@@ -26,9 +26,9 @@
inc _num_npcs
.endm
- .macro warp_def x, y, byte, warp, map_id
+ .macro warp_def x, y, elevation, warp, map_id
.2byte \x, \y
- .byte \byte, \warp
+ .byte \elevation, \warp
.byte \map_id & 0xFF @ map num
.byte \map_id >> 8 @ map group
inc _num_warps
diff --git a/include/menu.h b/include/menu.h
index 8741649c8..921a05eca 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -70,7 +70,7 @@ u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
int sub_8072AB0(const u8 *, u8, u16, u8, u8, u32);
void MenuPrint_RightAligned(const u8 *, u8, u8);
void sub_8072B80(const u8 *, u8, u8, const u8 *);
-void sub_8072BD8(const u8 *, u8, u8, u16);
+void MenuPrint_Centered(const u8 *, u8, u8, u16);
u8 *AlignInt1InMenuWindow(u8 *, s32, u8, u8);
u8 *AlignInt2InMenuWindow(u8 *, s32, u8, u8);
u8 *AlignStringInMenuWindow(u8 *, const u8 *, u8, u8);
diff --git a/include/money.h b/include/money.h
index e3a3f898d..43579910c 100644
--- a/include/money.h
+++ b/include/money.h
@@ -6,7 +6,7 @@ void AddMoney(u32 *, u32);
void RemoveMoney(u32 *, u32);
void GetMoneyAmountText(u8 *buffer, u32 arg1, u8 arg2);
void PrintMoneyAmount(u32 arg0, u8 arg1, u8 x, u8 y);
-void sub_80B7AEC(u32, u8 left, u8 top);
+void sub_80B7AEC(u32, u8 right, u8 top);
void Draw10000Sprite(u8, u8, int);
void UpdateMoneyWindow(u32, u8, u8);
void OpenMoneyWindow(u32, u8, u8);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index f1dbe0089..29bdd332e 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -63,7 +63,6 @@ void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback,
u8 sub_809FA30(void);
u8 GetPrimaryStatus(u32);
u8 GetMonStatusAndPokerus();
-u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8);
u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level);
u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
bool8 CheckPartyPokerus(struct Pokemon *, u8);
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 096260488..c7cb833bc 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -41,9 +41,9 @@ bool8 IsDoubleBattle(void);
void sub_8078914();
u8 sub_80789BC();
void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
-void InitAnimSpriteTranslationDeltas(struct Sprite *sprite);
-bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite);
-void TranslateAnimSpriteByDeltasUntil(struct Sprite *sprite);
+void InitAnimLinearTranslation(struct Sprite *sprite);
+bool8 TranslateAnimLinear(struct Sprite *sprite);
+void TranslateAnimLinearUntil(struct Sprite *sprite);
void sub_8078D44(struct Sprite *sprite);
void obj_id_set_rotscale(u8 sprite, s16, s16, u16);
bool8 sub_8078E38();
@@ -72,10 +72,10 @@ void sub_807A960(struct Sprite *sprite);
void sub_8078A34(struct Sprite *sprite);
void InitAnimSpritePos(struct Sprite *sprite, u8);
void sub_8078764(struct Sprite *sprite, u8);
-void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite);
+void StartAnimLinearTranslation(struct Sprite *sprite);
void sub_8078D60(struct Sprite *sprite);
-void InitAnimSpriteTranslationOverDuration(struct Sprite *sprite);
void sub_8078D8C(struct Sprite *sprite);
+void InitAnimArcTranslation(struct Sprite *sprite);
void WaitAnimForDuration(struct Sprite *sprite);
void sub_8078CC0(struct Sprite *sprite);
void sub_8078600(struct Sprite *sprite);
@@ -105,7 +105,7 @@ void sub_80798F4(struct Task *task, u8 a2, const void *a3);
bool8 sub_807992C(struct Task *task);
u8 sub_8077FC0(u8 slot);
void move_anim_8074EE0(struct Sprite *sprite);
-bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite);
+bool8 TranslateAnimArc(struct Sprite *sprite);
bool8 sub_8078CE8(struct Sprite *sprite);
void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
void sub_8078BD4(struct Sprite *sprite);
diff --git a/include/strings.h b/include/strings.h
index 0232b03f4..2ce8ac977 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -171,7 +171,8 @@ extern const u8 gOtherText_OneDash[];
extern const u8 gOtherText_TwoDashes[];
extern const u8 gOtherText_ThreeDashes2[];
extern const u8 gOtherText_MaleSymbol2[];
-extern const u8 gOtherText_FemaleSymbolAndLv[];
+extern const u8 gOtherText_FemaleSymbol2[];
+extern const u8 gOtherText_Lv[];
extern const u8 gOtherText_TallPlusAndRightArrow[];
extern const u8 gMenuText_GoBackToPrev[];
extern const u8 gOtherText_WhatWillYouDo[];
diff --git a/include/text.h b/include/text.h
index ce63a2542..8b5df9280 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,6 +2,7 @@
#define GUARD_TEXT_H
#define CHAR_SPACE 0x00
+#define CHAR_LV 0x34
#define CHAR_SONG_WORD_SEPARATOR 0x37 // separates words in the bard song. Not sure if it's used for anything else
#define CHAR_0 0xA1
#define CHAR_QUESTION_MARK 0xAC
@@ -74,6 +75,27 @@
#define CHAR_NEWLINE 0xFE
#define EOS 0xFF // end of string
+#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 4
+#define TEXT_COLOR_TRANSPARENT 0x00
+#define TEXT_COLOR_DARK_GREY 0x01
+#define TEXT_COLOR_RED 0x02
+#define TEXT_COLOR_GREEN 0x03
+#define TEXT_COLOR_BLUE 0x04
+#define TEXT_COLOR_YELLOW 0x05
+#define TEXT_COLOR_CYAN 0x06
+#define TEXT_COLOR_MAGENTA 0x07
+#define TEXT_COLOR_LIGHT_GREY 0x08
+#define TEXT_COLOR_BLACK 0x09
+#define TEXT_COLOR_BLACK2 0x0A
+#define TEXT_COLOR_SILVER 0x0B
+#define TEXT_COLOR_WHITE 0x0C
+#define TEXT_COLOR_SKY_BLUE 0x0D
+#define TEXT_COLOR_LIGHT_BLUE 0x0E
+#define TEXT_COLOR_WHITE2 0x0F
+
+#define EXT_CTRL_CODE_CLEAR 17
+
+
struct WindowTemplate
{
u8 bgNum;
@@ -242,8 +264,8 @@ u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignT
u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 alignType);
u8 GetStringWidth(struct Window *win, const u8 *s);
u8 Text_InitWindow8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6);
-u8 Text_InitWindow8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
-u8 Text_InitWindow8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6);
+u8 Text_InitWindow_RightAligned(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 right, u8 top);
+u8 Text_InitWindow_Centered(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6);
u8 Text_GetWindowPaletteNum(struct Window *win);
void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 *shadow);
void Text_InitWindow8004E3C(const struct WindowTemplate *winConfig, u8 *tileData, const u8 *text);
diff --git a/include/util.h b/include/util.h
index 02c503f75..1a3bd5f1a 100644
--- a/include/util.h
+++ b/include/util.h
@@ -3,6 +3,12 @@
#include "sprite.h"
+//Extracts the upper 16 bits of a 32-bit number
+#define HIHALF(n) (((n) & 0xFFFF0000) >> 16)
+
+//Extracts the lower 16 bits of a 32-bit number
+#define LOHALF(n) ((n) & 0xFFFF)
+
extern const u8 gMiscBlank_Gfx[];
extern const u32 gBitTable[];
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 04:01:41 +0000