diff --git a/include/room.h b/include/room.h index eec4e46d..a23dff14 100644 --- a/include/room.h +++ b/include/room.h @@ -162,8 +162,13 @@ typedef struct { /* 0x31 */ u8 field31; /* 0x32 */ u8 field32; /* 0x33 */ u8 field33; - /* 0x34 */ u8 hint_heightEU; +#if defined(JP) || defined(EU) + /* 0x34 */ u8 hint_height; + /* 0x35 */ u8 field35; +#else + /* 0x34 */ u8 field35; /* 0x35 */ u8 hint_height; +#endif /* 0x36 */ u16 hint_idx; /* 0x38 */ u8 field_0x38; /* 0x39 */ u8 field_0x39; 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) {