pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix kmr_12 split

Browse Source
This commit is contained in:
Alex Bates 2020-10-19 23:22:18 +01:00
parent f9a667bc7d
commit dd72dfcd1f
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/world/area_kmr/kmr_12/events.c
View File

@ -2,6 +2,8 @@
#include "script_api/map.h" #include "script_api/map.h"
Bytecode kmr_12_play_music[]; Bytecode kmr_12_play_music[];
ApiStatus get_goomba_ref(ScriptInstance* script, s32 isInitialCall);
Bytecode make_entities[]; Bytecode make_entities[];
Bytecode read_sign[]; Bytecode read_sign[];
@ -61,11 +63,6 @@ StaticNpcSettings goomba_npc_settings = {
.defeatScript = (Bytecode*)0x8007809C, .defeatScript = (Bytecode*)0x8007809C,
}; };
ApiStatus get_goomba_ref(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = get_enemy_safe(0);
return ApiStatus_DONE2;
}
Bytecode read_sign[] = { // *INDENT-OFF* Bytecode read_sign[] = { // *INDENT-OFF*
SI_GROUP(0), SI_GROUP(0),

5
src/world/area_kmr/kmr_12/header.c
View File

@ -20,3 +20,8 @@ Bytecode kmr_12_play_music[] = {
SI_RETURN(), SI_RETURN(),
SI_END(), SI_END(),
}; };
ApiStatus get_goomba_ref(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = get_enemy_safe(0);
return ApiStatus_DONE2;
}

5
tools/splat.yaml
View File

@ -1151,10 +1151,9 @@ segments:
start: 0x8EB360 start: 0x8EB360
vram: 0x80240000 vram: 0x80240000
files: files:
- [0x8EB360, "c", "world/area_kmr/kmr_12/events"] - [0x8EB360, "c", "world/area_kmr/kmr_12/header"]
- [0x8EB390, ".data", "world/area_kmr/kmr_12/header"] - [0x8EB390, ".data", "world/area_kmr/kmr_12/header"]
- [0x8EB360, "c", "world/area_kmr/kmr_12/events"] - [0x8EB420, ".data", "world/area_kmr/kmr_12/events"]
- [0x8EB360, ".data", "world/area_kmr/kmr_12/events"]
- [0x8EBE10, ".rodata", "world/area_kmr/kmr_12/events"] - [0x8EBE10, ".rodata", "world/area_kmr/kmr_12/events"]
- name: world/area_kmr/kmr_20 - name: world/area_kmr/kmr_20
type: code type: code