Start reorganizing pokeyellow

1 files changed, 0 insertions, 258 deletions

diff --git a/engine/pikachu_status.asm b/engine/pikachu_status.asm
deleted file mode 100755
index c73d3b3f..00000000
--- a/engine/pikachu_status.asm
+++ /dev/null
@@ -1,258 +0,0 @@
-IsStarterPikachuInOurParty::
-	ld hl, wPartySpecies
-	ld de, wPartyMon1OTID
-	ld bc, wPartyMonOT
-	push hl
-.loop
-	pop hl
-	ld a, [hli]
-	push hl
-	inc a
-	jr z, .noPlayerPikachu
-	cp PIKACHU + 1
-	jr nz, .curMonNotPlayerPikachu
-	ld h, d
-	ld l, e
-	ld a, [wPlayerID]
-	cp [hl]
-	jr nz, .curMonNotPlayerPikachu
-	inc hl
-	ld a, [wPlayerID+1]
-	cp [hl]
-	jr nz, .curMonNotPlayerPikachu
-	push de
-	push bc
-	ld hl, wPlayerName
-	ld d, $6 ; possible player length - 1
-.nameCompareLoop
-	dec d
-	jr z, .sameOT
-	ld a, [bc]
-	inc bc
-	cp [hl]
-	inc hl
-	jr z, .nameCompareLoop
-	pop bc
-	pop de
-.curMonNotPlayerPikachu
-	ld hl, wPartyMon2 - wPartyMon1
-	add hl, de
-	ld d, h
-	ld e, l
-	ld hl, NAME_LENGTH
-	add hl, bc
-	ld b, h
-	ld c, l
-	jr .loop
-
-.sameOT
-	pop bc
-	pop de
-	ld h, d
-	ld l, e
-	ld bc, -NAME_LENGTH
-	add hl, bc
-	ld a, [hli]
-	or [hl]
-	jr z, .noPlayerPikachu ; XXX how is this determined?
-	pop hl
-	scf
-	ret
-
-.noPlayerPikachu
-	pop hl
-	and a
-	ret
-
-IsThisPartymonStarterPikachu_Box::
-	ld hl, wBoxMon1
-	ld bc, wBoxMon2 - wBoxMon1
-	ld de, wBoxMonOT
-	jr asm_fce21
-
-IsThisPartymonStarterPikachu_Party::
-IsThisPartymonStarterPikachu::
-	ld hl, wPartyMon1
-	ld bc, wPartyMon2 - wPartyMon1
-	ld de, wPartyMonOT
-asm_fce21:
-	ld a, [wWhichPokemon]
-	call AddNTimes
-	ld a, [hl]
-	cp PIKACHU
-	jr nz, .notPlayerPikachu
-	ld bc, wPartyMon1OTID - wPartyMon1
-	add hl, bc
-	ld a, [wPlayerID]
-	cp [hl]
-	jr nz, .notPlayerPikachu
-	inc hl
-	ld a, [wPlayerID+1]
-	cp [hl]
-	jr nz, .notPlayerPikachu
-	ld h, d
-	ld l, e
-	ld a, [wWhichPokemon]
-	ld bc, NAME_LENGTH
-	call AddNTimes
-	ld de, wPlayerName
-	ld b, $6
-.loop
-	dec b
-	jr z, .isPlayerPikachu
-	ld a, [de]
-	inc de
-	cp [hl]
-	inc hl
-	jr z, .loop
-.notPlayerPikachu
-	and a
-	ret
-
-.isPlayerPikachu
-	scf
-	ret
-
-UpdatePikachuMoodAfterBattle::
-; because d is always $82 at this function, it serves to
-; ensure Pikachu's mood is at least 130 after battle
-	push de
-	call IsStarterPikachuInOurParty
-	pop de
-	ret nc
-	ld a, d
-	cp 128
-	ld a, [wPikachuMood]
-	jr c, .d_less_than_128 ; we never jump
-	cp d
-	jr c, .load_d_into_mood
-	ret
-
-.d_less_than_128
-	cp d
-	ret c
-.load_d_into_mood
-	ld a, d
-	ld [wPikachuMood], a
-	ret
-
-CheckPikachuFaintedOrStatused::
-; function to test if Pikachu is alive?
-	xor a
-	ld [wWhichPokemon], a
-	ld hl, wPartyCount
-.loop
-	inc hl
-	ld a, [hl]
-	cp $ff
-	jr z, .dead_or_not_in_party
-	push hl
-	call IsThisPartymonStarterPikachu_Party
-	pop hl
-	jr nc, .next
-	ld a, [wWhichPokemon]
-	ld hl, wPartyMon1HP
-	ld bc, wPartyMon2 - wPartyMon1
-	call AddNTimes
-	ld a, [hli]
-	or [hl]
-	ld d, a
-	inc hl
-	inc hl
-	ld a, [hl] ; status
-	and a
-	jr nz, .alive
-	jr .dead_or_not_in_party
-
-.next
-	ld a, [wWhichPokemon]
-	inc a
-	ld [wWhichPokemon], a
-	jr .loop
-
-.alive
-	scf
-	ret
-
-.dead_or_not_in_party
-	and a
-	ret
-
-IsSurfingPikachuInThePlayersParty::
-	ld hl, wPartySpecies
-	ld de, wPartyMon1Moves
-	ld bc, wPartyMonOT
-	push hl
-.loop
-	pop hl
-	ld a, [hli]
-	push hl
-	inc a
-	jr z, .noSurfingPlayerPikachu
-	cp PIKACHU+1
-	jr nz, .curMonNotSurfingPlayerPikachu
-	ld h, d
-	ld l, e
-	push hl
-	push bc
-	ld b, NUM_MOVES
-.moveSearchLoop
-	ld a, [hli]
-	cp SURF
-	jr z, .foundSurfingPikachu
-	dec b
-	jr nz, .moveSearchLoop
-	pop bc
-	pop hl
-	jr .curMonNotSurfingPlayerPikachu
-
-.foundSurfingPikachu
-	pop bc
-	pop hl
-	inc hl
-	inc hl
-	inc hl
-	inc hl
-	ld a, [wPlayerID]
-	cp [hl]
-	jr nz, .curMonNotSurfingPlayerPikachu
-	inc hl
-	ld a, [wPlayerID+1]
-	cp [hl]
-	jr nz, .curMonNotSurfingPlayerPikachu
-	push de
-	push bc
-	ld hl, wPlayerName
-	ld d, $6
-.nameCompareLoop
-	dec d
-	jr z, .foundSurfingPlayerPikachu
-	ld a, [bc]
-	inc bc
-	cp [hl]
-	inc hl
-	jr z, .nameCompareLoop
-	pop bc
-	pop de
-.curMonNotSurfingPlayerPikachu
-	ld hl, wPartyMon2 - wPartyMon1
-	add hl, de
-	ld d, h
-	ld e, l
-	ld hl, NAME_LENGTH
-	add hl, bc
-	ld b, h
-	ld c, l
-	jr .loop
-
-.foundSurfingPlayerPikachu
-	pop bc
-	pop de
-	pop hl
-	scf
-	ret
-
-.noSurfingPlayerPikachu
-	pop hl
-	and a
-	ret