diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-26 16:27:21 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-26 16:27:21 -0500 |
| commit | 47979336e29d7e22d524e35ddc50576874ead009 (patch) | |
| tree | 91723be28641be80ad475b61b5b40f03e1eab9ae /scripts | |
| parent | engine/trade.asm, trade2.asm, intro.asm, overworld/emotion_bubbles.asm (diff) | |
| download | pokeyellow-47979336e29d7e22d524e35ddc50576874ead009.tar.gz pokeyellow-47979336e29d7e22d524e35ddc50576874ead009.tar.xz pokeyellow-47979336e29d7e22d524e35ddc50576874ead009.zip | |
Start disassembling bank0F (Battle)
All current findings will be located in engine/battle/core_.asm
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/viridiancity.asm | 4 |
1 files changed, 2 insertions, 2 deletions
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 |