Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-09-30 13:16:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Indigo Plateau Lobby

Browse Source
This commit is contained in:
pikalaxalt
2016-06-02 13:18:57 -04:00
parent 34061c6d0f
commit eb83973a64
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/mapObjects/indigoplateaulobby.asm
View File

@@ -8,12 +8,13 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
db $0 ; signs
db $5 ; objects
db $6 ; objects
object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person
object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person
object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person
object SPRITE_CHANSEY, $8, $5, STAY, DOWN, $6 ; person
; warp-to
EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7

2
data/map_header_banks.asm
View File

@@ -174,7 +174,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(CinnabarPokecenter_h)
db BANK(CinnabarMart_h)
db BANK(CinnabarMart_h)
db $06 ; db BANK(IndigoPlateauLobby_h)
db BANK(IndigoPlateauLobby_h)
db BANK(CopycatsHouse1F_h)
db $17 ; db BANK(CopycatsHouse2F_h)
db $17 ; db BANK(FightingDojo_h)

2
data/map_header_pointers.asm
View File

@@ -174,7 +174,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw CinnabarPokecenter_h
dw CinnabarMart_h
dw CinnabarMart_h ; unused
dw $5d45 ; dw IndigoPlateauLobby_h
dw IndigoPlateauLobby_h
dw CopycatsHouse1F_h
dw $4b5b ; dw CopycatsHouse2F_h
dw $4c47 ; dw FightingDojo_h

8
main.asm
View File

@@ -272,7 +272,13 @@ INCLUDE "data/mapHeaders/blueshouse.asm"
INCLUDE "scripts/blueshouse.asm"
INCLUDE "data/mapObjects/blueshouse.asm"
BluesHouseBlocks: INCBIN "maps/blueshouse.blk"
dr $19d05,$1a4ea
dr $19d05,$19d45
INCLUDE "data/mapHeaders/indigoplateaulobby.asm"
INCLUDE "scripts/indigoplateaulobby.asm"
INCLUDE "data/mapObjects/indigoplateaulobby.asm"
IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk"
dr $19e09,$1a4ea
INCLUDE "engine/overworld/npc_movement.asm"
INCLUDE "engine/overworld/doors.asm"

10
scripts/indigoplateaulobby.asm
View File

@@ -20,9 +20,10 @@ IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f)
dw IndigoPlateauLobbyText3
dw IndigoPlateauLobbyText4
dw IndigoPlateauLobbyText5
dw IndigoPlateauLobbyText6
IndigoPlateauLobbyText1: ; 19c89 (6:5c89)
db $ff
TX_POKECENTER_NURSE
IndigoPlateauLobbyText2: ; 19c8a (6:5c8a)
TX_FAR _IndigoPlateauLobbyText1
@@ -33,4 +34,9 @@ IndigoPlateauLobbyText3: ; 19c8f (6:5c8f)
db "@"
IndigoPlateauLobbyText5: ; 19c94 (6:5c94)
db $f6
TX_CABLE_CLUB_RECEPTIONIST
IndigoPlateauLobbyText6:
TX_ASM
callab PokecenterChanseyText
jp TextScriptEnd