summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle_transition.h37
-rw-r--r--include/berry_fix_program.h6
-rw-r--r--include/clear_save_data_screen.h6
-rw-r--r--include/field_camera.h1
-rw-r--r--include/field_effect.h2
-rw-r--r--include/global.h2
-rw-r--r--include/graphics.h13
-rw-r--r--include/intro.h6
-rw-r--r--include/main.h2
-rw-r--r--include/main_menu.h6
-rw-r--r--include/new_menu_helpers.h1
-rw-r--r--include/overworld.h1
-rw-r--r--include/palette.h4
-rw-r--r--include/quest_log.h1
-rw-r--r--include/slot_machine.h2
-rw-r--r--include/strings.h5
-rw-r--r--include/trainer_pokemon_sprites.h7
17 files changed, 94 insertions, 8 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h
index 91e564790..4ef5f19d9 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -3,8 +3,39 @@
#include "global.h"
-void sub_8149DFC(u8 a0);
-bool8 sub_80D08F8(void);
-void sub_80D08B8(u8 a0);
+enum
+{
+ MUGSHOT_LORELEI,
+ MUGSHOT_BRUNO,
+ MUGSHOT_AGATHA,
+ MUGSHOT_LANCE,
+ MUGSHOT_BLUE,
+ MUGSHOTS_COUNT
+};
+
+#define B_TRANSITION_BLUR 0
+#define B_TRANSITION_DISTORTED_WAVE 1
+#define B_TRANSITION_HORIZONTAL_CORRUGATE 2
+#define B_TRANSITION_BIG_POKEBALL 3
+#define B_TRANSITION_SLIDING_POKEBALLS 4
+#define B_TRANSITION_CLOCKWISE_BLACKFADE 5
+#define B_TRANSITION_FULLSCREEN_WAVE 6
+#define B_TRANSITION_BLACK_WAVE_TO_RIGHT 7
+#define B_TRANSITION_SLICED_SCREEN 8
+#define B_TRANSITION_WHITEFADE_IN_STRIPES 9
+#define B_TRANSITION_GRID_SQUARES 10
+#define B_TRANSITION_BLACK_DOODLES 11
+#define B_TRANSITION_LORELEI 12
+#define B_TRANSITION_BRUNO 13
+#define B_TRANSITION_AGATHA 14
+#define B_TRANSITION_LANCE 15
+#define B_TRANSITION_BLUE 16
+#define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17
+
+extern const struct SpritePalette sSpritePalette_SlidingPokeball;
+
+bool8 BT_IsDone(void);
+void BT_StartOnField(u8 transitionId);
+bool8 FldEff_Pokeball(void);
#endif // GUARD_BATTLE_TRANSITION_H
diff --git a/include/berry_fix_program.h b/include/berry_fix_program.h
new file mode 100644
index 000000000..fc0748fd9
--- /dev/null
+++ b/include/berry_fix_program.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BERRY_FIX_PROGRAM_H
+#define GUARD_BERRY_FIX_PROGRAM_H
+
+void mb_berry_fix_serve(void);
+
+#endif //GUARD_BERRY_FIX_PROGRAM_H
diff --git a/include/clear_save_data_screen.h b/include/clear_save_data_screen.h
new file mode 100644
index 000000000..d5d2665ae
--- /dev/null
+++ b/include/clear_save_data_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_CLEAR_SAVE_DATA_SCREEN_H
+#define GUARD_CLEAR_SAVE_DATA_SCREEN_H
+
+void CB2_SaveClearScreen_Init(void);
+
+#endif //GUARD_CLEAR_SAVE_DATA_SCREEN_H
diff --git a/include/field_camera.h b/include/field_camera.h
index 53d734081..d67523c8f 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -26,5 +26,6 @@ extern u16 gUnknown_03005DE8;
void DrawWholeMapView(void);
void CurrentMapDrawMetatileAt(int x, int y);
+void sub_805A658(s16 *x, s16 *y);
#endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 426f77510..0ab2d0475 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -83,5 +83,7 @@ void sub_80B69DC(void);
void CreateTeleportFieldEffectTask(void);
void FieldEffectActiveListRemove(u8 id);
void sub_8085620(void);
+void FieldEffectStop(struct Sprite *sprite, u8 id);
+u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
#endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/global.h b/include/global.h
index e1f63213a..9a398354d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -17,7 +17,7 @@
// Get the IDE to stfu
// We define it this way to fool preproc.
-#define INCBIN(x) {0}
+#define INCBIN(...) {0}
#define INCBIN_U8 INCBIN
#define INCBIN_U16 INCBIN
#define INCBIN_U32 INCBIN
diff --git a/include/graphics.h b/include/graphics.h
index e8503609e..f6c2ddd4a 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -961,4 +961,17 @@ extern const u8 gFile_graphics_items_icon_palettes_sapphire_palette[];
extern const u8 gFile_graphics_items_icons_return_to_field_arrow_sheet[];
extern const u8 gFile_graphics_items_icon_palettes_return_to_field_arrow_palette[];
+// title_screen
+extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
+extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
+extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoMap[];
+extern const u16 gGraphics_TitleScreen_CharizardPals[];
+extern const u8 gGraphics_TitleScreen_CharizardTiles[];
+extern const u8 gGraphics_TitleScreen_CharizardMap[];
+extern u16 gGraphics_TitleScreen_BackgroundPals[]; // If this is const, title_screen.c does not match
+extern const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[];
+extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
+extern const u16 gGraphics_TitleScreen_FirePals[];
+extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
+
#endif //GUARD_GRAPHICS_H
diff --git a/include/intro.h b/include/intro.h
new file mode 100644
index 000000000..f01c81a9e
--- /dev/null
+++ b/include/intro.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_INTRO_H
+#define GUARD_INTRO_H
+
+void sub_80EC864(void);
+
+#endif //GUARD_INTRO_H
diff --git a/include/main.h b/include/main.h
index a250475cb..d326909ff 100644
--- a/include/main.h
+++ b/include/main.h
@@ -65,6 +65,8 @@ void ClearPokemonCrySongs(void);
void RestoreSerialTimer3IntrHandlers(void);
void SetVBlankCounter1Ptr(u32 *ptr);
void DisableVBlankCounter1(void);
+void StartTimer1(void);
+void SeedRngAndSetTrainerId(void);
extern const char RomHeaderGameCode[4];
extern const char RomHeaderSoftwareVersion;
diff --git a/include/main_menu.h b/include/main_menu.h
new file mode 100644
index 000000000..2a0cd81d5
--- /dev/null
+++ b/include/main_menu.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MAIN_MENU_H
+#define GUARD_MAIN_MENU_H
+
+void sub_800C300(void);
+
+#endif //GUARD_MAIN_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index d68957e62..7b83c913b 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -31,6 +31,7 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer);
void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
+void sub_80F6C14(void);
void sub_80F771C(bool8 copyToVram);
void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
void sub_80F7768(u8 windowId, bool8 copyToVram);
diff --git a/include/overworld.h b/include/overworld.h
index 9a9657006..7c1f34e41 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -106,6 +106,7 @@ extern bool8 (* gFieldCallback2)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void sub_8055864(u8 mapGroup, u8 mapNum);
void CB2_Overworld(void);
+void CB2_OverworldBasic(void);
void CB2_NewGame(void);
bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
void Overworld_ResetStateAfterTeleport(void);
diff --git a/include/palette.h b/include/palette.h
index 06b9b1f6f..300236d1e 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -71,7 +71,11 @@ void BlendPalettes(u32, u8, u16);
void BlendPalettesUnfaded(u32, u8, u16);
void sub_80716F8(const u16 *, u16 *, u16, u8);
void TintPalette_GrayScale(u16 *, u16);
+void TintPalette_GrayScale2(u16 *, u16);
void TintPalette_SepiaTone(u16 *, u16);
+void sub_80717A8(u32, s8, u8, u8, u16, u8, u8);
+bool32 sub_807185C(u8);
+void sub_8071898(void);
extern struct PaletteFadeControl gPaletteFade;
diff --git a/include/quest_log.h b/include/quest_log.h
index 4fb4fe0fa..858ea593a 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -22,6 +22,7 @@ extern const u16 gUnknown_84566A8[];
void sub_8112720(u8);
void sub_8113550(u16, const u16 *);
+void sub_811539C(void);
void sub_8115748(u16);
u8 sub_8112CAC(void);
bool8 sub_81119D4(void (*func)(void));
diff --git a/include/slot_machine.h b/include/slot_machine.h
index 5c96384fa..37120f66b 100644
--- a/include/slot_machine.h
+++ b/include/slot_machine.h
@@ -3,6 +3,6 @@
#include "global.h"
-void PlaySlotMachine(u8, void *);
+void PlaySlotMachine(u16, void (*)(void));
#endif // GUARD_SLOT_MACHINE_H
diff --git a/include/strings.h b/include/strings.h
index 85b67ed57..97c120ff3 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -203,4 +203,9 @@ extern const u8 gString_BattleRecords_ColumnHeaders[];
extern const u8 gString_BattleRecords_7Dashes[];
extern const u8 gString_BattleRecords_4Dashes[];
+// slot_machine
+extern const u8 gString_OutOfCoins[];
+extern const u8 gString_QuitPlaying[];
+extern const u8 gString_SlotMachineControls[];
+
#endif //GUARD_STRINGS_H
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h
index 3ae75ed0f..2a520715f 100644
--- a/include/trainer_pokemon_sprites.h
+++ b/include/trainer_pokemon_sprites.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_DOME_CARDS_H
-#define GUARD_BATTLE_DOME_CARDS_H
+#ifndef GUARD_TRAINER_POKEMON_SPRITES_H
+#define GUARD_TRAINER_POKEMON_SPRITES_H
#include "global.h"
@@ -13,5 +13,6 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS
u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 FreeAndDestroyTrainerPicSprite(u16);
+u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
-#endif //GUARD_BATTLE_DOME_CARDS_H
+#endif // GUARD_TRAINER_POKEMON_SPRITES_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:19:38 +0000