mirror of https://github.com/zeldaret/mm.git
				
				
				
			Merge 0d79933a56 into 3b3b117100
				
					
				
			This commit is contained in:
		
						commit
						6b03aff6f8
					
				| 
						 | 
				
			
			@ -4011,7 +4011,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) {
 | 
			
		|||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void func_80886C00(EnHorse* this, PlayState* play) {
 | 
			
		||||
void EnHorse_CheckBoost(EnHorse* this, PlayState* play) {
 | 
			
		||||
    Input* input = &play->state.input[this->unk_52C];
 | 
			
		||||
 | 
			
		||||
    if (((this->action == ENHORSE_ACTION_MOUNTED_WALK) || (this->action == ENHORSE_ACTION_MOUNTED_TROT) ||
 | 
			
		||||
| 
						 | 
				
			
			@ -4239,7 +4239,7 @@ void EnHorse_Update(Actor* thisx, PlayState* play2) {
 | 
			
		|||
    if (!(this->stateFlags & ENHORSE_INACTIVE)) {
 | 
			
		||||
        if ((this->action == ENHORSE_ACTION_MOUNTED_GALLOP) || (this->action == ENHORSE_ACTION_MOUNTED_TROT) ||
 | 
			
		||||
            (this->action == ENHORSE_ACTION_MOUNTED_WALK)) {
 | 
			
		||||
            func_80886C00(this, play);
 | 
			
		||||
            EnHorse_CheckBoost(this, play);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (this->playerControlled == true) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5345,7 +5345,7 @@ EnHorse_UpdateStick = 0x80885AF4; // type:func
 | 
			
		|||
EnHorse_ResolveCollision = 0x80885B4C; // type:func
 | 
			
		||||
EnHorse_BgCheckSlowMoving = 0x80885C90; // type:func
 | 
			
		||||
EnHorse_UpdateBgCheckInfo = 0x80885DA4; // type:func
 | 
			
		||||
func_80886C00 = 0x80886C00; // type:func
 | 
			
		||||
EnHorse_CheckBoost = 0x80886C00; // type:func
 | 
			
		||||
EnHorse_RegenBoost = 0x80886DC4; // type:func
 | 
			
		||||
EnHorse_UpdatePlayerDir = 0x80886FA8; // type:func
 | 
			
		||||
EnHorse_TiltBody = 0x808870A4; // type:func
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue