pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

data disassembly!

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-29 00:22:33 -05:00
parent f1ee257cdf
commit c5dec63567
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -150,6 +150,11 @@ $(BUILD_DIR)/%.s.o: %.s
@mkdir -p $(shell dirname $@)
$(AS) $(ASFLAGS) -o $@ $<
# Data
$(BUILD_DIR)/data/%.data.o: asm/data/%.data.s
@mkdir -p $(shell dirname $@)
$(AS) $(ASFLAGS) -o $@ $<
# Images
$(BUILD_DIR)/%.png.o: $(BUILD_DIR)/%.png
$(LD) -r -b binary -o $@ $<

15
asm/data/si.data.s Normal file
View File

@ -0,0 +1,15 @@
.include "macro.inc"
.section .data
glabel ShakeCam1
.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel ShakeCamX
.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel gPlayerNpcPtr
.word 0x802DB270, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, 0x802D5B10, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_802D9D50
.word 0x00000043, 0x00000001, func_802D7BA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0xFEFE00FF, 0x00000000, 0x00000000, 0x00000000

10
src/code_197F40.c
View File

@ -1807,7 +1807,7 @@ ApiStatus func_8026D5A4(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus HPBarToHome(ScriptInstance *script, s32 isInitialCall) {
ApiStatus HPBarToHome(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = get_variable(script, *args++);
Actor* actor;
@ -1830,7 +1830,7 @@ ApiStatus HPBarToHome(ScriptInstance *script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus HPBarToCurrent(ScriptInstance *script, s32 isInitialCall) {
ApiStatus HPBarToCurrent(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = get_variable(script, *args++);
Actor* actor;
@ -1853,7 +1853,7 @@ ApiStatus HPBarToCurrent(ScriptInstance *script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_8026D8EC(ScriptInstance *script, s32 isInitialCall) {
ApiStatus func_8026D8EC(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = get_variable(script, *args++);
@ -1866,7 +1866,7 @@ ApiStatus func_8026D8EC(ScriptInstance *script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_8026D940(ScriptInstance *script, s32 isInitialCall) {
ApiStatus func_8026D940(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = get_variable(script, *args++);
Actor* actor;
@ -1894,7 +1894,7 @@ ApiStatus func_8026D940(ScriptInstance *script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_8026DA94(ScriptInstance *script, s32 isInitialCall) {
ApiStatus func_8026DA94(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = get_variable(script, *args++);
Actor* actor;

2
tools/n64splat

@ -1 +1 @@
Subproject commit 686be7cf19780b5dd619e0f51bb071f721b05b9a
Subproject commit 150b75e52c30a48a32dde48c124cd4a8b87016a0

2
tools/splat.yaml
View File

@ -266,7 +266,7 @@ segments:
- [0xFBE10, c]
- [0xfe0b0, c, code_fe0b0_len_5a0]
- [0xFE650, .data, code_e79b0_len_1920]
- [0xFE660, bin]
- [0xFE660, data, si]
- [0xFE730, .rodata, code_e79b0_len_1920]
- [0xFE748, bin] # rodata chunk for above overlay; here to avoid the 0x10 alignment
- type: code

1
tools/symbol_addrs.txt
View File

@ -1880,6 +1880,7 @@ GetItemPower = 0x802D732C;
ShowGotItem = 0x802D73A4;
ShowEmote = 0x802D78A0;
RemoveEffect = 0x802D7AE4;
func_802D7BA4 = 0x802D7BA4;
ShowSleepBubble = 0x802D8028;
PlayEffect = 0x802D829C;
SetSpriteShading = 0x802D9700;