# To be inserted at 80040f04 .include "../../../../Globals.s" .include "../../../../m-ex/Header.s" .set entity, 31 .set player, 31 .set playerdata, 31 # r27 = Attacker Slot # r28 = Victim Slot # r5 = Attacker # r6 = Victim # This injection makes the Pummel Move ID skip the combo count increment. Originally only 5 moves perform this behavior, pummel not being one of them. # Get Attacker Pointer mr r3, r27 branchl r12, PlayerBlock_LoadMainCharDataOffset lwz r5, 0x2C(r3) # Get Victim Pointer mr r3, r28 branchl r12, PlayerBlock_LoadMainCharDataOffset lwz r6, 0x2C(r3) ###################### ## Check For Pummel ## ###################### cmpwi r30, 0x34 beq NoComboInc ################################# ## Check For Same Move as Last ## ################################# SameMoveCheck: lhz r3, 0x18EC(r6) # Last Move Instance Victim Was Hit By lhz r4, 0x2088(r5) # Attacking Player's Current Move Instance cmpw r3, r4 bne SkipSameMoveCheck # Check If Its a Throw cmpwi r30, 0x35 blt NoComboInc cmpwi r30, 0x38 bgt NoComboInc # Check If Attacker Is Grabbable (Attacker is Set Grabbable When the Throw Releases the Victim) lhz r3, 0x1A6A(r5) # Grabbable Flag cmpwi r3, 0x0 bne NoComboInc b Original SkipSameMoveCheck: ################################ ## Check For MidGrab Hitboxes ## ################################ # Allow Cliff Attacks cmpwi r30, 0x3F beq Original cmpwi r30, 0x3E beq Original # Check If Attacker Is Grabbable (Attacker is Set Grabbable When the Throw Releases the Victim) lhz r3, 0x1A6A(r5) # Grabbable Flag cmpwi r3, 0x0 bne NoComboInc b Original NoComboInc: # Spoof Pummel as Some Other Move that Triggers the Check li r30, 76 Original: addi r3, r28, 0