diff options
Diffstat (limited to 'maps/TeamRocketBaseB1F.asm')
-rw-r--r-- | maps/TeamRocketBaseB1F.asm | 352 |
1 files changed, 134 insertions, 218 deletions
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 32f621a00..32582ccc7 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,34 +1,31 @@ -TeamRocketBaseB1F_MapScriptHeader: ; 0x6c651 - ; trigger count +TeamRocketBaseB1F_MapScriptHeader: +.MapTriggers: db 1 ; triggers dw UnknownScript_0x6c65a, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks dbw 2, UnknownScript_0x6c65b -; 0x6c65a -UnknownScript_0x6c65a: ; 0x6c65a +UnknownScript_0x6c65a: end -; 0x6c65b -UnknownScript_0x6c65b: ; 0x6c65b +UnknownScript_0x6c65b: disappear $2 return -; 0x6c65e -SecurityCamera1a: ; 0x6c65e +SecurityCamera1a: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 @@ -37,7 +34,7 @@ SecurityCamera1a: ; 0x6c65e scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 @@ -46,15 +43,14 @@ SecurityCamera1a: ; 0x6c65e if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end -; 0x6c6a7 -SecurityCamera1b: ; 0x6c6a7 +SecurityCamera1b: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 @@ -63,7 +59,7 @@ SecurityCamera1b: ; 0x6c6a7 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 @@ -72,15 +68,14 @@ SecurityCamera1b: ; 0x6c6a7 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end -; 0x6c6f0 -SecurityCamera2a: ; 0x6c6f0 +SecurityCamera2a: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $7 appear $2 @@ -89,7 +84,7 @@ SecurityCamera2a: ; 0x6c6f0 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $c, $5 @@ -99,15 +94,14 @@ SecurityCamera2a: ; 0x6c6f0 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end -; 0x6c73c -SecurityCamera2b: ; 0x6c73c +SecurityCamera2b: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $8 appear $2 @@ -116,7 +110,7 @@ SecurityCamera2b: ; 0x6c73c scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $c, $5 @@ -126,15 +120,14 @@ SecurityCamera2b: ; 0x6c73c if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end -; 0x6c788 -SecurityCamera3a: ; 0x6c788 +SecurityCamera3a: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $6 appear $2 @@ -143,7 +136,7 @@ SecurityCamera3a: ; 0x6c788 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $b @@ -153,15 +146,14 @@ SecurityCamera3a: ; 0x6c788 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end -; 0x6c7d4 -SecurityCamera3b: ; 0x6c7d4 +SecurityCamera3b: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $7 appear $2 @@ -170,7 +162,7 @@ SecurityCamera3b: ; 0x6c7d4 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $c @@ -180,15 +172,14 @@ SecurityCamera3b: ; 0x6c7d4 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end -; 0x6c820 -SecurityCamera4: ; 0x6c820 +SecurityCamera4: checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $11, $10 appear $2 @@ -197,7 +188,7 @@ SecurityCamera4: ; 0x6c820 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $b @@ -207,15 +198,14 @@ SecurityCamera4: ; 0x6c820 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 end -; 0x6c86c -SecurityCamera5: ; 0x6c86c +SecurityCamera5: checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $3, $10 appear $2 @@ -224,7 +214,7 @@ SecurityCamera5: ; 0x6c86c scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $e, $10 @@ -234,13 +224,11 @@ SecurityCamera5: ; 0x6c86c if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 end -; 0x6c8b8 -NoSecurityCamera: ; 0x6c8b8 +NoSecurityCamera: end -; 0x6c8b9 -TrainerCameraGrunt1: ; 0x6c8b9 +TrainerCameraGrunt1: loadfont writetext CameraGrunt1SeenText closetext @@ -252,9 +240,8 @@ TrainerCameraGrunt1: ; 0x6c8b9 disappear $2 returnafterbattle end -; 0x6c8ce -TrainerCameraGrunt2: ; 0x6c8ce +TrainerCameraGrunt2: loadfont writetext CameraGrunt2SeenText closetext @@ -266,9 +253,8 @@ TrainerCameraGrunt2: ; 0x6c8ce disappear $2 returnafterbattle end -; 0x6c8e3 -PlaySecurityCameraSounds: ; 0x6c8e3 +PlaySecurityCameraSounds: playsound SFX_LICK pause 10 playsound SFX_LICK @@ -281,9 +267,8 @@ PlaySecurityCameraSounds: ; 0x6c8e3 pause 10 playsound SFX_LICK end -; 0x6c900 -ExplodingTrap1: ; 0x6c900 +ExplodingTrap1: checkevent EVENT_EXPLODING_TRAP_1 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -291,7 +276,7 @@ ExplodingTrap1: ; 0x6c900 setevent EVENT_EXPLODING_TRAP_1 end -ExplodingTrap2: ; 0x6c90e +ExplodingTrap2: checkevent EVENT_EXPLODING_TRAP_2 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -299,7 +284,7 @@ ExplodingTrap2: ; 0x6c90e setevent EVENT_EXPLODING_TRAP_2 end -ExplodingTrap3: ; 0x6c91c +ExplodingTrap3: checkevent EVENT_EXPLODING_TRAP_3 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -307,7 +292,7 @@ ExplodingTrap3: ; 0x6c91c setevent EVENT_EXPLODING_TRAP_3 end -ExplodingTrap4: ; 0x6c92a +ExplodingTrap4: checkevent EVENT_EXPLODING_TRAP_4 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -315,7 +300,7 @@ ExplodingTrap4: ; 0x6c92a setevent EVENT_EXPLODING_TRAP_4 end -ExplodingTrap5: ; 0x6c938 +ExplodingTrap5: checkevent EVENT_EXPLODING_TRAP_5 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -323,7 +308,7 @@ ExplodingTrap5: ; 0x6c938 setevent EVENT_EXPLODING_TRAP_5 end -ExplodingTrap6: ; 0x6c946 +ExplodingTrap6: checkevent EVENT_EXPLODING_TRAP_6 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -331,7 +316,7 @@ ExplodingTrap6: ; 0x6c946 setevent EVENT_EXPLODING_TRAP_6 end -ExplodingTrap7: ; 0x6c954 +ExplodingTrap7: checkevent EVENT_EXPLODING_TRAP_7 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -339,7 +324,7 @@ ExplodingTrap7: ; 0x6c954 setevent EVENT_EXPLODING_TRAP_7 end -ExplodingTrap8: ; 0x6c962 +ExplodingTrap8: checkevent EVENT_EXPLODING_TRAP_8 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -347,7 +332,7 @@ ExplodingTrap8: ; 0x6c962 setevent EVENT_EXPLODING_TRAP_8 end -ExplodingTrap9: ; 0x6c970 +ExplodingTrap9: checkevent EVENT_EXPLODING_TRAP_9 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -355,7 +340,7 @@ ExplodingTrap9: ; 0x6c970 setevent EVENT_EXPLODING_TRAP_9 end -ExplodingTrap10: ; 0x6c97e +ExplodingTrap10: checkevent EVENT_EXPLODING_TRAP_10 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -363,7 +348,7 @@ ExplodingTrap10: ; 0x6c97e setevent EVENT_EXPLODING_TRAP_10 end -ExplodingTrap11: ; 0x6c98c +ExplodingTrap11: checkevent EVENT_EXPLODING_TRAP_11 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -371,7 +356,7 @@ ExplodingTrap11: ; 0x6c98c setevent EVENT_EXPLODING_TRAP_11 end -ExplodingTrap12: ; 0x6c99a +ExplodingTrap12: checkevent EVENT_EXPLODING_TRAP_12 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -379,7 +364,7 @@ ExplodingTrap12: ; 0x6c99a setevent EVENT_EXPLODING_TRAP_12 end -ExplodingTrap13: ; 0x6c9a8 +ExplodingTrap13: checkevent EVENT_EXPLODING_TRAP_13 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -387,7 +372,7 @@ ExplodingTrap13: ; 0x6c9a8 setevent EVENT_EXPLODING_TRAP_13 end -ExplodingTrap14: ; 0x6c9b6 +ExplodingTrap14: checkevent EVENT_EXPLODING_TRAP_14 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -395,7 +380,7 @@ ExplodingTrap14: ; 0x6c9b6 setevent EVENT_EXPLODING_TRAP_14 end -ExplodingTrap15: ; 0x6c9c4 +ExplodingTrap15: checkevent EVENT_EXPLODING_TRAP_15 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -403,7 +388,7 @@ ExplodingTrap15: ; 0x6c9c4 setevent EVENT_EXPLODING_TRAP_15 end -ExplodingTrap16: ; 0x6c9d2 +ExplodingTrap16: checkevent EVENT_EXPLODING_TRAP_16 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -411,7 +396,7 @@ ExplodingTrap16: ; 0x6c9d2 setevent EVENT_EXPLODING_TRAP_16 end -ExplodingTrap17: ; 0x6c9e0 +ExplodingTrap17: checkevent EVENT_EXPLODING_TRAP_17 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -419,7 +404,7 @@ ExplodingTrap17: ; 0x6c9e0 setevent EVENT_EXPLODING_TRAP_17 end -ExplodingTrap18: ; 0x6c9ee +ExplodingTrap18: checkevent EVENT_EXPLODING_TRAP_18 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -427,7 +412,7 @@ ExplodingTrap18: ; 0x6c9ee setevent EVENT_EXPLODING_TRAP_18 end -ExplodingTrap19: ; 0x6c9fc +ExplodingTrap19: checkevent EVENT_EXPLODING_TRAP_19 iftrue NoExplodingTrap scall GeodudeExplodingTrap @@ -435,7 +420,7 @@ ExplodingTrap19: ; 0x6c9fc setevent EVENT_EXPLODING_TRAP_19 end -ExplodingTrap20: ; 0x6ca0a +ExplodingTrap20: checkevent EVENT_EXPLODING_TRAP_20 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -443,7 +428,7 @@ ExplodingTrap20: ; 0x6ca0a setevent EVENT_EXPLODING_TRAP_20 end -ExplodingTrap21: ; 0x6ca18 +ExplodingTrap21: checkevent EVENT_EXPLODING_TRAP_21 iftrue NoExplodingTrap scall KoffingExplodingTrap @@ -451,7 +436,7 @@ ExplodingTrap21: ; 0x6ca18 setevent EVENT_EXPLODING_TRAP_21 end -ExplodingTrap22: ; 0x6ca26 +ExplodingTrap22: checkevent EVENT_EXPLODING_TRAP_22 iftrue NoExplodingTrap scall VoltorbExplodingTrap @@ -459,107 +444,68 @@ ExplodingTrap22: ; 0x6ca26 setevent EVENT_EXPLODING_TRAP_22 end -VoltorbExplodingTrap: ; 0x6ca34 - special Function8c084 +VoltorbExplodingTrap: + special FadeBlackBGMap cry VOLTORB - special Function8c079 + special FadeInBGMap setlasttalked $ff - writecode $3, BATTLETYPE_TRAP + writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata VOLTORB, 23 startbattle end -GeodudeExplodingTrap: ; 0x6ca47 - special Function8c084 +GeodudeExplodingTrap: + special FadeBlackBGMap cry GEODUDE - special Function8c079 + special FadeInBGMap setlasttalked $ff - writecode $3, BATTLETYPE_TRAP + writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata GEODUDE, 21 startbattle end -KoffingExplodingTrap: ; 0x6ca5a - special Function8c084 +KoffingExplodingTrap: + special FadeBlackBGMap cry KOFFING - special Function8c079 + special FadeInBGMap setlasttalked $ff - writecode $3, BATTLETYPE_TRAP + writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata KOFFING, 21 startbattle end -NoExplodingTrap: ; 0x6ca6d +NoExplodingTrap: end -; 0x6ca6e -TrainerScientistJed: ; 0x6ca6e - ; bit/flag number - dw $4a1 +TrainerScientistJed: + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, $0000, ScientistJedScript - ; trainer group && trainer id - db SCIENTIST, JED - - ; text when seen - dw ScientistJedSeenText - - ; text when trainer beaten - dw ScientistJedBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistJedScript -; 0x6ca7a - -ScientistJedScript: ; 0x6ca7a +ScientistJedScript: talkaftercancel loadfont writetext UnknownText_0x6cc16 closetext loadmovesprites end -; 0x6ca82 - -TrainerGruntM16: ; 0x6ca82 - ; bit/flag number - dw $500 - - ; trainer group && trainer id - db GRUNTM, 16 - - ; text when seen - dw GruntM16SeenText - - ; text when trainer beaten - dw GruntM16BeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw GruntM16Script -; 0x6ca8e +TrainerGruntM16: + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, $0000, GruntM16Script -GruntM16Script: ; 0x6ca8e +GruntM16Script: talkaftercancel loadfont writetext UnknownText_0x6cd1b closetext loadmovesprites end -; 0x6ca96 -MapTeamRocketBaseB1FSignpost5Script: ; 0x6ca96 +MapTeamRocketBaseB1FSignpost5Script: jumptext SecurityCameraText -; 0x6ca99 -MapTeamRocketBaseB1FSignpost7Script: ; 0x6ca99 +MapTeamRocketBaseB1FSignpost7Script: jumpstd teamrocketoath -; 0x6ca9c -MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c +MapTeamRocketBaseB1FSignpost0Script: loadfont checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS iftrue UnknownScript_0x6cabe @@ -574,42 +520,34 @@ MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c setevent EVENT_SECURITY_CAMERA_4 setevent EVENT_SECURITY_CAMERA_5 end -; 0x6cabe -UnknownScript_0x6cabe: ; 0x6cabe +UnknownScript_0x6cabe: writetext UnknownText_0x6cdd0 closetext loadmovesprites end -; 0x6cac4 -ItemFragment_0x6cac4: ; 0x6cac4 +ItemFragment_0x6cac4: db HYPER_POTION, 1 -; 0x6cac6 -ItemFragment_0x6cac6: ; 0x6cac6 +ItemFragment_0x6cac6: db NUGGET, 1 -; 0x6cac8 -ItemFragment_0x6cac8: ; 0x6cac8 +ItemFragment_0x6cac8: db GUARD_SPEC, 1 -; 0x6caca -MapTeamRocketBaseB1FSignpostItem8: ; 0x6caca - dw $0086 - db REVIVE +MapTeamRocketBaseB1FSignpostItem8: + dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE -; 0x6cacd -SecurityCameraMovement1: ; 0x6cacd +SecurityCameraMovement1: big_step_right big_step_right big_step_right big_step_right step_end -; 0x6cad2 -SecurityCameraMovement2: ; 0x6cad2 +SecurityCameraMovement2: big_step_up big_step_right big_step_up @@ -618,9 +556,8 @@ SecurityCameraMovement2: ; 0x6cad2 big_step_up turn_head_right step_end -; 0x6cada -SecurityCameraMovement3: ; 0x6cada +SecurityCameraMovement3: big_step_left big_step_left big_step_left @@ -630,9 +567,8 @@ SecurityCameraMovement3: ; 0x6cada big_step_left big_step_left step_end -; 0x6cae3 -SecurityCameraMovement4: ; 0x6cae3 +SecurityCameraMovement4: ; he jumps over a trap jump_step_up big_step_right @@ -641,9 +577,8 @@ SecurityCameraMovement4: ; 0x6cae3 big_step_up turn_head_right step_end -; 0x6caea -SecurityCameraMovement5: ; 0x6caea +SecurityCameraMovement5: big_step_left big_step_left big_step_left @@ -652,9 +587,8 @@ SecurityCameraMovement5: ; 0x6caea big_step_left big_step_left step_end -; 0x6caf2 -SecurityCameraMovement6: ; 0x6caf2 +SecurityCameraMovement6: big_step_up big_step_up big_step_right @@ -663,9 +597,8 @@ SecurityCameraMovement6: ; 0x6caf2 big_step_up big_step_left step_end -; 0x6cafa -SecurityCameraMovement7: ; 0x6cafa +SecurityCameraMovement7: big_step_up big_step_up big_step_up @@ -674,9 +607,8 @@ SecurityCameraMovement7: ; 0x6cafa big_step_up big_step_left step_end -; 0x6cb02 -SecurityCameraMovement8: ; 0x6cb02 +SecurityCameraMovement8: big_step_down big_step_down big_step_right @@ -687,35 +619,30 @@ SecurityCameraMovement8: ; 0x6cb02 big_step_left big_step_left step_end -; 0x6cb0c -SecurityCameraMovement9: ; 0x6cb0c +SecurityCameraMovement9: big_step_left big_step_left big_step_left big_step_left big_step_left step_end -; 0x6cb12 -CameraGrunt1SeenText: ; 0x6cb12 +CameraGrunt1SeenText: text "Hey!" line "Intruder alert!" done -; 0x6cb28 -CameraGrunt1BeatenText: ; 0x6cb28 +CameraGrunt1BeatenText: text "Dang… I failed…" done -; 0x6cb39 -CameraGrunt2SeenText: ; 0x6cb39 +CameraGrunt2SeenText: text "It's my turn!" line "There's no escape!" done -; 0x6cb59 -CameraGrunt2BeatenText: ; 0x6cb59 +CameraGrunt2BeatenText: text "Surveillance cams" line "are in the #MON" cont "statues." @@ -724,9 +651,8 @@ CameraGrunt2BeatenText: ; 0x6cb59 line "ing until you trip" cont "a secret switch." done -; 0x6cbbb -ScientistJedSeenText: ; 0x6cbbb +ScientistJedSeenText: text "This was once a" line "ninja hideout." @@ -734,14 +660,12 @@ ScientistJedSeenText: ; 0x6cbbb line "confound intruders" cont "like you." done -; 0x6cc0b -ScientistJedBeatenText: ; 0x6cc0b +ScientistJedBeatenText: text "I get it…" done -; 0x6cc16 -UnknownText_0x6cc16: ; 0x6cc16 +UnknownText_0x6cc16: text "All right. I'll" line "divulge a secret" cont "about our hideout." @@ -756,9 +680,8 @@ UnknownText_0x6cc16: ; 0x6cc16 para "back to the en-" line "trance." done -; 0x6ccb7 -GruntM16SeenText: ; 0x6ccb7 +GruntM16SeenText: text "Heheh. Feeling" line "lucky, punk?" @@ -768,14 +691,12 @@ GruntM16SeenText: ; 0x6ccb7 para "We've got traps" line "set in the floor!" done -; 0x6cd12 -GruntM16BeatenText: ; 0x6cd12 +GruntM16BeatenText: text "Kaboom!" done -; 0x6cd1b -UnknownText_0x6cd1b: ; 0x6cd1b +UnknownText_0x6cd1b: text "I don't even know" line "where the traps" cont "are planted." @@ -784,41 +705,37 @@ UnknownText_0x6cd1b: ; 0x6cd1b line "to collect your" cont "courage and walk." done -; 0x6cd7c -SecurityCameraText: ; 0x6cd7c +SecurityCameraText: text "It's a PERSIAN" line "statue…" para "Its eyes are oddly" line "shiny." done -; 0x6cdad -UnknownText_0x6cdad: ; 0x6cdad +UnknownText_0x6cdad: text "A secret switch!" line "Better press it." done -; 0x6cdd0 -UnknownText_0x6cdd0: ; 0x6cdd0 +UnknownText_0x6cdd0: text "The switch is" line "turned off." done -; 0x6cdeb -TeamRocketBaseB1F_MapEventHeader: ; 0x6cdeb +TeamRocketBaseB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $2, $1b, 3, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F warp_def $e, $3, 1, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $f, $5, 4, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - ; xy triggers +.XYTriggers: db 30 ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. @@ -855,24 +772,23 @@ TeamRocketBaseB1F_MapEventHeader: ; 0x6cdeb xy_trigger 0, $d, $4, $0, ExplodingTrap21, $0, $0 xy_trigger 0, $d, $5, $0, ExplodingTrap22, $0, $0 - ; signposts +.Signposts: db 9 - signpost 11, 19, $0, MapTeamRocketBaseB1FSignpost0Script - signpost 1, 24, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 1, 6, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 8, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 22, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 5, 24, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 11, 20, $0, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 21, $0, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, $7, MapTeamRocketBaseB1FSignpostItem8 - - ; people-events + signpost 11, 19, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost0Script + signpost 1, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 1, 6, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 15, 8, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 15, 22, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script + signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script + signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 + +.PersonEvents: db 6 - person_event SPRITE_ROCKET, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d9 - person_event SPRITE_ROCKET, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, $06da - person_event SPRITE_SCIENTIST, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, $06da - person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, $0669 - person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a - person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b -; 0x6cf70 + person_event SPRITE_ROCKET, 4, 4, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + person_event SPRITE_ROCKET, 8, 6, OW_LEFT | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 16, 22, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 10, 31, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 19, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + person_event SPRITE_POKE_BALL, 16, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC |