diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
| commit | 82f55f238125ff42845881189eb9237692c48ba4 (patch) | |
| tree | 7b496125c6e0b644ce535548ec09755fd4f489bb /include/constants/battle_pyramid.h | |
| parent | 6556b556dd624964f53d76ff546589e6688412eb (diff) | |
| parent | 6967caefb246f9709032049b0ae2baee71f71eb6 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'include/constants/battle_pyramid.h')
| -rw-r--r-- | include/constants/battle_pyramid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h index cfe6e891e..004df7155 100644 --- a/include/constants/battle_pyramid.h +++ b/include/constants/battle_pyramid.h @@ -36,14 +36,14 @@ #define BATTLE_PYRAMID_FUNC_SEED_FLOOR 6 #define BATTLE_PYRAMID_FUNC_SET_ITEM 7 #define BATTLE_PYRAMID_FUNC_HIDE_ITEM 8 -#define BATTLE_PYRAMID_FUNC_INIT_TRAINERS 9 +#define BATTLE_PYRAMID_FUNC_SET_TRAINERS 9 #define BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT 10 #define BATTLE_PYRAMID_FUNC_UPDATE_STREAK 11 // unused #define BATTLE_PYRAMID_FUNC_IS_IN 12 #define BATTLE_PYRAMID_FUNC_UPDATE_LIGHT 13 #define BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS 14 #define BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE 15 -#define BATTLE_PYRAMID_FUNC_16 16 // unused +#define BATTLE_PYRAMID_FUNC_START_MENU 16 // unused #define BATTLE_PYRAMID_FUNC_RESTORE_PARTY 17 #define PYRAMID_DATA_PRIZE 0 |