Skip to content

Commit

Permalink
Cross Hooh Event Dialogue
Browse files Browse the repository at this point in the history
  • Loading branch information
PiaCarrot authored and PiaCarrot committed Apr 30, 2024
1 parent ffa4322 commit 6b62a21
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 8 deletions.
91 changes: 85 additions & 6 deletions maps/Route51.asm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ Route51CrossScript_left:
checkevent EVENT_CROSS_CORRUPTED_FOUGHT
iftrue .finish
spriteface PLAYER, RIGHT
playmusic MUSIC_LOOK_GLADION
opentext
writetext CrossRoute51Text
waitbutton
closetext
spriteface ROUTE51_CROSS, LEFT
jump Route51CrossScript
.finish
Expand All @@ -114,15 +119,19 @@ Route51CrossScript_up:
checkevent EVENT_CROSS_CORRUPTED_FOUGHT
iftrue .finish
spriteface PLAYER, DOWN
playmusic MUSIC_LOOK_GLADION
opentext
writetext CrossRoute51Text
waitbutton
closetext
spriteface ROUTE51_CROSS, UP
jump Route51CrossScript
.finish
end

Route51CrossScript:
playmusic MUSIC_LOOK_GLADION
opentext
writetext CrossRoute51Text
writetext CrossRoute51Text2
waitbutton
closetext
checkevent EVENT_GOT_CHARMANDER_FROM_IVY
Expand Down Expand Up @@ -168,6 +177,7 @@ Route51CrossScript:
playmapmusic
pause 10
setevent EVENT_CROSS_CORRUPTED_FOUGHT
cry HO_OH
opentext
writetext CrossRoute51PurifiedWingText
waitbutton
Expand All @@ -176,19 +186,88 @@ Route51CrossScript:
end

CrossRoute51Text:
text "ROUTE 51 CROSS TEXT"
text "CROSS: Why will"
line "you not face me,"
cont "HO-OH? I have your"
cont "RAINBOW WING!"
cont "Submit to me, a"
cont "#MON MASTER!"
para "CROSS produces the"
line "RAINBOW WING, but"
cont "its covered in a"
cont "dark miasma."
para "HO-OH: Ayiiiehh!!"
CrossRoute51Text2:
para "CROSS: Oh, I see<...>"
line "You wish for me to"
cont "prove myself by"
cont "beating the ORANGE"
cont "CREW CHAMPION!"
para "That will be easy,"
line "with my new tools"
cont "I've obtained!"
done

CrossRoute51WinLoss:
text "WinLoss"
text "CROSS: MARSHADOW!"
line "Where are you"
cont "going? This isn't"
cont "how it was meant"
cont "to be<...>"
done

CrossRout51DefeatText:
text "Defeat."
text "CROSS: <...><...>"
line "I understand now."
cont "It was never about"
cont "strength, was it?"
para "I can see it now,"
line "<PLAYER>."
cont "Your #MON adore"
cont "you, and you love"
cont "them too. I only"
cont "treated mine as"
cont "tools to obtain"
cont "even more power."
para "I was never worthy"
line "of HO-OH. You can"
cont "have this, I don't"
cont "need it anymore<...>"
para "<PLAYER> received"
line "the RAINBOW WING!"
cont "It's still covered"
cont "in a dark miasma."
para "CROSS: I don't"
line "expect you to"
cont "forgive me for the"
cont "way I've treated"
cont "you, but I hope we"
cont "meet again."
done

CrossRoute51PurifiedWingText:
text "Purified."
text "HO-OH: Ayiiieehhh!"
para "The dark miasma"
line "enveloping the"
cont "RAINBOW WING"
cont "dissipates, and it"
cont "shimmers again!"
para "HO-OH looks down"
line "upon you, awaiting"
cont "your challenge."
cont "You have earned"
cont "the right to face"
cont "it!"
done

Route51_MapEventHeader::
Expand Down
22 changes: 20 additions & 2 deletions maps/SunrayCaveMandarinDesert1F.asm
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,29 @@ MandarinCaveMarshadowScript:
end
MarshadowText:
text "Shadow!"
text "Kuu!"
done

CrossSunrayText:
text "placeholder"
text "<PLAYER>! You have"
line "something of mine."
cont "Give it back!"

para "You return the"
line "RAINBOW WING to"
cont "CROSS."
para "CROSS: Hahaha! You"
line "are spineless."
cont "CHAMPION of the"
cont "dorks! I'll return"
cont "to the island we"
cont "first met. I can"
cont "feel HO-OH's power"
cont "in the RAINBOW"
cont "WING!"
para "MARSHADOW: Kuu<...>"
done

SunrayCaveMandarinDesert1F_MapEventHeader::
Expand Down
19 changes: 19 additions & 0 deletions scan_includes.exe.stackdump
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Exception: STATUS_ACCESS_VIOLATION at rip=00100401B56
rax=FFFFFFF7FFF94B31 rbx=0000000000000F6C rcx=0000000800000010
rdx=0000000000000000 rsi=0000000000000000 rdi=0000000100404236
r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401CD6 r12=000000080006B4D0 r13=0000000800069A6F
r14=0000000000000000 r15=0000000000000001
rbp=0000000100404228 rsp=00000000FFFFCA60
program=C:\cygwin64\home\lamer\pokeorange\tools\scan_includes.exe, pid 2130, thread main
cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
Stack trace:
Frame Function Args
00100404228 00100401B56 (00800069A6F, 00000000022, 00100404246, 0018036DFB0)
00100404228 00100401D19 (00800058876, 00000000022, 00100404246, 00000000000)
00100404228 00100401D19 (0018036F9A3, 00000000000, 00000000000, 000FFFFCD30)
000FFFFCD30 001004024F3 (00000000020, 00000000000, 00180049B11, 00180048A70)
000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 00180047746 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 001800477F4 (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace

0 comments on commit 6b62a21

Please sign in to comment.