summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle_tower.h3
-rw-r--r--include/constants/field_effects.h1
-rw-r--r--include/constants/flags.h11
-rw-r--r--include/constants/layouts.h2
-rw-r--r--include/constants/map_groups.h2
-rw-r--r--include/constants/vars.h82
-rw-r--r--include/field_camera.h3
-rw-r--r--include/field_effect.h1
-rw-r--r--include/field_map_obj.h1
-rw-r--r--include/field_specials.h7
-rw-r--r--include/fieldmap.h1
-rw-r--r--include/global.fieldmap.h3
-rw-r--r--include/global.h27
-rw-r--r--include/mevent.h1
-rw-r--r--include/overworld.h1
-rw-r--r--include/pokemon.h2
-rw-r--r--include/script_menu.h1
-rw-r--r--include/strings.h46
18 files changed, 134 insertions, 61 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 78e3f8e43..4c3c23e48 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -4,9 +4,10 @@
#include "global.h"
u16 sub_8164FCC(u8, u8);
-void sub_80E7524(u32 *);
+void sub_80E7524(struct BattleTowerEReaderTrainer *);
void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
+void CopyEReaderTrainerName5(u8 *dest);
#endif //GUARD_BATTLE_TOWER_H
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 62ab5af0c..8a5e11fcf 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -67,6 +67,7 @@
#define FLDEFF_USE_TELEPORT 63
#define FLDEFF_UNK_40 64
#define FLDEFF_UNK_41 65 // TODO: related to vs_seeker
+#define FLDEFF_UNK_43 67 // TODO: related to deoxys
#define FLDEFF_UNK_45 69 // TODO: related to fame checker photos
#endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 994221afd..082e12f87 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -748,10 +748,10 @@
#define FLAG_NO_ROOM_FOR_TOGEPI_EGG 0x2DB
#define FLAG_RECOVERED_SAPPHIRE 0x2DC
#define FLAG_GOT_RUBY 0x2DD
-#define FLAG_0x2DE 0x2DE
-#define FLAG_0x2DF 0x2DF
-#define FLAG_0x2E0 0x2E0
-#define FLAG_LEARNED_MOVE_AT_CAPE_BRINK 0x2E1
+#define FLAG_TUTOR_FRENZY_PLANT 0x2DE
+#define FLAG_TUTOR_BLAST_BURN 0x2DF
+#define FLAG_TUTOR_HYDRO_CANNON 0x2E0
+#define FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK 0x2E1
#define FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL 0x2E2
#define FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE 0x2E3
#define FLAG_FOUGHT_DEOXYS 0x2E4
@@ -1325,6 +1325,7 @@
#define FLAG_SYS_STRENGTH_ACTIVE (SYS_FLAGS + 0x5)
#define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6)
#define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7)
+#define FLAG_0x808 (SYS_FLAGS + 0x8)
#define PERMA_SYS_FLAGS_START 0x820
#define FLAG_BADGE01_GET (SYS_FLAGS + 0x20)
@@ -1422,7 +1423,7 @@
#define FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE (SYS_FLAGS + 0xBE)
#define FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER (SYS_FLAGS + 0xBF)
#define FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (SYS_FLAGS + 0xC0)
-#define FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY (SYS_FLAGS + 0xC1)
+#define FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY (SYS_FLAGS + 0xC1)
#define FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR (SYS_FLAGS + 0xC2)
#define FLAG_0x8D5 (SYS_FLAGS + 0xD5)
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 3d17cd441..24cdcec13 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -323,7 +323,7 @@
#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER 338
#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER 339
#define LAYOUT_SIX_ISLAND_ALTERING_CAVE 340
-#define LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 341
+#define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY 341
#define LAYOUT_BIRTH_ISLAND_EXTERIOR 342
#define LAYOUT_NAVEL_ROCK_EXTERIOR 343
#define LAYOUT_NAVEL_ROCK_1F 344
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 44fa03eda..13862d6c7 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -169,7 +169,7 @@
#define MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER (32 | (2 << 8))
#define MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER (33 | (2 << 8))
#define MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (34 | (2 << 8))
-#define MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY (35 | (2 << 8))
+#define MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY (35 | (2 << 8))
#define MAP_NAVEL_ROCK_1F (36 | (2 << 8))
#define MAP_NAVEL_ROCK_SUMMIT (37 | (2 << 8))
#define MAP_NAVEL_ROCK_BASE (38 | (2 << 8))
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 59dbf8ebb..3f171ede8 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -78,50 +78,50 @@
// with the species sanity bit set.
// Bits 12-15 are the same for the player's party.
// Used by Quest Log.
-#define VAR_QUEST_LOG_MON_COUNTS 0x4027
-#define VAR_MENEWS_JISAN_STEP_COUNTER 0x4028
-#define VAR_0x4029 0x4029
-#define VAR_HAPPINESS_STEP_COUNTER 0x402A
-#define VAR_POISON_STEP_COUNTER 0x402B
-#define VAR_RESET_RTC_ENABLE 0x402C
-#define VAR_0x402D 0x402D
-#define VAR_0x402E 0x402E
+#define VAR_QUEST_LOG_MON_COUNTS 0x4027
+#define VAR_MENEWS_JISAN_STEP_COUNTER 0x4028
+#define VAR_0x4029 0x4029
+#define VAR_HAPPINESS_STEP_COUNTER 0x402A
+#define VAR_POISON_STEP_COUNTER 0x402B
+#define VAR_RESET_RTC_ENABLE 0x402C
+#define VAR_0x402D 0x402D
+#define VAR_0x402E 0x402E
-#define VAR_0x402F 0x402F
+#define VAR_0x402F 0x402F
-#define VAR_0x4030 0x4030
-#define VAR_STARTER_MON 0x4031
-#define VAR_0x4032 0x4032
-#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
+#define VAR_0x4030 0x4030
+#define VAR_STARTER_MON 0x4031
+#define VAR_0x4032 0x4032
+#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
-#define VAR_0x4034 0x4034
-#define VAR_0x4035 0x4035
-#define VAR_STORAGE_UNKNOWN 0x4036
-#define VAR_0x4037 0x4037
-#define VAR_0x4038 0x4038
-#define VAR_0x4039 0x4039
-#define VAR_ELEVATOR_FLOOR 0x403A
-#define VAR_0x403B 0x403B
-#define VAR_0x403C 0x403C
-#define VAR_0x403D 0x403D
-#define VAR_DEOXYS_INTERACTION_NUM 0x403E
-#define VAR_0x403F 0x403F
-#define VAR_DAYS 0x4040
-#define VAR_0x4041 0x4041
-#define VAR_0x4042 0x4042
-#define VAR_DEPT_STORE_FLOOR 0x4043
-#define VAR_0x4044 0x4044
-#define VAR_POKELOT_PRIZE 0x4045
-#define VAR_NATIONAL_DEX 0x4046
-#define VAR_SEEDOT_SIZE_RECORD 0x4047
-#define VAR_ASH_GATHER_COUNT 0x4048
-#define VAR_HOF_BRAG_STATE 0x4049
-#define VAR_EGG_BRAG_STATE 0x404A
-#define VAR_LINK_WIN_BRAG_STATE 0x404B
-#define VAR_POKELOT_RND2 0x404C
-#define VAR_0x404D 0x404D
-#define VAR_0x404E 0x404E
-#define VAR_LOTAD_SIZE_RECORD 0x404F
+#define VAR_0x4034 0x4034
+#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035
+#define VAR_RESORT_GORGEOUS_REQUESTED_MON 0x4036
+#define VAR_0x4037 0x4037
+#define VAR_0x4038 0x4038
+#define VAR_0x4039 0x4039
+#define VAR_ELEVATOR_FLOOR 0x403A
+#define VAR_RESORT_GORGEOUS_REWARD 0x403B
+#define VAR_0x403C 0x403C
+#define VAR_HERACROSS_SIZE_RECORD 0x403D
+#define VAR_DEOXYS_INTERACTION_NUM 0x403E
+#define VAR_0x403F 0x403F
+#define VAR_MAGIKARP_SIZE_RECORD 0x4040
+#define VAR_0x4041 0x4041
+#define VAR_TRAINER_CARD_MON_ICON_TINT_IDX 0x4042
+#define VAR_TRAINER_CARD_MON_ICON_1 0x4043
+#define VAR_TRAINER_CARD_MON_ICON_2 0x4044
+#define VAR_TRAINER_CARD_MON_ICON_3 0x4045
+#define VAR_TRAINER_CARD_MON_ICON_4 0x4046
+#define VAR_TRAINER_CARD_MON_ICON_5 0x4047
+#define VAR_TRAINER_CARD_MON_ICON_6 0x4048
+#define VAR_HOF_BRAG_STATE 0x4049
+#define VAR_EGG_BRAG_STATE 0x404A
+#define VAR_LINK_WIN_BRAG_STATE 0x404B
+#define VAR_POKELOT_RND2 0x404C
+#define VAR_0x404D 0x404D
+#define VAR_0x404E 0x404E
+#define VAR_LOTAD_SIZE_RECORD 0x404F
// Map Scene
#define VAR_MAP_SCENE_PALLET_TOWN_OAK 0x4050
diff --git a/include/field_camera.h b/include/field_camera.h
index d67523c8f..d2165780a 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -27,5 +27,8 @@ extern u16 gUnknown_03005DE8;
void DrawWholeMapView(void);
void CurrentMapDrawMetatileAt(int x, int y);
void sub_805A658(s16 *x, s16 *y);
+void SetCameraPanningCallback(void (*cb)(void));
+void SetCameraPanning(s16 x, s16 y);
+void InstallCameraPanAheadCallback(void);
#endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_effect.h b/include/field_effect.h
index fa66929ea..70398313b 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -20,5 +20,6 @@ void sub_8084454(void);
void sub_8084784(u8 a0, u8 a1);
void sub_8084F2C(u8 a0);
void sub_80853CC(u8 a0);
+void sub_8083598(u8 a0);
#endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index baed87ac6..40d7ed933 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -94,6 +94,7 @@ void npc_paltag_set_load(u8 mode);
bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
u8 sub_8063F84(u8 direction);
+void CameraObjectSetFollowedObjectId(u8 spriteId);
// Exported data declarations
diff --git a/include/field_specials.h b/include/field_specials.h
index 2abe168e0..c435bdaee 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -12,17 +12,18 @@ enum HiddenItemAttr
};
u8 GetLeadMonIndex(void);
-u8 CountDigits(u16 number);
+s32 CountDigits(s32 number);
void TV_PrintIntToStringVar(u8, int);
u16 ScrSpecial_GetStarter(void);
-void sub_80CCB68(void);
+void StopPokemonLeagueLightingEffectTask(void);
void nullsub_60(void);
void nullsub_61(void);
u8 ContextNpcGetTextColor(void);
void set_unknown_box_id(u8);
u16 get_unknown_box_id(void);
bool8 sub_80CC7B4(void);
-u16 GetHiddenItemAttr(struct HiddenItemStruct hiddenItem, u8 attr);
+u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr);
u8 GetUnlockedSeviiAreas(void);
+u32 GetPlayerTrainerId(void);
#endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index dde05b7ed..c3709c616 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -25,6 +25,7 @@ bool32 CanCameraMoveInDirection(s32);
u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection);
struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
+void sub_8059948(u8 a0, u8 a1);
void save_serialize_map(void);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index bf142d265..a4358081d 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -134,7 +134,8 @@ union BgUnion
u8 *script;
// hidden item type probably
- struct HiddenItemStruct hiddenItem;
+ struct HiddenItemStruct hiddenItemStr;
+ u32 hiddenItem;
// secret base type
u32 secretBaseId;
diff --git a/include/global.h b/include/global.h
index 57035ce30..5c4501be3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -194,6 +194,11 @@ struct LinkBattleRecords
u8 languages[LINK_B_RECORDS_COUNT];
};
+#include "constants/game_stat.h"
+#include "global.fieldmap.h"
+#include "global.berry.h"
+#include "pokemon.h"
+
struct UnknownSaveBlock2Struct
{
u8 field_0;
@@ -214,6 +219,20 @@ struct UnknownSaveBlock2Struct
u8 field_EB;
}; // sizeof = 0xEC
+struct BattleTowerEReaderTrainer
+{
+ /*0x4A0 0x3F0 0x00*/ u8 unk0;
+ /*0x4A1 0x3F1 0x01*/ u8 facilityClass;
+ /*0x4A2 0x3F2 0x02*/ u16 winStreak;
+ /*0x4A4 0x3F4 0x04*/ u8 name[8];
+ /*0x4AC 0x3FC 0x0C*/ u8 trainerId[4];
+ /*0x4B0 0x400 0x10*/ u16 greeting[6];
+ /*0x4BC 0x40C 0x1C*/ u16 farewellPlayerLost[6];
+ /*0x4C8 0x418 0x28*/ u16 farewellPlayerWon[6];
+ /*0x4D4 0x424 0x34*/ struct BattleTowerPokemon party[3];
+ /*0x558 0x4A8 0xB8*/ u32 checksum;
+};
+
struct UnkSaveBlock2Substruct_55C
{
/* 0x000:0x55C */ u8 unk_00_0:1;
@@ -232,7 +251,7 @@ struct UnkSaveBlock2Substruct_55C
struct UnkSaveBlock2Substruct_B0
{
/* 0x000:0x0B0 */ u8 field_0[0x3F0];
- /* 0x3F0:0x4A0 */ u32 field_3F0[0x2F];
+ /* 0x3F0:0x4A0 */ struct BattleTowerEReaderTrainer field_3F0;
/* 0x4AC:0x55C */ struct UnkSaveBlock2Substruct_55C field_4AC;
/* 0x4C4:0x574 */ u8 field_4C4[0x324];
}; // size: 0x7E8
@@ -261,7 +280,6 @@ struct SaveBlock2
/*0x0A8*/ u32 field_A8;
/*0x0AC*/ u8 field_AC;
/*0x0AD*/ u8 field_AD;
- /*0x0AE*/ u8 filler_AE[0x2];
/*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0;
/*0x898*/ u16 mapView[0x100];
/*0xA98*/ struct LinkBattleRecords linkBattleRecords;
@@ -304,11 +322,6 @@ struct SecretBaseRecord
/*0x1AD0*/ struct SecretBaseParty party;
};
-#include "constants/game_stat.h"
-#include "global.fieldmap.h"
-#include "global.berry.h"
-#include "pokemon.h"
-
struct WarpData
{
s8 mapGroup;
diff --git a/include/mevent.h b/include/mevent.h
index 08ee8c038..98d184f60 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -67,5 +67,6 @@ bool32 WonderNews_Test_Unk_02(void);
bool32 WonderCard_Test_Unk_08_6(void);
u32 MENews_GetInput(u16 input);
void sub_8143D24(void);
+u16 sub_81445C0(u32 command);
#endif //GUARD_MEVENT_H
diff --git a/include/overworld.h b/include/overworld.h
index 65e3fe723..a5e975d1d 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -35,6 +35,7 @@ extern struct UCoords32 gDirectionToVectors[];
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
extern MainCallback gFieldCallback;
+extern struct WarpData gUnknown_2031DB4;
extern struct WarpData gUnknown_2031DBC;
extern u8 gUnknown_2031DE0;
diff --git a/include/pokemon.h b/include/pokemon.h
index c5ee4eda5..77c8191f3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -346,7 +346,7 @@ struct BattleTowerPokemon
u32 gap:1;
u32 abilityNum:1;
/*0x1C*/ u32 personality;
- /*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+ /*0x20*/ u8 nickname[11];
/*0x2B*/ u8 friendship;
};
diff --git a/include/script_menu.h b/include/script_menu.h
index c1e32beae..d3d04c65d 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -15,5 +15,6 @@ void ScriptMenu_DisplayPCStartupPrompt(void);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
void sub_809D6D4(void);
+void sub_809D424(void);
#endif //GUARD_SCRIPT_MENU_H
diff --git a/include/strings.h b/include/strings.h
index 8f3da98cf..ee7536d9b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -475,4 +475,50 @@ extern const u8 gSaveStatName_Time[];
// mail
extern const u8 gText_From[];
+// field_specials
+extern const u8 gUnknown_8417FBB[];
+extern const u8 gUnknown_8417FC3[];
+extern const u8 gUnknown_8417FD0[];
+extern const u8 gUnknown_8417FCC[];
+extern const u8 gUnknown_8418075[];
+extern const u8 gUnknown_8418069[];
+extern const u8 gUnknown_8418065[];
+extern const u8 gUnknown_8418061[];
+extern const u8 gUnknown_841805D[];
+extern const u8 gUnknown_841803A[];
+extern const u8 gUnknown_841803D[];
+extern const u8 gUnknown_8418040[];
+extern const u8 gUnknown_8418043[];
+extern const u8 gUnknown_8418046[];
+extern const u8 gUnknown_8418049[];
+extern const u8 gUnknown_841804C[];
+extern const u8 gUnknown_841804F[];
+extern const u8 gUnknown_8418052[];
+extern const u8 gUnknown_8418055[];
+extern const u8 gUnknown_8418059[];
+extern const u8 gUnknown_841806D[];
+extern const u8 gUnknown_8417FD9[];
+extern const u8 gUnknown_8417FE6[];
+extern const u8 gUnknown_8417FF3[];
+extern const u8 gUnknown_8418000[];
+extern const u8 gUnknown_841800D[];
+extern const u8 gUnknown_8418017[];
+extern const u8 gUnknown_8418022[];
+extern const u8 gUnknown_841802F[];
+extern const u8 gUnknown_841807D[];
+extern const u8 gUnknown_841808E[];
+extern const u8 gUnknown_841809C[];
+extern const u8 gOtherText_Quit[];
+extern const u8 gUnknown_84180A7[];
+extern const u8 gUnknown_84180BC[];
+extern const u8 gUnknown_84180D0[];
+extern const u8 gUnknown_84180E4[];
+extern const u8 gUnknown_84180FA[];
+extern const u8 gUnknown_841810D[];
+extern const u8 gUnknown_841811D[];
+extern const u8 gUnknown_841812F[];
+extern const u8 gUnknown_8418142[];
+extern const u8 gUnknown_8418152[];
+extern const u8 gUnknown_8418163[];
+
#endif //GUARD_STRINGS_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 11:11:28 +0000