From 30dc1c210939d206f7e8f1fc109cd8a88e627f1c Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 28 Sep 2024 15:31:25 +0200 Subject: [PATCH] renamed BD style mega rock to heavy rock --- .../{bdx_mega_rock.txt => bdx_heavy_rock.txt} | 0 docs/elements/bdx_magic_wall.txt | 4 +- src/conf_gfx.c | 14 +++--- src/conf_snd.c | 6 +-- src/editor.c | 46 +++++++++---------- src/files.c | 14 +++--- src/main.c | 24 +++++----- src/main.h | 12 ++--- src/tools.c | 10 ++-- 9 files changed, 65 insertions(+), 65 deletions(-) rename docs/elements/{bdx_mega_rock.txt => bdx_heavy_rock.txt} (100%) diff --git a/docs/elements/bdx_mega_rock.txt b/docs/elements/bdx_heavy_rock.txt similarity index 100% rename from docs/elements/bdx_mega_rock.txt rename to docs/elements/bdx_heavy_rock.txt diff --git a/docs/elements/bdx_magic_wall.txt b/docs/elements/bdx_magic_wall.txt index 9cfca9cb..4a3532c0 100644 --- a/docs/elements/bdx_magic_wall.txt +++ b/docs/elements/bdx_magic_wall.txt @@ -1,6 +1,6 @@ This magic wall converts rocks into diamonds and vice versa. Note that -a magic wall can only be activated for some limited time. It can also turn mega -rocks into nitro packs, nitro packs into mega rocks. Even flying diamonds and +a magic wall can only be activated for some limited time. It can also turn heavy +rocks into nitro packs, nitro packs into heavy rocks. Even flying diamonds and rocks pass them to be converted into each other, but they do that from bottom to up, of course. diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 39ee3b58..4ef10337 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -804,13 +804,13 @@ struct ConfigInfo image_config[] = { "bdx_flying_rock.flying.EDITOR.xpos", "4" }, { "bdx_flying_rock.flying.EDITOR.ypos", "3" }, - { "bdx_mega_rock", "RocksBD.png" }, - { "bdx_mega_rock.xpos", "2" }, - { "bdx_mega_rock.ypos", "4" }, - { "bdx_mega_rock.frames", "1" }, - { "bdx_mega_rock.falling.EDITOR", "RocksBD2.png" }, - { "bdx_mega_rock.falling.EDITOR.xpos", "2" }, - { "bdx_mega_rock.falling.EDITOR.ypos", "3" }, + { "bdx_heavy_rock", "RocksBD.png" }, + { "bdx_heavy_rock.xpos", "2" }, + { "bdx_heavy_rock.ypos", "4" }, + { "bdx_heavy_rock.frames", "1" }, + { "bdx_heavy_rock.falling.EDITOR", "RocksBD2.png" }, + { "bdx_heavy_rock.falling.EDITOR.xpos", "2" }, + { "bdx_heavy_rock.falling.EDITOR.ypos", "3" }, { "bdx_rock_glued", UNDEFINED_FILENAME }, { "bdx_rock_glued.clone_from", "bd_rock" }, diff --git a/src/conf_snd.c b/src/conf_snd.c index 103058e4..1b912f2b 100644 --- a/src/conf_snd.c +++ b/src/conf_snd.c @@ -80,9 +80,9 @@ struct ConfigInfo sound_config[] = { "bdx_flying_rock.pushing", "pusch.wav" }, { "bdx_flying_rock.falling", "klopf.wav" }, { "bdx_flying_rock.impact", "klopf.wav" }, - { "bdx_mega_rock.pushing", "pusch.wav" }, - { "bdx_mega_rock.falling", "klopf.wav" }, - { "bdx_mega_rock.impact", "klopf.wav" }, + { "bdx_heavy_rock.pushing", "pusch.wav" }, + { "bdx_heavy_rock.falling", "klopf.wav" }, + { "bdx_heavy_rock.impact", "klopf.wav" }, { "bdx_waiting_rock.pushing", "pusch.wav" }, { "bdx_chasing_rock.pushing", "pusch.wav" }, { "bdx_nut.pushing", "knurk.wav" }, diff --git a/src/editor.c b/src/editor.c index 4f067b93..9f2037e1 100644 --- a/src/editor.c +++ b/src/editor.c @@ -631,7 +631,7 @@ enum GADGET_ID_BD_SNAP_ELEMENT, GADGET_ID_BD_MAGIC_WALL_DIAMOND_TO, GADGET_ID_BD_MAGIC_WALL_ROCK_TO, - GADGET_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, + GADGET_ID_BD_MAGIC_WALL_HEAVY_ROCK_TO, GADGET_ID_BD_MAGIC_WALL_NUT_TO, GADGET_ID_BD_MAGIC_WALL_NITRO_PACK_TO, GADGET_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO, @@ -847,7 +847,7 @@ enum GADGET_ID_DONT_COLLIDE_WITH, GADGET_ID_BD_DIAGONAL_MOVEMENTS, GADGET_ID_BD_TOPMOST_PLAYER_ACTIVE, - GADGET_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET, + GADGET_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET, GADGET_ID_BD_MAGIC_WALL_ZERO_INFINITE, GADGET_ID_BD_MAGIC_WALL_WAIT_HATCHING, GADGET_ID_BD_MAGIC_WALL_STOPS_AMOEBA, @@ -1247,7 +1247,7 @@ enum ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH, ED_CHECKBUTTON_ID_BD_DIAGONAL_MOVEMENTS, ED_CHECKBUTTON_ID_BD_TOPMOST_PLAYER_ACTIVE, - ED_CHECKBUTTON_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET, + ED_CHECKBUTTON_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET, ED_CHECKBUTTON_ID_BD_MAGIC_WALL_ZERO_INFINITE, ED_CHECKBUTTON_ID_BD_MAGIC_WALL_WAIT_HATCHING, ED_CHECKBUTTON_ID_BD_MAGIC_WALL_STOPS_AMOEBA, @@ -1369,7 +1369,7 @@ enum ED_DRAWING_ID_BD_SNAP_ELEMENT, ED_DRAWING_ID_BD_MAGIC_WALL_DIAMOND_TO, ED_DRAWING_ID_BD_MAGIC_WALL_ROCK_TO, - ED_DRAWING_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_HEAVY_ROCK_TO, ED_DRAWING_ID_BD_MAGIC_WALL_NUT_TO, ED_DRAWING_ID_BD_MAGIC_WALL_NITRO_PACK_TO, ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO, @@ -4255,12 +4255,12 @@ static struct "Topmost player is active", "Use first player found on playfield" }, { - ED_CHECKBUTTON_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET, + ED_CHECKBUTTON_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET, ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(4), - GADGET_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET, GADGET_ID_NONE, - &level.bd_push_mega_rock_with_sweet, + GADGET_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET, GADGET_ID_NONE, + &level.bd_push_heavy_rock_with_sweet, NULL, NULL, - "Mega rocks pushable with sweet", "Push mega rocks after eating sweet" + "Heavy rocks pushable with sweet", "Push heavy rocks after eating sweet" }, { ED_CHECKBUTTON_ID_BD_MAGIC_WALL_ZERO_INFINITE, @@ -4947,12 +4947,12 @@ static struct "Changes rocks to:", NULL, NULL, NULL, "Element to turn rocks to" }, { - ED_DRAWING_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, + ED_DRAWING_ID_BD_MAGIC_WALL_HEAVY_ROCK_TO, ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(8), ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, - GADGET_ID_BD_MAGIC_WALL_MEGA_ROCK_TO, GADGET_ID_NONE, - &level.bd_magic_wall_mega_rock_to, 1, 1, - "Changes mega rocks to:", NULL, NULL, NULL, "Element to turn mega rocks to" + GADGET_ID_BD_MAGIC_WALL_HEAVY_ROCK_TO, GADGET_ID_NONE, + &level.bd_magic_wall_heavy_rock_to, 1, 1, + "Changes heavy rocks to:", NULL, NULL, NULL, "Element to turn heavy rocks to" }, { ED_DRAWING_ID_BD_MAGIC_WALL_NUT_TO, @@ -5712,7 +5712,7 @@ static int editor_el_boulderdash_native[] = EL_BDX_STEELWALL_SLOPED_DOWN_LEFT, EL_BDX_STEELWALL_SLOPED_DOWN_RIGHT, - EL_BDX_MEGA_ROCK, + EL_BDX_HEAVY_ROCK, EL_BDX_SWEET, EL_BDX_INVISIBLE_EXIT_CLOSED, EL_BDX_INVISIBLE_EXIT_OPEN, @@ -5789,7 +5789,7 @@ static int editor_el_boulderdash_effects[] = { EL_BDX_DIAMOND_FALLING, EL_BDX_ROCK_FALLING, - EL_BDX_MEGA_ROCK_FALLING, + EL_BDX_HEAVY_ROCK_FALLING, EL_BDX_FLYING_DIAMOND_FLYING, EL_BDX_FALLING_WALL_FALLING, @@ -5947,8 +5947,8 @@ static int editor_el_boulderdash_scanned[] = EL_BDX_FLYING_ROCK_SCANNED, EL_BDX_FLYING_ROCK_FLYING_SCANNED, - EL_BDX_MEGA_ROCK_SCANNED, - EL_BDX_MEGA_ROCK_FALLING_SCANNED, + EL_BDX_HEAVY_ROCK_SCANNED, + EL_BDX_HEAVY_ROCK_FALLING_SCANNED, EL_BDX_DIAMOND_SCANNED, EL_BDX_DIAMOND_FALLING_SCANNED, @@ -12619,7 +12619,7 @@ static boolean checkPropertiesConfig(int element) MAYBE_DONT_COLLIDE_WITH(element) || element == EL_BDX_SAND_1 || element == EL_BDX_ROCK || - element == EL_BDX_MEGA_ROCK || + element == EL_BDX_HEAVY_ROCK || element == EL_BDX_BOMB || element == EL_BDX_ROCKET_LAUNCHER || element == EL_BDX_NITRO_PACK || @@ -12773,7 +12773,7 @@ static void DrawPropertiesConfig(void) MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_DIAMOND_TO); MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_ROCK_TO); - MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_MEGA_ROCK_TO); + MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_HEAVY_ROCK_TO); MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_NUT_TO); MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_NITRO_PACK_TO); MapDrawingArea(ED_DRAWING_ID_BD_MAGIC_WALL_FLYING_DIAMOND_TO); @@ -12930,13 +12930,13 @@ static void DrawPropertiesConfig(void) ED_ELEMENT_SETTINGS_YPOS(2); counterbutton_info[ED_COUNTER_ID_BD_PUSHING_PROB_WITH_SWEET].y = ED_ELEMENT_SETTINGS_YPOS(3); - checkbutton_info[ED_CHECKBUTTON_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET].y = + checkbutton_info[ED_CHECKBUTTON_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET].y = ED_ELEMENT_SETTINGS_YPOS(4); // draw checkbutton gadgets MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_DIAGONAL_MOVEMENTS); MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_TOPMOST_PLAYER_ACTIVE); - MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET); // draw counter gadgets MapCounterButtons(ED_COUNTER_ID_BD_PUSHING_PROB); @@ -13015,16 +13015,16 @@ static void DrawPropertiesConfig(void) } } - if (properties_element == EL_BDX_MEGA_ROCK || + if (properties_element == EL_BDX_HEAVY_ROCK || properties_element == EL_BDX_SWEET) { counterbutton_info[ED_COUNTER_ID_BD_PUSHING_PROB_WITH_SWEET].y = ED_ELEMENT_SETTINGS_YPOS(0); - checkbutton_info[ED_CHECKBUTTON_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET].y = + checkbutton_info[ED_CHECKBUTTON_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET].y = ED_ELEMENT_SETTINGS_YPOS(1); MapCounterButtons(ED_COUNTER_ID_BD_PUSHING_PROB_WITH_SWEET); - MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_PUSH_MEGA_ROCK_WITH_SWEET); + MapCheckbuttonGadget(ED_CHECKBUTTON_ID_BD_PUSH_HEAVY_ROCK_WITH_SWEET); } if (properties_element == EL_BDX_VOODOO_DOLL) diff --git a/src/files.c b/src/files.c index 93c7303e..d2573403 100644 --- a/src/files.c +++ b/src/files.c @@ -667,7 +667,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = { EL_BDX_PLAYER, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(5), - &li.bd_push_mega_rock_with_sweet, FALSE + &li.bd_push_heavy_rock_with_sweet, FALSE }, { EL_BDX_PLAYER, -1, @@ -811,7 +811,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = { EL_BDX_MAGIC_WALL, -1, TYPE_ELEMENT, CONF_VALUE_16_BIT(4), - &li.bd_magic_wall_mega_rock_to, EL_BDX_NITRO_PACK_FALLING + &li.bd_magic_wall_heavy_rock_to, EL_BDX_NITRO_PACK_FALLING }, { EL_BDX_MAGIC_WALL, -1, @@ -821,7 +821,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = { EL_BDX_MAGIC_WALL, -1, TYPE_ELEMENT, CONF_VALUE_16_BIT(6), - &li.bd_magic_wall_nitro_pack_to, EL_BDX_MEGA_ROCK_FALLING + &li.bd_magic_wall_nitro_pack_to, EL_BDX_HEAVY_ROCK_FALLING }, { EL_BDX_MAGIC_WALL, -1, @@ -4343,7 +4343,7 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->active_is_first_found = level->bd_topmost_player_active; cave->pushing_stone_prob = level->bd_pushing_prob * 10000; cave->pushing_stone_prob_sweet = level->bd_pushing_prob_with_sweet * 10000; - cave->mega_stones_pushable_with_sweet = level->bd_push_mega_rock_with_sweet; + cave->mega_stones_pushable_with_sweet = level->bd_push_heavy_rock_with_sweet; cave->snap_element = LEVEL_TO_CAVE(level->bd_snap_element); // element properties @@ -4361,7 +4361,7 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->magic_diamond_to = LEVEL_TO_CAVE(level->bd_magic_wall_diamond_to); cave->magic_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_rock_to); - cave->magic_mega_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_mega_rock_to); + cave->magic_mega_stone_to = LEVEL_TO_CAVE(level->bd_magic_wall_heavy_rock_to); cave->magic_nut_to = LEVEL_TO_CAVE(level->bd_magic_wall_nut_to); cave->magic_nitro_pack_to = LEVEL_TO_CAVE(level->bd_magic_wall_nitro_pack_to); cave->magic_flying_diamond_to = LEVEL_TO_CAVE(level->bd_magic_wall_flying_diamond_to); @@ -4527,7 +4527,7 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_topmost_player_active = cave->active_is_first_found; level->bd_pushing_prob = cave->pushing_stone_prob / 10000; level->bd_pushing_prob_with_sweet = cave->pushing_stone_prob_sweet / 10000; - level->bd_push_mega_rock_with_sweet = cave->mega_stones_pushable_with_sweet; + level->bd_push_heavy_rock_with_sweet = cave->mega_stones_pushable_with_sweet; level->bd_snap_element = CAVE_TO_LEVEL(cave->snap_element); // element properties @@ -4545,7 +4545,7 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_magic_wall_diamond_to = CAVE_TO_LEVEL(cave->magic_diamond_to); level->bd_magic_wall_rock_to = CAVE_TO_LEVEL(cave->magic_stone_to); - level->bd_magic_wall_mega_rock_to = CAVE_TO_LEVEL(cave->magic_mega_stone_to); + level->bd_magic_wall_heavy_rock_to = CAVE_TO_LEVEL(cave->magic_mega_stone_to); level->bd_magic_wall_nut_to = CAVE_TO_LEVEL(cave->magic_nut_to); level->bd_magic_wall_nitro_pack_to = CAVE_TO_LEVEL(cave->magic_nitro_pack_to); level->bd_magic_wall_flying_diamond_to= CAVE_TO_LEVEL(cave->magic_flying_diamond_to); diff --git a/src/main.c b/src/main.c index 3e056363..bda0cd4f 100644 --- a/src/main.c +++ b/src/main.c @@ -6673,9 +6673,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Flying rock" }, { - "bdx_mega_rock", - "bdx_mega_rock", - "Mega rock" + "bdx_heavy_rock", + "bdx_heavy_rock", + "Heavy rock" }, { "bdx_rock_glued", @@ -7258,9 +7258,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Flying rock (flying)" }, { - "bdx_mega_rock.falling", - "bdx_mega_rock", - "Mega rock (falling)" + "bdx_heavy_rock.falling", + "bdx_heavy_rock", + "Heavy rock (falling)" }, { "bdx_diamond.falling", @@ -7748,14 +7748,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Flying rock (flying) (scanned)" }, { - "bdx_mega_rock.scanned", - "bdx_mega_rock", - "Mega rock (scanned)" + "bdx_heavy_rock.scanned", + "bdx_heavy_rock", + "Heavy rock (scanned)" }, { - "bdx_mega_rock.falling.scanned", - "bdx_mega_rock", - "Mega rock (falling) (scanned)" + "bdx_heavy_rock.falling.scanned", + "bdx_heavy_rock", + "Heavy rock (falling) (scanned)" }, { "bdx_diamond.scanned", diff --git a/src/main.h b/src/main.h index 522e4652..c311346f 100644 --- a/src/main.h +++ b/src/main.h @@ -2131,7 +2131,7 @@ #define EL_BDX_INVISIBLE_EXIT_CLOSED 1292 #define EL_BDX_INVISIBLE_EXIT_OPEN 1293 #define EL_BDX_FLYING_ROCK 1294 -#define EL_BDX_MEGA_ROCK 1295 +#define EL_BDX_HEAVY_ROCK 1295 #define EL_BDX_ROCK_GLUED 1296 #define EL_BDX_FLYING_DIAMOND 1297 #define EL_BDX_DIAMOND_GLUED 1298 @@ -2253,7 +2253,7 @@ #define EL_BDX_SAND_LOOSE_FALLING 1409 #define EL_BDX_ROCK_FALLING 1410 #define EL_BDX_FLYING_ROCK_FLYING 1411 -#define EL_BDX_MEGA_ROCK_FALLING 1412 +#define EL_BDX_HEAVY_ROCK_FALLING 1412 #define EL_BDX_DIAMOND_FALLING 1413 #define EL_BDX_FLYING_DIAMOND_FLYING 1414 #define EL_BDX_NUT_FALLING 1415 @@ -2354,8 +2354,8 @@ #define EL_BDX_ROCK_FALLING_SCANNED 1507 #define EL_BDX_FLYING_ROCK_SCANNED 1508 #define EL_BDX_FLYING_ROCK_FLYING_SCANNED 1509 -#define EL_BDX_MEGA_ROCK_SCANNED 1510 -#define EL_BDX_MEGA_ROCK_FALLING_SCANNED 1511 +#define EL_BDX_HEAVY_ROCK_SCANNED 1510 +#define EL_BDX_HEAVY_ROCK_FALLING_SCANNED 1511 #define EL_BDX_DIAMOND_SCANNED 1512 #define EL_BDX_DIAMOND_FALLING_SCANNED 1513 #define EL_BDX_FLYING_DIAMOND_SCANNED 1514 @@ -3798,7 +3798,7 @@ struct LevelInfo int bd_snap_element; // BD element that is created when player is snapping int bd_pushing_prob; // BD player probability to push rocks int bd_pushing_prob_with_sweet; // BD player probability to push rocks after eating sweet - boolean bd_push_mega_rock_with_sweet; // BD player can push mega rocks after eating sweet + boolean bd_push_heavy_rock_with_sweet;// BD player can push heavy rocks after eating sweet boolean bd_magic_wall_zero_infinite; // BD magic wall with timer of zero runs infinitely boolean bd_magic_wall_wait_hatching; // BD magic wall waits for player's birth boolean bd_magic_wall_stops_amoeba; // BD magic wall can stop amoeba and turn to diamonds @@ -3806,7 +3806,7 @@ struct LevelInfo int bd_magic_wall_time; // BD magic wall time int bd_magic_wall_diamond_to; // BD magic wall turns diamonds to specified element int bd_magic_wall_rock_to; // BD magic wall turns rocks to specified element - int bd_magic_wall_mega_rock_to; // BD magic wall turns mega rocks to specified element + int bd_magic_wall_heavy_rock_to; // BD magic wall turns heavy rocks to specified element int bd_magic_wall_nut_to; // BD magic wall turns nuts to specified element int bd_magic_wall_nitro_pack_to; // BD magic wall turns nitro packs to specified element int bd_magic_wall_flying_diamond_to; // BD magic wall turns flying diamonds to specified element diff --git a/src/tools.c b/src/tools.c index e91257c6..03229296 100644 --- a/src/tools.c +++ b/src/tools.c @@ -6306,15 +6306,15 @@ bd_object_mapping_list[] = }, { O_MEGA_STONE, TRUE, - EL_BDX_MEGA_ROCK, -1, -1 + EL_BDX_HEAVY_ROCK, -1, -1 }, { O_MEGA_STONE_F, TRUE, - EL_BDX_MEGA_ROCK_FALLING, -1, -1 + EL_BDX_HEAVY_ROCK_FALLING, -1, -1 }, { O_MEGA_STONE_F, FALSE, - EL_BDX_MEGA_ROCK, ACTION_FALLING, -1 + EL_BDX_HEAVY_ROCK, ACTION_FALLING, -1 }, { O_DIAMOND, TRUE, @@ -7485,11 +7485,11 @@ bd_object_mapping_list[] = }, { O_MEGA_STONE_scanned, TRUE, - EL_BDX_MEGA_ROCK_SCANNED, -1, -1 + EL_BDX_HEAVY_ROCK_SCANNED, -1, -1 }, { O_MEGA_STONE_F_scanned, TRUE, - EL_BDX_MEGA_ROCK_FALLING_SCANNED, -1, -1 + EL_BDX_HEAVY_ROCK_FALLING_SCANNED, -1, -1 }, { O_DIAMOND_scanned, TRUE, -- 2.34.1