Skip to content

Commit 7aaa47c

Browse files
cyndifusiccyndifusic
committed
2 parents 7de1053 + 127ba7a commit 7aaa47c

File tree

4 files changed

+98
-101
lines changed

4 files changed

+98
-101
lines changed

‎src/core/CheckMgr.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,7 @@ void CheckMgr::Clear() {
160160
* @brief Sets debug state
161161
*/
162162
void CheckMgr::Debug() {
163-
for(u16 i = 0x0000; i < CheckMgr::COUNT; i++)
164-
{
165-
kiwi::cout << "Check " << GetCheckName(CheckID(i)) << " is " << CheckMgr::GetCheckState(CheckID(i)) << kiwi::endl;
166-
}
163+
167164
}
168165

169166
bool CheckMgr::GetCheckState(CheckID id) const {

‎src/core/CheckMgr.h‎

Lines changed: 93 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -16,106 +16,107 @@ class CheckMgr : public kiwi::DynamicSingleton<CheckMgr>, public kiwi::IBinary {
1616
public:
1717
enum CheckID {
1818
// Stamps
19-
SWORDPLAY_DUEL_STAMP_1 = 0x0000,
20-
SWORDPLAY_DUEL_STAMP_2 = 0x0001,
21-
SWORDPLAY_DUEL_STAMP_3 = 0x0002,
22-
SWORDPLAY_DUEL_STAMP_4 = 0x0003,
23-
SWORDPLAY_DUEL_STAMP_5 = 0x0004,
24-
SWORDPLAY_SPEED_SLICE_STAMP_1 = 0x0005,
25-
SWORDPLAY_SPEED_SLICE_STAMP_2 = 0x0006,
26-
SWORDPLAY_SPEED_SLICE_STAMP_3 = 0x0007,
27-
SWORDPLAY_SPEED_SLICE_STAMP_4 = 0x0008,
28-
SWORDPLAY_SPEED_SLICE_STAMP_5 = 0x0009,
29-
SWORDPLAY_SHOWDOWN_STAMP_1 = 0x000A,
30-
SWORDPLAY_SHOWDOWN_STAMP_2 = 0x000B,
31-
SWORDPLAY_SHOWDOWN_STAMP_3 = 0x000C,
32-
SWORDPLAY_SHOWDOWN_STAMP_4 = 0x000D,
33-
SWORDPLAY_SHOWDOWN_STAMP_5 = 0x000E,
34-
WAKEBOARDING_STAMP_1 = 0x000F,
35-
WAKEBOARDING_STAMP_2 = 0x0010,
36-
WAKEBOARDING_STAMP_3 = 0x0011,
37-
WAKEBOARDING_STAMP_4 = 0x0012,
38-
WAKEBOARDING_STAMP_5 = 0x0013,
39-
FRISBEE_DOG_STAMP_1 = 0x0014,
40-
FRISBEE_DOG_STAMP_2 = 0x0015,
41-
FRISBEE_DOG_STAMP_3 = 0x0016,
42-
FRISBEE_DOG_STAMP_4 = 0x0017,
43-
FRISBEE_DOG_STAMP_5 = 0x0018,
44-
FRISBEE_GOLF_STAMP_1 = 0x0019,
45-
FRISBEE_GOLF_STAMP_2 = 0x001A,
46-
FRISBEE_GOLF_STAMP_3 = 0x001B,
47-
FRISBEE_GOLF_STAMP_4 = 0x001C,
48-
FRISBEE_GOLF_STAMP_5 = 0x001D,
49-
ARCHERY_STAMP_1 = 0x001E,
50-
ARCHERY_STAMP_2 = 0x001F,
51-
ARCHERY_STAMP_3 = 0x0020,
52-
ARCHERY_STAMP_4 = 0x0021,
53-
ARCHERY_STAMP_5 = 0x0022,
54-
BASKETBALL_3PT_CONTEST_STAMP_1 = 0x0023,
19+
SWORDPLAY_SHOWDOWN_STAMP_1 = 0x0000, // Sport ID 0
20+
SWORDPLAY_SHOWDOWN_STAMP_2 = 0x0001,
21+
SWORDPLAY_SHOWDOWN_STAMP_3 = 0x0002,
22+
SWORDPLAY_SHOWDOWN_STAMP_4 = 0x0003,
23+
SWORDPLAY_SHOWDOWN_STAMP_5 = 0x0004,
24+
SWORDPLAY_DUEL_STAMP_1 = 0x0005, // Sport ID 1
25+
SWORDPLAY_DUEL_STAMP_2 = 0x0006,
26+
SWORDPLAY_DUEL_STAMP_3 = 0x0007,
27+
SWORDPLAY_DUEL_STAMP_4 = 0x0008,
28+
SWORDPLAY_DUEL_STAMP_5 = 0x0009,
29+
SWORDPLAY_SPEED_SLICE_STAMP_1 = 0x000A, // Sport ID 2
30+
SWORDPLAY_SPEED_SLICE_STAMP_2 = 0x000B,
31+
SWORDPLAY_SPEED_SLICE_STAMP_3 = 0x000C,
32+
SWORDPLAY_SPEED_SLICE_STAMP_4 = 0x000D,
33+
SWORDPLAY_SPEED_SLICE_STAMP_5 = 0x000E,
34+
POWER_CRUISING_STAMP_1 = 0x000F, // Sport ID 3
35+
POWER_CRUISING_STAMP_2 = 0x0010,
36+
POWER_CRUISING_STAMP_3 = 0x0011,
37+
POWER_CRUISING_STAMP_4 = 0x0012,
38+
POWER_CRUISING_STAMP_5 = 0x0013,
39+
ARCHERY_STAMP_1 = 0x0019, // Sport ID 5
40+
ARCHERY_STAMP_2 = 0x001A,
41+
ARCHERY_STAMP_3 = 0x001B,
42+
ARCHERY_STAMP_4 = 0x001C,
43+
ARCHERY_STAMP_5 = 0x001D,
44+
FRISBEE_DOG_STAMP_1 = 0x001E, // Sport ID 6
45+
FRISBEE_DOG_STAMP_2 = 0x001F,
46+
FRISBEE_DOG_STAMP_3 = 0x0020,
47+
FRISBEE_DOG_STAMP_4 = 0x0021,
48+
FRISBEE_DOG_STAMP_5 = 0x0022,
49+
BASKETBALL_3PT_CONTEST_STAMP_1 = 0x0023, // Sport ID 7
5550
BASKETBALL_3PT_CONTEST_STAMP_2 = 0x0024,
5651
BASKETBALL_3PT_CONTEST_STAMP_3 = 0x0025,
5752
BASKETBALL_3PT_CONTEST_STAMP_4 = 0x0026,
5853
BASKETBALL_3PT_CONTEST_STAMP_5 = 0x0027,
59-
BASKETBALL_PICKUP_GAME_1 = 0x0028,
54+
BASKETBALL_PICKUP_GAME_1 = 0x0028, // Sport ID 8
6055
BASKETBALL_PICKUP_GAME_2 = 0x0029,
6156
BASKETBALL_PICKUP_GAME_3 = 0x002A,
6257
BASKETBALL_PICKUP_GAME_4 = 0x002B,
6358
BASKETBALL_PICKUP_GAME_5 = 0x002C,
64-
TABLE_TENNIS_MATCH_STAMP_1 = 0x002D,
65-
TABLE_TENNIS_MATCH_STAMP_2 = 0x002E,
66-
TABLE_TENNIS_MATCH_STAMP_3 = 0x002F,
67-
TABLE_TENNIS_MATCH_STAMP_4 = 0x0030,
68-
TABLE_TENNIS_MATCH_STAMP_5 = 0x0031,
69-
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_1 = 0x0032,
70-
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_2 = 0x0033,
71-
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_3 = 0x0034,
72-
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_4 = 0x0035,
73-
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_5 = 0x0036,
74-
GOLF_STAMP_1 = 0x0037,
75-
GOLF_STAMP_2 = 0x0038,
76-
GOLF_STAMP_3 = 0x0039,
77-
GOLF_STAMP_4 = 0x003A,
78-
GOLF_STAMP_5 = 0x003B,
79-
BOWLING_STANDARD_GAME_STAMP_1 = 0x003C,
80-
BOWLING_STANDARD_GAME_STAMP_2 = 0x003D,
81-
BOWLING_STANDARD_GAME_STAMP_3 = 0x003E,
82-
BOWLING_STANDARD_GAME_STAMP_4 = 0x003F,
83-
BOWLING_STANDARD_GAME_STAMP_5 = 0x0040,
84-
BOWLING_100_PIN_STAMP_1 = 0x0041,
85-
BOWLING_100_PIN_STAMP_2 = 0x0042,
86-
BOWLING_100_PIN_STAMP_3 = 0x0043,
87-
BOWLING_100_PIN_STAMP_4 = 0x0044,
88-
BOWLING_100_PIN_STAMP_5 = 0x0045,
89-
BOWLING_SPIN_CONTROL_STAMP_1 = 0x0046,
90-
BOWLING_SPIN_CONTROL_STAMP_2 = 0x0047,
91-
BOWLING_SPIN_CONTROL_STAMP_3 = 0x0048,
92-
BOWLING_SPIN_CONTROL_STAMP_4 = 0x0049,
93-
BOWLING_SPIN_CONTROL_STAMP_5 = 0x004A,
94-
POWER_CRUISING_STAMP_1 = 0x004B,
95-
POWER_CRUISING_STAMP_2 = 0x004C,
96-
POWER_CRUISING_STAMP_3 = 0x004D,
97-
POWER_CRUISING_STAMP_4 = 0x004E,
98-
POWER_CRUISING_STAMP_5 = 0x004F,
99-
CANOEING_STAMP_1 = 0x0050,
100-
CANOEING_STAMP_2 = 0x0051,
101-
CANOEING_STAMP_3 = 0x0052,
102-
CANOEING_STAMP_4 = 0x0053,
103-
CANOEING_STAMP_5 = 0x0054,
104-
CYCLING_STAMP_1 = 0x0055,
105-
CYCLING_STAMP_2 = 0x0056,
106-
CYCLING_STAMP_3 = 0x0057,
107-
CYCLING_STAMP_4 = 0x0058,
108-
CYCLING_STAMP_5 = 0x0059,
109-
SKYDIVING_STAMP_1 = 0x005A,
110-
SKYDIVING_STAMP_2 = 0x005B,
111-
SKYDIVING_STAMP_3 = 0x005C,
112-
SKYDIVING_STAMP_4 = 0x005D,
113-
SKYDIVING_STAMP_5 = 0x005E,
114-
ISLAND_FLYOVER_STAMP_1 = 0x005F,
115-
ISLAND_FLYOVER_STAMP_2 = 0x0060,
116-
ISLAND_FLYOVER_STAMP_3 = 0x0061,
117-
ISLAND_FLYOVER_STAMP_4 = 0x0062,
118-
ISLAND_FLYOVER_STAMP_5 = 0x0063,
59+
BOWLING_STANDARD_GAME_STAMP_1 = 0x002D, // Sport ID 9
60+
BOWLING_STANDARD_GAME_STAMP_2 = 0x002E,
61+
BOWLING_STANDARD_GAME_STAMP_3 = 0x002F,
62+
BOWLING_STANDARD_GAME_STAMP_4 = 0x0030,
63+
BOWLING_STANDARD_GAME_STAMP_5 = 0x0031,
64+
BOWLING_100_PIN_STAMP_1 = 0x0032, // Sport ID 10
65+
BOWLING_100_PIN_STAMP_2 = 0x0033,
66+
BOWLING_100_PIN_STAMP_3 = 0x0034,
67+
BOWLING_100_PIN_STAMP_4 = 0x0035,
68+
BOWLING_100_PIN_STAMP_5 = 0x0036,
69+
BOWLING_SPIN_CONTROL_STAMP_1 = 0x0037, // Sport ID 11
70+
BOWLING_SPIN_CONTROL_STAMP_2 = 0x0038,
71+
BOWLING_SPIN_CONTROL_STAMP_3 = 0x0039,
72+
BOWLING_SPIN_CONTROL_STAMP_4 = 0x003A,
73+
BOWLING_SPIN_CONTROL_STAMP_5 = 0x003B,
74+
CANOEING_STAMP_1 = 0x0041, // Sport ID 13
75+
CANOEING_STAMP_2 = 0x0042,
76+
CANOEING_STAMP_3 = 0x0043,
77+
CANOEING_STAMP_4 = 0x0044,
78+
CANOEING_STAMP_5 = 0x0045,
79+
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_1 = 0x0046, // Sport ID 14
80+
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_2 = 0x0047,
81+
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_3 = 0x0048,
82+
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_4 = 0x0049,
83+
TABLE_TENNIS_RETURN_CHALLENGE_STAMP_5 = 0x004A,
84+
TABLE_TENNIS_MATCH_STAMP_1 = 0x004B, // Sport ID 15
85+
TABLE_TENNIS_MATCH_STAMP_2 = 0x004C,
86+
TABLE_TENNIS_MATCH_STAMP_3 = 0x004D,
87+
TABLE_TENNIS_MATCH_STAMP_4 = 0x004E,
88+
TABLE_TENNIS_MATCH_STAMP_5 = 0x004F,
89+
WAKEBOARDING_STAMP_1 = 0x0050, // Sport ID 16
90+
WAKEBOARDING_STAMP_2 = 0x0051,
91+
WAKEBOARDING_STAMP_3 = 0x0052,
92+
WAKEBOARDING_STAMP_4 = 0x0053,
93+
WAKEBOARDING_STAMP_5 = 0x0054,
94+
ISLAND_FLYOVER_STAMP_1 = 0x0055, // Sport ID 17
95+
ISLAND_FLYOVER_STAMP_2 = 0x0056,
96+
ISLAND_FLYOVER_STAMP_3 = 0x0057,
97+
ISLAND_FLYOVER_STAMP_4 = 0x0058,
98+
ISLAND_FLYOVER_STAMP_5 = 0x0059,
99+
GOLF_STAMP_1 = 0x005F, // Sport ID 19
100+
GOLF_STAMP_2 = 0x0060,
101+
GOLF_STAMP_3 = 0x0061,
102+
GOLF_STAMP_4 = 0x0062,
103+
GOLF_STAMP_5 = 0x0063,
104+
FRISBEE_GOLF_STAMP_1 = 0x0064, // Sport ID 20
105+
FRISBEE_GOLF_STAMP_2 = 0x0065,
106+
FRISBEE_GOLF_STAMP_3 = 0x0066,
107+
FRISBEE_GOLF_STAMP_4 = 0x0067,
108+
FRISBEE_GOLF_STAMP_5 = 0x0068,
109+
CYCLING_STAMP_1 = 0x006E, // Sport ID 22
110+
CYCLING_STAMP_2 = 0x006F,
111+
CYCLING_STAMP_3 = 0x0070,
112+
CYCLING_STAMP_4 = 0x0071,
113+
CYCLING_STAMP_5 = 0x0072,
114+
SKYDIVING_STAMP_1 = 0x0073, // Sport ID 23
115+
SKYDIVING_STAMP_2 = 0x0074,
116+
SKYDIVING_STAMP_3 = 0x0075,
117+
SKYDIVING_STAMP_4 = 0x0076,
118+
SKYDIVING_STAMP_5 = 0x0077,
119+
119120
COUNT
120121
}; // CheckID;
121122

‎src/core/ItemMgr.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,11 @@ void ItemMgr::Debug() {
366366
mJskFreeTimerFlag.Randomize();
367367

368368
// Canoeing
369-
mCanTimerFlag.Randomize();
369+
//mCanTimerFlag.Randomize();
370370
mCanStageFlag.Randomize();
371371

372+
mCanTimerFlag.SetAll();
373+
372374
// Cycling
373375
mBicHeartFlag.Randomize();
374376
mBicStageFlag.Randomize();

‎src/hooks/Cmn/checks_Cmn.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ namespace Cmn {
1616

1717
void SetStampCheckIfNew(int playerDataPtr,int sportID,int stampIdx)
1818
{
19-
int stampID = sportID * 5 + stampIdx;
20-
kiwi::cout << "Sport ID: " << sportID << kiwi::endl;
21-
kiwi::cout << "Stamp Index: " << stampIdx << kiwi::endl;
22-
kiwi::cout << "Stamp ID: " << stampIdx << kiwi::endl << kiwi::endl;
19+
int stampID = (sportID * 5) + stampIdx;
2320
bool hasCheck = CheckMgr::GetInstance().GetCheckState(CheckMgr::CheckID(stampID));
2421
if(!hasCheck) {
2522
CheckMgr::GetInstance().GiveItemFromCheck(CheckMgr::CheckID(stampID));

0 commit comments

Comments
 (0)