mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Miscellaneous reorganization fixes
This commit is contained in:
parent
89c2646cca
commit
b565e6a9dc
@ -1,13 +1,3 @@
|
||||
CriticalHitMoves:
|
||||
db KARATE_CHOP
|
||||
db RAZOR_WIND
|
||||
db RAZOR_LEAF
|
||||
db CRABHAMMER
|
||||
db SLASH
|
||||
db AEROBLAST
|
||||
db CROSS_CHOP
|
||||
db -1
|
||||
|
||||
CriticalHitChances:
|
||||
db 7 percent ; 0
|
||||
db 12 percent + 2 ; +1
|
9
data/moves/critical_hit_moves.asm
Normal file
9
data/moves/critical_hit_moves.asm
Normal file
@ -0,0 +1,9 @@
|
||||
CriticalHitMoves:
|
||||
db KARATE_CHOP
|
||||
db RAZOR_WIND
|
||||
db RAZOR_LEAF
|
||||
db CRABHAMMER
|
||||
db SLASH
|
||||
db AEROBLAST
|
||||
db CROSS_CHOP
|
||||
db -1
|
@ -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"
|
||||
|
||||
|
@ -40,4 +40,4 @@ BattleCommand_Metronome:
|
||||
call UpdateMoveData
|
||||
jp ResetTurn
|
||||
|
||||
INCLUDE "data/battle/metronome_exception_moves.asm"
|
||||
INCLUDE "data/moves/metronome_exception_moves.asm"
|
||||
|
@ -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
|
||||
|
||||
|
@ -1176,7 +1176,7 @@ ScrollMapUp::
|
||||
ld l, a
|
||||
ld a, [wBGMapAnchor + 1]
|
||||
ld h, a
|
||||
ld bc, $0200
|
||||
ld bc, BG_MAP_WIDTH tiles
|
||||
add hl, bc
|
||||
; cap d at HIGH(vBGMap0)
|
||||
ld a, h
|
||||
|
Loading…
Reference in New Issue
Block a user