Sync with pokered

3 files changed, 70 insertions, 24 deletions

diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm
new file mode 100644
index 00000000..a85c9c64
--- /dev/null
+++ b/engine/debug/debug_menu.asm
@@ -0,0 +1,46 @@
+DebugMenu:
+	ret
+
+TestBattle:
+.loop
+	call GBPalNormal
+
+	; Don't mess around
+	; with obedience.
+	ld a, 1 << BIT_EARTHBADGE
+	ld [wObtainedBadges], a
+
+	ld hl, wFlags_D733
+	set BIT_TEST_BATTLE, [hl]
+
+	; Reset the party.
+	ld hl, wPartyCount
+	xor a
+	ld [hli], a
+	dec a
+	ld [hl], a
+
+	; Give the player a
+	; level 20 Rhydon.
+	ld a, RHYDON
+	ld [wcf91], a
+	ld a, 20
+	ld [wCurEnemyLVL], a
+	xor a
+	ld [wMonDataLocation], a
+	ld [wCurMap], a
+	call AddPartyMon
+
+	; Fight against a
+	; level 20 Rhydon.
+	ld a, RHYDON
+	ld [wCurOpponent], a
+
+	predef InitOpponent
+
+	; When the battle ends,
+	; do it all again.
+	ld a, 1
+	ld [wUpdateSpritesEnabled], a
+	ldh [hAutoBGTransferEnabled], a
+	jr .loop
diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm
new file mode 100644
index 00000000..8545b848
--- /dev/null
+++ b/engine/debug/debug_party.asm
@@ -0,0 +1,24 @@
+; not IshiharaTeam
+SetDebugTeam:
+	ld de, DebugTeam
+.loop
+	ld a, [de]
+	cp -1
+	ret z
+	ld [wcf91], a
+	inc de
+	ld a, [de]
+	ld [wCurEnemyLVL], a
+	inc de
+	call AddPartyMon
+	jr .loop
+
+DebugTeam:
+	db SNORLAX, 80
+	db PERSIAN, 80
+	db JIGGLYPUFF, 15
+	db PIKACHU, 5
+	db -1 ; end
+
+DebugStart:
+	ret
diff --git a/engine/debug1.asm b/engine/debug1.asm
deleted file mode 100644
index a39e8cac..00000000
--- a/engine/debug1.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-; not IshiharaTeam
-SetDebugTeam:
-	ld de, DebugTeam
-.loop
-	ld a, [de]
-	cp $ff
-	ret z
-	ld [wcf91], a
-	inc de
-	ld a, [de]
-	ld [wCurEnemyLVL], a
-	inc de
-	call AddPartyMon
-	jr .loop
-
-DebugTeam:
-	db SNORLAX,80
-	db PERSIAN,80
-	db JIGGLYPUFF,15
-	db PIKACHU,5
-	db $FF
-
-EmptyFunc:
-	ret