shithub: pokered

Download patch

ref: 40c2ce0bec2cc31425069ae6134fb3078f07b17a
parent: 968c0c493cfc9bffe4501598585c8e1b05a352c4
parent: 6c3eb008fe7506b0c6d4a58d849610bfcd625ba7
author: Bryan Bishop <kanzure@gmail.com>
date: Mon Jan 16 05:27:12 EST 2012

Merge in Route2 from KuroiIeWa5Da.

Also, this reverts the additional awk flag- it breaks bsd awk.

hg-commit-id: eb7be134dd2c


--- a/common.asm
+++ b/common.asm
@@ -127,7 +127,7 @@
 	dw SaffronCity_h ; SAFFRON_CITY
 	dw SaffronCity_h ; unused
 	dw Route1_h ; ROUTE_1
-	dw $4000 ; ROUTE_2
+	dw Route2_h ; ROUTE_2
 	dw Route3_h ; ROUTE_3
 	dw Route4_h ; ROUTE_4
 	dw Route5_h ; ROUTE_5
@@ -2639,7 +2639,7 @@
 	db BANK(SaffronCity_h) ; SAFFRON_CITY
 	db $01 ; unused
 	db BANK(Route1_h) ; ROUTE_1
-	db $15 ; ROUTE_2
+	db BANK(Route2_h) ; ROUTE_2
 	db BANK(Route3_h) ; ROUTE_3
 	db BANK(Route4_h) ; ROUTE_4
 	db BANK(Route5_h) ; ROUTE_5
@@ -27619,7 +27619,34 @@
 
 SECTION "bank15",DATA,BANK[$15]
 
-INCBIN "baserom.gbc",$54000,$54022 - $54000
+Route2_h:
+	db TileSet_Outside; Tileset
+	db Route2Height,Route2Width ;Height,Width blocks (1 block = 4x4 tiles)
+	dw $407E ;Map-Pointer
+	dw $54E6 ;Maps text pointer
+	dw $54E3 ;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 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
+	
+	dw $4022 ;Object Data Pointer
 
 Route2Object: ; 0x54022 (size=72)
     db $f ; border tile
--- a/constants.asm
+++ b/constants.asm
@@ -2167,3 +2167,29 @@
 ; Agatha_h map_id=247
 AgathaHeight EQU $06
 AgathaWidth  EQU $05
+
+;Tilesets
+TileSet_Outside equ $0
+TileSet_YourHouse1 equ $1
+TileSet_PkmnCtr1 equ $2
+TileSet_VirForest equ $3
+TileSet_YourHouse2 equ $4
+TileSet_Gym1 equ $5
+TileSet_PkmnCtr2 equ $6
+TileSet_Gym2 equ $7
+TileSet_House equ $8
+TileSet_Museum1 equ $9
+TileSet_Museum2 equ $A
+TileSet_UndPath equ $B
+TileSet_Museum3 equ $C
+TileSet_SSAnne equ $D
+TileSet_VermPort equ $E
+TileSet_PokeCem equ $F
+TileSet_Silph equ $10
+TileSet_Cave equ $11
+TileSet_CeldMart equ $12
+TileSet_GmFrkHQ equ $13
+TileSet_Lab equ $14
+TileSet_BikeShp equ $15
+TileSet_Mansion equ $16
+TileSet_IndigoPlt equ $17
\ No newline at end of file