summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--baserom.ipsbin643242 -> 643126 bytes
-rw-r--r--data/data_835B488.s30
-rw-r--r--data/strings.s6
3 files changed, 32 insertions, 4 deletions
diff --git a/baserom.ips b/baserom.ips
index fdab16ff0..bdd4e4f31 100644
--- a/baserom.ips
+++ b/baserom.ips
Binary files differ
diff --git a/data/data_835B488.s b/data/data_835B488.s
index f6bb5878d..fc3032459 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -994,7 +994,35 @@ gUnknown_83E04B0:: @ 83E04B0
.4byte gUnknown_83E0480, 5
gStdStringPtrs:: @ 83E06B8
- .incbin "baserom.gba", 0x3E06B8, 0x74
+ .4byte gUnknown_8417ABF
+ .4byte gUnknown_8417AC4
+ .4byte gUnknown_8417ACB
+ .4byte gUnknown_8417AD0
+ .4byte gUnknown_8417AD6
+ .4byte gUnknown_8417AF4
+ .4byte gUnknown_8417AF9
+ .4byte gUnknown_8417B00
+ .4byte gUnknown_8417B05
+ .4byte gUnknown_8417B0B
+ .4byte gUnknown_8417B11
+ .4byte gUnknown_8417B17
+ .4byte gUnknown_8417B21
+ .4byte gUnknown_8417B2C
+ .4byte gUnknown_8417B36
+ .4byte gUnknown_8417B3E
+ .4byte gUnknown_8417B4B
+ .4byte gUnknown_8417B58
+ .4byte gUnknown_8417B65
+ .4byte gUnknown_8417B72
+ .4byte gUnknown_8417B7C
+ .4byte gUnknown_8417B87
+ .4byte gUnknown_8417B94
+ .4byte gUnknown_8417C2D
+ .4byte gUnknown_8417DA9
+ .4byte gUnknown_8417DB6
+ .4byte gUnknown_8417DC7
+ .4byte gUnknown_8417DD9
+ .4byte gUnknown_8417DE1
gUnknown_83E072C:: @ 83E072C
.incbin "baserom.gba", 0x3E072C, 0xC
diff --git a/data/strings.s b/data/strings.s
index f9fea0e1d..18d7435d9 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -1551,7 +1551,7 @@ gUnknown_8417B21:: @ 0x8417B21
.string "POKé BALLS$"
gUnknown_8417B2C:: @ 0x8417B2C
- .string "TMs を HMs$"
+ .string "TMs & HMs$"
gUnknown_8417B36:: @ 0x8417B36
.string "BERRIES$"
@@ -2890,7 +2890,7 @@ gUnknown_8419D57:: @ 8419D57
.string "POKéMON TRADES$"
gUnknown_8419D66:: @ 8419D66
- .string "UNION TRADES を BATTLES$"
+ .string "UNION TRADES & BATTLES$"
gUnknown_8419D7D:: @ 8419D7D
.string "BERRY CRUSH$"
@@ -4072,7 +4072,7 @@ gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Yuichiro_Ito_Akira_Kinashi:: @ 0
.align 2
gCreditsString_Environment_Tool_Programmers:: @ 0x841DB7C
.string "\n"
- .string "Environment を Tool Programmers\n"
+ .string "Environment & Tool Programmers\n"
.string "\n\n"
.string "\n\n"
.string "$"