summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/cereader_tool.h4
-rw-r--r--include/constants/trainer_tower.h17
-rw-r--r--include/easy_chat.h2
-rw-r--r--include/gba/defines.h5
-rw-r--r--include/graphics.h6
-rw-r--r--include/list_menu.h24
-rw-r--r--include/menu.h4
-rw-r--r--include/pokedex.h2
-rw-r--r--include/pokedex_area_markers.h6
-rw-r--r--include/pokedex_screen.h30
10 files changed, 75 insertions, 25 deletions
diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index dd1866fb3..5dd0a7589 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -8,7 +8,7 @@ struct TrainerTowerTrainer
{
/* 0x000 */ u8 name[11];
/* 0x00B */ u8 facilityClass;
- /* 0x00C */ u8 gender;
+ /* 0x00C */ u8 textColor;
/* 0x00E */ u16 speechBefore[6];
/* 0x01A */ u16 speechWin[6];
/* 0x026 */ u16 speechLose[6];
@@ -18,7 +18,7 @@ struct TrainerTowerTrainer
struct TrainerTowerFloor
{
- /* 0x000 */ u8 unk_000;
+ /* 0x000 */ u8 id;
/* 0x001 */ u8 floorIdx;
/* 0x002 */ u8 challengeType;
/* 0x003 */ u8 prize;
diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h
index 6372a30e8..ea0039ea1 100644
--- a/include/constants/trainer_tower.h
+++ b/include/constants/trainer_tower.h
@@ -4,12 +4,29 @@
#define CHALLENGE_TYPE_SINGLE 0
#define CHALLENGE_TYPE_DOUBLE 1
#define CHALLENGE_TYPE_KNOCKOUT 2
+#define CHALLENGE_TYPE_MIXED 3
// Mixed challenges use one of the above 3 for each floor
#define CHALLENGE_STATUS_LOST 0
#define CHALLENGE_STATUS_UNK 1 // Never set, possibly e-Card related
#define CHALLENGE_STATUS_NORMAL 2 // Not started or ongoing
+#define TTPRIZE_HP_UP 0
+#define TTPRIZE_PROTEIN 1
+#define TTPRIZE_IRON 2
+#define TTPRIZE_CARBOS 3
+#define TTPRIZE_CALCIUM 4
+#define TTPRIZE_ZINC 5
+#define TTPRIZE_BRIGHT_POWDER 6
+#define TTPRIZE_WHITE_HERB 7
+#define TTPRIZE_MENTAL_HERB 8
+#define TTPRIZE_CHOICE_BAND 9
+#define TTPRIZE_KINGS_ROCK 10
+#define TTPRIZE_SCOPE_LENS 11
+#define TTPRIZE_METAL_COAT 12
+#define TTPRIZE_DRAGON_SCALE 13
+#define TTPRIZE_UP_GRADE 14
+
#define MAX_TRAINER_TOWER_FLOORS 8
#define MAX_TRAINERS_PER_FLOOR 3
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 11711cbbc..9c6400fd1 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -31,7 +31,7 @@ struct EasyChatWordsByLetter
};
u8 *CopyEasyChatWord(u8 *dest, u16 word);
-u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
+u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength);
void EC_ResetMEventProfileMaybe(void);
void InitEasyChatPhrases(void);
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 02d687ade..f0fce824e 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -51,8 +51,9 @@
#define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (BG_SCREEN_SIZE * (n)))
#define BG_TILE_ADDR(n) (void *)(BG_VRAM + (0x80 * (n)))
-#define BG_TILE_H_FLIP(n) (0x400 + (n))
-#define BG_TILE_V_FLIP(n) (0x800 + (n))
+#define BG_TILE_H_FLIP(n) (0x400 + (n))
+#define BG_TILE_V_FLIP(n) (0x800 + (n))
+#define BG_TILE_H_V_FLIP(n) (0xC00 + (n))
// text-mode BG
#define OBJ_VRAM0 (void *)(VRAM + 0x10000)
diff --git a/include/graphics.h b/include/graphics.h
index 81b6b4ddf..6b2c87bad 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4861,7 +4861,7 @@ extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[];
extern const u8 gHealthboxElementsGfxTable[][32];
extern const u16 gBattleInterface_BallStatusBarPal[];
extern const u16 gBattleInterface_BallDisplayPal[];
-extern const u16 gUnknown_8D12404[];
+extern const u16 gBattleInterface_SummaryBallDisplayGfx[];
// item_menu
extern const u32 gUnknown_8E830CC[];
@@ -4931,7 +4931,7 @@ extern const u16 gUnknown_8E9C3F8[];
extern const u16 gUnknown_8E9C418[];
// pokedex_screen
-extern const u16 gUnknown_8E9C14C[];
-extern const u16 gUnknown_8E9C16C[];
+extern const u16 gDexScreen_TopMenuIconPals_AtoZ[];
+extern const u32 gDexScreen_TopMenuIconTiles_AtoZ[];
#endif //GUARD_GRAPHICS_H
diff --git a/include/list_menu.h b/include/list_menu.h
index 24c614e39..df204b247 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -28,6 +28,28 @@ struct ListMenuItem
struct ListMenu;
+// For ListMenuGet/SetTemplateField
+enum ListMenuFields
+{
+ LISTFIELD_MOVECURSORFUNC = 0,
+ LISTFIELD_MOVECURSORFUNC2,
+ LISTFIELD_TOTALITEMS,
+ LISTFIELD_MAXSHOWED,
+ LISTFIELD_WINDOWID,
+ LISTFIELD_HEADERX,
+ LISTFIELD_ITEMX,
+ LISTFIELD_CURSORX,
+ LISTFIELD_UPTEXTY,
+ LISTFIELD_CURSORPAL,
+ LISTFIELD_FILLVALUE,
+ LISTFIELD_CURSORSHADOWPAL,
+ LISTFIELD_LETTERSPACING,
+ LISTFIELD_ITEMVERTICALPADDING,
+ LISTFIELD_SCROLLMULTIPLE,
+ LISTFIELD_FONTID,
+ LISTFIELD_CURSORKIND,
+};
+
struct ListMenuTemplate
{
/*0x00*/ const struct ListMenuItem *items;
@@ -82,6 +104,6 @@ void ListMenuGetScrollAndRow(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove);
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value);
+void ListMenuSetTemplateField(u8 taskId, u8 field, s32 value);
#endif //GUARD_LIST_MENU_H
diff --git a/include/menu.h b/include/menu.h
index 83bdcb4f6..5b12047ee 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -28,8 +28,8 @@ u8 Menu2_GetMonSpriteAnchorCoord(u16 species, u32 personality, u8 a2);
s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2);
// list_menu
-void sub_8107CD8(u8 palOffset, u16 speciesId);
-void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
+void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId);
+void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
void ListMenuLoadStdPalAt(u8 palOffset, u8 palId);
void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);
diff --git a/include/pokedex.h b/include/pokedex.h
index aad4849de..12f03e87d 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -48,6 +48,6 @@ bool16 HasAllHoennMons(void);
bool16 HasAllKantoMons(void);
bool16 HasAllMons(void);
-u8 sub_8106B60(u16 species);
+u8 DexScreen_RegisterMonToPokedex(u16 species);
#endif // GUARD_POKEDEX_H
diff --git a/include/pokedex_area_markers.h b/include/pokedex_area_markers.h
index 47bbdf486..a9669a80a 100644
--- a/include/pokedex_area_markers.h
+++ b/include/pokedex_area_markers.h
@@ -12,8 +12,8 @@ struct PAM_TaskData
};
void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites);
-void sub_81343F4(u8 taskId);
-u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y);
-u8 sub_81344E0(u8 taskId);
+void Dtor_PokedexAreaMarkers(u8 taskId);
+u8 Ctor_PokedexAreaMarkers(u16 species, u16 tilesTag, u8 palIdx, u8 y);
+u8 PokedexAreaMarkers_Any(u8 taskId);
#endif //GUARD_POKEDEX_AREA_MARKERS_H
diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h
index 128fc1ad3..a93e0ffcd 100644
--- a/include/pokedex_screen.h
+++ b/include/pokedex_screen.h
@@ -1,21 +1,31 @@
#ifndef GUARD_POKEDEX_SCREEN_H
#define GUARD_POKEDEX_SCREEN_H
-#define DEX_CATEGORY_GRASSLAND 0
-#define DEX_CATEGORY_FOREST 1
-#define DEX_CATEGORY_WATERS_EDGE 2
-#define DEX_CATEGORY_SEA 3
-#define DEX_CATEGORY_CAVE 4
-#define DEX_CATEGORY_MOUNTAIN 5
-#define DEX_CATEGORY_ROUGH_TERRAIN 6
-#define DEX_CATEGORY_URBAN 7
-#define DEX_CATEGORY_RARE 8
+#define DEX_CATEGORY_GRASSLAND 0
+#define DEX_CATEGORY_FOREST 1
+#define DEX_CATEGORY_WATERS_EDGE 2
+#define DEX_CATEGORY_SEA 3
+#define DEX_CATEGORY_CAVE 4
+#define DEX_CATEGORY_MOUNTAIN 5
+#define DEX_CATEGORY_ROUGH_TERRAIN 6
+#define DEX_CATEGORY_URBAN 7
+#define DEX_CATEGORY_RARE 8
+#define DEX_CATEGORY_COUNT 9
+
+#define DEX_ORDER_NUMERICAL_KANTO 0
+#define DEX_ORDER_ATOZ 1
+#define DEX_ORDER_TYPE 2
+#define DEX_ORDER_LIGHTEST 3
+#define DEX_ORDER_SMALLEST 4
+#define DEX_ORDER_NUMERICAL_NATIONAL 5
+
+#define DEX_MODE(name) (DEX_CATEGORY_COUNT + DEX_ORDER_##name)
#include "pokedex.h"
extern const struct PokedexEntry gPokedexEntries[];
void CB2_OpenPokedexFromStartMenu(void);
-s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
+s8 DexScreen_GetSetPokedexFlag(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
#endif //GUARD_POKEDEX_SCREEN_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 08:48:21 +0000