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
include/slot_machine.h
+4 -4
View File
@@ -1,13 +1,15 @@
#ifndef GUARD_SLOT_MACHINE_H #ifndef GUARD_SLOT_MACHINE_H
#define GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H
#define REEL_NUM_TAGS 21 #define NUM_REELS 3
#define REEL_NUM_TAGS 21
#define REEL_TAG_HEIGHT 24
// Lucky Flags // Lucky Flags
#define LUCKY_BIAS_REPLAY 0x0001 #define LUCKY_BIAS_REPLAY 0x0001
#define LUCKY_BIAS_CHERRY 0x0002 #define LUCKY_BIAS_CHERRY 0x0002
#define LUCKY_BIAS_LOTAD 0x0004 #define LUCKY_BIAS_LOTAD 0x0004
#define LUCKY_BIAS_AZURRILL 0x0008 #define LUCKY_BIAS_AZURILL 0x0008
#define LUCKY_BIAS_POWER 0x0010 #define LUCKY_BIAS_POWER 0x0010
#define LUCKY_BIAS_REELTIME 0x0020 #define LUCKY_BIAS_REELTIME 0x0020
#define LUCKY_BIAS_MIXED_777 0x0040 #define LUCKY_BIAS_MIXED_777 0x0040
@@ -18,8 +20,6 @@
#define SLOT_MIDDLE_ROW 0x0002 #define SLOT_MIDDLE_ROW 0x0002
#define SLOT_BOTTOM_ROW 0x0003 #define SLOT_BOTTOM_ROW 0x0003
void PlaySlotMachine(u8, void (callback)(void)); void PlaySlotMachine(u8, void (callback)(void));
#endif // GUARD_SLOT_MACHINE_H #endif // GUARD_SLOT_MACHINE_H
include/tv.h
+3 -3
View File
@@ -26,9 +26,9 @@ bool8 GetPriceReduction(u8 newsKind);
void sub_80F14F8(TVShow *shows); void sub_80F14F8(TVShow *shows);
size_t CountDigits(int value); size_t CountDigits(int value);
u8 GetRibbonCount(struct Pokemon *pokemon); u8 GetRibbonCount(struct Pokemon *pokemon);
void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent); void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent);
void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent); void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent);
void reportNewCoinTotal(u16 nCoinsPaidOut); void AlertTVOfNewCointTotal(u16 nCoinsPaidOut);
void sub_80EEA70(void); void sub_80EEA70(void);
void sub_80EDB44(void); void sub_80EDB44(void);
void sub_80EDC60(const u16 *words); void sub_80EDC60(const u16 *words);
src/roulette.c
+2 -2
View File
@@ -996,7 +996,7 @@ static void sub_81405CC(void)
taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0); taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0);
gTasks[taskId].data[6] = 6; gTasks[taskId].data[6] = 6;
gTasks[taskId].data[13] = GetCoins(); gTasks[taskId].data[13] = GetCoins();
AlertTVThatYouPlayedRoulette(GetCoins()); AlertTVThatPlayerPlayedRoulette(GetCoins());
gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1); gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1);
SetMainCallback2(sub_8140238); SetMainCallback2(sub_8140238);
return; return;
@@ -1964,7 +1964,7 @@ static void sub_8141DE4(u8 taskId)
gSpecialVar_0x8004 = TRUE; gSpecialVar_0x8004 = TRUE;
else else
gSpecialVar_0x8004 = FALSE; gSpecialVar_0x8004 = FALSE;
reportNewCoinTotal(GetCoins()); AlertTVOfNewCointTotal(GetCoins());
BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0); BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
gTasks[taskId].func = sub_8141E7C; gTasks[taskId].func = sub_8141E7C;
} }
src/slot_machine.c
+569 -575
View File
File diff suppressed because it is too large Load Diff
src/tv.c
+4 -4
View File
@@ -62,7 +62,7 @@ IWRAM_DATA s8 sTVShowMixingCurSlot;
EWRAM_DATA u16 sPokemonAnglerSpecies = 0; EWRAM_DATA u16 sPokemonAnglerSpecies = 0;
EWRAM_DATA u16 sPokemonAnglerAttemptCounters = 0; EWRAM_DATA u16 sPokemonAnglerAttemptCounters = 0;
EWRAM_DATA u16 sFindThatGamerCoinsSpent = 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 sRecordMixingPartnersWithoutShowsToShare = 0;
EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0; EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0;
EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {}; EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {};
@@ -2019,7 +2019,7 @@ void sub_80EDCE8(void)
} }
} }
void reportNewCoinTotal(u16 nCoinsPaidOut) void AlertTVOfNewCointTotal(u16 nCoinsPaidOut)
{ {
TVShow *show; TVShow *show;
bool8 flag; bool8 flag;
@@ -2072,13 +2072,13 @@ void reportNewCoinTotal(u16 nCoinsPaidOut)
} }
} }
void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent) void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent)
{ {
sFindThatGamerWhichGame = SLOT_MACHINE; sFindThatGamerWhichGame = SLOT_MACHINE;
sFindThatGamerCoinsSpent = nCoinsSpent; sFindThatGamerCoinsSpent = nCoinsSpent;
} }
void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent) void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent)
{ {
sFindThatGamerWhichGame = ROULETTE; sFindThatGamerWhichGame = ROULETTE;
sFindThatGamerCoinsSpent = nCoinsSpent; sFindThatGamerCoinsSpent = nCoinsSpent;