diff options
Diffstat (limited to 'maps/LancesRoom.asm')
| -rw-r--r-- | maps/LancesRoom.asm | 90 |
1 files changed, 31 insertions, 59 deletions
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 609e1aeb9..bb0d19d7f 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,4 +1,4 @@ -LancesRoom_MapScriptHeader: ; 0x180e2c +LancesRoom_MapScriptHeader: ; trigger count db 2 @@ -12,30 +12,26 @@ LancesRoom_MapScriptHeader: ; 0x180e2c ; callbacks dbw 1, UnknownScript_0x180e3e -; 0x180e39 -UnknownScript_0x180e39: ; 0x180e39 +UnknownScript_0x180e39: priorityjump UnknownScript_0x180e53 end -; 0x180e3d -UnknownScript_0x180e3d: ; 0x180e3d +UnknownScript_0x180e3d: end -; 0x180e3e -UnknownScript_0x180e3e: ; 0x180e3e +UnknownScript_0x180e3e: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 -UnknownScript_0x180e48: ; 0x180e48 +UnknownScript_0x180e48: checkevent $0312 iffalse UnknownScript_0x180e52 changeblock $4, $0, $b -UnknownScript_0x180e52: ; 0x180e52 +UnknownScript_0x180e52: return -; 0x180e53 -UnknownScript_0x180e53: ; 0x180e53 +UnknownScript_0x180e53: applymovement $0, MovementData_0x180f33 refreshscreen $86 playsound SFX_STRENGTH @@ -46,18 +42,16 @@ UnknownScript_0x180e53: ; 0x180e53 dotrigger $1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end -; 0x180e6a -UnknownScript_0x180e6a: ; 0x180e6a +UnknownScript_0x180e6a: special Functionc48f applymovement $0, MovementData_0x180f38 jump LanceScript_0x180e7b -; 0x180e74 -UnknownScript_0x180e74: ; 0x180e74 +UnknownScript_0x180e74: special Functionc48f applymovement $0, MovementData_0x180f3c -LanceScript_0x180e7b: ; 0x180e7b +LanceScript_0x180e7b: spriteface $2, LEFT loadfont writetext UnknownText_0x180f67 @@ -135,82 +129,70 @@ LanceScript_0x180e7b: ; 0x180e7b pause 15 warpfacing $1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $4, $d end -; 0x180f33 -MovementData_0x180f33: ; 0x180f33 +MovementData_0x180f33: step_up step_up step_up step_up step_end -; 0x180f38 -MovementData_0x180f38: ; 0x180f38 +MovementData_0x180f38: step_up step_up turn_head_right step_end -; 0x180f3c -MovementData_0x180f3c: ; 0x180f3c +MovementData_0x180f3c: step_up step_left step_up turn_head_right step_end -; 0x180f41 -MovementData_0x180f41: ; 0x180f41 +MovementData_0x180f41: big_step_up big_step_up big_step_up turn_head_down step_end -; 0x180f46 -MovementData_0x180f46: ; 0x180f46 +MovementData_0x180f46: step_up step_up step_end -; 0x180f49 -MovementData_0x180f49: ; 0x180f49 +MovementData_0x180f49: step_left turn_head_right step_end -; 0x180f4c -MovementData_0x180f4c: ; 0x180f4c +MovementData_0x180f4c: big_step_up turn_head_right step_end -; 0x180f4f -MovementData_0x180f4f: ; 0x180f4f +MovementData_0x180f4f: step_up step_left turn_head_down step_end -; 0x180f53 -MovementData_0x180f53: ; 0x180f53 +MovementData_0x180f53: step_up step_end -; 0x180f55 -MovementData_0x180f55: ; 0x180f55 +MovementData_0x180f55: step_up step_end -; 0x180f57 -MovementData_0x180f57: ; 0x180f57 +MovementData_0x180f57: step_up step_right turn_head_up step_end -; 0x180f5b -MovementData_0x180f5b: ; 0x180f5b +MovementData_0x180f5b: big_step_right big_step_right big_step_left @@ -223,9 +205,8 @@ MovementData_0x180f5b: ; 0x180f5b big_step_left turn_head_up step_end -; 0x180f67 -UnknownText_0x180f67: ; 0x180f67 +UnknownText_0x180f67: text "LANCE: I've been" line "waiting for you." @@ -256,9 +237,8 @@ UnknownText_0x180f67: ; 0x180f67 line "on master, accept" cont "your challenge!" done -; 0x1810a4 -UnknownText_0x1810a4: ; 0x1810a4 +UnknownText_0x1810a4: text "…It's over." para "But it's an odd" @@ -274,9 +254,8 @@ UnknownText_0x1810a4: ; 0x1810a4 para "of a great new" line "CHAMPION!" done -; 0x181132 -UnknownText_0x181132: ; 0x181132 +UnknownText_0x181132: text "…Whew." para "You have become" @@ -295,18 +274,16 @@ UnknownText_0x181132: ; 0x181132 para "grow strong with" line "your #MON." done -; 0x1811dd -UnknownText_0x1811dd: ; 0x1811dd +UnknownText_0x1811dd: text "MARY: Oh, no!" line "It's all over!" para "PROF.OAK, if you" line "weren't so slow…" done -; 0x18121b -UnknownText_0x18121b: ; 0x18121b +UnknownText_0x18121b: text "PROF.OAK: Ah," line "<PLAY_G>!" @@ -338,16 +315,14 @@ UnknownText_0x18121b: ; 0x18121b para "Congratulations," line "<PLAY_G>!" done -; 0x18134b -UnknownText_0x18134b: ; 0x18134b +UnknownText_0x18134b: text "MARY: Let's inter-" line "view the brand new" cont "CHAMPION!" done -; 0x18137b -UnknownText_0x18137b: ; 0x18137b +UnknownText_0x18137b: text "LANCE: This is" line "getting to be a" cont "bit too noisy…" @@ -355,16 +330,14 @@ UnknownText_0x18137b: ; 0x18137b para "<PLAY_G>, could you" line "come with me?" done -; 0x1813c5 -UnknownText_0x1813c5: ; 0x1813c5 +UnknownText_0x1813c5: text "MARY: Oh, wait!" line "We haven't done" cont "the interview!" done -; 0x1813f4 -LancesRoom_MapEventHeader: ; 0x1813f4 +LancesRoom_MapEventHeader: ; filler db 0, 0 @@ -388,4 +361,3 @@ LancesRoom_MapEventHeader: ; 0x1813f4 person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, $ffff person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f -; 0x181445 |