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_BattlePikeRandomRoom3 | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom3')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin | bin | 8 -> 0 bytes | |||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc | 12 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc | 50 |
5 files changed, 63 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin +++ /dev/null diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc new file mode 100644 index 000000000..20e6cb085 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -0,0 +1,12 @@ +BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 + coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 + coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + +BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 + map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index e3518c68b..1d8848d23 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom3_Layout .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin deleted file mode 100644 index 8ce7f1c37..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin +++ /dev/null @@ -1 +0,0 @@ -§ ¡¢£¤¥¦§¯¨©ª«¬®¯·°±²6³6´6µ¶·¿6¸6Û2º6»2¼6Û2¾6¿Ù2Ú2Üã2ä2å2ÜÚ2Ú242Ý2
3æ2è2ç2
3Ý2Ý2>ùùÁ2Á2Á2ùùù72
3
3Ý2Ý2Ý2
3
3Ú2>ùùùùùùùÁ2Ù2
3
3
3
3
3
3
3Ý2Ã2ùùùùùùùù42
3
3
3
3
3
3Ú2
3>ùùùùùùÁ2ù3Ú2
3
3
3
3
3Ý2
3>Á2ùùùùùùù72Ý2
3
3
3
3
3Ú2
3>ùùùùùùÁ2ù3
3Ú2Ú2Ú2Ú2Ú2Ý2
3>ù3ã2ä2å23ùùÙ2Ú2 æ2è2ç2 Ú2Ú2
\ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc new file mode 100644 index 000000000..9256764e8 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -0,0 +1,50 @@ +BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A + map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A + map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A + map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 + .byte 0 + +BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C + map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C + setvar VAR_TEMP_0, 1 + setvar VAR_0x8004, 6 + special sub_81A703C + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special sub_81A1780 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 + setvar VAR_TEMP_4, 1 + turnobject 255, 2 + end + +BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A + call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special sub_81A1780 + compare VAR_RESULT, 2 + goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + compare VAR_RESULT, 3 + goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 + setvar VAR_TEMP_1, 1 + end + |