diff options
| author | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2025-01-03 17:32:14 -0300 |
|---|---|---|
| committer | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2025-01-03 17:59:48 -0500 |
| commit | e9ef31c50f1bded97578f059d9af28bf0ccd0437 (patch) | |
| tree | dc2a92cdabc4842a4363c389450469443ec04923 | |
| parent | 9fa7a968415a533c1076ea6bb9046e4e57003554 (diff) | |
Fix Venom 1
| -rw-r--r-- | assets/yaml/us/rev0/ast_audio.yaml | 1 | ||||
| -rw-r--r-- | assets/yaml/us/rev0/ast_venom_1.yaml | 4 | ||||
| -rw-r--r-- | assets/yaml/us/rev1/ast_venom_1.yaml | 4 | ||||
| -rw-r--r-- | include/assets/ast_venom_1.h | 2 | ||||
| -rw-r--r-- | src/engine/fox_enmy2.c | 2 | ||||
| m--------- | tools/Torch | 0 |
6 files changed, 6 insertions, 7 deletions
diff --git a/assets/yaml/us/rev0/ast_audio.yaml b/assets/yaml/us/rev0/ast_audio.yaml index 709d3a17..c911f873 100644 --- a/assets/yaml/us/rev0/ast_audio.yaml +++ b/assets/yaml/us/rev0/ast_audio.yaml @@ -1,5 +1,4 @@ :config: - force: true header: code: - '#include "sys.h"' diff --git a/assets/yaml/us/rev0/ast_venom_1.yaml b/assets/yaml/us/rev0/ast_venom_1.yaml index 6179a33e..a46bc2dd 100644 --- a/assets/yaml/us/rev0/ast_venom_1.yaml +++ b/assets/yaml/us/rev0/ast_venom_1.yaml @@ -118,8 +118,8 @@ D_VE1_6007E30: D_VE1_6007E74: { type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 } -D_VE1_601B1E4: - { type: SF64:SCRIPT, offset: 0x601B1E4, symbol: D_VE1_601B1E4 } +aVe1EventScript: + { type: SF64:SCRIPT, offset: 0x601B1D8, symbol: aVe1EventScript } D_VE1_6010088: { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } diff --git a/assets/yaml/us/rev1/ast_venom_1.yaml b/assets/yaml/us/rev1/ast_venom_1.yaml index cb8fd9f8..80379e2c 100644 --- a/assets/yaml/us/rev1/ast_venom_1.yaml +++ b/assets/yaml/us/rev1/ast_venom_1.yaml @@ -118,8 +118,8 @@ D_VE1_6007E30: D_VE1_6007E74: { type: SF64:OBJECT_INIT, offset: 0x6007E74, symbol: D_VE1_6007E74 } -D_VE1_601B1E4: - { type: SF64:SCRIPT, offset: 0x601B1E4, symbol: D_VE1_601B1E4 } +aVe1EventScript: + { type: SF64:SCRIPT, offset: 0x601B1E4, symbol: aVe1EventScript } D_VE1_6010088: { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } diff --git a/include/assets/ast_venom_1.h b/include/assets/ast_venom_1.h index 8ac862e8..8160e113 100644 --- a/include/assets/ast_venom_1.h +++ b/include/assets/ast_venom_1.h @@ -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 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"; diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c index 3306fd1c..692b8948 100644 --- a/src/engine/fox_enmy2.c +++ b/src/engine/fox_enmy2.c @@ -1106,7 +1106,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) { levelScripts = (uint16_t**) LOAD_ASSET(D_ZO_602AAC0); break; case LEVEL_VENOM_1: - levelScripts = (uint16_t**) LOAD_ASSET(D_VE1_601B1E4); + levelScripts = (uint16_t**) LOAD_ASSET(aVe1EventScript); break; case LEVEL_MACBETH: levelScripts = (uint16_t**) LOAD_ASSET(D_MA_60381D8); diff --git a/tools/Torch b/tools/Torch -Subproject 187237b3e4b5a6d16d1176ea90b9dcea7539829 +Subproject 0d9da406262b5fc8029e65a332bf2fd771afa3f |