From 9d31df335a90cf317dbe466fa707747015b309cf Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Fri, 4 Oct 2024 18:27:50 +0200 Subject: [PATCH] Revert "refac: remove unnecessary value declarations for enums" This reverts commit 93d06ec6b9e033c35ffefdb93af257e46286027f. --- include/enums.h | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/include/enums.h b/include/enums.h index d850f504..e20c1d34 100644 --- a/include/enums.h +++ b/include/enums.h @@ -828,7 +828,7 @@ enum sfx_e SFX_24_KONGA_NOISE_3, // might be part of Clankers Bolt SFX_25_METAL_SLIDING_OVER_SMTH, - SFX_26_BANJO_LANDING_09, + SFX_26_BANJO_LANDING_09 = 0x26, SFX_27_JINJO_HI, SFX_28_RUSTLING_NOISE, SFX_29_GRUBLIN_NYAHAHA, @@ -1862,8 +1862,8 @@ enum actor_e ACTOR_147_ANCIENT_ONE, ACTOR_149_TTC_BLUBBER_UNKNOWN = 0x149, - ACTOR_14A_TTC_BLUBBER_UNKNOWN, - ACTOR_14B_TTC_BLUBBER_UNKNOWN, + ACTOR_14A_TTC_BLUBBER_UNKNOWN = 0x14a, + ACTOR_14B_TTC_BLUBBER_UNKNOWN = 0x14b, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH = 0x14E, ACTOR_14F_DESTROYED_JIGGY, @@ -2021,11 +2021,11 @@ enum actor_e ACTOR_2A9_ACORN, ACTOR_2DB_DINGPOT = 0x2DB, + ACTOR_2DF_LIGHTHOUSE_B = 0x2df, - ACTOR_2DF_LIGHTHOUSE_B = 0x2DF, - ACTOR_2E0_TTC_STAIRS_1, - ACTOR_2E1_TTC_STAIRS_2, - ACTOR_2E2_LIGHTHOUSE_A, + ACTOR_2E0_TTC_STAIRS_1 = 0x2e0, + ACTOR_2E1_TTC_STAIRS_2 = 0x2e1, + ACTOR_2E2_LIGHTHOUSE_A = 0x2e2, ACTOR_2E5_DOOR_OF_GRUNTY = 0x2e5, @@ -3034,16 +3034,16 @@ enum asset_e // 3b3 Mumbo's Hut // Unused // Unused - ASSET_3B6_MODEL_TTC_STAIRS_1 = 0x3Bb6, - ASSET_3B7_MODEL_TTC_STAIRS_1, + ASSET_3B6_MODEL_TTC_STAIRS_1 = 0x3b6, + ASSET_3B7_MODEL_TTC_STAIRS_1 = 0x3b7, // Unused // Unused // Unused ASSET_3BB_MODEL_JINJO_YELLOW = 0x3BB, ASSET_3BC_MODEL_JINJO_ORANGE, - ASSET_3BD_MODEL_LIGHTHOUSE_A, - ASSET_3BE_MODEL_LIGHTHOUSE_B, - ASSET_3BF_MODEL_PLAYER_SHADOW, + ASSET_3BD_MODEL_LIGHTHOUSE_A = 0x3bd, + ASSET_3BE_MODEL_LIGHTHOUSE_B = 0x3be, + ASSET_3BF_MODEL_PLAYER_SHADOW = 0x3BF, ASSET_3C0_MODEL_JINJO_BLUE, ASSET_3C1_MODEL_JINJO_PINK, ASSET_3C2_MODEL_JINJO_GREEN, @@ -4002,24 +4002,24 @@ enum asset_e ASSET_896_MODEL_GOLD_ROCK = 0x896, - ASSET_89D_ZOOMBOX_SPRITE = 0x89D, + ASSET_89D_ZOOMBOX_SPRITE = 0x89d, - ASSET_8A0_SPRITE_WATER_DROP = 0x8A0, + ASSET_8A0_SPRITE_WATER_DROP = 0x8a0, - ASSET_A0B_TEXT_BLUBBER_FIRST_MEET = 0xA0B, - ASSET_A0C_TEXT_BLUBBER_HALF_GOLD, - ASSET_A0D_TEXT_BLUBBER_COMPLETE, - ASSET_A0E_TEXT_NIPPER_SPAWNED, + ASSET_A0B_TEXT_BLUBBER_FIRST_MEET = 0xa0b, + ASSET_A0C_TEXT_BLUBBER_HALF_GOLD = 0xa0c, + ASSET_A0D_TEXT_BLUBBER_COMPLETE = 0xa0d, + ASSET_A0E_TEXT_NIPPER_SPAWNED = 0xa0e, - ASSET_A10_TEXT_TTC_NIPPER_HURT = 0xA10, + ASSET_A10_TEXT_TTC_NIPPER_HURT = 0xa10, - ASSET_A14_TEXT_CLAM_TAUNT = 0xA14, - ASSET_A15_TEXT_TTC_LOCKUP_SPAWNED, + ASSET_A14_TEXT_CLAM_TAUNT = 0xa14, + ASSET_A15_TEXT_TTC_LOCKUP_SPAWNED = 0xa15, - ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xA17, - ASSET_A18_TEXT_TREASUREHUNT_FOLLOW_CLUES, - ASSET_A19_TEXT_TREASUREHUNT_SECOND_STEP, - ASSET_A1A_TEXT_LEAKY_FIRST_MEET, + ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED = 0xa17, + ASSET_A18_TEXT_TREASUREHUNT_FOLLOW_CLUES = 0xa18, + ASSET_A19_TEXT_TREASUREHUNT_SECOND_STEP = 0xa19, + ASSET_A1A_TEXT_LEAKY_FIRST_MEET = 0xa1a, ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0), ASSET_A20_DIALOG_FLY_LEARN, @@ -4643,7 +4643,7 @@ enum marker_e{ MARKER_121_GLASS_EYE = 0x121, - MARKER_124_BOGGY_1 = 0x124, + MARKER_124_BOGGY_1 = 0x124, MARKER_127_BAT = 0x127, MARKER_128_COLLYWOBBLE_A, @@ -4796,9 +4796,9 @@ enum marker_e{ MARKER_261_FIGHT_FLIGHT_PAD = 0x261, MARKER_267_LIGHTHOUSE_A = 0x267, - MARKER_268_STAIRS_1, - MARKER_269_STAIRS_2, - MARKER_26A_LIGHTHOUSE_B, + MARKER_268_STAIRS_1 = 0x268, + MARKER_269_STAIRS_2 = 0x269, + MARKER_26A_LIGHTHOUSE_B = 0x26a, MARKER_276_STONE_JINJO = 0x276,