Move events and scripts into map dirs

This commit is contained in:
Marcus Huderle
2018-06-20 17:41:41 -05:00
parent 89d35e82a2
commit 135a11e50e
1038 changed files with 1036 additions and 1036 deletions
+41
View File
@@ -0,0 +1,41 @@
AquaHideout_B1F_EventObjects: @ 8535378
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
AquaHideout_B1F_MapWarps: @ 8535450
warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F
warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F
warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F
warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F
warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F
warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F
warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F
warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F
warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F
warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F
warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F
warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F
warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F
warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F
warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F
warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F
warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F
warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F
warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F
warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F
warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F
warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F
warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F
warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F
AquaHideout_B1F_MapEvents:: @ 8535518
map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
+171
View File
@@ -0,0 +1,171 @@
AquaHideout_B1F_MapScripts:: @ 82339A7
map_script 5, AquaHideout_B1F_MapScript1_2339B2
map_script 3, AquaHideout_B1F_MapScript1_2339D0
.byte 0
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, AquaHideout_B1F_EventScript_2339BC
end
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, sub_8138B80
compare VAR_RESULT, 7
goto_if 5, AquaHideout_B1F_EventScript_27374E
removeobject VAR_LAST_TALKED
return
AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
checkflag FLAG_0x1C4
call_if 0, AquaHideout_B1F_EventScript_2339E3
checkflag FLAG_0x1C5
call_if 0, AquaHideout_B1F_EventScript_2339E7
end
AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
clearflag FLAG_0x3D1
return
AquaHideout_B1F_EventScript_2339E7:: @ 82339E7
clearflag FLAG_0x3D2
return
AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
waitse
playmoncry SPECIES_ELECTRODE, 2
delay 40
waitmoncry
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 4
goto_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 5
goto_eq AquaHideout_B1F_EventScript_233A2F
setflag FLAG_0x1C4
release
end
AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F
setflag FLAG_0x1C4
goto AquaHideout_B1F_EventScript_27376D
end
AquaHideout_B1F_EventScript_233A38:: @ 8233A38
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
waitse
playmoncry SPECIES_ELECTRODE, 2
delay 40
waitmoncry
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 4
goto_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 5
goto_eq AquaHideout_B1F_EventScript_233A7C
setflag FLAG_0x1C5
release
end
AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
setflag FLAG_0x1C5
goto AquaHideout_B1F_EventScript_27376D
end
AquaHideout_B1F_EventScript_233A85:: @ 8233A85
trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0
msgbox AquaHideout_B1F_Text_233B5E, 6
end
AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0
special sub_80B4808
waitmovement 0
msgbox AquaHideout_B1F_Text_233B5E, 4
release
end
AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0
trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB
msgbox AquaHideout_B1F_Text_233C41, 6
end
AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB
msgbox AquaHideout_B1F_Text_233C41, 4
release
end
AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5
trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA
msgbox AquaHideout_B1F_Text_233CDC, 6
end
AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC
trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E
msgbox AquaHideout_B1F_Text_233D84, 6
end
AquaHideout_B1F_Text_233B03: @ 8233B03
.string "If you want to know the secret about\n"
.string "our HIDEOUT, you have me to beat!$"
AquaHideout_B1F_Text_233B4A: @ 8233B4A
.string "I cant win at all…$"
AquaHideout_B1F_Text_233B5E: @ 8233B5E
.string "Our HIDEOUTs secret?\p"
.string "Well, lets just say…\n"
.string "Theres a submarine at the far end!\p"
.string "But, by now…\n"
.string "Kekekeke…$"
AquaHideout_B1F_Text_233BC5: @ 8233BC5
.string "Fuel supply loaded A-OK!\n"
.string "In-cruise snacks loaded A-OK!\p"
.string "Nothing left to do but KO a pesky\n"
.string "meddler!$"
AquaHideout_B1F_Text_233C27: @ 8233C27
.string "I took a serious licking!$"
AquaHideout_B1F_Text_233C41: @ 8233C41
.string "Humph!\n"
.string "This was supposed to happen!\p"
.string "My mission was to just hold you up!$"
AquaHideout_B1F_Text_233C89: @ 8233C89
.string "Yawn… Keeping watch over the\n"
.string "HIDEOUT bores me. Ill take you on.$"
AquaHideout_B1F_Text_233CCA: @ 8233CCA
.string "Yawn…\n"
.string "Oh, I lost…$"
AquaHideout_B1F_Text_233CDC: @ 8233CDC
.string "If you scurry too much, other TEAM\n"
.string "AQUA members might get you.$"
AquaHideout_B1F_Text_233D1B: @ 8233D1B
.string "Hey!\n"
.string "You there!\p"
.string "Which do you think is cooler?\n"
.string "TEAM AQUAs uniform or TEAM MAGMAs?$"
AquaHideout_B1F_Text_233D6E: @ 8233D6E
.string "I lost in a cool way…$"
AquaHideout_B1F_Text_233D84: @ 8233D84
.string "If you have a cool uniform, you look\n"
.string "good even in a loss, dont you think?$"