summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHenny022p <info@henny022.de>2023-08-02 22:32:17 +0200
committerHenny022p <info@henny022.de>2023-08-02 22:32:17 +0200
commit83d710a413d6a72117b32c35f7195e4e0dcab8d4 (patch)
treec1d30286c9b99af7500c4f8963a2ba58053bf5c8 /src
parentea30d2264bf578767f12262105be5d0c3b6a75ef (diff)
clean up hint_height version mess
Diffstat (limited to 'src')
-rw-r--r--src/gameUtils.c8
-rw-r--r--src/kinstone.c4
-rw-r--r--src/playerUtils.c4
3 files changed, 0 insertions, 16 deletions
diff --git a/src/gameUtils.c b/src/gameUtils.c
index 29f221d4..d4543147 100644
--- a/src/gameUtils.c
+++ b/src/gameUtils.c
@@ -448,18 +448,10 @@ bool32 CanDispEzloMessage(void) {
void DisplayEzloMessage(void) {
u32 height;
u32 idx;
-#if defined(JP) || defined(EU)
- if (gRoomTransition.hint_heightEU == 0) {
-#else
if (gRoomTransition.hint_height == 0) {
-#endif
height = gPlayerEntity.y.HALF.HI - gRoomControls.scroll_y > 96 ? 1 : 13;
} else {
-#if defined(JP) || defined(EU)
- height = gRoomTransition.hint_heightEU;
-#else
height = gRoomTransition.hint_height;
-#endif
}
MessageAtHeight(gRoomTransition.hint_idx, height);
}
diff --git a/src/kinstone.c b/src/kinstone.c
index 936d07aa..71a93a7b 100644
--- a/src/kinstone.c
+++ b/src/kinstone.c
@@ -179,11 +179,7 @@ void GenerateAreaHint(void) {
struct_area_28* ptr;
gPlayerState.queued_action = PLAYER_TALKEZLO;
-#if defined(EU) || defined(JP)
- gRoomTransition.hint_heightEU = 0;
-#else
gRoomTransition.hint_height = 0;
-#endif
ptr = &gArea.unk28;
if (ptr->textBaseIndex == 0xff) {
gRoomTransition.hint_idx = ptr->ezloHintTexts[0];
diff --git a/src/playerUtils.c b/src/playerUtils.c
index 0e3802eb..7514488c 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -1288,11 +1288,7 @@ void SetPlayerControl(PlayerControlMode mode) {
void CreateEzloHint(u32 hintId, u32 hintHeight) {
gPlayerState.queued_action = PLAYER_TALKEZLO;
gRoomTransition.hint_idx = hintId;
-#if defined(EU) || defined(JP)
- gRoomTransition.hint_heightEU = hintHeight;
-#else
gRoomTransition.hint_height = hintHeight;
-#endif
}
void sub_08078AC0(u32 param_1, u32 param_2, u32 param_3) {