$FFF3 checks whose turn it is.

hg-commit-id: e2038c0cb5f9
This commit is contained in:
IIMarckus 2011-12-29 03:37:44 -07:00
parent 0af6c061fe
commit 3678f9bfb9
2 changed files with 15 additions and 11 deletions

View file

@ -166,6 +166,8 @@ W_NUMINBOX EQU $DA80
H_RAND1 EQU $FFD3 H_RAND1 EQU $FFD3
H_RAND2 EQU $FFD4 H_RAND2 EQU $FFD4
H_WHOSETURN EQU $FFF3 ; 0 on players turn, 1 on enemys turn
; hardware registers, from the pandocs http://nocash.emubase.de/pandocs.htm ; hardware registers, from the pandocs http://nocash.emubase.de/pandocs.htm
rDIV EQU $FF04 rDIV EQU $FF04
rBGP EQU $FF47 rBGP EQU $FF47

View file

@ -662,11 +662,11 @@ Char4A: ; PKMN
Char59: Char59:
; depending on whose turn it is, print ; depending on whose turn it is, print
; player active monsters name
; or
; enemy active monsters name, prefixed with “Enemy ” ; enemy active monsters name, prefixed with “Enemy ”
; (XXX what is the purpose of this vs. Char5A) ; or
ld a,[$FFF3] ; player active monsters name
; (like Char5A but flipped)
ld a,[H_WHOSETURN]
xor 1 xor 1
jr MonsterNameCharsCommon jr MonsterNameCharsCommon
@ -675,7 +675,7 @@ Char5A:
; player active monsters name ; player active monsters name
; or ; or
; enemy active monsters name, prefixed with “Enemy ” ; enemy active monsters name, prefixed with “Enemy ”
ld a,[$FFF3] ld a,[H_WHOSETURN]
MonsterNameCharsCommon: MonsterNameCharsCommon:
push de push de
and a and a
@ -10222,17 +10222,17 @@ Function5811: ; 5811
; print the ghost battle messages ; print the ghost battle messages
call $583A call $583A
ret nz ret nz
ld a,[$FFF3] ld a,[H_WHOSETURN]
and a and a
jr nz,.next\@ jr nz,.Ghost\@
ld a,[W_CURMONSTATUS] ld a,[W_CURMONSTATUS] ; players turn
and a,SLP | FRZ and a,SLP | FRZ
ret nz ret nz
ld hl,ScaredText ld hl,ScaredText
call PrintText call PrintText
xor a xor a
ret ret
.next\@ .Ghost\@ ; ghosts turn
ld hl,GetOutText ld hl,GetOutText
call PrintText call PrintText
xor a xor a
@ -13539,10 +13539,12 @@ AttackAnimation: ; 4D5E
ShareAttackAnimations: ; 4DA6 ShareAttackAnimations: ; 4DA6
; some moves just reuse animations from status conditions ; some moves just reuse animations from status conditions
ld a,[$FFF3] ld a,[H_WHOSETURN]
and a and a
ret z ret z
; opponents turn
ld a,[$D07C] ld a,[$D07C]
cp a,AMNESIA cp a,AMNESIA
@ -13655,7 +13657,7 @@ Func586F: ; 586F
ld b,a ld b,a
call IsCryMove call IsCryMove
jr nc,.NotCryMove jr nc,.NotCryMove
ld a,[$FFF3] ld a,[H_WHOSETURN]
and a and a
jr nz,.next\@ jr nz,.next\@
ld a,[$D014] ; get number of current monster ld a,[$D014] ; get number of current monster