pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

comment move priority functions

Browse Source
This commit is contained in:
yenatch 2013-12-30 23:32:37 -05:00
parent bfaad924e7
commit a10ee4e9f1
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
battle/core.asm
View File

@ -475,7 +475,7 @@ Function3c314: ; 3c314
ld a, [$d0ec] ld a, [$d0ec]
and a and a
jp nz, .asm_3c3f1 jp nz, .asm_3c3f1
call Function3c5b4 call CompareMovePriority
jr z, .asm_3c36d jr z, .asm_3c36d
jp c, .asm_3c3f1 jp c, .asm_3c3f1
jp Function3c3f3 jp Function3c3f3
@ -848,7 +848,10 @@ AlwaysFleeMons: ; 3c5b1
; 3c5b4 ; 3c5b4
Function3c5b4: ; 3c5b4 CompareMovePriority: ; 3c5b4
; Compare the priority of the player and enemy's moves.
; Return carry if the player goes first, or z if they match.
ld a, [CurPlayerMove] ld a, [CurPlayerMove]
call GetMovePriority call GetMovePriority
ld b, a ld b, a
@ -861,39 +864,45 @@ Function3c5b4: ; 3c5b4
; 3c5c5 ; 3c5c5
GetMovePriority: ; 3c5c5 GetMovePriority: ; 3c5c5
; Return the priority (0-3) of move a.
ld b, a ld b, a
; Vital throw goes last.
cp VITAL_THROW cp VITAL_THROW
ld a, 0 ld a, 0
ret z ret z
call Function3c5ec
ld hl, .data_3c5df call GetMoveEffect
ld hl, MoveEffectPriorities
.loop .loop
ld a, [hli] ld a, [hli]
cp b cp b
jr z, .asm_3c5dd jr z, .done
inc hl inc hl
cp $ff cp -1
jr nz, .loop jr nz, .loop
ld a, 1 ld a, 1
ret ret
.asm_3c5dd .done
ld a, [hl] ld a, [hl]
ret ret
; 3c5df ; 3c5df
.data_3c5df MoveEffectPriorities: ; 3c5df
db EFFECT_PROTECT, 3 db EFFECT_PROTECT, 3
db EFFECT_ENDURE, 3 db EFFECT_ENDURE, 3
db EFFECT_PRIORITY_HIT, 2 db EFFECT_PRIORITY_HIT, 2
db EFFECT_WHIRLWIND, 0 db EFFECT_WHIRLWIND, 0
db EFFECT_COUNTER, 0 db EFFECT_COUNTER, 0
db EFFECT_MIRROR_COAT, 0 db EFFECT_MIRROR_COAT, 0
db $ff db -1
; 3c5ec ; 3c5ec
Function3c5ec: ; 3c5ec GetMoveEffect: ; 3c5ec
ld a, b ld a, b
dec a dec a
ld hl, Moves + MOVE_EFFECT ld hl, Moves + MOVE_EFFECT
@ -905,6 +914,7 @@ Function3c5ec: ; 3c5ec
ret ret
; 3c5fe ; 3c5fe
Function3c5fe: ; 3c5fe Function3c5fe: ; 3c5fe
call Function309d call Function309d
call Function3c543 call Function3c543
@ -4282,7 +4292,7 @@ Function3dc5b: ; 3dc5b
ld a, $10 ld a, $10
call GetBattleVar call GetBattleVar
ld b, a ld b, a
call Function3c5ec call GetMoveEffect
ld a, b ld a, b
cp $80 cp $80
jr nz, .asm_3dce4 jr nz, .asm_3dce4

6
battle/effect_commands.asm
View File

@ -4469,7 +4469,7 @@ BattleCommand40: ; 35813
ret z ret z
ld b, a ld b, a
callab Function3c5ec callab GetMoveEffect
ld a, b ld a, b
cp $59 cp $59
@ -5095,7 +5095,7 @@ BattleCommand48: ; 35b33
push bc push bc
ld b, a ld b, a
callab Function3c5ec callab GetMoveEffect
ld a, b ld a, b
pop bc pop bc
@ -10181,7 +10181,7 @@ BattleCommand9a: ; 37c95
and a and a
ret z ret z
ld b, a ld b, a
callab Function3c5ec callab GetMoveEffect
ld a, b ld a, b
cp $90 cp $90
ret z ret z