diff options
| -rwxr-xr-x | data/mapObjects/indigoplateaulobby.asm | 3 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | scripts/indigoplateaulobby.asm | 10 |
5 files changed, 19 insertions, 6 deletions
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index dfcd97b7..c41e2cfc 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -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 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1239167c..4793e452 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -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) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index c0d1b477..7c16b7e2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -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 @@ -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" diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 7655d8c7..c639adb7 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -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 |