thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #190 from Pokeglitch/master

Browse source 
Fixed some map header files
This commit is contained in:
luckytyphlosion 2018-11-05 12:55:11 -05:00 committed by GitHub
parent b250e788bd 9b6f57832e
commit f386dea5d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/mapHeaders/pewtercity.asm
View file

@ -6,5 +6,3 @@ PewterCity_h:
SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks
EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks
dw PewterCityObject ; objects dw PewterCityObject ; objects
db $0

2
data/mapHeaders/route2.asm
View file

@ -1,5 +1,5 @@
Route2_h: Route2_h:
db 00 ; tileset db OVERWORLD ; tileset
db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x)
dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts
db NORTH | SOUTH ; connections db NORTH | SOUTH ; connections

2
data/mapHeaders/viridianhouse.asm
View file

@ -4,5 +4,3 @@ ViridianHouse_h:
dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
db 0 ; connections db 0 ; connections
dw ViridianHouseObject ; objects dw ViridianHouseObject ; objects
db $0

2
main.asm
View file

@ -275,6 +275,7 @@ INCLUDE "data/mapObjects/viridiancity.asm"
ViridianCityBlocks: INCBIN "maps/viridiancity.blk" ViridianCityBlocks: INCBIN "maps/viridiancity.blk"
INCLUDE "data/mapHeaders/pewtercity.asm" INCLUDE "data/mapHeaders/pewtercity.asm"
db $0
INCLUDE "data/mapObjects/pewtercity.asm" INCLUDE "data/mapObjects/pewtercity.asm"
PewterCityBlocks: INCBIN "maps/pewtercity.blk" PewterCityBlocks: INCBIN "maps/pewtercity.blk"
@ -394,6 +395,7 @@ INCLUDE "scripts/school.asm"
INCLUDE "data/mapObjects/school.asm" INCLUDE "data/mapObjects/school.asm"
INCLUDE "data/mapHeaders/viridianhouse.asm" INCLUDE "data/mapHeaders/viridianhouse.asm"
db $0
INCLUDE "scripts/viridianhouse.asm" INCLUDE "scripts/viridianhouse.asm"
INCLUDE "data/mapObjects/viridianhouse.asm" INCLUDE "data/mapObjects/viridianhouse.asm"