Decompile scenarioCtcIsRoomHighlighted and scenarioKohIsRoomHighlighted

This commit is contained in:
Ryan Dwyer
2020-01-11 15:06:05 +10:00
parent a149a22ff2
commit ecfa2605a0
4 changed files with 29 additions and 52 deletions
+2 -2
View File
@@ -105,7 +105,7 @@ bool scenarioCtcHighlight(struct prop *prop, u32 *colour);
u32 func0f181800(void);
bool scenarioCtcCallback2c(f32 arg0, s32 arg1, s32 arg2, struct prop *prop, f32 *arg4);
s32 scenarioCtcGetMaxTeams(void);
bool scenarioCtcCallback34(s16 arg0);
bool scenarioCtcIsRoomHighlighted(s16 room);
void scenarioCtcCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
void scenarioKohCallback40(s32 *arg0);
void scenarioKohCallback44(s32 *arg0);
@@ -116,7 +116,7 @@ u32 scenarioKohCallback18(void);
void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
s32 scenarioKohRadar(s32 value);
u32 func0f182aac(void);
bool scenarioKohCallback34(s16 arg0);
bool scenarioKohIsRoomHighlighted(s16 arg0);
void scenarioKohCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
void scenarioHtmInit(void);
s32 scenarioHtmCallback08(void);
+2 -3
View File
@@ -4123,7 +4123,7 @@ struct mpscenario {
bool (*highlightfunc)(struct prop *prop, u32 *colour);
bool (*unk2c)(f32 arg0, s32 arg1, s32 arg2, struct prop *prop, f32 *arg4);
s32 (*maxteamsfunc)(void);
bool (*unk34)(s16 arg0);
bool (*isroomhighlightedfunc)(s16 room);
void (*unk38)(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
void *unk3c;
void (*unk40)(s32 *arg0);
@@ -4475,8 +4475,7 @@ struct ctcthing {
struct scenariodata_ctc {
/*0x00*/ s16 unk00[4];
/*0x08*/ s16 unk08[4];
/*0x10*/ s32 unk10;
/*0x14*/ s32 unk14;
/*0x10*/ s16 baserooms[4];
/*0x18*/ struct ctcthing unk18[4];
/*0x58*/ struct prop *tokens[4];
};