diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 08:20:56 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 08:20:56 -0400 |
| commit | 1f4f4b99a83406f3078ad639d2c81da32468d463 (patch) | |
| tree | 17b53841b98b959868bc2e536f672b5d05f3e480 /main.asm | |
| parent | Uncomment map header pointers for disassembled maps (diff) | |
| download | pokeyellow-1f4f4b99a83406f3078ad639d2c81da32468d463.tar.gz pokeyellow-1f4f4b99a83406f3078ad639d2c81da32468d463.tar.xz pokeyellow-1f4f4b99a83406f3078ad639d2c81da32468d463.zip | |
Update Celadon scripts
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -261,7 +261,6 @@ CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836 ; INCLUDE "data/mapObjects/fuchsiacity.asm" ; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" - ; dr $18dee,$1902a ; map scripts INCLUDE "scripts/pallettown.asm" INCLUDE "scripts/viridiancity.asm" @@ -270,11 +269,9 @@ INCLUDE "scripts/ceruleancity.asm" dr $19841,$19a43 ; vermilion scripts ; INCLUDE "scripts/vermilioncity.asm" -; INCLUDE "scripts/celadoncity.asm" -CeladonCityScript: - dr $19a43,$19a5f -CeladonCityTextPointers: - dr $19a5f,$1a4ea +INCLUDE "scripts/celadoncity.asm" + + dr $19b2b,$1a4ea ; INCLUDE "scripts/fuchsiacity.asm" INCLUDE "engine/overworld/npc_movement.asm" |