Blind wram in maps.

This commit is contained in:
yenatch 2015-02-10 15:37:24 -08:00
parent 7c862ca7e2
commit b097617f9f
39 changed files with 174 additions and 140 deletions

View File

@ -531,7 +531,7 @@ UnknownText_0x9eb45: ; 0x9eb45
UnknownText_0x9eb7e: ; 0x9eb7e UnknownText_0x9eb7e: ; 0x9eb7e
db $0, $52, " got five", $4f db $0, $52, " got five", $4f
db "@" db "@"
text_from_ram $d0ac text_from_ram StringBuffer4
db $0, "!@" db $0, "!@"
sound0x0F sound0x0F
text_waitbutton text_waitbutton
@ -654,7 +654,7 @@ UnknownText_0x9ee92: ; 0x9ee92
UnknownText_0x9eebc: ; 0x9eebc UnknownText_0x9eebc: ; 0x9eebc
text "Next up, opponent" text "Next up, opponent"
line "no.@" line "no.@"
text_from_ram $d099 text_from_ram StringBuffer3
text ". Ready?" text ". Ready?"
done done
; 0x9eee0 ; 0x9eee0
@ -770,7 +770,7 @@ UnknownText_0x9f1e5: ; 0x9f1e5
; 0x9f217 ; 0x9f217
UnknownText_0x9f217: ; 0x9f217 UnknownText_0x9f217: ; 0x9f217
text_from_ram $cd49 text_from_ram wcd49
text " may not" text " may not"
line "enter a BATTLE" line "enter a BATTLE"
cont "ROOM under L70." cont "ROOM under L70."

View File

@ -37,7 +37,7 @@ UnknownScript_0x9f425: ; 0x9f425
special $002e special $002e
reloadmap reloadmap
if_not_equal $0, UnknownScript_0x9f4c2 if_not_equal $0, UnknownScript_0x9f4c2
copybytetovar $cf64 copybytetovar wcf64
if_equal $7, UnknownScript_0x9f4d9 if_equal $7, UnknownScript_0x9f4d9
applymovement $2, MovementData_0x9e597 applymovement $2, MovementData_0x9e597
warpsound warpsound

View File

@ -32,7 +32,7 @@ Function_0x9f5cb: ; 0x9f5cb
ld a, 3 ld a, 3
ld [rSVBK], a ld [rSVBK], a
ld a, [$d800] ld a, [w3_d800]
ld [ScriptVar], a ld [ScriptVar], a
pop af pop af

View File

@ -262,7 +262,7 @@ UnknownText_0x189784: ; 0x189784
UnknownText_0x1897a6: ; 0x1897a6 UnknownText_0x1897a6: ; 0x1897a6
text "Ah, so that is" text "Ah, so that is"
line "@" line "@"
text_from_ram $d099 text_from_ram StringBuffer3
text "?" text "?"
para "Isn't it cute!" para "Isn't it cute!"

View File

@ -113,7 +113,7 @@ UnknownText_0x19b266: ; 0x19b266
; 0x19b296 ; 0x19b296
UnknownText_0x19b296: ; 0x19b296 UnknownText_0x19b296: ; 0x19b296
text_from_ram $d099 text_from_ram StringBuffer3
text " looks" text " looks"
line "content." line "content."
done done

View File

@ -214,7 +214,7 @@ UnknownText_0x73285: ; 0x73285
UnknownText_0x732e7: ; 0x732e7 UnknownText_0x732e7: ; 0x732e7
text $52, " found" text $52, " found"
line "@" line "@"
text_from_ram $d099 text_from_ram StringBuffer3
text "!" text "!"
done done
; 0x732f7 ; 0x732f7

View File

@ -126,7 +126,7 @@ UnknownText_0x71274: ; 0x71274
text "Clang!" text "Clang!"
para "@" para "@"
text_from_ram $d099 text_from_ram StringBuffer3
db $0 db $0
line "popped out." line "popped out."
done done

View File

@ -262,7 +262,7 @@ UnknownText_0x72974: ; 0x72974
UnknownText_0x72991: ; 0x72991 UnknownText_0x72991: ; 0x72991
text "OK, so you wanted" text "OK, so you wanted"
line "a @" line "a @"
text_from_ram $d099 text_from_ram StringBuffer3
text "?" text "?"
done done
; 0x729ad ; 0x729ad

View File

@ -503,7 +503,7 @@ UnknownText_0x18cf0f: ; 0x18cf0f
UnknownText_0x18cf41: ; 0x18cf41 UnknownText_0x18cf41: ; 0x18cf41
text $52, " found" text $52, " found"
line "@" line "@"
text_from_ram $d099 text_from_ram StringBuffer3
text "!" text "!"
done done
; 0x18cf51 ; 0x18cf51

View File

@ -984,7 +984,7 @@ ChoseStarterText: ; 0x79487
ReceivedStarterText: ; 0x794ad ReceivedStarterText: ; 0x794ad
text $52, " received" text $52, " received"
line "@" line "@"
text_from_ram $d099 text_from_ram StringBuffer3
text "!" text "!"
done done
; 0x794c0 ; 0x794c0

View File

@ -116,7 +116,7 @@ UnknownText_0x564cb: ; 0x564cb
UnknownText_0x564ef: ; 0x564ef UnknownText_0x564ef: ; 0x564ef
text "Clang! A can of" text "Clang! A can of"
line "@" line "@"
text_from_ram $d099 text_from_ram StringBuffer3
text $55 text $55
db "popped out!" db "popped out!"
done done

View File

@ -359,7 +359,7 @@ UnknownText_0x56e8b: ; 0x56e8b
; 0x56ea8 ; 0x56ea8
UnknownText_0x56ea8: ; 0x56ea8 UnknownText_0x56ea8: ; 0x56ea8
text_from_ram $d099 text_from_ram StringBuffer3
text "." text "."
line "Is that right?" line "Is that right?"
done done

View File

@ -87,7 +87,7 @@ UnknownText_0x549a3: ; 0x549a3
para "Oh? Let me see" para "Oh? Let me see"
line "your @" line "your @"
text_from_ram $d099 text_from_ram StringBuffer3
text "…" text "…"
done done
; 0x549fc ; 0x549fc

View File

@ -193,10 +193,10 @@ UnknownText_0x6113b: ; 0x6113b
line "to trade your" line "to trade your"
para "@" para "@"
text_from_ram $d099 text_from_ram StringBuffer3
text " for" text " for"
line "@" line "@"
text_from_ram $d0ac text_from_ram StringBuffer4
text "." text "."
para "We'll have to hold" para "We'll have to hold"
@ -214,7 +214,7 @@ UnknownText_0x611c9: ; 0x611c9
line "to trade your" line "to trade your"
para "@" para "@"
text_from_ram $d099 text_from_ram StringBuffer3
text " for a" text " for a"
line "#MON that you" line "#MON that you"
cont "have never seen." cont "have never seen."

View File

@ -217,10 +217,10 @@ UnknownText_0x19aabc: ; 0x19aabc
text "CURRENT RECORD" text "CURRENT RECORD"
para "@" para "@"
text_from_ram $d099 text_from_ram StringBuffer3
text " caught by" text " caught by"
line "@" line "@"
text_from_ram $d0ac text_from_ram StringBuffer4
db "@@" db "@@"
; 0x19aae2 ; 0x19aae2

View File

@ -115,7 +115,7 @@ UnknownScript_0x5c074: ; 0x5c074
UnknownScript_0x5c088: ; 0x5c088 UnknownScript_0x5c088: ; 0x5c088
scall UnknownScript_0x5c114 scall UnknownScript_0x5c114
winlosstext SchoolboyJack1BeatenText, $0000 winlosstext SchoolboyJack1BeatenText, $0000
copybytetovar $d9f2 copybytetovar wd9f2
if_equal $4, UnknownScript_0x5c0a7 if_equal $4, UnknownScript_0x5c0a7
if_equal $3, UnknownScript_0x5c0ad if_equal $3, UnknownScript_0x5c0ad
if_equal $2, UnknownScript_0x5c0b3 if_equal $2, UnknownScript_0x5c0b3
@ -137,7 +137,7 @@ UnknownScript_0x5c0bf: ; 0x5c0bf
loadtrainer SCHOOLBOY, JACK1 loadtrainer SCHOOLBOY, JACK1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f2, $1 loadvar wd9f2, $1
clearflag $0065 clearflag $0065
end end
; 0x5c0cc ; 0x5c0cc
@ -146,7 +146,7 @@ UnknownScript_0x5c0cc: ; 0x5c0cc
loadtrainer SCHOOLBOY, JACK2 loadtrainer SCHOOLBOY, JACK2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f2, $2 loadvar wd9f2, $2
clearflag $0065 clearflag $0065
end end
; 0x5c0d9 ; 0x5c0d9
@ -155,7 +155,7 @@ UnknownScript_0x5c0d9: ; 0x5c0d9
loadtrainer SCHOOLBOY, JACK3 loadtrainer SCHOOLBOY, JACK3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f2, $3 loadvar wd9f2, $3
clearflag $0065 clearflag $0065
end end
; 0x5c0e6 ; 0x5c0e6
@ -164,7 +164,7 @@ UnknownScript_0x5c0e6: ; 0x5c0e6
loadtrainer SCHOOLBOY, JACK4 loadtrainer SCHOOLBOY, JACK4
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f2, $4 loadvar wd9f2, $4
clearflag $0065 clearflag $0065
end end
; 0x5c0f3 ; 0x5c0f3

View File

@ -84,7 +84,7 @@ UnknownScript_0x5afb3: ; 0x5afb3
UnknownScript_0x5afc7: ; 0x5afc7 UnknownScript_0x5afc7: ; 0x5afc7
scall UnknownScript_0x5b06b scall UnknownScript_0x5b06b
winlosstext SailorHuey1BeatenText, $0000 winlosstext SailorHuey1BeatenText, $0000
copybytetovar $d9f4 copybytetovar wd9f4
if_equal $3, UnknownScript_0x5afe2 if_equal $3, UnknownScript_0x5afe2
if_equal $2, UnknownScript_0x5afe8 if_equal $2, UnknownScript_0x5afe8
if_equal $1, UnknownScript_0x5afee if_equal $1, UnknownScript_0x5afee
@ -102,7 +102,7 @@ UnknownScript_0x5aff4: ; 0x5aff4
loadtrainer SAILOR, HUEY1 loadtrainer SAILOR, HUEY1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f4, $1 loadvar wd9f4, $1
clearflag $0066 clearflag $0066
end end
; 0x5b001 ; 0x5b001
@ -111,7 +111,7 @@ UnknownScript_0x5b001: ; 0x5b001
loadtrainer SAILOR, HUEY2 loadtrainer SAILOR, HUEY2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f4, $2 loadvar wd9f4, $2
clearflag $0066 clearflag $0066
end end
; 0x5b00e ; 0x5b00e
@ -120,7 +120,7 @@ UnknownScript_0x5b00e: ; 0x5b00e
loadtrainer SAILOR, HUEY3 loadtrainer SAILOR, HUEY3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f4, $3 loadvar wd9f4, $3
clearflag $0066 clearflag $0066
end end
; 0x5b01b ; 0x5b01b

View File

@ -102,7 +102,7 @@ UnknownScript_0x1928be: ; 0x1928be
writetext UnknownText_0x192f67 writetext UnknownText_0x192f67
special $0003 special $0003
iffalse UnknownScript_0x192911 iffalse UnknownScript_0x192911
copybytetovar $cf51 copybytetovar wcf51
iffalse UnknownScript_0x1928fe iffalse UnknownScript_0x1928fe
special $0005 special $0005
iffalse UnknownScript_0x192909 iffalse UnknownScript_0x192909
@ -215,7 +215,7 @@ UnknownScript_0x192973: ; 0x192973
writetext UnknownText_0x192f67 writetext UnknownText_0x192f67
special $0003 special $0003
iffalse UnknownScript_0x1929c6 iffalse UnknownScript_0x1929c6
copybytetovar $cf51 copybytetovar wcf51
iffalse UnknownScript_0x1929b3 iffalse UnknownScript_0x1929b3
special $0005 special $0005
iffalse UnknownScript_0x1929be iffalse UnknownScript_0x1929be
@ -356,7 +356,7 @@ LinkReceptionistScript_0x192a2d: ; 0x192a2d
writetext UnknownText_0x192f67 writetext UnknownText_0x192f67
special $0003 special $0003
iffalse UnknownScript_0x192a99 iffalse UnknownScript_0x192a99
copybytetovar $cf51 copybytetovar wcf51
iffalse UnknownScript_0x192a84 iffalse UnknownScript_0x192a84
special $0005 special $0005
writetext UnknownText_0x19304a writetext UnknownText_0x19304a
@ -1028,7 +1028,7 @@ UnknownText_0x19307c: ; 0x19307c
UnknownText_0x19308b: ; 0x19308b UnknownText_0x19308b: ; 0x19308b
text "Sorry--@" text "Sorry--@"
text_from_ram $d073 text_from_ram StringBuffer1
db $0 db $0
line "can't be taken." line "can't be taken."
prompt prompt
@ -1037,10 +1037,10 @@ UnknownText_0x19308b: ; 0x19308b
UnknownText_0x1930a8: ; 0x1930a8 UnknownText_0x1930a8: ; 0x1930a8
text "You can't take the" text "You can't take the"
line "@" line "@"
text_from_ram $d073 text_from_ram StringBuffer1
text " with a" text " with a"
cont "@" cont "@"
text_from_ram $d086 text_from_ram StringBuffer2
text "." text "."
prompt prompt
; 0x1930cf ; 0x1930cf
@ -1048,7 +1048,7 @@ UnknownText_0x1930a8: ; 0x1930a8
UnknownText_0x1930cf: ; 0x1930cf UnknownText_0x1930cf: ; 0x1930cf
text "You can't take the" text "You can't take the"
line "@" line "@"
text_from_ram $d073 text_from_ram StringBuffer1
text " that" text " that"
cont "has MAIL with you." cont "has MAIL with you."
prompt prompt

View File

@ -273,7 +273,7 @@ UnknownText_0x5ceba: ; 0x5ceba
UnknownText_0x5cf3a: ; 0x5cf3a UnknownText_0x5cf3a: ; 0x5cf3a
text "This week's ID" text "This week's ID"
line "number is @" line "number is @"
text_from_ram $d099 text_from_ram StringBuffer3
text "." text "."
done done
; 0x5cf5a ; 0x5cf5a

View File

@ -86,7 +86,7 @@ UnknownScript_0x1a4d65: ; 0x1a4d65
UnknownScript_0x1a4d79: ; 0x1a4d79 UnknownScript_0x1a4d79: ; 0x1a4d79
scall UnknownScript_0x1a4dd7 scall UnknownScript_0x1a4dd7
winlosstext CooltrainermGaven3BeatenText, $0000 winlosstext CooltrainermGaven3BeatenText, $0000
copybytetovar $d9f5 copybytetovar wd9f5
if_equal $2, UnknownScript_0x1a4d90 if_equal $2, UnknownScript_0x1a4d90
if_equal $1, UnknownScript_0x1a4d96 if_equal $1, UnknownScript_0x1a4d96
if_equal $0, UnknownScript_0x1a4d9c if_equal $0, UnknownScript_0x1a4d9c
@ -100,7 +100,7 @@ UnknownScript_0x1a4d9c: ; 0x1a4d9c
loadtrainer COOLTRAINERM, GAVEN3 loadtrainer COOLTRAINERM, GAVEN3
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f5, $1 loadvar wd9f5, $1
clearflag $0067 clearflag $0067
end end
; 0x1a4da9 ; 0x1a4da9
@ -109,7 +109,7 @@ UnknownScript_0x1a4da9: ; 0x1a4da9
loadtrainer COOLTRAINERM, GAVEN1 loadtrainer COOLTRAINERM, GAVEN1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f5, $2 loadvar wd9f5, $2
clearflag $0067 clearflag $0067
end end
; 0x1a4db6 ; 0x1a4db6
@ -237,7 +237,7 @@ UnknownScript_0x1a4e21: ; 0x1a4e21
UnknownScript_0x1a4e35: ; 0x1a4e35 UnknownScript_0x1a4e35: ; 0x1a4e35
scall UnknownScript_0x1a4e93 scall UnknownScript_0x1a4e93
winlosstext CooltrainerfBeth1BeatenText, $0000 winlosstext CooltrainerfBeth1BeatenText, $0000
copybytetovar $d9f6 copybytetovar wd9f6
if_equal $2, UnknownScript_0x1a4e4c if_equal $2, UnknownScript_0x1a4e4c
if_equal $1, UnknownScript_0x1a4e52 if_equal $1, UnknownScript_0x1a4e52
if_equal $0, UnknownScript_0x1a4e58 if_equal $0, UnknownScript_0x1a4e58
@ -251,7 +251,7 @@ UnknownScript_0x1a4e58: ; 0x1a4e58
loadtrainer COOLTRAINERF, BETH1 loadtrainer COOLTRAINERF, BETH1
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f6, $1 loadvar wd9f6, $1
clearflag $0068 clearflag $0068
end end
; 0x1a4e65 ; 0x1a4e65
@ -260,7 +260,7 @@ UnknownScript_0x1a4e65: ; 0x1a4e65
loadtrainer COOLTRAINERF, BETH2 loadtrainer COOLTRAINERF, BETH2
startbattle startbattle
returnafterbattle returnafterbattle
loadvar $d9f6, $2 loadvar wd9f6, $2
clearflag $0068 clearflag $0068
end end
; 0x1a4e72 ; 0x1a4e72

Some files were not shown because too many files have changed in this diff Show More