diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
| commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
| tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /data/maps/BattleFrontier_BattlePikeThreePathRoom | |
| parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
| parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cac594516..54f11f071 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 |