From 1b41b8b7caf56d34d31137c18055a30258787263 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 15 Oct 2019 04:58:52 -0400 Subject: Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms --- include/constants/field_tasks.h | 13 +++++++++++++ include/constants/flags.h | 2 +- include/constants/metatile_labels.h | 2 ++ include/constants/vars.h | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 include/constants/field_tasks.h (limited to 'include') diff --git a/include/constants/field_tasks.h b/include/constants/field_tasks.h new file mode 100644 index 000000000..7f773855d --- /dev/null +++ b/include/constants/field_tasks.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_FIELD_TASKS_H +#define GUARD_CONSTANTS_FIELD_TASKS_H + +#define STEP_CB_DUMMY 0 +#define STEP_CB_ASH 1 +#define STEP_CB_FORTREE_BRIDGE 2 +#define STEP_CB_PACIFIDLOG_BRIDGE 3 +#define STEP_CB_SOOTOPOLIS_ICE 4 +#define STEP_CB_TRUCK 5 +#define STEP_CB_SECRET_BASE 6 +#define STEP_CB_CRACKED_FLOOR 7 + +#endif // GUARD_CONSTANTS_FIELD_TASKS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index d90451ad7..f47b0dff6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1549,7 +1549,7 @@ // Special Flags (Unknown) #define SPECIAL_FLAGS_START 0x4000 #define FLAG_HIDE_MAP_NAME_POPUP 0x4000 -#define FLAG_SPECIAL_FLAG_0x4001 0x4001 +#define FLAG_DONT_TRANSITION_MUSIC 0x4001 #define FLAG_SPECIAL_FLAG_0x4002 0x4002 #define FLAG_SPECIAL_FLAG_0x4003 0x4003 #define FLAG_SPECIAL_FLAG_0x4004 0x4004 diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 8fe95b464..ea54d04a8 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -75,6 +75,8 @@ #define METATILE_MossdeepGym_OuterWall_RightCorner 0x205 #define METATILE_MossdeepGym_Empty0 0x238 #define METATILE_MossdeepGym_Empty1 0x239 +#define METATILE_MossdeepGym_YellowRightArrow 0x250 + // gTileset_BrendansMaysHouse #define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A diff --git a/include/constants/vars.h b/include/constants/vars.h index 72b15654e..3af9e3b7c 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -147,7 +147,7 @@ #define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 -#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman #define VAR_LINK_CONTEST_ROOM_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_LOCATION 0x4088 -- cgit v1.2.3 From 90a05cf824b14861b7c1c942aebae31f9cb502ea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 15 Oct 2019 05:00:08 -0400 Subject: Finish Mossdeep Gym doc, beging documenting rotating tile puzzle --- include/constants/flags.h | 8 ++++---- include/constants/metatile_labels.h | 18 ++++++++++-------- include/field_screen_effect.h | 2 +- include/mossdeep_gym.h | 9 --------- include/rotating_tile_puzzle.h | 9 +++++++++ 5 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 include/mossdeep_gym.h create mode 100644 include/rotating_tile_puzzle.h (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index f47b0dff6..21d9fcfb0 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -109,10 +109,10 @@ #define FLAG_MET_TEAM_AQUA_HARBOR 0x61 #define FLAG_TV_EXPLAINED 0x62 #define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63 -#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 -#define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 -#define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 -#define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 +#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 // Leftover from the RS version of Mossdeep Gym, functionally always zero +#define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 // +#define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 // +#define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 // #define FLAG_UNUSED_0x068 0x68 // Unused Flag diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index ea54d04a8..db205819d 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -68,15 +68,16 @@ #define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B #define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C -// gTileset_MossdeepGym -#define METATILE_MossdeepGym_Obelisk_Top 0x204 -#define METATILE_MossdeepGym_Obelisk_Base 0x20C -#define METATILE_MossdeepGym_Wall_LeftCorner 0x20D -#define METATILE_MossdeepGym_OuterWall_RightCorner 0x205 -#define METATILE_MossdeepGym_Empty0 0x238 -#define METATILE_MossdeepGym_Empty1 0x239 -#define METATILE_MossdeepGym_YellowRightArrow 0x250 +// gTileset_MossdeepGym from R/S +#define METATILE_RS_MossdeepGym_RedArrow_Right 0x204 +#define METATILE_RS_MossdeepGym_RedArrow_Left 0x20C +#define METATILE_RS_MossdeepGym_RedArrow_Up 0x20D +#define METATILE_RS_MossdeepGym_RedArrow_Down 0x205 +#define METATILE_RS_MossdeepGym_Switch_Up 0x238 +#define METATILE_RS_MossdeepGym_Switch_Down 0x239 +// gTileset_MossdeepGym from Emerald +#define METATILE_MossdeepGym_YellowRightArrow 0x250 // gTileset_BrendansMaysHouse #define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A @@ -378,6 +379,7 @@ #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C +#define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298 // gTileset_BikeShop #define METATILE_BikeShop_Barrier_Hidden_Top 0x269 diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index a62a76b2a..e26188d47 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -28,7 +28,7 @@ void sub_80AF80C(u8 metatileBehavior); void sub_80AF828(void); void sub_80AF838(void); void sub_80AF848(void); -void sub_80AF87C(void); +void DoMossdeepGymWarp(void); void sub_80AF8B8(void); void sub_80AF948(void); void sub_80AF9F8(void); diff --git a/include/mossdeep_gym.h b/include/mossdeep_gym.h deleted file mode 100644 index c16730094..000000000 --- a/include/mossdeep_gym.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GUARD_MOSSDEEP_GYM_H -#define GUARD_MOSSDEEP_GYM_H - -void InitMossdeepGymTiles(bool8 arg0); -void FinishMossdeepGymTiles(void); -u16 MossdeepGym_MoveEvents(u8 arg0); -void MossdeepGym_TurnEvents(void); - -#endif // GUARD_MOSSDEEP_GYM_H diff --git a/include/rotating_tile_puzzle.h b/include/rotating_tile_puzzle.h new file mode 100644 index 000000000..48b27c5f3 --- /dev/null +++ b/include/rotating_tile_puzzle.h @@ -0,0 +1,9 @@ +#ifndef GUARD_ROTATING_TILE_PUZZLE_H +#define GUARD_ROTATING_TILE_PUZZLE_H + +void InitRotatingTilePuzzle(bool8 isTrickHouse); +void FinishMossdeepGymTiles(void); +u16 MossdeepGym_MoveEvents(u8 puzzleNumber); +void MossdeepGym_TurnEvents(void); + +#endif // GUARD_ROTATING_TILE_PUZZLE_H -- cgit v1.2.3 From 0f15264595e66f1de9aa030b69a9fedc9c75f13e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 16 Oct 2019 04:09:30 -0400 Subject: Document rotating_tile_puzzle --- include/constants/flags.h | 2 +- include/constants/metatile_labels.h | 2 +- include/rotating_tile_puzzle.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index 21d9fcfb0..3d43e0fe6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -109,7 +109,7 @@ #define FLAG_MET_TEAM_AQUA_HARBOR 0x61 #define FLAG_TV_EXPLAINED 0x62 #define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63 -#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 // Leftover from the RS version of Mossdeep Gym, functionally always zero +#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 // Leftover from the RS version of Mossdeep Gym, functionally unused #define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 // #define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 // #define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 // diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index db205819d..2f3ce5f71 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -77,7 +77,7 @@ #define METATILE_RS_MossdeepGym_Switch_Down 0x239 // gTileset_MossdeepGym from Emerald -#define METATILE_MossdeepGym_YellowRightArrow 0x250 +#define METATILE_MossdeepGym_YellowArrow_Right 0x250 // gTileset_BrendansMaysHouse #define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A diff --git a/include/rotating_tile_puzzle.h b/include/rotating_tile_puzzle.h index 48b27c5f3..8c6ab7944 100644 --- a/include/rotating_tile_puzzle.h +++ b/include/rotating_tile_puzzle.h @@ -2,8 +2,8 @@ #define GUARD_ROTATING_TILE_PUZZLE_H void InitRotatingTilePuzzle(bool8 isTrickHouse); -void FinishMossdeepGymTiles(void); -u16 MossdeepGym_MoveEvents(u8 puzzleNumber); -void MossdeepGym_TurnEvents(void); +void FreeRotatingTilePuzzle(void); +u16 MoveRotatingTileObjects(u8 puzzleNumber); +void TurnRotatingTileObjects(void); #endif // GUARD_ROTATING_TILE_PUZZLE_H -- cgit v1.2.3