dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Finish Mossdeep Gym doc, beging documenting rotating tile puzzle

Browse Source
This commit is contained in:
GriffinR
2019-10-15 05:00:08 -04:00
parent 1b41b8b7ca
commit 90a05cf824
17 changed files with 246 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/constants/flags.h
View File

@@ -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

18
include/constants/metatile_labels.h
View File

@@ -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

2
include/field_screen_effect.h
View File

@@ -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);

9
include/mossdeep_gym.h
View File

@@ -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

9
include/rotating_tile_puzzle.h Normal file
View File

@@ -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