diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 19:54:16 -0500 |
| commit | 7b7f4bb7d6f5d29b40e15aa4c6285c6885359e0d (patch) | |
| tree | 8da3f8fae8c1c165e3435ee079f48631479b7611 /data/maps/MtPyre_4F | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
| parent | 8bf4b1a917786c683ac30278108f74d31961274d (diff) | |
Merge pull request #636 from huderlem/assets
Map organization
Diffstat (limited to 'data/maps/MtPyre_4F')
| -rw-r--r-- | data/maps/MtPyre_4F/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/MtPyre_4F/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/MtPyre_4F/header.inc | 4 | ||||
| -rw-r--r-- | data/maps/MtPyre_4F/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/MtPyre_4F/scripts.inc | 7 | ||||
| -rw-r--r-- | data/maps/MtPyre_4F/text.inc | 11 |
6 files changed, 34 insertions, 4 deletions
diff --git a/data/maps/MtPyre_4F/border.bin b/data/maps/MtPyre_4F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_4F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc new file mode 100644 index 000000000..9de527f2d --- /dev/null +++ b/data/maps/MtPyre_4F/events.inc @@ -0,0 +1,14 @@ +MtPyre_4F_EventObjects:: @ 838C9E0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 + +MtPyre_4F_MapWarps:: @ 838CA10 + warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F + warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F + warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F + warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F + warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F + warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F + +MtPyre_4F_MapEvents:: @ 838CA40 + map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 8dcbd4e64..720ff831e 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,9 +1,9 @@ MtPyre_4F:: @ 8306F68 - .4byte MtPyre_4F_MapAttributes + .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 141 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_4F/map.bin b/data/maps/MtPyre_4F/map.bin deleted file mode 100644 index 98dc679ff..000000000 --- a/data/maps/MtPyre_4F/map.bin +++ /dev/null @@ -1 +0,0 @@ -äï³´µêì÷»¼2½ëïïïïïï &&è2ç2é2&÷÷÷÷÷÷'&îæ2æ2æ2îïÃÄÅïïïïêÞ2Ï0Ï0ä÷ËÌ2Í÷÷÷÷ëÞ2Ï0Ï0ì&è2ç2é2&&&&&ç2ç2ç2&&æ2æ2æ2îîîîîæ2æ2æ2æ2ç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2îîîîîîîîîîæ2æ2æ2î&æ2æ2í6æ2æ2îîîò3æ2æ2æ2&æ2æ2æ2æ2æ2îîîîîîî&æ2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2
\ No newline at end of file diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc new file mode 100644 index 000000000..e1ebac7c1 --- /dev/null +++ b/data/maps/MtPyre_4F/scripts.inc @@ -0,0 +1,7 @@ +MtPyre_4F_MapScripts:: @ 815D417 + .byte 0 + +MtPyre_4F_EventScript_15D418:: @ 815D418 + trainerbattle 0, OPPONENT_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + msgbox MtPyre_4F_Text_1968EE, 6 + end diff --git a/data/maps/MtPyre_4F/text.inc b/data/maps/MtPyre_4F/text.inc new file mode 100644 index 000000000..275b6f5ac --- /dev/null +++ b/data/maps/MtPyre_4F/text.inc @@ -0,0 +1,11 @@ +MtPyre_4F_Text_1968A6:: @ 81968A6 + .string "Teacher...\n" + .string "Please watch over my progress!$" + +MtPyre_4F_Text_1968D0:: @ 81968D0 + .string "Teacher...\n" + .string "Please forgive me!$" + +MtPyre_4F_Text_1968EE:: @ 81968EE + .string "Until I improve, my teacher, who rests\n" + .string "here, will never find true peace...$" |