diff options
Diffstat (limited to 'maps/BattleTowerHallway.asm')
| -rw-r--r-- | maps/BattleTowerHallway.asm | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 33bde1837..311f8cc0f 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,32 +1,28 @@ -BattleTowerHallway_MapScriptHeader: ; 0x9f5b1 - ; trigger count +BattleTowerHallway_MapScriptHeader: +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f5bb, $0000 dw UnknownScript_0x9f5c0, $0000 - ; callback count +.MapCallbacks: db 0 -; 0x9f5bb -UnknownScript_0x9f5bb: ; 0x9f5bb +UnknownScript_0x9f5bb: priorityjump UnknownScript_0x9f5c1 dotrigger $1 -; 0x9f5c0 -UnknownScript_0x9f5c0: ; 0x9f5c0 +UnknownScript_0x9f5c0: end -; 0x9f5c1 -UnknownScript_0x9f5c1: ; 0x9f5c1 +UnknownScript_0x9f5c1: follow $2, $0 callasm Function_0x9f5cb jump UnknownScript_0x9f5dc -; 0x9f5cb -Function_0x9f5cb: ; 0x9f5cb +Function_0x9f5cb: ld a, [rSVBK] push af @@ -38,10 +34,9 @@ Function_0x9f5cb: ; 0x9f5cb pop af ld [rSVBK], a ret -; 0x9f5dc -UnknownScript_0x9f5dc: ; 0x9f5dc +UnknownScript_0x9f5dc: if_equal $3, UnknownScript_0x9f603 if_equal $4, UnknownScript_0x9f603 if_equal $5, UnknownScript_0x9f60a @@ -52,29 +47,24 @@ UnknownScript_0x9f5dc: ; 0x9f5dc if_equal $a, UnknownScript_0x9f618 applymovement $2, MovementData_0x9e57a jump UnknownScript_0x9f61f -; 0x9f603 -UnknownScript_0x9f603: ; 0x9f603 +UnknownScript_0x9f603: applymovement $2, MovementData_0x9e57c jump UnknownScript_0x9f61f -; 0x9f60a -UnknownScript_0x9f60a: ; 0x9f60a +UnknownScript_0x9f60a: applymovement $2, MovementData_0x9e586 jump UnknownScript_0x9f61f -; 0x9f611 -UnknownScript_0x9f611: ; 0x9f611 +UnknownScript_0x9f611: applymovement $2, MovementData_0x9e584 jump UnknownScript_0x9f61f -; 0x9f618 -UnknownScript_0x9f618: ; 0x9f618 +UnknownScript_0x9f618: applymovement $2, MovementData_0x9e582 jump UnknownScript_0x9f61f -; 0x9f61f -UnknownScript_0x9f61f: ; 0x9f61f +UnknownScript_0x9f61f: faceperson $0, $2 loadfont writetext UnknownText_0x9ec26 @@ -84,13 +74,12 @@ UnknownScript_0x9f61f: ; 0x9f61f applymovement $0, MovementData_0x9e576 warpcheck end -; 0x9f62f -BattleTowerHallway_MapEventHeader: ; 0x9f62f +BattleTowerHallway_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM @@ -99,13 +88,12 @@ BattleTowerHallway_MapEventHeader: ; 0x9f62f warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff -; 0x9f660 + person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1 |