diff options
Diffstat (limited to 'maps')
-rw-r--r-- | maps/BattleTower1F.asm | 8 | ||||
-rw-r--r-- | maps/BattleTowerHallway.asm | 2 | ||||
-rw-r--r-- | maps/BillsHouse.asm | 2 | ||||
-rw-r--r-- | maps/BluesHouse.asm | 2 | ||||
-rw-r--r-- | maps/CeladonCafe.asm | 2 | ||||
-rw-r--r-- | maps/CeladonDeptStore6F.asm | 2 | ||||
-rw-r--r-- | maps/CeladonGameCornerPrizeRoom.asm | 2 | ||||
-rw-r--r-- | maps/DragonsDenB1F.asm | 2 | ||||
-rw-r--r-- | maps/ElmsLab.asm | 2 | ||||
-rw-r--r-- | maps/GoldenrodDeptStore6F.asm | 2 | ||||
-rw-r--r-- | maps/GoldenrodGameCorner.asm | 2 | ||||
-rw-r--r-- | maps/GoldenrodHappinessRater.asm | 2 | ||||
-rw-r--r-- | maps/GoldenrodPokecenter1F.asm | 6 | ||||
-rw-r--r-- | maps/GoldenrodUnderground.asm | 8 | ||||
-rw-r--r-- | maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 32 | ||||
-rw-r--r-- | maps/GoldenrodUndergroundWarehouse.asm | 2 | ||||
-rw-r--r-- | maps/IlexForest.asm | 48 | ||||
-rw-r--r-- | maps/LakeOfRageMagikarpHouse.asm | 4 | ||||
-rw-r--r-- | maps/Pokecenter2F.asm | 8 | ||||
-rw-r--r-- | maps/RadioTower1F.asm | 2 | ||||
-rw-r--r-- | maps/Route35NationalParkGate.asm | 6 | ||||
-rw-r--r-- | maps/Route36NationalParkGate.asm | 6 | ||||
-rw-r--r-- | maps/Route39Barn.asm | 4 | ||||
-rw-r--r-- | maps/TrainerHouseB1F.asm | 2 |
24 files changed, 79 insertions, 79 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index ceb4da590..ef2d5a7f8 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -525,7 +525,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 @@ -635,7 +635,7 @@ Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92 Text_NextUpOpponentNo: ; 0x9eebc text "Next up, opponent" line "no.@" - text_from_ram StringBuffer3 + text_from_ram wStringBuffer3 text ". Ready?" done @@ -734,7 +734,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 @@ -746,7 +746,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 cf24725c9..7b41b7e9a 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -26,7 +26,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 76f268f5a..ff83b7979 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -239,7 +239,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 c101b788b..e402d0c9a 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -104,7 +104,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 62fdbb61e..e2485619b 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -196,7 +196,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 f57308593..243c8d11a 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -107,7 +107,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 01e2229ae..0141f21f3 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 StringBuffer3 + text_from_ram wStringBuffer3 text "?" done diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8f765a333..2404cebe1 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -394,7 +394,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 6a3cb640d..332dedcaf 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -891,7 +891,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 207b28191..bf510a58f 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -100,7 +100,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 674d161c9..c1accf826 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -326,7 +326,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 59bdeb1ba..78f1ca3ba 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -78,7 +78,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 a7f0ed977..bdaea95ea 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -180,10 +180,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" @@ -200,7 +200,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 017d7b23a..22bd3296c 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -34,7 +34,7 @@ GoldenrodUnderground_MapScripts: clearevent EVENT_SWITCH_13 clearevent EVENT_SWITCH_14 writebyte 0 - copyvartobyte UndergroundSwitchPositions + copyvartobyte wUndergroundSwitchPositions return .CheckBasementKey: @@ -617,19 +617,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 88cdcc085..a3733aaec 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -279,9 +279,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 @@ -289,9 +289,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 @@ -304,9 +304,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 @@ -314,9 +314,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 @@ -329,9 +329,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 @@ -339,9 +339,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 @@ -355,7 +355,7 @@ EmergencySwitchScript: yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle writebyte 7 - copyvartobyte UndergroundSwitchPositions + copyvartobyte wUndergroundSwitchPositions setevent EVENT_EMERGENCY_SWITCH setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_2 @@ -367,7 +367,7 @@ EmergencySwitchScript: yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle writebyte 0 - copyvartobyte UndergroundSwitchPositions + copyvartobyte wUndergroundSwitchPositions clearevent EVENT_EMERGENCY_SWITCH clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 @@ -379,7 +379,7 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle: end GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors: - copybytetovar UndergroundSwitchPositions + copybytetovar wUndergroundSwitchPositions ifequal 0, .Position0 ifequal 1, .Position1 ifequal 2, .Position2 @@ -499,7 +499,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors: reloadmappart closetext writebyte 6 - copyvartobyte UndergroundSwitchPositions + copyvartobyte wUndergroundSwitchPositions end .Set4: diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index ba7b0a9a0..054139331 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -30,7 +30,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 b3dcf841f..94e1b0eb0 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -20,7 +20,7 @@ IlexForest_MapScripts: .FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT iftrue .Static - copybytetovar FarfetchdPosition + copybytetovar wFarfetchdPosition ifequal 1, .PositionOne ifequal 2, .PositionTwo ifequal 3, .PositionThree @@ -101,7 +101,7 @@ IlexForestCharcoalApprenticeScript: end IlexForestFarfetchdScript: - copybytetovar FarfetchdPosition + copybytetovar wFarfetchdPosition ifequal 1, .Position1 ifequal 2, .Position2 ifequal 3, .Position3 @@ -126,7 +126,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 2 + loadvar wFarfetchdPosition, 2 end .Position2: @@ -136,7 +136,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 3 + loadvar wFarfetchdPosition, 3 end .Position2_Down: @@ -144,7 +144,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 8 + loadvar wFarfetchdPosition, 8 end .Position3: @@ -154,7 +154,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 4 + loadvar wFarfetchdPosition, 4 end .Position3_Left: @@ -162,7 +162,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 2 + loadvar wFarfetchdPosition, 2 end .Position4: @@ -172,7 +172,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 5 + loadvar wFarfetchdPosition, 5 end .Position4_Up: @@ -180,7 +180,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 3 + loadvar wFarfetchdPosition, 3 end .Position5: @@ -192,7 +192,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 6 + loadvar wFarfetchdPosition, 6 end .Position5_Left: @@ -200,7 +200,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 7 + loadvar wFarfetchdPosition, 7 end .Position5_Up: @@ -208,7 +208,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 4 + loadvar wFarfetchdPosition, 4 end .Position5_Right: @@ -216,7 +216,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 4 + loadvar wFarfetchdPosition, 4 end .Position6: @@ -226,7 +226,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 7 + loadvar wFarfetchdPosition, 7 end .Position6_Right: @@ -234,7 +234,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 5 + loadvar wFarfetchdPosition, 5 end .Position7: @@ -245,7 +245,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 8 + loadvar wFarfetchdPosition, 8 end .Position7_Left: @@ -253,7 +253,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 6 + loadvar wFarfetchdPosition, 6 end .Position7_Down: @@ -261,7 +261,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 5 + loadvar wFarfetchdPosition, 5 end .Position8: @@ -273,7 +273,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 10, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 9 + loadvar wFarfetchdPosition, 9 end .Position8_Right: @@ -281,7 +281,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 7 + loadvar wFarfetchdPosition, 7 end .Position8_Up: @@ -290,7 +290,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 2 + loadvar wFarfetchdPosition, 2 end .Position9: @@ -301,7 +301,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 @@ -312,7 +312,7 @@ IlexForestFarfetchdScript: moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD - loadvar FarfetchdPosition, 8 + loadvar wFarfetchdPosition, 8 end .Position9_Down: @@ -320,7 +320,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 ee58b0b02..9a7b1ff3b 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -198,10 +198,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 de2047d37..1e7f7222b 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -912,7 +912,7 @@ Text_PleaseEnter: Text_RejectNewMon: text "Sorry--@" - text_from_ram StringBuffer1 + text_from_ram wStringBuffer1 text_start line "can't be taken." prompt @@ -920,17 +920,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 b39c01d7d..fdc85f46f 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 StringBuffer3 + text_from_ram wStringBuffer3 text "." done diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 01f4dcaf2..4bde14d74 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -224,7 +224,7 @@ MovementData_0x6a2e9: UnknownText_0x6a2eb: text "Today's @" - text_from_ram StringBuffer3 + text_from_ram wStringBuffer3 text "." line "That means the" @@ -287,7 +287,7 @@ UnknownText_0x6a4c6: para "You'll have to use" line "@" - text_from_ram StringBuffer3 + text_from_ram wStringBuffer3 text ", the" para "first #MON in" @@ -371,7 +371,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 bf53bf964..7afa94b5e 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -474,7 +474,7 @@ MovementData_0x6add1: UnknownText_0x6add5: text "Today's @" - text_from_ram StringBuffer3 + text_from_ram wStringBuffer3 text "." line "That means the" @@ -537,7 +537,7 @@ UnknownText_0x6afb0: para "You'll have to use" line "@" - text_from_ram StringBuffer3 + text_from_ram wStringBuffer3 text ", the" para "first #MON in" @@ -621,7 +621,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 9c3f2af8c..f1bbdcad4 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -67,9 +67,9 @@ MooMoo: checkitem BERRY iffalse .NoBerriesInBag takeitem BERRY - copybytetovar MooMooBerries + copybytetovar wMooMooBerries addvar 1 - copyvartobyte MooMooBerries + copyvartobyte wMooMooBerries ifequal 3, .ThreeBerries ifequal 5, .FiveBerries ifequal 7, .SevenBerries diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index e3dd6f3b3..6ed62935d 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -119,7 +119,7 @@ TrainerHouseB1FIntroText: done TrainerHouseB1FYourOpponentIsText: - text_from_ram StringBuffer3 + text_from_ram wStringBuffer3 text " is your" line "opponent today." done |