Viridian pokecenter

This commit is contained in:
pikalaxalt
2016-05-28 17:16:06 -04:00
parent ff62edda93
commit 40fce3a7d2
16 changed files with 41 additions and 20 deletions
+3 -2
View File
@@ -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
+2 -2
View File
@@ -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)
+2 -2
View File
@@ -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
+17 -3
View File
@@ -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)
+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+1 -1
View File
@@ -1,2 +1,2 @@
 !"#
 '"#

+6
View File
@@ -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