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

Names in KinstoneWorldEvent struct

This commit is contained in:
Catobat 2023-01-08 17:47:29 +01:00
parent 8515634fa9
commit c88f5cf280
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/kinstone.h
View File

@ -23,13 +23,13 @@ extern FuseInfo gFuseInfo;
typedef struct { typedef struct {
u8 objPalette; u8 objPalette;
u8 unk1; u8 gfxOffsetPiece;
u8 unk2; u8 gfxOffsetFull;
u8 subtask; // SUBTASK_WORLDEVENT or 0 u8 subtask; // SUBTASK_WORLDEVENT or 0
u8 worldEventId; u8 worldEventId;
u8 unk5; u8 shape;
u8 unk6; u8 bubbleIcon;
u8 unk7; // TODO flag if it shows a map hint? u8 mapMarkerIcon; // 0 for no map marker
} KinstoneWorldEvent; } KinstoneWorldEvent;
// Indexed by kinstoneId // Indexed by kinstoneId
extern const KinstoneWorldEvent gKinstoneWorldEvents[]; extern const KinstoneWorldEvent gKinstoneWorldEvents[];

8
src/menu/kinstoneMenu.c
View File

@ -265,8 +265,8 @@ void KinstoneMenu_Type3_Overlay0(void) {
} }
void KinstoneMenu_Type3_Overlay1(void) { void KinstoneMenu_Type3_Overlay1(void) {
u32 temp = gKinstoneWorldEvents[gKinstoneMenu.unk2a].unk5; u32 temp = gKinstoneWorldEvents[gKinstoneMenu.unk2a].shape;
if (temp != gKinstoneWorldEvents[gFuseInfo.kinstoneId].unk5) { if (temp != gKinstoneWorldEvents[gFuseInfo.kinstoneId].shape) {
SoundReq(SFX_ITEM_SHIELD_BOUNCE); SoundReq(SFX_ITEM_SHIELD_BOUNCE);
SetMenuType(4); SetMenuType(4);
} else { } else {
@ -517,9 +517,9 @@ void sub_080A42E0(u32 kinstoneId, u32 param_2) {
const KinstoneWorldEvent* ptr = &gKinstoneWorldEvents[kinstoneId]; const KinstoneWorldEvent* ptr = &gKinstoneWorldEvents[kinstoneId];
if (param_2 == 0xff) { if (param_2 == 0xff) {
uVar1 = ptr->unk2; uVar1 = ptr->gfxOffsetFull;
} else { } else {
uVar1 = ptr->unk1; uVar1 = ptr->gfxOffsetPiece;
} }
iVar4 = sub_080A43A8(uVar1); iVar4 = sub_080A43A8(uVar1);
if ((param_2 != 0) && (param_2 != 0xff)) { if ((param_2 != 0) && (param_2 != 0xff)) {

2
src/menu/pauseMenuScreen6.c
View File

@ -206,7 +206,7 @@ void sub_080A68D4(void) {
for (i = 10; i <= 100; i++) { for (i = 10; i <= 100; i++) {
if (CheckKinstoneFused(i) && !CheckFusionMapMarkerDisabled(i)) { if (CheckKinstoneFused(i) && !CheckFusionMapMarkerDisabled(i)) {
uVar4 = gKinstoneWorldEvents[i].unk7; uVar4 = gKinstoneWorldEvents[i].mapMarkerIcon;
ptr = &gWorldEvents[gKinstoneWorldEvents[i].worldEventId]; ptr = &gWorldEvents[gKinstoneWorldEvents[i].worldEventId];
sub_080A698C(ptr->_c, ptr->_e, DRAW_DIRECT_SPRITE_INDEX, uVar4 + 100); sub_080A698C(ptr->_c, ptr->_e, DRAW_DIRECT_SPRITE_INDEX, uVar4 + 100);
} }

2
src/object/cameraTarget.c
View File

@ -133,7 +133,7 @@ void CameraTarget_Action2(Entity* this) {
bVar2 = this->type2; bVar2 = this->type2;
} }
ptr = gKinstoneWorldEvents + bVar2; ptr = gKinstoneWorldEvents + bVar2;
bVar1 = ptr->unk6; bVar1 = ptr->bubbleIcon;
bVar3 = bVar1 & 1; bVar3 = bVar1 & 1;
this->palette.b.b0 = bVar3; this->palette.b.b0 = bVar3;
temp = gUnk_0811F744[bVar1] < 0; temp = gUnk_0811F744[bVar1] < 0;

2
src/subtask/subtaskLocalMapHint.c
View File

@ -38,7 +38,7 @@ void sub_080A6B04(void) {
sub_080A4DB8(6); sub_080A4DB8(6);
ptr = &gKinstoneWorldEvents[gFuseInfo.kinstoneId]; ptr = &gKinstoneWorldEvents[gFuseInfo.kinstoneId];
ptr2 = &gWorldEvents[ptr->worldEventId]; ptr2 = &gWorldEvents[ptr->worldEventId];
bVar1 = ptr->unk7; bVar1 = ptr->mapMarkerIcon;
uVar3 = ptr2->_c; uVar3 = ptr2->_c;
uVar4 = ptr2->_e; uVar4 = ptr2->_e;
uVar2 = sub_080A6A80(uVar3, uVar4)->_4; uVar2 = sub_080A6A80(uVar3, uVar4)->_4;

2
src/subtask/subtaskWorldEvent.c
View File

@ -58,7 +58,7 @@ void Subtask_WorldEvent_Update(void) {
void Subtask_WorldEvent_End(void) { void Subtask_WorldEvent_End(void) {
MessageInitialize(); MessageInitialize();
sub_0806F38C(); sub_0806F38C();
if (gKinstoneWorldEvents[gFuseInfo.kinstoneId].unk7 != 0) { if (gKinstoneWorldEvents[gFuseInfo.kinstoneId].mapMarkerIcon != 0) {
// Show the map hint. // Show the map hint.
MenuFadeIn(SUBTASK_LOCALMAPHINT, gUI.field_0x3); MenuFadeIn(SUBTASK_LOCALMAPHINT, gUI.field_0x3);
} else { } else {