summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-05-01 13:52:44 -0400
committeryenatch <yenatch@gmail.com>2013-05-01 13:52:44 -0400
commite46e8a3023661880333a2781cbd4611d436da405 (patch)
tree1e162ffca91bce3dd854bd35cc31124ede3cbb9b
parentd4fe2c9953027e1d459bbe4b4fe4c5131c10aa1a (diff)
fix parsing errors in RuinsofAlphOutside
-rw-r--r--maps/RuinsofAlphOutside.asm35
1 files changed, 25 insertions, 10 deletions
diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm
index 0f4408684..daa5f07e7 100644
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -141,22 +141,37 @@ PsychicNathanScript: ; 0x58095
end
; 0x5809d
-UnknownScript_0x5809d: ; 0x5809d
- musicfadeout $2905, $1
-; 0x580a2
-
-; probably not a script?
-UnknownScript_0x580a2: ; 0x580a2
- db $e5
- itemtotext THUNDERSTONE, $42
- 2call $a900
- pokenamemem EXEGGCUTE, $47
+
+TrainerSuperNerdStan: ; 0x5809d
+ ; bit/flag number
+ dw $581
+
+ ; trainer group && trainer id
+ db SUPER_NERD, STAN
+
+ ; text when seen
+ dw UnknownText_0x581e5
+
+ ; text when trainer beaten
+ dw UnknownText_0x58217
+
+ ; script when lost
+ dw $0000
+
+ ; script when talk again
+ dw UnknownScript_0x580a9
+; 0x580a9
+
+UnknownScript_0x580a9: ; 0x580a9
+ talkaftercancel
+ loadfont
2writetext UnknownText_0x58250
closetext
loadmovesprites
end
; 0x580b1
+
MapRuinsofAlphOutsideSignpost0Script: ; 0x580b1
jumptext UnknownText_0x58325
; 0x580b4