From 2f9a0d7d9f3e2ee0f1db0ef25cd47803bc0efdf6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 25 Feb 2018 22:19:17 -0500 Subject: Pokecom Center Admin Room -> Office --- constants/map_constants.asm | 2 +- data/maps/attributes.asm | 2 +- data/maps/blocks.asm | 4 +- data/maps/maps.asm | 2 +- data/maps/scripts.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 2 +- maps/PokecomCenterAdminOfficeMobile.asm | 280 ++++++++++++++++++++++++++++++++ maps/PokecomCenterAdminOfficeMobile.blk | 4 + maps/PokecomCenterAdminRoomMobile.asm | 280 -------------------------------- maps/PokecomCenterAdminRoomMobile.blk | 4 - 10 files changed, 291 insertions(+), 291 deletions(-) create mode 100644 maps/PokecomCenterAdminOfficeMobile.asm create mode 100644 maps/PokecomCenterAdminOfficeMobile.blk delete mode 100644 maps/PokecomCenterAdminRoomMobile.asm delete mode 100644 maps/PokecomCenterAdminRoomMobile.blk diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 21476ae0e..0f604b42a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -260,7 +260,7 @@ ENDM map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18 map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19 map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20 - map_const POKECOM_CENTER_ADMIN_ROOM_MOBILE, 16, 16 ; 21 + map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 16, 16 ; 21 map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22 map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23 map_const DAY_CARE, 5, 4 ; 24 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 23afc8103..fff261319 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -517,7 +517,7 @@ ENDM map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 - map_attributes PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0 + map_attributes PokecomCenterAdminOfficeMobile, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, $00, 0 map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 map_attributes DayCare, DAY_CARE, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 6ee73f3e9..c4f180b8f 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1022,8 +1022,8 @@ BattleTower1F_Blocks: BattleTowerBattleRoom_Blocks: INCBIN "maps/BattleTowerBattleRoom.blk" -PokecomCenterAdminRoomMobile_Blocks: - INCBIN "maps/PokecomCenterAdminRoomMobile.blk" +PokecomCenterAdminOfficeMobile_Blocks: + INCBIN "maps/PokecomCenterAdminOfficeMobile.blk" MobileTradeRoom_Blocks: INCBIN "maps/MobileTradeRoom.blk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 471884825..e86cef4c4 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -271,7 +271,7 @@ MapGroup_Goldenrod: map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 4d314cd1e..ff9974833 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm" -INCLUDE "maps/PokecomCenterAdminRoomMobile.asm" +INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 9e5173fb7..2009b79be 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -808,7 +808,7 @@ GoldenrodPokecenter1F_MapEvents: db 4 ; warp events warp_event 3, 7, GOLDENROD_CITY, 15 warp_event 4, 7, GOLDENROD_CITY, 15 - warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1 + warp_event 0, 6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1 warp_event 0, 7, POKECENTER_2F, 1 db 2 ; coord events diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm new file mode 100644 index 000000000..901f278b6 --- /dev/null +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -0,0 +1,280 @@ + const_def 2 ; object constants + const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1 + const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2 + const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3 + +PokecomCenterAdminOfficeMobile_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +PokecomCenterAdminOfficeMobileScientist1Script: + jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text + +PokecomCenterAdminOfficeMobileScientist2Script: + jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist2Text + +PokecomCenterAdminOfficeMobileScientist3Script: + jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text + +PokecomCenterAdminOfficeMobileSignpost0Script: + opentext + writetext UnknownText_0x627ee + waitbutton +UnknownScript_0x625df: + reloadmappart + loadmenu MenuHeader_0x62602 + verticalmenu + closewindow + ifequal 1, UnknownScript_0x625f0 + ifequal 2, UnknownScript_0x625f8 + jump UnknownScript_0x62600 + +UnknownScript_0x625f0: + opentext + writetext UnknownText_0x62828 + waitbutton + jump UnknownScript_0x625df + +UnknownScript_0x625f8: + opentext + writetext UnknownText_0x628f4 + waitbutton + jump UnknownScript_0x625df + +UnknownScript_0x62600: + closetext + end + +MenuHeader_0x62602: + db MENU_BACKUP_TILES ; flags + menu_coords 0, 0, 15, 8 + dw .MenuData + db 1 ; default option + +.MenuData: + db STATICMENU_CURSOR ; flags + db 3 ; items + db "#　つうしん　クラブ@" ; # COM CLUB + db "モバイルセンター@" ; MOBILE CENTER + db "やめる@" ; QUIT + +PokecomCenterAdminOfficeMobileSignpost1Script: + opentext + writetext UnknownText_0x62989 + waitbutton +UnknownScript_0x62629: + reloadmappart + loadmenu MenuHeader_0x6264c + verticalmenu + closewindow + ifequal 1, UnknownScript_0x6263a + ifequal 2, UnknownScript_0x62642 + jump UnknownScript_0x6264a + +UnknownScript_0x6263a: + opentext + writetext UnknownText_0x629ae + waitbutton + jump UnknownScript_0x62629 + +UnknownScript_0x62642: + opentext + writetext UnknownText_0x62a5a + waitbutton + jump UnknownScript_0x62629 + +UnknownScript_0x6264a: + closetext + end + +MenuHeader_0x6264c: + db MENU_BACKUP_TILES ; flags + menu_coords 0, 0, 15, 8 + dw .MenuData + db 1 ; default option + +.MenuData: + db STATICMENU_CURSOR ; flags + db 3 ; items + db "でんわつかうとき@" ; Use phone + db "でんわつながらないとき@" ; Don't use phone + db "やめる@" ; QUIT + +PokecomCenterAdminOfficeMobileSignpost2Script: + jumptext UnknownText_0x62b26 + +PokecomCenterAdminOfficeMobileScientist1Text: + text "#COM CENTER and" + line "MOBILE CENTER were" + + para "built to satisfy" + line "demands for trades" + + para "and battles with" + line "trainers far away" + + para "and with total" + line "strangers." + done + +PokecomCenterAdminOfficeMobileScientist2Text: + text "When you linked" + line "with someone by" + + para "mobile phone for" + line "the first time," + + para "weren't you" + line "impressed?" + + para "When my first try" + line "worked, I was so" + + para "impressed that I" + line "got the shakes!" + done + +PokecomCenterAdminOfficeMobileScientist3Text: + text "They were able to" + line "build this huge" + + para "facility thanks to" + line "advances in wire-" + cont "less technology." + done + +UnknownText_0x627ee: + text "It's a notice" + line "about where MOBILE" + + para "ADAPTERS are to be" + line "used…" + done + +UnknownText_0x62828: + text "There's a #COM" + line "CLUB upstairs in" + + para "any #MON" + line "CENTER." + + para "There, you can" + line "battle or trade" + + para "with a friend far" + line "away by using a" + cont "MOBILE ADAPTER." + + para "To link up, your" + line "friend must have" + + para "the same kind of" + line "MOBILE ADAPTER as" + cont "you." + done + +UnknownText_0x628f4: + text "To use the TRADE" + line "CORNER or read the" + + para "#MON NEWS, you" + line "need to phone the" + cont "MOBILE CENTER." + + para "You must register" + line "at the MOBILE" + + para "CENTER before" + line "connecting there." + done + +UnknownText_0x62989: + text "It's a notice" + line "about using the" + cont "phone…" + done + +UnknownText_0x629ae: + text "Please ensure that" + line "your phone and" + + para "MOBILE ADAPTER are" + line "properly linked." + + para "Please make sure" + line "the wireless phone" + cont "signal is strong." + + para "Don't touch or" + line "hang up the phone" + cont "while linking." + done + +UnknownText_0x62a5a: + text "If the server is" + line "busy, it may not" + + para "be possible to log" + line "on." + + para "If so, please call" + line "back later." + + para "If you are unable" + line "to log on or don't" + + para "understand the" + line "error messages," + + para "call a support" + line "center or read the" + cont "instructions." + done + +UnknownText_0x62b26: + text "The ADMINISTRATION" + line "OFFICE received an" + cont "e-mail. It says…" + + para "<……> <……> <……>" + + para "To the #COM" + line "CENTER staff…" + + para "Wireless communi-" + line "cation has enabled" + + para "#MON trainers" + line "to interact across" + + para "the nation. Let's" + line "keep working for" + + para "the day when all" + line "the trainers in" + + para "the world can link" + line "without barriers!" + + para "<……> <……> <……>" + done + +PokecomCenterAdminOfficeMobile_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 + warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 + + db 0 ; coord events + + db 3 ; bg events + bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost0Script + bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost1Script + bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost2Script + + db 3 ; object events + object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1 + object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1 + object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1 diff --git a/maps/PokecomCenterAdminOfficeMobile.blk b/maps/PokecomCenterAdminOfficeMobile.blk new file mode 100644 index 000000000..d4fd92414 --- /dev/null +++ b/maps/PokecomCenterAdminOfficeMobile.blk @@ -0,0 +1,4 @@ +&*' +< +/)#  >8? ( + "; %$... +!,-...933901224567::7-=== \ No newline at end of file diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm deleted file mode 100644 index 840d3a771..000000000 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ /dev/null @@ -1,280 +0,0 @@ - const_def 2 ; object constants - const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 - const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 - const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 - -PokecomCenterAdminRoomMobile_MapScripts: - db 0 ; scene scripts - - db 0 ; callbacks - -PokecomCenterAdminRoomMobileScientist1Script: - jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text - -PokecomCenterAdminRoomMobileScientist2Script: - jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text - -PokecomCenterAdminRoomMobileScientist3Script: - jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text - -PokecomCenterAdminRoomMobileSignpost0Script: - opentext - writetext UnknownText_0x627ee - waitbutton -UnknownScript_0x625df: - reloadmappart - loadmenu MenuHeader_0x62602 - verticalmenu - closewindow - ifequal 1, UnknownScript_0x625f0 - ifequal 2, UnknownScript_0x625f8 - jump UnknownScript_0x62600 - -UnknownScript_0x625f0: - opentext - writetext UnknownText_0x62828 - waitbutton - jump UnknownScript_0x625df - -UnknownScript_0x625f8: - opentext - writetext UnknownText_0x628f4 - waitbutton - jump UnknownScript_0x625df - -UnknownScript_0x62600: - closetext - end - -MenuHeader_0x62602: - db MENU_BACKUP_TILES ; flags - menu_coords 0, 0, 15, 8 - dw .MenuData - db 1 ; default option - -.MenuData: - db STATICMENU_CURSOR ; flags - db 3 ; items - db "#　つうしん　クラブ@" ; # COM CLUB - db "モバイルセンター@" ; MOBILE CENTER - db "やめる@" ; QUIT - -PokecomCenterAdminRoomMobileSignpost1Script: - opentext - writetext UnknownText_0x62989 - waitbutton -UnknownScript_0x62629: - reloadmappart - loadmenu MenuHeader_0x6264c - verticalmenu - closewindow - ifequal 1, UnknownScript_0x6263a - ifequal 2, UnknownScript_0x62642 - jump UnknownScript_0x6264a - -UnknownScript_0x6263a: - opentext - writetext UnknownText_0x629ae - waitbutton - jump UnknownScript_0x62629 - -UnknownScript_0x62642: - opentext - writetext UnknownText_0x62a5a - waitbutton - jump UnknownScript_0x62629 - -UnknownScript_0x6264a: - closetext - end - -MenuHeader_0x6264c: - db MENU_BACKUP_TILES ; flags - menu_coords 0, 0, 15, 8 - dw .MenuData - db 1 ; default option - -.MenuData: - db STATICMENU_CURSOR ; flags - db 3 ; items - db "でんわつかうとき@" ; Use phone - db "でんわつながらないとき@" ; Don't use phone - db "やめる@" ; QUIT - -PokecomCenterAdminRoomMobileSignpost2Script: - jumptext UnknownText_0x62b26 - -PokecomCenterAdminRoomMobileScientist1Text: - text "#COM CENTER and" - line "MOBILE CENTER were" - - para "built to satisfy" - line "demands for trades" - - para "and battles with" - line "trainers far away" - - para "and with total" - line "strangers." - done - -PokecomCenterAdminRoomMobileScientist2Text: - text "When you linked" - line "with someone by" - - para "mobile phone for" - line "the first time," - - para "weren't you" - line "impressed?" - - para "When my first try" - line "worked, I was so" - - para "impressed that I" - line "got the shakes!" - done - -PokecomCenterAdminRoomMobileScientist3Text: - text "They were able to" - line "build this huge" - - para "facility thanks to" - line "advances in wire-" - cont "less technology." - done - -UnknownText_0x627ee: - text "It's a notice" - line "about where MOBILE" - - para "ADAPTERS are to be" - line "used…" - done - -UnknownText_0x62828: - text "There's a #COM" - line "CLUB upstairs in" - - para "any #MON" - line "CENTER." - - para "There, you can" - line "battle or trade" - - para "with a friend far" - line "away by using a" - cont "MOBILE ADAPTER." - - para "To link up, your" - line "friend must have" - - para "the same kind of" - line "MOBILE ADAPTER as" - cont "you." - done - -UnknownText_0x628f4: - text "To use the TRADE" - line "CORNER or read the" - - para "#MON NEWS, you" - line "need to phone the" - cont "MOBILE CENTER." - - para "You must register" - line "at the MOBILE" - - para "CENTER before" - line "connecting there." - done - -UnknownText_0x62989: - text "It's a notice" - line "about using the" - cont "phone…" - done - -UnknownText_0x629ae: - text "Please ensure that" - line "your phone and" - - para "MOBILE ADAPTER are" - line "properly linked." - - para "Please make sure" - line "the wireless phone" - cont "signal is strong." - - para "Don't touch or" - line "hang up the phone" - cont "while linking." - done - -UnknownText_0x62a5a: - text "If the server is" - line "busy, it may not" - - para "be possible to log" - line "on." - - para "If so, please call" - line "back later." - - para "If you are unable" - line "to log on or don't" - - para "understand the" - line "error messages," - - para "call a support" - line "center or read the" - cont "instructions." - done - -UnknownText_0x62b26: - text "The ADMINISTRATION" - line "OFFICE received an" - cont "e-mail. It says…" - - para "<……> <……> <……>" - - para "To the #COM" - line "CENTER staff…" - - para "Wireless communi-" - line "cation has enabled" - - para "#MON trainers" - line "to interact across" - - para "the nation. Let's" - line "keep working for" - - para "the day when all" - line "the trainers in" - - para "the world can link" - line "without barriers!" - - para "<……> <……> <……>" - done - -PokecomCenterAdminRoomMobile_MapEvents: - db 0, 0 ; filler - - db 2 ; warp events - warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 - warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 - - db 0 ; coord events - - db 3 ; bg events - bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script - bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script - bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script - - db 3 ; object events - object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 - object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 - object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 diff --git a/maps/PokecomCenterAdminRoomMobile.blk b/maps/PokecomCenterAdminRoomMobile.blk deleted file mode 100644 index d4fd92414..000000000 --- a/maps/PokecomCenterAdminRoomMobile.blk +++ /dev/null @@ -1,4 +0,0 @@ -&*' -< -/)#  >8? ( - "; %$... +!,-...933901224567::7-=== \ No newline at end of file -- cgit v1.2.3