summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/blend_palette.h2
-rw-r--r--include/constants/flags.h2
-rw-r--r--include/constants/quest_log.h6
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/field_effect.h2
-rw-r--r--include/field_specials.h4
-rw-r--r--include/field_weather.h2
-rw-r--r--include/fieldmap.h2
-rw-r--r--include/overworld.h2
-rw-r--r--include/quest_log.h6
-rw-r--r--include/text.h26
11 files changed, 37 insertions, 19 deletions
diff --git a/include/blend_palette.h b/include/blend_palette.h
index 7f0826187..a84e6c228 100644
--- a/include/blend_palette.h
+++ b/include/blend_palette.h
@@ -10,6 +10,6 @@
// Exported ROM declarations
void BlendPalette(u16, u16, u8, u16);
-void sub_8045314(u16 * palbuff, u16 blend_pal, u32 coefficient, s32 size);
+void BlendPalettesAt(u16 * palbuff, u16 blend_pal, u32 coefficient, s32 size);
#endif //GUARD_BLEND_PALETTE_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 12bb5801c..83d9bf28b 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1324,7 +1324,7 @@
#define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6)
#define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7)
-#define FLAG_0x808 (SYS_FLAGS + 0x8)
+#define FLAG_QL_DEPARTED (SYS_FLAGS + 0x8)
#define FLAG_0x809 (SYS_FLAGS + 0x9)
#define FLAG_0x80A (SYS_FLAGS + 0xA)
#define FLAG_0x80B (SYS_FLAGS + 0xB)
diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h
index 3565c581e..58efd6ea3 100644
--- a/include/constants/quest_log.h
+++ b/include/constants/quest_log.h
@@ -8,6 +8,12 @@
#define QL_START_NORMAL 1
#define QL_START_WARP 2
+// gGlobalFieldTintMode
+#define QL_TINT_NONE 0
+#define QL_TINT_GRAYSCALE 1
+#define QL_TINT_SEPIA 2
+#define QL_TINT_BACKUP_GRAYSCALE 3
+
#define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST)
#define QL_EVENT_0 0 // Null
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 8b7ffbfbd..e10a96bd0 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -122,7 +122,7 @@
#define VAR_EGG_BRAG_STATE 0x404A
#define VAR_LINK_WIN_BRAG_STATE 0x404B
#define VAR_POKELOT_RND2 0x404C
-#define VAR_0x404D 0x404D
+#define VAR_QL_ENTRANCE 0x404D
#define VAR_0x404E 0x404E
#define VAR_LOTAD_SIZE_RECORD 0x404F
diff --git a/include/field_effect.h b/include/field_effect.h
index f9760d87f..a0673c517 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -20,7 +20,7 @@ void FieldCB_FallWarpExit(void);
void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
void StartLavaridgeGymB1FWarp(u8 a0);
void StartLavaridgeGym1FWarp(u8 a0);
-void sub_8083598(u8 a0);
+void ApplyGlobalFieldPaletteTint(u8 paletteIdx);
void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId);
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
void ReturnToFieldFromFlyMapSelect(void);
diff --git a/include/field_specials.h b/include/field_specials.h
index 0a4ea7bce..08518da03 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -34,7 +34,7 @@ void IncrementBirthIslandRockStepCount(void);
void ResetCyclingRoadChallengeData(void);
void ResetFieldTasksArgs(void);
bool8 UsedPokemonCenterWarp(void);
-void sub_80CC534(void);
-void sub_80CC59C(void);
+void QuestLog_CheckDepartingIndoorsMap(void);
+void QuestLog_TryRecordDepartedLocation(void);
#endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 195b35318..4b9dc7695 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -119,7 +119,7 @@ void sub_80AEDBC(void);
void DoCurrentWeather(void);
void SetSav1WeatherFromCurrMapHeader(void);
-void sub_807B0C4(u16 *, u16 *, u32);
+void SlightlyDarkenPalsInWeather(u16 *, u16 *, u32);
void PlayRainStoppingSoundEffect(void);
bool8 IsWeatherNotFadingIn(void);
void SetWeatherScreenFadeOut(void);
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 4ac3a4712..d2eada760 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -28,7 +28,7 @@ bool32 CanCameraMoveInDirection(s32);
u32 GetBehaviorByMetatileIdAndMapLayout(const struct MapLayout *mapLayout, 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 Fieldmap_ApplyGlobalTintToPaletteSlot(u8 slot, u8 count);
void save_serialize_map(void);
u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit);
diff --git a/include/overworld.h b/include/overworld.h
index e28a75064..d97aa40dc 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -127,7 +127,7 @@ void CleanupOverworldWindowsAndTilemaps(void);
u32 ComputeWhiteOutMoneyLoss(void);
extern u8 gDisableMapMusicChangeOnMapLoad;
-extern u8 gUnknown_2036E28;
+extern u8 gGlobalFieldTintMode;
extern bool8 (* gFieldCallback2)(void);
diff --git a/include/quest_log.h b/include/quest_log.h
index a9a04657e..748b9c3da 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -39,7 +39,7 @@ void SetQLPlayedTheSlots(void);
void QuestLog_RecordEnteredMap(u16);
u8 sub_8112CAC(void);
bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
-void sub_8111F38(u16 offset, u16 idx);
+void QuestLog_BackUpPalette(u16 offset, u16 size);
void CommitQuestLogWindow1(void);
void QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(void);
void ResetQuestLog(void);
@@ -77,7 +77,7 @@ bool8 QuestLogScenePlaybackIsEnding(void);
void sub_8115798(void);
bool8 QuestLog_ShouldEndSceneOnMapChange(void);
void QuestLog_AdvancePlayhead_(void);
-void sub_8111F14(void);
+void QuestLog_InitPalettesBackup(void);
void sub_8110FCC(void);
u8 GetQuestLogStartType(void);
void sub_81113E4(void);
@@ -94,7 +94,7 @@ u16 *sub_8113CC8(u16 *, struct QuestLogEntry *);
u16 *sub_8113D08(u16 *, struct QuestLogEntry *);
u16 *sub_8113D48(u16 *, struct QuestLogEntry *);
u16 *sub_8113D94(u16 *, struct QuestLogEntry *);
-void sub_811381C(void);
+void QL_EnableRecordingSteps(void);
u16 *QuestLog_SkipCommand(u16 *, u16 **);
void sub_8113ABC(const u16 *);
u16 *sub_8113C20(u16 *, struct QuestLogEntry *);
diff --git a/include/text.h b/include/text.h
index cd10de3e6..58690b6f9 100644
--- a/include/text.h
+++ b/include/text.h
@@ -81,10 +81,11 @@
#define CHAR_x 0xEC
#define CHAR_y 0xED
#define CHAR_z 0xEE
-#define CHAR_SPECIAL_F7 0xF7
+#define CHAR_COLON 0xF0
+
+#define CHAR_DYNAMIC_PLACEHOLDER 0xF7
#define CHAR_KEYPAD_ICON 0xF8
#define CHAR_EXTRA_EMOJI 0xF9
-#define CHAR_COLON 0xF0
#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog
#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
@@ -129,15 +130,26 @@
#define EXT_CTRL_CODE_HIGHLIGHT 0x2
#define EXT_CTRL_CODE_SHADOW 0x3
#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x4
-//
-#define EXT_CTRL_CODE_UNKNOWN_7 0x7
-//
+#define EXT_CTRL_CODE_PALETTE 0x5
+#define EXT_CTRL_CODE_FONT 0x6
+#define EXT_CTRL_CODE_RESET_FONT 0x7
+#define EXT_CTRL_CODE_PAUSE 0x8
+#define EXT_CTRL_CODE_WAIT_BUTTON 0x9
+#define EXT_CTRL_CODE_WAIT_SE 0xA
+#define EXT_CTRL_CODE_PLAY_BGM 0xB
+#define EXT_CTRL_CODE_ESCAPE 0xC
+#define EXT_CTRL_CODE_SHIFT_RIGHT 0xD
+#define EXT_CTRL_CODE_SHIFT_DOWN 0xE
+#define EXT_CTRL_CODE_FILL_WINDOW 0xF
+#define EXT_CTRL_CODE_PLAY_SE 0x10
#define EXT_CTRL_CODE_CLEAR 0x11
-//
+#define EXT_CTRL_CODE_SKIP 0x12
#define EXT_CTRL_CODE_CLEAR_TO 0x13
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
#define EXT_CTRL_CODE_JPN 0x15
#define EXT_CTRL_CODE_ENG 0x16
+#define EXT_CTRL_CODE_STOP_BGM 0x17
+#define EXT_CTRL_CODE_RESUME_BGM 0x18
#define NUM_TEXT_PRINTERS 32
@@ -305,7 +317,7 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
void sub_80062B0(struct Sprite *sprite);
u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
-void sub_8006398(u8 spriteId);
+void DestroyTextCursorSprite(u8 spriteId);
s32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese);
#endif // GUARD_TEXT_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 16:56:02 +0000