summaryrefslogtreecommitdiff
path: root/data/maps/AquaHideout_1F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/AquaHideout_1F')
-rw-r--r--data/maps/AquaHideout_1F/border.bin1
-rw-r--r--data/maps/AquaHideout_1F/events.inc13
-rw-r--r--data/maps/AquaHideout_1F/header.inc10
-rw-r--r--data/maps/AquaHideout_1F/map.bin55
-rw-r--r--data/maps/AquaHideout_1F/scripts.inc122
5 files changed, 140 insertions, 61 deletions
diff --git a/data/maps/AquaHideout_1F/border.bin b/data/maps/AquaHideout_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc
new file mode 100644
index 000000000..ab7c49b30
--- /dev/null
+++ b/data/maps/AquaHideout_1F/events.inc
@@ -0,0 +1,13 @@
+AquaHideout_1F_EventObjects: @ 8535304
+ object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
+ object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
+ object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
+
+AquaHideout_1F_MapWarps: @ 853534C
+ warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
+ warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY
+ warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_1F_MapEvents:: @ 8535364
+ map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index d2f8601bf..c632eb204 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,15 +1,15 @@
AquaHideout_1F: @ 8484144
- .4byte AquaHideout_1F_MapAttributes
+ .4byte AquaHideout_1F_Layout
.4byte AquaHideout_1F_MapEvents
.4byte AquaHideout_1F_MapScripts
.4byte 0x0
.2byte MUS_AJITO
.2byte 143
- .byte 197
+ .byte MAPSEC_AQUA_HIDEOUT
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
- .byte 3
+ .byte MAP_BATTLE_SCENE_AQUA
diff --git a/data/maps/AquaHideout_1F/map.bin b/data/maps/AquaHideout_1F/map.bin
deleted file mode 100644
index 2330fe015..000000000
--- a/data/maps/AquaHideout_1F/map.bin
+++ /dev/null
@@ -1,55 +0,0 @@
-STST [\21$#![\0!21!!2"
-cd:292)2)2)2cd82)2:292)2)22)22)2'
-
-!!! k2l22(2(2(2(2k2l22(2(2(2(2(2(2(2(2(27
-
-2)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2)2
-
-'//2(2(2]iiiiiiiiii^2(2(2(2(2(2
-
-/'/2(2(2`q1q1q1q1q1q1q1q1q1q12(2(2(2(2(2
-
-'/22(2(2`q1p1p1p1p1p1p1p1p1q12(2(2(2(2(2
-
-/22(2(2(2hiiiiiiiiii2(2(2(2(2
-
-)22(2(2(2(2*2*2*2*2*2*2*2*2*2*2*2*22(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]iiiiiif(2(2eiiiiii^2(2'
-
-)2(2(2`t||||||00||||||2(2/
-
-)2(2(2`us2(2*2
-
-)2(2(2`upppppppppppps2(2(2
-
-22(2`upppppppppppps2(2(2
-
-2uppppppppppppsy2(2(2
-
-2*BBBBtppppprBBBBB*2(2(2
-
-)2*22((BBBBuypppxsBBBBB((222
-
-)2(2(2t|||}ppp{||||2
-
-)2(2(2`uppps2
-
-)2(2(2`upppppppppppps2*2*2
-
-22(2`upppppppppppps2(2(2
-
-2`upppppppppppps222
-
-2uppppppppppppsy2
-
-)2*22*BBBBBtppprBBBBBB*2
-
-)2(2(2((BBBBBuypxsB(B(B(B(B(B((2*2*2
-
-mmmmmmmmougsnmmmmmmmmm
-
-qqqqqqqqusqqqqqqqqq
-llllllllllllllllllllll \ No newline at end of file
diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc
new file mode 100644
index 000000000..9172c3927
--- /dev/null
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -0,0 +1,122 @@
+AquaHideout_1F_MapScripts:: @ 8233493
+ .byte 0
+
+AquaHideout_1F_EventScript_233494:: @ 8233494
+ lock
+ faceplayer
+ checkflag FLAG_0x06F
+ goto_eq AquaHideout_1F_EventScript_2334BC
+ checkflag FLAG_0x0D4
+ goto_eq AquaHideout_1F_EventScript_2334B2
+ msgbox AquaHideout_1F_Text_23351D, 4
+ release
+ end
+
+AquaHideout_1F_EventScript_2334B2:: @ 82334B2
+ msgbox AquaHideout_1F_Text_2335E3, 4
+ release
+ end
+
+AquaHideout_1F_EventScript_2334BC:: @ 82334BC
+ msgbox AquaHideout_1F_Text_23367D, 4
+ release
+ end
+
+AquaHideout_1F_EventScript_2334C6:: @ 82334C6
+ lock
+ faceplayer
+ checkflag FLAG_0x06F
+ goto_eq AquaHideout_1F_EventScript_2334EE
+ checkflag FLAG_0x0D4
+ goto_eq AquaHideout_1F_EventScript_2334E4
+ msgbox AquaHideout_1F_Text_233739, 4
+ release
+ end
+
+AquaHideout_1F_EventScript_2334E4:: @ 82334E4
+ msgbox AquaHideout_1F_Text_2337FA, 4
+ release
+ end
+
+AquaHideout_1F_EventScript_2334EE:: @ 82334EE
+ msgbox AquaHideout_1F_Text_233884, 4
+ release
+ end
+
+AquaHideout_1F_EventScript_2334F8:: @ 82334F8
+ trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513
+ msgbox AquaHideout_1F_Text_233977, 6
+ end
+
+AquaHideout_1F_EventScript_233513:: @ 8233513
+ msgbox AquaHideout_1F_Text_233977, 4
+ release
+ end
+
+AquaHideout_1F_Text_23351D: @ 823351D
+ .string "What? What? What do you want with \n"
+ .string "TEAM AQUA?\p"
+ .string "Our BOSS isn’t here! He’s gone off to\n"
+ .string "snatch something important!\p"
+ .string "… …\n"
+ .string "Where did he go?\p"
+ .string "Wahaha! Do you really think I’d tell\n"
+ .string "you something that crucial?$"
+
+AquaHideout_1F_Text_2335E3: @ 82335E3
+ .string "What? What?\n"
+ .string "Are you a TEAM MAGMA grunt?\p"
+ .string "I hear that TEAM MAGMA is trying to\n"
+ .string "awaken an awesome POKéMON at their\l"
+ .string "HIDEOUT.\p"
+ .string "But where might their HIDEOUT be?$"
+
+AquaHideout_1F_Text_23367D: @ 823367D
+ .string "What? What? What do you want with \n"
+ .string "TEAM AQUA?\p"
+ .string "Our BOSS isn’t here!\n"
+ .string "He’s gone off to jack a submarine!\p"
+ .string "… …\n"
+ .string "Where did he go?\p"
+ .string "Wahaha! Do you really think I’d tell\n"
+ .string "you something that crucial?$"
+
+AquaHideout_1F_Text_233739: @ 8233739
+ .string "What? What? What do you want with \n"
+ .string "TEAM AQUA?\p"
+ .string "Our BOSS isn’t here! He’s on his way to\n"
+ .string "MT. PYRE on ROUTE 122!\p"
+ .string "… …\n"
+ .string "Why did he go?\p"
+ .string "Wahaha! Do you really think I’d tell\n"
+ .string "you something that crucial?$"
+
+AquaHideout_1F_Text_2337FA: @ 82337FA
+ .string "What? What?\n"
+ .string "Are you a TEAM MAGMA grunt?\p"
+ .string "I hear that TEAM MAGMA is after\n"
+ .string "an awesome POKéMON at MT. CHIMNEY.\p"
+ .string "But what is that POKéMON like?$"
+
+AquaHideout_1F_Text_233884: @ 8233884
+ .string "What? What? What do you want with\n"
+ .string "TEAM AQUA?\p"
+ .string "Our BOSS isn’t here!\n"
+ .string "He’s on his way to SLATEPORT CITY!\p"
+ .string "… …\n"
+ .string "Why did he go?\p"
+ .string "Wahaha! Do you really think I’d tell\n"
+ .string "you something that crucial?$"
+
+AquaHideout_1F_Text_23393D: @ 823393D
+ .string "Ayiyiyi!\n"
+ .string "Suspicious character spotted!$"
+
+AquaHideout_1F_Text_233964: @ 8233964
+ .string "Grrrrr…\n"
+ .string "I lost it!$"
+
+AquaHideout_1F_Text_233977: @ 8233977
+ .string "I took the loss for the TEAM,\n"
+ .string "but I did my job…$"
+