pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Shift (#334)

Browse Source 
* migrate si.data.s to si.c

* remove unused undefined_sym

* split world script data into individual scripts

Co-authored-by: Alex Bates <hi@imalex.xyz>
This commit is contained in:
Ethan Roseman 2021-07-21 07:52:26 -04:00 committed by GitHub
parent 53b5004d6e
commit 18837f7303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/evt/si.c
View File

@ -8,6 +8,11 @@ Bytecode* si_goto_next_case(ScriptInstance* script);
Bytecode* si_goto_end_loop(ScriptInstance* script);
s32 get_variable_index(ScriptInstance* script, s32 var);
u8 D_802D9D70 = 0xFE;
u8 D_802D9D71 = 0xFE;
u8 D_802D9D72 = 0x00;
u8 D_802D9D73 = 0xFF;
f32 fixed_var_to_float(Bytecode scriptVar) {
if (scriptVar <= -220000000) {
return (scriptVar + 230000000) / 1024.0f;

15
ver/us/asm/data/evt/si.data.s
View File

@ -1,15 +0,0 @@
.include "macro.inc"
.section .data
glabel D_802D9D70
.byte 0xFE
glabel D_802D9D71
.byte 0xFE
glabel D_802D9D72
.byte 0x00
glabel D_802D9D73
.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

46
ver/us/asm/data/world/script_api/7E4EF0.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/splat.yaml
View File

@ -712,7 +712,7 @@ segments:
- [0xFE6D0, .data, player_api]
- [0xFE6E0, .data, fa4c0_len_3bf0]
- [0xFE700, .data, fx_api]
- [0xFE720, data, si]
- [0xFE720, .data, si]
- [0xFE730, .rodata, script_list]
- [0xFE748, .rodata, si]
- [0xFEB80, .rodata, cam_api]

2
ver/us/undefined_syms.txt
View File

@ -37,8 +37,6 @@ _osViModeNtscLan1 = 0x80095820;
_osViModeMPalLan1 = 0x80095870;
gBackgroundImage = 0x80200000;
func_80242040_8B20B0 = 0x80242040;
EnterWalk = 0x80285960;
ExitWalk = 0x80285CF4;
spiked_goomba = 0x8021B0AC;
paragoomba = 0x8021CD00;
D_802C05CC = 0x802C05CC;

8
ver/us/undefined_syms_auto.txt
View File

@ -737,14 +737,6 @@ D_80270724 = 0x80270724;
D_80282EE9 = 0x80282EE9;
D_80282EEA = 0x80282EEA;
bMarioHideAnims = 0x80283370;
EnterWalk = 0x80285960;
EnterWalkShort = 0x80285A60;
EnterSavePoint = 0x80285CB0;
ExitWalk = 0x80285CF4;
ExitSingleDoor = 0x80285DAC;
EnterSingleDoor = 0x80285DD4;
ExitDoubleDoor = 0x80285E4C;
EnterDoubleDoor = 0x80285E74;
D_8029DA30 = 0x8029DA30;
D_8029DA33 = 0x8029DA33;
D_8029DA34 = 0x8029DA34;