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

document more vola flags

Browse Source
This commit is contained in:
mariob92
2024-09-08 17:59:41 +02:00
parent 35f93d5505
commit f451eae4e2
33 changed files with 184 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GV/matchinggame.c
View File

@@ -69,7 +69,7 @@ void __matchingGame_spawnJIggy(void){
void __matchingGame_setState(s32 next_state){
if(next_state == 2){
item_set(ITEM_6_HOURGLASS, 1);
if(volatileFlag_get(VOLATILE_FLAG_2))
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME))
item_set(ITEM_0_HOURGLASS_TIMER, 4499);
else
item_set(ITEM_0_HOURGLASS_TIMER, 5999);
@@ -79,9 +79,9 @@ void __matchingGame_setState(s32 next_state){
}
if(next_state == 3){
if(volatileFlag_get(VOLATILE_FLAG_2)){
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
volatileFlag_set(VOLATILE_FLAG_3, 0);
volatileFlag_set(VOLATILE_FLAG_5, 0);
volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 0);
}
else{
func_8028F66C(BS_INTR_F);
@@ -89,9 +89,9 @@ void __matchingGame_setState(s32 next_state){
}
if(next_state == 4){
if(volatileFlag_get(VOLATILE_FLAG_2)){
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
volatileFlag_set(VOLATILE_FLAG_3, 0);
volatileFlag_set(VOLATILE_FLAG_5, 1);
volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1);
}
else{
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
@@ -120,7 +120,7 @@ void gv_matchingGame_init(void){
matchingGame.state = 0;
if(map_get() == MAP_13_GV_MEMORY_GAME){
if( !jiggyscore_isSpawned(JIGGY_40_GV_MATCHING_GAME) //jiggy is collected
|| volatileFlag_get(VOLATILE_FLAG_2) //in FF minigame
|| volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) //in FF minigame
){
matchingGame.match_count = 0;
matchingGame.tile_a = NULL;
@@ -222,7 +222,7 @@ void gv_matchingGame_update(void){
}//L803907F0
if( matchingGame.state == 1
&& volatileFlag_get(VOLATILE_FLAG_2)
&& volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)
&& volatileFlag_get(VOLATILE_FLAG_3)
){
__matchingGame_setState(2);