diff options
39 files changed, 175 insertions, 141 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index a44f6228f..152a8915e 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -531,7 +531,7 @@ UnknownText_0x9eb45: ; 0x9eb45 UnknownText_0x9eb7e: ; 0x9eb7e db $0, $52, " got five", $4f db "@" - text_from_ram $d0ac + text_from_ram StringBuffer4 db $0, "!@" sound0x0F text_waitbutton @@ -654,7 +654,7 @@ UnknownText_0x9ee92: ; 0x9ee92 UnknownText_0x9eebc: ; 0x9eebc text "Next up, opponent" line "no.@" - text_from_ram $d099 + text_from_ram StringBuffer3 text ". Ready?" done ; 0x9eee0 @@ -770,7 +770,7 @@ UnknownText_0x9f1e5: ; 0x9f1e5 ; 0x9f217 UnknownText_0x9f217: ; 0x9f217 - text_from_ram $cd49 + text_from_ram wcd49 text " may not" line "enter a BATTLE" cont "ROOM under L70." diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 9d3604fb3..d07ebbb3c 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -37,7 +37,7 @@ UnknownScript_0x9f425: ; 0x9f425 special $002e reloadmap if_not_equal $0, UnknownScript_0x9f4c2 - copybytetovar $cf64 + copybytetovar wcf64 if_equal $7, UnknownScript_0x9f4d9 applymovement $2, MovementData_0x9e597 warpsound diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 7532d745a..1ac5939bb 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -32,7 +32,7 @@ Function_0x9f5cb: ; 0x9f5cb ld a, 3 ld [rSVBK], a - ld a, [$d800] + ld a, [w3_d800] ld [ScriptVar], a pop af diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index e1b0ec7a9..91ab8acec 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -262,7 +262,7 @@ UnknownText_0x189784: ; 0x189784 UnknownText_0x1897a6: ; 0x1897a6 text "Ah, so that is" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text "?" para "Isn't it cute!" diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 3d64d322c..59ef62951 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -113,7 +113,7 @@ UnknownText_0x19b266: ; 0x19b266 ; 0x19b296 UnknownText_0x19b296: ; 0x19b296 - text_from_ram $d099 + text_from_ram StringBuffer3 text " looks" line "content." done diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 3c30e8df5..844fde007 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -214,7 +214,7 @@ UnknownText_0x73285: ; 0x73285 UnknownText_0x732e7: ; 0x732e7 text $52, " found" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text "!" done ; 0x732f7 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index ad817566d..a498ab1e1 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -126,7 +126,7 @@ UnknownText_0x71274: ; 0x71274 text "Clang!" para "@" - text_from_ram $d099 + text_from_ram StringBuffer3 db $0 line "popped out." done diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index ac84d1931..2eaa2d81a 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -262,7 +262,7 @@ UnknownText_0x72974: ; 0x72974 UnknownText_0x72991: ; 0x72991 text "OK, so you wanted" line "a @" - text_from_ram $d099 + text_from_ram StringBuffer3 text "?" done ; 0x729ad diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 826205a64..b2d750813 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -503,7 +503,7 @@ UnknownText_0x18cf0f: ; 0x18cf0f UnknownText_0x18cf41: ; 0x18cf41 text $52, " found" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text "!" done ; 0x18cf51 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 12a8da3fd..d9c06ff46 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -984,7 +984,7 @@ ChoseStarterText: ; 0x79487 ReceivedStarterText: ; 0x794ad text $52, " received" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text "!" done ; 0x794c0 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index f4054792a..c5b8fe6f3 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -116,7 +116,7 @@ UnknownText_0x564cb: ; 0x564cb UnknownText_0x564ef: ; 0x564ef text "Clang! A can of" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text $55 db "popped out!" done diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index bd10033ab..8906568e2 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -359,7 +359,7 @@ UnknownText_0x56e8b: ; 0x56e8b ; 0x56ea8 UnknownText_0x56ea8: ; 0x56ea8 - text_from_ram $d099 + text_from_ram StringBuffer3 text "." line "Is that right?" done diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4b3f71a76..f4f856c46 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -87,7 +87,7 @@ UnknownText_0x549a3: ; 0x549a3 para "Oh? Let me see" line "your @" - text_from_ram $d099 + text_from_ram StringBuffer3 text "…" done ; 0x549fc diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 660d4cafa..44c7f78ec 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -193,10 +193,10 @@ UnknownText_0x6113b: ; 0x6113b line "to trade your" para "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text " for" line "@" - text_from_ram $d0ac + text_from_ram StringBuffer4 text "." para "We'll have to hold" @@ -214,7 +214,7 @@ UnknownText_0x611c9: ; 0x611c9 line "to trade your" para "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text " for a" line "#MON that you" cont "have never seen." diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 679164daf..a76abb35d 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -217,10 +217,10 @@ UnknownText_0x19aabc: ; 0x19aabc text "CURRENT RECORD" para "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text " caught by" line "@" - text_from_ram $d0ac + text_from_ram StringBuffer4 db "@@" ; 0x19aae2 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 3f5456ce5..c665af53b 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -115,7 +115,7 @@ UnknownScript_0x5c074: ; 0x5c074 UnknownScript_0x5c088: ; 0x5c088 scall UnknownScript_0x5c114 winlosstext SchoolboyJack1BeatenText, $0000 - copybytetovar $d9f2 + copybytetovar wd9f2 if_equal $4, UnknownScript_0x5c0a7 if_equal $3, UnknownScript_0x5c0ad if_equal $2, UnknownScript_0x5c0b3 @@ -137,7 +137,7 @@ UnknownScript_0x5c0bf: ; 0x5c0bf loadtrainer SCHOOLBOY, JACK1 startbattle returnafterbattle - loadvar $d9f2, $1 + loadvar wd9f2, $1 clearflag $0065 end ; 0x5c0cc @@ -146,7 +146,7 @@ UnknownScript_0x5c0cc: ; 0x5c0cc loadtrainer SCHOOLBOY, JACK2 startbattle returnafterbattle - loadvar $d9f2, $2 + loadvar wd9f2, $2 clearflag $0065 end ; 0x5c0d9 @@ -155,7 +155,7 @@ UnknownScript_0x5c0d9: ; 0x5c0d9 loadtrainer SCHOOLBOY, JACK3 startbattle returnafterbattle - loadvar $d9f2, $3 + loadvar wd9f2, $3 clearflag $0065 end ; 0x5c0e6 @@ -164,7 +164,7 @@ UnknownScript_0x5c0e6: ; 0x5c0e6 loadtrainer SCHOOLBOY, JACK4 startbattle returnafterbattle - loadvar $d9f2, $4 + loadvar wd9f2, $4 clearflag $0065 end ; 0x5c0f3 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index f06ab2cdb..1223de492 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -84,7 +84,7 @@ UnknownScript_0x5afb3: ; 0x5afb3 UnknownScript_0x5afc7: ; 0x5afc7 scall UnknownScript_0x5b06b winlosstext SailorHuey1BeatenText, $0000 - copybytetovar $d9f4 + copybytetovar wd9f4 if_equal $3, UnknownScript_0x5afe2 if_equal $2, UnknownScript_0x5afe8 if_equal $1, UnknownScript_0x5afee @@ -102,7 +102,7 @@ UnknownScript_0x5aff4: ; 0x5aff4 loadtrainer SAILOR, HUEY1 startbattle returnafterbattle - loadvar $d9f4, $1 + loadvar wd9f4, $1 clearflag $0066 end ; 0x5b001 @@ -111,7 +111,7 @@ UnknownScript_0x5b001: ; 0x5b001 loadtrainer SAILOR, HUEY2 startbattle returnafterbattle - loadvar $d9f4, $2 + loadvar wd9f4, $2 clearflag $0066 end ; 0x5b00e @@ -120,7 +120,7 @@ UnknownScript_0x5b00e: ; 0x5b00e loadtrainer SAILOR, HUEY3 startbattle returnafterbattle - loadvar $d9f4, $3 + loadvar wd9f4, $3 clearflag $0066 end ; 0x5b01b diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index f31392fc1..ab4a0c8bf 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -102,7 +102,7 @@ UnknownScript_0x1928be: ; 0x1928be writetext UnknownText_0x192f67 special $0003 iffalse UnknownScript_0x192911 - copybytetovar $cf51 + copybytetovar wcf51 iffalse UnknownScript_0x1928fe special $0005 iffalse UnknownScript_0x192909 @@ -215,7 +215,7 @@ UnknownScript_0x192973: ; 0x192973 writetext UnknownText_0x192f67 special $0003 iffalse UnknownScript_0x1929c6 - copybytetovar $cf51 + copybytetovar wcf51 iffalse UnknownScript_0x1929b3 special $0005 iffalse UnknownScript_0x1929be @@ -356,7 +356,7 @@ LinkReceptionistScript_0x192a2d: ; 0x192a2d writetext UnknownText_0x192f67 special $0003 iffalse UnknownScript_0x192a99 - copybytetovar $cf51 + copybytetovar wcf51 iffalse UnknownScript_0x192a84 special $0005 writetext UnknownText_0x19304a @@ -1028,7 +1028,7 @@ UnknownText_0x19307c: ; 0x19307c UnknownText_0x19308b: ; 0x19308b text "Sorry--@" - text_from_ram $d073 + text_from_ram StringBuffer1 db $0 line "can't be taken." prompt @@ -1037,10 +1037,10 @@ UnknownText_0x19308b: ; 0x19308b UnknownText_0x1930a8: ; 0x1930a8 text "You can't take the" line "@" - text_from_ram $d073 + text_from_ram StringBuffer1 text " with a" cont "@" - text_from_ram $d086 + text_from_ram StringBuffer2 text "." prompt ; 0x1930cf @@ -1048,7 +1048,7 @@ UnknownText_0x1930a8: ; 0x1930a8 UnknownText_0x1930cf: ; 0x1930cf text "You can't take the" line "@" - text_from_ram $d073 + text_from_ram StringBuffer1 text " that" cont "has MAIL with you." prompt diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index eaddfd5bb..0fda5651e 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -273,7 +273,7 @@ UnknownText_0x5ceba: ; 0x5ceba UnknownText_0x5cf3a: ; 0x5cf3a text "This week's ID" line "number is @" - text_from_ram $d099 + text_from_ram StringBuffer3 text "." done ; 0x5cf5a diff --git a/maps/Route26.asm b/maps/Route26.asm index 5824c863d..cd7a08c6c 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -86,7 +86,7 @@ UnknownScript_0x1a4d65: ; 0x1a4d65 UnknownScript_0x1a4d79: ; 0x1a4d79 scall UnknownScript_0x1a4dd7 winlosstext CooltrainermGaven3BeatenText, $0000 - copybytetovar $d9f5 + copybytetovar wd9f5 if_equal $2, UnknownScript_0x1a4d90 if_equal $1, UnknownScript_0x1a4d96 if_equal $0, UnknownScript_0x1a4d9c @@ -100,7 +100,7 @@ UnknownScript_0x1a4d9c: ; 0x1a4d9c loadtrainer COOLTRAINERM, GAVEN3 startbattle returnafterbattle - loadvar $d9f5, $1 + loadvar wd9f5, $1 clearflag $0067 end ; 0x1a4da9 @@ -109,7 +109,7 @@ UnknownScript_0x1a4da9: ; 0x1a4da9 loadtrainer COOLTRAINERM, GAVEN1 startbattle returnafterbattle - loadvar $d9f5, $2 + loadvar wd9f5, $2 clearflag $0067 end ; 0x1a4db6 @@ -237,7 +237,7 @@ UnknownScript_0x1a4e21: ; 0x1a4e21 UnknownScript_0x1a4e35: ; 0x1a4e35 scall UnknownScript_0x1a4e93 winlosstext CooltrainerfBeth1BeatenText, $0000 - copybytetovar $d9f6 + copybytetovar wd9f6 if_equal $2, UnknownScript_0x1a4e4c if_equal $1, UnknownScript_0x1a4e52 if_equal $0, UnknownScript_0x1a4e58 @@ -251,7 +251,7 @@ UnknownScript_0x1a4e58: ; 0x1a4e58 loadtrainer COOLTRAINERF, BETH1 startbattle returnafterbattle - loadvar $d9f6, $1 + loadvar wd9f6, $1 clearflag $0068 end ; 0x1a4e65 @@ -260,7 +260,7 @@ UnknownScript_0x1a4e65: ; 0x1a4e65 loadtrainer COOLTRAINERF, BETH2 startbattle returnafterbattle - loadvar $d9f6, $2 + loadvar wd9f6, $2 clearflag $0068 end ; 0x1a4e72 diff --git a/maps/Route27.asm b/maps/Route27.asm index e9df736f9..3261eaf19 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -127,7 +127,7 @@ UnknownScript_0x1a08eb: ; 0x1a08eb UnknownScript_0x1a08ff: ; 0x1a08ff scall UnknownScript_0x1a096f winlosstext Bird_keeperJose2BeatenText, $0000 - copybytetovar $d9f7 + copybytetovar wd9f7 if_equal $2, UnknownScript_0x1a0916 if_equal $1, UnknownScript_0x1a091c if_equal $0, UnknownScript_0x1a0922 @@ -141,7 +141,7 @@ UnknownScript_0x1a0922: ; 0x1a0922 loadtrainer BIRD_KEEPER, JOSE2 startbattle returnafterbattle - loadvar $d9f7, $1 + loadvar wd9f7, $1 clearflag $0069 end ; 0x1a092f @@ -150,7 +150,7 @@ UnknownScript_0x1a092f: ; 0x1a092f loadtrainer BIRD_KEEPER, JOSE1 startbattle returnafterbattle - loadvar $d9f7, $2 + loadvar wd9f7, $2 clearflag $0069 end ; 0x1a093c @@ -329,7 +329,7 @@ UnknownScript_0x1a09d5: ; 0x1a09d5 UnknownScript_0x1a09e9: ; 0x1a09e9 scall UnknownScript_0x1a0a47 winlosstext CooltrainerfReena1BeatenText, $0000 - copybytetovar $d9f8 + copybytetovar wd9f8 if_equal $2, UnknownScript_0x1a0a00 if_equal $1, UnknownScript_0x1a0a06 if_equal $0, UnknownScript_0x1a0a0c @@ -343,7 +343,7 @@ UnknownScript_0x1a0a0c: ; 0x1a0a0c loadtrainer COOLTRAINERF, REENA1 startbattle returnafterbattle - loadvar $d9f8, $1 + loadvar wd9f8, $1 clearflag $006a end ; 0x1a0a19 @@ -352,7 +352,7 @@ UnknownScript_0x1a0a19: ; 0x1a0a19 loadtrainer COOLTRAINERF, REENA2 startbattle returnafterbattle - loadvar $d9f8, $2 + loadvar wd9f8, $2 clearflag $006a end ; 0x1a0a26 diff --git a/maps/Route30.asm b/maps/Route30.asm index 9b57182d7..a7e223770 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -78,7 +78,7 @@ UnknownScript_0x1a16cc: ; 0x1a16cc UnknownScript_0x1a16e0: ; 0x1a16e0 scall UnknownScript_0x1a179b winlosstext YoungsterJoey1BeatenText, $0000 - copybytetovar $d9f9 + copybytetovar wd9f9 if_equal $4, UnknownScript_0x1a16ff if_equal $3, UnknownScript_0x1a1705 if_equal $2, UnknownScript_0x1a170b @@ -100,7 +100,7 @@ UnknownScript_0x1a1717: ; 0x1a717 loadtrainer YOUNGSTER, JOEY1 startbattle returnafterbattle - loadvar $d9f9, $1 + loadvar wd9f9, $1 clearflag $006b end ; 0x1a1724 @@ -109,7 +109,7 @@ UnknownScript_0x1a1724: ; 0x1a1724 loadtrainer YOUNGSTER, JOEY2 startbattle returnafterbattle - loadvar $d9f9, $2 + loadvar wd9f9, $2 clearflag $006b end ; 0x1a1731 @@ -118,7 +118,7 @@ UnknownScript_0x1a1731: ; 0x1a1731 loadtrainer YOUNGSTER, JOEY3 startbattle returnafterbattle - loadvar $d9f9, $3 + loadvar wd9f9, $3 clearflag $006b end ; 0x1a173e @@ -127,7 +127,7 @@ UnknownScript_0x1a173e: ; 0x1a173e loadtrainer YOUNGSTER, JOEY4 startbattle returnafterbattle - loadvar $d9f9, $4 + loadvar wd9f9, $4 clearflag $006b end ; 0x1a174b diff --git a/maps/Route31.asm b/maps/Route31.asm index 5cd903103..b24345965 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -74,7 +74,7 @@ UnknownScript_0x1a547f: ; 0x1a547f UnknownScript_0x1a5493: ; 0x1a5493 scall UnknownScript_0x1a5564 winlosstext Bug_catcherWade1BeatenText, $0000 - copybytetovar $d9fa + copybytetovar wd9fa if_equal $4, UnknownScript_0x1a54b2 if_equal $3, UnknownScript_0x1a54b8 if_equal $2, UnknownScript_0x1a54be @@ -96,7 +96,7 @@ UnknownScript_0x1a54ca: ; 0x1a54ca loadtrainer BUG_CATCHER, WADE1 startbattle returnafterbattle - loadvar $d9fa, $1 + loadvar wd9fa, $1 clearflag $006c end ; 0x1a54d7 @@ -105,7 +105,7 @@ UnknownScript_0x1a54d7: ; 0x1a54d7 loadtrainer BUG_CATCHER, WADE2 startbattle returnafterbattle - loadvar $d9fa, $2 + loadvar wd9fa, $2 clearflag $006c end ; 0x1a54e4 @@ -114,7 +114,7 @@ UnknownScript_0x1a54e4: ; 0x1a54e4 loadtrainer BUG_CATCHER, WADE3 startbattle returnafterbattle - loadvar $d9fa, $3 + loadvar wd9fa, $3 clearflag $006c end ; 0x1a54f1 @@ -123,7 +123,7 @@ UnknownScript_0x1a54f1: ; 0x1a54f1 loadtrainer BUG_CATCHER, WADE4 startbattle returnafterbattle - loadvar $d9fa, $4 + loadvar wd9fa, $4 clearflag $006c end ; 0x1a54fe diff --git a/maps/Route32.asm b/maps/Route32.asm index 0b37e58ed..ac3124f47 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -256,7 +256,7 @@ UnknownScript_0x190569: ; 0x190569 UnknownScript_0x19057d: ; 0x19057d scall UnknownScript_0x19060f winlosstext FisherRalph1BeatenText, $0000 - copybytetovar $d9fb + copybytetovar wd9fb if_equal $4, UnknownScript_0x19059c if_equal $3, UnknownScript_0x1905a2 if_equal $2, UnknownScript_0x1905a8 @@ -278,7 +278,7 @@ UnknownScript_0x1905b4: ; 0x1905b4 loadtrainer FISHER, RALPH1 startbattle returnafterbattle - loadvar $d9fb, $1 + loadvar wd9fb, $1 clearflag $006d end ; 0x1905c1 @@ -287,7 +287,7 @@ UnknownScript_0x1905c1: ; 0x1905c1 loadtrainer FISHER, RALPH2 startbattle returnafterbattle - loadvar $d9fb, $2 + loadvar wd9fb, $2 clearflag $006d end ; 0x1905ce @@ -296,7 +296,7 @@ UnknownScript_0x1905ce: ; 0x1905ce loadtrainer FISHER, RALPH3 startbattle returnafterbattle - loadvar $d9fb, $3 + loadvar wd9fb, $3 clearflag $006d end ; 0x1905db @@ -305,7 +305,7 @@ UnknownScript_0x1905db: ; 0x1905db loadtrainer FISHER, RALPH4 startbattle returnafterbattle - loadvar $d9fb, $4 + loadvar wd9fb, $4 clearflag $006d end ; 0x1905e8 @@ -440,7 +440,7 @@ UnknownScript_0x190659: ; 0x190659 UnknownScript_0x19066d: ; 0x19066d scall UnknownScript_0x1906f9 winlosstext PicnickerLiz1BeatenText, $0000 - copybytetovar $d9fc + copybytetovar wd9fc if_equal $4, UnknownScript_0x19068c if_equal $3, UnknownScript_0x190692 if_equal $2, UnknownScript_0x190698 @@ -462,7 +462,7 @@ UnknownScript_0x1906a4: ; 0x1906a4 loadtrainer PICNICKER, LIZ1 startbattle returnafterbattle - loadvar $d9fc, $1 + loadvar wd9fc, $1 clearflag $006e end ; 0x1906b1 @@ -471,7 +471,7 @@ UnknownScript_0x1906b1: ; 0x1906b1 loadtrainer PICNICKER, LIZ2 startbattle returnafterbattle - loadvar $d9fc, $2 + loadvar wd9fc, $2 clearflag $006e end ; 0x1906be @@ -480,7 +480,7 @@ UnknownScript_0x1906be: ; 0x1906be loadtrainer PICNICKER, LIZ3 startbattle returnafterbattle - loadvar $d9fc, $3 + loadvar wd9fc, $3 clearflag $006e end ; 0x1906cb @@ -489,7 +489,7 @@ UnknownScript_0x1906cb: ; 0x1906cb loadtrainer PICNICKER, LIZ4 startbattle returnafterbattle - loadvar $d9fc, $4 + loadvar wd9fc, $4 clearflag $006e end ; 0x1906d8 diff --git a/maps/Route33.asm b/maps/Route33.asm index c1a4997e6..f8ece08cc 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -63,7 +63,7 @@ UnknownScript_0x1ac03d: ; 0x1ac03d UnknownScript_0x1ac051: ; 0x1ac051 scall UnknownScript_0x1ac0e3 winlosstext HikerAnthony2BeatenText, $0000 - copybytetovar $d9fd + copybytetovar wd9fd if_equal $4, UnknownScript_0x1ac070 if_equal $3, UnknownScript_0x1ac076 if_equal $2, UnknownScript_0x1ac07c @@ -85,7 +85,7 @@ UnknownScript_0x1ac088: ; 0x1ac088 loadtrainer HIKER, ANTHONY2 startbattle returnafterbattle - loadvar $d9fd, $1 + loadvar wd9fd, $1 clearflag $006f end ; 0x1ac095 @@ -94,7 +94,7 @@ UnknownScript_0x1ac095: ; 0x1ac095 loadtrainer HIKER, ANTHONY1 startbattle returnafterbattle - loadvar $d9fd, $2 + loadvar wd9fd, $2 clearflag $006f end ; 0x1ac0a2 @@ -103,7 +103,7 @@ UnknownScript_0x1ac0a2: ; 0x1ac0a2 loadtrainer HIKER, ANTHONY3 startbattle returnafterbattle - loadvar $d9fd, $3 + loadvar wd9fd, $3 clearflag $006f end ; 0x1ac0af @@ -112,7 +112,7 @@ UnknownScript_0x1ac0af: ; 0x1ac0af loadtrainer HIKER, ANTHONY4 startbattle returnafterbattle - loadvar $d9fd, $4 + loadvar wd9fd, $4 clearflag $006f end ; 0x1ac0bc diff --git a/maps/Route34.asm b/maps/Route34.asm index e0f321872..94c5b59b3 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -139,7 +139,7 @@ UnknownScript_0x780a9: ; 0x780a9 UnknownScript_0x780bd: ; 0x780bd scall UnknownScript_0x7814f winlosstext CamperTodd1BeatenText, $0000 - copybytetovar $d9fe + copybytetovar wd9fe if_equal $4, UnknownScript_0x780dc if_equal $3, UnknownScript_0x780e2 if_equal $2, UnknownScript_0x780e8 @@ -161,7 +161,7 @@ UnknownScript_0x780f4: ; 0x780f4 loadtrainer CAMPER, TODD1 startbattle returnafterbattle - loadvar $d9fe, $1 + loadvar wd9fe, $1 clearflag $0070 end ; 0x78101 @@ -170,7 +170,7 @@ UnknownScript_0x78101: ; 0x78101 loadtrainer CAMPER, TODD2 startbattle returnafterbattle - loadvar $d9fe, $2 + loadvar wd9fe, $2 clearflag $0070 end ; 0x7810e @@ -179,7 +179,7 @@ UnknownScript_0x7810e: ; 0x7810e loadtrainer CAMPER, TODD3 startbattle returnafterbattle - loadvar $d9fe, $3 + loadvar wd9fe, $3 clearflag $0070 end ; 0x7811b @@ -188,7 +188,7 @@ UnknownScript_0x7811b: ; 0x7811b loadtrainer CAMPER, TODD4 startbattle returnafterbattle - loadvar $d9fe, $4 + loadvar wd9fe, $4 clearflag $0070 end ; 0x78128 @@ -296,7 +296,7 @@ UnknownScript_0x7818b: ; 0x7818b UnknownScript_0x7819f: ; 0x7819f scall UnknownScript_0x78240 winlosstext PicnickerGina1BeatenText, $0000 - copybytetovar $d9ff + copybytetovar wd9ff if_equal $4, UnknownScript_0x781be if_equal $3, UnknownScript_0x781c4 if_equal $2, UnknownScript_0x781ca @@ -318,7 +318,7 @@ UnknownScript_0x781d6: ; 0x781d6 loadtrainer PICNICKER, GINA1 startbattle returnafterbattle - loadvar $d9ff, $1 + loadvar wd9ff, $1 clearflag $0071 end ; 0x781e3 @@ -327,7 +327,7 @@ UnknownScript_0x781e3: ; 0x781e3 loadtrainer PICNICKER, GINA2 startbattle returnafterbattle - loadvar $d9ff, $2 + loadvar wd9ff, $2 clearflag $0071 end ; 0x781f0 @@ -336,7 +336,7 @@ UnknownScript_0x781f0: ; 0x781f0 loadtrainer PICNICKER, GINA3 startbattle returnafterbattle - loadvar $d9ff, $3 + loadvar wd9ff, $3 clearflag $0071 end ; 0x781fd @@ -345,7 +345,7 @@ UnknownScript_0x781fd: ; 0x781fd loadtrainer PICNICKER, GINA4 startbattle returnafterbattle - loadvar $d9ff, $4 + loadvar wd9ff, $4 clearflag $0071 end ; 0x7820a diff --git a/maps/Route35.asm b/maps/Route35.asm index 1eacf18bc..568fe88ea 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -285,7 +285,7 @@ UnknownScript_0x19c9a7: ; 0x19c9a7 UnknownScript_0x19c9bb: ; 0x19c9bb scall UnknownScript_0x19c91b winlosstext Bug_catcherArnie1BeatenText, $0000 - copybytetovar $da01 + copybytetovar wda01 if_equal $4, UnknownScript_0x19c9da if_equal $3, UnknownScript_0x19c9e0 if_equal $2, UnknownScript_0x19c9e6 @@ -307,7 +307,7 @@ UnknownScript_0x19c9f2: ; 0x19c9f2 loadtrainer BUG_CATCHER, ARNIE1 startbattle returnafterbattle - loadvar $da01, $1 + loadvar wda01, $1 clearflag $0072 end ; 0x19c9ff @@ -316,7 +316,7 @@ UnknownScript_0x19c9ff: ; 0x19c9ff loadtrainer BUG_CATCHER, ARNIE2 startbattle returnafterbattle - loadvar $da01, $2 + loadvar wda01, $2 clearflag $0072 end ; 0x19ca0c @@ -325,7 +325,7 @@ UnknownScript_0x19ca0c: ; 0x19ca0c loadtrainer BUG_CATCHER, ARNIE3 startbattle returnafterbattle - loadvar $da01, $3 + loadvar wda01, $3 clearflag $0072 end ; 0x19ca19 @@ -334,7 +334,7 @@ UnknownScript_0x19ca19: ; 0x19ca19 loadtrainer BUG_CATCHER, ARNIE4 startbattle returnafterbattle - loadvar $da01, $4 + loadvar wda01, $4 clearflag $0072 end ; 0x19ca26 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 7e393a2cd..684c61c08 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -255,7 +255,7 @@ MovementData_0x6a2e9: ; 0x6a2e9 UnknownText_0x6a2eb: ; 0x6a2eb text "Today's @" - text_from_ram $d099 + text_from_ram StringBuffer3 text "." line "That means the" @@ -322,7 +322,7 @@ UnknownText_0x6a4c6: ; 0x6a4c6 para "You'll have to use" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text ", the" para "first #MON in" @@ -414,7 +414,7 @@ UnknownText_0x6a71f: ; 0x6a71f UnknownText_0x6a79a: ; 0x6a79a text "You still have @" - text_from_ram $d099 + text_from_ram StringBuffer3 db $0 line "minute(s) left." diff --git a/maps/Route36.asm b/maps/Route36.asm index 0e25bcbd1..1a07ddf63 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -229,7 +229,7 @@ UnknownScript_0x19412c: ; 0x19412c UnknownScript_0x194140: ; 0x194140 scall UnknownScript_0x1941e1 winlosstext SchoolboyAlan1BeatenText, $0000 - copybytetovar $da02 + copybytetovar wda02 if_equal $4, UnknownScript_0x19415f if_equal $3, UnknownScript_0x194165 if_equal $2, UnknownScript_0x19416b @@ -251,7 +251,7 @@ UnknownScript_0x194177: ; 0x194177 loadtrainer SCHOOLBOY, ALAN1 startbattle returnafterbattle - loadvar $da02, $1 + loadvar wda02, $1 clearflag $0073 end ; 0x194184 @@ -260,7 +260,7 @@ UnknownScript_0x194184: ; 0x194184 loadtrainer SCHOOLBOY, ALAN2 startbattle returnafterbattle - loadvar $da02, $2 + loadvar wda02, $2 clearflag $0073 end ; 0x194191 @@ -269,7 +269,7 @@ UnknownScript_0x194191: ; 0x194191 loadtrainer SCHOOLBOY, ALAN3 startbattle returnafterbattle - loadvar $da02, $3 + loadvar wda02, $3 clearflag $0073 end ; 0x19419e @@ -278,7 +278,7 @@ UnknownScript_0x19419e: ; 0x19419e loadtrainer SCHOOLBOY, ALAN4 startbattle returnafterbattle - loadvar $da02, $4 + loadvar wda02, $4 clearflag $0073 end ; 0x1941ab diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index ed4813626..93133e342 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -517,7 +517,7 @@ MovementData_0x6add1: ; 0x6add1 UnknownText_0x6add5: ; 0x6add5 text "Today's @" - text_from_ram $d099 + text_from_ram StringBuffer3 text "." line "That means the" @@ -584,7 +584,7 @@ UnknownText_0x6afb0: ; 0x6afb0 para "You'll have to use" line "@" - text_from_ram $d099 + text_from_ram StringBuffer3 text ", the" para "first #MON in" @@ -676,7 +676,7 @@ UnknownText_0x6b209: ; 0x6b209 UnknownText_0x6b284: ; 0x6b284 text "You still have @" - text_from_ram $d099 + text_from_ram StringBuffer3 db $0 line "minute(s) left." diff --git a/maps/Route38.asm b/maps/Route38.asm index 12840be16..85c08531d 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -117,7 +117,7 @@ UnknownScript_0x1a1d6e: ; 0x1a1d6e UnknownScript_0x1a1d82: ; 0x1a1d82 scall UnknownScript_0x1a1e23 winlosstext LassDana1BeatenText, $0000 - copybytetovar $da03 + copybytetovar wda03 if_equal $4, UnknownScript_0x1a1da1 if_equal $3, UnknownScript_0x1a1da7 if_equal $2, UnknownScript_0x1a1dad @@ -139,7 +139,7 @@ UnknownScript_0x1a1db9: ; 0x1a1db9 loadtrainer LASS, DANA1 startbattle returnafterbattle - loadvar $da03, $1 + loadvar wda03, $1 clearflag $0074 end ; 0x1a1dc6 @@ -148,7 +148,7 @@ UnknownScript_0x1a1dc6: ; 0x1a1dc6 loadtrainer LASS, DANA2 startbattle returnafterbattle - loadvar $da03, $2 + loadvar wda03, $2 clearflag $0074 end ; 0x1a1dd3 @@ -157,7 +157,7 @@ UnknownScript_0x1a1dd3: ; 0x1a1dd3 loadtrainer LASS, DANA3 startbattle returnafterbattle - loadvar $da03, $3 + loadvar wda03, $3 clearflag $0074 end ; 0x1a1de0 @@ -166,7 +166,7 @@ UnknownScript_0x1a1de0: ; 0x1a1de0 loadtrainer LASS, DANA4 startbattle returnafterbattle - loadvar $da03, $4 + loadvar wda03, $4 clearflag $0074 end ; 0x1a1ded @@ -288,7 +288,7 @@ UnknownScript_0x1a1e61: ; 0x1a1e61 UnknownScript_0x1a1e75: ; 0x1a1e75 scall UnknownScript_0x1a1f01 winlosstext SchoolboyChad1BeatenText, $0000 - copybytetovar $da04 + copybytetovar wda04 if_equal $4, UnknownScript_0x1a1e94 if_equal $3, UnknownScript_0x1a1e9a if_equal $2, UnknownScript_0x1a1ea0 @@ -310,7 +310,7 @@ UnknownScript_0x1a1eac: ; 0x1a1eac loadtrainer SCHOOLBOY, CHAD1 startbattle returnafterbattle - loadvar $da04, $1 + loadvar wda04, $1 clearflag $0075 end ; 0x1a1eb9 @@ -319,7 +319,7 @@ UnknownScript_0x1a1eb9: ; 0x1a1eb9 loadtrainer SCHOOLBOY, CHAD2 startbattle returnafterbattle - loadvar $da04, $2 + loadvar wda04, $2 clearflag $0075 end ; 0x1a1ec6 @@ -328,7 +328,7 @@ UnknownScript_0x1a1ec6: ; 0x1a1ec6 loadtrainer SCHOOLBOY, CHAD3 startbattle returnafterbattle - loadvar $da04, $3 + loadvar wda04, $3 clearflag $0075 end ; 0x1a1ed3 @@ -337,7 +337,7 @@ UnknownScript_0x1a1ed3: ; 0x1a1ed3 loadtrainer SCHOOLBOY, CHAD4 startbattle returnafterbattle - loadvar $da04, $4 + loadvar wda04, $4 clearflag $0075 end ; 0x1a1ee0 diff --git a/maps/Route42.asm b/maps/Route42.asm index 296258be2..df3d730df 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -84,7 +84,7 @@ UnknownScript_0x1a926b: ; 0x1a926b UnknownScript_0x1a927f: ; 0x1a927f scall UnknownScript_0x1a9309 winlosstext FisherTully1BeatenText, $0000 - copybytetovar $da06 + copybytetovar wda06 if_equal $3, UnknownScript_0x1a929a if_equal $2, UnknownScript_0x1a92a0 if_equal $1, UnknownScript_0x1a92a6 @@ -102,7 +102,7 @@ UnknownScript_0x1a92ac: ; 0x1a92ac loadtrainer FISHER, TULLY1 startbattle returnafterbattle - loadvar $da06, $1 + loadvar wda06, $1 clearflag $0076 end ; 0x1a92b9 @@ -111,7 +111,7 @@ UnknownScript_0x1a92b9: ; 0x1a92b9 loadtrainer FISHER, TULLY2 startbattle returnafterbattle - loadvar $da06, $2 + loadvar wda06, $2 clearflag $0076 end ; 0x1a92c6 @@ -120,7 +120,7 @@ UnknownScript_0x1a92c6: ; 0x1a92c6 loadtrainer FISHER, TULLY3 startbattle returnafterbattle - loadvar $da06, $3 + loadvar wda06, $3 clearflag $0076 end ; 0x1a92d3 diff --git a/maps/Route43.asm b/maps/Route43.asm index 19f573c56..c29d4c1c2 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -131,7 +131,7 @@ UnknownScript_0x19d0bb: ; 0x19d0bb UnknownScript_0x19d0cf: ; 0x19d0cf scall UnknownScript_0x19d144 winlosstext PokemaniacBrent1BeatenText, $0000 - copybytetovar $da07 + copybytetovar wda07 if_equal $3, UnknownScript_0x19d0ea if_equal $2, UnknownScript_0x19d0f0 if_equal $1, UnknownScript_0x19d0f6 @@ -149,7 +149,7 @@ UnknownScript_0x19d0fc: ; 0x19d0fc loadtrainer POKEMANIAC, BRENT1 startbattle returnafterbattle - loadvar $da07, $1 + loadvar wda07, $1 clearflag $0077 end ; 0x19d109 @@ -158,7 +158,7 @@ UnknownScript_0x19d109: ; 0x19d109 loadtrainer POKEMANIAC, BRENT2 startbattle returnafterbattle - loadvar $da07, $2 + loadvar wda07, $2 clearflag $0077 end ; 0x19d116 @@ -167,7 +167,7 @@ UnknownScript_0x19d116: ; 0x19d116 loadtrainer POKEMANIAC, BRENT3 startbattle returnafterbattle - loadvar $da07, $3 + loadvar wda07, $3 clearflag $0077 end ; 0x19d123 @@ -328,7 +328,7 @@ UnknownScript_0x19d1ad: ; 0x19d1ad UnknownScript_0x19d1c1: ; 0x19d1c1 scall UnknownScript_0x19d251 winlosstext PicnickerTiffany3BeatenText, $0000 - copybytetovar $da08 + copybytetovar wda08 if_equal $3, UnknownScript_0x19d1dc if_equal $2, UnknownScript_0x19d1e2 if_equal $1, UnknownScript_0x19d1e8 @@ -346,7 +346,7 @@ UnknownScript_0x19d1ee: ; 0x19d1ee loadtrainer PICNICKER, TIFFANY3 startbattle returnafterbattle - loadvar $da08, $1 + loadvar wda08, $1 clearflag $0078 end ; 0x19d1fb @@ -355,7 +355,7 @@ UnknownScript_0x19d1fb: ; 0x19d1fb loadtrainer PICNICKER, TIFFANY1 startbattle returnafterbattle - loadvar $da08, $2 + loadvar wda08, $2 clearflag $0078 end ; 0x19d208 @@ -364,7 +364,7 @@ UnknownScript_0x19d208: ; 0x19d208 loadtrainer PICNICKER, TIFFANY2 startbattle returnafterbattle - loadvar $da08, $3 + loadvar wda08, $3 clearflag $0078 end ; 0x19d215 diff --git a/maps/Route44.asm b/maps/Route44.asm index a19262533..d4d88ff60 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -57,7 +57,7 @@ UnknownScript_0x19d856: ; 0x19d856 UnknownScript_0x19d86a: ; 0x19d86a scall UnknownScript_0x19d8f7 winlosstext Bird_keeperVance1BeatenText, $0000 - copybytetovar $da09 + copybytetovar wda09 if_equal $2, UnknownScript_0x19d881 if_equal $1, UnknownScript_0x19d887 if_equal $0, UnknownScript_0x19d88d @@ -71,7 +71,7 @@ UnknownScript_0x19d88d: ; 0x19d88d loadtrainer BIRD_KEEPER, VANCE1 startbattle returnafterbattle - loadvar $da09, $1 + loadvar wda09, $1 clearflag $0079 end ; 0x19d89a @@ -80,7 +80,7 @@ UnknownScript_0x19d89a: ; 0x19d89a loadtrainer BIRD_KEEPER, VANCE2 startbattle returnafterbattle - loadvar $da09, $2 + loadvar wda09, $2 clearflag $0079 end ; 0x19d8a7 @@ -254,7 +254,7 @@ UnknownScript_0x19d95a: ; 0x19d95a UnknownScript_0x19d96e: ; 0x19d96e scall UnknownScript_0x19d8f7 winlosstext FisherWilton1BeatenText, $0000 - copybytetovar $da0a + copybytetovar wda0a if_equal $2, UnknownScript_0x19d985 if_equal $1, UnknownScript_0x19d98b if_equal $0, UnknownScript_0x19d991 @@ -268,7 +268,7 @@ UnknownScript_0x19d991: ; 0x19d991 loadtrainer FISHER, WILTON1 startbattle returnafterbattle - loadvar $da0a, $1 + loadvar wda0a, $1 clearflag $007a end ; 0x19d99e @@ -277,7 +277,7 @@ UnknownScript_0x19d99e: ; 0x19d99e loadtrainer FISHER, WILTON2 startbattle returnafterbattle - loadvar $da0a, $2 + loadvar wda0a, $2 clearflag $007a end ; 0x19d9ab diff --git a/maps/Route45.asm b/maps/Route45.asm index bb9251dde..7b215d9a6 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -253,7 +253,7 @@ UnknownScript_0x19e1a4: ; 0x19e1a4 UnknownScript_0x19e1b8: ; 0x19e1b8 scall UnknownScript_0x19e133 winlosstext HikerParry3BeatenText, $0000 - copybytetovar $da0c + copybytetovar wda0c if_equal $2, UnknownScript_0x19e1cf if_equal $1, UnknownScript_0x19e1d5 if_equal $0, UnknownScript_0x19e1db @@ -267,7 +267,7 @@ UnknownScript_0x19e1db: ; 0x19e1db loadtrainer HIKER, PARRY3 startbattle returnafterbattle - loadvar $da0c, $1 + loadvar wda0c, $1 clearflag $007b end ; 0x19e1e8 @@ -276,7 +276,7 @@ UnknownScript_0x19e1e8: ; 0x19e1e8 loadtrainer HIKER, PARRY1 startbattle returnafterbattle - loadvar $da0c, $2 + loadvar wda0c, $2 clearflag $007b end ; 0x19e1f5 diff --git a/maps/Route46.asm b/maps/Route46.asm index 41d76dc7f..8042da3bd 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -86,7 +86,7 @@ UnknownScript_0x1a96c6: ; 0x1a96c6 UnknownScript_0x1a96da: ; 0x1a96da scall UnknownScript_0x1a9767 winlosstext PicnickerErin1BeatenText, $0000 - copybytetovar $da0d + copybytetovar wda0d if_equal $2, UnknownScript_0x1a96f1 if_equal $1, UnknownScript_0x1a96f7 if_equal $0, UnknownScript_0x1a96fd @@ -100,7 +100,7 @@ UnknownScript_0x1a96fd: ; 0x1a96fd loadtrainer PICNICKER, ERIN1 startbattle returnafterbattle - loadvar $da0d, $1 + loadvar wda0d, $1 clearflag $007c end ; 0x1a970a @@ -109,7 +109,7 @@ UnknownScript_0x1a970a: ; 0x1a970a loadtrainer PICNICKER, ERIN2 startbattle returnafterbattle - loadvar $da0d, $2 + loadvar wda0d, $2 clearflag $007c end ; 0x1a9717 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 04c13bf58..8c10eca11 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -129,7 +129,7 @@ UnknownText_0x9b420: ; 0x9b420 ; 0x9b46a UnknownText_0x9b46a: ; 0x9b46a - text_from_ram $d099 + text_from_ram StringBuffer3 text " is your" line "opponent today." done diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index bdcecc4a2..929e7a98d 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -763,21 +763,21 @@ UnknownText_0x7c87b: ; 0x7c87b ; 0x7c8bf UnknownText_0x7c8bf: ; 0x7c8bf - text_from_ram $d099 + text_from_ram StringBuffer3 text " looks a" line "little happier." done ; 0x7c8dc UnknownText_0x7c8dc: ; 0x7c8dc - text_from_ram $d099 + text_from_ram StringBuffer3 text " looks" line "happy." done ; 0x7c8ee UnknownText_0x7c8ee: ; 0x7c8ee - text_from_ram $d099 + text_from_ram StringBuffer3 text " looks" line "delighted!" done @@ -2209,9 +2209,36 @@ wMobileBattleRoomTrigger:: ds 1 ; d9c0 SECTION "Events", WRAMX, BANK [1] - ds 14 - -wda00:: ds 114 +wd9f2:: ds 1 + ds 1 +wd9f4:: ds 1 +wd9f5:: ds 1 +wd9f6:: ds 1 +wd9f7:: ds 1 +wd9f8:: ds 1 +wd9f9:: ds 1 +wd9fa:: ds 1 +wd9fb:: ds 1 +wd9fc:: ds 1 +wd9fd:: ds 1 +wd9fe:: ds 1 +wd9ff:: ds 1 + +wda00:: ds 1 +wda01:: ds 1 +wda02:: ds 1 +wda03:: ds 1 +wda04:: ds 1 +wda05:: ds 1 +wda06:: ds 1 +wda07:: ds 1 +wda08:: ds 1 +wda09:: ds 1 +wda0a:: ds 1 +wda0b:: ds 1 +wda0c:: ds 1 +wda0d:: ds 1 + ds 100 EventFlags:: ; da72 ;RoomDecorations:: ; dac6 @@ -2534,6 +2561,13 @@ w2_d187:: ds 1 w2_d188:: ds 1 +SECTION "WRAM 3", WRAMX, BANK [3] + + ds $800 + +w3_d800:: ds 1 + + SECTION "GBC Video", WRAMX, BANK [5] ; 8 4-color palettes |