From 1d7de7cfcd74f9c115d79268e39b2c6aed61f8c3 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Thu, 26 Jan 2012 14:10:04 -0600 Subject: minor comments on CeruleanCityText1 hg-commit-id: 62b718195177 --- main.asm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/main.asm b/main.asm index 5d1bc7d6..87fcac14 100644 --- a/main.asm +++ b/main.asm @@ -14507,16 +14507,18 @@ CeruleanCityTexts: ; 0x1962d CeruleanCityText1: ; 0x1964f db $08 ; asm - ld a, [$d75a] + ld a, [$d75a] ; rival battle flag bit 0, a - jr z, .asm_a89f9 ; 0x19655 + ; do pre-battle text + jr z, .PreBattleText + ; or talk about bill ld hl, UnnamedText_19677 call PrintText - jr .asm_815c6 ; 0x1965d -.asm_a89f9 ; 0x1965f + jr .end ; 0x1965d +.PreBattleText ; 0x1965f ld hl, UnnamedText_19668 call PrintText -.asm_815c6 ; 0x19665 +.end ; 0x19665 jp TextScriptEnd UnnamedText_19668: ; 0x19668 -- cgit v1.2.3