PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-03 00:33:55 +03:00
Code Issues Actions 1 Packages Projects Releases 1 Wiki Activity

corrections

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-08-15 05:10:00 -03:00
parent f17c7bdc27
commit 56d49ec767
7 changed files with 256 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions.h
View File

@ -105,7 +105,7 @@ void ActorHopBot_Draw(Actor*);
void MeteoTunnel_Draw(Scenery*);
void Scenery_DrawTitaniaBones(Scenery*);
void CoIBeam_Draw(Scenery*);
void ActorMoleMissile_Draw(ActorMoleMissile*);
void CoMoleMissile_Draw(CoMoleMissile*);
void Sprite167_Draw(Sprite*);
void FogShadow_Draw(Sprite*);
void CoBuilding9_Draw(Scenery*);
@ -118,8 +118,8 @@ void MeMolarRock_Draw(Actor*);
void MeMeteor2_Draw(MeMeteor2*);
void MeLaserCannon1_Draw(MeLaserCannon1*);
void ActorMissileSeek_Draw(Actor*);
void ActorSkibot_Draw(ActorSkibot*);
void ActorRadar_Draw(CoRadar*);
void CoSkibot_Draw(CoSkibot*);
void CoRadar_Draw(CoRadar*);
void ItemCheckpoint_Draw(Item*);
void ItemSilverRing_Draw(Item*);
void ItemSilverStar_Draw(Item*);
@ -166,9 +166,9 @@ void func_enmy_800654E4(Object*);
void ActorMissileSeek_Update(Actor*);
void func_enmy_800660F0(Actor*);
void Actor_Despawn(Actor*);
void ActorSkibot_Update(ActorSkibot*);
void CoSkibot_Update(CoSkibot*);
void func_enmy_8006684C(Actor*);
void ActorRadar_Update(CoRadar*);
void CoRadar_Update(CoRadar*);
void MeMolarRock_Update(Actor*);
void func_enmy_80066C00(Scenery*);
void CoBuilding9_Update(Scenery*);
@ -219,7 +219,7 @@ void MeMora_Update(Actor*);
void MeMora_Dying(Actor*);
void MeMora_Draw(Actor*);
void CoIBeam_Update(Scenery*);
void ActorMoleMissile_Update(ActorMoleMissile*);
void CoMoleMissile_Update(CoMoleMissile*);
void ActorDebris_Update(Actor*);
void MeteoTunnel_Update(Scenery*);
void Actor_SetupPlayerShot(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);

4
include/sf64object.h
View File

@ -1127,11 +1127,11 @@ typedef Actor Actor188;
typedef Actor ActorDebris;
typedef Actor ActorMissileSeekTeam;
typedef Actor ActorMissileSeekPlayer;
typedef Actor ActorSkibot;
typedef Actor CoSkibot;
typedef Actor CoRadar;
typedef Actor MeMora;
typedef Actor ActorCutscene;
typedef Actor ActorMoleMissile;
typedef Actor CoMoleMissile;
typedef Actor ActorAllRange;
typedef Actor ActorTeamBoss; // Teammates in a boss battle
typedef Actor Actor199;

10
linker_scripts/us/rev1/symbol_addrs_engine.txt
View File

@ -177,7 +177,7 @@ MeteoTunnel_Draw = 0x80059AEC;
Scenery_DrawTitaniaBones = 0x80059B20;
func_edisplay_80059BB0 = 0x80059BB0;
CoIBeam_Draw = 0x80059BBC;
ActorMoleMissile_Draw = 0x80059BF0;
CoMoleMissile_Draw = 0x80059BF0;
func_edisplay_80059C28 = 0x80059C28;
Sprite167_Draw = 0x80059C34;
FogShadow_Draw = 0x80059C40;
@ -194,8 +194,8 @@ MeMolarRock_Draw = 0x8005B6A4;
MeMeteor2_Draw = 0x8005B71C;
MeLaserCannon1_Draw = 0x8005B7CC;
ActorMissileSeek_Draw = 0x8005B848;
ActorSkibot_Draw = 0x8005B9A4;
ActorRadar_Draw = 0x8005BA30;
CoSkibot_Draw = 0x8005B9A4;
CoRadar_Draw = 0x8005BA30;
func_edisplay_8005BAAC = 0x8005BAAC;
Object_SetShadowDL = 0x8005BAB4;
ItemCheckpoint_Draw = 0x8005C5F0;
@ -300,9 +300,9 @@ func_enmy_8006566C = 0x8006566C;
ActorMissileSeek_Update = 0x800656D4;
func_enmy_800660F0 = 0x800660F0;
Actor_Despawn = 0x80066254;
ActorSkibot_Update = 0x8006654C;
CoSkibot_Update = 0x8006654C;
func_enmy_8006684C = 0x8006684C;
ActorRadar_Update = 0x800669A0;
CoRadar_Update = 0x800669A0;
MeMolarRock_Update = 0x80066A80;
func_enmy_80066A8C = 0x80066A8C;
func_enmy_80066C00 = 0x80066C00;

6
src/engine/fox_edata_info.c
View File

@ -285,11 +285,11 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_ACTOR_DEBRIS */ {(void*) ActorDebris_Draw, 1, (ObjectFunc) ActorDebris_Update, gNoHitbox, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_MISSILE_SEEK_TEAM */ {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update, gActorMissileSeekHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_MISSILE_SEEK_PLAYER */ {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update, gActorMissileSeekHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_CO_SKIBOT */ {(void*) ActorSkibot_Draw, 1, (ObjectFunc) ActorSkibot_Update, aCoActorSkibotHitbox, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_CO_RADAR */ {(void*) ActorRadar_Draw, 1, (ObjectFunc) ActorRadar_Update, aCoActorRadarHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_CO_SKIBOT */ {(void*) CoSkibot_Draw, 1, (ObjectFunc) CoSkibot_Update, aCoActorSkibotHitbox, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_CO_RADAR */ {(void*) CoRadar_Draw, 1, (ObjectFunc) CoRadar_Update, aCoActorRadarHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_ME_MORA */ {(void*) MeMora_Draw, 1, (ObjectFunc) MeMora_Update, gMeMoraHitbox, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_CUTSCENE */ {(void*) ActorCutscene_Draw, 1, (ObjectFunc) ActorCutscene_Update, gNoHitbox, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) ActorMoleMissile_Draw, 1, (ObjectFunc) ActorMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) CoMoleMissile_Draw, 1, (ObjectFunc) CoMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, gActorAllRangeHItbox, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, gTeamHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) Andross_Actor199_Draw, 1, (ObjectFunc) Andross_Actor199_Update, gNoHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },

323
src/engine/fox_edisplay.c
View File

File diff suppressed because it is too large Load Diff

6
src/engine/fox_enmy.c
View File

@ -1780,7 +1780,7 @@ void Actor_Despawn(Actor* this) {
}
}
void ActorSkibot_Update(ActorSkibot* this) {
void CoSkibot_Update(CoSkibot* this) {
this->gravity = 0.4f;
if (this->obj.pos.y <= gGroundHeight + 130.0f) {
@ -1848,7 +1848,7 @@ void ActorSkibot_Update(ActorSkibot* this) {
}
}
void func_enmy_8006684C(ActorSkibot* this) {
void func_enmy_8006684C(CoSkibot* this) {
s32 pad;
if (this->timer_0BE != 0) {
@ -1874,7 +1874,7 @@ void func_enmy_8006684C(ActorSkibot* this) {
}
}
void ActorRadar_Update(CoRadar* this) {
void CoRadar_Update(CoRadar* this) {
if (this->timer_0BC != 0) {
if (this->timer_0BC == 1) {
Object_Kill(&this->obj, this->sfxSource);

2
src/engine/fox_enmy2.c
View File

@ -396,7 +396,7 @@ void func_enmy2_8006BB1C(f32 xPos, f32 yPos, f32 zPos) {
}
}
void ActorMoleMissile_Update(ActorMoleMissile* this) {
void CoMoleMissile_Update(CoMoleMissile* this) {
Vec3f sp44;
switch (this->state) {