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

PR fixes

Browse Source
This commit is contained in:
Ethan Roseman 2020-09-08 09:06:17 -04:00
parent ab244966a8
commit cfd7e16334
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/variables.h
View File

@ -20,7 +20,7 @@ extern ScriptInstance* gWorldScriptList[128];
extern ScriptInstance* gBattleScriptList[128];
extern ScriptInstance** gCurrentScriptListPtr[128];
extern s32 gListCount;
extern s32 gScriptListCount;
extern s32 gScriptIdList[128];
extern s32 gScriptIndexList[128];

3
src/code_1a1f0_len_5390.c
View File

@ -39,8 +39,7 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) {
script->functionTemp[2] = 0;
}
script->functionTemp[1]--;
return script->functionTemp[1] == 0;
return --script->functionTemp[1] == 0;
}
INCLUDE_ASM("code_1a1f0_len_5390", func_8003F7CC);

3
src/code_fee30_len_2d60.c
View File

@ -21,14 +21,13 @@ INCLUDE_ASM("code_fee30_len_2d60", spr_draw_component);
s32 _spr_sign_extend_12bit(u16 val) {
s32 temp = val & 0xFFF;
if ((temp & 0x800)) {
if (temp & 0x800) {
return temp | -0x1000;
} else {
return temp;
}
}
//INCLUDE_ASM("code_fee30_len_2d60", _spr_sign_extend_16bit);
s32 _spr_sign_extend_16bit(u16 val) {
s32 temp = val & 0xFFFF;

2
undefined_syms.txt
View File

@ -107,7 +107,7 @@ gCurrentDynamicEntityListPtr = 0x80154420;
gScriptIdList = 0x802D1898;
gScriptIndexList = 0x802DAA98;
gListCount = 0x802DAC98;
gScriptListCount = 0x802DAC98;
func_802A91F8 = 0x802A91F8;
func_802A9208 = 0x802A9208;