diff options
| author | IIMarckus <iimarckus@gmail.com> | 2012-08-24 21:17:43 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2012-08-24 21:17:43 -0600 |
| commit | 29957f6f5e26e8bac5c6c2fa7d959cbc52db9956 (patch) | |
| tree | 362a45ad16058e565280c3595e030242a3e3d91d | |
| parent | f323620f58ec194a878c0c4536573de035292550 (diff) | |
Add another script from Cerulean City.
hg-commit-id: f4bac0f8f57d
| -rw-r--r-- | main.asm | 26 |
1 files changed, 22 insertions, 4 deletions
@@ -22284,7 +22284,7 @@ ViridianCityScripts: ; 0x18ffd dw ViridianCityScript0 dw ViridianCityScript1 dw ViridianCityScript2 - dw ViridianCityScript3 ; 50c1 + dw ViridianCityScript3 ViridianCityScript0: ; 0x19005 call Function1900b @@ -22953,9 +22953,27 @@ CeruleanCity_Unknown1948c: ; 0x1948c ; 0x1949d CeruleanCityScripts: ; 0x1949d - dw CeruleanCityScript0, CeruleanCityScript1, CeruleanCityScript2, CeruleanCityScript3 - -INCBIN "baserom.gbc",$194a5,$23 + dw CeruleanCityScript0 + dw CeruleanCityScript1 + dw CeruleanCityScript2 + dw CeruleanCityScript3 + dw CeruleanCityScript4 + +CeruleanCityScript4: ; 0x194a7 + ld a, [W_ISINBATTLE] + cp $ff + jp z, CeruleanCity_Unknown1948c + ld a, $f0 + ld [$cd6b], a + ld hl, $d75b + set 7, [hl] + ld a, $2 + ld [$ff00+$8c], a + call DisplayTextID + xor a + ld [$cd6b], a + ld [$d60f], a + ret CeruleanCityScript0: ; 0x194c8 ld a, [$d75b] |