diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
| commit | cd876292d126c339bfc31c717d5bec6fe1b63f80 (patch) | |
| tree | e7e3666bc80640d9b946f79c07e8d0858600598b /src/braille_puzzles.c | |
| parent | a08cbaee0a5f06f2e6d11ceb958e36430175f220 (diff) | |
| parent | fa5bfc16279fe6c8c38392612796448495da896f (diff) | |
Merge branch 'master' into pokenav_unk_2
Diffstat (limited to 'src/braille_puzzles.c')
| -rw-r--r-- | src/braille_puzzles.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 659f8682e..c00be82ad 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -10,6 +10,7 @@ #include "constants/maps.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/metatile_labels.h" #include "fieldmap.h" #include "party_menu.h" #include "fldeff.h" @@ -86,12 +87,12 @@ bool8 ShouldDoBrailleDigEffect(void) void DoBrailleDigEffect(void) { - MapGridSetMetatileIdAt(16, 8, 0x22A); - MapGridSetMetatileIdAt(17, 8, 0x22B); - MapGridSetMetatileIdAt(18, 8, 0x22C); - MapGridSetMetatileIdAt(16, 9, 0xE32); - MapGridSetMetatileIdAt(17, 9, 0x233); - MapGridSetMetatileIdAt(18, 9, 0xE34); + MapGridSetMetatileIdAt(16, 8, METATILE_ID(Cave, SealedChamberEntrance_TopLeft)); + MapGridSetMetatileIdAt(17, 8, METATILE_ID(Cave, SealedChamberEntrance_TopMid)); + MapGridSetMetatileIdAt(18, 8, METATILE_ID(Cave, SealedChamberEntrance_TopRight)); + MapGridSetMetatileIdAt(16, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); + MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK); DrawWholeMapView(); PlaySE(SE_BAN); FlagSet(FLAG_SYS_BRAILLE_DIG); @@ -279,12 +280,12 @@ void UseRegirockHm_Callback(void) void DoBrailleRegirockEffect(void) { - MapGridSetMetatileIdAt(14, 26, 0x22A); - MapGridSetMetatileIdAt(15, 26, 0x22B); - MapGridSetMetatileIdAt(16, 26, 0x22C); - MapGridSetMetatileIdAt(14, 27, 0xE32); - MapGridSetMetatileIdAt(15, 27, 0x233); - MapGridSetMetatileIdAt(16, 27, 0xE34); + MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft)); + MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid)); + MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight)); + MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); + MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK); DrawWholeMapView(); PlaySE(SE_BAN); FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); @@ -318,12 +319,12 @@ void UseRegisteelHm_Callback(void) void DoBrailleRegisteelEffect(void) { - MapGridSetMetatileIdAt(14, 26, 0x22A); - MapGridSetMetatileIdAt(15, 26, 0x22B); - MapGridSetMetatileIdAt(16, 26, 0x22C); - MapGridSetMetatileIdAt(14, 27, 0xE32); - MapGridSetMetatileIdAt(15, 27, 0x233); - MapGridSetMetatileIdAt(16, 27, 0xE34); + MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft)); + MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid)); + MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight)); + MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); + MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | METATILE_COLLISION_MASK); DrawWholeMapView(); PlaySE(SE_BAN); FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED); |