summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle_tower.h1
-rw-r--r--include/constants/flags.h16
-rw-r--r--include/constants/vars.h16
-rw-r--r--include/event_object_movement.h1
-rw-r--r--include/field_region_map.h6
-rw-r--r--include/party_menu.h1
-rw-r--r--include/pokemon_storage_system.h1
-rw-r--r--include/rom_8011DC0.h1
-rw-r--r--include/strings.h10
-rw-r--r--include/tv.h1
-rw-r--r--include/wallclock.h3
11 files changed, 40 insertions, 17 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h
index d8a3dc9a8..e1655f2c6 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -42,5 +42,6 @@ void sub_81628A0(union BattleTowerRecord *);
void sub_8162614(u16 trainerId, u8);
void ConvertBattleFrontierTrainerSpeechToString(u16 *words);
void GetFrontierTrainerName(u8 *dest, u16 trainerIdx);
+void GetEreaderTrainerName(u8 *dest);
#endif //GUARD_BATTLE_TOWER_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 641d74f19..f6143982d 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -199,7 +199,7 @@
#define FLAG_0x0C4 0xC4
#define FLAG_0x0C5 0xC5
#define FLAG_0x0C6 0xC6
-#define FLAG_0x0C7 0xC7
+#define FLAG_RUSTURF_TUNNEL_OPENED 0xC7
#define FLAG_0x0C8 0xC8
#define FLAG_0x0C9 0xC9
#define FLAG_0x0CA 0xCA
@@ -532,10 +532,10 @@
#define FLAG_0x210 0x210
#define FLAG_0x211 0x211
#define FLAG_0x212 0x212
-#define FLAG_0x213 0x213
-#define FLAG_0x214 0x214
-#define FLAG_0x215 0x215
-#define FLAG_0x216 0x216
+#define FLAG_HIDDEN_ITEM_1F 0x213
+#define FLAG_HIDDEN_ITEM_20 0x214
+#define FLAG_HIDDEN_ITEM_21 0x215
+#define FLAG_HIDDEN_ITEM_22 0x216
#define FLAG_0x217 0x217
#define FLAG_0x218 0x218
#define FLAG_0x219 0x219
@@ -597,7 +597,7 @@
#define FLAG_0x251 0x251
#define FLAG_0x252 0x252
#define FLAG_0x253 0x253
-#define FLAG_0x254 0x254
+#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254
#define FLAG_0x255 0x255
#define FLAG_0x256 0x256
#define FLAG_0x257 0x257
@@ -932,8 +932,8 @@
#define FLAG_0x3A0 0x3A0
#define FLAG_0x3A1 0x3A1
#define FLAG_0x3A2 0x3A2
-#define FLAG_0x3A3 0x3A3
-#define FLAG_0x3A4 0x3A4
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4
#define FLAG_0x3A5 0x3A5
#define FLAG_0x3A6 0x3A6
#define FLAG_0x3A7 0x3A7
diff --git a/include/constants/vars.h b/include/constants/vars.h
index ed4a7797b..92cbaba5f 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -49,13 +49,13 @@
#define VAR_RECYCLE_GOODS 0x4020
#define VAR_REPEL_STEP_COUNT 0x4021
#define VAR_ICE_STEP_COUNT 0x4022
-#define VAR_FIRST_POKE 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
+#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
#define VAR_MIRAGE_RND_H 0x4024
#define VAR_MIRAGE_RND_L 0x4025
#define VAR_SECRET_BASE_MAP 0x4026
-#define VAR_0x4027 0x4027
-#define VAR_0x4028 0x4028
-#define VAR_0x4029 0x4029
+#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027
+#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028
+#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
@@ -170,7 +170,7 @@
#define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098
#define VAR_0x4099 0x4099
-#define VAR_0x409A 0x409A
+#define VAR_RUSTURF_TUNNEL_STATE 0x409A
#define VAR_0x409B 0x409B
#define VAR_0x409C 0x409C
#define VAR_0x409D 0x409D
@@ -185,7 +185,7 @@
#define VAR_0x40A6 0x40A6
#define VAR_0x40A7 0x40A7
#define VAR_0x40A8 0x40A8
-#define VAR_0x40A9 0x40A9
+#define VAR_CYCLING_CHALLENGE_STATE 0x40A9
#define VAR_0x40AA 0x40AA
#define VAR_0x40AB 0x40AB
#define VAR_0x40AC 0x40AC
@@ -196,7 +196,7 @@
#define VAR_0x40B1 0x40B1
#define VAR_0x40B2 0x40B2
#define VAR_WEATHER_INSTITUTE_STATE 0x40B3
-#define VAR_PORTHOLE 0x40B4
+#define VAR_PORTHOLE_STATE 0x40B4
#define VAR_0x40B5 0x40B5
#define VAR_0x40B6 0x40B6
#define VAR_0x40B7 0x40B7
@@ -210,7 +210,7 @@
#define VAR_0x40BF 0x40BF
#define VAR_0x40C0 0x40C0
#define VAR_0x40C1 0x40C1
-#define VAR_0x40C2 0x40C2
+#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2
#define VAR_0x40C3 0x40C3
#define VAR_0x40C4 0x40C4
#define VAR_0x40C5 0x40C5
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index a8f5caa28..c382ae4d8 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -185,6 +185,7 @@ bool8 FreezeEventObject(struct EventObject *eventObject);
u8 GetMoveDirectionFastAnimNum(u8);
u8 GetMoveDirectionFasterAnimNum(u8);
u8 GetMoveDirectionFastestAnimNum(u8);
+void CameraObjectSetFollowedObjectId(u8 objectId);
void MovementType_None(struct Sprite *);
void MovementType_LookAround(struct Sprite *);
diff --git a/include/field_region_map.h b/include/field_region_map.h
new file mode 100644
index 000000000..d50f1265c
--- /dev/null
+++ b/include/field_region_map.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_FIELD_REGION_MAP_H
+#define GUARD_FIELD_REGION_MAP_H
+
+void FieldInitRegionMap(MainCallback callback);
+
+#endif // GUARD_FIELD_REGION_MAP_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 6e1344213..d24bc817f 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -54,5 +54,6 @@ void sub_81B8518(u8 unused);
u8 sub_81B1360(void);
void sub_81B8904(u8 arg0, void (*callback)(void));
void OpenPartyMenuInBattle(u8 caseId);
+u16 ItemIdToBattleMoveId(u16 itemId);
#endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 9fcfdba96..5e07ba1f2 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -9,5 +9,6 @@ struct BoxPokemon *GetBoxedMonPtr(u8, u8);
void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
void CompactPartySlots(void);
u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
+bool8 CheckFreePokemonStorageSpace(void);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index fd8c35f56..f71e5d97d 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -8,5 +8,6 @@
// Exported ROM declarations
void sub_8018438(void);
+u16 mevent_081445C0(u8);
#endif //GUARD_rom_8011DC0_H
diff --git a/include/strings.h b/include/strings.h
index 4736fdc5d..3d3741a86 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -462,4 +462,14 @@ extern const u8 gText_TotalRecordWLD[];
extern const u8 gText_PlayersBattleResults[];
extern const u8 gText_WinLoseDraw[];
+extern const u8 gText_99TimesPlus[];
+extern const u8 gText_1MinutePlus[];
+extern const u8 gText_SpaceSeconds[];
+extern const u8 gText_SpaceTimes[];
+
+extern const u8 gText_BigGuy[];
+extern const u8 gText_BigGirl[];
+extern const u8 gText_Son[];
+extern const u8 gText_Daughter[];
+
#endif //GUARD_STRINGS_H
diff --git a/include/tv.h b/include/tv.h
index 17be8c43c..554bbad85 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -48,5 +48,6 @@ void PutPokemonTodayCaughtOnAir(void);
void TV_PutSecretBaseVisitOnTheAir(void);
void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
void UpdateTVScreensOnMap(int, int);
+void TV_PrintIntToStringVar(u8 varIdx, int value);
#endif //GUARD_TV_H
diff --git a/include/wallclock.h b/include/wallclock.h
index 48697c19f..208af9324 100644
--- a/include/wallclock.h
+++ b/include/wallclock.h
@@ -1,6 +1,7 @@
#ifndef GUARD_WALLCLOCK_H
#define GUARD_WALLCLOCK_H
-void Cb2_StartWallClock(void);
+void CB2_StartWallClock(void);
+void CB2_ViewWallClock(void);
#endif //GUARD_WALLCLOCK_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 16:40:50 +0000