dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix mistakes and bad formatting

Browse Source
This commit is contained in:
hondew
2019-02-22 16:03:35 -05:00
committed by huderlem
parent f965f1b13d
commit dd8ecabe26
5 changed files with 582 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/roulette.c
View File

@@ -996,7 +996,7 @@ static void sub_81405CC(void)
taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0);
gTasks[taskId].data[6] = 6;
gTasks[taskId].data[13] = GetCoins();
AlertTVThatYouPlayedRoulette(GetCoins());
AlertTVThatPlayerPlayedRoulette(GetCoins());
gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1);
SetMainCallback2(sub_8140238);
return;
@@ -1964,7 +1964,7 @@ static void sub_8141DE4(u8 taskId)
gSpecialVar_0x8004 = TRUE;
else
gSpecialVar_0x8004 = FALSE;
reportNewCoinTotal(GetCoins());
AlertTVOfNewCointTotal(GetCoins());
BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
gTasks[taskId].func = sub_8141E7C;
}

1144
src/slot_machine.c
View File

File diff suppressed because it is too large Load Diff

8
src/tv.c
View File

@@ -62,7 +62,7 @@ IWRAM_DATA s8 sTVShowMixingCurSlot;
EWRAM_DATA u16 sPokemonAnglerSpecies = 0;
EWRAM_DATA u16 sPokemonAnglerAttemptCounters = 0;
EWRAM_DATA u16 sFindThatGamerCoinsSpent = 0;
EWRAM_DATA bool8 sFindThatGamerWhichGame = SLOT_MACHINE;
EWRAM_DATA u8 sFindThatGamerWhichGame = SLOT_MACHINE;
EWRAM_DATA ALIGNED(4) u8 sRecordMixingPartnersWithoutShowsToShare = 0;
EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0;
EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {};
@@ -2019,7 +2019,7 @@ void sub_80EDCE8(void)
}
}
void reportNewCoinTotal(u16 nCoinsPaidOut)
void AlertTVOfNewCointTotal(u16 nCoinsPaidOut)
{
TVShow *show;
bool8 flag;
@@ -2072,13 +2072,13 @@ void reportNewCoinTotal(u16 nCoinsPaidOut)
}
}
void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent)
void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent)
{
sFindThatGamerWhichGame = SLOT_MACHINE;
sFindThatGamerCoinsSpent = nCoinsSpent;
}
void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent)
void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent)
{
sFindThatGamerWhichGame = ROULETTE;
sFindThatGamerCoinsSpent = nCoinsSpent;