diff options
Diffstat (limited to 'maps/BrunosRoom.asm')
| -rw-r--r-- | maps/BrunosRoom.asm | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 33aab7701..2ccf4e6be 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,4 +1,4 @@ -BrunosRoom_MapScriptHeader: ; 0x180986 +BrunosRoom_MapScriptHeader: ; trigger count db 2 @@ -12,30 +12,26 @@ BrunosRoom_MapScriptHeader: ; 0x180986 ; callbacks dbw 1, UnknownScript_0x180998 -; 0x180993 -UnknownScript_0x180993: ; 0x180993 +UnknownScript_0x180993: priorityjump UnknownScript_0x1809ad end -; 0x180997 -UnknownScript_0x180997: ; 0x180997 +UnknownScript_0x180997: end -; 0x180998 -UnknownScript_0x180998: ; 0x180998 +UnknownScript_0x180998: checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1809a2 changeblock $4, $e, $2a -UnknownScript_0x1809a2: ; 0x1809a2 +UnknownScript_0x1809a2: checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN iffalse UnknownScript_0x1809ac changeblock $4, $2, $16 -UnknownScript_0x1809ac: ; 0x1809ac +UnknownScript_0x1809ac: return -; 0x1809ad -UnknownScript_0x1809ad: ; 0x1809ad +UnknownScript_0x1809ad: applymovement $0, MovementData_0x1809f9 refreshscreen $86 playsound SFX_STRENGTH @@ -47,12 +43,11 @@ UnknownScript_0x1809ad: ; 0x1809ad setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitbutton end -; 0x1809c5 -BrunoScript_0x1809c5: ; 0x1809c5 +BrunoScript_0x1809c5: faceplayer loadfont - checkevent $05ba + checkevent EVENT_BEAT_ELITE_4_BRUNO iftrue UnknownScript_0x1809f3 writetext UnknownText_0x1809fe closetext @@ -61,7 +56,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 loadtrainer BRUNO, 1 startbattle returnafterbattle - setevent $05ba + setevent EVENT_BEAT_ELITE_4_BRUNO loadfont writetext UnknownText_0x180b3c closetext @@ -73,24 +68,21 @@ BrunoScript_0x1809c5: ; 0x1809c5 setevent EVENT_BRUNOS_ROOM_EXIT_OPEN waitbutton end -; 0x1809f3 -UnknownScript_0x1809f3: ; 0x1809f3 +UnknownScript_0x1809f3: writetext UnknownText_0x180b3c closetext loadmovesprites end -; 0x1809f9 -MovementData_0x1809f9: ; 0x1809f9 +MovementData_0x1809f9: step_up step_up step_up step_up step_end -; 0x1809fe -UnknownText_0x1809fe: ; 0x1809fe +UnknownText_0x1809fe: text "I am BRUNO of the" line "ELITE FOUR." @@ -119,15 +111,13 @@ UnknownText_0x1809fe: ; 0x1809fe para "Hoo hah!" done -; 0x180b23 -UnknownText_0x180b23: ; 0x180b23 +UnknownText_0x180b23: text "Why? How could we" line "lose?" done -; 0x180b3c -UnknownText_0x180b3c: ; 0x180b3c +UnknownText_0x180b3c: text "Having lost, I" line "have no right to" cont "say anything…" @@ -135,9 +125,8 @@ UnknownText_0x180b3c: ; 0x180b3c para "Go face your next" line "challenge!" done -; 0x180b88 -BrunosRoom_MapEventHeader: ; 0x180b88 +BrunosRoom_MapEventHeader: ; filler db 0, 0 @@ -157,4 +146,3 @@ BrunosRoom_MapEventHeader: ; 0x180b88 ; people-events db 1 person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff -; 0x180baf |