diff options
Diffstat (limited to 'maps/BattleTowerBattleRoom.asm')
| -rw-r--r-- | maps/BattleTowerBattleRoom.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 4c78d8871..82753c221 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,12 +1,12 @@ BattleTowerBattleRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f419, $0000 dw UnknownScript_0x9f420, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f419: @@ -31,7 +31,7 @@ UnknownScript_0x9f425: keeptextopen loadmovesprites special Function170215 - special Function8c084 + special FadeBlackBGMap reloadmap if_not_equal $0, UnknownScript_0x9f4c2 copybytetovar wcf64 @@ -46,10 +46,10 @@ UnknownScript_0x9f425: closetext loadmovesprites playmusic MUSIC_HEAL - special Function8c084 - special Function1047eb + special FadeBlackBGMap + special LoadMapPalettes pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x9eebc @@ -73,7 +73,7 @@ UnknownScript_0x9f483: special Function170687 playsound SFX_SAVE waitbutton - special Function8c084 + special FadeBlackBGMap special Reset UnknownScript_0x9f4a3: writetext UnknownText_0x9efbf @@ -84,14 +84,14 @@ UnknownScript_0x9f4a3: writebyte $6 special Function170687 loadmovesprites - special Function8c084 + special FadeBlackBGMap warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 loadfont jump UnknownScript_0x9e4b0 UnknownScript_0x9f4c2: pause 60 - special Function8c092 + special Special_BattleTowerFade warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 writebyte $4 special Function170687 @@ -103,7 +103,7 @@ UnknownScript_0x9f4c2: UnknownScript_0x9f4d9: pause 60 - special Function8c092 + special Special_BattleTowerFade warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 BattleTowerBattleRoomScript_0x9f4e4: loadfont @@ -142,18 +142,18 @@ BattleTowerBattleRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791 - person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, -1 + person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1 |