Skip to content

Commit 42d89bc

Browse files
WuBoytHWuBoytH
committed
Macros removal
1 parent d2e1be6 commit 42d89bc

File tree

134 files changed

+516
-516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+516
-516
lines changed

‎fighters/bayonetta/src/acmd/aerials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ unsafe extern "C" fn bayonetta_attack_air_b_expression(fighter: &mut L2CAgentBas
268268
}
269269
frame(lua_state, 20.0);
270270
if is_excute(fighter) {
271-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
271+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
272272
}
273273
}
274274

@@ -337,7 +337,7 @@ unsafe extern "C" fn bayonetta_attack_air_hi_expression(fighter: &mut L2CAgentBa
337337
}
338338
frame(lua_state, 10.0);
339339
if is_excute(fighter) {
340-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
340+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
341341
}
342342
frame(lua_state, 35.0);
343343
if is_excute(fighter) {

‎fighters/bayonetta/src/acmd/specials.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ unsafe extern "C" fn bayonetta_special_air_s_u_expression(fighter: &mut L2CAgent
228228
}
229229
frame(lua_state, 12.0);
230230
if is_excute(fighter) {
231-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
231+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
232232
}
233233
frame(lua_state, 20.0);
234234
if is_excute(fighter) {
@@ -295,7 +295,7 @@ unsafe extern "C" fn bayonetta_special_air_s_d_expression(fighter: &mut L2CAgent
295295
}
296296
frame(lua_state, 7.0);
297297
if is_excute(fighter) {
298-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
298+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
299299
}
300300
}
301301

@@ -434,7 +434,7 @@ unsafe extern "C" fn bayonetta_special_lw (fighter: &mut L2CAgentBase) {
434434
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x2ea0f68425), true);
435435
}
436436
fighter.on_flag(*FIGHTER_BAYONETTA_STATUS_WORK_ID_SPECIAL_LW_FLAG_WITCH_TIME);
437-
macros::SEARCH(fighter, 0, 0, Hash40::new("top"), 11.5, -2.0, 10.0, 0.0, None, None, None, *COLLISION_KIND_MASK_ATTACK, *HIT_STATUS_MASK_ALL, 1, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_FIEB, *COLLISION_PART_MASK_BODY_HEAD, false);
437+
SEARCH(fighter, 0, 0, Hash40::new("top"), 11.5, -2.0, 10.0, 0.0, None, None, None, *COLLISION_KIND_MASK_ATTACK, *HIT_STATUS_MASK_ALL, 1, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_FIEB, *COLLISION_PART_MASK_BODY_HEAD, false);
438438
}
439439
frame(lua_state, 15.0);
440440
FT_MOTION_RATE(fighter, 1.0); //9

‎fighters/bayonetta/src/acmd/tilts.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ unsafe extern "C" fn bayonetta_attack_s3_s_expression(fighter: &mut L2CAgentBase
5454
}
5555
frame(lua_state, 24.0);
5656
if is_excute(fighter) {
57-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
57+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
5858
}
5959
frame(lua_state, 45.0);
6060
if is_excute(fighter) {
@@ -107,7 +107,7 @@ unsafe extern "C" fn bayonetta_attack_s3_s2_expression(fighter: &mut L2CAgentBas
107107
}
108108
frame(lua_state, 19.0);
109109
if is_excute(fighter) {
110-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
110+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
111111
}
112112
frame(lua_state, 36.0);
113113
if is_excute(fighter) {
@@ -282,7 +282,7 @@ unsafe extern "C" fn bayonetta_attack_lw3_expression(fighter: &mut L2CAgentBase)
282282
}
283283
frame(lua_state, 12.0);
284284
if is_excute(fighter) {
285-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
285+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
286286
}
287287
}
288288

‎fighters/buddy/src/acmd/aerials.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@ unsafe extern "C" fn buddy_attack_air_n_expression(fighter: &mut L2CAgentBase) {
9191
}
9292
frame(lua_state, 8.0);
9393
if is_excute(fighter) {
94-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
94+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
9595
}
9696
frame(lua_state, 15.0);
9797
if is_excute(fighter) {
9898
ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 5, false, *BATTLE_OBJECT_ID_INVALID as u32);
9999
}
100100
frame(lua_state, 16.0);
101101
if is_excute(fighter) {
102-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
102+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
103103
}
104104
frame(lua_state, 25.0);
105105
if is_excute(fighter) {
106106
ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 5, false, *BATTLE_OBJECT_ID_INVALID as u32);
107107
}
108108
frame(lua_state, 26.0);
109109
if is_excute(fighter) {
110-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
110+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
111111
}
112112
}
113113

@@ -163,7 +163,7 @@ unsafe extern "C" fn buddy_attack_air_f_expression(fighter: &mut L2CAgentBase) {
163163
}
164164
frame(lua_state, 14.5);
165165
if is_excute(fighter) {
166-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
166+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
167167
}
168168
}
169169

@@ -285,7 +285,7 @@ unsafe extern "C" fn buddy_attack_air_hi_expression(fighter: &mut L2CAgentBase)
285285
}
286286
frame(lua_state, 7.0);
287287
if is_excute(fighter) {
288-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
288+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
289289
}
290290
}
291291

@@ -370,28 +370,28 @@ unsafe extern "C" fn buddy_attack_air_lw_game(fighter: &mut L2CAgentBase) {
370370

371371
unsafe extern "C" fn buddy_attack_air_lw_effect(agent: &mut L2CAgentBase) {
372372
frame(agent.lua_state_agent, 14.0);
373-
if macros::is_excute(agent) {
374-
macros::EFFECT_FLW_POS(agent, Hash40::new("buddy_air_lw"), Hash40::new("top"), 0, -7, 0, 0, 0, 0, 1, true);
373+
if is_excute(agent) {
374+
EFFECT_FLW_POS(agent, Hash40::new("buddy_air_lw"), Hash40::new("top"), 0, -7, 0, 0, 0, 0, 1, true);
375375
}
376376
frame(agent.lua_state_agent, 17.0);
377-
if macros::is_excute(agent) {
378-
macros::EFFECT_FOLLOW_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, Hash40::new("top"), 0, 2, 0, 0, 0, 0, 0.7, true);
377+
if is_excute(agent) {
378+
EFFECT_FOLLOW_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, Hash40::new("top"), 0, 2, 0, 0, 0, 0, 0.7, true);
379379
}
380380
frame(agent.lua_state_agent, 18.0);
381-
if macros::is_excute(agent) {
382-
macros::EFFECT_OFF_KIND_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, false, true);
381+
if is_excute(agent) {
382+
EFFECT_OFF_KIND_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, false, true);
383383
}
384384
frame(agent.lua_state_agent, 46.0);
385-
if macros::is_excute(agent) {
385+
if is_excute(agent) {
386386
if AttackModule::is_infliction_status(agent.module_accessor, *COLLISION_KIND_MASK_HIT | *COLLISION_KIND_MASK_SHIELD) {
387387
EFFECT_OFF_KIND(agent, Hash40::new("buddy_air_lw"),false,false);
388-
macros::EFFECT_FOLLOW_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, Hash40::new("top"), 0, 2, 0, 0, 0, 0, 1.1, true);
388+
EFFECT_FOLLOW_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, Hash40::new("top"), 0, 2, 0, 0, 0, 0, 1.1, true);
389389
sv_animcmd::EFFECT_WORK(agent.lua_state_agent);
390390
}
391391
}
392392
frame(agent.lua_state_agent, 50.0);
393-
if macros::is_excute(agent) {
394-
macros::EFFECT_OFF_KIND_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, false, true);
393+
if is_excute(agent) {
394+
EFFECT_OFF_KIND_WORK(agent, *FIGHTER_BUDDY_INSTANCE_WORK_ID_INT_EFFECT_KIND_FLYING, false, true);
395395
}
396396
}
397397

@@ -407,7 +407,7 @@ unsafe extern "C" fn buddy_attack_air_lw_expression(fighter: &mut L2CAgentBase)
407407
}
408408
frame(lua_state, 14.0);
409409
if is_excute(fighter) {
410-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
410+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
411411
}
412412
}
413413

‎fighters/buddy/src/acmd/ground.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ unsafe extern "C" fn buddy_attack_13_expression(fighter: &mut L2CAgentBase) {
8080
}
8181
frame(lua_state, 4.0);
8282
if is_excute(fighter) {
83-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
83+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
8484
}
8585
frame(lua_state, 7.0);
8686
if is_excute(fighter) {

‎fighters/buddy/src/acmd/smashes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ unsafe extern "C" fn buddy_attack_hi4_expression(fighter: &mut L2CAgentBase) {
153153
}
154154
frame(lua_state, 11.0);
155155
if is_excute(fighter) {
156-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
156+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
157157
}
158158
frame(lua_state, 23.0);
159159
if is_excute(fighter) {

‎fighters/buddy/src/acmd/tilts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ unsafe extern "C" fn buddy_attack_hi3_expression(fighter: &mut L2CAgentBase) {
197197
}
198198
frame(lua_state, 6.0);
199199
if is_excute(fighter) {
200-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
200+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
201201
}
202202
frame(lua_state, 11.0);
203203
if is_excute(fighter) {

‎fighters/cloud/src/acmd/smashes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ unsafe extern "C" fn cloud_attack_s4_s_expression(fighter: &mut L2CAgentBase) {
6767
frame(lua_state, 19.0);
6868
if is_excute(fighter) {
6969
AttackModule::set_attack_reference_joint_id(boma, Hash40::new("haver"), AttackDirectionAxis(*ATTACK_DIRECTION_Z), AttackDirectionAxis(*ATTACK_DIRECTION_Y), AttackDirectionAxis(*ATTACK_DIRECTION_X));
70-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_slashs"), 0);
70+
RUMBLE_HIT(fighter, Hash40::new("rbkind_slashs"), 0);
7171
}
7272
frame(lua_state, 22.0);
7373
if is_excute(fighter) {
@@ -79,7 +79,7 @@ unsafe extern "C" fn cloud_attack_s4_s_expression(fighter: &mut L2CAgentBase) {
7979
}
8080
frame(lua_state, 28.0);
8181
if is_excute(fighter) {
82-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_slashm"), 0);
82+
RUMBLE_HIT(fighter, Hash40::new("rbkind_slashm"), 0);
8383
}
8484
}
8585

‎fighters/daisy/src/acmd/aerials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ unsafe extern "C" fn daisy_attack_air_lw_expression(fighter: &mut L2CAgentBase)
242242
}
243243
frame(lua_state, 12.0);
244244
if is_excute(fighter) {
245-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 16);
245+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 16);
246246
}
247247
frame(lua_state, 17.0);
248248
if is_excute(fighter) {
@@ -258,7 +258,7 @@ unsafe extern "C" fn daisy_attack_air_lw_expression(fighter: &mut L2CAgentBase)
258258
}
259259
frame(lua_state, 29.0);
260260
if is_excute(fighter) {
261-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
261+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
262262
}
263263
}
264264

‎fighters/daisy/src/acmd/specials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ unsafe extern "C" fn daisy_special_hi_start_expression(fighter: &mut L2CAgentBas
110110
}
111111
frame(lua_state, 7.0);
112112
if is_excute(fighter) {
113-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
113+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
114114
ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
115115
}
116116
}
@@ -160,7 +160,7 @@ unsafe extern "C" fn daisy_special_air_hi_start_expression(fighter: &mut L2CAgen
160160
}
161161
frame(lua_state, 7.0);
162162
if is_excute(fighter) {
163-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
163+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
164164
ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitl"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
165165
}
166166
}

‎fighters/dedede/src/acmd/aerials.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -83,32 +83,32 @@ unsafe extern "C" fn dedede_attack_air_f_effect(fighter: &mut L2CAgentBase) {
8383
let lua_state = fighter.lua_state_agent;
8484
let boma = fighter.boma();
8585
frame(lua_state, 10.0);
86-
if macros::is_excute(fighter) {
87-
macros::EFFECT_FOLLOW(fighter, Hash40::new("dedede_hammer_body"), Hash40::new("hammer2"), 0, 0, 0, 0, 0, 0, 1, true);
86+
if is_excute(fighter) {
87+
EFFECT_FOLLOW(fighter, Hash40::new("dedede_hammer_body"), Hash40::new("hammer2"), 0, 0, 0, 0, 0, 0, 1, true);
8888
}
8989
frame(lua_state, 14.0);
90-
if macros::is_excute(fighter) {
91-
macros::EFFECT_FOLLOW(fighter, Hash40::new("dedede_hammer_arc_wind_c"), Hash40::new("top"), 0, 15, 0, 0, -62, 75, 1.1, true);
92-
macros::LAST_EFFECT_SET_RATE(fighter, 2.3);
90+
if is_excute(fighter) {
91+
EFFECT_FOLLOW(fighter, Hash40::new("dedede_hammer_arc_wind_c"), Hash40::new("top"), 0, 15, 0, 0, -62, 75, 1.1, true);
92+
LAST_EFFECT_SET_RATE(fighter, 2.3);
9393

9494

9595
frame(lua_state, 16.0);
96-
if macros::is_excute(fighter) {
97-
macros::EFFECT_FOLLOW(fighter, Hash40::new("dedede_hammer_arc_wind_c"), Hash40::new("top"), 0, 15, 0, 0, 0, 75, 1.1, true);
98-
macros::LAST_EFFECT_SET_RATE(fighter, 1.9);
96+
if is_excute(fighter) {
97+
EFFECT_FOLLOW(fighter, Hash40::new("dedede_hammer_arc_wind_c"), Hash40::new("top"), 0, 15, 0, 0, 0, 75, 1.1, true);
98+
LAST_EFFECT_SET_RATE(fighter, 1.9);
9999
}
100100
}
101101
frame(lua_state, 19.0);
102-
if macros::is_excute(fighter) {
103-
macros::EFFECT_OFF_KIND(fighter, Hash40::new("dedede_hammer_body"), false, true);
102+
if is_excute(fighter) {
103+
EFFECT_OFF_KIND(fighter, Hash40::new("dedede_hammer_body"), false, true);
104104
}
105105
frame(lua_state, 20.0);
106-
if macros::is_excute(fighter) {
107-
macros::EFFECT_DETACH_KIND(fighter, Hash40::new("dedede_hammer_arc_wind"), -1);
106+
if is_excute(fighter) {
107+
EFFECT_DETACH_KIND(fighter, Hash40::new("dedede_hammer_arc_wind"), -1);
108108
}
109109
frame(lua_state, 20.0);
110-
if macros::is_excute(fighter) {
111-
macros::EFFECT_OFF_KIND(fighter, Hash40::new("dedede_hammer_arc_wind"), true, true);
110+
if is_excute(fighter) {
111+
EFFECT_OFF_KIND(fighter, Hash40::new("dedede_hammer_arc_wind"), true, true);
112112
}
113113

114114
}
@@ -122,7 +122,7 @@ unsafe extern "C" fn dedede_attack_air_f_expression(fighter: &mut L2CAgentBase)
122122
}
123123
frame(lua_state, 14.4);
124124
if is_excute(fighter) {
125-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
125+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
126126
}
127127
}
128128

‎fighters/demon/src/acmd/specials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,8 @@ unsafe extern "C" fn kazuya_special_hi_start_effect(fighter: &mut L2CAgentBase)
760760
}
761761

762762
unsafe extern "C" fn game_attackstep2fhitshield(fighter: &mut L2CAgentBase) {
763-
if macros::is_excute(fighter) {
764-
//macros::ATTACK_FP(fighter, 6, 1, Hash40::new("top"), 0, 361, 100, 65, 0, 12, 0, 10, 10, Hash40::new("collision_attr_normal"), 0, 0, 0, false, false, 0, *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *COLLISION_SITUATION_MASK_G, true, *ATTACK_REGION_NONE, *COLLISION_CATEGORY_MASK_FIGHTER, false, *COLLISION_PART_MASK_ALL, false, false, false, false, 0, false, false, *ATTACK_LR_CHECK_POS, false, false, true, true, false, *COLLISION_SHAPE_TYPE_SPHERE);
763+
if is_excute(fighter) {
764+
//ATTACK_FP(fighter, 6, 1, Hash40::new("top"), 0, 361, 100, 65, 0, 12, 0, 10, 10, Hash40::new("collision_attr_normal"), 0, 0, 0, false, false, 0, *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_NONE, *COLLISION_SITUATION_MASK_G, true, *ATTACK_REGION_NONE, *COLLISION_CATEGORY_MASK_FIGHTER, false, *COLLISION_PART_MASK_ALL, false, false, false, false, 0, false, false, *ATTACK_LR_CHECK_POS, false, false, true, true, false, *COLLISION_SHAPE_TYPE_SPHERE);
765765
}
766766
}
767767

‎fighters/diddy/src/acmd/aerials.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ unsafe extern "C" fn diddy_attack_air_hi_expression(fighter: &mut L2CAgentBase)
172172
}
173173
frame(lua_state, 3.1);
174174
if is_excute(fighter) {
175-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
175+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
176176
}
177177
}
178178

‎fighters/diddy/src/acmd/smashes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ unsafe extern "C" fn diddy_attack_s4_expression(fighter: &mut L2CAgentBase) {
5454
}
5555
frame(lua_state, 12.0);
5656
if is_excute(fighter) {
57-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
57+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
5858
}
5959
frame(lua_state, 13.0);
6060
if is_excute(fighter) {
@@ -70,7 +70,7 @@ unsafe extern "C" fn diddy_attack_s4_expression(fighter: &mut L2CAgentBase) {
7070
}
7171
frame(lua_state, 19.0);
7272
if is_excute(fighter) {
73-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackl"), 0);
73+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackl"), 0);
7474
}
7575
frame(lua_state, 40.0);
7676
if is_excute(fighter) {

‎fighters/dolly/src/acmd/ground.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ unsafe extern "C" fn dolly_attack_12_expression(fighter: &mut L2CAgentBase) {
100100
}
101101
frame(lua_state, 3.5);
102102
if is_excute(fighter) {
103-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
103+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
104104
}
105105
}
106106

@@ -404,9 +404,9 @@ unsafe extern "C" fn dolly_attack_dash_expression(fighter: &mut L2CAgentBase) {
404404
frame(lua_state, 10.0);
405405
if is_excute(fighter) {
406406
if VarModule::is_flag(fighter.battle_object, vars::shotos::instance::IS_USE_EX_SPECIAL) {
407-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attack_critical"), 0);
407+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attack_critical"), 0);
408408
} else {
409-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
409+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
410410
}
411411
}
412412
frame(lua_state, 13.0);

‎fighters/dolly/src/acmd/smashes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ unsafe extern "C" fn dolly_attack_s4_s_expression(fighter: &mut L2CAgentBase) {
210210
frame(lua_state, 13.0);
211211
if is_excute(fighter) {
212212
if VarModule::is_flag(fighter.battle_object, vars::dolly::status::IS_SHATTER_STRIKE) {
213-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attack_critical"), 0);
213+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attack_critical"), 0);
214214
} else {
215-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackl"), 0);
215+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackl"), 0);
216216
}
217217
}
218218
frame(lua_state, 20.0);

‎fighters/donkey/src/acmd/ground.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ unsafe extern "C" fn attack_12_exp(fighter: &mut L2CAgentBase) {
4040
}
4141
frame(lua_state, 4.0);
4242
if is_excute(fighter) {
43-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
43+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
4444
}
4545
}
4646

‎fighters/duckhunt/src/acmd/tilts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ unsafe extern "C" fn duckhunt_attack_hi3_expression(fighter: &mut L2CAgentBase)
9393
}
9494
frame(lua_state, 7.0);
9595
if is_excute(fighter) {
96-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
96+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
9797
}
9898
frame(lua_state, 20.0);
9999
if is_excute(fighter) {

‎fighters/edge/src/acmd/ground.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ unsafe extern "C" fn sephiroth_attack_11_expression(fighter: &mut L2CAgentBase)
4141
}
4242
frame(lua_state, 6.5);
4343
if is_excute(fighter) {
44-
macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
44+
RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
4545
}
4646
frame(lua_state, 35.0);
4747
if is_excute(fighter) {

0 commit comments

Comments
 (0)