From 61d9713cc50c5637430cf0a8a176b0ca2c8c45bb Mon Sep 17 00:00:00 2001 From: Snesrev Date: Tue, 4 Apr 2023 21:06:22 +0200 Subject: [PATCH] Remove __plus__ --- src/ida_types.h | 16 ++++++---------- src/sm_94.c | 16 ++++++++-------- src/sm_a5.c | 4 ++-- src/sm_a6.c | 6 +++--- src/sm_a7.c | 4 ++-- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/ida_types.h b/src/ida_types.h index 1493e4c..fa992b7 100644 --- a/src/ida_types.h +++ b/src/ida_types.h @@ -1782,9 +1782,6 @@ enum Consts_88 { addr_kPowerBombExplosionShapeDef0 = 0x9246, addr_byte_889F06 = 0x9F06, addr_word_88A8E8 = 0xA8E8, - addr_word_88A8E8__plus__2 = 0xA8EA, - addr_word_88A8E8__plus__4 = 0xA8EC, - addr_word_88A8E8__plus__6 = 0xA8EE, addr_off_88AD9C = 0xAD9C, addr_off_88ADA6 = 0xADA6, addr_word_88DF5F = 0xDF5F, @@ -2001,7 +1998,6 @@ enum Consts_90 { addr_stru_909F31 = 0x9F31, addr_stru_909F3D = 0x9F3D, addr_kSamusSpeedTable_Normal_X = 0x9F49, - addr_kSamusSpeedTable_Normal_X__plus__12 = 0x9F55, addr_kSamusSpeedTable_Water_X = 0xA08D, addr_kSamusSpeedTable_LavaAcid_X = 0xA1DD, addr_kSuperMissileAccelerations = 0xc303, @@ -2270,8 +2266,8 @@ enum Consts_A5 { addr_kDraygon_Palette = 0xA1F7, addr_kDraygon_MorePalettes2 = 0xA277, addr_word_A5A297 = 0xA297, - addr_kDraygon_BigSprmap_C08F__plus__17 = 0xC0A0, - addr_kDraygon_BigSprmap_C11B__plus__197 = 0xC1E0, + addr_kDraygon_BigSprmap_C08F = 0xC08F, + addr_kDraygon_BigSprmap_C11B = 0xC11B, addr_kDraygon_Ilist_E6B9 = 0xE6B9, addr_kDraygon_Ilist_E6C7 = 0xE6C7, addr_kDraygon_Ilist_E6D5 = 0xE6D5, @@ -2344,8 +2340,8 @@ enum Consts_A6 { addr_kRidley_Ilist_E706 = 0xE706, addr_kRidley_Ilist_E73A = 0xE73A, addr_kRidley_Ilist_E91D = 0xE91D, - addr_kCeresDoor_Palette__plus__2 = 0xF4EE, - addr_word_A6F50C__plus__2 = 0xF50E, + addr_kCeresDoor_Palette = 0xF4EC, + addr_word_A6F50C = 0xF50C, addr_kCeresDoor_Sprmap_FAC7 = 0xFAC7, addr_stru_A6FCE1 = 0xFCE1, addr_stru_A6FCF9 = 0xFCF9, @@ -2368,8 +2364,8 @@ enum Consts_A7 { addr_kKraid_Ilist_8B0A = 0x8B0A, addr_kKraid_Sprmap_8C6C = 0x8C6C, addr_stru_A796DA = 0x96DA, - addr_stru_A7974A__plus__8 = 0x9752, - addr_stru_A79764__plus__8 = 0x976C, + addr_stru_A7974A = 0x974A, + addr_stru_A79764 = 0x9764, addr_kKraidTilemaps_0 = 0x97C8, addr_kKraidTilemaps_1 = 0x9AC8, addr_kKraidTilemaps_2 = 0x9DC8, diff --git a/src/sm_94.c b/src/sm_94.c index 41f2829..c54598c 100644 --- a/src/sm_94.c +++ b/src/sm_94.c @@ -1097,7 +1097,7 @@ static uint8 BlockInsideReact_Slope(CollInfo *ci) { // 0x9497BF } static uint8 BlockInsideReact_ShootableAir(CollInfo *ci) { // 0x9497D0 - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; return 0; } @@ -1114,7 +1114,7 @@ static void BlockInsideReact_SpikeAir_BTS2(void) { // 0x949866 samus_periodic_damage += 16; knockback_x_dir = ((*(uint16 *)&samus_pose_x_dir ^ 0xC) & 8) != 0; } - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; } static Func_V *const kBlockInsideReact_SpikeAir[16] = { // 0x9498CC @@ -1142,12 +1142,12 @@ static uint8 BlockInsideReact_SpikeAir(CollInfo *ci) { } static uint8 BlockInsideReact_Special_(CollInfo *ci) { // 0x9498DC - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; return 0; } static void BlockInsideReact_SpecialAir_Default(void) { // 0x9498E3 - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; } static void BlockInsideReact_SpecialAir_8(void) { // 0x9498EA @@ -1155,7 +1155,7 @@ static void BlockInsideReact_SpecialAir_8(void) { // 0x9498EA extra_samus_x_subdisplacement = 0; extra_samus_x_displacement = 2; } - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; } static void BlockInsideReact_SpecialAir_9(void) { // 0x949910 @@ -1163,19 +1163,19 @@ static void BlockInsideReact_SpecialAir_9(void) { // 0x949910 extra_samus_x_subdisplacement = 0; extra_samus_x_displacement = -2; } - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; } static void BlockInsideReact_SpecialAir_10(void) { // 0x949936 extra_samus_x_subdisplacement = 0; extra_samus_x_displacement = 2; - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; } static void BlockInsideReact_SpecialAir_11(void) { // 0x949946 extra_samus_x_subdisplacement = 0; extra_samus_x_displacement = -2; - samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X__plus__12; + samus_x_speed_table_pointer = addr_kSamusSpeedTable_Normal_X + 12; } static void BlockInsideReact_SpecialAir_70(void) { // 0x949956 diff --git a/src/sm_a5.c b/src/sm_a5.c index ba85625..d26ea3f 100644 --- a/src/sm_a5.c +++ b/src/sm_a5.c @@ -883,7 +883,7 @@ void Draygon_Hurt(void) { // 0xA5954D uint16 v0 = addr_kDraygon_MorePalettes2; if ((Get_Draygon(cur_enemy_index)->base.flash_timer & 2) != 0) v0 = addr_word_A5A297; - memcpy(g_ram + addr_kDraygon_BigSprmap_C08F__plus__17, RomPtr_A5(v0), 32); + memcpy(g_ram + addr_kDraygon_BigSprmap_C08F + 17, RomPtr_A5(v0), 32); if ((Get_Draygon(cur_enemy_index)->base.flash_timer & 2) == 0) { uint16 v3 = 4 * Get_Draygon(0)->draygon_var_0E; @@ -895,7 +895,7 @@ void Draygon_Hurt(void) { // 0xA5954D uint16 v5 = addr_kDraygon_Palette; if ((Get_Draygon(cur_enemy_index)->base.flash_timer & 2) != 0) v5 = addr_word_A5A297; - memcpy(g_ram + addr_kDraygon_BigSprmap_C11B__plus__197, RomPtr_A5(v5), 32); + memcpy(g_ram + addr_kDraygon_BigSprmap_C11B + 197, RomPtr_A5(v5), 32); if ((samus_grapple_flags & 1) != 0) { Enemy_Draygon *E = Get_Draygon(0); diff --git a/src/sm_a6.c b/src/sm_a6.c index 4f455ba..edf5969 100644 --- a/src/sm_a6.c +++ b/src/sm_a6.c @@ -4666,13 +4666,13 @@ void CeresDoor_Init(void) { // 0xA6F6C5 CeresDoor_Func_1(cur_enemy_index); uint16 v3; if (ceres_status) { - v3 = addr_word_A6F50C__plus__2; + v3 = addr_word_A6F50C + 2; } else { if (E->cdr_parameter_1 == 3) { - WriteColorsToTargetPalette(0xa6, 0x142, addr_kCeresDoor_Palette__plus__2, 0xF); + WriteColorsToTargetPalette(0xa6, 0x142, addr_kCeresDoor_Palette + 2, 0xF); return; } - v3 = addr_kCeresDoor_Palette__plus__2; + v3 = addr_kCeresDoor_Palette + 2; } Get_CeresDoor(cur_enemy_index)->base.palette_index = 3584; WriteColorsToTargetPalette(0xa6, 0x1E2, v3, 0xF); diff --git a/src/sm_a7.c b/src/sm_a7.c index 945a8bd..c81ad66 100644 --- a/src/sm_a7.c +++ b/src/sm_a7.c @@ -932,7 +932,7 @@ void Kraid_InitEyeGlowing(void) { // 0xA7B6BF Enemy_Kraid *E = Get_Kraid(0); E->kraid_var_A = FUNC16(Kraid_Shot_MouthIsOpen); E->kraid_var_A = FUNC16(Kraid_Shot_GlowHisEye); - E->kraid_var_B = addr_stru_A7974A__plus__8; + E->kraid_var_B = addr_stru_A7974A + 8; E->kraid_var_C = g_stru_A7974A[0].timer; Kraid_Shot_GlowHisEye(); } @@ -1634,7 +1634,7 @@ void Kraid_Death_Init(void) { // 0xA7C360 E1->base.current_instruction = addr_kKraid_Ilist_8AF0; E1->base.instruction_timer = 1; E0->kraid_var_A = FUNC16(Kraid_Death_Fadeout); - E0->kraid_var_B = addr_stru_A79764__plus__8; + E0->kraid_var_B = addr_stru_A79764 + 8; E0->kraid_var_C = g_stru_A79764[0].timer; uint16 v4 = cur_enemy_index; uint16 v7 = cur_enemy_index;