mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-06-10 13:04:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Colpoly factory and Torch fixes + sonicdcer's ast_sector_X (#164)

Browse Source 
* a start

* some things

* format

* hitboxes

* soon

* fixes and such

* Torch

* one fix
This commit is contained in:
petrie911
2024-03-13 16:48:03 -05:00
committed by GitHub
parent 976539b8c0
commit 01e87f1680
16 changed files with 855 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_enmy.c
+3 -3
View File
@@ -8,9 +8,9 @@ u8 D_80161684;
#include "fox_enmy_assets.h"
ObjectInit* D_800CFDA0[] = {
D_060371A4, D_06026CC4, D_0602A164, D_06023F64, D_060287A4, D_0602E4F4, D_06007E74,
D_0601F234, D_06026714, D_0C035154, D_06006AA4, D_06031000, D_06006C60, D_0602E5C8,
D_0600EAD4, NULL, D_06011044, D_0600FF74, D_06006EB4, D_06014D94, D_0302DE3C,
D_60371A4, D_6026CC4, D_602A164, D_6023F64, D_60287A4, D_602E4F4, D_6007E74,
D_601F234, D_6026714, D_0C035154, D_6006AA4, D_6031000, D_6006C60, D_602E5C8,
D_600EAD4, NULL, D_6011044, D_600FF74, D_6006EB4, D_6014D94, D_0302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
src/main/fox_enmy2.c
+2 -2
View File
@@ -1124,8 +1124,8 @@ void func_8006D36C(Actor* actor) {
switch (D_800D003C[actor->unk_0B4].unk_16) {
case 1:
if ((gCurrentLevel != LEVEL_SOLAR) && (actor->unk_0B4 != 6) &&
((gCurrentLevel != LEVEL_CORNERIA) || (actor->unk_0B4 != 8))) {
if (!((gCurrentLevel == LEVEL_SOLAR) || (actor->unk_0B4 == 6) ||
((gCurrentLevel == LEVEL_CORNERIA) && (actor->unk_0B4 == 8)))) {
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4);
}
break;
src/main/fox_radio.c
+2
View File
@@ -143,7 +143,9 @@ void func_800BAAE8(void) {
s32 j;
D_80178744 = 0;
mirror = false;
switch (D_801782A4) {
case RCID_FOX_RED:
D_80178744 = 1;
src/overlays/ovl_i2/fox_sx.c
+2 -2
View File
@@ -25,8 +25,8 @@ extern Animation D_601C690;
extern Animation D_60206DC;
extern Limb* D_6020C68[];
extern Gfx D_6020D20[];
extern Gfx D_603265C[];
extern Gfx D_6032768[];
extern f32 D_603265C[];
extern f32 D_6032768[];
extern f32 D_60328CC[];
extern s32 D_800C9E90[];