summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h1
-rw-r--r--include/decoration.h2
-rwxr-xr-xinclude/event_scripts.h13
-rw-r--r--include/field_camera.h1
-rwxr-xr-xinclude/field_map_obj.h1
-rw-r--r--include/field_player_avatar.h1
-rw-r--r--include/field_screen.h1
-rw-r--r--include/fldeff_80F9BCC.h13
-rw-r--r--include/global.h12
-rw-r--r--include/map_name_popup.h11
-rw-r--r--include/menu.h1
-rw-r--r--include/menu_indicators.h2
-rw-r--r--include/new_menu_helpers.h1
-rw-r--r--include/overworld.h5
-rw-r--r--include/rom6.h1
-rw-r--r--include/strings.h5
-rw-r--r--include/tv.h1
-rw-r--r--include/vars.h7
18 files changed, 71 insertions, 8 deletions
diff --git a/include/battle.h b/include/battle.h
index 3328c691f..4278d0a62 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -987,5 +987,6 @@ extern u8 gBattleOutcome;
extern u16 gLastUsedItem;
extern u32 gBattleTypeFlags;
extern struct MonSpritesGfx* gMonSpritesGfxPtr;
+extern u16 gTrainerBattleOpponent_A;
#endif // GUARD_BATTLE_H
diff --git a/include/decoration.h b/include/decoration.h
index adefb2fd1..ead621c5f 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -191,5 +191,7 @@ extern EWRAM_DATA u8 *gCurDecorInventoryItems;
extern EWRAM_DATA u8 gCurDecorationIndex;
void sub_8126968(void);
+void sub_8126AD8(u8 taskId);
+void sub_8127D38(u16 mapX, u16 mapY, u16 decor);
#endif //GUARD_DECORATION_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index ff02a110a..f85118e00 100755
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -6,6 +6,8 @@
#define GUARD_EVENT_SCRIPTS_H
extern const u8 gUnknown_0823B4E8[];
+extern const u8 gUnknown_0823B5E9[];
+extern const u8 gUnknown_08275BB7[];
extern const u8 gUnknown_08275D0C[];
extern const u8 gUnknown_08275D1F[];
extern const u8 gUnknown_08275D2E[];
@@ -360,5 +362,14 @@ extern const u8 gPokeNewsTextLilycove_Ending[];
extern const u8 gPokeNewsTextBlendMaster_Upcoming[];
extern const u8 gPokeNewsTextBlendMaster_Ongoing[];
extern const u8 gPokeNewsTextBlendMaster_Ending[];
-
+extern const u8 gUnknown_08274966[];
+extern const u8 gUnknown_08274D13[];
+extern const u8 gUnknown_08274FFE[];
+extern const u8 gUnknown_08275367[];
+extern const u8 gUnknown_082756C7[];
+extern const u8 gUnknown_08274B24[];
+extern const u8 gUnknown_08274E75[];
+extern const u8 gUnknown_082751E1[];
+extern const u8 gUnknown_082754F6[];
+extern const u8 gUnknown_082758CC[];
#endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_camera.h b/include/field_camera.h
index f74fadd86..a8559e1c2 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -23,5 +23,6 @@ extern u16 gUnknown_03005DE8;
// Exported ROM declarations
void DrawWholeMapView(void);
+void CurrentMapDrawMetatileAt(int x, int y);
#endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 038233fe6..0107fa10f 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -36,6 +36,7 @@ void npc_load_two_palettes__and_record(u16, u8);
void sub_808EBA8(u8, u8, u8, s16, s16);
void pal_patch_for_npc(u16, u8);
void sub_808E16C(s16, s16);
+void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
void sub_8092FF0(s16, s16, s16 *, s16 *);
u8 FieldObjectDirectionToImageAnimId(u8);
void sub_80930E0(s16 *, s16 *, s16, s16);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 5c16e9414..25b7f2d71 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -11,5 +11,6 @@ u8 player_get_direction_upper_nybble(void);
u8 player_get_x22(void);
void sub_808D074(u8);
+void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_screen.h b/include/field_screen.h
index b15fdba7d..089e79cc4 100644
--- a/include/field_screen.h
+++ b/include/field_screen.h
@@ -8,5 +8,6 @@
// Exported ROM declarations
void pal_fill_black(void);
bool8 sub_80ABDFC(void);
+void sub_80AF168(void);
#endif //GUARD_FIELD_SCREEN_H
diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h
new file mode 100644
index 000000000..ecce04943
--- /dev/null
+++ b/include/fldeff_80F9BCC.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_FLDEFF_80F9BCC_H
+#define GUARD_FLDEFF_80F9BCC_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+
+void sub_80FA5E4(s16 id, s16 x, s16 y);
+void sub_80FA794(s16 x, s16 y);
+
+#endif //GUARD_FLDEFF_80F9BCC_H
diff --git a/include/global.h b/include/global.h
index 8860b4ae3..75d709540 100644
--- a/include/global.h
+++ b/include/global.h
@@ -236,12 +236,12 @@ extern struct SaveBlock2 *gSaveBlock2Ptr;
struct SecretBaseRecord
{
- /*ID?*/ /*0x1A9C*/ u8 sbr_field_0;
+ /*0x1A9C*/ u8 secretBaseId;
/*0x1A9D*/ u8 sbr_field_1_0:4;
/*0x1A9D*/ u8 gender:1;
/*0x1A9D*/ u8 sbr_field_1_5:1;
/*0x1A9D*/ u8 sbr_field_1_6:2;
- /*0x1A9E*/ u8 trainerName[7]; // 0xFF bytes?
+ /*0x1A9E*/ u8 trainerName[OT_NAME_LENGTH];
/*0x1AA5*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
/*0x1AA9*/ u8 language;
/*0x1AAA*/ u16 sbr_field_e;
@@ -249,10 +249,10 @@ struct SecretBaseRecord
/*0x1AAD*/ u8 sbr_field_11;
/*0x1AAE*/ u8 decorations[16];
/*0x1ABE*/ u8 decorationPos[16];
- /*0x1ACE*/ u32 partyPersonality[6];
- /*0x1AE6*/ u16 partyMoves[6 * 4];
- /*0x1B16*/ u16 partySpecies[6];
- /*0x1B22*/ u16 partyHeldItems[6];
+ /*0x1AD0*/ u32 partyPersonality[6];
+ /*0x1AE8*/ u16 partyMoves[6 * 4];
+ /*0x1B18*/ u16 partySpecies[6];
+ /*0x1B24*/ u16 partyHeldItems[6];
/*0x1B2E*/ u8 partyLevels[6];
/*0x1B34*/ u8 partyEVs[6];
};
diff --git a/include/map_name_popup.h b/include/map_name_popup.h
new file mode 100644
index 000000000..8a9043a3f
--- /dev/null
+++ b/include/map_name_popup.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_MAP_NAME_POPUP_H
+#define GUARD_MAP_NAME_POPUP_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+void HideMapNamePopUpWindow(void);
+
+#endif //GUARD_MAP_NAME_POPUP_H
diff --git a/include/menu.h b/include/menu.h
index 927c3d3d4..d8b2afc5c 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -21,6 +21,7 @@ void PrintMenuTable(u8 idx, u8 nstrs, const struct MenuAction *strs);
void InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 idx, u8 nstrs,u8);
u8 GetMenuCursorPos(void);
s8 ProcessMenuInput(void);
+s8 ProcessMenuInputNoWrapAround(void);
void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
void reset_temp_tile_data_buffers(void);
int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u16 offset, u8 mode);
diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index 5a3b2e5b8..d0baac810 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -6,7 +6,7 @@
// Exported RAM declarations
// Exported ROM declarations
-u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u8, u8, u16 *);
+u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
void RemoveScrollIndicatorArrowPair(u8);
#endif //GUARD_MENU_INDICATORS_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index f588967bf..42b8c60b1 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -11,6 +11,7 @@ void sub_81973FC(u8, u8);
u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
void sub_8197434(u8 a0, u8 a1);
+void SetStandardWindowBorderStyle(u8 a0, u8 a1);
void sub_8197930(void);
#endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/overworld.h b/include/overworld.h
index 5ac4cad29..19bcaaf01 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -32,6 +32,7 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8);
void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void Overworld_SetHealLocationWarp(u8);
void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
@@ -59,5 +60,9 @@ void c2_exit_to_overworld_2_switch(void);
bool32 sub_8087598(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
void warp_in(void);
+void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum);
+void c2_load_new_map(void);
+void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
+void mapldr_default(void);
#endif //GUARD_ROM4_H
diff --git a/include/rom6.h b/include/rom6.h
index 0e9927855..a6aab998c 100644
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -3,5 +3,6 @@
void sub_81357FC(u8, void(void));
u8 GetLeadMonIndex(void);
+void sub_813BADC(bool8);
#endif //GUARD_ROM6_H
diff --git a/include/strings.h b/include/strings.h
index 191b1809a..fcdb1eca4 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -70,5 +70,10 @@ extern const u8 gText_Cushion[];
extern const u8 gText_Decorate[];
extern const u8 gText_PutAway[];
extern const u8 gText_Toss2[];
+extern const u8 gText_ApostropheSBase[];
+extern const u8 gText_NoRegistry[];
+extern const u8 gText_OkayToDeleteFromRegistry[];
+extern const u8 gText_RegisteredDataDeleted[];
+extern const u8 gUnknown_085EA79D[];
#endif //GUARD_STRINGS_H
diff --git a/include/tv.h b/include/tv.h
index 172754ae0..43f36d69f 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -10,6 +10,7 @@ bool8 GetPriceReduction(u8 newsKind);
u8 GetRibbonCount(struct Pokemon *pokemon);
void TV_PutSecretBaseVisitOnTheAir(void);
void sub_80EE184(void);
+void sub_80EEA70(void);
void sub_80F14F8(TVShow *shows);
size_t sub_80EF370(int value);
diff --git a/include/vars.h b/include/vars.h
index 67c0b67fc..c097faff7 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -1,6 +1,8 @@
#ifndef GUARD_VARS_H
#define GUARD_VARS_H
+#define VAR_0x3F20 0x3F20
+
#define VAR_0x4000 0x4000
#define VAR_0x4001 0x4001
#define VAR_0x4002 0x4002
@@ -61,6 +63,11 @@
#define VAR_DAILY_PLANTED_BERRIES 0x40E9
#define VAR_DAILY_PICKED_BERRIES 0x40EA
#define VAR_DAILY_ROULETTE 0x40EB
+#define VAR_0x40EC 0x40EC
+#define VAR_0x40ED 0x40ED
+#define VAR_0x40EE 0x40EE
+#define VAR_0x40EF 0x40EF
+#define VAR_0x40F0 0x40F0
#define VAR_DAILY_BP 0x40F1
#endif // GUARD_VARS_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 04:08:07 +0000