diff options
Diffstat (limited to 'maps/TeamRocketBaseB2F.asm')
| -rw-r--r-- | maps/TeamRocketBaseB2F.asm | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index f31110476..de8707b70 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -15,15 +15,13 @@ const_value set 2 const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScripts: -.SceneScripts: - db 4 + db 4 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .DummyScene2 scene_script .DummyScene3 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: @@ -109,7 +107,7 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d4c6 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL @@ -117,7 +115,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET3 disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 - special Special_FadeInQuickly + special FadeInQuickly setscene 2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN @@ -166,11 +164,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special Special_FadeOutPalettes - special Special_StubbedTrainerRankings_Healings + special FadeOutPalettes + special StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special Special_FadeInPalettes + special FadeInPalettes opentext writetext LanceHealsText2 waitbutton @@ -189,7 +187,7 @@ LanceHealsCommon: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script .Script: end_if_just_battled @@ -200,7 +198,7 @@ TrainerGruntM17: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script .Script: end_if_just_battled @@ -211,7 +209,7 @@ TrainerGruntM18: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script .Script: end_if_just_battled @@ -356,7 +354,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL MovementData_0x6d212: step RIGHT @@ -909,19 +907,16 @@ UnknownText_0x6de03: done TeamRocketBaseB2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F - warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F - warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F - warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F - warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F - -.CoordEvents: - db 9 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F + warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F + warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F + warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F + warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F + + db 9 ; coord events coord_event 5, 14, 0, LanceHealsScript1 coord_event 4, 13, 0, LanceHealsScript2 coord_event 14, 11, 1, UnknownScript_0x6cf95 @@ -932,8 +927,7 @@ TeamRocketBaseB2F_MapEvents: coord_event 12, 10, 2, UnknownScript_0x6d07a coord_event 12, 11, 2, UnknownScript_0x6d07a -.BGEvents: - db 23 + db 23 ; bg events bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript @@ -958,8 +952,7 @@ TeamRocketBaseB2F_MapEvents: bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal -.ObjectEvents: - db 14 + db 14 ; object events object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE |