summaryrefslogtreecommitdiff
path: root/src/d/d_map.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-11-19 17:10:03 -0500
committerGitHub <noreply@github.com>2025-11-19 14:10:03 -0800
commit4cf2c7e37d08cc2ae9c0ef42435fc89ab87734e7 (patch)
tree881aa06a300da3bcb30d95a27a18a291463dc47a /src/d/d_map.cpp
parent8956be538efe0517dc2c5f1fbedee9fbed48115d (diff)
Misc fixes (#2830)
* Replace DANPCF_C_HACK with a better fakematch * d_a_obj_item OK * Fix ninja diff * Misc debug/nonmatching fixes * Fix ninja diff for PAL * Fix bad PAL split
Diffstat (limited to 'src/d/d_map.cpp')
-rw-r--r--src/d/d_map.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp
index 7fde89416c..05c96cc3cb 100644
--- a/src/d/d_map.cpp
+++ b/src/d/d_map.cpp
@@ -1232,12 +1232,13 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
break;
case 2:
switch (field_0x8f) {
- case 2:
+ case 2: {
f32 temp_f31 = (f32)field_0x90 / 5.0f;
setMapPaletteColorAlphaPer(0x2F, 0x32, temp_f31);
setMapPaletteColorAlphaPer(0x21, 0x2B, temp_f31);
break;
- case 3:
+ }
+ case 3: {
calcMapCenterXZ(field_0x88, &mCenterX, &mCenterZ);
f32 sp24, sp20;
calcMapCenterXZ(field_0x84, &sp24, &sp20);
@@ -1268,11 +1269,13 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
mCenterX += sp14;
mCenterZ -= sp10;
break;
- case 4:
+ }
+ case 4: {
f32 temp_f31_3 = 1.0f - ((f32)field_0x90 / 5.0f);
setMapPaletteColorAlphaPer(0x2F, 0x32, temp_f31_3);
setMapPaletteColorAlphaPer(0x21, 0x2B, temp_f31_3);
break;
+ }
case 6:
copyPalette();
break;