From 47979336e29d7e22d524e35ddc50576874ead009 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sat, 26 Dec 2015 16:27:21 -0500 Subject: Start disassembling bank0F (Battle) All current findings will be located in engine/battle/core_.asm --- scripts/viridiancity.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index a660898b..ece2c4a1 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -72,7 +72,7 @@ ViridianCityScript1: ; 19062 (6:5062) ; set up battle for Old Man ld a, $1 - ld [W_BATTLETYPE], a + ld [wBattleType], a ld a, 5 ld [wCurEnemyLVL], a ld a, WEEDLE @@ -98,7 +98,7 @@ ViridianCityScript2: ; 1908f (6:508f) ld [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [W_BATTLETYPE], a + ld [wBattleType], a ld [wJoyIgnore], a ld a, $0 ld [W_VIRIDIANCITYCURSCRIPT], a -- cgit v1.2.3