pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename the Onix trade house to match the rest

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-13 18:07:00 -05:00
parent 0e7a101e41
commit 8745915dbd
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_dimension_constants.asm
View File

@ -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

2
maps.asm
View File

@ -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"

2
maps/VioletCity.asm
View File

@ -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

8
maps/VioletOnixTradeHouse.asm → maps/VioletKylesHouse.asm
View File

@ -1,8 +1,8 @@
const_value set 2
const VIOLETONIXTRADEHOUSE_POKEFAN_M
const VIOLETONIXTRADEHOUSE_KYLE
const VIOLETKYLESHOUSE_POKEFAN_M
const VIOLETKYLESHOUSE_KYLE
VioletOnixTradeHouse_MapScriptHeader:
VioletKylesHouse_MapScriptHeader:
.MapTriggers:
db 0
@ -32,7 +32,7 @@ UnknownText_0x69997:
line "disobey you."
done
VioletOnixTradeHouse_MapEventHeader:
VioletKylesHouse_MapEventHeader:
; filler
db 0, 0

2
maps/blockdata.asm
View File

@ -443,7 +443,7 @@ TimeCapsule_BlockData:
EcruteakLugiaSpeechHouse_BlockData:
EcruteakItemfinderHouse_BlockData:
VioletNicknameSpeechHouse_BlockData:
VioletOnixTradeHouse_BlockData:
VioletKylesHouse_BlockData:
INCBIN "maps/House2.blk"
BetaCave_BlockData:

2
maps/map_headers.asm
View File

@ -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

2
maps/second_map_headers.asm
View File

@ -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