summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-11 19:46:39 -0700
committerYamaArashi <shadow962@live.com>2016-07-11 19:46:39 -0700
commit73efa1e815e559169ba1fb01c91656cb65a1703d (patch)
treee44f2df88ecf62b005964aae8e3428d0579ee594
parentc48cd82c0dc64bd251bb16eff5d9f8ee47a10704 (diff)
pokenav city maps
-rw-r--r--asm/rom5.s2
-rw-r--r--data/data2.s149
-rw-r--r--graphics/pokenav/city_maps/dewford_0.bin1
-rw-r--r--graphics/pokenav/city_maps/ever_grande_0.bin1
-rw-r--r--graphics/pokenav/city_maps/ever_grande_1.bin1
-rw-r--r--graphics/pokenav/city_maps/fallarbor_0.bin1
-rw-r--r--graphics/pokenav/city_maps/fortree_0.bin1
-rw-r--r--graphics/pokenav/city_maps/lavaridge_0.bin1
-rw-r--r--graphics/pokenav/city_maps/lilycove_0.bin1
-rw-r--r--graphics/pokenav/city_maps/lilycove_1.bin1
-rw-r--r--graphics/pokenav/city_maps/littleroot_0.bin1
-rw-r--r--graphics/pokenav/city_maps/mauville_0.bin1
-rw-r--r--graphics/pokenav/city_maps/mauville_1.bin1
-rw-r--r--graphics/pokenav/city_maps/mossdeep_0.bin1
-rw-r--r--graphics/pokenav/city_maps/mossdeep_1.bin1
-rw-r--r--graphics/pokenav/city_maps/oldale_0.bin1
-rw-r--r--graphics/pokenav/city_maps/pacifidlog_0.bin1
-rw-r--r--graphics/pokenav/city_maps/petalburg_0.bin1
-rw-r--r--graphics/pokenav/city_maps/rustboro_0.bin1
-rw-r--r--graphics/pokenav/city_maps/rustboro_1.bin1
-rw-r--r--graphics/pokenav/city_maps/slateport_0.bin1
-rw-r--r--graphics/pokenav/city_maps/slateport_1.bin1
-rw-r--r--graphics/pokenav/city_maps/sootopolis_0.bin1
-rw-r--r--graphics/pokenav/city_maps/verdanturf_0.bin1
24 files changed, 166 insertions, 7 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index f2755ef2a..478f0ff56 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -240003,7 +240003,7 @@ _080EFC8E:
_080EFCD0: .4byte gUnknown_083DFEC4
_080EFCD4: .4byte 0x0000bc9a
_080EFCD8: .4byte 0x0000bc9b
-_080EFCDC: .4byte gUnknown_083E31F0
+_080EFCDC: .4byte gPokenavCityMaps
_080EFCE0: .4byte 0x0000bc9c
_080EFCE4: .4byte 0x0000cdcc
_080EFCE8:
diff --git a/data/data2.s b/data/data2.s
index 931f8c092..9d2d8c81a 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -18209,7 +18209,95 @@ gUnknown_083E05F4:: @ 83E05F4
.incbin "graphics/pokenav/glyph.4bpp.lz"
gUnknown_083E0804:: @ 83E0804
- .incbin "baserom.gba", 0x003e0804, 0x7C4
+ .incbin "baserom.gba", 0x003e0804, 0x168
+
+ .align 2
+gPokenavCityMap_Lavaridge_0:: @ 83E096C
+ .incbin "graphics/pokenav/city_maps/lavaridge_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Fallarbor_0:: @ 83E09B0
+ .incbin "graphics/pokenav/city_maps/fallarbor_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Fortree_0:: @ 83E09F8
+ .incbin "graphics/pokenav/city_maps/fortree_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Slateport_0:: @ 83E0A48
+ .incbin "graphics/pokenav/city_maps/slateport_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Slateport_1:: @ 83E0AA8
+ .incbin "graphics/pokenav/city_maps/slateport_1.bin.lz"
+
+ .align 2
+gPokenavCityMap_Rustboro_0:: @ 83E0AF4
+ .incbin "graphics/pokenav/city_maps/rustboro_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Rustboro_1:: @ 83E0B48
+ .incbin "graphics/pokenav/city_maps/rustboro_1.bin.lz"
+
+ .align 2
+gPokenavCityMap_Pacifidlog_0:: @ 83E0B9C
+ .incbin "graphics/pokenav/city_maps/pacifidlog_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Mauville_1:: @ 83E0BDC
+ .incbin "graphics/pokenav/city_maps/mauville_1.bin.lz"
+
+ .align 2
+gPokenavCityMap_Mauville_0:: @ 83E0C34
+ .incbin "graphics/pokenav/city_maps/mauville_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Oldale_0:: @ 83E0C88
+ .incbin "graphics/pokenav/city_maps/oldale_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Lilycove_1:: @ 83E0CB8
+ .incbin "graphics/pokenav/city_maps/lilycove_1.bin.lz"
+
+ .align 2
+gPokenavCityMap_Lilycove_0:: @ 83E0D04
+ .incbin "graphics/pokenav/city_maps/lilycove_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Littleroot_0:: @ 83E0D5C
+ .incbin "graphics/pokenav/city_maps/littleroot_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Dewford_0:: @ 83E0D8C
+ .incbin "graphics/pokenav/city_maps/dewford_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Sootopolis_0:: @ 83E0DC4
+ .incbin "graphics/pokenav/city_maps/sootopolis_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_EverGrande_0:: @ 83E0E04
+ .incbin "graphics/pokenav/city_maps/ever_grande_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_EverGrande_1:: @ 83E0E4C
+ .incbin "graphics/pokenav/city_maps/ever_grande_1.bin.lz"
+
+ .align 2
+gPokenavCityMap_Verdanturf_0:: @ 83E0E90
+ .incbin "graphics/pokenav/city_maps/verdanturf_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Mossdeep_1:: @ 83E0EC8
+ .incbin "graphics/pokenav/city_maps/mossdeep_1.bin.lz"
+
+ .align 2
+gPokenavCityMap_Mossdeep_0:: @ 83E0F10
+ .incbin "graphics/pokenav/city_maps/mossdeep_0.bin.lz"
+
+ .align 2
+gPokenavCityMap_Petalburg_0:: @ 83E0F6C
+ .incbin "graphics/pokenav/city_maps/petalburg_0.bin.lz"
@ 83E0FC8
.include "data/text/ribbon_descriptions.s"
@@ -18245,13 +18333,62 @@ gUnknown_083E31D8:: @ 83E31D8
.4byte PCText_FindTough
.4byte PCText_ReturnToCondition
-gUnknown_083E31F0:: @ 83E31F0
- .incbin "baserom.gba", 0x003e31f0, 0x80
+ .align 2
+gPokenavCityMaps:: @ 83E31F0
+ .4byte gPokenavCityMap_Littleroot_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Oldale_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Dewford_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Lavaridge_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Fallarbor_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Verdanturf_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Pacifidlog_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Petalburg_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Slateport_0
+ .4byte gPokenavCityMap_Slateport_1
+
+ .4byte gPokenavCityMap_Mauville_0
+ .4byte gPokenavCityMap_Mauville_1
+
+ .4byte gPokenavCityMap_Rustboro_0
+ .4byte gPokenavCityMap_Rustboro_1
+ .4byte gPokenavCityMap_Fortree_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_Lilycove_0
+ .4byte gPokenavCityMap_Lilycove_1
+
+ .4byte gPokenavCityMap_Mossdeep_0
+ .4byte gPokenavCityMap_Mossdeep_1
+
+ .4byte gPokenavCityMap_Sootopolis_0
+ .4byte NULL
+
+ .4byte gPokenavCityMap_EverGrande_0
+ .4byte gPokenavCityMap_EverGrande_1
+
+ .align 2
gUnknown_083E3270:: @ 83E3270
- .4byte 0x080F0A25
- .4byte 0x080F0A25
- .4byte 0x080F0A75
+ .4byte sub_80F0A24
+ .4byte sub_80F0A24
+ .4byte sub_80F0A74
+
.incbin "graphics/pokenav/icon.gbapal"
gUnknown_083E329C:: @ 83E329C
diff --git a/graphics/pokenav/city_maps/dewford_0.bin b/graphics/pokenav/city_maps/dewford_0.bin
new file mode 100644
index 000000000..5a9bd28e5
--- /dev/null
+++ b/graphics/pokenav/city_maps/dewford_0.bin
@@ -0,0 +1 @@
+22222222222222222222222૸𩒀22222૸2𩒀22222૸௞𩒀2222㺉௞𩒀2222૸૸ପ2222૸속૸2222222222222222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/ever_grande_0.bin b/graphics/pokenav/city_maps/ever_grande_0.bin
new file mode 100644
index 000000000..1e7b16318
--- /dev/null
+++ b/graphics/pokenav/city_maps/ever_grande_0.bin
@@ -0,0 +1 @@
+22222222222૸௔𦌾૸22૸૸2૸଴2૸૸2૸଴2૸૸𐨪𖱊22𯜄𯜄𯘊2଴2𯜄𯜄𯘊2଴2𯜄𯘊𐨪2଴2𯜄𯘊૸૸2𸪬𯜄𯜄𯜄𯜢 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/ever_grande_1.bin b/graphics/pokenav/city_maps/ever_grande_1.bin
new file mode 100644
index 000000000..e676725b5
--- /dev/null
+++ b/graphics/pokenav/city_maps/ever_grande_1.bin
@@ -0,0 +1 @@
+𸪬𯜄𯜄𯜄𯜢2૸𯜄𯜄૸22૸୒ଂ૸22૸୒୺૸22૸ீ22૸22૸ଡ଼૸૸22૸𩒀𩒀૸22𩒀𩒀𩒀𩒀22𩒀𩒀𩒀𩒀22222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/fallarbor_0.bin b/graphics/pokenav/city_maps/fallarbor_0.bin
new file mode 100644
index 000000000..de4ff1220
--- /dev/null
+++ b/graphics/pokenav/city_maps/fallarbor_0.bin
@@ -0,0 +1 @@
+2222222222222222222222૸૸૸22222ଖଂ଴222૸2୺଴2૸22𙹔𙷺૸22ପ୒2଴222૸எ2଴222222222222222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/fortree_0.bin b/graphics/pokenav/city_maps/fortree_0.bin
new file mode 100644
index 000000000..3fbe9ffeb
--- /dev/null
+++ b/graphics/pokenav/city_maps/fortree_0.bin
@@ -0,0 +1 @@
+22222222222222222222222222222222㺉𓭢𣇔22૸૸2쇱2૸222ପ૸22222૸𓭢2𖲆222૸22222222222222222222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/lavaridge_0.bin b/graphics/pokenav/city_maps/lavaridge_0.bin
new file mode 100644
index 000000000..83b9f7a4a
--- /dev/null
+++ b/graphics/pokenav/city_maps/lavaridge_0.bin
@@ -0,0 +1 @@
+2222222222222222222222𦌾ଂଠ2222𦌾୺୺2222૸୒୒2222૸எ2𙶂଴2속ପପ2222૸૸૸2222222222222222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/lilycove_0.bin b/graphics/pokenav/city_maps/lilycove_0.bin
new file mode 100644
index 000000000..59daec706
--- /dev/null
+++ b/graphics/pokenav/city_maps/lilycove_0.bin
@@ -0,0 +1 @@
+222222222𸧮૸૸𦌾૸𬔎௔𦉢𦌾ପ𬔎୦2222𣅺𲝾૸2ଂ୒2𬓒22222222𲝾૸2ଖ୒௨2஘2222𙷒𲝾எ𦍈𩒀૸𬔎2222𩒀222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/lilycove_1.bin b/graphics/pokenav/city_maps/lilycove_1.bin
new file mode 100644
index 000000000..cdd8013c6
--- /dev/null
+++ b/graphics/pokenav/city_maps/lilycove_1.bin
@@ -0,0 +1 @@
+𸧮22222222𬓒૸૸𩑶𦊞𬓒2૸௞𩒀2𲞒2૸௞𩒀𩒊૸ପ௞𩒀𩒞2૸௞𩒀𩏖𬔄૸௞𩒀𩏖𲞺௞𩒀𩒀𩏖𬓒૸૸௞𩏖𸧮22222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/littleroot_0.bin b/graphics/pokenav/city_maps/littleroot_0.bin
new file mode 100644
index 000000000..5dfe77d22
--- /dev/null
+++ b/graphics/pokenav/city_maps/littleroot_0.bin
@@ -0,0 +1 @@
+2222଴22222222଴222222૸૸૸2222ପ૸2଴222૸૸૸2222௔𦉢૸2222௔𦉢૸2222૸૸૸2222222222222222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/mauville_0.bin b/graphics/pokenav/city_maps/mauville_0.bin
new file mode 100644
index 000000000..8def8cacb
--- /dev/null
+++ b/graphics/pokenav/city_maps/mauville_0.bin
@@ -0,0 +1 @@
+222222଴2𸧮22222଴2𸧮2ଌ૸2૸𬔎2୺૸2૸𬓒୦𙹔2𙷒2𲝾2૸2૸૸𬔎2𦌾2૸ପ𬔎2૸૸𓭢2𲝾22222222𸧮22222଴22 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/mauville_1.bin b/graphics/pokenav/city_maps/mauville_1.bin
new file mode 100644
index 000000000..7aec51b0c
--- /dev/null
+++ b/graphics/pokenav/city_maps/mauville_1.bin
@@ -0,0 +1 @@
+𸧮22222222𸧮22222222𬓜૸௔૸22𬕔૸୺૸22𲟶2𣅺𙷒2૸𬓒୒૸૸22𬓺୒22૸22𲞒2𙷺ପ଴2𸧮2222𩒀𩒀𸧮2222𩒀𩒀 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/mossdeep_0.bin b/graphics/pokenav/city_maps/mossdeep_0.bin
new file mode 100644
index 000000000..da4b11960
--- /dev/null
+++ b/graphics/pokenav/city_maps/mossdeep_0.bin
@@ -0,0 +1 @@
+222222222𸧮૸ପ૸속𬔎2૸஘22௨2૸૸2૸௨22૸㻣૸௨2૸𓭢𜺺2௨2૸2ீ22𖴺2𩒀𩒀2ପ𐫞2𩒀𩒀𩒀𩒀𬔎222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/mossdeep_1.bin b/graphics/pokenav/city_maps/mossdeep_1.bin
new file mode 100644
index 000000000..dfa1f2be8
--- /dev/null
+++ b/graphics/pokenav/city_maps/mossdeep_1.bin
@@ -0,0 +1 @@
+𸧮22222222𬓒2૸૸𩒀2𬓒૸૸௞𩏖𬓒૸௔𦉢଴𬓒૸௔𦉢଴𬓒૸૸૸଴𬓒૸૸૸଴𲟬૸2૸2଴𬕨222૸𩒀2𸧮22222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/oldale_0.bin b/graphics/pokenav/city_maps/oldale_0.bin
new file mode 100644
index 000000000..da042c6c1
--- /dev/null
+++ b/graphics/pokenav/city_maps/oldale_0.bin
@@ -0,0 +1 @@
+2222଴22222222଴222222૸૸૸2222ପ૸2଴222૸૸૸22૸૸૸૸2222ଂ૸2଴222૸૸૸222222଴22222222଴2222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/pacifidlog_0.bin b/graphics/pokenav/city_maps/pacifidlog_0.bin
new file mode 100644
index 000000000..e3575006d
--- /dev/null
+++ b/graphics/pokenav/city_maps/pacifidlog_0.bin
@@ -0,0 +1 @@
+𩏖2222222𩒀𩒀𩒀𩒀𩒀𩒀𩏌𩒀𩒀2𩒀𩒀2𩎤𩒀2𩒀𩒀𐨪𣅺22𩒀𩒀𩏌2𩒀2𩒀𩒀𩐜2𩏌2𩒀𩒀𩐰𙷒22𩒀𩒀𩒀𩒀𩒀𩒀𩒀222222𩒀 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/petalburg_0.bin b/graphics/pokenav/city_maps/petalburg_0.bin
new file mode 100644
index 000000000..43f9194ea
--- /dev/null
+++ b/graphics/pokenav/city_maps/petalburg_0.bin
@@ -0,0 +1 @@
+22222222222૸2૸𩒀𩏖2૸2ଌ𩒀𩏖2૸2୺૸଴୦2𙷒𜺺2଴2૸૸2㼋଴2𩒀2ீ2𙷺଴𩒀૸22૸22𩒀𩎚𐩒૸22222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/rustboro_0.bin b/graphics/pokenav/city_maps/rustboro_0.bin
new file mode 100644
index 000000000..324e31d2c
--- /dev/null
+++ b/graphics/pokenav/city_maps/rustboro_0.bin
@@ -0,0 +1 @@
+22222଴22222222଴2222𦌾𦉢2૸଴2𦌾𦉢𠁂22଴𦌾𦉢2૸଴2𦌾𦉢2솿଴2𦌾𦋐222଴2૸૸2૸଴2ପ૸2ପ଴𸪢𬗂𬗠𬗂𬗪 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/rustboro_1.bin b/graphics/pokenav/city_maps/rustboro_1.bin
new file mode 100644
index 000000000..d1d1e532e
--- /dev/null
+++ b/graphics/pokenav/city_maps/rustboro_1.bin
@@ -0,0 +1 @@
+𸪢𬗂𬗠𬗂𬗪2૸૸2𦉢଴2ପଂ2૸଴2୦22𜺺૸22૸૸2૸଴2૸ଠ2ପ222૸஘𙷒2222ପ୒૸૸22૸ଡ଼૸૸22222଴2222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/slateport_0.bin b/graphics/pokenav/city_maps/slateport_0.bin
new file mode 100644
index 000000000..5e634aa1c
--- /dev/null
+++ b/graphics/pokenav/city_maps/slateport_0.bin
@@ -0,0 +1 @@
+22222଴22222222଴2222૸૸2૸଴2ଖ૸2ପ𩏖2஘22𙷒2଴222૸㺉𩒀222222𖱊𩒀22222୒௔𦊞22222𜺺૸2𸪢𵥪𬗠𬗂𬗪 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/slateport_1.bin b/graphics/pokenav/city_maps/slateport_1.bin
new file mode 100644
index 000000000..720b6e6fc
--- /dev/null
+++ b/graphics/pokenav/city_maps/slateport_1.bin
@@ -0,0 +1 @@
+𸪢𵥪𬗠𬗂𬗪2୒૸2𩒀𩏖2𦌾𦉢2௔𦊞2𦌾𦉢2૸଴2𦌾𦉢222଴2𦌾𦉢2𩒀𩏖2𦌾𦊲222𦊞2𦌾𦉢2૸଴22222଴22222222଴222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/sootopolis_0.bin b/graphics/pokenav/city_maps/sootopolis_0.bin
new file mode 100644
index 000000000..b46587887
--- /dev/null
+++ b/graphics/pokenav/city_maps/sootopolis_0.bin
@@ -0,0 +1 @@
+222222222222૸૸ପ଴2૸૸૸૸222૸𦉢ପ଴2૸૸૸૸222௞𩒀ପ଴2ଠ𩎮𩎤ପ222௞𩒀૸଴2௞𩒀𩒀𩎚22222222222 \ No newline at end of file
diff --git a/graphics/pokenav/city_maps/verdanturf_0.bin b/graphics/pokenav/city_maps/verdanturf_0.bin
new file mode 100644
index 000000000..f0fb56fc2
--- /dev/null
+++ b/graphics/pokenav/city_maps/verdanturf_0.bin
@@ -0,0 +1 @@
+2222222222222଴2222222૸ଠଂ22222૸૸଴222૸૸૸૸22૸૸૸22222ପ૸22222૸૸૸2222222222222222222222 \ No newline at end of file