From 7931dad49d63ef6bedc368d048d4f61fa126d86a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:51:42 +0100 Subject: [PATCH] Debug Battle doesn't replace attacks with Pound I've commented out the code relating to this, which allows for us to test move animations better. It also frees up a WRAM slot. --- engine/battle/core.asm | 4 ++-- engine/battle/init_battle_variables.asm | 4 ++-- engine/debug/debug_menu.asm | 2 +- ram/wram.asm | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 89aee908..9194ae4d 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6136,8 +6136,8 @@ GetCurrentMove: .player ld de, wPlayerMoveNum ld a, [wFlags_D733] - bit BIT_TEST_BATTLE, a - ld a, [wTestBattlePlayerSelectedMove] + ;bit BIT_TEST_BATTLE, a + ;ld a, [wTestBattlePlayerSelectedMove] jr nz, .selected ld a, [wPlayerSelectedMove] .selected diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index dd9f9714..1e36ef2d 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -25,8 +25,8 @@ InitBattleVariables: ld [hli], a dec b jr nz, .loop - inc a ; POUND - ld [wTestBattlePlayerSelectedMove], a + ;inc a ; POUND + ;ld [wTestBattlePlayerSelectedMove], a ld a, [wCurMap] cp SAFARI_ZONE_EAST jr c, .notSafariBattle diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 486d389c..4b391abb 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -92,7 +92,7 @@ TestBattle: ld [hl], a ; Give the player a - ; level 20 Rhyperior. + ; level 20 Rhydon. ld a, RHYPERIOR ld [wcf91], a ld a, 20 diff --git a/ram/wram.asm b/ram/wram.asm index fb7e47cc..ced4b45a 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -470,6 +470,7 @@ wEnemySubstituteHP:: db ; The player's selected move during a test battle. ; InitBattleVariables sets it to the move Pound. +; I've made this redundant by removing the checks for the move, so this can be used for anything you want. wTestBattlePlayerSelectedMove:: db ds 1