jojobear, our saviour

took out 4 bugs in one go, absolute legend

engine/debug/debug_menu.asm

@@ -108,9 +108,9 @@ TestBattle:
 	ld [hl], a
 
 	; Player's Pokemon.
-	ld a, GLACEON
+	ld a, GENGAR
 	ld [wcf91], a
-	ld a, 16
+	ld a, 50
 	ld [wCurEnemyLVL], a
 	xor a
 	ld [wMonDataLocation], a
@@ -120,19 +120,19 @@ TestBattle:
 	; This function gives you a way to waste a turn, never know when you'll need it.
 	; Alternatively, add a move to test.
 	ld hl, wPartyMon1Moves
-	ld a, UPPERCUT ; Something super weak
+	ld a, UPPERCUT ; New move animation test
 	ld [hli], a
-	ld a, POWDER_SNOW ; Test new failure text
+	ld a, POWDER_SNOW ; New move animation test
 	ld [hli], a
-	ld a, LOW_KICK ; Something that'll miss easily
+	ld a, FAKE_TEARS ; New move animation test
 	ld [hli], a
-	ld a, LEER ; Skip turn
+	ld a, NASTY_PLOT ; Skip turn, New move animation test
 	ld [hli], a
 	
 	; Opponent's Pokemon.
-	ld a, BUU ; Test new theme
+	ld a, NIDORINO
 	ld [wCurOpponent], a
-	ld a, 10 ; Set the level you want here.
+	ld a, 50 ; Set the level you want here.
 	ld [wCurEnemyLVL], a
 
 	predef InitOpponent
@@ -145,7 +145,7 @@ TestBattle:
 	jr .loop
 
 BattleDebugItemsList:
-	db X_ACCURACY, 99 ; Test Guillotine animation
+	db X_ACCURACY, 99
 	db FULL_RESTORE, 99
 	db MAX_ELIXER, 99
 	db FULL_HEAL, 99

engine/debug/debug_party.asm

@@ -21,12 +21,12 @@ SetIshiharaTeam:
 	jr .loop
 
 IshiharaTeam:
-	db EEVEE, 90
 	db EXEGGUTOR_A, 90
-	db TRAMPEL, 90
+	db SCREAM_TAIL, 90
+	db TOTARTLE, 90
 	db MEWTWO, 90
-	db ELECTRODE, 50
-	db FARFETCHD, 50
+	db RHYDON, 50
+	db EEVEE, 50
 	db -1 ; end
 
 DebugStart:
@@ -79,15 +79,6 @@ IF DEF(_DEBUG)
 	ld a, 15
 	ld [hli], a
 	ld [hl], a
-
-	; Jolteon (Pokemon 3) gets Thunderbolt.
-	; Adjusted for Trampel
-	ld hl, wPartyMon3Moves + 3
-	ld a, EARTHQUAKE
-	ld [hl], a
-	ld hl, wPartyMon3PP + 3
-	ld a, 15
-	ld [hl], a
 	
 	; Mewtwo (Pokemon 4) has a full moveset
 	; Use for sweeping the 4.
@@ -108,24 +99,14 @@ IF DEF(_DEBUG)
 	ld a, 99
 	ld [hli], a
 	ld [hl], a
-	
-	; Articuno (Pokemon 5) gets Fly.
-	ld hl, wPartyMon5Moves
-	ld a, FLY
-	ld [hl], a
-	ld hl, wPartyMon5PP
-	ld a, 15
-	ld [hl], a
 
-	; Kadabra (Pokemon 6) gets Flash and Teleport
+	; Eevee (Pokemon 6) gets Flash
 	ld hl, wPartyMon6Moves + 2
 	ld a, FLASH
 	ld [hl], a
 	ld hl, wPartyMon6PP + 2
 	ld a, 15
 	ld [hl], a
-	ld a, TELEPORT
-	ld [hl], a
 
 	; Get some debug items.
 	ld hl, wNumBagItems

engine/pokemon/evos_moves.asm

@@ -713,7 +713,6 @@ PrepareTradebackMoveList:: ; I still don't know how the fuck you're a single col
 	ld hl, wPartySpecies
 	add hl, bc
 	ld a, [hl] ; a = mon id
-	dec a
 	ld [wd0b5], a	;joenote - put mon id into wram for potential later usage of GetMonHeader
 	; Get pointer to evos moves data.
 	dec a
@@ -743,10 +742,10 @@ PrepareTradebackMoveList:: ; I still don't know how the fuck you're a single col
 	ld e, l
 	pop hl
 	; Skip over evolution data.
-.skipEvoEntriesLoop
-	ld a, [hli]
-	and a
-	jr nz, .skipEvoEntriesLoop
+;.skipEvoEntriesLoop
+;	ld a, [hli]
+;	and a
+;	jr nz, .skipEvoEntriesLoop
 	; Write list of relearnable moves, while keeping count along the way.
 	; de = pointer to mon's currently-known moves
 	; hl = pointer to moves data for our mon