From 40fce3a7d2959eaa2eaf38b3b9ff2bfc583c6e8d Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 17:16:06 -0400 Subject: Viridian pokecenter --- data/mapObjects/viridianpokecenter.asm | 5 +++-- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 20 +++++++++++++++++--- maps/celadonpokecenter.blk | 2 +- maps/ceruleanpokecenter.blk | 2 +- maps/cinnabarpokecenter.blk | 2 +- maps/fuchsiapokecenter.blk | 2 +- maps/lavenderpokecenter.blk | 2 +- maps/mtmoonpokecenter.blk | 2 +- maps/pewterpokecenter.blk | 2 +- maps/rocktunnelpokecenter.blk | 2 +- maps/saffronpokecenter.blk | 2 +- maps/vermilionpokecenter.blk | 2 +- maps/viridianpokecenter.blk | 2 +- scripts/viridianpokecenter.asm | 6 ++++++ 16 files changed, 41 insertions(+), 20 deletions(-) diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 652efb97..74c27d46 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,12 @@ ViridianPokecenterObject: ; 0x44277 (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, UP, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 94393e3e..2b901ed5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -40,8 +40,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(RedsHouse1F_h) db BANK(RedsHouse2F_h) db BANK(BluesHouse_h) - db $07 ; db BANK(OaksLab_h) - db $11 ; db BANK(ViridianPokecenter_h) + db BANK(OaksLab_h) + db BANK(ViridianPokecenter_h) db $07 ; db BANK(ViridianMart_h) db $07 ; db BANK(School_h) db $07 ; db BANK(ViridianHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index eed956bf..9d358b2d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -40,8 +40,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h - dw $4386 ; dw OaksLab_h ;id=40 - dw $4251 ; dw ViridianPokecenter_h + dw OaksLab_h ;id=40 + dw ViridianPokecenter_h dw $4c6e ; dw ViridianMart_h dw $4d6d ; dw School_h dw $4dc6 ; dw ViridianHouse_h diff --git a/main.asm b/main.asm index d80a7939..926e8984 100755 --- a/main.asm +++ b/main.asm @@ -696,14 +696,28 @@ INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" - dr $440df,$4410b +ViridianPokecenterBlocks: +PewterPokecenterBlocks: +CeruleanPokecenterBlocks: +VermilionPokecenterBlocks: +SaffronPokecenterBlocks: +LavenderPokecenterBlocks: +CeladonPokecenterBlocks: +FuchsiaPokecenterBlocks: +CinnabarPokecenterBlocks: +MtMoonPokecenterBlocks: +RockTunnelPokecenterBlocks: +INCBIN "maps/viridianpokecenter.blk" + dr $440fb,$4410b INCLUDE "scripts/lavendertown.asm" - ; dr $440df,$44169 INCLUDE "engine/pokedex_rating.asm" - dr $44251,$443b7 +INCLUDE "data/mapHeaders/viridianpokecenter.asm" +INCLUDE "scripts/viridianpokecenter.asm" +INCLUDE "data/mapObjects/viridianpokecenter.asm" + dr $442b7,$443b7 Mansion1Script_Switches: dr $443b7,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) diff --git a/maps/celadonpokecenter.blk b/maps/celadonpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/celadonpokecenter.blk +++ b/maps/celadonpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/ceruleanpokecenter.blk b/maps/ceruleanpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/ceruleanpokecenter.blk +++ b/maps/ceruleanpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/cinnabarpokecenter.blk b/maps/cinnabarpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/cinnabarpokecenter.blk +++ b/maps/cinnabarpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/fuchsiapokecenter.blk b/maps/fuchsiapokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/fuchsiapokecenter.blk +++ b/maps/fuchsiapokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/lavenderpokecenter.blk b/maps/lavenderpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/lavenderpokecenter.blk +++ b/maps/lavenderpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/mtmoonpokecenter.blk b/maps/mtmoonpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/mtmoonpokecenter.blk +++ b/maps/mtmoonpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/pewterpokecenter.blk b/maps/pewterpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/pewterpokecenter.blk +++ b/maps/pewterpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/rocktunnelpokecenter.blk b/maps/rocktunnelpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/rocktunnelpokecenter.blk +++ b/maps/rocktunnelpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/saffronpokecenter.blk b/maps/saffronpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/saffronpokecenter.blk +++ b/maps/saffronpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/vermilionpokecenter.blk b/maps/vermilionpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/vermilionpokecenter.blk +++ b/maps/vermilionpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/viridianpokecenter.blk b/maps/viridianpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/viridianpokecenter.blk +++ b/maps/viridianpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index ae5e32c8..f8aed602 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -7,6 +7,7 @@ ViridianPokecenterTextPointers: ; 44263 (11:4263) dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 dw ViridianPokeCenterText4 + dw ViridianPokeCenterText5 ViridianPokeCenterText1: ; 4426b (11:426b) db $ff @@ -21,3 +22,8 @@ ViridianPokeCenterText3: ; 44271 (11:4271) ViridianPokeCenterText4: ; 44276 (11:4276) db $f6 + +ViridianPokeCenterText5: + TX_ASM + callab Func_f0f12 + jp TextScriptEnd -- cgit v1.2.3