diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-03-27 14:11:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 14:11:59 -0500 |
| commit | e2e8bf6a8477af254ea7057028f72ac918b62005 (patch) | |
| tree | ffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/route18gateupstairs.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| parent | Removed EVENT_DISP (diff) | |
| download | pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/route18gateupstairs.asm')
| -rwxr-xr-x | data/mapObjects/route18gateupstairs.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 1ad911e8..4110089e 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -1,15 +1,15 @@ Route18GateUpstairsObject: db $a ; border block - db $1 ; warps - db $7, $7, $4, ROUTE_18_GATE_1F + db 1 ; warps + warp 7, 7, 4, ROUTE_18_GATE_1F - db $2 ; signs - db $2, $1, $2 ; Route18GateUpstairsText2 - db $2, $6, $3 ; Route18GateUpstairsText3 + db 2 ; signs + sign 1, 2, 2 ; Route18GateUpstairsText2 + sign 6, 2, 3 ; Route18GateUpstairsText3 - db $1 ; objects - object SPRITE_COOK, $4, $2, WALK, $2, $1 ; person + db 1 ; objects + object SPRITE_COOK, 4, 2, WALK, 2, 1 ; person ; warp-to - EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F + warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F |