diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-04 11:11:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 11:11:45 -0400 |
| commit | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (patch) | |
| tree | e8d37347ae000823943ef57973dc34dd98633b40 /data/maps/BattleFrontier_BattlePikeRandomRoom2 | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin | bin | 8 -> 0 bytes | |||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc | 43 |
5 files changed, 50 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin +++ /dev/null diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc new file mode 100644 index 000000000..9cff20517 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -0,0 +1,6 @@ +BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 + +BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 + map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 425df7bcb..5dde0fc15 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin deleted file mode 100644 index 27a6e52aa..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin +++ /dev/null @@ -1 +0,0 @@ -¥6¦6§6 6¡66®6¯6¨6©6µ6¶6·6°6±652¾¿¸52=@3A3B3=Ù2H3I3J3Ú242P3Q3R3Ý2<X3Y3Z3ù
\ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc new file mode 100644 index 000000000..4f0d4632b --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -0,0 +1,43 @@ +BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 + map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + .byte 0 + +BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 + delay 16 + applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB + waitmovement 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 3 + special sub_81A1780 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 + closemessage + releaseall + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 + setvar VAR_TEMP_4, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 + .string "Congratulations…\n" + .string "Now, this way, please…$" + |