diff options
Diffstat (limited to 'maps/MobileBattleRoom.asm')
| -rw-r--r-- | maps/MobileBattleRoom.asm | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index d65ae1006..8a8cd518d 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,11 +1,9 @@ MobileBattleRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .InitializeMobileBattleRoom - scene_script .DummyScene + db 2 ; scene scripts + scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .InitializeMobileBattleRoom: priorityjump .InitializeAndPreparePokecenter2F @@ -15,42 +13,42 @@ MobileBattleRoom_MapScripts: end .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 5 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM end MapMobileBattleRoomSignpost0Script: refreshscreen - special Special_Function1037c2 - if_equal $1, .one - special Special_Function1037eb + special Function1037c2 + ifequal $1, .one + special Function1037eb iffalse .false - if_equal $1, .one_ - if_equal $2, .two_ + ifequal $1, .one_ + ifequal $2, .two_ jump .false .one_ writetext MobileBattleRoom_HealText pause 20 closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL - special Special_LoadMapPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic refreshscreen .two_ - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty - special Special_Function10383c + special Function10383c iftrue .false .one - special Special_Function10387b + special Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Special_Function101225 + special Function101225 .false closetext end @@ -67,20 +65,15 @@ MobileBattleRoom_HealText: done MobileBattleRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 6, POKECENTER_2F - warp_def 5, 7, 6, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 6 + warp_event 5, 7, POKECENTER_2F, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script + db 1 ; bg events + bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script -.ObjectEvents: - db 0 + db 0 ; object events |