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/event_object_movement.h1
-rw-r--r--include/constants/field_effects.h62
-rw-r--r--include/constants/trainer_tower.h17
-rw-r--r--include/easy_chat.h2
-rw-r--r--include/event_object_movement.h14
-rw-r--r--include/field_effect.h2
-rw-r--r--include/field_effect_helpers.h2
-rw-r--r--include/global.fieldmap.h4
-rw-r--r--include/list_menu.h24
-rw-r--r--include/sprite.h2
11 files changed, 108 insertions, 26 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/event_object_movement.h b/include/constants/event_object_movement.h
index 008d3a117..62c5a2ef2 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -83,6 +83,7 @@
#define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E
#define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F
#define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50
+#define MOVEMENT_TYPES_COUNT 0x51
#define MOVEMENT_ACTION_FACE_DOWN 0x0
#define MOVEMENT_ACTION_FACE_UP 0x1
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 92795246a..47b5f2bed 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,16 +1,16 @@
#ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H
#define GUARD_CONSTANTS_FIELD_EFFECTS_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_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
@@ -72,4 +72,46 @@
#define FLDEFF_DESTROY_DEOXYS_ROCK 68
#define FLDEFF_UNK_45 69 // TODO: related to fame checker photos
+#define FLDEFF_PAL_TAG_GENERAL_0 0x1004
+#define FLDEFF_PAL_TAG_GENERAL_1 0x1005
+#define FLDEFF_PAL_TAG_ASH 0x100D
+#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F
+
+#define FLDEFFOBJ_SHADOW_S 0
+#define FLDEFFOBJ_SHADOW_M 1
+#define FLDEFFOBJ_SHADOW_L 2
+#define FLDEFFOBJ_SHADOW_XL 3
+#define FLDEFFOBJ_TALL_GRASS 4
+#define FLDEFFOBJ_RIPPLE 5
+#define FLDEFFOBJ_ASH 6
+#define FLDEFFOBJ_SURF_BLOB 7
+#define FLDEFFOBJ_ARROW 8
+#define FLDEFFOBJ_GROUND_IMPACT_DUST 9
+#define FLDEFFOBJ_JUMP_TALL_GRASS 10
+#define FLDEFFOBJ_SAND_FOOTPRINTS 11
+#define FLDEFFOBJ_JUMP_BIG_SPLASH 12
+#define FLDEFFOBJ_SPLASH 13
+#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14
+#define FLDEFFOBJ_LONG_GRASS 15
+#define FLDEFFOBJ_JUMP_LONG_GRASS 16
+#define FLDEFFOBJ_UNUSED_GRASS 17
+#define FLDEFFOBJ_UNUSED_GRASS_2 18
+#define FLDEFFOBJ_UNUSED_SAND 19
+#define FLDEFFOBJ_WATER_SURFACING 20
+#define FLDEFFOBJ_REFLECTION_DISTORTION 21
+#define FLDEFFOBJ_SPARKLE 22
+#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23
+#define FLDEFFOBJ_TREE_DISGUISE 24
+#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25
+#define FLDEFFOBJ_BIRD 26
+#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27
+#define FLDEFFOBJ_SAND_DISGUISE 28
+#define FLDEFFOBJ_SAND_PILE 29
+#define FLDEFFOBJ_SHORT_GRASS 30
+#define FLDEFFOBJ_HOT_SPRINGS_WATER 31
+#define FLDEFFOBJ_ASH_PUFF 32
+#define FLDEFFOBJ_ASH_LAUNCH 33
+#define FLDEFFOBJ_BUBBLES 34
+#define FLDEFFOBJ_SMALL_SPARKLE 35
+
#endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
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/event_object_movement.h b/include/event_object_movement.h
index 25fd988ea..119fa7f07 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -71,7 +71,7 @@ void LoadPlayerObjectReflectionPalette(u16, u8);
void LoadSpecialObjectReflectionPalette(u16, u8);
void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
void PatchObjectPalette(u16, u8);
-void sub_805EDF0(s16, s16);
+void ReloadMapObjectsWithOffset(s16 x, s16 y);
void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
void sub_8063AD4(s16, s16, s16 *, s16 *);
u8 GetFaceDirectionAnimNum(u8);
@@ -91,11 +91,11 @@ void ObjectEventTurn(struct ObjectEvent *, u8);
void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
void ObjectEventForceSetHeldMovement(struct ObjectEvent *, u8);
const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8);
-void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
+void ShowOrHideObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 state);
void FreeAndReserveObjectSpritePalettes(void);
-void sub_808E82C(u8, u8, u8, s16, s16);
-void sub_805F400(u8, u8, u8);
-void sub_805F3A8(u8, u8, u8, u8);
+void SetObjectPositionByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
+void UnfixObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
+void SetObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority);
void sub_808E75C(s16, s16);
void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup);
void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16);
@@ -161,7 +161,7 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
u8 sub_80641C0(u32 direction);
-void sub_805F378(s16 x, s16 y);
+void EnableObjectGroundEffectsByXY(s16 x, s16 y);
void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y);
u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority);
u16 GetObjectPaletteTag(u8 paletteIndex);
@@ -196,7 +196,7 @@ u8 GetMoveDirectionAnimNum(u8 direction);
// Exported data declarations
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
-extern const struct SpritePalette gUnknown_83A5348;
+extern const struct SpritePalette gSpritePalette_GeneralFieldEffect1;
extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
extern const struct OamData gObjectEventBaseOam_32x32;
extern const u16 gUnknown_8398648[];
diff --git a/include/field_effect.h b/include/field_effect.h
index a0673c517..48143b0d3 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -26,7 +26,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
void ReturnToFieldFromFlyMapSelect(void);
void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
void SpriteCB_PopOutOfAsh(struct Sprite * sprite);
-void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite);
+void SpriteCB_AshLaunch(struct Sprite * sprite);
void FieldEffectActiveListClear(void);
#endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index a842c5dc6..689f6d87b 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -25,7 +25,7 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s
void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
void SetSpriteInvisible(u8 spriteId);
void sub_80DC4A4(u8 spriteId, u8 value, s16 data1);
-void sub_80DCCE0(struct Sprite * sprite);
+void UpdateJumpImpactEffect(struct Sprite * sprite);
void UpdateShadowFieldEffect(struct Sprite * sprite);
void UpdateBubblesFieldEffect(struct Sprite * sprite);
void UpdateSparkleFieldEffect(struct Sprite * sprite);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 28737b520..7544fe418 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -249,8 +249,8 @@ struct ObjectEvent
struct ObjectEventGraphicsInfo
{
/*0x00*/ u16 tileTag;
- /*0x02*/ u16 paletteTag1;
- /*0x04*/ u16 paletteTag2;
+ /*0x02*/ u16 paletteTag;
+ /*0x04*/ u16 reflectionPaletteTag;
/*0x06*/ u16 size;
/*0x08*/ s16 width;
/*0x0A*/ s16 height;
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/sprite.h b/include/sprite.h
index 8f95eb788..80480e201 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -317,7 +317,7 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
void ClearSpriteCopyRequests(void);
void ResetAffineAnimData(void);
void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3);
-void sub_80075C0(struct Sprite *sprite);
+void FreeSpriteTilesIfNotUsingSheet(struct Sprite *sprite);
s16 AllocSpriteTiles(u16 tileCount);
void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 11:05:04 +0000