atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clarify MB_SEMI_DEEP_WATER name

Browse source
This commit is contained in:
GriffinR 2023-01-17 21:09:17 -05:00
parent d5a4bfcd6f
commit d68e81c2be
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/metatile_behaviors.h
View file

@ -18,7 +18,7 @@
#define MB_MOSSDEEP_GYM_WARP 0x0E #define MB_MOSSDEEP_GYM_WARP 0x0E
#define MB_MT_PYRE_HOLE 0x0F #define MB_MT_PYRE_HOLE 0x0F
#define MB_POND_WATER 0x10 #define MB_POND_WATER 0x10
#define MB_SEMI_DEEP_WATER 0x11 #define MB_INTERIOR_DEEP_WATER 0x11 // Used by interior maps; functionally the same as MB_DEEP_WATER
#define MB_DEEP_WATER 0x12 #define MB_DEEP_WATER 0x12
#define MB_WATERFALL 0x13 #define MB_WATERFALL 0x13
#define MB_SOOTOPOLIS_DEEP_WATER 0x14 #define MB_SOOTOPOLIS_DEEP_WATER 0x14

8
src/metatile_behavior.c
View file

@ -23,7 +23,7 @@ static const u8 sTileBitAttributes[NUM_METATILE_BEHAVIORS] =
[MB_MOSSDEEP_GYM_WARP] = TILE_FLAG_UNUSED, [MB_MOSSDEEP_GYM_WARP] = TILE_FLAG_UNUSED,
[MB_MT_PYRE_HOLE] = TILE_FLAG_UNUSED, [MB_MT_PYRE_HOLE] = TILE_FLAG_UNUSED,
[MB_POND_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, [MB_POND_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_SEMI_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, [MB_INTERIOR_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS, [MB_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_WATERFALL] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE, [MB_WATERFALL] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_SOOTOPOLIS_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE, [MB_SOOTOPOLIS_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
@ -852,7 +852,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior)
bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior)
{ {
if (metatileBehavior == MB_SEMI_DEEP_WATER if (metatileBehavior == MB_INTERIOR_DEEP_WATER
|| metatileBehavior == MB_DEEP_WATER || metatileBehavior == MB_DEEP_WATER
|| metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER) || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER)
return TRUE; return TRUE;
@ -905,7 +905,7 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior)
bool8 MetatileBehavior_IsDeepOrOceanWater(u8 metatileBehavior) bool8 MetatileBehavior_IsDeepOrOceanWater(u8 metatileBehavior)
{ {
if (metatileBehavior == MB_OCEAN_WATER if (metatileBehavior == MB_OCEAN_WATER
|| metatileBehavior == MB_SEMI_DEEP_WATER || metatileBehavior == MB_INTERIOR_DEEP_WATER
|| metatileBehavior == MB_DEEP_WATER) || metatileBehavior == MB_DEEP_WATER)
return TRUE; return TRUE;
else else
@ -1163,7 +1163,7 @@ bool8 MetatileBehavior_IsSurfableFishableWater(u8 metatileBehavior)
{ {
if (metatileBehavior == MB_POND_WATER if (metatileBehavior == MB_POND_WATER
|| metatileBehavior == MB_OCEAN_WATER || metatileBehavior == MB_OCEAN_WATER
|| metatileBehavior == MB_SEMI_DEEP_WATER || metatileBehavior == MB_INTERIOR_DEEP_WATER
|| metatileBehavior == MB_DEEP_WATER || metatileBehavior == MB_DEEP_WATER
|| metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER
|| (metatileBehavior == MB_EASTWARD_CURRENT || (metatileBehavior == MB_EASTWARD_CURRENT