summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuroiIeWa5Da < tyuki@adu.me >2012-01-16 17:41:39 -0600
committerKuroiIeWa5Da < tyuki@adu.me >2012-01-16 17:41:39 -0600
commit7c2a27f5513a41a5aafe17035295a39760c70e4c (patch)
tree46b6245031f8236513d5a5f55e8accc8fe3a70cf
parent4e1ac11dbdb553f3b7a6b08458d132813a1d3372 (diff)
parent4bd2d5dfb9e8421a2b85b5edda32dfea5861fdd5 (diff)
Merged
hg-commit-id: e6b2ec71c261
-rw-r--r--common.asm13
1 files changed, 8 insertions, 5 deletions
diff --git a/common.asm b/common.asm
index de6f975e..269d854f 100644
--- a/common.asm
+++ b/common.asm
@@ -8132,16 +8132,19 @@ CeladonCityBlocks: ; 450
INCBIN "maps/celadoncity.blk"
PalletTown_h:
- db $00 ; tileset
+ db TileSet_Outside ; tileset
db PalletTownHeight, PalletTownWidth ; dimensions
dw PalletTownBlocks, PalletTownTexts, PalletTownScript
db NORTH | SOUTH ; connections
db ROUTE_1
- dw Route1Blocks + 150,$C6EB ; pointers
- db $0A,$0A ; bigness, width
- db $23,$00 ; alignments
- dw $C809 ; window
+ dw Route1Blocks + ((Route1Width * 15) + 0) ;y, x Strip Starting Point
+ dw $C6EB + 0 ;Strip X-Offset to current map
+ db Route1Width ;"Bigness" (Unsure) ;Something to do with MapData
+ db Route1Width ;"Map Width" (Unsure) ;Something to do with TileSet
+ db (Route1Height * 2) - 1 ;Player's new Y-Coordinates
+ db (0 * -2) ;Player's new X-Coordinates
+ dw $C6E9 + Route1Height * (Route1Width + 6) ;New UL Block Pos (Window)
db ROUTE_21
dw Route21Blocks,$C7AB ; pointers