diff options
Diffstat (limited to 'maps/BattleTowerOutside.asm')
| -rw-r--r-- | maps/BattleTowerOutside.asm | 65 |
1 files changed, 21 insertions, 44 deletions
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 68db0320e..4f0055689 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,4 +1,4 @@ -BattleTowerOutside_MapScriptHeader: ; 0x9f852 +BattleTowerOutside_MapScriptHeader: ; trigger count db 0 @@ -6,47 +6,37 @@ BattleTowerOutside_MapScriptHeader: ; 0x9f852 db 2 ; callbacks + dbw 1, .Callback1 + dbw 2, .Callback2 - dbw 1, UnknownScript_0x9f85a - - dbw 2, UnknownScript_0x9f85b -; 0x9f85a - -UnknownScript_0x9f85a: ; 0x9f85a +.Callback1 return -; 0x9f85b -UnknownScript_0x9f85b: ; 0x9f85b +.Callback2 clearevent $07cf return -; 0x9f85f -StandingYoungsterScript_0x9f85f: ; 0x9f85f +StandingYoungsterScript_0x9f85f: jumptextfaceplayer UnknownText_0x9f930 -; 0x9f862 -BuenaScript_0x9f862: ; 0x9f862 +BuenaScript_0x9f862: jumptextfaceplayer UnknownText_0x9f9db -; 0x9f865 -SailorScript_0x9f865: ; 0x9f865 +SailorScript_0x9f865: jumptextfaceplayer UnknownText_0x9fa8c -; 0x9f868 -MapBattleTowerOutsideSignpost0Script: ; 0x9f868 +MapBattleTowerOutsideSignpost0Script: jumptext UnknownText_0x9fafc -; 0x9f86b -UnknownText_0x9f86b: ; 0x9f86b +UnknownText_0x9f86b: text "Wow, the BATTLE" line "TOWER is huge! My" para "neck is tired from" line "looking up at it." done -; 0x9f8b3 -UnknownText_0x9f8b3: ; 0x9f8b3 +UnknownText_0x9f8b3: text "Wow, the BATTLE" line "TOWER is huge!" @@ -59,9 +49,8 @@ UnknownText_0x9f8b3: ; 0x9f8b3 para "a wide variety of" line "#MON." done -; 0x9f930 -UnknownText_0x9f930: ; 0x9f930 +UnknownText_0x9f930: text "Wow, the BATTLE" line "TOWER is huge!" @@ -69,9 +58,8 @@ UnknownText_0x9f930: ; 0x9f930 line "kinds of #MON" cont "in there!" done -; 0x9f97b -UnknownText_0x9f97b: ; 0x9f97b +UnknownText_0x9f97b: text "What on earth do" line "they do here?" @@ -81,9 +69,8 @@ UnknownText_0x9f97b: ; 0x9f97b para "it must be for" line "#MON battles." done -; 0x9f9db -UnknownText_0x9f9db: ; 0x9f9db +UnknownText_0x9f9db: text "You can use only" line "three #MON." @@ -93,9 +80,8 @@ UnknownText_0x9f9db: ; 0x9f9db para "should go into" line "battle…" done -; 0x9fa32 -UnknownText_0x9fa32: ; 0x9fa32 +UnknownText_0x9fa32: text "Ehehehe…" line "I sneaked out of" cont "work to come here." @@ -104,9 +90,8 @@ UnknownText_0x9fa32: ; 0x9fa32 line "up until I become" cont "a LEADER!" done -; 0x9fa8c -UnknownText_0x9fa8c: ; 0x9fa8c +UnknownText_0x9fa8c: text "Hehehe, I snuck" line "out from work." @@ -116,33 +101,28 @@ UnknownText_0x9fa8c: ; 0x9fa8c para "I have to win it" line "all. That I must!" done -; 0x9faee -UnknownText_0x9faee: ; 0x9faee +UnknownText_0x9faee: text "BATTLE TOWER" done -; 0x9fafc -UnknownText_0x9fafc: ; 0x9fafc +UnknownText_0x9fafc: text "BATTLE TOWER" para "Take the Ultimate" line "Trainer Challenge!" done -; 0x9fb2f -UnknownText_0x9fb2f: ; 0x9fb2f +UnknownText_0x9fb2f: text "The BATTLE TOWER's" line "doors are closed…" done -; 0x9fb54 -UnknownText_0x9fb54: ; 0x9fb54 +UnknownText_0x9fb54: text "It's open!" done -; 0x9fb5f -BattleTowerOutside_MapEventHeader: ; 0x9fb5f +BattleTowerOutside_MapEventHeader: ; filler db 0, 0 @@ -166,6 +146,3 @@ BattleTowerOutside_MapEventHeader: ; 0x9fb5f person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, $ffff person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, $07cf person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff -; 0x9fbb2 - - |