summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm56
1 files changed, 30 insertions, 26 deletions
diff --git a/common.asm b/common.asm
index a13f54f0..6a70f5f6 100644
--- a/common.asm
+++ b/common.asm
@@ -8138,10 +8138,13 @@ PalletTown_h:
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 + ((ROUTE_1_WIDTH * 15) + 0) ;y, x Strip Starting Point
+ dw $C6EB + 0 ;Strip X-Offset to current map
+ db ROUTE_1_WIDTH ;"Bigness" (Unsure) ;Something to do with MapData
+ db ROUTE_1_WIDTH ;"Map Width" (Unsure) ;Something to do with TileSet
+ db (ROUTE_1_HEIGHT * 2) - 1 ;Player's new Y-Coordinates
+ db (0 * -2) ;Player's new X-Coordinates
+ dw $C6E9 + ROUTE_1_HEIGHT * (ROUTE_1_WIDTH + 6) ;New UL Block Pos (Window)
db ROUTE_21
dw Route21Blocks,$C7AB ; pointers
@@ -27620,33 +27623,33 @@ INCBIN "baserom.gbc",$52996,$54000 - $52996
SECTION "bank15",DATA,BANK[$15]
Route2_h:
- db 00; Tileset
+ db 00 ; Tileset
db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles)
- dw $407E ;Map-Pointer
- dw $54E6 ;Maps text pointer
- dw $54E3 ;Maps script pointer
+ dw Route2Blocks ;Map-Pointer
+ dw Route2Texts ;Maps text pointer
+ dw Route2Script ;Maps script pointer
db NORTH | SOUTH ;Connection Byte
;Connection data
- db PEWTER_CITY ;Index of connected map
- dw $4714 ;Pointer to "Connection Strip"s Upperleft Block (Connected Map)
- dw $C6E8 ;Pointer to "Connection Strip"s Upperleft Block (Current Map)
- db 16 ;Bigness
- db 20 ;Map Width
- db 35 ;Y Alignment
- db 10 ;X alignment
- dw $C8BD ;Window
+ db PEWTER_CITY ;Map
+ dw $4714 ;y, x Strip Starting Point
+ dw $C6E8 ;Strip X-Offset to current map
+ db 16 ;"Bigness" (Unsure) ;Something to do with MapData
+ db 20 ;"Map Width" (Unsure) ;Something to do with TileSet
+ db 35 ;Player's new Y-Coordinates
+ db 10 ;Player's new X-Coordinates
+ dw $C8BD ;New UL Block Pos (Window)
- db VIRIDIAN_CITY ;Index of connected map
- dw $43EE ;Pointer to "Connection Strip"s Upperleft Block (Connected Map)
- dw $C958 ;Pointer to "Connection Strip"s Upperleft Block (Current Map)
- db 16 ;Bigness
- db 20 ;Map Width
- db 0 ;Y Alignment
- db 10 ;X alignment
- dw $C703 ;Window
+ db VIRIDIAN_CITY ;Map
+ dw $43EE ;y, x Strip Starting Point
+ dw $C958 ;Strip X-Offset to current map
+ db 16 ;"Bigness" (Unsure) ;Something to do with MapData
+ db 20 ;"Map Width" (Unsure) ;Something to do with TileSet
+ db 0 ;Player's new Y-Coordinates
+ db 10 ;Player's new X-Coordinates
+ dw $C703 ;New UL Block Pos (Window)
- dw $4022 ;Object Data Pointer
+ dw Route2Object ;Object Data Pointer
Route2Object: ; 0x54022 (size=72)
db $f ; border tile
@@ -28144,7 +28147,8 @@ Route2Script: ; 0x554e3
jp $3c3c
; 0x554e6
-INCBIN "baserom.gbc",$554e6,$8
+Route2Texts:
+dw Route2Text1, Route2Text2, Route2Text3, Route2Text4
Route2Text3: ; 0x554ee
TX_FAR _Route2Text3