summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/bike.h10
-rw-r--r--include/constants/flags.h2
-rw-r--r--include/fieldmap.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/include/bike.h b/include/bike.h
index afe773d42..00f11aefe 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -17,11 +17,11 @@ struct BikeHistoryInputInfo
// Player speeds
enum
{
- BIKE_SPEED_STANDING,
- BIKE_SPEED_NORMAL,
- BIKE_SPEED_FAST,
- BIKE_SPEED_FASTER,
- BIKE_SPEED_FASTEST,
+ PLAYER_SPEED_STANDING,
+ PLAYER_SPEED_NORMAL,
+ PLAYER_SPEED_FAST,
+ PLAYER_SPEED_FASTER,
+ PLAYER_SPEED_FASTEST,
};
// mach bike transitions enum
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 793fe1135..eacb2426d 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -190,7 +190,7 @@
#define FLAG_RECEIVED_TM40 0xAA
#define FLAG_RECEIVED_TM04 0xAB
#define FLAG_RECEIVED_TM03 0xAC
-#define FLAG_DECORATION_0 0xAD
+#define FLAG_HIDE_SECRET_BASE_TRAINER 0xAD
#define FLAG_DECORATION_1 0xAE
#define FLAG_DECORATION_2 0xAF
#define FLAG_DECORATION_3 0xB0
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 28da8da2a..aabfce461 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -7,7 +7,7 @@
#define NUM_METATILES_TOTAL 1024
#define NUM_PALS_IN_PRIMARY 6
#define NUM_PALS_TOTAL 13
-#define MAX_MAP_DATA_SIZE 0x2800
+#define MAX_MAP_DATA_SIZE 10240
// Map coordinates are offset by 7 when using the map
// buffer because it needs to load sufficient border