summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/flags.h2
-rw-r--r--include/constants/vars.h4
-rw-r--r--[-rwxr-xr-x]include/event_scripts.h0
-rw-r--r--[-rwxr-xr-x]include/field_map_obj.h0
-rw-r--r--[-rwxr-xr-x]include/gba/isagbprint.h0
-rw-r--r--include/global.h14
-rw-r--r--include/graphics.h4
-rw-r--r--include/mystery_event_msg.h16
-rw-r--r--include/mystery_event_script.h4
-rw-r--r--include/option_menu.h6
-rw-r--r--include/strings.h29
-rw-r--r--include/text_window.h15
-rw-r--r--include/unknown_task.h2
13 files changed, 82 insertions, 14 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 941f40efb..63e053cbd 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -484,7 +484,7 @@
#define FLAG_0x1E1 0x1E1
#define FLAG_0x1E2 0x1E2
#define FLAG_0x1E3 0x1E3
-#define FLAG_0x1E4 0x1E4
+#define FLAG_MYSTERY_EVENT_DONE 0x1E4
#define FLAG_0x1E5 0x1E5
#define FLAG_0x1E6 0x1E6
#define FLAG_0x1E7 0x1E7
diff --git a/include/constants/vars.h b/include/constants/vars.h
index b8bd46a96..c0e3313b6 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -48,7 +48,7 @@
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
-#define VAR_0x402D 0x402D
+#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D
#define VAR_0x402E 0x402E
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
@@ -226,7 +226,7 @@
#define VAR_0x40DA 0x40DA
#define VAR_0x40DB 0x40DB
#define VAR_0x40DC 0x40DC
-#define VAR_0x40DD 0x40DD
+#define VAR_EVENT_PICHU_SLOT 0x40DD
#define VAR_0x40DE 0x40DE
#define VAR_0x40DF 0x40DF
#define VAR_0x40E0 0x40E0
diff --git a/include/event_scripts.h b/include/event_scripts.h
index a54e0e463..a54e0e463 100755..100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 198dd9759..198dd9759 100755..100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h
index c5eb456c3..c5eb456c3 100755..100644
--- a/include/gba/isagbprint.h
+++ b/include/gba/isagbprint.h
diff --git a/include/global.h b/include/global.h
index c32909c93..8b1925513 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,6 +1,7 @@
#ifndef GUARD_GLOBAL_H
#define GUARD_GLOBAL_H
+#include <string.h>
#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines.
#include "gba/gba.h"
@@ -12,11 +13,16 @@
#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
#define ASM_DIRECT __attribute__((naked))
+// IDE support
#if defined (__APPLE__) || defined (__CYGWIN__)
-void *memset(void *, int, size_t);
-void *memcpy(void *, const void *, size_t);
-int strcmp(const char *s1, const char *s2);
-char* strcpy(char *dst0, const char *src0);
+#define _(x) x
+#define __(x) x
+#define INCBIN_U8 {0}
+#define INCBIN_U16 {0}
+#define INCBIN_U32 {0}
+#define INCBIN_S8 {0}
+#define INCBIN_S16 {0}
+#define INCBIN_S32 {0}
#endif // __APPLE__
#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
diff --git a/include/graphics.h b/include/graphics.h
index 85e31aec9..5917e9d2a 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1,6 +1,10 @@
#ifndef GUARD_GRAPHICS_H
#define GUARD_GRAPHICS_H
+// overworld
+extern const u32 gMessageBox_Gfx[];
+extern const u16 gMessageBox_Pal[];
+
// interface pokeballs
extern const u8 gInterfaceGfx_PokeBall[];
extern const u8 gInterfacePal_PokeBall[];
diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h
new file mode 100644
index 000000000..465b60ccb
--- /dev/null
+++ b/include/mystery_event_msg.h
@@ -0,0 +1,16 @@
+#ifndef GUARD_MYSTERY_EVENT_MSG_H
+#define GUARD_MYSTERY_EVENT_MSG_H
+
+extern const u8 gText_MysteryGiftBerry[];
+extern const u8 gText_MysteryGiftBerryTransform[];
+extern const u8 gText_MysteryGiftBerryObtained[];
+extern const u8 gText_MysteryGiftSpecialRibbon[];
+extern const u8 gText_MysteryGiftNationalDex[];
+extern const u8 gText_MysteryGiftRareWord[];
+extern const u8 gText_MysteryGiftSentOver[];
+extern const u8 gText_MysteryGiftFullParty[];
+extern const u8 gText_MysteryGiftNewTrainer[];
+extern const u8 gText_MysteryGiftNewAdversaryInBattleTower[];
+extern const u8 gText_MysteryGiftCantBeUsed[];
+
+#endif // GUARD_MYSTERY_EVENT_MSG_H
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index ab23a8d00..991cab53a 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -1,7 +1,9 @@
#ifndef GUARD_MYSTERY_EVENT_SCRIPT_H
#define GUARD_MYSTERY_EVENT_SCRIPT_H
-u32 RunMysteryEventScript(u8 *);
+void sub_8153870(u8 *script);
+bool32 sub_8153884(u32 *a0);
+u32 RunMysteryEventScript(u8 *script);
void SetMysteryEventScriptStatus(u32 val);
u16 GetRecordMixingGift(void);
diff --git a/include/option_menu.h b/include/option_menu.h
new file mode 100644
index 000000000..b23a73c4c
--- /dev/null
+++ b/include/option_menu.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_OPTION_MENU_H
+#define GUARD_OPTION_MENU_H
+
+void CB2_InitOptionMenu(void);
+
+#endif // GUARD_OPTION_MENU_H
diff --git a/include/strings.h b/include/strings.h
index ea1852a14..186a48ff0 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -153,6 +153,10 @@ extern const u8 gText_MoveItemsDescription[];
extern const u8 gText_SeeYa[];
extern const u8 gText_SeeYaDescription[];
+extern const u8 gText_EggNickname[];
+extern const u8 gText_Pokemon[];
+extern const u8 gText_InGameClockUsable[];
+
// menu texts
extern const u8 gText_MenuPokedex[];
extern const u8 gText_MenuPokemon[];
@@ -175,4 +179,29 @@ extern const u8 gText_Peak[];
extern const u8 gText_SafariBallStock[];
extern const u8 gText_BattlePyramidFloor[];
+// option menu texts
+extern const u8 gText_TextSpeedSlow[];
+extern const u8 gText_TextSpeedMid[];
+extern const u8 gText_TextSpeedFast[];
+extern const u8 gText_BattleSceneOn[];
+extern const u8 gText_BattleSceneOff[];
+extern const u8 gText_BattleStyleShift[];
+extern const u8 gText_BattleStyleSet[];
+extern const u8 gText_SoundMono[];
+extern const u8 gText_SoundStereo[];
+extern const u8 gText_FrameTypeNumber[];
+extern const u8 gText_FrameType[];
+extern const u8 gText_ButtonTypeNormal[];
+extern const u8 gText_ButtonTypeLR[];
+extern const u8 gText_ButtonTypeLEqualsA[];
+extern const u8 gText_Option[];
+extern const u8 gText_OptionMenu[];
+extern const u8 gText_TextSpeed[];
+extern const u8 gText_BattleScene[];
+extern const u8 gText_BattleStyle[];
+extern const u8 gText_Sound[];
+extern const u8 gText_Frame[];
+extern const u8 gText_OptionMenuCancel[];
+extern const u8 gText_ButtonMode[];
+
#endif //GUARD_STRINGS_H
diff --git a/include/text_window.h b/include/text_window.h
index 0af007397..e6a753fcb 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -1,13 +1,18 @@
#ifndef GUARD_TEXT_WINDOW_H
#define GUARD_TEXT_WINDOW_H
+#define WINDOW_FRAMES_COUNT 20
+
struct TilesPal
{
- u32 *tiles;
- u16 *pal;
+ const u32 *tiles;
+ const u16 *pal;
};
-const struct TilesPal* sub_8098758(u8 id);
+extern const u32 gTextWindowFrame1_Gfx[];
+extern const u16 gTextWindowFrame1_Pal[];
+
+const struct TilesPal* GetWindowFrameTilesPal(u8 id);
void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset);
void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
@@ -15,8 +20,8 @@ void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset);
void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
void rbox_fill_rectangle(u8 windowId);
-const u16* stdpal_get(u8 id);
-const u16* GetOverworldTextboxPalettePtr(void);
+const u16 *stdpal_get(u8 id);
+const u16 *GetOverworldTextboxPalettePtr(void);
void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
#endif // GUARD_TEXT_WINDOW_H
diff --git a/include/unknown_task.h b/include/unknown_task.h
index 9c6968c30..906fed3e0 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -15,7 +15,7 @@ extern struct UnknownTaskStruct gUnknown_0831AC70;
// Exported RAM declarations
// Exported ROM declarations
-void remove_some_task(void);
+void ScanlineEffect_Stop(void);
void sub_80BA038(struct UnknownTaskStruct arg0);
void sub_80BA0A8(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 11:08:42 +0000