From 8745915dbd38e9647e0b27d20cb73da0fdde353f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 13 Dec 2017 18:07:00 -0500 Subject: Rename the Onix trade house to match the rest --- constants/map_dimension_constants.asm | 2 +- maps.asm | 2 +- maps/VioletCity.asm | 2 +- maps/VioletKylesHouse.asm | 53 +++++++++++++++++++++++++++++++++++ maps/VioletOnixTradeHouse.asm | 53 ----------------------------------- maps/blockdata.asm | 2 +- maps/map_headers.asm | 2 +- maps/second_map_headers.asm | 2 +- 8 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 maps/VioletKylesHouse.asm delete mode 100644 maps/VioletOnixTradeHouse.asm diff --git a/constants/map_dimension_constants.asm b/constants/map_dimension_constants.asm index d7fead006..df93fb796 100644 --- a/constants/map_dimension_constants.asm +++ b/constants/map_dimension_constants.asm @@ -214,7 +214,7 @@ mapgroup EARLS_POKEMON_ACADEMY, 8, 4 ; 8 mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9 mapgroup VIOLET_POKECENTER_1F, 4, 5 ; 10 - mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4 ; 11 + mapgroup VIOLET_KYLES_HOUSE, 4, 4 ; 11 mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 ; 12 mapgroup ROUTE_32_POKECENTER_1F, 4, 5 ; 13 mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5 ; 14 diff --git a/maps.asm b/maps.asm index 80ded93fc..35ca4a835 100644 --- a/maps.asm +++ b/maps.asm @@ -89,7 +89,7 @@ INCLUDE "maps/VioletGym.asm" INCLUDE "maps/EarlsPokemonAcademy.asm" INCLUDE "maps/VioletNicknameSpeechHouse.asm" INCLUDE "maps/VioletPokecenter1F.asm" -INCLUDE "maps/VioletOnixTradeHouse.asm" +INCLUDE "maps/VioletKylesHouse.asm" INCLUDE "maps/Route32RuinsOfAlphGate.asm" INCLUDE "maps/Route32Pokecenter1F.asm" INCLUDE "maps/Route35GoldenrodGate.asm" diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 2d503853b..93a71312a 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -289,7 +289,7 @@ VioletCity_MapEventHeader: warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE warp_def $19, $1f, 1, VIOLET_POKECENTER_1F - warp_def $1d, $15, 1, VIOLET_ONIX_TRADE_HOUSE + warp_def $1d, $15, 1, VIOLET_KYLES_HOUSE warp_def $5, $17, 1, SPROUT_TOWER_1F warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm new file mode 100644 index 000000000..041bfd9d7 --- /dev/null +++ b/maps/VioletKylesHouse.asm @@ -0,0 +1,53 @@ +const_value set 2 + const VIOLETKYLESHOUSE_POKEFAN_M + const VIOLETKYLESHOUSE_KYLE + +VioletKylesHouse_MapScriptHeader: +.MapTriggers: + db 0 + +.MapCallbacks: + db 0 + +PokefanMScript_0x6998d: + jumptextfaceplayer UnknownText_0x69997 + +Kyle: + faceplayer + opentext + trade NPCTRADE_KYLE + waitbutton + closetext + end + +UnknownText_0x69997: + text "A #MON you get" + line "in a trade grows" + cont "quickly." + + para "But if you don't" + line "have the right GYM" + + para "BADGE, they may" + line "disobey you." + done + +VioletKylesHouse_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def $7, $3, 6, VIOLET_CITY + warp_def $7, $4, 6, VIOLET_CITY + +.XYTriggers: + db 0 + +.Signposts: + db 0 + +.PersonEvents: + db 2 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 + person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm deleted file mode 100644 index feb5b10af..000000000 --- a/maps/VioletOnixTradeHouse.asm +++ /dev/null @@ -1,53 +0,0 @@ -const_value set 2 - const VIOLETONIXTRADEHOUSE_POKEFAN_M - const VIOLETONIXTRADEHOUSE_KYLE - -VioletOnixTradeHouse_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -PokefanMScript_0x6998d: - jumptextfaceplayer UnknownText_0x69997 - -Kyle: - faceplayer - opentext - trade NPCTRADE_KYLE - waitbutton - closetext - end - -UnknownText_0x69997: - text "A #MON you get" - line "in a trade grows" - cont "quickly." - - para "But if you don't" - line "have the right GYM" - - para "BADGE, they may" - line "disobey you." - done - -VioletOnixTradeHouse_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def $7, $3, 6, VIOLET_CITY - warp_def $7, $4, 6, VIOLET_CITY - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/blockdata.asm b/maps/blockdata.asm index e6c3e7ae9..c14b30743 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -443,7 +443,7 @@ TimeCapsule_BlockData: EcruteakLugiaSpeechHouse_BlockData: EcruteakItemfinderHouse_BlockData: VioletNicknameSpeechHouse_BlockData: -VioletOnixTradeHouse_BlockData: +VioletKylesHouse_BlockData: INCBIN "maps/House2.blk" BetaCave_BlockData: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 378356624..5145fdda1 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -235,7 +235,7 @@ MapGroup_Violet: map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletOnixTradeHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index b58895f4b..ab35a7f76 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -427,7 +427,7 @@ map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0 - map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 + map_header_2 VioletKylesHouse, VIOLET_KYLES_HOUSE, $0, 0 map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0 map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 -- cgit v1.2.3