shithub: pokered

Download patch

ref: fc08fc672b9643c4d3063a1d0ed28e74c7db84b8
parent: 82f96c1fd1cc70db827bd215b6c762408e00044b
author: IIMarckus <iimarckus@gmail.com>
date: Tue Jan 3 16:02:08 EST 2012

Use map IDs in connections.

hg-commit-id: 8376b329c44a


--- a/pokered.asm
+++ b/pokered.asm
@@ -4945,13 +4945,13 @@
 
     ; connection data
 
-    db $1B ; some map
+	db ROUTE_16
     dw $4B95, $C7C1 ; pointers (connected, current) (strip)
     db $09, $14 ; bigness, width
     db $F8, $27 ; alignments (y, x)
     dw $C716 ; window
 
-    db $12 ; some map
+	db ROUTE_7
     dw $4051, $C7DD ; pointers (connected, current) (strip)
     db $09, $0A ; bigness, width
     db $F8, $00 ; alignments (y, x)
@@ -5024,19 +5024,19 @@
 
     ; connections data
 
-    db $0d ; some map
+	db ROUTE_2
     dw $41C8, $C6F0 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $47, $f6 ; alignments (y, x)
     dw $c929 ; window
 
-    db $0c ; some map
+	db ROUTE_1
     dw $40fc, $c912 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $f6 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $21 ; some map
+	db ROUTE_22
     dw $404e, $c79e ; pointers (connected, current) (strip)
     db $09, $14 ; bigness, width
     db $f8, $27 ; alignments (y, x)
@@ -5056,13 +5056,13 @@
 
     ; connections data
 
-    db $0d ; some map
+	db ROUTE_2
     dw $407e, $c912 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $f6 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $0e ; some map
+	db ROUTE_3
     dw $4255, $c7b5 ; pointers (connected, current) (strip)
     db $09, $23 ; bigness, width
     db $f8, $00 ; alignments (y, x)
@@ -5082,25 +5082,25 @@
 
     ; connections data
 
-    db $23 ; some map
+	db ROUTE_24
     dw $477d, $c6f0 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $23, $f6 ; alignments (y, x)
     dw $c809 ; window
 
-    db $10 ; some map
+	db ROUTE_5
     dw $45d2, $c912 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $f6 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $0f ; some map
+	db ROUTE_4
     dw $4416, $c79e ; pointers (connected, current) (strip)
     db $09, $2d ; bigness, width
     db $f8, $59 ; alignments (y, x)
     dw $c748 ; window
 
-    db $14 ; some map
+	db ROUTE_9
     dw $46fe, $c7b5 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $f8, $00 ; alignments (y, x)
@@ -5120,13 +5120,13 @@
 
     ; connections data
 
-    db $11 ; some map
+	db ROUTE_6
     dw $410f, $c6f0 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $23, $f6 ; alignments (y, x)
     dw $c809 ; window
 
-    db $16 ; some map
+	db ROUTE_11
     dw $455f, $c7b5 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $f8, $00 ; alignments (y, x)
@@ -5146,19 +5146,19 @@
 
     ; connections data
 
-    db $1e ; some map
+	db ROUTE_19
     dw $4ef1, $c912 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $f6 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $1d ; some map
+	db ROUTE_18
     dw $4cb2, $c79e ; pointers (connected, current) (strip)
     db $09, $19 ; bigness, width
     db $f8, $31 ; alignments (y, x)
     dw $c720 ; window
 
-    db $1a ; some map
+	db ROUTE_15
     dw $49cc, $c7b5 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $f8, $00 ; alignments (y, x)
@@ -5562,13 +5562,13 @@
 
     ; connections data
 
-    db $20 ; some map
+	db ROUTE_21
     dw $5211, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $59, $00 ; alignments (y, x)
     dw $c9b9 ; window
 
-    db $1f ; some map
+	db ROUTE_20
     dw $417d, $c725 ; pointers (connected, current) (strip)
     db $09, $32 ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -5590,13 +5590,13 @@
 
     ; connections data
 
-    db $01 ; some map
+	db VIRIDIAN_CITY
     dw $451a, $c6e8 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $23, $0a ; alignments (y, x)
     dw $c8bd ; window
 
-    db $00 ; some map
+	db PALLET_TOWN
     dw $42fd, $c83b ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -12863,19 +12863,19 @@
 
     ; connections data
 
-    db $15 ; some map
+	db ROUTE_10
     dw $44a0, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $47, $00 ; alignments (y, x)
     dw $c929 ; window
 
-    db $17 ; some map
+	db ROUTE_12
     dw $4710, $c7ab ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $13 ; some map
+	db ROUTE_8
     dw $41e1, $c718 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $00, $3b ; alignments (y, x)
@@ -13157,13 +13157,13 @@
 
     ; connections data
 
-    db $06 ; some map
+	db CELADON_CITY
     dw $410e, $c6e8 ; pointers (connected, current) (strip)
     db $0f, $19 ; bigness, width
     db $08, $31 ; alignments (y, x)
     dw $c720 ; window
 
-    db $0a ; some map
+	db SAFFRON_CITY
     dw $4aac, $c6f5 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $00 ; alignments (y, x)
@@ -13873,13 +13873,13 @@
 
     ; connections data
 
-    db $22 ; some map
+	db ROUTE_23
     dw $4664, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $8f, $00 ; alignments (y, x)
     dw $cb69 ; window
 
-    db $01 ; some map
+	db VIRIDIAN_CITY
     dw $4400, $c6ff ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $00 ; alignments (y, x)
@@ -13899,13 +13899,13 @@
 
     ; connections data
 
-    db $08 ; some map
+	db CINNABAR_ISLAND
     dw $4070, $c790 ; pointers (connected, current) (strip)
     db $09, $0a ; bigness, width
     db $00, $13 ; alignments (y, x)
     dw $c702 ; window
 
-    db $1e ; some map
+	db ROUTE_19
     dw $4f87, $c71d ; pointers (connected, current) (strip)
     db $0c, $0a ; bigness, width
     db $24, $00 ; alignments (y, x)
@@ -13925,13 +13925,13 @@
 
     ; connections data
 
-    db $09 ; some map
+	db INDIGO_PLATEAU
     dw $4986, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $11, $00 ; alignments (y, x)
     dw $c779 ; window
 
-    db $21 ; some map
+	db ROUTE_22
     dw $403d, $cb9b ; pointers (connected, current) (strip)
     db $0d, $14 ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -13951,13 +13951,13 @@
 
     ; connections data
 
-    db $03 ; some map
+	db CERULEAN_CITY
     dw $4832, $c838 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $00, $0a ; alignments (y, x)
     dw $c703 ; window
 
-    db $24 ; some map
+	db ROUTE_25
     dw $4810, $c725 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -13977,7 +13977,7 @@
 
     ; connections data
 
-    db $23 ; some map
+	db ROUTE_24
     dw $46ee, $c754 ; pointers (connected, current) (strip)
     db $0c, $0a ; bigness, width
     db $00, $13 ; alignments (y, x)
@@ -13997,7 +13997,7 @@
 
     ; connections data
 
-    db $22 ; some map
+	db ROUTE_23
     dw $43b2, $c7ab ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -14017,25 +14017,25 @@
 
     ; connections data
 
-    db $10 ; some map
+	db ROUTE_5
     dw $4668, $c6f0 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $23, $f6 ; alignments (y, x)
     dw $c809 ; window
 
-    db $11 ; some map
+	db ROUTE_6
     dw $4079, $c912 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $f6 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $12 ; some map
+	db ROUTE_7
     dw $4058, $c79e ; pointers (connected, current) (strip)
     db $09, $0a ; bigness, width
     db $f8, $13 ; alignments (y, x)
     dw $c702 ; window
 
-    db $13 ; some map
+	db ROUTE_8
     dw $41c6, $c7b5 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $f8, $00 ; alignments (y, x)
@@ -14118,13 +14118,13 @@
 
     ; connections data
 
-    db $0f ; some map
+	db ROUTE_4
     dw $44fa, $c704 ; pointers (connected, current) (strip)
     db $0d, $2d ; bigness, width
     db $11, $ce ; alignments (y, x)
     dw $c8b4 ; window
 
-    db $02 ; some map
+	db PEWTER_CITY
     dw $460b, $c6e8 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $27 ; alignments (y, x)
@@ -14144,13 +14144,13 @@
 
     ; connections data
 
-    db $0e ; some map
+	db ROUTE_3
     dw $426b, $c94c ; pointers (connected, current) (strip)
     db $0d, $23 ; bigness, width
     db $00, $32 ; alignments (y, x)
     dw $c712 ; window
 
-    db $03 ; some map
+	db CERULEAN_CITY
     dw $4844, $c718 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $00 ; alignments (y, x)
@@ -14170,13 +14170,13 @@
 
     ; connections data
 
-    db $03 ; some map
+	db CERULEAN_CITY
     dw $495e, $c6e8 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $23, $0a ; alignments (y, x)
     dw $c8bd ; window
 
-    db $0a ; some map
+	db SAFFRON_CITY
     dw $4a9a, $c838 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $00, $0a ; alignments (y, x)
@@ -14196,13 +14196,13 @@
 
     ; connections data
 
-    db $03 ; some map
+	db CERULEAN_CITY
     dw $4855, $c6e8 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $27 ; alignments (y, x)
     dw $c716 ; window
 
-    db $15 ; some map
+	db ROUTE_10
     dw $4356, $c775 ; pointers (connected, current) (strip)
     db $0c, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -14222,13 +14222,13 @@
 
     ; connections data
 
-    db $17 ; some map
+	db ROUTE_12
     dw $490e, $c6ff ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $6b, $d8 ; alignments (y, x)
     dw $ca49 ; window
 
-    db $19 ; some map
+	db ROUTE_14
     dw $4a19, $c754 ; pointers (connected, current) (strip)
     db $0c, $0a ; bigness, width
     db $00, $13 ; alignments (y, x)
@@ -14248,13 +14248,13 @@
 
     ; connections data
 
-    db $1a ; some map
+	db ROUTE_15
     dw $49e7, $c838 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $dc, $3b ; alignments (y, x)
     dw $c72a ; window
 
-    db $18 ; some map
+	db ROUTE_13
     dw $488b, $c725 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -14274,13 +14274,13 @@
 
     ; connections data
 
-    db $1b ; some map
+	db ROUTE_16
     dw $4bfc, $c6eb ; pointers (connected, current) (strip)
     db $0d, $14 ; bigness, width
     db $11, $00 ; alignments (y, x)
     dw $c7d3 ; window
 
-    db $1d ; some map
+	db ROUTE_18
     dw $4c9c, $cb9b ; pointers (connected, current) (strip)
     db $0d, $19 ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -14300,13 +14300,13 @@
 
     ; connections data
 
-    db $07 ; some map
+	db FUCHSIA_CITY
     dw $4db4, $c6e8 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $23, $0a ; alignments (y, x)
     dw $c8bd ; window
 
-    db $1f ; some map
+	db ROUTE_20
     dw $41ac, $c838 ; pointers (connected, current) (strip)
     db $09, $32 ; bigness, width
     db $dc, $63 ; alignments (y, x)
@@ -14326,13 +14326,13 @@
 
     ; connections data
 
-    db $00 ; some map
+	db PALLET_TOWN
     dw $4339, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $11, $00 ; alignments (y, x)
     dw $c779 ; window
 
-    db $08 ; some map
+	db CINNABAR_ISLAND
     dw $4069, $c9eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -14413,13 +14413,13 @@
 
     ; connections data
 
-    db $0a ; some map
+	db SAFFRON_CITY
     dw $4bc6, $c6e8 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $23, $0a ; alignments (y, x)
     dw $c8bd ; window
 
-    db $05 ; some map
+	db VERMILION_CITY
     dw $4a41, $c838 ; pointers (connected, current) (strip)
     db $10, $14 ; bigness, width
     db $00, $0a ; alignments (y, x)
@@ -14439,13 +14439,13 @@
 
     ; connections data
 
-    db $0a ; some map
+	db SAFFRON_CITY
     dw $4abd, $c6e8 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $27 ; alignments (y, x)
     dw $c716 ; window
 
-    db $04 ; some map
+	db LAVENDER_TOWN
     dw $4085, $c775 ; pointers (connected, current) (strip)
     db $09, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
@@ -14465,13 +14465,13 @@
 
     ; connections data
 
-    db $04 ; some map
+	db LAVENDER_TOWN
     dw $4085, $c95b ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $14 ; some map
+	db ROUTE_9
     dw $4719, $c718 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $00, $3b ; alignments (y, x)
@@ -14491,13 +14491,13 @@
 
     ; connections data
 
-    db $05 ; some map
+	db VERMILION_CITY
     dw $4a64, $c6e8 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $27 ; alignments (y, x)
     dw $c716 ; window
 
-    db $17 ; some map
+	db ROUTE_12
     dw $4800, $c709 ; pointers (connected, current) (strip)
     db $0f, $0a ; bigness, width
     db $36, $00 ; alignments (y, x)
@@ -14517,19 +14517,19 @@
 
     ; connections data
 
-    db $04 ; some map
+	db LAVENDER_TOWN
     dw $40c1, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $11, $00 ; alignments (y, x)
     dw $c779 ; window
 
-    db $18 ; some map
+	db ROUTE_13
     dw $489c, $ca78 ; pointers (connected, current) (strip)
     db $0d, $1e ; bigness, width
     db $00, $28 ; alignments (y, x)
     dw $c70d ; window
 
-    db $16 ; some map
+	db ROUTE_11
     dw $457a, $c8c8 ; pointers (connected, current) (strip)
     db $09, $1e ; bigness, width
     db $ca, $3b ; alignments (y, x)
@@ -14549,13 +14549,13 @@
 
     ; connections data
 
-    db $07 ; some map
+	db FUCHSIA_CITY
     dw $4cab, $c6e8 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $27 ; alignments (y, x)
     dw $c716 ; window
 
-    db $19 ; some map
+	db ROUTE_14
     dw $4aa8, $c709 ; pointers (connected, current) (strip)
     db $0c, $0a ; bigness, width
     db $24, $00 ; alignments (y, x)
@@ -14575,13 +14575,13 @@
 
     ; connections data
 
-    db $1c ; some map
+	db ROUTE_17
     dw $4ba8, $c823 ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $00, $00 ; alignments (y, x)
     dw $c6f9 ; window
 
-    db $06 ; some map
+	db CELADON_CITY
     dw $40f8, $c6ff ; pointers (connected, current) (strip)
     db $0f, $19 ; bigness, width
     db $08, $00 ; alignments (y, x)
@@ -14601,13 +14601,13 @@
 
     ; connections data
 
-    db $1c ; some map
+	db ROUTE_17
     dw $4e5a, $c6eb ; pointers (connected, current) (strip)
     db $0a, $0a ; bigness, width
     db $8f, $00 ; alignments (y, x)
     dw $cb69 ; window
 
-    db $07 ; some map
+	db FUCHSIA_CITY
     dw $4c9a, $c704 ; pointers (connected, current) (strip)
     db $0f, $14 ; bigness, width
     db $08, $00 ; alignments (y, x)