mirror of
https://github.com/zeldaret/tmc
synced 2026-07-25 14:26:49 -04:00
clean up hint_height version mess
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user