Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-26 22:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HUD

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-08-11 22:19:39 -03:00
parent f2d51c971a
commit 4ccdb5dfc8
7 changed files with 505 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -386,8 +386,8 @@ void func_hud_80087530(f32, f32, s32);
void func_hud_800884E4(void); void func_hud_800884E4(void);
void func_hud_80088564(void); void func_hud_80088564(void);
void HUD_DrawStatusScreens(void); void HUD_DrawStatusScreens(void);
s32 Hud_MissileSeekModeCheck(s32); s32 ActorMissileSeek_ModeCheck(s32);
void func_hud_8008AD94(void); void HUD_RadioCharacterName_Draw(void);
void func_hud_8008B5B0(f32 x, f32 y); void func_hud_8008B5B0(f32 x, f32 y);
s32 func_hud_8008B774(void); s32 func_hud_8008B774(void);
void func_hud_8008BD00(u8*, s32, s32, u8); void func_hud_8008BD00(u8*, s32, s32, u8);

4
include/sf64object.h
View File

@ -1125,7 +1125,7 @@ typedef Actor MeLaserCannon1;
typedef Actor MeLaserCannon2; typedef Actor MeLaserCannon2;
typedef Actor Actor188; typedef Actor Actor188;
typedef Actor ActorDebris; typedef Actor ActorDebris;
typedef Actor Actor190; typedef Actor ActorMissileSeekTeam;
typedef Actor ActorMissileSeekPlayer; typedef Actor ActorMissileSeekPlayer;
typedef Actor ActorSkibot; typedef Actor ActorSkibot;
typedef Actor CoRadar; typedef Actor CoRadar;
@ -1133,7 +1133,7 @@ typedef Actor MeMora;
typedef Actor ActorCutscene; typedef Actor ActorCutscene;
typedef Actor ActorMoleMissile; typedef Actor ActorMoleMissile;
typedef Actor ActorAllRange; typedef Actor ActorAllRange;
typedef Actor ActorTeamBoss; typedef Actor ActorTeamBoss; // Teammates in a boss battle
typedef Actor Actor199; typedef Actor Actor199;
typedef Actor ActorEvent; typedef Actor ActorEvent;
typedef Actor MeteoBall; typedef Actor MeteoBall;

2
src/engine/fox_enmy.c
View File

@ -1456,7 +1456,7 @@ void func_enmy_800654E4(Object* obj) {
} }
} }
void func_enmy_800655C8(Actor190* this, f32 xPos, f32 yPos, f32 zPos, s32 eventType) { void func_enmy_800655C8(ActorMissileSeekTeam* this, f32 xPos, f32 yPos, f32 zPos, s32 eventType) {
Actor_Initialize(this); Actor_Initialize(this);
this->obj.status = OBJ_INIT; this->obj.status = OBJ_INIT;
this->obj.id = OBJ_MISSILE_SEEK_TEAM; this->obj.id = OBJ_MISSILE_SEEK_TEAM;

994
src/engine/fox_hud.c
View File

File diff suppressed because it is too large Load Diff

2
src/engine/fox_radio.c
View File

@ -769,7 +769,7 @@ void Radio_Draw(void) {
} }
if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) && if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
(gCurrentRadioPortrait != RCID_1000)) { (gCurrentRadioPortrait != RCID_1000)) {
func_hud_8008AD94(); HUD_RadioCharacterName_Draw();
} }
} }

4
src/overlays/ovl_i1/fox_co.c
View File

@ -398,7 +398,7 @@ ObjectId Corneria_CoGranga_ChooseMissileTarget(CoGranga* this) {
if (this->swork[GRANGA_MISSILE_COUNT] >= 5) { if (this->swork[GRANGA_MISSILE_COUNT] >= 5) {
this->swork[GRANGA_MISSILE_COUNT] = 0; this->swork[GRANGA_MISSILE_COUNT] = 0;
return OBJ_MISSILE_SEEK_PLAYER; return OBJ_MISSILE_SEEK_PLAYER;
} else if (Hud_MissileSeekModeCheck(0) < 4) { } else if (ActorMissileSeek_ModeCheck(0) < 4) {
return OBJ_MISSILE_SEEK_TEAM; return OBJ_MISSILE_SEEK_TEAM;
} else { } else {
return 0; return 0;
@ -1644,7 +1644,7 @@ void Corneria_CoCarrier_ChooseMissileTarget(CoCarrier* this, f32 xPos, f32 yPos,
s32 eventType) { s32 eventType) {
ObjectId objId = OBJ_MISSILE_SEEK_PLAYER; ObjectId objId = OBJ_MISSILE_SEEK_PLAYER;
if (Hud_MissileSeekModeCheck(0) < 4) { if (ActorMissileSeek_ModeCheck(0) < 4) {
objId = OBJ_MISSILE_SEEK_TEAM; objId = OBJ_MISSILE_SEEK_TEAM;
} }

2
src/overlays/ovl_i2/fox_me.c
View File

@ -1038,7 +1038,7 @@ void Meteo_MeCrusher_Update(MeCrusher* this) {
if (this->swork[18] != 0) { if (this->swork[18] != 0) {
s32 objId; s32 objId;
if (Hud_MissileSeekModeCheck(0) >= 4) { if (ActorMissileSeek_ModeCheck(0) >= 4) {
objId = OBJ_MISSILE_SEEK_PLAYER; objId = OBJ_MISSILE_SEEK_PLAYER;
} else { } else {
objId = OBJ_MISSILE_SEEK_TEAM; objId = OBJ_MISSILE_SEEK_TEAM;