falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up hint_height version mess

This commit is contained in:
Henny022p 2023-08-02 22:32:17 +02:00
parent ea30d2264b
commit 83d710a413
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/room.h
View File

@ -162,8 +162,13 @@ typedef struct {
/* 0x31 */ u8 field31; /* 0x31 */ u8 field31;
/* 0x32 */ u8 field32; /* 0x32 */ u8 field32;
/* 0x33 */ u8 field33; /* 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; /* 0x35 */ u8 hint_height;
#endif
/* 0x36 */ u16 hint_idx; /* 0x36 */ u16 hint_idx;
/* 0x38 */ u8 field_0x38; /* 0x38 */ u8 field_0x38;
/* 0x39 */ u8 field_0x39; /* 0x39 */ u8 field_0x39;

8
src/gameUtils.c
View File

@ -448,18 +448,10 @@ bool32 CanDispEzloMessage(void) {
void DisplayEzloMessage(void) { void DisplayEzloMessage(void) {
u32 height; u32 height;
u32 idx; u32 idx;
#if defined(JP) || defined(EU)
if (gRoomTransition.hint_heightEU == 0) {
#else
if (gRoomTransition.hint_height == 0) { if (gRoomTransition.hint_height == 0) {
#endif
height = gPlayerEntity.y.HALF.HI - gRoomControls.scroll_y > 96 ? 1 : 13; height = gPlayerEntity.y.HALF.HI - gRoomControls.scroll_y > 96 ? 1 : 13;
} else { } else {
#if defined(JP) || defined(EU)
height = gRoomTransition.hint_heightEU;
#else
height = gRoomTransition.hint_height; height = gRoomTransition.hint_height;
#endif
} }
MessageAtHeight(gRoomTransition.hint_idx, height); MessageAtHeight(gRoomTransition.hint_idx, height);
} }

4
src/kinstone.c
View File

@ -179,11 +179,7 @@ void GenerateAreaHint(void) {
struct_area_28* ptr; struct_area_28* ptr;
gPlayerState.queued_action = PLAYER_TALKEZLO; gPlayerState.queued_action = PLAYER_TALKEZLO;
#if defined(EU) || defined(JP)
gRoomTransition.hint_heightEU = 0;
#else
gRoomTransition.hint_height = 0; gRoomTransition.hint_height = 0;
#endif
ptr = &gArea.unk28; ptr = &gArea.unk28;
if (ptr->textBaseIndex == 0xff) { if (ptr->textBaseIndex == 0xff) {
gRoomTransition.hint_idx = ptr->ezloHintTexts[0]; gRoomTransition.hint_idx = ptr->ezloHintTexts[0];

4
src/playerUtils.c
View File

@ -1288,11 +1288,7 @@ void SetPlayerControl(PlayerControlMode mode) {
void CreateEzloHint(u32 hintId, u32 hintHeight) { void CreateEzloHint(u32 hintId, u32 hintHeight) {
gPlayerState.queued_action = PLAYER_TALKEZLO; gPlayerState.queued_action = PLAYER_TALKEZLO;
gRoomTransition.hint_idx = hintId; gRoomTransition.hint_idx = hintId;
#if defined(EU) || defined(JP)
gRoomTransition.hint_heightEU = hintHeight;
#else
gRoomTransition.hint_height = hintHeight; gRoomTransition.hint_height = hintHeight;
#endif
} }
void sub_08078AC0(u32 param_1, u32 param_2, u32 param_3) { void sub_08078AC0(u32 param_1, u32 param_2, u32 param_3) {