summaryrefslogtreecommitdiff
path: root/engine/routines
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 20:11:03 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 20:11:03 -0500
commitc6b12b07b302b82765181b2521e1e0f2ca5f7725 (patch)
tree008635aac62c3fdbb446453d308c2255fb0554d9 /engine/routines
parentaeee49d29be52d56b542706cf6524eb9b2c4c279 (diff)
Group Pokérus files in engine/pokerus/
Diffstat (limited to 'engine/routines')
-rw-r--r--engine/routines/applypokerustick.asm26
-rw-r--r--engine/routines/checkpokerus.asm25
2 files changed, 0 insertions, 51 deletions
diff --git a/engine/routines/applypokerustick.asm b/engine/routines/applypokerustick.asm
deleted file mode 100644
index 3c97fdc5e..000000000
--- a/engine/routines/applypokerustick.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-ApplyPokerusTick: ; 13988
-; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured.
- ld hl, PartyMon1PokerusStatus ; PartyMon1 + MON_PKRS
- ld a, [PartyCount]
- and a
- ret z ; make sure it's not wasting time on an empty party
- ld c, a
-.loop
- ld a, [hl]
- and $f ; lower nybble is the number of days remaining
- jr z, .next ; if already 0, skip
- sub b ; subtract the number of days
- jr nc, .ok ; max(result, 0)
- xor a
-.ok
- ld d, a ; back up this value because we need to preserve the strain (upper nybble)
- ld a, [hl]
- and $f0
- add d
- ld [hl], a ; this prevents a cured pokemon from recontracting pokerus
-.next
- ld de, PARTYMON_STRUCT_LENGTH
- add hl, de
- dec c
- jr nz, .loop
- ret
diff --git a/engine/routines/checkpokerus.asm b/engine/routines/checkpokerus.asm
deleted file mode 100644
index 285024754..000000000
--- a/engine/routines/checkpokerus.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-CheckPokerus: ; 4d860
-; Return carry if a monster in your party has Pokerus
-
-; Get number of monsters to iterate over
- ld a, [PartyCount]
- and a
- jr z, .NoPokerus
- ld b, a
-; Check each monster in the party for Pokerus
- ld hl, PartyMon1PokerusStatus
- ld de, PARTYMON_STRUCT_LENGTH
-.Check:
- ld a, [hl]
- and $0f ; only the bottom nybble is used
- jr nz, .HasPokerus
-; Next PartyMon
- add hl, de
- dec b
- jr nz, .Check
-.NoPokerus:
- and a
- ret
-.HasPokerus:
- scf
- ret