diff options
Diffstat (limited to 'maps/WillsRoom.asm')
| -rw-r--r-- | maps/WillsRoom.asm | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index c77d3ec27..b73262669 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,4 +1,4 @@ -WillsRoom_MapScriptHeader: ; 0x1804b9 +WillsRoom_MapScriptHeader: ; trigger count db 2 @@ -12,30 +12,26 @@ WillsRoom_MapScriptHeader: ; 0x1804b9 ; callbacks dbw 1, UnknownScript_0x1804cb -; 0x1804c6 -UnknownScript_0x1804c6: ; 0x1804c6 +UnknownScript_0x1804c6: priorityjump UnknownScript_0x1804e0 end -; 0x1804ca -UnknownScript_0x1804ca: ; 0x1804ca +UnknownScript_0x1804ca: end -; 0x1804cb -UnknownScript_0x1804cb: ; 0x1804cb +UnknownScript_0x1804cb: checkevent $0309 iffalse UnknownScript_0x1804d5 changeblock $4, $e, $2a -UnknownScript_0x1804d5: ; 0x1804d5 +UnknownScript_0x1804d5: checkevent EVENT_WILLS_ROOM_EXIT_OPEN iffalse UnknownScript_0x1804df changeblock $4, $2, $16 -UnknownScript_0x1804df: ; 0x1804df +UnknownScript_0x1804df: return -; 0x1804e0 -UnknownScript_0x1804e0: ; 0x1804e0 +UnknownScript_0x1804e0: applymovement $0, MovementData_0x18052c refreshscreen $86 playsound SFX_STRENGTH @@ -47,12 +43,11 @@ UnknownScript_0x1804e0: ; 0x1804e0 setevent $0309 waitbutton end -; 0x1804f8 -WillScript_0x1804f8: ; 0x1804f8 +WillScript_0x1804f8: faceplayer loadfont - checkevent $05b8 + checkevent EVENT_BEAT_ELITE_4_WILL iftrue UnknownScript_0x180526 writetext UnknownText_0x180531 closetext @@ -61,7 +56,7 @@ WillScript_0x1804f8: ; 0x1804f8 loadtrainer WILL, 1 startbattle returnafterbattle - setevent $05b8 + setevent EVENT_BEAT_ELITE_4_WILL loadfont writetext UnknownText_0x180644 closetext @@ -73,24 +68,21 @@ WillScript_0x1804f8: ; 0x1804f8 setevent EVENT_WILLS_ROOM_EXIT_OPEN waitbutton end -; 0x180526 -UnknownScript_0x180526: ; 0x180526 +UnknownScript_0x180526: writetext UnknownText_0x180644 closetext loadmovesprites end -; 0x18052c -MovementData_0x18052c: ; 0x18052c +MovementData_0x18052c: step_up step_up step_up step_up step_end -; 0x180531 -UnknownText_0x180531: ; 0x180531 +UnknownText_0x180531: text "Welcome to #MON" line "LEAGUE, <PLAYER>." @@ -114,15 +106,13 @@ UnknownText_0x180531: ; 0x180531 para "Losing is not an" line "option!" done -; 0x18062c -UnknownText_0x18062c: ; 0x18062c +UnknownText_0x18062c: text "I… I can't…" line "believe it…" done -; 0x180644 -UnknownText_0x180644: ; 0x180644 +UnknownText_0x180644: text "Even though I was" line "defeated, I won't" cont "change my course." @@ -139,9 +129,8 @@ UnknownText_0x180644: ; 0x180644 para "the true ferocity" line "of the ELITE FOUR." done -; 0x1806f9 -WillsRoom_MapEventHeader: ; 0x1806f9 +WillsRoom_MapEventHeader: ; filler db 0, 0 @@ -160,4 +149,3 @@ WillsRoom_MapEventHeader: ; 0x1806f9 ; people-events db 1 person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff -; 0x18071b |