From 7558b98a810bee3a51c8c0553b52e8a93f853268 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 21 Mar 2020 14:03:38 -0400 Subject: [PATCH] Revert the broken CheckTypeMatchup bugfix simplification from 5728d0141793d832476b3f7b5c0844166fa7c242 --- docs/bugs_and_glitches.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index faeaa471f..f306cc84d 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -901,8 +901,12 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing ld hl, wEnemyMonType1 ldh a, [hBattleTurn] and a - jr z, CheckTypeMatchup +- jr z, CheckTypeMatchup ++ jr z, .get_type ld hl, wBattleMonType1 ++.get_type ++ ld a, BATTLE_VARS_MOVE_TYPE ++ call GetBattleVar ; preserves hl, de, and bc CheckTypeMatchup: -; There is an incorrect assumption about this function made in the AI related code: when -; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the @@ -910,8 +914,6 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing -; this assumption is incorrect. A simple fix would be to load the move type for the -; current move into a in BattleCheckTypeMatchup, before falling through, which is -; consistent with how the rest of the code assumes this code works like. -+ ld a, BATTLE_VARS_MOVE_TYPE -+ call GetBattleVar ; preserves hl, de, and bc push hl push de push bc