summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BattleTower1F.asm8
-rw-r--r--maps/BattleTowerHallway.asm2
-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/GoldenrodPokecenter1F.asm6
-rw-r--r--maps/GoldenrodUnderground.asm8
-rw-r--r--maps/GoldenrodUndergroundSwitchRoomEntrances.asm32
-rw-r--r--maps/GoldenrodUndergroundWarehouse.asm2
-rw-r--r--maps/IlexForest.asm48
-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/Route39Barn.asm4
-rw-r--r--maps/TrainerHouseB1F.asm2
24 files changed, 79 insertions, 79 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index b7113f347..910d27a69 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -527,7 +527,7 @@ Text_AskRegisterRecord_Mobile:
Text_PlayerGotFive: ; 0x9eb7e
text "<PLAYER> got five"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!@"
sound_item
text_waitbutton
@@ -637,7 +637,7 @@ Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92
Text_NextUpOpponentNo: ; 0x9eebc
text "Next up, opponent"
line "no.@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ". Ready?"
done
@@ -736,7 +736,7 @@ Text_APkmnLevelExceeds: ; 0x9f1e5
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
- deciram ScriptVar, 1, 3
+ deciram wScriptVar, 1, 3
text "."
done
@@ -748,7 +748,7 @@ Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
para "This BATTLE ROOM"
line "is for L@"
- deciram ScriptVar, 1, 3
+ deciram wScriptVar, 1, 3
text "."
done
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 6b50783f5..80075fee2 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -28,7 +28,7 @@ BattleTowerHallway_MapScripts:
ld a, BANK(wBTChoiceOfLvlGroup)
ld [rSVBK], a
ld a, [wBTChoiceOfLvlGroup]
- ld [ScriptVar], a
+ ld [wScriptVar], a
pop af
ld [rSVBK], a
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index a4f2e0c0e..e21facaab 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -241,7 +241,7 @@ BillsGrandpaYouDontHaveItTextText:
BillsGrandpaShownPokemonText:
text "Ah, so that is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "?"
para "Isn't it cute!"
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index f31fefb9d..bb8603fbf 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -106,7 +106,7 @@ DaisyAlrightText:
done
GroomedMonLooksContentText:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " looks"
line "content."
done
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index d30baf17d..09a8db2f2 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -198,7 +198,7 @@ EatathonContestPosterText:
FoundLeftoversText:
text "<PLAYER> found"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 5a5e37afc..9a8c0bde8 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -109,7 +109,7 @@ CeladonClangText:
text "Clang!"
para "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "popped out."
done
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 1caed4b19..6d55f57d8 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -235,7 +235,7 @@ CeladonPrizeRoom_AskWhichPrizeText:
CeladonPrizeRoom_ConfirmPurchaseText:
text "OK, so you wanted"
line "a @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "?"
done
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 10b079edf..172619fb6 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -396,7 +396,7 @@ TwinsLeaandpia2AfterBattleText:
Text_FoundDragonFang:
text "<PLAYER> found"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 9322aefe8..ff531500c 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -893,7 +893,7 @@ ChoseStarterText:
ReceivedStarterText:
text "<PLAYER> received"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 73cb0f17e..995afcada 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -102,7 +102,7 @@ GoldenrodVendingText:
GoldenrodClangText:
text "Clang! A can of"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
cont "popped out!"
done
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index d467e84c3..58fc67192 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -328,7 +328,7 @@ GoldenrodGameCornerPrizeVendorWhichPrizeText:
done
GoldenrodGameCornerPrizeVendorConfirmPrizeText:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Is that right?"
done
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 4fa8506dc..f31e8603f 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -80,7 +80,7 @@ UnknownText_0x549a3:
para "Oh? Let me see"
line "your @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
done
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index f01194311..e835ff320 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -182,10 +182,10 @@ UnknownText_0x6113b:
line "to trade your"
para "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " for"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "We'll have to hold"
@@ -202,7 +202,7 @@ UnknownText_0x611c9:
line "to trade your"
para "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " for a"
line "#MON that you"
cont "have never seen."
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index e8e566666..06e15d67a 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -36,7 +36,7 @@ GoldenrodUnderground_MapScripts:
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte 0
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
return
.CheckBasementKey:
@@ -619,19 +619,19 @@ UnknownText_0x7c87b:
done
HaircutBrosText_SlightlyHappier:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " looks a"
line "little happier."
done
HaircutBrosText_Happier:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " looks"
line "happy."
done
HaircutBrosText_MuchHappier:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " looks"
line "delighted!"
done
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 621c133fd..8e84d7d36 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -281,9 +281,9 @@ Switch1Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
addvar 1
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -291,9 +291,9 @@ Switch1Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
addvar -1
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -306,9 +306,9 @@ Switch2Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
addvar 2
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -316,9 +316,9 @@ Switch2Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
addvar -2
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -331,9 +331,9 @@ Switch3Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
addvar 3
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -341,9 +341,9 @@ Switch3Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
addvar -3
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -357,7 +357,7 @@ EmergencySwitchScript:
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 7
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
setevent EVENT_EMERGENCY_SWITCH
setevent EVENT_SWITCH_1
setevent EVENT_SWITCH_2
@@ -369,7 +369,7 @@ EmergencySwitchScript:
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 0
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_EMERGENCY_SWITCH
clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2
@@ -381,7 +381,7 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
end
GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
- copybytetovar UndergroundSwitchPositions
+ copybytetovar wUndergroundSwitchPositions
if_equal 0, .Position0
if_equal 1, .Position1
if_equal 2, .Position2
@@ -501,7 +501,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
reloadmappart
closetext
writebyte 6
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
end
.Set4:
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index be5aa7e31..65e8f648a 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -32,7 +32,7 @@ GoldenrodUndergroundWarehouse_MapScripts:
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte 0
- copyvartobyte UndergroundSwitchPositions
+ copyvartobyte wUndergroundSwitchPositions
return
TrainerGruntM24:
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 01351cd84..de3d79152 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -22,7 +22,7 @@ IlexForest_MapScripts:
.FarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT
iftrue .Static
- copybytetovar FarfetchdPosition
+ copybytetovar wFarfetchdPosition
if_equal 1, .PositionOne
if_equal 2, .PositionTwo
if_equal 3, .PositionThree
@@ -103,7 +103,7 @@ IlexForestCharcoalApprenticeScript:
end
IlexForestFarfetchdScript:
- copybytetovar FarfetchdPosition
+ copybytetovar wFarfetchdPosition
if_equal 1, .Position1
if_equal 2, .Position2
if_equal 3, .Position3
@@ -128,7 +128,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 25
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 2
+ loadvar wFarfetchdPosition, 2
end
.Position2:
@@ -138,7 +138,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 20, 24
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 3
+ loadvar wFarfetchdPosition, 3
end
.Position2_Down:
@@ -146,7 +146,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 8
+ loadvar wFarfetchdPosition, 8
end
.Position3:
@@ -156,7 +156,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 4
+ loadvar wFarfetchdPosition, 4
end
.Position3_Left:
@@ -164,7 +164,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 25
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 2
+ loadvar wFarfetchdPosition, 2
end
.Position4:
@@ -174,7 +174,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 5
+ loadvar wFarfetchdPosition, 5
end
.Position4_Up:
@@ -182,7 +182,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 20, 24
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 3
+ loadvar wFarfetchdPosition, 3
end
.Position5:
@@ -194,7 +194,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 24, 35
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 6
+ loadvar wFarfetchdPosition, 6
end
.Position5_Left:
@@ -202,7 +202,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 7
+ loadvar wFarfetchdPosition, 7
end
.Position5_Up:
@@ -210,7 +210,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 4
+ loadvar wFarfetchdPosition, 4
end
.Position5_Right:
@@ -218,7 +218,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 4
+ loadvar wFarfetchdPosition, 4
end
.Position6:
@@ -228,7 +228,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 7
+ loadvar wFarfetchdPosition, 7
end
.Position6_Right:
@@ -236,7 +236,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 5
+ loadvar wFarfetchdPosition, 5
end
.Position7:
@@ -247,7 +247,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 8
+ loadvar wFarfetchdPosition, 8
end
.Position7_Left:
@@ -255,7 +255,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 24, 35
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 6
+ loadvar wFarfetchdPosition, 6
end
.Position7_Down:
@@ -263,7 +263,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 5
+ loadvar wFarfetchdPosition, 5
end
.Position8:
@@ -275,7 +275,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 10, 35
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 9
+ loadvar wFarfetchdPosition, 9
end
.Position8_Right:
@@ -283,7 +283,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 7
+ loadvar wFarfetchdPosition, 7
end
.Position8_Up:
@@ -292,7 +292,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 25
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 2
+ loadvar wFarfetchdPosition, 2
end
.Position9:
@@ -303,7 +303,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 6, 28
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 10
+ loadvar wFarfetchdPosition, 10
appear ILEXFOREST_BLACK_BELT
setevent EVENT_CHARCOAL_KILN_BOSS
setevent EVENT_HERDED_FARFETCHD
@@ -314,7 +314,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 8
+ loadvar wFarfetchdPosition, 8
end
.Position9_Down:
@@ -322,7 +322,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
- loadvar FarfetchdPosition, 8
+ loadvar wFarfetchdPosition, 8
end
.Position10:
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index c77d823c0..92900c486 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -200,10 +200,10 @@ UnknownText_0x19aabc:
text "CURRENT RECORD"
para "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " caught by"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
db "@@"
LakeOfRageMagikarpHouse_MapEvents:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 11a73de07..40900519c 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -914,7 +914,7 @@ Text_PleaseEnter:
Text_RejectNewMon:
text "Sorry--@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "can't be taken."
prompt
@@ -922,17 +922,17 @@ Text_RejectNewMon:
Text_RejectMonWithNewMove:
text "You can't take the"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " with a"
cont "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
Text_RejectMonWithMail:
text "You can't take the"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " that"
cont "has MAIL with you."
prompt
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 96cd013c6..d17798f1f 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -239,7 +239,7 @@ UnknownText_0x5ceba:
UnknownText_0x5cf3a:
text "This week's ID"
line "number is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 754591060..6dbfe9671 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -226,7 +226,7 @@ MovementData_0x6a2e9:
UnknownText_0x6a2eb:
text "Today's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "That means the"
@@ -289,7 +289,7 @@ UnknownText_0x6a4c6:
para "You'll have to use"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ", the"
para "first #MON in"
@@ -373,7 +373,7 @@ UnknownText_0x6a71f:
UnknownText_0x6a79a:
text "You still have @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "minute(s) left."
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index fa74c7ee5..5251fa470 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -476,7 +476,7 @@ MovementData_0x6add1:
UnknownText_0x6add5:
text "Today's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "That means the"
@@ -539,7 +539,7 @@ UnknownText_0x6afb0:
para "You'll have to use"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ", the"
para "first #MON in"
@@ -623,7 +623,7 @@ UnknownText_0x6b209:
UnknownText_0x6b284:
text "You still have @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "minute(s) left."
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 682b2dea1..5cc21eab5 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -69,9 +69,9 @@ MooMoo:
checkitem BERRY
iffalse .NoBerriesInBag
takeitem BERRY
- copybytetovar MooMooBerries
+ copybytetovar wMooMooBerries
addvar 1
- copyvartobyte MooMooBerries
+ copyvartobyte wMooMooBerries
if_equal 3, .ThreeBerries
if_equal 5, .FiveBerries
if_equal 7, .SevenBerries
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index bb6fd4316..bab0a5b66 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -121,7 +121,7 @@ TrainerHouseB1FIntroText:
done
TrainerHouseB1FYourOpponentIsText:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " is your"
line "opponent today."
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 13:43:53 +0000