kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Matched __propellorCtrl_setState without a function static

Browse Source
This commit is contained in:
Mr-Wiseguy
2024-08-30 19:38:02 -04:00
parent b1b7605a5f
commit 9f05494e7c
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/RBB/propellorctrl.c
View File

@@ -2,17 +2,18 @@
#include "functions.h" #include "functions.h"
#include "variables.h" #include "variables.h"
s32 pad_803912C0[2];
s32 pad_803912C0[1];
f32 __propellorTimer2; // TODO rematch __propellorCtrl_setState to merge this with __propellorTimer
u8 __propellorCtrlState; u8 __propellorCtrlState;
f32 __propellorTimer;
void __propellorCtrl_setState(s32 arg0){ void __propellorCtrl_setState(s32 arg0){
static f32 __propellorTimer; f32* timerPtr = &__propellorTimer;
*timerPtr = 0.0f;
__propellorTimer = 0.0f; if(arg0 == 1) {
if(arg0 == 1) *timerPtr = 6.5f;
__propellorTimer = 6.5f; }
if(arg0 == 2){ if(arg0 == 2){
item_set(ITEM_3_PROPELLOR_TIMER, 3900 - 1); item_set(ITEM_3_PROPELLOR_TIMER, 3900 - 1);
@@ -55,7 +56,7 @@ void rbb_propellorCtrl_update(void){
__propellorCtrl_setState(1); __propellorCtrl_setState(1);
if(__propellorCtrlState == 1) if(__propellorCtrlState == 1)
if(ml_timer_update(&__propellorTimer2,time_getDelta())) if(ml_timer_update(&__propellorTimer,time_getDelta()))
__propellorCtrl_setState(2); __propellorCtrl_setState(2);
if(__propellorCtrlState == 2) if(__propellorCtrlState == 2)

2
undefined_syms.libultra.txt
View File

@@ -42,5 +42,3 @@ boot_D_803FBE00 = D_803FBE00;
boot_D_803FFE00 = D_803FFE00; boot_D_803FFE00 = D_803FFE00;
boot_gOverlayTable = gOverlayTable; boot_gOverlayTable = gOverlayTable;
boot_func_8023DA20 = func_8023DA20; boot_func_8023DA20 = func_8023DA20;
__propellorTimer = 0x803912CC;