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

better code for matching funcs

Browse Source
This commit is contained in:
dark-samus 2020-07-18 23:56:17 -04:00
parent 7bc578801e
commit b889313aad
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
papermario/include/variables.h
View File

@ -4,7 +4,7 @@
#include "ultra64.h"
#include "common_structs.h"
extern game_status* gGameStatus;
extern game_status* gGameStatus[1];
extern s16* D_80151328;
#endif

22
papermario/src/code_fe0b0_len_5a0.c
View File

@ -16,22 +16,22 @@ s32 EnableSpriteShading(ScriptContext* script) {
}
s32 getDemoState(ScriptContext* script) {
set_variable(script, *script->ptrReadPos, gGameStatus->demoState);
set_variable(script, *script->ptrReadPos, (*gGameStatus)->demoState);
return 2;
}
s32 DemoPressButton(ScriptContext* script) {
gGameStatus->demoButtonInput |= get_variable(script, *script->ptrReadPos);
(*gGameStatus)->demoButtonInput |= get_variable(script, *script->ptrReadPos);
return 2;
}
s32 DemoReleaseButton(ScriptContext* script) {
gGameStatus->demoButtonInput &= ~get_variable(script, *script->ptrReadPos);
(*gGameStatus)->demoButtonInput &= ~get_variable(script, *script->ptrReadPos);
return 2;
}
s32 DemoSetButtons(ScriptContext* script) {
gGameStatus->demoButtonInput = get_variable(script, *script->ptrReadPos);
(*gGameStatus)->demoButtonInput = get_variable(script, *script->ptrReadPos);
return 2;
}
@ -39,13 +39,12 @@ s32 DemoJoystickRadial(ScriptContext* script) {
float a;
float b;
s32* thisPos = script->ptrReadPos;
game_status **status = &gGameStatus;
a = get_float_variable(script, *thisPos++);
b = get_float_variable(script, *thisPos);
b = get_float_variable(script, *thisPos++);
(*status)->demoStickX = a * sin_deg(b);
(*status)->demoStickY = a * cos_deg(b);
(*gGameStatus)->demoStickX = a * sin_deg(b);
(*gGameStatus)->demoStickY = a * cos_deg(b);
return 2;
}
@ -54,13 +53,12 @@ s32 DemoJoystickXY(ScriptContext* script) {
float a;
float b;
s32* thisPos = script->ptrReadPos;
game_status **status = &gGameStatus;
a = get_float_variable(script, *thisPos++);
b = get_float_variable(script, *thisPos);
b = get_float_variable(script, *thisPos++);
(*status)->demoStickX = a;
(*status)->demoStickY = b;
(*gGameStatus)->demoStickX = a;
(*gGameStatus)->demoStickY = b;
return 2;
}