ref: b097617f9f3a23092ef3f3c0eedba4ae6fa04e06
parent: 7c862ca7e21d0223a5158f3689bfc81755ab06c1
author: yenatch <yenatch@gmail.com>
date: Tue Feb 10 10:37:24 EST 2015
Blind wram in maps.
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -531,7 +531,7 @@
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_0x9eebc: ; 0x9eebc
text "Next up, opponent"
line "no.@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text ". Ready?"
done
; 0x9eee0
@@ -770,7 +770,7 @@
; 0x9f217
UnknownText_0x9f217: ; 0x9f217
- text_from_ram $cd49
+ text_from_ram wcd49
text " may not"
line "enter a BATTLE"
cont "ROOM under L70."
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -37,7 +37,7 @@
special $002e
reloadmap
if_not_equal $0, UnknownScript_0x9f4c2
- copybytetovar $cf64
+ copybytetovar wcf64
if_equal $7, UnknownScript_0x9f4d9
applymovement $2, MovementData_0x9e597
warpsound
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -32,7 +32,7 @@
ld a, 3
ld [rSVBK], a
- ld a, [$d800]
+ ld a, [w3_d800]
ld [ScriptVar], a
pop af
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -262,7 +262,7 @@
UnknownText_0x1897a6: ; 0x1897a6
text "Ah, so that is"
line "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "?"
para "Isn't it cute!"
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -113,7 +113,7 @@
; 0x19b296
UnknownText_0x19b296: ; 0x19b296
- text_from_ram $d099
+ text_from_ram StringBuffer3
text " looks"
line "content."
done
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -214,7 +214,7 @@
UnknownText_0x732e7: ; 0x732e7
text $52, " found"
line "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "!"
done
; 0x732f7
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -126,7 +126,7 @@
text "Clang!"
para "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
db $0
line "popped out."
done
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -262,7 +262,7 @@
UnknownText_0x72991: ; 0x72991
text "OK, so you wanted"
line "a @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "?"
done
; 0x729ad
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -503,7 +503,7 @@
UnknownText_0x18cf41: ; 0x18cf41
text $52, " found"
line "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "!"
done
; 0x18cf51
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -984,7 +984,7 @@
ReceivedStarterText: ; 0x794ad
text $52, " received"
line "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "!"
done
; 0x794c0
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -116,7 +116,7 @@
UnknownText_0x564ef: ; 0x564ef
text "Clang! A can of"
line "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text $55
db "popped out!"
done
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -359,7 +359,7 @@
; 0x56ea8
UnknownText_0x56ea8: ; 0x56ea8
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "."
line "Is that right?"
done
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -87,7 +87,7 @@
para "Oh? Let me see"
line "your @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "…"
done
; 0x549fc
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -193,10 +193,10 @@
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 @@
line "to trade your"
para "@"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text " for a"
line "#MON that you"
cont "have never seen."
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -217,10 +217,10 @@
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
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -115,7 +115,7 @@
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 @@
loadtrainer SCHOOLBOY, JACK1
startbattle
returnafterbattle
- loadvar $d9f2, $1
+ loadvar wd9f2, $1
clearflag $0065
end
; 0x5c0cc
@@ -146,7 +146,7 @@
loadtrainer SCHOOLBOY, JACK2
startbattle
returnafterbattle
- loadvar $d9f2, $2
+ loadvar wd9f2, $2
clearflag $0065
end
; 0x5c0d9
@@ -155,7 +155,7 @@
loadtrainer SCHOOLBOY, JACK3
startbattle
returnafterbattle
- loadvar $d9f2, $3
+ loadvar wd9f2, $3
clearflag $0065
end
; 0x5c0e6
@@ -164,7 +164,7 @@
loadtrainer SCHOOLBOY, JACK4
startbattle
returnafterbattle
- loadvar $d9f2, $4
+ loadvar wd9f2, $4
clearflag $0065
end
; 0x5c0f3
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -84,7 +84,7 @@
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 @@
loadtrainer SAILOR, HUEY1
startbattle
returnafterbattle
- loadvar $d9f4, $1
+ loadvar wd9f4, $1
clearflag $0066
end
; 0x5b001
@@ -111,7 +111,7 @@
loadtrainer SAILOR, HUEY2
startbattle
returnafterbattle
- loadvar $d9f4, $2
+ loadvar wd9f4, $2
clearflag $0066
end
; 0x5b00e
@@ -120,7 +120,7 @@
loadtrainer SAILOR, HUEY3
startbattle
returnafterbattle
- loadvar $d9f4, $3
+ loadvar wd9f4, $3
clearflag $0066
end
; 0x5b01b
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -102,7 +102,7 @@
writetext UnknownText_0x192f67
special $0003
iffalse UnknownScript_0x192911
- copybytetovar $cf51
+ copybytetovar wcf51
iffalse UnknownScript_0x1928fe
special $0005
iffalse UnknownScript_0x192909
@@ -215,7 +215,7 @@
writetext UnknownText_0x192f67
special $0003
iffalse UnknownScript_0x1929c6
- copybytetovar $cf51
+ copybytetovar wcf51
iffalse UnknownScript_0x1929b3
special $0005
iffalse UnknownScript_0x1929be
@@ -356,7 +356,7 @@
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_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_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_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
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -273,7 +273,7 @@
UnknownText_0x5cf3a: ; 0x5cf3a
text "This week's ID"
line "number is @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "."
done
; 0x5cf5a
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -86,7 +86,7 @@
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 @@
loadtrainer COOLTRAINERM, GAVEN3
startbattle
returnafterbattle
- loadvar $d9f5, $1
+ loadvar wd9f5, $1
clearflag $0067
end
; 0x1a4da9
@@ -109,7 +109,7 @@
loadtrainer COOLTRAINERM, GAVEN1
startbattle
returnafterbattle
- loadvar $d9f5, $2
+ loadvar wd9f5, $2
clearflag $0067
end
; 0x1a4db6
@@ -237,7 +237,7 @@
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 @@
loadtrainer COOLTRAINERF, BETH1
startbattle
returnafterbattle
- loadvar $d9f6, $1
+ loadvar wd9f6, $1
clearflag $0068
end
; 0x1a4e65
@@ -260,7 +260,7 @@
loadtrainer COOLTRAINERF, BETH2
startbattle
returnafterbattle
- loadvar $d9f6, $2
+ loadvar wd9f6, $2
clearflag $0068
end
; 0x1a4e72
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -127,7 +127,7 @@
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 @@
loadtrainer BIRD_KEEPER, JOSE2
startbattle
returnafterbattle
- loadvar $d9f7, $1
+ loadvar wd9f7, $1
clearflag $0069
end
; 0x1a092f
@@ -150,7 +150,7 @@
loadtrainer BIRD_KEEPER, JOSE1
startbattle
returnafterbattle
- loadvar $d9f7, $2
+ loadvar wd9f7, $2
clearflag $0069
end
; 0x1a093c
@@ -329,7 +329,7 @@
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 @@
loadtrainer COOLTRAINERF, REENA1
startbattle
returnafterbattle
- loadvar $d9f8, $1
+ loadvar wd9f8, $1
clearflag $006a
end
; 0x1a0a19
@@ -352,7 +352,7 @@
loadtrainer COOLTRAINERF, REENA2
startbattle
returnafterbattle
- loadvar $d9f8, $2
+ loadvar wd9f8, $2
clearflag $006a
end
; 0x1a0a26
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -78,7 +78,7 @@
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 @@
loadtrainer YOUNGSTER, JOEY1
startbattle
returnafterbattle
- loadvar $d9f9, $1
+ loadvar wd9f9, $1
clearflag $006b
end
; 0x1a1724
@@ -109,7 +109,7 @@
loadtrainer YOUNGSTER, JOEY2
startbattle
returnafterbattle
- loadvar $d9f9, $2
+ loadvar wd9f9, $2
clearflag $006b
end
; 0x1a1731
@@ -118,7 +118,7 @@
loadtrainer YOUNGSTER, JOEY3
startbattle
returnafterbattle
- loadvar $d9f9, $3
+ loadvar wd9f9, $3
clearflag $006b
end
; 0x1a173e
@@ -127,7 +127,7 @@
loadtrainer YOUNGSTER, JOEY4
startbattle
returnafterbattle
- loadvar $d9f9, $4
+ loadvar wd9f9, $4
clearflag $006b
end
; 0x1a174b
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -74,7 +74,7 @@
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 @@
loadtrainer BUG_CATCHER, WADE1
startbattle
returnafterbattle
- loadvar $d9fa, $1
+ loadvar wd9fa, $1
clearflag $006c
end
; 0x1a54d7
@@ -105,7 +105,7 @@
loadtrainer BUG_CATCHER, WADE2
startbattle
returnafterbattle
- loadvar $d9fa, $2
+ loadvar wd9fa, $2
clearflag $006c
end
; 0x1a54e4
@@ -114,7 +114,7 @@
loadtrainer BUG_CATCHER, WADE3
startbattle
returnafterbattle
- loadvar $d9fa, $3
+ loadvar wd9fa, $3
clearflag $006c
end
; 0x1a54f1
@@ -123,7 +123,7 @@
loadtrainer BUG_CATCHER, WADE4
startbattle
returnafterbattle
- loadvar $d9fa, $4
+ loadvar wd9fa, $4
clearflag $006c
end
; 0x1a54fe
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -256,7 +256,7 @@
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 @@
loadtrainer FISHER, RALPH1
startbattle
returnafterbattle
- loadvar $d9fb, $1
+ loadvar wd9fb, $1
clearflag $006d
end
; 0x1905c1
@@ -287,7 +287,7 @@
loadtrainer FISHER, RALPH2
startbattle
returnafterbattle
- loadvar $d9fb, $2
+ loadvar wd9fb, $2
clearflag $006d
end
; 0x1905ce
@@ -296,7 +296,7 @@
loadtrainer FISHER, RALPH3
startbattle
returnafterbattle
- loadvar $d9fb, $3
+ loadvar wd9fb, $3
clearflag $006d
end
; 0x1905db
@@ -305,7 +305,7 @@
loadtrainer FISHER, RALPH4
startbattle
returnafterbattle
- loadvar $d9fb, $4
+ loadvar wd9fb, $4
clearflag $006d
end
; 0x1905e8
@@ -440,7 +440,7 @@
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 @@
loadtrainer PICNICKER, LIZ1
startbattle
returnafterbattle
- loadvar $d9fc, $1
+ loadvar wd9fc, $1
clearflag $006e
end
; 0x1906b1
@@ -471,7 +471,7 @@
loadtrainer PICNICKER, LIZ2
startbattle
returnafterbattle
- loadvar $d9fc, $2
+ loadvar wd9fc, $2
clearflag $006e
end
; 0x1906be
@@ -480,7 +480,7 @@
loadtrainer PICNICKER, LIZ3
startbattle
returnafterbattle
- loadvar $d9fc, $3
+ loadvar wd9fc, $3
clearflag $006e
end
; 0x1906cb
@@ -489,7 +489,7 @@
loadtrainer PICNICKER, LIZ4
startbattle
returnafterbattle
- loadvar $d9fc, $4
+ loadvar wd9fc, $4
clearflag $006e
end
; 0x1906d8
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -63,7 +63,7 @@
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 @@
loadtrainer HIKER, ANTHONY2
startbattle
returnafterbattle
- loadvar $d9fd, $1
+ loadvar wd9fd, $1
clearflag $006f
end
; 0x1ac095
@@ -94,7 +94,7 @@
loadtrainer HIKER, ANTHONY1
startbattle
returnafterbattle
- loadvar $d9fd, $2
+ loadvar wd9fd, $2
clearflag $006f
end
; 0x1ac0a2
@@ -103,7 +103,7 @@
loadtrainer HIKER, ANTHONY3
startbattle
returnafterbattle
- loadvar $d9fd, $3
+ loadvar wd9fd, $3
clearflag $006f
end
; 0x1ac0af
@@ -112,7 +112,7 @@
loadtrainer HIKER, ANTHONY4
startbattle
returnafterbattle
- loadvar $d9fd, $4
+ loadvar wd9fd, $4
clearflag $006f
end
; 0x1ac0bc
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -139,7 +139,7 @@
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 @@
loadtrainer CAMPER, TODD1
startbattle
returnafterbattle
- loadvar $d9fe, $1
+ loadvar wd9fe, $1
clearflag $0070
end
; 0x78101
@@ -170,7 +170,7 @@
loadtrainer CAMPER, TODD2
startbattle
returnafterbattle
- loadvar $d9fe, $2
+ loadvar wd9fe, $2
clearflag $0070
end
; 0x7810e
@@ -179,7 +179,7 @@
loadtrainer CAMPER, TODD3
startbattle
returnafterbattle
- loadvar $d9fe, $3
+ loadvar wd9fe, $3
clearflag $0070
end
; 0x7811b
@@ -188,7 +188,7 @@
loadtrainer CAMPER, TODD4
startbattle
returnafterbattle
- loadvar $d9fe, $4
+ loadvar wd9fe, $4
clearflag $0070
end
; 0x78128
@@ -296,7 +296,7 @@
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 @@
loadtrainer PICNICKER, GINA1
startbattle
returnafterbattle
- loadvar $d9ff, $1
+ loadvar wd9ff, $1
clearflag $0071
end
; 0x781e3
@@ -327,7 +327,7 @@
loadtrainer PICNICKER, GINA2
startbattle
returnafterbattle
- loadvar $d9ff, $2
+ loadvar wd9ff, $2
clearflag $0071
end
; 0x781f0
@@ -336,7 +336,7 @@
loadtrainer PICNICKER, GINA3
startbattle
returnafterbattle
- loadvar $d9ff, $3
+ loadvar wd9ff, $3
clearflag $0071
end
; 0x781fd
@@ -345,7 +345,7 @@
loadtrainer PICNICKER, GINA4
startbattle
returnafterbattle
- loadvar $d9ff, $4
+ loadvar wd9ff, $4
clearflag $0071
end
; 0x7820a
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -285,7 +285,7 @@
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 @@
loadtrainer BUG_CATCHER, ARNIE1
startbattle
returnafterbattle
- loadvar $da01, $1
+ loadvar wda01, $1
clearflag $0072
end
; 0x19c9ff
@@ -316,7 +316,7 @@
loadtrainer BUG_CATCHER, ARNIE2
startbattle
returnafterbattle
- loadvar $da01, $2
+ loadvar wda01, $2
clearflag $0072
end
; 0x19ca0c
@@ -325,7 +325,7 @@
loadtrainer BUG_CATCHER, ARNIE3
startbattle
returnafterbattle
- loadvar $da01, $3
+ loadvar wda01, $3
clearflag $0072
end
; 0x19ca19
@@ -334,7 +334,7 @@
loadtrainer BUG_CATCHER, ARNIE4
startbattle
returnafterbattle
- loadvar $da01, $4
+ loadvar wda01, $4
clearflag $0072
end
; 0x19ca26
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -255,7 +255,7 @@
UnknownText_0x6a2eb: ; 0x6a2eb
text "Today's @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "."
line "That means the"
@@ -322,7 +322,7 @@
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_0x6a79a: ; 0x6a79a
text "You still have @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
db $0
line "minute(s) left."
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -229,7 +229,7 @@
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 @@
loadtrainer SCHOOLBOY, ALAN1
startbattle
returnafterbattle
- loadvar $da02, $1
+ loadvar wda02, $1
clearflag $0073
end
; 0x194184
@@ -260,7 +260,7 @@
loadtrainer SCHOOLBOY, ALAN2
startbattle
returnafterbattle
- loadvar $da02, $2
+ loadvar wda02, $2
clearflag $0073
end
; 0x194191
@@ -269,7 +269,7 @@
loadtrainer SCHOOLBOY, ALAN3
startbattle
returnafterbattle
- loadvar $da02, $3
+ loadvar wda02, $3
clearflag $0073
end
; 0x19419e
@@ -278,7 +278,7 @@
loadtrainer SCHOOLBOY, ALAN4
startbattle
returnafterbattle
- loadvar $da02, $4
+ loadvar wda02, $4
clearflag $0073
end
; 0x1941ab
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -517,7 +517,7 @@
UnknownText_0x6add5: ; 0x6add5
text "Today's @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
text "."
line "That means the"
@@ -584,7 +584,7 @@
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_0x6b284: ; 0x6b284
text "You still have @"
- text_from_ram $d099
+ text_from_ram StringBuffer3
db $0
line "minute(s) left."
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -117,7 +117,7 @@
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 @@
loadtrainer LASS, DANA1
startbattle
returnafterbattle
- loadvar $da03, $1
+ loadvar wda03, $1
clearflag $0074
end
; 0x1a1dc6
@@ -148,7 +148,7 @@
loadtrainer LASS, DANA2
startbattle
returnafterbattle
- loadvar $da03, $2
+ loadvar wda03, $2
clearflag $0074
end
; 0x1a1dd3
@@ -157,7 +157,7 @@
loadtrainer LASS, DANA3
startbattle
returnafterbattle
- loadvar $da03, $3
+ loadvar wda03, $3
clearflag $0074
end
; 0x1a1de0
@@ -166,7 +166,7 @@
loadtrainer LASS, DANA4
startbattle
returnafterbattle
- loadvar $da03, $4
+ loadvar wda03, $4
clearflag $0074
end
; 0x1a1ded
@@ -288,7 +288,7 @@
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 @@
loadtrainer SCHOOLBOY, CHAD1
startbattle
returnafterbattle
- loadvar $da04, $1
+ loadvar wda04, $1
clearflag $0075
end
; 0x1a1eb9
@@ -319,7 +319,7 @@
loadtrainer SCHOOLBOY, CHAD2
startbattle
returnafterbattle
- loadvar $da04, $2
+ loadvar wda04, $2
clearflag $0075
end
; 0x1a1ec6
@@ -328,7 +328,7 @@
loadtrainer SCHOOLBOY, CHAD3
startbattle
returnafterbattle
- loadvar $da04, $3
+ loadvar wda04, $3
clearflag $0075
end
; 0x1a1ed3
@@ -337,7 +337,7 @@
loadtrainer SCHOOLBOY, CHAD4
startbattle
returnafterbattle
- loadvar $da04, $4
+ loadvar wda04, $4
clearflag $0075
end
; 0x1a1ee0
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -84,7 +84,7 @@
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 @@
loadtrainer FISHER, TULLY1
startbattle
returnafterbattle
- loadvar $da06, $1
+ loadvar wda06, $1
clearflag $0076
end
; 0x1a92b9
@@ -111,7 +111,7 @@
loadtrainer FISHER, TULLY2
startbattle
returnafterbattle
- loadvar $da06, $2
+ loadvar wda06, $2
clearflag $0076
end
; 0x1a92c6
@@ -120,7 +120,7 @@
loadtrainer FISHER, TULLY3
startbattle
returnafterbattle
- loadvar $da06, $3
+ loadvar wda06, $3
clearflag $0076
end
; 0x1a92d3
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -131,7 +131,7 @@
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 @@
loadtrainer POKEMANIAC, BRENT1
startbattle
returnafterbattle
- loadvar $da07, $1
+ loadvar wda07, $1
clearflag $0077
end
; 0x19d109
@@ -158,7 +158,7 @@
loadtrainer POKEMANIAC, BRENT2
startbattle
returnafterbattle
- loadvar $da07, $2
+ loadvar wda07, $2
clearflag $0077
end
; 0x19d116
@@ -167,7 +167,7 @@
loadtrainer POKEMANIAC, BRENT3
startbattle
returnafterbattle
- loadvar $da07, $3
+ loadvar wda07, $3
clearflag $0077
end
; 0x19d123
@@ -328,7 +328,7 @@
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 @@
loadtrainer PICNICKER, TIFFANY3
startbattle
returnafterbattle
- loadvar $da08, $1
+ loadvar wda08, $1
clearflag $0078
end
; 0x19d1fb
@@ -355,7 +355,7 @@
loadtrainer PICNICKER, TIFFANY1
startbattle
returnafterbattle
- loadvar $da08, $2
+ loadvar wda08, $2
clearflag $0078
end
; 0x19d208
@@ -364,7 +364,7 @@
loadtrainer PICNICKER, TIFFANY2
startbattle
returnafterbattle
- loadvar $da08, $3
+ loadvar wda08, $3
clearflag $0078
end
; 0x19d215
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -57,7 +57,7 @@
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 @@
loadtrainer BIRD_KEEPER, VANCE1
startbattle
returnafterbattle
- loadvar $da09, $1
+ loadvar wda09, $1
clearflag $0079
end
; 0x19d89a
@@ -80,7 +80,7 @@
loadtrainer BIRD_KEEPER, VANCE2
startbattle
returnafterbattle
- loadvar $da09, $2
+ loadvar wda09, $2
clearflag $0079
end
; 0x19d8a7
@@ -254,7 +254,7 @@
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 @@
loadtrainer FISHER, WILTON1
startbattle
returnafterbattle
- loadvar $da0a, $1
+ loadvar wda0a, $1
clearflag $007a
end
; 0x19d99e
@@ -277,7 +277,7 @@
loadtrainer FISHER, WILTON2
startbattle
returnafterbattle
- loadvar $da0a, $2
+ loadvar wda0a, $2
clearflag $007a
end
; 0x19d9ab
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -253,7 +253,7 @@
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 @@
loadtrainer HIKER, PARRY3
startbattle
returnafterbattle
- loadvar $da0c, $1
+ loadvar wda0c, $1
clearflag $007b
end
; 0x19e1e8
@@ -276,7 +276,7 @@
loadtrainer HIKER, PARRY1
startbattle
returnafterbattle
- loadvar $da0c, $2
+ loadvar wda0c, $2
clearflag $007b
end
; 0x19e1f5
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -86,7 +86,7 @@
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 @@
loadtrainer PICNICKER, ERIN1
startbattle
returnafterbattle
- loadvar $da0d, $1
+ loadvar wda0d, $1
clearflag $007c
end
; 0x1a970a
@@ -109,7 +109,7 @@
loadtrainer PICNICKER, ERIN2
startbattle
returnafterbattle
- loadvar $da0d, $2
+ loadvar wda0d, $2
clearflag $007c
end
; 0x1a9717
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -129,7 +129,7 @@
; 0x9b46a
UnknownText_0x9b46a: ; 0x9b46a
- text_from_ram $d099
+ text_from_ram StringBuffer3
text " is your"
line "opponent today."
done
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -763,7 +763,7 @@
; 0x7c8bf
UnknownText_0x7c8bf: ; 0x7c8bf
- text_from_ram $d099
+ text_from_ram StringBuffer3
text " looks a"
line "little happier."
done
@@ -770,7 +770,7 @@
; 0x7c8dc
UnknownText_0x7c8dc: ; 0x7c8dc
- text_from_ram $d099
+ text_from_ram StringBuffer3
text " looks"
line "happy."
done
@@ -777,7 +777,7 @@
; 0x7c8ee
UnknownText_0x7c8ee: ; 0x7c8ee
- text_from_ram $d099
+ text_from_ram StringBuffer3
text " looks"
line "delighted!"
done
--- a/wram.asm
+++ b/wram.asm
@@ -2209,9 +2209,36 @@
SECTION "Events", WRAMX, BANK [1]
- ds 14
+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 114
+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
@@ -2532,6 +2559,13 @@
w2_d186:: ds 1
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]