izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

play part 2

Browse Source
This commit is contained in:
petrie911
2022-07-28 10:03:44 -05:00
parent a92e1756c2
commit f91845a611
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -617,7 +617,7 @@ void Flags_SetCollectible(PlayState* play, s32 flag);
void TitleCard_InitBossName(GameState* gameState, TitleCardContext* titleCtx, TexturePtr texture, s16 x, s16 y, u8 width, u8 height);
s32 func_800B648C(PlayState* play, s32 arg1, s32 arg2, f32 arg3, Vec3f* arg4);
f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, u32* arg3);
f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, s32* arg3);
void* func_800B6584(PlayState* play, s16 id, void* arg2, size_t size);
void* func_800B6608(PlayState* play, s16 id);
void* func_800B6680(PlayState* play, s16 id);
src/code/z_actor.c
+1 -1
View File
@@ -930,7 +930,7 @@ s32 func_800B648C(PlayState* play, s32 arg1, s32 arg2, f32 arg3, Vec3f* arg4) {
return true;
}
f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, u32* arg3) {
f32 func_800B64FC(PlayState* play, f32 arg1, Vec3f* arg2, s32* arg3) {
f32 temp_f8;
if ((play->actorCtx.unk1F5 == 0) || (arg1 == 0.0f)) {
src/overlays/actors/ovl_Boss_07/z_boss_07.c
+6 -6
View File
@@ -1394,7 +1394,7 @@ void Boss07_Wrath_Grab(Boss07* this, PlayState* play) {
}
void Boss07_Wrath_GrabPlayer(Boss07* this, PlayState* play) {
u32 sp2C;
s32 sp2C;
Player* player = GET_PLAYER(play);
SkelAnime_Update(&this->skelAnime);
@@ -1420,7 +1420,7 @@ void Boss07_Wrath_ThrowPlayer(Boss07* this, PlayState* play) {
Player* player = GET_PLAYER(play);
f32 phi_f0;
f32 phi_f2;
u32 sp30;
s32 sp30;
SkelAnime_Update(&this->skelAnime);
this->unk_15A = 20;
@@ -1655,7 +1655,7 @@ void Boss07_Wrath_Damaged(Boss07* this, PlayState* play) {
void Boss07_Wrath_WhipCollisionCheck(Vec3f* arg0, f32 arg1, Boss07* this, PlayState* play) {
s32 i;
u32 sp98 = -1;
s32 sp98 = -1;
Player* player = GET_PLAYER(play);
f32 dx;
f32 dy;
@@ -2865,7 +2865,7 @@ void Boss07_Incarnation_SetupRun(Boss07* this, PlayState* play) {
void Boss07_Incarnation_Run(Boss07* this, PlayState* play) {
f32 sp34;
f32 sp30;
u32 sp2C;
s32 sp2C;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LAST2_WALK_OLD - SFX_FLAG);
this->unk_AB40++;
@@ -5384,7 +5384,7 @@ void Boss07_Top_Collide(Boss07* this, PlayState* play) {
}
void Boss07_Top_CollisionCheck(Boss07* this, PlayState* play) {
u32 sp3C;
s32 sp3C;
s32 sp38 = 0;
Player* player = GET_PLAYER(play);
s32 pad[3];
@@ -5497,7 +5497,7 @@ void Boss07_Static_Update(Actor* thisx, PlayState* play2) {
if (sHeartbeatTimer != 0) {
sHeartbeatTimer--;
dummy_label:;
dummy_label:; //!@fake
play_sound(NA_SE_EN_LAST2_HEARTBEAT_OLD - SFX_FLAG);
}
if (this->unk_1808 != 0) {
src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
+1 -1
View File
@@ -724,7 +724,7 @@ void EnDragon_Dead(EnDragon* this, PlayState* play) {
void EnDragon_UpdateDamage(EnDragon* this, PlayState* play) {
Player* player = GET_PLAYER(play);
u32 sp30;
s32 sp30;
if (this->action == DEEP_PYTHON_ACTION_EXTEND) {
if ((this->collider.elements[2].info.bumperFlags & BUMP_HIT) ||