diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-30 19:20:48 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-30 19:20:48 -0500 |
| commit | c1365802c73376609e53b97440ae037b14f6324f (patch) | |
| tree | 8633e5de1122d50d100805df2edb5cdb34d83c52 /include/game.h | |
| parent | 64f38f642113ac4bd5b1d96e76c9ae97965bc416 (diff) | |
| parent | 1db72b5e45cc25eb183817f05a2ee631d8fff837 (diff) | |
| download | kamek-c1365802c73376609e53b97440ae037b14f6324f.tar.gz kamek-c1365802c73376609e53b97440ae037b14f6324f.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'include/game.h')
| -rwxr-xr-x | include/game.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/game.h b/include/game.h index ef6aba4..91dd77a 100755 --- a/include/game.h +++ b/include/game.h @@ -160,6 +160,7 @@ bool IsWideScreen(); #define COND_COIN1 1
#define COND_COIN2 2
#define COND_COIN3 4
+#define COND_COIN_ALL 7
#define COND_NORMAL 0x10
#define COND_SECRET 0x20
#define COND_SGNORMAL 0x80
@@ -244,7 +245,7 @@ public: GXColor hudTextColours[2]; // 0x730
s16 hudHintH, hudHintS, hudHintL; // 0x738
u8 currentMapMusic; // 0x73E
- u8 _padding; // 0x73F
+ u8 newerWorldID; // 0x73F
};
};
u8 toad_location[10]; // 0x742
|