summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-10 22:40:33 -0700
committerYamaArashi <shadow962@live.com>2016-09-10 22:40:33 -0700
commit0f2e0c96a733bbceb8ea8f0e1d40796695ecf2fa (patch)
tree98f7613d7eb9bc3265fe2f56625884edd70e8250 /data
parente090eef838387bd8b3ebc78ddd9d6c97f249b84a (diff)
build revision 1 and 2
Diffstat (limited to 'data')
-rw-r--r--data/data2.s4
-rw-r--r--data/decorations.s4
-rw-r--r--data/event_scripts.s6
-rw-r--r--data/graphics.s8
-rw-r--r--data/pokedex_entries.s33
-rw-r--r--data/text/cable_club.s4
-rw-r--r--data/text/tv.s4
7 files changed, 59 insertions, 4 deletions
diff --git a/data/data2.s b/data/data2.s
index ff525aa82..a5258494f 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -28796,7 +28796,11 @@ OtherText_WontHaveAnyEffect:
gUnknown_0840EFA1:: @ 840EFA1
OtherText_CantUseItemOnPoke:
+ .if REVISION >= 1
+ .string "This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$"
+ .else
.string "This item can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$"
+ .endif
gUnknown_0840EFCC:: @ 840EFCC
OtherText_CantBeSwitched:
diff --git a/data/decorations.s b/data/decorations.s
index 37c274389..268ebee9a 100644
--- a/data/decorations.s
+++ b/data/decorations.s
@@ -363,7 +363,11 @@ DecorDesc_MARILL_DOLL: @ 83EACF2
.string "or a desk.$"
DecorDesc_TOGEPI_DOLL: @ 83EAD1E
+ .if REVISION >= 1
+ .string "A TOGEPI doll.\n"
+ .else
.string "A TOPGEPI doll.\n"
+ .endif
.string "Place it on a mat\n"
.string "or a desk.$"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index a8c897621..966e32ad2 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -4953,8 +4953,10 @@ Text_1C6C62: @ 81C6C62
.string "テストよう メッセージです!\n"
.string "ざひょう チェックの イベントです$"
-@ 81C6C83
- .string " $"
+@ 81C6C84
+@ object file boundary?
+ .align 2
+ .string "$"
.include "data/text/save.s"
.include "data/text/intro.s"
diff --git a/data/graphics.s b/data/graphics.s
index 39cfaf5d9..6dcd10041 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -4560,11 +4560,19 @@ gDecoration10000_Gfx:: @ 8EA2A44
.align 2
gFont3LatinGlyphs:: @ 8EA2C44
+ .if REVISION >= 1
+ .incbin "graphics/fonts/font3_lat_rev1.4bpp"
+ .else
.incbin "graphics/fonts/font3_lat.4bpp"
+ .endif
.align 2
gFont4LatinGlyphs:: @ 8EA6BC4
+ .if REVISION >= 1
+ .incbin "graphics/fonts/font4_lat_rev1.4bpp"
+ .else
.incbin "graphics/fonts/font4_lat.4bpp"
+ .endif
.align 2
gFont3JapaneseGlyphs:: @ 8EA8744
diff --git a/data/pokedex_entries.s b/data/pokedex_entries.s
index e9d9fd0ec..f1c206e3c 100644
--- a/data/pokedex_entries.s
+++ b/data/pokedex_entries.s
@@ -320,16 +320,34 @@ DexDescription_Vileplume_2:
.endif
.ifdef SAPPHIRE
+
+ .if REVISION >= 1
+DexDescription_Paras_1:
+ .string "PARAS has parasitic mushrooms growing\non its back called tochukaso. They grow\nlarge by drawing nutrients from this$"
+DexDescription_Paras_2:
+ .string "BUG/GRASS POKéMON host. They are\nhighly valued as a medicine for\nextending life.$"
+ .else
DexDescription_Paras_1:
.string "PARAS has parasitic mushrooms growing\non its back called tochukaso. They grow\nlarge by drawing nutrients from this$"
DexDescription_Paras_2:
.string "BUG POKéMON host. They are highly\nvalued as a medicine for extending life.$"
+ .endif @ REVISION >= 1
+
+ .else
+
+ .if REVISION >= 1
+DexDescription_Paras_1:
+ .string "PARAS has parasitic mushrooms growing\non its back called tochukaso. They grow\nlarge by drawing nutrients from this$"
+DexDescription_Paras_2:
+ .string "BUG/GRASS POKéMON host. They are\nhighly valued as a medicine for\nextending life.$"
.else
DexDescription_Paras_1:
.string "PARAS has parasitic mushrooms growing\non its back called tochukaso. They grow\nlarge by drawing nutrients from the BUG$"
DexDescription_Paras_2:
.string "POKéMON host. They are highly valued as\na medicine for extending life.$"
- .endif
+ .endif @ REVISION >= 1
+
+ .endif @ SAPPHIRE
DexDescription_Parasect_1:
.string "PARASECT is known to infest large trees\nen masse and drain nutrients from the\nlower trunk and roots.$"
@@ -2347,16 +2365,27 @@ DexDescription_Sableye_2:
.endif
.ifdef SAPPHIRE
+
DexDescription_Mawile_1:
.string "Don’t be taken in by this POKéMON’s\ncute face - it’s very dangerous. MAWILE\nfools the foe into letting down its$"
DexDescription_Mawile_2:
.string "guard, then chomps down with its\nmassive jaws. The steel jaws are really\nhorns that have been transformed.$"
+
+ .else
+
+ .if REVISION >= 1
+DexDescription_Mawile_1:
+ .string "MAWILE’s huge jaws are actually steel\nhorns that have been transformed.\nIts docile-looking face serves to lull$"
+DexDescription_Mawile_2:
+ .string "its foe into letting down its guard.\nWhen the foe least expects it, MAWILE\nchomps it with its gaping jaws.$"
.else
DexDescription_Mawile_1:
.string "MAWHILE’s huge jaws are actually steel\nhorns that have been transformed.\nIts docile-looking face serves to lull$"
DexDescription_Mawile_2:
.string "its foe into letting down its guard.\nWhen the foe least expects it, MAWHILE\nchomps it with its gaping jaws.$"
- .endif
+ .endif @ REVISION >= 1
+
+ .endif @ SAPPHIRE
.ifdef SAPPHIRE
DexDescription_Aron_1:
diff --git a/data/text/cable_club.s b/data/text/cable_club.s
index 54f9bda5a..1d3c7fd92 100644
--- a/data/text/cable_club.s
+++ b/data/text/cable_club.s
@@ -13,7 +13,11 @@ OldaleTown_PokemonCenter_2F_Text_1A457E:: @ 81A457E
OldaleTown_PokemonCenter_2F_Text_1A45FE:: @ 81A45FE
.string "Welcome to the POKéMON CABLE CLUB\n"
+ .if REVISION >= 1
+ .string "RECORD CORNER.\p"
+ .else
.string "RECORD CENTER.\p"
+ .endif
.string "You may mix your records as a TRAINER\n"
.string "with the records of your friends.\p"
.string "Would you like to mix records?$"
diff --git a/data/text/tv.s b/data/text/tv.s
index fc26766b1..d2cc1a6fa 100644
--- a/data/text/tv.s
+++ b/data/text/tv.s
@@ -906,7 +906,11 @@ UnknownString_81AB381:: @ 81AB381
.string "Hello!\p"
.string "It’s time for TODAY’S SMART SHOPPER.\p"
.string "INTERVIEWER: How are you, viewers?\p"
+ .if REVISION >= 1
+ .string "Today we’re visiting a shop\n"
+ .else
.string "Today we’re visiting the POKéMON MART\n"
+ .endif
.string "in {STR_VAR_2}.\p"
.string "Let’s check on what the hot sellers\n"
.string "have been recently.$"