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

Fix Venom 1

Browse Source
This commit is contained in:
Sonic Dreamcaster 2025-01-03 17:32:14 -03:00 committed by Alejandro Asenjo Nitti
parent 9fa7a96841
commit e9ef31c50f
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/yaml/us/rev0/ast_audio.yaml
View File

@ -1,5 +1,4 @@
:config: :config:
force: true
header: header:
code: code:
- '#include "sys.h"' - '#include "sys.h"'

4
assets/yaml/us/rev0/ast_venom_1.yaml
View File

@ -118,8 +118,8 @@ D_VE1_6007E30:
D_VE1_6007E74: D_VE1_6007E74:
{ type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 } { type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 }
D_VE1_601B1E4: aVe1EventScript:
{ type: SF64:SCRIPT, offset: 0x601B1E4, symbol: D_VE1_601B1E4 } { type: SF64:SCRIPT, offset: 0x601B1D8, symbol: aVe1EventScript }
D_VE1_6010088: D_VE1_6010088:
{ type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 }

4
assets/yaml/us/rev1/ast_venom_1.yaml
View File

@ -118,8 +118,8 @@ D_VE1_6007E30:
D_VE1_6007E74: D_VE1_6007E74:
{ type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 } { type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 }
D_VE1_601B1E4: aVe1EventScript:
{ type: SF64:SCRIPT, offset: 0x601B1E4, symbol: D_VE1_601B1E4 } { type: SF64:SCRIPT, offset: 0x601B1E4, symbol: aVe1EventScript }
D_VE1_6010088: D_VE1_6010088:
{ type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 }

2
include/assets/ast_venom_1.h
View File

@ -118,7 +118,7 @@ static const ALIGN_ASSET(2) char D_VE1_6007E74[] = "__OTR__ast_venom_1/D_VE1_600
static const ALIGN_ASSET(2) char D_VE1_6010088[] = "__OTR__ast_venom_1/D_VE1_6010088"; static const ALIGN_ASSET(2) char D_VE1_6010088[] = "__OTR__ast_venom_1/D_VE1_6010088";
static const char D_VE1_601B1E4[] = "__OTR__ast_venom_1/D_VE1_601B1E4"; static const char aVe1EventScript[] = "__OTR__ast_venom_1/aVe1EventScript";
static const ALIGN_ASSET(2) char aVe1Pillar5Hitbox[] = "__OTR__ast_venom_1/aVe1Pillar5Hitbox"; static const ALIGN_ASSET(2) char aVe1Pillar5Hitbox[] = "__OTR__ast_venom_1/aVe1Pillar5Hitbox";

2
src/engine/fox_enmy2.c
View File

@ -1106,7 +1106,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
levelScripts = (uint16_t**) LOAD_ASSET(D_ZO_602AAC0); levelScripts = (uint16_t**) LOAD_ASSET(D_ZO_602AAC0);
break; break;
case LEVEL_VENOM_1: case LEVEL_VENOM_1:
levelScripts = (uint16_t**) LOAD_ASSET(D_VE1_601B1E4); levelScripts = (uint16_t**) LOAD_ASSET(aVe1EventScript);
break; break;
case LEVEL_MACBETH: case LEVEL_MACBETH:
levelScripts = (uint16_t**) LOAD_ASSET(D_MA_60381D8); levelScripts = (uint16_t**) LOAD_ASSET(D_MA_60381D8);

2
tools/Torch

@ -1 +1 @@
Subproject commit 187237b3e4b5a6d16d1176ea90b9dcea75398298 Subproject commit 0d9da406262b5fc8029e65a332bf2fd771afa3f0