Miscellaneous reorganization fixes

This commit is contained in:
Rangi
2018-07-04 02:42:11 -04:00
parent 89c2646cca
commit b565e6a9dc
7 changed files with 15 additions and 14 deletions

View File

@@ -1210,7 +1210,9 @@ BattleCommand_Critical:
ld [wCriticalHit], a
ret
INCLUDE "data/battle/critical_hits.asm"
INCLUDE "data/moves/critical_hit_moves.asm"
INCLUDE "data/battle/critical_hit_chances.asm"
INCLUDE "engine/battle/move_effects/triple_kick.asm"

View File

@@ -40,4 +40,4 @@ BattleCommand_Metronome:
call UpdateMoveData
jp ResetTurn
INCLUDE "data/battle/metronome_exception_moves.asm"
INCLUDE "data/moves/metronome_exception_moves.asm"

View File

@@ -16,7 +16,7 @@ FindFirstAliveMonAndStartBattle:
xor a
ld [hMapAnims], a
call DelayFrame
ld b, 6
ld b, PARTY_LENGTH
ld hl, wPartyMon1HP
ld de, PARTYMON_STRUCT_LENGTH - 1