summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BillsHouse.asm2
-rw-r--r--maps/BluesHouse.asm2
-rw-r--r--maps/CeladonCafe.asm2
-rw-r--r--maps/CeladonDeptStore6F.asm2
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm2
-rw-r--r--maps/DragonsDenB1F.asm2
-rw-r--r--maps/ElmsLab.asm2
-rw-r--r--maps/GoldenrodDeptStore6F.asm2
-rw-r--r--maps/GoldenrodGameCorner.asm2
-rw-r--r--maps/GoldenrodHappinessRater.asm2
-rw-r--r--maps/GoldenrodUnderground.asm6
-rw-r--r--maps/LakeOfRageMagikarpHouse.asm4
-rw-r--r--maps/Pokecenter2F.asm8
-rw-r--r--maps/RadioTower1F.asm2
-rw-r--r--maps/Route35NationalParkGate.asm6
-rw-r--r--maps/Route36NationalParkGate.asm6
-rw-r--r--maps/TrainerHouseB1F.asm2
17 files changed, 27 insertions, 27 deletions
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index ff83b797..69a7fda7 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -239,7 +239,7 @@ BillsGrandpaYouDontHaveItTextText:
BillsGrandpaShownPokemonText:
text "Ah, so that is"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "?"
para "Isn't it cute!"
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index e402d0c9..27d46e07 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -104,7 +104,7 @@ DaisyAlrightText:
done
GroomedMonLooksContentText:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " looks"
line "content."
done
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 90e655d2..77227fbe 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -196,7 +196,7 @@ EatathonContestPosterText:
FoundLeftoversText:
text "<PLAYER> found a"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index d30f23f1..80c810f9 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -102,7 +102,7 @@ CeladonClangText:
text "Clang!"
para "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "popped out."
done
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 0ddca0a0..82642f83 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -233,7 +233,7 @@ CeladonPrizeRoom_AskWhichPrizeText:
CeladonPrizeRoom_ConfirmPurchaseText:
text "OK, so you wanted"
line "a @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "?"
done
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 13d20b01..0496893a 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -259,7 +259,7 @@ SilverText_Training2:
Text_FoundDragonFang:
text "<PLAYER> found a"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index a74212f4..4f7ef7b5 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -754,7 +754,7 @@ ChoseStarterText:
ReceivedStarterText:
text "<PLAYER> received"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index e718b4ee..b11be1ed 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -100,7 +100,7 @@ GoldenrodVendingText:
GoldenrodClangText:
text "Clang! A can of"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
cont "popped out!"
done
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 89e9c0c9..ea87b115 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -374,7 +374,7 @@ GoldenrodGameCornerPrizeVendorWhichPrizeText:
done
GoldenrodGameCornerPrizeVendorConfirmPrizeText:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "Is that right?"
done
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 2b2093a2..0918b6b7 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -78,7 +78,7 @@ GoldenrodHappinessRaterTeacherText:
para "Oh? Let me see"
line "your @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "…"
done
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 1e629348..eaecc1c5 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -617,19 +617,19 @@ UnknownText_0x7c87b:
done
HaircutBrosText_SlightlyHappier:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " looks a"
line "little happier."
done
HaircutBrosText_Happier:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " looks"
line "happy."
done
HaircutBrosText_MuchHappier:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " looks"
line "delighted!"
done
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 52c5a1e0..4731ec48 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -199,10 +199,10 @@ LakeOfRageMagikarpHouseUnusedRecordText:
text "CURRENT RECORD"
para "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " caught by"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
db "@@"
LakeOfRageMagikarpHouse_MapEvents:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 82b63a39..4d3d7413 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -499,7 +499,7 @@ Text_PleaseEnter:
Text_RejectNewMon:
text "Sorry--@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "can't be taken."
prompt
@@ -507,17 +507,17 @@ Text_RejectNewMon:
Text_RejectMonWithNewMove:
text "You can't take the"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " with a"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
Text_RejectMonWithMail:
text "You can't take the"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " that"
cont "has MAIL with you."
prompt
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 7caa1e5d..0350ae51 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -237,7 +237,7 @@ UnknownText_0x5ceba:
UnknownText_0x5cf3a:
text "This week's ID"
line "number is @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 35040564..18520fdd 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -224,7 +224,7 @@ MovementData_0x6a2e9:
UnknownText_0x6a2eb:
text "Today's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "That means the"
@@ -287,7 +287,7 @@ UnknownText_0x6a4c6:
para "You'll have to use"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ", the"
para "first #MON in"
@@ -371,7 +371,7 @@ UnknownText_0x6a71f:
UnknownText_0x6a79a:
text "You still have @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "minute(s) left."
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 52fc9ac2..8e967b6c 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -475,7 +475,7 @@ MovementData_0x6add1:
UnknownText_0x6add5:
text "Today's @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
line "That means the"
@@ -538,7 +538,7 @@ UnknownText_0x6afb0:
para "You'll have to use"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text ", the"
para "first #MON in"
@@ -622,7 +622,7 @@ UnknownText_0x6b209:
UnknownText_0x6b284:
text "You still have @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "minutes left."
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 00de895a..1380d805 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -119,7 +119,7 @@ TrainerHouseB1FIntroText:
done
TrainerHouseB1FYourOpponentIsText:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " is your"
line "opponent today."
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 10:19:02 +0000