diff options
Diffstat (limited to 'data/maps')
2110 files changed, 49329 insertions, 8982 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/maps/AbandonedShip_CaptainsOffice/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index 791ab9754..791ab9754 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index e5e3adc3a..67112ba78 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,9 +1,9 @@ AbandonedShip_CaptainsOffice:: @ 8307454 - .4byte AbandonedShip_CaptainsOffice_MapAttributes + .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 196 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/maps/AbandonedShip_CaptainsOffice/map.bin Binary files differdeleted file mode 100644 index c9097fa63..000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/map.bin +++ /dev/null diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc new file mode 100644 index 000000000..22c76847a --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -0,0 +1,24 @@ +AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 + .byte 0 + +AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 + lock + faceplayer + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D + checkitem ITEM_SCANNER, 1 + compare RESULT, 1 + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D + msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 + release + end + +AbandonedShip_CaptainsOffice_EventScript_15EB23:: @ 815EB23 + msgbox AbandonedShip_CaptainsOffice_Text_198D00, 4 + release + end + +AbandonedShip_CaptainsOffice_EventScript_15EB2D:: @ 815EB2D + msgbox AbandonedShip_CaptainsOffice_Text_198D7B, 4 + release + end diff --git a/data/maps/AbandonedShip_CaptainsOffice/text.inc b/data/maps/AbandonedShip_CaptainsOffice/text.inc new file mode 100644 index 000000000..bdd2057c4 --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/text.inc @@ -0,0 +1,16 @@ +AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85 + .string "I’m investigating this ship on behalf\n" + .string "of CAPT. STERN.\p" + .string "He also asked me to find a SCANNER,\n" + .string "but I haven’t had any success...$" + +AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00 + .string "Oh! That’s a SCANNER!\p" + .string "Listen, can I get you to deliver that\n" + .string "to CAPT. STERN?\p" + .string "I want to investigate this ship a\n" + .string "little more.$" + +AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B + .string "This ship is called S.S. CACTUS.\n" + .string "It seems to be from an earlier era.$" diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/maps/AbandonedShip_Corridors_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index 82af88bce..82af88bce 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index e2bd23252..c228ebc29 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Corridors_1F:: @ 8307374 - .4byte AbandonedShip_Corridors_1F_MapAttributes + .4byte AbandonedShip_Corridors_1F_Layout .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 188 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/maps/AbandonedShip_Corridors_1F/map.bin deleted file mode 100644 index 5ef5ca949..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/map.bin +++ /dev/null @@ -1,3 +0,0 @@ - 22222 -2 662222222 -2 62222 2222222222 2226201222220111122222012222201111222220122222011112222201222220111122262%#&2222%$"#&2222-+6.2222-2,*+6.262222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc new file mode 100644 index 000000000..0c7278f3b --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -0,0 +1,11 @@ +AbandonedShip_Corridors_1F_MapScripts:: @ 815E964 + .byte 0 + +AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 + msgbox AbandonedShip_Corridors_1F_Text_1984D8, 2 + end + +AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E + trainerbattle 0, OPPONENT_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + msgbox AbandonedShip_Corridors_1F_Text_198493, 6 + end diff --git a/data/maps/AbandonedShip_Corridors_1F/text.inc b/data/maps/AbandonedShip_Corridors_1F/text.inc new file mode 100644 index 000000000..2df1c32b2 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/text.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D + .string "What’s so funny about having my inner\n" + .string "tube aboard the ship?$" + +AbandonedShip_Corridors_1F_Text_198479:: @ 8198479 + .string "Whoa, you overwhelmed me!$" + +AbandonedShip_Corridors_1F_Text_198493:: @ 8198493 + .string "It’s not easy throwing POKé BALLS\n" + .string "while hanging on to an inner tube!$" + +AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8 + .string "Isn’t it fun here?\n" + .string "I get excited just being here!$" diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/maps/AbandonedShip_Corridors_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 35dc34437..35dc34437 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 064e24e92..bbca3eaba 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Corridors_B1F:: @ 83073AC - .4byte AbandonedShip_Corridors_B1F_MapAttributes + .4byte AbandonedShip_Corridors_B1F_Layout .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 190 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/maps/AbandonedShip_Corridors_B1F/map.bin deleted file mode 100644 index 24b1a7b61..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -!!011112!!011)011112)0112011112201122%#$"&22%#$22-+6,*2.22-+6,22222222222222222222222226222222222222 262220111111122222011111112
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc new file mode 100644 index 000000000..c34f2c28b --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -0,0 +1,55 @@ +AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F + map_script 5, AbandonedShip_Corridors_B1F_MapScript1_15E99A + map_script 1, AbandonedShip_Corridors_B1F_MapScript1_15E9A3 + .byte 0 + +AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 + end + +AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9B6 + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9C0 + end + +AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 + setmetatile 11, 4, 563, 1 + return + +AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 + setmetatile 11, 4, 555, 1 + return + +AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA + msgbox AbandonedShip_Corridors_B1F_Text_19864A, 2 + end + +AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 + lockall + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14 + checkitem ITEM_STORAGE_KEY, 1 + compare RESULT, 0 + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A + msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 + playse SE_PIN + takeitem ITEM_STORAGE_KEY, 1 + setflag FLAG_USED_STORAGE_KEY + call AbandonedShip_Corridors_B1F_EventScript_15E9C0 + special DrawWholeMapView + releaseall + end + +AbandonedShip_Corridors_B1F_EventScript_15EA0A:: @ 815EA0A + msgbox AbandonedShip_Corridors_B1F_Text_19865C, 4 + releaseall + end + +AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 + msgbox AbandonedShip_Corridors_B1F_Text_1986EC, 4 + releaseall + end + +AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E + trainerbattle 0, OPPONENT_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 + end diff --git a/data/maps/AbandonedShip_Corridors_B1F/text.inc b/data/maps/AbandonedShip_Corridors_B1F/text.inc new file mode 100644 index 000000000..887a6c11a --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/text.inc @@ -0,0 +1,29 @@ +AbandonedShip_Corridors_B1F_Text_19856F:: @ 819856F + .string "When we go out to sea, we SAILORS\n" + .string "always bring our POKéMON.\l" + .string "How about a quick battle?$" + +AbandonedShip_Corridors_B1F_Text_1985C5:: @ 81985C5 + .string "Whoops, I’m sunk!$" + +AbandonedShip_Corridors_B1F_Text_1985D7:: @ 81985D7 + .string "The ship’s bottom has sunk into the\n" + .string "depths.\p" + .string "If a POKéMON knew how to go underwater,\n" + .string "we might make some progress...$" + +AbandonedShip_Corridors_B1F_Text_19864A:: @ 819864A + .string "Yay!\n" + .string "It’s a ship!$" + +AbandonedShip_Corridors_B1F_Text_19865C:: @ 819865C + .string "The door is locked.\p" + .string "“STORAGE” is painted on the door.$" + +AbandonedShip_Corridors_B1F_Text_198692:: @ 8198692 + .string "{PLAYER} inserted and turned the\n" + .string "STORAGE KEY.\p" + .string "The inserted KEY stuck fast, but the\n" + .string "door opened.$" + +AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/maps/AbandonedShip_Deck/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/AbandonedShip_Deck/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc index 15f54114b..15f54114b 100644 --- a/data/maps/events/AbandonedShip_Deck.inc +++ b/data/maps/AbandonedShip_Deck/events.inc diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 1db367db8..84b45db3a 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Deck:: @ 8307358 - .4byte AbandonedShip_Deck_MapAttributes + .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 187 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/maps/AbandonedShip_Deck/map.bin deleted file mode 100644 index 67cdde3d7..000000000 --- a/data/maps/AbandonedShip_Deck/map.bin +++ /dev/null @@ -1 +0,0 @@ -(((`( `(((((b`(((((((((((`(''`(eif(b`(( (((((((`('/`(((((b`( '( (ef(`(/'hiiiiij`(''('((((`(*/`(//(/((((`(* ]]]2hiiiiiiii(((`(((33*2*22*22ef(hiiiiif(2(2ei (((00((( ]]]2002]]]]]]]](((33*2*22*22*22*22*2*2*2*2*2*2*2(((((((2(2(2(2(2(2(2(2(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiii00 00 22 44pppppppp
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc new file mode 100644 index 000000000..68d872f01 --- /dev/null +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -0,0 +1,7 @@ +AbandonedShip_Deck_MapScripts:: @ 815E95A + map_script 3, AbandonedShip_Deck_MapScript1_15E960 + .byte 0 + +AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 + setflag FLAG_LANDMARK_ABANDONED_SHIP + end diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 97bdf37c5..97bdf37c5 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index a841ee87c..99b22902b 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,9 +1,9 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes + .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 290 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin deleted file mode 100644 index a4637ccbe..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin +++ /dev/null @@ -1 +0,0 @@ - 2222222222222622422222242 22222011111112266201111111222220111111122222%#$"#$"#&22-36,*36,*+6.22V2222222222GVx2222222222
\ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc new file mode 100644 index 000000000..e8e48a6f6 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -0,0 +1,136 @@ +AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 + map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51 + map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A + .byte 0 + +AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 + end + +AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 + setmetatile 3, 8, 555, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD + setmetatile 6, 8, 555, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 + setmetatile 3, 3, 538, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 + setmetatile 9, 3, 538, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB + setmetatile 3, 8, 563, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 + setmetatile 6, 8, 563, 1 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF + setmetatile 3, 3, 564, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 + setmetatile 9, 3, 564, 0 + return + +AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 + lockall + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + checkitem ITEM_ROOM_1_KEY, 1 + compare RESULT, 0 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF + msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 + playse SE_PIN + takeitem ITEM_ROOM_1_KEY, 1 + setflag FLAG_USED_ROOM_1_KEY + call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A + lockall + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + checkitem ITEM_ROOM_2_KEY, 1 + compare RESULT, 0 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 + msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 + playse SE_PIN + takeitem ITEM_ROOM_2_KEY, 1 + setflag FLAG_USED_ROOM_2_KEY + call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 + lockall + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + checkitem ITEM_ROOM_4_KEY, 1 + compare RESULT, 0 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 + msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 + playse SE_PIN + takeitem ITEM_ROOM_4_KEY, 1 + setflag FLAG_USED_ROOM_4_KEY + call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 + lockall + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + checkitem ITEM_ROOM_6_KEY, 1 + compare RESULT, 0 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED + msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 + playse SE_PIN + takeitem ITEM_ROOM_6_KEY, 1 + setflag FLAG_USED_ROOM_6_KEY + call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + special DrawWholeMapView + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF:: @ 815ECCF + msgbox AbandonedShip_HiddenFloorCorridors_Text_198DC0, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9:: @ 815ECD9 + msgbox AbandonedShip_HiddenFloorCorridors_Text_198DF4, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3:: @ 815ECE3 + msgbox AbandonedShip_HiddenFloorCorridors_Text_198E28, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15ECED:: @ 815ECED + msgbox AbandonedShip_HiddenFloorCorridors_Text_198E5C, 4 + releaseall + end + +AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7:: @ 815ECF7 + msgbox AbandonedShip_HiddenFloorCorridors_Text_1986EC, 4 + releaseall + end diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc new file mode 100644 index 000000000..4e7c2014f --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc @@ -0,0 +1,2 @@ +AbandonedShip_HiddenFloorCorridors_Text_1986EC:: @ 81986EC + .string "The door is open.$" diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/maps/AbandonedShip_HiddenFloorRooms/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 7c8135e89..7c8135e89 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 647b22977..8f5d464a2 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,9 +1,9 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes + .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 311 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/maps/AbandonedShip_HiddenFloorRooms/map.bin deleted file mode 100644 index b63eeabe6..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin +++ /dev/null @@ -1 +0,0 @@ -6''''c'''''76''''''''''76'''''c'''''7>////6/////?>/////2/////GF/////6/////?>h;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2665;266;2;2;2;2ON:2;2;2;2;2;2;2g2;2;266;2?>=28282828282a2828282826?>682a2^6_682b6682828282;2;2<28282b68282828282826682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>682^6_6828282828282`282?>=2`2828282828282828282a282?>682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a2828282826?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;266;2?>=282828282a2828282V6W682?>=28282828282`2828282b6826?>682828282V6W68282826682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>682`2828282828282828282?>=2V6W682828282828282828282?>=282828282828282828282826?>=282828282d2e2828282826?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2?
\ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc new file mode 100644 index 000000000..5a5ab3005 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -0,0 +1,143 @@ +AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 + map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07 + .byte 0 + +AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 + .2byte 0 + +AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + compare VAR_TEMP_2, 36 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + compare VAR_TEMP_3, 2 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + switch VAR_TEMP_4 + case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B + case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 + case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5 + case 4, AbandonedShip_HiddenFloorRooms_EventScript_15EDEB + case 5, AbandonedShip_HiddenFloorRooms_EventScript_15EE23 + case 6, AbandonedShip_HiddenFloorRooms_EventScript_15EE6A + end + +AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89 + addvar VAR_TEMP_4, 1 + return + +AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F + addvar VAR_TEMP_4, 2 + return + +AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 + addvar VAR_TEMP_4, 3 + return + +AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B + delay 20 + setfieldeffectargument 0, 10 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + specialvar RESULT, FoundAbandonedShipRoom4Key + compare RESULT, 0 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + waitfieldeffect FLDEFF_SPARKLE + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 + specialvar RESULT, FoundAbandonedShipRoom1Key + compare RESULT, 1 + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA + delay 20 + compare RESULT, 0 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + waitfieldeffect FLDEFF_SPARKLE + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB + delay 20 + setfieldeffectargument 0, 8 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + setfieldeffectargument 0, 11 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + specialvar RESULT, FoundAbandonedShipRoom6Key + compare RESULT, 0 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + waitfieldeffect FLDEFF_SPARKLE + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 + delay 20 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + setfieldeffectargument 0, 25 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + setfieldeffectargument 0, 24 + setfieldeffectargument 1, 6 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + specialvar RESULT, FoundAbandonedShipRoom2Key + compare RESULT, 0 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + waitfieldeffect FLDEFF_SPARKLE + delay 10 + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A + end + +AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B + setfieldeffectargument 0, 42 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + return + +AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B + setfieldeffectargument 0, 20 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + return + +AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 12 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + return + +AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + return + +AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB + lockall + msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, 4 + releaseall + end diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/text.inc b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc new file mode 100644 index 000000000..1be9f8f02 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc @@ -0,0 +1,35 @@ +AbandonedShip_HiddenFloorCorridors_Text_198DC0:: @ 8198DC0 + .string "The door is locked.\p" + .string "“RM. 1” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_198DF4:: @ 8198DF4 + .string "The door is locked.\p" + .string "“RM. 2” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_198E28:: @ 8198E28 + .string "The door is locked.\p" + .string "“RM. 4” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_198E5C:: @ 8198E5C + .string "The door is locked.\p" + .string "“RM. 6” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_198E90:: @ 8198E90 + .string "{PLAYER} inserted and turned the\n" + .string "KEY.\p" + .string "The inserted KEY stuck fast, but the\n" + .string "door opened.$" + +AbandonedShip_HiddenFloorRooms_Text_198EE2:: @ 8198EE2 + .string "It’s bright and shiny!\n" + .string "But it’s just trash...$" + +UnknownString_8198F10: @ 8198F10 + .string "There’s a small indent in the wall.$" + +UnknownString_8198F34: @ 8198F34 + .string "There’s a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +UnknownString_8198F6E: @ 8198F6E + .string "Discovered a small cavern!$" diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/maps/AbandonedShip_Room_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Room_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index e828890a5..e828890a5 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 7b88baf94..335c10f7a 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Room_B1F:: @ 830741C - .4byte AbandonedShip_Room_B1F_MapAttributes + .4byte AbandonedShip_Room_B1F_Layout .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 194 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/maps/AbandonedShip_Room_B1F/map.bin deleted file mode 100644 index cb8393eb2..000000000 --- a/data/maps/AbandonedShip_Room_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6'''''''7>///////?>:2;2;2;2;2;2;2?>=282a282828282?>=2`28282828282?>=282828282a282?>=2828282828282?>=28282d2e282b?
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Room_B1F/scripts.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc new file mode 100644 index 000000000..4cdc8bbd1 --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc @@ -0,0 +1,2 @@ +AbandonedShip_Room_B1F_MapScripts:: @ 815EA66 + .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/maps/AbandonedShip_Rooms2_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index e29bd3b42..e29bd3b42 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 44bcd4733..bb6b7be08 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms2_1F:: @ 8307438 - .4byte AbandonedShip_Rooms2_1F_MapAttributes + .4byte AbandonedShip_Rooms2_1F_Layout .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 195 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/maps/AbandonedShip_Rooms2_1F/map.bin deleted file mode 100644 index c897ce8a0..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@kc''7>Hs6//?>PQ:2;2;2;2;2?>XY=282828282?> 2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282?
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc new file mode 100644 index 000000000..e1e903cc0 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -0,0 +1,28 @@ +AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 + .byte 0 + +AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 + trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 + msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 + end + +AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 + trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6 + end + +AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE + trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 + msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 + end + +AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 + trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 + end diff --git a/data/maps/AbandonedShip_Rooms2_1F/text.inc b/data/maps/AbandonedShip_Rooms2_1F/text.inc new file mode 100644 index 000000000..3acf542fc --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/text.inc @@ -0,0 +1,70 @@ +AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1 + .string "HAL: While searching for treasures,\n" + .string "we discovered a TRAINER!$" + +AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE + .string "HAL: We couldn’t win even though\n" + .string "we worked together...$" + +AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835 + .string "HAL: We can’t find any treasures...\n" + .string "I wonder if someone got them already?$" + +AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F + .string "HAL: You don’t even have two POKéMON.\n" + .string "You can’t expect to beat us like that.$" + +AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC + .string "LOIS: Oh? We were looking for some\n" + .string "treasure, but we only found a TRAINER.$" + +AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916 + .string "LOIS: Oh, wow, you’re strong!$" + +AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934 + .string "LOIS: I wonder where the treasures\n" + .string "are hidden?\p" + .string "I already know what I’m going to buy\n" + .string "when I find them!$" + +AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A + .string "LOIS: Don’t you have two POKéMON?\n" + .string "We’ll have to battle another time!$" + +AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF + .string "HAL: We’ve been searching for\n" + .string "treasures all this time.\p" + .string "Our POKéMON have grown stronger, too.\n" + .string "Let us show you, okay?$" + +AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53 + .string "HAL: You’re strong as usual!$" + +AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70 + .string "HAL: We can’t find any treasures,\n" + .string "we lose at POKéMON...\p" + .string "I want to go home... But if I say that,\n" + .string "she gets all angry with me...$" + +AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE + .string "HAL: You don’t even have two POKéMON.\n" + .string "You can’t expect to beat us like that.$" + +AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B + .string "LOIS: Oh, hi, we meet again!\p" + .string "Just like us, you haven’t given up\n" + .string "searching for treasures!\p" + .string "How about we battle, and the loser has\n" + .string "to give up looking?$" + +AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF + .string "LOIS: Oh, we lost again...$" + +AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA + .string "LOIS: We’ll raise our POKéMON more.\p" + .string "We’re not going home until we find our\n" + .string "treasures!$" + +AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40 + .string "LOIS: Don’t you have two POKéMON?\n" + .string "We’ll have to battle another time!$" diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/maps/AbandonedShip_Rooms2_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index aa6eb759a..aa6eb759a 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 017b1382b..538209d37 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 - .4byte AbandonedShip_Rooms2_B1F_MapAttributes + .4byte AbandonedShip_Rooms2_B1F_Layout .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 192 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/maps/AbandonedShip_Rooms2_B1F/map.bin deleted file mode 100644 index 7865bb69d..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@AB''''76@AB'CDE7>HIJ////?>HIJ/KLM?>PQ:2;2;2;2;2GFPQ:2;2;2TU?>XY=282VW6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=282828282826?>6828282828282?>682828282`282?>=28282d2e282b?>=28282d2e28282?
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc new file mode 100644 index 000000000..0c8f3ffc9 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -0,0 +1,6 @@ +AbandonedShip_Rooms2_B1F_MapScripts:: @ 815EA4D + .byte 0 + +AbandonedShip_Rooms2_B1F_EventScript_15EA4E:: @ 815EA4E + msgbox AbandonedShip_Rooms2_B1F_Text_198759, 2 + end diff --git a/data/maps/AbandonedShip_Rooms2_B1F/text.inc b/data/maps/AbandonedShip_Rooms2_B1F/text.inc new file mode 100644 index 000000000..11e505abd --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/text.inc @@ -0,0 +1,5 @@ +AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759 + .string "This is a perfect place to go exploring!\n" + .string "It’s exciting here!\p" + .string "I bet there’re amazing treasures on\n" + .string "board.$" diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/maps/AbandonedShip_Rooms_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index 6ffe06615..6ffe06615 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 7e8dbd5b8..39866961f 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms_1F:: @ 8307390 - .4byte AbandonedShip_Rooms_1F_MapAttributes + .4byte AbandonedShip_Rooms_1F_Layout .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 189 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/maps/AbandonedShip_Rooms_1F/map.bin deleted file mode 100644 index 20529b3df..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6''c''76@kc''7>//6//?>Hs6//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=28282826?>682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW8282826?>=2a28282828282?>=2^_82828282?>68282d2e28282?>=28282d2e28282?
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc new file mode 100644 index 000000000..c5f9ad3f5 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -0,0 +1,6 @@ +AbandonedShip_Rooms_1F_MapScripts:: @ 815E985 + .byte 0 + +AbandonedShip_Rooms_1F_EventScript_15E986:: @ 815E986 + msgbox AbandonedShip_Rooms_1F_Text_19850A, 2 + end diff --git a/data/maps/AbandonedShip_Rooms_1F/text.inc b/data/maps/AbandonedShip_Rooms_1F/text.inc new file mode 100644 index 000000000..67b67ca4c --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/text.inc @@ -0,0 +1,5 @@ +AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A + .string "Ships of this sort are rare, so I’m\n" + .string "taking a look around.\p" + .string "Hmhm...\n" + .string "There appear to be other cabins...$" diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/maps/AbandonedShip_Rooms_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 405506b44..405506b44 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 6ac6e3794..ac27a4798 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 - .4byte AbandonedShip_Rooms_B1F_MapAttributes + .4byte AbandonedShip_Rooms_B1F_Layout .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 191 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/maps/AbandonedShip_Rooms_B1F/map.bin deleted file mode 100644 index b18509507..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@kmE@kc''@kmE7>Hs2uMHs6//Hs2uM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<28282826:2;2<28282;2;2?>=2VW8282826=282=28282a2828282?>=2^_82`28282=2pVp82=2`2828282b82?>6828282828282=2VGV82=282828282826?
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc new file mode 100644 index 000000000..4299c7da4 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -0,0 +1,11 @@ +AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 + map_script 5, AbandonedShip_Rooms_B1F_MapScript1_15EA3B + .byte 0 + +AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 + end + +AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 + msgbox AbandonedShip_Rooms_B1F_Text_1986FE, 2 + end diff --git a/data/maps/AbandonedShip_Rooms_B1F/text.inc b/data/maps/AbandonedShip_Rooms_B1F/text.inc new file mode 100644 index 000000000..45df47d60 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/text.inc @@ -0,0 +1,5 @@ +AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE + .string "Urrrrppp...\p" + .string "I’m getting queasy just being aboard\n" + .string "this ship...\p" + .string "It’s not even moving, but...$" diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/maps/AbandonedShip_Underwater1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Underwater1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc index 17a89c2aa..17a89c2aa 100644 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ b/data/maps/AbandonedShip_Underwater1/events.inc diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 6313cf6f1..bf4004eb2 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Underwater1:: @ 8307400 - .4byte AbandonedShip_Underwater1_MapAttributes + .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 193 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/maps/AbandonedShip_Underwater1/map.bin deleted file mode 100644 index 2c73cfe86..000000000 --- a/data/maps/AbandonedShip_Underwater1/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc new file mode 100644 index 000000000..52ba61136 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -0,0 +1,7 @@ +AbandonedShip_Underwater1_MapScripts:: @ 815EA57 + map_script 5, AbandonedShip_Underwater1_MapScript1_15EA5D + .byte 0 + +AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 + end diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/maps/AbandonedShip_Underwater2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AbandonedShip_Underwater2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc index 6eb94059c..6eb94059c 100644 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ b/data/maps/AbandonedShip_Underwater2/events.inc diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index c81b78357..ad7380354 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,9 +1,9 @@ AbandonedShip_Underwater2:: @ 8307470 - .4byte AbandonedShip_Underwater2_MapAttributes + .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 197 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/maps/AbandonedShip_Underwater2/map.bin deleted file mode 100644 index 9dbd5c71a..000000000 --- a/data/maps/AbandonedShip_Underwater2/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc new file mode 100644 index 000000000..22113661a --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -0,0 +1,7 @@ +AbandonedShip_Underwater2_MapScripts:: @ 815EB37 + map_script 5, AbandonedShip_Underwater2_MapScript1_15EB3D + .byte 0 + +AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 + end diff --git a/data/maps/AncientTomb/border.bin b/data/maps/AncientTomb/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/AncientTomb/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc index 2699b9036..2699b9036 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/AncientTomb/events.inc diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 82ac0555d..f559acdd4 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,9 +1,9 @@ AncientTomb:: @ 83074E0 - .4byte AncientTomb_MapAttributes + .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 282 .byte 83 .byte 0 diff --git a/data/maps/AncientTomb/map.bin b/data/maps/AncientTomb/map.bin Binary files differdeleted file mode 100644 index bb87de307..000000000 --- a/data/maps/AncientTomb/map.bin +++ /dev/null diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc new file mode 100644 index 000000000..8ff39c0a4 --- /dev/null +++ b/data/maps/AncientTomb/scripts.inc @@ -0,0 +1,68 @@ +AncientTomb_MapScripts:: @ 815EFBE + map_script 5, AncientTomb_MapScript1_15EFCE + map_script 1, AncientTomb_MapScript1_15EFE0 + map_script 3, AncientTomb_MapScript1_15EFDC + .byte 0 + +AncientTomb_MapScript1_15EFCE:: @ 815EFCE + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_15EFD8 + end + +AncientTomb_EventScript_15EFD8:: @ 815EFD8 + removeobject LAST_TALKED + return + +AncientTomb_MapScript1_15EFDC:: @ 815EFDC + setflag FLAG_LANDMARK_ANCIENT_TOMB + end + +AncientTomb_MapScript1_15EFE0:: @ 815EFE0 + call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15EFEA + end + +AncientTomb_EventScript_15EFEA:: @ 815EFEA + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 + return + +AncientTomb_EventScript_15F021:: @ 815F021 + lockall + goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15F038 + braillemessage AncientTomb_Braille_1C552E + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +AncientTomb_EventScript_15F038:: @ 815F038 + msgbox AncientTomb_Text_1A13BE, 4 + releaseall + end + +AncientTomb_EventScript_15F042:: @ 815F042 + lockall + braillemessage AncientTomb_Braille_1C552E + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +AncientTomb_EventScript_15F050:: @ 815F050 + lock + faceplayer + waitse + playmoncry SPECIES_REGISTEEL, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE + setflag FLAG_HIDE_REGISTEEL + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartRegiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end 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/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc index 3c87be0d7..3c87be0d7 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/AquaHideout_1F/events.inc diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 94650821d..7fc84658d 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,9 +1,9 @@ AquaHideout_1F:: @ 8306FF4 - .4byte AquaHideout_1F_MapAttributes + .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 144 .byte 66 .byte 0 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 @@ -ST ST [\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..ee49ba695 --- /dev/null +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -0,0 +1,46 @@ +AquaHideout_1F_MapScripts:: @ 815D7C2 + map_script 3, AquaHideout_1F_MapScript1_15D7C8 + .byte 0 + +AquaHideout_1F_MapScript1_15D7C8:: @ 815D7C8 + call AquaHideout_1F_EventScript_1A0196 + end + +AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE +MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE + lock + faceplayer + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D7E3 + msgbox AquaHideout_1F_Text_196AFD, 4 + release + end + +AquaHideout_1F_EventScript_15D7E3:: @ 815D7E3 + msgbox AquaHideout_1F_Text_196BC5, 4 + release + end + +AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED +MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED + lock + faceplayer + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D802 + msgbox AquaHideout_1F_Text_196C83, 4 + release + end + +AquaHideout_1F_EventScript_15D802:: @ 815D802 + msgbox AquaHideout_1F_Text_196D46, 4 + release + end + +AquaHideout_1F_EventScript_15D80C:: @ 815D80C +MagmaHideout_1F_EventScript_15D80C:: @ 815D80C + trainerbattle 2, OPPONENT_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 + msgbox AquaHideout_1F_Text_196E3D, 6 + end + +AquaHideout_1F_EventScript_15D827:: @ 815D827 + msgbox AquaHideout_1F_Text_196E3D, 4 + release + end diff --git a/data/maps/AquaHideout_1F/text.inc b/data/maps/AquaHideout_1F/text.inc new file mode 100644 index 000000000..6c003d308 --- /dev/null +++ b/data/maps/AquaHideout_1F/text.inc @@ -0,0 +1,51 @@ +AquaHideout_1F_Text_196AFD:: @ 8196AFD + .string "What? What? What do you want with \n" + .string "TEAM {EVIL_TEAM}?\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_196BC5:: @ 8196BC5 + .string "What? What? What do you want with \n" + .string "TEAM {EVIL_TEAM}?\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_196C83:: @ 8196C83 + .string "What? What? What do you want with \n" + .string "TEAM {EVIL_TEAM}?\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_196D46:: @ 8196D46 + .string "What? What? What do you want with\n" + .string "TEAM {EVIL_TEAM}?\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_196E01:: @ 8196E01 + .string "Ayiyiyi!\n" + .string "Suspicious character spotted!$" + +AquaHideout_1F_Text_196E28:: @ 8196E28 + .string "Grrrrr...\n" + .string "I lost it!$" + +AquaHideout_1F_Text_196E3D:: @ 8196E3D + .string "I took the loss for the TEAM, but\n" + .string "I did my job...$" diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/maps/AquaHideout_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc index 0a53d4cf9..0a53d4cf9 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/AquaHideout_B1F/events.inc diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index ef7f4cfdf..94abd0406 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,9 +1,9 @@ AquaHideout_B1F:: @ 8307010 - .4byte AquaHideout_B1F_MapAttributes + .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 145 .byte 66 .byte 0 diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/maps/AquaHideout_B1F/map.bin deleted file mode 100644 index 5d13df58d..000000000 --- a/data/maps/AquaHideout_B1F/map.bin +++ /dev/null @@ -1,83 +0,0 @@ - 01!2 -112! -!!2!! - -!!! -ST8292)22)22 -92922)22)2 -')22)22)2' - -)2)2)2 - -!2[\ )2(2(2(2(2(2 -)2(2(2(2(2(27 -/2(2(2(2(2/ - -72(227 - -)22)22cd2)2(2(2(2(2(2 -)2(2(2(2(22*2*27 -)22(2(2(22(2 - -)2*22(2(2*2*27 - -)2(2(2(2k2l22(2(2(2(2(2(2 2Y2Y2Y2Y2Y2Y2Y2Y2Y2 2Y2Y2Y2Y2Y2Y2 -)22(2(22(2(22(2 - -)2(2(2(22A2B2222(2(2(2+,-. -iiiiiii^ - -)2(2(2(2IJ222(2(2(2 -$#$!!! -0013456 - -`2222222 - -)2(2(2(22 22A2B22(2(2(2 -37733366 -828292;<=> - -hiiiiiii - -)2(2(2(2222IJ(2(2(2 -3337733333 -)263(2CDEF - -)22(2(22(2(22(2 - -)2(2(2(2222 222(2(2(2 -3333333323 -)2(2(2KLMN - -iiiiiii^ - 2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 3333333333 )2(2(2(2UV)2 - -`2222222 -)22(2(2(2(2(2 - -hiiiiiii - -!!!!!!!!!!!!! !!!!!!!!!! 2Y2Y2Y2Y2Y2Y2 -)22(2(22(2(22(2 - -)2)2)2)2)2)2)2)2)2)2)2)2)22)2222222223 -iiiiiii^ - -)2(22(2(2(2(2(2(2(2(2(2(2(2(23
2227 !!!!!!! - -`2222222 - -iiiiiiiiiiiii^22 2D322222)2)2 - -hiiiiiii - -`222222222222222 22222 22222222(2(2 - -)22(2(22(2(22(2 - -`2O1O1O1O1O1O1O1O1O1O1O1O12A2B2222A2B23322222(2(2 - 2Y2Y2Y2Y2Y2Y2Y2Y2 -hiiiiiiiiiiiii2IJ222IJ22222(22 - -)2*22*2*2*2*2*2*2*2*2*2*2*2*22 222222 22222222(2(2 - !!!!!!!!! 2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
\ No newline at end of file diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc new file mode 100644 index 000000000..3be8d487d --- /dev/null +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -0,0 +1,44 @@ +AquaHideout_B1F_MapScripts:: @ 815D831 + map_script 5, AquaHideout_B1F_MapScript1_15D83C + map_script 3, AquaHideout_B1F_MapScript1_15D84A + .byte 0 + +AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_15D846 + end + +AquaHideout_B1F_EventScript_15D846:: @ 815D846 + removeobject LAST_TALKED + return + +AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A + call AquaHideout_B1F_EventScript_1A0196 + end + +AquaHideout_B1F_EventScript_15D850:: @ 815D850 +MagmaHideout_B1F_EventScript_15D850:: @ 815D850 + trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B + msgbox AquaHideout_B1F_Text_196ECC, 6 + end + +AquaHideout_B1F_EventScript_15D86B:: @ 815D86B + msgbox AquaHideout_B1F_Text_196ECC, 4 + release + end + +AquaHideout_B1F_EventScript_15D875:: @ 815D875 +MagmaHideout_B1F_EventScript_15D875:: @ 815D875 + trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 + msgbox AquaHideout_B1F_Text_196FB5, 6 + end + +AquaHideout_B1F_EventScript_15D890:: @ 815D890 + msgbox AquaHideout_B1F_Text_196FB5, 4 + release + end + +AquaHideout_B1F_EventScript_15D89A:: @ 815D89A +MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A + trainerbattle 0, OPPONENT_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 + msgbox AquaHideout_B1F_Text_197056, 6 + end diff --git a/data/maps/AquaHideout_B1F/text.inc b/data/maps/AquaHideout_B1F/text.inc new file mode 100644 index 000000000..605a98b8b --- /dev/null +++ b/data/maps/AquaHideout_B1F/text.inc @@ -0,0 +1,39 @@ +AquaHideout_B1F_Text_196E6F:: @ 8196E6F + .string "If you want to know the secret about\n" + .string "our HIDEOUT, you have me to beat!$" + +AquaHideout_B1F_Text_196EB6:: @ 8196EB6 + .string "I can’t win at all...$" + +AquaHideout_B1F_Text_196ECC:: @ 8196ECC + .string "Our HIDEOUT’s secret?\p" + .string "Well, let’s just say...\n" + .string "There’s a submarine at the far end!\p" + .string "But, by now...\n" + .string "Kekekeke...$" + +AquaHideout_B1F_Text_196F39:: @ 8196F39 + .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_196F9B:: @ 8196F9B + .string "I took a serious licking!$" + +AquaHideout_B1F_Text_196FB5:: @ 8196FB5 + .string "Humph!\n" + .string "This was supposed to happen!\p" + .string "My mission was to just hold you up!$" + +AquaHideout_B1F_Text_196FFD:: @ 8196FFD + .string "Yawn... Keeping watch over the\n" + .string "HIDEOUT bores me. I’ll take you on.$" + +AquaHideout_B1F_Text_197040:: @ 8197040 + .string "Yawn...\n" + .string "Oh, I lost...$" + +AquaHideout_B1F_Text_197056:: @ 8197056 + .string "If you scurry too much, other TEAM\n" + .string "{EVIL_TEAM} members might get you.$" diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/maps/AquaHideout_B2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/AquaHideout_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc index 6eee30658..6eee30658 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/AquaHideout_B2F/events.inc diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 38b3f546f..c700ac8dd 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,9 +1,9 @@ AquaHideout_B2F:: @ 830702C - .4byte AquaHideout_B2F_MapAttributes + .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 146 .byte 66 .byte 0 diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/maps/AquaHideout_B2F/map.bin deleted file mode 100644 index 2e843a8e4..000000000 --- a/data/maps/AquaHideout_B2F/map.bin +++ /dev/null @@ -1,51 +0,0 @@ -ST+,-.+,-.222 [\012 -!!23456!!3456!!! -cd82922)22 -)2)22)22;<=>)2)2;<=>)2)2)2 - -!2! -k2l22(2(2(2(2 -)2(2(2(2(2CDEF2(2CDEF2(2(2 - -)22)22)2 -)2(2(2(2(2(2(2 -)2(2(2(2(2KLMN2(2KLMN2(2(2 - -)2(2(2(2(2 -)2(2(22A2B22 -)2(2(2(2(2(2UV2(2(2(2UV2(2(2(2 - -)2 (2(2 -)2(2(22IJ -)2(222(2(2*2*22(2(2(2*2*22(2(2(2 - -)2// (2 -)2(2(22 222 -)2(22(222(2(222(222(2(2(2 - -)277/2 -)22(22222 -)2(2202(2222(2 - 2Y2Y2Y2Y2 2Y2Y2Y2Y2Y2Y2 )2(2*2*22822(2:22(2(2 -)2(2(2(2(2(2*2*22(2*2*22*2*22(2(2 - -!!!!! 012!!!! -)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2 - -)2)2)2)2)228292: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(2(2(22(2 )2(2(22(2(2(2 ' 2Y2Y2Y2Y2Y2Y2Y2Y2 -)2(2(2(2(2(2(2(2(2(2(2(2(2)2(2(2(2(2(2 '/ - -iiiiiiiiiiif )2(2(2(2(2(2/// !!!!!!!! - -2iiiiiii^2)2)2)2)2)2)2)2)2 - -VVVVVVVVppp2(2(2(2(2(2(22(2 - -GGGGGGGVVVVVVVVpppppy2(2(2(2(2 - -GGGGGGGGGGGGGGVVVVVp*22(2(2(2(2''// - -GGGGGGGGGGGGGGGGGGVp2(2(2(2(2//)22 - GGGGGGGGGGGGGGGGGGVp2Y2Y2Y2Y2 2 2 2Y2 GGGGGGGGGGGGGGGGGGVpb iiiiiiiiiiiiiiiiiiiiij !!!!!!!!
\ No newline at end of file diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc new file mode 100644 index 000000000..37830a00e --- /dev/null +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -0,0 +1,101 @@ +AquaHideout_B2F_MapScripts:: @ 815D8B1 + map_script 3, AquaHideout_B2F_MapScript1_15D8B7 + .byte 0 + +AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 + call AquaHideout_B2F_EventScript_1A0196 + end + +AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD +MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD + lockall + setvar VAR_SPECIAL_8, 1 + playse SE_PIN + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 + waitmovement 0 + .ifdef SAPPHIRE + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 + .else + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841 + .endif + waitmovement 0 + setvar VAR_TEMP_1, 1 + releaseall + end + +AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 +MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 + trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + msgbox AquaHideout_B2F_Text_1971AE, 4 + release + end + +AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD + setvar VAR_SPECIAL_8, 1 + .ifdef SAPPHIRE + setvar VAR_SPECIAL_9, 4 + .else + setvar VAR_SPECIAL_9, 3 + .endif + .ifdef SAPPHIRE + applymovement VAR_SPECIAL_8, Movement_1A083F + .else + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 + .endif + waitmovement 0 + delay 20 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 + waitmovement 0 + msgbox AquaHideout_B2F_Text_197162, 4 + closemessage + .ifdef SAPPHIRE + applymovement VAR_SPECIAL_8, Movement_1A083F + .else + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 + .endif + .ifdef SAPPHIRE + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958 + .else + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D + .endif + waitmovement 0 + removeobject VAR_SPECIAL_9 + delay 20 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 + waitmovement 0 + msgbox AquaHideout_B2F_Text_1971AE, 4 + setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE + setflag FLAG_HIDE_GRUNTS_LILYCOVE + release + end + +AquaHideout_B2F_Movement_15D958:: @ 815D958 + walk_left + walk_left + walk_left + walk_left + end_movement + +AquaHideout_B2F_Movement_15D95D:: @ 815D95D + walk_right + walk_right + walk_right + walk_right + end_movement + +AquaHideout_B2F_EventScript_15D962:: @ 815D962 +MagmaHideout_B2F_EventScript_15D962:: @ 815D962 + trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + msgbox AquaHideout_B2F_Text_1972D2, 6 + end + +AquaHideout_B2F_EventScript_15D97D:: @ 815D97D + msgbox AquaHideout_B2F_Text_1972D2, 4 + release + end + +AquaHideout_B2F_EventScript_15D987:: @ 815D987 +MagmaHideout_B2F_EventScript_15D987:: @ 815D987 + trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + msgbox AquaHideout_B2F_Text_1973C0, 6 + end diff --git a/data/maps/AquaHideout_B2F/text.inc b/data/maps/AquaHideout_B2F/text.inc new file mode 100644 index 000000000..f4b7dd035 --- /dev/null +++ b/data/maps/AquaHideout_B2F/text.inc @@ -0,0 +1,58 @@ +AquaHideout_B2F_Text_197093:: @ 8197093 + .string "Hehehe...\p" + .string "Got here already, did you?\n" + .string "We underestimated you!\p" + .string "But this is it!\p" + .string "I’m a cut above the GRUNTS you’ve seen\n" + .string "so far.\p" + .string "I’m not stalling for time. I’m going\n" + .string "to pulverize you!$" + +AquaHideout_B2F_Text_197145:: @ 8197145 + .string "Hehehe...\n" + .string "So, I lost, too...$" + +AquaHideout_B2F_Text_197162:: @ 8197162 + .string "Hehehe!\p" + .string "While I was toying with you, our BOSS\n" + .string "got through his preparations!$" + +AquaHideout_B2F_Text_1971AE:: @ 81971AE + .string "Hehehe!\p" + .string "Our BOSS has already gone on his way to\n" + .string "some cave under the sea!\p" + .string "If you’re going to give chase, you’d\n" + .string "better search the big, wide sea beyond\l" + .string "LILYCOVE.\p" + .string "But will you find it then?\n" + .string "Hehehe!$" + +AquaHideout_B2F_Text_197270:: @ 8197270 + .string "Wahahah, I grew weary of waiting!\n" + .string "You owe me a battle, too!$" + +AquaHideout_B2F_Text_1972AC:: @ 81972AC + .string "Tired of waiting...\n" + .string "Lost and dazed...$" + +AquaHideout_B2F_Text_1972D2:: @ 81972D2 + .string "BOSS...\n" + .string "Is this good enough?$" + +AquaHideout_B2F_Text_1972EF:: @ 81972EF + .string "Warp panels, the HIDEOUT’s pride\n" + .string "and joy!\p" + .string "You’re clueless about where you are,\n" + .string "aren’t you?\p" + .string "Fluster and tire out the enemy, then\n" + .string "lower the boom! That’s our plan!$" + +AquaHideout_B2F_Text_197390:: @ 8197390 + .string "What’s wrong with you?\n" + .string "You’re not tired at all!$" + +AquaHideout_B2F_Text_1973C0:: @ 81973C0 + .string "That reminds me... I can’t remember\n" + .string "where I put the MASTER BALL.\p" + .string "If I fail to guard it, our BOSS will\n" + .string "chew me out...$" diff --git a/data/maps/BattleTower_BattleRoom/border.bin b/data/maps/BattleTower_BattleRoom/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattleTower_BattleRoom/border.bin +++ /dev/null diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/events.inc index a4bbe9849..a4bbe9849 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/BattleTower_BattleRoom/events.inc diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 3104824ed..9712d2535 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -1,9 +1,9 @@ BattleTower_BattleRoom:: @ 8307C88 - .4byte BattleTower_BattleRoom_MapAttributes + .4byte BattleTower_BattleRoom_Layout .4byte BattleTower_BattleRoom_MapEvents .4byte BattleTower_BattleRoom_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 269 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_BattleRoom/map.bin b/data/maps/BattleTower_BattleRoom/map.bin deleted file mode 100644 index 42d99b5a6..000000000 --- a/data/maps/BattleTower_BattleRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -///LMMN///?77TU2U2V77?G<2<2<2<2<2<2<2<2;2:2H2B2I2J2B2K2:2:2;2:2D2P2Q2R2S2E2:2:2;2:2D2X2Y2Z2[2E2:2:2;2:2D2`2a2b2c2E2:2:2~2:2@2C21292C2A2:2>2:2:2:222:2:2:2F
\ No newline at end of file diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc new file mode 100644 index 000000000..22529962a --- /dev/null +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -0,0 +1,165 @@ +BattleTower_BattleRoom_MapScripts:: @ 81608DB + map_script 2, BattleTower_BattleRoom_MapScript2_1608E1 + .byte 0 + +BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 + map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB + .2byte 0 + +BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB + setvar VAR_TEMP_0, 1 + applymovement 255, BattleTower_BattleRoom_Movement_160AB7 + waitmovement 0 + +BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA + special sub_81347F8 + addobject 1 + applymovement 1, BattleTower_BattleRoom_Movement_160AC0 + waitmovement 0 + special PrintBattleTowerTrainerGreeting + msgbox gStringVar4, 4 + waitmessage + closemessage + special ScrSpecial_HealPlayerParty + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 + special StartSpecialBattle + waitstate + switch RESULT + case 1, BattleTower_BattleRoom_EventScript_160961 + special LoadPlayerParty + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 5 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 14 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 3 + special sub_810FF60 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 + waitstate + +BattleTower_BattleRoom_EventScript_160961:: @ 8160961 + setvar VAR_SPECIAL_4, 6 + special SetBattleTowerProperty + switch RESULT + case 8, BattleTower_BattleRoom_EventScript_160A56 + applymovement 1, BattleTower_BattleRoom_Movement_160AC6 + waitmovement 0 + removeobject 1 + applymovement 2, BattleTower_BattleRoom_Movement_160ACB + waitmovement 0 + applymovement 255, BattleTower_BattleRoom_Movement_160ABC + waitmovement 0 + msgbox BattleTower_BattleRoom_Text_19ACDC, 4 + special LoadPlayerParty + special SavePlayerParty + special SetBattleTowerParty + playfanfare MUS_ME_ASA + waitfanfare + special ScrSpecial_HealPlayerParty + +BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 + msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO + switch RESULT + case NO, BattleTower_BattleRoom_EventScript_1609E0 + case YES, BattleTower_BattleRoom_EventScript_160A3C + case 127, BattleTower_BattleRoom_EventScript_1609E0 + +BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0 + msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO + switch RESULT + case NO, BattleTower_BattleRoom_EventScript_160A0E + case YES, BattleTower_BattleRoom_EventScript_160A94 + case 127, BattleTower_BattleRoom_EventScript_160A0E + +BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E + msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO + switch RESULT + case NO, BattleTower_BattleRoom_EventScript_1609B2 + case YES, BattleTower_BattleRoom_EventScript_160AB1 + case 127, BattleTower_BattleRoom_EventScript_1609B2 + +BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C + closemessage + applymovement 255, BattleTower_BattleRoom_Movement_160ABE + waitmovement 0 + applymovement 2, BattleTower_BattleRoom_Movement_160AD0 + waitmovement 0 + goto BattleTower_BattleRoom_EventScript_1608FA + +BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 + special LoadPlayerParty + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 4 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 1 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 7 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 14 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 3 + special sub_810FF60 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 + waitstate + +BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 + setvar VAR_SPECIAL_4, 2 + special SaveBattleTowerProgress + message BattleTower_BattleRoom_Text_1C6CE1 + delay 60 + waitmessage + playse SE_SAVE + waitse + msgbox BattleTower_BattleRoom_Text_1C6D05, 4 + +BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 + fadescreen 1 + special BattleTower_SoftReset + end + +BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 + walk_up + walk_up + walk_up + face_right + end_movement + +BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC + face_down + end_movement + +BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE + face_right + end_movement + +BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0 + walk_down + walk_down + walk_down + walk_down + face_left + end_movement + +BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6 + walk_up + walk_up + walk_up + walk_up + end_movement + +BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB + walk_right + walk_right + walk_right + walk_up + end_movement + +BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0 + walk_down + walk_left + walk_left + walk_left + face_right + end_movement diff --git a/data/maps/BattleTower_BattleRoom/text.inc b/data/maps/BattleTower_BattleRoom/text.inc new file mode 100644 index 000000000..9f72d8971 --- /dev/null +++ b/data/maps/BattleTower_BattleRoom/text.inc @@ -0,0 +1,15 @@ +BattleTower_BattleRoom_Text_19ACDC:: @ 819ACDC + .string "We will restore your POKéMON to\n" + .string "full health.$" + +BattleTower_BattleRoom_Text_19AD09:: @ 819AD09 + .string "You will be facing opponent no. {STR_VAR_1}.\n" + .string "Are you ready?$" + +BattleTower_BattleRoom_Text_19AD3C:: @ 819AD3C + .string "Would you like to save and\n" + .string "quit the game?$" + +BattleTower_BattleRoom_Text_19AD66:: @ 819AD66 + .string "Would you like to cancel your BATTLE\n" + .string "ROOM challenge?$" diff --git a/data/maps/BattleTower_Corridor/border.bin b/data/maps/BattleTower_Corridor/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattleTower_Corridor/border.bin +++ /dev/null diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/BattleTower_Corridor/events.inc index 1233ff32c..1233ff32c 100644 --- a/data/maps/events/BattleTower_Corridor.inc +++ b/data/maps/BattleTower_Corridor/events.inc diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 016e178ac..33ab24b7c 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -1,9 +1,9 @@ BattleTower_Corridor:: @ 8307C6C - .4byte BattleTower_Corridor_MapAttributes + .4byte BattleTower_Corridor_Layout .4byte BattleTower_Corridor_MapEvents .4byte BattleTower_Corridor_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 268 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Corridor/map.bin b/data/maps/BattleTower_Corridor/map.bin Binary files differdeleted file mode 100644 index 0b0803f91..000000000 --- a/data/maps/BattleTower_Corridor/map.bin +++ /dev/null diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc new file mode 100644 index 000000000..d9d73b832 --- /dev/null +++ b/data/maps/BattleTower_Corridor/scripts.inc @@ -0,0 +1,58 @@ +BattleTower_Corridor_MapScripts:: @ 8160845 + map_script 1, BattleTower_Corridor_MapScript1_160850 + map_script 2, BattleTower_Corridor_MapScript2_160881 + .byte 0 + +BattleTower_Corridor_MapScript1_160850:: @ 8160850 + compare VAR_SPECIAL_6, 1 + goto_if_eq BattleTower_Corridor_EventScript_16086E + setmetatile 12, 0, 519, 0 + setmetatile 12, 1, 527, 0 + end + +BattleTower_Corridor_EventScript_16086E:: @ 816086E + setmetatile 15, 0, 519, 0 + setmetatile 15, 1, 527, 0 + end + +BattleTower_Corridor_MapScript2_160881:: @ 8160881 + map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B + .2byte 0 + +BattleTower_Corridor_EventScript_16088B:: @ 816088B + setvar VAR_TEMP_0, 1 + compare VAR_SPECIAL_6, 1 + goto_if_eq BattleTower_Corridor_EventScript_1608B1 + applymovement 1, BattleTower_Corridor_Movement_1608D5 + applymovement 255, BattleTower_Corridor_Movement_1608D4 + waitmovement 0 + goto BattleTower_Corridor_EventScript_1608C2 + +BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 + applymovement 1, BattleTower_Corridor_Movement_1608D2 + applymovement 255, BattleTower_Corridor_Movement_1608D1 + waitmovement 0 + +BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 + setvar VAR_TEMP_0, 0 + warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + waitstate + end + +BattleTower_Corridor_Movement_1608D1:: @ 81608D1 + walk_right + +BattleTower_Corridor_Movement_1608D2:: @ 81608D2 + walk_right + walk_right + +BattleTower_Corridor_Movement_1608D4:: @ 81608D4 + walk_right + +BattleTower_Corridor_Movement_1608D5:: @ 81608D5 + walk_right + walk_right + walk_right + walk_up + set_invisible + end_movement diff --git a/data/maps/BattleTower_Elevator/border.bin b/data/maps/BattleTower_Elevator/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattleTower_Elevator/border.bin +++ /dev/null diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/BattleTower_Elevator/events.inc index 57434d3ac..57434d3ac 100644 --- a/data/maps/events/BattleTower_Elevator.inc +++ b/data/maps/BattleTower_Elevator/events.inc diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 0a7285261..0718e7924 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -1,9 +1,9 @@ BattleTower_Elevator:: @ 8307C50 - .4byte BattleTower_Elevator_MapAttributes + .4byte BattleTower_Elevator_Layout .4byte BattleTower_Elevator_MapEvents .4byte BattleTower_Elevator_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 267 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Elevator/map.bin b/data/maps/BattleTower_Elevator/map.bin deleted file mode 100644 index 8777c1471..000000000 --- a/data/maps/BattleTower_Elevator/map.bin +++ /dev/null @@ -1 +0,0 @@ -hiijpqqrxyyz\2]2]2]2d2e2e2f2d2e2e2f2d2O2W2f2
\ No newline at end of file diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc new file mode 100644 index 000000000..f3373ee6e --- /dev/null +++ b/data/maps/BattleTower_Elevator/scripts.inc @@ -0,0 +1,57 @@ +BattleTower_Elevator_MapScripts:: @ 81607CF + map_script 2, BattleTower_Elevator_MapScript2_1607DA + map_script 4, BattleTower_Elevator_MapScript2_160821 + .byte 0 + +BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA + map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4 + .2byte 0 + +BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 + setvar VAR_TEMP_0, 1 + applymovement 1, BattleTower_Elevator_Movement_160835 + applymovement 255, BattleTower_Elevator_Movement_160839 + waitmovement 0 + special ShakeScreenInElevator + waitstate + delay 64 + applymovement 1, BattleTower_Elevator_Movement_16083D + applymovement 255, BattleTower_Elevator_Movement_160841 + waitmovement 0 + setvar VAR_TEMP_0, 0 + warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 + waitstate + end + +BattleTower_Elevator_MapScript2_160821:: @ 8160821 + map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B + .2byte 0 + +BattleTower_Elevator_EventScript_16082B:: @ 816082B + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleTower_Elevator_Movement_160835:: @ 8160835 + walk_up + walk_right + face_down + end_movement + +BattleTower_Elevator_Movement_160839:: @ 8160839 + walk_up + walk_up + face_down + end_movement + +BattleTower_Elevator_Movement_16083D:: @ 816083D + walk_down + walk_down + set_invisible + end_movement + +BattleTower_Elevator_Movement_160841:: @ 8160841 + walk_right + walk_down + walk_down + end_movement diff --git a/data/maps/BattleTower_Lobby/border.bin b/data/maps/BattleTower_Lobby/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattleTower_Lobby/border.bin +++ /dev/null diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/events.inc index ca33bdf95..ca33bdf95 100644 --- a/data/maps/events/BattleTower_Lobby.inc +++ b/data/maps/BattleTower_Lobby/events.inc diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index c8c0b0473..ae2eaaa14 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -1,9 +1,9 @@ BattleTower_Lobby:: @ 8307C34 - .4byte BattleTower_Lobby_MapAttributes + .4byte BattleTower_Lobby_Layout .4byte BattleTower_Lobby_MapEvents .4byte BattleTower_Lobby_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 265 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Lobby/map.bin b/data/maps/BattleTower_Lobby/map.bin Binary files differdeleted file mode 100644 index 8ff3182a6..000000000 --- a/data/maps/BattleTower_Lobby/map.bin +++ /dev/null diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc new file mode 100644 index 000000000..28f828bc6 --- /dev/null +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -0,0 +1,424 @@ +BattleTower_Lobby_MapScripts:: @ 816027E + map_script 5, BattleTower_Lobby_MapScript1_160293 + map_script 3, BattleTower_Lobby_MapScript1_1602E8 + map_script 2, BattleTower_Lobby_MapScript2_160302 + map_script 4, BattleTower_Lobby_MapScript2_1602EE + .byte 0 + +BattleTower_Lobby_MapScript1_160293:: @ 8160293 + special TryEnableBravoTrainerBattleTower + call BattleTower_Lobby_EventScript_16029C + end + +BattleTower_Lobby_EventScript_16029C:: @ 816029C + setvar VAR_SPECIAL_4, 10 + special SetBattleTowerProperty + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak + compare VAR_SPECIAL_7, 50 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + special TryInitBattleTowerAwardManEventObject + return + +BattleTower_Lobby_EventScript_1602CD:: @ 81602CD + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak + compare VAR_SPECIAL_7, 100 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + special TryInitBattleTowerAwardManEventObject + return + +BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 + setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + return + +BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 + call BattleTower_Lobby_EventScript_1AE2ED + end + +BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE + map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8 + .2byte 0 + +BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 + setvar VAR_TEMP_1, 1 + turnobject 255, 2 + end + +BattleTower_Lobby_MapScript2_160302:: @ 8160302 + map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C + map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330 + map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342 + map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419 + map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B + .2byte 0 + +BattleTower_Lobby_EventScript_16032C:: @ 816032C + special sub_8134548 + end + +BattleTower_Lobby_EventScript_160330:: @ 8160330 + lock + faceplayer + msgbox BattleTower_Lobby_Text_19A3FD, 4 + closemessage + setvar VAR_TEMP_0, 5 + release + end + +BattleTower_Lobby_EventScript_160342:: @ 8160342 + lock + faceplayer + message BattleTower_Lobby_Text_19A487 + waitmessage + setvar VAR_SPECIAL_4, 0 + special BattleTowerUtil + compare RESULT, 6 + goto_if_eq BattleTower_Lobby_EventScript_16037D + special AwardBattleTowerRibbons + compare RESULT, 0 + goto_if_eq BattleTower_Lobby_EventScript_16037D + message BattleTower_Lobby_Text_19A6BE + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + msgbox BattleTower_Lobby_Text_19A719, 4 + +BattleTower_Lobby_EventScript_16037D:: @ 816037D + setvar VAR_SPECIAL_4, 8 + special BattleTowerUtil + compare RESULT, 1 + goto_if_eq BattleTower_Lobby_EventScript_1603AD + message BattleTower_Lobby_Text_19A589 + waitmessage + setvar VAR_SPECIAL_4, 13 + special SetBattleTowerProperty + special DetermineBattleTowerPrize + setvar VAR_SPECIAL_4, 3 + special SaveBattleTowerProgress + playse SE_SAVE + waitse + +BattleTower_Lobby_EventScript_1603AD:: @ 81603AD + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 3 + special SetBattleTowerProperty + message BattleTower_Lobby_Text_19A4BB + waitmessage + special GiveBattleTowerPrize + switch RESULT + case 0, BattleTower_Lobby_EventScript_160408 + message BattleTower_Lobby_Text_19A506 + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + setvar VAR_SPECIAL_4, 9 + special BattleTowerUtil + compare RESULT, 49 + goto_if_ne BattleTower_Lobby_EventScript_1603F8 + msgbox BattleTower_Lobby_Text_19A617, 4 + +BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 + msgbox BattleTower_Lobby_Text_199FA9, 4 + closemessage + setvar VAR_TEMP_0, 5 + release + end + +BattleTower_Lobby_EventScript_160408:: @ 8160408 + msgbox BattleTower_Lobby_Text_19A520, 4 + waitmessage + closemessage + setvar VAR_TEMP_0, 5 + release + end + +BattleTower_Lobby_EventScript_160419:: @ 8160419 + lock + faceplayer + message BattleTower_Lobby_Text_19A571 + waitmessage + message BattleTower_Lobby_Text_19A589 + waitmessage + setvar VAR_SPECIAL_4, 13 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 0 + special SaveBattleTowerProgress + playse SE_SAVE + waitse + msgbox BattleTower_Lobby_Text_199FA9, 4 + closemessage + setvar VAR_TEMP_0, 5 + release + end + +BattleTower_Lobby_EventScript_16044B:: @ 816044B + lock + faceplayer + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 + message BattleTower_Lobby_Text_19A5B1 + waitmessage + message BattleTower_Lobby_Text_19A5CE + waitmessage + setvar VAR_SPECIAL_4, 1 + special SaveBattleTowerProgress + playse SE_SAVE + waitse + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 + special SetBattleTowerProperty + setvar VAR_TEMP_0, 5 + special SavePlayerParty + special SetBattleTowerParty + msgbox BattleTower_Lobby_Text_19A0A8, 4 + closemessage + call BattleTower_Lobby_EventScript_160664 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + setvar VAR_TEMP_0, 0 + waitstate + +BattleTower_Lobby_EventScript_16049E:: @ 816049E + lock + faceplayer + setvar VAR_SPECIAL_4, 0 + special BattleTowerUtil + compare RESULT, 6 + goto_if_eq BattleTower_Lobby_EventScript_160342 + special SavePlayerParty + msgbox BattleTower_Lobby_Text_199F2C, 4 + +BattleTower_Lobby_EventScript_1604BE:: @ 81604BE + message BattleTower_Lobby_Text_199F79 + waitmessage + multichoice 15, 6, 23, 0 + switch RESULT + case 0, BattleTower_Lobby_EventScript_1604FA + case 1, BattleTower_Lobby_EventScript_160600 + case 2, BattleTower_Lobby_EventScript_160652 + case 127, BattleTower_Lobby_EventScript_160652 + +BattleTower_Lobby_EventScript_1604FA:: @ 81604FA + message BattleTower_Lobby_Text_19A024 + waitmessage + multichoice 18, 6, 24, 0 + switch RESULT + case 2, BattleTower_Lobby_EventScript_160652 + case 127, BattleTower_Lobby_EventScript_160652 + special CheckPartyBattleTowerBanlist + compare VAR_SPECIAL_4, 1 + goto_if_eq BattleTower_Lobby_EventScript_16060D + setvar VAR_SPECIAL_4, 1 + copyvar VAR_SPECIAL_5, RESULT + copyvar VAR_SPECIAL_6, RESULT + special SetBattleTowerProperty + msgbox BattleTower_Lobby_Text_19A07B, 4 + fadescreen 1 + special ChooseBattleTowerPlayerParty + waitstate + compare RESULT, 0 + goto_if_eq BattleTower_Lobby_EventScript_16064F + msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO + switch RESULT + case NO, BattleTower_Lobby_EventScript_16064F + case YES, BattleTower_Lobby_EventScript_160587 + case 127, BattleTower_Lobby_EventScript_16064F + +BattleTower_Lobby_EventScript_160587:: @ 8160587 + setvar VAR_SPECIAL_4, 5 + special SetBattleTowerProperty + setvar VAR_TEMP_0, 0 + setvar VAR_SPECIAL_4, 11 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 + special SetBattleTowerProperty + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 + special SetBattleTowerProperty + special LoadPlayerParty + closemessage + delay 2 + call S_DoSaveDialog + setvar VAR_TEMP_0, 5 + erasebox 0, 0, 15, 10 + compare RESULT, 0 + goto_if_eq BattleTower_Lobby_EventScript_160642 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER + special SavePlayerParty + special SetBattleTowerParty + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 + msgbox BattleTower_Lobby_Text_19A0A8, 4 + closemessage + call BattleTower_Lobby_EventScript_160664 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + setvar VAR_TEMP_0, 0 + waitstate + +BattleTower_Lobby_EventScript_160600:: @ 8160600 + msgbox BattleTower_Lobby_Text_19A0D1, 4 + goto BattleTower_Lobby_EventScript_1604BE + +BattleTower_Lobby_EventScript_16060D:: @ 816060D + switch RESULT + case 0, BattleTower_Lobby_EventScript_160628 + case 1, BattleTower_Lobby_EventScript_160635 + +BattleTower_Lobby_EventScript_160628:: @ 8160628 + msgbox BattleTower_Lobby_Text_19A249, 4 + goto BattleTower_Lobby_EventScript_160662 + +BattleTower_Lobby_EventScript_160635:: @ 8160635 + msgbox BattleTower_Lobby_Text_19A32D, 4 + goto BattleTower_Lobby_EventScript_160662 + +BattleTower_Lobby_EventScript_160642:: @ 8160642 + setvar VAR_SPECIAL_4, 12 + special SetBattleTowerProperty + goto BattleTower_Lobby_EventScript_160652 + +BattleTower_Lobby_EventScript_16064F:: @ 816064F + special LoadPlayerParty + +BattleTower_Lobby_EventScript_160652:: @ 8160652 + msgbox BattleTower_Lobby_Text_199FA9, 4 + setvar VAR_SPECIAL_4, 11 + special SetBattleTowerProperty + +BattleTower_Lobby_EventScript_160662:: @ 8160662 + release + end + +BattleTower_Lobby_EventScript_160664:: @ 8160664 + applymovement 1, BattleTower_Lobby_Movement_160693 + applymovement 255, BattleTower_Lobby_Movement_160693 + waitmovement 0 + opendoor 6, 1 + waitdooranim + applymovement 1, BattleTower_Lobby_Movement_160697 + applymovement 255, BattleTower_Lobby_Movement_16069A + waitmovement 0 + closedoor 6, 1 + waitdooranim + return + +BattleTower_Lobby_Movement_160693:: @ 8160693 + walk_up + walk_up + walk_up + end_movement + +BattleTower_Lobby_Movement_160697:: @ 8160697 + walk_up + set_invisible + end_movement + +BattleTower_Lobby_Movement_16069A:: @ 816069A + walk_up + walk_up + set_invisible + end_movement + +@ 816069E + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible + end_movement + +BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 + lock + faceplayer + msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO + switch RESULT + case YES, BattleTower_Lobby_EventScript_1606CC + case NO, BattleTower_Lobby_EventScript_1606F7 + release + end + +BattleTower_Lobby_EventScript_1606CC:: @ 81606CC + msgbox BattleTower_Lobby_Text_19A7C3, 4 + setvar VAR_SPECIAL_4, 1 + call BattleTower_Lobby_EventScript_1A00F3 + lock + faceplayer + compare RESULT, 0 + goto_if_eq BattleTower_Lobby_EventScript_160701 + compare RESULT, 1 + goto_if_eq BattleTower_Lobby_EventScript_16070B + end + +BattleTower_Lobby_EventScript_1606F7:: @ 81606F7 + msgbox BattleTower_Lobby_Text_19A7FD, 4 + release + end + +BattleTower_Lobby_EventScript_160701:: @ 8160701 + msgbox BattleTower_Lobby_Text_19A83D, 4 + release + end + +BattleTower_Lobby_EventScript_16070B:: @ 816070B + msgbox BattleTower_Lobby_Text_19A871, 4 + release + end + +BattleTower_Lobby_EventScript_160715:: @ 8160715 + msgbox BattleTower_Lobby_Text_19A8AE, 2 + end + +BattleTower_Lobby_EventScript_16071E:: @ 816071E + msgbox BattleTower_Lobby_Text_19A946, 2 + end + +BattleTower_Lobby_EventScript_160727:: @ 8160727 + lockall + special ShowBattleTowerRecords + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +BattleTower_Lobby_EventScript_160733:: @ 8160733 + lock + faceplayer + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773 + msgbox BattleTower_Lobby_Text_19A9EE, 4 + setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD + givedecoration_std DECOR_SILVER_SHIELD + compare RESULT, 0 + goto_if_eq BattleTower_Lobby_EventScript_1607AF + setflag FLAG_RECEIVED_SILVER_SHIELD + msgbox BattleTower_Lobby_Text_19ABAA, 4 + release + end + +BattleTower_Lobby_EventScript_160773:: @ 8160773 + specialvar RESULT, GetBestBattleTowerStreak + compare RESULT, 100 + goto_if_lt BattleTower_Lobby_EventScript_1607C5 + msgbox BattleTower_Lobby_Text_19AAC4, 4 + setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD + givedecoration_std DECOR_GOLD_SHIELD + compare RESULT, 0 + goto_if_eq BattleTower_Lobby_EventScript_1607AF + setflag FLAG_RECEIVED_GOLD_SHIELD + msgbox BattleTower_Lobby_Text_19ABAA, 4 + release + end + +BattleTower_Lobby_EventScript_1607AF:: @ 81607AF + bufferdecorationname 1, VAR_SPECIAL_8 + msgbox BattleTower_Lobby_Text_1A0CEF, 4 + msgbox BattleTower_Lobby_Text_19ABED, 4 + release + end + +BattleTower_Lobby_EventScript_1607C5:: @ 81607C5 + msgbox BattleTower_Lobby_Text_19AC55, 4 + release + end diff --git a/data/maps/BattleTower_Lobby/text.inc b/data/maps/BattleTower_Lobby/text.inc new file mode 100644 index 000000000..db94f1bce --- /dev/null +++ b/data/maps/BattleTower_Lobby/text.inc @@ -0,0 +1,192 @@ +BattleTower_Lobby_Text_199F2C:: @ 8199F2C + .string "Welcome to the BATTLE TOWER!\p" + .string "Please register with me to enter\n" + .string "a BATTLE ROOM.$" + +BattleTower_Lobby_Text_199F79:: @ 8199F79 + .string "Would you like to make a BATTLE ROOM\n" + .string "challenge?$" + +BattleTower_Lobby_Text_199FA9:: @ 8199FA9 + .string "We’ll be looking forward to your\n" + .string "next challenge.$" + +BattleTower_Lobby_Text_199FDA:: @ 8199FDA + .string "Before entering a BATTLE ROOM, your\n" + .string "progress must be saved. Is that okay?$" + +BattleTower_Lobby_Text_19A024:: @ 819A024 + .string "There are two BATTLE ROOMS,\n" + .string "Level 50 and Level 100.\l" + .string "Which would you like to challenge?$" + +BattleTower_Lobby_Text_19A07B:: @ 819A07B + .string "Please select the POKéMON you wish\n" + .string "to enter.$" + +BattleTower_Lobby_Text_19A0A8:: @ 819A0A8 + .string "I’ll direct you to your BATTLE ROOM now.$" + +BattleTower_Lobby_Text_19A0D1:: @ 819A0D1 + .string "The BATTLE TOWER is a facility made\n" + .string "especially for POKéMON battles.\p" + .string "Within the TOWER are many BATTLE ROOMS.\p" + .string "In each BATTLE ROOM, seven TRAINERS\n" + .string "await your challenge.\p" + .string "Beat all seven, and you will be rewarded\n" + .string "with a fabulous prize.\p" + .string "You may also take a break from your\n" + .string "challenge by saving your progress.\p" + .string "Make sure you save properly or you\n" + .string "won’t be able to resume your challenge.$" + +BattleTower_Lobby_Text_19A249:: @ 819A249 + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleTower_Lobby_Text_19A32D:: @ 819A32D + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" + +BattleTower_Lobby_Text_19A3FD:: @ 819A3FD + .string "Excuse me!\p" + .string "You didn’t save before you quit your\n" + .string "challenge last time.\p" + .string "Because of that, your challenge so far\n" + .string "has been disqualified. Sorry!$" + +BattleTower_Lobby_Text_19A487:: @ 819A487 + .string "Congratulations!\n" + .string "You’ve beaten all seven TRAINERS!\p" + .string "$" + +BattleTower_Lobby_Text_19A4BB:: @ 819A4BB + .string "For beating seven TRAINERS in a row,\n" + .string "you have earned this fabulous prize!\p" + .string "$" + +BattleTower_Lobby_Text_19A506:: @ 819A506 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +BattleTower_Lobby_Text_19A520:: @ 819A520 + .string "Oh, your BAG appears to be full.\p" + .string "Please make room in your BAG, then come\n" + .string "see me.$" + +BattleTower_Lobby_Text_19A571:: @ 819A571 + .string "Thank you for playing!\p" + .string "$" + +BattleTower_Lobby_Text_19A589:: @ 819A589 + .string "Your record will be saved.\n" + .string "Please wait.$" + +BattleTower_Lobby_Text_19A5B1:: @ 819A5B1 + .string "We’ve been waiting for you!\p" + .string "$" + +BattleTower_Lobby_Text_19A5CE:: @ 819A5CE + .string "Before entering a BATTLE ROOM, your\n" + .string "progress will be saved. Please wait.$" + +BattleTower_Lobby_Text_19A617:: @ 819A617 + .string "You’re finally about to face the\n" + .string "50th TRAINER.\p" + .string "From here on, every time you beat seven\n" + .string "TRAINERS in a row, your POKéMON will\l" + .string "receive a commemorative RIBBON.\p" + .string "Good luck!$" + +BattleTower_Lobby_Text_19A6BE:: @ 819A6BE + .string "Here are some RIBBONS for beating\n" + .string "seven tough TRAINERS in a row.\p" + .string "{PLAYER} received some RIBBONS!$" + +BattleTower_Lobby_Text_19A719:: @ 819A719 + .string "{PLAYER} put the RIBBONS on the\n" + .string "challenger POKéMON.$" + +BattleTower_Lobby_Text_19A747:: @ 819A747 + .string "Hello, hello!\n" + .string "You’re going to battle here, right?\p" + .string "Can you tell me what’s going through\n" + .string "your mind as you prepare for battle?$" + +BattleTower_Lobby_Text_19A7C3:: @ 819A7C3 + .string "Oh, wow, you’ll tell me?\n" + .string "Great! Then, what’s your answer?$" + +BattleTower_Lobby_Text_19A7FD:: @ 819A7FD + .string "Oh, so you don’t think much about it?\n" + .string "You’re one cool customer.$" + +BattleTower_Lobby_Text_19A83D:: @ 819A83D + .string "Hunh? You changed your mind?\n" + .string "I guess you’re fickle.$" + +BattleTower_Lobby_Text_19A871:: @ 819A871 + .string "Okay, so that’s how you feel?\n" + .string "That’s quite original.\p" + .string "Thanks!$" + +BattleTower_Lobby_Text_19A8AE:: @ 819A8AE + .string "The number of matches you win in a row\n" + .string "is recorded.\p" + .string "The record is posted beside the\n" + .string "registration counter.\p" + .string "It’s also on the back of your\n" + .string "TRAINER’S CARD.$" + +BattleTower_Lobby_Text_19A946:: @ 819A946 + .string "Once you’ve entered the BATTLE TOWER,\n" + .string "you can’t leave until you either lose\l" + .string "or you beat seven TRAINERS in a row.\p" + .string "You’d best be certain that you’re up\n" + .string "to the challenge.$" + +BattleTower_Lobby_Text_19A9EE:: @ 819A9EE + .string "Hahahaha! Pure magnificence!\n" + .string "Pure magnificence indeed!\p" + .string "Do you realize what you’ve achieved?\n" + .string "You’ve beaten 50 TRAINERS in a row!\p" + .string "Yes, purely magnificent!\p" + .string "As the OWNER of the BATTLE TOWER,\n" + .string "let me give you a memento!$" + +BattleTower_Lobby_Text_19AAC4:: @ 819AAC4 + .string "Wahahaha! Pure magnificence!\n" + .string "Absolutely pure magnificence indeed!\p" + .string "Do you realize what you’ve achieved?\n" + .string "You’ve beaten 100 TRAINERS in a row!\p" + .string "Yes, absolutely magnificent!\p" + .string "As the OWNER of the BATTLE TOWER,\n" + .string "let me give you a memento!$" + +BattleTower_Lobby_Text_19ABAA:: @ 819ABAA + .string "I suggest you keep it displayed.\n" + .string "It will surely attract attention.$" + +BattleTower_Lobby_Text_19ABED:: @ 819ABED + .string "Oh?\n" + .string "Your PC has no room for this...\p" + .string "But it would be a shame to waste this...\n" + .string "Please come back for this!$" + +BattleTower_Lobby_Text_19AC55:: @ 819AC55 + .string "I’m overwhelmed with satisfaction after\n" + .string "seeing your magnificent performance.\p" + .string "It makes the building of the BATTLE\n" + .string "TOWER all worthwhile!$" diff --git a/data/maps/BattleTower_Outside/border.bin b/data/maps/BattleTower_Outside/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/BattleTower_Outside/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/events.inc index 2e02fcc1c..2e02fcc1c 100644 --- a/data/maps/events/BattleTower_Outside.inc +++ b/data/maps/BattleTower_Outside/events.inc diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 01bbc2fd9..28035f749 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -1,9 +1,9 @@ BattleTower_Outside:: @ 8307C18 - .4byte BattleTower_Outside_MapAttributes + .4byte BattleTower_Outside_Layout .4byte BattleTower_Outside_MapEvents .4byte BattleTower_Outside_MapScripts .4byte 0x0 - .2byte BGM_B_TOWER + .2byte MUS_B_TOWER .2byte 266 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Outside/map.bin b/data/maps/BattleTower_Outside/map.bin deleted file mode 100644 index 6e9f6adb6..000000000 --- a/data/maps/BattleTower_Outside/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppppprIJJxyz{bJJ`tp1ppppppppppprIJJxyz{bJJ`tpppppppprk0rIJJxyz{bJJ`s0mtppppprks0jIJJxyz{bJJ`k00mtpppxsqsk00HIJJxyz{bJJ`a22umtppskssHIJJxyz{bJJ`auuqutpssqss0HIJJKLMNOJJ`a2uuquuyssqss00PQRRSTUVWRRhi22uuquuyssks0X2Y2Z2Z2[\]^_Z2Z2p2q22uuquusssqs000w2o22c2d2e2f2g2222222uuquusssqs00w2o2l2m2n22222uut}usssqs0000000t2u2v2000000t}uuqusssq{00000|2}2~200000ut}ut}ss{qs0000000000000t}uquus{sq{000000000ut}t}up{s{|{00000t}uququps{qsq{||||000||||}t}ququpp{{{||000}qququppsqsqqqqt000qqqt|}t}pppsq{||||}q]^0^0^0_q{|||}qquppp{||]^0^0^0_|||}pppp]^0^0^0_pppppppppppppp]^0^0^0^0V0V0V0V0V0V0Wppppppppppppppppp]^0^0^0^0^0^0^0^0^0^0_pppppppppppppppp22pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc new file mode 100644 index 000000000..8f6cb4305 --- /dev/null +++ b/data/maps/BattleTower_Outside/scripts.inc @@ -0,0 +1,94 @@ +BattleTower_Outside_MapScripts:: @ 8160156 + map_script 3, BattleTower_Outside_MapScript1_16015C + .byte 0 + +BattleTower_Outside_MapScript1_16015C:: @ 816015C + setflag FLAG_LANDMARK_BATTLE_TOWER + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 + setflag FLAG_HIDE_REPORTER_BATTLE_TOWER + end + +BattleTower_Outside_EventScript_160168:: @ 8160168 + lock + faceplayer + msgbox BattleTower_Outside_Text_199D06, 4 + checkitem ITEM_SS_TICKET, 1 + compare RESULT, 0 + goto_if_eq BattleTower_Outside_EventScript_1601C6 + message BattleTower_Outside_Text_199D9D + waitmessage + goto BattleTower_Outside_EventScript_16018E + end + +BattleTower_Outside_EventScript_16018E:: @ 816018E + multichoicedefault 21, 6, 53, 2, 0 + switch RESULT + case 0, BattleTower_Outside_EventScript_1601D0 + case 1, BattleTower_Outside_EventScript_1601FB + case 2, BattleTower_Outside_EventScript_160250 + case 127, BattleTower_Outside_EventScript_160250 + end + +BattleTower_Outside_EventScript_1601C6:: @ 81601C6 + msgbox BattleTower_Outside_Text_199D40, 4 + release + end + +BattleTower_Outside_EventScript_1601D0:: @ 81601D0 + msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq BattleTower_Outside_EventScript_160226 + msgbox BattleTower_Outside_Text_199E4B, 4 + call BattleTower_Outside_EventScript_160232 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +BattleTower_Outside_EventScript_1601FB:: @ 81601FB + msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq BattleTower_Outside_EventScript_160226 + msgbox BattleTower_Outside_Text_199E4B, 4 + call BattleTower_Outside_EventScript_160232 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +BattleTower_Outside_EventScript_160226:: @ 8160226 + message BattleTower_Outside_Text_199E7A + waitmessage + goto BattleTower_Outside_EventScript_16018E + end + +BattleTower_Outside_EventScript_160232:: @ 8160232 + closemessage + applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 + waitmovement 0 + delay 30 + hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE + setvar VAR_SPECIAL_4, 4 + call BattleTower_Outside_EventScript_1A047C + return + +BattleTower_Outside_EventScript_160250:: @ 8160250 + msgbox BattleTower_Outside_Text_199E29, 4 + release + end + +BattleTower_Outside_EventScript_16025A:: @ 816025A + msgbox BattleTower_Outside_Text_199C6F, 3 + end + +BattleTower_Outside_EventScript_160263:: @ 8160263 + msgbox BattleTower_Outside_Text_199CA4, 2 + end + +BattleTower_Outside_EventScript_16026C:: @ 816026C + msgbox BattleTower_Outside_Text_199E9C, 2 + end + +BattleTower_Outside_EventScript_160275:: @ 8160275 + msgbox BattleTower_Outside_Text_199ED4, 2 + end diff --git a/data/maps/BattleTower_Outside/text.inc b/data/maps/BattleTower_Outside/text.inc new file mode 100644 index 000000000..934ebca36 --- /dev/null +++ b/data/maps/BattleTower_Outside/text.inc @@ -0,0 +1,48 @@ +BattleTower_Outside_Text_199C6F:: @ 8199C6F + .string "BATTLE TOWER\n" + .string "“Win it all and be the best, TRAINERS!”$" + +BattleTower_Outside_Text_199CA4:: @ 8199CA4 + .string "This is the BATTLE TOWER.\p" + .string "TRAINERS bring their best-raised\n" + .string "POKéMON for elimination-style matches.$" + +BattleTower_Outside_Text_199D06:: @ 8199D06 + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" + +BattleTower_Outside_Text_199D40:: @ 8199D40 + .string "{PLAYER} doesn’t have the TICKET...\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" + +BattleTower_Outside_Text_199D9D:: @ 8199D9D + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" + +BattleTower_Outside_Text_199DF2:: @ 8199DF2 + .string "SLATEPORT CITY it is, then!$" + +BattleTower_Outside_Text_199E0E:: @ 8199E0E + .string "LILYCOVE CITY it is, then!$" + +BattleTower_Outside_Text_199E29:: @ 8199E29 + .string "Please sail with us another time!$" + +BattleTower_Outside_Text_199E4B:: @ 8199E4B + .string "Please board the ferry and wait for\n" + .string "departure.$" + +BattleTower_Outside_Text_199E7A:: @ 8199E7A + .string "Then, where would you like to go?$" + +BattleTower_Outside_Text_199E9C:: @ 8199E9C + .string "I’m not leaving until I’ve beaten 35\n" + .string "TRAINERS in a row!$" + +BattleTower_Outside_Text_199ED4:: @ 8199ED4 + .string "Gee, there’re a lot of tough-looking\n" + .string "TRAINERS here.\l" + .string "I’m not good enough to enter yet...$" diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/maps/CaveOfOrigin_1F/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333
\ No newline at end of file diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc index b0d77795c..b0d77795c 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/CaveOfOrigin_1F/events.inc diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index b49287535..1797ed327 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,9 +1,9 @@ CaveOfOrigin_1F:: @ 8307198 - .4byte CaveOfOrigin_1F_MapAttributes + .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 159 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/maps/CaveOfOrigin_1F/map.bin deleted file mode 100644 index c3c5e7abf..000000000 --- a/data/maps/CaveOfOrigin_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ))))))))))))))))))))) "33333333 )))) 3333333 " )))))))*3333()))))) ""33 ))))))))))))) 33 ""3 *333 )))))))) 33 ""3"3 ))*33333=333 33 ""3" *33333333333 33 "$""33333333322$ 33 "3"""33333222$333 33 "3"""3333$3333333 3$ "3"""333$33333333( 3 "3"""333 3333333333 3 "3"""333 3333333333 3 "3"""333() 333 ))) 3 " *""33333()))*333 3 ""3""3333333333333 3 ""3"$33333333333$ 3 ""3"3$3333;33333$3 3 ""3$3$22289:222$2$ 3 "$3$222222222222$33 $"3"33222223332222$ 3"3$22$33333$222$3332$3$222222222222222222$333
\ No newline at end of file diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc new file mode 100644 index 000000000..58c6563f6 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_1F_MapScripts:: @ 815DD6C + map_script 3, CaveOfOrigin_1F_MapScript1_15DD72 + .byte 0 + +CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3 + end diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/maps/CaveOfOrigin_B1F/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333
\ No newline at end of file diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc index a91ee50e4..a91ee50e4 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 97e5e68c8..d9b38b628 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,9 +1,9 @@ CaveOfOrigin_B1F:: @ 83071B4 - .4byte CaveOfOrigin_B1F_MapAttributes + .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 160 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/maps/CaveOfOrigin_B1F/map.bin deleted file mode 100644 index 0ffbdaaa0..000000000 --- a/data/maps/CaveOfOrigin_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -33 )))))))))))))))) 33333"33 ))) 3333 ))) 33333"33"333())))*333 ( 33 )*33"3 )))))))) 3( 33"33 )*3" )))))) ( 3 33"33"333""3333<33( 3 33"3 *333""3333333 3 33"3"3333%%333333 3 33"3"333333%23333 3 33" * ))) 333%333 2 33""3" ) ( 333"33 3 33""3""=3( 333""33 3 33""3""33 33 *"33 3 33""3""33 ())* *33 3 33""3""33())))*333 3 33""3""33333333333 ( 33""3"%333333333% 3 33""3"3%3333333%3 3 33""3%3%2222222%2%3 33"%3%2222222222%32% 33"3%23322222233 33 33%33%22%333333%22%2%333%2222222222222222%3333
\ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc new file mode 100644 index 000000000..c79eb088e --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_B1F_MapScripts:: @ 815DD7C + map_script 3, CaveOfOrigin_B1F_MapScript1_15DD82 + .byte 0 + +CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3 + end diff --git a/data/maps/CaveOfOrigin_B2F/border.bin b/data/maps/CaveOfOrigin_B2F/border.bin deleted file mode 100644 index 4117717f2..000000000 --- a/data/maps/CaveOfOrigin_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -####
\ No newline at end of file diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/events.inc index 5d03aaaa2..5d03aaaa2 100644 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ b/data/maps/CaveOfOrigin_B2F/events.inc diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index 79e76f693..1b3bf2902 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -1,9 +1,9 @@ CaveOfOrigin_B2F:: @ 83071D0 - .4byte CaveOfOrigin_B2F_MapAttributes + .4byte CaveOfOrigin_B2F_Layout .4byte CaveOfOrigin_B2F_MapEvents .4byte CaveOfOrigin_B2F_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 161 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B2F/map.bin b/data/maps/CaveOfOrigin_B2F/map.bin deleted file mode 100644 index 4c1fd5ab8..000000000 --- a/data/maps/CaveOfOrigin_B2F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ))))) ### )))) ## ) "#####()))* )) ())*# "# ))))))))*##()))) "#"## )))))))))) ## "#"##" )))))))) ( # " * )*"33333333( # ""#" )*333333333 % ""#""333223333 # ""#""33%##%333 %""#""33 ####%33 #""#""<33 #####"33 #""#"%22%#####"33 #"%%2##### )*33 #"#"##"# )))*3333 ( "#"##"#"=33333332 # "#"##%"333333%# # "#"###"%222222%2%( "#"###%22222222%### "#%222##222222## %222#%22%######%22% ####%222222222222222%
\ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B2F/scripts.inc b/data/maps/CaveOfOrigin_B2F/scripts.inc new file mode 100644 index 000000000..66b02ee9f --- /dev/null +++ b/data/maps/CaveOfOrigin_B2F/scripts.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_B2F_MapScripts:: @ 815DD8C + map_script 3, CaveOfOrigin_B2F_MapScript1_15DD92 + .byte 0 + +CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3 + end diff --git a/data/maps/CaveOfOrigin_B3F/border.bin b/data/maps/CaveOfOrigin_B3F/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_B3F/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333
\ No newline at end of file diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/events.inc index dcf831a76..dcf831a76 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/CaveOfOrigin_B3F/events.inc diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index 746d187f3..cc196d0c8 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -1,9 +1,9 @@ CaveOfOrigin_B3F:: @ 83071EC - .4byte CaveOfOrigin_B3F_MapAttributes + .4byte CaveOfOrigin_B3F_Layout .4byte CaveOfOrigin_B3F_MapEvents .4byte CaveOfOrigin_B3F_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 162 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B3F/map.bin b/data/maps/CaveOfOrigin_B3F/map.bin deleted file mode 100644 index ea574b224..000000000 --- a/data/maps/CaveOfOrigin_B3F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ))))))))))))))))) " ))) 3333 ))) 333 ""333())))*333()) ""33 ))))))))) 33 ""33" ))))))) ( 3 ""3 *"3333333( 3 "$" *333333=33 $ "3"""3322233 3 "3"""3$333$3 3 "3"""3 33333"$ 3 "3"""3( 3333" 3 3 "3"""33( 33 * 3 3 " *""333 33"$3 ( ""3""333())* 33 3 ""3"$3<33333 2$3 ""3$"333333 333 ""33"$222222$ 333 ""33$22222222$333 "$2233332222222$ "333$2222$3222222$$2222222222$3333333
\ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B3F/scripts.inc b/data/maps/CaveOfOrigin_B3F/scripts.inc new file mode 100644 index 000000000..8084ceb43 --- /dev/null +++ b/data/maps/CaveOfOrigin_B3F/scripts.inc @@ -0,0 +1,7 @@ +CaveOfOrigin_B3F_MapScripts:: @ 815DD9C + map_script 3, CaveOfOrigin_B3F_MapScript1_15DDA2 + .byte 0 + +CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3 + end diff --git a/data/maps/CaveOfOrigin_B4F/border.bin b/data/maps/CaveOfOrigin_B4F/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_B4F/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333
\ No newline at end of file diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/CaveOfOrigin_B4F/events.inc index faa146570..faa146570 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/CaveOfOrigin_B4F/events.inc diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index 0cb1ad83b..97a58ddd6 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B4F:: @ 8307208 - .4byte CaveOfOrigin_B4F_MapAttributes + .4byte CaveOfOrigin_B4F_Layout .4byte CaveOfOrigin_B4F_MapEvents .4byte CaveOfOrigin_B4F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B4F/map.bin b/data/maps/CaveOfOrigin_B4F/map.bin deleted file mode 100644 index efec94a9e..000000000 --- a/data/maps/CaveOfOrigin_B4F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ))))))))))))))))) 3 ))))))))))))) 3J"3"3333333333333 3 " *3 ))))))))) 3( ""3 * ))))))@ ( 3 ""3" *333333A3( 3J ""3" 333 ) 333 3 ""3""33 END 33 3 ""3""3 ENOND 3 3 ""3""3GNOOONF3 3L ""3 "3GNOOONF3 3 ""3""3$3?NON>$33 3 "M3"$3$3?N>$33$ 3 ""3$"33$3B3$333 $3 "$3"$2222222$ 3$ "3"3$222222222$3 3 "3$22223332222$3 "333333$222$333333 $222222232222222$
\ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc new file mode 100644 index 000000000..aeec7023f --- /dev/null +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -0,0 +1,97 @@ +CaveOfOrigin_B4F_MapScripts:: @ 815DDAC + map_script 5, CaveOfOrigin_B4F_MapScript1_15DDB7 + map_script 3, CaveOfOrigin_B4F_MapScript1_15DDC5 + .byte 0 + +CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1 + end + +CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 + removeobject 1 + return + +CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 + .ifdef SAPPHIRE + setmaplayoutindex 163 + .else + setmaplayoutindex 313 + .endif + call CaveOfOrigin_B4F_EventScript_1A01B5 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3 + end + +CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 + lockall + applymovement 255, CaveOfOrigin_B4F_Movement_1A0841 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B4F03, 4 + .else + msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4 + .endif + closemessage + setweather WEATHER_NONE + doweather + special WaitWeather + waitstate + playse SE_W197 + setfieldeffectargument 0, 9 + setfieldeffectargument 1, 13 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + waitfieldeffect FLDEFF_SPARKLE + .ifdef SAPPHIRE + setvar RESULT, 3 + .else + setvar RESULT, 2 + .endif + playse SE_TAMA + special sub_80818A4 + waitstate + special sub_80818FC + waitstate + applymovement 1, CaveOfOrigin_B4F_Movement_15DE7D + waitmovement 0 + delay 60 + setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE + waitse + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 + delay 40 + waitmoncry + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartGroudonKyogreBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar RESULT, GetBattleOutcome + compare RESULT, 1 + call_if_eq CaveOfOrigin_B4F_EventScript_15DE73 + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + setvar VAR_CAVE_OF_ORIGIN_B4F_STATE, 1 + setflag FLAG_LEGENDARY_BATTLE_COMPLETED + clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS + clearflag FLAG_SYS_WEATHER_CTRL + setvar VAR_MT_PYRE_STATE, 2 + clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + releaseall + end + +CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73 + .ifdef SAPPHIRE + msgbox UnknownString_81B4F29, 4 + .else + msgbox CaveOfOrigin_B4F_Text_1B5009, 4 + .endif + closemessage + return + +CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D + init_affine_anim + walk_down_affine_0 + delay_16 + delay_16 + walk_down_affine_1 + end_movement diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/maps/CaveOfOrigin_Entrance/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/CaveOfOrigin_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333
\ No newline at end of file diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc index cab14e4d7..cab14e4d7 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ b/data/maps/CaveOfOrigin_Entrance/events.inc diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 606997174..70ad445c4 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,9 +1,9 @@ CaveOfOrigin_Entrance:: @ 830717C - .4byte CaveOfOrigin_Entrance_MapAttributes + .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 158 .byte 72 .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/maps/CaveOfOrigin_Entrance/map.bin deleted file mode 100644 index 4bbffd109..000000000 --- a/data/maps/CaveOfOrigin_Entrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -3333333333333333333333333 )))))) 3333333 )))* ))) 3()) 3333" )))*333())) 3333"" )))-./)) 3 ( 333"""3 )5637) 3 3 33 *""3"33333333 3( 33"3""3"33333333 33 33"3""3"33333333 33 33"3""3"33333333 ( 3 ( * *"3"33333333 3 3 3 "3"3"3"33333333 3 3 3 "3"3"3"33333333 3( 3 "3"3"3"33333333 33 3 "3"3"3"33333333 33 ( " *3"3"33333333 33 3 ""33"3"33333333 33 3 ""33"3"33333333 3$3 ""3 *3"33333333 3 33 ""3"33"33333333 3 33 ""3"33"333#3333 3 33 "%"33$289:2$3 33 "3"$22233322$33 "3"3333$222$33333 "3$22222222222222$ $222222233322222$
\ No newline at end of file diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc new file mode 100644 index 000000000..68f91e0bd --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -0,0 +1,2 @@ +CaveOfOrigin_Entrance_MapScripts:: @ 815DD6B + .byte 0 diff --git a/data/maps/DesertRuins/border.bin b/data/maps/DesertRuins/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/DesertRuins/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc index b1d8690c1..b1d8690c1 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/DesertRuins/events.inc diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 79e681666..4a9ceab39 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,9 +1,9 @@ DesertRuins:: @ 8306E18 - .4byte DesertRuins_MapAttributes + .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 132 .byte 82 .byte 0 diff --git a/data/maps/DesertRuins/map.bin b/data/maps/DesertRuins/map.bin Binary files differdeleted file mode 100644 index bb87de307..000000000 --- a/data/maps/DesertRuins/map.bin +++ /dev/null diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc new file mode 100644 index 000000000..2627a8261 --- /dev/null +++ b/data/maps/DesertRuins/scripts.inc @@ -0,0 +1,68 @@ +DesertRuins_MapScripts:: @ 815CAF3 + map_script 5, DesertRuins_MapScript1_15CB03 + map_script 1, DesertRuins_MapScript1_15CB11 + map_script 3, DesertRuins_MapScript1_15CB52 + .byte 0 + +DesertRuins_MapScript1_15CB03:: @ 815CB03 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_15CB0D + end + +DesertRuins_EventScript_15CB0D:: @ 815CB0D + removeobject LAST_TALKED + return + +DesertRuins_MapScript1_15CB11:: @ 815CB11 + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB1B + end + +DesertRuins_EventScript_15CB1B:: @ 815CB1B + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 + return + +DesertRuins_MapScript1_15CB52:: @ 815CB52 + setflag FLAG_LANDMARK_DESERT_RUINS + end + +DesertRuins_EventScript_15CB56:: @ 815CB56 + lockall + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D + braillemessage DesertRuins_Braille_1C54C8 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +DesertRuins_EventScript_15CB6D:: @ 815CB6D + msgbox DesertRuins_Text_1A13BE, 4 + releaseall + end + +DesertRuins_EventScript_15CB77:: @ 815CB77 + lockall + braillemessage DesertRuins_Braille_1C54C8 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +DesertRuins_EventScript_15CB85:: @ 815CB85 + lock + faceplayer + waitse + playmoncry SPECIES_REGIROCK, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE + setflag FLAG_HIDE_REGIROCK + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartRegiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end diff --git a/data/maps/DewfordTown/border.bin b/data/maps/DewfordTown/border.bin deleted file mode 100644 index 281762f5b..000000000 --- a/data/maps/DewfordTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -CCCC
\ No newline at end of file diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc index 5cfb552ee..5cfb552ee 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/DewfordTown/events.inc diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7aed01d94..0bd56d96d 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,9 +1,9 @@ DewfordTown:: @ 830557C - .4byte DewfordTown_MapAttributes + .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 12 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown/map.bin b/data/maps/DewfordTown/map.bin deleted file mode 100644 index e8a1154e8..000000000 --- a/data/maps/DewfordTown/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -C 2 2
2$1$1$1$1$1%pzCCC92C92C$1$1$1$1$1%pzC:CCCC: $1$1$1$1$1%pzC92CC:C92'%&$1$1$1$1$1%pz5CC:C92:C$1$1$1$1$1$1$19292%pzCC92CC92:$1$1$1$1$1$1 2 2%pz:::CCC$1$1$1$1$1$1$1%pyy:::$12222$1$1 %ppppyyy$1PQRS$1$1%&%pppppppp$1XYZ[$1$1$1$1$1$1(2)2)2pppppp$1 ab -$1$1$1$1$1011 1 1 1 1 1$1$1$1$1$1$1$1$1$1$1$1>1 1 1=1$1 2 2 2
2$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$122222 2$1$1$1$1$1 92$1$1$1$1"####$$1$1$1$1$1%&C$1$1$1$1+,-./2$1$1$1$1$1$192C$1$1$1$134567$1$1$1$1$1$1$1C:92$1$1$1;2<2=>?2$1$1$1$1$1929292:92C92$1$1$1$1$1$1$1$1$1$149292:CCCCC9292929292929292929292CC92CC92
\ No newline at end of file diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc new file mode 100644 index 000000000..63f8c45b9 --- /dev/null +++ b/data/maps/DewfordTown/scripts.inc @@ -0,0 +1,642 @@ +DewfordTown_MapScripts:: @ 814DFF8 + map_script 3, DewfordTown_MapScript1_14DFFE + .byte 0 + +DewfordTown_MapScript1_14DFFE:: @ 814DFFE + setflag FLAG_VISITED_DEWFORD_TOWN + end + +DewfordTown_EventScript_14E002:: @ 814E002 + lock + faceplayer + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076 + message DewfordTown_Text_16B522 + waitmessage + multichoicedefault 21, 6, 0, 2, 0 + switch RESULT + case 0, DewfordTown_EventScript_14E04B + case 1, DewfordTown_EventScript_14E05B + case 2, DewfordTown_EventScript_14E06B + case 127, DewfordTown_EventScript_14E06B + end + +DewfordTown_EventScript_14E04B:: @ 814E04B + msgbox DewfordTown_Text_16B57D, 4 + closemessage + goto DewfordTown_EventScript_14E151 + release + end + +DewfordTown_EventScript_14E05B:: @ 814E05B + msgbox DewfordTown_Text_16B5D2, 4 + closemessage + goto DewfordTown_EventScript_14E1D8 + release + end + +DewfordTown_EventScript_14E06B:: @ 814E06B + msgbox DewfordTown_Text_16B627, 4 + closemessage + release + end + +DewfordTown_EventScript_14E076:: @ 814E076 + msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq DewfordTown_EventScript_14E093 + msgbox DewfordTown_Text_16B471, 4 + release + end + +DewfordTown_EventScript_14E093:: @ 814E093 + msgbox DewfordTown_Text_16B417, 4 + closemessage + goto DewfordTown_EventScript_14E151 + end + +DewfordTown_EventScript_14E0A2:: @ 814E0A2 + msgbox DewfordTown_Text_16B23B, 2 + end + +DewfordTown_EventScript_14E0AB:: @ 814E0AB + msgbox DewfordTown_Text_16B2A7, 3 + end + +DewfordTown_EventScript_14E0B4:: @ 814E0B4 + msgbox DewfordTown_Text_16B2D5, 3 + end + +DewfordTown_EventScript_14E0BD:: @ 814E0BD + msgbox DewfordTown_Text_16B317, 3 + end + +DewfordTown_EventScript_14E0C6:: @ 814E0C6 + lock + faceplayer + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B + msgbox DewfordTown_Text_16B665, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq DewfordTown_EventScript_14E0F0 + compare RESULT, NO + goto_if_eq DewfordTown_EventScript_14E111 + end + +DewfordTown_EventScript_14E0F0:: @ 814E0F0 + msgbox DewfordTown_Text_16B6A8, 4 + giveitem_std ITEM_OLD_ROD + setflag FLAG_RECEIVED_OLD_ROD + msgbox DewfordTown_Text_16B6F9, 4 + release + end + +DewfordTown_EventScript_14E111:: @ 814E111 + msgbox DewfordTown_Text_16B828, 4 + release + end + +DewfordTown_EventScript_14E11B:: @ 814E11B + message DewfordTown_Text_16B84E + waitmessage + multichoice 20, 8, 50, 1 + compare RESULT, 0 + goto_if_eq DewfordTown_EventScript_14E13D + compare RESULT, 1 + goto_if_eq DewfordTown_EventScript_14E147 + end + +DewfordTown_EventScript_14E13D:: @ 814E13D + msgbox DewfordTown_Text_16B866, 4 + release + end + +DewfordTown_EventScript_14E147:: @ 814E147 + msgbox DewfordTown_Text_16B89A, 4 + release + end + +DewfordTown_EventScript_14E151:: @ 814E151 + call DewfordTown_EventScript_1A010C + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 + applymovement 2, DewfordTown_Movement_14E40E + waitmovement 0 + removeobject 2 + applymovement 255, DewfordTown_Movement_14E402 + waitmovement 0 + hideobjectat 255, MAP_DEWFORD_TOWN + call DewfordTown_EventScript_1A02E7 + applymovement 4, DewfordTown_Movement_14E293 + applymovement 255, DewfordTown_Movement_14E293 + waitmovement 0 + showobjectat 255, MAP_ROUTE104 + call DewfordTown_EventScript_1A02EF + applymovement 255, DewfordTown_Movement_14E405 + waitmovement 0 + showobjectat 255, MAP_ROUTE104 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + hideobjectat 4, MAP_DEWFORD_TOWN + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 + resetobjectpriority 255, MAP_DEWFORD_TOWN + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + waitstate + release + end + +DewfordTown_EventScript_14E1D8:: @ 814E1D8 + call DewfordTown_EventScript_1A010C + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 + applymovement 2, DewfordTown_Movement_14E40E + waitmovement 0 + removeobject 2 + applymovement 255, DewfordTown_Movement_14E402 + waitmovement 0 + hideobjectat 255, MAP_DEWFORD_TOWN + call DewfordTown_EventScript_1A02E7 + applymovement 4, DewfordTown_Movement_14E356 + applymovement 255, DewfordTown_Movement_14E356 + waitmovement 0 + call DewfordTown_EventScript_1A02EF + showobjectat 255, MAP_ROUTE109 + applymovement 255, DewfordTown_Movement_14E409 + waitmovement 0 + setobjectxyperm 2, 21, 26 + addobject 2 + setobjectpriority 2, MAP_ROUTE109, 0 + applymovement 2, DewfordTown_Movement_14E410 + waitmovement 0 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 + addobject 1 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + hideobjectat 4, MAP_DEWFORD_TOWN + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281 + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A + closemessage + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 + moveobjectoffscreen 2 + release + end + +DewfordTown_EventScript_14E281:: @ 814E281 + msgbox DewfordTown_Text_16E080, 4 + return + +DewfordTown_EventScript_14E28A:: @ 814E28A + msgbox DewfordTown_Text_16E1FA, 4 + return + +DewfordTown_Movement_14E293:: @ 814E293 + walk_up + walk_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_left + walk_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_up + walk_up + end_movement + +DewfordTown_Movement_14E356:: @ 814E356 + walk_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +DewfordTown_Movement_14E402:: @ 814E402 + walk_right + walk_up + end_movement + +DewfordTown_Movement_14E405:: @ 814E405 + walk_up + walk_up + walk_up + end_movement + +DewfordTown_Movement_14E409:: @ 814E409 + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement + +DewfordTown_Movement_14E40E:: @ 814E40E + walk_up + end_movement + +DewfordTown_Movement_14E410:: @ 814E410 + walk_up + walk_up + end_movement + +DewfordTown_EventScript_14E413:: @ 814E413 + lock + faceplayer + call DewfordTown_EventScript_1A0102 + msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq DewfordTown_EventScript_14E439 + compare RESULT, NO + goto_if_eq DewfordTown_EventScript_14E443 + end + +DewfordTown_EventScript_14E439:: @ 814E439 + msgbox DewfordTown_Text_16BD37, 4 + release + end + +DewfordTown_EventScript_14E443:: @ 814E443 + msgbox DewfordTown_Text_16BADC, 4 + setvar VAR_SPECIAL_4, 9 + call DewfordTown_EventScript_1A00F3 + lock + faceplayer + compare RESULT, 1 + goto_if_eq DewfordTown_EventScript_14E46E + compare RESULT, 0 + goto_if_eq DewfordTown_EventScript_14E485 + end + +DewfordTown_EventScript_14E46E:: @ 814E46E + incrementgamestat GAME_STAT_STARTED_TRENDS + compare VAR_SPECIAL_4, 0 + goto_if_eq DewfordTown_EventScript_14E48F + msgbox DewfordTown_Text_16BB44, 4 + release + end + +DewfordTown_EventScript_14E485:: @ 814E485 + msgbox DewfordTown_Text_16BCE9, 4 + release + end + +DewfordTown_EventScript_14E48F:: @ 814E48F + msgbox DewfordTown_Text_16BCA2, 4 + release + end + +@ 814E499 + msgbox DewfordTown_Text_16BD79, 4 + release + end diff --git a/data/maps/DewfordTown/text.inc b/data/maps/DewfordTown/text.inc new file mode 100644 index 000000000..efdbfbff6 --- /dev/null +++ b/data/maps/DewfordTown/text.inc @@ -0,0 +1,167 @@ +DewfordTown_Text_16B23B:: @ 816B23B + .string "DEWFORD TOWN is a tiny island community.\n" + .string "If something gets trendy here,\l" + .string "everyone picks up on it right away.$" + +DewfordTown_Text_16B2A7:: @ 816B2A7 + .string "DEWFORD TOWN\n" + .string "“A tiny island in the blue sea.”$" + +DewfordTown_Text_16B2D5:: @ 816B2D5 + .string "DEWFORD TOWN POKéMON GYM\n" + .string "LEADER: BRAWLY\l" + .string "“A big wave in fighting!”$" + +DewfordTown_Text_16B317:: @ 816B317 + .string "DEWFORD HALL\n" + .string "“Everyone’s information exchange!”$" + +Route104_Text_16B347:: @ 816B347 + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve hit land in DEWFORD.\p" + .string "I suppose you’re off to deliver that\n" + .string "LETTER to, who was it now, STEVEN!$" + +DewfordTown_Text_16B3BC:: @ 816B3BC + .string "MR. BRINEY: Have you delivered your\n" + .string "LETTER?\p" + .string "Or were you meaning to sail back to\n" + .string "PETALBURG?$" + +DewfordTown_Text_16B417:: @ 816B417 + .string "MR. BRINEY: PETALBURG it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +DewfordTown_Text_16B471:: @ 816B471 + .string "MR. BRINEY: Then you go on and deliver\n" + .string "the LETTER. I’ll be waiting.$" + +Route104_Text_16B4B5:: @ 816B4B5 +Route109_Text_16B4B5:: @ 816B4B5 + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve hit land in DEWFORD!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail again!$" + +DewfordTown_Text_16B522:: @ 816B522 + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" + +DewfordTown_Text_16B57D:: @ 816B57D + .string "MR. BRINEY: PETALBURG, is it?\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +DewfordTown_Text_16B5D2:: @ 816B5D2 + .string "MR. BRINEY: SLATEPORT, is it?\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +DewfordTown_Text_16B627:: @ 816B627 + .string "MR. BRINEY: Just tell me whenever you\n" + .string "want to set sail again.$" + +DewfordTown_Text_16B665:: @ 816B665 + .string "This is a renowned fishing spot.\n" + .string "Are you getting the itch to fish?$" + +DewfordTown_Text_16B6A8:: @ 816B6A8 + .string "I hear you, and I like what\n" + .string "you’re saying!\p" + .string "I’ll give you one of my fishing RODS.$" + +DewfordTown_Text_16B6F9:: @ 816B6F9 + .string "And, as an added bonus, I’ll even throw\n" + .string "in a little fishing advice!\p" + .string "First, you want to face the water,\n" + .string "then use the ROD.\p" + .string "Focus your mind...\n" + .string "If you get a bite, pull on the ROD.\p" + .string "Sometimes you can snag something\n" + .string "immediately, but with bigger catches,\l" + .string "you need to time the pulls on your ROD\l" + .string "to haul them in.$" + +DewfordTown_Text_16B828:: @ 816B828 + .string "Oh, is that so?\n" + .string "That’s too bad, then.$" + +DewfordTown_Text_16B84E:: @ 816B84E + .string "Yo!\n" + .string "How’s your fishing?$" + +DewfordTown_Text_16B866:: @ 816B866 + .string "Is that right! That’s great!\n" + .string "Haul in some big ones!$" + +DewfordTown_Text_16B89A:: @ 816B89A + .string "Oh, hey, don’t get down on yourself!\n" + .string "I’ll give you a little fishing advice.\p" + .string "First, you want to face the water,\n" + .string "then use the ROD.\p" + .string "Focus your mind...\n" + .string "If you get a bite, pull the ROD.\p" + .string "Sometimes you can snag something\n" + .string "immediately, but with bigger catches,\l" + .string "you need to time the pulls on your ROD\l" + .string "to haul them in.$" + +DewfordTown_Text_16B9CE:: @ 816B9CE + .string "I like what’s hip, happening, and trendy.\n" + .string "I’m always checking it out.\p" + .string "Listen, have you heard about this new\n" + .string "“{STR_VAR_1}”?\p" + .string "That’s right!\n" + .string "Of course you know!\p" + .string "I mean, sheesh,\n" + .string "“{STR_VAR_1}”...\l" + .string "It’s the hottest thing in cool!\p" + .string "Wherever you’re from,\n" + .string "“{STR_VAR_1}”\l" + .string "is the biggest happening thing, right?$" + +DewfordTown_Text_16BADC:: @ 816BADC + .string "Hunh?\n" + .string "It’s not the hip and happening thing?\p" + .string "Well, hey, you have to tell me,\n" + .string "what’s new and what’s “in”?$" + +DewfordTown_Text_16BB44:: @ 816BB44 + .string "Hunh?\n" + .string "“{STR_VAR_2}”?\p" + .string "... ...\p" + .string "...Uh... Yeah! That’s right!\n" + .string "Yeah, I knew that! Knew it all along!\p" + .string "Of course I know about that!\n" + .string "“{STR_VAR_2},” right?\p" + .string "Yeah, that’s it, it’s there!\n" + .string "Isn’t “{STR_VAR_2}”\l" + .string "the coolest, or what?\p" + .string "It’s the hippest thing in hip.\n" + .string "You think I’d not know about it?\p" + .string "“{STR_VAR_1}”...\n" + .string "It’s, like, so five minutes ago.\p" + .string "Now, “{STR_VAR_2}” is\n" + .string "what’s vital and in tune with the times!$" + +DewfordTown_Text_16BCA2:: @ 816BCA2 + .string "Hmm...\n" + .string "“{STR_VAR_2},” huh?\p" + .string "But personally, I think\n" + .string "“{STR_VAR_1}”\l" + .string "is what’s real in cool.$" + +DewfordTown_Text_16BCE9:: @ 816BCE9 + .string "Well, if you hear of any happening new\n" + .string "trends, come share them with me, okay?$" + +DewfordTown_Text_16BD37:: @ 816BD37 + .string "Yeah, absolutely right!\p" + .string "“{STR_VAR_1}” is the\n" + .string "definition of “in” right now.$" + +DewfordTown_Text_16BD79: @ 816BD79 + .string "“{STR_VAR_2}” is at\n" + .string "the pinnacle of cool right now.$" diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/maps/DewfordTown_Gym/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/DewfordTown_Gym/border.bin +++ /dev/null diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc index 237748602..237748602 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/DewfordTown_Gym/events.inc diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 79227e545..c5c9540e5 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,9 +1,9 @@ DewfordTown_Gym:: @ 8305B9C - .4byte DewfordTown_Gym_MapAttributes + .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 65 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/maps/DewfordTown_Gym/map.bin deleted file mode 100644 index 19ea81674..000000000 --- a/data/maps/DewfordTown_Gym/map.bin +++ /dev/null @@ -1,50 +0,0 @@ - - - - )*** - +292:22 ;82$222242 -'12222& ,2-2.2/2#2#2-2/2#2 - +22 - +2 - +22 - +2 - +22 - +2 - +22 - +2+22 - 72& +22 - +2 +22 - - +22 -'7252.2.2622& - +22 - - +22 - ,2-2/2$22 - - +2 - +2242.2.2.2/2#2-2.2.2& - +2 - +22 - +2 - -'72& +22 - +2 - - '722< +2 - - - +2 - - ,2+2 - - ,2 +2 +2 - -'12"2#2#2#2#22252.2/2$2 - - '122222 - +2 - -
+22
- '72& - '82$2242& 22
\ No newline at end of file diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc new file mode 100644 index 000000000..596f2c77f --- /dev/null +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -0,0 +1,192 @@ +DewfordTown_Gym_MapScripts:: @ 8153065 + map_script 3, DewfordTown_Gym_MapScript1_15306B + .byte 0 + +DewfordTown_Gym_MapScript1_15306B:: @ 815306B + call DewfordTown_Gym_EventScript_153071 + end + +DewfordTown_Gym_EventScript_153071:: @ 8153071 + goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA + call DewfordTown_Gym_EventScript_153122 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 0 + goto_if_eq DewfordTown_Gym_EventScript_1530BA + compare VAR_SPECIAL_0, 1 + goto_if_eq DewfordTown_Gym_EventScript_1530B6 + compare VAR_SPECIAL_0, 2 + goto_if_eq DewfordTown_Gym_EventScript_1530B2 + goto DewfordTown_Gym_EventScript_1530AE + +DewfordTown_Gym_EventScript_1530AA:: @ 81530AA + setflashradius 0 + return + +DewfordTown_Gym_EventScript_1530AE:: @ 81530AE + setflashradius 1 + return + +DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 + setflashradius 2 + return + +DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 + setflashradius 3 + return + +DewfordTown_Gym_EventScript_1530BA:: @ 81530BA + setflashradius 4 + return + +DewfordTown_Gym_EventScript_1530BE:: @ 81530BE + call DewfordTown_Gym_EventScript_153122 + nop1 + compare VAR_SPECIAL_0, VAR_SPECIAL_1 + goto_if_eq DewfordTown_Gym_EventScript_1530F5 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 1 + goto_if_eq DewfordTown_Gym_EventScript_1530F6 + compare VAR_SPECIAL_0, 2 + goto_if_eq DewfordTown_Gym_EventScript_153101 + compare VAR_SPECIAL_0, 3 + goto_if_eq DewfordTown_Gym_EventScript_15310C + +DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 + return + +DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 + playse SE_MU_PACHI + animateflash 3 + call DewfordTown_Gym_EventScript_153071 + return + +DewfordTown_Gym_EventScript_153101:: @ 8153101 + playse SE_MU_PACHI + animateflash 2 + call DewfordTown_Gym_EventScript_153071 + return + +DewfordTown_Gym_EventScript_15310C:: @ 815310C + playse SE_MU_PACHI + animateflash 1 + call DewfordTown_Gym_EventScript_153071 + return + +DewfordTown_Gym_EventScript_153117:: @ 8153117 + playse SE_MU_PACHI + animateflash 0 + call DewfordTown_Gym_EventScript_153071 + return + +DewfordTown_Gym_EventScript_153122:: @ 8153122 + setvar VAR_SPECIAL_0, 0 + goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 + addvar VAR_SPECIAL_0, 1 + +DewfordTown_Gym_EventScript_153135:: @ 8153135 + goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 + addvar VAR_SPECIAL_0, 1 + +DewfordTown_Gym_EventScript_153143:: @ 8153143 + goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 + addvar VAR_SPECIAL_0, 1 + +DewfordTown_Gym_EventScript_153151:: @ 8153151 + return + +DewfordTown_Gym_EventScript_153152:: @ 8153152 + trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 + msgbox DewfordTown_Gym_Text_175412, 4 + release + end + +DewfordTown_Gym_EventScript_153177:: @ 8153177 + call DewfordTown_Gym_EventScript_153117 + message DewfordTown_Gym_Text_1752BB + waitmessage + call DewfordTown_Gym_EventScript_1A02C5 + msgbox DewfordTown_Gym_Text_1752E6, 4 + setflag FLAG_DEFEATED_DEWFORD_GYM + setflag FLAG_BADGE02_GET + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 + call_if_eq DewfordTown_Gym_EventScript_1A00FB + setvar VAR_SPECIAL_8, 2 + call DewfordTown_Gym_EventScript_1A01C0 + goto DewfordTown_Gym_EventScript_1531B5 + end + +DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 + giveitem_std ITEM_TM08_BULK_UP + compare RESULT, 0 + goto_if_eq DewfordTown_Gym_EventScript_1A029B + msgbox DewfordTown_Gym_Text_1753BF, 4 + setflag FLAG_RECEIVED_TM08 + release + end + +DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 + trainerbattle 2, OPPONENT_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + msgbox DewfordTown_Gym_Text_174F8E, 6 + end + +DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 + call DewfordTown_Gym_EventScript_1530BE + release + end + +DewfordTown_Gym_EventScript_1531FB:: @ 81531FB + trainerbattle 2, OPPONENT_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + msgbox DewfordTown_Gym_Text_175031, 6 + end + +DewfordTown_Gym_EventScript_153216:: @ 8153216 + call DewfordTown_Gym_EventScript_1530BE + release + end + +DewfordTown_Gym_EventScript_15321D:: @ 815321D + trainerbattle 2, OPPONENT_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + msgbox DewfordTown_Gym_Text_175117, 6 + end + +DewfordTown_Gym_EventScript_153238:: @ 8153238 + call DewfordTown_Gym_EventScript_1530BE + release + end + +DewfordTown_Gym_EventScript_15323F:: @ 815323F + lock + faceplayer + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254 + msgbox DewfordTown_Gym_Text_174D98, 4 + release + end + +DewfordTown_Gym_EventScript_153254:: @ 8153254 + msgbox DewfordTown_Gym_Text_174F1E, 4 + release + end + +DewfordTown_Gym_EventScript_15325E:: @ 815325E + lockall + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E + goto DewfordTown_Gym_EventScript_153288 + end + +DewfordTown_Gym_EventScript_15326E:: @ 815326E + lockall + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E + goto DewfordTown_Gym_EventScript_153288 + end + +DewfordTown_Gym_EventScript_15327E:: @ 815327E + msgbox DewfordTown_Gym_Text_175490, 4 + releaseall + end + +DewfordTown_Gym_EventScript_153288:: @ 8153288 + msgbox DewfordTown_Gym_Text_175477, 4 + releaseall + end diff --git a/data/maps/DewfordTown_Gym/text.inc b/data/maps/DewfordTown_Gym/text.inc new file mode 100644 index 000000000..24d90ec6c --- /dev/null +++ b/data/maps/DewfordTown_Gym/text.inc @@ -0,0 +1,107 @@ +DewfordTown_Gym_Text_174D98:: @ 8174D98 + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "DEWFORD’s GYM LEADER BRAWLY commands\n" + .string "FIGHTING-type POKéMON.\p" + .string "Going against him with NORMAL-type\n" + .string "POKéMON is asking for trouble.\p" + .string "FIGHTING POKéMON will lay a serious\n" + .string "smack down on NORMAL POKéMON,\l" + .string "so be careful!\p" + .string "What’s worse, the GYM is as dark as\n" + .string "the ocean floor.\p" + .string "But it will get brighter after defeating\n" + .string "the TRAINERS in your way.\p" + .string "Hey, okay, go for it!$" + +DewfordTown_Gym_Text_174F1E:: @ 8174F1E + .string "Whoah! It’s turned too bright in here!\p" + .string "Your future is bright, too!$" + +DewfordTown_Gym_Text_174F61:: @ 8174F61 + .string "Might is right!\n" + .string "Come on!$" + +DewfordTown_Gym_Text_174F7A:: @ 8174F7A + .string "Not enough power...$" + +DewfordTown_Gym_Text_174F8E:: @ 8174F8E + .string "Your skill overcame my strength!\n" + .string "Your technique is commendable!$" + +DewfordTown_Gym_Text_174FCE:: @ 8174FCE + .string "There’s no need for BRAWLY to be\n" + .string "involved!\p" + .string "I’ll crush you!$" + +DewfordTown_Gym_Text_175009:: @ 8175009 + .string "But... How?\n" + .string "How could I lose so easily?$" + +DewfordTown_Gym_Text_175031:: @ 8175031 + .string "I’m not going to waste this loss.\n" + .string "I’ll use it to motivate me to train!\p" + .string "One day I’ll become a GYM LEADER...\p" + .string "No, I’ll become the POKéMON LEAGUE\n" + .string "CHAMPION!$" + +DewfordTown_Gym_Text_1750C9:: @ 81750C9 + .string "Don’t you dare brush me off!\n" + .string "It’s not my fault if you cry!$" + +DewfordTown_Gym_Text_175104:: @ 8175104 + .string "Waaaaaaah!\n" + .string "I lost!$" + +DewfordTown_Gym_Text_175117:: @ 8175117 + .string "I battle in the dark to make my heart\n" + .string "stronger.\p" + .string "But because it’s so dark, I can never\n" + .string "see BRAWLY’s face...$" + +DewfordTown_Gym_Text_175182:: @ 8175182 + .string "I’m BRAWLY!\n" + .string "DEWFORD’s GYM LEADER!\p" + .string "I’ve been churned in the rough waves\n" + .string "of these parts, and I’ve grown tough\l" + .string "in the pitch-black cave!\p" + .string "So you wanted to challenge me?\n" + .string "Let me see what you’re made of!$" + +DewfordTown_Gym_Text_175246:: @ 8175246 + .string "Whoah, wow! You made a much bigger\n" + .string "splash than I expected!\p" + .string "You swamped me!\p" + .string "Okay, you’ve got me.\n" + .string "Take this GYM BADGE!$" + +DewfordTown_Gym_Text_1752BB:: @ 81752BB + .string "{PLAYER} received the KNUCKLE BADGE\n" + .string "from BRAWLY.$" + +DewfordTown_Gym_Text_1752E6:: @ 81752E6 + .string "The KNUCKLE BADGE makes all POKéMON\n" + .string "up to Level 30, even those you get in\l" + .string "trades, obey without question.\p" + .string "And, you’ll be able to use the HM move\n" + .string "FLASH outside of battle.\p" + .string "If you’d like, use this TECHNICAL\n" + .string "MACHINE, too.$" + +DewfordTown_Gym_Text_1753BF:: @ 81753BF + .string "That TM08 contains BULK UP.\p" + .string "It’s a move that raises both ATTACK\n" + .string "and DEFENSE stats.$" + +DewfordTown_Gym_Text_175412:: @ 8175412 + .string "I can see your talent becoming a giant\n" + .string "wave to cause a storm of astonishment\l" + .string "among TRAINERS one day!$" + +DewfordTown_Gym_Text_175477:: @ 8175477 + .string "DEWFORD TOWN POKéMON GYM$" + +DewfordTown_Gym_Text_175490:: @ 8175490 + .string "DEWFORD TOWN POKéMON GYM\p" + .string "BRAWLY’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/maps/DewfordTown_Hall/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DewfordTown_Hall/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc index 3eb9818fe..3eb9818fe 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/DewfordTown_Hall/events.inc diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 975a257d8..38b662f4d 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,9 +1,9 @@ DewfordTown_Hall:: @ 8305BB8 - .4byte DewfordTown_Hall_MapAttributes + .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 66 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/maps/DewfordTown_Hall/map.bin Binary files differdeleted file mode 100644 index 5fd13209d..000000000 --- a/data/maps/DewfordTown_Hall/map.bin +++ /dev/null diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc new file mode 100644 index 000000000..602c4776e --- /dev/null +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -0,0 +1,267 @@ +DewfordTown_Hall_MapScripts:: @ 8153292 + .byte 0 + +DewfordTown_Hall_EventScript_153293:: @ 8153293 + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + special TrendyPhraseIsOld + compare RESULT, 1 + goto_if_eq DewfordTown_Hall_EventScript_1532B2 + msgbox DewfordTown_Hall_Text_1754C9, 4 + release + end + +DewfordTown_Hall_EventScript_1532B2:: @ 81532B2 + msgbox DewfordTown_Hall_Text_175528, 4 + release + end + +DewfordTown_Hall_EventScript_1532BC:: @ 81532BC + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + msgbox DewfordTown_Hall_Text_17559E, 4 + release + end + +DewfordTown_Hall_EventScript_1532CD:: @ 81532CD + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + special BufferRandomHobbyOrLifestyleString + msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq DewfordTown_Hall_EventScript_1532F6 + compare RESULT, NO + goto_if_eq DewfordTown_Hall_EventScript_153300 + end + +DewfordTown_Hall_EventScript_1532F6:: @ 81532F6 + msgbox DewfordTown_Hall_Text_175664, 4 + release + end + +DewfordTown_Hall_EventScript_153300:: @ 8153300 + msgbox DewfordTown_Hall_Text_1756B7, 4 + release + end + +DewfordTown_Hall_EventScript_15330A:: @ 815330A + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + msgbox DewfordTown_Hall_Text_17570D, 4 + closemessage + applymovement 4, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 + release + end + +DewfordTown_Hall_EventScript_153326:: @ 8153326 + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + msgbox DewfordTown_Hall_Text_17574C, 4 + closemessage + applymovement 5, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 + release + end + +DewfordTown_Hall_EventScript_153342:: @ 8153342 + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + msgbox DewfordTown_Hall_Text_175779, 4 + release + end + +DewfordTown_Hall_EventScript_153353:: @ 8153353 + lockall + call DewfordTown_Hall_EventScript_1A0102 + msgbox DewfordTown_Hall_Text_175842, 4 + releaseall + end + +DewfordTown_Hall_EventScript_153363:: @ 8153363 + lockall + call DewfordTown_Hall_EventScript_1A0102 + special GetDewfordHallPaintingNameIndex + switch RESULT + case 0, DewfordTown_Hall_EventScript_1533CA + case 4, DewfordTown_Hall_EventScript_1533CA + case 1, DewfordTown_Hall_EventScript_1533D4 + case 5, DewfordTown_Hall_EventScript_1533CA + case 2, DewfordTown_Hall_EventScript_1533DE + case 6, DewfordTown_Hall_EventScript_1533DE + case 3, DewfordTown_Hall_EventScript_1533E8 + case 7, DewfordTown_Hall_EventScript_1533DE + end + +DewfordTown_Hall_EventScript_1533CA:: @ 81533CA + msgbox DewfordTown_Hall_Text_1758C4, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1533D4:: @ 81533D4 + msgbox DewfordTown_Hall_Text_1758E0, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1533DE:: @ 81533DE + msgbox DewfordTown_Hall_Text_1758FB, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 + msgbox DewfordTown_Hall_Text_175916, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 + lockall + setvar VAR_SPECIAL_8, 0 + goto DewfordTown_Hall_EventScript_15340A + end + +DewfordTown_Hall_EventScript_1533FE:: @ 81533FE + lockall + setvar VAR_SPECIAL_8, 1 + goto DewfordTown_Hall_EventScript_15340A + end + +DewfordTown_Hall_EventScript_15340A:: @ 815340A + call DewfordTown_Hall_EventScript_1A0102 + special GetDewfordHallPaintingNameIndex + switch RESULT + case 0, DewfordTown_Hall_EventScript_153470 + case 1, DewfordTown_Hall_EventScript_153470 + case 2, DewfordTown_Hall_EventScript_15348C + case 3, DewfordTown_Hall_EventScript_15348C + case 4, DewfordTown_Hall_EventScript_1534A8 + case 5, DewfordTown_Hall_EventScript_1534A8 + case 6, DewfordTown_Hall_EventScript_1534C4 + case 7, DewfordTown_Hall_EventScript_1534E0 + end + +DewfordTown_Hall_EventScript_153470:: @ 8153470 + call DewfordTown_Hall_EventScript_1534FD + msgbox DewfordTown_Hall_Text_175935, 4 + call DewfordTown_Hall_EventScript_153535 + msgbox DewfordTown_Hall_Text_1759A1, 4 + releaseall + end + +DewfordTown_Hall_EventScript_15348C:: @ 815348C + call DewfordTown_Hall_EventScript_1534FD + msgbox DewfordTown_Hall_Text_175A5C, 4 + call DewfordTown_Hall_EventScript_153535 + msgbox DewfordTown_Hall_Text_175AD9, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1534A8:: @ 81534A8 + call DewfordTown_Hall_EventScript_1534FD + msgbox DewfordTown_Hall_Text_175B46, 4 + call DewfordTown_Hall_EventScript_153535 + msgbox DewfordTown_Hall_Text_175BA7, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1534C4:: @ 81534C4 + call DewfordTown_Hall_EventScript_1534FD + msgbox DewfordTown_Hall_Text_175C41, 4 + call DewfordTown_Hall_EventScript_153535 + msgbox DewfordTown_Hall_Text_175CC2, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1534E0:: @ 81534E0 + call DewfordTown_Hall_EventScript_1534FD + msgbox DewfordTown_Hall_Text_175D6B, 4 + call DewfordTown_Hall_EventScript_153535 + msgbox DewfordTown_Hall_Text_175DC3, 4 + releaseall + end + +DewfordTown_Hall_EventScript_1534FC:: @ 81534FC + return + +DewfordTown_Hall_EventScript_1534FD:: @ 81534FD + applymovement 8, DewfordTown_Hall_Movement_153599 + waitmovement 0 + compare VAR_SPECIAL_8, 0 + goto_if_eq DewfordTown_Hall_EventScript_15351E + compare VAR_SPECIAL_8, 1 + goto_if_eq DewfordTown_Hall_EventScript_153534 + end + +DewfordTown_Hall_EventScript_15351E:: @ 815351E + compare FACING, 4 + goto_if_eq DewfordTown_Hall_EventScript_1534FC + applymovement 255, DewfordTown_Hall_Movement_1A0843 + waitmovement 0 + return + +DewfordTown_Hall_EventScript_153534:: @ 8153534 + return + +DewfordTown_Hall_EventScript_153535:: @ 8153535 + applymovement 7, DewfordTown_Hall_Movement_15359B + waitmovement 0 + compare VAR_SPECIAL_8, 0 + goto_if_eq DewfordTown_Hall_EventScript_153556 + compare VAR_SPECIAL_8, 1 + goto_if_eq DewfordTown_Hall_EventScript_153583 + end + +DewfordTown_Hall_EventScript_153556:: @ 8153556 + compare FACING, 2 + call_if_eq DewfordTown_Hall_EventScript_15356D + compare FACING, 1 + call_if_eq DewfordTown_Hall_EventScript_153578 + return + +DewfordTown_Hall_EventScript_15356D:: @ 815356D + applymovement 255, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 + return + +DewfordTown_Hall_EventScript_153578:: @ 8153578 + applymovement 255, DewfordTown_Hall_Movement_1A0845 + waitmovement 0 + return + +DewfordTown_Hall_EventScript_153583:: @ 8153583 + compare FACING, 3 + goto_if_eq DewfordTown_Hall_EventScript_1534FC + applymovement 255, DewfordTown_Hall_Movement_1A083F + waitmovement 0 + return + +DewfordTown_Hall_Movement_153599:: @ 8153599 + walk_in_place_left + end_movement + +DewfordTown_Hall_Movement_15359B:: @ 815359B + walk_in_place_right + end_movement + +DewfordTown_Hall_EventScript_15359D:: @ 815359D + lock + faceplayer + call DewfordTown_Hall_EventScript_1A0102 + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 + msgbox DewfordTown_Hall_Text_175E13, 4 + giveitem_std ITEM_TM36_SLUDGE_BOMB + compare RESULT, 0 + goto_if_eq DewfordTown_Hall_EventScript_1A029B + setflag FLAG_RECEIVED_TM36 + release + end + +DewfordTown_Hall_EventScript_1535D1:: @ 81535D1 + msgbox DewfordTown_Hall_Text_175EBE, 4 + release + end diff --git a/data/maps/DewfordTown_Hall/text.inc b/data/maps/DewfordTown_Hall/text.inc new file mode 100644 index 000000000..6b9f4337e --- /dev/null +++ b/data/maps/DewfordTown_Hall/text.inc @@ -0,0 +1,183 @@ +DewfordTown_Hall_Text_1754C9:: @ 81754C9 + .string "What’s in vogue? Why, it has to be\n" + .string "“{STR_VAR_1}”!\p" + .string "I can’t imagine what life would be like\n" + .string "without “{STR_VAR_1}”!$" + +DewfordTown_Hall_Text_175528:: @ 8175528 + .string "What’s in vogue? Why, it has to be\n" + .string "“{STR_VAR_1}”!\p" + .string "But I’m getting kind of bored with it.\p" + .string "I should look for the next big thing.$" + +DewfordTown_Hall_Text_17559E:: @ 817559E + .string "I’m teaching my POKéMON about\n" + .string "“{STR_VAR_1},”\l" + .string "but it’s not going well.\p" + .string "It’s a bit too much, I think.$" + +DewfordTown_Hall_Text_1755F9:: @ 81755F9 + .string "I’m studying up on the hip and trendy\n" + .string "“{STR_VAR_1}” now.\p" + .string "Is it true that there’s a deep link\n" + .string "between “{STR_VAR_1}”\l" + .string "and “{STR_VAR_2}”?$" + +DewfordTown_Hall_Text_175664:: @ 8175664 + .string "Oh!\n" + .string "So, my hunch was right!\p" + .string "I’m one step closer to being hip and\n" + .string "happening, yowza!$" + +DewfordTown_Hall_Text_1756B7:: @ 81756B7 + .string "What?!\n" + .string "Is that so?!\p" + .string "It’s not easy for an older fellow like\n" + .string "me to keep up with trends!$" + +DewfordTown_Hall_Text_17570D:: @ 817570D + .string "This whole business about\n" + .string "“{STR_VAR_1}”...\l" + .string "Isn’t there a TV show on it?$" + +DewfordTown_Hall_Text_17574C:: @ 817574C + .string "Across the sea...\p" + .string "Is “{STR_VAR_1}”\n" + .string "even more popular?$" + +DewfordTown_Hall_Text_175779:: @ 8175779 + .string "I collect official\n" + .string "“{STR_VAR_1}”\l" + .string "licensed merchandise.\p" + .string "I have official\n" + .string "“{STR_VAR_1}” dolls...\p" + .string "Official “{STR_VAR_1}”\n" + .string "brand clothing...\p" + .string "And officially licensed\n" + .string "“{STR_VAR_1}”\l" + .string "picture books.\p" + .string "Heheh, I own!\n" + .string "I’m not sharing anything with you!$" + +DewfordTown_Hall_Text_175842:: @ 8175842 + .string "IDENTIFYING GOOD\n" + .string "“{STR_VAR_1}” &\l" + .string "BAD “{STR_VAR_1}”...\p" + .string "THE LINK BETWEEN\n" + .string "“{STR_VAR_1}” AND\l" + .string "POKéMON...\p" + .string "USEFUL\n" + .string "“{STR_VAR_1}”...\p" + .string "It’s neatly jammed with books about\n" + .string "“{STR_VAR_1}.”$" + +DewfordTown_Hall_Text_1758C4:: @ 81758C4 + .string "“{STR_VAR_1}’S\n" + .string "SCREAM” is the title.$" + +DewfordTown_Hall_Text_1758E0:: @ 81758E0 + .string "“{STR_VAR_1}’S\n" + .string "SMILE” is the title.$" + +DewfordTown_Hall_Text_1758FB:: @ 81758FB + .string "It’s titled “THE LAST\n" + .string "{STR_VAR_1}”.$" + +DewfordTown_Hall_Text_175916:: @ 8175916 + .string "It’s titled “THE BIRTH OF\n" + .string "{STR_VAR_1}”.$" + +DewfordTown_Hall_Text_175935:: @ 8175935 + .string "I saw “{STR_VAR_1}”!\n" + .string "Cool, huh?\p" + .string "It’s, like, the coolest thing going!\p" + .string "It was awesome!\n" + .string "It was the real thing, oh yeah!$" + +DewfordTown_Hall_Text_1759A1:: @ 81759A1 + .string "Oh, no, no, no.\p" + .string "That alleged\n" + .string "“{STR_VAR_1}”\l" + .string "you claim to have seen - it’s not.\p" + .string "The authentic article is much...\n" + .string "How should I say it?\l" + .string "Sharper, yet more mellifluous!\p" + .string "Ah, no matter. It’s astonishing!$" + +DewfordTown_Hall_Text_175A5C:: @ 8175A5C + .string "Hey, listen, I composed a theme song\n" + .string "for “{STR_VAR_1}.”\p" + .string "“{STR_VAR_1}”\n" + .string "is really popular right now.\p" + .string "Okay, listen!\n" + .string "... ...\p" + .string "Oh!\n" + .string "{STR_VAR_1}!\p" + .string "Wonderful\n" + .string "{STR_VAR_1}!$" + +DewfordTown_Hall_Text_175AD9:: @ 8175AD9 + .string "... ...\p" + .string "I dare say, chap, it would pay for you\n" + .string "to work on your singing before you\l" + .string "trifle yourself with\l" + .string "“{STR_VAR_1}.”$" + +DewfordTown_Hall_Text_175B46:: @ 8175B46 + .string "Anyway, as I was saying earlier, we\n" + .string "should get together and organize a\l" + .string "“{STR_VAR_1}” party\l" + .string "on the island.$" + +DewfordTown_Hall_Text_175BA7:: @ 8175BA7 + .string "Oh, a smashing good idea!\p" + .string "It will settle once and for all\n" + .string "who is the best at\l" + .string "“{STR_VAR_1}.”\l" + .string "Brilliant, indeed!\p" + .string "Starting today, our lives will revolve\n" + .string "around “{STR_VAR_1}”!$" + +DewfordTown_Hall_Text_175C41:: @ 8175C41 + .string "I was thinking, though...\p" + .string "Wouldn’t you agree that\n" + .string "“{STR_VAR_1}” has\l" + .string "grown from being something trendy to\l" + .string "being a part of our daily lives?$" + +DewfordTown_Hall_Text_175CC2:: @ 8175CC2 + .string "Beg pardon?\n" + .string "That much, what?\p" + .string "However, it’s true that\n" + .string "“{STR_VAR_1}”\l" + .string "weighs heavily on your mind, whether\l" + .string "you’re awake or asleep.\p" + .string "Absolutely, you’re the\n" + .string "“{STR_VAR_1}”\l" + .string "PROFESSOR, old sport!$" + +DewfordTown_Hall_Text_175D6B:: @ 8175D6B + .string "If you and me team up as a combo,\n" + .string "we’ll be invincible when it comes to all\l" + .string "things “{STR_VAR_1}”!$" + +DewfordTown_Hall_Text_175DC3:: @ 8175DC3 + .string "Spot on, my friend!\p" + .string "We shall be the\n" + .string "“{STR_VAR_1}” DUO!\p" + .string "Isn’t that a ripe image?\n" + .string "Hahahah!$" + +DewfordTown_Hall_Text_175E13:: @ 8175E13 + .string "For me, SLUDGE BOMB is at the peak\n" + .string "of popularity. It’s the one.\p" + .string "Hunh? You’re telling me that you don’t\n" + .string "know about SLUDGE BOMB?\p" + .string "That’s outright pitiful.\n" + .string "I’ll give you one.$" + +DewfordTown_Hall_Text_175EBE:: @ 8175EBE + .string "I love SLUDGE BOMB.\p" + .string "But POKéMON with the\n" + .string "“{STR_VAR_1}”\l" + .string "move are in, too.$" diff --git a/data/maps/DewfordTown_House1/border.bin b/data/maps/DewfordTown_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DewfordTown_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc index 69fd54d9c..69fd54d9c 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/DewfordTown_House1/events.inc diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 95a8a8339..9f56cdf5d 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,9 +1,9 @@ DewfordTown_House1:: @ 8305B48 - .4byte DewfordTown_House1_MapAttributes + .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 64 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_House1/map.bin b/data/maps/DewfordTown_House1/map.bin deleted file mode 100644 index 1f732ba3f..000000000 --- a/data/maps/DewfordTown_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ - 222!2!2@22222!2)2)2D2NOD2)2)2)2!2)2)2D2VWD2)2)2)2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333
\ No newline at end of file diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc new file mode 100644 index 000000000..4a112eea2 --- /dev/null +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -0,0 +1,20 @@ +DewfordTown_House1_MapScripts:: @ 8152FEE + .byte 0 + +DewfordTown_House1_EventScript_152FEF:: @ 8152FEF + msgbox DewfordTown_House1_Text_174BA5, 2 + end + +DewfordTown_House1_EventScript_152FF8:: @ 8152FF8 + msgbox DewfordTown_House1_Text_174C0D, 2 + end + +DewfordTown_House1_EventScript_153001:: @ 8153001 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox DewfordTown_House1_Text_174CC8, 4 + waitmoncry + release + end diff --git a/data/maps/DewfordTown_House1/text.inc b/data/maps/DewfordTown_House1/text.inc new file mode 100644 index 000000000..d004acf7f --- /dev/null +++ b/data/maps/DewfordTown_House1/text.inc @@ -0,0 +1,14 @@ +DewfordTown_House1_Text_174BA5:: @ 8174BA5 + .string "There’s a lot to be said for living on\n" + .string "a small island like this in harmony with\l" + .string "POKéMON and the family.$" + +DewfordTown_House1_Text_174C0D:: @ 8174C0D + .string "I came from the large port of SLATEPORT\n" + .string "CITY when I married my husband here.\p" + .string "Life goes by slowly on this little\n" + .string "island. But being surrounded by the\l" + .string "beautiful sea - that’s happiness, too.$" + +DewfordTown_House1_Text_174CC8:: @ 8174CC8 + .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/border.bin b/data/maps/DewfordTown_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DewfordTown_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc index f6858b846..f6858b846 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/DewfordTown_House2/events.inc diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 37aac2ead..35fd959eb 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,9 +1,9 @@ DewfordTown_House2:: @ 8305BD4 - .4byte DewfordTown_House2_MapAttributes + .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 67 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_House2/map.bin b/data/maps/DewfordTown_House2/map.bin deleted file mode 100644 index 6274e4418..000000000 --- a/data/maps/DewfordTown_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ - 22266!2!2!222!2)2D2)2)2)2)2)2)2)2!2)2)2)2)2)2)2N_D2!2)2)2)2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333
\ No newline at end of file diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc new file mode 100644 index 000000000..a2341bc76 --- /dev/null +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -0,0 +1,28 @@ +DewfordTown_House2_MapScripts:: @ 81535DB + .byte 0 + +DewfordTown_House2_EventScript_1535DC:: @ 81535DC + lock + faceplayer + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 + msgbox DewfordTown_House2_Text_175EFE, 4 + giveitem_std ITEM_SILK_SCARF + compare RESULT, 0 + goto_if_eq DewfordTown_House2_EventScript_15360B + setflag FLAG_RECEIVED_SILK_SCARF + release + end + +DewfordTown_House2_EventScript_15360B:: @ 815360B + msgbox DewfordTown_House2_Text_175FDA, 4 + release + end + +DewfordTown_House2_EventScript_153615:: @ 8153615 + msgbox DewfordTown_House2_Text_176055, 4 + release + end + +DewfordTown_House2_EventScript_15361F:: @ 815361F + msgbox DewfordTown_House2_Text_1760C8, 2 + end diff --git a/data/maps/DewfordTown_House2/text.inc b/data/maps/DewfordTown_House2/text.inc new file mode 100644 index 000000000..b37456112 --- /dev/null +++ b/data/maps/DewfordTown_House2/text.inc @@ -0,0 +1,28 @@ +DewfordTown_House2_Text_175EFE:: @ 8175EFE + .string "Gorge your eyes on this!\p" + .string "It’s a SILK SCARF. It’s right at the\n" + .string "cutting edge of fashion, yeah!\p" + .string "Oh, I can see your eyes twinkling!\n" + .string "You appreciate my dazzling style!\p" + .string "Oh, you’re a delight!\n" + .string "Here you go. I want you to have it!$" + +DewfordTown_House2_Text_175FDA:: @ 8175FDA + .string "Oh, you don’t have room?\p" + .string "Now, listen tight, this SCARF is a must-\n" + .string "have! Why, I would sell all my items\l" + .string "in order to get it!$" + +DewfordTown_House2_Text_176055:: @ 8176055 + .string "The SILK SCARF raises the power of\n" + .string "NORMAL-type moves.\p" + .string "It’s a marvelous SCARF that will go\n" + .string "with almost all POKéMON!$" + +DewfordTown_House2_Text_1760C8:: @ 81760C8 + .string "Wow, you bothered to cross the sea\n" + .string "to visit DEWFORD?\p" + .string "Did you maybe come here because you\n" + .string "heard about BRAWLY?\p" + .string "He’s so cool...\n" + .string "Everyone idolizes him.$" diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index 97b0e761a..97b0e761a 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 9cf0a8f46..b7630e6c3 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..33d14e770 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,24 @@ +DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 + map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_15301A + .byte 0 + +DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A + setrespawn 15 + call DewfordTown_PokemonCenter_1F_EventScript_19FD1B + end + +DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 + setvar VAR_SPECIAL_B, 1 + call DewfordTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +DewfordTown_PokemonCenter_1F_EventScript_153031:: @ 8153031 + msgbox DewfordTown_PokemonCenter_1F_Text_174CDB, 2 + end + +DewfordTown_PokemonCenter_1F_EventScript_15303A:: @ 815303A + msgbox DewfordTown_PokemonCenter_1F_Text_174D32, 2 + end diff --git a/data/maps/DewfordTown_PokemonCenter_1F/text.inc b/data/maps/DewfordTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..9c4a6f41c --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/text.inc @@ -0,0 +1,10 @@ +DewfordTown_PokemonCenter_1F_Text_174CDB:: @ 8174CDB + .string "There’s a stone cavern at the edge\n" + .string "of town.\p" + .string "I’ve heard you can find rare stones\n" + .string "there.$" + +DewfordTown_PokemonCenter_1F_Text_174D32:: @ 8174D32 + .string "Even if a POKéMON faints and can’t\n" + .string "battle, it can still use a move learned\l" + .string "from a Hidden Machine, HM.$" diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 333823536..333823536 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index a54a51c94..5d0babd91 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..554c9ef6b --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +DewfordTown_PokemonCenter_2F_MapScripts:: @ 8153043 + map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +DewfordTown_PokemonCenter_2F_EventScript_153053:: @ 8153053 + call DewfordTown_PokemonCenter_2F_EventScript_1A3EA6 + end + +DewfordTown_PokemonCenter_2F_EventScript_153059:: @ 8153059 + call DewfordTown_PokemonCenter_2F_EventScript_1A40CC + end + +DewfordTown_PokemonCenter_2F_EventScript_15305F:: @ 815305F + call DewfordTown_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/maps/DoubleBattleColosseum/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/DoubleBattleColosseum/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc index a04c7a3a9..a04c7a3a9 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/DoubleBattleColosseum/events.inc diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index baf1b8076..bf41ae872 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,9 +1,9 @@ DoubleBattleColosseum:: @ 83079CC - .4byte DoubleBattleColosseum_MapAttributes + .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 225 .byte 87 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/maps/DoubleBattleColosseum/map.bin deleted file mode 100644 index 77606e818..000000000 --- a/data/maps/DoubleBattleColosseum/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_22L2M22222M2N2222U2`2U2U2b2c2U2U2a2U222U2T2U2U2d2e2U2U2V2U222U2`2U2U2f2g2U2U2a2U222U2\2]2]2]2]2]2]2^2U22!2!2!2!2
\ No newline at end of file diff --git a/data/maps/DoubleBattleColosseum/scripts.inc b/data/maps/DoubleBattleColosseum/scripts.inc new file mode 100644 index 000000000..9bc33e6bd --- /dev/null +++ b/data/maps/DoubleBattleColosseum/scripts.inc @@ -0,0 +1,2 @@ +DoubleBattleColosseum_MapScripts:: @ 815F57F + .byte 0 diff --git a/data/maps/EverGrandeCity/border.bin b/data/maps/EverGrandeCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/EverGrandeCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc index 0a619b93d..0a619b93d 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/EverGrandeCity/events.inc diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 0c1f6eab0..89386b78c 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,9 +1,9 @@ EverGrandeCity:: @ 8305528 - .4byte EverGrandeCity_MapAttributes + .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 9 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity/map.bin b/data/maps/EverGrandeCity/map.bin Binary files differdeleted file mode 100644 index 33b271d5d..000000000 --- a/data/maps/EverGrandeCity/map.bin +++ /dev/null diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc new file mode 100644 index 000000000..293780716 --- /dev/null +++ b/data/maps/EverGrandeCity/scripts.inc @@ -0,0 +1,24 @@ +EverGrandeCity_MapScripts:: @ 814D4D5 + map_script 3, EverGrandeCity_MapScript1_14D4DB + .byte 0 + +EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB + call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1 + end + +EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 + msgbox EverGrandeCity_Text_16A74D, 3 + end + +EverGrandeCity_EventScript_14D4EE:: @ 814D4EE + msgbox EverGrandeCity_Text_16A787, 3 + end + +EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 + msgbox EverGrandeCity_Text_16A763, 3 + end + +EverGrandeCity_EventScript_14D500:: @ 814D500 + setflag FLAG_VISITED_EVER_GRANDE_CITY + setvar VAR_TEMP_1, 1 + end diff --git a/data/maps/EverGrandeCity/text.inc b/data/maps/EverGrandeCity/text.inc new file mode 100644 index 000000000..f468bf3b7 --- /dev/null +++ b/data/maps/EverGrandeCity/text.inc @@ -0,0 +1,11 @@ +EverGrandeCity_Text_16A74D:: @ 816A74D + .string "ENTERING VICTORY ROAD$" + +EverGrandeCity_Text_16A763:: @ 816A763 + .string "ENTERING POKéMON LEAGUE\n" + .string "CENTER GATE$" + +EverGrandeCity_Text_16A787:: @ 816A787 + .string "EVER GRANDE CITY\p" + .string "“The paradise of flowers, the sea,\n" + .string "and POKéMON.”$" diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/maps/EverGrandeCity_ChampionsRoom/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 832ddf206..832ddf206 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 154d5ba29..85afeb078 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 - .4byte EverGrandeCity_ChampionsRoom_MapAttributes + .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 116 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/maps/EverGrandeCity_ChampionsRoom/map.bin Binary files differdeleted file mode 100644 index a234307b5..000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin +++ /dev/null diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc new file mode 100644 index 000000000..7e1f6e6cb --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -0,0 +1,226 @@ +EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF + map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF + map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5 + map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4 + .byte 0 + +EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF + call EverGrandeCity_ChampionsRoom_EventScript_1A014E + end + +EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF + .2byte 0 + +EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF + turnobject 255, 2 + end + +EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE + .2byte 0 + +EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE + lockall + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E + waitmovement 0 + delay 40 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 + waitmovement 0 + setvar VAR_TEMP_1, 1 + goto EverGrandeCity_ChampionsRoom_EventScript_15B805 + releaseall + end + +EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 + walk_up + walk_up + end_movement + +EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 + playbgm MUS_DAIGO, FALSE + msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 + trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + goto EverGrandeCity_ChampionsRoom_EventScript_15B821 + end + +EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 + playse SE_DOOR + setmetatile 6, 1, 838, 0 + setmetatile 6, 2, 839, 0 + special DrawWholeMapView + msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 + closemessage + playse SE_DOOR + checkplayergender + compare RESULT, 0 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C + compare RESULT, 1 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881 + addobject 2 + call EverGrandeCity_ChampionsRoom_EventScript_15B9BD + checkplayergender + compare RESULT, 0 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 + compare RESULT, 1 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB + end + +EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C + playbgm MUS_GIRL_SUP, FALSE + return + +EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 + playbgm MUS_BOY_SUP, FALSE + return + +EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 + msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 + delay 40 + playse SE_PIN + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + waitmovement 0 + call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 + msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4 + goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + end + +EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB + msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 + delay 40 + playse SE_PIN + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + waitmovement 0 + call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 + msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4 + goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + end + +EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 + closemessage + addobject 3 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 + waitmovement 0 + msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4 + call EverGrandeCity_ChampionsRoom_EventScript_1A03B0 + msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 + waitmovement 0 + delay 20 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 + waitmovement 0 + msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 + closemessage + delay 30 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 + waitmovement 0 + delay 20 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 + waitmovement 0 + msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 + checkplayergender + compare RESULT, 0 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB + compare RESULT, 1 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + closemessage + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 + waitmovement 0 + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 + waitstate + releaseall + end + +EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB + msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, 4 + return + +EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4 + msgbox EverGrandeCity_ChampionsRoom_Text_191675, 4 + return + +EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F + waitmovement 0 + return + +EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF + waitmovement 0 + return + +EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD + walk_up + walk_up + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 + walk_up + delay_16 + walk_up + delay_8 + set_invisible + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_in_place_fastest_right + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + delay_16 + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8 + walk_right + walk_up + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB + walk_up + walk_up + walk_in_place_fastest_down + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF + walk_up + delay_8 + set_invisible + end_movement + +EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_in_place_fastest_left + end_movement diff --git a/data/maps/EverGrandeCity_ChampionsRoom/text.inc b/data/maps/EverGrandeCity_ChampionsRoom/text.inc new file mode 100644 index 000000000..c7c63e208 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/text.inc @@ -0,0 +1,100 @@ +EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C + .string "STEVEN: Welcome, {PLAYER}{KUN}.\p" + .string "I was looking forward to seeing you\n" + .string "here one day.\p" + .string "You... What did you see on your\n" + .string "journey with POKéMON?\p" + .string "What did you feel, meeting so many\n" + .string "other TRAINERS like you?\p" + .string "What has awoken in you?\n" + .string "I want you to hit me with it all!\p" + .string "Now, bring it!$" + +EverGrandeCity_ChampionsRoom_Text_1910A0:: @ 81910A0 + .string "I, the CHAMPION, fall in defeat...\p" + .string "Kudos to you, {PLAYER}{KUN}!\p" + .string "You are a truly noble POKéMON\n" + .string "TRAINER!$" + +EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE + .string "STEVEN: Congratulations!\p" + .string "The feelings you have for your\n" + .string "POKéMON...\p" + .string "And the POKéMON that responded to\n" + .string "those feelings with all their might...\p" + .string "They came together as one, and created\n" + .string "an even greater power.\p" + .string "And thus, you were able to grasp\n" + .string "victory today!\p" + .string "You are rightfully the HOENN region’s\n" + .string "new...$" + +EverGrandeCity_ChampionsRoom_Text_191225:: @ 8191225 + .string "MAY: {PLAYER}{KUN}!\p" + .string "Here’s some advice before you challenge\n" + .string "the CHAMPION...$" + +EverGrandeCity_ChampionsRoom_Text_191268:: @ 8191268 + .string "MAY: Huh? What, what, what?\p" + .string "{PLAYER}{KUN}...\n" + .string "Could it be that...\l" + .string "It’s already over?$" + +EverGrandeCity_ChampionsRoom_Text_1912B3:: @ 81912B3 + .string "BRENDAN: {PLAYER}!\p" + .string "How would you like some advice before\n" + .string "you challenge the CHAMPION?...$" + +EverGrandeCity_ChampionsRoom_Text_191305:: @ 8191305 + .string "BRENDAN: {PLAYER}...\p" + .string "Are you trying to tell me...\n" + .string "You’ve beaten the CHAMPION?$" + +EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D + .string "PROF. BIRCH: See?\n" + .string "What did I tell you, {RIVAL}?\p" + .string "Didn’t I tell you that you don’t need\n" + .string "to worry about {PLAYER}{KUN}?\p" + .string "... ... ... ... ... ... ... ...\n" + .string "{PLAYER}{KUN}, you’ve finally done it.\p" + .string "When I heard that you defeated your\n" + .string "own father at the PETALBURG GYM,\l" + .string "I thought perhaps you had a chance...\p" + .string "But to think you’ve actually become\n" + .string "the CHAMPION!\p" + .string "Ah, yes!\p" + .string "What became of your POKéDEX?\n" + .string "Here, let me see.$" + +EverGrandeCity_ChampionsRoom_Text_1914C6:: @ 81914C6 + .string "PROF. BIRCH: Anyways,\n" + .string "congratulations!\p" + .string "Now, go proudly into the final room!$" + +EverGrandeCity_ChampionsRoom_Text_191512:: @ 8191512 + .string "STEVEN: {PLAYER}{KUN}...\p" + .string "No, the new CHAMPION!\p" + .string "Come with me.$" + +EverGrandeCity_ChampionsRoom_Text_191546:: @ 8191546 + .string "STEVEN: I’m sorry, but...\p" + .string "From here on, only those TRAINERS who\n" + .string "have become CHAMPIONS may enter.\p" + .string "You’ll have to wait outside with the\n" + .string "PROFESSOR.$" + +EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 + .string "MAY: Groan...\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "I’m just joking! That’s okay!\n" + .string "That’s the rule!\p" + .string "{PLAYER}{KUN}!\n" + .string "Honestly, congratulations!$" + +EverGrandeCity_ChampionsRoom_Text_191675:: @ 8191675 + .string "BRENDAN: ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "It can’t be helped if that’s the rule.\p" + .string "{PLAYER}, way to go!\n" + .string "Congratulations!$" diff --git a/data/maps/EverGrandeCity_Corridor1/border.bin b/data/maps/EverGrandeCity_Corridor1/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_Corridor1/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/events.inc index f3ec6727e..f3ec6727e 100644 --- a/data/maps/events/EverGrandeCity_Corridor1.inc +++ b/data/maps/EverGrandeCity_Corridor1/events.inc diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index 68d16484e..c15955ae1 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_Corridor1:: @ 8306B24 - .4byte EverGrandeCity_Corridor1_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor1_MapEvents .4byte EverGrandeCity_Corridor1_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor1/map.bin b/data/maps/EverGrandeCity_Corridor1/map.bin deleted file mode 100644 index 75812b238..000000000 --- a/data/maps/EverGrandeCity_Corridor1/map.bin +++ /dev/null @@ -1 +0,0 @@ -DHIHI E HIHI2222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_Corridor1/scripts.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc new file mode 100644 index 000000000..60d1f7253 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc @@ -0,0 +1,11 @@ +EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C + map_script 4, EverGrandeCity_Corridor1_MapScript2_15BA12 + .byte 0 + +EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_15BA1C + .2byte 0 + +EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C + turnobject 255, 2 + end diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/events.inc index e9a9cdc4c..e9a9cdc4c 100644 --- a/data/maps/events/EverGrandeCity_Corridor2.inc +++ b/data/maps/EverGrandeCity_Corridor2/events.inc diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 0dab21f9a..774dd8bf9 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_Corridor2:: @ 8306B40 - .4byte EverGrandeCity_Corridor2_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor2_MapEvents .4byte EverGrandeCity_Corridor2_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor2/scripts.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc new file mode 100644 index 000000000..d74be91c4 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc @@ -0,0 +1,11 @@ +EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 + map_script 4, EverGrandeCity_Corridor2_MapScript2_15BA27 + .byte 0 + +EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_15BA31 + .2byte 0 + +EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 + turnobject 255, 2 + end diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/events.inc index 98d5f7b81..98d5f7b81 100644 --- a/data/maps/events/EverGrandeCity_Corridor3.inc +++ b/data/maps/EverGrandeCity_Corridor3/events.inc diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index 3d20a6a41..2799a2256 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_Corridor3:: @ 8306B5C - .4byte EverGrandeCity_Corridor3_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor3_MapEvents .4byte EverGrandeCity_Corridor3_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor3/scripts.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc new file mode 100644 index 000000000..006e570ef --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc @@ -0,0 +1,11 @@ +EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 + map_script 4, EverGrandeCity_Corridor3_MapScript2_15BA3C + .byte 0 + +EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_EventScript_15BA46 + .2byte 0 + +EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 + turnobject 255, 2 + end diff --git a/data/maps/EverGrandeCity_Corridor4/border.bin b/data/maps/EverGrandeCity_Corridor4/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_Corridor4/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/events.inc index cbcf9f77e..cbcf9f77e 100644 --- a/data/maps/events/EverGrandeCity_Corridor4.inc +++ b/data/maps/EverGrandeCity_Corridor4/events.inc diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 56a5297d7..254553ab4 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_Corridor4:: @ 8306B78 - .4byte EverGrandeCity_Corridor4_MapAttributes + .4byte EverGrandeCity_Corridor4_Layout .4byte EverGrandeCity_Corridor4_MapEvents .4byte EverGrandeCity_Corridor4_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 316 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor4/map.bin b/data/maps/EverGrandeCity_Corridor4/map.bin deleted file mode 100644 index 580ae095a..000000000 --- a/data/maps/EverGrandeCity_Corridor4/map.bin +++ /dev/null @@ -1 +0,0 @@ -D
E
2222222222222222222222222222J222J222J222J222J222J222222J222J222222222J222J222222222222J222J222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_Corridor4/scripts.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc new file mode 100644 index 000000000..2ae857aa8 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc @@ -0,0 +1,11 @@ +EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B + map_script 4, EverGrandeCity_Corridor4_MapScript2_15BA51 + .byte 0 + +EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_EventScript_15BA5B + .2byte 0 + +EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B + turnobject 255, 2 + end diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/events.inc index 5b77148ca..5b77148ca 100644 --- a/data/maps/events/EverGrandeCity_Corridor5.inc +++ b/data/maps/EverGrandeCity_Corridor5/events.inc diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 2ca1fef86..176d27e1e 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_Corridor5:: @ 8306B94 - .4byte EverGrandeCity_Corridor5_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor5_MapEvents .4byte EverGrandeCity_Corridor5_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor5/scripts.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc new file mode 100644 index 000000000..09ce304f6 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc @@ -0,0 +1,11 @@ +EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 + map_script 4, EverGrandeCity_Corridor5_MapScript2_15BA66 + .byte 0 + +EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_15BA70 + .2byte 0 + +EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 + turnobject 255, 2 + end diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/maps/EverGrandeCity_DrakesRoom/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 6b69d45da..6b69d45da 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 04c1d9f32..4f5cb96b6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC - .4byte EverGrandeCity_DrakesRoom_MapAttributes + .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 115 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/maps/EverGrandeCity_DrakesRoom/map.bin deleted file mode 100644 index 3b5248d98..000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -
-
2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222HIHI222HIHI
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc new file mode 100644 index 000000000..4dad28923 --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -0,0 +1,62 @@ +EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D + map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C + map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743 + map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570 + .byte 0 + +@ 815B71D + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 + .2byte 0 + +EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 + turnobject 255, 2 + end + +EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 + .2byte 0 + +EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 + lockall + call EverGrandeCity_DrakesRoom_EventScript_1A0710 + setvar VAR_ELITE_4_STATE, 4 + releaseall + end + +EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758 + compare VAR_ELITE_4_STATE, 4 + call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E + end + +EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 + call EverGrandeCity_DrakesRoom_EventScript_1A0757 + return + +EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E + call EverGrandeCity_DrakesRoom_EventScript_1A07FA + return + +EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 + lock + faceplayer + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B + playbgm MUS_SITENNOU, FALSE + msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 + trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 + goto EverGrandeCity_DrakesRoom_EventScript_15B795 + end + +EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B + msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 + release + end + +EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 + setvar VAR_SPECIAL_4, 0 + special sub_810FF60 + setflag FLAG_DEFEATED_ELITE_4_DRAKE + call EverGrandeCity_DrakesRoom_EventScript_1A0693 + msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 + release + end diff --git a/data/maps/EverGrandeCity_DrakesRoom/text.inc b/data/maps/EverGrandeCity_DrakesRoom/text.inc new file mode 100644 index 000000000..ed89c22bf --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/text.inc @@ -0,0 +1,28 @@ +EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB + .string "I am the last of the POKéMON LEAGUE\n" + .string "ELITE FOUR, DRAKE the DRAGON master!\p" + .string "In their natural state, POKéMON are\n" + .string "wild living things. They are free.\p" + .string "At times, they hinder us.\n" + .string "At times, they help us.\p" + .string "For us to battle with POKéMON as\n" + .string "partners, do you know what it takes?\p" + .string "Do you know what is needed?\p" + .string "If you don’t, then you will never\n" + .string "prevail over me!$" + +EverGrandeCity_DrakesRoom_Text_190E42:: @ 8190E42 + .string "Superb, it should be said.$" + +EverGrandeCity_DrakesRoom_Text_190E5D:: @ 8190E5D + .string "You deserve every credit for coming\n" + .string "this far as a TRAINER of POKéMON.\p" + .string "You do seem to know what is needed.\p" + .string "Yes, what a TRAINER needs is a\n" + .string "virtuous heart.\p" + .string "POKéMON touch the good hearts of\n" + .string "TRAINERS and learn good from wrong.\p" + .string "They touch the good hearts of\n" + .string "TRAINERS and grow strong.\p" + .string "Go! Go onwards!\n" + .string "The CHAMPION is waiting!$" diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/maps/EverGrandeCity_GlaciasRoom/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 8dba287fe..8dba287fe 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index e0a48f9a6..f0ba099ac 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 - .4byte EverGrandeCity_GlaciasRoom_MapAttributes + .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 114 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/maps/EverGrandeCity_GlaciasRoom/map.bin deleted file mode 100644 index 2d7db7377..000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -
-
r2r2r2r2r2222r2r2r2r2r2v22p2s2s2s2t222wu}~22x2y2z2{2|222}222222222q22x2222|22222x2222|222222222222222222222222222222222222222222222HIHI222HIHI
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc new file mode 100644 index 000000000..17555f2f6 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -0,0 +1,60 @@ +EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 + map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692 + map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9 + map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683 + .byte 0 + +EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D + .2byte 0 + +EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D + turnobject 255, 2 + end + +EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C + .2byte 0 + +EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C + lockall + call EverGrandeCity_GlaciasRoom_EventScript_1A0710 + setvar VAR_ELITE_4_STATE, 3 + releaseall + end + +EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE + compare VAR_ELITE_4_STATE, 3 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + end + +EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE + call EverGrandeCity_GlaciasRoom_EventScript_1A0757 + return + +EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 + call EverGrandeCity_GlaciasRoom_EventScript_1A07FA + return + +EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA + lock + faceplayer + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + playbgm MUS_SITENNOU, FALSE + msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 + trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB + end + +EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 + msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4 + release + end + +EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB + setflag FLAG_DEFEATED_ELITE_4_GLACIA + call EverGrandeCity_GlaciasRoom_EventScript_1A0693 + msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4 + release + end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/text.inc b/data/maps/EverGrandeCity_GlaciasRoom/text.inc new file mode 100644 index 000000000..88fa1e664 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/text.inc @@ -0,0 +1,22 @@ +EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 + .string "Welcome, my name is GLACIA of the\n" + .string "ELITE FOUR.\p" + .string "I’ve traveled from afar to HOENN so\n" + .string "that I may hone my ice skills.\p" + .string "But all I have seen are challenges by\n" + .string "weak TRAINERS and their POKéMON.\p" + .string "What about you?\p" + .string "It would please me to no end if I could\n" + .string "go all out against you!$" + +EverGrandeCity_GlaciasRoom_Text_190C01:: @ 8190C01 + .string "You and your POKéMON...\n" + .string "How hot your spirits burn!\p" + .string "The all-consuming heat overwhelms.\p" + .string "It’s no surprise that my icy skills\n" + .string "failed to harm you.$" + +EverGrandeCity_GlaciasRoom_Text_190C8F:: @ 8190C8F + .string "Advance to the next room.\p" + .string "And there, confirm the truly fearsome\n" + .string "side of the POKéMON LEAGUE.$" diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/maps/EverGrandeCity_HallOfFame/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_HallOfFame/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index f5a3f9137..f5a3f9137 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index b7816ea86..3a8c1a263 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_HallOfFame:: @ 8306BCC - .4byte EverGrandeCity_HallOfFame_MapAttributes + .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 - .2byte BGM_EIKOU_R + .2byte MUS_EIKOU_R .2byte 299 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/maps/EverGrandeCity_HallOfFame/map.bin deleted file mode 100644 index 1df9e4804..000000000 --- a/data/maps/EverGrandeCity_HallOfFame/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222262226
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc new file mode 100644 index 000000000..6cfc5ae27 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -0,0 +1,84 @@ +EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 + map_script 2, EverGrandeCity_HallOfFame_MapScript2_15BB9E + map_script 4, EverGrandeCity_HallOfFame_MapScript2_15BB8F + .byte 0 + +EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 + .2byte 0 + +EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 + turnobject 255, 2 + end + +EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 + .2byte 0 + +EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 + lockall + applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59 + applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59 + waitmovement 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + waitmovement 0 + msgbox EverGrandeCity_HallOfFame_Text_191841, 4 + closemessage + applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 + applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 + waitmovement 0 + delay 20 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + waitmovement 0 + msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4 + closemessage + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 + waitmovement 0 + delay 20 + dofieldeffect FLDEFF_HALL_OF_FAME_RECORD + waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD + delay 40 + setvar VAR_TEMP_1, 1 + call EverGrandeCity_HallOfFame_EventScript_19FC13 + checkplayergender + compare RESULT, 0 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 + compare RESULT, 1 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D + end + +EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 + setrespawn 1 + fadescreenspeed 1, 24 + special GameClear + waitstate + releaseall + end + +EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D + setrespawn 2 + fadescreenspeed 1, 24 + special GameClear + waitstate + releaseall + end + +EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement diff --git a/data/maps/EverGrandeCity_HallOfFame/text.inc b/data/maps/EverGrandeCity_HallOfFame/text.inc new file mode 100644 index 000000000..c684dcb72 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/text.inc @@ -0,0 +1,13 @@ +EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 + .string "STEVEN: This room...\p" + .string "This is where we keep records of\n" + .string "POKéMON that prevailed through\l" + .string "harsh battles.\p" + .string "It is here that the LEAGUE CHAMPIONS\n" + .string "are honored.$" + +EverGrandeCity_HallOfFame_Text_1918D7:: @ 81918D7 + .string "STEVEN: Come on, let’s record your\n" + .string "name as a TRAINER who triumphed over\l" + .string "the POKéMON LEAGUE, and the names of\l" + .string "the partners who battled with you.$" diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/maps/EverGrandeCity_PhoebesRoom/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index aa67e5912..aa67e5912 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index f9ef5a516..8d34dd0ba 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 - .4byte EverGrandeCity_PhoebesRoom_MapAttributes + .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 113 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/maps/EverGrandeCity_PhoebesRoom/map.bin deleted file mode 100644 index 2e75b706c..000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -
-
B2B2B2B2B2X2X2X2B2B2B2B2B2EF\2\2@2C2C2C2D2\2\2GAMN\2\2H2I2J2K2L2\2\2O@UV\2\2P2Q2R2S2T2\2\2WA]^\2\2H2Y2Z2[2L2\2\2WBef\2\2H2a2b2c2L2\2\2gCm2n2\2\2h2k2k2k2l2\2\2o2`2j2i2i2i2i2i2i2i2i2i2i2i2i22222222222222\2\2\2HIHId2d2d2HIHI
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc new file mode 100644 index 000000000..5575b99b3 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -0,0 +1,60 @@ +EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 + map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F + map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9 + map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8 + .byte 0 + +EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 + .2byte 0 + +EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 + turnobject 255, 2 + end + +EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 + .2byte 0 + +EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 + lockall + call EverGrandeCity_PhoebesRoom_EventScript_1A0710 + setvar VAR_ELITE_4_STATE, 2 + releaseall + end + +EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624 + compare VAR_ELITE_4_STATE, 2 + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A + end + +EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 + call EverGrandeCity_PhoebesRoom_EventScript_1A0757 + return + +EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A + call EverGrandeCity_PhoebesRoom_EventScript_1A07FA + return + +EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 + lock + faceplayer + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 + playbgm MUS_SITENNOU, FALSE + msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 + trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + goto EverGrandeCity_PhoebesRoom_EventScript_15B661 + end + +EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 + msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4 + release + end + +EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661 + setflag FLAG_DEFEATED_ELITE_4_PHOEBE + call EverGrandeCity_PhoebesRoom_EventScript_1A0693 + msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4 + release + end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/text.inc b/data/maps/EverGrandeCity_PhoebesRoom/text.inc new file mode 100644 index 000000000..e77a7d31a --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/text.inc @@ -0,0 +1,23 @@ +EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 + .string "Ahahaha!\p" + .string "I’m PHOEBE of the ELITE FOUR.\n" + .string "I did my training on MT. PYRE.\p" + .string "While I trained, I gained the ability\n" + .string "to commune with GHOST-type POKéMON.\p" + .string "Yes, the bond I developed with POKéMON\n" + .string "is extremely tight.\p" + .string "So, come on, just try and see if you can\n" + .string "even inflict damage on my POKéMON!$" + +EverGrandeCity_PhoebesRoom_Text_190A0C:: @ 8190A0C + .string "Oh, darn.\n" + .string "I’ve gone and lost.$" + +EverGrandeCity_PhoebesRoom_Text_190A2A:: @ 8190A2A + .string "There’s a definite bond between you\n" + .string "and your POKéMON, too.\p" + .string "I didn’t recognize it, so it’s only\n" + .string "natural that I lost.\p" + .string "Yup, I’d like to see how far your bond\n" + .string "will carry you.\p" + .string "Go ahead, move on to the next room.$" diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index ea1045d22..ea1045d22 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 2b72fc661..489b5bd52 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..374ef9472 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,24 @@ +EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 + map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C + .byte 0 + +EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C + setrespawn 11 + end + +EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 +SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 + setvar VAR_SPECIAL_B, 1 + call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E:: @ 815BC7E + msgbox EverGrandeCity_PokemonCenter_1F_Text_191967, 2 + end + +EverGrandeCity_PokemonCenter_1F_EventScript_15BC87:: @ 815BC87 + msgbox EverGrandeCity_PokemonCenter_1F_Text_1919EF, 2 + end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..18594308a --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc @@ -0,0 +1,12 @@ +EverGrandeCity_PokemonCenter_1F_Text_191967:: @ 8191967 + .string "The POKéMON LEAGUE is only a short\n" + .string "distance after the VICTORY ROAD.\p" + .string "If you’ve come this far, what choice\n" + .string "do you have but to keep going?$" + +EverGrandeCity_PokemonCenter_1F_Text_1919EF:: @ 81919EF + .string "The long and harrowing VICTORY ROAD...\p" + .string "It’s like reliving the path one has\n" + .string "traveled in life...\p" + .string "Believe in your POKéMON and give it\n" + .string "your very best!$" diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 36dfa01f7..36dfa01f7 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index b60e3c3df..35167d6c1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..9941e17e4 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 815BC90 + map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0:: @ 815BCA0 + call EverGrandeCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6:: @ 815BCA6 + call EverGrandeCity_PokemonCenter_2F_EventScript_1A40CC + end + +EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC:: @ 815BCAC + call EverGrandeCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/EverGrandeCity_PokemonLeague/border.bin b/data/maps/EverGrandeCity_PokemonLeague/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc index 89c6973a5..89c6973a5 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index cf24b61dc..56bb00438 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 - .4byte EverGrandeCity_PokemonLeague_MapAttributes + .4byte EverGrandeCity_PokemonLeague_Layout .4byte EverGrandeCity_PokemonLeague_MapEvents .4byte EverGrandeCity_PokemonLeague_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 271 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.bin b/data/maps/EverGrandeCity_PokemonLeague/map.bin deleted file mode 100644 index d2acdf2dd..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - JK
"#RSI22Hs2*+2[Q$2 22222 2 2P}2)2t2u2!!!!Y<2@2@2@2@2@2@2@2X!!! 222222%2@2@20232@2@2@2g2222D2 2@2@2@2@2@2@2@2v2{2{2w2@2@2@2@2@2@2'22^222@2@2@202{222{232@2@2@2@2^2 -2f22@2@2@282|222|2;2@2@2@2&2f 2@2&2=>@2@2@2~2|2|22@2@2@2=>@2'2 2@242EF&2@2@2@2A2B2@2@2@2@2EF42'2 2@2@2@242@2@2@2@2@2@2@2@2@22&242@2'2(22@2@2@2@2@2@222@2@2@2@2@2@2@27
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc new file mode 100644 index 000000000..a48cf278e --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -0,0 +1,121 @@ +EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 + map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B + .byte 0 + +EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B + setrespawn 20 + setflag FLAG_SYS_POKEMON_LEAGUE_FLY + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B + end + +EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B + setobjectxyperm 3, 9, 2 + setobjectxyperm 4, 10, 2 + return + +EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A + setvar VAR_SPECIAL_B, 1 + call EverGrandeCity_PokemonLeague_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8 + lock + faceplayer + message EverGrandeCity_PokemonLeague_Text_1A0BE4 + waitmessage + pokemart EverGrandeCity_PokemonLeague_Items + msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4 + release + end + + .align 2 +EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_FULL_RESTORE + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 + lockall + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 + call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34 + compare VAR_TEMP_0, 8 + call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F + message EverGrandeCity_PokemonLeague_Text_1916FD + waitmessage + delay 75 + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A + closemessage + applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E + applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 + waitmovement 0 + delay 10 + playfanfare MUS_ME_BACHI + message EverGrandeCity_PokemonLeague_Text_191804 + waitmessage + waitfanfare + closemessage + moveobjectoffscreen 3 + moveobjectoffscreen 4 + setflag FLAG_ENTERED_ELITE_FOUR + releaseall + end + +EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34 + applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76 + waitmovement 0 + return + +EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F + applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A + waitmovement 0 + return + +EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A + playse SE_HAZURE + msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4 + releaseall + end + +EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 + applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 + waitmovement 0 + msgbox EverGrandeCity_PokemonLeague_Text_191804, 4 + closemessage + applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D + waitmovement 0 + releaseall + end + +EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76 + walk_down + walk_left + walk_in_place_fastest_up + end_movement + +EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A + walk_down + walk_right + walk_in_place_fastest_up + end_movement + +EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E + walk_left + walk_in_place_fastest_down + end_movement + +EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81 + walk_right + walk_in_place_fastest_down + end_movement diff --git a/data/maps/EverGrandeCity_PokemonLeague/text.inc b/data/maps/EverGrandeCity_PokemonLeague/text.inc new file mode 100644 index 000000000..89971022c --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague/text.inc @@ -0,0 +1,15 @@ +EverGrandeCity_PokemonLeague_Text_1916FD:: @ 81916FD + .string "Beyond this point, only those TRAINERS\n" + .string "who have collected all the GYM BADGES\l" + .string "are permitted to enter.\p" + .string "TRAINER, let us confirm that you have\n" + .string "all the GYM BADGES.$" + +EverGrandeCity_PokemonLeague_Text_19179C:: @ 819179C + .string "You haven’t obtained all the BADGES.\p" + .string "If you’re bound for the POKéMON\n" + .string "LEAGUE, you must return with them.$" + +EverGrandeCity_PokemonLeague_Text_191804:: @ 8191804 + .string "TRAINER! Believe in yourself and your\n" + .string "POKéMON, and go forth!$" diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/maps/EverGrandeCity_SidneysRoom/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/border.bin +++ /dev/null diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index 552981282..552981282 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 7c2ee11f8..41ea61fd8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,9 +1,9 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 - .4byte EverGrandeCity_SidneysRoom_MapAttributes + .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 112 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/maps/EverGrandeCity_SidneysRoom/map.bin deleted file mode 100644 index ebca00c5c..000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -
-
22222(2(2(222222>,2,222222,2,2 ,2,22222 2,2,2 %&,2,2 2!2"2#2$2,2,2'%?:,2,22)2*2+2 2,2,2'?-.,2,22122232 2,2,2/-=262,2,282;2;2;2<2,2,27252922222222222222222222222222,2,2,2HIHI424242HIHI
\ No newline at end of file diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc new file mode 100644 index 000000000..2b6cc0571 --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -0,0 +1,61 @@ +EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F + map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F + map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570 + map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F + .byte 0 + +EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F + call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564 + compare VAR_ELITE_4_STATE, 1 + call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A + end + +EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 + call EverGrandeCity_SidneysRoom_EventScript_1A0757 + return + +EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A + call EverGrandeCity_SidneysRoom_EventScript_1A07FA + return + +EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 +EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A + .2byte 0 + +EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A + turnobject 255, 2 + end + +EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 + .2byte 0 + +EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 + lockall + call EverGrandeCity_SidneysRoom_EventScript_1A0710 + setvar VAR_ELITE_4_STATE, 1 + releaseall + end + +EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 + lock + faceplayer + goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD + playbgm MUS_SITENNOU, FALSE + msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 + trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 + end + +EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD + msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 + release + end + +EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 + setflag FLAG_DEFEATED_ELITE_4_SYDNEY + call EverGrandeCity_SidneysRoom_EventScript_1A0693 + msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 + release + end diff --git a/data/maps/EverGrandeCity_SidneysRoom/text.inc b/data/maps/EverGrandeCity_SidneysRoom/text.inc new file mode 100644 index 000000000..84d1dddf5 --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/text.inc @@ -0,0 +1,20 @@ +EverGrandeCity_SidneysRoom_Text_190728:: @ 8190728 + .string "Welcome, challenger!\n" + .string "I’m SIDNEY of the ELITE FOUR.\p" + .string "I like that look you’re giving me.\n" + .string "I guess you’ll give me a good match.\l" + .string "That’s good! Looking real good!\p" + .string "All right! You and me, let’s enjoy a\n" + .string "battle that can only be staged here\l" + .string "in the POKéMON LEAGUE!$" + +EverGrandeCity_SidneysRoom_Text_190823:: @ 8190823 + .string "Well, how do you like that? I lost!\n" + .string "Eh, it was fun, so it doesn’t matter.$" + +EverGrandeCity_SidneysRoom_Text_19086D:: @ 819086D + .string "Well, listen to what this loser has\n" + .string "to say.\p" + .string "You’ve got what it takes to go far.\n" + .string "Now, go on to the next room and enjoy\l" + .string "your next battle!$" diff --git a/data/maps/FallarborTown/border.bin b/data/maps/FallarborTown/border.bin deleted file mode 100644 index 23e2a92e5..000000000 --- a/data/maps/FallarborTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -klst
\ No newline at end of file diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc index 37308b07c..37308b07c 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/FallarborTown/events.inc diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index bd719a36b..e6e0041b6 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,9 +1,9 @@ FallarborTown:: @ 83055B4 - .4byte FallarborTown_MapAttributes + .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 14 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin Binary files differdeleted file mode 100644 index 08f68b6ea..000000000 --- a/data/maps/FallarborTown/map.bin +++ /dev/null diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc new file mode 100644 index 000000000..a168a0ef5 --- /dev/null +++ b/data/maps/FallarborTown/scripts.inc @@ -0,0 +1,55 @@ +FallarborTown_MapScripts:: @ 814E7E0 + map_script 3, FallarborTown_MapScript1_14E7E6 + .byte 0 + +FallarborTown_MapScript1_14E7E6:: @ 814E7E6 + setflag FLAG_VISITED_FALLARBOR_TOWN + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + clearflag FLAG_CONTEST_SKETCH_CREATED + end + +FallarborTown_EventScript_14E7F5:: @ 814E7F5 + lock + faceplayer + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A + msgbox FallarborTown_Text_16C7FF, 4 + release + end + +FallarborTown_EventScript_14E80A:: @ 814E80A + msgbox FallarborTown_Text_16C855, 4 + release + end + +FallarborTown_EventScript_14E814:: @ 814E814 + msgbox FallarborTown_Text_16C8D6, 2 + end + +FallarborTown_EventScript_14E81D:: @ 814E81D + msgbox FallarborTown_Text_16C941, 2 + end + +FallarborTown_EventScript_14E826:: @ 814E826 + lock + faceplayer + waitse + playmoncry SPECIES_AZURILL, 0 + msgbox FallarborTown_Text_16C92C, 4 + waitmoncry + release + end + +FallarborTown_EventScript_14E839:: @ 814E839 + msgbox FallarborTown_Text_16CA39, 3 + end + +FallarborTown_EventScript_14E842:: @ 814E842 +MeteorFalls_1F_1R_EventScript_14E842:: @ 814E842 +MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842 + msgbox FallarborTown_Text_16CA83, 3 + end + +FallarborTown_EventScript_14E84B:: @ 814E84B + msgbox FallarborTown_Text_16CAB9, 3 + end diff --git a/data/maps/FallarborTown/text.inc b/data/maps/FallarborTown/text.inc new file mode 100644 index 000000000..1483272de --- /dev/null +++ b/data/maps/FallarborTown/text.inc @@ -0,0 +1,41 @@ +FallarborTown_Text_16C7FF:: @ 816C7FF + .string "What’s up, what’s up?\p" + .string "I saw a shady fellow scuttling in and\n" + .string "out of PROF. COZMO’s LAB.$" + +FallarborTown_Text_16C855:: @ 816C855 + .string "This region’s been known for meteors\n" + .string "since the olden days.\p" + .string "They say METEOR FALLS was gouged out\n" + .string "by a falling meteorite long ago.$" + +FallarborTown_Text_16C8D6:: @ 816C8D6 + .string "See! Take a look!\n" + .string "This is my precious AZURILL!\p" + .string "It’s slick and smooth and plushy, too!$" + +FallarborTown_Text_16C92C:: @ 816C92C + .string "AZURILL: Rooreelooo.$" + +FallarborTown_Text_16C941:: @ 816C941 + .string "Have you already challenged FLANNERY,\n" + .string "the LEADER of LAVARIDGE GYM?\p" + .string "The girl’s grandfather was famous.\n" + .string "He was one of the ELITE FOUR in the\l" + .string "POKéMON LEAGUE at one point.\p" + .string "It wouldn’t surprise me to see FLANNERY\n" + .string "become a great TRAINER in her own\l" + .string "right.$" + +FallarborTown_Text_16CA39:: @ 816CA39 + .string "POKéMON CONTESTS\n" + .string "SUPER RANK REGISTRATION\p" + .string "“Burst on to the POKéMON scene!”$" + +FallarborTown_Text_16CA83:: @ 816CA83 + .string "FALLARBOR TOWN\n" + .string "“A farm community with small gardens.”$" + +FallarborTown_Text_16CAB9:: @ 816CAB9 + .string "MOVE TUTOR’S HOUSE\n" + .string "“New moves taught to POKéMON.”$" diff --git a/data/maps/FallarborTown_ContestHall/border.bin b/data/maps/FallarborTown_ContestHall/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FallarborTown_ContestHall/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/events.inc index 9479c8db1..9479c8db1 100644 --- a/data/maps/events/FallarborTown_ContestHall.inc +++ b/data/maps/FallarborTown_ContestHall/events.inc diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index aa540e338..38f414c10 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -1,9 +1,9 @@ FallarborTown_ContestHall:: @ 8305CEC - .4byte FallarborTown_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte FallarborTown_ContestHall_MapEvents .4byte FallarborTown_ContestHall_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 73 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_ContestHall/map.bin b/data/maps/FallarborTown_ContestHall/map.bin deleted file mode 100644 index d65e7c489..000000000 --- a/data/maps/FallarborTown_ContestHall/map.bin +++ /dev/null @@ -1 +0,0 @@ -/////////////////////nnnbbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2
f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q22qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`2 6s2t2u26 f2`2*2(2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2
\ No newline at end of file diff --git a/data/maps/FallarborTown_ContestHall/scripts.inc b/data/maps/FallarborTown_ContestHall/scripts.inc new file mode 100644 index 000000000..e3fcfd9bc --- /dev/null +++ b/data/maps/FallarborTown_ContestHall/scripts.inc @@ -0,0 +1,18 @@ +FallarborTown_ContestHall_MapScripts:: @ 8153ACE + .byte 0 + +FallarborTown_ContestHall_EventScript_153ACF:: @ 8153ACF + msgbox FallarborTown_ContestHall_Text_177335, 2 + end + +FallarborTown_ContestHall_EventScript_153AD8:: @ 8153AD8 + msgbox FallarborTown_ContestHall_Text_1773C6, 2 + end + +FallarborTown_ContestHall_EventScript_153AE1:: @ 8153AE1 + msgbox FallarborTown_ContestHall_Text_177437, 2 + end + +FallarborTown_ContestHall_EventScript_153AEA:: @ 8153AEA + msgbox FallarborTown_ContestHall_Text_1774B1, 3 + end diff --git a/data/maps/FallarborTown_ContestHall/text.inc b/data/maps/FallarborTown_ContestHall/text.inc new file mode 100644 index 000000000..5db8766c5 --- /dev/null +++ b/data/maps/FallarborTown_ContestHall/text.inc @@ -0,0 +1,21 @@ +FallarborTown_ContestHall_Text_177335:: @ 8177335 + .string "We do all right in the preliminary round,\n" + .string "but we can never win the appeals...\p" + .string "Maybe it means I have to watch what\n" + .string "other contestants are doing...$" + +FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 + .string "See!\n" + .string "My POKéMON won all these RIBBONS!\p" + .string "Have your POKéMON earned any RIBBONS?\n" + .string "You can check them on your POKéNAV.$" + +FallarborTown_ContestHall_Text_177437:: @ 8177437 + .string "I can’t beat GYM LEADERS...\p" + .string "I can’t win any CONTESTS...\p" + .string "I’ve been here, there, and everywhere,\n" + .string "and it’s all for naught...$" + +FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 + .string "POKéMON CONTESTS\n" + .string "SUPER RANK STAGE!$" diff --git a/data/maps/FallarborTown_ContestLobby/border.bin b/data/maps/FallarborTown_ContestLobby/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FallarborTown_ContestLobby/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/events.inc index 47144a554..47144a554 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/FallarborTown_ContestLobby/events.inc diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index 2f25d3675..2b8d9a18b 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -1,9 +1,9 @@ FallarborTown_ContestLobby:: @ 8305CD0 - .4byte FallarborTown_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte FallarborTown_ContestLobby_MapEvents .4byte FallarborTown_ContestLobby_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 72 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_ContestLobby/map.bin b/data/maps/FallarborTown_ContestLobby/map.bin deleted file mode 100644 index 87407546a..000000000 --- a/data/maps/FallarborTown_ContestLobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -[\]NMcdebVbbbbTb 2!2!2222U2!2!2!2!2!2"2(2`2`2f2`2`2`2`292(2`2`22_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`292(2`2`2`2`2`2`2`2`2`2`2`2A2
\ No newline at end of file diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc new file mode 100644 index 000000000..5386fec4f --- /dev/null +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -0,0 +1,120 @@ +FallarborTown_ContestLobby_MapScripts:: @ 81539C1 + map_script 3, FallarborTown_ContestLobby_MapScript1_1539C7 + .byte 0 + +FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 + call FallarborTown_ContestLobby_EventScript_1AE188 + end + +FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD + setvar VAR_SPECIAL_B, 6 + setvar CONTEST_RANK, 1 + call FallarborTown_ContestLobby_EventScript_1A4E92 + call FallarborTown_ContestLobby_EventScript_1539F8 + special SetContestTrainerGfxIds + call FallarborTown_ContestLobby_EventScript_15FBDB + setvar VAR_CONTEST_LOCATION, 2 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 + waitstate + end + +FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 + lockall + applymovement 1, FallarborTown_ContestLobby_Movement_153A7C + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 + special DrawWholeMapView + applymovement 1, FallarborTown_ContestLobby_Movement_153A7F + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 1, FallarborTown_ContestLobby_Movement_153A8C + waitmovement 0 + applymovement 255, FallarborTown_ContestLobby_Movement_153A7A + waitmovement 0 + msgbox FallarborTown_ContestLobby_Text_1A6832, 4 + closemessage + applymovement 1, FallarborTown_ContestLobby_Movement_153A83 + applymovement 255, FallarborTown_ContestLobby_Movement_153A70 + waitmovement 0 + releaseall + return + +FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A + walk_in_place_fastest_left + end_movement + +FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C + walk_left + walk_in_place_fastest_down + end_movement + +FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F + walk_down + walk_down + walk_in_place_fastest_up + end_movement + +FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C + walk_in_place_fastest_right + end_movement + +FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E + msgbox FallarborTown_ContestLobby_Text_177141, 2 + end + +FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 + goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 + msgbox FallarborTown_ContestLobby_Text_177246, 2 + end + +FallarborTown_ContestLobby_EventScript_153AA9:: @ 8153AA9 + msgbox FallarborTown_ContestLobby_Text_1772D8, 2 + end + +FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 + msgbox FallarborTown_ContestLobby_Text_1771F2, 2 + end + +FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB + lockall + fadescreen 1 + drawcontestwinner 2 + releaseall + end + +FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 + lockall + special ShowBerryBlenderRecordWindow + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/FallarborTown_ContestLobby/text.inc b/data/maps/FallarborTown_ContestLobby/text.inc new file mode 100644 index 000000000..5d4305f8c --- /dev/null +++ b/data/maps/FallarborTown_ContestLobby/text.inc @@ -0,0 +1,23 @@ +FallarborTown_ContestLobby_Text_177141:: @ 8177141 + .string "They had a sketch of my POKéMON up\n" + .string "on the wall over there, but they\l" + .string "changed it with a new one already.\p" + .string "I’m going to enter my HANA in CONTESTS\n" + .string "so we can get her sketch up again!$" + +FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 + .string "Hi, are you making any {POKEBLOCK}S?\p" + .string "You should come by with a bunch of\n" + .string "BERRIES sometime.$" + +FallarborTown_ContestLobby_Text_177246:: @ 8177246 + .string "You see how they display a sketch of\n" + .string "a CONTEST winner here?\p" + .string "I sketch them!\p" + .string "If any of your POKéMON wins a CONTEST,\n" + .string "I’d gladly make a sketch of it!$" + +FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 + .string "Hello! Congratulations!\p" + .string "I’ve put up a sketch of your POKéMON\n" + .string "right here for everyone to see!$" diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc index fefaadc51..fefaadc51 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/FallarborTown_House1/events.inc diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 2761536b6..e6eacc77c 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,9 +1,9 @@ FallarborTown_House1:: @ 8305D40 - .4byte House1_MapAttributes + .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 59 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc new file mode 100644 index 000000000..f16b6e828 --- /dev/null +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -0,0 +1,72 @@ +FallarborTown_House1_MapScripts:: @ 8153BAE + map_script 3, FallarborTown_House1_MapScript1_153BB4 + .byte 0 + +FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 + end + +FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 + checkitem ITEM_METEORITE, 1 + compare RESULT, 1 + goto_if_eq FallarborTown_House1_EventScript_153BDA + msgbox FallarborTown_House1_Text_177755, 4 + release + end + +FallarborTown_House1_EventScript_153BDA:: @ 8153BDA + call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D + call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E + compare RESULT, NO + goto_if_eq FallarborTown_House1_EventScript_153C47 + msgbox FallarborTown_House1_Text_1778C4, 4 + giveitem_std ITEM_TM27_RETURN + compare RESULT, 0 + goto_if_eq FallarborTown_House1_EventScript_1A029B + setvar VAR_SPECIAL_4, 280 + call FallarborTown_House1_EventScript_1A067F + setflag FLAG_RECEIVED_TM27 + msgbox FallarborTown_House1_Text_177910, 4 + release + end + +FallarborTown_House1_EventScript_153C2D:: @ 8153C2D + msgbox FallarborTown_House1_Text_177755, 4 + msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO + return + +FallarborTown_House1_EventScript_153C3E:: @ 8153C3E + msgbox FallarborTown_House1_Text_1779B8, MSGBOX_YESNO + return + +FallarborTown_House1_EventScript_153C47:: @ 8153C47 + setflag FLAG_TEMP_2 + msgbox FallarborTown_House1_Text_17797D, 4 + release + end + +FallarborTown_House1_EventScript_153C54:: @ 8153C54 + msgbox FallarborTown_House1_Text_177910, 4 + release + end + +FallarborTown_House1_EventScript_153C5E:: @ 8153C5E + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C + msgbox FallarborTown_House1_Text_177A2B, 4 + release + end + +FallarborTown_House1_EventScript_153C7C:: @ 8153C7C + msgbox FallarborTown_House1_Text_177A7C, 4 + release + end + +FallarborTown_House1_EventScript_153C86:: @ 8153C86 + msgbox FallarborTown_House1_Text_177ABB, 4 + release + end diff --git a/data/maps/FallarborTown_House1/text.inc b/data/maps/FallarborTown_House1/text.inc new file mode 100644 index 000000000..c882bc9b7 --- /dev/null +++ b/data/maps/FallarborTown_House1/text.inc @@ -0,0 +1,51 @@ +FallarborTown_House1_Text_177755:: @ 8177755 + .string "PROF. COZMO: Oh...\n" + .string "I never should have let myself be\l" + .string "conned into telling TEAM {EVIL_TEAM} where\l" + .string "you can find METEORITES...\p" + .string "That METEORITE from METEOR FALLS...\n" + .string "It’s never going to be mine now...$" + +FallarborTown_House1_Text_17780E:: @ 817780E + .string "Oh!\n" + .string "Hah?\p" + .string "That item...\p" + .string "Could it be?\p" + .string "Is it the METEORITE that TEAM {EVIL_TEAM}\n" + .string "took from METEOR FALLS?\p" + .string "Please, may I have it?\p" + .string "I’m not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_House1_Text_1778C4:: @ 81778C4 + .string "PROF. COZMO: This TM, it represents\n" + .string "my feeling of gratitude.\l" + .string "Please use it!$" + +FallarborTown_House1_Text_177910:: @ 8177910 + .string "PROF. COZMO: Oh, I can’t believe it.\n" + .string "This is really, really great!\p" + .string "This is really going to help my research!$" + +FallarborTown_House1_Text_17797D:: @ 817797D + .string "PROF. COZMO: Oh, but...\n" + .string "I’m crushed with disappointment...$" + +FallarborTown_House1_Text_1779B8:: @ 81779B8 + .string "PROF. COZMO: Please, may I have that\n" + .string "METEORITE?\p" + .string "I’m not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_House1_Text_177A2B:: @ 8177A2B + .string "PROF. COZMO went off to METEOR FALLS\n" + .string "on ROUTE 114 with some people from\l" + .string "TEAM {EVIL_TEAM}.$" + +FallarborTown_House1_Text_177A7C:: @ 8177A7C + .string "Poor PROF. COZMO...\n" + .string "He’s so depressed... I feel sorry for him.$" + +FallarborTown_House1_Text_177ABB:: @ 8177ABB + .string "Look at PROF. COZMO...\n" + .string "He’s so happy! I think it’s cute.$" diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc index b873f95c8..b873f95c8 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/FallarborTown_House2/events.inc diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 0366c201a..246bc12db 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,9 +1,9 @@ FallarborTown_House2:: @ 8305D5C - .4byte House2_MapAttributes + .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 60 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc new file mode 100644 index 000000000..41ebd039c --- /dev/null +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -0,0 +1,62 @@ +FallarborTown_House2_MapScripts:: @ 8153C90 + .byte 0 + +FallarborTown_House2_EventScript_153C91:: @ 8153C91 + lockall + applymovement 1, FallarborTown_House2_Movement_1A0839 + waitmovement 0 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 + msgbox FallarborTown_House2_Text_177AF4, 4 + setflag FLAG_TEMP_1 + goto FallarborTown_House2_EventScript_153CB6 + end + +FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 + checkitem ITEM_HEART_SCALE, 1 + compare RESULT, 0 + goto_if_eq FallarborTown_House2_EventScript_153D60 + msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO + switch RESULT + case NO, FallarborTown_House2_EventScript_153D60 + goto FallarborTown_House2_EventScript_153CE4 + end + +FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 + msgbox FallarborTown_House2_Text_177C3F, 4 + special SelectMoveTutorMon + waitstate + compare VAR_SPECIAL_4, 255 + goto_if_eq FallarborTown_House2_EventScript_153D60 + special IsSelectedMonEgg + compare RESULT, 1 + goto_if_eq FallarborTown_House2_EventScript_153D52 + compare VAR_SPECIAL_5, 0 + goto_if_eq FallarborTown_House2_EventScript_153D44 + goto FallarborTown_House2_EventScript_153D1A + end + +FallarborTown_House2_EventScript_153D1A:: @ 8153D1A + msgbox FallarborTown_House2_Text_177C5D, 4 + special DisplayMoveTutorMenu + waitstate + compare VAR_SPECIAL_4, 0 + goto_if_eq FallarborTown_House2_EventScript_153CE4 + msgbox FallarborTown_House2_Text_177CC3, 4 + takeitem ITEM_HEART_SCALE, 1 + goto FallarborTown_House2_EventScript_153D60 + end + +FallarborTown_House2_EventScript_153D44:: @ 8153D44 + msgbox FallarborTown_House2_Text_177C78, 4 + goto FallarborTown_House2_EventScript_153CE4 + end + +FallarborTown_House2_EventScript_153D52:: @ 8153D52 + msgbox FallarborTown_House2_Text_177D33, 4 + goto FallarborTown_House2_EventScript_153CE4 + end + +FallarborTown_House2_EventScript_153D60:: @ 8153D60 + msgbox FallarborTown_House2_Text_177CEF, 4 + releaseall + end diff --git a/data/maps/FallarborTown_House2/text.inc b/data/maps/FallarborTown_House2/text.inc new file mode 100644 index 000000000..de6d63fad --- /dev/null +++ b/data/maps/FallarborTown_House2/text.inc @@ -0,0 +1,38 @@ +FallarborTown_House2_Text_177AF4:: @ 8177AF4 + .string "I’m the MOVE TUTOR.\p" + .string "I know all the moves that POKéMON\n" + .string "learn - every one of them - and I can\l" + .string "teach POKéMON those moves.\p" + .string "I can teach a move to a POKéMON\n" + .string "of yours if you’d like.\p" + .string "I’ll do it for a HEART SCALE.\n" + .string "I’m collecting those now.$" + +FallarborTown_House2_Text_177BDB:: @ 8177BDB + .string "Oh! That’s it! That’s an honest to\n" + .string "goodness HEART SCALE!\p" + .string "Let me guess, you want me to teach\n" + .string "a move?$" + +FallarborTown_House2_Text_177C3F:: @ 8177C3F + .string "Which POKéMON needs tutoring?$" + +FallarborTown_House2_Text_177C5D:: @ 8177C5D + .string "Which move should I teach?$" + +FallarborTown_House2_Text_177C78:: @ 8177C78 + .string "Sorry...\p" + .string "It doesn’t appear as if I have any move\n" + .string "I can teach that POKéMON.$" + +FallarborTown_House2_Text_177CC3:: @ 8177CC3 + .string "{PLAYER} handed over one HEART SCALE\n" + .string "in exchange.$" + +FallarborTown_House2_Text_177CEF:: @ 8177CEF + .string "If your POKéMON need to learn a move,\n" + .string "come back with a HEART SCALE.$" + +FallarborTown_House2_Text_177D33:: @ 8177D33 + .string "Hunh? There isn’t a single move that\n" + .string "I can teach an EGG.$" diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc index bf3195eea..bf3195eea 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/FallarborTown_Mart/events.inc diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index b60fa85c8..de16583f4 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,9 +1,9 @@ FallarborTown_Mart:: @ 8305CB4 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc new file mode 100644 index 000000000..cfd239e8a --- /dev/null +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -0,0 +1,48 @@ +FallarborTown_Mart_MapScripts:: @ 8153966 + .byte 0 + +FallarborTown_Mart_EventScript_153967:: @ 8153967 + lock + faceplayer + message FallarborTown_Mart_Text_1A0BE4 + waitmessage + pokemart FallarborTown_Mart_Items + msgbox FallarborTown_Mart_Text_1A0C02, 4 + release + end + + .align 2 +FallarborTown_Mart_Items:: @ 8153980 + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_DIRE_HIT + .2byte ITEM_GUARD_SPEC + .2byte ITEM_NONE + release + end + +FallarborTown_Mart_EventScript_15399C:: @ 815399C + msgbox FallarborTown_Mart_Text_176FF0, 2 + end + +FallarborTown_Mart_EventScript_1539A5:: @ 81539A5 + msgbox FallarborTown_Mart_Text_1770E2, 2 + end + +FallarborTown_Mart_EventScript_1539AE:: @ 81539AE + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox FallarborTown_Mart_Text_1770D3, 4 + waitmoncry + release + end diff --git a/data/maps/FallarborTown_Mart/text.inc b/data/maps/FallarborTown_Mart/text.inc new file mode 100644 index 000000000..bc8b3fb32 --- /dev/null +++ b/data/maps/FallarborTown_Mart/text.inc @@ -0,0 +1,16 @@ +FallarborTown_Mart_Text_176FF0:: @ 8176FF0 + .string "I’m having a hard time deciding if I\n" + .string "should make my SKITTY evolve or not.\p" + .string "I only have to use this MOON STONE,\n" + .string "but it’s so hard to decide...\p" + .string "If I make it evolve, it will become\n" + .string "much stronger.\p" + .string "But it will look so different, too.$" + +FallarborTown_Mart_Text_1770D3:: @ 81770D3 + .string "SKITTY: Miyao?$" + +FallarborTown_Mart_Text_1770E2:: @ 81770E2 + .string "This NUGGET I found here...\n" + .string "I suppose I’ll have to sell it, seeing\l" + .string "as how it has no other use.$" diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index 06f8068c6..06f8068c6 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 8ffb95e0c..e51dea9cc 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..6ae897ec8 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,81 @@ +FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 + map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_153AF9 + .byte 0 + +FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 + setrespawn 17 + call FallarborTown_PokemonCenter_1F_EventScript_19FD1B + end + +FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 + setvar VAR_SPECIAL_B, 1 + call FallarborTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10 + msgbox FallarborTown_PokemonCenter_1F_Text_17768C, 2 + end + +FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19 + msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, 2 + end + +FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 + lock + faceplayer + msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4 + closemessage + switch FACING + case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 + case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 + end + +FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74 + waitmovement 0 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 + end + +FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81 + waitmovement 0 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 + end + +FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 + playse SE_JIDO_DOA + removeobject 4 + clearflag FLAG_HIDE_LANETTE + release + end + +FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement + +FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement diff --git a/data/maps/FallarborTown_PokemonCenter_1F/text.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..a626ff1e9 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/text.inc @@ -0,0 +1,27 @@ +FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 + .string "Oh, hello.\n" + .string "You are?\p" + .string "Okay, your name’s {PLAYER}{KUN}.\n" + .string "I can see that you’re a TRAINER.\p" + .string "So that means you use the POKéMON\n" + .string "Storage System I developed.\p" + .string "How I arrived at that conclusion is\n" + .string "a simple deductive process.\p" + .string "You spoke to me because you wanted\n" + .string "to access something on this PC.\p" + .string "Oh, I’m sorry. I’m LANETTE.\p" + .string "Honestly, I’m glad to meet you - it’s\n" + .string "great you’re using the Storage System.\p" + .string "If you could, please visit me at home.\n" + .string "My house is on ROUTE 114.$" + +FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C + .string "I wonder what POKéMON looked like\n" + .string "long, long ago?\p" + .string "Maybe the FOSSIL MANIAC at the edge\n" + .string "of town will know.$" + +FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 + .string "In the fields of FALLARBOR, we plant\n" + .string "seedlings of hardy trees that thrive\l" + .string "even in volcanic ash.$" diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 381051d01..381051d01 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 45120890d..91613d680 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..148b22531 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +FallarborTown_PokemonCenter_2F_MapScripts:: @ 8153B8C + map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +FallarborTown_PokemonCenter_2F_EventScript_153B9C:: @ 8153B9C + call FallarborTown_PokemonCenter_2F_EventScript_1A3EA6 + end + +FallarborTown_PokemonCenter_2F_EventScript_153BA2:: @ 8153BA2 + call FallarborTown_PokemonCenter_2F_EventScript_1A40CC + end + +FallarborTown_PokemonCenter_2F_EventScript_153BA8:: @ 8153BA8 + call FallarborTown_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/FieryPath/border.bin b/data/maps/FieryPath/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/FieryPath/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq
\ No newline at end of file diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc index faf6d5011..faf6d5011 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/FieryPath/events.inc diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index ccca2e656..dcc4d55ea 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,9 +1,9 @@ FieryPath:: @ 8306EF8 - .4byte FieryPath_MapAttributes + .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 294 .byte 74 .byte 0 diff --git a/data/maps/FieryPath/map.bin b/data/maps/FieryPath/map.bin deleted file mode 100644 index 5928fb173..000000000 --- a/data/maps/FieryPath/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -qqqq{ttttttt|qqqq{ttttttttttt|qqqqqqqqqr{ttt|qpqqqqr{tttttttt|qpqqqqqqqq{z{333|pqqq{z33333333|pqqqqqqqqrq33333pqqqrq333333333pqqqqqqq{zq33333pqqqr{3333333 33pqqqqqq{zq3 - ~pqqqr3333 -
~~qqqqqqr{tt3h ~qqqr333 -pqqqqqqqqqqqqqrr3333pqqqqqqr333pqqqqqqqqqqqqqrr3 - 3pqqqqqqqr333pqqqqqqqqqqqqqrr33xttttt|qr333pqqqqqqqqqqqqqrr33ttttt|pqr333pqqqqqqqqqqqqqrr3333333333pqr333pqqqqqqqqqqqqqrr3 -
3 -~xtz333pqqqqqqqqqqqqqrr3qqq
3qqqq333pqqqqqqqqqqqqqrr3h jr33tttt333x|qqqqqqqqqqqqrr3pqrr33333333333pqqqqqqqqqqqqrr3pqqrr333 - 333qpqqqqqqqqqqqqrr3pqqr ~h j333|x|qqqqqqqqqqrr3pqq ~qr3333qxtttt|qqqqq{zr3xt|qqqqqqqqr3333tttt|pqqqqqr{3t|xt|qqqqqqr 33333333|pqqqqqrr33
73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr 333qpqqqqqqr 3333pqqqqq jr333qpqqqqqqiiiij3333pqqqqqqqqrr33 -~qpqqqqqqqqqqqr3333pqqqqqqqqrr3 -~qqpqqqqqqqqqqqr 333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z 333pxt|qqqqqqqqqqr333pqqqqqqqr{tz333xt|pqqqqqqqqqqr333pqqqqqqqrr
33333
ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqr ~pqqqqqqqqqqr333pqqqqqqqiiiiiiiii~qqqqqqqqqqr3 33pqqqqqqqqqqqqqqqqqqqqqqqqqqqq
~~qqqqq
\ No newline at end of file diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc new file mode 100644 index 000000000..f0bd22071 --- /dev/null +++ b/data/maps/FieryPath/scripts.inc @@ -0,0 +1,7 @@ +FieryPath_MapScripts:: @ 815D318 + map_script 3, FieryPath_MapScript1_15D31E + .byte 0 + +FieryPath_MapScript1_15D31E:: @ 815D31E + setflag FLAG_LANDMARK_FIERY_PATH + end diff --git a/data/maps/FortreeCity/border.bin b/data/maps/FortreeCity/border.bin Binary files differdeleted file mode 100644 index addb5d6ce..000000000 --- a/data/maps/FortreeCity/border.bin +++ /dev/null diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc index 485fd836f..485fd836f 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/FortreeCity/events.inc diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 4c96de2b2..eb04f8bcb 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,9 +1,9 @@ FortreeCity:: @ 83054B8 - .4byte FortreeCity_MapAttributes + .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 5 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity/map.bin b/data/maps/FortreeCity/map.bin deleted file mode 100644 index a2aa40e98..000000000 --- a/data/maps/FortreeCity/map.bin +++ /dev/null @@ -1 +0,0 @@ -$%&HIJ$%&*$%&$%&+,-./PQR+,-./**+,-./+,-./34567D\DHIJK3456734567**34567*3<B>B>B7PQRS3<B=B>B?BVBVB;B<B>B>B?BVBVBVB;B<B=B>B?BVBVB;B<B>B>B7XYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFG0`abcMHIJMHIJM00000X2Y2Y2SSa2PQRcddddea2PQRa2SSS00000000`2a2a2a2a2a2Aa2SAa2a2a2b2000000000h2a2a2a2a2sS`2U2sa2a2a2j200000000000h2a2a2a20`2]*Sa2a2j20000000(0)0)0+00`2a2K2$%&**0111`2a2a2a2a20$%&01230`2K2+,-./0X2Y2Y2Y2Y2a2K2*Sa2a2a2+,-./89:;0`234567K2K2K2K2K2K20h2i2i234567`ABCX2a23<B=B>B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBNNNNVB;B<B>B>B7000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6GX2Y2a2a2a2a2SSMHIJL2Y2a2a2S6S6S6MK2K2a2a2a2a2a2a2a2PQRHIJK2a2a2a2a2a2a2K2K2K2a2a2a2a2D\DPQRK2K2a2a2a2K2**K2K2K2K2*D\DK2K2K2
\ No newline at end of file diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc new file mode 100644 index 000000000..342e2fdc3 --- /dev/null +++ b/data/maps/FortreeCity/scripts.inc @@ -0,0 +1,90 @@ +FortreeCity_MapScripts:: @ 814C943 + map_script 3, FortreeCity_MapScript1_14C94E + map_script 5, FortreeCity_MapScript1_14C952 + .byte 0 + +FortreeCity_MapScript1_14C94E:: @ 814C94E + setflag FLAG_VISITED_FORTREE_CITY + end + +FortreeCity_MapScript1_14C952:: @ 814C952 + setstepcallback 2 + end + +FortreeCity_EventScript_14C955:: @ 814C955 + msgbox FortreeCity_Text_167577, 2 + end + +FortreeCity_EventScript_14C95E:: @ 814C95E + lock + faceplayer + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973 + msgbox FortreeCity_Text_1675C2, 4 + release + end + +FortreeCity_EventScript_14C973:: @ 814C973 + msgbox FortreeCity_Text_167642, 4 + release + end + +FortreeCity_EventScript_14C97D:: @ 814C97D + msgbox FortreeCity_Text_16768A, 2 + end + +FortreeCity_EventScript_14C986:: @ 814C986 + msgbox FortreeCity_Text_16770E, 2 + end + +FortreeCity_EventScript_14C98F:: @ 814C98F + msgbox FortreeCity_Text_1677BD, 2 + end + +FortreeCity_EventScript_14C998:: @ 814C998 + msgbox FortreeCity_Text_16782C, 2 + end + +FortreeCity_EventScript_14C9A1:: @ 814C9A1 + msgbox FortreeCity_Text_16792F, 3 + end + +FortreeCity_EventScript_14C9AA:: @ 814C9AA + msgbox FortreeCity_Text_167969, 3 + end + +FortreeCity_EventScript_14C9B3:: @ 814C9B3 + lock + faceplayer + checkitem ITEM_DEVON_SCOPE, 1 + compare RESULT, 1 + goto_if_eq FortreeCity_EventScript_14C9CF + msgbox FortreeCity_Text_167868, 4 + release + end + +FortreeCity_EventScript_14C9CF:: @ 814C9CF + msgbox FortreeCity_Text_16788B, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq FortreeCity_EventScript_14C9E4 + release + end + +FortreeCity_EventScript_14C9E4:: @ 814C9E4 + msgbox FortreeCity_Text_1678CB, 4 + closemessage + applymovement LAST_TALKED, FortreeCity_Movement_1A0662 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + applymovement LAST_TALKED, FortreeCity_Movement_14CA13 + waitmovement 0 + removeobject LAST_TALKED + setflag FLAG_KECLEON_FLED_FORTREE + release + end + +FortreeCity_Movement_14CA13:: @ 814CA13 + walk_right + end_movement diff --git a/data/maps/FortreeCity/text.inc b/data/maps/FortreeCity/text.inc new file mode 100644 index 000000000..8640fada7 --- /dev/null +++ b/data/maps/FortreeCity/text.inc @@ -0,0 +1,62 @@ +FortreeCity_Text_167577:: @ 8167577 + .string "Sniff...\n" + .string "Um... You, uh...smell singed.\p" + .string "Were you at a volcano or something?$" + +FortreeCity_Text_1675C2:: @ 81675C2 + .string "I want to go to the POKéMON GYM, but\n" + .string "something’s blocking the way.\p" + .string "After all the bother I went through\n" + .string "training on ROUTE 120...$" + +FortreeCity_Text_167642:: @ 8167642 + .string "I’ve got my pride-and-joy POKéMON\n" + .string "with me. This time, I’ll beat WINONA.$" + +FortreeCity_Text_16768A:: @ 816768A + .string "The ground absorbs rainwater, and\n" + .string "trees grow by drinking that water...\p" + .string "Our FORTREE CITY exists because\n" + .string "there’s both water and soil.$" + +FortreeCity_Text_16770E:: @ 816770E + .string "The CITY consists of homes built on\n" + .string "trees.\p" + .string "Perhaps because of that lifestyle,\n" + .string "everyone is healthy and lively.\p" + .string "Why, even myself - I feel as if I’ve\n" + .string "grown thirty years younger.$" + +FortreeCity_Text_1677BD:: @ 81677BD + .string "Living on top of trees is okay.\p" + .string "But sometimes BUG POKéMON come in\n" + .string "through windows.\l" + .string "It can be really startling.$" + +FortreeCity_Text_16782C:: @ 816782C + .string "Some POKéMON evolve when they go\n" + .string "through a Game Link cable.$" + +FortreeCity_Text_167868:: @ 8167868 + .string "Something unseeable is in the way.$" + +FortreeCity_Text_16788B:: @ 816788B + .string "Something unseeable is in the way.\p" + .string "Want to use the DEVON SCOPE?$" + +FortreeCity_Text_1678CB:: @ 81678CB + .string "{PLAYER} used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON fled!$" + +FortreeCity_Text_16792F:: @ 816792F + .string "FORTREE CITY\n" + .string "“The treetop city that frolics with\l" + .string "nature.”$" + +FortreeCity_Text_167969:: @ 8167969 + .string "FORTREE CITY POKéMON GYM\n" + .string "LEADER: WINONA\p" + .string "“The bird user taking flight into\n" + .string "the world.”$" diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/maps/FortreeCity_DecorationShop/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FortreeCity_DecorationShop/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc index 47e635fa8..47e635fa8 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 5334ca92c..78b54e060 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,9 +1,9 @@ FortreeCity_DecorationShop:: @ 8306504 - .4byte FortreeCity_DecorationShop_MapAttributes + .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 256 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/maps/FortreeCity_DecorationShop/map.bin deleted file mode 100644 index 6ca8b4e61..000000000 --- a/data/maps/FortreeCity_DecorationShop/map.bin +++ /dev/null @@ -1 +0,0 @@ -333333333333733337
\ No newline at end of file diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc new file mode 100644 index 000000000..56a360708 --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -0,0 +1,58 @@ +FortreeCity_DecorationShop_MapScripts:: @ 8158257 + .byte 0 + +FortreeCity_DecorationShop_EventScript_158258:: @ 8158258 + msgbox FortreeCity_DecorationShop_Text_186A61, 2 + end + +FortreeCity_DecorationShop_EventScript_158261:: @ 8158261 + msgbox FortreeCity_DecorationShop_Text_186AD6, 2 + end + +FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A + lock + faceplayer + message FortreeCity_DecorationShop_Text_1A0BE4 + waitmessage + pokemartdecoration FortreeCity_DecorationShop_Decorations1 + msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 + release + end + + .align 2 +FortreeCity_DecorationShop_Decorations1:: @ 8158284 + .2byte DECOR_SMALL_DESK + .2byte DECOR_POKEMON_DESK + .2byte DECOR_HEAVY_DESK + .2byte DECOR_RAGGED_DESK + .2byte DECOR_COMFORT_DESK + .2byte DECOR_BRICK_DESK + .2byte DECOR_CAMP_DESK + .2byte DECOR_HARD_DESK + .2byte DECOR_NONE + release + end + +FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 + lock + faceplayer + message FortreeCity_DecorationShop_Text_1A0BE4 + waitmessage + pokemartdecoration FortreeCity_DecorationShop_Decorations2 + msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 + release + end + + .align 2 +FortreeCity_DecorationShop_Decorations2:: @ 81582B0 + .2byte DECOR_SMALL_CHAIR + .2byte DECOR_POKEMON_CHAIR + .2byte DECOR_HEAVY_CHAIR + .2byte DECOR_RAGGED_CHAIR + .2byte DECOR_COMFORT_CHAIR + .2byte DECOR_BRICK_CHAIR + .2byte DECOR_CAMP_CHAIR + .2byte DECOR_HARD_CHAIR + .2byte DECOR_NONE + release + end diff --git a/data/maps/FortreeCity_DecorationShop/text.inc b/data/maps/FortreeCity_DecorationShop/text.inc new file mode 100644 index 000000000..7809f10ff --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/text.inc @@ -0,0 +1,12 @@ +FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 + .string "Merchandise you buy here is sent to\n" + .string "your own PC.\p" + .string "That’s fantastic! I wish they could\n" + .string "also deliver me home like that.$" + +FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 + .string "I’m buying a pretty desk and I’m\n" + .string "putting my cute DOLLS on it.\p" + .string "If I don’t, when I decorate my\n" + .string "SECRET BASE, my DOLLS will get\l" + .string "dirty or poked with splinters.$" diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/maps/FortreeCity_Gym/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/FortreeCity_Gym/border.bin +++ /dev/null diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc index 9ff31951b..9ff31951b 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/FortreeCity_Gym/events.inc diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 378a73b52..9ecaef8b4 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,9 +1,9 @@ FortreeCity_Gym:: @ 8306424 - .4byte FortreeCity_Gym_MapAttributes + .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 100 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/maps/FortreeCity_Gym/map.bin deleted file mode 100644 index a8ee94ae1..000000000 --- a/data/maps/FortreeCity_Gym/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - 22222202222 2 2 2 222232222222222"2"2"202223422222222222 32242$2 2 22222342222,2222)22"2"21222222222 (22 32322222 22)242
22#2"2$22222 222222 222222 2222222
( -22222222 222222 2 2 2 2 2323-22222 32422222 ()2"2"2$2
2 2222 222222222222.222'2222 2"2"2022222222 2 2/22/23 3222223 22222) )#2 2222) 222 22 %&
\ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc new file mode 100644 index 000000000..c0de6bfee --- /dev/null +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -0,0 +1,99 @@ +FortreeCity_Gym_MapScripts:: @ 8157ED3 + map_script 3, FortreeCity_Gym_MapScript1_157EDE + map_script 4, FortreeCity_Gym_MapScript2_157EE2 + .byte 0 + +FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE + special RotatingGate_InitPuzzle + end + +FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_157EEC + .2byte 0 + +FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC + special RotatingGate_InitPuzzleAndGraphics + end + +FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 + trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E + msgbox FortreeCity_Gym_Text_185F98, 4 + release + end + +FortreeCity_Gym_EventScript_157F15:: @ 8157F15 + message FortreeCity_Gym_Text_185E48 + waitmessage + call FortreeCity_Gym_EventScript_1A02C5 + msgbox FortreeCity_Gym_Text_185E73, 4 + setflag FLAG_DEFEATED_FORTREE_GYM + setflag FLAG_BADGE06_GET + setvar VAR_SPECIAL_8, 6 + call FortreeCity_Gym_EventScript_1A01C0 + goto FortreeCity_Gym_EventScript_157F3E + end + +FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E + giveitem_std ITEM_TM40_AERIAL_ACE + compare RESULT, 0 + goto_if_eq FortreeCity_Gym_EventScript_1A029B + msgbox FortreeCity_Gym_Text_185F4A, 4 + setflag FLAG_RECEIVED_TM40 + release + end + +FortreeCity_Gym_EventScript_157F62:: @ 8157F62 + trainerbattle 0, OPPONENT_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + msgbox FortreeCity_Gym_Text_185A02, 6 + end + +FortreeCity_Gym_EventScript_157F79:: @ 8157F79 + trainerbattle 0, OPPONENT_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + msgbox FortreeCity_Gym_Text_185B18, 6 + end + +FortreeCity_Gym_EventScript_157F90:: @ 8157F90 + trainerbattle 0, OPPONENT_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + msgbox FortreeCity_Gym_Text_185C00, 6 + end + +FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 + trainerbattle 0, OPPONENT_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + msgbox FortreeCity_Gym_Text_185C8C, 6 + end + +FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE + lock + faceplayer + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3 + msgbox FortreeCity_Gym_Text_18589C, 4 + release + end + +FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 + msgbox FortreeCity_Gym_Text_185994, 4 + release + end + +FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD + lockall + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD + goto FortreeCity_Gym_EventScript_158007 + end + +FortreeCity_Gym_EventScript_157FED:: @ 8157FED + lockall + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD + goto FortreeCity_Gym_EventScript_158007 + end + +FortreeCity_Gym_EventScript_157FFD:: @ 8157FFD + msgbox FortreeCity_Gym_Text_185FEE, 4 + releaseall + end + +FortreeCity_Gym_EventScript_158007:: @ 8158007 + msgbox FortreeCity_Gym_Text_185FD5, 4 + releaseall + end diff --git a/data/maps/FortreeCity_Gym/text.inc b/data/maps/FortreeCity_Gym/text.inc new file mode 100644 index 000000000..036cacd50 --- /dev/null +++ b/data/maps/FortreeCity_Gym/text.inc @@ -0,0 +1,116 @@ +FortreeCity_Gym_Text_18589C:: @ 818589C + .string "Yo, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "FORTREE GYM LEADER WINONA is a\n" + .string "master of FLYING-type POKéMON.\p" + .string "She’s waiting at the back of this GYM,\n" + .string "behind the rotating doors.\p" + .string "She’s waiting for new challengers who\n" + .string "are trying to take wing!\p" + .string "Okay, go for it!$" + +FortreeCity_Gym_Text_185994:: @ 8185994 + .string "You did it!\n" + .string "You’ve achieved liftoff!$" + +FortreeCity_Gym_Text_1859B9:: @ 81859B9 + .string "Behold the elegant battle style of\n" + .string "BIRD POKéMON!$" + +FortreeCity_Gym_Text_1859EA:: @ 81859EA + .string "You...\n" + .string "You’re strong...$" + +FortreeCity_Gym_Text_185A02:: @ 8185A02 + .string "A TRAINER has to be smart to keep\n" + .string "up with unexpected turns of events.\p" + .string "Let’s see if you have the smarts to\n" + .string "get to our LEADER?$" + +FortreeCity_Gym_Text_185A7F:: @ 8185A7F + .string "The lovers of BIRD POKéMON aspire\n" + .string "to join this GYM.\p" + .string "As a member of the FORTREE GYM,\n" + .string "I’m not allowed to lose!$" + +FortreeCity_Gym_Text_185AEC:: @ 8185AEC + .string "It was too much of a load for me\n" + .string "to bear...$" + +FortreeCity_Gym_Text_185B18:: @ 8185B18 + .string "The world is huge, and there are\n" + .string "countless tough TRAINERS.\p" + .string "I’m going to keep training and make\n" + .string "myself even stronger.$" + +FortreeCity_Gym_Text_185B8D:: @ 8185B8D + .string "There’s no need for WINONA, our GYM\n" + .string "LEADER, to deal with you!\p" + .string "I’m plenty good enough for you!$" + +FortreeCity_Gym_Text_185BEB:: @ 8185BEB + .string "WINONA, I...\n" + .string "I lost!$" + +FortreeCity_Gym_Text_185C00:: @ 8185C00 + .string "WINONA is cute and she’s strong.\n" + .string "She’s the ultimate LEADER!\p" + .string "Blush...$" + +FortreeCity_Gym_Text_185C45:: @ 8185C45 + .string "WINONA taught me personally!\n" + .string "You can’t beat me easily!$" + +FortreeCity_Gym_Text_185C7C:: @ 8185C7C + .string "I was beaten...$" + +FortreeCity_Gym_Text_185C8C:: @ 8185C8C + .string "Thanks to WINONA, the people of\n" + .string "FORTREE can live without fear.$" + +FortreeCity_Gym_Text_185CCB:: @ 8185CCB + .string "I am WINONA. I am the LEADER of the\n" + .string "FORTREE POKéMON GYM.\p" + .string "I have become one with BIRD POKéMON\n" + .string "and have soared the skies...\p" + .string "However grueling the battle, we have\n" + .string "triumphed with grace...\p" + .string "Witness the elegant choreography\n" + .string "of BIRD POKéMON and I!$" + +FortreeCity_Gym_Text_185DBA:: @ 8185DBA + .string "Never before have I seen a TRAINER\n" + .string "command POKéMON with more grace\l" + .string "than I...\p" + .string "In recognition of your prowess,\n" + .string "I present to you this GYM BADGE.$" + +FortreeCity_Gym_Text_185E48:: @ 8185E48 + .string "{PLAYER} received the FEATHER BADGE\n" + .string "from WINONA.$" + +FortreeCity_Gym_Text_185E73:: @ 8185E73 + .string "With the FEATHER BADGE, all POKéMON up\n" + .string "to LV 70, even those received through\l" + .string "trades, will obey your every command.\p" + .string "You will also be able to use the\n" + .string "HM move FLY outside of battle.\p" + .string "And this...\n" + .string "This is a gift from me.$" + +FortreeCity_Gym_Text_185F4A:: @ 8185F4A + .string "TM40 contains AERIAL ACE.\p" + .string "Its speed...\n" + .string "No POKéMON should be able to avoid it.$" + +FortreeCity_Gym_Text_185F98:: @ 8185F98 + .string "Though I fell to you, I will remain\n" + .string "devoted to BIRD POKéMON.$" + +FortreeCity_Gym_Text_185FD5:: @ 8185FD5 + .string "FORTREE CITY POKéMON GYM$" + +FortreeCity_Gym_Text_185FEE:: @ 8185FEE + .string "FORTREE CITY POKéMON GYM\p" + .string "WINONA’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/FortreeCity_House1/border.bin b/data/maps/FortreeCity_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FortreeCity_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc index 5e91f873e..5e91f873e 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/FortreeCity_House1/events.inc diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index ad8198c43..79d0466d7 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,9 +1,9 @@ FortreeCity_House1:: @ 8306408 - .4byte FortreeCity_House1_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House1/map.bin b/data/maps/FortreeCity_House1/map.bin deleted file mode 100644 index 5a3ac8cb6..000000000 --- a/data/maps/FortreeCity_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -33333333333333333333733337
\ No newline at end of file diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc new file mode 100644 index 000000000..443cc3a5c --- /dev/null +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -0,0 +1,64 @@ +FortreeCity_House1_MapScripts:: @ 8157E12 + .byte 0 + +FortreeCity_House1_EventScript_157E13:: @ 8157E13 + lock + faceplayer + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD + setvar VAR_SPECIAL_8, 1 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_SPECIAL_9, RESULT + msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq FortreeCity_House1_EventScript_157E95 + special SelectMonForNPCTrade + waitstate + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 + goto_if_eq FortreeCity_House1_EventScript_157E95 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + specialvar RESULT, GetTradeSpecies + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 + goto_if_ne FortreeCity_House1_EventScript_157E9F + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + special CreateInGameTradePokemon + special DoInGameTradeScene + waitstate + bufferspeciesname 0, VAR_SPECIAL_9 + msgbox FortreeCity_House1_Text_1856F7, 4 + setflag FLAG_FORTREE_NPC_TRADE_COMPLETED + release + end + +FortreeCity_House1_EventScript_157E95:: @ 8157E95 + msgbox FortreeCity_House1_Text_18577F, 4 + release + end + +FortreeCity_House1_EventScript_157E9F:: @ 8157E9F + bufferspeciesname 0, VAR_SPECIAL_9 + msgbox FortreeCity_House1_Text_185737, 4 + release + end + +FortreeCity_House1_EventScript_157EAD:: @ 8157EAD + msgbox FortreeCity_House1_Text_1857C7, 4 + release + end + +FortreeCity_House1_EventScript_157EB7:: @ 8157EB7 + msgbox FortreeCity_House1_Text_18582A, 2 + end + +FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox FortreeCity_House1_Text_185888, 4 + waitmoncry + release + end diff --git a/data/maps/FortreeCity_House1/text.inc b/data/maps/FortreeCity_House1/text.inc new file mode 100644 index 000000000..0d94fcd27 --- /dev/null +++ b/data/maps/FortreeCity_House1/text.inc @@ -0,0 +1,35 @@ +FortreeCity_House1_Text_18568C:: @ 818568C + .string "Hi, there’s this POKéMON that I’m\n" + .string "looking for.\p" + .string "I want a {STR_VAR_1}.\n" + .string "Do you have one?\p" + .string "Would you trade it for my {STR_VAR_2}?$" + +FortreeCity_House1_Text_1856F7:: @ 81856F7 + .string "Thank you!\p" + .string "I’ll be good to your {STR_VAR_1},\n" + .string "so please be nice to my {STR_VAR_2}!$" + +FortreeCity_House1_Text_185737:: @ 8185737 + .string "Wait!\n" + .string "That POKéMON isn’t a {STR_VAR_1}.\p" + .string "I guess you don’t want to trade\n" + .string "with me.$" + +FortreeCity_House1_Text_18577F:: @ 818577F + .string "Oh, okay. If you change your mind,\n" + .string "please come see me.\p" + .string "I’ll be waiting!$" + +FortreeCity_House1_Text_1857C7:: @ 81857C7 + .string "Thank you for trading with me!\p" + .string "I really wanted this POKéMON, so\n" + .string "I promise to take good care of it!$" + +FortreeCity_House1_Text_18582A:: @ 818582A + .string "Trading POKéMON with others...\p" + .string "It’s as if you’re trading your own\n" + .string "memories with other people.$" + +FortreeCity_House1_Text_185888:: @ 8185888 + .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/maps/FortreeCity_House2/border.bin b/data/maps/FortreeCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/FortreeCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc index 41d8962fe..41d8962fe 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/FortreeCity_House2/events.inc diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 3c803636b..44447c390 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,9 +1,9 @@ FortreeCity_House2:: @ 8306494 - .4byte FortreeCity_House2_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 101 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House2/map.bin b/data/maps/FortreeCity_House2/map.bin deleted file mode 100644 index 3fbcd6043..000000000 --- a/data/maps/FortreeCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ - 37733333333333333333733337
\ No newline at end of file diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc new file mode 100644 index 000000000..365646d81 --- /dev/null +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -0,0 +1,43 @@ +FortreeCity_House2_MapScripts:: @ 81580B3 + .byte 0 + +FortreeCity_House2_EventScript_1580B4:: @ 81580B4 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157 + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B + msgbox FortreeCity_House2_Text_186360, 4 + multichoice 21, 8, 54, 1 + switch RESULT + case 1, FortreeCity_House2_EventScript_158161 + msgbox FortreeCity_House2_Text_1863F6, 4 + multichoice 21, 8, 54, 1 + switch RESULT + case 1, FortreeCity_House2_EventScript_158161 + msgbox FortreeCity_House2_Text_186455, 4 + multichoice 21, 8, 54, 1 + switch RESULT + case 0, FortreeCity_House2_EventScript_158161 + msgbox FortreeCity_House2_Text_1864C6, 4 + giveitem_std ITEM_TM10_HIDDEN_POWER + compare RESULT, 0 + goto_if_eq FortreeCity_House2_EventScript_1A029B + setflag FLAG_RECEIVED_TM10 + msgbox FortreeCity_House2_Text_18652F, 4 + release + end + +FortreeCity_House2_EventScript_15814B:: @ 815814B + msgbox FortreeCity_House2_Text_186306, 4 + setflag FLAG_MET_HIDDEN_POWER_GIVER + return + +FortreeCity_House2_EventScript_158157:: @ 8158157 + msgbox FortreeCity_House2_Text_18652F, 4 + release + end + +FortreeCity_House2_EventScript_158161:: @ 8158161 + msgbox FortreeCity_House2_Text_186565, 4 + release + end diff --git a/data/maps/FortreeCity_House2/text.inc b/data/maps/FortreeCity_House2/text.inc new file mode 100644 index 000000000..8b78e1ae8 --- /dev/null +++ b/data/maps/FortreeCity_House2/text.inc @@ -0,0 +1,45 @@ +FortreeCity_House2_Text_186306:: @ 8186306 + .string "People... POKéMON...\p" + .string "Their hidden powers are aroused by\n" + .string "living in natural environments...$" + +FortreeCity_House2_Text_186360:: @ 8186360 + .string "Let this old woman see if your hidden\n" + .string "power has awoken...\p" + .string "I hold a coin in my hand.\p" + .string "Now, tell me, have I palmed it in the\n" + .string "right hand? Or in the left?$" + +FortreeCity_House2_Text_1863F6:: @ 81863F6 + .string "Oh! Yes, correct!\p" + .string "We shall try again.\p" + .string "In which hand have I palmed the coin?\n" + .string "The right or left?$" + +FortreeCity_House2_Text_186455:: @ 8186455 + .string "Oh! Yes, correct again!\p" + .string "We shall try once more.\p" + .string "In which hand have I palmed the coin?\n" + .string "The right or left? Choose!$" + +FortreeCity_House2_Text_1864C6:: @ 81864C6 + .string "Oh! Splendid!\n" + .string "Your hidden power has awoken!\p" + .string "Here, take this and awaken the hidden\n" + .string "power of your POKéMON.$" + +FortreeCity_House2_Text_18652F:: @ 818652F + .string "HIDDEN POWER is a move that changes\n" + .string "with the POKéMON.$" + +FortreeCity_House2_Text_186565:: @ 8186565 + .string "No, too bad.\n" + .string "You guessed wrong.$" + +UnknownString_8186585: @ 8186585 + .string "The area around FORTREE CITY is like\n" + .string "a jungle.\p" + .string "It gets awfully tiring walking around\n" + .string "this city.\p" + .string "That’s why I use FLY to instantly go to\n" + .string "any city I’ve visited.$" diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc index e02749d0e..e02749d0e 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/FortreeCity_House3/events.inc diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 40bf85478..aa77bbf4e 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,9 +1,9 @@ FortreeCity_House3:: @ 83064B0 - .4byte FortreeCity_House3_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc new file mode 100644 index 000000000..f5d11ffa7 --- /dev/null +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -0,0 +1,10 @@ +FortreeCity_House3_MapScripts:: @ 815816B + .byte 0 + +FortreeCity_House3_EventScript_15816C:: @ 815816C + msgbox FortreeCity_House3_Text_186624, 2 + end + +FortreeCity_House3_EventScript_158175:: @ 8158175 + msgbox FortreeCity_House3_Text_186745, 2 + end diff --git a/data/maps/FortreeCity_House3/text.inc b/data/maps/FortreeCity_House3/text.inc new file mode 100644 index 000000000..6b0b254f6 --- /dev/null +++ b/data/maps/FortreeCity_House3/text.inc @@ -0,0 +1,17 @@ +FortreeCity_House3_Text_186624:: @ 8186624 + .string "Speaking of POKéDEXES, I remembered\n" + .string "something.\p" + .string "I met this TRAINER, STEVEN, when\n" + .string "I was searching for rare stones.\p" + .string "Hoo, boy, he had some amazing POKéMON\n" + .string "with him.\p" + .string "They weren’t just rare, they were\n" + .string "trained to terrifying extremes!\p" + .string "He might even be stronger than the\n" + .string "GYM LEADER in this town...$" + +FortreeCity_House3_Text_186745:: @ 8186745 + .string "What’s that thing you have there?\p" + .string "... ... ... ... ... ...\p" + .string "Oh, it’s called a POKéDEX?\n" + .string "It’s really awesome!$" diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc index 58285c7f4..58285c7f4 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/FortreeCity_House4/events.inc diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index bed750ecb..dcd41d274 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,9 +1,9 @@ FortreeCity_House4:: @ 83064CC - .4byte FortreeCity_House4_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 101 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc new file mode 100644 index 000000000..77e43be34 --- /dev/null +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -0,0 +1,64 @@ +FortreeCity_House4_MapScripts:: @ 815817E + .byte 0 + +FortreeCity_House4_EventScript_15817F:: @ 815817F + msgbox FortreeCity_House4_Text_1867AF, 2 + end + +FortreeCity_House4_EventScript_158188:: @ 8158188 + lockall + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204 + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6 + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2 + msgbox FortreeCity_House4_Text_186835, 4 + closemessage + setflag FLAG_WINGULL_SENT_ON_ERRAND + clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE + applymovement 3, FortreeCity_House4_Movement_158218 + waitmovement 0 + removeobject 3 + releaseall + end + +FortreeCity_House4_EventScript_1581C2:: @ 81581C2 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 + msgbox FortreeCity_House4_Text_18684E, 4 + releaseall + end + +FortreeCity_House4_EventScript_1581D6:: @ 81581D6 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 + msgbox FortreeCity_House4_Text_186881, 4 + giveitem_std ITEM_MENTAL_HERB + compare RESULT, 0 + goto_if_eq FortreeCity_House4_EventScript_1A029B + setflag FLAG_RECEIVED_MENTAL_HERB + releaseall + end + +FortreeCity_House4_EventScript_158204:: @ 8158204 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 + msgbox FortreeCity_House4_Text_186924, 4 + releaseall + end + +FortreeCity_House4_Movement_158218:: @ 8158218 + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 + end_movement + +FortreeCity_House4_EventScript_15821E:: @ 815821E + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox FortreeCity_House4_Text_18695C, 4 + waitmoncry + release + end diff --git a/data/maps/FortreeCity_House4/text.inc b/data/maps/FortreeCity_House4/text.inc new file mode 100644 index 000000000..9389ec4aa --- /dev/null +++ b/data/maps/FortreeCity_House4/text.inc @@ -0,0 +1,30 @@ +FortreeCity_House4_Text_1867AF:: @ 81867AF + .string "By being together with POKéMON,\n" + .string "people make more and more friends.\p" + .string "And that brings the world closer\n" + .string "together. I think it’s wonderful!$" + +FortreeCity_House4_Text_186835:: @ 8186835 + .string "There!\n" + .string "Go, BIRD POKéMON!$" + +FortreeCity_House4_Text_18684E:: @ 818684E + .string "Heheh, I asked my WINGULL to run an\n" + .string "errand for me.$" + +FortreeCity_House4_Text_186881:: @ 8186881 + .string "Good!\n" + .string "Welcome back, WINGULL!\p" + .string "Huh? What is this?\n" + .string "What is it holding?\p" + .string "A MENTAL HERB?\n" + .string "It must have picked it up somewhere.\p" + .string "But I’m not a TRAINER, so you can\n" + .string "have it.$" + +FortreeCity_House4_Text_186924:: @ 8186924 + .string "Thanks to my WINGULL, I have friends\n" + .string "who live far away.$" + +FortreeCity_House4_Text_18695C:: @ 818695C + .string "WINGULL: Pihyoh!$" diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc index 93447f739..93447f739 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/FortreeCity_House5/events.inc diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index a8bb67d65..98faa0aee 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,9 +1,9 @@ FortreeCity_House5:: @ 83064E8 - .4byte FortreeCity_House5_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc new file mode 100644 index 000000000..888ebe0e2 --- /dev/null +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -0,0 +1,20 @@ +FortreeCity_House5_MapScripts:: @ 8158231 + .byte 0 + +FortreeCity_House5_EventScript_158232:: @ 8158232 + msgbox FortreeCity_House5_Text_18696D, 2 + end + +FortreeCity_House5_EventScript_15823B:: @ 815823B + msgbox FortreeCity_House5_Text_1869D6, 2 + end + +FortreeCity_House5_EventScript_158244:: @ 8158244 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox FortreeCity_House5_Text_186A4F, 4 + waitmoncry + release + end diff --git a/data/maps/FortreeCity_House5/text.inc b/data/maps/FortreeCity_House5/text.inc new file mode 100644 index 000000000..711b9579e --- /dev/null +++ b/data/maps/FortreeCity_House5/text.inc @@ -0,0 +1,13 @@ +FortreeCity_House5_Text_18696D:: @ 818696D + .string "The tree houses of FORTREE are great!\p" + .string "I think it’s the number one town for\n" + .string "living together with POKéMON.$" + +FortreeCity_House5_Text_1869D6:: @ 81869D6 + .string "POKéMON and people have adapted to\n" + .string "nature to survive.\p" + .string "There’s no need to make nature\n" + .string "conform to the way we want to live.$" + +FortreeCity_House5_Text_186A4F:: @ 8186A4F + .string "ZIGZAGOON: Bufuu!$" diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc index a9c48da93..a9c48da93 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/FortreeCity_Mart/events.inc diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 4b8793d36..a43cd9466 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,9 +1,9 @@ FortreeCity_Mart:: @ 8306478 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc new file mode 100644 index 000000000..076f702af --- /dev/null +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -0,0 +1,40 @@ +FortreeCity_Mart_MapScripts:: @ 8158066 + .byte 0 + +FortreeCity_Mart_EventScript_158067:: @ 8158067 + lock + faceplayer + message FortreeCity_Mart_Text_1A0BE4 + waitmessage + pokemart FortreeCity_Mart_Items + msgbox FortreeCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +FortreeCity_Mart_Items:: @ 8158080 + .2byte ITEM_GREAT_BALL + .2byte ITEM_ULTRA_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_REVIVE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_WOOD_MAIL + .2byte ITEM_NONE + release + end + +FortreeCity_Mart_EventScript_158098:: @ 8158098 + msgbox FortreeCity_Mart_Text_1861EF, 2 + end + +FortreeCity_Mart_EventScript_1580A1:: @ 81580A1 + msgbox FortreeCity_Mart_Text_186251, 2 + end + +FortreeCity_Mart_EventScript_1580AA:: @ 81580AA + msgbox FortreeCity_Mart_Text_1862CA, 2 + end diff --git a/data/maps/FortreeCity_Mart/text.inc b/data/maps/FortreeCity_Mart/text.inc new file mode 100644 index 000000000..c8c2c4f0f --- /dev/null +++ b/data/maps/FortreeCity_Mart/text.inc @@ -0,0 +1,15 @@ +FortreeCity_Mart_Text_1861EF:: @ 81861EF + .string "SUPER REPEL lasts a long time, and\n" + .string "it gets the job done.\p" + .string "It’s much better than an ordinary\n" + .string "REPEL.$" + +FortreeCity_Mart_Text_186251:: @ 8186251 + .string "I always stock up on more items than\n" + .string "I’m sure I’ll need.\p" + .string "You never know what might happen.\n" + .string "Better to be safe than sorry!$" + +FortreeCity_Mart_Text_1862CA:: @ 81862CA + .string "A RARE CANDY makes a POKéMON grow\n" + .string "immediately by one level.$" diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index dcf0e088a..dcf0e088a 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index fcafbe2af..97c8403b2 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..6d847d7cc --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,27 @@ +FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 + map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_158017 + .byte 0 + +FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 + setrespawn 7 + end + +FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B + setvar VAR_SPECIAL_B, 1 + call FortreeCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +FortreeCity_PokemonCenter_1F_EventScript_158029:: @ 8158029 + msgbox FortreeCity_PokemonCenter_1F_Text_186027, 2 + end + +FortreeCity_PokemonCenter_1F_EventScript_158032:: @ 8158032 + msgbox FortreeCity_PokemonCenter_1F_Text_186086, 2 + end + +FortreeCity_PokemonCenter_1F_EventScript_15803B:: @ 815803B + msgbox FortreeCity_PokemonCenter_1F_Text_186138, 2 + end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/text.inc b/data/maps/FortreeCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..d5ffb8a61 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/text.inc @@ -0,0 +1,22 @@ +FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 + .string "Listen, kid, are you working\n" + .string "on a POKéDEX?\p" + .string "Hmm... Go to the SAFARI ZONE.\n" + .string "That’s my suggestion.$" + +FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 + .string "Have you done anything at the\n" + .string "RECORD CORNER?\p" + .string "It’s pretty neat. It mixes and matches\n" + .string "the records of TRAINERS.\p" + .string "I don’t know quite how it works,\n" + .string "but it’s cool. It’s exciting, even!$" + +FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 + .string "Hey, you’ve got a POKéNAV!\n" + .string "It’s the same as mine.\p" + .string "Check out the TRAINER’S EYES on it.\p" + .string "It shows you TRAINERS who want a\n" + .string "rematch with you.\p" + .string "Isn’t it great?\n" + .string "You have to hand it to DEVON!$" diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 2e410c319..2e410c319 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 0421b7880..57e8510b8 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ FortreeCity_PokemonCenter_2F:: @ 830645C - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..3019dbbc0 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +FortreeCity_PokemonCenter_2F_MapScripts:: @ 8158044 + map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +FortreeCity_PokemonCenter_2F_EventScript_158054:: @ 8158054 + call FortreeCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +FortreeCity_PokemonCenter_2F_EventScript_15805A:: @ 815805A + call FortreeCity_PokemonCenter_2F_EventScript_1A40CC + end + +FortreeCity_PokemonCenter_2F_EventScript_158060:: @ 8158060 + call FortreeCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/GraniteCave_1F/border.bin b/data/maps/GraniteCave_1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc index 20ea8d4d5..20ea8d4d5 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/GraniteCave_1F/events.inc diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index cf22ded8a..b3682961a 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,9 +1,9 @@ GraniteCave_1F:: @ 8306E34 - .4byte GraniteCave_1F_MapAttributes + .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 133 .byte 55 .byte 0 diff --git a/data/maps/GraniteCave_1F/map.bin b/data/maps/GraniteCave_1F/map.bin deleted file mode 100644 index 58c7945ab..000000000 --- a/data/maps/GraniteCave_1F/map.bin +++ /dev/null @@ -1,5 +0,0 @@ - 22222222222222222222222?22''22222222222222222222222222222 22 "2222 222222222222222222222 2222222222222222222222222222 22222226222222 -222222222222222222222J6R6F622222 $# -22222222222<22222222;62;622222# -22222222# XYZ "222;62;62?22 "# -2222# "# "2;2;6222 # "2222# "# $'# XYZ$$# $# $
\ No newline at end of file diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc new file mode 100644 index 000000000..b9d89f93c --- /dev/null +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -0,0 +1,18 @@ +GraniteCave_1F_MapScripts:: @ 815CBA6 + .byte 0 + +GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 + lock + faceplayer + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 + msgbox GraniteCave_1F_Text_194917, 4 + giveitem_std ITEM_HM05_FLASH + setflag FLAG_RECEIVED_HM05 + msgbox GraniteCave_1F_Text_194A3E, 4 + release + end + +GraniteCave_1F_EventScript_15CBD3:: @ 815CBD3 + msgbox GraniteCave_1F_Text_194A3E, 4 + release + end diff --git a/data/maps/GraniteCave_1F/text.inc b/data/maps/GraniteCave_1F/text.inc new file mode 100644 index 000000000..3344f76d9 --- /dev/null +++ b/data/maps/GraniteCave_1F/text.inc @@ -0,0 +1,19 @@ +GraniteCave_1F_Text_194917:: @ 8194917 + .string "Hey, you.\n" + .string "It gets awfully dark ahead.\l" + .string "It’ll be tough trying to explore.\p" + .string "That guy who came by earlier...\n" + .string "STEVEN, I think it was.\p" + .string "He knew how to use FLASH, so he ought\n" + .string "to be all right, but...\p" + .string "Well, for us HIKERS, helping out those\n" + .string "that we meet is our motto.\p" + .string "Here you go, I’ll pass this on to you.$" + +GraniteCave_1F_Text_194A3E:: @ 8194A3E + .string "Teach that hidden move FLASH to a\n" + .string "POKéMON and use it.\p" + .string "It lights up even the inky darkness\n" + .string "of caves.\p" + .string "But, to use it, you need the GYM BADGE\n" + .string "from DEWFORD’s POKéMON GYM.$" diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/maps/GraniteCave_B1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc index 3d148a922..3d148a922 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/GraniteCave_B1F/events.inc diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 654803312..80af713ad 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,9 +1,9 @@ GraniteCave_B1F:: @ 8306E50 - .4byte GraniteCave_B1F_MapAttributes + .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 134 .byte 55 .byte 1 diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/maps/GraniteCave_B1F/map.bin deleted file mode 100644 index 27f98c6cf..000000000 --- a/data/maps/GraniteCave_B1F/map.bin +++ /dev/null @@ -1,10 +0,0 @@ - 2/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2!!!! -222/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2?2222!!!!!! -2?222/2/2/2/2/2/2/2/22222!!!!! -/2/2/2/2/2/222222222/2/2/222?222/2/2/2/2/2/2/222222222/2/2/222222 /2/2/2/2/2/2/222222#!#!! -222222#!#!#!#!!!!!!!#222222 0 2 0 222 222222222222222222222222222222222222222222222>2222?22222 -222 -22222222222222222222222 2222 #222222222222222# -222222222 22222222222222 22222 222222# -222222=22# -222 !!!!"2222?222222222# !!!"# ### ## # ## ## #
\ No newline at end of file diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc new file mode 100644 index 000000000..c6be3feca --- /dev/null +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -0,0 +1,10 @@ +GraniteCave_B1F_MapScripts:: @ 815CBDD + map_script 2, GraniteCave_B1F_MapScript2_1C6BB5 + map_script 3, GraniteCave_B1F_MapScript1_1C6BBF + map_script 5, GraniteCave_B1F_MapScript1_15CBED + .byte 0 + +GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED + setstepcallback 7 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 + end diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/maps/GraniteCave_B2F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc index e5c7b1768..e5c7b1768 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/GraniteCave_B2F/events.inc diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 4d243f3da..9b3dc1610 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,9 +1,9 @@ GraniteCave_B2F:: @ 8306E6C - .4byte GraniteCave_B2F_MapAttributes + .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 135 .byte 55 .byte 1 diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/maps/GraniteCave_B2F/map.bin deleted file mode 100644 index bbf8dc7af..000000000 --- a/data/maps/GraniteCave_B2F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - 2 2222222222222222222222 62222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2 "222222222222222222>22BR22222226222222222222222222222 $P622 $$ $ 6666666666666666666666666666666666666666 66666 S 66622 2 2b6 2 2"22S 622222222222222222222222222222222222222>2 222222222222222222222222222'2222222222222222222 222222222222222222222222222222222222222222222222222222222222222222222222222 -22222222222 2222222222222222222'222 $ 22=222222222222 "'222$ $$ $$ $$ $$ #
\ No newline at end of file diff --git a/data/maps/GraniteCave_B2F/scripts.inc b/data/maps/GraniteCave_B2F/scripts.inc new file mode 100644 index 000000000..54e1150f1 --- /dev/null +++ b/data/maps/GraniteCave_B2F/scripts.inc @@ -0,0 +1,2 @@ +GraniteCave_B2F_MapScripts:: @ 815CBF8 + .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/maps/GraniteCave_StevensRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/GraniteCave_StevensRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 9d8f4b2ba..9d8f4b2ba 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index fb9b18436..da9664943 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,9 +1,9 @@ GraniteCave_StevensRoom:: @ 8306E88 - .4byte GraniteCave_StevensRoom_MapAttributes + .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 289 .byte 55 .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/maps/GraniteCave_StevensRoom/map.bin deleted file mode 100644 index 3dc6987c2..000000000 --- a/data/maps/GraniteCave_StevensRoom/map.bin +++ /dev/null @@ -1,4 +0,0 @@ -
2 2222222 22222 2222222222222$! -22222$ -2222$ -$!!!!!$$!!!!!!!!$$!!!!!!!!!!$
\ No newline at end of file diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc new file mode 100644 index 000000000..013703e92 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -0,0 +1,62 @@ +GraniteCave_StevensRoom_MapScripts:: @ 815CBF9 + .byte 0 + +GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA + lock + faceplayer + msgbox GraniteCave_StevensRoom_Text_194AE5, 4 + setvar VAR_SPECIAL_4, ITEM_LETTER + call GraniteCave_StevensRoom_EventScript_1A067F + setflag FLAG_DELIVERED_STEVEN_LETTER + msgbox GraniteCave_StevensRoom_Text_194BDD, 4 + giveitem_std ITEM_TM47_STEEL_WING + compare RESULT, 0 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 + msgbox GraniteCave_StevensRoom_Text_194C8D, 4 + closemessage + compare FACING, 2 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D + compare FACING, 1 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC78 + compare FACING, 3 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D + compare FACING, 4 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D + playse SE_KAIDAN + removeobject 1 + release + end + +GraniteCave_StevensRoom_EventScript_15CC6D:: @ 815CC6D + applymovement 1, GraniteCave_StevensRoom_Movement_15CC8C + waitmovement 0 + return + +GraniteCave_StevensRoom_EventScript_15CC78:: @ 815CC78 + applymovement 1, GraniteCave_StevensRoom_Movement_15CC93 + waitmovement 0 + return + +GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83 + msgbox GraniteCave_StevensRoom_Text_194D43, 4 + return + +GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + end_movement + +GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 + end_movement diff --git a/data/maps/GraniteCave_StevensRoom/text.inc b/data/maps/GraniteCave_StevensRoom/text.inc new file mode 100644 index 000000000..873acea22 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/text.inc @@ -0,0 +1,33 @@ +GraniteCave_StevensRoom_Text_194AE5:: @ 8194AE5 + .string "That device you have there...\n" + .string "It’s a POKéNAV.\p" + .string "When TRAINERS that have POKéNAVS\n" + .string "battle, it keeps a record of how\l" + .string "things went, I think.\p" + .string "Oh, pardon me.\n" + .string "My name is STEVEN.\p" + .string "I’m interested in rare stones, so\n" + .string "I travel here and there.\p" + .string "Oh?\n" + .string "A LETTER for me?$" + +GraniteCave_StevensRoom_Text_194BDD:: @ 8194BDD + .string "STEVEN: Okay, thank you.\p" + .string "You went through all this trouble to\n" + .string "deliver that. I need to thank you.\p" + .string "Let me see...\n" + .string "I’ll give you this TM.\p" + .string "It contains my favorite move,\n" + .string "STEEL WING.$" + +GraniteCave_StevensRoom_Text_194C8D:: @ 8194C8D + .string "STEVEN: Your POKéMON appear quite\n" + .string "capable.\p" + .string "If you keep training, you could even\n" + .string "become the CHAMPION of the POKéMON\l" + .string "LEAGUE one day. That’s what I think.\p" + .string "Now, I’ve got to hurry along.$" + +GraniteCave_StevensRoom_Text_194D43:: @ 8194D43 + .string "Oh, your BAG is full...\n" + .string "That’s too bad, then.$" diff --git a/data/maps/House1/border.bin b/data/maps/House1/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/House1/border.bin +++ /dev/null diff --git a/data/maps/House1/map.bin b/data/maps/House1/map.bin deleted file mode 100644 index ea185484d..000000000 --- a/data/maps/House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -yz
222222$2$2$2$29252626262626272#2#292=H6I62>2>2?2#2#292=P6Q62>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6
\ No newline at end of file diff --git a/data/maps/House2/border.bin b/data/maps/House2/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/House2/border.bin +++ /dev/null diff --git a/data/maps/House2/map.bin b/data/maps/House2/map.bin deleted file mode 100644 index 0e9f07964..000000000 --- a/data/maps/House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -0x
hlm2282$2$2$2$2p2t2u2292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#22#2#2#2#2#2#2#2#2#2"2#2#2 #2#2#2#2#2*
\ No newline at end of file diff --git a/data/maps/InsideOfTruck/border.bin b/data/maps/InsideOfTruck/border.bin deleted file mode 100644 index 8459c2996..000000000 --- a/data/maps/InsideOfTruck/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc index 3aa3036de..3aa3036de 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/InsideOfTruck/events.inc diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index ee88d280d..b406937ca 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,5 +1,5 @@ InsideOfTruck:: @ 8307B38 - .4byte InsideOfTruck_MapAttributes + .4byte InsideOfTruck_Layout .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 diff --git a/data/maps/InsideOfTruck/map.bin b/data/maps/InsideOfTruck/map.bin deleted file mode 100644 index 84b946be5..000000000 --- a/data/maps/InsideOfTruck/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - -2 2 2222 2!"#$
\ No newline at end of file diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc new file mode 100644 index 000000000..37fa85041 --- /dev/null +++ b/data/maps/InsideOfTruck/scripts.inc @@ -0,0 +1,52 @@ +InsideOfTruck_MapScripts:: @ 815FBFF + map_script 1, InsideOfTruck_MapScript1_15FC0A + map_script 5, InsideOfTruck_MapScript1_15FC26 + .byte 0 + +InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A + setmetatile 4, 1, 520, 0 + setmetatile 4, 2, 528, 0 + setmetatile 4, 3, 536, 0 + end + +InsideOfTruck_MapScript1_15FC26:: @ 815FC26 + setstepcallback 5 + end + +InsideOfTruck_EventScript_15FC29:: @ 815FC29 + lockall + setflag FLAG_SPECIAL_FLAG_0 + checkplayergender + compare RESULT, 0 + goto_if_eq InsideOfTruck_EventScript_15FC45 + compare RESULT, 1 + goto_if_eq InsideOfTruck_EventScript_15FC68 + end + +InsideOfTruck_EventScript_15FC45:: @ 815FC45 + setrespawn 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 + setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_MAY + setflag FLAG_HIDE_BRENDAN_MOM + setflag FLAG_HIDE_BRENDAN_UPSTAIRS + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 + releaseall + end + +InsideOfTruck_EventScript_15FC68:: @ 815FC68 + setrespawn 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 + setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + setflag FLAG_HIDE_MAY_MOM + setflag FLAG_HIDE_MAY_UPSTAIRS + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 + releaseall + end + +InsideOfTruck_EventScript_15FC8B:: @ 815FC8B + msgbox InsideOfTruck_Text_198FAD, 3 + end diff --git a/data/maps/InsideOfTruck/text.inc b/data/maps/InsideOfTruck/text.inc new file mode 100644 index 000000000..19166c481 --- /dev/null +++ b/data/maps/InsideOfTruck/text.inc @@ -0,0 +1,4 @@ +InsideOfTruck_Text_198FAD:: @ 8198FAD + .string "The box is printed with a POKéMON logo.\p" + .string "It’s a POKéMON brand moving and\n" + .string "delivery service.$" diff --git a/data/maps/IslandCave/border.bin b/data/maps/IslandCave/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/IslandCave/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc index 8c279596d..8c279596d 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/IslandCave/events.inc diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index f811fe3da..70b8a62c6 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,9 +1,9 @@ IslandCave:: @ 83074C4 - .4byte IslandCave_MapAttributes + .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 281 .byte 81 .byte 0 diff --git a/data/maps/IslandCave/map.bin b/data/maps/IslandCave/map.bin Binary files differdeleted file mode 100644 index a7fa61b4d..000000000 --- a/data/maps/IslandCave/map.bin +++ /dev/null diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc new file mode 100644 index 000000000..d8576e883 --- /dev/null +++ b/data/maps/IslandCave/scripts.inc @@ -0,0 +1,87 @@ +IslandCave_MapScripts:: @ 815EEB6 + map_script 5, IslandCave_MapScript1_15EEC6 + map_script 1, IslandCave_MapScript1_15EED4 + map_script 3, IslandCave_MapScript1_15EF15 + .byte 0 + +IslandCave_MapScript1_15EEC6:: @ 815EEC6 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0 + end + +IslandCave_EventScript_15EED0:: @ 815EED0 + removeobject LAST_TALKED + return + +IslandCave_MapScript1_15EED4:: @ 815EED4 + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE + end + +IslandCave_EventScript_15EEDE:: @ 815EEDE + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 + return + +IslandCave_MapScript1_15EF15:: @ 815EF15 + setflag FLAG_LANDMARK_ISLAND_CAVE + end + +S_OpenRegiceChamber:: @ 815EF19 + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 + special DrawWholeMapView + playse SE_BAN + setflag FLAG_SYS_BRAILLE_WAIT + end + +IslandCave_EventScript_15EF59:: @ 815EF59 + lockall + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72 + braillemessage IslandCave_Braille_1C54FC + special DoBrailleWait + waitstate + goto IslandCave_EventScript_15EF95 + end + +IslandCave_EventScript_15EF72:: @ 815EF72 + msgbox IslandCave_Text_1A13BE, 4 + releaseall + end + +IslandCave_EventScript_15EF7C:: @ 815EF7C + lockall + braillemessage IslandCave_Braille_1C54FC + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95 + special DoBrailleWait + waitstate + goto IslandCave_EventScript_15EF95 + end + +IslandCave_EventScript_15EF95:: @ 815EF95 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +IslandCave_EventScript_15EF9D:: @ 815EF9D + lock + faceplayer + waitse + playmoncry SPECIES_REGICE, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_REGICE, 40, ITEM_NONE + setflag FLAG_HIDE_REGICE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartRegiBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end diff --git a/data/maps/JaggedPass/border.bin b/data/maps/JaggedPass/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/JaggedPass/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq
\ No newline at end of file diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc index 4b656e76e..4b656e76e 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/JaggedPass/events.inc diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 6770756e8..cb9b61bb3 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,9 +1,9 @@ JaggedPass:: @ 8306EDC - .4byte JaggedPass_MapAttributes + .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 293 .byte 76 .byte 0 diff --git a/data/maps/JaggedPass/map.bin b/data/maps/JaggedPass/map.bin Binary files differdeleted file mode 100644 index a87a5332e..000000000 --- a/data/maps/JaggedPass/map.bin +++ /dev/null diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc new file mode 100644 index 000000000..d75420e88 --- /dev/null +++ b/data/maps/JaggedPass/scripts.inc @@ -0,0 +1,49 @@ +JaggedPass_MapScripts:: @ 815D266 + map_script 5, JaggedPass_MapScript1_15D271 + map_script 3, JaggedPass_MapScript1_15D274 + .byte 0 + +JaggedPass_MapScript1_15D271:: @ 815D271 + setstepcallback 1 + end + +JaggedPass_MapScript1_15D274:: @ 815D274 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 + call_if_eq JaggedPass_EventScript_15D280 + end + +JaggedPass_EventScript_15D280:: @ 815D280 + setweather WEATHER_ASH + doweather + return + +JaggedPass_EventScript_15D285:: @ 815D285 + trainerbattle 0, OPPONENT_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + msgbox JaggedPass_Text_195E3E, 6 + end + +JaggedPass_EventScript_15D29C:: @ 815D29C + trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq JaggedPass_EventScript_15D2C3 + msgbox JaggedPass_Text_195F04, 6 + end + +JaggedPass_EventScript_15D2C3:: @ 815D2C3 + trainerbattle 5, OPPONENT_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + msgbox JaggedPass_Text_195FB9, 6 + end + +JaggedPass_EventScript_15D2DA:: @ 815D2DA + trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq JaggedPass_EventScript_15D301 + msgbox JaggedPass_Text_196077, 6 + end + +JaggedPass_EventScript_15D301:: @ 815D301 + trainerbattle 5, OPPONENT_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + msgbox JaggedPass_Text_196118, 6 + end diff --git a/data/maps/JaggedPass/text.inc b/data/maps/JaggedPass/text.inc new file mode 100644 index 000000000..23216b12b --- /dev/null +++ b/data/maps/JaggedPass/text.inc @@ -0,0 +1,63 @@ +JaggedPass_Text_195DAC:: @ 8195DAC + .string "MT. CHIMNEY’s JAGGED PASS...\p" + .string "Now this is what I’ve always wanted\n" + .string "in a mountain.\p" + .string "This jagged bumpiness...\n" + .string "It rocks my soul!$" + +JaggedPass_Text_195E27:: @ 8195E27 + .string "Losing left me bitter!$" + +JaggedPass_Text_195E3E:: @ 8195E3E + .string "Yes, I did lose at POKéMON...\p" + .string "But, when it comes to the love of\n" + .string "the mountains, I have you beat!$" + +JaggedPass_Text_195E9E:: @ 8195E9E + .string "This place isn’t your casual hike.\n" + .string "It’s not suited for a picnic.$" + +JaggedPass_Text_195EDF:: @ 8195EDF + .string "Ohhh, no!\n" + .string "The ground is too bumpy...$" + +JaggedPass_Text_195F04:: @ 8195F04 + .string "Did you know?\p" + .string "Some people cleverly ride their\n" + .string "bicycles up this horribly bumpy pass.$" + +JaggedPass_Text_195F58:: @ 8195F58 + .string "Picnics are fun wherever you go.\n" + .string "Just like POKéMON!$" + +JaggedPass_Text_195F8C:: @ 8195F8C + .string "I only lost because the ground is\n" + .string "too bumpy!$" + +JaggedPass_Text_195FB9:: @ 8195FB9 + .string "I’ll forget about losing and just\n" + .string "enjoy this bumpy hike.$" + +JaggedPass_Text_195FF2:: @ 8195FF2 + .string "JAGGED PASS is hard to walk on.\n" + .string "It’s a good place for training.$" + +JaggedPass_Text_196032:: @ 8196032 + .string "It was all over while we were still\n" + .string "trying to find a good footing...$" + +JaggedPass_Text_196077:: @ 8196077 + .string "If I had an ACRO BIKE, I’d be able to\n" + .string "jump ledges.$" + +JaggedPass_Text_1960AA:: @ 81960AA + .string "I got used to this bumpiness.\n" + .string "I sing while I climb now.$" + +JaggedPass_Text_1960E2:: @ 81960E2 + .string "It’s still not easy to battle on this\n" + .string "bumpy ground...$" + +JaggedPass_Text_196118:: @ 8196118 + .string "I should get an ACRO BIKE from RYDEL\n" + .string "in MAUVILLE CITY...$" diff --git a/data/maps/LavaridgeTown/border.bin b/data/maps/LavaridgeTown/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/LavaridgeTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq
\ No newline at end of file diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc index 895c792f4..895c792f4 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/LavaridgeTown/events.inc diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index e34eec863..8e8eaaee6 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,9 +1,9 @@ LavaridgeTown:: @ 8305598 - .4byte LavaridgeTown_MapAttributes + .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 13 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown/map.bin b/data/maps/LavaridgeTown/map.bin deleted file mode 100644 index 604ad5f3f..000000000 --- a/data/maps/LavaridgeTown/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -qqqq{ttttt|qqqqqqq66{tttzq22222xttttttttr{2t2|qqqNKLOq6rr2222JHIMyy0123rr2 3 32PQRS 2 289:;44rr2222XYZ[55`ABC44rr`abc550 1"1044rr2222220 1"10000 1"1000rr2222220 1"1000 1"1000rrBB00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rr111111000000000000rr0000 0 0 -00 0 0 -00rr0000rr000 4rr11000 !" !"4rr000000000000400004m00000000000000044qqrm0000000000000044qqllllllllllllllll
\ No newline at end of file diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc new file mode 100644 index 000000000..c2bf9bb68 --- /dev/null +++ b/data/maps/LavaridgeTown/scripts.inc @@ -0,0 +1,320 @@ +LavaridgeTown_MapScripts:: @ 814E4A3 + map_script 3, LavaridgeTown_MapScript1_14E4AE + map_script 2, LavaridgeTown_MapScript2_14E4E3 + .byte 0 + +LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE + setflag FLAG_VISITED_LAVARIDGE_TOWN + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF + call LavaridgeTown_EventScript_1A014E + call LavaridgeTown_EventScript_1A0172 + compare VAR_LAVARIDGE_RIVAL_STATE, 2 + call_if_eq LavaridgeTown_EventScript_14E4D0 + end + +LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 + setobjectxyperm 8, 11, 9 + setobjectxyperm 7, 11, 9 + return + +LavaridgeTown_EventScript_14E4DF:: @ 814E4DF + clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE + return + +LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED + .2byte 0 + +LavaridgeTown_EventScript_14E4ED:: @ 814E4ED + lockall + setvar VAR_SPECIAL_8, 1 + opendoor 12, 15 + waitdooranim + addobject 8 + applymovement 8, LavaridgeTown_Movement_14E70E + waitmovement 0 + closedoor 12, 15 + waitdooranim + applymovement 8, LavaridgeTown_Movement_1A083F + waitmovement 0 + applymovement 255, LavaridgeTown_Movement_1A0843 + applymovement 8, LavaridgeTown_Movement_1A0833 + waitmovement 0 + applymovement 8, LavaridgeTown_Movement_1A0835 + waitmovement 0 + checkplayergender + compare RESULT, 0 + call_if_eq LavaridgeTown_EventScript_14E56B + compare RESULT, 1 + call_if_eq LavaridgeTown_EventScript_14E570 + compare VAR_SPECIAL_8, 1 + call_if_eq LavaridgeTown_EventScript_14E68F + checkplayergender + compare RESULT, 0 + goto_if_eq LavaridgeTown_EventScript_14E5AB + compare RESULT, 1 + goto_if_eq LavaridgeTown_EventScript_14E5D0 + end + +LavaridgeTown_EventScript_14E56B:: @ 814E56B + playbgm MUS_GIRL_SUP, TRUE + return + +LavaridgeTown_EventScript_14E570:: @ 814E570 + playbgm MUS_BOY_SUP, TRUE + return + +LavaridgeTown_EventScript_14E575:: @ 814E575 + lock + faceplayer + setvar VAR_SPECIAL_8, 0 + checkplayergender + compare RESULT, 0 + call_if_eq LavaridgeTown_EventScript_14E56B + compare RESULT, 1 + call_if_eq LavaridgeTown_EventScript_14E570 + checkplayergender + compare RESULT, 0 + goto_if_eq LavaridgeTown_EventScript_14E5AB + compare RESULT, 1 + goto_if_eq LavaridgeTown_EventScript_14E5D0 + end + +LavaridgeTown_EventScript_14E5AB:: @ 814E5AB + msgbox LavaridgeTown_Text_16BDA4, 4 + giveitem_std ITEM_GO_GOGGLES + setflag FLAG_RECEIVED_GO_GOGGLES + msgbox LavaridgeTown_Text_16BE7D, 4 + goto LavaridgeTown_EventScript_14E5F5 + end + +LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 + msgbox LavaridgeTown_Text_16BF92, 4 + giveitem_std ITEM_GO_GOGGLES + setflag FLAG_RECEIVED_GO_GOGGLES + msgbox LavaridgeTown_Text_16C020, 4 + goto LavaridgeTown_EventScript_14E5F5 + end + +LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 + closemessage + compare VAR_SPECIAL_8, 1 + call_if_eq LavaridgeTown_EventScript_14E646 + compare VAR_SPECIAL_8, 0 + call_if_eq LavaridgeTown_EventScript_14E64E + removeobject 8 + addobject 7 + delay 30 + compare VAR_SPECIAL_8, 1 + call_if_eq LavaridgeTown_EventScript_14E69A + compare VAR_SPECIAL_8, 0 + call_if_eq LavaridgeTown_EventScript_14E6A5 + removeobject 7 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 + savebgm 0 + fadedefaultbgm + compare VAR_SPECIAL_8, 0 + goto_if_eq LavaridgeTown_EventScript_14E644 + releaseall + end + +LavaridgeTown_EventScript_14E644:: @ 814E644 + release + end + +LavaridgeTown_EventScript_14E646:: @ 814E646 + setobjectxyperm 7, 6, 16 + return + +LavaridgeTown_EventScript_14E64E:: @ 814E64E + compare FACING, 2 + call_if_eq LavaridgeTown_EventScript_14E67B + compare FACING, 1 + call_if_eq LavaridgeTown_EventScript_14E680 + compare FACING, 3 + call_if_eq LavaridgeTown_EventScript_14E685 + compare FACING, 4 + call_if_eq LavaridgeTown_EventScript_14E68A + return + +LavaridgeTown_EventScript_14E67B:: @ 814E67B + setobjectmovementtype 7, 8 + return + +LavaridgeTown_EventScript_14E680:: @ 814E680 + setobjectmovementtype 7, 7 + return + +LavaridgeTown_EventScript_14E685:: @ 814E685 + setobjectmovementtype 7, 10 + return + +LavaridgeTown_EventScript_14E68A:: @ 814E68A + setobjectmovementtype 7, 9 + return + +LavaridgeTown_EventScript_14E68F:: @ 814E68F + applymovement 8, LavaridgeTown_Movement_14E6E8 + waitmovement 0 + return + +LavaridgeTown_EventScript_14E69A:: @ 814E69A + applymovement 7, LavaridgeTown_Movement_14E6EF + waitmovement 0 + return + +LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 + compare FACING, 2 + call_if_eq LavaridgeTown_EventScript_14E6D2 + compare FACING, 1 + call_if_eq LavaridgeTown_EventScript_14E6D2 + compare FACING, 3 + call_if_eq LavaridgeTown_EventScript_14E6DD + compare FACING, 4 + call_if_eq LavaridgeTown_EventScript_14E6D2 + return + +LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 + applymovement 7, LavaridgeTown_Movement_14E6FA + waitmovement 0 + return + +LavaridgeTown_EventScript_14E6DD:: @ 814E6DD + applymovement 7, LavaridgeTown_Movement_14E703 + waitmovement 0 + return + +LavaridgeTown_Movement_14E6E8:: @ 814E6E8 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +LavaridgeTown_Movement_14E6EF:: @ 814E6EF + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +LavaridgeTown_Movement_14E6FA:: @ 814E6FA + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +LavaridgeTown_Movement_14E703:: @ 814E703 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +LavaridgeTown_Movement_14E70E:: @ 814E70E + walk_down + end_movement + +LavaridgeTown_EventScript_14E710:: @ 814E710 + specialvar RESULT, GetPlayerFacingDirection + compare RESULT, 1 + goto_if_eq LavaridgeTown_EventScript_14E721 + end + +LavaridgeTown_EventScript_14E721:: @ 814E721 + incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS + end + +LavaridgeTown_EventScript_14E724:: @ 814E724 + msgbox LavaridgeTown_Text_16C3FD, 2 + end + +LavaridgeTown_EventScript_14E72D:: @ 814E72D + msgbox LavaridgeTown_Text_16C4DB, 3 + end + +LavaridgeTown_EventScript_14E736:: @ 814E736 + msgbox LavaridgeTown_Text_16C59B, 2 + end + +LavaridgeTown_EventScript_14E73F:: @ 814E73F + msgbox LavaridgeTown_Text_16C603, 2 + end + +LavaridgeTown_EventScript_14E748:: @ 814E748 + msgbox LavaridgeTown_Text_16C694, 2 + end + +LavaridgeTown_EventScript_14E751:: @ 814E751 + msgbox LavaridgeTown_Text_16C54E, 2 + end + +LavaridgeTown_EventScript_14E75A:: @ 814E75A + lock + faceplayer + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E + msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LavaridgeTown_EventScript_14E7B2 + getpartysize + compare RESULT, 6 + goto_if_eq LavaridgeTown_EventScript_14E7A8 + msgbox LavaridgeTown_Text_16C2B6, 4 + setflag FLAG_RECEIVED_LAVARIDGE_EGG + playfanfare MUS_FANFA4 + message LavaridgeTown_Text_16C2EA + waitfanfare + waitmessage + giveegg SPECIES_WYNAUT + release + end + +LavaridgeTown_EventScript_14E79E:: @ 814E79E + msgbox LavaridgeTown_Text_16C398, 4 + release + end + +LavaridgeTown_EventScript_14E7A8:: @ 814E7A8 + msgbox LavaridgeTown_Text_16C2FF, 4 + release + end + +LavaridgeTown_EventScript_14E7B2:: @ 814E7B2 + msgbox LavaridgeTown_Text_16C33C, 4 + release + end + +LavaridgeTown_EventScript_14E7BC:: @ 814E7BC + msgbox LavaridgeTown_Text_16C72F, 3 + end + +LavaridgeTown_EventScript_14E7C5:: @ 814E7C5 + msgbox LavaridgeTown_Text_16C77C, 3 + end + +@ 814E7CE + msgbox LavaridgeTown_Text_16C7CF, 3 + end + +LavaridgeTown_EventScript_14E7D7:: @ 814E7D7 + msgbox LavaridgeTown_Text_16C7CF, 3 + end diff --git a/data/maps/LavaridgeTown/text.inc b/data/maps/LavaridgeTown/text.inc new file mode 100644 index 000000000..308548510 --- /dev/null +++ b/data/maps/LavaridgeTown/text.inc @@ -0,0 +1,129 @@ +LavaridgeTown_Text_16BDA4:: @ 816BDA4 + .string "MAY: {PLAYER}{KUN}! Long time no see!\p" + .string "Oh? While I was visiting the hot springs,\n" + .string "you got the LAVARIDGE GYM BADGE.\p" + .string "You must have caught good POKéMON...\n" + .string "No, I guess you raised some.\p" + .string "I guess it would be okay for you to\n" + .string "have this.$" + +LavaridgeTown_Text_16BE7D:: @ 816BE7D + .string "MAY: With those GO-GOGGLES, you’ll\n" + .string "have no trouble getting through the\l" + .string "desert near ROUTE 111.\p" + .string "But, wow, {PLAYER}{KUN}...\n" + .string "Challenging GYMS...\p" + .string "You’re trying hard because you don’t\n" + .string "want to lose to me, I bet!\p" + .string "{PLAYER}{KUN}, I think I should challenge\n" + .string "your dad in PETALBURG GYM.\p" + .string "{PLAYER}{KUN}, see you again!$" + +LavaridgeTown_Text_16BF92:: @ 816BF92 + .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" + .string "How’s it going?\p" + .string "Hmm...\n" + .string "That’s a decent collection of BADGES.\p" + .string "All right, then.\n" + .string "You may as well have this.$" + +LavaridgeTown_Text_16C020:: @ 816C020 + .string "BRENDAN: Keep those with you if you’re\n" + .string "planning on going into that desert near\l" + .string "ROUTE 111.\p" + .string "There should be some POKéMON that\n" + .string "are exclusively desert-dwellers.\l" + .string "You might look around for those.\p" + .string "As for me...\n" + .string "I’m considering challenging NORMAN,\l" + .string "the GYM LEADER of PETALBURG.\p" + .string "Unlike you, {PLAYER}, your dad looks like\n" + .string "he really is tough.\p" + .string "See you around!$" + +LavaridgeTown_Text_16C174:: @ 816C174 + .string "I have here an EGG.\p" + .string "I’d hoped to hatch it by covering it in\n" + .string "hot sand by the hot springs.\l" + .string "But that doesn’t seem to be enough...\p" + .string "I’ve heard it would be best if it were\n" + .string "kept together with POKéMON and\l" + .string "carried about.\p" + .string "You are a TRAINER, yes?\n" + .string "And your POKéMON radiate vitality.\p" + .string "So, what say you?\n" + .string "Will you take this EGG to hatch?$" + +LavaridgeTown_Text_16C2B6:: @ 816C2B6 + .string "Good! I hope you’ll walk plenty with\n" + .string "this here EGG!$" + +LavaridgeTown_Text_16C2EA:: @ 816C2EA + .string "{PLAYER} received the EGG.$" + +LavaridgeTown_Text_16C2FF:: @ 816C2FF + .string "Oh? You’ve too many POKéMON.\n" + .string "There’s no room for this EGG...$" + +LavaridgeTown_Text_16C33C:: @ 816C33C + .string "As you wish, then...\p" + .string "If you have a change of heart about\n" + .string "hatching this EGG, I will be here.$" + +LavaridgeTown_Text_16C398:: @ 816C398 + .string "Every so often, an EGG will be found at\n" + .string "the POKéMON DAY CARE.\p" + .string "Or at least that’s how the rumor goes.$" + +LavaridgeTown_Text_16C3FD:: @ 816C3FD + .string "We draw as much hot water as we need,\n" + .string "and yet the hot springs never run dry.\p" + .string "Isn’t it magical?\p" + .string "These hot springs appear near active\n" + .string "volcanoes. Veins of water under the\l" + .string "ground are heated by magma to well up\l" + .string "as hot springs.$" + +LavaridgeTown_Text_16C4DB:: @ 816C4DB + .string "Being buried in this hot sand is...\n" + .string "Sigh...\p" + .string "So warm and heavenly...\p" + .string "Eh? Gyaah! Ouch!\p" + .string "A POKéMON nipped my backside!$" + +LavaridgeTown_Text_16C54E:: @ 816C54E + .string "Oh, you like hot springs, do you?\p" + .string "That’s surprising for one as young\n" + .string "as you.$" + +LavaridgeTown_Text_16C59B:: @ 816C59B + .string "I bathe in the hot springs every day.\p" + .string "I want to become a beautiful and strong\n" + .string "GYM LEADER like FLANNERY.$" + +LavaridgeTown_Text_16C603:: @ 816C603 + .string "If people put POKéMON in hot springs,\n" + .string "it might be seriously strange.\p" + .string "Why, it might be an electric bath, or\n" + .string "a bubble bath, or even a lava bath...$" + +LavaridgeTown_Text_16C694:: @ 816C694 + .string "They’re claiming that these hot springs\n" + .string "are good for calming nervous tension,\l" + .string "relieving aching muscles, solving\l" + .string "romantic problems, and attracting\l" + .string "money...$" + +LavaridgeTown_Text_16C72F:: @ 816C72F + .string "LAVARIDGE TOWN\p" + .string "“POKéMON CENTER HOT SPRINGS\n" + .string "An excellent place for relaxing!”$" + +LavaridgeTown_Text_16C77C:: @ 816C77C + .string "LAVARIDGE TOWN POKéMON GYM\n" + .string "LEADER: FLANNERY\l" + .string "“One with a fiery passion that burns!”$" + +LavaridgeTown_Text_16C7CF:: @ 816C7CF + .string "POKéMON HERB SHOP\n" + .string "“Bitter taste - better cure!”$" diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/maps/LavaridgeTown_Gym_1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LavaridgeTown_Gym_1F/border.bin +++ /dev/null diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index ed3cc738f..ed3cc738f 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 929b07ae7..05c0b2dbc 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_Gym_1F:: @ 8305C0C - .4byte LavaridgeTown_Gym_1F_MapAttributes + .4byte LavaridgeTown_Gym_1F_Layout .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 69 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/maps/LavaridgeTown_Gym_1F/map.bin deleted file mode 100644 index 7f2b02f90..000000000 --- a/data/maps/LavaridgeTown_Gym_1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -66666666662222222222 2 2 2 22 2 2 22 222222222222222222222222222222222222 2222222222222222 2 2 222 2 2 2 222222 -2 2 2 2 2 22222222222222222222222222222222222 2222222222
222
2 2 2 22 2 2 22222222222222222222222222 22222222222222222222 22222 22222(22222
\ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc new file mode 100644 index 000000000..27655127a --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -0,0 +1,157 @@ +LavaridgeTown_Gym_1F_MapScripts:: @ 815368E + map_script 3, LavaridgeTown_Gym_1F_MapScript1_153694 + .byte 0 + +LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 + call LavaridgeTown_Gym_1F_EventScript_15369F + call LavaridgeTown_Gym_1F_EventScript_1536FF + end + +LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + setvar VAR_TEMP_B, 1 + +LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 + setvar VAR_TEMP_C, 1 + +LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 + setvar VAR_TEMP_D, 1 + +LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 + setvar VAR_TEMP_E, 1 + +LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE + setvar VAR_TEMP_F, 1 + +LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE + return + +LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C + setobjectmovementtype 2, 63 + +LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 + setobjectmovementtype 3, 63 + +LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 + setobjectmovementtype 4, 63 + +LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 + setobjectmovementtype 5, 63 + +LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 + setobjectmovementtype 7, 63 + +LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 + return + +LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 + trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 + msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 + release + end + +LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 + message LavaridgeTown_Gym_1F_Text_176A62 + waitmessage + call LavaridgeTown_Gym_1F_EventScript_1A02C5 + msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 + setflag FLAG_DEFEATED_LAVARIDGE_GYM + setflag FLAG_BADGE04_GET + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 + call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB + setvar VAR_SPECIAL_8, 4 + call LavaridgeTown_Gym_1F_EventScript_1A01C0 + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 + goto LavaridgeTown_Gym_1F_EventScript_1537A7 + end + +LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 + giveitem_std ITEM_TM50_OVERHEAT + compare RESULT, 0 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B + msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 + setflag FLAG_RECEIVED_TM50 + release + end + +LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB + trainerbattle 2, OPPONENT_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + msgbox LavaridgeTown_Gym_1F_Text_176472, 6 + end + +LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 + call LavaridgeTown_Gym_1F_EventScript_15369F + release + end + +LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED + trainerbattle 2, OPPONENT_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + msgbox LavaridgeTown_Gym_1F_Text_176537, 6 + end + +LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 + trainerbattle 2, OPPONENT_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + msgbox LavaridgeTown_Gym_1F_Text_176660, 6 + end + +LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 + trainerbattle 2, OPPONENT_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6 + end + +LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E + trainerbattle 2, OPPONENT_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + msgbox LavaridgeTown_Gym_1F_Text_17671D, 6 + end + +LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 + lock + faceplayer + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E + msgbox LavaridgeTown_Gym_1F_Text_176312, 4 + release + end + +LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E + msgbox LavaridgeTown_Gym_1F_Text_17640C, 4 + release + end + +LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 + lockall + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 + goto LavaridgeTown_Gym_1F_EventScript_1538A2 + end + +LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 + lockall + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 + goto LavaridgeTown_Gym_1F_EventScript_1538A2 + end + +LavaridgeTown_Gym_1F_EventScript_153898:: @ 8153898 + msgbox LavaridgeTown_Gym_1F_Text_176CCA, 4 + releaseall + end + +LavaridgeTown_Gym_1F_EventScript_1538A2:: @ 81538A2 + msgbox LavaridgeTown_Gym_1F_Text_176CAF, 4 + releaseall + end diff --git a/data/maps/LavaridgeTown_Gym_1F/text.inc b/data/maps/LavaridgeTown_Gym_1F/text.inc new file mode 100644 index 000000000..87ec05632 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/text.inc @@ -0,0 +1,140 @@ +LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "LAVARIDGE’s GYM LEADER FLANNERY\n" + .string "uses FIRE-type POKéMON.\p" + .string "Her passion for POKéMON burns stronger\n" + .string "and hotter than a volcano.\p" + .string "Don’t get too close to her - you’ll burn!\n" + .string "Hose her down with water and then\l" + .string "go for it!$" + +LavaridgeTown_Gym_1F_Text_17640C:: @ 817640C + .string "Yow! That was a scorching hot battle!$" + +LavaridgeTown_Gym_1F_Text_176432:: @ 8176432 + .string "Owowowowow!\n" + .string "Yikes, it’s hot!$" + +LavaridgeTown_Gym_1F_Text_17644F:: @ 817644F + .string "I’m blinded by sweat in my eyes...$" + +LavaridgeTown_Gym_1F_Text_176472:: @ 8176472 + .string "Being buried in hot sand promotes\n" + .string "circulation.\p" + .string "It’s effective for healing pain in\n" + .string "your joints.$" + +LavaridgeTown_Gym_1F_Text_1764D1:: @ 81764D1 + .string "I’m trying to relieve my stress.\n" + .string "Don’t come along and stress me out!$" + +LavaridgeTown_Gym_1F_Text_176516:: @ 8176516 + .string "I hope FLANNERY flames you good!$" + +LavaridgeTown_Gym_1F_Text_176537:: @ 8176537 + .string "Haaah... Whew...\p" + .string "If you spend too much time buried in\n" + .string "hot sand, it tuckers you out...$" + +LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D + .string "You must be getting tired by now.\n" + .string "You’d like to rest in the hot sand,\l" + .string "wouldn’t you?\p" + .string "But you should know that maintaining\n" + .string "your willpower is an important ability\l" + .string "for all TRAINERS.$" + +LavaridgeTown_Gym_1F_Text_17663F:: @ 817663F + .string "Play with fire, and be burned...$" + +LavaridgeTown_Gym_1F_Text_176660:: @ 8176660 + .string "Your skill is real...\n" + .string "But our LEADER FLANNERY is strong.\p" + .string "If you don’t watch yourself, you’ll be\n" + .string "burned seriously.$" + +LavaridgeTown_Gym_1F_Text_1766D2:: @ 81766D2 + .string "Can your POKéMON withstand\n" + .string "392-degree heat?$" + +LavaridgeTown_Gym_1F_Text_1766FE:: @ 81766FE + .string "It didn’t burn hotly enough...$" + +LavaridgeTown_Gym_1F_Text_17671D:: @ 817671D + .string "The temperature of magma is\n" + .string "392 degrees.\p" + .string "Your POKéMON beat me, so they should\n" + .string "easily survive in magma.$" + +LavaridgeTown_Gym_1F_Text_176784:: @ 8176784 + .string "Um...\n" + .string "Okay, I’ll battle with you.$" + +LavaridgeTown_Gym_1F_Text_1767A6:: @ 81767A6 + .string "Oh, but you’re too strong.$" + +LavaridgeTown_Gym_1F_Text_1767C1:: @ 81767C1 + .string "I’m going to be a pretty and strong\n" + .string "TRAINER just like FLANNERY.$" + +LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 + .string "Welcome... No, wait.\p" + .string "Puny TRAINER, how good to see you’ve\n" + .string "made it here!\p" + .string "I have been entrusted with the...\n" + .string "No, wait.\p" + .string "I am FLANNERY, and I’m the GYM\n" + .string "LEADER here!\p" + .string "Uh...\n" + .string "Dare not underestimate me, though\l" + .string "I have been LEADER only a short time!\p" + .string "With skills inherited from my grand-\n" + .string "father, I shall, uh...demonstrate the\l" + .string "hot moves we have honed on this land!$" + +LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 + .string "Oh...\n" + .string "I guess I was trying too hard...\p" + .string "I... I’ve only recently become a GYM\n" + .string "LEADER.\p" + .string "I tried too hard to be someone I’m not.\p" + .string "I have to do things my natural way.\n" + .string "If I don’t, my POKéMON will be confused.\p" + .string "Thanks for teaching me that.\n" + .string "For that, you deserve this.$" + +LavaridgeTown_Gym_1F_Text_176A62:: @ 8176A62 + .string "{PLAYER} received the HEAT BADGE\n" + .string "from FLANNERY.$" + +LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C + .string "If you have a HEAT BADGE, all POKéMON\n" + .string "up to Level 50, even those you get in\l" + .string "trades from other people, will obey\l" + .string "you completely.\p" + .string "And, it lets POKéMON use the HM move\n" + .string "STRENGTH outside of battle.\p" + .string "This is a token of my appreciation.\n" + .string "Don’t be shy about taking it!$" + +LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F + .string "That TM50 contains OVERHEAT.\p" + .string "That move inflicts serious damage on\n" + .string "the opponent.\p" + .string "But it also sharply cuts the SP. ATK\n" + .string "of the POKéMON using it. It might not\l" + .string "be suitable for longer battles.$" + +LavaridgeTown_Gym_1F_Text_176C4A:: @ 8176C4A + .string "Your power reminds me of someone...\p" + .string "Oh! I know! You battle like NORMAN,\n" + .string "the GYM LEADER of PETALBURG.$" + +LavaridgeTown_Gym_1F_Text_176CAF:: @ 8176CAF + .string "LAVARIDGE TOWN POKéMON GYM$" + +LavaridgeTown_Gym_1F_Text_176CCA:: @ 8176CCA + .string "LAVARIDGE TOWN POKéMON GYM\p" + .string "FLANNERY’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/maps/LavaridgeTown_Gym_B1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/border.bin +++ /dev/null diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc index 9492194a8..9492194a8 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index d8a747789..0ae5a8634 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 - .4byte LavaridgeTown_Gym_B1F_MapAttributes + .4byte LavaridgeTown_Gym_B1F_Layout .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 70 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/maps/LavaridgeTown_Gym_B1F/map.bin deleted file mode 100644 index 035719ffe..000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666662 2 2 2 2 2 2 2 2 2 222222222222 222222222 22 22 22 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222!22!22!22)))22222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc new file mode 100644 index 000000000..58178722c --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -0,0 +1,2 @@ +LavaridgeTown_Gym_B1F_MapScripts:: @ 81538AC + .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/maps/LavaridgeTown_HerbShop/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LavaridgeTown_HerbShop/border.bin +++ /dev/null diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index 0e2c546b6..0e2c546b6 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index f44118c5c..8ab9e4807 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_HerbShop:: @ 8305BF0 - .4byte LavaridgeTown_HerbShop_MapAttributes + .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 68 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/maps/LavaridgeTown_HerbShop/map.bin deleted file mode 100644 index cc0294a80..000000000 --- a/data/maps/LavaridgeTown_HerbShop/map.bin +++ /dev/null @@ -1 +0,0 @@ -32222x2p2p2p2p22h2h2h2x2p2p2p2p2p2y2h2h2h232h2h2h2h2h2h2h2h2h22g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab
\ No newline at end of file diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc new file mode 100644 index 000000000..71fc2cbfe --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -0,0 +1,43 @@ +LavaridgeTown_HerbShop_MapScripts:: @ 8153628 + .byte 0 + +LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629 + lock + faceplayer + message LavaridgeTown_HerbShop_Text_17615C + waitmessage + pokemart LavaridgeTown_HerbShop_Items + msgbox LavaridgeTown_HerbShop_Text_1A0C02, 4 + release + end + + .align 2 +LavaridgeTown_HerbShop_Items:: @ 8153640 + .2byte ITEM_ENERGY_POWDER + .2byte ITEM_ENERGY_ROOT + .2byte ITEM_HEAL_POWDER + .2byte ITEM_REVIVAL_HERB + .2byte ITEM_NONE + release + end + +LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C + msgbox LavaridgeTown_HerbShop_Text_1762A3, 2 + end + +LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 + lock + faceplayer + goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 + msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 + giveitem_std ITEM_CHARCOAL + compare RESULT, 0 + goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B + setflag FLAG_RECEIVED_CHARCOAL + release + end + +LavaridgeTown_HerbShop_EventScript_153684:: @ 8153684 + msgbox LavaridgeTown_HerbShop_Text_176209, 4 + release + end diff --git a/data/maps/LavaridgeTown_HerbShop/text.inc b/data/maps/LavaridgeTown_HerbShop/text.inc new file mode 100644 index 000000000..893d3399f --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/text.inc @@ -0,0 +1,22 @@ +LavaridgeTown_HerbShop_Text_17615C:: @ 817615C + .string "Welcome to the HERB SHOP, home of\n" + .string "effective and inexpensive medicine!$" + +LavaridgeTown_HerbShop_Text_1761A2:: @ 81761A2 + .string "You’ve come to look at herbal medicine\n" + .string "in LAVARIDGE?\p" + .string "That’s rather commendable.\p" + .string "I like you! Take this!$" + +LavaridgeTown_HerbShop_Text_176209:: @ 8176209 + .string "That CHARCOAL I gave you, it’s used\n" + .string "for making herbal medicine.\p" + .string "It also does wonders when held by\n" + .string "a POKéMON.\p" + .string "It intensifies the power of FIRE-type\n" + .string "moves.$" + +LavaridgeTown_HerbShop_Text_1762A3:: @ 81762A3 + .string "Herbal medicine works impressively well.\n" + .string "But your POKéMON will dislike you for it.\l" + .string "It must be horribly bitter!$" diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc index 90e33480c..90e33480c 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/LavaridgeTown_House/events.inc diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f43ea0bc4..5b85bcbac 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_House:: @ 8305C44 - .4byte LavaridgeTown_House_MapAttributes + .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 64 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc new file mode 100644 index 000000000..6fc14e0b6 --- /dev/null +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -0,0 +1,16 @@ +LavaridgeTown_House_MapScripts:: @ 81538AD + .byte 0 + +LavaridgeTown_House_EventScript_1538AE:: @ 81538AE + msgbox LavaridgeTown_House_Text_176D07, 2 + end + +LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox LavaridgeTown_House_Text_176D94, 4 + waitmoncry + release + end diff --git a/data/maps/LavaridgeTown_House/text.inc b/data/maps/LavaridgeTown_House/text.inc new file mode 100644 index 000000000..9710d9398 --- /dev/null +++ b/data/maps/LavaridgeTown_House/text.inc @@ -0,0 +1,8 @@ +LavaridgeTown_House_Text_176D07:: @ 8176D07 + .string "My wife’s warming an EGG in the hot\n" + .string "springs. This is what she told me.\p" + .string "She left two POKéMON with the DAY CARE.\n" + .string "And they discovered that EGG!$" + +LavaridgeTown_House_Text_176D94:: @ 8176D94 + .string "ZIGZAGOON: Pshoo!$" diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc index 2d365da54..2d365da54 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 0882a6bf0..97c192d21 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_Mart:: @ 8305C60 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc new file mode 100644 index 000000000..99b567e06 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -0,0 +1,35 @@ +LavaridgeTown_Mart_MapScripts:: @ 81538CA + .byte 0 + +LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB + lock + faceplayer + message LavaridgeTown_Mart_Text_1A0BE4 + waitmessage + pokemart LavaridgeTown_Mart_Items + msgbox LavaridgeTown_Mart_Text_1A0C02, 4 + release + end + + .align 2 +LavaridgeTown_Mart_Items:: @ 81538E4 + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_NONE + release + end + +LavaridgeTown_Mart_EventScript_1538FA:: @ 81538FA + msgbox LavaridgeTown_Mart_Text_176DA6, 2 + end + +LavaridgeTown_Mart_EventScript_153903:: @ 8153903 + msgbox LavaridgeTown_Mart_Text_176E1A, 2 + end diff --git a/data/maps/LavaridgeTown_Mart/text.inc b/data/maps/LavaridgeTown_Mart/text.inc new file mode 100644 index 000000000..db79bd321 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/text.inc @@ -0,0 +1,10 @@ +LavaridgeTown_Mart_Text_176DA6:: @ 8176DA6 + .string "Use X SPEED to add to a POKéMON’s\n" + .string "SPEED in battle.\p" + .string "That will help it get in the first\n" + .string "strike - a decided advantage!$" + +LavaridgeTown_Mart_Text_176E1A:: @ 8176E1A + .string "On MT. CHIMNEY’s peak, there’s a local\n" + .string "specialty that you can buy only there.\p" + .string "Give it to a POKéMON - it will be elated.$" diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index 98f670755..98f670755 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 78576d740..27bdfe3f2 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes + .4byte LavaridgeTown_PokemonCenter_1F_Layout .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 71 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin deleted file mode 100644 index d841f9f1a..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ - JK
H"#RSI2222P*+2[Q$2 2 2 2 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'222222021222322222'26B228292:2;2242=>'222222@2A2B2C22&2EF'2(2222222222&2427
\ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..4e9c51380 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,28 @@ +LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C + map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_153912 + .byte 0 + +LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 + setrespawn 16 + call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B + end + +LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B + setvar VAR_SPECIAL_B, 1 + call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +LavaridgeTown_PokemonCenter_1F_EventScript_153929:: @ 8153929 + msgbox LavaridgeTown_PokemonCenter_1F_Text_176F08, 2 + end + +LavaridgeTown_PokemonCenter_1F_EventScript_153932:: @ 8153932 + msgbox LavaridgeTown_PokemonCenter_1F_Text_176E92, 2 + end + +LavaridgeTown_PokemonCenter_1F_EventScript_15393B:: @ 815393B + msgbox LavaridgeTown_PokemonCenter_1F_Text_176F7A, 2 + end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..c66d6df8a --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc @@ -0,0 +1,17 @@ +LavaridgeTown_PokemonCenter_1F_Text_176E92:: @ 8176E92 + .string "I think POKéMON get closer to their\n" + .string "TRAINERS if they spend time together.\p" + .string "The longer the better.\n" + .string "That’s what I think.$" + +LavaridgeTown_PokemonCenter_1F_Text_176F08:: @ 8176F08 + .string "I gave a RED {POKEBLOCK} to my POKéMON.\n" + .string "It looks a lot cooler all of a sudden.\p" + .string "Hmm...\n" + .string "Maybe I ought to eat a RED {POKEBLOCK}.$" + +LavaridgeTown_PokemonCenter_1F_Text_176F7A:: @ 8176F7A + .string "Hohoho! Hey, kid, you can reach\n" + .string "the hot springs from here.\p" + .string "If POKéMON are getting rest, so too\n" + .string "should their TRAINERS.$" diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 370feb889..370feb889 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 3d86fa588..096759809 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..daaeb0b93 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 8153944 + map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +LavaridgeTown_PokemonCenter_2F_EventScript_153954:: @ 8153954 + call LavaridgeTown_PokemonCenter_2F_EventScript_1A3EA6 + end + +LavaridgeTown_PokemonCenter_2F_EventScript_15395A:: @ 815395A + call LavaridgeTown_PokemonCenter_2F_EventScript_1A40CC + end + +LavaridgeTown_PokemonCenter_2F_EventScript_153960:: @ 8153960 + call LavaridgeTown_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/LilycoveCity/border.bin b/data/maps/LilycoveCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/LilycoveCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc index e2aa43d2d..e2aa43d2d 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/LilycoveCity/events.inc diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 204e2098d..2c067668e 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,9 +1,9 @@ LilycoveCity:: @ 83054D4 - .4byte LilycoveCity_MapAttributes + .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 6 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity/map.bin b/data/maps/LilycoveCity/map.bin Binary files differdeleted file mode 100644 index d17bd748d..000000000 --- a/data/maps/LilycoveCity/map.bin +++ /dev/null diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc new file mode 100644 index 000000000..081914bda --- /dev/null +++ b/data/maps/LilycoveCity/scripts.inc @@ -0,0 +1,408 @@ +LilycoveCity_MapScripts:: @ 814CA15 + map_script 3, LilycoveCity_MapScript1_14CA20 + map_script 1, LilycoveCity_MapScript1_14CA3F + .byte 0 + +LilycoveCity_MapScript1_14CA20:: @ 814CA20 + setflag FLAG_VISITED_LILYCOVE_CITY + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1 + call LilycoveCity_EventScript_1A0196 + call LilycoveCity_EventScript_1A014E + end + +LilycoveCity_MapScript1_14CA3F:: @ 814CA3F + .ifndef SAPPHIRE + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 680, 1 + setmetatile 71, 4, 681, 1 + setmetatile 72, 4, 682, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 688, 1 + setmetatile 71, 5, 689, 0 + setmetatile 72, 5, 690, 1 + setmetatile 69, 6, 446, 0 + setmetatile 70, 6, 447, 0 + setmetatile 71, 6, 368, 0 + setmetatile 72, 6, 445, 0 + .endif + call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE + call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B + end + +LilycoveCity_EventScript_14CABE:: @ 814CABE + setmetatile 76, 12, 656, 1 + setmetatile 77, 12, 657, 1 + setmetatile 76, 13, 672, 1 + setmetatile 77, 13, 673, 1 + setmetatile 76, 14, 664, 1 + setmetatile 77, 14, 665, 1 + setmetatile 76, 15, 672, 1 + setmetatile 77, 15, 673, 1 + setmetatile 77, 16, 664, 1 + setmetatile 78, 16, 665, 1 + setmetatile 77, 17, 672, 1 + setmetatile 78, 17, 673, 1 + return + +LilycoveCity_EventScript_14CB2B:: @ 814CB2B + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 169, 1 + setmetatile 71, 4, 169, 1 + setmetatile 72, 4, 169, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 145, 1 + setmetatile 71, 5, 145, 1 + setmetatile 72, 5, 145, 1 + return + +LilycoveCity_EventScript_14CB74:: @ 814CB74 + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 + msgbox LilycoveCity_Text_1C5A7A, 4 + random 10 + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq LilycoveCity_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE + msgbox LilycoveCity_Text_1C5B1D, 4 + release + end + +LilycoveCity_EventScript_14CBB4:: @ 814CBB4 + msgbox LilycoveCity_Text_1C5B5D, 4 + release + end + +LilycoveCity_EventScript_14CBBE:: @ 814CBBE + msgbox LilycoveCity_Text_1686C9, 2 + end + +LilycoveCity_EventScript_14CBC7:: @ 814CBC7 + lock + faceplayer + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC + msgbox LilycoveCity_Text_168750, 4 + release + end + +LilycoveCity_EventScript_14CBDC:: @ 814CBDC + msgbox LilycoveCity_Text_168791, 4 + release + end + +LilycoveCity_EventScript_14CBE6:: @ 814CBE6 + msgbox LilycoveCity_Text_168819, 2 + end + +LilycoveCity_EventScript_14CBEF:: @ 814CBEF + lock + faceplayer + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04 + msgbox LilycoveCity_Text_1688C1, 4 + release + end + +LilycoveCity_EventScript_14CC04:: @ 814CC04 + msgbox LilycoveCity_Text_168934, 4 + release + end + +LilycoveCity_EventScript_14CC0E:: @ 814CC0E + lock + faceplayer + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23 + msgbox LilycoveCity_Text_1689BF, 4 + release + end + +LilycoveCity_EventScript_14CC23:: @ 814CC23 + msgbox LilycoveCity_Text_168A55, 4 + release + end + +LilycoveCity_EventScript_14CC2D:: @ 814CC2D + msgbox LilycoveCity_Text_168A8D, 2 + end + +LilycoveCity_EventScript_14CC36:: @ 814CC36 + msgbox LilycoveCity_Text_168B1F, 3 + end + +LilycoveCity_EventScript_14CC3F:: @ 814CC3F + msgbox LilycoveCity_Text_168B9B, 3 + end + +LilycoveCity_EventScript_14CC48:: @ 814CC48 + lock + faceplayer + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D + msgbox LilycoveCity_Text_168C16, 4 + release + end + +LilycoveCity_EventScript_14CC5D:: @ 814CC5D + msgbox LilycoveCity_Text_168D15, 4 + release + end + +LilycoveCity_EventScript_14CC67:: @ 814CC67 + msgbox LilycoveCity_Text_168DA9, 3 + end + +LilycoveCity_EventScript_14CC70:: @ 814CC70 + msgbox LilycoveCity_Text_168DE1, 3 + end + +LilycoveCity_EventScript_14CC79:: @ 814CC79 + msgbox LilycoveCity_Text_168E2F, 3 + end + +LilycoveCity_EventScript_14CC82:: @ 814CC82 + lockall + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 + case 0, LilycoveCity_EventScript_14CCA2 + msgbox LilycoveCity_Text_168EA4, 4 + releaseall + end + +LilycoveCity_EventScript_14CCA2:: @ 814CCA2 + msgbox LilycoveCity_Text_168E67, 4 + releaseall + end + +LilycoveCity_EventScript_14CCAC:: @ 814CCAC + lockall + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0 + msgbox LilycoveCity_Text_168EDA, 4 + releaseall + end + +LilycoveCity_EventScript_14CCC0:: @ 814CCC0 + msgbox LilycoveCity_Text_168F57, 4 + releaseall + end + +LilycoveCity_EventScript_14CCCA:: @ 814CCCA + msgbox LilycoveCity_Text_168FA1, 3 + end + +LilycoveCity_EventScript_14CCD3:: @ 814CCD3 + msgbox LilycoveCity_Text_168FF3, 3 + end + +LilycoveCity_EventScript_14CCDC:: @ 814CCDC + msgbox LilycoveCity_Text_169072, 3 + end + +LilycoveCity_EventScript_14CCE5:: @ 814CCE5 + lockall + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 + msgbox LilycoveCity_Text_16864A, 4 + applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_Text_168675, 4 + applymovement LAST_TALKED, LilycoveCity_Movement_1A083D + waitmovement 0 + setflag FLAG_MET_WAILMER_TRAINER + releaseall + end + +LilycoveCity_EventScript_14CD18:: @ 814CD18 + msgbox LilycoveCity_Text_16864A, 4 + releaseall + end + +LilycoveCity_EventScript_14CD22:: @ 814CD22 + msgbox LilycoveCity_Text_168455, 2 + end + +LilycoveCity_EventScript_14CD2B:: @ 814CD2B + msgbox LilycoveCity_Text_1684C2, 2 + end + +LilycoveCity_EventScript_14CD34:: @ 814CD34 + msgbox LilycoveCity_Text_168573, 2 + end + +LilycoveCity_EventScript_14CD3D:: @ 814CD3D + msgbox LilycoveCity_Text_1685EB, 2 + end + +LilycoveCity_EventScript_14CD46:: @ 814CD46 + lock + faceplayer + checkplayergender + compare RESULT, 0 + goto_if_eq LilycoveCity_EventScript_14CD60 + compare RESULT, 1 + goto_if_eq LilycoveCity_EventScript_14CDD3 + end + +LilycoveCity_EventScript_14CD60:: @ 814CD60 + playbgm MUS_GIRL_SUP, TRUE + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 + compare RESULT, NO + goto_if_eq LilycoveCity_EventScript_14CDC2 + msgbox LilycoveCity_Text_167B94, 4 + switch VAR_STARTER_MON + case 0, LilycoveCity_EventScript_14CE46 + case 1, LilycoveCity_EventScript_14CE56 + case 2, LilycoveCity_EventScript_14CE66 + end + +LilycoveCity_EventScript_14CDB0:: @ 814CDB0 + msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO + return + +LilycoveCity_EventScript_14CDB9:: @ 814CDB9 + msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO + return + +LilycoveCity_EventScript_14CDC2:: @ 814CDC2 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE + msgbox LilycoveCity_Text_167AEB, 4 + savebgm 0 + fadedefaultbgm + release + end + +LilycoveCity_EventScript_14CDD3:: @ 814CDD3 + playbgm MUS_BOY_SUP, TRUE + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C + compare RESULT, NO + goto_if_eq LilycoveCity_EventScript_14CE35 + msgbox LilycoveCity_Text_1680A9, 4 + switch VAR_STARTER_MON + case 0, LilycoveCity_EventScript_14CE76 + case 1, LilycoveCity_EventScript_14CE86 + case 2, LilycoveCity_EventScript_14CE96 + end + +LilycoveCity_EventScript_14CE23:: @ 814CE23 + msgbox LilycoveCity_Text_168067, MSGBOX_YESNO + return + +LilycoveCity_EventScript_14CE2C:: @ 814CE2C + msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO + return + +LilycoveCity_EventScript_14CE35:: @ 814CE35 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE + msgbox LilycoveCity_Text_16802C, 4 + savebgm 0 + fadedefaultbgm + release + end + +LilycoveCity_EventScript_14CE46:: @ 814CE46 + trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 + goto LilycoveCity_EventScript_14CEA6 + end + +LilycoveCity_EventScript_14CE56:: @ 814CE56 + trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 + goto LilycoveCity_EventScript_14CEA6 + end + +LilycoveCity_EventScript_14CE66:: @ 814CE66 + trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 + goto LilycoveCity_EventScript_14CEA6 + end + +LilycoveCity_EventScript_14CE76:: @ 814CE76 + trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 + goto LilycoveCity_EventScript_14CF12 + end + +LilycoveCity_EventScript_14CE86:: @ 814CE86 + trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 + goto LilycoveCity_EventScript_14CF12 + end + +LilycoveCity_EventScript_14CE96:: @ 814CE96 + trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 + goto LilycoveCity_EventScript_14CF12 + end + +LilycoveCity_EventScript_14CEA6:: @ 814CEA6 + msgbox LilycoveCity_Text_167C6B, 4 + setvar RESULT, 0 + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE + compare RESULT, 0 + call_if_eq LilycoveCity_EventScript_14CEEE + compare RESULT, 1 + call_if_eq LilycoveCity_EventScript_14CEF7 + clearflag FLAG_HIDE_MAY_UPSTAIRS + clearflag FLAG_HIDE_MAY_PICHU_DOLL + goto LilycoveCity_EventScript_14CF6B + end + +LilycoveCity_EventScript_14CEDE:: @ 814CEDE + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8 + return + +LilycoveCity_EventScript_14CEE8:: @ 814CEE8 + setvar RESULT, 1 + return + +LilycoveCity_EventScript_14CEEE:: @ 814CEEE + msgbox LilycoveCity_Text_167D08, 4 + return + +LilycoveCity_EventScript_14CEF7:: @ 814CEF7 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09 + msgbox LilycoveCity_Text_167DDD, 4 + return + +LilycoveCity_EventScript_14CF09:: @ 814CF09 + msgbox LilycoveCity_Text_167EAA, 4 + return + +LilycoveCity_EventScript_14CF12:: @ 814CF12 + msgbox LilycoveCity_Text_168149, 4 + setvar RESULT, 0 + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE + compare RESULT, 0 + call_if_eq LilycoveCity_EventScript_14CF47 + compare RESULT, 1 + call_if_eq LilycoveCity_EventScript_14CF50 + clearflag FLAG_HIDE_BRENDAN_UPSTAIRS + goto LilycoveCity_EventScript_14CF6B + end + +LilycoveCity_EventScript_14CF47:: @ 814CF47 + msgbox LilycoveCity_Text_1681EA, 4 + return + +LilycoveCity_EventScript_14CF50:: @ 814CF50 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62 + msgbox LilycoveCity_Text_168282, 4 + return + +LilycoveCity_EventScript_14CF62:: @ 814CF62 + msgbox LilycoveCity_Text_16835A, 4 + return + +LilycoveCity_EventScript_14CF6B:: @ 814CF6B + closemessage + applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect FLDEFF_NPCFLY_OUT + delay 15 + removeobject LAST_TALKED + waitfieldeffect FLDEFF_NPCFLY_OUT + savebgm 0 + fadedefaultbgm + setflag FLAG_MET_RIVAL_LILYCOVE + release + end diff --git a/data/maps/LilycoveCity/text.inc b/data/maps/LilycoveCity/text.inc new file mode 100644 index 000000000..0f9b45c1d --- /dev/null +++ b/data/maps/LilycoveCity/text.inc @@ -0,0 +1,301 @@ +LilycoveCity_Text_1679BF:: @ 81679BF + .string "MAY: Oh, hey?\n" + .string "{PLAYER}{KUN}, are you shopping, too?\p" + .string "I bought a whole bunch of DOLLS and\n" + .string "POSTERS.\p" + .string "Of course, I’ve also caught a lot of\n" + .string "POKéMON, and I’m raising them\l" + .string "properly, too.\p" + .string "Actually, I’m more worried if you’re\n" + .string "raising POKéMON properly, {PLAYER}{KUN}.\p" + .string "I’ll battle with you, so you can show\n" + .string "me your POKéMON, {PLAYER}{KUN}.$" + +LilycoveCity_Text_167AEB:: @ 8167AEB + .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" + .string "been raising your POKéMON?\p" + .string "That’s not a very good showing as a\n" + .string "TRAINER...$" + +LilycoveCity_Text_167B55:: @ 8167B55 + .string "MAY: Come on, battle with me, so I can\n" + .string "check out your POKéMON!$" + +LilycoveCity_Text_167B94:: @ 8167B94 + .string "MAY: The POKéMON I raised won’t be\n" + .string "beaten by your POKéMON, {PLAYER}{KUN}!$" + +LilycoveCity_Text_167BD5:: @ 8167BD5 + .string "... ... ... ... ... ... ... ...\p" + .string "I remember the battle I had with you,\n" + .string "{PLAYER}{KUN}, on ROUTE 103.\p" + .string "That battle helped you become this\n" + .string "strong, {PLAYER}{KUN}, didn’t it?$" + +LilycoveCity_Text_167C6B:: @ 8167C6B + .string "MAY: I’m thinking of going back to\n" + .string "LITTLEROOT soon.\p" + .string "I’ve caught a decent group of POKéMON,\n" + .string "and my POKéDEX is coming along, so\l" + .string "I’m going home to show my dad.$" + +LilycoveCity_Text_167D08:: @ 8167D08 + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Collect all the GYM BADGES and take\n" + .string "the POKéMON LEAGUE challenge?\p" + .string "Well, while you’re collecting BADGES,\n" + .string "{PLAYER}{KUN}, I’m going to work on my\l" + .string "POKéDEX. I’ll complete it before you!\p" + .string "See you!$" + +LilycoveCity_Text_167DDD:: @ 8167DDD + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Are you taking the POKéMON LEAGUE\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "I might’ve lost to you in battling,\n" + .string "but I’ll finish my POKéDEX before you!\p" + .string "See you!$" + +LilycoveCity_Text_167EAA:: @ 8167EAA + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Are you taking the BATTLE TOWER\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "I might’ve lost to you in battling,\n" + .string "but I’ll finish my POKéDEX before you!\p" + .string "See you!$" + +LilycoveCity_Text_167F75:: @ 8167F75 + .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" + .string "I’m running an errand for my dad.\n" + .string "No, I’m not buying any DOLLS.\p" + .string "Anyways, it’s been a while.\p" + .string "Want to have a battle to see who’s been\n" + .string "raising POKéMON better?$" + +LilycoveCity_Text_16802C:: @ 816802C + .string "BRENDAN: Oh, what’s the matter?\n" + .string "Don’t have the confidence?$" + +LilycoveCity_Text_168067:: @ 8168067 + .string "BRENDAN: Want to battle to see who’s\n" + .string "been raising POKéMON better?$" + +LilycoveCity_Text_1680A9:: @ 81680A9 + .string "BRENDAN: Aww, but you know I’m not\n" + .string "going to lose to no {PLAYER}.$" + +LilycoveCity_Text_1680E4:: @ 81680E4 + .string "Humph...\n" + .string "You’ve done a lot of raising.\p" + .string "That stings a bit - I had a head start\n" + .string "on you as a TRAINER...$" + +LilycoveCity_Text_168149:: @ 8168149 + .string "BRENDAN: I...\n" + .string "I plan on going home to LITTLEROOT.\p" + .string "You know I’m helping out my dad on his\n" + .string "POKéDEX. It’s coming together pretty\l" + .string "decently, so I should go show him.$" + +LilycoveCity_Text_1681EA:: @ 81681EA + .string "{PLAYER}, what are you going to do?\p" + .string "Collect all the GYM BADGES and take\n" + .string "the POKéMON LEAGUE challenge?\p" + .string "Maybe I’ll do that, too...\p" + .string "Well, anyway, hang in there!$" + +LilycoveCity_Text_168282:: @ 8168282 + .string "{PLAYER}, what are you going to do?\p" + .string "Since you’re that strong, are you\n" + .string "taking the POKéMON LEAGUE challenge?\p" + .string "Heh, even me - if I trained my POKéMON\n" + .string "a bit more, I should be stronger than\l" + .string "you, {PLAYER}.\p" + .string "Well, anyway, hang in there!$" + +LilycoveCity_Text_16835A:: @ 816835A + .string "{PLAYER}, what are you going to do?\p" + .string "Since you’re that strong, are you\n" + .string "taking the BATTLE TOWER challenge?\p" + .string "Heh, even me - if I trained my POKéMON\n" + .string "a bit more, I should be stronger than\l" + .string "you, {PLAYER}.\l" + .string "Maybe I will go to the BATTLE TOWER.\p" + .string "Well, anyway, hang in there!$" + +LilycoveCity_Text_168455:: @ 8168455 + .string "Fufufu...\p" + .string "We moved more loot into our secret\n" + .string "HIDEOUT today...\p" + .string "Wh-who are you?!\n" + .string "I was just talking to myself!$" + +LilycoveCity_Text_1684C2:: @ 81684C2 + .string "I’m just a GRUNT, so I don’t know what\n" + .string "the BOSS is thinking...\p" + .string "But being on TEAM {EVIL_TEAM}, I know I’ll get\n" + .string "the chance to do big things!\p" + .string "Wh-who are you?!\n" + .string "I was just talking to myself!$" + +LilycoveCity_Text_168573:: @ 8168573 + .string "Hey, you!\p" + .string "Don’t go near the cave in the cove!\p" + .string "Why? You don’t need a reason why!\n" + .string "I’m an adult, so you just listen to me!$" + +LilycoveCity_Text_1685EB:: @ 81685EB + .string "If this whole wide world becomes ours,\n" + .string "TEAM {EVIL_TEAM}’s, it will be a happier\l" + .string "place for POKéMON, too.$" + +LilycoveCity_Text_16864A:: @ 816864A + .string "There! WAILMER!\n" + .string "Leap out of the water now!$" + +LilycoveCity_Text_168675:: @ 8168675 + .string "Hunh? What do you want?\p" + .string "You’re messing up our training, so can\n" + .string "you, like, get lost?$" + +LilycoveCity_Text_1686C9:: @ 81686C9 + .string "The POKéMON that come to this CONTEST\n" + .string "HALL are all prizewinners.\l" + .string "They come from all over the country.\p" + .string "My heart swells with excitement!$" + +LilycoveCity_Text_168750:: @ 8168750 + .string "Have you seen that strange cave in\n" + .string "the cove at the edge of town?$" + +LilycoveCity_Text_168791:: @ 8168791 + .string "I’m going to teach my POKéMON some new\n" + .string "moves for entering a CONTEST.\p" + .string "So, I’m going to see the MOVE DELETER\n" + .string "and make it forget HM moves.$" + +LilycoveCity_Text_168819:: @ 8168819 + .string "I came from KANTO.\p" + .string "The HOENN region is beautiful with\n" + .string "all its water and verdant nature.\p" + .string "Hunh? Wait a second...\p" + .string "Could there be rare POKéMON that live\n" + .string "only in this area?$" + +LilycoveCity_Text_1688C1:: @ 81688C1 + .string "TEAM {EVIL_TEAM}’s been training their\n" + .string "WAILMER in the cove.\p" + .string "We SAILORS can’t get our boats out\n" + .string "to sea with them in the way!$" + +LilycoveCity_Text_168934:: @ 8168934 + .string "Ahoy, did you know?\p" + .string "Someone punted TEAM {EVIL_TEAM} out of the\n" + .string "way for us!\p" + .string "That got the WAILMER out of the cove,\n" + .string "so we can get our boats out again.$" + +LilycoveCity_Text_1689BF:: @ 81689BF + .string "I was taking a relaxing snooze at the\n" + .string "seaside inn to the sound of waves...\p" + .string "When someone stole my POKéMON!\p" + .string "Who’s the abductor?\n" + .string "TEAM {EVIL_TEAM}? Is it TEAM {EVIL_TEAM}?$" + +LilycoveCity_Text_168A55:: @ 8168A55 + .string "My missing POKéMON...\n" + .string "It came back without me noticing!$" + +LilycoveCity_Text_168A8D:: @ 8168A8D + .string "I’m an ART DEALER.\p" + .string "I am a buyer and seller of fine art,\n" + .string "especially paintings.\p" + .string "I’ve heard that the MUSEUM here has\n" + .string "magnificent works on exhibit...$" + +LilycoveCity_Text_168B1F:: @ 8168B1F + .string "Even as we grow old and wrinkled, the\n" + .string "sea remains forever young with the\l" + .string "vivid brilliance of life...\p" + .string "Fwohoho fwohohohoho...$" + +LilycoveCity_Text_168B9B:: @ 8168B9B + .string "It was sixty years ago that my husband\n" + .string "proposed to me here.\l" + .string "The sea remains as beautiful as ever.\p" + .string "Mufufufu mufufufufufu...$" + +LilycoveCity_Text_168C16:: @ 8168C16 + .string "Hm, you know of the peculiar cavern\n" + .string "in this cove?\p" + .string "That had been a natural formation, but\n" + .string "then that TEAM {EVIL_TEAM} lot came along\l" + .string "and made their renovations.\p" + .string "They call themselves the “nature-loving\n" + .string "TEAM {EVIL_TEAM}”!\p" + .string "But what they do and what they say\n" + .string "don’t match at all!$" + +LilycoveCity_Text_168D15:: @ 8168D15 + .string "That cave in the cove...\n" + .string "It seems someone sealed the entrance,\l" + .string "so no one can enter it anymore.\p" + .string "That TEAM {EVIL_TEAM} lot, they must\n" + .string "have gone away for good.$" + +LilycoveCity_Text_168DA9:: @ 8168DA9 + .string "LILYCOVE CITY\p" + .string "“Where the land ends and the\n" + .string "sea begins.”$" + +LilycoveCity_Text_168DE1:: @ 8168DE1 + .string "POKéMON CONTESTS\n" + .string "MASTER RANK REGISTRATION\p" + .string "“Enter CONTESTS with your friends!”$" + +LilycoveCity_Text_168E2F:: @ 8168E2F + .string "COVE LILY MOTEL\p" + .string "“Remember us as COVE LILY of\n" + .string "LILYCOVE.”$" + +LilycoveCity_Text_168E67:: @ 8168E67 + .string "LILYCOVE MUSEUM\p" + .string "“POKéMON Masterpiece Collection\n" + .string "on exhibit!”$" + +LilycoveCity_Text_168EA4:: @ 8168EA4 + .string "LILYCOVE MUSEUM\p" + .string "“{PLAYER}’s POKéMON Collection\n" + .string "on exhibit!”$" + +LilycoveCity_Text_168EDA:: @ 8168EDA + .string "LILYCOVE CITY HARBOR\p" + .string "“The ferry S.S. TIDAL is under\n" + .string "construction in SLATEPORT CITY.\p" + .string "“Service is scheduled to begin\n" + .string "shortly.”$" + +LilycoveCity_Text_168F57:: @ 8168F57 + .string "LILYCOVE CITY HARBOR\p" + .string "“Enjoy a delightful cruise on the\n" + .string "ferry S.S. TIDAL.”$" + +LilycoveCity_Text_168FA1:: @ 8168FA1 + .string "POKéMON TRAINER FAN CLUB\p" + .string "The names of TRAINERS are scribbled\n" + .string "all over the sign...$" + +LilycoveCity_Text_168FF3:: @ 8168FF3 + .string "LILYCOVE DEPARTMENT STORE\p" + .string "“Overflowing with great merchandise\n" + .string "and excitement!\p" + .string "“A great place to find that something\n" + .string "you need!”$" + +LilycoveCity_Text_169072:: @ 8169072 + .string "MOVE DELETER’S HOUSE\p" + .string "“Unwanted POKéMON moves deleted.”$" diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/maps/LilycoveCity_ContestHall/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_ContestHall/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc index bc4331484..bc4331484 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 47329e0f7..9e690f9a7 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,9 +1,9 @@ LilycoveCity_ContestHall:: @ 83065AC - .4byte LilycoveCity_ContestHall_MapAttributes + .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 106 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/maps/LilycoveCity_ContestHall/map.bin deleted file mode 100644 index 06fdae4f7..000000000 --- a/data/maps/LilycoveCity_ContestHall/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -///////////////////////////////2222222222~v 2222222222//// -////22222<=>bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb<=> 22222//// -DEF. 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"2,DEF////<=>bbbb6(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*24bbbb<=>DEF. 2!2!2!2!202`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`222!2!2!2!2"2,DEFbbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2
f2`2`2`2`2`2`2`2`2`2`2`2*24bbbb 2!2!2!2!202`2`2J2`2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2J2`2`222!2!2!2!2"2(2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2*2(2`2J2`2`2J2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2`2I2`2I2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R`2`2R`2`2`2`2`2`2P2`2P2`2`2`2$%2%2pq2q2q22qwBqr%2%2&f2`2`2Q2`2Q2`2`2`2`2`2`2R`2`2R`2*2(2`2`2`2`2`2`2`2`2`2`2`2X2`2X2`2`2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2`2Y2`2Y2`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$%2%2pq2q2q2q2q2q2q2r%2%2&f2`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`2H2`2H2`2`2`2$%2%2xyy{2|2}2yyz%2%2&f2`2`2I2`2I2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2P2`2P2`2`2`22222222222222f2`2`2Q2`2Q2`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 222 f2`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`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`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`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`2`2`2`2`2`2`2*2(2`2`2`2`2`2
f2`2`2`2`2`2`2`2`2
f2`2`2`2`2*2(2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2*2(2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2I2`2`2`2`2`2H2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2Q2`2`2`2`2`2P2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2I2`2I2`2*2(2`2P2`2P2`2$%2%2pq2q2q22qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q22qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q22q2qq2r%2%2&f2Y2`2Y2`2*2(2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2I2`2`2`2`2`2H2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2xyy222yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy222yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`22222222222222f2Y2`2`2`2`2`2X2`22222222222222f2Q2`2Q2`2*2(2`2X2`2X2`2 222 f2`2`2`2`2`2`2`2`2 222 f2Y2`2Y2`2*2(2`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`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`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`2J2`2`2`2J2`2`2`2J2`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`2J2`2`2`2J2`2`2`2J2`2`2*2(2`2`2R`2`2`2R`2`2`2R`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2R`2`2`2R`2`2`2R`2`2*2
\ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc new file mode 100644 index 000000000..944857a21 --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -0,0 +1,255 @@ +LilycoveCity_ContestHall_MapScripts:: @ 8159099 + .byte 0 + + .byte 0 @ XXX + +LilycoveCity_ContestHall_EventScript_15909B:: @ 815909B + msgbox LilycoveCity_ContestHall_Text_1890D4, 2 + end + +LilycoveCity_ContestHall_EventScript_1590A4:: @ 81590A4 + msgbox LilycoveCity_ContestHall_Text_18915F, 2 + end + +LilycoveCity_ContestHall_EventScript_1590AD:: @ 81590AD + msgbox LilycoveCity_ContestHall_Text_189221, 2 + end + +LilycoveCity_ContestHall_EventScript_1590B6:: @ 81590B6 + msgbox LilycoveCity_ContestHall_Text_189299, 2 + end + +LilycoveCity_ContestHall_EventScript_1590BF:: @ 81590BF + msgbox LilycoveCity_ContestHall_Text_189301, 2 + lockall + applymovement 4, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1590D4:: @ 81590D4 + msgbox LilycoveCity_ContestHall_Text_189366, 2 + lockall + applymovement 5, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1590E9:: @ 81590E9 + msgbox LilycoveCity_ContestHall_Text_1893CE, 2 + lockall + applymovement 6, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1590FE:: @ 81590FE + msgbox LilycoveCity_ContestHall_Text_189463, 2 + lockall + applymovement 7, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159113:: @ 8159113 + msgbox LilycoveCity_ContestHall_Text_189512, 2 + lockall + applymovement 8, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159128:: @ 8159128 + msgbox LilycoveCity_ContestHall_Text_18956B, 2 + lockall + applymovement 9, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_15913D:: @ 815913D + msgbox LilycoveCity_ContestHall_Text_1895F3, 3 + end + +LilycoveCity_ContestHall_EventScript_159146:: @ 8159146 + msgbox LilycoveCity_ContestHall_Text_189617, 2 + lockall + applymovement 12, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_15915B:: @ 815915B + msgbox LilycoveCity_ContestHall_Text_1896BE, 2 + lockall + applymovement 22, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159170:: @ 8159170 + msgbox LilycoveCity_ContestHall_Text_1896FE, 2 + lockall + applymovement 11, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159185:: @ 8159185 + msgbox LilycoveCity_ContestHall_Text_189771, 2 + lockall + applymovement 13, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_15919A:: @ 815919A + msgbox LilycoveCity_ContestHall_Text_1897AA, 2 + lockall + applymovement 14, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1591AF:: @ 81591AF + msgbox LilycoveCity_ContestHall_Text_18980B, 2 + lockall + applymovement 15, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1591C4:: @ 81591C4 + msgbox LilycoveCity_ContestHall_Text_189874, 2 + lockall + applymovement 16, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1591D9:: @ 81591D9 + msgbox LilycoveCity_ContestHall_Text_18990A, 2 + lockall + applymovement 17, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1591EE:: @ 81591EE + msgbox LilycoveCity_ContestHall_Text_189981, 2 + lockall + applymovement 18, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159203:: @ 8159203 + msgbox LilycoveCity_ContestHall_Text_189A1D, 2 + lockall + applymovement 19, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159218:: @ 8159218 + msgbox LilycoveCity_ContestHall_Text_189A82, 2 + lockall + applymovement 21, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_15922D:: @ 815922D + msgbox LilycoveCity_ContestHall_Text_189AE1, 2 + lockall + applymovement 20, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159242:: @ 8159242 + msgbox LilycoveCity_ContestHall_Text_189B4E, 2 + lockall + applymovement 23, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159257:: @ 8159257 + msgbox LilycoveCity_ContestHall_Text_189BBF, 2 + lockall + applymovement 24, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_15926C:: @ 815926C + msgbox LilycoveCity_ContestHall_Text_189C29, 2 + lockall + applymovement 25, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159281:: @ 8159281 + msgbox LilycoveCity_ContestHall_Text_189C67, 2 + lockall + applymovement 26, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_159296:: @ 8159296 + msgbox LilycoveCity_ContestHall_Text_189CB3, 2 + lockall + applymovement 27, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1592AB:: @ 81592AB + msgbox LilycoveCity_ContestHall_Text_189D11, 2 + lockall + applymovement 28, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 + lockall + applymovement 29, LilycoveCity_ContestHall_Movement_1A0839 + waitmovement 0 + delay 25 + applymovement 29, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + msgbox LilycoveCity_ContestHall_Text_189DA2, 3 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1592E2:: @ 81592E2 + msgbox LilycoveCity_ContestHall_Text_189E5F, 2 + lockall + applymovement 31, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_1592F7:: @ 81592F7 + msgbox LilycoveCity_ContestHall_Text_189DF3, 2 + lockall + applymovement 30, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_ContestHall_EventScript_15930C:: @ 815930C + msgbox LilycoveCity_ContestHall_Text_189EF3, 3 + end + +LilycoveCity_ContestHall_EventScript_159315:: @ 8159315 + msgbox LilycoveCity_ContestHall_Text_189F29, 3 + end + +LilycoveCity_ContestHall_EventScript_15931E:: @ 815931E + msgbox LilycoveCity_ContestHall_Text_189F5C, 3 + end diff --git a/data/maps/LilycoveCity_ContestHall/text.inc b/data/maps/LilycoveCity_ContestHall/text.inc new file mode 100644 index 000000000..96507b770 --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/text.inc @@ -0,0 +1,206 @@ +LilycoveCity_ContestHall_Text_1890D4:: @ 81890D4 + .string "This POKéMON won the BEAUTY CONTEST\n" + .string "here before.\p" + .string "Well, guess what? Today, I made it\n" + .string "win a SMARTNESS CONTEST!\p" + .string "My abilities scare even me...$" + +LilycoveCity_ContestHall_Text_18915F:: @ 818915F + .string "I’ve entered a bunch of CONTESTS,\n" + .string "so I’m seeing how things work.\p" + .string "If you’re in a COOLNESS CONTEST,\n" + .string "cool moves go over as appeals.\p" + .string "But smart moves and cute moves\n" + .string "don’t go over well, for instance.$" + +LilycoveCity_ContestHall_Text_189221:: @ 8189221 + .string "That young man who won earlier had\n" + .string "a whole bunch of different {POKEBLOCK}S.\p" + .string "Can you win if you had that many\n" + .string "of those things?$" + +LilycoveCity_ContestHall_Text_189299:: @ 8189299 + .string "Whoa, isn’t this place humongous!\p" + .string "The tension in the air... It’s not\n" + .string "like a CONTEST hall in the sticks.$" + +LilycoveCity_ContestHall_Text_189301:: @ 8189301 + .string "MC: Okay, SMART POKéMON and their\n" + .string "TRAINERS, are you ready?!\p" + .string "Give it your best showing!\n" + .string "Let’s appeal!$" + +LilycoveCity_ContestHall_Text_189366:: @ 8189366 + .string "JUDGE: Are you enjoying this CONTEST?\p" + .string "Come back with three friends, and\n" + .string "all of you may enter a CONTEST!$" + +LilycoveCity_ContestHall_Text_1893CE:: @ 81893CE + .string "Ayayayay...\n" + .string "I entered the wrong CONTEST.\p" + .string "I entered this tough POKéMON in the\n" + .string "SMARTNESS CONTEST...\p" + .string "Come on, wow them with a smart-looking\n" + .string "ROCK SMASH.$" + +LilycoveCity_ContestHall_Text_189463:: @ 8189463 + .string "I’ve spent many a year, and all my\n" + .string "wisdom besides, raising this POKéMON\l" + .string "to be smart.\p" + .string "It won’t be easily bested by some\n" + .string "young pup’s POKéMON.\p" + .string "My dear wife, are you seeing this?$" + +LilycoveCity_ContestHall_Text_189512:: @ 8189512 + .string "There it is!\p" + .string "If my POKéMON pulls a smart move next,\n" + .string "the audience’s excitement will peak!$" + +LilycoveCity_ContestHall_Text_18956B:: @ 818956B + .string "Oh, dear, no!\p" + .string "My darling ZUBAT’s LEECH LIFE is so\n" + .string "cute I kept using it over and over!\p" + .string "But these mean people don’t appreciate\n" + .string "it at all!$" + +LilycoveCity_ContestHall_Text_1895F3:: @ 81895F3 + .string "Kiyaaah! You’re beautiful, Grandpa!$" + +LilycoveCity_ContestHall_Text_189617:: @ 8189617 + .string "Even when TRAINERS enter the same\n" + .string "kind of POKéMON, they all seem to use\l" + .string "different moves for appeals.\p" + .string "It’s just like the way people have\n" + .string "different styles for battling.$" + +LilycoveCity_ContestHall_Text_1896BE:: @ 81896BE + .string "I think the POKéMON look smarter\n" + .string "than their TRAINERS. By a lot.$" + +LilycoveCity_ContestHall_Text_1896FE:: @ 81896FE + .string "When all’s said and done, I still love\n" + .string "SMARTNESS CONTESTS.\p" + .string "That intellectual green color...\n" + .string "It’s so... So... Cool.$" + +LilycoveCity_ContestHall_Text_189771:: @ 8189771 + .string "MC: Are you entering the BEAUTY\n" + .string "CONTEST, too? Good luck!$" + +LilycoveCity_ContestHall_Text_1897AA:: @ 81897AA + .string "JUDGE: Ah, every POKéMON here is a\n" + .string "model of pristine beauty!\p" + .string "Why, I almost forgot to score them!$" + +LilycoveCity_ContestHall_Text_18980B:: @ 818980B + .string "A POKéMON this beautiful...\n" + .string "There isn’t another one like it.\p" + .string "Everyone’s eyes will be glued to\n" + .string "my beauty.$" + +LilycoveCity_ContestHall_Text_189874:: @ 8189874 + .string "Waaaah!\p" + .string "I brushed and groomed my POKéMON\n" + .string "carefully for this CONTEST...\p" + .string "But I overdid it...\n" + .string "My POKéMON’s coat turned all scraggly...\p" + .string "What should I do?$" + +LilycoveCity_ContestHall_Text_18990A:: @ 818990A + .string "This AURORA BEAM is so dazzling,\n" + .string "the JUDGE won’t be able to see it.\p" + .string "Uh, wait a second...\n" + .string "That’ll be meaningless, then!$" + +LilycoveCity_ContestHall_Text_189981:: @ 8189981 + .string "This pretty POKéMON looks just like\n" + .string "me when I was younger.\p" + .string "Right when I said that, my husband\n" + .string "spewed the coffee he was drinking.\p" + .string "Did I say something funny?$" + +LilycoveCity_ContestHall_Text_189A1D:: @ 8189A1D + .string "You know, as a woman, if I win at a\n" + .string "BEAUTY CONTEST, sure it makes me\l" + .string "happy. More than usual, anyway.$" + +LilycoveCity_ContestHall_Text_189A82:: @ 8189A82 + .string "Wahahahah!\p" + .string "Will you take a gander at all those\n" + .string "pretty POKéMON!\l" + .string "I just love this sort of glitz!$" + +LilycoveCity_ContestHall_Text_189AE1:: @ 8189AE1 + .string "You can’t always win on just beauty\n" + .string "alone.\p" + .string "You have to groom your POKéMON so\n" + .string "it’s nice and glossy like mine.$" + +LilycoveCity_ContestHall_Text_189B4E:: @ 8189B4E + .string "MC: Uh-oh! Hello!\n" + .string "We’re in the middle of a CONTEST!\p" + .string "Please enter at our registration\n" + .string "counter and come out, okay?$" + +LilycoveCity_ContestHall_Text_189BBF:: @ 8189BBF + .string "JUDGE: Oh, such charming and cute\n" + .string "appeals!\p" + .string "Oh, my goodness! What a perfectly\n" + .string "adorable WATER SPORT appeal!$" + +LilycoveCity_ContestHall_Text_189C29:: @ 8189C29 + .string "Oh, no... My sweet AZURILL was\n" + .string "distracted by another POKéMON.$" + +LilycoveCity_ContestHall_Text_189C67:: @ 8189C67 + .string "My POKéMON has never won in a battle,\n" + .string "but put it in a CONTEST and look out!$" + +LilycoveCity_ContestHall_Text_189CB3:: @ 8189CB3 + .string "My POKéMON’s PETAL DANCE is a marvel\n" + .string "of elegance.\p" + .string "I won’t let anyone disturb its\n" + .string "performance.$" + +LilycoveCity_ContestHall_Text_189D11:: @ 8189D11 + .string "Everyone’s POKéMON are very cute.\p" + .string "However, if my POKéMON were to make\n" + .string "a cute appeal...\p" + .string "I’m sure that it would be so much \n" + .string "cuter than the others.$" + +LilycoveCity_ContestHall_Text_189DA2:: @ 8189DA2 + .string "My child is in this CONTEST.\p" + .string "Come on, dear. Go for it!\n" + .string "Your POKéMON is the best!$" + +LilycoveCity_ContestHall_Text_189DF3:: @ 8189DF3 + .string "I think that girl over there is the\n" + .string "cutest of the lot.\p" + .string "What’s that? They’re judging\n" + .string "POKéMON by their looks?$" + +LilycoveCity_ContestHall_Text_189E5F:: @ 8189E5F + .string "Ohh, seeing all these cute POKéMON,\n" + .string "they make we want to get my own!\p" + .string "I’m going to go catch some!$" + +UnknownString_8189EC0: @ 8189EC0 + .string "COOLNESS CONTEST STAGE\n" + .string "BE CHILLED BY COOL POKéMON!$" + +LilycoveCity_ContestHall_Text_189EF3:: @ 8189EF3 + .string "BEAUTY CONTEST STAGE\n" + .string "BE ALLURED BY BEAUTIFUL POKéMON!$" + +LilycoveCity_ContestHall_Text_189F29:: @ 8189F29 + .string "CUTENESS CONTEST STAGE\n" + .string "BE CHARMED BY CUTE POKéMON!$" + +LilycoveCity_ContestHall_Text_189F5C:: @ 8189F5C + .string "SMARTNESS CONTEST STAGE\n" + .string "BE IMPRESSED BY SMART POKéMON!$" + +UnknownString_8189F93: @ 8189F93 + .string "TOUGHNESS CONTEST STAGE\n" + .string "BE THRILLED BY TOUGH POKéMON!$" diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/maps/LilycoveCity_ContestLobby/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_ContestLobby/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index b44590d65..b44590d65 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 5bf98a32b..37415383b 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,9 +1,9 @@ LilycoveCity_ContestLobby:: @ 8306590 - .4byte LilycoveCity_ContestLobby_MapAttributes + .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 105 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/maps/LilycoveCity_ContestLobby/map.bin deleted file mode 100644 index 3d8c96b04..000000000 --- a/data/maps/LilycoveCity_ContestLobby/map.bin +++ /dev/null @@ -1 +0,0 @@ -[\]:;M[\]c6debbBCbbc6debbbbT 2!2!2222222U2!2!2!2!2!2!2!2!2!2!2"2(2`2`2f2`2`2`2`2`2`2`2`2`2`2*2(2`2`22_2_2_2_2_2_2_2g2`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`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2
\ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc new file mode 100644 index 000000000..b9297628a --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -0,0 +1,766 @@ +LilycoveCity_ContestLobby_MapScripts:: @ 8158866 + map_script 3, LilycoveCity_ContestLobby_MapScript1_158871 + map_script 2, LilycoveCity_ContestLobby_MapScript2_158877 + .byte 0 + +LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871 + call LilycoveCity_ContestLobby_EventScript_1AE188 + end + +LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B + .2byte 0 + +LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 + end + +LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 + lockall + addobject 4 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B + waitmovement 4 + applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_18890F, 4 + lockall + fadescreen 1 + drawcontestwinner 0 + lockall + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE + compare RESULT, NO + goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE + msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 + closemessage + special sub_80C4CEC + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 + specialvar RESULT, GiveMonArtistRibbon + compare RESULT, 1 + call_if_eq LilycoveCity_ContestLobby_EventScript_158948 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 + waitmovement 0 + removeobject 4 + call LilycoveCity_ContestLobby_EventScript_158994 + call LilycoveCity_ContestLobby_EventScript_1589EA + releaseall + end + +LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE + msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 + closemessage + applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 + waitmovement 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 + removeobject 4 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 + incrementgamestat GAME_STAT_RECEIVED_RIBBONS + special sub_80C4858 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E + waitmovement 0 + playse SE_PIN + applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 + waitmovement 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 + playfanfare MUS_FANFA4 + msgbox LilycoveCity_ContestLobby_Text_188C03, 4 + waitfanfare + msgbox LilycoveCity_ContestLobby_Text_188C19, 4 + msgbox LilycoveCity_ContestLobby_Text_188C32, 4 + closemessage + return + +LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 + case 1, LilycoveCity_ContestLobby_EventScript_1589D6 + case 2, LilycoveCity_ContestLobby_EventScript_1589DA + case 3, LilycoveCity_ContestLobby_EventScript_1589DE + case 4, LilycoveCity_ContestLobby_EventScript_1589E2 + case 5, LilycoveCity_ContestLobby_EventScript_1589E6 + return + +LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + return + +LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + return + +LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + return + +LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + return + +LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + return + +LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA + switch CONTEST_CATEGORY + case 0, LilycoveCity_ContestLobby_EventScript_158A27 + case 1, LilycoveCity_ContestLobby_EventScript_158A2B + case 2, LilycoveCity_ContestLobby_EventScript_158A2F + case 3, LilycoveCity_ContestLobby_EventScript_158A33 + case 4, LilycoveCity_ContestLobby_EventScript_158A37 + return + +LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27 + setflag FLAG_COOL_PAINTING_MADE + return + +LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B + setflag FLAG_BEAUTY_PAINTING_MADE + return + +LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F + setflag FLAG_CUTE_PAINTING_MADE + return + +LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33 + setflag FLAG_SMART_PAINTING_MADE + return + +LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 + setflag FLAG_TOUGH_PAINTING_MADE + return + +LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement + +LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C + walk_in_place_fastest_left + end_movement + +LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E + walk_down + walk_down + walk_down + end_movement + +LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_right + end_movement + +LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 + end + +LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A + lockall + addobject 11 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 + waitmovement 11 + applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_18890F, 4 + lockall + fadescreen 1 + drawcontestwinner 0 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE + compare RESULT, NO + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 + end + +LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE + msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 + closemessage + special sub_80C4CEC + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 + specialvar RESULT, GiveMonArtistRibbon + compare RESULT, 1 + call_if_eq LilycoveCity_ContestLobby_EventScript_158B18 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D + waitmovement 0 + removeobject 11 + call LilycoveCity_ContestLobby_EventScript_158994 + call LilycoveCity_ContestLobby_EventScript_1589EA + releaseall + end + +LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE + msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 + closemessage + applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D + waitmovement 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 + removeobject 11 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 + incrementgamestat GAME_STAT_RECEIVED_RIBBONS + special sub_80C4858 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 + waitmovement 0 + playse SE_PIN + applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 + waitmovement 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 + playfanfare MUS_FANFA4 + msgbox LilycoveCity_ContestLobby_Text_188C03, 4 + waitfanfare + msgbox LilycoveCity_ContestLobby_Text_188C19, 4 + msgbox LilycoveCity_ContestLobby_Text_188C32, 4 + closemessage + return + +LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76 + walk_in_place_fastest_right + end_movement + +LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78 + walk_down + walk_down + walk_down + end_movement + +LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left + end_movement + +LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 + lockall + checkitem ITEM_CONTEST_PASS, 1 + compare RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE + message LilycoveCity_ContestLobby_Text_18848C + waitmessage + setflag FLAG_TEMP_2 + goto LilycoveCity_ContestLobby_EventScript_158BF0 + end + +LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE + message LilycoveCity_ContestLobby_Text_188584 + waitmessage + goto LilycoveCity_ContestLobby_EventScript_158BF0 + end + +LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA + msgbox LilycoveCity_ContestLobby_Text_1A63F4, 4 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 + msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 + call S_DoSaveDialog + erasebox 0, 0, 15, 9 + compare RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 + setflag FLAG_TEMP_3 + return + +LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 + multichoice 0, 0, 2, 0 + switch RESULT + case 0, LilycoveCity_ContestLobby_EventScript_158CEA + case 1, LilycoveCity_ContestLobby_EventScript_158C27 + case 2, LilycoveCity_ContestLobby_EventScript_158C35 + case 127, LilycoveCity_ContestLobby_EventScript_158C35 + end + +LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27 + msgbox LilycoveCity_ContestLobby_Text_1885A7, 4 + goto LilycoveCity_ContestLobby_EventScript_158B85 + end + +LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 + msgbox LilycoveCity_ContestLobby_Text_188559, 4 + releaseall + clearflag FLAG_TEMP_3 + end + +LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 + msgbox LilycoveCity_ContestLobby_Text_188703, 4 + setvar CONTEST_RANK, 0 + choosecontestmon + compare VAR_SPECIAL_4, 255 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA + special sub_80C43F4 + compare RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 + compare RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 + compare RESULT, 2 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 + compare RESULT, 3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 + compare RESULT, 4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 + end + +LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96 + msgbox LilycoveCity_ContestLobby_Text_1A664A, 4 + goto LilycoveCity_ContestLobby_EventScript_158C42 + end + +LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4 + msgbox LilycoveCity_ContestLobby_Text_1A669F, 4 + goto LilycoveCity_ContestLobby_EventScript_158C42 + end + +LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 + msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4 + goto LilycoveCity_ContestLobby_EventScript_158C42 + end + +LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_4 + message LilycoveCity_ContestLobby_Text_1A67A3 + waitmessage + yesnobox 20, 8 + switch RESULT + case 0, LilycoveCity_ContestLobby_EventScript_158C42 + case 1, LilycoveCity_ContestLobby_EventScript_158D24 + end + +LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA + call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4 + message LilycoveCity_ContestLobby_Text_1886DC + waitmessage + multichoice 0, 0, 4, 0 + switch RESULT + case 5, LilycoveCity_ContestLobby_EventScript_158C35 + case 127, LilycoveCity_ContestLobby_EventScript_158C35 + copyvar CONTEST_CATEGORY, RESULT + goto LilycoveCity_ContestLobby_EventScript_158C42 + end + +LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 + message LilycoveCity_ContestLobby_Text_1887C7 + waitmessage + copyvar VAR_SPECIAL_4, RESULT + special sub_808363C + waitstate + compare RESULT, 3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 + compare RESULT, 5 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 + compare RESULT, 6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 + messageautoscroll LilycoveCity_ContestLobby_Text_18872A + waitmessage + contestlinktransfer + switch VAR_SPECIAL_4 + case 0, LilycoveCity_ContestLobby_EventScript_158DD1 + case 1, LilycoveCity_ContestLobby_EventScript_158D82 + case 2, LilycoveCity_ContestLobby_EventScript_158DC3 + end + +LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82 + msgbox LilycoveCity_ContestLobby_Text_188750, 4 + goto LilycoveCity_ContestLobby_EventScript_158CEA + end + +LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 + special CloseLink + msgbox LilycoveCity_ContestLobby_Text_18878D, 4 + closemessage + releaseall + clearflag FLAG_TEMP_3 + end + +LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 + special CloseLink + msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 + closemessage + releaseall + clearflag FLAG_TEMP_3 + end + +LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 + special CloseLink + msgbox LilycoveCity_ContestLobby_Text_18881F, 4 + closemessage + releaseall + clearflag FLAG_TEMP_3 + end + +LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 + msgbox LilycoveCity_ContestLobby_Text_18873A, 4 + goto LilycoveCity_ContestLobby_EventScript_158CEA + end + +LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 + special sub_80C496C + addvar VAR_SPECIAL_4, 1 + buffernumberstring 1, 32772 + messageautoscroll LilycoveCity_ContestLobby_Text_188845 + waitmessage + addvar VAR_SPECIAL_4, -1 + goto LilycoveCity_ContestLobby_EventScript_158DEE + end + +LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE + call LilycoveCity_ContestLobby_EventScript_158E0B + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 + special sub_80C4F70 + setvar VAR_CONTEST_LOCATION, 5 + setvar CONTEST_RANK, 3 + call LilycoveCity_ContestLobby_EventScript_158F08 + end + +LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B + lockall + messageautoscroll LilycoveCity_ContestLobby_Text_1888C6 + waitmessage + delay 20 + closemessage + applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C + waitmovement 0 + playse SE_HASHI + setmetatile 9, 2, 545, 1 + setmetatile 9, 3, 609, 1 + special DrawWholeMapView + applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 + waitmovement 0 + playse SE_HASHI + setmetatile 9, 2, 721, 1 + setmetatile 9, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 + waitmovement 0 + messageautoscroll LilycoveCity_ContestLobby_Text_1A6832 + waitmessage + delay 20 + closemessage + applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4 + applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E + waitmovement 0 + releaseall + return + +LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99 + walk_in_place_fastest_right + walk_right + end_movement + +LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C + walk_right + walk_right + walk_in_place_fastest_down + end_movement + +LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0 + walk_down + walk_down + walk_in_place_fastest_up + end_movement + +LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4 + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE + walk_in_place_fastest_left + end_movement + +LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 + specialvar RESULT, sub_80C5044 + compare RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 + setvar VAR_SPECIAL_B, 8 + setvar CONTEST_RANK, 3 + call LilycoveCity_ContestLobby_EventScript_1A4E92 + call LilycoveCity_ContestLobby_EventScript_158F86 + special SetContestTrainerGfxIds + call LilycoveCity_ContestLobby_EventScript_15FBDB + setvar VAR_CONTEST_LOCATION, 4 + call LilycoveCity_ContestLobby_EventScript_158F08 + waitstate + end + +LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 + giveitem ITEM_CONTEST_PASS, 1 + setvar VAR_SPECIAL_B, 8 + setvar CONTEST_RANK, 3 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 + setflag FLAG_SYS_RIBBON_GET + end + +LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 + switch CONTEST_CATEGORY + case 0, LilycoveCity_ContestLobby_EventScript_158F45 + case 1, LilycoveCity_ContestLobby_EventScript_158F52 + case 2, LilycoveCity_ContestLobby_EventScript_158F5F + case 3, LilycoveCity_ContestLobby_EventScript_158F6C + case 4, LilycoveCity_ContestLobby_EventScript_158F79 + return + +LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 + special sub_8081334 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 + special sub_8081334 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 + special sub_8081334 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 + special sub_8081334 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 + special sub_8081334 + waitstate + return + +LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 + lockall + applymovement 1, LilycoveCity_ContestLobby_Movement_15900B + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 + special DrawWholeMapView + applymovement 1, LilycoveCity_ContestLobby_Movement_15900F + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 1, LilycoveCity_ContestLobby_Movement_15901C + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_159008 + waitmovement 0 + msgbox LilycoveCity_ContestLobby_Text_1A6832, 4 + closemessage + applymovement 1, LilycoveCity_ContestLobby_Movement_159013 + applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE + waitmovement 0 + releaseall + return + +LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +LilycoveCity_ContestLobby_Movement_159008:: @ 8159008 + walk_in_place_fastest_left + walk_left + end_movement + +LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B + walk_left + walk_left + walk_in_place_fastest_down + end_movement + +LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F + walk_down + walk_down + walk_in_place_fastest_up + end_movement + +LilycoveCity_ContestLobby_Movement_159013:: @ 8159013 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C + walk_in_place_fastest_right + end_movement + +LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E + msgbox LilycoveCity_ContestLobby_Text_188D3C, 2 + end + +LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 + goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039 + msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 + end + +LilycoveCity_ContestLobby_EventScript_159039:: @ 8159039 + msgbox LilycoveCity_ContestLobby_Text_188E47, 2 + end + +LilycoveCity_ContestLobby_EventScript_159042:: @ 8159042 + msgbox LilycoveCity_ContestLobby_Text_188F07, 2 + end + +LilycoveCity_ContestLobby_EventScript_15904B:: @ 815904B + msgbox LilycoveCity_ContestLobby_Text_188F81, 2 + end + +LilycoveCity_ContestLobby_EventScript_159054:: @ 8159054 + msgbox LilycoveCity_ContestLobby_Text_188FE3, 2 + end + +LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D + msgbox LilycoveCity_ContestLobby_Text_18904D, 2 + end + +LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066 + lockall + fadescreen 1 + drawcontestwinner 6 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D + lockall + fadescreen 1 + drawcontestwinner 7 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074 + lockall + fadescreen 1 + drawcontestwinner 8 + releaseall + end + +LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B + msgbox LilycoveCity_ContestLobby_Text_1B7225, 2 + end + +LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084 + msgbox LilycoveCity_ContestLobby_Text_1B7241, 2 + end + +LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D +SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D + lockall + special ShowBerryBlenderRecordWindow + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/LilycoveCity_ContestLobby/text.inc b/data/maps/LilycoveCity_ContestLobby/text.inc new file mode 100644 index 000000000..d173519e8 --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/text.inc @@ -0,0 +1,186 @@ +LilycoveCity_ContestLobby_Text_18848C:: @ 818848C + .string "I only register four players for\n" + .string "POKéMON CONTESTS.\p" + .string "If three other players link up, all\n" + .string "four may enter the same CONTEST.\p" + .string "Would you like to take part?$" + +LilycoveCity_ContestLobby_Text_188521:: @ 8188521 + .string "Before entering a CONTEST, your\n" + .string "progress will be saved.$" + +FallarborTown_ContestLobby_Text_188559:: @ 8188559 +LilycoveCity_ContestLobby_Text_188559:: @ 8188559 + .string "We hope you will participate another\n" + .string "time.$" + +LilycoveCity_ContestLobby_Text_188584:: @ 8188584 + .string "Would you like to enter a CONTEST?$" + +LilycoveCity_ContestLobby_Text_1885A7:: @ 81885A7 + .string "When four players are ready, connect\n" + .string "over a Game Link cable, and register\l" + .string "with me, please.\p" + .string "Please choose the same CONTEST\n" + .string "as your fellow contestants.\p" + .string "The CONTEST begins as soon as all\n" + .string "players register their entry.\p" + .string "After that, the usual CONTEST rules\n" + .string "apply.$" + +UnknownString_81886A8: @ 81886A8 + .string "Once you have linked up, please choose\n" + .string "the CONTEST.$" + +LilycoveCity_ContestLobby_Text_1886DC:: @ 81886DC + .string "Which CONTEST would you like to enter?$" + +LilycoveCity_ContestLobby_Text_188703:: @ 8188703 + .string "Which POKéMON would you like to enter?$" + +LilycoveCity_ContestLobby_Text_18872A:: @ 818872A + .string "Transmitting...$" + +LilycoveCity_ContestLobby_Text_18873A:: @ 818873A + .string "Transmission error...$" + +LilycoveCity_ContestLobby_Text_188750:: @ 8188750 + .string "You may have chosen a different\n" + .string "CONTEST than another player.$" + +LilycoveCity_ContestLobby_Text_18878D:: @ 818878D + .string "You may have made a different\n" + .string "choice than another player.$" + +LilycoveCity_ContestLobby_Text_1887C7:: @ 81887C7 + .string "Please wait.\n" + .string "Press the B Button to cancel...$" + +LilycoveCity_ContestLobby_Text_1887F4:: @ 81887F4 + .string "We hope you will participate\n" + .string "another time.$" + +LilycoveCity_ContestLobby_Text_18881F:: @ 818881F + .string "Transmission error.\n" + .string "Please try again.$" + +LilycoveCity_ContestLobby_Text_188845:: @ 8188845 + .string "Your POKéMON will be entered in\n" + .string "the CONTEST.\p" + .string "Your POKéMON is Entry No. {STR_VAR_2}.$" + +UnknownString_8188890: @ 8188890 + .string "Entry No. {STR_VAR_2} is assigned this color\n" + .string "for this CONTEST.$" + +LilycoveCity_ContestLobby_Text_1888C6:: @ 81888C6 + .string "The CONTEST will begin shortly.$" + +UnknownString_81888E6: @ 81888E6 + .string "Please come through this way.\n" + .string "Good luck!$" + +LilycoveCity_ContestLobby_Text_18890F:: @ 818890F + .string "Congratulations!\p" + .string "I did a painting of your POKéMON to\n" + .string "commemorate its victory...\p" + .string "Well, your POKéMON’s appeals were\n" + .string "so fantastic, it spurred me into\l" + .string "painting better than I usually do.\l" + .string "Look, see?$" + +UnknownString_81889D0: @ 81889D0 + .string "The screen switches to display the\n" + .string "painting.$" + +LilycoveCity_ContestLobby_Text_1889FD:: @ 81889FD + .string "What do you think? I’m confident in\n" + .string "what I’ve done, but do you like it?\p" + .string "A work of this caliber, it wouldn’t look\n" + .string "out of place in an art museum.\p" + .string "Huh? An art museum really is looking\n" + .string "for paintings?\p" + .string "Do you think I should take this there?$" + +LilycoveCity_ContestLobby_Text_188AE8:: @ 8188AE8 + .string "What, really? Then, sure, I will take\n" + .string "this painting there right now.\p" + .string "I’ll give it a proper title, too.\p" + .string "I hope they’ll like it and consider\n" + .string "exhibiting this.\p" + .string "Please check if they did accept this.\n" + .string "Thank you!$" + +LilycoveCity_ContestLobby_Text_188BB5:: @ 8188BB5 + .string "Oh, that’s right!\p" + .string "As a memento of me painting your\n" + .string "POKéMON, please take this.$" + +LilycoveCity_ContestLobby_Text_188C03:: @ 8188C03 + .string "{PLAYER} received a RIBBON.$" + +LilycoveCity_ContestLobby_Text_188C19:: @ 8188C19 + .string "{PLAYER} put the RIBBON on\n" + .string "{STR_VAR_1}.$" + +LilycoveCity_ContestLobby_Text_188C32:: @ 8188C32 + .string "Okay, see you!$" + +LilycoveCity_ContestLobby_Text_188C41:: @ 8188C41 + .string "Oh... Then, I guess I’ll just take\n" + .string "this home with me...\p" + .string "But, you know, I would like to take\n" + .string "this to the art museum... Okay?$" + +LilycoveCity_ContestLobby_Text_188CBD:: @ 8188CBD + .string "Oh, fine, that’s the way it is.\n" + .string "I will hang this in my own house.\p" + .string "I’ll just have to try harder next time.\n" + .string "Well, be seeing you.$" + +LilycoveCity_ContestLobby_Text_188D3C:: @ 8188D3C + .string "Hoo, boy... Master Rank CONTESTS,\n" + .string "here I come.\p" + .string "The world will know that my dearest\n" + .string "POKéMON is the cutest being in all\l" + .string "existence. The time has come!\l" + .string "Uheheheh.$" + +LilycoveCity_ContestLobby_Text_188DDA:: @ 8188DDA + .string "You can see a whole variety of\n" + .string "POKéMON here.\p" + .string "That’s why I make this place a regular\n" + .string "part of my daily stroll.$" + +LilycoveCity_ContestLobby_Text_188E47:: @ 8188E47 + .string "Oh, dear! They still haven’t given\n" + .string "you a CONTEST PASS?\p" + .string "You should go get one in VERDANTURF\n" + .string "TOWN right away.\p" + .string "It’s such a thrill having others see\n" + .string "POKéMON that you’ve raised with care\l" + .string "and love.$" + +LilycoveCity_ContestLobby_Text_188F07:: @ 8188F07 + .string "When you get up to the Master Rank\n" + .string "CONTESTS, you get your eyes opened\l" + .string "to striking POKéMON that just scream\l" + .string "to be painted.$" + +LilycoveCity_ContestLobby_Text_188F81:: @ 8188F81 + .string "The TOUGHNESS CONTEST is like\n" + .string "extreme, man!\p" + .string "Those muscular appeals...\n" + .string "Cascading sweat... I swoon!$" + +LilycoveCity_ContestLobby_Text_188FE3:: @ 8188FE3 + .string "Day in and day out, I lavished my care\n" + .string "on this POKéMON.\p" + .string "Its condition is peaking.\n" + .string "Today, victory is mine!$" + +LilycoveCity_ContestLobby_Text_18904D:: @ 818904D + .string "I made {POKEBLOCK}S with Mom, Dad and\n" + .string "Big Sister. They turned out great!\p" + .string "I bet you can make smoother, better\n" + .string "{POKEBLOCK}S if you have more people.$" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index eee09c890..eee09c890 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 141fda863..15a8aa7d0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_1F_Layout .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 300 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin deleted file mode 100644 index 5242f8e57..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -a 2!2!2!2!2222!2!2@22!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2D2N_D2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333
\ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc new file mode 100644 index 000000000..c3eca04f4 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -0,0 +1,74 @@ +LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 + .byte 0 + +LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 + lockall + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4 + closemessage + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, 4 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4 + closemessage + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, 4 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4 + closemessage + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D + lockall + playse SE_PIN + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 + waitmovement 0 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4 + closemessage + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C + waitmovement 0 + release + end + +LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395 + face_right + lock_facing_direction + walk_left + unlock_facing_direction + end_movement + +LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A + walk_up + end_movement + +LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C + face_down + walk_down + face_up + end_movement diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc new file mode 100644 index 000000000..7d6e4942f --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc @@ -0,0 +1,53 @@ +LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 + .string "Hm, so they doubled the guests by\n" + .string "using POKéMON as attractions?\p" + .string "Hm, well, maybe I should make a cute\n" + .string "POKéMON our inn’s mascot.\p" + .string "I wonder if that will attract more\n" + .string "guests to stay with us?$" + +LilycoveCity_CoveLilyMotel_1F_Text_186C2B:: @ 8186C2B + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV!\p" + .string "Since that TEAM {EVIL_TEAM} came to town,\n" + .string "the tourists have been staying away.$" + +LilycoveCity_CoveLilyMotel_1F_Text_186CA6:: @ 8186CA6 + .string "Hey, down in front!\n" + .string "I can’t see the TV!$" + +LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE + .string "Amazing! You’re telling me a POKéMON\n" + .string "found someone’s lost item?\p" + .string "That’s something. If we had some smart\n" + .string "POKéMON like that...\p" + .string "We could recover anything that our\n" + .string "guests mislaid...$" + +LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV!\p" + .string "I heard that someone busted the\n" + .string "TEAM {EVIL_TEAM} HIDEOUT.\p" + .string "Thanks to that, we just booked a\n" + .string "reservation from a big group.\p" + .string "It was a company called... Uh...\n" + .string "GAME something...$" + +LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 + .string "Amazing! A house-sitting POKéMON\n" + .string "caught a burglar?\p" + .string "That’s something. If we had a tough\n" + .string "POKéMON as a security guard...\p" + .string "We would be able to provide our guests\n" + .string "with greater safety.$" + +LilycoveCity_CoveLilyMotel_1F_Text_186F09:: @ 8186F09 + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV.\p" + .string "Oh, yes. A big group of guests arrived\n" + .string "a little while ago.\p" + .string "They booked in as GAME FREAK, so I\n" + .string "guess they must make games.\p" + .string "Uh-oh, I’d better get working on\n" + .string "their dinner!$" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index 4469cddb0..4469cddb0 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 2d6f9de4b..a39f3acf0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_2F_Layout .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 301 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin deleted file mode 100644 index 4484b5b55..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -a 2!2!2!2!2!2!2!22222!2)2N_D2)2)2D2NOD2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2)2N_)2)2!2D2VWD2)2)2D2VW)2)2!2)2)2)2)2)2)2)2)2)2)2)2
\ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc new file mode 100644 index 000000000..5bfc6a5e7 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -0,0 +1,53 @@ +LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 + .byte 0 + +LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 + lock + faceplayer + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + specialvar RESULT, CompletedHoennPokedex + compare RESULT, 1 + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 + release + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, 4 + return + +LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 + setflag FLAG_TEMP_2 + playfanfare MUS_FANFA4 + waitfanfare + goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD + message LilycoveCity_CoveLilyMotel_2F_Text_18708F + waitmessage + call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 + special ScrSpecial_ShowDiploma + waitstate + release + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE + msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, 2 + end + +LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2 + end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc new file mode 100644 index 000000000..0306db9e9 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc @@ -0,0 +1,45 @@ +LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 + .string "I’m the GAME DESIGNER.\p" + .string "Oh, is that right?\n" + .string "You’re working on a POKéDEX?\p" + .string "It’s tough trying to complete it,\n" + .string "but don’t give up.\p" + .string "If you do complete it, please come\n" + .string "show me.$" + +LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F + .string "Wow! That’s awesome!\n" + .string "Yep, it’s totally awesome!\p" + .string "This POKéDEX is completely filled!\n" + .string "You really must love POKéMON!\p" + .string "I’m so impressed!\p" + .string "Let me give you something in\n" + .string "recognition of your feat!$" + +LilycoveCity_CoveLilyMotel_2F_Text_187149:: @ 8187149 + .string "Me? You’re talking to me?\n" + .string "I’m the PROGRAMMER.\p" + .string "I wonder what the SLOTS are\n" + .string "like here.$" + +LilycoveCity_CoveLilyMotel_2F_Text_18719E:: @ 818719E + .string "I’m the GRAPHIC ARTIST! Aren’t the\n" + .string "POKéMON of HOENN interesting?$" + +LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF + .string "The girl TUBERS, they’re cute, hey?\n" + .string "To battle against a cute TUBER...\p" + .string "Whoop, it drives me wild!\p" + .string "And the TWINS! Aren’t they cute?\n" + .string "A 2-on-2 battle with TWINS...\p" + .string "Whoop, it’s unbearably fun!$" + +LilycoveCity_CoveLilyMotel_2F_Text_18729A:: @ 818729A + .string "The sea breeze tickles my heart.\n" + .string "It feels wonderful here!$" + +LilycoveCity_CoveLilyMotel_2F_Text_1872D4:: @ 81872D4 + .string "You never know when and where\n" + .string "people will challenge you.\p" + .string "That’s why I never leave home without\n" + .string "my GAME BOY ADVANCE.$" diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin +++ /dev/null diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index eca98b599..eca98b599 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 3f1a8ada9..65b573d92 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes + .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 274 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin deleted file mode 100644 index 1b3bf23c0..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin +++ /dev/null @@ -1 +0,0 @@ -hiijpqqrxyyz\2]2]2]2d2e2e2f2d2O2W2f2
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc new file mode 100644 index 000000000..f895ea99d --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -0,0 +1,83 @@ +LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B + .byte 0 + +LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C + lock + faceplayer + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR + special DisplayCurrentElevatorFloor + message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 + waitmessage + multichoice 0, 0, 57, 0 + switch RESULT + case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402 + case 1, LilycoveCity_DepartmentStoreElevator_EventScript_15A425 + case 2, LilycoveCity_DepartmentStoreElevator_EventScript_15A448 + case 3, LilycoveCity_DepartmentStoreElevator_EventScript_15A46B + case 4, LilycoveCity_DepartmentStoreElevator_EventScript_15A48E + case 127, LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 + compare VAR_DEPT_STORE_FLOOR, 0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + setvar VAR_DEPT_STORE_FLOOR, 0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 + compare VAR_DEPT_STORE_FLOOR, 1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + setvar VAR_DEPT_STORE_FLOOR, 1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 + compare VAR_DEPT_STORE_FLOOR, 2 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + setvar VAR_DEPT_STORE_FLOOR, 2 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 + compare VAR_DEPT_STORE_FLOOR, 3 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + setvar VAR_DEPT_STORE_FLOOR, 3 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 + compare VAR_DEPT_STORE_FLOOR, 4 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + setvar VAR_DEPT_STORE_FLOOR, 4 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 + erasebox 0, 0, 29, 19 + release + end + +LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 + erasebox 0, 0, 29, 19 + applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 + waitmovement 0 + special ShakeScreenInElevator + waitstate + setflag FLAG_TEMP_2 + return + +LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF + special SetDepartmentStoreFloorVar + return diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 71d34fa68..71d34fa68 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 292c621d3..0131ea7f1 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes + .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 263 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin deleted file mode 100644 index e9125baf0..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin +++ /dev/null @@ -1 +0,0 @@ -&oo' .S2S2S2S2S2S2S2S2wwS2NO5/ 622J2J2J2J2J2J2M2M23VW=z'6J2J2J2J2J2J2J2J2J2^_ET2S2/622J2J2J2J2J2J2J2J2J2M2M2M2M2676J2J266J2J266J2J2J2J2J267>U2[2[2[2[2[2[2[2[2[2[2[2[2[2[2[2?FccccccccccccccccG
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc new file mode 100644 index 000000000..e2274110c --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -0,0 +1,202 @@ +LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F + map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145 + .byte 0 + +LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 + getpricereduction 3 + compare RESULT, 1 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + compare RESULT, 0 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F + clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163 + setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 + lock + faceplayer + message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 + waitmessage + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations + msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180 + .2byte DECOR_MUD_BALL + .2byte DECOR_FENCE_LENGTH + .2byte DECOR_FENCE_WIDTH + .2byte DECOR_TIRE + .2byte DECOR_BREAKABLE_DOOR + .2byte DECOR_SOLID_BOARD + .2byte DECOR_SAND_ORNAMENT + .2byte DECOR_STAND + .2byte DECOR_SLIDE + .2byte DECOR_TV + .2byte DECOR_ROUND_TV + .2byte DECOR_CUTE_TV + .2byte DECOR_WAILMER_DOLL + .2byte DECOR_RHYDON_DOLL + .2byte DECOR_NONE + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 + lock + faceplayer + getpricereduction 3 + compare RESULT, 1 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA:: @ 815A1BA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C685, 4 + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4:: @ 815A1C4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C70E, 2 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD + lockall + message LilycoveCity_DepartmentStoreRooftop_Text_18C72B + waitmessage + showmoneybox 0, 0 + nop + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE + multichoice 16, 0, 42, 0 + copyvar VAR_TEMP_1, RESULT + switch VAR_TEMP_1 + case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C + case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 + case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7C3, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C + setvar VAR_TEMP_0, ITEM_FRESH_WATER + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 + setvar VAR_TEMP_0, ITEM_SODA_POP + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 + setvar VAR_TEMP_0, ITEM_LEMONADE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D:: @ 815A23D + checkmoney 0xc8, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A244:: @ 815A244 + checkmoney 0x12c, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B + checkmoney 0x15e, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252 + takemoney 0xc8, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259 + takemoney 0x12c, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 + takemoney 0x15e, 0 + return + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 + compare VAR_TEMP_1, 0 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + compare VAR_TEMP_1, 1 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + compare VAR_TEMP_1, 2 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + compare RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A + checkitemspace VAR_TEMP_0, 1 + compare RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + compare VAR_TEMP_1, 0 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + compare VAR_TEMP_1, 1 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + compare VAR_TEMP_1, 2 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + updatemoneybox 0, 0 + nop + bufferitemname 0, VAR_TEMP_0 + playse SE_JIHANKI + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 + bufferstdstring 2, 14 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 + random 64 + compare RESULT, 0 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + checkitemspace VAR_TEMP_0, 1 + compare RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + playse SE_JIHANKI + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 + bufferstdstring 2, 14 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 + random 64 + compare RESULT, 0 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + checkitemspace VAR_TEMP_0, 1 + compare RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + playse SE_JIHANKI + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 + bufferstdstring 2, 14 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E + message LilycoveCity_DepartmentStoreRooftop_Text_18C72B + waitmessage + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A:: @ 815A37A + msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7AF, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C79, 4 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 + hidemoneybox 0, 0 + releaseall + end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc new file mode 100644 index 000000000..62eb03bc1 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc @@ -0,0 +1,33 @@ +LilycoveCity_DepartmentStoreRooftop_Text_18C61F:: @ 818C61F + .string "Don’t they have set dates for their\n" + .string "clear-out sales?\p" + .string "I watch TV, but they never show any\n" + .string "commercials.$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C685:: @ 818C685 + .string "Yes! I’ve been waiting a long time for\n" + .string "this clear-out sale.\p" + .string "They have items that you can only get\n" + .string "here. I’m going to load up, that I am!$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C70E:: @ 818C70E + .string "Ohh... I’m bone-dry thirsty!$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C72B:: @ 818C72B + .string "It’s a VENDING MACHINE.\n" + .string "Which drink would you like?$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C75F:: @ 818C75F + .string "Clang!\p" + .string "A can of {STR_VAR_1} dropped down.$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C780:: @ 818C780 + .string "Clang!\p" + .string "Score! An extra can of {STR_VAR_1}\n" + .string "dropped down!$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C7AF:: @ 818C7AF + .string "Not enough money...$" + +LilycoveCity_DepartmentStoreRooftop_Text_18C7C3:: @ 818C7C3 + .string "Decided against buying a drink.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/maps/LilycoveCity_DepartmentStore_1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin +++ /dev/null diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index d5170d4c1..d5170d4c1 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index ecfb77604..6f5da636f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes + .4byte LilycoveCity_DepartmentStore_1F_Layout .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 258 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/maps/LilycoveCity_DepartmentStore_1F/map.bin deleted file mode 100644 index 2d3d15360..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -|}~
Px2222p2p22222x2p2p2p2p2p22h2h2h2h2h22h2h2h2n2h22g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h22g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc new file mode 100644 index 000000000..f6b23bc05 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -0,0 +1,144 @@ +LilycoveCity_DepartmentStore_1F_MapScripts:: @ 8159D54 + .byte 0 + +LilycoveCity_DepartmentStore_1F_EventScript_159D55:: @ 8159D55 + msgbox LilycoveCity_DepartmentStore_1F_Text_18BFB5, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E + lock + faceplayer + dodailyevents + compare VAR_LOTTERY_PRIZE, 0 + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 + goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 + setflag FLAG_DAILY_PICKED_LOTTO_TICKET + message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 + waitmessage + special RetrieveLotteryNumber + copyvar VAR_SPECIAL_8, RESULT + special BufferLottoTicketNumber + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 + waitmovement 0 + playse SE_PC_ON + special DoLotteryCornerComputerEffect + special PickLotteryCornerTicket + delay 220 + special EndLotteryCornerComputerEffect + delay 10 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 + waitmovement 0 + compare VAR_SPECIAL_4, 0 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 + incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY + compare VAR_SPECIAL_6, 0 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A + compare VAR_SPECIAL_6, 1 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43 + bufferitemname 0, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 1 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78 + compare VAR_SPECIAL_4, 2 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81 + compare VAR_SPECIAL_4, 3 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A + compare VAR_SPECIAL_4, 4 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 + giveitem_std VAR_SPECIAL_5 + compare RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C + goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E + end + +LilycoveCity_DepartmentStore_1F_EventScript_159E3A:: @ 8159E3A + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4D7D, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_159E43:: @ 8159E43 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4DD1, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_159E4C:: @ 8159E4C + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C6A, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_159E56:: @ 8159E56 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C85, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_159E60:: @ 8159E60 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E27, 4 + goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E + end + +LilycoveCity_DepartmentStore_1F_EventScript_159E6E:: @ 8159E6E + msgbox LilycoveCity_DepartmentStore_1F_Text_1C501C, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_159E78:: @ 8159E78 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E4F, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_159E81:: @ 8159E81 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E92, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_159E8A:: @ 8159E8A + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4ED8, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F1C, 4 + return + +LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C + copyvar VAR_LOTTERY_PRIZE, VAR_SPECIAL_5 + goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + end + +LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F77, 4 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 + giveitem_std VAR_LOTTERY_PRIZE + compare RESULT, 0 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + setvar VAR_LOTTERY_PRIZE, 0 + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_159ED7:: @ 8159ED7 + msgbox LilycoveCity_DepartmentStore_1F_Text_18BFDB, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_159EE0:: @ 8159EE0 + msgbox LilycoveCity_DepartmentStore_1F_Text_18C044, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_159EE9:: @ 8159EE9 + msgbox LilycoveCity_DepartmentStore_1F_Text_18C07A, 2 + end + +LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 + lock + faceplayer + waitse + playmoncry SPECIES_AZUMARILL, 0 + msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 + waitmoncry + release + end + +LilycoveCity_DepartmentStore_1F_EventScript_159F05:: @ 8159F05 + msgbox LilycoveCity_DepartmentStore_1F_Text_18C0D9, 3 + end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/text.inc b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc new file mode 100644 index 000000000..45cf3686d --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc @@ -0,0 +1,27 @@ +LilycoveCity_DepartmentStore_1F_Text_18BFB5:: @ 818BFB5 + .string "Welcome to LILYCOVE DEPARTMENT STORE.$" + +LilycoveCity_DepartmentStore_1F_Text_18BFDB:: @ 818BFDB + .string "Whenever I come to the DEPARTMENT\n" + .string "STORE, I always end up buying all sorts\l" + .string "of things because it’s so fun.$" + +LilycoveCity_DepartmentStore_1F_Text_18C044:: @ 818C044 + .string "Today, my mom is going to buy me some\n" + .string "nice furniture.$" + +LilycoveCity_DepartmentStore_1F_Text_18C07A:: @ 818C07A + .string "I’m buying something for my AZUMARILL\n" + .string "as a reward for winning a CONTEST.$" + +LilycoveCity_DepartmentStore_1F_Text_18C0C3:: @ 818C0C3 + .string "AZUMARILL: Maririroo!$" + +LilycoveCity_DepartmentStore_1F_Text_18C0D9:: @ 818C0D9 + .string "1F: SERVICE COUNTER\n" + .string " LOTTERY CORNER\p" + .string "2F: TRAINER’S ZONE\p" + .string "3F: BATTLE COLLECTION\p" + .string "4F: TM CORNER\p" + .string "5F: POKé DOLL FLOOR\p" + .string "ROOFTOP: ROOFTOP PLAZA$" diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/maps/LilycoveCity_DepartmentStore_2F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin +++ /dev/null diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 65c22a60f..65c22a60f 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index f10428935..7bc576b3f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes + .4byte LilycoveCity_DepartmentStore_2F_Layout .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 259 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/maps/LilycoveCity_DepartmentStore_2F/map.bin deleted file mode 100644 index 82ca90b08..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -|}~
PQ 22222222222222222222222222222222222m22222222222222u2234222234222222 2222222m2222222222222222u
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc new file mode 100644 index 000000000..25e981628 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -0,0 +1,67 @@ +LilycoveCity_DepartmentStore_2F_MapScripts:: @ 8159F0E + .byte 0 + +LilycoveCity_DepartmentStore_2F_EventScript_159F0F:: @ 8159F0F + msgbox LilycoveCity_DepartmentStore_2F_Text_18C162, 2 + end + +LilycoveCity_DepartmentStore_2F_EventScript_159F18:: @ 8159F18 + msgbox LilycoveCity_DepartmentStore_2F_Text_18C195, 2 + end + +LilycoveCity_DepartmentStore_2F_EventScript_159F21:: @ 8159F21 + msgbox LilycoveCity_DepartmentStore_2F_Text_18C1D9, 2 + end + +LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A + lock + faceplayer + message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 + waitmessage + pokemart LilycoveCity_DepartmentStore_2F_Items1 + msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_2F_Items1:: @ 8159F44 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_ULTRA_BALL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_FLUFFY_TAIL + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E + lock + faceplayer + message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 + waitmessage + pokemart LilycoveCity_DepartmentStore_2F_Items2 + msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_2F_Items2:: @ 8159F78 + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_REPEL + .2byte ITEM_SUPER_REPEL + .2byte ITEM_MAX_REPEL + .2byte ITEM_WAVE_MAIL + .2byte ITEM_MECH_MAIL + .2byte ITEM_NONE + release + end diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/text.inc b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc new file mode 100644 index 000000000..e9a52bbee --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc @@ -0,0 +1,15 @@ +LilycoveCity_DepartmentStore_2F_Text_18C162:: @ 818C162 + .string "Learn to use items properly.\n" + .string "That’s basic, really.$" + +LilycoveCity_DepartmentStore_2F_Text_18C195:: @ 818C195 + .string "My husband is waiting at home.\n" + .string "What would make a good gift for him?$" + +LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 + .string "I’m leaving on a long journey soon.\n" + .string "I need to stock up on items.$" + +UnknownString_818C21A: @ 818C21A + .string "FOR YOUR TRAVELING COMPANIONS\n" + .string "2F: TRAINER’S ZONE$" diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/maps/LilycoveCity_DepartmentStore_3F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin +++ /dev/null diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 212d44971..212d44971 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 16f453da0..402d1a137 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes + .4byte LilycoveCity_DepartmentStore_3F_Layout .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 260 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/maps/LilycoveCity_DepartmentStore_3F/map.bin deleted file mode 100644 index c10b776f5..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -|}~6
6QP 222222C2222 22222222222222222222+,2222222222+,2222342222222222342222;<2222222222;<22222222222222222222
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc new file mode 100644 index 000000000..1f55f5018 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -0,0 +1,60 @@ +LilycoveCity_DepartmentStore_3F_MapScripts:: @ 8159F90 + .byte 0 + +LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91 + lock + faceplayer + message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 + waitmessage + pokemart LilycoveCity_DepartmentStore_3F_Items1 + msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_3F_Items1:: @ 8159FA8 + .2byte ITEM_PROTEIN + .2byte ITEM_CALCIUM + .2byte ITEM_IRON + .2byte ITEM_ZINC + .2byte ITEM_CARBOS + .2byte ITEM_HP_UP + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8 + lock + faceplayer + message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 + waitmessage + pokemart LilycoveCity_DepartmentStore_3F_Items2 + msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4 + release + end + + + .align 2 +LilycoveCity_DepartmentStore_3F_Items2:: @ 8159FD0 + .2byte ITEM_X_SPEED + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_DIRE_HIT + .2byte ITEM_GUARD_SPEC + .2byte ITEM_X_ACCURACY + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_3F_EventScript_159FE2:: @ 8159FE2 + msgbox LilycoveCity_DepartmentStore_3F_Text_18C24B, 2 + end + +LilycoveCity_DepartmentStore_3F_EventScript_159FEB:: @ 8159FEB + msgbox LilycoveCity_DepartmentStore_3F_Text_18C2B5, 2 + end + +LilycoveCity_DepartmentStore_3F_EventScript_159FF4:: @ 8159FF4 + msgbox LilycoveCity_DepartmentStore_3F_Text_18C32E, 2 + end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/text.inc b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc new file mode 100644 index 000000000..8777fd1f3 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc @@ -0,0 +1,19 @@ +LilycoveCity_DepartmentStore_3F_Text_18C24B:: @ 818C24B + .string "For quickly toughening up POKéMON,\n" + .string "items are the best.\p" + .string "PROTEIN boosts ATTACK, and CALCIUM\n" + .string "raises SP. ATK.$" + +LilycoveCity_DepartmentStore_3F_Text_18C2B5:: @ 818C2B5 + .string "I want my POKéMON to have more\n" + .string "endurance.\p" + .string "I’m trying to decide whether to raise\n" + .string "DEFENSE with IRON, or SP. DEF with ZINC.$" + +LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E + .string "I gave a CARBOS to my POKéMON and its\n" + .string "SPEED went up.$" + +UnknownString_818C363: @ 818C363 + .string "ESSENTIALS FOR UNBEATABLE TRAINERS\n" + .string "3F: BATTLE COLLECTION$" diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/maps/LilycoveCity_DepartmentStore_4F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin +++ /dev/null diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 40b8eab37..40b8eab37 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 169f21d92..57bea5077 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes + .4byte LilycoveCity_DepartmentStore_4F_Layout .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 261 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/maps/LilycoveCity_DepartmentStore_4F/map.bin deleted file mode 100644 index bc1a09e2c..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin +++ /dev/null @@ -1 +0,0 @@ -|}~
PQ 2222222222222222222222222222222222222222222222222222222662222266662266222 22222666622222222222222222
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc new file mode 100644 index 000000000..907b79847 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -0,0 +1,54 @@ +LilycoveCity_DepartmentStore_4F_MapScripts:: @ 8159FFD + .byte 0 + +LilycoveCity_DepartmentStore_4F_EventScript_159FFE:: @ 8159FFE + msgbox LilycoveCity_DepartmentStore_4F_Text_18C39C, 2 + end + +LilycoveCity_DepartmentStore_4F_EventScript_15A007:: @ 815A007 + msgbox LilycoveCity_DepartmentStore_4F_Text_18C41B, 2 + end + +LilycoveCity_DepartmentStore_4F_EventScript_15A010:: @ 815A010 + msgbox LilycoveCity_DepartmentStore_4F_Text_18C481, 2 + end + +LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 + lock + faceplayer + message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 + waitmessage + pokemart LilycoveCity_DepartmentStore_4F_Items1 + msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030 + .2byte ITEM_TM38_FIRE_BLAST + .2byte ITEM_TM25_THUNDER + .2byte ITEM_TM14_BLIZZARD + .2byte ITEM_TM15_HYPER_BEAM + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C + lock + faceplayer + message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 + waitmessage + pokemart LilycoveCity_DepartmentStore_4F_Items2 + msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054 + .2byte ITEM_TM17_PROTECT + .2byte ITEM_TM20_SAFEGUARD + .2byte ITEM_TM33_REFLECT + .2byte ITEM_TM16_LIGHT_SCREEN + .2byte ITEM_NONE + release + end diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/text.inc b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc new file mode 100644 index 000000000..b26962a8f --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc @@ -0,0 +1,20 @@ +LilycoveCity_DepartmentStore_4F_Text_18C39C:: @ 818C39C + .string "Hmm...\p" + .string "An attacking move...\n" + .string "Or a defensive move...\p" + .string "It’s no easy matter to decide which TM\n" + .string "moves should be taught to POKéMON...$" + +LilycoveCity_DepartmentStore_4F_Text_18C41B:: @ 818C41B + .string "There are so many different kinds of\n" + .string "TM moves.\p" + .string "A catalog I read said there are fifty\n" + .string "different kinds.$" + +LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 + .string "I’d like to get all the different TMs,\n" + .string "but a POKéMON learns only four moves.$" + +UnknownString_818C4CE: @ 818C4CE + .string "A SHORTCUT TO POKéMON LEAGUE\n" + .string "4F: TM CORNER$" diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/maps/LilycoveCity_DepartmentStore_5F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin +++ /dev/null diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index 2883d167b..2883d167b 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 19b45696c..1159ddeaf 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes + .4byte LilycoveCity_DepartmentStore_5F_Layout .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 262 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/maps/LilycoveCity_DepartmentStore_5F/map.bin Binary files differdeleted file mode 100644 index 80acc3900..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin +++ /dev/null diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc new file mode 100644 index 000000000..184d3b816 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -0,0 +1,118 @@ +LilycoveCity_DepartmentStore_5F_MapScripts:: @ 815A060 + .byte 0 + +LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 + lock + faceplayer + message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 + msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Items1:: @ 815A078 + .2byte ITEM_X_DEFEND + .2byte ITEM_X_SPEED + .2byte ITEM_X_ACCURACY + .2byte ITEM_SUPER_REPEL + .2byte 91 + .2byte 92 + .2byte ITEM_SUN_STONE + .2byte ITEM_MOON_STONE + .2byte ITEM_FIRE_STONE + .2byte ITEM_THUNDER_STONE + .2byte ITEM_WATER_STONE + .2byte ITEM_LEAF_STONE + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 + lock + faceplayer + message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 + msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Items2:: @ 815A0AC + .2byte 101 + .2byte 102 + .2byte ITEM_BIG_MUSHROOM + .2byte 105 + .2byte ITEM_PEARL + .2byte ITEM_BIG_PEARL + .2byte ITEM_STARDUST + .2byte ITEM_STAR_PIECE + .2byte ITEM_NUGGET + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 + lock + faceplayer + message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 + msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Items3:: @ 815A0DC + .2byte ITEM_CARBOS + .2byte ITEM_CALCIUM + .2byte ITEM_RARE_CANDY + .2byte ITEM_PP_UP + .2byte ITEM_ZINC + .2byte ITEM_PP_MAX + .2byte 72 + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 + lock + faceplayer + message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + waitmessage + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 + msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 + release + end + + .align 2 +LilycoveCity_DepartmentStore_5F_Items4:: @ 815A10C + .2byte 59 + .2byte 60 + .2byte 61 + .2byte 62 + .2byte ITEM_HP_UP + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_RED_SHARD + .2byte ITEM_BLUE_SHARD + .2byte ITEM_YELLOW_SHARD + .2byte ITEM_NONE + release + end + +LilycoveCity_DepartmentStore_5F_EventScript_15A124:: @ 815A124 + msgbox LilycoveCity_DepartmentStore_5F_Text_18C4F9, 2 + end + +LilycoveCity_DepartmentStore_5F_EventScript_15A12D:: @ 815A12D + msgbox LilycoveCity_DepartmentStore_5F_Text_18C59F, 2 + end + +LilycoveCity_DepartmentStore_5F_EventScript_15A136:: @ 815A136 + msgbox LilycoveCity_DepartmentStore_5F_Text_18C556, 2 + end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/text.inc b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc new file mode 100644 index 000000000..8b1d81c2e --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc @@ -0,0 +1,17 @@ +LilycoveCity_DepartmentStore_5F_Text_18C4F9:: @ 818C4F9 + .string "This place is full of cute DOLLS.\p" + .string "I should buy some for me, instead of\n" + .string "just for my children.$" + +LilycoveCity_DepartmentStore_5F_Text_18C556:: @ 818C556 + .string "I’m not big enough to raise POKéMON,\n" + .string "so I’m getting a cute DOLL instead.$" + +LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F + .string "They sell many cute MATS here.\p" + .string "I wonder which one I should get?\n" + .string "Maybe I’ll buy them all...$" + +UnknownString_818C5FA: @ 818C5FA + .string "ADORABLE FRIENDS\n" + .string "5F: POKé DOLL FLOOR$" diff --git a/data/maps/LilycoveCity_EmptyMap/border.bin b/data/maps/LilycoveCity_EmptyMap/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/LilycoveCity_EmptyMap/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/events.inc index 4ac5c42b8..4ac5c42b8 100644 --- a/data/maps/events/LilycoveCity_EmptyMap.inc +++ b/data/maps/LilycoveCity_EmptyMap/events.inc diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index a83e7139d..469b52893 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -1,9 +1,9 @@ LilycoveCity_EmptyMap:: @ 8306654 - .4byte LilycoveCity_EmptyMap_MapAttributes + .4byte LilycoveCity_EmptyMap_Layout .4byte LilycoveCity_EmptyMap_MapEvents .4byte LilycoveCity_EmptyMap_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 108 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_EmptyMap/map.bin b/data/maps/LilycoveCity_EmptyMap/map.bin deleted file mode 100644 index f70d7bba4..000000000 --- a/data/maps/LilycoveCity_EmptyMap/map.bin +++ /dev/null @@ -1 +0,0 @@ -42
\ No newline at end of file diff --git a/data/maps/LilycoveCity_EmptyMap/scripts.inc b/data/maps/LilycoveCity_EmptyMap/scripts.inc new file mode 100644 index 000000000..16d025174 --- /dev/null +++ b/data/maps/LilycoveCity_EmptyMap/scripts.inc @@ -0,0 +1,2 @@ +LilycoveCity_EmptyMap_MapScripts:: @ 8159AAC + .byte 0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc index 35a34928f..35a34928f 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 022eb0356..75b924e8f 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,9 +1,9 @@ LilycoveCity_Harbor:: @ 8306638 - .4byte LilycoveCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 88 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc new file mode 100644 index 000000000..57ad4b85b --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -0,0 +1,166 @@ +LilycoveCity_Harbor_MapScripts:: @ 8159893 + map_script 3, LilycoveCity_Harbor_MapScript1_159899 + .byte 0 + +LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 + end + +LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 + lock + faceplayer + checkitem ITEM_EON_TICKET, 1 + compare RESULT, 1 + goto_if_eq LilycoveCity_Harbor_EventScript_1599EE + goto LilycoveCity_Harbor_EventScript_1598BA + end + +LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD + msgbox LilycoveCity_Harbor_Text_18B306, 4 + release + end + +LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD + msgbox LilycoveCity_Harbor_Text_18B36F, 4 + checkitem ITEM_SS_TICKET, 1 + compare RESULT, 0 + goto_if_eq LilycoveCity_Harbor_EventScript_159929 + message LilycoveCity_Harbor_Text_18B406 + waitmessage + goto LilycoveCity_Harbor_EventScript_1598F1 + end + +LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 + multichoicedefault 18, 6, 56, 2, 0 + switch RESULT + case 0, LilycoveCity_Harbor_EventScript_159933 + case 1, LilycoveCity_Harbor_EventScript_15995B + case 2, LilycoveCity_Harbor_EventScript_1599E4 + case 127, LilycoveCity_Harbor_EventScript_1599E4 + end + +LilycoveCity_Harbor_EventScript_159929:: @ 8159929 + msgbox LilycoveCity_Harbor_Text_18B3A9, 4 + release + end + +LilycoveCity_Harbor_EventScript_159933:: @ 8159933 + msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LilycoveCity_Harbor_EventScript_15997E + setvar VAR_PORTHOLE_STATE, 5 + call LilycoveCity_Harbor_EventScript_15998A + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_15995B:: @ 815995B + msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LilycoveCity_Harbor_EventScript_15997E + call LilycoveCity_Harbor_EventScript_15998A + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 + waitstate + release + end + +LilycoveCity_Harbor_EventScript_15997E:: @ 815997E + message LilycoveCity_Harbor_Text_18B4E2 + waitmessage + goto LilycoveCity_Harbor_EventScript_1598F1 + end + +LilycoveCity_Harbor_EventScript_15998A:: @ 815998A + msgbox LilycoveCity_Harbor_Text_18B4B3, 4 + closemessage + applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 + delay 30 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR + compare FACING, 2 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 + compare FACING, 4 + call_if_eq LilycoveCity_Harbor_EventScript_1599CE + delay 30 + hideobjectat 255, MAP_PETALBURG_CITY + setvar VAR_SPECIAL_4, 2 + call LilycoveCity_Harbor_EventScript_1A040E + return + +LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE + applymovement 255, LilycoveCity_Harbor_Movement_159A86 + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 + applymovement 255, LilycoveCity_Harbor_Movement_159A89 + waitmovement 0 + return + +LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 + msgbox LilycoveCity_Harbor_Text_18B45B, 4 + release + end + +LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA + goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA + msgbox LilycoveCity_Harbor_Text_1C50F2, 4 + closemessage + applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 + delay 30 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR + delay 60 + addobject 4 + delay 30 + applymovement 4, LilycoveCity_Harbor_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_Harbor_Text_1C5120, 4 + closemessage + applymovement 4, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 + delay 30 + removeobject 4 + compare FACING, 2 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 + compare FACING, 4 + call_if_eq LilycoveCity_Harbor_EventScript_1599CE + delay 30 + hideobjectat 255, MAP_PETALBURG_CITY + special ScrSpecial_HealPlayerParty + setvar VAR_SPECIAL_4, 2 + call LilycoveCity_Harbor_EventScript_1A040E + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + waitstate + release + end + +LilycoveCity_Harbor_Movement_159A86:: @ 8159A86 + walk_right + walk_in_place_fastest_up + end_movement + +LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 + walk_up + end_movement + +@ 8159A8B + walk_up + end_movement + +LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D + lock + faceplayer + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2 + msgbox LilycoveCity_Harbor_Text_18B504, 4 + release + end + +LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2 + msgbox LilycoveCity_Harbor_Text_18B58E, 4 + release + end diff --git a/data/maps/LilycoveCity_Harbor/text.inc b/data/maps/LilycoveCity_Harbor/text.inc new file mode 100644 index 000000000..0f31f697b --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/text.inc @@ -0,0 +1,49 @@ +LilycoveCity_Harbor_Text_18B306:: @ 818B306 + .string "I beg your pardon?\n" + .string "You’re looking for a ship?\p" + .string "I’m sorry, the ferry service isn’t\n" + .string "available at present...$" + +LilycoveCity_Harbor_Text_18B36F:: @ 818B36F + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" + +LilycoveCity_Harbor_Text_18B3A9:: @ 818B3A9 + .string "{PLAYER} doesn’t have the TICKET...\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" + +LilycoveCity_Harbor_Text_18B406:: @ 818B406 + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" + +LilycoveCity_Harbor_Text_18B45B:: @ 818B45B + .string "Please sail with us another time!$" + +LilycoveCity_Harbor_Text_18B47D:: @ 818B47D + .string "SLATEPORT CITY it is, then!$" + +LilycoveCity_Harbor_Text_18B499:: @ 818B499 + .string "BATTLE TOWER it is, then!$" + +LilycoveCity_Harbor_Text_18B4B3:: @ 818B4B3 + .string "Please board the ferry and wait for\n" + .string "departure.$" + +LilycoveCity_Harbor_Text_18B4E2:: @ 818B4E2 + .string "Then, where would you like to go?$" + +LilycoveCity_Harbor_Text_18B504:: @ 818B504 + .string "Until they finish making the ferry, we\n" + .string "sailors have nothing to do...\p" + .string "I wish they’d get a move on, the folks\n" + .string "at the SHIPYARD in SLATEPORT.$" + +LilycoveCity_Harbor_Text_18B58E:: @ 818B58E + .string "The ferry S.S. TIDAL is finally in\n" + .string "operation.\p" + .string "The folks at the SHIPYARD in SLATEPORT\n" + .string "must’ve worked extra hard.\p" + .string "Well, it’s my turn to get busy now!$" diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc index 482ebf0b6..482ebf0b6 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/LilycoveCity_House1/events.inc diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 5cfc8540b..20675582b 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,9 +1,9 @@ LilycoveCity_House1:: @ 830668C - .4byte House1_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 59 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc new file mode 100644 index 000000000..15535a122 --- /dev/null +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -0,0 +1,16 @@ +LilycoveCity_House1_MapScripts:: @ 8159B85 + .byte 0 + +LilycoveCity_House1_EventScript_159B86:: @ 8159B86 + msgbox LilycoveCity_House1_Text_18B7B0, 2 + end + +LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F + lock + faceplayer + waitse + playmoncry SPECIES_KECLEON, 0 + msgbox LilycoveCity_House1_Text_18B82B, 4 + waitmoncry + release + end diff --git a/data/maps/LilycoveCity_House1/text.inc b/data/maps/LilycoveCity_House1/text.inc new file mode 100644 index 000000000..a937ff64d --- /dev/null +++ b/data/maps/LilycoveCity_House1/text.inc @@ -0,0 +1,8 @@ +LilycoveCity_House1_Text_18B7B0:: @ 818B7B0 + .string "POKéMON are partners to people.\n" + .string "They aren’t our tools.\p" + .string "Unfortunately, there are some people\n" + .string "who fail to understand that...$" + +LilycoveCity_House1_Text_18B82B:: @ 818B82B + .string "KECLEON: Ruroro?$" diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/maps/LilycoveCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc index d557cd75a..d557cd75a 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/LilycoveCity_House2/events.inc diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 8aac9185c..1948d4470 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,9 +1,9 @@ LilycoveCity_House2:: @ 83066A8 - .4byte LilycoveCity_House2_MapAttributes + .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 74 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/maps/LilycoveCity_House2/map.bin deleted file mode 100644 index e381f20eb..000000000 --- a/data/maps/LilycoveCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ - 222!2!2222Y2N6O6)2)2)2)2)2Y2V6W6D2)2)2)2)2!2)2)2)2)2)2)2)2 33333333#333333
\ No newline at end of file diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc new file mode 100644 index 000000000..797c8f203 --- /dev/null +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -0,0 +1,20 @@ +LilycoveCity_House2_MapScripts:: @ 8159BA2 + .byte 0 + +LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA + msgbox LilycoveCity_House2_Text_18B83C, 4 + giveitem_std ITEM_TM44_REST + compare RESULT, 0 + goto_if_eq LilycoveCity_House2_EventScript_1A029B + setflag FLAG_RECEIVED_TM44 + msgbox LilycoveCity_House2_Text_18B883, 4 + release + end + +LilycoveCity_House2_EventScript_159BDA:: @ 8159BDA + msgbox LilycoveCity_House2_Text_18B883, 4 + release + end diff --git a/data/maps/LilycoveCity_House2/text.inc b/data/maps/LilycoveCity_House2/text.inc new file mode 100644 index 000000000..0e037a65f --- /dev/null +++ b/data/maps/LilycoveCity_House2/text.inc @@ -0,0 +1,9 @@ +LilycoveCity_House2_Text_18B83C:: @ 818B83C + .string "Huh? What? What’s that?\p" + .string "I’m not near awake yet...\n" + .string "You can have this...$" + +LilycoveCity_House2_Text_18B883:: @ 818B883 + .string "Yawn...\p" + .string "Sleep is essential for good health...\n" + .string "Sleep and regain health...$" diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc index 2186eb0d2..2186eb0d2 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/LilycoveCity_House3/events.inc diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 599e904d5..df0d576b4 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,9 +1,9 @@ LilycoveCity_House3:: @ 83066C4 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 60 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc new file mode 100644 index 000000000..1a569bf5b --- /dev/null +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -0,0 +1,99 @@ +LilycoveCity_House3_MapScripts:: @ 8159BE4 + map_script 3, LilycoveCity_House3_MapScript1_159BEA + .byte 0 + +LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA + random 4 + copyvar VAR_TEMP_1, RESULT + end + +LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 + lock + faceplayer + msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LilycoveCity_House3_EventScript_159C1D + msgbox LilycoveCity_House3_Text_18BA2B, 4 + closemessage + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 + release + end + +LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D + msgbox LilycoveCity_House3_Text_18B9DC, 4 + closemessage + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 + release + end + +LilycoveCity_House3_EventScript_159C32:: @ 8159C32 + lock + faceplayer + msgbox LilycoveCity_House3_Text_18BD64, 4 + closemessage + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 + release + end + +LilycoveCity_House3_EventScript_159C49:: @ 8159C49 + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_159D19 + case 1, LilycoveCity_House3_EventScript_159D23 + case 2, LilycoveCity_House3_EventScript_159D2D + case 3, LilycoveCity_House3_EventScript_159D37 + end + +LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_159D19 + case 1, LilycoveCity_House3_EventScript_159D23 + case 2, LilycoveCity_House3_EventScript_159D2D + case 3, LilycoveCity_House3_EventScript_159D37 + end + +LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_159D19 + case 1, LilycoveCity_House3_EventScript_159D23 + case 2, LilycoveCity_House3_EventScript_159D2D + case 3, LilycoveCity_House3_EventScript_159D37 + end + +LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5 + lock + faceplayer + switch VAR_TEMP_1 + case 0, LilycoveCity_House3_EventScript_159D19 + case 1, LilycoveCity_House3_EventScript_159D23 + case 2, LilycoveCity_House3_EventScript_159D2D + case 3, LilycoveCity_House3_EventScript_159D37 + end + +LilycoveCity_House3_EventScript_159D19:: @ 8159D19 + msgbox LilycoveCity_House3_Text_18BDDB, 4 + release + end + +LilycoveCity_House3_EventScript_159D23:: @ 8159D23 + msgbox LilycoveCity_House3_Text_18BE14, 4 + release + end + +LilycoveCity_House3_EventScript_159D2D:: @ 8159D2D + msgbox LilycoveCity_House3_Text_18BE57, 4 + release + end + +LilycoveCity_House3_EventScript_159D37:: @ 8159D37 + msgbox LilycoveCity_House3_Text_18BE8E, 4 + release + end diff --git a/data/maps/LilycoveCity_House3/text.inc b/data/maps/LilycoveCity_House3/text.inc new file mode 100644 index 000000000..03db4920f --- /dev/null +++ b/data/maps/LilycoveCity_House3/text.inc @@ -0,0 +1,68 @@ +LilycoveCity_House3_Text_18B8CC:: @ 818B8CC + .string "Oh, my, my! Are you traveling alone?\n" + .string "But you’re so young! Good for you!\p" + .string "I’m sure my kids could learn a thing\n" + .string "or two from you!\p" + .string "Me? I’m a master of {POKEBLOCK}S.\p" + .string "If I get serious just a little, why, I\n" + .string "can concoct great {POKEBLOCK}S.\p" + .string "Would you like to learn from me, a\n" + .string "master of {POKEBLOCK}S?$" + +LilycoveCity_House3_Text_18B9DC:: @ 818B9DC + .string "Oh? Are you sure?\p" + .string "You shouldn’t always try to do\n" + .string "everything by yourself, dear!$" + +LilycoveCity_House3_Text_18BA2B:: @ 818BA2B + .string "Oh, good! You’re a smart soul!\n" + .string "This is a bit long, so listen up!\p" + .string "Are you ready?\p" + .string "If you look at {POKEBLOCK}S, you should see\n" + .string "that they are rated on how they feel.\p" + .string "The lower the feel rating,\n" + .string "the better it is. Don’t forget this!\p" + .string "A good {POKEBLOCK} has a low feel\n" + .string "rating and a high level.\p" + .string "A POKéMON can eat more good\n" + .string "{POKEBLOCK}S than ordinary ones, too.\p" + .string "And this is important.\p" + .string "If you want to make smooth {POKEBLOCK}S,\n" + .string "use different kinds of BERRIES.\p" + .string "Don’t be stingy - the kinds of BERRIES\n" + .string "affect the smoothness of {POKEBLOCK}S.\p" + .string "And another thing.\p" + .string "The more people blending BERRIES, the\n" + .string "smoother the {POKEBLOCK}S.\p" + .string "That’s why you should talk to other\n" + .string "people and make {POKEBLOCK}S together.\p" + .string "That’s about all you need to know to\n" + .string "make good {POKEBLOCK}S.\p" + .string "If everyone had POKéMON they love,\n" + .string "smooth {POKEBLOCK}S, and a loving family,\l" + .string "the world would be a happier place.\p" + .string "Don’t give up, dear!$" + +LilycoveCity_House3_Text_18BD64:: @ 818BD64 + .string "When my wife gave birth to quadruplets,\n" + .string "you bet I was shocked.\p" + .string "But, now, seeing them play together,\n" + .string "it makes me happy.$" + +LilycoveCity_House3_Text_18BDDB:: @ 818BDDB + .string "We’re having MULTI BATTLES, but I know\n" + .string "I’m going to win.$" + +LilycoveCity_House3_Text_18BE14:: @ 818BE14 + .string "We like mixing stuff at the RECORD\n" + .string "CORNER.\p" + .string "But what gets mixed up?$" + +LilycoveCity_House3_Text_18BE57:: @ 818BE57 + .string "We’re going to make super {POKEBLOCK}S\n" + .string "with a BERRY BLENDER!$" + +LilycoveCity_House3_Text_18BE8E:: @ 818BE8E + .string "I want to brag about how tough my\n" + .string "POKéMON is, so we’re going to enter a\l" + .string "CONTEST together.$" diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc index d5ebda9f2..d5ebda9f2 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/LilycoveCity_House4/events.inc diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index d9cd2c7f0..a8d4d1bcc 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,9 +1,9 @@ LilycoveCity_House4:: @ 83066E0 - .4byte House1_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 59 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc new file mode 100644 index 000000000..13bc95dfa --- /dev/null +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -0,0 +1,10 @@ +LilycoveCity_House4_MapScripts:: @ 8159D41 + .byte 0 + +LilycoveCity_House4_EventScript_159D42:: @ 8159D42 + msgbox LilycoveCity_House4_Text_18BEE8, 2 + end + +LilycoveCity_House4_EventScript_159D4B:: @ 8159D4B + msgbox LilycoveCity_House4_Text_18BF4E, 2 + end diff --git a/data/maps/LilycoveCity_House4/text.inc b/data/maps/LilycoveCity_House4/text.inc new file mode 100644 index 000000000..ebfd5ae71 --- /dev/null +++ b/data/maps/LilycoveCity_House4/text.inc @@ -0,0 +1,9 @@ +LilycoveCity_House4_Text_18BEE8:: @ 818BEE8 + .string "This planet’s biggest mysteries are\n" + .string "at the bottom of the sea.\p" + .string "Somebody said that, but I don’t know...$" + +LilycoveCity_House4_Text_18BF4E:: @ 818BF4E + .string "There’s a deep underwater trench\n" + .string "between MOSSDEEP and SOOTOPOLIS.\p" + .string "That’s what someone told me, anyway.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index a081a6523..a081a6523 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index d48ffc94f..3af5b4c90 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_1F_Layout .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 - .2byte BGM_BIJYUTU + .2byte MUS_BIJYUTU .2byte 103 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin deleted file mode 100644 index 6e92a8b58..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ - !"#$%
&'222222222222222222222222222222222 22222222 2 2 2 2 2 2 2 222222222222 -. / 2222222222256722222:2;2;2;2<22222222222 22222B()*DO222222222222222J012LO22:2;2;2;2;2<222222222RSSSTO22HSAS@I>22222222?2?2?2?2?2F22M2?2?2?2O22222222+222,>222842;2;2;29O222222223>22?2F222RSSSSTO222222?2F22222
\ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc new file mode 100644 index 000000000..b45261aca --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -0,0 +1,162 @@ +LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 815841B + .byte 0 + +LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187348, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 + lockall + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 + message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 + waitmessage + multichoice 20, 8, 16, 1 + compare RESULT, 0 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 + compare RESULT, 1 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187459, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 + compare RESULT, YES + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1874F5, 3 + releaseall + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3 + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC + waitmovement 0 + removeobject 2 + switch FACING + case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD + case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2 + case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD + lockall + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 + waitmovement 0 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + waitstate + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 + lockall + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE + waitmovement 0 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + waitstate + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 + lockall + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 + waitmovement 0 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + waitstate + end + +LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC + walk_up + end_movement + +LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE + walk_left + walk_up + end_movement + +LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501 + walk_right + walk_up + end_movement + +LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504 + walk_up + walk_up + end_movement + +LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158510:: @ 8158510 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875BE, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158519:: @ 8158519 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875F8, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158522:: @ 8158522 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187641, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15852B:: @ 815852B + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1876A1, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158534:: @ 8158534 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_18770C, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15853D:: @ 815853D +LilycoveCity_LilycoveMuseum_2F_EventScript_15853D:: @ 815853D + msgbox LilycoveCity_LilycoveMuseum_1F_Text_18775F, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158546:: @ 8158546 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1877A9, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15854F:: @ 815854F + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187810, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158558:: @ 8158558 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1878B7, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158561:: @ 8158561 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_18791D, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15856A:: @ 815856A + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879BF, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158573:: @ 8158573 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879E6, 3 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15857C:: @ 815857C + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187A1A, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187AA0, 2 + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, 2 + lockall + applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D + waitmovement 0 + releaseall + end + +LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3:: @ 81585A3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, 2 + end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc new file mode 100644 index 000000000..b60e0e50d --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc @@ -0,0 +1,130 @@ +LilycoveCity_LilycoveMuseum_1F_Text_187348:: @ 8187348 + .string "Welcome to LILYCOVE MUSEUM.\p" + .string "Please take the time to enjoy our\n" + .string "collection of fantastic artwork\l" + .string "featuring POKéMON.$" + +LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 + .string "I’m the CURATOR of this MUSEUM of\n" + .string "fine arts.\p" + .string "It’s heartening to see someone so\n" + .string "young as you in our MUSEUM.\p" + .string "Have you viewed our collection of\n" + .string "paintings already?$" + +LilycoveCity_LilycoveMuseum_1F_Text_187459:: @ 8187459 + .string "Ah, then let me not disturb you.\n" + .string "Please, do take your time.$" + +LilycoveCity_LilycoveMuseum_1F_Text_187495:: @ 8187495 + .string "Oh? I do believe that you seem to\n" + .string "be a POKéMON TRAINER.\p" + .string "Have you an interest in paintings,\n" + .string "too?$" + +LilycoveCity_LilycoveMuseum_1F_Text_1874F5:: @ 81874F5 + .string "I see...\p" + .string "I’m honored that you would visit\n" + .string "us in spite of that.$" + +LilycoveCity_LilycoveMuseum_1F_Text_187534:: @ 8187534 + .string "Ah, excellent!\n" + .string "You do like paintings!\p" + .string "Then, may I ask you to come with me?$" + +LilycoveCity_LilycoveMuseum_1F_Text_18757F:: @ 818757F + .string "It’s a very old painting.\n" + .string "The paint is peeling here and there.$" + +LilycoveCity_LilycoveMuseum_1F_Text_1875BE:: @ 81875BE + .string "It’s an odd landscape with bizarre\n" + .string "and fantastic scenery.$" + +LilycoveCity_LilycoveMuseum_1F_Text_1875F8:: @ 81875F8 + .string "It’s a painting of a beautiful, smiling\n" + .string "woman with a POKéMON on her lap.$" + +LilycoveCity_LilycoveMuseum_1F_Text_187641:: @ 8187641 + .string "It’s a painting of a legendary POKéMON\n" + .string "from long ago.\p" + .string "The artist painted this from\n" + .string "imagination.$" + +LilycoveCity_LilycoveMuseum_1F_Text_1876A1:: @ 81876A1 + .string "It’s a painting of GRASS POKéMON\n" + .string "swaying in a breeze.\p" + .string "They appear to be enjoying the wind’s\n" + .string "gentle caress.$" + +LilycoveCity_LilycoveMuseum_1F_Text_18770C:: @ 818770C + .string "It’s a delicious-looking painting\n" + .string "of BERRIES.\p" + .string "This painting could make you hungry!$" + +LilycoveCity_LilycoveMuseum_1F_Text_18775F:: @ 818775F + .string "It’s a replica of a famous sculpture.\p" + .string "It depicts an ancient BIRD POKéMON.$" + +LilycoveCity_LilycoveMuseum_1F_Text_1877A9:: @ 81877A9 + .string "It’s a big POKé BALL carved from a\n" + .string "black stone.\p" + .string "It was apparently used in festivals\n" + .string "in the olden days.$" + +LilycoveCity_LilycoveMuseum_1F_Text_187810:: @ 8187810 + .string "It’s a huge stone tablet inscribed\n" + .string "with POKéMON and dense text in the\l" + .string "small characters of an ancient,\l" + .string "unreadable language.$" + +UnknownString_818788B: @ 818788B + .string "Hmmm...\n" + .string "What works of great magnificence...$" + +LilycoveCity_LilycoveMuseum_1F_Text_1878B7:: @ 81878B7 + .string "Battling with POKéMON is fun,\n" + .string "I’ll grant you that.\p" + .string "But one mustn’t forget our love for\n" + .string "the fine arts.$" + +LilycoveCity_LilycoveMuseum_1F_Text_18791D:: @ 818791D + .string "This ART MUSEUM... Well, you could\n" + .string "see many fantastic paintings.\p" + .string "And the CURATOR is a wonderful person.\p" + .string "Among artists like myself, this MUSEUM\n" + .string "is an inspiration.$" + +LilycoveCity_LilycoveMuseum_1F_Text_1879BF:: @ 81879BF + .string "This lady is pretty!\n" + .string "She’s like Mommy!$" + +LilycoveCity_LilycoveMuseum_1F_Text_1879E6:: @ 81879E6 + .string "This POKéMON is adorable!\n" + .string "Just like our little boy!$" + +LilycoveCity_LilycoveMuseum_1F_Text_187A1A:: @ 8187A1A + .string "I’d heard that this ART MUSEUM got\n" + .string "in some new paintings.\p" + .string "So, naturally I hurried over.\p" + .string "Are the new paintings up on the\n" + .string "second floor?$" + +LilycoveCity_LilycoveMuseum_1F_Text_187AA0:: @ 8187AA0 + .string "Lately, the CURATOR has been\n" + .string "unusually cheerful.\p" + .string "I bet something good happened for him.\n" + .string "Definitely.$" + +LilycoveCity_LilycoveMuseum_1F_Text_187B04:: @ 8187B04 + .string "I aim to see many great paintings\n" + .string "here and learn from them.\p" + .string "I have this dream of one day having\n" + .string "my artwork exhibited here.$" + +LilycoveCity_LilycoveMuseum_1F_Text_187B7F:: @ 8187B7F + .string "The ART MUSEUM has become a favorite\n" + .string "tourist destination.\p" + .string "It’s great for LILYCOVE...\n" + .string "No, great for the HOENN region!\p" + .string "This is what I’ve heard - a lone TRAINER\n" + .string "procured all the paintings upstairs.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index 4e2ffe49f..4e2ffe49f 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 460ed87f9..3ceabddcb 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_2F_Layout .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 - .2byte BGM_BIJYUTU + .2byte MUS_BIJYUTU .2byte 104 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin deleted file mode 100644 index 76a918838..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -yyyzjklxyyyrstq2p2q2p2q2p2q2q2p2q2q2p2p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2nno2h2i2h2nno2h2i2h2nno2q2XYw{2i2h2i2XYw{2i2h2i2XYw{2p2|2}2~222h2i2h2|2}2~222h2i2h2|2}2~222q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2nno2h2i2h2nno2h2i2h2i2q2h2i2h2i2XYw{2i2h2i2XYw{2i2h2i2h2p2i2h2i2h2|2}2~222h2i2h2|2}2~222h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2
\ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc new file mode 100644 index 000000000..1643c3a8b --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -0,0 +1,220 @@ +LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC + map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7 + map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670 + .byte 0 + +LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD + setmetatile 10, 6, 606, 1 + setmetatile 11, 6, 607, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 + setmetatile 18, 6, 604, 1 + setmetatile 19, 6, 605, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D + setmetatile 14, 10, 608, 1 + setmetatile 15, 10, 609, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 + setmetatile 6, 10, 602, 1 + setmetatile 7, 10, 603, 1 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D + setmetatile 2, 6, 610, 1 + setmetatile 3, 6, 611, 1 + end + +LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A + .2byte 0 + +LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A + lockall + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, 3 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, 3 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3 + walk_in_place_fastest_left + end_movement + +LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 + face_up + delay_16 + end_movement + +LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 + lockall + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 + case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C + case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C + case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C + case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C + case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_158735 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F4E, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F9D, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 + givedecoration_std DECOR_GLASS_ORNAMENT + compare RESULT, 0 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 + setflag FLAG_RECEIVED_GLASS_ORNAMENT + closemessage + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783 + call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4 + closemessage + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188194, 2 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D + lockall + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 + lockall + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 + lockall + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 + lockall + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 + lockall + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A + msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 + end + +@ 81587FC + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158805:: @ 8158805 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15880E:: @ 815880E + msgbox LilycoveCity_LilycoveMuseum_2F_Text_1883AB, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_188423, 2 + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 + fadescreen 1 + drawcontestwinner 9 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 + fadescreen 1 + drawcontestwinner 10 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 + fadescreen 1 + drawcontestwinner 11 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 + fadescreen 1 + drawcontestwinner 12 + releaseall + end + +LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 + fadescreen 1 + drawcontestwinner 13 + releaseall + end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc new file mode 100644 index 000000000..067cc335f --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc @@ -0,0 +1,114 @@ +LilycoveCity_LilycoveMuseum_2F_Text_187C42:: @ 8187C42 + .string "This is our special exhibit hall.$" + +LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 + .string "As you can plainly see, there is not a\n" + .string "single painting on exhibit.\p" + .string "Here, I don’t wish to exhibit works of\n" + .string "so-called classical art.\p" + .string "Such classical works you can see on\n" + .string "our ground floor.\p" + .string "I wish to exhibit work that is far\n" + .string "different from the classics.\p" + .string "Art, after all, is not restricted to old,\n" + .string "famous works!\p" + .string "This exhibit hall, I wish to fill it with...\p" + .string "Modern and vibrant artworks of\n" + .string "POKéMON seemingly ready to spring\l" + .string "forth into glorious life!$" + +LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D + .string "I beg your pardon. I didn’t intend\n" + .string "to monopolize the conversation.\p" + .string "Now, as you are young, and yet\n" + .string "obviously well traveled...\p" + .string "You must encounter lively POKéMON\n" + .string "and works of art depicting them.\p" + .string "If you were to come across such a\n" + .string "painting, may we ask you to obtain\l" + .string "the artist’s permission to exhibit\l" + .string "it here?$" + +LilycoveCity_LilycoveMuseum_2F_Text_187F4E:: @ 8187F4E + .string "I wish to fill this exhibit hall with\n" + .string "modern and vibrant paintings of\l" + .string "POKéMON.$" + +LilycoveCity_LilycoveMuseum_2F_Text_187F9D:: @ 8187F9D + .string "Thanks to you, we’ve added a new\n" + .string "painting to our collection!\p" + .string "I’ve heard it depicts your POKéMON.\n" + .string "Truly magnificent!\p" + .string "Thank you so very, very much!$" + +LilycoveCity_LilycoveMuseum_2F_Text_18802F:: @ 818802F + .string "Ah! It’s you!\n" + .string "{PLAYER}!$" + +LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 + .string "Isn’t this marvelous?\n" + .string "This collection of paintings!\p" + .string "Each one of them flawless!\n" + .string "None better than another!\p" + .string "These paintings have attracted\n" + .string "more guests to our ART MUSEUM.\p" + .string "Sincerely, I thank you, {PLAYER}.\n" + .string "This is my dream come true!$" + +LilycoveCity_LilycoveMuseum_2F_Text_188120:: @ 8188120 + .string "This is merely a token of my gratitude.$" + +UnknownString_8188148: @ 8188148 + .string "{PLAYER} received a GLASS ORNAMENT.$" + +LilycoveCity_LilycoveMuseum_2F_Text_188166:: @ 8188166 + .string "I will keep this for you until we\n" + .string "meet again.$" + +LilycoveCity_LilycoveMuseum_2F_Text_188194:: @ 8188194 + .string "Ah, so good to see you, {PLAYER}!\p" + .string "It’s an honor to have you visit us\n" + .string "on your busy journeys.\p" + .string "Please, relax and do enjoy your\n" + .string "visit with us.$" + +LilycoveCity_LilycoveMuseum_2F_Text_188219:: @ 8188219 + .string "It’s a picture frame with pink-colored\n" + .string "adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_18824C:: @ 818824C + .string "It’s a picture frame with yellow-colored\n" + .string "adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_188281:: @ 8188281 + .string "It’s a picture frame with blue-colored\n" + .string "adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_1882B4:: @ 81882B4 + .string "It’s a picture frame with red-colored\n" + .string "adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_1882E6:: @ 81882E6 + .string "It’s a picture frame with green-colored\n" + .string "adornments.$" + +LilycoveCity_LilycoveMuseum_2F_Text_18831A:: @ 818831A + .string "It’s a painting of POKéMON.$" + +LilycoveCity_LilycoveMuseum_2F_Text_188336:: @ 8188336 + .string "I’ve been away awhile, so the new\n" + .string "paintings up here surprised me.\p" + .string "I wish someone would paint my POKéMON\n" + .string "this pretty.$" + +LilycoveCity_LilycoveMuseum_2F_Text_1883AB:: @ 81883AB + .string "Well... So this is where they show the\n" + .string "topical POKéMON paintings.\p" + .string "I see, these new paintings are indeed\n" + .string "rather amusing.$" + +LilycoveCity_LilycoveMuseum_2F_Text_188423:: @ 8188423 + .string "Wow, is that right?\n" + .string "These paintings are of your POKéMON.\p" + .string "Isn’t that just the ultimate joy for\n" + .string "a TRAINER?$" diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index d28c4631c..d28c4631c 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index bcfc3435f..a2216160d 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,9 +1,9 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 60 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc new file mode 100644 index 000000000..4e67762bb --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -0,0 +1,63 @@ +LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD + .byte 0 + +LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE + lockall + applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 + waitmovement 0 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO + switch RESULT + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE + msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 + special SelectMonForNPCTrade + waitstate + compare VAR_SPECIAL_4, 255 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B + special IsSelectedMonEgg + compare RESULT, 1 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 + special ScrSpecial_CountPokemonMoves + compare RESULT, 1 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 + fadescreen 1 + special SelectMove + fadescreen 0 + compare VAR_SPECIAL_5, 4 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE + special ScrSpecial_GetPokemonNicknameAndMoveName + msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO + switch RESULT + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53 + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 + special DeleteMonMove + playfanfare MUS_ME_WASURE + waitfanfare + msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64 + special ScrSpecial_GetPokemonNicknameAndMoveName + msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, 4 + releaseall + end + +LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B + msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4 + releaseall + end diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/text.inc b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc new file mode 100644 index 000000000..1e2181aca --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc @@ -0,0 +1,32 @@ +LilycoveCity_MoveDeletersHouse_Text_18B622:: @ 818B622 + .string "Uh...\n" + .string "Oh, yes, I’m the MOVE DELETER.\p" + .string "I can make POKéMON forget their moves.\p" + .string "Would you like me to do that?$" + +LilycoveCity_MoveDeletersHouse_Text_18B68C:: @ 818B68C + .string "Which POKéMON should forget a move?$" + +LilycoveCity_MoveDeletersHouse_Text_18B6B0:: @ 818B6B0 + .string "Which move should be forgotten?$" + +LilycoveCity_MoveDeletersHouse_Text_18B6D0:: @ 818B6D0 + .string "{STR_VAR_1} seems to know only one\n" + .string "move...$" + +LilycoveCity_MoveDeletersHouse_Text_18B6F2:: @ 818B6F2 + .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" + .string "That move should be forgotten?$" + +LilycoveCity_MoveDeletersHouse_Text_18B71E:: @ 818B71E + .string "It worked to perfection!\p" + .string "{STR_VAR_1} has forgotten\n" + .string "{STR_VAR_2} completely.$" + +LilycoveCity_MoveDeletersHouse_Text_18B757:: @ 818B757 + .string "Come again if there are other moves\n" + .string "to be forgotten.$" + +LilycoveCity_MoveDeletersHouse_Text_18B78C:: @ 818B78C + .string "What?\n" + .string "No EGG should know any moves.$" diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 2505adbc3..2505adbc3 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index a1eb040ae..c94501f23 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..cff88caf0 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,32 @@ +LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 + map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_15932D + .byte 0 + +LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D + setrespawn 8 + end + +LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 + setvar VAR_SPECIAL_B, 1 + call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F + msgbox LilycoveCity_PokemonCenter_1F_Text_189FC9, 2 + end + +LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 + lock + faceplayer + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D + msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_15935D:: @ 815935D + msgbox LilycoveCity_PokemonCenter_1F_Text_18A0A1, 4 + release + end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/text.inc b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..c0cbb7436 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc @@ -0,0 +1,26 @@ +LilycoveCity_PokemonCenter_1F_Text_189FC9:: @ 8189FC9 + .string "I wonder how many kinds of POKéMON\n" + .string "there are in the world?\p" + .string "It’d be great to cross seas and\n" + .string "trade POKéMON with people far away.$" + +LilycoveCity_PokemonCenter_1F_Text_18A048:: @ 818A048 + .string "I’ve been hearing about some rotten\n" + .string "scoundrels who steal POKéMON and rip\l" + .string "off METEORITES.$" + +LilycoveCity_PokemonCenter_1F_Text_18A0A1:: @ 818A0A1 + .string "Those rotten scoundrels who steal\n" + .string "POKéMON and rip off METEORITES...\p" + .string "I haven’t seen them around recently.$" + +UnknownString_818A10A: @ 818A10A + .string "I’m going to get X ATTACK to raise\n" + .string "ATTACK during battle.\p" + .string "That way, I’ll be guaranteed to win!$" + +UnknownString_818A168: @ 818A168 + .string "FULL HEAL is a little expensive,\n" + .string "but it is convenient.\p" + .string "Just one of these can cure any\n" + .string "POKéMON status problem.$" diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index b8fd09d02..b8fd09d02 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 341ce8590..78816dbe9 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..e4554e49c --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +LilycoveCity_PokemonCenter_2F_MapScripts:: @ 8159367 + map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +LilycoveCity_PokemonCenter_2F_EventScript_159377:: @ 8159377 + call LilycoveCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +LilycoveCity_PokemonCenter_2F_EventScript_15937D:: @ 815937D + call LilycoveCity_PokemonCenter_2F_EventScript_1A40CC + end + +LilycoveCity_PokemonCenter_2F_EventScript_159383:: @ 8159383 + call LilycoveCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 4f1d4ff4d..4f1d4ff4d 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 4e75b2193..4445ed0df 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes + .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 107 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin deleted file mode 100644 index cddfe5d9d..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -no0vwi
~22q2$2$2$2$2$282$22292#2#2+2LMLM,2#2#2#292#2#2#2TUTU#2#2#2#292#2#2#2#2#2#2,2#2#2#2#2 322#2#2#2#2#2#2222#2#2#2#2#2#2 526262626272 -hi22$2=2H^HI?2%2p2q292#2#2=2PQPQ?2#2#2#292#2#2E2F2F2F2F2G2#2#2#292#2#2#2#2#2#2#2#2#2#2#292#2#2#2#2 #2#2#2#2#2
\ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc new file mode 100644 index 000000000..bab091a0e --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -0,0 +1,436 @@ +LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A + map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395 + map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412 + .byte 0 + +LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 + map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F + .2byte 0 + +LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F + lockall + applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845 + waitmovement 0 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, 4 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 + applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843 + waitmovement 0 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, 4 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F + waitmovement 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C + waitmovement 0 + setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 + releaseall + end + +LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left + end_movement + +LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + end_movement + +LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409 + walk_down + walk_in_place_fastest_right + end_movement + +LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down + end_movement + +LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 + special UpdateMovedLilycoveFanClubMembers + setvar VAR_SPECIAL_4, 8 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + setvar VAR_SPECIAL_4, 9 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + setvar VAR_SPECIAL_4, 10 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + setvar VAR_SPECIAL_4, 11 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + setvar VAR_SPECIAL_4, 12 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + setvar VAR_SPECIAL_4, 13 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + setvar VAR_SPECIAL_4, 14 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + setvar VAR_SPECIAL_4, 15 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 + setobjectxyperm 1, 7, 5 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD + setobjectxyperm 3, 3, 4 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5 + setobjectxyperm 4, 7, 2 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED + setobjectxyperm 5, 5, 5 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5 + setobjectxyperm 6, 5, 2 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD + setobjectxyperm 2, 8, 4 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505 + setobjectxyperm 7, 3, 3 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D + setobjectxyperm 8, 8, 3 + return + +LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 + call LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F + lock + faceplayer + setvar VAR_SPECIAL_4, 13 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159588:: @ 8159588 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A391, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159592:: @ 8159592 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A48D, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A4EA, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 + lock + faceplayer + setvar VAR_SPECIAL_4, 8 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF:: @ 81595FF + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A5AC, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159609:: @ 8159609 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A65B, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A6D4, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D + lock + faceplayer + setvar VAR_SPECIAL_4, 9 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159676:: @ 8159676 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A789, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159680:: @ 8159680 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A8C4, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A984, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 + lock + faceplayer + setvar VAR_SPECIAL_4, 10 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED:: @ 81596ED + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA83, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7:: @ 81596F7 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB41, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ABAE, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B + lock + faceplayer + setvar VAR_SPECIAL_4, 11 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159759:: @ 8159759 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC5E, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD05, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D + lock + faceplayer + setvar VAR_SPECIAL_4, 12 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB:: @ 81597BB + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ADEF, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AEF5, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF + lock + faceplayer + setvar VAR_SPECIAL_4, 14 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15981D:: @ 815981D + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AFD0, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B0C8, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 + lock + faceplayer + setvar VAR_SPECIAL_4, 15 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers + compare RESULT, 1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_15987F:: @ 815987F + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B181, 4 + release + end + +LilycoveCity_PokemonTrainerFanClub_EventScript_159889:: @ 8159889 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, 4 + release + end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc new file mode 100644 index 000000000..fbfbf4353 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc @@ -0,0 +1,251 @@ +LilycoveCity_PokemonTrainerFanClub_Text_18A1D6:: @ 818A1D6 + .string "Oh, wow!\n" + .string "It’s {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 + .string "I’ve heard the news!\n" + .string "You’re really strong, aren’t you?\p" + .string "We always argue about who is the\n" + .string "strongest of all TRAINERS here.\p" + .string "So when I heard about you, I decided\n" + .string "to be your fan!\p" + .string "I hope you’ll keep on battling other\n" + .string "tough TRAINERS.\p" + .string "That way, we’ll be able to see more\n" + .string "of your hot, hot battles.\p" + .string "That will make the others here see\n" + .string "exactly how great you are.\p" + .string "Remember, I’m cheering for you,\n" + .string "{PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A36A:: @ 818A36A + .string "Yo, {PLAYER}!\n" + .string "You’re the one we want to win!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A391:: @ 818A391 + .string "The others, they don’t know that\n" + .string "you’re the best of the best!\p" + .string "Isn’t that right, {PLAYER}?\n" + .string "Show them you’ve got guts!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A400:: @ 818A400 + .string "I hate to say this, but the TRAINER\n" + .string "everybody’s talking about is\l" + .string "{STR_VAR_1}, no question about it!\p" + .string "That TRAINER’s power...\n" + .string "It’s out of the ordinary.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A48D:: @ 818A48D + .string "Darn it... I’ve been telling people\n" + .string "that {STR_VAR_1} is the best now...\p" + .string "But no one wants to listen...$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA + .string "I’ve been hearing things about a\n" + .string "tough new TRAINER.\p" + .string "This TRAINER’s supposed to be beating\n" + .string "GYM LEADERS, even.\p" + .string "Do you know anything about this\n" + .string "new TRAINER?$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A584:: @ 818A584 + .string "Oh!\n" + .string "{PLAYER}!\p" + .string "Go for it!\n" + .string "I’m pulling for you!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC + .string "Sigh...\n" + .string "BRAWLY...\p" + .string "Oh, no! Wait!\n" + .string "That’s not right! No, no, no!\p" + .string "I’m your fan through and through!\p" + .string "So make me proud!\n" + .string "Go for it!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A629:: @ 818A629 + .string "I can’t help it, I can only get to\n" + .string "like BRAWLY...$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A65B:: @ 818A65B + .string "Nobody understands the charm of\n" + .string "BRAWLY...\p" + .string "I don’t care!\p" + .string "Even if I’m the only one, I’m going\n" + .string "to keep cheering for BRAWLY!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A6D4:: @ 818A6D4 + .string "Whatever anyone says, my favorite\n" + .string "TRAINER is DEWFORD’s GYM LEADER\l" + .string "BRAWLY!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A71E:: @ 818A71E + .string "You’ve surpassed your own father in\n" + .string "every regard!\p" + .string "I’m telling you, so there’s no question\n" + .string "about it at all!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A789:: @ 818A789 + .string "Even when things turned bleak, your\n" + .string "father never gave up.\p" + .string "This I know to be true.\p" + .string "You never give up even if you lose!\n" + .string "So keep on battling!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 + .string "NORMAN battled with more power,\n" + .string "charisma, and showmanship than you.\p" + .string "Even though people may say that\n" + .string "you’re strong...\p" + .string "You’ve still got a long way to go\n" + .string "compared to your father.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 + .string "You’re beginning to get the same\n" + .string "air of awe NORMAN exudes.\p" + .string "But there’s something conclusively\n" + .string "different between you and NORMAN.\p" + .string "I can’t tell you what that is.\n" + .string "You’ll have to find it yourself.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 + .string "Everyone here, we’re all huge fans\n" + .string "of POKéMON battles.\p" + .string "We discuss who we consider to be\n" + .string "the strongest of all TRAINERS.\p" + .string "If you were to become famous, we\n" + .string "might even become your fans!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AA39:: @ 818AA39 + .string "Oh, woweee! It’s {PLAYER}!\n" + .string "For real, too!\p" + .string "Please, shake my hand, shake my hand!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 + .string "I’ll always cheer for you, {PLAYER}!\n" + .string "Always, always!\p" + .string "I don’t want to see you lose ever,\n" + .string "{PLAYER}.\p" + .string "Because I know you’re really, really\n" + .string "strong, {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AB0A:: @ 818AB0A + .string "{STR_VAR_1} is really cool...\p" + .string "Everyone thinks so, right, right?$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AB41:: @ 818AB41 + .string "{STR_VAR_1} really is cool, don’t\n" + .string "you think so?\p" + .string "Even if it’s just me, I’m going to keep\n" + .string "cheering my favorite TRAINER.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18ABAE:: @ 818ABAE + .string "My favorite TRAINER is...\p" + .string "Cool...\p" + .string "Strong...\p" + .string "And really nice...\p" + .string "I wish there was a TRAINER like that...$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AC15:: @ 818AC15 + .string "Whoa! It’s {PLAYER}!\n" + .string "Wicked!\p" + .string "When I grow up, I want to be strong\n" + .string "like you, {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AC5E:: @ 818AC5E + .string "Even if I’m the only one...\p" + .string "You’ll always be the only one I\n" + .string "cheer for, {PLAYER}!\p" + .string "Because I believe in you, {PLAYER}!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18ACC7:: @ 818ACC7 + .string "{STR_VAR_1} is so wickedly cool...\n" + .string "I want to shake hands with my hero.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AD05:: @ 818AD05 + .string "Even if I’m the only one...\p" + .string "I’m never going to stop being\n" + .string "{STR_VAR_1}’s fan!\p" + .string "Because I’ve heard, {STR_VAR_1}\n" + .string "never loses!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AD6D:: @ 818AD6D + .string "{PLAYER}!\n" + .string "You are amazing after all!\p" + .string "Ever since I set eyes on you, I knew\n" + .string "that you were great.\p" + .string "It looks like my eyes didn’t deceive me.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18ADEF:: @ 818ADEF + .string "Who cares about the others.\n" + .string "I’m in your corner!\p" + .string "You don’t need to worry. Just get\n" + .string "out there and battle like always.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 + .string "You’re a pretty decent TRAINER,\n" + .string "I think.\p" + .string "But I also think that {STR_VAR_1}\n" + .string "is number one right now.\p" + .string "That’s just my opinion.\n" + .string "Don’t worry about it too much.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AEF5:: @ 818AEF5 + .string "Wow, you really are strong.\n" + .string "Maybe even stronger than {STR_VAR_1}.\p" + .string "But {STR_VAR_1} needs me.\p" + .string "If I don’t cheer for {STR_VAR_1},\n" + .string "who will?$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AF62:: @ 818AF62 + .string "You’ve changed my mind!\n" + .string "You are strong, aren’t you?\p" + .string "I’d like you to tell me how you managed\n" + .string "to get so strong!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18AFD0:: @ 818AFD0 + .string "The tougher the situation, the more\n" + .string "attractively you battle.\p" + .string "I can’t wait for your next battle!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18B030:: @ 818B030 + .string "Among the recently hot TRAINERS,\n" + .string "{STR_VAR_1} is the standout.\p" + .string "That toughness, it’s simply not normal.\p" + .string "You’re doing okay, but you’re not in\n" + .string "the same class as {STR_VAR_1}.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 + .string "You are really popular...\p" + .string "You’re strong, and you’re caring to\n" + .string "POKéMON. No one can knock you.\p" + .string "But, you know, I believe in {STR_VAR_1}.\p" + .string "{STR_VAR_1} is definitely stronger!\n" + .string "I’m positive!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18B16E:: @ 818B16E + .string "You...\p" + .string "Impressive!$" + +LilycoveCity_PokemonTrainerFanClub_Text_18B181:: @ 818B181 + .string "Your true worth, it is fine if only\n" + .string "I recognized it.\p" + .string "The others I doubt will understand\n" + .string "the hidden power that beats within.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18B1FD:: @ 818B1FD + .string "Yes, I see strength in your eyes.\p" + .string "But!\p" + .string "You still haven’t realized your\n" + .string "potential.$" + +LilycoveCity_PokemonTrainerFanClub_Text_18B24F:: @ 818B24F + .string "It is true that you are tremendously\n" + .string "powerful.\p" + .string "But!\n" + .string "I can tell...\p" + .string "That strength cannot be considered\n" + .string "true strength yet!\p" + .string "True strength is...!\n" + .string "... ...\p" + .string "Actually, I have no idea, either.$" diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc index 4a0127506..4a0127506 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ b/data/maps/LilycoveCity_UnusedMart/events.inc diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 43137d33b..fb20ddc79 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,9 +1,9 @@ LilycoveCity_UnusedMart:: @ 8306600 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/scripts.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc new file mode 100644 index 000000000..2e7ff450f --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc @@ -0,0 +1,2 @@ +LilycoveCity_UnusedMart_MapScripts:: @ 8159389 + .byte 0 diff --git a/data/maps/LinkContestRoom1/border.bin b/data/maps/LinkContestRoom1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc index 9bcf27a90..9bcf27a90 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/LinkContestRoom1/events.inc diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 9e265d9c9..7aea3de5f 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,9 +1,9 @@ LinkContestRoom1:: @ 83079E8 - .4byte LinkContestRoom1_MapAttributes + .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 226 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom1/map.bin b/data/maps/LinkContestRoom1/map.bin deleted file mode 100644 index a8853f6ae..000000000 --- a/data/maps/LinkContestRoom1/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````
$%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u222222 6s2t2u26
\ No newline at end of file diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc new file mode 100644 index 000000000..2709f558c --- /dev/null +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom1_MapScripts:: @ 815F580 diff --git a/data/maps/LinkContestRoom2/border.bin b/data/maps/LinkContestRoom2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc index 562a96523..562a96523 100644 --- a/data/maps/events/LinkContestRoom2.inc +++ b/data/maps/LinkContestRoom2/events.inc diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index f492eab03..a3d60c4f8 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,9 +1,9 @@ LinkContestRoom2:: @ 8307AAC - .4byte LinkContestRoom2_MapAttributes + .4byte LinkContestRoom2_Layout .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 233 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom2/map.bin b/data/maps/LinkContestRoom2/map.bin deleted file mode 100644 index 7cb63b40d..000000000 --- a/data/maps/LinkContestRoom2/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````
$%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&2222222222222 62226
\ No newline at end of file diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc new file mode 100644 index 000000000..f61e3fae6 --- /dev/null +++ b/data/maps/LinkContestRoom2/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom2_MapScripts:: @ 815F580 diff --git a/data/maps/LinkContestRoom3/border.bin b/data/maps/LinkContestRoom3/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc index 8c93f28c9..8c93f28c9 100644 --- a/data/maps/events/LinkContestRoom3.inc +++ b/data/maps/LinkContestRoom3/events.inc diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 90de4491d..4ee1f0e7d 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,9 +1,9 @@ LinkContestRoom3:: @ 8307AC8 - .4byte LinkContestRoom3_MapAttributes + .4byte LinkContestRoom3_Layout .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 234 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom3/map.bin b/data/maps/LinkContestRoom3/map.bin deleted file mode 100644 index 59e9e9182..000000000 --- a/data/maps/LinkContestRoom3/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````
$%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&2222222222222 62226
\ No newline at end of file diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc new file mode 100644 index 000000000..5a34f848a --- /dev/null +++ b/data/maps/LinkContestRoom3/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom3_MapScripts:: @ 815F580 diff --git a/data/maps/LinkContestRoom4/border.bin b/data/maps/LinkContestRoom4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc index a5e455811..a5e455811 100644 --- a/data/maps/events/LinkContestRoom4.inc +++ b/data/maps/LinkContestRoom4/events.inc diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 774e55abc..56ee5906c 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,9 +1,9 @@ LinkContestRoom4:: @ 8307AE4 - .4byte LinkContestRoom4_MapAttributes + .4byte LinkContestRoom4_Layout .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 235 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom4/map.bin b/data/maps/LinkContestRoom4/map.bin deleted file mode 100644 index 4e2166c19..000000000 --- a/data/maps/LinkContestRoom4/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````
$%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&2222222222222 62226
\ No newline at end of file diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc new file mode 100644 index 000000000..bf6539bdd --- /dev/null +++ b/data/maps/LinkContestRoom4/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom4_MapScripts:: @ 815F580 diff --git a/data/maps/LinkContestRoom5/border.bin b/data/maps/LinkContestRoom5/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom5/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc index f0f8fa508..f0f8fa508 100644 --- a/data/maps/events/LinkContestRoom5.inc +++ b/data/maps/LinkContestRoom5/events.inc diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 22b90f6c9..fb2a66640 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,9 +1,9 @@ LinkContestRoom5:: @ 8307B00 - .4byte LinkContestRoom5_MapAttributes + .4byte LinkContestRoom5_Layout .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 236 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom5/map.bin b/data/maps/LinkContestRoom5/map.bin deleted file mode 100644 index ad068fe7c..000000000 --- a/data/maps/LinkContestRoom5/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````
$%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&2222222222222 62226
\ No newline at end of file diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc new file mode 100644 index 000000000..d3cd5d64b --- /dev/null +++ b/data/maps/LinkContestRoom5/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom5_MapScripts:: @ 815F580 diff --git a/data/maps/LinkContestRoom6/border.bin b/data/maps/LinkContestRoom6/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LinkContestRoom6/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc index a8fd4962f..a8fd4962f 100644 --- a/data/maps/events/LinkContestRoom6.inc +++ b/data/maps/LinkContestRoom6/events.inc diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 773912080..db9343180 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,9 +1,9 @@ LinkContestRoom6:: @ 8307B1C - .4byte LinkContestRoom6_MapAttributes + .4byte LinkContestRoom6_Layout .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 237 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom6/map.bin b/data/maps/LinkContestRoom6/map.bin deleted file mode 100644 index 9fcec5a5e..000000000 --- a/data/maps/LinkContestRoom6/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````
$%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&2222222222222 62226
\ No newline at end of file diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc new file mode 100644 index 000000000..26296ece6 --- /dev/null +++ b/data/maps/LinkContestRoom6/scripts.inc @@ -0,0 +1 @@ +LinkContestRoom6_MapScripts:: @ 815F580 diff --git a/data/maps/LittlerootTown/border.bin b/data/maps/LittlerootTown/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/LittlerootTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc index b50dbc7e1..b50dbc7e1 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/LittlerootTown/events.inc diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 5493f6005..88f6763e3 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,9 +1,9 @@ LittlerootTown:: @ 8305544 - .4byte LittlerootTown_MapAttributes + .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 10 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/map.bin b/data/maps/LittlerootTown/map.bin deleted file mode 100644 index 9af76f90e..000000000 --- a/data/maps/LittlerootTown/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -5000000000000000000000000000000000000002 2 2 2 -20000002 2 2 2 -2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000000000000000000000000000000000000000000 2B2C2
2
2
220000000000000JK0000000000000000000000000 ,A- 0000000011000&4I5'00000000110000200000000110000000000000011111111111111
\ No newline at end of file diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc new file mode 100644 index 000000000..e98f73393 --- /dev/null +++ b/data/maps/LittlerootTown/scripts.inc @@ -0,0 +1,877 @@ +LittlerootTown_MapScripts:: @ 814D509 + map_script 3, LittlerootTown_MapScript1_14D514 + map_script 2, LittlerootTown_MapScript2_14D5D5 + .byte 0 + +LittlerootTown_MapScript1_14D514:: @ 814D514 + setflag FLAG_VISITED_LITTLEROOT_TOWN + compare VAR_LITTLEROOT_INTRO_STATE, 2 + call_if_eq LittlerootTown_EventScript_14D57B + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583 + compare VAR_LITTLEROOT_STATE, 3 + call_if_eq LittlerootTown_EventScript_14D5A6 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 + call_if_eq LittlerootTown_EventScript_14D570 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 + call_if_eq LittlerootTown_EventScript_14D570 + compare VAR_OLDALE_STATE, 1 + call_if_eq LittlerootTown_EventScript_14D567 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 + call_if_eq LittlerootTown_EventScript_14D563 + end + +LittlerootTown_EventScript_14D563:: @ 814D563 + setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 + return + +LittlerootTown_EventScript_14D567:: @ 814D567 + setvar VAR_OLDALE_STATE, 2 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN + return + +LittlerootTown_EventScript_14D570:: @ 814D570 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 + return + +LittlerootTown_EventScript_14D57B:: @ 814D57B + setobjectxyperm 4, 14, 8 + return + +LittlerootTown_EventScript_14D583:: @ 814D583 + compare VAR_LITTLEROOT_STATE, 0 + goto_if_eq LittlerootTown_EventScript_14D59A + setobjectxyperm 1, 10, 1 + setobjectmovementtype 1, 7 + return + +LittlerootTown_EventScript_14D59A:: @ 814D59A + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 8 + return + +LittlerootTown_EventScript_14D5A6:: @ 814D5A6 + clearflag FLAG_HIDE_MOM_LITTLEROOT + setobjectmovementtype 4, 8 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D5C5 + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D5CD + return + +LittlerootTown_EventScript_14D5C5:: @ 814D5C5 + setobjectxyperm 4, 5, 9 + return + +LittlerootTown_EventScript_14D5CD:: @ 814D5CD + setobjectxyperm 4, 14, 9 + return + +LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5 + .2byte 0 + +LittlerootTown_EventScript_14D5EF:: @ 814D5EF + lockall + setvar VAR_SPECIAL_4, 5 + setvar VAR_SPECIAL_5, 8 + call LittlerootTown_EventScript_14D62B + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 + waitstate + releaseall + end + +LittlerootTown_EventScript_14D60D:: @ 814D60D + lockall + setvar VAR_SPECIAL_4, 14 + setvar VAR_SPECIAL_5, 8 + call LittlerootTown_EventScript_14D62B + setflag FLAG_HIDE_MOVING_TRUCK_MAY + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 + waitstate + releaseall + end + +LittlerootTown_EventScript_14D62B:: @ 814D62B + delay 15 + playse SE_DANSA + applymovement 255, LittlerootTown_Movement_14D6C0 + waitmovement 0 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 + waitdooranim + addobject 4 + applymovement 4, LittlerootTown_Movement_14D6AC + waitmovement 0 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 + waitdooranim + delay 10 + applymovement 4, LittlerootTown_Movement_14D6AE + waitmovement 0 + msgbox LittlerootTown_Text_16A7C9, 4 + closemessage + applymovement 4, LittlerootTown_Movement_14D6B1 + applymovement 255, LittlerootTown_Movement_14D6B8 + waitmovement 0 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 + waitdooranim + applymovement 4, LittlerootTown_Movement_14D6B5 + applymovement 255, LittlerootTown_Movement_14D6BD + waitmovement 0 + setflag FLAG_HIDE_MOM_LITTLEROOT + setvar VAR_LITTLEROOT_INTRO_STATE, 3 + hideobjectat 255, MAP_PETALBURG_CITY + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 + waitdooranim + clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT + clearflag FLAG_SPECIAL_FLAG_0 + return + +LittlerootTown_Movement_14D6AC:: @ 814D6AC + walk_down + end_movement + +LittlerootTown_Movement_14D6AE:: @ 814D6AE + walk_down + walk_in_place_fastest_left + end_movement + +LittlerootTown_Movement_14D6B1:: @ 814D6B1 + delay_16 + delay_8 + walk_up + end_movement + +LittlerootTown_Movement_14D6B5:: @ 814D6B5 + walk_up + set_invisible + end_movement + +LittlerootTown_Movement_14D6B8:: @ 814D6B8 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14D6BD:: @ 814D6BD + walk_up + walk_up + end_movement + +LittlerootTown_Movement_14D6C0:: @ 814D6C0 + jump_right + delay_16 + delay_16 + delay_16 + end_movement + +LittlerootTown_EventScript_14D6C5:: @ 814D6C5 + lockall + setvar VAR_LITTLEROOT_INTRO_STATE, 8 + releaseall + end + +LittlerootTown_EventScript_14D6CD:: @ 814D6CD + msgbox LittlerootTown_Text_16AC00, 2 + end + +LittlerootTown_EventScript_14D6D6:: @ 814D6D6 + msgbox LittlerootTown_Text_16AC56, 2 + end + +LittlerootTown_EventScript_14D6DF:: @ 814D6DF + lock + faceplayer + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722 + compare VAR_LITTLEROOT_STATE, 0 + goto_if_ne LittlerootTown_EventScript_14D708 + msgbox LittlerootTown_Text_16ACEB, 4 + release + end + +LittlerootTown_EventScript_14D708:: @ 814D708 + msgbox LittlerootTown_Text_16AD82, 4 + closemessage + applymovement 1, LittlerootTown_Movement_1A083D + waitmovement 0 + setvar VAR_LITTLEROOT_STATE, 2 + release + end + +LittlerootTown_EventScript_14D722:: @ 814D722 + special GetPlayerBigGuyGirlString + msgbox LittlerootTown_Text_16ADF2, 4 + release + end + +LittlerootTown_EventScript_14D72F:: @ 814D72F + msgbox LittlerootTown_Text_16AE25, 4 + release + end + +LittlerootTown_EventScript_14D739:: @ 814D739 + lockall + applymovement 1, LittlerootTown_Movement_14D779 + waitmovement 0 + call LittlerootTown_EventScript_14D755 + applymovement 1, LittlerootTown_Movement_14D789 + waitmovement 0 + releaseall + end + +LittlerootTown_EventScript_14D755:: @ 814D755 + msgbox LittlerootTown_Text_16ACEB, 4 + closemessage + applymovement 1, LittlerootTown_Movement_14D787 + applymovement 255, LittlerootTown_Movement_14D793 + waitmovement 0 + msgbox LittlerootTown_Text_16AD3C, 4 + closemessage + return + +LittlerootTown_Movement_14D779:: @ 814D779 + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_left + face_down + end_movement + +LittlerootTown_Movement_14D787:: @ 814D787 + walk_down + end_movement + +LittlerootTown_Movement_14D789:: @ 814D789 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_down + end_movement + +LittlerootTown_Movement_14D793:: @ 814D793 + lock_facing_direction + walk_down + unlock_facing_direction + end_movement + +LittlerootTown_EventScript_14D797:: @ 814D797 + lockall + applymovement 1, LittlerootTown_Movement_14D7B3 + waitmovement 0 + call LittlerootTown_EventScript_14D755 + applymovement 1, LittlerootTown_Movement_14D7C0 + waitmovement 0 + releaseall + end + +LittlerootTown_Movement_14D7B3:: @ 814D7B3 + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_right + face_down + end_movement + +LittlerootTown_Movement_14D7C0:: @ 814D7C0 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement + +LittlerootTown_EventScript_14D7C7:: @ 814D7C7 + lockall + applymovement 1, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + msgbox LittlerootTown_Text_16AD82, 4 + closemessage + applymovement 1, LittlerootTown_Movement_1A083D + waitmovement 0 + setvar VAR_LITTLEROOT_STATE, 2 + releaseall + end + +LittlerootTown_EventScript_14D7F6:: @ 814D7F6 + msgbox LittlerootTown_Text_16AE50, 3 + end + +LittlerootTown_EventScript_14D7FF:: @ 814D7FF + msgbox LittlerootTown_Text_16AE87, 3 + end + +LittlerootTown_EventScript_14D808:: @ 814D808 + lockall + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D822 + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D82B + releaseall + end + +LittlerootTown_EventScript_14D822:: @ 814D822 + msgbox LittlerootTown_Text_16AEA1, 4 + return + +LittlerootTown_EventScript_14D82B:: @ 814D82B + msgbox LittlerootTown_Text_16AEAC, 4 + return + +LittlerootTown_EventScript_14D834:: @ 814D834 + lockall + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D84E + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D857 + releaseall + end + +LittlerootTown_EventScript_14D84E:: @ 814D84E + msgbox LittlerootTown_Text_16AEAC, 4 + return + +LittlerootTown_EventScript_14D857:: @ 814D857 + msgbox LittlerootTown_Text_16AEA1, 4 + return + +LittlerootTown_EventScript_14D860:: @ 814D860 + lockall + setvar VAR_SPECIAL_8, 0 + setobjectxy 4, 10, 9 + goto LittlerootTown_EventScript_14D8B6 + end + +LittlerootTown_EventScript_14D873:: @ 814D873 + lockall + setvar VAR_SPECIAL_8, 1 + setobjectxy 4, 11, 9 + goto LittlerootTown_EventScript_14D8B6 + end + +LittlerootTown_EventScript_14D886:: @ 814D886 + lockall + setvar VAR_SPECIAL_8, 2 + goto LittlerootTown_EventScript_14D8B6 + end + +LittlerootTown_EventScript_14D892:: @ 814D892 + lockall + setvar VAR_SPECIAL_8, 3 + goto LittlerootTown_EventScript_14D8B6 + end + +LittlerootTown_EventScript_14D89E:: @ 814D89E + lockall + setvar VAR_SPECIAL_8, 4 + goto LittlerootTown_EventScript_14D8B6 + end + +LittlerootTown_EventScript_14D8AA:: @ 814D8AA + lockall + setvar VAR_SPECIAL_8, 5 + goto LittlerootTown_EventScript_14D8B6 + end + +LittlerootTown_EventScript_14D8B6:: @ 814D8B6 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D93C + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D947 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D926 + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D931 + msgbox LittlerootTown_Text_16A8EE, 4 + closemessage + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D952 + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D995 + call LittlerootTown_EventScript_14DD38 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14DAAA + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14DAED + goto LittlerootTown_EventScript_14DD2B + end + +LittlerootTown_EventScript_14D926:: @ 814D926 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 8 + return + +LittlerootTown_EventScript_14D931:: @ 814D931 + setvar VAR_SPECIAL_9, 14 + setvar VAR_SPECIAL_A, 8 + return + +LittlerootTown_EventScript_14D93C:: @ 814D93C + applymovement 4, LittlerootTown_Movement_1A0843 + waitmovement 0 + return + +LittlerootTown_EventScript_14D947:: @ 814D947 + applymovement 4, LittlerootTown_Movement_1A083F + waitmovement 0 + return + +LittlerootTown_EventScript_14D952:: @ 814D952 + compare VAR_SPECIAL_8, 0 + call_if_eq LittlerootTown_EventScript_14D9D8 + compare VAR_SPECIAL_8, 1 + call_if_eq LittlerootTown_EventScript_14D9ED + compare VAR_SPECIAL_8, 2 + call_if_eq LittlerootTown_EventScript_14DA02 + compare VAR_SPECIAL_8, 3 + call_if_eq LittlerootTown_EventScript_14DA17 + compare VAR_SPECIAL_8, 4 + call_if_eq LittlerootTown_EventScript_14DA2C + compare VAR_SPECIAL_8, 5 + call_if_eq LittlerootTown_EventScript_14DA41 + return + +LittlerootTown_EventScript_14D995:: @ 814D995 + compare VAR_SPECIAL_8, 0 + call_if_eq LittlerootTown_EventScript_14D9D8 + compare VAR_SPECIAL_8, 1 + call_if_eq LittlerootTown_EventScript_14D9ED + compare VAR_SPECIAL_8, 2 + call_if_eq LittlerootTown_EventScript_14DA56 + compare VAR_SPECIAL_8, 3 + call_if_eq LittlerootTown_EventScript_14DA6B + compare VAR_SPECIAL_8, 4 + call_if_eq LittlerootTown_EventScript_14DA80 + compare VAR_SPECIAL_8, 5 + call_if_eq LittlerootTown_EventScript_14DA95 + return + +LittlerootTown_EventScript_14D9D8:: @ 814D9D8 + applymovement 255, LittlerootTown_Movement_1A0845 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC76 + waitmovement 0 + return + +LittlerootTown_EventScript_14D9ED:: @ 814D9ED + applymovement 255, LittlerootTown_Movement_1A0845 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC7D + waitmovement 0 + return + +LittlerootTown_EventScript_14DA02:: @ 814DA02 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC84 + waitmovement 0 + return + +LittlerootTown_EventScript_14DA17:: @ 814DA17 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC89 + waitmovement 0 + return + +LittlerootTown_EventScript_14DA2C:: @ 814DA2C + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC8F + waitmovement 0 + return + +LittlerootTown_EventScript_14DA41:: @ 814DA41 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC92 + waitmovement 0 + return + +LittlerootTown_EventScript_14DA56:: @ 814DA56 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC96 + waitmovement 0 + return + +LittlerootTown_EventScript_14DA6B:: @ 814DA6B + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC9A + waitmovement 0 + return + +LittlerootTown_EventScript_14DA80:: @ 814DA80 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC9D + waitmovement 0 + return + +LittlerootTown_EventScript_14DA95:: @ 814DA95 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DCA3 + waitmovement 0 + return + +LittlerootTown_EventScript_14DAAA:: @ 814DAAA + compare VAR_SPECIAL_8, 0 + call_if_eq LittlerootTown_EventScript_14DB30 + compare VAR_SPECIAL_8, 1 + call_if_eq LittlerootTown_EventScript_14DB3B + compare VAR_SPECIAL_8, 2 + call_if_eq LittlerootTown_EventScript_14DB46 + compare VAR_SPECIAL_8, 3 + call_if_eq LittlerootTown_EventScript_14DB6C + compare VAR_SPECIAL_8, 4 + call_if_eq LittlerootTown_EventScript_14DB92 + compare VAR_SPECIAL_8, 5 + call_if_eq LittlerootTown_EventScript_14DBB8 + return + +LittlerootTown_EventScript_14DAED:: @ 814DAED + compare VAR_SPECIAL_8, 0 + call_if_eq LittlerootTown_EventScript_14DB30 + compare VAR_SPECIAL_8, 1 + call_if_eq LittlerootTown_EventScript_14DB3B + compare VAR_SPECIAL_8, 2 + call_if_eq LittlerootTown_EventScript_14DBDE + compare VAR_SPECIAL_8, 3 + call_if_eq LittlerootTown_EventScript_14DC04 + compare VAR_SPECIAL_8, 4 + call_if_eq LittlerootTown_EventScript_14DC2A + compare VAR_SPECIAL_8, 5 + call_if_eq LittlerootTown_EventScript_14DC50 + return + +LittlerootTown_EventScript_14DB30:: @ 814DB30 + applymovement 4, LittlerootTown_Movement_14DCA8 + waitmovement 0 + return + +LittlerootTown_EventScript_14DB3B:: @ 814DB3B + applymovement 4, LittlerootTown_Movement_14DCAE + waitmovement 0 + return + +LittlerootTown_EventScript_14DB46:: @ 814DB46 + applymovement 4, LittlerootTown_Movement_14DCB4 + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DB6C:: @ 814DB6C + applymovement 4, LittlerootTown_Movement_14DCBA + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DB92:: @ 814DB92 + applymovement 4, LittlerootTown_Movement_14DCC1 + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DBB8:: @ 814DBB8 + applymovement 4, LittlerootTown_Movement_14DCC5 + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DBDE:: @ 814DBDE + applymovement 4, LittlerootTown_Movement_14DCCA + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DC04:: @ 814DC04 + applymovement 4, LittlerootTown_Movement_14DCCF + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DC2A:: @ 814DC2A + applymovement 4, LittlerootTown_Movement_14DCD3 + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_EventScript_14DC50:: @ 814DC50 + applymovement 4, LittlerootTown_Movement_14DCDA + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + return + +LittlerootTown_Movement_14DC76:: @ 814DC76 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +LittlerootTown_Movement_14DC7D:: @ 814DC7D + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +LittlerootTown_Movement_14DC84:: @ 814DC84 + walk_right + walk_right + walk_right + walk_right + end_movement + +LittlerootTown_Movement_14DC89:: @ 814DC89 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +LittlerootTown_Movement_14DC8F:: @ 814DC8F + walk_right + walk_right + end_movement + +LittlerootTown_Movement_14DC92:: @ 814DC92 + walk_right + walk_right + walk_right + end_movement + +LittlerootTown_Movement_14DC96:: @ 814DC96 + walk_left + walk_left + walk_left + end_movement + +LittlerootTown_Movement_14DC9A:: @ 814DC9A + walk_left + walk_left + end_movement + +LittlerootTown_Movement_14DC9D:: @ 814DC9D + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +LittlerootTown_Movement_14DCA3:: @ 814DCA3 + walk_left + walk_left + walk_left + walk_left + end_movement + +LittlerootTown_Movement_14DCA8:: @ 814DCA8 + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +LittlerootTown_Movement_14DCAE:: @ 814DCAE + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +LittlerootTown_Movement_14DCB4:: @ 814DCB4 + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCBA:: @ 814DCBA + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCC1:: @ 814DCC1 + walk_left + walk_left + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCC5:: @ 814DCC5 + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCCA:: @ 814DCCA + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCCF:: @ 814DCCF + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCD3:: @ 814DCD3 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCDA:: @ 814DCDA + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +LittlerootTown_Movement_14DCE0:: @ 814DCE0 + walk_up + end_movement + +LittlerootTown_EventScript_14DCE2:: @ 814DCE2 + lock + faceplayer + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_EventScript_14D926 + compare RESULT, 1 + call_if_eq LittlerootTown_EventScript_14D931 + call LittlerootTown_EventScript_14DD38 + applymovement 4, LittlerootTown_Movement_1A0841 + waitmovement 0 + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 + hideobjectat 4, MAP_LITTLEROOT_TOWN + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + waitdooranim + goto LittlerootTown_EventScript_14DD2B + end + +LittlerootTown_EventScript_14DD2B:: @ 814DD2B + removeobject 4 + setflag FLAG_SYS_B_DASH + setvar VAR_LITTLEROOT_STATE, 4 + release + end + +LittlerootTown_EventScript_14DD38:: @ 814DD38 + msgbox LittlerootTown_Text_16A8FD, 4 + playfanfare MUS_FANFA4 + message LittlerootTown_Text_16AA32 + waitfanfare + waitmessage + setflag FLAG_RECEIVED_RUNNING_SHOES + msgbox LittlerootTown_Text_16AA5C, 4 + msgbox LittlerootTown_Text_16AB10, 4 + closemessage + delay 30 + return diff --git a/data/maps/LittlerootTown/text.inc b/data/maps/LittlerootTown/text.inc new file mode 100644 index 000000000..1e23d584f --- /dev/null +++ b/data/maps/LittlerootTown/text.inc @@ -0,0 +1,94 @@ +LittlerootTown_Text_16A7C9:: @ 816A7C9 + .string "MOM: {PLAYER}, we’re here, honey!\p" + .string "It must be tiring riding with our things\n" + .string "in the moving truck.\p" + .string "Well, this is LITTLEROOT TOWN.\p" + .string "How do you like it?\n" + .string "This is our new home!\p" + .string "It has a quaint feel, but it seems to be\n" + .string "an easy place to live, don’t you think?\p" + .string "And, you get your own room, {PLAYER}!\n" + .string "Let’s go inside.$" + +LittlerootTown_Text_16A8EE:: @ 816A8EE + .string "MOM: Wait, {PLAYER}!$" + +LittlerootTown_Text_16A8FD:: @ 816A8FD + .string "MOM: {PLAYER}! {PLAYER}! Did you\n" + .string "introduce yourself to PROF. BIRCH?\p" + .string "Oh! What an adorable POKéMON!\n" + .string "You got it from PROF. BIRCH. How nice!\p" + .string "You’re your father’s child, all right.\n" + .string "You look good together with POKéMON!\p" + .string "Here, honey! If you’re going out on an\n" + .string "adventure, wear these RUNNING SHOES.\p" + .string "They’ll put a zip in your step!$" + +LittlerootTown_Text_16AA32:: @ 816AA32 + .string "{PLAYER} switched shoes with the\n" + .string "RUNNING SHOES.$" + +LittlerootTown_Text_16AA5C:: @ 816AA5C + .string "MOM: {PLAYER}, those shoes came with\n" + .string "instructions.\p" + .string "“Press the B Button while wearing these\n" + .string "RUNNING SHOES to run extra-fast!\p" + .string "“Slip on these RUNNING SHOES and race\n" + .string "in the great outdoors!”$" + +LittlerootTown_Text_16AB10:: @ 816AB10 + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "To think that you have your very own\n" + .string "POKéMON now...\l" + .string "Your father will be overjoyed.\p" + .string "...But please be careful.\n" + .string "If anything happens, you can come home.\p" + .string "Go on, go get them, honey!$" + +LittlerootTown_Text_16AC00:: @ 816AC00 + .string "If you use a PC, you can store items\n" + .string "and POKéMON.\p" + .string "The power of science is staggering!$" + +LittlerootTown_Text_16AC56:: @ 816AC56 + .string "PROF. BIRCH spends days in his LAB\n" + .string "studying, then he’ll suddenly go out in\l" + .string "the wild to do more research...\p" + .string "When does PROF. BIRCH spend time\n" + .string "at home?$" + +LittlerootTown_Text_16ACEB:: @ 816ACEB + .string "If you go in the tall grass at the sides\n" + .string "of this road, wild POKéMON will appear.$" + +LittlerootTown_Text_16AD3C:: @ 816AD3C + .string "It’s not safe to go out there if you\n" + .string "don’t have any POKéMON with you.$" + +LittlerootTown_Text_16AD82:: @ 816AD82 + .string "I can hear someone shouting down the\n" + .string "road here.\p" + .string "What should I do? What should we do?\n" + .string "Somebody has to go help...$" + +LittlerootTown_Text_16ADF2:: @ 816ADF2 + .string "Boy, am I glad you went and rescued\n" + .string "the PROFESSOR.$" + +LittlerootTown_Text_16AE25:: @ 816AE25 + .string "Are you going to catch POKéMON?\n" + .string "Good luck!$" + +LittlerootTown_Text_16AE50:: @ 816AE50 + .string "LITTLEROOT TOWN\n" + .string "“A town that can’t be shaded any hue.”$" + +LittlerootTown_Text_16AE87:: @ 816AE87 + .string "PROF. BIRCH’S POKéMON LAB$" + +LittlerootTown_Text_16AEA1:: @ 816AEA1 + .string "{PLAYER}’s HOUSE$" + +LittlerootTown_Text_16AEAC:: @ 816AEAC + .string "PROF. BIRCH’S HOUSE$" diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/maps/LittlerootTown_BrendansHouse_1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin +++ /dev/null diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 4ac7d4b3c..4ac7d4b3c 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 122fdc82a..eebc7b989 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,9 +1,9 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes + .4byte LittlerootTown_BrendansHouse_1F_Layout .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 54 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/maps/LittlerootTown_BrendansHouse_1F/map.bin deleted file mode 100644 index 3ae8e69a6..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -nn nn 01234&&
M89:;<222222B222d222222@A222222252H2I2J2.262222222266 2 222222 2!2"#$2%222222(2)2*2+2,2-222
\ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc new file mode 100644 index 000000000..340f50894 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -0,0 +1,123 @@ +LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B + map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_15264B + map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_15268A + map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0 + .byte 0 + +LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B + compare VAR_LITTLEROOT_INTRO_STATE, 6 + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660 + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673 + end + +LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 + return + +LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 + checkplayergender + compare RESULT, 0 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 + return + +LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 + setmetatile 3, 7, 659, 1 + return + +LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A + compare VAR_LITTLEROOT_INTRO_STATE, 3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + compare VAR_LITTLEROOT_INTRO_STATE, 5 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC + compare VAR_LITTLEROOT_INTRO_STATE, 6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + end + +LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC + setobjectxyperm 1, 8, 4 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8 + setobjectxyperm 1, 4, 5 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 + setobjectxyperm 1, 9, 8 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE + .2byte 0 + +LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA + lockall + msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4 + closemessage + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 + waitmovement 0 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 + waitstate + releaseall + end + +LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 + walk_up + end_movement + +LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 + lockall + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 + end + +LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 + lockall + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF + end + +LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 + lockall + playse SE_PIN + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 + waitmovement 0 + special GetRivalSonDaughterString + msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 + setflag FLAG_MET_RIVAL_MOM + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 + releaseall + end + +LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 + lockall + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F + waitmovement 0 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 + end diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/text.inc b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc new file mode 100644 index 000000000..888fc8973 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc @@ -0,0 +1,146 @@ +LittlerootTown_BrendansHouse_1F_Text_172429:: @ 8172429 + .string "MOM: See, {PLAYER}?\n" + .string "Isn’t it nice in here, too?$" + +LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 + .string "The mover’s POKéMON do all the work\n" + .string "of moving us in and cleaning up after.\l" + .string "This is so convenient!\p" + .string "{PLAYER}, your room is upstairs.\n" + .string "Go check it out, dear!\p" + .string "DAD bought you a new clock to mark\n" + .string "our move here.\l" + .string "Don’t forget to set it!$" + +LittlerootTown_BrendansHouse_1F_Text_172531:: @ 8172531 + .string "MOM: Well, {PLAYER}?\p" + .string "Aren’t you interested in seeing your\n" + .string "very own room?$" + +LittlerootTown_BrendansHouse_1F_Text_172574:: @ 8172574 +LittlerootTown_MaysHouse_1F_Text_172574:: @ 8172574 + .string "MOM: {PLAYER}.\p" + .string "Go set the clock in your room, honey.$" + +LittlerootTown_BrendansHouse_1F_Text_1725A3:: @ 81725A3 + .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" + .string "Quick! Come quickly!$" + +LittlerootTown_BrendansHouse_1F_Text_1725C9:: @ 81725C9 +LittlerootTown_MaysHouse_1F_Text_1725C9:: @ 81725C9 + .string "MOM: Look! It’s PETALBURG GYM!\n" + .string "Maybe DAD will be on!$" + +LittlerootTown_BrendansHouse_1F_Text_1725FE:: @ 81725FE +LittlerootTown_MaysHouse_1F_Text_1725FE:: @ 81725FE + .string "MOM: Oh... It’s over.\p" + .string "I think DAD was on, but we missed him.\n" + .string "Too bad.$" + +LittlerootTown_BrendansHouse_1F_Text_172644:: @ 8172644 +LittlerootTown_MaysHouse_1F_Text_172644:: @ 8172644 + .string "Oh, yes.\n" + .string "One of DAD’s friends lives in town.\p" + .string "PROF. BIRCH is his name.\p" + .string "He lives right next door, so you should\n" + .string "go over and introduce yourself.$" + +LittlerootTown_BrendansHouse_1F_Text_1726D2:: @ 81726D2 + .string "MOM: See you, honey!$" + +LittlerootTown_BrendansHouse_1F_Text_1726E7:: @ 81726E7 + .string "MOM: Did you introduce yourself to\n" + .string "PROF. BIRCH?$" + +LittlerootTown_BrendansHouse_1F_Text_172717:: @ 8172717 + .string "MOM: How are you doing, {PLAYER}?\n" + .string "You look a little tired.\p" + .string "I think you should rest a bit.$" + +LittlerootTown_BrendansHouse_1F_Text_17276B:: @ 817276B + .string "MOM: Take care, honey!$" + +LittlerootTown_BrendansHouse_1F_Text_172782:: @ 8172782 + .string "MOM: Oh? Did DAD give you that BADGE?\p" + .string "Then here’s something from your MOM!$" + +LittlerootTown_BrendansHouse_1F_Text_1727CD:: @ 81727CD + .string "Don’t push yourself too hard, dear.\n" + .string "You can always come home.\p" + .string "Go for it, honey!$" + +LittlerootTown_BrendansHouse_1F_Text_17281D:: @ 817281D + .string "Gyao, gyao gyaoh...$" + +LittlerootTown_BrendansHouse_1F_Text_172831:: @ 8172831 + .string "Gwagwah gwah...$" + +LittlerootTown_BrendansHouse_1F_Text_172841:: @ 8172841 + .string "INTERVIEWER: ...We brought you this\n" + .string "report from in front of PETALBURG GYM.$" + +UnknownString_817288C: @ 817288C + .string "There is a movie on TV.\p" + .string "Two men are dancing on a big piano\n" + .string "keyboard.\p" + .string "Better get going!$" + +UnknownString_81728E3: @ 81728E3 + .string "It’s the instruction booklet for the\n" + .string "RUNNING SHOES.\p" + .string "“Press the B Button to run while\n" + .string "wearing your RUNNING SHOES.\p" + .string "“Lace up your RUNNING SHOES and hit\n" + .string "the road running!”$" + +LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B + .string "DAD: Hm?\p" + .string "Hey, it’s {PLAYER}!\p" + .string "It’s been a while since I saw you,\n" + .string "but you look...stronger, somehow.\p" + .string "That’s the impression I get.\n" + .string "But your old man hasn’t given up yet!\p" + .string "Oh, yes, I have something for you.\n" + .string "This came to you from someone named\l" + .string "MR. BRINEY.$" + +LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D + .string "DAD: Hm, a TICKET for a ferry?\p" + .string "If I recall, there are ferry ports in\n" + .string "SLATEPORT and LILYCOVE.\p" + .string "{PLAYER}, if you have ambition as a\n" + .string "TRAINER, go to the BATTLE TOWER.\p" + .string "It should teach you that there is\n" + .string "no end to a TRAINER’s chosen path.$" + +LittlerootTown_BrendansHouse_1F_Text_172B5E:: @ 8172B5E + .string "I’d better get back to PETALBURG GYM.\p" + .string "MOM, thanks for looking after the house\n" + .string "while I’m away.$" + +LittlerootTown_BrendansHouse_1F_Text_172BBC:: @ 8172BBC + .string "MOM: That DAD of yours...\p" + .string "He comes home for the first time in a\n" + .string "while, but all he talks about is POKéMON.\p" + .string "He should relax and stay a little longer.$" + +UnknownString_8172C50: @ 8172C50 + .string "We bring you a special news bulletin.\p" + .string "We’ve received reports of a blue FLYING\n" + .string "POKéMON in various HOENN locales.\p" + .string "The identity of this POKéMON has not\n" + .string "yet been determined.\p" + .string "We now return you to your regular\n" + .string "movie presentation.$" + +UnknownString_8172D30: @ 8172D30 + .string "We bring you a special news bulletin.\p" + .string "We’ve received reports of a red FLYING\n" + .string "POKéMON in various HOENN locales.\p" + .string "The identity of this POKéMON has not\n" + .string "yet been determined.\p" + .string "We now return you to your regular\n" + .string "movie presentation.$" + +UnknownString_8172E0F: @ 8172E0F + .string "Gau gau!$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/maps/LittlerootTown_BrendansHouse_2F/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 2e4c4b6ae..2e4c4b6ae 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 449a883cb..660c1e08e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,9 +1,9 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes + .4byte LittlerootTown_BrendansHouse_2F_Layout .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 55 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/maps/LittlerootTown_BrendansHouse_2F/map.bin deleted file mode 100644 index 9de4bae2a..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -RTPTV'
Z[Ue/b2c2x2f2]2x2222{2|2}22222222222222BB222222222222222222222
\ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc new file mode 100644 index 000000000..ed6818fa0 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -0,0 +1,89 @@ +LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 + map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1527AF + map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1527DA + .byte 0 + +LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE + compare VAR_LITTLEROOT_INTRO_STATE, 4 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 + call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D + setvar VAR_0x4089, 0 + end + +LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE + setobjectxyperm 1, 1, 2 + setobjectmovementtype 1, 7 + return + +LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA + map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 + .2byte 0 + +LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 + checkplayergender + compare RESULT, 0 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 + end + +@ 81527F1 + lockall + checkplayergender + compare RESULT, 0 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A + compare RESULT, 1 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 + end + +LittlerootTown_BrendansHouse_2F_EventScript_15280A:: @ 815280A + msgbox UnknownString_8172F31, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_152814:: @ 8152814 + msgbox UnknownString_8173A76, 4 + releaseall + end + +gUnknown_0815281E:: @ 815281E + +LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E + lockall + checkplayergender + compare RESULT, 0 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 + compare RESULT, 1 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D + end + +LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 + setvar VAR_SPECIAL_4, 1 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 + special BedroomPC + waitstate + releaseall + end + +gBrendanHouse_TurnPCOff:: @ 8152850 + setvar VAR_SPECIAL_4, 1 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D + msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_152867:: @ 8152867 +LittlerootTown_MaysHouse_2F_EventScript_152867:: @ 8152867 + msgbox LittlerootTown_BrendansHouse_2F_Text_172F9A, 3 + end + +LittlerootTown_BrendansHouse_2F_EventScript_152870:: @ 8152870 +LittlerootTown_MaysHouse_2F_EventScript_152870:: @ 8152870 + msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, 3 + end diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc new file mode 100644 index 000000000..06206caaa --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc @@ -0,0 +1,38 @@ +LittlerootTown_BrendansHouse_2F_Text_172E18:: @ 8172E18 + .string "The clock is stopped...\p" + .string "Better set it and start it!$" + +LittlerootTown_BrendansHouse_2F_Text_172E4C:: @ 8172E4C + .string "MOM: {PLAYER}, how do you like your\n" + .string "new room?\p" + .string "Good! Everything’s put away neatly!\p" + .string "They finished moving everything in\n" + .string "downstairs, too.\p" + .string "POKéMON movers are so convenient!\p" + .string "Oh, you should make sure that\n" + .string "everything’s all there on your desk.$" + +UnknownString_8172F31: @ 8172F31 + .string "The bookshelf is lined entirely with\n" + .string "books on POKéMON.\p" + .string "It’s {PLAYER}’s prized collection.$" + +UnknownString_8172F85: @ 8172F85 + .string "{PLAYER} booted up the PC.$" + +LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A + .string "{PLAYER} flipped open the notebook.\p" + .string "ADVENTURE RULE NO. 1\n" + .string "Open the MENU with START.\p" + .string "ADVENTURE RULE NO. 2\n" + .string "Record your progress with SAVE.\p" + .string "The remaining pages are blank...$" + +UnknownString_817303D: @ 817303D + .string "{PLAYER} took a closer look at the\n" + .string "HOENN region map.$" + +LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C + .string "It’s a Nintendo GameCube.\p" + .string "A Game Boy Advance is connected to\n" + .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/maps/LittlerootTown_MaysHouse_1F/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 353dc00a8..353dc00a8 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 6d6220086..329380b39 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,9 +1,9 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 - .4byte LittlerootTown_MaysHouse_1F_MapAttributes + .4byte LittlerootTown_MaysHouse_1F_Layout .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 56 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/maps/LittlerootTown_MaysHouse_1F/map.bin deleted file mode 100644 index 12b4f86c2..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ - nnn nno m&&CD120vwux22KL9:82222y22F22222222222@A22222252.2J2H2I2622222222 2 222222 2!2"#$2%2222(2)2*2+2,2-22
\ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc new file mode 100644 index 000000000..ad7257e0b --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -0,0 +1,168 @@ +LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 + map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_152889 + map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1528C8 + map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_15290E + .byte 0 + +LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 + compare VAR_LITTLEROOT_INTRO_STATE, 6 + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + end + +LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 + return + +LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 + checkplayergender + compare RESULT, 1 + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE + return + +LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE + setmetatile 6, 7, 659, 1 + return + +LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 + compare VAR_LITTLEROOT_INTRO_STATE, 3 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902 + compare VAR_LITTLEROOT_INTRO_STATE, 5 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA + compare VAR_LITTLEROOT_INTRO_STATE, 6 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6 + end + +LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA + setobjectxyperm 1, 2, 4 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 + setobjectxyperm 1, 1, 8 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE + .2byte 0 + +LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 + lockall + msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4 + closemessage + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E + waitmovement 0 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 + waitstate + releaseall + end + +LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E + walk_up + end_movement + +LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 + lockall + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 + end + +LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 + lockall + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E + end + +LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 + lockall + playse SE_PIN + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 + waitmovement 0 + special GetRivalSonDaughterString + msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 + setflag FLAG_MET_RIVAL_MOM + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 + releaseall + end + +LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +@ 81529C7 + lockall + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1 + compare RESULT, 1 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2 + releaseall + end + +LittlerootTown_MaysHouse_1F_EventScript_1529E1:: @ 81529E1 + return + +LittlerootTown_MaysHouse_1F_EventScript_1529E2:: @ 81529E2 + msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 + return + +LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB +LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB + lock + faceplayer + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21 + goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B + special GetRivalSonDaughterString + msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_152A17:: @ 8152A17 + msgbox LittlerootTown_BrendansHouse_1F_Text_173262, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_152A21:: @ 8152A21 + msgbox LittlerootTown_BrendansHouse_1F_Text_1732B9, 4 + release + end + +LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B + msgbox LittlerootTown_BrendansHouse_1F_Text_1731E3, 4 + release + end + +LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 + lockall + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + applymovement VAR_SPECIAL_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 + waitmovement 0 + goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 + end diff --git a/data/maps/LittlerootTown_MaysHouse_1F/text.inc b/data/maps/LittlerootTown_MaysHouse_1F/text.inc new file mode 100644 index 000000000..aef905854 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/text.inc @@ -0,0 +1,34 @@ +LittlerootTown_BrendansHouse_1F_Text_1730C2:: @ 81730C2 +LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 + .string "Oh, hello. And you are?\p" + .string "... ... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ... ...\p" + .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" + .string "neighbor! Hi!\p" + .string "We have a {STR_VAR_1} about the same\n" + .string "age as you.\p" + .string "Our {STR_VAR_1} was excited about making\n" + .string "a new friend.\p" + .string "Our {STR_VAR_1} is upstairs, I think.$" + +LittlerootTown_BrendansHouse_1F_Text_1731C6:: @ 81731C6 + .string "Our {STR_VAR_1} is upstairs, I think.$" + +LittlerootTown_BrendansHouse_1F_Text_1731E3:: @ 81731E3 + .string "Where has my husband gone?\n" + .string "Just when {PLAYER}{KUN} is visiting, too...\p" + .string "That man can never sit still for long...\n" + .string "He might be at his LAB.$" + +LittlerootTown_BrendansHouse_1F_Text_173262:: @ 8173262 + .string "Oh, {RIVAL} has gone out somewhere.\p" + .string "Like father, like child.\n" + .string "{RIVAL} can’t stay quietly at home.$" + +LittlerootTown_BrendansHouse_1F_Text_1732B9:: @ 81732B9 + .string "I think it’s wonderful for people to\n" + .string "travel with POKéMON.\p" + .string "But you should go home every so often\n" + .string "to let your mother know you’re okay.\p" + .string "She might not say it, but I’m sure she\n" + .string "worries about you, {PLAYER}{KUN}.$" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/maps/LittlerootTown_MaysHouse_2F/border.bin deleted file mode 100644 index c1b82435c..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 98a144305..98a144305 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 44859dd4c..cfb150c46 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,9 +1,9 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 - .4byte LittlerootTown_MaysHouse_2F_MapAttributes + .4byte LittlerootTown_MaysHouse_2F_Layout .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 - .2byte BGM_MISHIRO + .2byte MUS_MISHIRO .2byte 57 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/maps/LittlerootTown_MaysHouse_2F/map.bin deleted file mode 100644 index b51210332..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - -'VTPTQ/eUXYE2222]2g22`2a2222222222222222222222BB2222222222222222
\ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc new file mode 100644 index 000000000..bcc4ba46b --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -0,0 +1,219 @@ +LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 + map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B + map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86 + .byte 0 + +LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A + compare VAR_LITTLEROOT_INTRO_STATE, 4 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 + call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D + setvar VAR_0x4089, 0 + end + +LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 7 + return + +LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 + map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 + .2byte 0 + +LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 + checkplayergender + compare RESULT, 1 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 + end + +LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D +LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D + lockall + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + compare RESULT, 1 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A + playse SE_KAIDAN + removeobject LAST_TALKED + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 + setvar VAR_LITTLEROOT_STATE, 1 + savebgm 0 + fadedefaultbgm + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 + msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 + playbgm MUS_GIRL_SUP, TRUE + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + waitmovement 0 + msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 + closemessage + compare FACING, 4 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29 + compare FACING, 2 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34 + compare FACING, 3 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F + return + +LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A + msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 + playbgm MUS_BOY_SUP, TRUE + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + waitmovement 0 + msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 + closemessage + compare FACING, 4 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F + compare FACING, 2 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F + compare FACING, 3 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA + return + +LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 + waitmovement 0 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB + compare RESULT, 1 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED + setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF + msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08 + msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF + msgbox LittlerootTown_BrendansHouse_2F_Text_173883, 4 + return + +LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08 + msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4 + return + +LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + delay_8 + end_movement + +LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + delay_8 + end_movement + +LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + delay_8 + end_movement + +LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + delay_8 + end_movement + +gUnknown_08152C39:: @ 8152C39 + +LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 + lockall + checkplayergender + compare RESULT, 0 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 + compare RESULT, 1 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C + end + +LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 + msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4 + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C + setvar VAR_SPECIAL_4, 2 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 + special BedroomPC + waitstate + releaseall + end + +gMayHouse_TurnPCOff:: @ 8152C75 + setvar VAR_SPECIAL_4, 2 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end diff --git a/data/maps/LittlerootTown_MaysHouse_2F/text.inc b/data/maps/LittlerootTown_MaysHouse_2F/text.inc new file mode 100644 index 000000000..313095c8d --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/text.inc @@ -0,0 +1,86 @@ +LittlerootTown_BrendansHouse_2F_Text_17337E:: @ 817337E + .string "POKéMON fully restored!\n" + .string "Items ready, and... Huh?$" + +LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF + .string "Huh?\n" + .string "Who... Who are you?\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "So your move was today.\p" + .string "Um... I’m MAY.\n" + .string "Glad to meet you!\p" + .string "I...\n" + .string "I have this dream of becoming friends\l" + .string "with POKéMON all over the world.\p" + .string "I... I heard about you, {PLAYER}{KUN}, from\n" + .string "my dad, PROF. BIRCH.\p" + .string "I was hoping that you would be nice,\n" + .string "{PLAYER}{KUN}, and that we could be friends.\p" + .string "Oh, this is silly, isn’t it?\n" + .string "I... I’ve just met you, {PLAYER}{KUN}.\p" + .string "Eheheh...\p" + .string "Oh, no! I forgot!\p" + .string "I was supposed to go help Dad catch\n" + .string "some wild POKéMON!\p" + .string "{PLAYER}{KUN}, I’ll catch you later!$" + +LittlerootTown_BrendansHouse_2F_Text_1735C9:: @ 81735C9 + .string "POKéMON fully restored...\n" + .string "Items all packed, and...$" + +LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC + .string "Hey!\n" + .string "You...\p" + .string "Who are you?\p" + .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Moved in next door, right?\p" + .string "I didn’t know that you’re a girl.\p" + .string "Dad, PROF. BIRCH, said that our new\n" + .string "next-door neighbor is a GYM LEADER’s\l" + .string "kid, so I assumed you’d be a guy.\p" + .string "My name’s BRENDAN.\n" + .string "So, hi, neighbor!\p" + .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "a POKéMON?\p" + .string "Do you want me to go catch you one?\p" + .string "Aw, darn, I forgot...\p" + .string "I’m supposed to go help my dad catch\n" + .string "some wild POKéMON.\p" + .string "Some other time, okay?$" + +LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE + .string "MAY: {PLAYER}{KUN}!\p" + .string "I was just checking my POKéDEX.\p" + .string "There’s still a lot of POKéMON that\n" + .string "I’ve seen but haven’t caught.\p" + .string "And there are many others that\n" + .string "I think will evolve.\p" + .string "I wonder where I should go catch\n" + .string "some POKéMON next?$" + +LittlerootTown_BrendansHouse_2F_Text_173883:: @ 8173883 + .string "MAY: I wonder where I should go catch\n" + .string "some POKéMON next?\p" + .string "Wouldn’t it be funny if we ran into each\n" + .string "other, {PLAYER}{KUN}?$" + +LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 + .string "BRENDAN: Hey, it’s {PLAYER}.\p" + .string "I was just checking out my POKéDEX.\p" + .string "There are still many POKéMON that\n" + .string "I need to catch, I know, but this\l" + .string "is looking pretty good.\p" + .string "Checking this POKéDEX out gives me\n" + .string "the urge to hit the road again.$" + +LittlerootTown_BrendansHouse_2F_Text_1739CC:: @ 81739CC + .string "BRENDAN: I’m having a hard time deciding\n" + .string "where I should catch POKéMON next.\p" + .string "Hey, {PLAYER}, if I see you while I’m out\n" + .string "catching POKéMON, I can pitch you a\l" + .string "battle if you’d like.$" + +UnknownString_8173A76: @ 8173A76 + .string "It’s lined with POKéMON picture books.$" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index bca8009b5..bca8009b5 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 31fb03c64..1961431b9 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,9 +1,9 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes + .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 - .2byte BGM_ODAMAKI + .2byte MUS_ODAMAKI .2byte 58 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin deleted file mode 100644 index 0b62afcdf..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin +++ /dev/null @@ -1,4 +0,0 @@ - < -
- - !2D"2#2>2"232"232>2>2(2*2*2A22222)2:22 2222222221B2'$2%2627222222?2?22/2,-,-22222224545222222 =2>2>2>2222222G2?2220222222222;.H8922222222I2C:2H@2&22222222KBO2?22.22222?2?2
\ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc new file mode 100644 index 000000000..74d5f9193 --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -0,0 +1,214 @@ +LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82 + map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92 + map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D + map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC + .byte 0 + +LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 + call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E + call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4 + end + +LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 + .2byte 0 + +LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 + turnobject 255, 2 + end + +LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A + .2byte 0 + +LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE + lockall + bufferleadmonspeciesname 0 + message LittlerootTown_ProfessorBirchsLab_Text_173D94 + waitmessage + playfanfare MUS_FANFA4 + waitfanfare + msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA + compare RESULT, NO + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA + setvar VAR_SPECIAL_4, 0 + call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 + goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA + msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + compare RESULT, NO + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 + clearflag FLAG_HIDE_BOY_ROUTE101 + setvar VAR_BIRCH_LAB_STATE, 3 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B + msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + compare RESULT, NO + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A + lockall + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B + waitmovement 0 + goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA + end + +LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 + lock + faceplayer + compare VAR_BIRCH_LAB_STATE, 3 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90 + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 + setflag FLAG_BIRCH_AIDE_MET + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A + lock + faceplayer + goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F + compare VAR_BIRCH_LAB_STATE, 5 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B + msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA + msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4 + call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D + msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 + waitmovement 0 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 + waitmovement 0 + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + compare RESULT, 1 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + setvar VAR_BIRCH_LAB_STATE, 5 + setflag FLAG_ADVENTURE_STARTED + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 + setvar VAR_LITTLEROOT_STATE, 3 + releaseall + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 + giveitem_std ITEM_POKE_BALL, 5 + compare RESULT, 0 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 + msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 + setvar RESULT, 0 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 + msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 + giveitem_std ITEM_POKE_BALL, 5 + compare RESULT, 0 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E + msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 + setvar RESULT, 1 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D + playfanfare MUS_FANFA4 + message LittlerootTown_ProfessorBirchsLab_Text_17422F + waitfanfare + waitmessage + setflag FLAG_SYS_POKEDEX_GET + return + +LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B + msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, 4 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E + msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, 4 + return + +LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97 + walk_down + walk_in_place_fastest_left + end_movement + +LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A + msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 + lock + faceplayer + checkplayergender + compare RESULT, 0 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + compare RESULT, 1 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + release + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE + msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, 4 + return + +LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, 3 + end + +LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3 + end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc new file mode 100644 index 000000000..dd470ef08 --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc @@ -0,0 +1,163 @@ +UnknownString_8173A9D: @ 8173A9D + .string "POKéMON SPECIES & HABITATS...\n" + .string "HUMAN & POKéMON COEXISTENCE...\l" + .string "POKéMONOLOGY FOR BEGINNERS...\p" + .string "It’s brimming with books written by\n" + .string "PROF. BIRCH.$" + +LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 + .string "Hunh? PROF. BIRCH?\p" + .string "The PROF’s away on fieldwork.\n" + .string "Ergo, he isn’t here.\p" + .string "Oh, let me explain what fieldwork is.\p" + .string "It is to study things in the natural\n" + .string "environment, like fields and mountains,\l" + .string "instead of a laboratory.\p" + .string "The PROF isn’t one for doing desk work.\n" + .string "He’s the type of person who would\l" + .string "rather go outside and experience\l" + .string "things than read about them here.$" + +LittlerootTown_ProfessorBirchsLab_Text_173C88:: @ 8173C88 + .string "The PROF isn’t one for doing desk work.\n" + .string "He’s the type of person who would\l" + .string "rather go outside and experience\l" + .string "things than read about them here.$" + +LittlerootTown_ProfessorBirchsLab_Text_173D15:: @ 8173D15 + .string "PROF. BIRCH is studying the habitats\n" + .string "and distribution of POKéMON.\p" + .string "The PROF enjoys {RIVAL}’s help, too.\n" + .string "There’s a lot of love there.$" + +LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 + .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" + .string "I’ve heard so much about you from\n" + .string "your father.\p" + .string "I’ve heard that you don’t have your\n" + .string "own POKéMON yet.\p" + .string "But the way you battled earlier,\n" + .string "you pulled it off with aplomb!\p" + .string "I guess you have your father’s blood\n" + .string "in your veins after all!\p" + .string "Oh, yes. As thanks for rescuing me,\n" + .string "I’d like you to have the POKéMON you\l" + .string "used earlier.\p" + .string "{PLAYER} received the {STR_VAR_1}!$" + +LittlerootTown_ProfessorBirchsLab_Text_173EF8:: @ 8173EF8 + .string "PROF. BIRCH: While you’re at it, why not\n" + .string "give a nickname to that {STR_VAR_1}?$" + +LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D + .string "PROF. BIRCH: If you work at POKéMON\n" + .string "and gain experience, I think you’ll make\l" + .string "a darn good TRAINER.\p" + .string "My kid, {RIVAL}, is out on ROUTE 103\n" + .string "studying POKéMON.\p" + .string "It might not be a bad idea for you to\n" + .string "go see {RIVAL}. What do you think?$" + +LittlerootTown_ProfessorBirchsLab_Text_174015:: @ 8174015 + .string "PROF. BIRCH: Great!\n" + .string "{RIVAL} should be happy, too.\p" + .string "Get {RIVAL} to teach you what it\n" + .string "means to be a TRAINER.$" + +LittlerootTown_ProfessorBirchsLab_Text_174075:: @ 8174075 + .string "PROF. BIRCH: Oh, don’t be that way.\n" + .string "You should go meet my kid.$" + +LittlerootTown_ProfessorBirchsLab_Text_1740B4:: @ 81740B4 + .string "PROF. BIRCH: {RIVAL} should be on\n" + .string "ROUTE 103 somewhere.\p" + .string "If you or your POKéMON get tired,\n" + .string "get some rest at home.$" + +LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F + .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" + .string "I heard you beat {RIVAL} on\n" + .string "your first try. That’s excellent!\p" + .string "{RIVAL}’s been helping with my research\n" + .string "for a long time.\p" + .string "{RIVAL} has an extensive history as\n" + .string "a TRAINER already.\p" + .string "Here, {PLAYER}{KUN}, I ordered this for my\n" + .string "research, but I think you should have\l" + .string "this POKéDEX.$" + +LittlerootTown_ProfessorBirchsLab_Text_17422F:: @ 817422F + .string "{PLAYER} received the POKéDEX!$" + +LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 + .string "PROF. BIRCH: The POKéDEX is a high-tech\n" + .string "tool that automatically makes a record\l" + .string "of any POKéMON you meet or catch.\p" + .string "My kid, {RIVAL}, goes everywhere\n" + .string "with it.\p" + .string "Whenever my kid catches a rare POKéMON\n" + .string "and records its data in the POKéDEX,\l" + .string "why, {RIVAL} looks for me while I’m out\l" + .string "doing fieldwork, and shows me.$" + +LittlerootTown_ProfessorBirchsLab_Text_17436C:: @ 817436C + .string "PROF. BIRCH: Countless POKéMON await\n" + .string "you!\p" + .string "Argh, I’m getting the itch to get out\n" + .string "and do fieldwork again!$" + +LittlerootTown_ProfessorBirchsLab_Text_1743D4:: @ 81743D4 + .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" + .string "You got a POKéDEX, too!\p" + .string "That’s great! Just like me!\n" + .string "I’ve got something for you, too!$" + +LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D + .string "MAY: It’s fun if you can get a lot of\n" + .string "POKéMON!\p" + .string "I’m going to look all over the place\n" + .string "because I want different POKéMON.\p" + .string "If I find any cute POKéMON, I’ll catch\n" + .string "them with POKé BALLS!$" + +LittlerootTown_ProfessorBirchsLab_Text_1744F0:: @ 81744F0 + .string "Oh? Your BAG’s full.$" + +LittlerootTown_ProfessorBirchsLab_Text_174505:: @ 8174505 + .string "MAY: I wonder where I should go look\n" + .string "for POKéMON next?$" + +LittlerootTown_ProfessorBirchsLab_Text_17453C:: @ 817453C + .string "BRENDAN: Huh...\n" + .string "So you got a POKéDEX, too.\p" + .string "Well then, here.\n" + .string "I’ll give you this.$" + +LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C + .string "BRENDAN: You know it’s more fun to\n" + .string "have a whole bunch of POKéMON.\p" + .string "I’m going to explore all over the place\n" + .string "to find different POKéMON.\p" + .string "If I find any cool POKéMON, you bet\n" + .string "I’ll try to get them with POKé BALLS.$" + +LittlerootTown_ProfessorBirchsLab_Text_17465B:: @ 817465B + .string "Hey, your BAG’s full.$" + +LittlerootTown_ProfessorBirchsLab_Text_174671:: @ 8174671 + .string "BRENDAN: Where should I look for\n" + .string "POKéMON next...$" + +LittlerootTown_ProfessorBirchsLab_Text_1746A2:: @ 81746A2 + .string "It’s a serious-looking machine.\n" + .string "The PROF must use this for research.$" + +LittlerootTown_ProfessorBirchsLab_Text_1746E7:: @ 81746E7 + .string "It’s a PC used for research.\n" + .string "Better not mess around with it.$" + +LittlerootTown_ProfessorBirchsLab_Text_174724:: @ 8174724 + .string "It’s crammed with books on POKéMON.$" + +LittlerootTown_ProfessorBirchsLab_Text_174748:: @ 8174748 + .string "It’s a book that’s too hard to read.$" diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/maps/MagmaHideout_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MagmaHideout_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc index 362d9b719..362d9b719 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/MagmaHideout_1F/events.inc diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 3876e17ec..c236bdae1 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,9 +1,9 @@ MagmaHideout_1F:: @ 8307588 - .4byte MagmaHideout_1F_MapAttributes + .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 317 .byte 66 .byte 0 diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/maps/MagmaHideout_1F/map.bin Binary files differdeleted file mode 100644 index 52c2d57eb..000000000 --- a/data/maps/MagmaHideout_1F/map.bin +++ /dev/null diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc new file mode 100644 index 000000000..f5b535f71 --- /dev/null +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -0,0 +1,2 @@ +MagmaHideout_1F_MapScripts:: @ 815F2A7 + .byte 0 diff --git a/data/maps/MagmaHideout_B1F/border.bin b/data/maps/MagmaHideout_B1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MagmaHideout_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/events.inc index 5e4c3a078..5e4c3a078 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/MagmaHideout_B1F/events.inc diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 16fe3f2ba..18a1bd49c 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -1,9 +1,9 @@ MagmaHideout_B1F:: @ 83075A4 - .4byte MagmaHideout_B1F_MapAttributes + .4byte MagmaHideout_B1F_Layout .4byte MagmaHideout_B1F_MapEvents .4byte MagmaHideout_B1F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 318 .byte 66 .byte 0 diff --git a/data/maps/MagmaHideout_B1F/map.bin b/data/maps/MagmaHideout_B1F/map.bin deleted file mode 100644 index b423ca1a9..000000000 --- a/data/maps/MagmaHideout_B1F/map.bin +++ /dev/null @@ -1,95 +0,0 @@ - 01!2 -012!!!!!!!3333 - -!!! -STST8292)22)22 -82922)22)2)2)2)2)2)2)27777// - -)2)2)2 - -!2[\01!! - 2[\ -)2(2(2(2(2(2 -)2(2(2(2(22A2B222(2(2*2*27777 - -72(227 - -)22)22cd8292)2)2 -'2)22cd -)2(2(2(2(2(2 -)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2 - -)2*22(2(2*2*27 - -)2(2(2(2k2l2(22(2(2 -/2(2(2k2l2 -)2(2(2(22(2 -)2(2(2(2(22 2222(2(2(22(2(2(2(2 - -)22(2(22(2(22(2 - -)2(2(2(2(2(2(2(2(2(2 -'2(2(2(2(2 -)22A2B222 2Y2Y2Y2Y2Y2Y2Y2Y2 2Y2Y2Y2Y2Y2Y2Y2Y2 -mmmmmmmo - -)2(2(2(2(2(2(22(2(2 -/62(2(2(2(2 -)22IJ2 -vq0q0q0q0q0q0q0w - 2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )222(2(2(2 -)22 2222 -$#$!! -001!3333 - -~yyyyyyy -)2(2(2(2(2(2 -)2(2(2(2(2(2 -77333 -828292)2 - -)22(2(22(2(22(2 - !!!!!!!!!! 2Y2Y2Y2Y2Y2 2Y2Y2Y2Y2Y2 3333333 -)2(2(2(2*2*2 - -mmmmmmmo -+,-.333333332 -)2(22(2(22*2*2 - -vq0q0q0q0q0q0q0w - -345601 -0011!! 333333333 2Y2Y2Y2Y2Y2Y2Y2 -~yyyyyyy - -;<=>8292 -82829292)2)2 -)22(2(22(2(22(2 - -CDEF)22 -)2(22(2(2(2 !!!!!!!!! !!!!!!!! - -mmmmmmmo - -KLMN)2(2 -)2(2(2(2(2(22)2)2)2)2)2)2)2)2)22)2)2)2)2)2)2)2)2 - -vq0q0q0q0q0q0q0w - -)2UV)22(2 2Y2Y2Y2Y2Y2Y2Y2Y2 23222222222222(2(2 - -~yyyyyyy - -)2)2)2)2(2(2
2A2B222@2B2332(2(2 - -)22(2(22(2(22(2 - -)2(2(2(233 -!!!!!!!!! 2IJ22HJ2(2(2 - 2Y2Y2Y2Y2Y2Y2Y2Y2 -)2(233 -)2)2)2)2)2)2)2)2)222 2 22 2222 222 22(22 - -3377(2(2 -)2(22(2(2(2(2(2(2(22222222222222(2(2 - !!!!!!!!! 7777 2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!
\ No newline at end of file diff --git a/data/maps/MagmaHideout_B1F/scripts.inc b/data/maps/MagmaHideout_B1F/scripts.inc new file mode 100644 index 000000000..a55d260ab --- /dev/null +++ b/data/maps/MagmaHideout_B1F/scripts.inc @@ -0,0 +1,11 @@ +MagmaHideout_B1F_MapScripts:: @ 815F2A8 + map_script 5, MagmaHideout_B1F_MapScript1_15F2AE + .byte 0 + +MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MagmaHideout_B1F_EventScript_15F2B8 + end + +MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 + removeobject LAST_TALKED + return diff --git a/data/maps/MagmaHideout_B2F/border.bin b/data/maps/MagmaHideout_B2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MagmaHideout_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/events.inc index 111b97e42..111b97e42 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/MagmaHideout_B2F/events.inc diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index 3aee695b4..6cb9a6a47 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -1,9 +1,9 @@ MagmaHideout_B2F:: @ 83075C0 - .4byte MagmaHideout_B2F_MapAttributes + .4byte MagmaHideout_B2F_Layout .4byte MagmaHideout_B2F_MapEvents .4byte MagmaHideout_B2F_MapScripts .4byte 0x0 - .2byte BGM_AJITO + .2byte MUS_AJITO .2byte 319 .byte 66 .byte 0 diff --git a/data/maps/MagmaHideout_B2F/map.bin b/data/maps/MagmaHideout_B2F/map.bin deleted file mode 100644 index 68afb0063..000000000 --- a/data/maps/MagmaHideout_B2F/map.bin +++ /dev/null @@ -1,49 +0,0 @@ -ST|}~|}~ [\012 -!!23456!!3456!!! -cd82922)22 -)2)22)22;<=>)2)2;<=>)2)2)2 - - 2! k2l22(2(2(2(2 -)2(2(2(2(2CDEF(2(2CDEF2(2(2 - -'2)22)22)2(2(2(2(2(2(2 -)2(2(2(2(2KLMN(2(2KLMN22(2 - -/(2(2(2(22A2B222(2(2(2 -)222(2(2(2UV2(2(2(2UV2(2(2(2 - -/(2(2(2(22IJ2(2(2(2 -)222(2(2(2(2(2(2(2*2*22(2(2(2 - -)2(2(2(2(22 2222(2(2(2 -)2:22(2(2(2(2(2(222(222(2(2 - -)2(2(2(2(222222(2(2(2 -)2*2*22(2(2(2(2(2(2(222(2 - 2Y2 2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 2Y2Y2Y2Y2Y2Y2Y2 2(2(2:22(2 -(2(2*2*22*2*22(2 - -01 -!!!!!!!!!! -!!!!!!!! (2(2(2(2(2(2(2(2(2 - -8292 -)2)2)2)2)2)2)2)2)2)2 )2)2)2)2)2)2)2)22(2(2(2(2(2 2Y2Y2Y2 -)2(2 -)2(2(2(2(2(2(2(22(2)2(22(2(2(2(2(2(2(2(2(2(2(2 -)22 -)2(2(2(2(2(2(2(2(2(2 iiiiiiiiiiii^ !!! - -)2(2 -)2(2(2(2piiiif22)2)2)2 - -)2(2 )2(2(2(2`pppppVVVVVVb2(22(2 - -)2(2)2(2(2(2`ppppppVVVVVGGGGGVb2(2(2(2 - -)2(2 )2(2(2(2xpppVVVGGGGGGGGGGVb2(2(2(2 - -)2(22)2(2(2(2*2pVVGGGGGGGGGGGGGVb2(2(2(2 - -)2(2(2(2(2(2(2VGGGGGGGGGGGGGGGVb2(2(2(2 - 2Y2Y2Y2Y2Y2 2`VGGGGGGGGGGGGGGGVb{3(2(2(2 `VGGGGGGGGGGGGGGGVb !!!!!! hiiiiiiiiiiiiiiiiiiij !!!
\ No newline at end of file diff --git a/data/maps/MagmaHideout_B2F/scripts.inc b/data/maps/MagmaHideout_B2F/scripts.inc new file mode 100644 index 000000000..222297ef7 --- /dev/null +++ b/data/maps/MagmaHideout_B2F/scripts.inc @@ -0,0 +1,2 @@ +MagmaHideout_B2F_MapScripts:: @ 815F2BC + .byte 0 diff --git a/data/maps/MauvilleCity/border.bin b/data/maps/MauvilleCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/MauvilleCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc index 6b26c7973..6b26c7973 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/MauvilleCity/events.inc diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index e0e2c4f22..9ea461f4c 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,9 +1,9 @@ MauvilleCity:: @ 8305480 - .4byte MauvilleCity_MapAttributes + .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 3 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity/map.bin b/data/maps/MauvilleCity/map.bin Binary files differdeleted file mode 100644 index 80a38e902..000000000 --- a/data/maps/MauvilleCity/map.bin +++ /dev/null diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc new file mode 100644 index 000000000..bd4f8ab3d --- /dev/null +++ b/data/maps/MauvilleCity/scripts.inc @@ -0,0 +1,312 @@ +MauvilleCity_MapScripts:: @ 814C032 + map_script 3, MauvilleCity_MapScript1_14C038 + .byte 0 + +MauvilleCity_MapScript1_14C038:: @ 814C038 + setflag FLAG_VISITED_MAUVILLE_CITY + clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + setflag FLAG_SYS_TV_START + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE + setvar VAR_MAUVILLE_GYM_STATE, 0 + call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053 + end + +MauvilleCity_EventScript_14C053:: @ 814C053 + clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + setflag FLAG_HIDE_WATTSON_MAUVILLE + return + +MauvilleCity_EventScript_14C05A:: @ 814C05A + msgbox MauvilleCity_Text_1664DF, 2 + end + +MauvilleCity_EventScript_14C063:: @ 814C063 + msgbox MauvilleCity_Text_16655C, 2 + end + +MauvilleCity_EventScript_14C06C:: @ 814C06C + msgbox MauvilleCity_Text_1665DB, 2 + end + +MauvilleCity_EventScript_14C075:: @ 814C075 + msgbox MauvilleCity_Text_16662A, 2 + end + +MauvilleCity_EventScript_14C07E:: @ 814C07E + msgbox MauvilleCity_Text_166665, 3 + end + +MauvilleCity_EventScript_14C087:: @ 814C087 + msgbox MauvilleCity_Text_166697, 3 + end + +MauvilleCity_EventScript_14C090:: @ 814C090 + msgbox MauvilleCity_Text_1666E4, 3 + end + +MauvilleCity_EventScript_14C099:: @ 814C099 + msgbox MauvilleCity_Text_16671C, 3 + end + +MauvilleCity_EventScript_14C0A2:: @ 814C0A2 + lock + faceplayer + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA + msgbox MauvilleCity_Text_16674A, 4 + setflag FLAG_TV_EXPLAINED + release + end + +MauvilleCity_EventScript_14C0BA:: @ 814C0BA + msgbox MauvilleCity_Text_166879, 4 + release + end + +MauvilleCity_EventScript_14C0C4:: @ 814C0C4 + lock + faceplayer + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4 + msgbox MauvilleCity_Text_165B76, 4 + closemessage + applymovement 7, MauvilleCity_Movement_1A083D + waitmovement 0 + release + end + +MauvilleCity_EventScript_14C0E4:: @ 814C0E4 + msgbox MauvilleCity_Text_165E45, 4 + closemessage + applymovement 7, MauvilleCity_Movement_1A083D + waitmovement 0 + release + end + +MauvilleCity_EventScript_14C0F9:: @ 814C0F9 + lockall + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 + msgbox MauvilleCity_Text_165BE3, 4 + msgbox MauvilleCity_Text_165C57, 4 + msgbox MauvilleCity_Text_165D01, 4 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 + playse SE_PIN + applymovement 6, MauvilleCity_Movement_1A0833 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0835 + waitmovement 0 + msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO + goto MauvilleCity_EventScript_14C154 + end + +MauvilleCity_EventScript_14C154:: @ 814C154 + compare RESULT, YES + call_if_eq MauvilleCity_EventScript_14C23C + compare RESULT, NO + goto_if_eq MauvilleCity_EventScript_14C285 + closemessage + switch FACING + case 2, MauvilleCity_EventScript_14C187 + case 4, MauvilleCity_EventScript_14C1D9 + end + +MauvilleCity_EventScript_14C187:: @ 814C187 + applymovement 6, MauvilleCity_Movement_14C2AA + applymovement 7, MauvilleCity_Movement_14C2CC + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 + delay 30 + applymovement 7, MauvilleCity_Movement_14C2D8 + waitmovement 0 + applymovement 255, MauvilleCity_Movement_1A0845 + waitmovement 0 + msgbox MauvilleCity_Text_1660FA, 4 + closemessage + applymovement 6, MauvilleCity_Movement_14C2B6 + applymovement 7, MauvilleCity_Movement_14C2DF + waitmovement 0 + goto MauvilleCity_EventScript_14C22B + end + +MauvilleCity_EventScript_14C1D9:: @ 814C1D9 + applymovement 6, MauvilleCity_Movement_14C2B0 + applymovement 7, MauvilleCity_Movement_14C2D2 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 + delay 30 + applymovement 7, MauvilleCity_Movement_14C2DC + waitmovement 0 + applymovement 255, MauvilleCity_Movement_1A0845 + waitmovement 0 + msgbox MauvilleCity_Text_1660FA, 4 + closemessage + applymovement 6, MauvilleCity_Movement_14C2C1 + applymovement 7, MauvilleCity_Movement_14C2E8 + waitmovement 0 + goto MauvilleCity_EventScript_14C22B + end + +MauvilleCity_EventScript_14C22B:: @ 814C22B + removeobject 6 + removeobject 7 + clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE + clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE + setflag FLAG_DEFEATED_WALLY_MAUVILLE + releaseall + end + +MauvilleCity_EventScript_14C23C:: @ 814C23C + msgbox MauvilleCity_Text_165F0D, 4 + trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 + msgbox MauvilleCity_Text_165F85, 4 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 + msgbox MauvilleCity_Text_165FB3, 4 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 + msgbox MauvilleCity_Text_166050, 4 + return + +MauvilleCity_EventScript_14C285:: @ 814C285 + setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE + msgbox MauvilleCity_Text_165DE8, 4 + release + end + +MauvilleCity_EventScript_14C292:: @ 814C292 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 + msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO + goto MauvilleCity_EventScript_14C154 + end + +MauvilleCity_Movement_14C2AA:: @ 814C2AA + walk_left + walk_left + walk_down + walk_down + walk_left + end_movement + +MauvilleCity_Movement_14C2B0:: @ 814C2B0 + walk_down + walk_down + walk_left + walk_left + walk_left + end_movement + +MauvilleCity_Movement_14C2B6:: @ 814C2B6 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +MauvilleCity_Movement_14C2C1:: @ 814C2C1 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +MauvilleCity_Movement_14C2CC:: @ 814C2CC + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement + +MauvilleCity_Movement_14C2D2:: @ 814C2D2 + walk_left + walk_down + walk_down + walk_left + walk_left + end_movement + +MauvilleCity_Movement_14C2D8:: @ 814C2D8 + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +MauvilleCity_Movement_14C2DC:: @ 814C2DC + walk_right + walk_up + end_movement + +MauvilleCity_Movement_14C2DF:: @ 814C2DF + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +MauvilleCity_Movement_14C2E8:: @ 814C2E8 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +MauvilleCity_EventScript_14C2F2:: @ 814C2F2 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368 + compare VAR_NEW_MAUVILLE_STATE, 2 + goto_if_eq MauvilleCity_EventScript_14C33C + goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332 + msgbox MauvilleCity_Text_1661C1, 4 + giveitem_std ITEM_BASEMENT_KEY + setflag FLAG_RECEIVED_BASEMENT_KEY + msgbox MauvilleCity_Text_166331, 4 + release + end + +MauvilleCity_EventScript_14C332:: @ 814C332 + msgbox MauvilleCity_Text_166331, 4 + release + end + +MauvilleCity_EventScript_14C33C:: @ 814C33C + msgbox MauvilleCity_Text_1663EB, 4 + giveitem_std ITEM_TM24_THUNDERBOLT + compare RESULT, 0 + goto_if_eq MauvilleCity_EventScript_1A029B + setflag FLAG_RECEIVED_TM24 + msgbox MauvilleCity_Text_166488, 4 + release + end + +MauvilleCity_EventScript_14C368:: @ 814C368 + msgbox MauvilleCity_Text_166488, 4 + release + end diff --git a/data/maps/MauvilleCity/text.inc b/data/maps/MauvilleCity/text.inc new file mode 100644 index 000000000..8080d10d9 --- /dev/null +++ b/data/maps/MauvilleCity/text.inc @@ -0,0 +1,174 @@ +MauvilleCity_Text_165B76:: @ 8165B76 + .string "UNCLE: It’s because of POKéMON that\n" + .string "this boy’s got more pep, I suppose...\l" + .string "But he’s become a bit too peppy...$" + +MauvilleCity_Text_165BE3:: @ 8165BE3 + .string "WALLY: Aww, UNCLE, please?\p" + .string "I want to challenge this GYM and see\n" + .string "how much better I’ve become.\p" + .string "Please? May I, please?$" + +MauvilleCity_Text_165C57:: @ 8165C57 + .string "UNCLE: Now hold on, WALLY.\p" + .string "Since you started living with POKéMON,\n" + .string "you have grown quite a lot stronger.\p" + .string "But don’t you think you’re pushing it\n" + .string "to suddenly challenge a GYM?$" + +MauvilleCity_Text_165D01:: @ 8165D01 + .string "WALLY: I’m not pushing it.\p" + .string "If I combine forces with RALTS,\n" + .string "we can beat anyone!$" + +MauvilleCity_Text_165D50:: @ 8165D50 + .string "WALLY: Oh! Hi, {PLAYER}!\p" + .string "I’ve gotten a lot stronger since we\n" + .string "met.\p" + .string "{PLAYER}, I want you and my UNCLE to\n" + .string "understand that.\p" + .string "{PLAYER}, please, will you have a\n" + .string "battle with me?$" + +MauvilleCity_Text_165DE8:: @ 8165DE8 + .string "WALLY: Oh... If you won’t battle me,\n" + .string "{PLAYER}, my UNCLE won’t know that I’ve\l" + .string "become really strong.$" + +MauvilleCity_Text_165E45:: @ 8165E45 + .string "UNCLE: {PLAYER}{KUN}, was it?\n" + .string "On WALLY’s behalf, can I ask you to\l" + .string "battle with him just this once?\p" + .string "I don’t think he’s going to listen to\n" + .string "any reason the way he is now.$" + +MauvilleCity_Text_165EE2:: @ 8165EE2 + .string "WALLY: {PLAYER}, please!\n" + .string "Battle with me, please.$" + +MauvilleCity_Text_165F0D:: @ 8165F0D + .string "WALLY: {PLAYER}, thank you.\p" + .string "Okay... Here I come!$" + +MauvilleCity_Text_165F38:: @ 8165F38 + .string "WALLY: ... ... ... ... ... ... ...\p" + .string "... ... ... ... ... ... ... ...\p" + .string "I lost...$" + +MauvilleCity_Text_165F85:: @ 8165F85 + .string "WALLY: UNCLE...\n" + .string "I’ll go back to VERDANTURF...$" + +MauvilleCity_Text_165FB3:: @ 8165FB3 + .string "{PLAYER}, thank you.\n" + .string "Being a TRAINER is tough, isn’t it?\p" + .string "It’s not enough just to have POKéMON\n" + .string "and make them battle. That isn’t what\l" + .string "being a real TRAINER is about.$" + +MauvilleCity_Text_166050:: @ 8166050 + .string "UNCLE: WALLY, there’s no need to be so\n" + .string "down on yourself.\p" + .string "Why, what’s keeping you from becoming\n" + .string "stronger and stronger?\p" + .string "Come on, let’s go home.\n" + .string "Everyone’s waiting for you.$" + +MauvilleCity_Text_1660FA:: @ 81660FA + .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" + .string "that you must be the TRAINER who kept\l" + .string "an eye out for WALLY when he caught\l" + .string "his POKéMON.\p" + .string "Why don’t you visit us in VERDANTURF\n" + .string "sometime?\l" + .string "I’m sure WALLY would enjoy it.$" + +MauvilleCity_Text_1661C1:: @ 81661C1 + .string "WATTSON: Oh, {PLAYER}{KUN}!\n" + .string "You look like you have a lot of zip!\l" + .string "That’s a good thing, wahahahaha!\p" + .string "Fine! I’ve decided!\n" + .string "I need a favor, {PLAYER}{KUN}!\p" + .string "MAUVILLE CITY has an underground\n" + .string "sector called NEW MAUVILLE.\p" + .string "{PLAYER}{KUN}, I’d like you to go there and\n" + .string "switch off the GENERATOR.\p" + .string "The GENERATOR has been running a bit\n" + .string "haywire. It’s getting unsafe.\p" + .string "Here, this is the KEY to get into NEW\n" + .string "MAUVILLE.$" + +MauvilleCity_Text_166331:: @ 8166331 + .string "WATTSON: Don’t you worry about it.\n" + .string "It won’t be a challenge to you.\p" + .string "The entrance to NEW MAUVILLE is just\n" + .string "a short SURF away from ROUTE 110.\p" + .string "That’s it, then, you have my trust!\n" + .string "Wahahahaha!$" + +MauvilleCity_Text_1663EB:: @ 81663EB + .string "WATTSON: Wahahahaha!\p" + .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" + .string "the right choice asking you!\p" + .string "This is my thanks - a TM containing\n" + .string "THUNDERBOLT!\p" + .string "Go on, you’ve earned it!$" + +MauvilleCity_Text_166488:: @ 8166488 + .string "WATTSON: Wahahahaha!\p" + .string "It pleases me to no end to see the\n" + .string "young step up and take charge!$" + +MauvilleCity_Text_1664DF:: @ 81664DF + .string "You know, it’s cool to have POKéMON\n" + .string "battles and stuff...\p" + .string "But if your POKéMON gets hurt, you\n" + .string "have to nurse it back to health.$" + +MauvilleCity_Text_16655C:: @ 816655C + .string "The roads of this town stretch north\n" + .string "and south, and east and west.\p" + .string "Because of that, we get all sorts of\n" + .string "people coming through.$" + +MauvilleCity_Text_1665DB:: @ 81665DB + .string "Have you been to RYDEL’S CYCLES yet?\p" + .string "RYDEL, the owner, is a very generous\n" + .string "man.$" + +MauvilleCity_Text_16662A:: @ 816662A + .string "Even if you’re riding a BIKE, wild\n" + .string "POKéMON could jump you.$" + +MauvilleCity_Text_166665:: @ 8166665 + .string "MAUVILLE CITY\n" + .string "“The bright and shiny city of fun!”$" + +MauvilleCity_Text_166697:: @ 8166697 + .string "MAUVILLE CITY POKéMON GYM\n" + .string "LEADER: WATTSON\l" + .string "“The cheerfully electrifying man!”$" + +MauvilleCity_Text_1666E4:: @ 81666E4 + .string "“Ride in gravel and shake up your\n" + .string "soul!”\l" + .string "RYDEL’S CYCLES$" + +MauvilleCity_Text_16671C:: @ 816671C + .string "“The play spot for all!”\n" + .string "MAUVILLE GAME CORNER$" + +MauvilleCity_Text_16674A:: @ 816674A + .string "Hi, do you check out TV at all?\p" + .string "They’ve added a bunch of cool new\n" + .string "shows recently.\p" + .string "TV is so cool. I’ve seen my friends on\n" + .string "TV just out of the blue.\p" + .string "And, sometimes, they even put you on TV\n" + .string "without telling you.\p" + .string "I wish I would be on TV sometime.\p" + .string "That’s why I think you should check\n" + .string "out TVs whenever you can.$" + +MauvilleCity_Text_166879:: @ 8166879 + .string "Hi, have you been checking out TVs?$" diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/maps/MauvilleCity_BikeShop/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/MauvilleCity_BikeShop/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc index 83b5f66d8..83b5f66d8 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index c99124794..a1e3e56bc 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,9 +1,9 @@ MauvilleCity_BikeShop:: @ 8306168 - .4byte MauvilleCity_BikeShop_MapAttributes + .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 90 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/maps/MauvilleCity_BikeShop/map.bin deleted file mode 100644 index 9891b9fd5..000000000 --- a/data/maps/MauvilleCity_BikeShop/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -()*+,- -
012345222892:2;2<2:2 @A2B2?2C2D2!"#2$2%2&2HIJ2?2KL?2?2?2?2P2Q2R2?2ST"?2?2?2?2?2?2?2?2EF!"?2?2?2?2?2?2?2?2MN6?22 2?2?2?2?2?2UV
\ No newline at end of file diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc new file mode 100644 index 000000000..08f11d641 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -0,0 +1,182 @@ +MauvilleCity_BikeShop_MapScripts:: @ 8156795 + .byte 0 + +MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 + lock + faceplayer + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1 + msgbox MauvilleCity_BikeShop_Text_180F9F, 4 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq MauvilleCity_BikeShop_EventScript_156824 + compare RESULT, NO + goto_if_eq MauvilleCity_BikeShop_EventScript_156817 + end + +MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq MauvilleCity_BikeShop_EventScript_156824 + compare RESULT, NO + goto_if_eq MauvilleCity_BikeShop_EventScript_156817 + end + +MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 + message MauvilleCity_BikeShop_Text_1810B1 + waitmessage + multichoice 21, 8, 12, 1 + switch RESULT + case 0, MauvilleCity_BikeShop_EventScript_15682D + case 1, MauvilleCity_BikeShop_EventScript_156847 + end + +MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 + setflag FLAG_DECLINED_BIKE + msgbox MauvilleCity_BikeShop_Text_181067, 4 + release + end + +MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 + setflag FLAG_RECEIVED_BIKE + goto MauvilleCity_BikeShop_EventScript_1567F0 + end + +MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D + msgbox MauvilleCity_BikeShop_Text_181332, 4 + giveitem_std ITEM_MACH_BIKE + goto MauvilleCity_BikeShop_EventScript_156861 + end + +MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 + msgbox MauvilleCity_BikeShop_Text_18134A, 4 + giveitem_std ITEM_ACRO_BIKE + goto MauvilleCity_BikeShop_EventScript_156861 + end + +MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 + msgbox MauvilleCity_BikeShop_Text_181362, 4 + special SwapRegisteredBike + release + end + +MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E + msgbox MauvilleCity_BikeShop_Text_1813A0, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq MauvilleCity_BikeShop_EventScript_15688D + compare RESULT, NO + goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF + end + +MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D + msgbox MauvilleCity_BikeShop_Text_1813D4, 4 + checkitem ITEM_ACRO_BIKE, 1 + compare RESULT, 1 + goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 + checkitem ITEM_MACH_BIKE, 1 + compare RESULT, 1 + goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA + msgbox MauvilleCity_BikeShop_Text_181498, 4 + release + end + +MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF + msgbox MauvilleCity_BikeShop_Text_181469, 4 + release + end + +MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 + incrementgamestat GAME_STAT_TRADED_BIKES + msgbox MauvilleCity_BikeShop_Text_181439, 4 + takeitem ITEM_ACRO_BIKE, 1 + giveitem_std ITEM_MACH_BIKE + goto MauvilleCity_BikeShop_EventScript_156861 + end + +MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA + incrementgamestat GAME_STAT_TRADED_BIKES + msgbox MauvilleCity_BikeShop_Text_181408, 4 + takeitem ITEM_MACH_BIKE, 1 + giveitem_std ITEM_ACRO_BIKE + goto MauvilleCity_BikeShop_EventScript_156861 + end + +MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B + msgbox MauvilleCity_BikeShop_Text_181568, 2 + end + +MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 + message MauvilleCity_BikeShop_Text_1815EA + waitmessage + goto MauvilleCity_BikeShop_EventScript_156920 + end + +MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 + multichoice 0, 0, 43, 0 + switch RESULT + case 0, MauvilleCity_BikeShop_EventScript_156962 + case 1, MauvilleCity_BikeShop_EventScript_15696E + case 2, MauvilleCity_BikeShop_EventScript_15697A + case 3, MauvilleCity_BikeShop_EventScript_156986 + case 127, MauvilleCity_BikeShop_EventScript_156986 + end + +MauvilleCity_BikeShop_EventScript_156962:: @ 8156962 + message MauvilleCity_BikeShop_Text_18162C + waitmessage + goto MauvilleCity_BikeShop_EventScript_156920 + end + +MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E + message MauvilleCity_BikeShop_Text_1816F5 + waitmessage + goto MauvilleCity_BikeShop_EventScript_156920 + end + +MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A + message MauvilleCity_BikeShop_Text_1817BF + waitmessage + goto MauvilleCity_BikeShop_EventScript_156920 + end + +MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 + release + end + +MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 + message MauvilleCity_BikeShop_Text_181892 + waitmessage + goto MauvilleCity_BikeShop_EventScript_156994 + end + +MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 + multichoice 0, 0, 44, 0 + switch RESULT + case 0, MauvilleCity_BikeShop_EventScript_1569D6 + case 1, MauvilleCity_BikeShop_EventScript_1569E2 + case 2, MauvilleCity_BikeShop_EventScript_1569EE + case 3, MauvilleCity_BikeShop_EventScript_1569FA + case 127, MauvilleCity_BikeShop_EventScript_1569FA + end + +MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6 + message MauvilleCity_BikeShop_Text_1818D4 + waitmessage + goto MauvilleCity_BikeShop_EventScript_156994 + end + +MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2 + message MauvilleCity_BikeShop_Text_18199A + waitmessage + goto MauvilleCity_BikeShop_EventScript_156994 + end + +MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE + message MauvilleCity_BikeShop_Text_181A3D + waitmessage + goto MauvilleCity_BikeShop_EventScript_156994 + end + +MauvilleCity_BikeShop_EventScript_1569FA:: @ 81569FA + release + end diff --git a/data/maps/MauvilleCity_BikeShop/text.inc b/data/maps/MauvilleCity_BikeShop/text.inc new file mode 100644 index 000000000..3fbdffc09 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/text.inc @@ -0,0 +1,144 @@ +MauvilleCity_BikeShop_Text_180F9F:: @ 8180F9F + .string "Well, well, what have we here?\n" + .string "A most energetic customer!\p" + .string "Me? You may call me RYDEL.\n" + .string "I’m the owner of this cycle shop.$" + +MauvilleCity_BikeShop_Text_181016:: @ 8181016 + .string "RYDEL: Your RUNNING SHOES...\n" + .string "They’re awfully filthy.\p" + .string "Did you come from far away?$" + +MauvilleCity_BikeShop_Text_181067:: @ 8181067 + .string "RYDEL: Is that right?\p" + .string "Then, I guess you have no need for\n" + .string "any of my BIKES.$" + +MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 + .string "RYDEL: Hm, hm... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "You’re saying that you came all this\n" + .string "way from LITTLEROOT?\p" + .string "My goodness!\n" + .string "That’s ridiculously far!\p" + .string "If you had one of my BIKES, you could\n" + .string "go anywhere easily while feeling the\l" + .string "gentle caress of the wind!\p" + .string "I’ll tell you what!\n" + .string "I’ll give you a BIKE!\p" + .string "Oh, wait a second!\p" + .string "I forgot to tell you that there are\n" + .string "two kinds of BIKES!\p" + .string "They are the MACH BIKE and the\n" + .string "ACRO BIKE!\p" + .string "MACH BIKE is for cyclists who want\n" + .string "to feel the wind with their bodies!\p" + .string "And an ACRO BIKE is for those who\n" + .string "prefer technical rides!\p" + .string "I’m a real sweetheart, so you can\n" + .string "have whichever one you like!\p" + .string "Which one will you choose?$" + +MauvilleCity_BikeShop_Text_181332:: @ 8181332 + .string "{PLAYER} chose the MACH BIKE.$" + +MauvilleCity_BikeShop_Text_18134A:: @ 818134A + .string "{PLAYER} chose the ACRO BIKE.$" + +MauvilleCity_BikeShop_Text_181362:: @ 8181362 + .string "RYDEL: If you get the urge to switch\n" + .string "BIKES, just come see me!$" + +MauvilleCity_BikeShop_Text_1813A0:: @ 81813A0 + .string "RYDEL: Oh? Were you thinking about\n" + .string "switching BIKES?$" + +MauvilleCity_BikeShop_Text_1813D4:: @ 81813D4 + .string "RYDEL: Okay, no problem!\n" + .string "I’ll switch BIKES for you!$" + +MauvilleCity_BikeShop_Text_181408:: @ 8181408 + .string "{PLAYER} got the MACH BIKE exchanged\n" + .string "for an ACRO BIKE.$" + +MauvilleCity_BikeShop_Text_181439:: @ 8181439 + .string "{PLAYER} got the ACRO BIKE exchanged\n" + .string "for a MACH BIKE.$" + +MauvilleCity_BikeShop_Text_181469:: @ 8181469 + .string "RYDEL: Good, good!\n" + .string "I’m happy that you like it!$" + +MauvilleCity_BikeShop_Text_181498:: @ 8181498 + .string "Oh? What happened to that BIKE I\n" + .string "gave you?\p" + .string "Oh, I get it, you stored it using your PC.\p" + .string "Well, take it out of PC storage,\n" + .string "and I’ll be happy to exchange it!\p" + .string "May the wind always be at your back\n" + .string "on your adventure!$" + +MauvilleCity_BikeShop_Text_181568:: @ 8181568 + .string "I’m learning about BIKES while\n" + .string "I work here.\p" + .string "If you need advice on how to ride your\n" + .string "BIKE, there’re a couple handbooks in\l" + .string "the back.$" + +MauvilleCity_BikeShop_Text_1815EA:: @ 81815EA + .string "It’s a handbook on the MACH BIKE.\p" + .string "Which page do you want to read?$" + +MauvilleCity_BikeShop_Text_18162C:: @ 818162C + .string "A BIKE moves in the direction that\n" + .string "the + Control Pad is pressed.\p" + .string "It will speed up once it gets rolling.\p" + .string "To stop, release the + Control Pad.\n" + .string "The BIKE will slow to a stop.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 + .string "A MACH BIKE is speedy, but it can’t\n" + .string "stop very quickly.\p" + .string "It gets a little tricky to get around\n" + .string "a corner.\p" + .string "Release the + Control Pad a little\n" + .string "before the corner and slow down.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF + .string "There are small sandy slopes throughout\n" + .string "the HOENN region.\p" + .string "The loose, crumbly sand makes it\n" + .string "impossible to climb normally.\p" + .string "But if you have a MACH BIKE, you can\n" + .string "zip up a sandy slope.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_181892:: @ 8181892 + .string "It’s a handbook on the ACRO BIKE.\p" + .string "Which page do you want to read?$" + +MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 + .string "Press the B Button while riding, and the\n" + .string "front wheel lifts up.\p" + .string "You can zip around with the front\n" + .string "wheel up using the + Control Pad.\p" + .string "This technique is called a wheelie.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_18199A:: @ 818199A + .string "Keeping the B Button pressed, your\n" + .string "BIKE can hop on the spot.\p" + .string "This technique is called a bunny hop.\p" + .string "You can ride while hopping, too.\p" + .string "Want to read a different page?$" + +MauvilleCity_BikeShop_Text_181A3D:: @ 8181A3D + .string "Press the B Button and the + Control\n" + .string "Pad at the same time to jump.\p" + .string "Press the + Control Pad to the side\n" + .string "to jump sideways.\p" + .string "Press it backwards to make the BIKE\n" + .string "change directions while jumping.\p" + .string "Want to read a different page?$" diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/maps/MauvilleCity_GameCorner/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/MauvilleCity_GameCorner/border.bin +++ /dev/null diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 7b789a34e..7b789a34e 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 653a41544..7e9bb00fa 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,9 +1,9 @@ MauvilleCity_GameCorner:: @ 83061A0 - .4byte MauvilleCity_GameCorner_MapAttributes + .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 - .2byte BGM_CASINO + .2byte MUS_CASINO .2byte 91 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/maps/MauvilleCity_GameCorner/map.bin deleted file mode 100644 index ce3f9bf73..000000000 --- a/data/maps/MauvilleCity_GameCorner/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -<=>>>>? - - ///DFEFFFG.227772LC2M2N2M2M2O22222222222TVUVUUW 22 2 2 2 2222222222\2]2^2^2^2]2_2 22222622$2%2222$2%222222222222222&2,-'22&2,-'22222"#
22"#
222&2,-'22&2,-'22222*+ 22*+ 222&2,-'22&2,-'2222223 2223 222&245'22&245'22222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc new file mode 100644 index 000000000..b9f8e5ad1 --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -0,0 +1,655 @@ +MauvilleCity_GameCorner_MapScripts:: @ 8156A33 + .byte 0 + +MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_181C35, 4 + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 + message MauvilleCity_GameCorner_Text_181CB4 + waitmessage + showmoneybox 0, 0 + nop + showcoinsbox 0, 5 + goto MauvilleCity_GameCorner_EventScript_156A60 + +MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 + multichoicedefault 15, 0, 49, 0, 0 + switch RESULT + case 0, MauvilleCity_GameCorner_EventScript_156AAE + case 1, MauvilleCity_GameCorner_EventScript_156AF0 + goto MauvilleCity_GameCorner_EventScript_156B4C + end + +@ 8156A87 + multichoicedefault 15, 0, 49, 1, 0 + switch RESULT + case 0, MauvilleCity_GameCorner_EventScript_156AAE + case 1, MauvilleCity_GameCorner_EventScript_156AF0 + goto MauvilleCity_GameCorner_EventScript_156B4C + end + +MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C + checkmoney 0x3e8, 0 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C + givecoins 50 + takemoney 0x3e8, 0 + updatemoneybox 0, 0 + nop + updatecoinsbox 0, 5 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181CFE, 4 + hidemoneybox 0, 0 + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C + checkmoney 0x2710, 0 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C + givecoins 500 + takemoney 0x2710, 0 + updatemoneybox 0, 0 + nop + updatecoinsbox 0, 5 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181CFE, 4 + hidemoneybox 0, 0 + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32 + msgbox MauvilleCity_GameCorner_Text_181C53, 4 + release + end + +MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C + msgbox MauvilleCity_GameCorner_Text_181D28, 4 + hidemoneybox 0, 0 + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C + msgbox MauvilleCity_GameCorner_Text_181D73, 4 + hidemoneybox 0, 0 + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C + msgbox MauvilleCity_GameCorner_Text_181D57, 4 + hidemoneybox 0, 0 + hidecoinsbox 0, 5 + release + end + +MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_181DE1, 4 + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 1 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 + release + end + +MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 + message MauvilleCity_GameCorner_Text_181E17 + waitmessage + showcoinsbox 0, 0 + setvar VAR_TEMP_1, 0 + goto MauvilleCity_GameCorner_EventScript_156BA6 + +MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B + message MauvilleCity_GameCorner_Text_181E17 + waitmessage + goto MauvilleCity_GameCorner_EventScript_156BA6 + +MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 + multichoice 12, 0, 48, 0 + switch RESULT + case 0, MauvilleCity_GameCorner_EventScript_156BE2 + case 1, MauvilleCity_GameCorner_EventScript_156BF0 + case 2, MauvilleCity_GameCorner_EventScript_156BFE + case 3, MauvilleCity_GameCorner_EventScript_156D0D + goto MauvilleCity_GameCorner_EventScript_156D0D + end + +MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 + setvar VAR_TEMP_1, 1 + bufferdecorationname 0, 88 + goto MauvilleCity_GameCorner_EventScript_156C0C + +MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 + setvar VAR_TEMP_1, 2 + bufferdecorationname 0, 89 + goto MauvilleCity_GameCorner_EventScript_156C0C + +MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE + setvar VAR_TEMP_1, 3 + bufferdecorationname 0, 90 + goto MauvilleCity_GameCorner_EventScript_156C0C + +MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D + switch VAR_TEMP_1 + case 1, MauvilleCity_GameCorner_EventScript_156C46 + case 2, MauvilleCity_GameCorner_EventScript_156C80 + case 3, MauvilleCity_GameCorner_EventScript_156CBA + end + +MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 + takecoins 1000 + givedecoration DECOR_TREECKO_DOLL + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181E49, 4 + goto MauvilleCity_GameCorner_EventScript_156B9B + end + +MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 + takecoins 1000 + givedecoration DECOR_TORCHIC_DOLL + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181E49, 4 + goto MauvilleCity_GameCorner_EventScript_156B9B + end + +MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 + takecoins 1000 + givedecoration DECOR_MUDKIP_DOLL + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181E49, 4 + goto MauvilleCity_GameCorner_EventScript_156B9B + end + +MauvilleCity_GameCorner_EventScript_156CF4:: @ 8156CF4 + msgbox MauvilleCity_GameCorner_Text_181E76, 4 + goto MauvilleCity_GameCorner_EventScript_156B9B + end + +MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 + call MauvilleCity_GameCorner_EventScript_1A02B8 + goto MauvilleCity_GameCorner_EventScript_156B9B + end + +MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D + msgbox MauvilleCity_GameCorner_Text_181EC2, 4 + hidecoinsbox 0, 0 + release + end + +MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_181DE1, 4 + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 1 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 + release + end + +MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 + message MauvilleCity_GameCorner_Text_181E17 + waitmessage + showcoinsbox 0, 0 + setvar VAR_TEMP_1, 0 + goto MauvilleCity_GameCorner_EventScript_156D54 + +MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 + message MauvilleCity_GameCorner_Text_181E17 + waitmessage + goto MauvilleCity_GameCorner_EventScript_156D54 + +MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 + multichoice 12, 0, 55, 0 + switch RESULT + case 0, MauvilleCity_GameCorner_EventScript_156DA6 + case 1, MauvilleCity_GameCorner_EventScript_156DB4 + case 2, MauvilleCity_GameCorner_EventScript_156DC2 + case 3, MauvilleCity_GameCorner_EventScript_156DD0 + case 4, MauvilleCity_GameCorner_EventScript_156DDE + case 5, MauvilleCity_GameCorner_EventScript_156F77 + goto MauvilleCity_GameCorner_EventScript_156F77 + end + +MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 + setvar VAR_TEMP_1, 1 + bufferitemname 0, ITEM_TM32_DOUBLE_TEAM + goto MauvilleCity_GameCorner_EventScript_156DEC + +MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 + setvar VAR_TEMP_1, 2 + bufferitemname 0, ITEM_TM29_PSYCHIC + goto MauvilleCity_GameCorner_EventScript_156DEC + +MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 + setvar VAR_TEMP_1, 3 + bufferitemname 0, ITEM_TM35_FLAMETHROWER + goto MauvilleCity_GameCorner_EventScript_156DEC + +MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 + setvar VAR_TEMP_1, 4 + bufferitemname 0, ITEM_TM24_THUNDERBOLT + goto MauvilleCity_GameCorner_EventScript_156DEC + +MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE + setvar VAR_TEMP_1, 5 + bufferitemname 0, ITEM_TM13_ICE_BEAM + goto MauvilleCity_GameCorner_EventScript_156DEC + +MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 + switch VAR_TEMP_1 + case 1, MauvilleCity_GameCorner_EventScript_156E3C + case 2, MauvilleCity_GameCorner_EventScript_156E76 + case 3, MauvilleCity_GameCorner_EventScript_156EB0 + case 4, MauvilleCity_GameCorner_EventScript_156EEA + case 5, MauvilleCity_GameCorner_EventScript_156F24 + end + +MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + checkitemspace ITEM_TM32_DOUBLE_TEAM, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + takecoins 1500 + giveitem ITEM_TM32_DOUBLE_TEAM, 1 + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181F08, 4 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + checkitemspace ITEM_TM29_PSYCHIC, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + takecoins 3500 + giveitem ITEM_TM29_PSYCHIC, 1 + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181F08, 4 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + checkitemspace ITEM_TM35_FLAMETHROWER, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + takecoins 4000 + giveitem ITEM_TM35_FLAMETHROWER, 1 + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181F08, 4 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + checkitemspace ITEM_TM24_THUNDERBOLT, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + takecoins 4000 + giveitem ITEM_TM24_THUNDERBOLT, 1 + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181F08, 4 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + checkitemspace ITEM_TM13_ICE_BEAM, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + takecoins 4000 + giveitem ITEM_TM13_ICE_BEAM, 1 + updatecoinsbox 0, 0 + playse SE_REGI + msgbox MauvilleCity_GameCorner_Text_181F08, 4 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156F5E:: @ 8156F5E + msgbox MauvilleCity_GameCorner_Text_181E76, 4 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C + call MauvilleCity_GameCorner_EventScript_1A02A5 + goto MauvilleCity_GameCorner_EventScript_156D49 + end + +MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77 + msgbox MauvilleCity_GameCorner_Text_181EC2, 4 + hidecoinsbox 0, 0 + release + end + +MauvilleCity_GameCorner_EventScript_156F84:: @ 8156F84 + msgbox MauvilleCity_GameCorner_Text_1821C1, 2 + end + +MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D + msgbox MauvilleCity_GameCorner_Text_1821F3, 2 + end + +MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 + lock + faceplayer + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072 + msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MauvilleCity_GameCorner_EventScript_157068 + switch VAR_STARTER_MON + case 0, MauvilleCity_GameCorner_EventScript_156FDB + case 1, MauvilleCity_GameCorner_EventScript_157005 + case 2, MauvilleCity_GameCorner_EventScript_15702F + end + +MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 + msgbox MauvilleCity_GameCorner_Text_181F89, 4 + givedecoration_std DECOR_TREECKO_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL + goto MauvilleCity_GameCorner_EventScript_157072 + end + +MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 + msgbox MauvilleCity_GameCorner_Text_181F89, 4 + givedecoration_std DECOR_TORCHIC_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL + goto MauvilleCity_GameCorner_EventScript_157072 + end + +MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 + msgbox MauvilleCity_GameCorner_Text_181F89, 4 + givedecoration_std DECOR_MUDKIP_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL + goto MauvilleCity_GameCorner_EventScript_157072 + end + +MauvilleCity_GameCorner_EventScript_157059:: @ 8157059 + call MauvilleCity_GameCorner_EventScript_1A02B8 + msgbox MauvilleCity_GameCorner_Text_181F97, 4 + release + end + +MauvilleCity_GameCorner_EventScript_157068:: @ 8157068 + msgbox MauvilleCity_GameCorner_Text_181FBC, 4 + release + end + +MauvilleCity_GameCorner_EventScript_157072:: @ 8157072 + msgbox MauvilleCity_GameCorner_Text_181FE9, 4 + release + end + +MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C + lock + faceplayer + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 1 + goto_if_eq MauvilleCity_GameCorner_EventScript_15709C + msgbox MauvilleCity_GameCorner_Text_18201E, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_1570CA + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 + goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA + setflag FLAG_RECEIVED_20_COINS + givecoins 20 + msgbox MauvilleCity_GameCorner_Text_18208E, 4 + playse SE_REGI + goto MauvilleCity_GameCorner_EventScript_1570CA + end + +MauvilleCity_GameCorner_EventScript_1570CA:: @ 81570CA + msgbox MauvilleCity_GameCorner_Text_1820DD, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_1570D8:: @ 81570D8 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_182120, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_1570E8:: @ 81570E8 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_18217C, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_182241, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 + closemessage + applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D + waitmovement 0 + release + end + +MauvilleCity_GameCorner_EventScript_157115:: @ 8157115 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_182272, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 + lock + faceplayer + msgbox MauvilleCity_GameCorner_Text_1822F4, 4 + goto MauvilleCity_GameCorner_EventScript_157108 + end + +MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 0 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 1 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 2 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 3 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 4 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 5 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 6 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 7 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 8 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 9 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 10 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 + lockall + checkitem ITEM_COIN_CASE, 1 + compare RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + setvar VAR_SPECIAL_4, 11 + specialvar RESULT, GetSlotMachineId + playslotmachine RESULT + releaseall + end + +MauvilleCity_GameCorner_EventScript_1572B5:: @ 81572B5 + msgbox MauvilleCity_GameCorner_Text_182420, 4 + releaseall + end diff --git a/data/maps/MauvilleCity_GameCorner/text.inc b/data/maps/MauvilleCity_GameCorner/text.inc new file mode 100644 index 000000000..f367c3cf2 --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/text.inc @@ -0,0 +1,147 @@ +MauvilleCity_GameCorner_Text_181C35:: @ 8181C35 + .string "This is MAUVILLE GAME CORNER.$" + +MauvilleCity_GameCorner_Text_181C53:: @ 8181C53 + .string "Okay, you wanted some COINS for\n" + .string "the games?\p" + .string "But you don’t have a COIN CASE for\n" + .string "stowing the COINS.$" + +MauvilleCity_GameCorner_Text_181CB4:: @ 8181CB4 + .string "Were you looking for COINS?\p" + .string "It’s ¥1000 for 50 COINS.\n" + .string "Would you like some?$" + +MauvilleCity_GameCorner_Text_181CFE:: @ 8181CFE + .string "Thank you very much!\n" + .string "Here are your COINS!$" + +MauvilleCity_GameCorner_Text_181D28:: @ 8181D28 + .string "Um... You don’t appear to have\n" + .string "enough money...$" + +MauvilleCity_GameCorner_Text_181D57:: @ 8181D57 + .string "Oh?\n" + .string "Your COIN CASE is full.$" + +MauvilleCity_GameCorner_Text_181D73:: @ 8181D73 + .string "Oh... You don’t need COINS, then?\n" + .string "Good luck on your adventure!$" + +UnknownString_8181DB2: @ 8181DB2 + .string "It’s ¥1,000 for 50 COINS.\n" + .string "Would you like some?$" + +MauvilleCity_GameCorner_Text_181DE1:: @ 8181DE1 + .string "Welcome.\p" + .string "You can exchange your COINS for\n" + .string "prizes here.$" + +MauvilleCity_GameCorner_Text_181E17:: @ 8181E17 + .string "Which prize would you like?$" + +MauvilleCity_GameCorner_Text_181E33:: @ 8181E33 + .string "So your choice is {STR_VAR_1}?$" + +MauvilleCity_GameCorner_Text_181E49:: @ 8181E49 + .string "Thank you!\n" + .string "We’ll send it to your PC at home.$" + +MauvilleCity_GameCorner_Text_181E76:: @ 8181E76 + .string "You don’t have enough COINS.$" + +UnknownString_8181E93: @ 8181E93 + .string "There isn’t any room available for\n" + .string "placing {STR_VAR_1}.$" + +MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 + .string "Oh, is that so? \n" + .string "You need to save some COINS before\l" + .string "coming back here.$" + +MauvilleCity_GameCorner_Text_181F08:: @ 8181F08 + .string "Here you go!$" + +UnknownString_8181F15: @ 8181F15 + .string "Oh, you can’t carry any more than that.$" + +MauvilleCity_GameCorner_Text_181F3D:: @ 8181F3D + .string "I made a mistake and got two of the\n" + .string "same DOLLS.\p" + .string "Would you like one of them?$" + +MauvilleCity_GameCorner_Text_181F89:: @ 8181F89 + .string "There you go!$" + +MauvilleCity_GameCorner_Text_181F97:: @ 8181F97 + .string "Huh?\n" + .string "You want it, but not right now?$" + +MauvilleCity_GameCorner_Text_181FBC:: @ 8181FBC + .string "Oh, don’t be so negative!\n" + .string "You can have this!$" + +MauvilleCity_GameCorner_Text_181FE9:: @ 8181FE9 + .string "There’s a prize I want, but I can’t win\n" + .string "the jackpot.$" + +MauvilleCity_GameCorner_Text_18201E:: @ 818201E + .string "Hey, kid, if you want to play here,\n" + .string "you need a COIN CASE.\p" + .string "I think the young lady next door\n" + .string "had one. Go see her!$" + +MauvilleCity_GameCorner_Text_18208E:: @ 818208E + .string "My luck can only last so long.\n" + .string "This is too much for me.\l" + .string "Here, take some COINS!$" + +MauvilleCity_GameCorner_Text_1820DD:: @ 81820DD + .string "MAUVILLE has something for\n" + .string "everyone.\p" + .string "For me, it’s the GAME CORNER.$" + +MauvilleCity_GameCorner_Text_182120:: @ 8182120 + .string "The ROULETTE tables have different\n" + .string "rates.\p" + .string "Check your COINS if you’re going to\n" + .string "pick a table.$" + +MauvilleCity_GameCorner_Text_18217C:: @ 818217C + .string "It’s easy to lose track of time in here. \n" + .string "I should get back to work.$" + +MauvilleCity_GameCorner_Text_1821C1:: @ 81821C1 + .string "COINS are needed to play here in the\n" + .string "GAME CORNER.$" + +MauvilleCity_GameCorner_Text_1821F3:: @ 81821F3 + .string "This ROULETTE thing...\n" + .string "It’s rather demanding.\p" + .string "Win or lose, it’s only by luck.$" + +MauvilleCity_GameCorner_Text_182241:: @ 8182241 + .string "Up to three COINS can be used to play\n" + .string "the SLOTS.$" + +MauvilleCity_GameCorner_Text_182272:: @ 8182272 + .string "It’s very difficult to make it stop\n" + .string "right on “7.”\p" + .string "If it stops on “7” during the REEL TIME\n" + .string "bonus game, you’ll receive extra COINS.$" + +MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 + .string "Here’s some information for you\n" + .string "about the SLOTS.\p" + .string "The more lightning bolts you stock, the\n" + .string "more REEL TIME chances you get.\p" + .string "In a game with the maximum five REEL\n" + .string "TIME chances...\p" + .string "It is possible to receive four regular\n" + .string "bonuses, then a big bonus.\p" + .string "The big bonus is 660 COINS, but it’s\n" + .string "very difficult to get.$" + +MauvilleCity_GameCorner_Text_182420:: @ 8182420 + .string "You can’t play if you don’t have a\n" + .string "COIN CASE.$" diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/maps/MauvilleCity_Gym/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/MauvilleCity_Gym/border.bin +++ /dev/null diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc index cfcbbc4c6..cfcbbc4c6 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/MauvilleCity_Gym/events.inc diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index efbd61fe0..a52423319 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,9 +1,9 @@ MauvilleCity_Gym:: @ 830614C - .4byte MauvilleCity_Gym_MapAttributes + .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 89 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/maps/MauvilleCity_Gym/map.bin deleted file mode 100644 index 73847264c..000000000 --- a/data/maps/MauvilleCity_Gym/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -&' 6666 2222 2222 2222 2222 2 2!22 222@() 222222H22222 222232P62232222:2;2C:2;2@22
222222H 2 2222Q2 2!2P6 22() 2222222 2222222222222222 -222 -2222 2222 222222 2222
\ No newline at end of file diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc new file mode 100644 index 000000000..d9b8aced7 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -0,0 +1,216 @@ +MauvilleCity_Gym_MapScripts:: @ 8156450 + map_script 1, MauvilleCity_Gym_MapScript1_156456 + .byte 0 + +MauvilleCity_Gym_MapScript1_156456:: @ 8156456 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1565A7 + switch VAR_MAUVILLE_GYM_STATE + case 0, MauvilleCity_Gym_EventScript_156491 + case 1, MauvilleCity_Gym_EventScript_15657D + case 2, MauvilleCity_Gym_EventScript_15658B + case 3, MauvilleCity_Gym_EventScript_156599 + end + +MauvilleCity_Gym_EventScript_156491:: @ 8156491 + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_15649B + end + +MauvilleCity_Gym_EventScript_15649B:: @ 815649B + setmetatile 4, 7, 560, 0 + setmetatile 4, 8, 568, 0 + setmetatile 5, 7, 561, 0 + setmetatile 5, 8, 569, 0 + setmetatile 3, 8, 578, 1 + setmetatile 3, 9, 538, 0 + setmetatile 3, 10, 593, 0 + setmetatile 1, 10, 546, 0 + setmetatile 1, 11, 554, 1 + setmetatile 2, 10, 547, 0 + setmetatile 2, 11, 555, 1 + setmetatile 4, 10, 546, 0 + setmetatile 4, 11, 554, 1 + setmetatile 5, 10, 547, 0 + setmetatile 5, 11, 555, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 12, 538, 0 + setmetatile 6, 13, 593, 0 + setmetatile 3, 11, 577, 1 + setmetatile 3, 12, 585, 1 + setmetatile 3, 13, 592, 1 + setmetatile 4, 13, 560, 0 + setmetatile 4, 14, 568, 0 + setmetatile 5, 13, 561, 0 + setmetatile 5, 14, 569, 0 + end + +MauvilleCity_Gym_EventScript_15657D:: @ 815657D + setvar VAR_SPECIAL_4, 0 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_156491 + end + +MauvilleCity_Gym_EventScript_15658B:: @ 815658B + setvar VAR_SPECIAL_4, 1 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_156491 + end + +MauvilleCity_Gym_EventScript_156599:: @ 8156599 + setvar VAR_SPECIAL_4, 2 + special MauvilleGymSpecial1 + goto MauvilleCity_Gym_EventScript_156491 + end + +MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 + special MauvilleGymSpecial3 + end + +MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB + trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D + compare VAR_NEW_MAUVILLE_STATE, 2 + goto_if_eq MauvilleCity_Gym_EventScript_156641 + msgbox MauvilleCity_Gym_Text_180EDB, 4 + release + end + +MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB + message MauvilleCity_Gym_Text_180DAF + waitmessage + call MauvilleCity_Gym_EventScript_1A02C5 + msgbox MauvilleCity_Gym_Text_180DDA, 4 + setflag FLAG_DEFEATED_MAUVILLE_GYM + setflag FLAG_BADGE03_GET + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 + call_if_eq MauvilleCity_Gym_EventScript_1A00FB + setvar VAR_SPECIAL_8, 3 + call MauvilleCity_Gym_EventScript_1A01C0 + special MauvilleGymSpecial3 + special DrawWholeMapView + playse SE_KI_GASYAN + goto MauvilleCity_Gym_EventScript_15661D + end + +MauvilleCity_Gym_EventScript_15661D:: @ 815661D + giveitem_std ITEM_TM34_SHOCK_WAVE + compare RESULT, 0 + goto_if_eq MauvilleCity_Gym_EventScript_1A029B + msgbox MauvilleCity_Gym_Text_180E76, 4 + setflag FLAG_RECEIVED_TM34 + release + end + +MauvilleCity_Gym_EventScript_156641:: @ 8156641 + msgbox MauvilleCity_Gym_Text_180F1D, 4 + release + end + +MauvilleCity_Gym_EventScript_15664B:: @ 815664B + lockall + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA + compare VAR_MAUVILLE_GYM_STATE, 1 + goto_if_eq MauvilleCity_Gym_EventScript_1566DA + setvar VAR_MAUVILLE_GYM_STATE, 1 + setvar VAR_SPECIAL_4, 0 + goto MauvilleCity_Gym_EventScript_1566BA + end + +MauvilleCity_Gym_EventScript_156670:: @ 8156670 + lockall + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA + compare VAR_MAUVILLE_GYM_STATE, 2 + goto_if_eq MauvilleCity_Gym_EventScript_1566DA + setvar VAR_MAUVILLE_GYM_STATE, 2 + setvar VAR_SPECIAL_4, 1 + goto MauvilleCity_Gym_EventScript_1566BA + end + +MauvilleCity_Gym_EventScript_156695:: @ 8156695 + lockall + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA + compare VAR_MAUVILLE_GYM_STATE, 3 + goto_if_eq MauvilleCity_Gym_EventScript_1566DA + setvar VAR_MAUVILLE_GYM_STATE, 3 + setvar VAR_SPECIAL_4, 2 + goto MauvilleCity_Gym_EventScript_1566BA + end + +MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA + special MauvilleGymSpecial2 + special MauvilleGymSpecial1 + special DrawWholeMapView + playse SE_KI_GASYAN + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC + releaseall + end + +MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA + releaseall + end + +MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC + setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE + releaseall + end + +MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE + releaseall + end + +MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 + trainerbattle 0, OPPONENT_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + msgbox MauvilleCity_Gym_Text_1809D1, 6 + end + +MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD + trainerbattle 0, OPPONENT_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + msgbox MauvilleCity_Gym_Text_180A5E, 6 + end + +MauvilleCity_Gym_EventScript_156714:: @ 8156714 + trainerbattle 0, OPPONENT_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + msgbox MauvilleCity_Gym_Text_180B1D, 6 + end + +MauvilleCity_Gym_EventScript_15672B:: @ 815672B + trainerbattle 0, OPPONENT_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + msgbox MauvilleCity_Gym_Text_180BAE, 6 + end + +MauvilleCity_Gym_EventScript_156742:: @ 8156742 + lock + faceplayer + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757 + msgbox MauvilleCity_Gym_Text_180815, 4 + release + end + +MauvilleCity_Gym_EventScript_156757:: @ 8156757 + msgbox MauvilleCity_Gym_Text_18091D, 4 + release + end + +MauvilleCity_Gym_EventScript_156761:: @ 8156761 + lockall + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 + goto MauvilleCity_Gym_EventScript_15678B + end + +MauvilleCity_Gym_EventScript_156771:: @ 8156771 + lockall + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 + goto MauvilleCity_Gym_EventScript_15678B + end + +MauvilleCity_Gym_EventScript_156781:: @ 8156781 + msgbox MauvilleCity_Gym_Text_180F64, 4 + releaseall + end + +MauvilleCity_Gym_EventScript_15678B:: @ 815678B + msgbox MauvilleCity_Gym_Text_180F4A, 4 + releaseall + end diff --git a/data/maps/MauvilleCity_Gym/text.inc b/data/maps/MauvilleCity_Gym/text.inc new file mode 100644 index 000000000..5ae43f880 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/text.inc @@ -0,0 +1,116 @@ +MauvilleCity_Gym_Text_180815:: @ 8180815 + .string "Hey, how’s it going, the CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "WATTSON, the LEADER of MAUVILLE\n" + .string "GYM, uses ELECTRIC-type POKéMON.\p" + .string "If you challenge him with WATER-type\n" + .string "POKéMON, he’ll zap them! Bzzt!\p" + .string "And, he’s put in switch-controlled doors\n" + .string "all over his GYM! Eccentric!\p" + .string "Hey, go for it!$" + +MauvilleCity_Gym_Text_18091D:: @ 818091D + .string "Whoa, you’re electrifying!\n" + .string "You’ve powered the door open!$" + +MauvilleCity_Gym_Text_180956:: @ 8180956 + .string "My electric soul, it’ll shatter your\n" + .string "dreams whole, whoah-yeahah!$" + +MauvilleCity_Gym_Text_180997:: @ 8180997 + .string "That was plugged in, amped up,\n" + .string "over-driven electric, man!$" + +MauvilleCity_Gym_Text_1809D1:: @ 81809D1 + .string "POKéMON and rock, it’s all about heart,\n" + .string "whoah yeah!$" + +MauvilleCity_Gym_Text_180A05:: @ 8180A05 + .string "I trained under WATTSON!\n" + .string "There ain’t no way I’d lose easily!$" + +MauvilleCity_Gym_Text_180A42:: @ 8180A42 + .string "Unplugged and turned off...$" + +MauvilleCity_Gym_Text_180A5E:: @ 8180A5E + .string "WATTSON, our GYM LEADER, has been\n" + .string "around for a long, long time.\p" + .string "He was battling even before your\n" + .string "daddy was born, that tough coot.$" + +MauvilleCity_Gym_Text_180AE0:: @ 8180AE0 + .string "This GYM’s got puzzles!\n" + .string "Isn’t it fun?$" + +MauvilleCity_Gym_Text_180B06:: @ 8180B06 + .string "It’s no fun to lose...$" + +MauvilleCity_Gym_Text_180B1D:: @ 8180B1D + .string "WATTSON says he likes setting up\n" + .string "little traps with switches.$" + +MauvilleCity_Gym_Text_180B5A:: @ 8180B5A + .string "With my charm and my POKéMON’s moves,\n" + .string "you’ll be shocked!$" + +MauvilleCity_Gym_Text_180B93:: @ 8180B93 + .string "I’m shocked by your power!$" + +MauvilleCity_Gym_Text_180BAE:: @ 8180BAE + .string "I’ve heard that MAUVILLE was founded\n" + .string "by WATTSON.\p" + .string "He was a TRAINER long before we\n" + .string "became TRAINERS.\l" + .string "He must know all sorts of things!$" + +MauvilleCity_Gym_Text_180C32:: @ 8180C32 + .string "I’ve given up on my plans to convert\n" + .string "the city, I have.\p" + .string "And so, I put my time into making\n" + .string "door traps in my GYM.\p" + .string "Oh? Now, what are you doing here?\p" + .string "What’s that? You say you’ve gotten\n" + .string "past all my rigged doors?\p" + .string "Wahahahah!\n" + .string "Now, that is amusing!\p" + .string "Then, I, WATTSON, the LEADER of\n" + .string "MAUVILLE GYM, shall electrify you!$" + +MauvilleCity_Gym_Text_180D64:: @ 8180D64 + .string "Wahahahah!\n" + .string "Fine, I lost!\p" + .string "You ended up giving me a thrill!\n" + .string "Take this BADGE!$" + +MauvilleCity_Gym_Text_180DAF:: @ 8180DAF + .string "{PLAYER} received the DYNAMO BADGE\n" + .string "from WATTSON.$" + +MauvilleCity_Gym_Text_180DDA:: @ 8180DDA + .string "With the DYNAMO BADGE, POKéMON can\n" + .string "use ROCK SMASH out of battle.\p" + .string "And, it will make your POKéMON a little\n" + .string "bit faster, too.\p" + .string "Hmm...\n" + .string "You should take this, too!$" + +MauvilleCity_Gym_Text_180E76:: @ 8180E76 + .string "That TM34 there contains SHOCK WAVE.\p" + .string "It’s a trustworthy move that never\n" + .string "misses! You can count on it!$" + +MauvilleCity_Gym_Text_180EDB:: @ 8180EDB + .string "I swell with optimism, seeing a promising\n" + .string "young TRAINER like you!$" + +MauvilleCity_Gym_Text_180F1D:: @ 8180F1D + .string "Wahahahah!\n" + .string "Go forth and endeavor, youngster!$" + +MauvilleCity_Gym_Text_180F4A:: @ 8180F4A + .string "MAUVILLE CITY POKéMON GYM$" + +MauvilleCity_Gym_Text_180F64:: @ 8180F64 + .string "MAUVILLE CITY POKéMON GYM\p" + .string "WATTSON’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc index 07044121d..07044121d 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/MauvilleCity_House1/events.inc diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 30c59da1e..0d464b6c0 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,9 +1,9 @@ MauvilleCity_House1:: @ 8306184 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc new file mode 100644 index 000000000..4caaef545 --- /dev/null +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -0,0 +1,18 @@ +MauvilleCity_House1_MapScripts:: @ 81569FC + .byte 0 + +MauvilleCity_House1_EventScript_1569FD:: @ 81569FD + lock + faceplayer + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 + msgbox MauvilleCity_House1_Text_181B1A, 4 + giveitem_std ITEM_HM06_ROCK_SMASH + setflag FLAG_RECEIVED_HM06 + msgbox MauvilleCity_House1_Text_181B64, 4 + release + end + +MauvilleCity_House1_EventScript_156A29:: @ 8156A29 + msgbox MauvilleCity_House1_Text_181BF6, 4 + release + end diff --git a/data/maps/MauvilleCity_House1/text.inc b/data/maps/MauvilleCity_House1/text.inc new file mode 100644 index 000000000..c5eec210e --- /dev/null +++ b/data/maps/MauvilleCity_House1/text.inc @@ -0,0 +1,16 @@ +MauvilleCity_House1_Text_181B1A:: @ 8181B1A + .string "Woohoo, your POKéMON look pretty\n" + .string "strong.\p" + .string "I like that!\n" + .string "Here, take this HM!$" + +MauvilleCity_House1_Text_181B64:: @ 8181B64 + .string "That HM contains ROCK SMASH.\p" + .string "If you come across large boulders\n" + .string "that block your path...\p" + .string "Well, use that HM move and smash\n" + .string "it right out of your way!$" + +MauvilleCity_House1_Text_181BF6:: @ 8181BF6 + .string "Oh, yes, if you smash a rock, a POKéMON\n" + .string "could come flying out.$" diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc index 58d8d5a24..58d8d5a24 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/MauvilleCity_House2/events.inc diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 9bd7d9c11..7a8c72f6e 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,9 +1,9 @@ MauvilleCity_House2:: @ 83061BC - .4byte House1_MapAttributes + .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 59 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc new file mode 100644 index 000000000..f18d278b5 --- /dev/null +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -0,0 +1,44 @@ +MauvilleCity_House2_MapScripts:: @ 81572BF + .byte 0 + +MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 + lock + faceplayer + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D + msgbox MauvilleCity_House2_Text_18244E, 4 + checkitem ITEM_HARBOR_MAIL, 1 + compare RESULT, 1 + goto_if_eq MauvilleCity_House2_EventScript_1572E5 + release + end + +MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 + playse SE_PIN + applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 + waitmovement 0 + msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq MauvilleCity_House2_EventScript_15731B + compare RESULT, NO + goto_if_eq MauvilleCity_House2_EventScript_157347 + end + +MauvilleCity_House2_EventScript_15731B:: @ 815731B + msgbox MauvilleCity_House2_Text_182515, 4 + takeitem ITEM_HARBOR_MAIL, 1 + giveitem_std ITEM_COIN_CASE + setflag FLAG_RECEIVED_COIN_CASE + goto MauvilleCity_House2_EventScript_15733D + end + +MauvilleCity_House2_EventScript_15733D:: @ 815733D + msgbox MauvilleCity_House2_Text_182549, 4 + release + end + +MauvilleCity_House2_EventScript_157347:: @ 8157347 + msgbox MauvilleCity_House2_Text_182578, 4 + release + end diff --git a/data/maps/MauvilleCity_House2/text.inc b/data/maps/MauvilleCity_House2/text.inc new file mode 100644 index 000000000..50cdf1fa7 --- /dev/null +++ b/data/maps/MauvilleCity_House2/text.inc @@ -0,0 +1,22 @@ +MauvilleCity_House2_Text_18244E:: @ 818244E + .string "If I had a BIKE, it’d be easy to cycle to\n" + .string "SLATEPORT for some shopping.\p" + .string "I’d be able to buy HARBOR MAIL at the\n" + .string "POKéMON MART in SLATEPORT...$" + +MauvilleCity_House2_Text_1824D8:: @ 81824D8 + .string "Oh! You have HARBOR MAIL?\n" + .string "Will you trade it for a COIN CASE?$" + +MauvilleCity_House2_Text_182515:: @ 8182515 + .string "Oh, I’m so happy!\n" + .string "Okay, I’ll trade you a COIN CASE!$" + +MauvilleCity_House2_Text_182549:: @ 8182549 + .string "That COIN CASE can be used at the\n" + .string "GAME CORNER.$" + +MauvilleCity_House2_Text_182578:: @ 8182578 + .string "Oh, that’s disappointing.\p" + .string "A COIN CASE is needed for the\n" + .string "GAME CORNER.$" diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc index cb8397726..cb8397726 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/MauvilleCity_Mart/events.inc diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 7712e16df..169089f69 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,9 +1,9 @@ MauvilleCity_Mart:: @ 8306210 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc new file mode 100644 index 000000000..0dd66eddf --- /dev/null +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -0,0 +1,38 @@ +MauvilleCity_Mart_MapScripts:: @ 81573BD + .byte 0 + +MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE + lock + faceplayer + message MauvilleCity_Mart_Text_1A0BE4 + waitmessage + pokemart MauvilleCity_Mart_Items + msgbox MauvilleCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +MauvilleCity_Mart_Items:: @ 81573D8 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT + .2byte ITEM_X_ACCURACY + .2byte ITEM_NONE + release + end + +MauvilleCity_Mart_EventScript_1573F4:: @ 81573F4 + msgbox MauvilleCity_Mart_Text_1827D3, 2 + end + +MauvilleCity_Mart_EventScript_1573FD:: @ 81573FD + msgbox MauvilleCity_Mart_Text_18287F, 2 + end diff --git a/data/maps/MauvilleCity_Mart/text.inc b/data/maps/MauvilleCity_Mart/text.inc new file mode 100644 index 000000000..6b8f6c002 --- /dev/null +++ b/data/maps/MauvilleCity_Mart/text.inc @@ -0,0 +1,13 @@ +MauvilleCity_Mart_Text_1827D3:: @ 81827D3 + .string "There are items that temporarily\n" + .string "elevate the stats of POKéMON.\p" + .string "The ones I know you use in battle\n" + .string "are X ATTACK and X DEFEND...\p" + .string "I do believe that there are others\n" + .string "like them.$" + +MauvilleCity_Mart_Text_18287F:: @ 818287F + .string "Use a certain move, or use an item\n" + .string "instead...\p" + .string "The TRAINER’s decisions determine how\n" + .string "battles turn out, I think.$" diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index 30f702a6f..30f702a6f 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index b6e0a1628..74cc8bfe2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..85590f9c2 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,33 @@ +MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 + map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_157357 + .byte 0 + +MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 + setrespawn 5 + call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B + goto MauvilleCity_PokemonCenter_1F_EventScript_157365 + end + +MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 + special sub_80F83D0 + end + +MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 + setvar VAR_SPECIAL_B, 1 + call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_157377:: @ 8157377 + msgbox MauvilleCity_PokemonCenter_1F_Text_1825BD, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_157380:: @ 8157380 + msgbox MauvilleCity_PokemonCenter_1F_Text_182622, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_157389:: @ 8157389 + msgbox MauvilleCity_PokemonCenter_1F_Text_1826A6, 2 + end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/text.inc b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..c4287cda3 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc @@ -0,0 +1,18 @@ +MauvilleCity_PokemonCenter_1F_Text_1825BD:: @ 81825BD + .string "That man over there, he says weird\n" + .string "things!\p" + .string "He’s funny in a weird way.\n" + .string "I doubt I’ll forget about him!$" + +MauvilleCity_PokemonCenter_1F_Text_182622:: @ 8182622 + .string "When I accessed the RECORD CORNER,\n" + .string "the data for what’s hot in DEWFORD\l" + .string "got updated.\p" + .string "Now that bit of data is the same\n" + .string "as my friend’s!$" + +MauvilleCity_PokemonCenter_1F_Text_1826A6:: @ 81826A6 + .string "A RECORD CORNER opened upstairs in\n" + .string "the POKéMON CENTER.\p" + .string "I don’t know what it’s about, but it\n" + .string "sounds fun. I’ll go check it out!$" diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index aef1d63ed..aef1d63ed 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 8787c975e..fd7bf6a2d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..e85e80308 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,21 @@ +MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8157392 + map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +MauvilleCity_PokemonCenter_2F_EventScript_1573A2:: @ 81573A2 + call MauvilleCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +MauvilleCity_PokemonCenter_2F_EventScript_1573A8:: @ 81573A8 + call MauvilleCity_PokemonCenter_2F_EventScript_1A40CC + end + +MauvilleCity_PokemonCenter_2F_EventScript_1573AE:: @ 81573AE + call MauvilleCity_PokemonCenter_2F_EventScript_1A41FB + end + +MauvilleCity_PokemonCenter_2F_EventScript_1573B4:: @ 81573B4 + msgbox MauvilleCity_PokemonCenter_2F_Text_182724, 2 + end diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/text.inc b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc new file mode 100644 index 000000000..1e67948a5 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc @@ -0,0 +1,7 @@ +MauvilleCity_PokemonCenter_2F_Text_182724:: @ 8182724 + .string "Did you know that you can link battle\n" + .string "at the COLOSSEUM here?\p" + .string "They put up your record on the wall\n" + .string "for everyone to see.\p" + .string "It’s embarrassing if you lose more\n" + .string "often than you win...$" diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/maps/MeteorFalls_1F_1R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_1F_1R/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 0b85c4e98..0b85c4e98 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index dcb3fbbde..506463120 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,9 +1,9 @@ MeteorFalls_1F_1R:: @ 8306D70 - .4byte MeteorFalls_1F_1R_MapAttributes + .4byte MeteorFalls_1F_1R_Layout .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 126 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/maps/MeteorFalls_1F_1R/map.bin deleted file mode 100644 index bcfb05fd2..000000000 --- a/data/maps/MeteorFalls_1F_1R/map.bin +++ /dev/null @@ -1 +0,0 @@ -4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tuDDD\DDEFGDnoDDDDDDtuDDDDno<42222242DMN2ODvwDDD<22222242vw<42222
242222242(<222222422<422222?2>2>2>2>2?2ppp(<222222?222<42222422ppp(<222224222<42222?2pppppppp(<2222242222<4>2>2>2?2ppppppppp(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/.DDfgDDDdeD2D<4lmDDDD/.DDnoDDDlmD2D<4tuDDDD/.LDnoDDDtuD2D<42242DD/.TDnoDD<2222<42242*D/LLLLLLLL.\DvwD(<22222<4>2>2?2*TTTTTTTTZ[22((=2>2>2>2>2<422ppppppppppXY(<4>2>2>2?2pppp8pBqBqBqBqBrB9pp(<BBBBB<42pppx(<BBBBB4B`BaaabB<BBBBBB<42222ppp<B4BhBiiijB=B3}~<42222 2 2 2 2 22222(<B4B*q0(<<4222222222222(<B4B*p((=>>><42>2>2>2>2>2>222222(=B?B*pp(01111<4>2?2LDD2Dde<2222272yp011111<4fgTDD2Dlm=2>2>2?2DLDD/.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\DD/.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/.DEFGT<4)2)2)2U2V2W2)2)2)2)2)2)2**D/.DMN2O\<411]^_1111212**/LLL.<2222<4*)2U2W2U2V2V2W2)2)2)2)2)2***TTT(<222<42]_]^^_112112**ppp(<2222<41U2V2V2V2W2U2W2)2)2)2 )**ppp(<2222<41]^^^_]_121112*ppp(<2222<4*U2W2U2V2V2W2U2V2W2)2)2)2)2 *ppp(<2222<4*]_]^^_]^_)222)22pPQ(=222<4*U2V2V2V2W2U2V2V2W2)222)2*pXY0=2>2<4*]^^^_]^^_21112pppp0111<4*)2)2)2)2)2)2)2)2)2)2)2)2 )2pppppZ[<42)2)2)2$2)2)2)2)2)2)2)2)2 6)2ppppPQppXY<4XXYHIJY")2)2)2)2)2)2 6ppppXYpppp<6666666666666666666666666666
\ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc new file mode 100644 index 000000000..ee2c5b1dc --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -0,0 +1,227 @@ +MeteorFalls_1F_1R_MapScripts:: @ 815C490 + map_script 3, MeteorFalls_1F_1R_MapScript1_15C496 + .byte 0 + +MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 + call MeteorFalls_1F_1R_EventScript_1A0196 + end + +MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C + lockall + applymovement 255, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 + delay 30 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_193237, 4 + closemessage + applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 + applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 + waitmovement 0 + playse SE_PIN + applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_193268, 4 + closemessage + applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_1932C5, 4 + closemessage + applymovement 255, MeteorFalls_1F_1R_Movement_1A083F + applymovement 5, MeteorFalls_1F_1R_Movement_1A083F + applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 + addobject 7 + addobject 8 + addobject 9 + applymovement 7, MeteorFalls_1F_1R_Movement_15C608 + applymovement 8, MeteorFalls_1F_1R_Movement_15C60F + applymovement 9, MeteorFalls_1F_1R_Movement_15C617 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A083F + applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_193320, 4 + closemessage + applymovement 255, MeteorFalls_1F_1R_Movement_15C64F + applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 + applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC + waitmovement 0 + removeobject 5 + removeobject 6 + applymovement 7, MeteorFalls_1F_1R_Movement_15C628 + waitmovement 0 + .ifdef SAPPHIRE + msgbox MeteorFalls_1F_1R_Text_1933EC, 4 + .else + msgbox MeteorFalls_1F_1R_Text_193584, 4 + .endif + closemessage + applymovement 8, MeteorFalls_1F_1R_Movement_15C639 + applymovement 9, MeteorFalls_1F_1R_Movement_15C64A + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_193720, 4 + applymovement 7, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_193747, 4 + applymovement 7, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 + msgbox MeteorFalls_1F_1R_Text_1937AA, 4 + closemessage + applymovement 7, MeteorFalls_1F_1R_Movement_15C61F + applymovement 8, MeteorFalls_1F_1R_Movement_15C62E + applymovement 9, MeteorFalls_1F_1R_Movement_15C63E + waitmovement 0 + removeobject 7 + removeobject 8 + removeobject 9 + setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + setvar VAR_METEOR_FALLS_STATE, 1 + releaseall + end + +MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left + end_movement + +MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C639:: @ 815C639 + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F + walk_in_place_fastest_down + delay_4 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + end_movement + +MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 + lock + faceplayer + goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E + setflag FLAG_MET_PROF_COSMO + msgbox MeteorFalls_1F_1R_Text_1937EB, 4 + release + end + +MeteorFalls_1F_1R_EventScript_15C66E:: @ 815C66E + msgbox MeteorFalls_1F_1R_Text_19396A, 4 + release + end diff --git a/data/maps/MeteorFalls_1F_1R/text.inc b/data/maps/MeteorFalls_1F_1R/text.inc new file mode 100644 index 000000000..ad19e3e0b --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/text.inc @@ -0,0 +1,93 @@ +MeteorFalls_1F_1R_Text_193237:: @ 8193237 + .string "Hehehe!\p" + .string "With this METEORITE, MT. CHIMNEY\n" + .string "will...$" + +MeteorFalls_1F_1R_Text_193268:: @ 8193268 + .string "Heh?\p" + .string "I don’t know who you are, but if you get\n" + .string "in the way of TEAM {EVIL_TEAM}, don’t\l" + .string "expect any mercy!$" + +MeteorFalls_1F_1R_Text_1932C5:: @ 81932C5 + .string "Hold it right there, TEAM {EVIL_TEAM}!\p" + .string "We, TEAM {GOOD_TEAM}, won’t allow you to\n" + .string "get away with your misdeeds!$" + +MeteorFalls_1F_1R_Text_193320:: @ 8193320 + .string "Hehehe!\n" + .string "Even TEAM {GOOD_TEAM} joins us!\p" + .string "But it’s too much trouble to deal with\n" + .string "you all...\p" + .string "Heh, it doesn’t matter!\p" + .string "We’ve got the METEORITE, so off to\n" + .string "MT. CHIMNEY we go!\p" + .string "Hehehe! Be seeing you, you TEAM\n" + .string "{GOOD_TEAM} dingbats!$" + +MeteorFalls_1F_1R_Text_1933EC:: @ 81933EC + .string "And you are?\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "Fine, so you are {PLAYER}{KUN}.\p" + .string "I am MAXIE. As the head of TEAM MAGMA,\n" + .string "I have dedicated myself to thwarting\l" + .string "the dangerous plans of TEAM AQUA.\p" + .string "Why? Because TEAM AQUA is a grave\n" + .string "threat to us all.\p" + .string "They have committed many destructive\n" + .string "acts in their bid to enlarge the sea.\p" + .string "We, TEAM MAGMA, love dry land above\n" + .string "all! TEAM AQUA is our sworn enemy!$" + +MeteorFalls_1F_1R_Text_193584:: @ 8193584 + .string "Who might you be?\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "Ah, so you are {PLAYER}{KUN}.\p" + .string "I am ARCHIE. As the head of TEAM AQUA,\n" + .string "I have dedicated myself to thwarting\l" + .string "the dangerous plans of TEAM MAGMA.\p" + .string "Why? Because TEAM MAGMA is a grave\n" + .string "threat to us all.\p" + .string "They have committed many destructive\n" + .string "acts in their bid to expand the land.\p" + .string "We, TEAM AQUA, love the sea above\n" + .string "all! TEAM MAGMA is our sworn enemy!$" + +MeteorFalls_1F_1R_Text_193720:: @ 8193720 + .string "{GOOD_LEADER}, we should give chase to\n" + .string "TEAM {EVIL_TEAM}...$" + +MeteorFalls_1F_1R_Text_193747:: @ 8193747 + .string "{GOOD_LEADER}: Yes, yes, we must!\n" + .string "We’ve got to hurry.\p" + .string "There’s no telling what TEAM {EVIL_TEAM}\n" + .string "will do at MT. CHIMNEY!$" + +MeteorFalls_1F_1R_Text_1937AA:: @ 81937AA + .string "{GOOD_LEADER}: {PLAYER}{KUN}, you should keep\n" + .string "an eye out for TEAM {EVIL_TEAM}, too.\p" + .string "Farewell!$" + +MeteorFalls_1F_1R_Text_1937EB:: @ 81937EB + .string "I... I’m COZMO...\n" + .string "I’m a PROFESSOR...\p" + .string "I usually study METEORITES in\n" + .string "FALLARBOR TOWN...\p" + .string "Then some people from TEAM {EVIL_TEAM}\n" + .string "made me guide them to METEOR FALLS...\p" + .string "They promised me that they would\n" + .string "excavate METEORITES for me...\p" + .string "But, I...\n" + .string "TEAM {EVIL_TEAM} tricked me...\p" + .string "Oh... That METEORITE...\n" + .string "It will never be mine now...\p" + .string "But that TEAM {EVIL_TEAM}...\p" + .string "What are they going to do with that\n" + .string "METEORITE at MT. CHIMNEY?$" + +MeteorFalls_1F_1R_Text_19396A:: @ 819396A + .string "PROF. COZMO: That TEAM {EVIL_TEAM}...\p" + .string "What are they going to do with that\n" + .string "METEORITE at MT. CHIMNEY?$" diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/maps/MeteorFalls_1F_2R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_1F_2R/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 5264fcb5e..5264fcb5e 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 0d9d797aa..f46645b7e 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,9 +1,9 @@ MeteorFalls_1F_2R:: @ 8306D8C - .4byte MeteorFalls_1F_2R_MapAttributes + .4byte MeteorFalls_1F_2R_Layout .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 127 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/maps/MeteorFalls_1F_2R/map.bin deleted file mode 100644 index cea93a39b..000000000 --- a/data/maps/MeteorFalls_1F_2R/map.bin +++ /dev/null @@ -1,2 +0,0 @@ ->>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2U2V2V2W2U2W2=>>01111111111212111]^^_]_11=>>>>>11111112>2>2>2>2>2U2W2U2V2V2V2W2=01111114112111]_]^^^_1111<>>>>?*>2>2>2>2>2U2V2W2U2W2U2V2V2W2=>>(<4111121211]^_]_]^^_11(<4*11112>2>2>2U2W2U2V2V2W22U2V2V2W2=((=>4**4111121]_]^^_]^^_(01<4**?2222222U2V2V2W2222222011(<4**2222222]^^_2U2W2U2V2W2=>((<4**
22222U2V2V2W2222]_]^_1((<4**2222]^^_2222222(((<4** -2222222<42U2W2U2V2V2W2(((<4**>?2222U2V2W2=?2]_]^^_(((<4**?22]^_2222222(((<4**?22222222222222222(((<4**22
2222222222222222(((<4**22222Z[22222222223(<4**pXY222222(<(<4**pppppPQpppp2222
22((34**dQppPQXYpppp222222(((<4**lYPQXYpppppp222222(((<4**pXYppppp6262622223((<4**pppppppp222222(<((<4**pp626262626262222222(<3(<4**pp222222222222(<(<34**kzqqzk}Q(<(<66
\ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc new file mode 100644 index 000000000..49d629294 --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -0,0 +1,41 @@ +MeteorFalls_1F_2R_MapScripts:: @ 815C678 + .byte 0 + +MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 + trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 + msgbox MeteorFalls_1F_2R_Text_193A60, 6 + end + +MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 + trainerbattle 5, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + msgbox MeteorFalls_1F_2R_Text_193B4C, 6 + end + +MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 + trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 + msgbox MeteorFalls_1F_2R_Text_193C35, 6 + end + +MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 + trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + msgbox MeteorFalls_1F_2R_Text_193EF3, 6 + end + +MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD + trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 + msgbox MeteorFalls_1F_2R_Text_193D9A, 6 + end + +MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 + trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + msgbox MeteorFalls_1F_2R_Text_194066, 6 + end diff --git a/data/maps/MeteorFalls_1F_2R/text.inc b/data/maps/MeteorFalls_1F_2R/text.inc new file mode 100644 index 000000000..35b60d662 --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/text.inc @@ -0,0 +1,113 @@ +MeteorFalls_1F_2R_Text_1939C5:: @ 81939C5 + .string "This is where we DRAGON users do our\n" + .string "training.\p" + .string "The CHAMPION even visits.\n" + .string "Now do you see how special it is here?$" + +MeteorFalls_1F_2R_Text_193A35:: @ 8193A35 + .string "Urgh!\n" + .string "I didn’t expect you to be so strong!$" + +MeteorFalls_1F_2R_Text_193A60:: @ 8193A60 + .string "The road ahead remains long and harsh.\p" + .string "When will my POKéMON and I become the\n" + .string "best?$" + +MeteorFalls_1F_2R_Text_193AB3:: @ 8193AB3 + .string "Since we met, we have trained hard\n" + .string "with our sights on number one.\p" + .string "Help us see how much stronger we’ve\n" + .string "become!$" + +MeteorFalls_1F_2R_Text_193B21:: @ 8193B21 + .string "Urgh!\n" + .string "I didn’t expect you to be so strong!$" + +MeteorFalls_1F_2R_Text_193B4C:: @ 8193B4C + .string "You’ve obviously kept up your\n" + .string "POKéMON training.\p" + .string "So long as you remain strong, I, too,\n" + .string "can become stronger!$" + +MeteorFalls_1F_2R_Text_193BB7:: @ 8193BB7 + .string "JOHN: We’ve always battled POKéMON\n" + .string "together as a twosome.\l" + .string "We’ve confidence in ourselves.$" + +MeteorFalls_1F_2R_Text_193C10:: @ 8193C10 + .string "JOHN: Oh, my.\n" + .string "We’ve lost, dear wife.$" + +MeteorFalls_1F_2R_Text_193C35:: @ 8193C35 + .string "JOHN: We’ve been married for\n" + .string "fifty years.\p" + .string "Come to think of it, I’ve yet to beat\n" + .string "my dear wife in a battle.$" + +MeteorFalls_1F_2R_Text_193C9F:: @ 8193C9F + .string "JOHN: Well, well, what a young TRAINER!\p" + .string "Will you battle with us? If so, you’ll\n" + .string "have to return with more POKéMON.$" + +MeteorFalls_1F_2R_Text_193D10:: @ 8193D10 + .string "JAY: We’ve been married for\n" + .string "fifty years.\p" + .string "The bond we share as a couple could\n" + .string "never be broken.$" + +MeteorFalls_1F_2R_Text_193D6E:: @ 8193D6E + .string "JAY: Oh, dear.\n" + .string "We’ve lost, my dear husband.$" + +MeteorFalls_1F_2R_Text_193D9A:: @ 8193D9A + .string "JAY: Fifty years of marriage...\p" + .string "If we ever argued, we always settled\n" + .string "it with a POKéMON battle...$" + +MeteorFalls_1F_2R_Text_193DFB:: @ 8193DFB + .string "JAY: Well, well, aren’t you a young\n" + .string "TRAINER?\p" + .string "If you’d care to battle with us, you’ll\n" + .string "have to come back with more POKéMON.$" + +MeteorFalls_1F_2R_Text_193E75:: @ 8193E75 + .string "JOHN: We’ve always battled POKéMON\n" + .string "together as a twosome.\l" + .string "We’ve confidence in ourselves.$" + +MeteorFalls_1F_2R_Text_193ECE:: @ 8193ECE + .string "JOHN: Oh, my.\n" + .string "We’ve lost, dear wife.$" + +MeteorFalls_1F_2R_Text_193EF3:: @ 8193EF3 + .string "JOHN: Married for fifty years...\p" + .string "On reflection, the dear wife and I,\n" + .string "we battled day in and day out...$" + +MeteorFalls_1F_2R_Text_193F59:: @ 8193F59 + .string "JOHN: Well, well, what a young\n" + .string "TRAINER!\p" + .string "Will you battle with us? If so, you’ll\n" + .string "have to return with more POKéMON.$" + +MeteorFalls_1F_2R_Text_193FCA:: @ 8193FCA + .string "JAY: We’ve been married for\n" + .string "fifty years.\p" + .string "We’ve supported each other all that\n" + .string "time. We’ve made ourselves strong.$" + +MeteorFalls_1F_2R_Text_19403A:: @ 819403A + .string "JAY: Oh, dear.\n" + .string "We’ve lost, my dear husband.$" + +MeteorFalls_1F_2R_Text_194066:: @ 8194066 + .string "JAY: Fifty years of marriage...\n" + .string "Many things have happened.\p" + .string "I hope that we will continue to make\n" + .string "happy memories together.$" + +MeteorFalls_1F_2R_Text_1940DF:: @ 81940DF + .string "JAY: Well, well, aren’t you a young\n" + .string "TRAINER?\p" + .string "If you’d care to battle with us, you’ll\n" + .string "have to come back with more POKéMON.$" diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/maps/MeteorFalls_B1F_1R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_B1F_1R/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc index 053c932ce..053c932ce 100644 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ b/data/maps/MeteorFalls_B1F_1R/events.inc diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index f67ab9ea7..6e34052ce 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,9 +1,9 @@ MeteorFalls_B1F_1R:: @ 8306DA8 - .4byte MeteorFalls_B1F_1R_MapAttributes + .4byte MeteorFalls_B1F_1R_Layout .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 128 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/maps/MeteorFalls_B1F_1R/map.bin deleted file mode 100644 index a37afdb17..000000000 --- a/data/maps/MeteorFalls_B1F_1R/map.bin +++ /dev/null @@ -1,6 +0,0 @@ ->>>>>>>>>>>>>>>?DDDDDDDDDD=>>>4DDDD/DDDEFGDDDD.DD<?DDD/DDDMN2ODDDD.D(<411111D/22222222.((<4*11c11B*222222222(((<4*BB BBBBB*2222222222p(((<4*BBBBBB*p(((<4*BBBBBB*ppppppppppp((=4*BBRRR -*ppppppppppp((0<4*BB<R4R*ppppppppppp0(<4*BB<R R4R*pppBqBqBqBqB pp0((<4*BB<RR4R*px(<B -*yp((<4*BB=R>R?R*p(<B=?*pp(<4*BB1*p(<Bc*pp(<4*BBB211p(<BBB BB*pp(<4*BBB222p(<BBBBB*pp(<4*BBB222pp(<BBBBB*pp(<4*BBB222pp(<BBBB*pp(<4*BBBBBBkBzBqBqBzBkBBBB12pp(<4*BBBBBBBBBBBBBBB*pp(<4*6RRRRRRRR -BBBBB>BB*pppp(<4*RRRRRR4RBBBBB12pppp(<4R RRRRR>R?RBBBBB*pppp(<4RRR4RBBBBB*pppppp(<4RRRR4RBBBBBBB*pppppp(<4RRRR4RBBBBBBB2pppppxk(<6 -B*ppppx(<(<R4 -*ppppp(<(<R4*ppppp(<(<R4*ppppp(<R4*ppppp(<<R4*ppppp(<<R4*ppppp(<<R4* 2 2 2 2 2 2 2<<R4*222222<<R4*222222<<R66}~
\ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_1R/scripts.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc new file mode 100644 index 000000000..57d458b23 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc @@ -0,0 +1,2 @@ +MeteorFalls_B1F_1R_MapScripts:: @ 815C743 + .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/maps/MeteorFalls_B1F_2R/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MeteorFalls_B1F_2R/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 964a6c447..964a6c447 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 779e6d23a..487cf19e9 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,9 +1,9 @@ MeteorFalls_B1F_2R:: @ 8306DC4 - .4byte MeteorFalls_B1F_2R_MapAttributes + .4byte MeteorFalls_B1F_2R_Layout .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 - .2byte BGM_DAN03 + .2byte MUS_DAN03 .2byte 129 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/maps/MeteorFalls_B1F_2R/map.bin deleted file mode 100644 index 5f4497752..000000000 --- a/data/maps/MeteorFalls_B1F_2R/map.bin +++ /dev/null @@ -1 +0,0 @@ ->>>>>>>>>41111111<4*11111(<4**22222((<4**22222((<4**((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4** 2 2 2 2 2((<4**22222((<4*}~(<
\ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_2R/scripts.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc new file mode 100644 index 000000000..514e60966 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc @@ -0,0 +1,2 @@ +MeteorFalls_B1F_2R_MapScripts:: @ 815C744 + .byte 0 diff --git a/data/maps/MossdeepCity/border.bin b/data/maps/MossdeepCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/MossdeepCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc index 4803f9347..4803f9347 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/MossdeepCity/events.inc diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 26b3e1db0..93aeb648a 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,9 +1,9 @@ MossdeepCity:: @ 83054F0 - .4byte MossdeepCity_MapAttributes + .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 7 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity/map.bin b/data/maps/MossdeepCity/map.bin Binary files differdeleted file mode 100644 index 29b167286..000000000 --- a/data/maps/MossdeepCity/map.bin +++ /dev/null diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc new file mode 100644 index 000000000..7ec338927 --- /dev/null +++ b/data/maps/MossdeepCity/scripts.inc @@ -0,0 +1,90 @@ +MossdeepCity_MapScripts:: @ 814CF92 + map_script 3, MossdeepCity_MapScript1_14CF98 + .byte 0 + +MossdeepCity_MapScript1_14CF98:: @ 814CF98 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1 + end + +MossdeepCity_EventScript_14CFAE:: @ 814CFAE + msgbox MossdeepCity_Text_169266, 2 + end + +MossdeepCity_EventScript_14CFB7:: @ 814CFB7 + msgbox MossdeepCity_Text_1692A1, 2 + end + +MossdeepCity_EventScript_14CFC0:: @ 814CFC0 + msgbox MossdeepCity_Text_1691F2, 2 + end + +MossdeepCity_EventScript_14CFC9:: @ 814CFC9 + msgbox MossdeepCity_Text_169370, 2 + end + +MossdeepCity_EventScript_14CFD2:: @ 814CFD2 + msgbox MossdeepCity_Text_169314, 2 + end + +MossdeepCity_EventScript_14CFDB:: @ 814CFDB + msgbox MossdeepCity_Text_1694DA, 2 + end + +MossdeepCity_EventScript_14CFE4:: @ 814CFE4 + msgbox MossdeepCity_Text_1695D3, 3 + end + +MossdeepCity_EventScript_14CFED:: @ 814CFED + msgbox MossdeepCity_Text_1695E6, 3 + end + +MossdeepCity_EventScript_14CFF6:: @ 814CFF6 + msgbox MossdeepCity_Text_16962F, 3 + end + +MossdeepCity_EventScript_14CFFF:: @ 814CFFF + msgbox MossdeepCity_Text_16965C, 3 + end + +MossdeepCity_EventScript_14D008:: @ 814D008 + setflag FLAG_VISITED_MOSSDEEP_CITY + setvar VAR_TEMP_1, 1 + end + +MossdeepCity_EventScript_14D011:: @ 814D011 + lock + faceplayer + msgbox MossdeepCity_Text_16944E, 4 + applymovement LAST_TALKED, MossdeepCity_Movement_1A083D + waitmovement 0 + release + end + +MossdeepCity_EventScript_14D027:: @ 814D027 + lock + faceplayer + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 + msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MossdeepCity_EventScript_14D073 + msgbox MossdeepCity_Text_169117, 4 + giveitem_std ITEM_KINGS_ROCK + compare RESULT, 0 + goto_if_eq MossdeepCity_EventScript_1A029B + setflag FLAG_RECEIVED_KINGS_ROCK + release + end + +MossdeepCity_EventScript_14D069:: @ 814D069 + msgbox MossdeepCity_Text_16916F, 4 + release + end + +MossdeepCity_EventScript_14D073:: @ 814D073 + msgbox MossdeepCity_Text_1691A7, 4 + release + end diff --git a/data/maps/MossdeepCity/text.inc b/data/maps/MossdeepCity/text.inc new file mode 100644 index 000000000..9bdcf3b3c --- /dev/null +++ b/data/maps/MossdeepCity/text.inc @@ -0,0 +1,84 @@ +MossdeepCity_Text_1690A9:: @ 81690A9 + .string "I got this from STEVEN, but I don’t\n" + .string "know what it’s good for.\p" + .string "I think it’s called KING’S ROCK.\n" + .string "Do you want it?$" + +MossdeepCity_Text_169117:: @ 8169117 + .string "Why would you want it?\n" + .string "You’re weird.\p" + .string "You can keep it, but keep it a secret\n" + .string "from STEVEN.$" + +MossdeepCity_Text_16916F:: @ 816916F + .string "Is it really that fun collecting\n" + .string "rocks? I don’t get it.$" + +MossdeepCity_Text_1691A7:: @ 81691A7 + .string "Yeah, you think so, too! What are you\n" + .string "supposed to do with some weird rock?$" + +MossdeepCity_Text_1691F2:: @ 81691F2 + .string "Around MOSSDEEP, you can see wild\n" + .string "WAILMER.\p" + .string "It’s called, uh...\n" + .string "What was it now...\p" + .string "WAI, WAI, WAI...\p" + .string "WAILMER watching!$" + +MossdeepCity_Text_169266:: @ 8169266 + .string "The island’s SPACE CENTER has been\n" + .string "launching huge rockets.$" + +MossdeepCity_Text_1692A1:: @ 81692A1 + .string "I’d heard from my mates in LILYCOVE\n" + .string "that the herd of WAILMER has\l" + .string "disappeared.\p" + .string "What went down over there, I wonder?$" + +MossdeepCity_Text_169314:: @ 8169314 + .string "Wouldn’t it be nice?\p" + .string "If the whole world was covered in\n" + .string "plants and flowers like this island?$" + +MossdeepCity_Text_169370:: @ 8169370 + .string "All life needs the sea to live, even\n" + .string "though it makes its home on the land.\p" + .string "Life, having run its course, becomes\n" + .string "soil and returns to the land.\p" + .string "And the sea is always connected to\n" + .string "the land.\p" + .string "Yes, like the very shoreline here.$" + +MossdeepCity_Text_16944E:: @ 816944E + .string "A voyage on a ship is fine.\p" + .string "But crossing the sea with POKéMON\n" + .string "using SURF...\p" + .string "Now that’s an exhilarating trip!\n" + .string "Wouldn’t you agree, youngster?$" + +MossdeepCity_Text_1694DA:: @ 81694DA + .string "This rock has a special meaning to\n" + .string "the people at the SPACE CENTER.\p" + .string "They put it here as their wish for\n" + .string "their rockets to fly safely.\p" + .string "When you make a wish, what do you use?\n" + .string "Do you wish upon a star?\p" + .string "I use a wish tag to make it happen.\n" + .string "That’s what I do.$" + +MossdeepCity_Text_1695D3:: @ 81695D3 + .string "It’s a white rock.$" + +MossdeepCity_Text_1695E6:: @ 81695E6 + .string "MOSSDEEP CITY POKéMON GYM\n" + .string "LEADERS: LIZA & TATE\p" + .string "“The mystic combination!”$" + +MossdeepCity_Text_16962F:: @ 816962F + .string "MOSSDEEP CITY\n" + .string "“Our slogan: Cherish POKéMON!”$" + +MossdeepCity_Text_16965C:: @ 816965C + .string "MOSSDEEP SPACE CENTER\n" + .string "“The closest place to space.”$" diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/maps/MossdeepCity_GameCorner_1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/border.bin +++ /dev/null diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 2d10740b1..2d10740b1 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d96d383ea..dc11469e0 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,9 +1,9 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 - .4byte MossdeepCity_GameCorner_1F_MapAttributes + .4byte MossdeepCity_GameCorner_1F_Layout .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 306 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/maps/MossdeepCity_GameCorner_1F/map.bin deleted file mode 100644 index bad63f412..000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -0no -2
hvw22$2$2$2$2$282p2~2292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#292#2#2#2#2#2#2#2#2"2"292#2#2 #2#2#2#2**
\ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc new file mode 100644 index 000000000..4d9989d82 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -0,0 +1,186 @@ +MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 + map_script 1, MossdeepCity_GameCorner_1F_MapScript1_15AC62 + map_script 3, MossdeepCity_GameCorner_1F_MapScript1_15AC84 + map_script 2, MossdeepCity_GameCorner_1F_MapScript2_15ACBB + .byte 0 + +MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 + special ValidateEReaderTrainer + compare RESULT, 1 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71 + end + +MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 + setmetatile 3, 0, 653, 1 + setmetatile 3, 1, 661, 1 + return + +MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 + special ValidateEReaderTrainer + compare RESULT, 0 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E + compare VAR_GAME_CORNER_STATE, 0 + call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF + end + +MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E + setvar VAR_TEMP_1, 1 + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 8 + return + +MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF + setobjectxyperm 1, 2, 2 + setobjectmovementtype 1, 10 + return + +MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB + map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + .2byte 0 + +MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 + lockall + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D + waitmovement 0 + applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F + waitmovement 0 + moveobjectoffscreen 1 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 + waitmovement 0 + compare VAR_GAME_CORNER_STATE, 1 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22 + compare VAR_GAME_CORNER_STATE, 2 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B + compare VAR_GAME_CORNER_STATE, 3 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34 + special LoadPlayerParty + setvar VAR_GAME_CORNER_STATE, 0 + releaseall + end + +MossdeepCity_GameCorner_1F_EventScript_15AD22:: @ 815AD22 + msgbox MossdeepCity_GameCorner_1F_Text_18E80E, 4 + return + +MossdeepCity_GameCorner_1F_EventScript_15AD2B:: @ 815AD2B + msgbox MossdeepCity_GameCorner_1F_Text_18E859, 4 + return + +MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34 + msgbox MossdeepCity_GameCorner_1F_Text_18E7B1, 4 + return + +MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D + walk_down + end_movement + +MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F + walk_right + walk_in_place_fastest_down + end_movement + +MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 + lock + faceplayer + compare VAR_TEMP_1, 1 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 + msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 + release + end + +MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 + special SavePlayerParty + special BufferEReaderTrainerName + msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + call MossdeepCity_GameCorner_1F_EventScript_15ADF5 + compare RESULT, 0 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO + compare RESULT, NO + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + special LoadPlayerParty + call S_DoSaveDialog + compare RESULT, 0 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + erasebox 0, 0, 15, 10 + special SavePlayerParty + special ReducePlayerPartyToThree + msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 + closemessage + compare FACING, 2 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04 + compare FACING, 4 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16 + compare FACING, 3 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 + waitstate + release + end + +MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8 + special LoadPlayerParty + msgbox MossdeepCity_GameCorner_1F_Text_18E698, 4 + release + end + +MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 + msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, 4 + fadescreen 1 + special sub_80C5568 + waitstate + return + +MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A + waitmovement 0 + return + +MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E + waitmovement 0 + return + +MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42 + waitmovement 0 + return + +MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A + delay_16 + walk_up + walk_up + end_movement + +MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E + delay_16 + walk_right + walk_up + end_movement + +MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42 + delay_16 + walk_left + walk_up + end_movement + +MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46 + walk_left + walk_in_place_fastest_right + end_movement + +MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49 + walk_right + walk_in_place_fastest_left + end_movement + +MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C + msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3 + end diff --git a/data/maps/MossdeepCity_GameCorner_1F/text.inc b/data/maps/MossdeepCity_GameCorner_1F/text.inc new file mode 100644 index 000000000..7324999c8 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/text.inc @@ -0,0 +1,59 @@ +MossdeepCity_GameCorner_1F_Text_18E59A:: @ 818E59A + .string "When I was young, I traveled the world\n" + .string "as a POKéMON TRAINER.\p" + .string "Now that I’ve become an old buzzard,\n" + .string "my only amusement is watching young\l" + .string "TRAINERS battle.$" + +MossdeepCity_GameCorner_1F_Text_18E631:: @ 818E631 + .string "The door appears to be locked.$" + +MossdeepCity_GameCorner_1F_Text_18E650:: @ 818E650 + .string "A TRAINER named {STR_VAR_1} is\n" + .string "visiting my home.\p" + .string "Would you like to challenge\n" + .string "{STR_VAR_1}?$" + +MossdeepCity_GameCorner_1F_Text_18E698:: @ 818E698 + .string "You won’t battle? I’m disappointed\n" + .string "that I can’t see you battle...$" + +MossdeepCity_GameCorner_1F_Text_18E6DA:: @ 818E6DA + .string "Oh, good, good!\p" + .string "But my house isn’t all that sturdy.\p" + .string "Could I ask you to keep it down to\n" + .string "a 3-on-3 match?$" + +MossdeepCity_GameCorner_1F_Text_18E741:: @ 818E741 + .string "Before you two battle, you should\n" + .string "save your progress.$" + +MossdeepCity_GameCorner_1F_Text_18E777:: @ 818E777 + .string "I hope to see a good match!$" + +UnknownString_818E793: @ 818E793 + .string "{STR_VAR_1}$" + +MossdeepCity_GameCorner_B1F_Text_18E796:: @ 818E796 + .string "The match ended up a draw.$" + +MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 + .string "So, it became a standoff.\p" + .string "It was a brilliant match in which\n" + .string "neither side conceded a step!$" + +UnknownString_818E80B: @ 818E80B + .string "{STR_VAR_1}$" + +MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E + .string "That was superlative!\p" + .string "Why, it was like seeing myself in my\n" + .string "youth again!$" + +UnknownString_818E856: @ 818E856 + .string "{STR_VAR_1}$" + +MossdeepCity_GameCorner_1F_Text_18E859:: @ 818E859 + .string "Ah, too bad for you!\p" + .string "But it was a good match.\n" + .string "I hope you can win next time.$" diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/maps/MossdeepCity_GameCorner_B1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin +++ /dev/null diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index da6316421..da6316421 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 7692281f0..fd8e210cc 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,9 +1,9 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 - .4byte MossdeepCity_GameCorner_B1F_MapAttributes + .4byte MossdeepCity_GameCorner_B1F_Layout .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 307 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/maps/MossdeepCity_GameCorner_B1F/map.bin deleted file mode 100644 index 399d05705..000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -
-
6$2$2$2$2$2$2$2$2$2$2692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#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*
\ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc new file mode 100644 index 000000000..0af775590 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -0,0 +1,77 @@ +MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55 + map_script 3, MossdeepCity_GameCorner_B1F_MapScript1_15AE60 + map_script 2, MossdeepCity_GameCorner_B1F_MapScript2_15AE64 + .byte 0 + +MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 + special SetEReaderTrainerGfxId + end + +MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 + map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E + .2byte 0 + +MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E + lockall + applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 + waitmovement 0 + special PrintEReaderTrainerGreeting + msgbox gStringVar4, 4 + closemessage + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 0 + special StartSpecialBattle + waitstate + compare RESULT, 3 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5 + compare RESULT, 1 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3 + compare RESULT, 2 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE + closemessage + special ScrSpecial_HealPlayerParty + applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF + waitmovement 0 + special LoadPlayerParty + setvar VAR_TEMP_1, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 + waitstate + releaseall + end + +MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 + setvar VAR_GAME_CORNER_STATE, 3 + msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4 + return + +MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 + setvar VAR_GAME_CORNER_STATE, 1 + special ShowFieldMessageStringVar4 + waitmessage + waitbuttonpress + return + +MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE + setvar VAR_GAME_CORNER_STATE, 2 + special ShowFieldMessageStringVar4 + waitmessage + waitbuttonpress + return + +MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 + walk_down + walk_down + walk_down + walk_right + walk_right + end_movement + +MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 + end_movement diff --git a/data/maps/MossdeepCity_GameCorner_B1F/text.inc b/data/maps/MossdeepCity_GameCorner_B1F/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/maps/MossdeepCity_Gym/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/MossdeepCity_Gym/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc index 7c7a25777..7c7a25777 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/MossdeepCity_Gym/events.inc diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index b72bdf62e..cabaf610a 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,9 +1,9 @@ MossdeepCity_Gym:: @ 83067C0 - .4byte MossdeepCity_Gym_MapAttributes + .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 109 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/maps/MossdeepCity_Gym/map.bin deleted file mode 100644 index cd6eb09f9..000000000 --- a/data/maps/MossdeepCity_Gym/map.bin +++ /dev/null @@ -1,50 +0,0 @@ -@@@@@@@@@@@@@@@@@@@@HHHHHHHHHHHHHHHHHHHH222222 2 2 2 2 2 2 2 2 22222-2222222222222 -2(22222-222222222222 -2(22222-22222 2222222( -2(222222 2&2%F*2E&2&2&2&22-2282(.2B B B B B B B1 B B B B B/2-2222(.2=7557>226'2G6 /2-2222# 4?2,2,2?24 -24,2?24 -22222(2(8222( -2(22( -2(-22222(202222( -2(22( -2(6662 -2(2662 -2( -2# -2(-2&2&2+2*2E+2E&2&2+2*2E*2&2&22( -2(O2BB))B)BBB))B)BB/20 -2(O2 G32226326G3222622G/28 -2(O2 ?22 -2424?22 -24 -2?2222( -2 2 -2(2(222 -2( -2 2222 -2(( -2(2 -2(20222 -2#2 -2(( -2(2 -2(22222222222 -2(( -2(2 -2022222222222( -2(( -202 -2 2 2 22 -2(( -2222222222222222( -2((22 2 2 2 2 2 2 2 2 2 2 2 2 2( -2(( -22228222222222(2( -2(( -2 22222222222202( -2(( -2(2222<2222<2222 2 2( -2(( -2#D222D$ -2(( -2 2 2 2 2 2;2222;2222222 -2(022222222!"222222220
\ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc new file mode 100644 index 000000000..a17d09e10 --- /dev/null +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -0,0 +1,239 @@ +MossdeepCity_Gym_MapScripts:: @ 815A4D3 + map_script 1, MossdeepCity_Gym_MapScript1_15A4D9 + .byte 0 + +MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510 + goto MossdeepCity_Gym_EventScript_15A4E8 + end + +MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528 + goto MossdeepCity_Gym_EventScript_15A4F7 + end + +MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540 + goto MossdeepCity_Gym_EventScript_15A506 + end + +MossdeepCity_Gym_EventScript_15A506:: @ 815A506 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558 + end + +MossdeepCity_Gym_EventScript_15A510:: @ 815A510 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 + goto MossdeepCity_Gym_EventScript_15A4E8 + end + +MossdeepCity_Gym_EventScript_15A528:: @ 815A528 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 + goto MossdeepCity_Gym_EventScript_15A4F7 + end + +MossdeepCity_Gym_EventScript_15A540:: @ 815A540 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 + goto MossdeepCity_Gym_EventScript_15A506 + end + +MossdeepCity_Gym_EventScript_15A558:: @ 815A558 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 + end + +MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B + trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 + msgbox MossdeepCity_Gym_Text_18D273, 4 + release + end + +MossdeepCity_Gym_EventScript_15A594:: @ 815A594 + message MossdeepCity_Gym_Text_18D0F9 + waitmessage + call MossdeepCity_Gym_EventScript_1A02C5 + msgbox MossdeepCity_Gym_Text_18D128, 4 + setflag FLAG_DEFEATED_MOSSDEEP_GYM + setflag FLAG_BADGE07_GET + clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + clearflag FLAG_UNKNOWN_393 + setvar VAR_SPECIAL_8, 7 + call MossdeepCity_Gym_EventScript_1A01C0 + clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + goto MossdeepCity_Gym_EventScript_15A5C6 + end + +MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 + giveitem_std ITEM_TM04_CALM_MIND + compare RESULT, 0 + goto_if_eq MossdeepCity_Gym_EventScript_1A029B + msgbox MossdeepCity_Gym_Text_18D1CF, 4 + setflag FLAG_RECEIVED_TM04 + release + end + +MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA + lockall + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621 + setflag FLAG_MOSSDEEP_GYM_SWITCH_1 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A619:: @ 815A619 + special DrawWholeMapView + playse SE_TK_KASYA + releaseall + end + +MossdeepCity_Gym_EventScript_15A621:: @ 815A621 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 5, 5, 524, 0 + setmetatile 2, 7, 568, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A646:: @ 815A646 + lockall + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675 + setflag FLAG_MOSSDEEP_GYM_SWITCH_2 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A675:: @ 815A675 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 8, 14, 517, 0 + setmetatile 8, 10, 568, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A + lockall + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9 + setflag FLAG_MOSSDEEP_GYM_SWITCH_3 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 15, 17, 516, 0 + setmetatile 17, 15, 568, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE + lockall + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D + setflag FLAG_MOSSDEEP_GYM_SWITCH_4 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 + setmetatile 1, 23, 516, 0 + setmetatile 5, 24, 568, 1 + goto MossdeepCity_Gym_EventScript_15A619 + end + +MossdeepCity_Gym_EventScript_15A742:: @ 815A742 + lockall + warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29 + waitstate + releaseall + end + +MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E + trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + msgbox MossdeepCity_Gym_Text_18C9E1, 6 + end + +MossdeepCity_Gym_EventScript_15A765:: @ 815A765 + trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + msgbox MossdeepCity_Gym_Text_18CA48, 6 + end + +MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C + trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + msgbox MossdeepCity_Gym_Text_18CB77, 6 + end + +MossdeepCity_Gym_EventScript_15A793:: @ 815A793 + trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + msgbox MossdeepCity_Gym_Text_18CC9B, 6 + end + +MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA + trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + msgbox MossdeepCity_Gym_Text_18CD73, 6 + end + +MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 + trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + msgbox MossdeepCity_Gym_Text_18CE6C, 6 + end + +MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 + lock + faceplayer + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED + msgbox MossdeepCity_Gym_Text_18C7E3, 4 + release + end + +MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED + msgbox MossdeepCity_Gym_Text_18C938, 4 + release + end + +MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 + delay_16 + delay_16 + end_movement + +MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA + lockall + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A + goto MossdeepCity_Gym_EventScript_15A824 + end + +MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A + lockall + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A + goto MossdeepCity_Gym_EventScript_15A824 + end + +MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A + msgbox MossdeepCity_Gym_Text_18D424, 4 + releaseall + end + +MossdeepCity_Gym_EventScript_15A824:: @ 815A824 + msgbox MossdeepCity_Gym_Text_18D40A, 4 + releaseall + end diff --git a/data/maps/MossdeepCity_Gym/text.inc b/data/maps/MossdeepCity_Gym/text.inc new file mode 100644 index 000000000..5ff5f6554 --- /dev/null +++ b/data/maps/MossdeepCity_Gym/text.inc @@ -0,0 +1,168 @@ +MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 + .string "Yo, how’s it going, CHAMPION-bound\n" + .string "{PLAYER}?\p" + .string "The GYM LEADERS here use PSYCHIC-type\n" + .string "POKéMON.\p" + .string "If you go up against them with\n" + .string "FIGHTING- or POISON-type POKéMON,\l" + .string "they’ll inflict horrible damage!\p" + .string "Plus, they’ll come at you with\n" + .string "outstanding combination attacks.\p" + .string "If you want to win, you’ll need to show\n" + .string "them how tight you are with your\l" + .string "POKéMON. Go for it!$" + +MossdeepCity_Gym_Text_18C938:: @ 818C938 + .string "Wow, you’re astounding!\n" + .string "You’re one great TRAINER!$" + +MossdeepCity_Gym_Text_18C96A:: @ 818C96A + .string "Battles hinge on the strength of your\n" + .string "spirit! The weak-spirited will never win!$" + +MossdeepCity_Gym_Text_18C9BA:: @ 818C9BA + .string "I lost! I must temper my spirit again!$" + +MossdeepCity_Gym_Text_18C9E1:: @ 818C9E1 + .string "The indecisive lose.\n" + .string "That’s my warning to you.$" + +MossdeepCity_Gym_Text_18CA10:: @ 818CA10 + .string "Let me see your talent!$" + +MossdeepCity_Gym_Text_18CA28:: @ 818CA28 + .string "You possess spectacular talent!$" + +MossdeepCity_Gym_Text_18CA48:: @ 818CA48 + .string "If there are prodigies in the world,\n" + .string "then our GYM LEADERS are them!\p" + .string "However, you may be even more talented\n" + .string "than them...$" + +MossdeepCity_Gym_Text_18CAC0:: @ 818CAC0 + .string "Fufufufu... Watch me levitate a POKé\n" + .string "BALL telekinetically!\p" + .string "Wrooooooooaaaar!\n" + .string "... ... ... ... ... ... ...\p" + .string "Sometimes, I’m out of sync...$" + +MossdeepCity_Gym_Text_18CB46:: @ 818CB46 + .string "My POKéMON battling skills are out\n" + .string "of sync, too!$" + +MossdeepCity_Gym_Text_18CB77:: @ 818CB77 + .string "A POKé BALL was too heavy to lift\n" + .string "psychically. But this dust bunny...\p" + .string "Whoooooooooooooooh!\n" + .string "... ... ... ... ... ...\p" + .string "No, I’m not cheating!\n" + .string "I didn’t blow on it! Honestly!$" + +MossdeepCity_Gym_Text_18CC1E:: @ 818CC1E + .string "When you lose to me, don’t be too hard\n" + .string "on yourself.\p" + .string "It’s not that you’re weak - I’m just\n" + .string "too strong!$" + +MossdeepCity_Gym_Text_18CC83:: @ 818CC83 + .string "You’re just too strong!$" + +MossdeepCity_Gym_Text_18CC9B:: @ 818CC9B + .string "I’m not going to get down on myself for\n" + .string "losing. I just need to train harder.\p" + .string "Positive thinking - that’s my strong\n" + .string "point!$" + +MossdeepCity_Gym_Text_18CD14:: @ 818CD14 + .string "I see it...\n" + .string "I see your future...\p" + .string "If you can beat me, I will tell you\n" + .string "your future!$" + +MossdeepCity_Gym_Text_18CD66:: @ 818CD66 + .string "I surrender!$" + +MossdeepCity_Gym_Text_18CD73:: @ 818CD73 + .string "You will wage a terrifically intense\n" + .string "battle with our GYM LEADERS...\p" + .string "The result...\n" + .string "You won’t hear it from me!$" + +MossdeepCity_Gym_Text_18CDE0:: @ 818CDE0 + .string "The roads you have traveled...\n" + .string "What you have experienced...\p" + .string "Come at me with everything you’ve\n" + .string "learned!$" + +MossdeepCity_Gym_Text_18CE47:: @ 818CE47 + .string "You’ve traveled a path of greatness!$" + +MossdeepCity_Gym_Text_18CE6C:: @ 818CE6C + .string "A bright future awaits those who have\n" + .string "worked diligently.\p" + .string "For those who lazed idly, there is\n" + .string "only despair at the end.\p" + .string "What goes around comes around...$" + +MossdeepCity_Gym_Text_18CF02:: @ 818CF02 + .string "TATE: Hehehe... Were you surprised?\p" + .string "LIZA: Fufufu... Were you surprised?\p" + .string "TATE: That there are two GYM LEADERS?\n" + .string "LIZA: That there are two GYM LEADERS?\p" + .string "TATE: We’re twins!\n" + .string "LIZA: We’re twins!\p" + .string "TATE: We don’t need to talk because...\n" + .string "LIZA: We can each determine what...\p" + .string "TATE: The other is thinking...\n" + .string "LIZA: All in our minds!\p" + .string "TATE: This combination of ours...\n" + .string "LIZA: Can you beat it?$" + +MossdeepCity_Gym_Text_18D077:: @ 818D077 + .string "TATE: What?! Our combination...\n" + .string "LIZA: Was shattered!\p" + .string "TATE: It can’t be helped. You’ve won...\n" + .string "LIZA: So, in recognition, take this.$" + +MossdeepCity_Gym_Text_18D0F9:: @ 818D0F9 + .string "{PLAYER} received the MIND BADGE\n" + .string "from LIZA and TATE.$" + +MossdeepCity_Gym_Text_18D128:: @ 818D128 + .string "TATE: The MIND BADGE enhances the\n" + .string "SP. ATK and SP. DEF of POKéMON.\p" + .string "LIZA: It also lets you use the HM move\n" + .string "DIVE outside of battle.\p" + .string "TATE: You should also take this, too.$" + +MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF + .string "TATE: That TM04 contains...\n" + .string "LIZA: CALM MIND!\p" + .string "TATE: It raises SP. ATK and...\n" + .string "LIZA: It raises SP. DEF!\p" + .string "TATE: It’s a move that’s perfect...\n" + .string "LIZA: For PSYCHIC POKéMON!$" + +MossdeepCity_Gym_Text_18D273:: @ 818D273 + .string "TATE: Looks like the bond between you\n" + .string "and your POKéMON is far stronger than\l" + .string "the bond that we share as twins.\p" + .string "LIZA: You will become even stronger!\n" + .string "We’ve battled you, so we know.$" + +MossdeepCity_Gym_Text_18D324:: @ 818D324 + .string "TATE: Hehehe... Were you surprised?\p" + .string "LIZA: That there are two GYM LEADERS?\p" + .string "TATE: Oops, you have only one...\n" + .string "LIZA: POKéMON that can battle.\p" + .string "TATE: We can’t battle that way!\p" + .string "LIZA: If you want to challenge us,\n" + .string "bring some more POKéMON.$" + +MossdeepCity_Gym_Text_18D40A:: @ 818D40A + .string "MOSSDEEP CITY POKéMON GYM$" + +MossdeepCity_Gym_Text_18D424:: @ 818D424 + .string "MOSSDEEP CITY POKéMON GYM\p" + .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc index 2fe9e0373..2fe9e0373 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/MossdeepCity_House1/events.inc diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 70f681e7a..f6815842d 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,9 +1,9 @@ MossdeepCity_House1:: @ 83067DC - .4byte House2_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc new file mode 100644 index 000000000..97a5fc452 --- /dev/null +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -0,0 +1,23 @@ +MossdeepCity_House1_MapScripts:: @ 815A82E + .byte 0 + +MossdeepCity_House1_EventScript_15A82F:: @ 815A82F + lock + faceplayer + bufferleadmonspeciesname 0 + msgbox MossdeepCity_House1_Text_18D465, 4 + specialvar RESULT, GetPokeblockNameByMonNature + compare RESULT, 0 + goto_if_eq MossdeepCity_House1_EventScript_15A855 + msgbox MossdeepCity_House1_Text_18D475, 4 + release + end + +MossdeepCity_House1_EventScript_15A855:: @ 815A855 + msgbox MossdeepCity_House1_Text_18D4C0, 4 + release + end + +MossdeepCity_House1_EventScript_15A85F:: @ 815A85F + msgbox MossdeepCity_House1_Text_18D4F1, 2 + end diff --git a/data/maps/MossdeepCity_House1/text.inc b/data/maps/MossdeepCity_House1/text.inc new file mode 100644 index 000000000..0572ba260 --- /dev/null +++ b/data/maps/MossdeepCity_House1/text.inc @@ -0,0 +1,17 @@ +MossdeepCity_House1_Text_18D465:: @ 818D465 + .string "Hmm!\n" + .string "Your {STR_VAR_1}...$" + +MossdeepCity_House1_Text_18D475:: @ 818D475 + .string "It likes {STR_VAR_1}S,\n" + .string "doesn’t it?\p" + .string "No, I’m positive of it! It definitely\n" + .string "likes {STR_VAR_1}S!$" + +MossdeepCity_House1_Text_18D4C0:: @ 818D4C0 + .string "It doesn’t appear to like or dislike\n" + .string "any {POKEBLOCK}S.$" + +MossdeepCity_House1_Text_18D4F1:: @ 818D4F1 + .string "My husband can tell what kind of\n" + .string "{POKEBLOCK}S a POKéMON likes at a glance.$" diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc index 743350683..743350683 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/MossdeepCity_House2/events.inc diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 62bd6bdec..36964f8ee 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,9 +1,9 @@ MossdeepCity_House2:: @ 83067F8 - .4byte House1_MapAttributes + .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 59 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc new file mode 100644 index 000000000..c8bccdd52 --- /dev/null +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -0,0 +1,54 @@ +MossdeepCity_House2_MapScripts:: @ 815A868 + .byte 0 + +MossdeepCity_House2_EventScript_15A869:: @ 815A869 + msgbox MossdeepCity_House2_Text_18D536, 2 + end + +MossdeepCity_House2_EventScript_15A872:: @ 815A872 + msgbox MossdeepCity_House2_Text_18D596, 2 + end + +MossdeepCity_House2_EventScript_15A87B:: @ 815A87B + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox MossdeepCity_House2_Text_18D61E, 4 + waitmoncry + closemessage + setflag FLAG_WINGULL_DELIVERED_MAIL + clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE + compare FACING, 2 + call_if_eq MossdeepCity_House2_EventScript_15A8AE + compare FACING, 3 + call_if_eq MossdeepCity_House2_EventScript_15A8B9 + removeobject 3 + release + end + +MossdeepCity_House2_EventScript_15A8AE:: @ 815A8AE + applymovement 3, MossdeepCity_House2_Movement_15A8C4 + waitmovement 0 + return + +MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9 + applymovement 3, MossdeepCity_House2_Movement_15A8CB + waitmovement 0 + return + +MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 + end_movement + +MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement diff --git a/data/maps/MossdeepCity_House2/text.inc b/data/maps/MossdeepCity_House2/text.inc new file mode 100644 index 000000000..ae4b11cb6 --- /dev/null +++ b/data/maps/MossdeepCity_House2/text.inc @@ -0,0 +1,14 @@ +MossdeepCity_House2_Text_18D536:: @ 818D536 + .string "My little sister exchanges MAIL with\n" + .string "her boyfriend in FORTREE.\p" + .string "I don’t envy her one bit at all.$" + +MossdeepCity_House2_Text_18D596:: @ 818D596 + .string "Even though I can’t see my friend in\n" + .string "FORTREE, my POKéMON carries MAIL back\l" + .string "and forth for us.\p" + .string "I’m not lonesome, even though we’re\n" + .string "apart.$" + +MossdeepCity_House2_Text_18D61E:: @ 818D61E + .string "WINGULL: Pihyoh!$" diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc index f601038e6..f601038e6 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/MossdeepCity_House3/events.inc diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 54c6641b6..e395c29f6 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,9 +1,9 @@ MossdeepCity_House3:: @ 8306868 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc new file mode 100644 index 000000000..4c4d6cbdd --- /dev/null +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -0,0 +1,26 @@ +MossdeepCity_House3_MapScripts:: @ 815A971 + .byte 0 + +MossdeepCity_House3_EventScript_15A972:: @ 815A972 + lock + faceplayer + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1 + msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MossdeepCity_House3_EventScript_15A9BB + msgbox MossdeepCity_House3_Text_18D9A9, 4 + giveitem_std ITEM_SUPER_ROD + setflag FLAG_RECEIVED_SUPER_ROD + msgbox MossdeepCity_House3_Text_18D9E3, 4 + release + end + +MossdeepCity_House3_EventScript_15A9B1:: @ 815A9B1 + msgbox MossdeepCity_House3_Text_18DA44, 4 + release + end + +MossdeepCity_House3_EventScript_15A9BB:: @ 815A9BB + msgbox MossdeepCity_House3_Text_18DA26, 4 + release + end diff --git a/data/maps/MossdeepCity_House3/text.inc b/data/maps/MossdeepCity_House3/text.inc new file mode 100644 index 000000000..270457172 --- /dev/null +++ b/data/maps/MossdeepCity_House3/text.inc @@ -0,0 +1,23 @@ +MossdeepCity_House3_Text_18D909:: @ 818D909 + .string "Hey there, TRAINER!\n" + .string "A SUPER ROD really is super!\p" + .string "Say all you want, but this baby can\n" + .string "catch POKéMON off the seafloor!\p" + .string "What do you think?\n" + .string "You want it, don’t you?$" + +MossdeepCity_House3_Text_18D9A9:: @ 818D9A9 + .string "You bet, you bet!\n" + .string "After all, a SUPER ROD is really super!$" + +MossdeepCity_House3_Text_18D9E3:: @ 818D9E3 + .string "If there’s any water, try dropping in\n" + .string "your ROD and see what bites!$" + +MossdeepCity_House3_Text_18DA26:: @ 818DA26 + .string "Hunh?\n" + .string "Don’t you like to fish?$" + +MossdeepCity_House3_Text_18DA44:: @ 818DA44 + .string "Go after the seafloor POKéMON with\n" + .string "your SUPER ROD.$" diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc index cfde3a35e..cfde3a35e 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/MossdeepCity_House4/events.inc diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 1c0e433bb..fe346cb0a 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,9 +1,9 @@ MossdeepCity_House4:: @ 83068A0 - .4byte MossdeepCity_House4_MapAttributes + .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 80 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc new file mode 100644 index 000000000..15ed22c5e --- /dev/null +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -0,0 +1,41 @@ +MossdeepCity_House4_MapScripts:: @ 815AB30 + .byte 0 + +MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 + lock + faceplayer + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46 + msgbox MossdeepCity_House4_Text_18E0E3, 4 + release + end + +MossdeepCity_House4_EventScript_15AB46:: @ 815AB46 + msgbox MossdeepCity_House4_Text_18E125, 4 + release + end + +MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 + lock + faceplayer + special CheckPlayerHasSecretBase + compare RESULT, 0 + goto_if_eq MossdeepCity_House4_EventScript_15AB6D + special GetSecretBaseNearbyMapName + msgbox MossdeepCity_House4_Text_18E17E, 4 + release + end + +MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D + msgbox MossdeepCity_House4_Text_18E1A7, 4 + release + end + +MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox MossdeepCity_House4_Text_18E1E1, 4 + waitmoncry + release + end diff --git a/data/maps/MossdeepCity_House4/text.inc b/data/maps/MossdeepCity_House4/text.inc new file mode 100644 index 000000000..e612a8018 --- /dev/null +++ b/data/maps/MossdeepCity_House4/text.inc @@ -0,0 +1,19 @@ +MossdeepCity_House4_Text_18E0E3:: @ 818E0E3 + .string "My little brother says he likes to go\n" + .string "find people’s SECRET BASES.$" + +MossdeepCity_House4_Text_18E125:: @ 818E125 + .string "My little brother says he likes to\n" + .string "visit people’s SECRET BASES and have\l" + .string "POKéMON battles.$" + +MossdeepCity_House4_Text_18E17E:: @ 818E17E + .string "Was it you who made a SECRET BASE in\n" + .string "{STR_VAR_1}?$" + +MossdeepCity_House4_Text_18E1A7:: @ 818E1A7 + .string "You should make a SECRET BASE\n" + .string "somewhere. I’ll go find it!$" + +MossdeepCity_House4_Text_18E1E1:: @ 818E1E1 + .string "DELCATTY: Miyaan?$" diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc index 92f4a8cbd..92f4a8cbd 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/MossdeepCity_Mart/events.inc diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index c18fca0e3..6c8b09d32 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,9 +1,9 @@ MossdeepCity_Mart:: @ 830684C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc new file mode 100644 index 000000000..ce5845c81 --- /dev/null +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -0,0 +1,39 @@ +MossdeepCity_Mart_MapScripts:: @ 815A925 + .byte 0 + +MossdeepCity_Mart_EventScript_15A926:: @ 815A926 + lock + faceplayer + message MossdeepCity_Mart_Text_1A0BE4 + waitmessage + pokemart MossdeepCity_Mart_Items + msgbox MossdeepCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +MossdeepCity_Mart_Items:: @ 815A940 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_NET_BALL + .2byte ITEM_DIVE_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_NONE + release + end + +MossdeepCity_Mart_EventScript_15A956:: @ 815A956 + msgbox MossdeepCity_Mart_Text_18D758, 2 + end + +MossdeepCity_Mart_EventScript_15A95F:: @ 815A95F + msgbox MossdeepCity_Mart_Text_18D7E7, 2 + end + +MossdeepCity_Mart_EventScript_15A968:: @ 815A968 + msgbox MossdeepCity_Mart_Text_18D841, 2 + end diff --git a/data/maps/MossdeepCity_Mart/text.inc b/data/maps/MossdeepCity_Mart/text.inc new file mode 100644 index 000000000..cdce8c48c --- /dev/null +++ b/data/maps/MossdeepCity_Mart/text.inc @@ -0,0 +1,19 @@ +MossdeepCity_Mart_Text_18D758:: @ 818D758 + .string "REVIVE is fantastic!\p" + .string "Give it to a fainted POKéMON, and the\n" + .string "POKéMON will arise.\p" + .string "But be careful, REVIVE doesn’t restore\n" + .string "the used-up PP of moves.$" + +MossdeepCity_Mart_Text_18D7E7:: @ 818D7E7 + .string "MAX REPEL keeps all weak POKéMON away.\p" + .string "Out of all the REPEL sprays, it lasts\n" + .string "the longest.$" + +MossdeepCity_Mart_Text_18D841:: @ 818D841 + .string "The NET and DIVE BALLS are rare POKé\n" + .string "BALLS that are only made in MOSSDEEP.\p" + .string "A NET BALL is effective against\n" + .string "BUG-type and WATER-type POKéMON.\p" + .string "A DIVE BALL works best on POKéMON at\n" + .string "the bottom of the sea.$" diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index da310c9f7..da310c9f7 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 036604eff..ef51b2588 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..a722e666b --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,23 @@ +MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 + map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6 + .byte 0 + +MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 + setrespawn 9 + end + +MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA + setvar VAR_SPECIAL_B, 1 + call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +MossdeepCity_PokemonCenter_1F_EventScript_15A8E8:: @ 815A8E8 + msgbox MossdeepCity_PokemonCenter_1F_Text_18D62F, 2 + end + +MossdeepCity_PokemonCenter_1F_EventScript_15A8F1:: @ 815A8F1 + msgbox MossdeepCity_PokemonCenter_1F_Text_18D69A, 2 + end diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/text.inc b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..5f345613e --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc @@ -0,0 +1,10 @@ +MossdeepCity_PokemonCenter_1F_Text_18D62F:: @ 818D62F + .string "The GYM LEADERS in this town are a\n" + .string "formidable duo.\p" + .string "Their combination attacks are, like,\n" + .string "excellent and wow!$" + +MossdeepCity_PokemonCenter_1F_Text_18D69A:: @ 818D69A + .string "Depending on the special abilities of\n" + .string "POKéMON, some moves might change\l" + .string "or not work at all.$" diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index 4af09479f..4af09479f 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index cb42c5c80..db24bf9e5 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..a88147c08 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,21 @@ +MossdeepCity_PokemonCenter_2F_MapScripts:: @ 815A8FA + map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +MossdeepCity_PokemonCenter_2F_EventScript_15A90A:: @ 815A90A + msgbox MossdeepCity_PokemonCenter_2F_Text_18D6F5, 2 + end + +MossdeepCity_PokemonCenter_2F_EventScript_15A913:: @ 815A913 + call MossdeepCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +MossdeepCity_PokemonCenter_2F_EventScript_15A919:: @ 815A919 + call MossdeepCity_PokemonCenter_2F_EventScript_1A40CC + end + +MossdeepCity_PokemonCenter_2F_EventScript_15A91F:: @ 815A91F + call MossdeepCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/text.inc b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc new file mode 100644 index 000000000..66bba2421 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc @@ -0,0 +1,4 @@ +MossdeepCity_PokemonCenter_2F_Text_18D6F5:: @ 818D6F5 + .string "If I win a whole lot of link battles\n" + .string "and show everyone how good I am,\l" + .string "I might get a fan following!$" diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/maps/MossdeepCity_SpaceCenter_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index 85e716a93..85e716a93 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 65ba897fb..bc2152a58 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes + .4byte MossdeepCity_SpaceCenter_1F_Layout .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 276 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/maps/MossdeepCity_SpaceCenter_1F/map.bin Binary files differdeleted file mode 100644 index 44f5081b9..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin +++ /dev/null diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc new file mode 100644 index 000000000..83b859c26 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -0,0 +1,62 @@ +MossdeepCity_SpaceCenter_1F_MapScripts:: @ 815AB8A + .byte 0 + +MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B + lock + faceplayer + dodailyevents + specialvar RESULT, GetWeekCount + buffernumberstring 0, RESULT + compare RESULT, 0 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + compare RESULT, 1 + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + closemessage + applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + waitmovement 0 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_15ABBA:: @ 815ABBA + msgbox MossdeepCity_SpaceCenter_1F_Text_18E1F3, 4 + return + +MossdeepCity_SpaceCenter_1F_EventScript_15ABC3:: @ 815ABC3 + msgbox MossdeepCity_SpaceCenter_1F_Text_18E214, 4 + return + +MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC + msgbox MossdeepCity_SpaceCenter_1F_Text_18E251, 2 + end + +MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 + lock + faceplayer + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C + msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 + giveitem_std ITEM_SUN_STONE + compare RESULT, 0 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP + msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_15AC0C:: @ 815AC0C + msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 + release + end + +MossdeepCity_SpaceCenter_1F_EventScript_15AC16:: @ 815AC16 + msgbox MossdeepCity_SpaceCenter_1F_Text_18E3E5, 2 + end + +MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F + lock + faceplayer + msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4 + closemessage + applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + waitmovement 0 + release + end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/text.inc b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc new file mode 100644 index 000000000..a94d343bc --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc @@ -0,0 +1,33 @@ +MossdeepCity_SpaceCenter_1F_Text_18E1F3:: @ 818E1F3 + .string "The rocket’s launch is imminent!$" + +MossdeepCity_SpaceCenter_1F_Text_18E214:: @ 818E214 + .string "The rocket launched safely!\n" + .string "That’s successful launch no. {STR_VAR_1}!$" + +MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 + .string "A rocket launch demands perfection.\n" + .string "Not even a 1% margin of error is allowed.\p" + .string "Even if it’s 99% okay, the whole thing\n" + .string "is useless if 1% happens to be no good.\p" + .string "Despite that, we never stop trying.\n" + .string "Why? It’s a dream that never ends.$" + +MossdeepCity_SpaceCenter_1F_Text_18E335:: @ 818E335 + .string "I was taking a stroll down the beach\n" + .string "when I found this.\p" + .string "It’s not anything I need, so you can\n" + .string "have it.$" + +MossdeepCity_SpaceCenter_1F_Text_18E39B:: @ 818E39B + .string "The HOENN region has been famous for \n" + .string "its meteor showers for a long time.$" + +MossdeepCity_SpaceCenter_1F_Text_18E3E5:: @ 818E3E5 + .string "Some people claim that POKéMON came\n" + .string "from space. Could it be true?$" + +MossdeepCity_SpaceCenter_1F_Text_18E427:: @ 818E427 + .string "A giant chunk of metal bursts through\n" + .string "the skies and flies into space...\p" + .string "It boggles my mind!$" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/maps/MossdeepCity_SpaceCenter_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index faf5d89fa..faf5d89fa 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 2195ee8e2..46c44758d 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes + .4byte MossdeepCity_SpaceCenter_2F_Layout .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 277 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/maps/MossdeepCity_SpaceCenter_2F/map.bin Binary files differdeleted file mode 100644 index d2e52d780..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin +++ /dev/null diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc new file mode 100644 index 000000000..97467f4e5 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -0,0 +1,14 @@ +MossdeepCity_SpaceCenter_2F_MapScripts:: @ 815AC36 + .byte 0 + +MossdeepCity_SpaceCenter_2F_EventScript_15AC37:: @ 815AC37 + msgbox MossdeepCity_SpaceCenter_2F_Text_18E483, 2 + end + +MossdeepCity_SpaceCenter_2F_EventScript_15AC40:: @ 815AC40 + msgbox MossdeepCity_SpaceCenter_2F_Text_18E4EE, 2 + end + +MossdeepCity_SpaceCenter_2F_EventScript_15AC49:: @ 815AC49 + msgbox MossdeepCity_SpaceCenter_2F_Text_18E564, 2 + end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/text.inc b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc new file mode 100644 index 000000000..0c8159423 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc @@ -0,0 +1,15 @@ +MossdeepCity_SpaceCenter_2F_Text_18E483:: @ 818E483 + .string "MOSSDEEP has mainly sunny weather,\n" + .string "and its winds are stable.\p" + .string "It’s an ideal location for launching\n" + .string "rockets.$" + +MossdeepCity_SpaceCenter_2F_Text_18E4EE:: @ 818E4EE + .string "If only I was a little younger, I would\n" + .string "have liked being an astronaut...\p" + .string "No... It’s not too late!\n" + .string "I can and will try!$" + +MossdeepCity_SpaceCenter_2F_Text_18E564:: @ 818E564 + .string "I wish ordinary people could go into\n" + .string "space one day...$" diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/maps/MossdeepCity_StevensHouse/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/MossdeepCity_StevensHouse/border.bin +++ /dev/null diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 7a8fee393..7a8fee393 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 761ea9b73..abbe4b98b 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,9 +1,9 @@ MossdeepCity_StevensHouse:: @ 8306884 - .4byte MossdeepCity_StevensHouse_MapAttributes + .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 328 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/maps/MossdeepCity_StevensHouse/map.bin deleted file mode 100644 index ade25497a..000000000 --- a/data/maps/MossdeepCity_StevensHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -h
ii22p2$2$2$2$2$2$2q2q292#2#2#26666#2#2[392#2#2#26666#2#2c792#2#2#2#2#2,2#2#2#2[392#2#2#2#2#2#2#2#2#2c792#2#2 #2#2#2#2#2#2
\ No newline at end of file diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc new file mode 100644 index 000000000..eb719a33a --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -0,0 +1,128 @@ +MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 + map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5 + map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9 + map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01 + .byte 0 + +MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF + end + +MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF + setmetatile 6, 4, 753, 1 + return + +MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 + compare VAR_STEVENS_HOUSE_STATE, 1 + call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5 + end + +MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 + return + +MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 + map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B + .2byte 0 + +MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B + lockall + applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F + waitmovement 0 + playse SE_PIN + applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E + waitmovement 0 + msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 + giveitem_std ITEM_HM08_DIVE + setflag FLAG_RECEIVED_HM08 + setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER + msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 + closemessage + delay 20 + applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 + waitmovement 0 + setvar VAR_STEVENS_HOUSE_STATE, 1 + releaseall + end + +MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement + +MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C + lockall + msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 + getpartysize + compare RESULT, 6 + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC + copyvar VAR_SPECIAL_4, RESULT + removeobject 2 + playfanfare MUS_FANFA4 + message MossdeepCity_StevensHouse_Text_18DD61 + waitfanfare + waitmessage + givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + bufferspeciesname 1, SPECIES_BELDUM + msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES + call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678 + setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE + setflag FLAG_RECEIVED_BELDUM + releaseall + end + +MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC + msgbox MossdeepCity_StevensHouse_Text_18DD77, 4 + releaseall + end + +MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6 + msgbox MossdeepCity_StevensHouse_Text_18DD9E, 4 + releaseall + end + +MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0 + msgbox MossdeepCity_StevensHouse_Text_18E0A3, 3 + end + +MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 + msgbox MossdeepCity_StevensHouse_Text_18DC25, 2 + end + +MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 + lockall + goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16 + msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 + releaseall + end + +MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 + msgbox MossdeepCity_StevensHouse_Text_18DDC2, 4 + releaseall + end + +MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 + giveitem_std ITEM_HM08_DIVE, 1, 1 + setflag FLAG_RECEIVED_HM08 + end diff --git a/data/maps/MossdeepCity_StevensHouse/text.inc b/data/maps/MossdeepCity_StevensHouse/text.inc new file mode 100644 index 000000000..6f5b9b9b8 --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/text.inc @@ -0,0 +1,83 @@ +MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 + .string "STEVEN: {PLAYER}{KUN}?\p" + .string "Yes, this is my place. It’s a little\n" + .string "embarrassing how empty it is here.\p" + .string "Oh, here, you should take this HM.\p" + .string "It contains DIVE.\n" + .string "I’ve already taught my POKéMON.$" + +MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 + .string "STEVEN: While you’re using SURF, you\n" + .string "should notice dark patches of water.\p" + .string "Use DIVE if you come to deep water\n" + .string "like it. You’ll drop to the seafloor.\p" + .string "When you want to come back up, use\n" + .string "DIVE again.\p" + .string "In some places, it won’t be possible\n" + .string "for you to surface, though.$" + +MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 + .string "STEVEN: Apparently, there’s an\n" + .string "underwater cavern between\l" + .string "MOSSDEEP and SOOTOPOLIS.\p" + .string "You know, the one that CAPT. STERN\n" + .string "found in his submarine.\p" + .string "An underwater cavern...\p" + .string "There might be some rare stones down\n" + .string "there... I should go for a DIVE...$" + +MossdeepCity_StevensHouse_Text_18DD12:: @ 818DD12 + .string "{PLAYER} checked the POKé BALL.\p" + .string "It contained the POKéMON\n" + .string "BELDUM.\p" + .string "Take the POKé BALL?$" + +MossdeepCity_StevensHouse_Text_18DD61:: @ 818DD61 + .string "{PLAYER} obtained a BELDUM.$" + +MossdeepCity_StevensHouse_Text_18DD77:: @ 818DD77 + .string "There is no space for another POKéMON.$" + +MossdeepCity_StevensHouse_Text_18DD9E:: @ 818DD9E + .string "{PLAYER} left the POKé BALL where\n" + .string "it was.$" + +MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 + .string "It’s a letter.\p" + .string "... ... ... ... ... ...\p" + .string "To {PLAYER}{KUN}...\p" + .string "I’ve decided to do a little soul-\n" + .string "searching and train on the road.\p" + .string "I don’t plan to return home for some\n" + .string "time.\p" + .string "I have a favor to ask of you.\p" + .string "I want you to take the POKé BALL on\n" + .string "the desk.\p" + .string "Inside it is a BELDUM, my favorite\n" + .string "POKéMON.\p" + .string "I’m counting on you.\p" + .string "May our paths cross some day.\p" + .string "STEVEN STONE$" + +MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A + .string "It’s a letter.\p" + .string "... ... ... ... ... ...\p" + .string "To {PLAYER}{KUN}...\p" + .string "I’ve decided to do a little soul-\n" + .string "searching and train on the road.\p" + .string "I don’t plan to return home for some\n" + .string "time.\p" + .string "I have a favor to ask of you.\p" + .string "I want you to take the POKé BALL on\n" + .string "the desk.\p" + .string "Inside it is a BELDUM, my favorite\n" + .string "POKéMON.\p" + .string "I’m counting on you.\p" + .string "If you’d like, you should also take\n" + .string "the HM DIVE.\p" + .string "May our paths cross some day.\p" + .string "STEVEN STONE$" + +MossdeepCity_StevensHouse_Text_18E0A3:: @ 818E0A3 + .string "It’s a collection of rare rocks and\n" + .string "stones assembled by STEVEN.$" diff --git a/data/maps/MtChimney/border.bin b/data/maps/MtChimney/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/MtChimney/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq
\ No newline at end of file diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc index f011502f2..f011502f2 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/MtChimney/events.inc diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index cdc29ce7f..690312635 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,9 +1,9 @@ MtChimney:: @ 8306EC0 - .4byte MtChimney_MapAttributes + .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 137 .byte 56 .byte 0 diff --git a/data/maps/MtChimney/map.bin b/data/maps/MtChimney/map.bin deleted file mode 100644 index 09eb5a906..000000000 --- a/data/maps/MtChimney/map.bin +++ /dev/null @@ -1 +0,0 @@ -h~qpqqpqpqrrrq2r x|q2{z ppppqrrqqqrqqpqqpqqpqpqrrr{z |xtz{ ~6ppppqrrqqqrqqpqh~qqph~qrrrr{ yyy qppppqrrqqqrq{pqpqqqppqqrrrr h~pppqrrqq{zqrpqpqqqppqqrrrr ph~pxtzrqqrqqrpqpqqqppq{zrrr ~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227 qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2 h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{ttt pqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr ~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rr pqh~h~2q2q2q2rq{zqrqqqpqx|qppqrq222jqqr~h~qph~2q2q2q2q2rqrqqrq{qpqqpqpxtzq2q2q22i2jiiiii~qh~6pq2q2q2q2q2rqrqqrqr|x|qx|x|q2q2q2q2hijriijqqhii~6q6pq2q2q2q2q2rqrqqr{zpqpqqpqx|q2q2q2pqr2i2jii~hi2i2i2~2q2q2q2q2q2rqrq{zr{x|x|qpqqpq2q2q2xtzq2q22i2i2i2i2~2q2q2q2q2q2q2q2q2q2r{zqr{zrqpqpqx|qpq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zrq{zr{z|pqpqqpqx|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6rqrqrrqppqx|qpqqxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6r{z{zr{px|qx|xttt|pq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6rrqrqrrpqx|qxttt|pxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6q6rrqr{zrpqqxt|qqqppq6q6x|q2q2q2q2q2q2q2q2q2q2q2q2q2{z{ttzrqrrqrxtt|qxt|qpxt|q2xt|q2q2{ttttt2ttz{z{ttz{zrqrqqqxt|qpqxt|xtt|xttzq2q2q2q2q2q2{ttz{z{ttz{zqrttt|qx|xt|qxt|q6x|q2q2{2tttttzq2q2{z{z{ttz{tztt|pqqxt|x|qqxt|xttzq2q2q2q2q2q2q2q2q2r{z{z{ttzqqqqpx|qqqpqxtt|qxt|q2q2q2q2q2q2q2q2q2{tzrq2rq2rqqq2{tqqpqxt|q|qqqx|qqx|q2q2q2{ttt2z{tz{{zqq{qqqx|q2pq6pqqqqxtt|xtttzq2q2q2q2{zq2q2r6r{ttzqqqqx|t|xttttt|qxtttttttt2zq2q2q2rqrrq2q262qqqqp66qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{rq6qq6qqqqxtt|pqq2qqpq2q2q2q2q2{ttzr6r22{tt|qqqqqqppqq2qqq2&2'2!2!2"2q2q2xttt2tzq2q2q2r{z6r2qxtt|qqqppq22q&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zr26{z2tt|pqqqppq6q-67112q2q2q2q2q2q2q2q2\2[2R2Qq2r6{z266qqpxt|2pxt|62->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrq6{|qxt|pt||5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{z6pq2qpp66qpp22q2q2q2q2q2q2q2q24q2q2q222q2rqrqYRQ{tp22pxt|qp6p666q2q2q2q2q2q2q2q2q2q2q2q266{z{2rqYPap66t|p2x|pqq2q2q2q2{z{6r2rrYx|66qppqpt|q2q2q2q2q2q2q2q2q2q2{z{z66{zrrrqt|qpp6qp66qt6226ttz{z2q2q2rq26rrrq66qp2px|2|6277226{zq26{zq2{zrrtt|qpx|p666|776rq2q2{z2q2rq2rr22p2pqpt|p{z22rq2q2r2rrpp2p6q6p6p6r2r2662rrrpp6xtt|x|x|6r6r22rrr
\ No newline at end of file diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc new file mode 100644 index 000000000..f13850570 --- /dev/null +++ b/data/maps/MtChimney/scripts.inc @@ -0,0 +1,465 @@ +MtChimney_MapScripts:: @ 815CF7C + map_script 5, MtChimney_MapScript1_15CF92 + map_script 3, MtChimney_MapScript1_15CF87 + .byte 0 + +MtChimney_MapScript1_15CF87:: @ 815CF87 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 + call MtChimney_EventScript_1A0196 + end + +MtChimney_MapScript1_15CF92:: @ 815CF92 + setstepcallback 1 + end + +MtChimney_EventScript_15CF95:: @ 815CF95 + lock + faceplayer + showmoneybox 0, 0 + nop + msgbox MtChimney_Text_195760, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MtChimney_EventScript_15D00B + checkmoney 0xc8, 0 + compare RESULT, 0 + goto_if_eq MtChimney_EventScript_15D018 + msgbox MtChimney_Text_1957A9, 4 + checkitemspace ITEM_LAVA_COOKIE, 1 + compare RESULT, 1 + call_if_eq MtChimney_EventScript_15D000 + giveitem_std ITEM_LAVA_COOKIE + compare RESULT, 0 + goto_if_eq MtChimney_EventScript_15CFF3 + hidemoneybox 0, 0 + release + end + +MtChimney_EventScript_15CFF3:: @ 815CFF3 + msgbox MtChimney_Text_1A0CC2, 4 + hidemoneybox 0, 0 + release + end + +MtChimney_EventScript_15D000:: @ 815D000 + takemoney 0xc8, 0 + updatemoneybox 0, 0 + nop + return + +MtChimney_EventScript_15D00B:: @ 815D00B + msgbox MtChimney_Text_1957F7, 4 + hidemoneybox 0, 0 + release + end + +MtChimney_EventScript_15D018:: @ 815D018 + msgbox MtChimney_Text_1957BA, 4 + hidemoneybox 0, 0 + release + end + +MtChimney_Movement_15D025:: @ 815D025 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + end_movement + +MtChimney_Movement_15D02D:: @ 815D02D + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +MtChimney_Movement_15D036:: @ 815D036 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement + +MtChimney_Movement_15D03E:: @ 815D03E + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815D048 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement + +@ 815D05A + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + end_movement + +@ 815D063 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815D072 + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement + +@ 815D08B + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + end_movement + +@ 815D096 + delay_16 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815D0A6 + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement + +@ 815D0B7 + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement + +@ 815D0BF + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815D0CD + walk_down + end_movement + +@ 815D0CF + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815D0D7 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815D0E1 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + end_movement + +@ 815D0EC + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right + end_movement + +@ 815D0F1 + walk_left + walk_in_place_fastest_right + delay_16 + end_movement + +MtChimney_EventScript_15D0F5:: @ 815D0F5 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B36F1, 3 + .else + msgbox MtChimney_Text_1B40EA, 3 + .endif + end + +MtChimney_EventScript_15D0FE:: @ 815D0FE + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B372E, 3 + .else + msgbox MtChimney_Text_1B4128, 3 + .endif + end + +MtChimney_EventScript_15D107:: @ 815D107 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B3778, 3 + .else + msgbox MtChimney_Text_1B416E, 3 + .endif + end + +MtChimney_EventScript_15D110:: @ 815D110 + .ifdef SAPPHIRE + trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + msgbox MtChimney_Text_1B3239, 6 + .else + trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + msgbox MtChimney_Text_1B3C07, 6 + .endif + end + +MtChimney_EventScript_15D127:: @ 815D127 + .ifdef SAPPHIRE + trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + msgbox MtChimney_Text_1B338D, 6 + .else + trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + msgbox MtChimney_Text_1B3D3D, 6 + .endif + end + +MtChimney_EventScript_15D13E:: @ 815D13E + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B33EA, 3 + .else + msgbox MtChimney_Text_1B3D9A, 3 + .endif + end + +@ 815D147 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B3427, 3 + .else + msgbox MtChimney_Text_1B3DD6, 3 + .endif + end + +MtChimney_EventScript_15D150:: @ 815D150 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B3446, 3 + .else + msgbox MtChimney_Text_1B3DF5, 3 + .endif + end + +MtChimney_EventScript_15D159:: @ 815D159 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B3470, 3 + .else + msgbox MtChimney_Text_1B3E1F, 3 + .endif + end + +MtChimney_EventScript_15D162:: @ 815D162 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B34C6, 3 + .else + msgbox MtChimney_Text_1B3E7A, 3 + .endif + end + +MtChimney_EventScript_15D16B:: @ 815D16B + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B3503, 3 + .else + msgbox MtChimney_Text_1B3EBA, 3 + .endif + end + +MtChimney_EventScript_15D174:: @ 815D174 + .ifdef SAPPHIRE + msgbox MtChimney_Text_1B37B4, 3 + .else + msgbox MtChimney_Text_1B41B0, 3 + .endif + end + +MtChimney_EventScript_15D17D:: @ 815D17D + lockall + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0 + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6 + msgbox MtChimney_Text_195870, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq MtChimney_EventScript_15D1BC + msgbox MtChimney_Text_1958C6, 4 + giveitem_std ITEM_METEORITE + setflag FLAG_RECEIVED_METEORITE + releaseall + end + +MtChimney_EventScript_15D1BC:: @ 815D1BC + msgbox MtChimney_Text_1958FC, 4 + releaseall + end + +MtChimney_EventScript_15D1C6:: @ 815D1C6 + msgbox MtChimney_Text_195920, 4 + releaseall + end + +MtChimney_EventScript_15D1D0:: @ 815D1D0 + msgbox MtChimney_Text_195806, 4 + releaseall + end + +MtChimney_EventScript_15D1DA:: @ 815D1DA + msgbox MtChimney_Text_19595C, 3 + end + +MtChimney_EventScript_15D1E3:: @ 815D1E3 + trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq MtChimney_EventScript_15D20A + msgbox MtChimney_Text_195A04, 6 + end + +MtChimney_EventScript_15D20A:: @ 815D20A + trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + msgbox MtChimney_Text_195AD9, 6 + end + +MtChimney_EventScript_15D221:: @ 815D221 + trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + msgbox MtChimney_Text_195B84, 6 + end + +MtChimney_EventScript_15D238:: @ 815D238 + trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + msgbox MtChimney_Text_195C31, 6 + end + +MtChimney_EventScript_15D24F:: @ 815D24F + trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + msgbox MtChimney_Text_195D5C, 6 + end diff --git a/data/maps/MtChimney/text.inc b/data/maps/MtChimney/text.inc new file mode 100644 index 000000000..8641bde00 --- /dev/null +++ b/data/maps/MtChimney/text.inc @@ -0,0 +1,107 @@ +MtChimney_Text_195760:: @ 8195760 + .string "LAVA COOKIES are MT. CHIMNEY’s local\n" + .string "specialty.\p" + .string "Try one. It’s just ¥200.$" + +MtChimney_Text_1957A9:: @ 81957A9 + .string "Thank you, dear!$" + +MtChimney_Text_1957BA:: @ 81957BA + .string "Oh, dear. You can’t buy a thing if\n" + .string "you’ve not got the money.$" + +MtChimney_Text_1957F7:: @ 81957F7 + .string "Oh, fine then.$" + +MtChimney_Text_195806:: @ 8195806 + .string "A METEORITE is fitted on a mysterious\n" + .string "machine...\p" + .string "The machine seems to be storing\n" + .string "energy in the METEORITE.$" + +MtChimney_Text_195870:: @ 8195870 + .string "A METEORITE is fitted on a mysterious\n" + .string "machine...\p" + .string "Do you want to remove the METEORITE?$" + +MtChimney_Text_1958C6:: @ 81958C6 + .string "{PLAYER} removed the METEORITE from\n" + .string "the mysterious machine.$" + +MtChimney_Text_1958FC:: @ 81958FC + .string "{PLAYER} left the METEORITE where\n" + .string "it was.$" + +MtChimney_Text_195920:: @ 8195920 + .string "This mysterious machine...\n" + .string "It makes no response whatsoever.$" + +MtChimney_Text_19595C:: @ 819595C + .string "{0x7A} JAGGED PATH\n" + .string "LAVARIDGE TOWN AHEAD$" + +MtChimney_Text_19597F:: @ 819597F + .string "I’ve been to the hot springs and\n" + .string "refreshed my tired bones.\l" + .string "Right now I’m feeling strong!$" + +MtChimney_Text_1959D8:: @ 81959D8 + .string "Oh, my goodness.\n" + .string "Now, aren’t you something!$" + +MtChimney_Text_195A04:: @ 8195A04 + .string "Well, well, I’ve lost. I can’t call\n" + .string "myself an EXPERT now, can I?$" + +MtChimney_Text_195A45:: @ 8195A45 + .string "If you can mesh your heart with those\n" + .string "of your POKéMON, why, you should be\l" + .string "able to achieve great things.$" + +MtChimney_Text_195AAD:: @ 8195AAD + .string "Oh, my goodness.\n" + .string "Now, aren’t you something!$" + +MtChimney_Text_195AD9:: @ 8195AD9 + .string "Perhaps your heart has become one\n" + .string "with the hearts of your POKéMON.$" + +MtChimney_Text_195B1C:: @ 8195B1C + .string "I’ve got the fire in me, baby.\n" + .string "I can’t stand it! I have to battle!$" + +MtChimney_Text_195B5F:: @ 8195B5F + .string "Ooh, that was a scorching-hot match!$" + +MtChimney_Text_195B84:: @ 8195B84 + .string "The heat of MT. CHIMNEY lights my\n" + .string "fire, baby!$" + +MtChimney_Text_195BB2:: @ 8195BB2 + .string "I’ve finally made it to MT. CHIMNEY.\n" + .string "I want to make my POKéMON battle!$" + +MtChimney_Text_195BF9:: @ 8195BF9 + .string "The way you battle...\n" + .string "It’s like a MT. CHIMNEY eruption!$" + +MtChimney_Text_195C31:: @ 8195C31 + .string "Like I said, I’ve finally made it to\n" + .string "MT. CHIMNEY. It would be a shame if\l" + .string "I only do a little sightseeing...\p" + .string "I want to get in some battles and buy\n" + .string "COOKIES as souvenirs.$" + +MtChimney_Text_195CD8:: @ 8195CD8 + .string "Since I bathed in the hot springs,\n" + .string "I’ve been feeling great!\l" + .string "I’m sure I’m going to win!$" + +MtChimney_Text_195D2F:: @ 8195D2F + .string "Yowch!\n" + .string "I’m getting a chill out of the water.$" + +MtChimney_Text_195D5C:: @ 8195D5C + .string "I’ll have to take another dip in the\n" + .string "hot springs. Want to join me?\p" + .string "Just joking!$" diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc index e5d69ee75..e5d69ee75 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index f5207578b..9584ed7a2 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,9 +1,9 @@ MtChimney_CableCarStation:: @ 8306CAC - .4byte MtChimney_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 119 .byte 56 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc new file mode 100644 index 000000000..7161e8800 --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -0,0 +1,87 @@ +MtChimney_CableCarStation_MapScripts:: @ 815C0FA + map_script 3, MtChimney_CableCarStation_MapScript1_15C105 + map_script 2, MtChimney_CableCarStation_MapScript2_15C11D + .byte 0 + +MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 + compare VAR_CABLE_CAR_STATION_STATE, 1 + call_if_eq MtChimney_CableCarStation_EventScript_15C111 + end + +MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 + setobjectxyperm 1, 5, 4 + setobjectmovementtype 1, 10 + return + +MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_15C127 + .2byte 0 + +MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 + lockall + applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 + applymovement 1, MtChimney_CableCarStation_Movement_15C1AA + waitmovement 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 + releaseall + end + +MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B + lock + faceplayer + msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq MtChimney_CableCarStation_EventScript_15C16C + compare RESULT, NO + goto_if_eq MtChimney_CableCarStation_EventScript_15C19B + end + +MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C + msgbox MtChimney_CableCarStation_Text_1925A9, 4 + closemessage + applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 + applymovement 255, MtChimney_CableCarStation_Movement_15C1AF + waitmovement 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 2 + incrementgamestat GAME_STAT_RODE_CABLE_CAR + special CableCarWarp + special CableCar + waitstate + release + end + +MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B + msgbox MtChimney_CableCarStation_Text_1925BF, 4 + release + end + +MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5 + walk_up + walk_up + walk_left + walk_in_place_fastest_right + end_movement + +MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA + delay_16 + walk_right + walk_down + walk_down + end_movement + +MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF + walk_up + walk_up + walk_up + delay_16 + end_movement + +MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4 + walk_down + walk_down + walk_down + delay_16 + end_movement diff --git a/data/maps/MtChimney_CableCarStation/text.inc b/data/maps/MtChimney_CableCarStation/text.inc new file mode 100644 index 000000000..03e2f7a2a --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/text.inc @@ -0,0 +1,10 @@ +MtChimney_CableCarStation_Text_19256A:: @ 819256A + .string "The CABLE CAR is ready to go down.\n" + .string "Would you like to be on it?$" + +MtChimney_CableCarStation_Text_1925A9:: @ 81925A9 +Route112_CableCarStation_Text_1925A9:: @ 81925A9 + .string "Please step this way.$" + +MtChimney_CableCarStation_Text_1925BF:: @ 81925BF + .string "Please ride with us another time.$" diff --git a/data/maps/MtPyre_1F/border.bin b/data/maps/MtPyre_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc index f547a9a98..f547a9a98 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/MtPyre_1F/events.inc diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index cfdff9591..a75471d53 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,9 +1,9 @@ MtPyre_1F:: @ 8306F14 - .4byte MtPyre_1F_MapAttributes + .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 138 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_1F/map.bin b/data/maps/MtPyre_1F/map.bin deleted file mode 100644 index 60b992a73..000000000 --- a/data/maps/MtPyre_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222&7&72222222 2222662666266'7222266266626622222222226622222222222222222222666266&7622222666266&762222222222222662222222222266222222222&7622662222266&7622662222266222222222222
\ No newline at end of file diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc new file mode 100644 index 000000000..f34c31da0 --- /dev/null +++ b/data/maps/MtPyre_1F/scripts.inc @@ -0,0 +1,27 @@ +MtPyre_1F_MapScripts:: @ 815D322 + .byte 0 + +MtPyre_1F_EventScript_15D323:: @ 815D323 + lock + faceplayer + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 + msgbox MtPyre_1F_Text_196151, 4 + giveitem_std ITEM_CLEANSE_TAG + compare RESULT, 0 + goto_if_eq MtPyre_1F_EventScript_1A029B + setflag FLAG_RECEIVED_CLEANSE_TAG + release + end + +MtPyre_1F_EventScript_15D352:: @ 815D352 + msgbox MtPyre_1F_Text_1961CE, 4 + release + end + +MtPyre_1F_EventScript_15D35C:: @ 815D35C + msgbox MtPyre_1F_Text_196218, 2 + end + +MtPyre_1F_EventScript_15D365:: @ 815D365 + msgbox MtPyre_1F_Text_196283, 2 + end diff --git a/data/maps/MtPyre_1F/text.inc b/data/maps/MtPyre_1F/text.inc new file mode 100644 index 000000000..84e1cef07 --- /dev/null +++ b/data/maps/MtPyre_1F/text.inc @@ -0,0 +1,19 @@ +MtPyre_1F_Text_196151:: @ 8196151 + .string "All sorts of beings wander the slopes\n" + .string "of MT. PYRE...\p" + .string "There is no telling what may happen.\n" + .string "Take this. It’s for your own good.$" + +MtPyre_1F_Text_1961CE:: @ 81961CE + .string "Have a POKéMON hold that\n" + .string "CLEANSE TAG.\p" + .string "It will help ward off wild POKéMON.$" + +MtPyre_1F_Text_196218:: @ 8196218 + .string "Did you come to pay your respect\n" + .string "to the spirits of departed POKéMON?\p" + .string "You must care for your POKéMON a lot.$" + +MtPyre_1F_Text_196283:: @ 8196283 + .string "This is the final resting place of my\n" + .string "ZIGZAGOON. I cherished it...$" diff --git a/data/maps/MtPyre_2F/border.bin b/data/maps/MtPyre_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc index 9f8041366..9f8041366 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/MtPyre_2F/events.inc diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 914fdabd4..081adb3e9 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,9 +1,9 @@ MtPyre_2F:: @ 8306F30 - .4byte MtPyre_2F_MapAttributes + .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 139 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_2F/map.bin b/data/maps/MtPyre_2F/map.bin deleted file mode 100644 index 628d2262e..000000000 --- a/data/maps/MtPyre_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222&&2222&2222222222&2222222&222222222222222222222222222&222222&2222232222222222222&22222&22222
\ No newline at end of file diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc new file mode 100644 index 000000000..1d2368597 --- /dev/null +++ b/data/maps/MtPyre_2F/scripts.inc @@ -0,0 +1,33 @@ +MtPyre_2F_MapScripts:: @ 815D36E + map_script 2, MtPyre_2F_MapScript2_1C6BB5 + map_script 3, MtPyre_2F_MapScript1_1C6BBF + map_script 5, MtPyre_2F_MapScript1_15D37E + .byte 0 + +MtPyre_2F_MapScript1_15D37E:: @ 815D37E + setstepcallback 7 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 + end + +MtPyre_2F_EventScript_15D389:: @ 815D389 + msgbox MtPyre_2F_Text_1965BB, 2 + end + +MtPyre_2F_EventScript_15D392:: @ 815D392 + msgbox MtPyre_2F_Text_196600, 2 + end + +MtPyre_2F_EventScript_15D39B:: @ 815D39B + trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + msgbox MtPyre_2F_Text_1966E7, 6 + end + +MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 + trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + msgbox MtPyre_2F_Text_196368, 6 + end + +MtPyre_2F_EventScript_15D3CD:: @ 815D3CD + trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + msgbox MtPyre_2F_Text_196504, 6 + end diff --git a/data/maps/MtPyre_2F/text.inc b/data/maps/MtPyre_2F/text.inc new file mode 100644 index 000000000..28c57d0ba --- /dev/null +++ b/data/maps/MtPyre_2F/text.inc @@ -0,0 +1,63 @@ +MtPyre_2F_Text_1962C6:: @ 81962C6 + .string "LUKE: We’re here on a dare.\p" + .string "Heheh, if I show her how cool I am,\n" + .string "she’ll fall for me. I know it!\p" + .string "I know! I’ll cream you and show her\n" + .string "how cool I am!$" + +MtPyre_2F_Text_196358:: @ 8196358 + .string "LUKE: Whoopsie!$" + +MtPyre_2F_Text_196368:: @ 8196368 + .string "LUKE: Well, we lost but that’s okay!\n" + .string "I’m right here by your side.\l" + .string "We’ll make it through this dare!$" + +MtPyre_2F_Text_1963CB:: @ 81963CB + .string "LUKE: If you want to take me on, bring\n" + .string "some more POKéMON.\p" + .string "If you don’t, I won’t be able to show\n" + .string "off how cool I am to my girl!$" + +MtPyre_2F_Text_196449:: @ 8196449 + .string "DEZ: I came here on a dare with my\n" + .string "boyfriend.\p" + .string "It’s really scary, but I’m with my\n" + .string "boyfriend. It’s okay.\p" + .string "I know! I’ll get my boyfriend to look\n" + .string "cool by beating you!$" + +MtPyre_2F_Text_1964EB:: @ 81964EB + .string "DEZ: Waaaah! I’m scared!$" + +MtPyre_2F_Text_196504:: @ 8196504 + .string "DEZ: We’re lovey-dovey, so we don’t\n" + .string "care if we lose!$" + +MtPyre_2F_Text_196539:: @ 8196539 + .string "DEZ: If you want to challenge us, you\n" + .string "should bring at least two POKéMON.\p" + .string "My boyfriend’s strong.\n" + .string "Just one POKéMON won’t do at all.$" + +MtPyre_2F_Text_1965BB:: @ 81965BB + .string "Memories of my darling SKITTY...\n" + .string "My eyes overflow thinking about it.$" + +MtPyre_2F_Text_196600:: @ 8196600 + .string "Ooch, ouch... There are holes in the\n" + .string "ground here and there.\p" + .string "I didn’t notice and took a tumble from\n" + .string "the floor above.$" + +MtPyre_2F_Text_196674:: @ 8196674 + .string "Hey! Are you searching for POKéMON?\n" + .string "You came along after me! You’re rude!$" + +MtPyre_2F_Text_1966BE:: @ 81966BE + .string "Ayieeeeh!\n" + .string "I’m sorry, forgive me, please!$" + +MtPyre_2F_Text_1966E7:: @ 81966E7 + .string "People don’t come here often, so\n" + .string "I thought there’d be rare POKéMON.$" diff --git a/data/maps/MtPyre_3F/border.bin b/data/maps/MtPyre_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc index fbaf6fa4b..fbaf6fa4b 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/MtPyre_3F/events.inc diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index b4a59adbd..253facf61 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,9 +1,9 @@ MtPyre_3F:: @ 8306F4C - .4byte MtPyre_3F_MapAttributes + .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 140 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_3F/map.bin b/data/maps/MtPyre_3F/map.bin deleted file mode 100644 index fabbe8cb3..000000000 --- a/data/maps/MtPyre_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -22&2222&&&2222&&2222222222222222222&222222&222222222222222222222&222&2222222222222222222222222323
\ No newline at end of file diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc new file mode 100644 index 000000000..ea8bda7b5 --- /dev/null +++ b/data/maps/MtPyre_3F/scripts.inc @@ -0,0 +1,12 @@ +MtPyre_3F_MapScripts:: @ 815D3E8 + .byte 0 + +MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 + trainerbattle 0, OPPONENT_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + msgbox MtPyre_3F_Text_1967B5, 6 + end + +MtPyre_3F_EventScript_15D400:: @ 815D400 + trainerbattle 0, OPPONENT_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + msgbox MtPyre_3F_Text_196842, 6 + end diff --git a/data/maps/MtPyre_3F/text.inc b/data/maps/MtPyre_3F/text.inc new file mode 100644 index 000000000..c714c97a0 --- /dev/null +++ b/data/maps/MtPyre_3F/text.inc @@ -0,0 +1,27 @@ +MtPyre_3F_Text_19672B:: @ 819672B + .string "The rich atmosphere of the mountain\n" + .string "has elevated my psychic power!\p" + .string "A mere child like you...\n" + .string "You dream of winning?$" + +MtPyre_3F_Text_19679D:: @ 819679D + .string "I drown in self-pity...$" + +MtPyre_3F_Text_1967B5:: @ 81967B5 + .string "My psychic powers have surely\n" + .string "grown several times, but...$" + +MtPyre_3F_Text_1967EF:: @ 81967EF + .string "Ahahahaha!\p" + .string "This is no place for children, least\n" + .string "of all you!$" + +MtPyre_3F_Text_19682B:: @ 819682B + .string "I lost that cleanly...$" + +MtPyre_3F_Text_196842:: @ 8196842 + .string "This means my training is still not\n" + .string "enough...\p" + .string "I’ve got to keep working toward the\n" + .string "summit...\p" + .string "Go, me!$" 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/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc index 9de527f2d..9de527f2d 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/MtPyre_4F/events.inc 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 &&222&'&2222002200&222&&&&&222&&2222222222222222222222&226223222&22222&232222222222
\ 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...$" diff --git a/data/maps/MtPyre_5F/border.bin b/data/maps/MtPyre_5F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_5F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc index cbf1b64b4..cbf1b64b4 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/MtPyre_5F/events.inc diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 0eb7f7bba..dc8d93e29 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,9 +1,9 @@ MtPyre_5F:: @ 8306F84 - .4byte MtPyre_5F_MapAttributes + .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 142 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_5F/map.bin b/data/maps/MtPyre_5F/map.bin deleted file mode 100644 index 12fbeeb7e..000000000 --- a/data/maps/MtPyre_5F/map.bin +++ /dev/null @@ -1 +0,0 @@ -2&222&2&2222222&222&&&&&222&&2222222222222222222222&2222222226223&222222222&222222222223
\ No newline at end of file diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc new file mode 100644 index 000000000..9adb249f0 --- /dev/null +++ b/data/maps/MtPyre_5F/scripts.inc @@ -0,0 +1,7 @@ +MtPyre_5F_MapScripts:: @ 815D42F + .byte 0 + +MtPyre_5F_EventScript_15D430:: @ 815D430 + trainerbattle 0, OPPONENT_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + msgbox MtPyre_5F_Text_1969AC, 6 + end diff --git a/data/maps/MtPyre_5F/text.inc b/data/maps/MtPyre_5F/text.inc new file mode 100644 index 000000000..c70211067 --- /dev/null +++ b/data/maps/MtPyre_5F/text.inc @@ -0,0 +1,14 @@ +MtPyre_5F_Text_196939:: @ 8196939 + .string "I love all things horrifying...\n" + .string "It’s like a disease...\p" + .string "When I’m here...\n" + .string "I shiver with fear...$" + +MtPyre_5F_Text_196997:: @ 8196997 + .string "Losing, I dislike...$" + +MtPyre_5F_Text_1969AC:: @ 81969AC + .string "I want to see dreadful things...\n" + .string "I can’t leave...\p" + .string "Stay...\n" + .string "Won’t you stay with me?$" diff --git a/data/maps/MtPyre_6F/border.bin b/data/maps/MtPyre_6F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/MtPyre_6F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc index d65a3a8c6..d65a3a8c6 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/MtPyre_6F/events.inc diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3cab722cd..986c3b538 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,9 +1,9 @@ MtPyre_6F:: @ 8306FA0 - .4byte MtPyre_6F_MapAttributes + .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 143 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_6F/map.bin b/data/maps/MtPyre_6F/map.bin deleted file mode 100644 index 54f599ec2..000000000 --- a/data/maps/MtPyre_6F/map.bin +++ /dev/null @@ -1 +0,0 @@ -2&222&&222222&22222226622222222262222&2222226622222&22&&272&&22&22222222222232222222222222222222222&2222222
\ No newline at end of file diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc new file mode 100644 index 000000000..ae09300a3 --- /dev/null +++ b/data/maps/MtPyre_6F/scripts.inc @@ -0,0 +1,15 @@ +MtPyre_6F_MapScripts:: @ 815D447 + .byte 0 + +MtPyre_6F_EventScript_15D448:: @ 815D448 + trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq MtPyre_6F_EventScript_15D46F + msgbox MtPyre_6F_Text_196A4C, 6 + end + +MtPyre_6F_EventScript_15D46F:: @ 815D46F + trainerbattle 5, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + msgbox MtPyre_6F_Text_196AC9, 6 + end diff --git a/data/maps/MtPyre_6F/text.inc b/data/maps/MtPyre_6F/text.inc new file mode 100644 index 000000000..711c87570 --- /dev/null +++ b/data/maps/MtPyre_6F/text.inc @@ -0,0 +1,21 @@ +MtPyre_6F_Text_1969FE:: @ 81969FE + .string "When I’m here...\n" + .string "A curious power flows into me...$" + +MtPyre_6F_Text_196A30:: @ 8196A30 + .string "The power is ebbing away...$" + +MtPyre_6F_Text_196A4C:: @ 8196A4C + .string "Perhaps the power is from the spirits\n" + .string "of POKéMON in fitful sleep here...$" + +MtPyre_6F_Text_196A95:: @ 8196A95 + .string "Behind you...\n" + .string "What is it...$" + +MtPyre_6F_Text_196AB1:: @ 8196AB1 + .string "Something faded away...$" + +MtPyre_6F_Text_196AC9:: @ 8196AC9 + .string "The POKéMON at rest here...\n" + .string "Sometimes, they play...$" diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/maps/MtPyre_Exterior/border.bin Binary files differdeleted file mode 100644 index 1d7df4a00..000000000 --- a/data/maps/MtPyre_Exterior/border.bin +++ /dev/null diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc index 48593481e..48593481e 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/MtPyre_Exterior/events.inc diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 543e090f0..0c115cd95 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,9 +1,9 @@ MtPyre_Exterior:: @ 8306FBC - .4byte MtPyre_Exterior_MapAttributes + .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 - .2byte BGM_MACHUPI + .2byte MUS_MACHUPI .2byte 303 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/maps/MtPyre_Exterior/map.bin Binary files differdeleted file mode 100644 index 7ab1e0461..000000000 --- a/data/maps/MtPyre_Exterior/map.bin +++ /dev/null diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc new file mode 100644 index 000000000..f8b4141d7 --- /dev/null +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -0,0 +1,27 @@ +MtPyre_Exterior_MapScripts:: @ 815D486 + map_script 3, MtPyre_Exterior_MapScript1_15D48C + .byte 0 + +MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C + call MtPyre_Exterior_EventScript_15D492 + end + +MtPyre_Exterior_EventScript_15D492:: @ 815D492 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 + goto_if_lt MtPyre_Exterior_EventScript_15D4A3 + return + +MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 + setweather WEATHER_FOG_1 + return + +MtPyre_Exterior_EventScript_15D4A7:: @ 815D4A7 + setweather WEATHER_FOG_1 + doweather + end + +MtPyre_Exterior_EventScript_15D4AC:: @ 815D4AC + setweather WEATHER_SUNNY + doweather + end diff --git a/data/maps/MtPyre_Summit/border.bin b/data/maps/MtPyre_Summit/border.bin Binary files differdeleted file mode 100644 index 1d7df4a00..000000000 --- a/data/maps/MtPyre_Summit/border.bin +++ /dev/null diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc index 3ddc6f36b..3ddc6f36b 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/MtPyre_Summit/events.inc diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index e07d849a6..fc8a0a82e 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,9 +1,9 @@ MtPyre_Summit:: @ 8306FD8 - .4byte MtPyre_Summit_MapAttributes + .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 - .2byte BGM_MACHUPI + .2byte MUS_MACHUPI .2byte 304 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_Summit/map.bin b/data/maps/MtPyre_Summit/map.bin Binary files differdeleted file mode 100644 index 1de8bd5ea..000000000 --- a/data/maps/MtPyre_Summit/map.bin +++ /dev/null diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc new file mode 100644 index 000000000..36b72ad12 --- /dev/null +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -0,0 +1,365 @@ +MtPyre_Summit_MapScripts:: @ 815D4B1 + map_script 3, MtPyre_Summit_MapScript1_15D4B7 + .byte 0 + +MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 + call MtPyre_Summit_EventScript_1A0196 + end + +MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD + lockall + setvar VAR_SPECIAL_8, 0 + goto MtPyre_Summit_EventScript_15D4E1 + end + +MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 + lockall + setvar VAR_SPECIAL_8, 1 + goto MtPyre_Summit_EventScript_15D4E1 + end + +MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 + lockall + setvar VAR_SPECIAL_8, 2 + goto MtPyre_Summit_EventScript_15D4E1 + end + +MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 + applymovement 255, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_1A0845 + waitmovement 0 + delay 50 + compare VAR_SPECIAL_8, 0 + call_if_eq MtPyre_Summit_EventScript_15D593 + compare VAR_SPECIAL_8, 1 + call_if_eq MtPyre_Summit_EventScript_15D59E + compare VAR_SPECIAL_8, 2 + call_if_eq MtPyre_Summit_EventScript_15D59F + .ifdef SAPPHIRE + msgbox UnknownString_81B52B0, 4 + .else + msgbox MtPyre_Summit_Text_1B5EEC, 4 + .endif + closemessage + fadescreen 1 + removeobject 2 + removeobject 4 + removeobject 5 + removeobject 6 + setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + fadescreen 0 + delay 20 + call MtPyre_Summit_EventScript_15D57A + compare VAR_SPECIAL_8, 0 + call_if_eq MtPyre_Summit_EventScript_15D5AA + compare VAR_SPECIAL_8, 1 + call_if_eq MtPyre_Summit_EventScript_15D5BF + compare VAR_SPECIAL_8, 2 + call_if_eq MtPyre_Summit_EventScript_15D5CA + .ifdef SAPPHIRE + msgbox UnknownString_81B53AB, 4 + .else + msgbox MtPyre_Summit_Text_1B5FE6, 4 + .endif + giveitem_std ITEM_RED_OR_BLUE_ORB + setflag FLAG_RECEIVED_RED_OR_BLUE_ORB + releaseall + end + +MtPyre_Summit_EventScript_15D57A:: @ 815D57A + setflag FLAG_MT_PYRE_ORB_STOLEN + setvar VAR_SLATEPORT_STATE, 1 + clearflag FLAG_HIDE_STERN_SLATEPORT + clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT + setvar VAR_SLATEPORT_HARBOR_STATE, 1 + setvar VAR_MT_PYRE_STATE, 1 + return + +MtPyre_Summit_EventScript_15D593:: @ 815D593 + applymovement 2, MtPyre_Summit_Movement_15D5E9 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D59E:: @ 815D59E + return + +MtPyre_Summit_EventScript_15D59F:: @ 815D59F + applymovement 2, MtPyre_Summit_Movement_15D5EC + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA + applymovement 3, MtPyre_Summit_Movement_15D5DF + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_1A0843 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF + applymovement 3, MtPyre_Summit_Movement_15D5E3 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA + applymovement 3, MtPyre_Summit_Movement_15D5E5 + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_1A083F + waitmovement 0 + return + +MtPyre_Summit_Movement_15D5DF:: @ 815D5DF + walk_down + walk_down + walk_in_place_fastest_left + end_movement + +MtPyre_Summit_Movement_15D5E3:: @ 815D5E3 + walk_down + end_movement + +MtPyre_Summit_Movement_15D5E5:: @ 815D5E5 + walk_down + walk_down + walk_in_place_fastest_right + end_movement + +MtPyre_Summit_Movement_15D5E9:: @ 815D5E9 + walk_left + walk_in_place_fastest_down + end_movement + +MtPyre_Summit_Movement_15D5EC:: @ 815D5EC + walk_right + walk_in_place_fastest_down + end_movement + +MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF + lock + faceplayer + .ifdef SAPPHIRE + msgbox UnknownString_81B586F, MSGBOX_YESNO + .else + msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO + .endif + compare RESULT, YES + call_if_eq MtPyre_Summit_EventScript_15D611 + compare RESULT, NO + call_if_eq MtPyre_Summit_EventScript_15D61A + release + end + +MtPyre_Summit_EventScript_15D611:: @ 815D611 + .ifdef SAPPHIRE + msgbox UnknownString_81B5992, 4 + .else + msgbox MtPyre_Summit_Text_1B65D6, 4 + .endif + return + +MtPyre_Summit_EventScript_15D61A:: @ 815D61A + .ifdef SAPPHIRE + msgbox UnknownString_81B5BD7, 4 + .else + msgbox MtPyre_Summit_Text_1B6823, 4 + .endif + return + +MtPyre_Summit_EventScript_15D623:: @ 815D623 + lock + faceplayer + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA + .ifdef SAPPHIRE + msgbox UnknownString_81B54BE, 4 + .else + msgbox MtPyre_Summit_Text_1B60F9, 4 + .endif + release + end + +MtPyre_Summit_EventScript_15D64A:: @ 815D64A + .ifdef SAPPHIRE + msgbox UnknownString_81B5647, MSGBOX_YESNO + .else + msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO + .endif + compare RESULT, YES + goto_if_eq MtPyre_Summit_EventScript_15D669 + compare RESULT, NO + goto_if_eq MtPyre_Summit_EventScript_15D69B + end + +MtPyre_Summit_EventScript_15D669:: @ 815D669 + setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB + call MtPyre_Summit_EventScript_1A067F + closemessage + applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + delay 40 + applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839 + waitmovement 0 + delay 10 + .ifdef SAPPHIRE + msgbox UnknownString_81B5762, 4 + .else + msgbox MtPyre_Summit_Text_1B639C, 4 + .endif + setflag FLAG_RETURNED_RED_OR_BLUE_ORB + release + end + +MtPyre_Summit_EventScript_15D69B:: @ 815D69B + .ifdef SAPPHIRE + msgbox UnknownString_81B56AB, MSGBOX_YESNO + .else + msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO + .endif + compare RESULT, YES + goto_if_eq MtPyre_Summit_EventScript_15D669 + compare RESULT, NO + goto_if_eq MtPyre_Summit_EventScript_15D69B + end + +MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA + .ifdef SAPPHIRE + msgbox UnknownString_81B5540, 4 + .else + msgbox MtPyre_Summit_Text_1B617B, 4 + .endif + release + end + +MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 + .ifdef SAPPHIRE + msgbox UnknownString_81B57BE, 4 + .else + msgbox MtPyre_Summit_Text_1B63F8, 4 + .endif + release + end + +MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE + lockall + setvar VAR_SPECIAL_8, 0 + goto MtPyre_Summit_EventScript_15D6F2 + end + +MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA + lockall + setvar VAR_SPECIAL_8, 1 + goto MtPyre_Summit_EventScript_15D6F2 + end + +MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 + lockall + setvar VAR_SPECIAL_8, 2 + goto MtPyre_Summit_EventScript_15D6F2 + end + +MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 + applymovement 255, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_1A0845 + waitmovement 0 + delay 50 + compare VAR_SPECIAL_8, 0 + call_if_eq MtPyre_Summit_EventScript_15D75E + compare VAR_SPECIAL_8, 1 + call_if_eq MtPyre_Summit_EventScript_15D769 + compare VAR_SPECIAL_8, 2 + call_if_eq MtPyre_Summit_EventScript_15D774 + .ifdef SAPPHIRE + msgbox UnknownString_81B5BFC, 4 + .else + msgbox MtPyre_Summit_Text_1B6848, 4 + .endif + closemessage + compare VAR_SPECIAL_8, 0 + call_if_eq MtPyre_Summit_EventScript_15D77F + compare VAR_SPECIAL_8, 1 + call_if_eq MtPyre_Summit_EventScript_15D78A + compare VAR_SPECIAL_8, 2 + call_if_eq MtPyre_Summit_EventScript_15D795 + removeobject 2 + setvar VAR_MT_PYRE_STATE, 3 + releaseall + end + +MtPyre_Summit_EventScript_15D75E:: @ 815D75E + applymovement 2, MtPyre_Summit_Movement_15D7A0 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D769:: @ 815D769 + applymovement 2, MtPyre_Summit_Movement_15D7A3 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D774:: @ 815D774 + applymovement 2, MtPyre_Summit_Movement_15D7A4 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D77F:: @ 815D77F + applymovement 2, MtPyre_Summit_Movement_15D7A7 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D78A:: @ 815D78A + applymovement 2, MtPyre_Summit_Movement_15D7B0 + waitmovement 0 + return + +MtPyre_Summit_EventScript_15D795:: @ 815D795 + applymovement 2, MtPyre_Summit_Movement_15D7B9 + waitmovement 0 + return + +MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 + walk_left + walk_in_place_fastest_down + end_movement + +MtPyre_Summit_Movement_15D7A3:: @ 815D7A3 + end_movement + +MtPyre_Summit_Movement_15D7A4:: @ 815D7A4 + walk_right + walk_in_place_fastest_down + end_movement + +MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/maps/NewMauville_Entrance/border.bin Binary files differdeleted file mode 100644 index 4531975c7..000000000 --- a/data/maps/NewMauville_Entrance/border.bin +++ /dev/null diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc index 8967a1df0..8967a1df0 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/NewMauville_Entrance/events.inc diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 28ac26ccf..7ca1c1b96 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,9 +1,9 @@ NewMauville_Entrance:: @ 8307320 - .4byte NewMauville_Entrance_MapAttributes + .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 185 .byte 62 .byte 0 diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/maps/NewMauville_Entrance/map.bin deleted file mode 100644 index 1e3f471e8..000000000 --- a/data/maps/NewMauville_Entrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -t||||ut2suu33333suu33333suu33333suu33333suu33333suslllllll
\ No newline at end of file diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc new file mode 100644 index 000000000..1c8bdfb3f --- /dev/null +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -0,0 +1,50 @@ +NewMauville_Entrance_MapScripts:: @ 815E48A + map_script 1, NewMauville_Entrance_MapScript1_15E495 + map_script 3, NewMauville_Entrance_MapScript1_15E4D8 + .byte 0 + +NewMauville_Entrance_MapScript1_15E495:: @ 815E495 + compare VAR_NEW_MAUVILLE_STATE, 0 + call_if_eq NewMauville_Entrance_EventScript_15E4A1 + end + +NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 + setmetatile 3, 0, 788, 1 + setmetatile 4, 0, 789, 1 + setmetatile 5, 0, 790, 1 + setmetatile 3, 1, 796, 1 + setmetatile 4, 1, 797, 1 + setmetatile 5, 1, 798, 1 + return + +NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 + setflag FLAG_LANDMARK_NEW_MAUVILLE + end + +NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC + lockall + applymovement 255, NewMauville_Entrance_Movement_1A0841 + waitmovement 0 + msgbox NewMauville_Entrance_Text_1982C0, 4 + checkitem ITEM_BASEMENT_KEY, 1 + compare RESULT, 0 + goto_if_eq NewMauville_Entrance_EventScript_15E55D + msgbox NewMauville_Entrance_Text_1982D4, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq NewMauville_Entrance_EventScript_15E55D + msgbox NewMauville_Entrance_Text_1982EA, 4 + setmetatile 3, 0, 707, 0 + setmetatile 4, 0, 708, 0 + setmetatile 5, 0, 709, 0 + setmetatile 3, 1, 715, 1 + setmetatile 4, 1, 716, 0 + setmetatile 5, 1, 717, 1 + special DrawWholeMapView + playse SE_BAN + setvar VAR_NEW_MAUVILLE_STATE, 1 + releaseall + end + +NewMauville_Entrance_EventScript_15E55D:: @ 815E55D + releaseall + end diff --git a/data/maps/NewMauville_Entrance/text.inc b/data/maps/NewMauville_Entrance/text.inc new file mode 100644 index 000000000..36739ec3e --- /dev/null +++ b/data/maps/NewMauville_Entrance/text.inc @@ -0,0 +1,9 @@ +NewMauville_Entrance_Text_1982C0:: @ 81982C0 + .string "The door is closed.$" + +NewMauville_Entrance_Text_1982D4:: @ 81982D4 + .string "Use the BASEMENT KEY?$" + +NewMauville_Entrance_Text_1982EA:: @ 81982EA + .string "{PLAYER} used the BASEMENT KEY.\p" + .string "The door opened!$" diff --git a/data/maps/NewMauville_Inside/border.bin b/data/maps/NewMauville_Inside/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/NewMauville_Inside/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc index be85150e3..be85150e3 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/NewMauville_Inside/events.inc diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 9771d7ec7..44a3d1895 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,9 +1,9 @@ NewMauville_Inside:: @ 830733C - .4byte NewMauville_Inside_MapAttributes + .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 186 .byte 62 .byte 0 diff --git a/data/maps/NewMauville_Inside/map.bin b/data/maps/NewMauville_Inside/map.bin deleted file mode 100644 index 78d1e39ce..000000000 --- a/data/maps/NewMauville_Inside/map.bin +++ /dev/null @@ -1 +0,0 @@ -h jh jp'''''rp''rpu222u2/2/26/2222 2u2226u22266rp}22727272726727222'''''''}222266}26666}2266rp}2'''''''}22/2/2/2/2/26/2/2/2~22222/2~26666}222/2rh }2jp}22727272727267272222222222/2/2/2~2222rp'}2rp}2''''''''}22222222>22222rpu22/2~2222rh }2 jp}22222222222ry2o2222o272p}2'rxy27272727272727272727272727272zp'w}2w'rp2/2~22/222r'''''''''''''''pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272zy2722227272'''''''p}2''rh jp66u2~22/2/2rp''''rp66}22222rpu222u2/2222u26622rpu2/2~22222 }22222222}266}22rp}222222'}22222222}22/2~22rp2222222/26/2~222222222~2222.2rpX6266222726222272727272272o27272o272pX62222''}22'''''w''ry2o272o272o272p}222/2/2/2/2u2/2/2/222r p'w'wwrp}22226222}222222 `''a jpu2/2/2/22/22rp}222222}222222'u222/222'''rp}22 27222272722222222/26/2~2222222/2/2/2rp6222''}2'}22222726222222227222rp2622222/26/2/2/2/2~2222u2/2~2222''}222222'}2rp2222227262222222}222222rxy27272727272zp}2rp222''}222222~222222r''''''p}2rxy222227272zxy272727272727272727272727272zp}2r'}22''''''''''''''''p}2rp}22rp}2rp}22rh jh \n]p}2rp}22rp'rpv2a}2rp}22 22u2222 2222/2/2/222}2rp}22'''}22}2222'''}22222222226/2~2rp}222/22222/2/2/2~22}2.2222/26/2/2/2~22222o2727272267272zxy27272727272727272722222~22222726727222222w''''''''''''''}2222222''''}222622/222/2rxy2727272727272zxy27272727272727272z''''''''''''''''
\ No newline at end of file diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc new file mode 100644 index 000000000..e045cda5d --- /dev/null +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -0,0 +1,206 @@ +NewMauville_Inside_MapScripts:: @ 815E55F + map_script 5, NewMauville_Inside_MapScript1_15E56F + map_script 3, NewMauville_Inside_MapScript1_15E593 + map_script 1, NewMauville_Inside_MapScript1_15E59E + .byte 0 + +NewMauville_Inside_MapScript1_15E56F:: @ 815E56F + compare VAR_TEMP_1, 1 + call_if_eq NewMauville_Inside_EventScript_15E5DA + compare VAR_TEMP_2, 1 + call_if_eq NewMauville_Inside_EventScript_15E728 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_15E58F + end + +NewMauville_Inside_EventScript_15E58F:: @ 815E58F + removeobject LAST_TALKED + return + +NewMauville_Inside_MapScript1_15E593:: @ 815E593 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + end + +NewMauville_Inside_MapScript1_15E59E:: @ 815E59E + compare VAR_NEW_MAUVILLE_STATE, 2 + call_if_eq NewMauville_Inside_EventScript_15E88B + end + +NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA + lockall + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 + playse SE_PIN + call NewMauville_Inside_EventScript_15E5DA + special DrawWholeMapView + releaseall + end + +NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 + lockall + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 + playse SE_PIN + call NewMauville_Inside_EventScript_15E728 + special DrawWholeMapView + releaseall + end + +NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA + setmetatile 23, 34, 617, 1 + setmetatile 23, 35, 625, 1 + setmetatile 23, 36, 621, 0 + setmetatile 23, 37, 641, 0 + setmetatile 10, 16, 617, 1 + setmetatile 10, 17, 625, 1 + setmetatile 10, 18, 621, 0 + setmetatile 10, 19, 641, 0 + setmetatile 10, 0, 617, 1 + setmetatile 10, 1, 625, 1 + setmetatile 10, 2, 621, 0 + setmetatile 10, 3, 641, 0 + setmetatile 37, 33, 694, 1 + setmetatile 37, 34, 702, 1 + setmetatile 37, 35, 710, 1 + setmetatile 37, 36, 718, 1 + setmetatile 28, 22, 694, 1 + setmetatile 28, 23, 702, 1 + setmetatile 28, 24, 710, 1 + setmetatile 28, 25, 718, 1 + setmetatile 10, 24, 694, 1 + setmetatile 10, 25, 702, 1 + setmetatile 10, 26, 710, 1 + setmetatile 10, 27, 718, 1 + setmetatile 21, 2, 694, 1 + setmetatile 21, 3, 702, 1 + setmetatile 21, 4, 710, 1 + setmetatile 21, 5, 718, 1 + setmetatile 6, 11, 591, 0 + setmetatile 13, 10, 591, 0 + setmetatile 16, 22, 591, 0 + setmetatile 4, 26, 591, 0 + setmetatile 30, 38, 591, 0 + setmetatile 2, 11, 558, 0 + setmetatile 17, 10, 558, 0 + setmetatile 25, 18, 558, 0 + setmetatile 18, 36, 558, 0 + return + +NewMauville_Inside_EventScript_15E728:: @ 815E728 + setmetatile 23, 34, 695, 1 + setmetatile 23, 35, 703, 1 + setmetatile 23, 36, 711, 1 + setmetatile 23, 37, 719, 1 + setmetatile 10, 16, 695, 1 + setmetatile 10, 17, 703, 1 + setmetatile 10, 18, 711, 1 + setmetatile 10, 19, 719, 1 + setmetatile 10, 0, 695, 1 + setmetatile 10, 1, 703, 1 + setmetatile 10, 2, 711, 1 + setmetatile 10, 3, 719, 1 + setmetatile 37, 33, 617, 1 + setmetatile 37, 34, 625, 1 + setmetatile 37, 35, 621, 0 + setmetatile 37, 36, 641, 0 + setmetatile 28, 22, 617, 1 + setmetatile 28, 23, 625, 1 + setmetatile 28, 24, 621, 0 + setmetatile 28, 25, 641, 0 + setmetatile 10, 24, 617, 1 + setmetatile 10, 25, 625, 1 + setmetatile 10, 26, 621, 0 + setmetatile 10, 27, 641, 0 + setmetatile 21, 2, 617, 1 + setmetatile 21, 3, 625, 1 + setmetatile 21, 4, 621, 0 + setmetatile 21, 5, 641, 0 + setmetatile 2, 11, 591, 0 + setmetatile 17, 10, 591, 0 + setmetatile 25, 18, 591, 0 + setmetatile 18, 36, 591, 0 + setmetatile 6, 11, 566, 0 + setmetatile 13, 10, 566, 0 + setmetatile 16, 22, 566, 0 + setmetatile 4, 26, 566, 0 + setmetatile 30, 38, 566, 0 + return + +NewMauville_Inside_EventScript_15E876:: @ 815E876 + lockall + msgbox NewMauville_Inside_Text_1983B1, 4 + call NewMauville_Inside_EventScript_15E88B + setvar VAR_NEW_MAUVILLE_STATE, 2 + releaseall + end + +NewMauville_Inside_EventScript_15E88B:: @ 815E88B + setmetatile 33, 6, 591, 0 + setmetatile 32, 2, 752, 1 + setmetatile 33, 2, 753, 1 + setmetatile 34, 2, 754, 1 + setmetatile 35, 2, 755, 1 + setmetatile 32, 3, 756, 1 + setmetatile 33, 3, 757, 1 + setmetatile 34, 3, 758, 1 + setmetatile 35, 3, 759, 1 + special DrawWholeMapView + return + +NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 + lockall + compare VAR_NEW_MAUVILLE_STATE, 2 + goto_if_eq NewMauville_Inside_EventScript_15E8F6 + msgbox NewMauville_Inside_Text_198315, 4 + releaseall + end + +NewMauville_Inside_EventScript_15E8F6:: @ 815E8F6 + msgbox NewMauville_Inside_Text_198395, 4 + releaseall + end + +NewMauville_Inside_EventScript_15E900:: @ 815E900 + lock + faceplayer + setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE + waitse + playmoncry SPECIES_VOLTORB, 2 + delay 40 + waitmoncry + setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end + +NewMauville_Inside_EventScript_15E91E:: @ 815E91E + lock + faceplayer + setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE + waitse + playmoncry SPECIES_VOLTORB, 2 + delay 40 + waitmoncry + setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end + +NewMauville_Inside_EventScript_15E93C:: @ 815E93C + lock + faceplayer + setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE + waitse + playmoncry SPECIES_VOLTORB, 2 + delay 40 + waitmoncry + setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end diff --git a/data/maps/NewMauville_Inside/text.inc b/data/maps/NewMauville_Inside/text.inc new file mode 100644 index 000000000..c18354294 --- /dev/null +++ b/data/maps/NewMauville_Inside/text.inc @@ -0,0 +1,16 @@ +NewMauville_Inside_Text_198315:: @ 8198315 + .string "The generator is radiating heat that\n" + .string "can be felt even at a distance.\p" + .string "It looks like it should be turned off\n" + .string "as soon as possible.$" + +NewMauville_Inside_Text_198395:: @ 8198395 + .string "The generator quieted down.$" + +NewMauville_Inside_Text_1983B1:: @ 81983B1 + .string "{PLAYER} stepped on the switch.\p" + .string "Click...\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The generator appears to have\n" + .string "stopped...$" diff --git a/data/maps/OldaleTown/border.bin b/data/maps/OldaleTown/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/OldaleTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc index ac50e1197..ac50e1197 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/OldaleTown/events.inc diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 22965da3d..7f89ef759 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,9 +1,9 @@ OldaleTown:: @ 8305560 - .4byte OldaleTown_MapAttributes + .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 11 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown/map.bin b/data/maps/OldaleTown/map.bin deleted file mode 100644 index e6ff2362e..000000000 --- a/data/maps/OldaleTown/map.bin +++ /dev/null @@ -1 +0,0 @@ -01101110000011110000000011110(0)0)000l2m2m2n2111100123000tuuv1111189:;000|}~11111`ABC00011111111110001111000111111100111111001111111020111111100011111100211111111111111110110001111111111000000H0I02211111l2m2m2n2000PQRS11110tuuv110XYZ[11110|}~0`abc1111000011111000011000111110000111x211111111
\ No newline at end of file diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc new file mode 100644 index 000000000..dcac39584 --- /dev/null +++ b/data/maps/OldaleTown/scripts.inc @@ -0,0 +1,318 @@ +OldaleTown_MapScripts:: @ 814DD62 + map_script 3, OldaleTown_MapScript1_14DD68 + .byte 0 + +OldaleTown_MapScript1_14DD68:: @ 814DD68 + call OldaleTown_EventScript_1A014E + setflag FLAG_VISITED_OLDALE_TOWN + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92 + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C + end + +OldaleTown_EventScript_14DD8C:: @ 814DD8C + setvar VAR_ROUTE102_ACCESSIBLE, 1 + return + +OldaleTown_EventScript_14DD92:: @ 814DD92 + setobjectxyperm 3, 1, 11 + setobjectmovementtype 3, 9 + return + +OldaleTown_EventScript_14DD9E:: @ 814DD9E + setobjectxyperm 2, 13, 14 + setobjectmovementtype 2, 8 + return + +OldaleTown_EventScript_14DDAA:: @ 814DDAA + msgbox OldaleTown_Text_16B20E, 3 + end + +OldaleTown_EventScript_14DDB3:: @ 814DDB3 + msgbox OldaleTown_Text_16AEC0, 2 + end + +OldaleTown_EventScript_14DDBC:: @ 814DDBC + lock + faceplayer + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 + setflag FLAG_TEMP_1 + playbgm MUS_TSURETEK, FALSE + msgbox OldaleTown_Text_16AEF2, 4 + closemessage + switch FACING + case 1, OldaleTown_EventScript_14DE07 + case 2, OldaleTown_EventScript_14DE1E + case 4, OldaleTown_EventScript_14DE35 + end + +OldaleTown_EventScript_14DE07:: @ 814DE07 + applymovement 2, OldaleTown_Movement_14DE97 + applymovement 255, OldaleTown_Movement_14DEC1 + waitmovement 0 + goto OldaleTown_EventScript_14DE4C + end + +OldaleTown_EventScript_14DE1E:: @ 814DE1E + applymovement 2, OldaleTown_Movement_14DEA2 + applymovement 255, OldaleTown_Movement_14DECB + waitmovement 0 + goto OldaleTown_EventScript_14DE4C + end + +OldaleTown_EventScript_14DE35:: @ 814DE35 + applymovement 255, OldaleTown_Movement_14DEB9 + applymovement 2, OldaleTown_Movement_14DE8E + waitmovement 0 + goto OldaleTown_EventScript_14DE4C + end + +OldaleTown_EventScript_14DE4C:: @ 814DE4C + msgbox OldaleTown_Text_16AF2F, 4 + giveitem_std ITEM_POTION + compare RESULT, 0 + goto_if_eq OldaleTown_EventScript_14DE83 + msgbox OldaleTown_Text_16AFE1, 4 + setflag FLAG_RECEIVED_POTION_OLDALE + fadedefaultbgm + release + end + +OldaleTown_EventScript_14DE79:: @ 814DE79 + msgbox OldaleTown_Text_16AFE1, 4 + release + end + +OldaleTown_EventScript_14DE83:: @ 814DE83 + msgbox OldaleTown_Text_1A0CC2, 4 + fadedefaultbgm + release + end + +OldaleTown_Movement_14DE8E:: @ 814DE8E + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement + +OldaleTown_Movement_14DE97:: @ 814DE97 + walk_left + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement + +OldaleTown_Movement_14DEA2:: @ 814DEA2 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement + +@ 814DEAB + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + walk_in_place_fastest_down + end_movement + +OldaleTown_Movement_14DEB9:: @ 814DEB9 + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +OldaleTown_Movement_14DEC1:: @ 814DEC1 + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +OldaleTown_Movement_14DECB:: @ 814DECB + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +@ 814DED3 + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + end_movement + +OldaleTown_EventScript_14DEDF:: @ 814DEDF + lock + faceplayer + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26 + msgbox OldaleTown_Text_16B0CC, 4 + closemessage + applymovement 3, OldaleTown_Movement_1A083D + waitmovement 0 + release + end + +OldaleTown_EventScript_14DEFF:: @ 814DEFF + lockall + applymovement 255, OldaleTown_Movement_14DFEC + applymovement 3, OldaleTown_Movement_14DFEF + waitmovement 0 + msgbox OldaleTown_Text_16B045, 4 + closemessage + applymovement 3, OldaleTown_Movement_14DFF5 + waitmovement 0 + releaseall + end + +OldaleTown_EventScript_14DF26:: @ 814DF26 + msgbox OldaleTown_Text_16B12A, 4 + release + end + +OldaleTown_EventScript_14DF30:: @ 814DF30 + lockall + applymovement 4, OldaleTown_Movement_1A0839 + waitmovement 0 + goto OldaleTown_EventScript_14DF92 + end + +OldaleTown_EventScript_14DF41:: @ 814DF41 + lockall + applymovement 4, OldaleTown_Movement_14DFDE + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 + goto OldaleTown_EventScript_14DF92 + end + +OldaleTown_EventScript_14DF5C:: @ 814DF5C + lockall + applymovement 4, OldaleTown_Movement_14DFE1 + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 + goto OldaleTown_EventScript_14DF92 + end + +OldaleTown_EventScript_14DF77:: @ 814DF77 + lockall + applymovement 4, OldaleTown_Movement_14DFE3 + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 + goto OldaleTown_EventScript_14DF92 + end + +OldaleTown_EventScript_14DF92:: @ 814DF92 + checkplayergender + compare RESULT, 0 + goto_if_eq OldaleTown_EventScript_14DFAA + compare RESULT, 1 + goto_if_eq OldaleTown_EventScript_14DFB8 + end + +OldaleTown_EventScript_14DFAA:: @ 814DFAA + msgbox OldaleTown_Text_16B196, 4 + goto OldaleTown_EventScript_14DFC6 + end + +OldaleTown_EventScript_14DFB8:: @ 814DFB8 + msgbox OldaleTown_Text_16B1BE, 4 + goto OldaleTown_EventScript_14DFC6 + end + +OldaleTown_EventScript_14DFC6:: @ 814DFC6 + closemessage + applymovement 4, OldaleTown_Movement_14DFE5 + waitmovement 0 + removeobject 4 + setvar VAR_OLDALE_STATE, 2 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN + releaseall + end + +OldaleTown_Movement_14DFDE:: @ 814DFDE + walk_left + walk_left + end_movement + +OldaleTown_Movement_14DFE1:: @ 814DFE1 + walk_left + end_movement + +OldaleTown_Movement_14DFE3:: @ 814DFE3 + face_left + end_movement + +OldaleTown_Movement_14DFE5:: @ 814DFE5 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +OldaleTown_Movement_14DFEC:: @ 814DFEC + delay_8 + walk_right + end_movement + +OldaleTown_Movement_14DFEF:: @ 814DFEF + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction + end_movement + +OldaleTown_Movement_14DFF5:: @ 814DFF5 + walk_down + walk_left + end_movement diff --git a/data/maps/OldaleTown/text.inc b/data/maps/OldaleTown/text.inc new file mode 100644 index 000000000..2d0b31a44 --- /dev/null +++ b/data/maps/OldaleTown/text.inc @@ -0,0 +1,55 @@ +OldaleTown_Text_16AEC0:: @ 816AEC0 + .string "I want to take a rest, so I’m saving my\n" + .string "progress.$" + +OldaleTown_Text_16AEF2:: @ 816AEF2 + .string "Hi!\n" + .string "I work at a POKéMON MART.\p" + .string "Can I get you to come with me?$" + +OldaleTown_Text_16AF2F:: @ 816AF2F + .string "This is a POKéMON MART.\n" + .string "Just look for our blue roof.\p" + .string "We sell a variety of goods including\n" + .string "POKé BALLS for catching POKéMON.\p" + .string "Here, I’d like you to have this as a\n" + .string "promotional item.$" + +OldaleTown_Text_16AFE1:: @ 816AFE1 + .string "A POTION can be used anytime, so it’s\n" + .string "even more useful than a POKéMON CENTER\l" + .string "in certain situations.$" + +OldaleTown_Text_16B045:: @ 816B045 + .string "Aaaaah! Wait!\n" + .string "Please don’t come in here.\p" + .string "I just discovered the footprints of\n" + .string "a rare POKéMON!\p" + .string "Wait until I finish sketching\n" + .string "them, okay?$" + +OldaleTown_Text_16B0CC:: @ 816B0CC + .string "I just discovered the footprints of\n" + .string "a rare POKéMON!\p" + .string "Wait until I finish sketching\n" + .string "them, okay?$" + +OldaleTown_Text_16B12A:: @ 816B12A + .string "I finished sketching the footprints of\n" + .string "a rare POKéMON.\p" + .string "But it turns out they were only my\n" + .string "own footprints...$" + +OldaleTown_Text_16B196:: @ 816B196 + .string "MAY: {PLAYER}{KUN}!\n" + .string "Over here!\l" + .string "Let’s hurry home!$" + +OldaleTown_Text_16B1BE:: @ 816B1BE + .string "BRENDAN: I’m heading back to my dad’s\n" + .string "LAB now.\l" + .string "{PLAYER}, you should hustle back, too.$" + +OldaleTown_Text_16B20E:: @ 816B20E + .string "OLDALE TOWN\n" + .string "“Where things start off scarce.”$" diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc index e037e3b0e..e037e3b0e 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/OldaleTown_House1/events.inc diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 550ff5a75..b2b31cb73 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,9 +1,9 @@ OldaleTown_House1:: @ 8305ABC - .4byte House1_MapAttributes + .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 59 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc new file mode 100644 index 000000000..1e519a737 --- /dev/null +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -0,0 +1,6 @@ +OldaleTown_House1_MapScripts:: @ 8152EEB + .byte 0 + +OldaleTown_House1_EventScript_152EEC:: @ 8152EEC + msgbox OldaleTown_House1_Text_17476D, 2 + end diff --git a/data/maps/OldaleTown_House1/text.inc b/data/maps/OldaleTown_House1/text.inc new file mode 100644 index 000000000..943003b97 --- /dev/null +++ b/data/maps/OldaleTown_House1/text.inc @@ -0,0 +1,7 @@ +OldaleTown_House1_Text_17476D:: @ 817476D + .string "When a POKéMON battle starts, the one\n" + .string "at the left of the list goes out first.\p" + .string "So, when you get more POKéMON in your\n" + .string "party, try switching around the order\l" + .string "of your POKéMON.\p" + .string "It could give you an advantage.$" diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc index 0968fda57..0968fda57 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/OldaleTown_House2/events.inc diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index eb1660cf9..33ad6fcd7 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,9 +1,9 @@ OldaleTown_House2:: @ 8305AD8 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S4 + .2byte MUS_MACHI_S4 .2byte 60 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc new file mode 100644 index 000000000..57a9ab8ac --- /dev/null +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -0,0 +1,10 @@ +OldaleTown_House2_MapScripts:: @ 8152EF5 + .byte 0 + +OldaleTown_House2_EventScript_152EF6:: @ 8152EF6 + msgbox OldaleTown_House2_Text_174838, 2 + end + +OldaleTown_House2_EventScript_152EFF:: @ 8152EFF + msgbox OldaleTown_House2_Text_17487B, 2 + end diff --git a/data/maps/OldaleTown_House2/text.inc b/data/maps/OldaleTown_House2/text.inc new file mode 100644 index 000000000..54a6547b4 --- /dev/null +++ b/data/maps/OldaleTown_House2/text.inc @@ -0,0 +1,8 @@ +OldaleTown_House2_Text_174838:: @ 8174838 + .string "When POKéMON battle, they eventually\n" + .string "level up and become stronger.$" + +OldaleTown_House2_Text_17487B:: @ 817487B + .string "If the POKéMON with you become\n" + .string "stronger, you’ll be able to go farther\l" + .string "away from here.$" diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/maps/OldaleTown_Mart/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/OldaleTown_Mart/border.bin +++ /dev/null diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc index 9d0b70937..9d0b70937 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/OldaleTown_Mart/events.inc diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index a0e8a8851..d74999efb 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,9 +1,9 @@ OldaleTown_Mart:: @ 8305B2C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/maps/OldaleTown_Mart/map.bin deleted file mode 100644 index 73d90bf31..000000000 --- a/data/maps/OldaleTown_Mart/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -"#$#$D*()() 222 2220212!212%28292:2222222-@AB222+,22+ -22222234223 -222222;<22;22222222 2
\ No newline at end of file diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc new file mode 100644 index 000000000..15cf40027 --- /dev/null +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -0,0 +1,57 @@ +OldaleTown_Mart_MapScripts:: @ 8152F78 + .byte 0 + +OldaleTown_Mart_EventScript_152F79:: @ 8152F79 + lock + faceplayer + message OldaleTown_Mart_Text_1A0BE4 + waitmessage + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8 + pokemart OldaleTown_Mart_Items1 + msgbox OldaleTown_Mart_Text_1A0C02, 4 + release + end + + .align 2 +OldaleTown_Mart_Items1:: @ 8152F9C + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_NONE + release + end + +OldaleTown_Mart_EventScript_152FA8:: @ 8152FA8 + pokemart OldaleTown_Mart_Items2 + msgbox OldaleTown_Mart_Text_1A0C02, 4 + release + end + + .align 2 +OldaleTown_Mart_Items2:: @ 8152FB8 + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_NONE + release + end + +OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 + lock + faceplayer + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB + msgbox OldaleTown_Mart_Text_174A8A, 4 + release + end + +OldaleTown_Mart_EventScript_152FDB:: @ 8152FDB + msgbox OldaleTown_Mart_Text_174ACB, 4 + release + end + +OldaleTown_Mart_EventScript_152FE5:: @ 8152FE5 + msgbox OldaleTown_Mart_Text_174B10, 2 + end diff --git a/data/maps/OldaleTown_Mart/text.inc b/data/maps/OldaleTown_Mart/text.inc new file mode 100644 index 000000000..5abb0cb9b --- /dev/null +++ b/data/maps/OldaleTown_Mart/text.inc @@ -0,0 +1,13 @@ +OldaleTown_Mart_Text_174A8A:: @ 8174A8A + .string "The clerk says they’re all sold out.\n" + .string "I can’t buy any POKé BALLS.$" + +OldaleTown_Mart_Text_174ACB:: @ 8174ACB + .string "I’m going to buy a bunch of POKé BALLS\n" + .string "and catch a bunch of POKéMON!$" + +OldaleTown_Mart_Text_174B10:: @ 8174B10 + .string "If a POKéMON gets hurt and loses its HP\n" + .string "and faints, it won’t be able to battle.\p" + .string "To prevent your POKéMON from fainting,\n" + .string "restore its HP with a POTION.$" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/maps/OldaleTown_PokemonCenter_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index 89ad23d8f..89ad23d8f 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 82ced7328..a3bfaff18 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/maps/OldaleTown_PokemonCenter_1F/map.bin deleted file mode 100644 index 5201dde15..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ij JK
qrH"#RSI22y2z2P*+2[Q$2 2 2 2 2&2422X!!!Y<222'2 2222`2l2m2n2o22%222'222222021222322222'26B228292:2;2242=>'222222@2A2B2C22&2EF'2(2222222222&24276
\ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..c993807c6 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,37 @@ +OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 + map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_152F0E + .byte 0 + +OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E + setrespawn 14 + call OldaleTown_PokemonCenter_1F_EventScript_19FD1B + end + +OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 + setvar VAR_SPECIAL_B, 1 + call OldaleTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +OldaleTown_PokemonCenter_1F_EventScript_152F25:: @ 8152F25 + msgbox OldaleTown_PokemonCenter_1F_Text_1748D1, 2 + end + +OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E + msgbox OldaleTown_PokemonCenter_1F_Text_174945, 2 + end + +OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 + lock + faceplayer + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C + msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 + release + end + +OldaleTown_PokemonCenter_1F_EventScript_152F4C:: @ 8152F4C + msgbox OldaleTown_PokemonCenter_1F_Text_174A2E, 4 + release + end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/text.inc b/data/maps/OldaleTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..4fa7f4d9b --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/text.inc @@ -0,0 +1,22 @@ +OldaleTown_PokemonCenter_1F_Text_1748D1:: @ 81748D1 + .string "That PC in the corner there is\n" + .string "for any POKéMON TRAINER to use.\p" + .string "Naturally, that means you’re welcome\n" + .string "to use it, too.$" + +OldaleTown_PokemonCenter_1F_Text_174945:: @ 8174945 + .string "POKéMON CENTERS are great!\p" + .string "You can use their services as much\n" + .string "as you like, and it’s all for free.\l" + .string "You never have to worry!$" + +OldaleTown_PokemonCenter_1F_Text_1749C0:: @ 81749C0 + .string "The POKéMON CABLE CLUB on the second\n" + .string "floor was built recently.\p" + .string "But they say they’re still making\n" + .string "adjustments.$" + +OldaleTown_PokemonCenter_1F_Text_174A2E:: @ 8174A2E + .string "The POKéMON CABLE CLUB on the second\n" + .string "floor was built recently.\p" + .string "I traded POKéMON right away.$" diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/maps/OldaleTown_PokemonCenter_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index 9af6ec676..9af6ec676 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 79e6ca99d..73c9d23d4 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/maps/OldaleTown_PokemonCenter_2F/map.bin deleted file mode 100644 index 40cf9afd7..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ - ?L\?M\?N\?GTd6GUd6GVd6G22 2Oh2 2Oh2 2Oh2 2Ob2 222Wp]Wp]Wp]W/2222ek22_k22_k22_/2Bg2%22g2%22g2%22g2c2222^22222^22222'2 222f42&242&2f42&242&2'2(622222222222276
\ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..622f50c29 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +OldaleTown_PokemonCenter_2F_MapScripts:: @ 8152F56 + map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +OldaleTown_PokemonCenter_2F_EventScript_152F66:: @ 8152F66 + call OldaleTown_PokemonCenter_2F_EventScript_1A3EA6 + end + +OldaleTown_PokemonCenter_2F_EventScript_152F6C:: @ 8152F6C + call OldaleTown_PokemonCenter_2F_EventScript_1A40CC + end + +OldaleTown_PokemonCenter_2F_EventScript_152F72:: @ 8152F72 + call OldaleTown_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/PacifidlogTown/border.bin b/data/maps/PacifidlogTown/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/PacifidlogTown/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc index f8db75501..f8db75501 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/PacifidlogTown/events.inc diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 057e83264..dd589e122 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,9 +1,9 @@ PacifidlogTown:: @ 83055EC - .4byte PacifidlogTown_MapAttributes + .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 16 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown/map.bin b/data/maps/PacifidlogTown/map.bin deleted file mode 100644 index 02c1454bb..000000000 --- a/data/maps/PacifidlogTown/map.bin +++ /dev/null @@ -1,6 +0,0 @@ -qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqt||qqqqqqqqqqqqqt||}q{qqqqqqqqqqt|}qqq{q{y|||||||||}qqt||{|qqqqqqt||}qt{{y|||||}t|}{}pppppuv - pppppppppppp}~22ppppppppp - p2 2pp0123ppp22p2!2!2!2 2pPQRS p2 2p 2!2!2!2$2p2XYZ[2p 2!2!2!2$2p())*2,p2HabK 2p()*2),ppX2p2!2!2!2 2pX2ppp`2P2Q2 2!2!2!2!2$2P2Q2P2Q2`2pp()*2)),pppppppppppppX2ppppp - p - pp`2ppppp22p22ppX2pppp2 2p2 2pp`2p - 2!2!2!2$2p 2!2!2!2$2ppX2p22()*2),()*2),`2p2 2ppX2ppppX2ppppX2p 2!2!2!2$2pp`2ppppp`2P2Q2P2Q2`2p()*2),ppX2ppppppppX2P2Q2P2Q2P2Q2P2Q2`2pppppppp`2pppppppppppuvpppppppppppppppppp}~ppppppppppppppuvppppr{{{{{{{{{{{{t}~pp{{qqqqklllllmq{{{{qqqqkllqqqqqlllmqqkllqqqqqqqqqqqqllqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
\ No newline at end of file diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc new file mode 100644 index 000000000..d7ac80a0a --- /dev/null +++ b/data/maps/PacifidlogTown/scripts.inc @@ -0,0 +1,28 @@ +PacifidlogTown_MapScripts:: @ 814E8EE + map_script 3, PacifidlogTown_MapScript1_14E8F9 + map_script 5, PacifidlogTown_MapScript1_14E8FD + .byte 0 + +PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 + setflag FLAG_VISITED_PACIFIDLOG_TOWN + end + +PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD + setstepcallback 3 + end + +PacifidlogTown_EventScript_14E900:: @ 814E900 + msgbox PacifidlogTown_Text_16D04A, 2 + end + +PacifidlogTown_EventScript_14E909:: @ 814E909 + msgbox PacifidlogTown_Text_16CFC5, 2 + end + +PacifidlogTown_EventScript_14E912:: @ 814E912 + msgbox PacifidlogTown_Text_16D08A, 2 + end + +PacifidlogTown_EventScript_14E91B:: @ 814E91B + msgbox PacifidlogTown_Text_16D0CE, 3 + end diff --git a/data/maps/PacifidlogTown/text.inc b/data/maps/PacifidlogTown/text.inc new file mode 100644 index 000000000..f598c566a --- /dev/null +++ b/data/maps/PacifidlogTown/text.inc @@ -0,0 +1,19 @@ +PacifidlogTown_Text_16CFC5:: @ 816CFC5 + .string "The sea between PACIFIDLOG and\n" + .string "SLATEPORT has a fast-running tide.\p" + .string "If you decide to SURF, you could end\n" + .string "up swept away somewhere else.$" + +PacifidlogTown_Text_16D04A:: @ 816D04A + .string "See, isn’t it neat?\n" + .string "These houses are on water!\p" + .string "I was born here!$" + +PacifidlogTown_Text_16D08A:: @ 816D08A + .string "The folks of PACIFIDLOG all fish and\n" + .string "dive as part of the lifestyle.$" + +PacifidlogTown_Text_16D0CE:: @ 816D0CE + .string "PACIFIDLOG TOWN\p" + .string "“Where the morning sun smiles upon\n" + .string "the waters.”$" diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/maps/PacifidlogTown_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/PacifidlogTown_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc index 95d0009d9..95d0009d9 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/PacifidlogTown_House1/events.inc diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 7842574f9..dcf7d338d 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_House1:: @ 8305E90 - .4byte PacifidlogTown_House1_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/maps/PacifidlogTown_House1/map.bin deleted file mode 100644 index 7865fdc7c..000000000 --- a/data/maps/PacifidlogTown_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -3333373333333333333333333333733333333333333333733333333373333337
\ No newline at end of file diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc new file mode 100644 index 000000000..4b3586a16 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -0,0 +1,10 @@ +PacifidlogTown_House1_MapScripts:: @ 8154154 + .byte 0 + +PacifidlogTown_House1_EventScript_154155:: @ 8154155 + msgbox PacifidlogTown_House1_Text_178F9F, 2 + end + +PacifidlogTown_House1_EventScript_15415E:: @ 815415E + msgbox PacifidlogTown_House1_Text_17906A, 2 + end diff --git a/data/maps/PacifidlogTown_House1/text.inc b/data/maps/PacifidlogTown_House1/text.inc new file mode 100644 index 000000000..5d2f5a2c9 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/text.inc @@ -0,0 +1,13 @@ +PacifidlogTown_House1_Text_178F9F:: @ 8178F9F + .string "In the HOENN region, there are three\n" + .string "POKéMON that represent the power of\l" + .string "rock, ice, and steel.\p" + .string "Each of them is said to hide away deep\n" + .string "inside caves.\p" + .string "That’s the story I heard when I was\n" + .string "just a little kid.$" + +PacifidlogTown_House1_Text_17906A:: @ 817906A + .string "“Six dots open three doors.”\p" + .string "Grandpa used to say that, but I don’t\n" + .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/maps/PacifidlogTown_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/PacifidlogTown_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc index 00493650a..00493650a 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/PacifidlogTown_House2/events.inc diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 3fc2aba99..758c10751 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_House2:: @ 8305EAC - .4byte PacifidlogTown_House2_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 78 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/maps/PacifidlogTown_House2/map.bin deleted file mode 100644 index 617346322..000000000 --- a/data/maps/PacifidlogTown_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ - 3333333333733333333373333333333333333333333333333333333373333337
\ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc new file mode 100644 index 000000000..110bdcbe6 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -0,0 +1,96 @@ +PacifidlogTown_House2_MapScripts:: @ 8154167 + .byte 0 + +PacifidlogTown_House2_EventScript_154168:: @ 8154168 + lock + faceplayer + dodailyevents + call PacifidlogTown_House2_EventScript_1541B4 + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254 + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7 + setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER + specialvar RESULT, GetLeadMonFriendshipScore + compare RESULT, 4 + goto_if_ge PacifidlogTown_House2_EventScript_1541EC + specialvar RESULT, GetLeadMonFriendshipScore + compare RESULT, 2 + goto_if_ge PacifidlogTown_House2_EventScript_15421B + goto PacifidlogTown_House2_EventScript_154225 + end + +PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable + compare RESULT, 0 + call_if_eq PacifidlogTown_House2_EventScript_1541E8 + return + +PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE + msgbox PacifidlogTown_House2_Text_179155, 4 + return + +PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7 + msgbox PacifidlogTown_House2_Text_1790C1, 4 + msgbox PacifidlogTown_House2_Text_179155, 4 + return + +PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 + clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK + return + +PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC + msgbox PacifidlogTown_House2_Text_179169, 4 + giveitem_std ITEM_TM27_RETURN + compare RESULT, 0 + goto_if_eq PacifidlogTown_House2_EventScript_1A029B + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK + special SetPacifidlogTMReceivedDay + msgbox PacifidlogTown_House2_Text_179283, 4 + release + end + +PacifidlogTown_House2_EventScript_15421B:: @ 815421B + msgbox PacifidlogTown_House2_Text_1791CA, 4 + release + end + +PacifidlogTown_House2_EventScript_154225:: @ 8154225 + msgbox PacifidlogTown_House2_Text_17922D, 4 + giveitem_std ITEM_TM21_FRUSTRATION + compare RESULT, 0 + goto_if_eq PacifidlogTown_House2_EventScript_1A029B + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK + special SetPacifidlogTMReceivedDay + msgbox PacifidlogTown_House2_Text_179283, 4 + release + end + +PacifidlogTown_House2_EventScript_154254:: @ 8154254 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable + buffernumberstring 0, RESULT + msgbox PacifidlogTown_House2_Text_1792F2, 4 + release + end + +PacifidlogTown_House2_EventScript_154267:: @ 8154267 + lock + faceplayer + waitse + playmoncry SPECIES_AZURILL, 0 + msgbox PacifidlogTown_House2_Text_17938B, 4 + waitmoncry + msgbox PacifidlogTown_House2_Text_17939B, 4 + release + end + +PacifidlogTown_House2_EventScript_154282:: @ 8154282 + lock + faceplayer + waitse + playmoncry SPECIES_AZURILL, 2 + msgbox PacifidlogTown_House2_Text_1793CC, 4 + waitmoncry + msgbox PacifidlogTown_House2_Text_1793DD, 4 + release + end diff --git a/data/maps/PacifidlogTown_House2/text.inc b/data/maps/PacifidlogTown_House2/text.inc new file mode 100644 index 000000000..5c669dc98 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/text.inc @@ -0,0 +1,54 @@ +PacifidlogTown_House2_Text_1790C1:: @ 81790C1 + .string "Er-hem!\p" + .string "I am the POKéMON FAN CLUB’s most\n" + .string "important person, the CHAIRMAN’s\l" + .string "younger brother.\p" + .string "I’m here enjoying my vacation with\n" + .string "POKéMON, yes, indeed.$" + +PacifidlogTown_House2_Text_179155:: @ 8179155 + .string "Ah!\n" + .string "Your POKéMON...$" + +PacifidlogTown_House2_Text_179169:: @ 8179169 + .string "It clearly likes you very much.\p" + .string "A POKéMON that adoring and adorable\n" + .string "deserves a TM like this, no?$" + +PacifidlogTown_House2_Text_1791CA:: @ 81791CA + .string "Hmm...\n" + .string "It’s not bad, but it’s also not good.\p" + .string "You, as the TRAINER, need to put in\n" + .string "some more effort.$" + +PacifidlogTown_House2_Text_17922D:: @ 817922D + .string "It has a vicious look to it.\p" + .string "A frightening POKéMON like that\n" + .string "deserves a TM like this.$" + +PacifidlogTown_House2_Text_179283:: @ 8179283 + .string "If a POKéMON likes you a lot, RETURN’s\n" + .string "power is enhanced.\p" + .string "If it doesn’t like you, FRUSTRATION’s\n" + .string "power goes up.$" + +PacifidlogTown_House2_Text_1792F2:: @ 81792F2 + .string "Oh, yes. In about {STR_VAR_1} or so days,\n" + .string "I should be getting a good TM or two.\p" + .string "You should come see me then.\n" + .string "I’ll give you a TM that’s suitable for\l" + .string "your POKéMON.$" + +PacifidlogTown_House2_Text_17938B:: @ 817938B + .string "AZURILL: Rurii.$" + +PacifidlogTown_House2_Text_17939B:: @ 817939B + .string "It appears to be very friendly with the\n" + .string "TRAINER.$" + +PacifidlogTown_House2_Text_1793CC:: @ 81793CC + .string "AZURILL: Rururi!$" + +PacifidlogTown_House2_Text_1793DD:: @ 81793DD + .string "It doesn’t appear to like the TRAINER\n" + .string "very much.$" diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc index 0f7bb798b..0f7bb798b 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/PacifidlogTown_House3/events.inc diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 6bf1e6bd6..55427804f 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_House3:: @ 8305EC8 - .4byte PacifidlogTown_House3_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc new file mode 100644 index 000000000..3b21ac996 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -0,0 +1,54 @@ +PacifidlogTown_House3_MapScripts:: @ 815429D + .byte 0 + +PacifidlogTown_House3_EventScript_15429E:: @ 815429E + lock + faceplayer + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338 + setvar VAR_SPECIAL_8, 2 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_SPECIAL_9, RESULT + msgbox PacifidlogTown_House3_Text_17940E, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq PacifidlogTown_House3_EventScript_154320 + special SelectMonForNPCTrade + waitstate + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 + goto_if_eq PacifidlogTown_House3_EventScript_154320 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + specialvar RESULT, GetTradeSpecies + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 + goto_if_ne PacifidlogTown_House3_EventScript_15432A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + special CreateInGameTradePokemon + special DoInGameTradeScene + waitstate + bufferspeciesname 0, VAR_SPECIAL_9 + msgbox PacifidlogTown_House3_Text_1794C4, 4 + setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED + release + end + +PacifidlogTown_House3_EventScript_154320:: @ 8154320 + msgbox PacifidlogTown_House3_Text_1794ED, 4 + release + end + +PacifidlogTown_House3_EventScript_15432A:: @ 815432A + bufferspeciesname 0, VAR_SPECIAL_9 + msgbox PacifidlogTown_House3_Text_1794DF, 4 + release + end + +PacifidlogTown_House3_EventScript_154338:: @ 8154338 + msgbox PacifidlogTown_House3_Text_17950A, 4 + release + end + +PacifidlogTown_House3_EventScript_154342:: @ 8154342 + msgbox PacifidlogTown_House3_Text_179541, 2 + end diff --git a/data/maps/PacifidlogTown_House3/text.inc b/data/maps/PacifidlogTown_House3/text.inc new file mode 100644 index 000000000..1aabc9578 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/text.inc @@ -0,0 +1,27 @@ +PacifidlogTown_House3_Text_17940E:: @ 817940E + .string "Hello, TRAINER. Would you do me a favor\n" + .string "and trade POKéMON with me?\p" + .string "Living in PACIFIDLOG, I can only catch\n" + .string "certain kinds of POKéMON.\p" + .string "{STR_VAR_1}? Do you have one?\n" + .string "I’ll trade you my {STR_VAR_2} for it.$" + +PacifidlogTown_House3_Text_1794C4:: @ 81794C4 + .string "Wow!\n" + .string "This {STR_VAR_1} is so fluffy!$" + +PacifidlogTown_House3_Text_1794DF:: @ 81794DF + .string "That’s no {STR_VAR_1}.$" + +PacifidlogTown_House3_Text_1794ED:: @ 81794ED + .string "I’m a little disappointed...$" + +PacifidlogTown_House3_Text_17950A:: @ 817950A + .string "Since we traded, you and me,\n" + .string "we’re friends, aren’t we?$" + +PacifidlogTown_House3_Text_179541:: @ 8179541 + .string "Is that a POKéDEX?\p" + .string "Did you get to meet a lot of different\n" + .string "POKéMON?\p" + .string "I wish I was like you.$" diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc index e41a86e44..e41a86e44 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/PacifidlogTown_House4/events.inc diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index df930a533..fbadb5440 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_House4:: @ 8305EE4 - .4byte PacifidlogTown_House4_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 78 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc new file mode 100644 index 000000000..584366c88 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -0,0 +1,30 @@ +PacifidlogTown_House4_MapScripts:: @ 815434B + .byte 0 + +PacifidlogTown_House4_EventScript_15434C:: @ 815434C + msgbox PacifidlogTown_House4_Text_17961F, 2 + end + +PacifidlogTown_House4_EventScript_154355:: @ 8154355 + msgbox PacifidlogTown_House4_Text_17959B, 2 + end + +PacifidlogTown_House4_EventScript_15435E:: @ 815435E + lock + faceplayer + msgbox PacifidlogTown_House4_Text_17963D, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PacifidlogTown_House4_EventScript_15437F + compare RESULT, NO + goto_if_eq PacifidlogTown_House4_EventScript_154389 + end + +PacifidlogTown_House4_EventScript_15437F:: @ 815437F + msgbox PacifidlogTown_House4_Text_179656, 4 + release + end + +PacifidlogTown_House4_EventScript_154389:: @ 8154389 + msgbox PacifidlogTown_House4_Text_17968C, 4 + release + end diff --git a/data/maps/PacifidlogTown_House4/text.inc b/data/maps/PacifidlogTown_House4/text.inc new file mode 100644 index 000000000..3ca9e5cca --- /dev/null +++ b/data/maps/PacifidlogTown_House4/text.inc @@ -0,0 +1,23 @@ +PacifidlogTown_House4_Text_17959B:: @ 817959B + .string "People were saying they saw a POKéMON\n" + .string "FLYING high above HOENN.\p" + .string "Is it FLYING around all the time?\n" + .string "Doesn’t it need to rest somewhere?$" + +PacifidlogTown_House4_Text_17961F:: @ 817961F + .string "A sky POKéMON!\n" + .string "A sky POKéMON!$" + +PacifidlogTown_House4_Text_17963D:: @ 817963D + .string "Where did you come from?$" + +PacifidlogTown_House4_Text_179656:: @ 8179656 + .string "Yes?\n" + .string "YES TOWN?\p" + .string "I’ve never heard of a place like that.$" + +PacifidlogTown_House4_Text_17968C:: @ 817968C + .string "No? That doesn’t make any sense.\n" + .string "You have to come from somewhere.\p" + .string "Oh! Wait! You’re not going to say you\n" + .string "were born at the bottom of the sea?$" diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc index bac0ca3e1..bac0ca3e1 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/PacifidlogTown_House5/events.inc diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index d0fca156f..c8d5bcf3c 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_House5:: @ 8305F00 - .4byte PacifidlogTown_House5_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc new file mode 100644 index 000000000..46b1990df --- /dev/null +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -0,0 +1,21 @@ +PacifidlogTown_House5_MapScripts:: @ 8154393 + .byte 0 + +PacifidlogTown_House5_EventScript_154394:: @ 8154394 + lock + faceplayer + specialvar RESULT, IsMirageIslandPresent + compare RESULT, 1 + goto_if_eq PacifidlogTown_House5_EventScript_1543B0 + msgbox PacifidlogTown_House5_Text_179718, 4 + release + end + +PacifidlogTown_House5_EventScript_1543B0:: @ 81543B0 + msgbox PacifidlogTown_House5_Text_17973B, 4 + release + end + +PacifidlogTown_House5_EventScript_1543BA:: @ 81543BA + msgbox PacifidlogTown_House5_Text_179765, 2 + end diff --git a/data/maps/PacifidlogTown_House5/text.inc b/data/maps/PacifidlogTown_House5/text.inc new file mode 100644 index 000000000..5fc9ca5c5 --- /dev/null +++ b/data/maps/PacifidlogTown_House5/text.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House5_Text_179718:: @ 8179718 + .string "I can’t see MIRAGE ISLAND today...$" + +PacifidlogTown_House5_Text_17973B:: @ 817973B + .string "Oh! Oh my!\n" + .string "I can see MIRAGE ISLAND today!$" + +PacifidlogTown_House5_Text_179765:: @ 8179765 + .string "MIRAGE ISLAND...\p" + .string "It must become visible and invisible\n" + .string "depending on the weather conditions\l" + .string "that make mirages appear.\p" + .string "Or is it really appearing and\n" + .string "disappearing?$" diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 05f1e9698..05f1e9698 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index ef2ddbf4c..706a9d8b2 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..557b6497e --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,27 @@ +PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF + map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_154105 + .byte 0 + +PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 + setrespawn 19 + end + +@ 8154109 + setvar VAR_SPECIAL_B, 1 + call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +PacifidlogTown_PokemonCenter_1F_EventScript_154117:: @ 8154117 + msgbox PacifidlogTown_PokemonCenter_1F_Text_178E47, 2 + end + +PacifidlogTown_PokemonCenter_1F_EventScript_154120:: @ 8154120 + msgbox PacifidlogTown_PokemonCenter_1F_Text_178E79, 2 + end + +PacifidlogTown_PokemonCenter_1F_EventScript_154129:: @ 8154129 + msgbox PacifidlogTown_PokemonCenter_1F_Text_178ED9, 2 + end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..9f87c6a54 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc @@ -0,0 +1,17 @@ +PacifidlogTown_PokemonCenter_1F_Text_178E47:: @ 8178E47 + .string "What color is your TRAINER’S CARD?\n" + .string "Mine’s copper!$" + +PacifidlogTown_PokemonCenter_1F_Text_178E79:: @ 8178E79 + .string "PACIFIDLOG TOWN floats on top of\n" + .string "a colony of CORSOLA.\p" + .string "If I told you that, would you believe me?$" + +PacifidlogTown_PokemonCenter_1F_Text_178ED9:: @ 8178ED9 + .string "The ancestors of the people in\n" + .string "PACIFIDLOG were said to have been\l" + .string "born on boats and then lived and died \l" + .string "aboard them.\p" + .string "I understand that they lived that way\n" + .string "because they were searching for\l" + .string "something.$" diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index 8bc70f400..8bc70f400 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index b985545a8..9408e8611 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..2bff37736 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8154132 + map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +@ 8154142 + call VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6 + end + +@ 8154148 + call VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC + end + +PacifidlogTown_PokemonCenter_2F_EventScript_15414E:: @ 815414E + call PacifidlogTown_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/PetalburgCity/border.bin b/data/maps/PetalburgCity/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/PetalburgCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc index 43216cdc9..43216cdc9 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/PetalburgCity/events.inc diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index c1706a55a..ddda0a3b0 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,9 +1,9 @@ PetalburgCity:: @ 8305448 - .4byte PetalburgCity_MapAttributes + .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 1 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity/map.bin b/data/maps/PetalburgCity/map.bin deleted file mode 100644 index 35f0172ca..000000000 --- a/data/maps/PetalburgCity/map.bin +++ /dev/null @@ -1,4 +0,0 @@ -UNMNMNVD -F000LL55T L??0 !"LLL001100LLL00 1"100LLL00 1"10<2fL111L5500 1"1deT0011101T00000P2Q2XY0000 1"1000000 1!1"110000000123550000 1"1000000 1!1"1000000089:;001111!1!1111111!1!1"10000000`ABC11(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110000000 1"100PQRS00 1"10000000 1"100XYZ[00 1"1050 0 0 -000 1"10`abc00 1"100000 1!111111111!1!1100 00 1!1)1)1)1)1)1)1)1)1)1)1*10055 !"00 1"1000000000111100020000 1"10<2=2=2=2=2=2=2>200000000 1"10D -EEF00000000 1"10LL110 1"10T L0 1"100 !"00L0 1!111111000L0(1)1)1)1)1)1*1000T11111111111100001111
\ No newline at end of file diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc new file mode 100644 index 000000000..77b12b556 --- /dev/null +++ b/data/maps/PetalburgCity/scripts.inc @@ -0,0 +1,428 @@ +PetalburgCity_MapScripts:: @ 814B70C + map_script 3, PetalburgCity_MapScript1_14B717 + map_script 2, PetalburgCity_MapScript2_14B73D + .byte 0 + +PetalburgCity_MapScript1_14B717:: @ 814B717 + setflag FLAG_VISITED_PETALBURG_CITY + compare VAR_PETALBURG_STATE, 0 + call_if_eq PetalburgCity_EventScript_14B731 + compare VAR_PETALBURG_STATE, 2 + call_if_eq PetalburgCity_EventScript_14B739 + end + +PetalburgCity_EventScript_14B731:: @ 814B731 + setobjectxyperm 9, 5, 11 + return + +PetalburgCity_EventScript_14B739:: @ 814B739 + savebgm MUS_TSURETEK + return + +PetalburgCity_MapScript2_14B73D:: @ 814B73D + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747 + .2byte 0 + +PetalburgCity_EventScript_14B747:: @ 814B747 + lockall + setflag FLAG_SPECIAL_FLAG_0 + special SavePlayerParty + special PutZigzagoonInPlayerParty + applymovement 2, PetalburgCity_Movement_14B7ED + applymovement 255, PetalburgCity_Movement_14B7CC + waitmovement 0 + msgbox PetalburgCity_Text_16D361, 4 + special ScrSpecial_StartWallyTutorialBattle + waitstate + msgbox PetalburgCity_Text_16D3DE, 4 + applymovement 2, PetalburgCity_Movement_1A083F, 0, 0 + waitmovement 0, 0, 2 + msgbox PetalburgCity_Text_16D408, 4 + closemessage + clearflag FLAG_SPECIAL_FLAG_0 + setvar VAR_PETALBURG_STATE, 3 + fadedefaultbgm + clearflag FLAG_SPECIAL_FLAG_1 + special LoadPlayerParty + setvar VAR_PETALBURG_GYM_STATE, 1 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 + waitstate + releaseall + end + +PetalburgCity_EventScript_14B7AC:: @ 814B7AC + lock + faceplayer + msgbox PetalburgCity_Text_164490, 4 + closemessage + applymovement 3, PetalburgCity_Movement_1A083D + waitmovement 0 + release + end + +PetalburgCity_EventScript_14B7C3:: @ 814B7C3 + msgbox PetalburgCity_Text_16433E, 2 + end + +PetalburgCity_Movement_14B7CC:: @ 814B7CC + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_right + end_movement + +PetalburgCity_Movement_14B7ED:: @ 814B7ED + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right + end_movement + +PetalburgCity_EventScript_14B812:: @ 814B812 + msgbox PetalburgCity_Text_1645BB, 3 + end + +PetalburgCity_EventScript_14B81B:: @ 814B81B + msgbox PetalburgCity_Text_164602, 3 + end + +PetalburgCity_EventScript_14B824:: @ 814B824 + msgbox PetalburgCity_Text_16453F, 2 + end + +PetalburgCity_EventScript_14B82D:: @ 814B82D + msgbox PetalburgCity_Text_164634, 3 + end + +PetalburgCity_EventScript_14B836:: @ 814B836 + lockall + setvar VAR_SPECIAL_8, 0 + goto PetalburgCity_EventScript_14B866 + end + +PetalburgCity_EventScript_14B842:: @ 814B842 + lockall + setvar VAR_SPECIAL_8, 1 + goto PetalburgCity_EventScript_14B866 + end + +PetalburgCity_EventScript_14B84E:: @ 814B84E + lockall + setvar VAR_SPECIAL_8, 2 + goto PetalburgCity_EventScript_14B866 + end + +PetalburgCity_EventScript_14B85A:: @ 814B85A + lockall + setvar VAR_SPECIAL_8, 3 + goto PetalburgCity_EventScript_14B866 + end + +PetalburgCity_EventScript_14B866:: @ 814B866 + applymovement 9, PetalburgCity_Movement_1A0839 + waitmovement 0 + playbgm MUS_TSURETEK, FALSE + playse SE_PIN + applymovement 9, PetalburgCity_Movement_1A0833 + waitmovement 0 + applymovement 9, PetalburgCity_Movement_1A0835 + waitmovement 0 + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_EventScript_14B91B + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_EventScript_14B930 + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_EventScript_14B93B + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_EventScript_14B950 + msgbox PetalburgCity_Text_16438A, 4 + closemessage + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_EventScript_14B965 + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_EventScript_14B977 + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_EventScript_14B989 + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_EventScript_14B99B + msgbox PetalburgCity_Text_164426, 4 + applymovement 9, PetalburgCity_Movement_1A0843 + applymovement 255, PetalburgCity_Movement_1A0843 + waitmovement 0 + msgbox PetalburgCity_Text_164449, 4 + closemessage + applymovement 9, PetalburgCity_Movement_14B9F4 + waitmovement 0 + fadedefaultbgm + releaseall + end + +PetalburgCity_EventScript_14B91B:: @ 814B91B + applymovement 9, PetalburgCity_Movement_14B9B1 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_EventScript_14B930:: @ 814B930 + applymovement 9, PetalburgCity_Movement_14B9B6 + waitmovement 0 + return + +PetalburgCity_EventScript_14B93B:: @ 814B93B + applymovement 9, PetalburgCity_Movement_14B9B9 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0841 + waitmovement 0 + return + +PetalburgCity_EventScript_14B950:: @ 814B950 + applymovement 9, PetalburgCity_Movement_14B9BE + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0841 + waitmovement 0 + return + +PetalburgCity_EventScript_14B965:: @ 814B965 + applymovement 9, PetalburgCity_Movement_14B9C4 + applymovement 255, PetalburgCity_Movement_14BA01 + waitmovement 0 + return + +PetalburgCity_EventScript_14B977:: @ 814B977 + applymovement 9, PetalburgCity_Movement_14B9CF + applymovement 255, PetalburgCity_Movement_14BA0B + waitmovement 0 + return + +PetalburgCity_EventScript_14B989:: @ 814B989 + applymovement 9, PetalburgCity_Movement_14B9DD + applymovement 255, PetalburgCity_Movement_14BA18 + waitmovement 0 + return + +PetalburgCity_EventScript_14B99B:: @ 814B99B + applymovement 9, PetalburgCity_Movement_14B9E8 + applymovement 255, PetalburgCity_Movement_14BA22 + waitmovement 0 + return + +@ 814B9AD + delay_16 + delay_16 + delay_16 + end_movement + +PetalburgCity_Movement_14B9B1:: @ 814B9B1 + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +PetalburgCity_Movement_14B9B6:: @ 814B9B6 + walk_right + walk_right + end_movement + +PetalburgCity_Movement_14B9B9:: @ 814B9B9 + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement + +PetalburgCity_Movement_14B9BE:: @ 814B9BE + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement + +PetalburgCity_Movement_14B9C4:: @ 814B9C4 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up + end_movement + +PetalburgCity_Movement_14B9CF:: @ 814B9CF + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up + end_movement + +PetalburgCity_Movement_14B9DD:: @ 814B9DD + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up + end_movement + +PetalburgCity_Movement_14B9E8:: @ 814B9E8 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up + end_movement + +PetalburgCity_Movement_14B9F4:: @ 814B9F4 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +PetalburgCity_Movement_14BA01:: @ 814BA01 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + end_movement + +PetalburgCity_Movement_14BA0B:: @ 814BA0B + delay_16 + delay_16 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + end_movement + +PetalburgCity_Movement_14BA18:: @ 814BA18 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + end_movement + +PetalburgCity_Movement_14BA22:: @ 814BA22 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + end_movement + +PetalburgCity_EventScript_14BA2D:: @ 814BA2D + msgbox PetalburgCity_Text_16438A, 2 + end diff --git a/data/maps/PetalburgCity/text.inc b/data/maps/PetalburgCity/text.inc new file mode 100644 index 000000000..fbe00df96 --- /dev/null +++ b/data/maps/PetalburgCity/text.inc @@ -0,0 +1,44 @@ +PetalburgCity_Text_16433E:: @ 816433E + .string "Where has our WALLY gone?\p" + .string "We have to leave for VERDANTURF TOWN\n" + .string "very soon...$" + +PetalburgCity_Text_16438A:: @ 816438A + .string "Hiya! Are you maybe...\n" + .string "A rookie TRAINER?\p" + .string "Do you know what POKéMON TRAINERS\n" + .string "do when they reach a new town?\p" + .string "They first check what kind of GYM\n" + .string "is in the town.$" + +PetalburgCity_Text_164426:: @ 8164426 + .string "See? This is PETALBURG CITY’s GYM.$" + +PetalburgCity_Text_164449:: @ 8164449 + .string "This is the GYM’s sign. Look for it\n" + .string "whenever you’re looking for a GYM.$" + +PetalburgCity_Text_164490:: @ 8164490 + .string "My face is reflected in the water.\p" + .string "It’s a shining grin full of hope...\p" + .string "Or it could be a look of somber silence\n" + .string "struggling with fear...\p" + .string "What do you see reflected in your face?$" + +PetalburgCity_Text_16453F:: @ 816453F + .string "Let’s say you have six POKéMON.\n" + .string "If you catch another one...\p" + .string "It is automatically sent to a STORAGE\n" + .string "BOX over a PC connection.$" + +PetalburgCity_Text_1645BB:: @ 81645BB + .string "PETALBURG CITY POKéMON GYM\n" + .string "LEADER: NORMAN\l" + .string "“A man in pursuit of power!”$" + +PetalburgCity_Text_164602:: @ 8164602 + .string "PETALBURG CITY\n" + .string "“Where people mingle with nature.”$" + +PetalburgCity_Text_164634:: @ 8164634 + .string "WALLY’S HOUSE$" diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/maps/PetalburgCity_Gym/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/PetalburgCity_Gym/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc index b5dd1f57b..b5dd1f57b 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/PetalburgCity_Gym/events.inc diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index af00ed5f0..6c519b07e 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,9 +1,9 @@ PetalburgCity_Gym:: @ 8305F38 - .4byte PetalburgCity_Gym_MapAttributes + .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 79 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/maps/PetalburgCity_Gym/map.bin deleted file mode 100644 index 665783c7b..000000000 --- a/data/maps/PetalburgCity_Gym/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -xy z{ - 222222222 222222222 222(2)2*2222 222021222222 2228292:2222 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222 - 222222222 222222222 222222222 2@222222@22 2H6+22222H6+2 22322222232
\ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc new file mode 100644 index 000000000..a3fb5c494 --- /dev/null +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -0,0 +1,1027 @@ +PetalburgCity_Gym_MapScripts:: @ 8154477 + map_script 1, PetalburgCity_Gym_MapScript1_15448C + map_script 3, PetalburgCity_Gym_MapScript1_15451B + map_script 4, PetalburgCity_Gym_MapScript2_154553 + map_script 2, PetalburgCity_Gym_MapScript2_154562 + .byte 0 + +PetalburgCity_Gym_MapScript1_15448C:: @ 815448C + compare VAR_PETALBURG_GYM_STATE, 6 + goto_if_eq PetalburgCity_Gym_EventScript_1544A3 + compare VAR_PETALBURG_GYM_STATE, 7 + call_if_ge PetalburgCity_Gym_EventScript_1544ED + end + +PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 + setvar VAR_SPECIAL_5, 1 + call PetalburgCity_Gym_EventScript_154F9A + call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 + end + +PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED + setvar VAR_SPECIAL_5, 1 + call PetalburgCity_Gym_EventScript_154F9A + call PetalburgCity_Gym_EventScript_154FBB + call PetalburgCity_Gym_EventScript_154FDC + call PetalburgCity_Gym_EventScript_154FFD + call PetalburgCity_Gym_EventScript_15501E + call PetalburgCity_Gym_EventScript_15503F + call PetalburgCity_Gym_EventScript_155060 + call PetalburgCity_Gym_EventScript_155081 + return + +PetalburgCity_Gym_MapScript1_15451B:: @ 815451B + compare VAR_PETALBURG_GYM_STATE, 1 + call_if_eq PetalburgCity_Gym_EventScript_15453B + compare VAR_PETALBURG_GYM_STATE, 6 + call_if_lt PetalburgCity_Gym_EventScript_154543 + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B + end + +PetalburgCity_Gym_EventScript_15453B:: @ 815453B + setobjectxyperm 10, 5, 108 + return + +PetalburgCity_Gym_EventScript_154543:: @ 8154543 + setobjectxyperm 1, 4, 107 + return + +PetalburgCity_Gym_EventScript_15454B:: @ 815454B + setobjectxyperm 1, 4, 107 + return + +PetalburgCity_Gym_MapScript2_154553:: @ 8154553 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D + .2byte 0 + +PetalburgCity_Gym_EventScript_15455D:: @ 815455D + turnobject 255, 2 + end + +PetalburgCity_Gym_MapScript2_154562:: @ 8154562 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C + .2byte 0 + +PetalburgCity_Gym_EventScript_15456C:: @ 815456C + lockall + msgbox PetalburgCity_Gym_Text_17A196, 4 + msgbox PetalburgCity_Gym_Text_17A1B0, 4 + closemessage + applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_1545B4 + waitmovement 0 + playse SE_KAIDAN + removeobject 10 + setflag FLAG_HIDE_WALLY_PETALBURG + delay 30 + applymovement 255, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 + msgbox PetalburgCity_Gym_Text_17A2A4, 4 + setvar VAR_PETALBURG_GYM_STATE, 2 + releaseall + end + +PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 + walk_down + walk_down + walk_down + delay_16 + end_movement + +PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 + lock + faceplayer + switch VAR_PETALBURG_GYM_STATE + case 2, PetalburgCity_Gym_EventScript_154907 + case 3, PetalburgCity_Gym_EventScript_154911 + case 4, PetalburgCity_Gym_EventScript_15491B + case 5, PetalburgCity_Gym_EventScript_154925 + case 6, PetalburgCity_Gym_EventScript_1549D6 + case 7, PetalburgCity_Gym_EventScript_15493D + msgbox PetalburgCity_Gym_Text_179DF6, 4 + closemessage + switch FACING + case 1, PetalburgCity_Gym_EventScript_15463D + case 2, PetalburgCity_Gym_EventScript_154648 + case 3, PetalburgCity_Gym_EventScript_154653 + case 4, PetalburgCity_Gym_EventScript_15465E + end + +PetalburgCity_Gym_EventScript_15463D:: @ 815463D + setvar VAR_SPECIAL_8, 0 + goto PetalburgCity_Gym_EventScript_154669 + end + +PetalburgCity_Gym_EventScript_154648:: @ 8154648 + setvar VAR_SPECIAL_8, 1 + goto PetalburgCity_Gym_EventScript_154669 + end + +PetalburgCity_Gym_EventScript_154653:: @ 8154653 + setvar VAR_SPECIAL_8, 2 + goto PetalburgCity_Gym_EventScript_154669 + end + +PetalburgCity_Gym_EventScript_15465E:: @ 815465E + setvar VAR_SPECIAL_8, 3 + goto PetalburgCity_Gym_EventScript_154669 + end + +PetalburgCity_Gym_EventScript_154669:: @ 8154669 + addobject 10 + playse SE_DOOR + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_Gym_EventScript_1547EE + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_Gym_EventScript_154800 + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_Gym_EventScript_15481C + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_Gym_EventScript_15481C + msgbox PetalburgCity_Gym_Text_179F07, 4 + msgbox PetalburgCity_Gym_Text_179F37, 4 + msgbox PetalburgCity_Gym_Text_179F70, 4 + msgbox PetalburgCity_Gym_Text_17A03A, 4 + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_Gym_EventScript_154884 + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_Gym_EventScript_15488F + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_Gym_EventScript_1548A1 + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_Gym_EventScript_1548B3 + msgbox PetalburgCity_Gym_Text_17A04A, 4 + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_Gym_EventScript_1548C5 + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_Gym_EventScript_1548D0 + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_Gym_EventScript_1548DB + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_Gym_EventScript_1548E6 + msgbox PetalburgCity_Gym_Text_17A0A8, 4 + msgbox PetalburgCity_Gym_Text_17A0EB, 4 + msgbox PetalburgCity_Gym_Text_17A156, 4 + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_Gym_EventScript_15492F + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_Gym_EventScript_154930 + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_Gym_EventScript_15493B + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_Gym_EventScript_15493C + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_Gym_EventScript_1548FC + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 + msgbox PetalburgCity_Gym_Text_17A171, 4 + closemessage + setflag FLAG_SPECIAL_FLAG_1 + playbgm MUS_TSURETEK, FALSE + compare VAR_SPECIAL_8, 0 + call_if_eq PetalburgCity_Gym_EventScript_154835 + compare VAR_SPECIAL_8, 1 + call_if_eq PetalburgCity_Gym_EventScript_15484E + compare VAR_SPECIAL_8, 2 + call_if_eq PetalburgCity_Gym_EventScript_154860 + compare VAR_SPECIAL_8, 3 + call_if_eq PetalburgCity_Gym_EventScript_154872 + removeobject 10 + setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 + clearflag FLAG_HIDE_WALLY_PETALBURG + clearflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_RIVAL_BIRCH_LAB + special InitBirchState + warp MAP_PETALBURG_CITY, 255, 15, 8 + waitstate + release + end + +PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B27 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154800:: @ 8154800 + applymovement 10, PetalburgCity_Gym_Movement_154B1D + waitmovement 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 255, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_15481C:: @ 815481C + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B27 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154835:: @ 8154835 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B3E + applymovement 255, PetalburgCity_Gym_Movement_154B4D + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_15484E:: @ 815484E + applymovement 10, PetalburgCity_Gym_Movement_154B2E + applymovement 255, PetalburgCity_Gym_Movement_154B45 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154860:: @ 8154860 + applymovement 10, PetalburgCity_Gym_Movement_154B3E + applymovement 255, PetalburgCity_Gym_Movement_154B57 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154872:: @ 8154872 + applymovement 10, PetalburgCity_Gym_Movement_154B36 + applymovement 255, PetalburgCity_Gym_Movement_154B5F + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154884:: @ 8154884 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_15488F:: @ 815488F + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 255, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + applymovement 255, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1 + applymovement 10, PetalburgCity_Gym_Movement_1A0839 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC + applymovement 10, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154907:: @ 8154907 + msgbox PetalburgCity_Gym_Text_17A41E, 4 + release + end + +PetalburgCity_Gym_EventScript_154911:: @ 8154911 + msgbox PetalburgCity_Gym_Text_17A518, 4 + release + end + +PetalburgCity_Gym_EventScript_15491B:: @ 815491B + msgbox PetalburgCity_Gym_Text_17A5F3, 4 + release + end + +PetalburgCity_Gym_EventScript_154925:: @ 8154925 + msgbox PetalburgCity_Gym_Text_17A5F3, 4 + release + end + +PetalburgCity_Gym_EventScript_15492F:: @ 815492F + return + +PetalburgCity_Gym_EventScript_154930:: @ 8154930 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_15493B:: @ 815493B + return + +PetalburgCity_Gym_EventScript_15493C:: @ 815493C + return + +PetalburgCity_Gym_EventScript_15493D:: @ 815493D + call PetalburgCity_Gym_EventScript_154969 + compare RESULT, 1 + goto_if_eq PetalburgCity_Gym_EventScript_1549B8 + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69 + msgbox PetalburgCity_Gym_Text_17AA6B, 4 + release + end + +PetalburgCity_Gym_EventScript_154969:: @ 8154969 + specialvar RESULT, IsEnigmaBerryValid + compare RESULT, 0 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + checkitem ITEM_ENIGMA_BERRY, 1 + compare RESULT, 1 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + checkpcitem ITEM_ENIGMA_BERRY, 1 + compare RESULT, 1 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + compare VAR_ENIGMA_BERRY_AVAILABLE, 0 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + msgbox PetalburgCity_Gym_Text_1C5570, 4 + setvar RESULT, 1 + return + +PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 + setvar RESULT, 0 + return + +PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 + giveitem_std ITEM_ENIGMA_BERRY + compare RESULT, 0 + goto_if_eq PetalburgCity_Gym_EventScript_1A029B + setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 + release + end + +PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 + msgbox PetalburgCity_Gym_Text_17A653, 4 + trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A + message PetalburgCity_Gym_Text_17A7DD + waitmessage + call PetalburgCity_Gym_EventScript_1A02C5 + msgbox PetalburgCity_Gym_Text_17A805, 4 + setflag FLAG_DEFEATED_PETALBURG_GYM + setvar VAR_PETALBURG_GYM_STATE, 7 + setflag FLAG_BADGE05_GET + call PetalburgCity_Gym_EventScript_1A0424 + setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + clearflag FLAG_HIDE_WATTSON_MAUVILLE + setvar VAR_SPECIAL_8, 5 + call PetalburgCity_Gym_EventScript_1A01C0 + clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL + call PetalburgCity_Gym_EventScript_1544ED + special DrawWholeMapView + goto PetalburgCity_Gym_EventScript_154A2C + end + +PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C + giveitem_std ITEM_TM42_FACADE + compare RESULT, 0 + goto_if_eq PetalburgCity_Gym_EventScript_1A029B + setflag FLAG_RECEIVED_TM42 + msgbox PetalburgCity_Gym_Text_17A8CF, 4 + msgbox PetalburgCity_Gym_Text_17A976, 4 + closemessage + compare FACING, 2 + call_if_eq PetalburgCity_Gym_EventScript_154ABC + compare FACING, 1 + call_if_eq PetalburgCity_Gym_EventScript_154AC7 + compare FACING, 3 + call_if_eq PetalburgCity_Gym_EventScript_154AD2 + compare FACING, 4 + call_if_eq PetalburgCity_Gym_EventScript_154ADD + delay 70 + compare FACING, 2 + call_if_eq PetalburgCity_Gym_EventScript_154AE8 + compare FACING, 1 + call_if_eq PetalburgCity_Gym_EventScript_154AF3 + compare FACING, 3 + call_if_eq PetalburgCity_Gym_EventScript_154AFE + compare FACING, 4 + call_if_eq PetalburgCity_Gym_EventScript_154B09 + msgbox PetalburgCity_Gym_Text_17A9F6, 4 + release + end + +PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 + return + +PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 + return + +@ 8154B14 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down + end_movement + +PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_in_place_fastest_left + end_movement + +PetalburgCity_Gym_Movement_154B27:: @ 8154B27 + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up + end_movement + +PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement + +PetalburgCity_Gym_Movement_154B36:: @ 8154B36 + walk_down + walk_down + walk_right + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement + +PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement + +PetalburgCity_Gym_Movement_154B45:: @ 8154B45 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 + end_movement + +PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement + +PetalburgCity_Gym_Movement_154B57:: @ 8154B57 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement + +PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F + walk_in_place_fastest_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_right + walk_down + delay_8 + end_movement + +PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 + msgbox PetalburgCity_Gym_Text_17AB17, 4 + release + end + +PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 + lockall + compare VAR_PETALBURG_GYM_STATE, 6 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 85 + msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 + closemessage + delay 30 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 + waitstate + releaseall + end + +PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7 + releaseall + end + +PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 + msgbox PetalburgCity_Gym_Text_17B844, 4 + releaseall + end + +PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 + lockall + compare VAR_PETALBURG_GYM_STATE, 6 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 98 + msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 + lockall + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 46 + msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B + lockall + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 59 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E + lockall + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 59 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 + lockall + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 72 + msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 + lockall + goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 20 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 + lockall + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 20 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A + lockall + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 33 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D + lockall + goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 33 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 + lockall + goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 7 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 + lockall + goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 7 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + compare RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + end + +PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 + trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 + msgbox PetalburgCity_Gym_Text_17AE30, 6 + end + +PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_154FBB + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 + msgbox PetalburgCity_Gym_Text_17AEBB, 2 + end + +PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 + trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 + msgbox PetalburgCity_Gym_Text_17AFD3, 6 + end + +PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_154FFD + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 + msgbox PetalburgCity_Gym_Text_17B016, 2 + end + +PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E + trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 + msgbox PetalburgCity_Gym_Text_17B12C, 6 + end + +PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_15503F + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 + msgbox PetalburgCity_Gym_Text_17B1F4, 2 + end + +PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA + trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD + msgbox PetalburgCity_Gym_Text_17B2E4, 6 + end + +PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_155081 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD + msgbox PetalburgCity_Gym_Text_17B39B, 2 + end + +PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 + trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 + msgbox PetalburgCity_Gym_Text_17B46F, 6 + end + +PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_154FDC + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 + msgbox PetalburgCity_Gym_Text_17B521, 2 + end + +PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 + trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 + msgbox PetalburgCity_Gym_Text_17B5EA, 6 + end + +PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_15501E + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 + msgbox PetalburgCity_Gym_Text_17B6B5, 2 + end + +PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E + trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 + msgbox PetalburgCity_Gym_Text_17B749, 6 + end + +PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 + setvar VAR_SPECIAL_5, 0 + call PetalburgCity_Gym_EventScript_155060 + special DrawWholeMapView + release + end + +PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 + msgbox PetalburgCity_Gym_Text_17B7C0, 2 + end + +PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A + setvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_1550A2 + return + +PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB + setvar VAR_SPECIAL_4, 2 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_1550C7 + return + +PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC + setvar VAR_SPECIAL_4, 3 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_1550EC + return + +PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD + setvar VAR_SPECIAL_4, 4 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_155111 + return + +PetalburgCity_Gym_EventScript_15501E:: @ 815501E + setvar VAR_SPECIAL_4, 5 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_155124 + return + +PetalburgCity_Gym_EventScript_15503F:: @ 815503F + setvar VAR_SPECIAL_4, 6 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_155149 + return + +PetalburgCity_Gym_EventScript_155060:: @ 8155060 + setvar VAR_SPECIAL_4, 7 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_15515C + return + +PetalburgCity_Gym_EventScript_155081:: @ 8155081 + setvar VAR_SPECIAL_4, 8 + compare VAR_SPECIAL_5, 0 + call_if_eq PetalburgCity_Gym_EventScript_155182 + compare VAR_SPECIAL_5, 1 + call_if_eq PetalburgCity_Gym_EventScript_155187 + call PetalburgCity_Gym_EventScript_15516F + return + +PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 + setmetatile 6, 85, 528, 0 + setmetatile 7, 85, 529, 0 + setmetatile 1, 98, 528, 0 + setmetatile 2, 98, 529, 0 + return + +PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 + setmetatile 6, 46, 528, 0 + setmetatile 7, 46, 529, 0 + setmetatile 1, 59, 528, 0 + setmetatile 2, 59, 529, 0 + return + +PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC + setmetatile 6, 59, 528, 0 + setmetatile 7, 59, 529, 0 + setmetatile 1, 72, 528, 0 + setmetatile 2, 72, 529, 0 + return + +PetalburgCity_Gym_EventScript_155111:: @ 8155111 + setmetatile 1, 20, 528, 0 + setmetatile 2, 20, 529, 0 + return + +PetalburgCity_Gym_EventScript_155124:: @ 8155124 + setmetatile 6, 20, 528, 0 + setmetatile 7, 20, 529, 0 + setmetatile 1, 33, 528, 0 + setmetatile 2, 33, 529, 0 + return + +PetalburgCity_Gym_EventScript_155149:: @ 8155149 + setmetatile 6, 33, 528, 0 + setmetatile 7, 33, 529, 0 + return + +PetalburgCity_Gym_EventScript_15515C:: @ 815515C + setmetatile 1, 7, 528, 0 + setmetatile 2, 7, 529, 0 + return + +PetalburgCity_Gym_EventScript_15516F:: @ 815516F + setmetatile 6, 7, 528, 0 + setmetatile 7, 7, 529, 0 + return + +PetalburgCity_Gym_EventScript_155182:: @ 8155182 + special PetalburgGymSlideOpenDoors + waitstate + return + +PetalburgCity_Gym_EventScript_155187:: @ 8155187 + special PetalburgGymOpenDoorsInstantly + return + +PetalburgCity_Gym_EventScript_15518B:: @ 815518B + lock + faceplayer + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0 + msgbox PetalburgCity_Gym_Text_17AB96, 4 + release + end + +PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 + msgbox PetalburgCity_Gym_Text_17AD49, 4 + release + end + +PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA + lockall + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA + goto PetalburgCity_Gym_EventScript_1551D4 + end + +PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA + lockall + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA + goto PetalburgCity_Gym_EventScript_1551D4 + end + +PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA + msgbox PetalburgCity_Gym_Text_17BAC0, 4 + releaseall + end + +PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4 + msgbox PetalburgCity_Gym_Text_17BAA5, 4 + releaseall + end diff --git a/data/maps/PetalburgCity_Gym/text.inc b/data/maps/PetalburgCity_Gym/text.inc new file mode 100644 index 000000000..bbd072564 --- /dev/null +++ b/data/maps/PetalburgCity_Gym/text.inc @@ -0,0 +1,411 @@ +PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 + .string "DAD: Hm?\p" + .string "Well, if it isn’t {PLAYER}!\n" + .string "So you’re all finished moving in?\p" + .string "I’m surprised that you managed to\n" + .string "get here by yourself.\p" + .string "Oh, I see.\n" + .string "You’re with your POKéMON.\p" + .string "Hm... Then I guess you’re going to\n" + .string "become a TRAINER like me, {PLAYER}.\p" + .string "That’s great news!\n" + .string "I’ll be looking forward to it!$" + +PetalburgCity_Gym_Text_179F07:: @ 8179F07 + .string "Um... I... I’d like to get a\n" + .string "POKéMON, please...$" + +PetalburgCity_Gym_Text_179F37:: @ 8179F37 + .string "DAD: Hm? You’re... Uh... Oh, right.\n" + .string "You’re WALLY, right?$" + +PetalburgCity_Gym_Text_179F70:: @ 8179F70 + .string "WALLY: I’m going to go stay with my\n" + .string "relatives in VERDANTURF TOWN.\p" + .string "I thought I would be lonely by myself,\n" + .string "so I wanted to take a POKéMON along.\p" + .string "But I’ve never caught a POKéMON before.\n" + .string "I don’t know how...$" + +PetalburgCity_Gym_Text_17A03A:: @ 817A03A + .string "DAD: Hm. I see.$" + +PetalburgCity_Gym_Text_17A04A:: @ 817A04A + .string "DAD: {PLAYER}, you heard that,\n" + .string "right?\p" + .string "Go with WALLY and make sure that he\n" + .string "safely catches a POKéMON.$" + +PetalburgCity_Gym_Text_17A0A8:: @ 817A0A8 + .string "WALLY, here, I’ll loan you my POKéMON.\p" + .string "WALLY received a ZIGZAGOON!$" + +PetalburgCity_Gym_Text_17A0EB:: @ 817A0EB + .string "WALLY: Oh, wow!\n" + .string "A POKéMON!\p" + .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" + .string "Go for it!\p" + .string "WALLY received a POKé BALL!$" + +PetalburgCity_Gym_Text_17A156:: @ 817A156 + .string "WALLY: Oh, wow!\n" + .string "Thank you!$" + +PetalburgCity_Gym_Text_17A171:: @ 817A171 + .string "{PLAYER}... Would you really come\n" + .string "with me?$" + +PetalburgCity_Gym_Text_17A196:: @ 817A196 + .string "DAD: So, did it work out?$" + +PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 + .string "WALLY: Thank you, yes, it did.\n" + .string "Here’s your POKéMON back.\p" + .string "{PLAYER}, thank you for coming along\n" + .string "with me.\p" + .string "You two are why I was able to catch\n" + .string "my POKéMON.\p" + .string "I promise I’ll take really good\n" + .string "care of it.\p" + .string "Oh! My mom’s waiting for me, so I\n" + .string "have to go!\p" + .string "Bye, {PLAYER}!$" + +PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 + .string "DAD: Now...\p" + .string "{PLAYER}, if you want to become a\n" + .string "strong TRAINER, here’s my advice.\p" + .string "Head for RUSTBORO CITY beyond this\n" + .string "town.\p" + .string "There, you should challenge the GYM\n" + .string "LEADER, ROXANNE.\p" + .string "After her, go on to other POKéMON\n" + .string "GYMS and defeat their LEADERS.\p" + .string "Collect BADGES from them,\n" + .string "understood?\p" + .string "Of course, I’m a GYM LEADER, too.\n" + .string "We’ll battle one day, {PLAYER}.\p" + .string "But that’s only after you become\n" + .string "stronger, {PLAYER}.$" + +PetalburgCity_Gym_Text_17A41E:: @ 817A41E + .string "DAD: Hm? Aren’t you going to the\n" + .string "POKéMON GYM in RUSTBORO CITY?\p" + .string "There’s no challenge for me to\n" + .string "battle a greenhorn TRAINER.\p" + .string "{PLAYER}, I want you to challenge me\n" + .string "when you become a lot stronger.\p" + .string "I’ll battle you, {PLAYER}, when you\n" + .string "can show me four GYM BADGES, okay?$" + +PetalburgCity_Gym_Text_17A518:: @ 817A518 + .string "DAD: I see... So, you’ve beaten the\n" + .string "GYM LEADER in RUSTBORO CITY.\p" + .string "But there are many more TRAINERS\n" + .string "who are stronger than you, {PLAYER}.\p" + .string "Across the sea in DEWFORD TOWN is a\n" + .string "GYM LEADER named BRAWLY.\p" + .string "You should go challenge him.$" + +PetalburgCity_Gym_Text_17A5F3:: @ 817A5F3 + .string "DAD: Hm... {PLAYER}, you have gotten\n" + .string "stronger.\p" + .string "I can tell by the number of BADGES\n" + .string "that you’ve earned.$" + +PetalburgCity_Gym_Text_17A653:: @ 817A653 + .string "DAD: Hm...\n" + .string "So, you did get four GYM BADGES.\p" + .string "Fine, as I promised, we will have a\n" + .string "POKéMON battle.\p" + .string "{PLAYER}...\p" + .string "I’m so happy that I can have a \n" + .string "real battle with my own child.\p" + .string "But, a battle is a battle!\p" + .string "I will do everything in my power as\n" + .string "a GYM LEADER to win.\p" + .string "{PLAYER}, you’d better give it your\n" + .string "best shot, too!$" + +PetalburgCity_Gym_Text_17A77A:: @ 817A77A + .string "...\p" + .string "I... I can’t...\p" + .string "I can’t believe it. {PLAYER}...\p" + .string "I lost to {PLAYER}?\p" + .string "But, rules are rules!\n" + .string "Here, take this.$" + +PetalburgCity_Gym_Text_17A7DD:: @ 817A7DD + .string "{PLAYER} received the BALANCE BADGE\n" + .string "from DAD!$" + +PetalburgCity_Gym_Text_17A805:: @ 817A805 + .string "DAD: With that BADGE, the DEFENSE\n" + .string "of all your POKéMON will increase.\p" + .string "POKéMON that know the HM move SURF\n" + .string "will be able to travel over water.\p" + .string "This is my gift to you. {PLAYER}, I’m\n" + .string "sure you can use it correctly.$" + +PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF + .string "DAD: TM42 contains FACADE.\p" + .string "It doubles the power of moves if\n" + .string "the POKéMON is poisoned, paralyzed,\l" + .string "or burned.\p" + .string "It might be able to turn a bad\n" + .string "situation into an advantage.$" + +PetalburgCity_Gym_Text_17A976:: @ 817A976 + .string "DAD: As the GYM LEADER, I can’t\n" + .string "express how upset I am...\p" + .string "But as a father, it makes me both\n" + .string "happy and a little sad. It’s odd...$" + +PetalburgCity_Gym_Text_17A9F6:: @ 817A9F6 + .string "DAD: Oh, yes...\p" + .string "WALLY’s parents came calling\n" + .string "earlier.\p" + .string "They said that they had something\n" + .string "they wanted to give you, {PLAYER}.$" + +PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B + .string "DAD: {PLAYER}, you should go visit\n" + .string "your mother every so often.\p" + .string "I’m going to stay here and redouble\n" + .string "my training.\p" + .string "It would bother me as a TRAINER to\n" + .string "not avenge my loss to you, {PLAYER}!$" + +PetalburgCity_Gym_Text_17AB17:: @ 817AB17 + .string "DAD: {PLAYER}, how are things going?\p" + .string "The world of POKéMON is deep.\p" + .string "I honestly think that no amount of\n" + .string "training would ever be enough.$" + +PetalburgCity_Gym_Text_17AB96:: @ 817AB96 + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "The doors in this GYM open when you\n" + .string "beat the awaiting TRAINERS.\p" + .string "Whoops! The doors in this room are\n" + .string "already open, so don’t attack me!\p" + .string "The TRAINERS of PETALBURG GYM use\n" + .string "all kinds of items.\p" + .string "The door at the left leads to the\n" + .string "SPEED ROOM.\p" + .string "The door at the right leads to the\n" + .string "ACCURACY ROOM.\p" + .string "The room’s name will be on the\n" + .string "door, so choose carefully.\p" + .string "Once you’ve chosen the door...\n" + .string "Well, hey, go for it!$" + +PetalburgCity_Gym_Text_17AD49:: @ 817AD49 + .string "{PLAYER}! Whoa! You’ve overcome even\n" + .string "your own father!\p" + .string "Like, whoa!\n" + .string "What a stunning turn of events!$" + +PetalburgCity_Gym_Text_17ADA5:: @ 817ADA5 + .string "The ability to attack before the\n" + .string "opponent...\p" + .string "Just that alone puts me at a great\n" + .string "advantage, don’t you agree?$" + +PetalburgCity_Gym_Text_17AE11:: @ 817AE11 + .string "That was a magnificent battle!$" + +PetalburgCity_Gym_Text_17AE30:: @ 817AE30 + .string "Go on to the next room where a new\n" + .string "challenge awaits you.\p" + .string "At the left is the ZERO REDUCTION\n" + .string "ROOM.\p" + .string "The right door leads to the DEFENSE\n" + .string "ROOM.$" + +PetalburgCity_Gym_Text_17AEBB:: @ 817AEBB + .string "Whomever you beat, and whomever you\n" + .string "may lose to, you never shirk from\l" + .string "training yourself and your POKéMON.\p" + .string "That’s what I think being a\n" + .string "GYM LEADER is all about.$" + +PetalburgCity_Gym_Text_17AF5A:: @ 817AF5A + .string "Don’t waste your time trying to\n" + .string "lower my POKéMON’s abilities!$" + +PetalburgCity_Gym_Text_17AF98:: @ 817AF98 + .string "My POKéMON’s abilities weren’t\n" + .string "harmed, but I still lost...$" + +PetalburgCity_Gym_Text_17AFD3:: @ 817AFD3 + .string "The next room is the STRENGTH ROOM.\n" + .string "Can you withstand brute force?$" + +PetalburgCity_Gym_Text_17B016:: @ 817B016 + .string "After you beat our LEADER, the\n" + .string "training has become a lot tougher.$" + +PetalburgCity_Gym_Text_17B058:: @ 817B058 + .string "Just when you think you’re going to\n" + .string "win, your opponent restores HP...\p" + .string "Can you just imagine how awful that\n" + .string "must feel?\p" + .string "I’ll show you exactly how awful it\n" + .string "feels!$" + +PetalburgCity_Gym_Text_17B0F7:: @ 817B0F7 + .string "I couldn’t restore HP enough...\n" + .string "What ATTACK power...$" + +PetalburgCity_Gym_Text_17B12C:: @ 817B12C + .string "I should have expected no less from\n" + .string "our LEADER’s kid.\p" + .string "No, wait! A TRAINER’s abilities are\n" + .string "earned only through effort.\p" + .string "I lost because my own efforts\n" + .string "weren’t enough.\p" + .string "Go on! The ONE-HIT KO ROOM is next.$" + +PetalburgCity_Gym_Text_17B1F4:: @ 817B1F4 + .string "I’m going to keep training at GYMS.\n" + .string "One day, I’ll become a LEADER.$" + +PetalburgCity_Gym_Text_17B237:: @ 817B237 + .string "I’m not going to take it easy just\n" + .string "because you’re our LEADER’s kid.\p" + .string "I’ll show you how horrid it is for\n" + .string "a POKéMON to take a critical hit!$" + +PetalburgCity_Gym_Text_17B2C0:: @ 817B2C0 + .string "Your power...\n" + .string "You’re the real deal.$" + +PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 + .string "Your father really is strong. He’s\n" + .string "a TRAINER worth my respect.\p" + .string "And, I sense the same glow coming\n" + .string "from you as your father.\p" + .string "I hope that you’ll stage a terrific\n" + .string "battle with your father!$" + +PetalburgCity_Gym_Text_17B39B:: @ 817B39B + .string "Since your dad became the LEADER,\n" + .string "the TRAINERS of PETALBURG CITY have\l" + .string "become a lot tougher.$" + +PetalburgCity_Gym_Text_17B3F7:: @ 817B3F7 + .string "Giggle...\n" + .string "This is the ACCURACY ROOM.\p" + .string "It’s pretty nasty when every attack\n" + .string "lands without fail.$" + +PetalburgCity_Gym_Text_17B454:: @ 817B454 + .string "You were a cut above me...$" + +PetalburgCity_Gym_Text_17B46F:: @ 817B46F + .string "There are some even stronger\n" + .string "TRAINERS waiting for you.\p" + .string "The left is the DEFENSE ROOM, and\n" + .string "the right is the RECOVERY ROOM.\p" + .string "Your POKéMON’s ATTACK power will be\n" + .string "on trial either way.$" + +PetalburgCity_Gym_Text_17B521:: @ 817B521 + .string "Do you know what we’re trying to\n" + .string "achieve as TRAINERS?\p" + .string "We’re striving to become soul mates\n" + .string "with our POKéMON.$" + +PetalburgCity_Gym_Text_17B58D:: @ 817B58D + .string "The higher the DEFENSE, the more\n" + .string "reckless I can be in attack.$" + +PetalburgCity_Gym_Text_17B5CB:: @ 817B5CB + .string "Our defenses weren’t enough...$" + +PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA + .string "I think you’ve taught me a valuable\n" + .string "lesson here.\p" + .string "Now, go on! The left door goes to\n" + .string "the STRENGTH ROOM.\p" + .string "The right door opens to the\n" + .string "ONE-HIT KO ROOM.\p" + .string "Both of them have TRAINERS who are\n" + .string "offensively skilled.$" + +PetalburgCity_Gym_Text_17B6B5:: @ 817B6B5 + .string "Hi! Have you tried using SURF?$" + +PetalburgCity_Gym_Text_17B6D4:: @ 817B6D4 + .string "Our GYM LEADER told us to go all out\n" + .string "and beat you.\p" + .string "Even if you happen to be the\n" + .string "LEADER’s kid!$" + +PetalburgCity_Gym_Text_17B732:: @ 817B732 + .string "But... I went all out!$" + +PetalburgCity_Gym_Text_17B749:: @ 817B749 + .string "The way you use your POKéMON...\n" + .string "It’s like your father’s style.\p" + .string "Go on through! The GYM LEADER, your\n" + .string "father, is waiting!$" + +PetalburgCity_Gym_Text_17B7C0:: @ 817B7C0 + .string "Sure, it’s fine to make your POKéMON\n" + .string "stronger.\p" + .string "But what decides the winner?\p" + .string "Why, it’s the feelings TRAINERS have for\n" + .string "their POKéMON.$" + +PetalburgCity_Gym_Text_17B844:: @ 817B844 + .string "This door appears to be locked\n" + .string "right now...$" + +PetalburgCity_Gym_Text_17B870:: @ 817B870 + .string "“SPEED ROOM,” the sign says.\p" + .string "Do you want to go through?$" + +UnknownString_817B8A8: @ 817B8A8 + .string "This door appears to be locked\n" + .string "right now...$" + +PetalburgCity_Gym_Text_17B8D4:: @ 817B8D4 + .string "“ACCURACY ROOM,” the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17B90F:: @ 817B90F + .string "“ZERO REDUCTION ROOM,” the sign\n" + .string "says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17B950:: @ 817B950 + .string "“DEFENSE ROOM,” the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17B98A:: @ 817B98A + .string "“RECOVERY ROOM,” the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17B9C5:: @ 817B9C5 + .string "“STRENGTH ROOM,” the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17BA00:: @ 817BA00 + .string "“ONE-HIT KO ROOM,” the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17BA3D:: @ 817BA3D + .string "“GYM LEADER’S ROOM\p" + .string "“See for yourself what POKéMON await\n" + .string "you!” the sign says.\p" + .string "Do you want to go through?$" + +PetalburgCity_Gym_Text_17BAA5:: @ 817BAA5 + .string "PETALBURG CITY POKéMON GYM$" + +PetalburgCity_Gym_Text_17BAC0:: @ 817BAC0 + .string "PETALBURG CITY POKéMON GYM\p" + .string "NORMAN’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc index df1970bd4..df1970bd4 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/PetalburgCity_House1/events.inc diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index e1f5c1f63..1aaa3ee6d 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,9 +1,9 @@ PetalburgCity_House1:: @ 8305F54 - .4byte House1_MapAttributes + .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 59 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc new file mode 100644 index 000000000..7a3b7c1b1 --- /dev/null +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -0,0 +1,10 @@ +PetalburgCity_House1_MapScripts:: @ 81551DE + .byte 0 + +PetalburgCity_House1_EventScript_1551DF:: @ 81551DF + msgbox PetalburgCity_House1_Text_17BAFB, 2 + end + +PetalburgCity_House1_EventScript_1551E8:: @ 81551E8 + msgbox PetalburgCity_House1_Text_17BB4A, 2 + end diff --git a/data/maps/PetalburgCity_House1/text.inc b/data/maps/PetalburgCity_House1/text.inc new file mode 100644 index 000000000..d41fadd1f --- /dev/null +++ b/data/maps/PetalburgCity_House1/text.inc @@ -0,0 +1,16 @@ +PetalburgCity_House1_Text_17BAFB:: @ 817BAFB + .string "Traveling is wonderful!\p" + .string "When I was young, I roamed the seas\n" + .string "and the mountains!$" + +PetalburgCity_House1_Text_17BB4A:: @ 817BB4A + .string "Sigh...\p" + .string "I wish I could go on an adventure\n" + .string "with some POKéMON...\p" + .string "Crawl through some damp grass...\n" + .string "Climb rocky, rugged mountains...\p" + .string "Cross the raging seas...\n" + .string "Wander about in dark caves...\p" + .string "And, sometimes, even get a little\n" + .string "homesick...\p" + .string "It must be fabulous to travel!$" diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/maps/PetalburgCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/PetalburgCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc index b26cc139f..b26cc139f 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/PetalburgCity_House2/events.inc diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index fb76b1bfe..1f115285c 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,9 +1,9 @@ PetalburgCity_House2:: @ 8305F70 - .4byte PetalburgCity_House2_MapAttributes + .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 80 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/maps/PetalburgCity_House2/map.bin deleted file mode 100644 index b91b7153b..000000000 --- a/data/maps/PetalburgCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -nohi
vwp2q2$2$2$2$2$2$2~22Z6[6#2#2#2#2#2#2#2,2b6c6#2#2#2#2#2#2LM92#2#2#2#2#2#2+2TU92#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2
\ No newline at end of file diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc new file mode 100644 index 000000000..4cc1325a2 --- /dev/null +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -0,0 +1,10 @@ +PetalburgCity_House2_MapScripts:: @ 81551F1 + .byte 0 + +PetalburgCity_House2_EventScript_1551F2:: @ 81551F2 + msgbox PetalburgCity_House2_Text_17BC4F, 2 + end + +PetalburgCity_House2_EventScript_1551FB:: @ 81551FB + msgbox PetalburgCity_House2_Text_17BCB1, 2 + end diff --git a/data/maps/PetalburgCity_House2/text.inc b/data/maps/PetalburgCity_House2/text.inc new file mode 100644 index 000000000..426dac360 --- /dev/null +++ b/data/maps/PetalburgCity_House2/text.inc @@ -0,0 +1,12 @@ +PetalburgCity_House2_Text_17BC4F:: @ 817BC4F + .string "NORMAN became our town’s new GYM\n" + .string "LEADER.\p" + .string "I think he called his family over from\n" + .string "the JOHTO region.$" + +PetalburgCity_House2_Text_17BCB1:: @ 817BCB1 + .string "I battled NORMAN once, but, whew,\n" + .string "he was way too strong.\p" + .string "How would I put it?\p" + .string "I just got the feeling that he\n" + .string "lives for POKéMON.$" diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc index 3171dca99..3171dca99 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/PetalburgCity_Mart/events.inc diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 56275cfaf..21a487898 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,9 +1,9 @@ PetalburgCity_Mart:: @ 8305FC4 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc new file mode 100644 index 000000000..7584f6f19 --- /dev/null +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -0,0 +1,67 @@ +PetalburgCity_Mart_MapScripts:: @ 81552AF + .byte 0 + +PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 + lock + faceplayer + message PetalburgCity_Mart_Text_1A0BE4 + waitmessage + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA + pokemart PetalburgCity_Mart_Items1 + msgbox PetalburgCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +PetalburgCity_Mart_Items1:: @ 81552D0 + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_ORANGE_MAIL + .2byte ITEM_NONE + release + end + +PetalburgCity_Mart_EventScript_1552EA:: @ 81552EA + pokemart PetalburgCity_Mart_Items2 + msgbox PetalburgCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +PetalburgCity_Mart_Items2:: @ 81552FC + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_ORANGE_MAIL + .2byte ITEM_NONE + release + end + +PetalburgCity_Mart_EventScript_15531A:: @ 815531A + msgbox PetalburgCity_Mart_Text_17BFFD, 2 + end + +PetalburgCity_Mart_EventScript_155323:: @ 8155323 + msgbox PetalburgCity_Mart_Text_17C06C, 2 + end + +PetalburgCity_Mart_EventScript_15532C:: @ 815532C + msgbox PetalburgCity_Mart_Text_17C0BC, 2 + end diff --git a/data/maps/PetalburgCity_Mart/text.inc b/data/maps/PetalburgCity_Mart/text.inc new file mode 100644 index 000000000..d6fcc6fff --- /dev/null +++ b/data/maps/PetalburgCity_Mart/text.inc @@ -0,0 +1,17 @@ +PetalburgCity_Mart_Text_17BFFD:: @ 817BFFD + .string "Even if a POKéMON is weak now,\n" + .string "it will grow stronger.\p" + .string "The most important thing is love!\n" + .string "Love for your POKéMON!$" + +PetalburgCity_Mart_Text_17C06C:: @ 817C06C + .string "Do you use REPEL?\n" + .string "It keeps POKéMON away, so it’s\l" + .string "useful when you’re in a hurry.$" + +PetalburgCity_Mart_Text_17C0BC:: @ 817C0BC + .string "Do you have any ANTIDOTES with\n" + .string "you?\p" + .string "If you walk around with a poisoned\n" + .string "POKéMON, it will lose HP until it faints.\l" + .string "Take some ANTIDOTES with you.$" diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index d4dc0c63e..d4dc0c63e 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 2596fb65d..0c87b4934 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..136cc11c5 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,56 @@ +PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 + map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_15520A + .byte 0 + +PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A + setrespawn 3 + call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B + end + +PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 + setvar VAR_SPECIAL_B, 1 + call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +PetalburgCity_PokemonCenter_1F_EventScript_155221:: @ 8155221 + msgbox PetalburgCity_PokemonCenter_1F_Text_17BD30, 2 + end + +PetalburgCity_PokemonCenter_1F_EventScript_15522A:: @ 815522A + msgbox PetalburgCity_PokemonCenter_1F_Text_17BD92, 2 + end + +PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 + lock + faceplayer + msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 + specialvar RESULT, IsStarterInParty + compare RESULT, 1 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F + release + end + +PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F + compare VAR_STARTER_MON, 0 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155272 + compare VAR_STARTER_MON, 1 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15527B + compare VAR_STARTER_MON, 2 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155284 + release + end + +PetalburgCity_PokemonCenter_1F_EventScript_155272:: @ 8155272 + msgbox PetalburgCity_PokemonCenter_1F_Text_17BE6C, 4 + return + +PetalburgCity_PokemonCenter_1F_EventScript_15527B:: @ 815527B + msgbox PetalburgCity_PokemonCenter_1F_Text_17BEF1, 4 + return + +PetalburgCity_PokemonCenter_1F_EventScript_155284:: @ 8155284 + msgbox PetalburgCity_PokemonCenter_1F_Text_17BF73, 4 + return diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/text.inc b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..1c4689672 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc @@ -0,0 +1,39 @@ +PetalburgCity_PokemonCenter_1F_Text_17BD30:: @ 817BD30 + .string "That PC-based POKéMON storage\n" + .string "system...\p" + .string "Whoever made it must be some kind\n" + .string "of a scientific wizard!$" + +PetalburgCity_PokemonCenter_1F_Text_17BD92:: @ 817BD92 + .string "When my POKéMON ate an\n" + .string "ORAN BERRY, it regained HP!$" + +PetalburgCity_PokemonCenter_1F_Text_17BDC5:: @ 817BDC5 + .string "There are many types of POKéMON.\p" + .string "All types have their strengths and\n" + .string "weaknesses against other types.\p" + .string "Depending on the types of POKéMON,\n" + .string "a battle could be easy or hard.$" + +PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C + .string "For example, your TREECKO is a\n" + .string "GRASS type.\p" + .string "It’s strong against the WATER and\n" + .string "GROUND types.\p" + .string "But, it’s weak against FIRE-type\n" + .string "POKéMON.$" + +PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 + .string "For example, your TORCHIC is a\n" + .string "FIRE type.\p" + .string "It’s strong against the GRASS and\n" + .string "BUG types.\p" + .string "But, it’s weak against WATER-type\n" + .string "POKéMON.$" + +PetalburgCity_PokemonCenter_1F_Text_17BF73:: @ 817BF73 + .string "For example, your MUDKIP is a\n" + .string "WATER type.\p" + .string "It’s strong against the FIRE type.\p" + .string "But, it’s weak against GRASS-type\n" + .string "and ELECTRIC-type POKéMON.$" diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 365e3a258..365e3a258 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index ac6c77b6a..7646fd56e 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..a95823736 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +PetalburgCity_PokemonCenter_2F_MapScripts:: @ 815528D + map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +PetalburgCity_PokemonCenter_2F_EventScript_15529D:: @ 815529D + call PetalburgCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +PetalburgCity_PokemonCenter_2F_EventScript_1552A3:: @ 81552A3 + call PetalburgCity_PokemonCenter_2F_EventScript_1A40CC + end + +PetalburgCity_PokemonCenter_2F_EventScript_1552A9:: @ 81552A9 + call PetalburgCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index bc33ab969..bc33ab969 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index e16ac5a7f..297065253 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,9 +1,9 @@ PetalburgCity_WallysHouse:: @ 8305F1C - .4byte House2_MapAttributes + .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 60 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc new file mode 100644 index 000000000..1a1605817 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -0,0 +1,61 @@ +PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 + .byte 0 + +PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 + lock + faceplayer + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_1543F7 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406 + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B + msgbox PetalburgCity_WallysHouse_Text_179805, 4 + setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY + release + end + +PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154431 + goto PetalburgCity_WallysHouse_EventScript_154406 + end + +PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 + msgbox PetalburgCity_WallysHouse_Text_179996, 4 + giveitem_std ITEM_HM03_SURF + setflag FLAG_RECEIVED_HM03 + msgbox PetalburgCity_WallysHouse_Text_179B14, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_154427:: @ 8154427 + msgbox PetalburgCity_WallysHouse_Text_179B5B, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_154431:: @ 8154431 + msgbox PetalburgCity_WallysHouse_Text_179B92, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B + msgbox PetalburgCity_WallysHouse_Text_179975, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 + lock + faceplayer + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463 + msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_154463:: @ 8154463 + msgbox PetalburgCity_WallysHouse_Text_179CA1, 4 + release + end + +PetalburgCity_WallysHouse_EventScript_15446D:: @ 815446D + msgbox PetalburgCity_WallysHouse_Text_179D12, 4 + release + end diff --git a/data/maps/PetalburgCity_WallysHouse/text.inc b/data/maps/PetalburgCity_WallysHouse/text.inc new file mode 100644 index 000000000..888dfbc91 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/text.inc @@ -0,0 +1,72 @@ +PetalburgCity_WallysHouse_Text_179805:: @ 8179805 + .string "You’re...\n" + .string "Ah, you must be {PLAYER}{KUN}, right?\p" + .string "Thank you for playing with WALLY a\n" + .string "little while ago.\p" + .string "He’s been frail and sickly ever\n" + .string "since he was a baby.\p" + .string "We’ve sent him to stay with my relatives\n" + .string "in VERDANTURF TOWN for a while.\p" + .string "The air is a lot cleaner there\n" + .string "than it is here.\p" + .string "What’s that? Where’s WALLY?\n" + .string "He’s already left, our WALLY.\p" + .string "I wonder where he could have\n" + .string "gotten by now?$" + +PetalburgCity_WallysHouse_Text_179975:: @ 8179975 + .string "I wonder how our WALLY is doing?$" + +PetalburgCity_WallysHouse_Text_179996:: @ 8179996 + .string "Hi there, {PLAYER}{KUN}!\p" + .string "Our WALLY’s become very healthy\n" + .string "since he went to VERDANTURF TOWN.\p" + .string "We owe it all to you!\p" + .string "When WALLY left town, you helped\n" + .string "him catch a POKéMON, right?\p" + .string "I think that made WALLY really\n" + .string "happy.\p" + .string "Actually, not just WALLY.\n" + .string "It made me, his father, happy too.\p" + .string "Happy that he’s got such a great\n" + .string "friend as you.\p" + .string "This isn’t a bribe or anything, but\n" + .string "I’d really like you to have this.$" + +PetalburgCity_WallysHouse_Text_179B14:: @ 8179B14 + .string "If your POKéMON can SURF, you’ll be\n" + .string "able to go to all sorts of places.$" + +PetalburgCity_WallysHouse_Text_179B5B:: @ 8179B5B + .string "WALLY’s coming home soon.\n" + .string "I’m looking forward to that.$" + +PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 + .string "Oh? You met WALLY in EVER GRANDE\n" + .string "CITY?\p" + .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" + .string "He may have gotten healthy, but he\n" + .string "can’t go somewhere far away like\l" + .string "that all by himself.$" + +PetalburgCity_WallysHouse_Text_179C2C:: @ 8179C2C + .string "WALLY was really happy when he told\n" + .string "us that he caught a POKéMON.\p" + .string "It’s been ages since I’ve seen him\n" + .string "smile like that.$" + +PetalburgCity_WallysHouse_Text_179CA1:: @ 8179CA1 + .string "Oh, hello, {PLAYER}! We’ve got\n" + .string "something we want you to have.\p" + .string "My husband has it, so please have a\n" + .string "word with him, dear.$" + +PetalburgCity_WallysHouse_Text_179D12:: @ 8179D12 + .string "I want you to keep this a secret\n" + .string "from my husband...\p" + .string "But our WALLY left VERDANTURF TOWN\n" + .string "without telling anyone.\p" + .string "You know, WALLY is frail, but\n" + .string "he’s surprisingly strong-willed.\p" + .string "I’m sure that he’ll come back safe\n" + .string "and sound one day!$" diff --git a/data/maps/PetalburgWoods/border.bin b/data/maps/PetalburgWoods/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/PetalburgWoods/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc index d624d94dc..d624d94dc 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/PetalburgWoods/events.inc diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index b3a981af9..d473ea6ed 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,9 +1,9 @@ PetalburgWoods:: @ 8306EA4 - .4byte PetalburgWoods_MapAttributes + .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 136 .byte 59 .byte 0 diff --git a/data/maps/PetalburgWoods/map.bin b/data/maps/PetalburgWoods/map.bin deleted file mode 100644 index a032b4c43..000000000 --- a/data/maps/PetalburgWoods/map.bin +++ /dev/null @@ -1 +0,0 @@ -000000
0
0
0
0
0
0IIII000001111
0
0
000000000000005555
0
0
0000000000000000
0
0000000
0
0
0
04000000
0
0000000
0
0
0000
0
0
0
0
0
00000000
0
0
00111111
0
0000000
0
0
0
0
0
0
00000000000
0
0
0
0
0
0
0555555
0
0
000000000
0
0
0
0
0111111000011111111111111110000
0
00
0
0
05555550000555555555555555000
0
0
000000000100
0
0
00000500
0
0
0000
00000010
0
0
00
0
0
0
0
0
00000000000000000050
0
0
0
0
0
0
0
0
0
0000000
0
0
0
0000000000
0
0
0
0
0
0
0
0
000000
0
0
0
0
0
0
0
0
0000000
011111111000011111111110000005555555500005555555555000000000000
000000
000000
0
000000000
000000
0
0
00000000000000
0
0
0
0
0
0
0
000
0
0000000
0
0
0
0
00
0
0
00000000000
0
0
0
0
0
0000
0
0
00110
0
0
0
0
0
0
00
0
0
0
0
0
0
0
0000000000000000
0
0
0
0550
0
0
0
0
0
0
0
0
0
0
0
0
0111111000000111111
0
0
0
011
0
0
0
011
0
0
0
0
0
0555000000555555
0
0
0
05
0
0
0
05
0
0
0
0
0
00000000
0
0
01111
0
0
0
0
0
0000
0
0
0
0
0
0
000000000000
0
0
0
0
0
0
0
0
040000000
0
0
0
0110
0
0
0
0
0
000000000
0
0
0
0
000005000000000000000
0
0
0
0
0
0
000000000
0
0
0
0
0
01111111100000011111111111111000
0
00
0
0500000055000
0
0
0
0
00000000000
0
011IIIIIIII5
\ No newline at end of file diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc new file mode 100644 index 000000000..69b85d743 --- /dev/null +++ b/data/maps/PetalburgWoods/scripts.inc @@ -0,0 +1,282 @@ +PetalburgWoods_MapScripts:: @ 815CC9C + map_script 3, PetalburgWoods_MapScript1_15CCA2 + .byte 0 + +PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2 + call PetalburgWoods_EventScript_1A0196 + end + +PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 + lockall + call PetalburgWoods_EventScript_15CDE6 + applymovement 4, PetalburgWoods_Movement_15CE89 + waitmovement 0 + msgbox PetalburgWoods_Text_194D92, 4 + closemessage + playbgm MUS_EVIL_TEAM, FALSE + applymovement 3, PetalburgWoods_Movement_15CEC3 + waitmovement 0 + msgbox PetalburgWoods_Text_194DED, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_15CEB0 + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_1A0841 + waitmovement 0 + msgbox PetalburgWoods_Text_194E6B, 4 + closemessage + applymovement 4, PetalburgWoods_Movement_15CE9E + waitmovement 0 + msgbox PetalburgWoods_Text_194E9A, 4 + applymovement 3, PetalburgWoods_Movement_15CEC8 + waitmovement 0 + msgbox PetalburgWoods_Text_194EE8, 4 + trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + applymovement 3, PetalburgWoods_Movement_15CEB3 + waitmovement 0 + call PetalburgWoods_EventScript_15CDFA + applymovement 4, PetalburgWoods_Movement_15CE80 + waitmovement 0 + goto PetalburgWoods_EventScript_15CE69 + end + +PetalburgWoods_EventScript_15CD42:: @ 815CD42 + lockall + call PetalburgWoods_EventScript_15CDE6 + applymovement 4, PetalburgWoods_Movement_15CE8E + waitmovement 0 + applymovement 255, PetalburgWoods_Movement_1A083F + waitmovement 0 + msgbox PetalburgWoods_Text_194D92, 4 + closemessage + playbgm MUS_EVIL_TEAM, FALSE + applymovement 3, PetalburgWoods_Movement_15CEC3 + waitmovement 0 + msgbox PetalburgWoods_Text_194DED, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_15CEBF + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_1A0841 + waitmovement 0 + msgbox PetalburgWoods_Text_194E6B, 4 + closemessage + applymovement 4, PetalburgWoods_Movement_15CEA4 + waitmovement 0 + msgbox PetalburgWoods_Text_194E9A, 4 + applymovement 255, PetalburgWoods_Movement_1A0841 + waitmovement 0 + msgbox PetalburgWoods_Text_194EE8, 4 + trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + applymovement 3, PetalburgWoods_Movement_15CEB3 + waitmovement 0 + call PetalburgWoods_EventScript_15CDFA + applymovement 4, PetalburgWoods_Movement_15CE95 + waitmovement 0 + goto PetalburgWoods_EventScript_15CE69 + end + +PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 + applymovement 4, PetalburgWoods_Movement_15CE73 + waitmovement 0 + msgbox PetalburgWoods_Text_194D71, 4 + closemessage + return + +PetalburgWoods_EventScript_15CDFA:: @ 815CDFA + msgbox PetalburgWoods_Text_194FA4, 4 + closemessage + applymovement 3, PetalburgWoods_Movement_15CEB7 + waitmovement 0 + removeobject 3 + applymovement 255, PetalburgWoods_Movement_1A0845 + waitmovement 0 + msgbox PetalburgWoods_Text_19507E, 4 + giveitem_std ITEM_GREAT_BALL + compare RESULT, 0 + goto_if_eq PetalburgWoods_EventScript_15CE3F + goto PetalburgWoods_EventScript_15CE4D + end + +PetalburgWoods_EventScript_15CE3F:: @ 815CE3F + msgbox PetalburgWoods_Text_195182, 4 + goto PetalburgWoods_EventScript_15CE4D + end + +PetalburgWoods_EventScript_15CE4D:: @ 815CE4D + msgbox PetalburgWoods_Text_19510A, 4 + applymovement 4, PetalburgWoods_Movement_15CEA8 + waitmovement 0 + msgbox PetalburgWoods_Text_195153, 4 + closemessage + return + +PetalburgWoods_EventScript_15CE69:: @ 815CE69 + removeobject 4 + setvar VAR_PETALBURG_WOODS_STATE, 1 + releaseall + end + +PetalburgWoods_Movement_15CE73:: @ 815CE73 + face_up + delay_16 + face_right + delay_16 + face_left + delay_16 + face_down + delay_16 + face_right + delay_16 + face_up + delay_16 + end_movement + +PetalburgWoods_Movement_15CE80:: @ 815CE80 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +PetalburgWoods_Movement_15CE89:: @ 815CE89 + delay_16 + face_player + walk_down + walk_down + end_movement + +PetalburgWoods_Movement_15CE8E:: @ 815CE8E + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right + end_movement + +PetalburgWoods_Movement_15CE95:: @ 815CE95 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +PetalburgWoods_Movement_15CE9E:: @ 815CE9E + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up + end_movement + +PetalburgWoods_Movement_15CEA4:: @ 815CEA4 + walk_fast_down + walk_fast_right + walk_in_place_fastest_up + end_movement + +PetalburgWoods_Movement_15CEA8:: @ 815CEA8 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up + end_movement + +PetalburgWoods_Movement_15CEB0:: @ 815CEB0 + walk_fast_down + walk_fast_down + end_movement + +PetalburgWoods_Movement_15CEB3:: @ 815CEB3 + lock_facing_direction + walk_up + unlock_facing_direction + end_movement + +PetalburgWoods_Movement_15CEB7:: @ 815CEB7 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + delay_16 + delay_16 + end_movement + +PetalburgWoods_Movement_15CEBF:: @ 815CEBF + walk_fast_down + walk_fast_down + walk_fast_down + end_movement + +PetalburgWoods_Movement_15CEC3:: @ 815CEC3 + walk_down + walk_down + delay_16 + delay_16 + end_movement + +PetalburgWoods_Movement_15CEC8:: @ 815CEC8 + walk_down + end_movement + +PetalburgWoods_EventScript_15CECA:: @ 815CECA + msgbox PetalburgWoods_Text_1953AC, 2 + end + +PetalburgWoods_EventScript_15CED3:: @ 815CED3 + msgbox PetalburgWoods_Text_19542B, 2 + end + +PetalburgWoods_EventScript_15CEDC:: @ 815CEDC + lock + faceplayer + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B + msgbox PetalburgWoods_Text_19549E, 4 + giveitem_std ITEM_MIRACLE_SEED + compare RESULT, 0 + goto_if_eq PetalburgWoods_EventScript_1A029B + setflag FLAG_RECEIVED_MIRACLE_SEED + release + end + +PetalburgWoods_EventScript_15CF0B:: @ 815CF0B + msgbox PetalburgWoods_Text_195503, 4 + release + end + +PetalburgWoods_EventScript_15CF15:: @ 815CF15 + msgbox PetalburgWoods_Text_1955B0, 3 + end + +PetalburgWoods_EventScript_15CF1E:: @ 815CF1E + msgbox PetalburgWoods_Text_1956A6, 3 + end + +PetalburgWoods_EventScript_15CF27:: @ 815CF27 + trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + msgbox PetalburgWoods_Text_195232, 6 + end + +PetalburgWoods_EventScript_15CF3E:: @ 815CF3E + trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq PetalburgWoods_EventScript_15CF65 + msgbox PetalburgWoods_Text_1952CC, 6 + end + +PetalburgWoods_EventScript_15CF65:: @ 815CF65 + trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + msgbox PetalburgWoods_Text_195356, 6 + end diff --git a/data/maps/PetalburgWoods/text.inc b/data/maps/PetalburgWoods/text.inc new file mode 100644 index 000000000..21a04dcc8 --- /dev/null +++ b/data/maps/PetalburgWoods/text.inc @@ -0,0 +1,145 @@ +PetalburgWoods_Text_194D71:: @ 8194D71 + .string "Hmmm...\n" + .string "Not a one to be found...$" + +PetalburgWoods_Text_194D92:: @ 8194D92 + .string "Hello, have you seen any POKéMON\n" + .string "called SHROOMISH around here?\p" + .string "I really love that POKéMON.$" + +PetalburgWoods_Text_194DED:: @ 8194DED + .string "I was going to ambush you, but you\n" + .string "had to dawdle in PETALBURG WOODS\l" + .string "forever, didn’t you?\p" + .string "I got sick of waiting, so here I am!$" + +PetalburgWoods_Text_194E6B:: @ 8194E6B + .string "You! DEVON RESEARCHER!\p" + .string "Hand over those papers!$" + +PetalburgWoods_Text_194E9A:: @ 8194E9A + .string "Aiyeeeh!\p" + .string "You’re a POKéMON TRAINER, aren’t you?\n" + .string "You’ve got to help me, please!$" + +PetalburgWoods_Text_194EE8:: @ 8194EE8 + .string "Hunh? What do you think you’re doing?\n" + .string "What, you’re going to protect him?\p" + .string "No one who crosses TEAM {EVIL_TEAM}\n" + .string "gets any mercy, not even a kid!\p" + .string "Come on and battle me!$" + +PetalburgWoods_Text_194F83:: @ 8194F83 + .string "You’re kidding me! You’re tough!$" + +PetalburgWoods_Text_194FA4:: @ 8194FA4 + .string "Grrr... You’ve got some nerve\n" + .string "meddling with TEAM {EVIL_TEAM}!\l" + .string "Come on and battle me again!\p" + .string "I wish I could say that, but I’m out of\n" + .string "POKéMON...\p" + .string "And, hey, we of TEAM {EVIL_TEAM} are also\n" + .string "after something in RUSTBORO.\p" + .string "I’ll let you go today!$" + +PetalburgWoods_Text_19507E:: @ 819507E + .string "Whew...\n" + .string "That was awfully close!\p" + .string "Thanks to you, he didn’t rob me of\n" + .string "these important papers.\p" + .string "I know, I’ll give you a GREAT BALL as\n" + .string "my thanks!$" + +PetalburgWoods_Text_19510A:: @ 819510A + .string "Didn’t that TEAM {EVIL_TEAM} thug say\n" + .string "they were after something in\l" + .string "RUSTBORO, too?$" + +PetalburgWoods_Text_195153:: @ 8195153 + .string "Uh-oh! It’s a crisis!\n" + .string "I can’t be wasting time!$" + +PetalburgWoods_Text_195182:: @ 8195182 + .string "You’re loaded with items.\n" + .string "I can’t give you this GREAT BALL.$" + +PetalburgWoods_Text_1951BE:: @ 81951BE + .string "I caught a whole bunch of POKéMON!\p" + .string "Go, go, go!\n" + .string "My BUG POKéMON team!$" + +PetalburgWoods_Text_195202:: @ 8195202 + .string "I have all these POKéMON, but I\n" + .string "couldn’t win...$" + +PetalburgWoods_Text_195232:: @ 8195232 + .string "I caught a bunch of POKéMON.\n" + .string "Now I’m out of POKé BALLS.$" + +PetalburgWoods_Text_19526A:: @ 819526A + .string "If you take BUG POKéMON to school,\n" + .string "you get to be instantly popular!$" + +PetalburgWoods_Text_1952AE:: @ 81952AE + .string "I can’t be popular if I lose.$" + +PetalburgWoods_Text_1952CC:: @ 81952CC + .string "If you have a big BUG POKéMON, people\n" + .string "respect you for it.$" + +PetalburgWoods_Text_195306:: @ 8195306 + .string "My BUG POKéMON have grown.\n" + .string "I’ll be popular again.$" + +PetalburgWoods_Text_195338:: @ 8195338 + .string "I can’t be popular if I lose.$" + +PetalburgWoods_Text_195356:: @ 8195356 + .string "You get to be popular if you have\n" + .string "strong POKéMON, right?\l" + .string "So, I’ve been training hard.$" + +PetalburgWoods_Text_1953AC:: @ 81953AC + .string "Yo, there!\n" + .string "Your POKéMON doing okay?\p" + .string "If your POKéMON are weak and you want\n" + .string "to avoid battles, you should stay out\l" + .string "of tall grass.$" + +PetalburgWoods_Text_19542B:: @ 819542B + .string "Sometimes, there are things on the\n" + .string "ground even if you can’t see them.\p" + .string "That’s why I always check where I’m\n" + .string "walking.$" + +PetalburgWoods_Text_19549E:: @ 819549E + .string "Oh, neat!\n" + .string "That’s the BADGE from RUSTBORO GYM!\p" + .string "You must be a TRAINER.\n" + .string "You should try using this item.$" + +PetalburgWoods_Text_195503:: @ 8195503 + .string "It’s a MIRACLE SEED.\n" + .string "If a POKéMON holds that item, its\l" + .string "GRASS-type moves become stronger.\p" + .string "Besides MIRACLE SEED, I think there are\n" + .string "other convenient items for POKéMON\l" + .string "to hold.$" + +PetalburgWoods_Text_1955B0:: @ 81955B0 + .string "TRAINER TIPS\p" + .string "Any POKéMON that appears even once\n" + .string "in a battle is awarded EXP Points.\p" + .string "To raise a weak POKéMON, put it at the\n" + .string "top of the team list.\p" + .string "As soon as a battle starts, switch it\n" + .string "out. It will earn EXP Points without\l" + .string "being exposed to any harm.$" + +PetalburgWoods_Text_1956A6:: @ 81956A6 + .string "TRAINER TIPS\p" + .string "In addition to Hit Points (HP), POKéMON\n" + .string "have Power Points (PP) that are used to\l" + .string "make moves during battle.\p" + .string "If a POKéMON runs out of PP, it must be\n" + .string "taken to a POKéMON CENTER.$" diff --git a/data/maps/RecordCorner/border.bin b/data/maps/RecordCorner/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RecordCorner/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc index e8c27a9c9..e8c27a9c9 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/RecordCorner/events.inc diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index a8322ebee..ee1142c85 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,9 +1,9 @@ RecordCorner:: @ 83079B0 - .4byte RecordCorner_MapAttributes + .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 224 .byte 87 .byte 0 diff --git a/data/maps/RecordCorner/map.bin b/data/maps/RecordCorner/map.bin deleted file mode 100644 index 51dfb6e5a..000000000 --- a/data/maps/RecordCorner/map.bin +++ /dev/null @@ -1 +0,0 @@ -22222222222222222222222222222222222222222222222222222222222222222222"2"2"2"2
\ No newline at end of file diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc new file mode 100644 index 000000000..8a2c1db22 --- /dev/null +++ b/data/maps/RecordCorner/scripts.inc @@ -0,0 +1,2 @@ +RecordCorner_MapScripts:: @ 815F57E + .byte 0 diff --git a/data/maps/Route101/border.bin b/data/maps/Route101/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route101/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc index 933509835..933509835 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/Route101/events.inc diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 1b4b6b1c4..c3d5606d5 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,9 +1,9 @@ Route101:: @ 8305608 - .4byte Route101_MapAttributes + .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections - .2byte BGM_DOORO1 + .2byte MUS_DOORO1 .2byte 17 .byte 16 .byte 0 diff --git a/data/maps/Route101/map.bin b/data/maps/Route101/map.bin deleted file mode 100644 index fab3a1d69..000000000 --- a/data/maps/Route101/map.bin +++ /dev/null @@ -1 +0,0 @@ -11101110
0
0
000000000
0
0
05
0
0
0
0000000
0
0
0
0
0
0
0
0
0
0000000
0
0
0
0
0
011
0
0
000000011
0
0
0
0
0
0
000n11
0
000000000011011000000001110001110
0
0011110111110
0
0
0
0
001110111110
0
0
0
0
0
00110011100
0
0
0
0
0
0000
0
0000011
0
0
0011
0
0
0
0
00000000
0
00011
0
0
0
00000001111
0
0
0
000000011111111000000
\ No newline at end of file diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc new file mode 100644 index 000000000..c7f570044 --- /dev/null +++ b/data/maps/Route101/scripts.inc @@ -0,0 +1,246 @@ +Route101_MapScripts:: @ 814E924 + map_script 3, Route101_MapScript1_14E92F + map_script 2, Route101_MapScript2_14E935 + .byte 0 + +Route101_MapScript1_14E92F:: @ 814E92F + call Route101_EventScript_1A02F4 + end + +Route101_MapScript2_14E935:: @ 814E935 + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F + .2byte 0 + +Route101_EventScript_14E93F:: @ 814E93F + setflag FLAG_SPECIAL_FLAG_0 + setvar VAR_ROUTE101_STATE, 1 + end + +Route101_EventScript_14E948:: @ 814E948 + lockall + playbgm MUS_EVENT0, TRUE + msgbox Route101_Text_16D10E, 4 + closemessage + setobjectxy 2, 0, 15 + setobjectxy 4, 0, 16 + applymovement 255, Route101_Movement_14EA2C + applymovement 2, Route101_Movement_14EA50 + applymovement 4, Route101_Movement_14EA1F + waitmovement 0 + applymovement 4, Route101_Movement_14EA00 + applymovement 2, Route101_Movement_14EA31 + waitmovement 0 + applymovement 2, Route101_Movement_1A0843 + waitmovement 0 + applymovement 4, Route101_Movement_14EA27 + applymovement 2, Route101_Movement_14EA58 + waitmovement 0 + msgbox Route101_Text_16D119, 4 + closemessage + setvar VAR_ROUTE101_STATE, 2 + releaseall + end + +Route101_EventScript_14E9B8:: @ 814E9B8 + lockall + msgbox Route101_Text_16D15E, 4 + closemessage + applymovement 255, Route101_Movement_14E9FA + waitmovement 0 + releaseall + end + +Route101_EventScript_14E9CE:: @ 814E9CE + lockall + msgbox Route101_Text_16D15E, 4 + closemessage + applymovement 255, Route101_Movement_14E9FC + waitmovement 0 + releaseall + end + +Route101_EventScript_14E9E4:: @ 814E9E4 + lockall + msgbox Route101_Text_16D15E, 4 + closemessage + applymovement 255, Route101_Movement_14E9FE + waitmovement 0 + releaseall + end + +Route101_Movement_14E9FA:: @ 814E9FA + walk_up + end_movement + +Route101_Movement_14E9FC:: @ 814E9FC + walk_right + end_movement + +Route101_Movement_14E9FE:: @ 814E9FE + walk_down + end_movement + +Route101_Movement_14EA00:: @ 814EA00 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + end_movement + +Route101_Movement_14EA1F:: @ 814EA1F + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement + +@ 814EA26 + end_movement + +Route101_Movement_14EA27:: @ 814EA27 + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + end_movement + +Route101_Movement_14EA2C:: @ 814EA2C + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +Route101_Movement_14EA31:: @ 814EA31 + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + end_movement + +Route101_Movement_14EA50:: @ 814EA50 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + end_movement + +@ 814EA57 + end_movement + +Route101_Movement_14EA58:: @ 814EA58 + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + end_movement + +@ 814EA5D + walk_up + walk_up + end_movement + +@ 814EA60 + walk_up + walk_left + walk_up + end_movement + +Route101_EventScript_14EA64:: @ 814EA64 + msgbox Route101_Text_16D25E, 2 + end + +Route101_EventScript_14EA6D:: @ 814EA6D + msgbox Route101_Text_16D2CB, 2 + end + +Route101_EventScript_14EA76:: @ 814EA76 + msgbox Route101_Text_16D349, 3 + end + +Route101_EventScript_14EA7F:: @ 814EA7F + lock + faceplayer + setflag FLAG_SYS_POKEMON_GET + setflag FLAG_RESCUED_BIRCH + fadescreen 1 + removeobject 4 + setobjectxy 255, 6, 13 + applymovement 255, Route101_Movement_1A083F + waitmovement 0 + special ScrSpecial_ChooseStarter + waitstate + applymovement 2, Route101_Movement_14EAD7 + waitmovement 0 + msgbox Route101_Text_16D191, 4 + special ScrSpecial_HealPlayerParty + setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + clearflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_BIRCH_STARTERS_BAG + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 + clearflag FLAG_SPECIAL_FLAG_0 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + waitstate + release + end + +Route101_Movement_14EAD7:: @ 814EAD7 + walk_right + end_movement diff --git a/data/maps/Route101/text.inc b/data/maps/Route101/text.inc new file mode 100644 index 000000000..3bfa1ef6e --- /dev/null +++ b/data/maps/Route101/text.inc @@ -0,0 +1,39 @@ +Route101_Text_16D10E:: @ 816D10E + .string "H-help me!$" + +Route101_Text_16D119:: @ 816D119 + .string "Hello! You over there!\n" + .string "Please! Help!\p" + .string "In my BAG!\n" + .string "There’s a POKé BALL!$" + +Route101_Text_16D15E:: @ 816D15E + .string "Wh-Where are you going?!\n" + .string "Don’t leave me like this!$" + +Route101_Text_16D191:: @ 816D191 + .string "PROF. BIRCH: Whew...\p" + .string "I was in the tall grass studying wild\n" + .string "POKéMON when I was jumped.\p" + .string "You saved me.\n" + .string "Thanks a lot!\p" + .string "Oh?\p" + .string "Hi, you’re {PLAYER}{KUN}!\p" + .string "This is not the place to chat, so come\n" + .string "by my POKéMON LAB later, okay?$" + +Route101_Text_16D25E:: @ 816D25E + .string "If POKéMON get tired, take them to\n" + .string "a POKéMON CENTER.\p" + .string "There’s a POKéMON CENTER in OLDALE\n" + .string "TOWN right close by.$" + +Route101_Text_16D2CB:: @ 816D2CB + .string "Wild POKéMON will jump out at you in\n" + .string "tall grass.\p" + .string "If you want to catch POKéMON, you have\n" + .string "to go into the tall grass and search.$" + +Route101_Text_16D349:: @ 816D349 + .string "ROUTE 101\n" + .string "{0x79} OLDALE TOWN$" diff --git a/data/maps/Route102/border.bin b/data/maps/Route102/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route102/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc index 4de0e95d2..4de0e95d2 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/Route102/events.inc diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index a4318e2d2..a84770fae 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,9 +1,9 @@ Route102:: @ 8305624 - .4byte Route102_MapAttributes + .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections - .2byte BGM_DOORO1 + .2byte MUS_DOORO1 .2byte 18 .byte 17 .byte 0 diff --git a/data/maps/Route102/map.bin b/data/maps/Route102/map.bin deleted file mode 100644 index 7378bb44b..000000000 --- a/data/maps/Route102/map.bin +++ /dev/null @@ -1 +0,0 @@ -
0
0
00000000000026620
0
0
0
0
0
0
000011110000011110
0
0
0
0
0
0
0
0
0
0
0
0
0011111111000000000000000
0
0
0
0
0
0
0
0
0
0
0
00111q2y211110000000000110000
0
0
0000
0
0
0
0
0
0
0011100111100000
0
00000
0
0
0
00001r210000
0
0
0
0
00110000000000000000000000000
0
0
0
0
0
0
00{00000000000001111111100000
0
0
0
0
0
0
00011000000000000011
0
0
0
0
0
000000000011110000000
0
0
0
000000000111111100011
0
000
0
0
00011000
0
0111111111000
0
01100011000
0
0
0
0111111101111
0
0
0000000000
0
0
0
0
000111111000
0
0
001100
0
0
00000
0
0
0000111001111
0
0
0
00
0
0
0
0
0
0
0000000000000001111111111
0
0
00000011111111
0
0
0
0000011111111
\ No newline at end of file diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc new file mode 100644 index 000000000..ad1571caa --- /dev/null +++ b/data/maps/Route102/scripts.inc @@ -0,0 +1,46 @@ +Route102_MapScripts:: @ 814EAD9 + .byte 0 + +Route102_EventScript_14EADA:: @ 814EADA + msgbox Route102_Text_16D431, 2 + end + +Route102_EventScript_14EAE3:: @ 814EAE3 + msgbox Route102_Text_16D547, 3 + end + +Route102_EventScript_14EAEC:: @ 814EAEC + msgbox Route102_Text_16D55F, 3 + end + +Route102_EventScript_14EAF5:: @ 814EAF5 + msgbox Route102_Text_16D51A, 2 + end + +Route102_EventScript_14EAFE:: @ 814EAFE + trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route102_EventScript_14EB25 + msgbox Route102_Text_1B7A60, 6 + end + +Route102_EventScript_14EB25:: @ 814EB25 + trainerbattle 5, OPPONENT_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + msgbox Route102_Text_1B7B2F, 6 + end + +Route102_EventScript_14EB3C:: @ 814EB3C + trainerbattle 0, OPPONENT_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + msgbox Route102_Text_1B7C52, 6 + end + +Route102_EventScript_14EB53:: @ 814EB53 + trainerbattle 0, OPPONENT_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + msgbox Route102_Text_1B7D11, 6 + end + +Route102_EventScript_14EB6A:: @ 814EB6A + trainerbattle 0, OPPONENT_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + msgbox Route102_Text_1B7BD0, 6 + end diff --git a/data/maps/Route102/text.inc b/data/maps/Route102/text.inc new file mode 100644 index 000000000..cf367edc2 --- /dev/null +++ b/data/maps/Route102/text.inc @@ -0,0 +1,43 @@ +PetalburgCity_Text_16D361:: @ 816D361 + .string "WALLY: {PLAYER}...\n" + .string "POKéMON hide in tall grass like this,\l" + .string "don’t they?\p" + .string "Please watch me and see if I can\n" + .string "catch one properly.\p" + .string "...Whoa!$" + +PetalburgCity_Text_16D3DE:: @ 816D3DE + .string "WALLY: I did it... It’s my...\n" + .string "My POKéMON!$" + +PetalburgCity_Text_16D408:: @ 816D408 + .string "{PLAYER}, thank you!\n" + .string "Let’s go back to the GYM!$" + +Route102_Text_16D431:: @ 816D431 + .string "I’m...not very tall, so I sink right\n" + .string "into tall grass.\p" + .string "The grass goes up my nose and...\n" + .string "Fwafwafwafwafwa...\p" + .string "Fwatchoo!$" + +UnknownString_816D4A5: @ 816D4A5 + .string "Fufufufu...\n" + .string "Watch me.$" + +UnknownString_816D4BB: @ 816D4BB + .string "Ta-daaaah! Awesome, huh?\p" + .string "There are some ledges that you can’t\n" + .string "climb up, but you can jump down.$" + +Route102_Text_16D51A:: @ 816D51A + .string "I’m going to catch a whole bunch of\n" + .string "POKéMON!$" + +Route102_Text_16D547:: @ 816D547 + .string "ROUTE 102\n" + .string "{0x7C} OLDALE TOWN$" + +Route102_Text_16D55F:: @ 816D55F + .string "ROUTE 102\n" + .string "{0x7B} PETALBURG CITY$" diff --git a/data/maps/Route103/border.bin b/data/maps/Route103/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route103/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc index f131106da..f131106da 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/Route103/events.inc diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index b23f9d523..f0423adeb 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,9 +1,9 @@ Route103:: @ 8305640 - .4byte Route103_MapAttributes + .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections - .2byte BGM_DOORO1 + .2byte MUS_DOORO1 .2byte 19 .byte 18 .byte 0 diff --git a/data/maps/Route103/map.bin b/data/maps/Route103/map.bin deleted file mode 100644 index 6c5205b4c..000000000 --- a/data/maps/Route103/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppppppppppppsqqsqqqsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquuvpppppppppuvp{|sqqq{qqqqt|||||||qqqqqqqqt}qqqqqu000000
0
0
0
0
0
0}~ppppppppp}~ps{qqq{||||}qtq{||||||||}qqqqqqu00001111
0
0
0
0ppppppuvPQpppppp{sqt||}qqq{|||||||}
0
0000011110
0
0
0
0
0puvppp}~XYppuvpps{|}tyyy
0
0
0
04444444o4
0
0
0
0dQpp}~uvPQpppPQ}~uvPesqqqu0K1L5L5L5M1
0
0
0
0
0
0
000004444444lYuvpp}~XYpppXYpp}~Xm{|||z011111000000
0
0
0
0
0
0
000000000000p}~pppppppppppppppp0000000000000000000
0
0
0
0
0
0
00000111110000ppppppppppppppppppppppp00000000000000000011
0
0
0
0
00040111111000ppppppppppppppppppppppppp011110000000000011111
0
0
0
000000001111000ppppppppppppppppppppppppp0(1)1!1!1111100000011!1!1)1)1)1
0
0
0
0000000
0
0
0
00000ppppppppppppppppppppppppp000(1)1)1)1!1!1111111111111111!1!1)1*10004444444444
0
0
0
0
000000yppppppppppppppppppppppp0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*1000000000000
0
0
0
0
0
0
0111111dQPQppppppppppuvppppp0000000000000000000000000000000
0
0
0
0
0
0
05555lYXYuvppppPQPQ}~puvpx 000000000001100000011111122yp}~uvPQXYXYpPQ}~Pe0000000000000005ppp}~XYpppppXYppXm000000000110000uvppppppppppppppp550000}~ppppppppppppppx 00000pppppppppppppppp
\ No newline at end of file diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc new file mode 100644 index 000000000..361dc78c3 --- /dev/null +++ b/data/maps/Route103/scripts.inc @@ -0,0 +1,216 @@ +Route103_MapScripts:: @ 814EB81 + map_script 3, Route103_MapScript1_14EB87 + .byte 0 + +Route103_MapScript1_14EB87:: @ 814EB87 + call Route103_EventScript_1A014E + call Route103_EventScript_1A02F4 + end + +Route103_EventScript_14EB92:: @ 814EB92 + lockall + checkplayergender + compare RESULT, 0 + goto_if_eq Route103_EventScript_14EBAB + compare RESULT, 1 + goto_if_eq Route103_EventScript_14EC04 + end + +Route103_EventScript_14EBAB:: @ 814EBAB + msgbox Route103_Text_16D57A, 4 + playbgm MUS_GIRL_SUP, TRUE + applymovement 2, Route103_Movement_1A0839 + waitmovement 0 + applymovement 2, Route103_Movement_1A0833 + waitmovement 0 + applymovement 2, Route103_Movement_1A0835 + waitmovement 0 + msgbox Route103_Text_16D5B6, 4 + switch VAR_STARTER_MON + case 0, Route103_EventScript_14EC5D + case 1, Route103_EventScript_14EC6D + case 2, Route103_EventScript_14EC7D + end + +Route103_EventScript_14EC04:: @ 814EC04 + msgbox Route103_Text_16D762, 4 + playbgm MUS_BOY_SUP, TRUE + applymovement 2, Route103_Movement_1A0839 + waitmovement 0 + applymovement 2, Route103_Movement_1A0833 + waitmovement 0 + applymovement 2, Route103_Movement_1A0835 + waitmovement 0 + msgbox Route103_Text_16D7A9, 4 + switch VAR_STARTER_MON + case 0, Route103_EventScript_14EC8D + case 1, Route103_EventScript_14EC9D + case 2, Route103_EventScript_14ECAD + end + +Route103_EventScript_14EC5D:: @ 814EC5D + trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B + goto Route103_EventScript_14ECBD + end + +Route103_EventScript_14EC6D:: @ 814EC6D + trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B + goto Route103_EventScript_14ECBD + end + +Route103_EventScript_14EC7D:: @ 814EC7D + trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B + goto Route103_EventScript_14ECBD + end + +Route103_EventScript_14EC8D:: @ 814EC8D + trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 + goto Route103_EventScript_14ECCB + end + +Route103_EventScript_14EC9D:: @ 814EC9D + trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 + goto Route103_EventScript_14ECCB + end + +Route103_EventScript_14ECAD:: @ 814ECAD + trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 + goto Route103_EventScript_14ECCB + end + +Route103_EventScript_14ECBD:: @ 814ECBD + msgbox Route103_Text_16D688, 4 + goto Route103_EventScript_14ECD9 + end + +Route103_EventScript_14ECCB:: @ 814ECCB + msgbox Route103_Text_16D856, 4 + goto Route103_EventScript_14ECD9 + end + +Route103_EventScript_14ECD9:: @ 814ECD9 + closemessage + switch FACING + case 1, Route103_EventScript_14ED29 + case 2, Route103_EventScript_14ED0C + case 3, Route103_EventScript_14ED29 + case 4, Route103_EventScript_14ED29 + end + +Route103_EventScript_14ED0C:: @ 814ED0C + applymovement 2, Route103_Movement_14ED67 + waitmovement 0 + playse SE_DANSA + applymovement 2, Route103_Movement_14ED6B + waitmovement 0 + goto Route103_EventScript_14ED46 + end + +Route103_EventScript_14ED29:: @ 814ED29 + applymovement 2, Route103_Movement_14ED71 + waitmovement 0 + playse SE_DANSA + applymovement 2, Route103_Movement_14ED74 + waitmovement 0 + goto Route103_EventScript_14ED46 + end + +Route103_EventScript_14ED46:: @ 814ED46 + removeobject 2 + setvar VAR_ROUTE103_STATE, 1 + setvar VAR_BIRCH_LAB_STATE, 4 + clearflag FLAG_HIDE_RIVAL_BIRCH_LAB + setflag FLAG_DEFEATED_RIVAL_ROUTE103 + setvar VAR_OLDALE_STATE, 1 + clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN + savebgm 0 + fadedefaultbgm + releaseall + end + +Route103_Movement_14ED67:: @ 814ED67 + walk_left + walk_down + walk_down + end_movement + +Route103_Movement_14ED6B:: @ 814ED6B + jump_2_down + delay_16 + walk_down + walk_down + walk_down + end_movement + +Route103_Movement_14ED71:: @ 814ED71 + walk_down + walk_down + end_movement + +Route103_Movement_14ED74:: @ 814ED74 + jump_2_down + delay_16 + walk_down + walk_down + end_movement + +Route103_EventScript_14ED79:: @ 814ED79 + msgbox Route103_Text_16D950, 2 + end + +Route103_EventScript_14ED82:: @ 814ED82 + msgbox Route103_Text_16D996, 2 + end + +Route103_EventScript_14ED8B:: @ 814ED8B + msgbox Route103_Text_16D9FB, 3 + end + +Route103_EventScript_14ED94:: @ 814ED94 + trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + msgbox Route103_Text_1B7DB2, 6 + end + +Route103_EventScript_14EDAB:: @ 814EDAB + trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route103_EventScript_14EDD6 + msgbox Route103_Text_1B7E50, 6 + end + +Route103_EventScript_14EDD6:: @ 814EDD6 + trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + msgbox Route103_Text_1B8053, 6 + end + +Route103_EventScript_14EDF1:: @ 814EDF1 + trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route103_EventScript_14EE1C + msgbox Route103_Text_1B7F40, 6 + end + +Route103_EventScript_14EE1C:: @ 814EE1C + trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + msgbox Route103_Text_1B814D, 6 + end + +Route103_EventScript_14EE37:: @ 814EE37 + trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + msgbox Route103_Text_1B8281, 6 + end + +Route103_EventScript_14EE4E:: @ 814EE4E + trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route103_EventScript_14EE75 + msgbox Route103_Text_1B830D, 6 + end + +Route103_EventScript_14EE75:: @ 814EE75 + trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C + msgbox Route103_Text_1B83A4, 6 + end diff --git a/data/maps/Route103/text.inc b/data/maps/Route103/text.inc new file mode 100644 index 000000000..ebdedea82 --- /dev/null +++ b/data/maps/Route103/text.inc @@ -0,0 +1,64 @@ +Route103_Text_16D57A:: @ 816D57A + .string "MAY: Let’s see... The POKéMON found\n" + .string "on ROUTE 103 include...$" + +Route103_Text_16D5B6:: @ 816D5B6 + .string "Oh, hi, {PLAYER}{KUN}!\p" + .string "...Oh, I see, my dad gave you a\n" + .string "POKéMON as a gift.\p" + .string "Since we’re here, let’s have a quick\n" + .string "battle!\p" + .string "I’ll give you a taste of what being a\n" + .string "TRAINER is like.$" + +Route103_Text_16D65B:: @ 816D65B + .string "Wow! That’s great!\n" + .string "{PLAYER}{KUN}, you’re pretty good!$" + +Route103_Text_16D688:: @ 816D688 + .string "MAY: I think I know why my dad has an\n" + .string "eye out for you now.\p" + .string "I mean, you just got that POKéMON but\n" + .string "it already likes you.\p" + .string "You might be able to befriend any\n" + .string "kind of POKéMON easily.\p" + .string "Well, it’s time to head back to the\n" + .string "LAB.$" + +Route103_Text_16D762:: @ 816D762 + .string "BRENDAN: Okay, so it’s this one and\n" + .string "that one that live on ROUTE 103...$" + +Route103_Text_16D7A9:: @ 816D7A9 + .string "Hey, it’s {PLAYER}!\p" + .string "...Oh, yeah, Dad gave you a POKéMON.\p" + .string "Since we’re here, how about a little\n" + .string "battle?\p" + .string "I’ll teach you what being a TRAINER’s\n" + .string "about!$" + +Route103_Text_16D836:: @ 816D836 + .string "Huh, {PLAYER}, you’re not too shabby.$" + +Route103_Text_16D856:: @ 816D856 + .string "BRENDAN: I think I get it.\n" + .string "I think I know why my dad has his eye\l" + .string "out for you now.\p" + .string "Look, your POKéMON already likes you,\n" + .string "even though you just got it.\p" + .string "{PLAYER}, I get the feeling that you\n" + .string "could befriend any POKéMON with ease.\p" + .string "We should head back to the LAB.$" + +Route103_Text_16D950:: @ 816D950 + .string "My POKéMON is staggeringly tired...\n" + .string "I should have brought a POTION...$" + +Route103_Text_16D996:: @ 816D996 + .string "If you cross the sea from here,\n" + .string "it’ll be a shortcut to OLDALE TOWN.\p" + .string "Fufufu, that’s useful, isn’t it?$" + +Route103_Text_16D9FB:: @ 816D9FB + .string "ROUTE 103\n" + .string "{0x7A} OLDALE TOWN$" diff --git a/data/maps/Route104/border.bin b/data/maps/Route104/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route104/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc index 61934c590..61934c590 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/Route104/events.inc diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 71e7059b5..da47dab56 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,9 +1,9 @@ Route104:: @ 830565C - .4byte Route104_MapAttributes + .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 20 .byte 19 .byte 0 diff --git a/data/maps/Route104/map.bin b/data/maps/Route104/map.bin Binary files differdeleted file mode 100644 index 7731bc31c..000000000 --- a/data/maps/Route104/map.bin +++ /dev/null diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc new file mode 100644 index 000000000..8fda04ea5 --- /dev/null +++ b/data/maps/Route104/scripts.inc @@ -0,0 +1,454 @@ +Route104_MapScripts:: @ 814EE8C + map_script 2, Route104_MapScript2_14EE97 + map_script 3, Route104_MapScript1_14EEA8 + .byte 0 + +Route104_MapScript2_14EE97:: @ 814EE97 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1 + .2byte 0 + +Route104_EventScript_14EEA1:: @ 814EEA1 + lockall + goto Route104_EventScript_14EFD5 + end + +Route104_MapScript1_14EEA8:: @ 814EEA8 + call Route104_EventScript_14EEAE + end + +Route104_EventScript_14EEAE:: @ 814EEAE + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4 + clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE + return + +Route104_EventScript_14EEC4:: @ 814EEC4 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE + return + +Route104_EventScript_14EEC8:: @ 814EEC8 + lock + faceplayer + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF + msgbox Route104_Text_1C55B9, 4 + giveitem_std ITEM_CHESTO_BERRY + compare RESULT, 0 + goto_if_eq Route104_EventScript_1A029B + setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 + msgbox Route104_Text_1C5665, 4 + release + end + +Route104_EventScript_14EEFF:: @ 814EEFF + msgbox Route104_Text_1C5665, 4 + release + end + +Route104_EventScript_14EF09:: @ 814EF09 + lock + faceplayer + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 + msgbox Route104_Text_16DD91, 4 + giveitem_std ITEM_WHITE_HERB + compare RESULT, 0 + goto_if_eq Route104_EventScript_1A029B + setflag FLAG_RECEIVED_WHITE_HERB + release + end + +Route104_EventScript_14EF38:: @ 814EF38 + msgbox Route104_Text_16DE36, 4 + release + end + +Route104_EventScript_14EF42:: @ 814EF42 + msgbox Route104_Text_16DA13, 2 + end + +Route104_EventScript_14EF4B:: @ 814EF4B + msgbox Route104_Text_16DA89, 3 + end + +Route104_EventScript_14EF54:: @ 814EF54 + msgbox Route104_Text_16DEB3, 3 + end + +Route104_EventScript_14EF5D:: @ 814EF5D + msgbox Route104_Text_16DEC8, 3 + end + +Route104_EventScript_14EF66:: @ 814EF66 + msgbox Route104_Text_16DEE3, 3 + end + +Route104_EventScript_14EF6F:: @ 814EF6F + msgbox Route104_Text_16DEFD, 3 + end + +Route104_EventScript_14EF78:: @ 814EF78 + msgbox Route104_Text_16DF16, 3 + end + +Route104_EventScript_14EF81:: @ 814EF81 + msgbox Route104_Text_16DAC9, 2 + end + +Route104_EventScript_14EF8A:: @ 814EF8A + msgbox Route104_Text_16DB5C, 2 + end + +Route104_EventScript_14EF93:: @ 814EF93 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 + msgbox Route104_Text_16DC5F, 4 + giveitem_std ITEM_TM09_BULLET_SEED + compare RESULT, 0 + goto_if_eq Route104_EventScript_1A029B + setflag FLAG_RECEIVED_TM09 + release + end + +Route104_EventScript_14EFC2:: @ 814EFC2 + msgbox Route104_Text_16DD0E, 4 + release + end + +Route104_EventScript_14EFCC:: @ 814EFCC + msgbox Route104_Text_16DBC9, 2 + end + +Route104_EventScript_14EFD5:: @ 814EFD5 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 + applymovement 8, Route104_Movement_14F16C + waitmovement 0 + removeobject 8 + applymovement 255, Route104_Movement_14F162 + waitmovement 0 + hideobjectat 255, MAP_ROUTE104 + call Route104_EventScript_1A02E7 + applymovement 7, Route104_Movement_14F09F + applymovement 255, Route104_Movement_14F09F + waitmovement 0 + applymovement 255, Route104_Movement_14F166 + waitmovement 0 + call Route104_EventScript_1A02EF + showobjectat 255, MAP_DEWFORD_TOWN + applymovement 255, Route104_Movement_14F168 + waitmovement 0 + setobjectxyperm 2, 12, 8 + addobject 2 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + applymovement 2, Route104_Movement_14F16F + waitmovement 0 + addobject 4 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + call Route104_EventScript_1A02EF + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + hideobjectat 7, MAP_ROUTE104 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN + moveobjectoffscreen 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095 + end + +Route104_EventScript_14F08B:: @ 814F08B + msgbox Route104_Text_16B347, 4 + releaseall + end + +Route104_EventScript_14F095:: @ 814F095 + msgbox Route104_Text_16B4B5, 4 + releaseall + end + +Route104_Movement_14F09F:: @ 814F09F + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down + end_movement + +Route104_Movement_14F162:: @ 814F162 + walk_left + walk_down + walk_down + end_movement + +Route104_Movement_14F166:: @ 814F166 + walk_down + end_movement + +Route104_Movement_14F168:: @ 814F168 + walk_down + walk_left + walk_in_place_fastest_right + end_movement + +Route104_Movement_14F16C:: @ 814F16C + walk_down + walk_down + end_movement + +Route104_Movement_14F16F:: @ 814F16F + walk_down + walk_in_place_fastest_left + end_movement + +Route104_EventScript_14F172:: @ 814F172 + trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + msgbox Route104_Text_1B8680, 6 + end + +Route104_EventScript_14F189:: @ 814F189 + trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + msgbox Route104_Text_1B871C, 6 + end + +Route104_EventScript_14F1A0:: @ 814F1A0 + trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route104_EventScript_14F1C7 + msgbox Route104_Text_1B87C3, 6 + end + +Route104_EventScript_14F1C7:: @ 814F1C7 + trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 + msgbox Route104_Text_1B8872, 6 + end + +Route104_EventScript_14F1DE:: @ 814F1DE + trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route104_EventScript_14F205 + msgbox Route104_Text_1B8925, 6 + end + +Route104_EventScript_14F205:: @ 814F205 + trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E + msgbox Route104_Text_1B89C0, 6 + end + +Route104_EventScript_14F21C:: @ 814F21C + trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route104_EventScript_14F243 + msgbox Route104_Text_1B8A69, 6 + end + +Route104_EventScript_14F243:: @ 814F243 + trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + msgbox Route104_Text_1B8B02, 6 + end + +Route104_EventScript_14F25A:: @ 814F25A + trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + special GetPlayerBigGuyGirlString + msgbox Route104_Text_1B842C, 4 + release + end + +Route104_EventScript_14F279:: @ 814F279 + trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + special GetPlayerBigGuyGirlString + msgbox Route104_Text_1B853B, 4 + release + end diff --git a/data/maps/Route104/text.inc b/data/maps/Route104/text.inc new file mode 100644 index 000000000..95f70a7ec --- /dev/null +++ b/data/maps/Route104/text.inc @@ -0,0 +1,81 @@ +Route104_Text_16DA13:: @ 816DA13 + .string "That seaside cottage is where\n" + .string "MR. BRINEY lives.\p" + .string "He was once a mighty sailor who never\n" + .string "feared the sea, however stormy.$" + +Route104_Text_16DA89:: @ 816DA89 + .string "The sea, huh?\p" + .string "I wonder what it’s like at the bottom\n" + .string "of the sea?$" + +Route104_Text_16DAC9:: @ 816DAC9 + .string "If you’re going to throw a POKé BALL,\n" + .string "weaken the wild POKéMON first.\p" + .string "It will be easier to catch if it’s been\n" + .string "poisoned, burned, or lulled to sleep.$" + +Route104_Text_16DB5C:: @ 816DB5C + .string "You’re a thief if you try to steal\n" + .string "someone else’s POKéMON.\p" + .string "You should throw POKé BALLS only at\n" + .string "wild POKéMON.$" + +Route104_Text_16DBC9:: @ 816DBC9 + .string "Oh, no, I’m not a TRAINER.\p" + .string "But that’s right, if TRAINERS lock eyes,\n" + .string "it’s a challenge to battle.\p" + .string "If you don’t want to battle, stay out\n" + .string "of their sight.$" + +Route104_Text_16DC5F:: @ 816DC5F + .string "I like filling my mouth with seeds,\n" + .string "then spitting them out fast!\p" + .string "You can have this, so you try it out!\p" + .string "Use it on a POKéMON, and it will learn\n" + .string "a move for firing seeds rapidly.$" + +Route104_Text_16DD0E:: @ 816DD0E + .string "A word of advice!\p" + .string "A TM, TECHNICAL MACHINE, is good only\n" + .string "for one-time use.\p" + .string "Once you use it, it’s gone.\n" + .string "Think twice before using it!$" + +Route104_Text_16DD91:: @ 816DD91 + .string "This FLOWER SHOP started selling\n" + .string "saplings recently.\p" + .string "It made me so happy, I went overboard\n" + .string "shopping. I don’t need this WHITE HERB\l" + .string "anymore. Would you take it, please?$" + +Route104_Text_16DE36:: @ 816DE36 + .string "This FLOWER SHOP started selling\n" + .string "saplings recently.\p" + .string "It made me so happy, I went overboard\n" + .string "shopping. Where should I put them?$" + +Route104_Text_16DEB3:: @ 816DEB3 + .string "MR. BRINEY’S COTTAGE$" + +Route104_Text_16DEC8:: @ 816DEC8 + .string "ROUTE 1O4\n" + .string "{0x7C} PETALBURG CITY$" + +Route104_Text_16DEE3:: @ 816DEE3 + .string "ROUTE 1O4\n" + .string "{0x79} RUSTBORO CITY$" + +Route104_Text_16DEFD:: @ 816DEFD + .string "PRETTY PETAL FLOWER SHOP$" + +Route104_Text_16DF16:: @ 816DF16 + .string "TRAINER TIPS\p" + .string "In the HOENN region there are pairs\n" + .string "of TRAINERS who challenge others\l" + .string "for 2-on-2 POKéMON battles called\l" + .string "DOUBLE BATTLES.\p" + .string "In a DOUBLE BATTLE, the TRAINER must\n" + .string "send out two POKéMON, the one at the\l" + .string "left of the list and the top one.\l" + .string "Watch how POKéMON are lined up.$" diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/maps/Route104_MrBrineysHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route104_MrBrineysHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc index 9ae66cabb..9ae66cabb 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 3055a73d6..e5a626a43 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,9 +1,9 @@ Route104_MrBrineysHouse:: @ 8306C20 - .4byte Route104_MrBrineysHouse_MapAttributes + .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 102 .byte 19 .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/maps/Route104_MrBrineysHouse/map.bin deleted file mode 100644 index 7660fd5d7..000000000 --- a/data/maps/Route104_MrBrineysHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ - 222!22!2!22222266)2)2)2)2)2)2)2)2)2)26)2)2)2)2)2)2NO)2)2)2!2)2)2)2)2)2)2VWD2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333
\ No newline at end of file diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc new file mode 100644 index 000000000..514b1b9cc --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -0,0 +1,95 @@ +Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 + map_script 3, Route104_MrBrineysHouse_MapScript1_15BCB8 + .byte 0 + +Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE + compare VAR_BRINEY_HOUSE_STATE, 1 + call_if_eq Route104_MrBrineysHouse_EventScript_15BCD4 + call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_15BCD0 + end + +Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 + setflag FLAG_HIDE_RIVAL_RUSTBORO + return + +Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 + setobjectxyperm 1, 9, 3 + setobjectmovementtype 1, 50 + setobjectxyperm 2, 9, 6 + setobjectmovementtype 2, 51 + return + +Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB + lock + faceplayer + call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_15BD0E + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_15BD65 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_15BD7E + goto Route104_MrBrineysHouse_EventScript_15BD32 + end + +Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E + setflag FLAG_MR_BRINEY_SAILING_INTRO + msgbox Route104_MrBrineysHouse_Text_191A82, 4 + msgbox Route104_MrBrineysHouse_Text_191AAD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 + goto Route104_MrBrineysHouse_EventScript_15BDAB + end + +Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 + message Route104_MrBrineysHouse_Text_191E80 + waitmessage + multichoicedefault 21, 8, 14, 1, 0 + switch RESULT + case 0, Route104_MrBrineysHouse_EventScript_15BDAB + case 1, Route104_MrBrineysHouse_EventScript_15BDA1 + case 127, Route104_MrBrineysHouse_EventScript_15BDA1 + end + +Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 + msgbox Route104_MrBrineysHouse_Text_191CC3, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 + goto Route104_MrBrineysHouse_EventScript_15BDAB + end + +Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E + msgbox Route104_MrBrineysHouse_Text_191DA6, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 + goto Route104_MrBrineysHouse_EventScript_15BDAB + end + +Route104_MrBrineysHouse_EventScript_15BD97:: @ 815BD97 + msgbox Route104_MrBrineysHouse_Text_191C57, 4 + release + end + +Route104_MrBrineysHouse_EventScript_15BDA1:: @ 815BDA1 + msgbox Route104_MrBrineysHouse_Text_191EDB, 4 + release + end + +Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB + msgbox Route104_MrBrineysHouse_Text_191BFD, 4 + call Route104_MrBrineysHouse_EventScript_1A010C + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + warp MAP_ROUTE104, 255, 13, 51 + waitstate + releaseall + end + +Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox Route104_MrBrineysHouse_Text_191FB9, 4 + waitmoncry + release + end diff --git a/data/maps/Route104_MrBrineysHouse/text.inc b/data/maps/Route104_MrBrineysHouse/text.inc new file mode 100644 index 000000000..37fd0c0e1 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/text.inc @@ -0,0 +1,67 @@ +Route104_MrBrineysHouse_Text_191A82:: @ 8191A82 + .string "MR. BRINEY: Hold on, lass!\n" + .string "Wait up, PEEKO!$" + +Route104_MrBrineysHouse_Text_191AAD:: @ 8191AAD + .string "Hm? You’re {PLAYER}{KUN}!\n" + .string "You saved my darling PEEKO!\l" + .string "We owe so much to you!\p" + .string "What’s that?\n" + .string "You want to sail with me?\p" + .string "Hmhm...\p" + .string "You have a LETTER bound for DEWFORD\n" + .string "and a package for SLATEPORT, then?\p" + .string "Quite the busy life you must lead!\p" + .string "But, certainly, what you’re asking is\n" + .string "no problem at all.\p" + .string "You’ve come to the right man!\n" + .string "We’ll set sail for DEWFORD.$" + +Route104_MrBrineysHouse_Text_191BFD:: @ 8191BFD + .string "MR. BRINEY: DEWFORD, here we come!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +Route104_MrBrineysHouse_Text_191C57:: @ 8191C57 + .string "MR. BRINEY: Is that so?\n" + .string "Your deliveries can wait?\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" + +Route104_MrBrineysHouse_Text_191CC3:: @ 8191CC3 + .string "MR. BRINEY: Ahoy!\n" + .string "I know exactly what you want to say!\p" + .string "You’re to deliver a LETTER to DEWFORD\n" + .string "and a package to SLATEPORT.\p" + .string "What you need me to do is no problem\n" + .string "at all - I’m the man for the job!\p" + .string "First, we’ll set sail for DEWFORD.$" + +Route104_MrBrineysHouse_Text_191DA6:: @ 8191DA6 + .string "MR. BRINEY: Ahoy!\n" + .string "I know exactly what you want to say!\p" + .string "You’re to deliver a package to\n" + .string "CAPT. STERN in SLATEPORT.\p" + .string "What you need me to do is no problem\n" + .string "at all - I’m the man for the job!\p" + .string "First, we’ll set sail for DEWFORD.$" + +Route104_MrBrineysHouse_Text_191E80:: @ 8191E80 + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" + +Route104_MrBrineysHouse_Text_191EDB:: @ 8191EDB + .string "MR. BRINEY: Is that so?\n" + .string "Well, PEEKO owes her life to you.\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" + +UnknownString_8191F4F: @ 8191F4F + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve made land in PETALBURG!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" + +Route104_MrBrineysHouse_Text_191FB9:: @ 8191FB9 + .string "PEEKO: Pii pihyoroo!$" diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/maps/Route104_PrettyPetalFlowerShop/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin +++ /dev/null diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index edf18089d..edf18089d 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 3dae6a068..30e6625d8 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,9 +1,9 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C - .4byte Route104_PrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S2 + .2byte MUS_MACHI_S2 .2byte 118 .byte 19 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/maps/Route104_PrettyPetalFlowerShop/map.bin Binary files differdeleted file mode 100644 index d34ff5c1a..000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin +++ /dev/null diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc new file mode 100644 index 000000000..5e70a8ec2 --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -0,0 +1,103 @@ +Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 + map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_15BDEA + .byte 0 + +Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA + setflag FLAG_LANDMARK_FLOWER_SHOP + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + setflag FLAG_TEMP_1 + end + +Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 + setobjectxyperm 1, 4, 6 + end + +Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B + lock + faceplayer + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_15BE7C + msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A + setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO + compare RESULT, YES + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A + compare RESULT, NO + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 + release + end + +Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO + compare RESULT, YES + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A + compare RESULT, NO + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 + release + end + +Route104_PrettyPetalFlowerShop_EventScript_15BE6A:: @ 815BE6A + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F9D, 4 + return + +Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 + msgbox Route104_PrettyPetalFlowerShop_Text_1C6121, 4 + return + +Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C + message Route104_PrettyPetalFlowerShop_Text_1A0C42 + waitmessage + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items + msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 + release + end + + .align 2 +Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_NONE + release + end + +Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 + lock + faceplayer + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 + msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 + release + end + +Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 + msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 + giveitem_std ITEM_WAILMER_PAIL + msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 + setflag FLAG_RECEIVED_WAILMER_PAIL + release + end + +Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A + msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 + random 8 + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP + msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 + release + end + +Route104_PrettyPetalFlowerShop_EventScript_15BF1A:: @ 815BF1A + msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 + release + end diff --git a/data/maps/Route104_Prototype/border.bin b/data/maps/Route104_Prototype/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route104_Prototype/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc index 2d7c90dc1..2d7c90dc1 100644 --- a/data/maps/events/Route104_Prototype.inc +++ b/data/maps/Route104_Prototype/events.inc diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 7f5115386..3fbbdad95 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,9 +1,9 @@ Route104_Prototype:: @ 8307CF8 - .4byte Route104_Prototype_MapAttributes + .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 288 .byte 19 .byte 0 diff --git a/data/maps/Route104_Prototype/map.bin b/data/maps/Route104_Prototype/map.bin deleted file mode 100644 index 71bd63e62..000000000 --- a/data/maps/Route104_Prototype/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc new file mode 100644 index 000000000..e0aba01c9 --- /dev/null +++ b/data/maps/Route104_Prototype/scripts.inc @@ -0,0 +1,98 @@ +Route104_Prototype_MapScripts:: @ 8160C4A + .byte 0 + +Route104_Prototype_EventScript_160C4B:: @ 8160C4B + lock + faceplayer + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 + msgbox Route104_Prototype_Text_19B267, 4 + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB + release + end + +Route104_Prototype_EventScript_160C99:: @ 8160C99 + msgbox Route104_Prototype_Text_19B22E, 4 + release + end + +Route104_Prototype_EventScript_160CA3:: @ 8160CA3 + lock + faceplayer + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 + msgbox Route104_Prototype_Text_19B2E9, 4 + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB + release + end + +Route104_Prototype_EventScript_160CF1:: @ 8160CF1 + msgbox Route104_Prototype_Text_19B2B6, 4 + release + end + +Route104_Prototype_EventScript_160CFB:: @ 8160CFB + closemessage + delay 60 + fadescreen 1 + delay 60 + special DoSoftReset + waitstate + release + end + +Route104_Prototype_EventScript_160D0A:: @ 8160D0A + msgbox Route104_Prototype_Text_19B33B, 2 + end + +Route104_Prototype_EventScript_160D13:: @ 8160D13 + msgbox Route104_Prototype_Text_19B37F, 2 + end + +Route104_Prototype_EventScript_160D1C:: @ 8160D1C + msgbox Route104_Prototype_Text_19B3DE, 3 + end + +Route104_Prototype_EventScript_160D25:: @ 8160D25 + msgbox Route104_Prototype_Text_19B3FF, 3 + end + +Route104_Prototype_EventScript_160D2E:: @ 8160D2E + trainerbattle 0, OPPONENT_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + msgbox Route104_Prototype_Text_19ADF7, 6 + end + +Route104_Prototype_EventScript_160D45:: @ 8160D45 + trainerbattle 4, OPPONENT_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + msgbox Route104_Prototype_Text_19AE6A, 6 + end + +Route104_Prototype_EventScript_160D60:: @ 8160D60 + trainerbattle 4, OPPONENT_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + msgbox Route104_Prototype_Text_19B18D, 6 + end + +Route104_Prototype_EventScript_160D7B:: @ 8160D7B + trainerbattle 0, OPPONENT_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + msgbox Route104_Prototype_Text_19AF56, 6 + end + +Route104_Prototype_EventScript_160D92:: @ 8160D92 + trainerbattle 0, OPPONENT_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + msgbox Route104_Prototype_Text_19B00D, 6 + end + +Route104_Prototype_EventScript_160DA9:: @ 8160DA9 + trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + msgbox Route104_Prototype_Text_19B0EF, 6 + end diff --git a/data/maps/Route104_Prototype/text.inc b/data/maps/Route104_Prototype/text.inc new file mode 100644 index 000000000..7ce19f609 --- /dev/null +++ b/data/maps/Route104_Prototype/text.inc @@ -0,0 +1,115 @@ +Route104_Prototype_Text_19AD9B:: @ 819AD9B + .string "Oh? You look like a good TRAINER.\n" + .string "Will you look at my POKéMON?$" + +Route104_Prototype_Text_19ADDA:: @ 819ADDA + .string "I’m not good enough for you.$" + +Route104_Prototype_Text_19ADF7:: @ 819ADF7 + .string "I enjoyed our battle very much.\n" + .string "Please battle with me some other time.$" + +Route104_Prototype_Text_19AE3E:: @ 819AE3E + .string "Go!\n" + .string "Go, our POKéMON!$" + +Route104_Prototype_Text_19AE53:: @ 819AE53 + .string "Oh... We couldn’t win.$" + +Route104_Prototype_Text_19AE6A:: @ 819AE6A + .string "Did it surprise you that two POKéMON\n" + .string "battled at the same time?$" + +Route104_Prototype_Text_19AEA9:: @ 819AEA9 + .string "You can’t battle with us if you have\n" + .string "only one POKéMON.\l" + .string "Why? Because we’re strong!$" + +Route104_Prototype_Text_19AEFB:: @ 819AEFB + .string "Hey, hey! This is my first battle in\n" + .string "a while. I’ll give it my all!$" + +Route104_Prototype_Text_19AF3E:: @ 819AF3E + .string "But I gave it my all...$" + +Route104_Prototype_Text_19AF56:: @ 819AF56 + .string "You’re far too strong!\n" + .string "You must be a great TRAINER!$" + +Route104_Prototype_Text_19AF8A:: @ 819AF8A + .string "My POKéMON are extremely cute and\n" + .string "extremely strong.\l" + .string "Please allow me to show you.$" + +Route104_Prototype_Text_19AFDB:: @ 819AFDB + .string "I must concede defeat.\n" + .string "After all, you are strong.$" + +Route104_Prototype_Text_19B00D:: @ 819B00D + .string "The next time we meet, I will have raised\n" + .string "my POKéMON much more.\p" + .string "Don’t expect mercy then!$" + +Route104_Prototype_Text_19B066:: @ 819B066 + .string "We HIKERS are always full of energy!\n" + .string "My POKéMON are also full of energy, too.\l" + .string "We’re always itching for a battle!$" + +Route104_Prototype_Text_19B0D7:: @ 819B0D7 + .string "We ran out of energy...$" + +Route104_Prototype_Text_19B0EF:: @ 819B0EF + .string "Wahahah! Sure, we lost!\n" + .string "But we had a great battle, didn’t we?\l" + .string "We’re satisfied with that!$" + +Route104_Prototype_Text_19B148:: @ 819B148 + .string "You look like a strong TRAINER,\n" + .string "but can you beat us?$" + +Route104_Prototype_Text_19B17D:: @ 819B17D + .string "Waaah!\n" + .string "We lost!$" + +Route104_Prototype_Text_19B18D:: @ 819B18D + .string "If two POKéMON can battle at the same\n" + .string "time, all sorts of new things can happen.$" + +Route104_Prototype_Text_19B1DD:: @ 819B1DD + .string "Do you only have one POKéMON that can\n" + .string "battle?\p" + .string "Then we can’t battle with you yet.$" + +Route104_Prototype_Text_19B22E:: @ 819B22E + .string "Have you tried beating all the other\n" + .string "TRAINERS in battle?$" + +Route104_Prototype_Text_19B267:: @ 819B267 + .string "Thanks for coming today!\p" + .string "I hope you’re looking forward to this\n" + .string "game’s release!$" + +Route104_Prototype_Text_19B2B6:: @ 819B2B6 + .string "Huh? Did you battle with all the\n" + .string "TRAINERS already?$" + +Route104_Prototype_Text_19B2E9:: @ 819B2E9 + .string "Thank you for coming today!\p" + .string "I hope you’re looking forward to this\n" + .string "game’s release!$" + +Route104_Prototype_Text_19B33B:: @ 819B33B + .string "I’ve never seen the POKéMON you have.\n" + .string "It makes me envious a little.$" + +Route104_Prototype_Text_19B37F:: @ 819B37F + .string "Look at all those TRAINERS!\n" + .string "They have different POKéMON, too.\l" + .string "And they’re all waiting for you!$" + +Route104_Prototype_Text_19B3DE:: @ 819B3DE + .string "Welcome to the World of POKéMON!$" + +Route104_Prototype_Text_19B3FF:: @ 819B3FF + .string "May all POKéMON battles be bright,\n" + .string "fun, and ferocious!$" diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc index 89ceb8270..89ceb8270 100644 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 51b27eb0a..f7b4982aa 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,9 +1,9 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 - .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 118 .byte 19 .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc new file mode 100644 index 000000000..f979ab60b --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc @@ -0,0 +1,6 @@ +Route104_PrototypePrettyPetalFlowerShop_MapScripts:: @ 8160DC0 + .byte 0 + +Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1:: @ 8160DC1 + msgbox Route104_PrototypePrettyPetalFlowerShop_Text_19B436, 2 + end diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc new file mode 100644 index 000000000..3ec76ff55 --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc @@ -0,0 +1,6 @@ +Route104_PrototypePrettyPetalFlowerShop_Text_19B436:: @ 819B436 + .string "I have to stay home today.\p" + .string "My big sisters had to go out.\n" + .string "They said it was for preparations.\p" + .string "In the autumn, we’re going to start\n" + .string "a flower shop. Please wait for it!$" diff --git a/data/maps/Route105/border.bin b/data/maps/Route105/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route105/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc index 999966093..999966093 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/Route105/events.inc diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 344b8f634..79fedb244 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,9 +1,9 @@ Route105:: @ 8305678 - .4byte Route105_MapAttributes + .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 21 .byte 20 .byte 0 diff --git a/data/maps/Route105/map.bin b/data/maps/Route105/map.bin Binary files differdeleted file mode 100644 index 152aad670..000000000 --- a/data/maps/Route105/map.bin +++ /dev/null diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc new file mode 100644 index 000000000..305a2e9af --- /dev/null +++ b/data/maps/Route105/scripts.inc @@ -0,0 +1,37 @@ +Route105_MapScripts:: @ 814F298 + map_script 1, Route105_MapScript1_14F29E + .byte 0 + +Route105_MapScript1_14F29E:: @ 814F29E + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_14F2A8 + end + +Route105_EventScript_14F2A8:: @ 814F2A8 + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 + return + +Route105_EventScript_14F2BB:: @ 814F2BB + trainerbattle 0, OPPONENT_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + msgbox Route105_Text_1B8BDE, 6 + end + +Route105_EventScript_14F2D2:: @ 814F2D2 + trainerbattle 0, OPPONENT_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + msgbox Route105_Text_1B8CA9, 6 + end + +Route105_EventScript_14F2E9:: @ 814F2E9 + trainerbattle 0, OPPONENT_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + msgbox Route105_Text_1B8D45, 6 + end + +Route105_EventScript_14F300:: @ 814F300 + trainerbattle 0, OPPONENT_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + msgbox Route105_Text_1B8DED, 6 + end + +Route105_EventScript_14F317:: @ 814F317 + trainerbattle 0, OPPONENT_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + msgbox Route105_Text_1B8EBD, 6 + end diff --git a/data/maps/Route105/text.inc b/data/maps/Route105/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/Route105/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/Route106/border.bin b/data/maps/Route106/border.bin deleted file mode 100644 index 281762f5b..000000000 --- a/data/maps/Route106/border.bin +++ /dev/null @@ -1 +0,0 @@ -CCCC
\ No newline at end of file diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc index 55f395ded..55f395ded 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/Route106/events.inc diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 494690340..bf8dd9626 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,9 +1,9 @@ Route106:: @ 8305694 - .4byte Route106_MapAttributes + .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 22 .byte 21 .byte 0 diff --git a/data/maps/Route106/map.bin b/data/maps/Route106/map.bin Binary files differdeleted file mode 100644 index d65a278a4..000000000 --- a/data/maps/Route106/map.bin +++ /dev/null diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc new file mode 100644 index 000000000..ae65c7013 --- /dev/null +++ b/data/maps/Route106/scripts.inc @@ -0,0 +1,34 @@ +Route106_MapScripts:: @ 814F32E + .byte 0 + +Route106_EventScript_14F32F:: @ 814F32F + msgbox Route106_Text_16E026, 3 + end + +Route106_EventScript_14F338:: @ 814F338 + trainerbattle 0, OPPONENT_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F + msgbox Route106_Text_1B918A, 6 + end + +Route106_EventScript_14F34F:: @ 814F34F + trainerbattle 0, OPPONENT_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + msgbox Route106_Text_1B9222, 6 + end + +Route106_EventScript_14F366:: @ 814F366 + trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route106_EventScript_14F38D + msgbox Route106_Text_1B8F55, 6 + end + +Route106_EventScript_14F38D:: @ 814F38D + trainerbattle 5, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + msgbox Route106_Text_1B9011, 6 + end + +Route106_EventScript_14F3A4:: @ 814F3A4 + trainerbattle 0, OPPONENT_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + msgbox Route106_Text_1B910A, 6 + end diff --git a/data/maps/Route106/text.inc b/data/maps/Route106/text.inc new file mode 100644 index 000000000..38e92c65d --- /dev/null +++ b/data/maps/Route106/text.inc @@ -0,0 +1,4 @@ +Route106_Text_16E026:: @ 816E026 + .string "TRAINER TIPS\p" + .string "Advice on catching POKéMON with a ROD:\n" + .string "Press the A Button if you get a bite.$" diff --git a/data/maps/Route107/border.bin b/data/maps/Route107/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route107/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc index 9bdeaf3b0..9bdeaf3b0 100644 --- a/data/maps/events/Route107.inc +++ b/data/maps/Route107/events.inc diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 382b617ba..19ba4ebd6 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,9 +1,9 @@ Route107:: @ 83056B0 - .4byte Route107_MapAttributes + .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 23 .byte 22 .byte 0 diff --git a/data/maps/Route107/map.bin b/data/maps/Route107/map.bin Binary files differdeleted file mode 100644 index 521997b0f..000000000 --- a/data/maps/Route107/map.bin +++ /dev/null diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc new file mode 100644 index 000000000..ad2d293fc --- /dev/null +++ b/data/maps/Route107/scripts.inc @@ -0,0 +1,40 @@ +Route107_MapScripts:: @ 814F3BB + .byte 0 + +Route107_EventScript_14F3BC:: @ 814F3BC + trainerbattle 0, OPPONENT_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + msgbox Route107_Text_1B92E7, 6 + end + +Route107_EventScript_14F3D3:: @ 814F3D3 + trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route107_EventScript_14F3FA + msgbox Route107_Text_1B938E, 6 + end + +Route107_EventScript_14F3FA:: @ 814F3FA + trainerbattle 5, OPPONENT_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + msgbox Route107_Text_1B9477, 6 + end + +Route107_EventScript_14F411:: @ 814F411 + trainerbattle 0, OPPONENT_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + msgbox Route107_Text_1B94FF, 6 + end + +Route107_EventScript_14F428:: @ 814F428 + trainerbattle 0, OPPONENT_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + msgbox Route107_Text_1B9589, 6 + end + +Route107_EventScript_14F43F:: @ 814F43F + trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + msgbox Route107_Text_1B9630, 6 + end + +Route107_EventScript_14F45A:: @ 814F45A + trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + msgbox Route107_Text_1B9735, 6 + end diff --git a/data/maps/Route107/text.inc b/data/maps/Route107/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/Route107/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/Route108/border.bin b/data/maps/Route108/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route108/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc index 997fb5ce2..997fb5ce2 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/Route108/events.inc diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 3214f7b89..0169859e0 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,9 +1,9 @@ Route108:: @ 83056CC - .4byte Route108_MapAttributes + .4byte Route108_Layout .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 24 .byte 23 .byte 0 diff --git a/data/maps/Route108/map.bin b/data/maps/Route108/map.bin deleted file mode 100644 index 0a82f9924..000000000 --- a/data/maps/Route108/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppppppppppppppPQpp111111111111pppppppppppppPQpppppppppppPQppppppppppppppXYp11511^5_515^5_511bQppppppppppppXYpppppppppPQXY11pPQpppppppppPc^5_5155n5o551n5o555jYppp11111pPQppppuvpuvPQXYpPc^5_5bQXY11pPQppXkn5o5111^5_51Q3R3S3T35puvPc^5_515bQXYuvpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvpn5o5X7YZ[\7]p}~Xkn5o551jYpp}~PQpPQppppppppppXkn5o5jYpp}~pppppp1`abcdepppp11pppppXYpXYpppppppppppppppppppppppppppi3j3k3ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp11pppppppppppppppPQpppppppppppppppppppp}~ppppppppp11pXY1511ppppppppppppppXYpppppppppppppp111ppppPQppPQpp5ppp1511pp11ppppppPQppPQuvppppp11p51ppuvXYuvXYpppuvppPc^5_5bQpppppXYppXY}~uvppPc^5_5bQpPQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~ppPQPQXYpppppppppXYpPQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp
\ No newline at end of file diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc new file mode 100644 index 000000000..2e40c882d --- /dev/null +++ b/data/maps/Route108/scripts.inc @@ -0,0 +1,22 @@ +Route108_MapScripts:: @ 814F475 + .byte 0 + +Route108_EventScript_14F476:: @ 814F476 + trainerbattle 0, OPPONENT_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + msgbox Route108_Text_1B9823, 6 + end + +Route108_EventScript_14F48D:: @ 814F48D + trainerbattle 0, OPPONENT_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F + msgbox Route108_Text_1B98BC, 6 + end + +Route108_EventScript_14F4A4:: @ 814F4A4 + trainerbattle 0, OPPONENT_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C + msgbox Route108_Text_1B9935, 6 + end + +Route108_EventScript_14F4BB:: @ 814F4BB + trainerbattle 0, OPPONENT_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB + msgbox Route108_Text_1B99E9, 6 + end diff --git a/data/maps/Route108/text.inc b/data/maps/Route108/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/Route108/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/Route109/border.bin b/data/maps/Route109/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route109/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc index 7376fd4bf..7376fd4bf 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/Route109/events.inc diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index db91d1368..95c3cfaeb 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,9 +1,9 @@ Route109:: @ 83056E8 - .4byte Route109_MapAttributes + .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 25 .byte 24 .byte 0 diff --git a/data/maps/Route109/map.bin b/data/maps/Route109/map.bin Binary files differdeleted file mode 100644 index eb83de870..000000000 --- a/data/maps/Route109/map.bin +++ /dev/null diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc new file mode 100644 index 000000000..6f24b2142 --- /dev/null +++ b/data/maps/Route109/scripts.inc @@ -0,0 +1,444 @@ +Route109_MapScripts:: @ 814F4D2 + .byte 0 + +Route109_EventScript_14F4D3:: @ 814F4D3 + call Route109_EventScript_1A010C + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 + applymovement 2, Route109_Movement_14F67B + waitmovement 0 + removeobject 2 + switch FACING + case 1, Route109_EventScript_14F518 + case 3, Route109_EventScript_14F538 + case 4, Route109_EventScript_14F528 + end + +Route109_EventScript_14F518:: @ 814F518 + applymovement 255, Route109_Movement_14F66D + waitmovement 0 + goto Route109_EventScript_14F548 + end + +Route109_EventScript_14F528:: @ 814F528 + applymovement 255, Route109_Movement_14F675 + waitmovement 0 + goto Route109_EventScript_14F548 + end + +Route109_EventScript_14F538:: @ 814F538 + applymovement 255, Route109_Movement_14F678 + waitmovement 0 + goto Route109_EventScript_14F548 + end + +Route109_EventScript_14F548:: @ 814F548 + hideobjectat 255, MAP_ROUTE109 + call Route109_EventScript_1A02E7 + applymovement 1, Route109_Movement_14F5BF + applymovement 255, Route109_Movement_14F5BF + waitmovement 0 + call Route109_EventScript_1A02EF + showobjectat 255, MAP_DEWFORD_TOWN + applymovement 255, Route109_Movement_14F670 + waitmovement 0 + addobject 4 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setobjectxyperm 2, 12, 8 + addobject 2 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + applymovement 2, Route109_Movement_14F67D + waitmovement 0 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + hideobjectat 1, MAP_ROUTE109 + msgbox Route109_Text_16B4B5, 4 + closemessage + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN + moveobjectoffscreen 2 + release + end + +Route109_Movement_14F5BF:: @ 814F5BF + walk_in_place_fastest_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement + +Route109_Movement_14F66D:: @ 814F66D + walk_down + walk_down + end_movement + +Route109_Movement_14F670:: @ 814F670 + walk_down + walk_down + walk_left + walk_in_place_fastest_right + end_movement + +Route109_Movement_14F675:: @ 814F675 + walk_right + walk_down + end_movement + +Route109_Movement_14F678:: @ 814F678 + walk_left + walk_down + end_movement + +Route109_Movement_14F67B:: @ 814F67B + walk_down + end_movement + +Route109_Movement_14F67D:: @ 814F67D + walk_down + walk_in_place_fastest_left + end_movement + +Route109_EventScript_14F680:: @ 814F680 + lock + faceplayer + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691 + goto Route109_EventScript_14F6AF + end + +Route109_EventScript_14F691:: @ 814F691 + message Route109_Text_16E0F9 + msgbox Route109_Text_16E0F9, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route109_EventScript_14F6F1 + goto Route109_EventScript_14F6E2 + end + +Route109_EventScript_14F6AF:: @ 814F6AF + message Route109_Text_16E26A + waitmessage + multichoicedefault 21, 8, 14, 1, 0 + switch RESULT + case 0, Route109_EventScript_14F6E2 + case 1, Route109_EventScript_14F6FB + case 127, Route109_EventScript_14F6FB + end + +Route109_EventScript_14F6E2:: @ 814F6E2 + msgbox Route109_Text_16E159, 4 + closemessage + goto Route109_EventScript_14F4D3 + end + +Route109_EventScript_14F6F1:: @ 814F6F1 + msgbox Route109_Text_16E1B1, 4 + release + end + +Route109_EventScript_14F6FB:: @ 814F6FB + msgbox Route109_Text_16E2C5, 4 + release + end + +Route109_EventScript_14F705:: @ 814F705 + msgbox Route109_Text_16E307, 2 + end + +Route109_EventScript_14F70E:: @ 814F70E + lock + faceplayer + msgbox Route109_Text_16E405, 4 + closemessage + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 + release + end + +Route109_EventScript_14F725:: @ 814F725 + lock + faceplayer + special GetPlayerBigGuyGirlString + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762 + msgbox Route109_Text_16E433, 4 + giveitem_std ITEM_SOFT_SAND + compare RESULT, 0 + goto_if_eq Route109_EventScript_1A029B + closemessage + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 + setflag FLAG_RECEIVED_SOFT_SAND + release + end + +Route109_EventScript_14F762:: @ 814F762 + msgbox Route109_Text_16E446, 4 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 + release + end + +Route109_EventScript_14F776:: @ 814F776 + msgbox Route109_Text_16E35B, 2 + end + +Route109_EventScript_14F77F:: @ 814F77F + msgbox Route109_Text_16E4D5, 2 + end + +Route109_EventScript_14F788:: @ 814F788 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox Route109_Text_16E5CA, 4 + waitmoncry + release + end + +Route109_EventScript_14F79B:: @ 814F79B + msgbox Route109_Text_16E5DC, 3 + end + +Route109_EventScript_14F7A4:: @ 814F7A4 + msgbox Route109_Text_16E62C, 3 + end + +Route109_EventScript_14F7AD:: @ 814F7AD + trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + msgbox Route109_Text_1B9A6D, 6 + end + +Route109_EventScript_14F7C4:: @ 814F7C4 + trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + msgbox Route109_Text_1B9AEB, 6 + end + +Route109_EventScript_14F7DB:: @ 814F7DB + trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + msgbox Route109_Text_1B9B68, 6 + end + +Route109_EventScript_14F7F2:: @ 814F7F2 + trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + msgbox Route109_Text_1B9BD3, 6 + end + +Route109_EventScript_14F809:: @ 814F809 + trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route109_EventScript_14F830 + msgbox Route109_Text_1B9C6E, 6 + end + +Route109_EventScript_14F830:: @ 814F830 + trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + msgbox Route109_Text_1B9D10, 6 + end + +Route109_EventScript_14F847:: @ 814F847 + trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route109_EventScript_14F86E + msgbox Route109_Text_1B9D8E, 6 + end + +Route109_EventScript_14F86E:: @ 814F86E + trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + msgbox Route109_Text_1B9E1D, 6 + end + +Route109_EventScript_14F885:: @ 814F885 + trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + msgbox Route109_Text_1B9ECA, 6 + end + +Route109_EventScript_14F89C:: @ 814F89C + trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + msgbox Route109_Text_1B9F44, 6 + end + +Route109_EventScript_14F8B3:: @ 814F8B3 + trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + msgbox Route109_Text_1B9FB7, 6 + end + +Route109_EventScript_14F8CA:: @ 814F8CA + trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + msgbox Route109_Text_1BA069, 6 + end + +Route109_EventScript_14F8E5:: @ 814F8E5 + trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + msgbox Route109_Text_1BA193, 6 + end diff --git a/data/maps/Route109/text.inc b/data/maps/Route109/text.inc new file mode 100644 index 000000000..a86efa2c4 --- /dev/null +++ b/data/maps/Route109/text.inc @@ -0,0 +1,86 @@ +DewfordTown_Text_16E080:: @ 816E080 + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve made land in SLATEPORT!\p" + .string "I suppose you’re going to visit CAPT.\n" + .string "STERN and deliver the DEVON GOODS?$" + +Route109_Text_16E0F9:: @ 816E0F9 + .string "MR. BRINEY: Aren’t you delivering the\n" + .string "DEVON GOODS?\p" + .string "Or were you meaning to sail back to\n" + .string "DEWFORD?$" + +Route109_Text_16E159:: @ 816E159 + .string "MR. BRINEY: DEWFORD it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" + +Route109_Text_16E1B1:: @ 816E1B1 + .string "MR. BRINEY: Then you go on and deliver\n" + .string "the DEVON GOODS. I’ll be waiting.$" + +DewfordTown_Text_16E1FA:: @ 816E1FA + .string "MR. BRINEY: Ahoy! We’ve made land in\n" + .string "SLATEPORT!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail again!$" + +Route109_Text_16E26A:: @ 816E26A + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" + +Route109_Text_16E2C5:: @ 816E2C5 + .string "MR. BRINEY: You just tell me whenever\n" + .string "you need to set sail again!$" + +Route109_Text_16E307:: @ 816E307 + .string "Yo, TRAINERS!\n" + .string "Whether you’re hot to trot,\l" + .string "or cool cat not,\l" + .string "chill at my papa’s spot!$" + +Route109_Text_16E35B:: @ 816E35B + .string "Little kids can dart around so quickly...\p" + .string "You don’t dare take your eyes off them\n" + .string "for an instant. It’s very taxing.\p" + .string "Mine’s with my POKéMON, so they should\n" + .string "be okay, but...$" + +Route109_Text_16E405:: @ 816E405 + .string "Our sand castle’s taking a long time\n" + .string "to make.$" + +Route109_Text_16E433:: @ 816E433 + .string "You can have this!$" + +Route109_Text_16E446:: @ 816E446 + .string "We’re going to get all the sand from\n" + .string "the beach and make a big castle!\p" + .string "And then we’re going to be a king and\n" + .string "queen.\p" + .string "We’ll let you be a servant.$" + +Route109_Text_16E4D5:: @ 816E4D5 + .string "The water around these parts is clean.\p" + .string "But, I get my ZIGZAGOON to pick up\n" + .string "litter from the shoreline at times.\p" + .string "Dirty water becomes rain and joins our\n" + .string "rivers, which we drink from...\p" + .string "If we pollute the sea, it all comes\n" + .string "back to haunt us eventually.$" + +Route109_Text_16E5CA:: @ 816E5CA + .string "ZIGZAGOON: Guguu?$" + +Route109_Text_16E5DC:: @ 816E5DC + .string "SEASHORE HOUSE\p" + .string "“May hot battles rage on hot sands!\n" + .string "The place for hot TRAINERS!”$" + +Route109_Text_16E62C:: @ 816E62C + .string "TRAINER TIPS\p" + .string "POKéMON at the same level may not\n" + .string "always have identical stats.\p" + .string "POKéMON raised by TRAINERS are said\n" + .string "to grow stronger than wild POKéMON.$" diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/maps/Route109_SeashoreHouse/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route109_SeashoreHouse/border.bin +++ /dev/null diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc index f82513f08..f82513f08 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 064d428bd..6677181f7 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,9 +1,9 @@ Route109_SeashoreHouse:: @ 8307D30 - .4byte Route109_SeashoreHouse_MapAttributes + .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 - .2byte BGM_HIGHTOWN + .2byte MUS_HIGHTOWN .2byte 244 .byte 24 .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/maps/Route109_SeashoreHouse/map.bin deleted file mode 100644 index cb7853a17..000000000 --- a/data/maps/Route109_SeashoreHouse/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -./
67 - -
2 2222' 22222"2,2,2-2$2$2,2,2-2$2$2$2,2,2&2 %2%2%2%2%2!22*2222*2*2222*2*222 $2$2$2$2$2! 22%2222%2%2222%2%22 2 *2*2*2*2*2*2*2*2*2*2*2! 22%2%2%2%2%2%2%2%2%22 2
\ No newline at end of file diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc new file mode 100644 index 000000000..13d37e7bd --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -0,0 +1,103 @@ +Route109_SeashoreHouse_MapScripts:: @ 8160DCA + map_script 3, Route109_SeashoreHouse_MapScript1_160DD0 + .byte 0 + +Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 + setflag FLAG_LANDMARK_SEASHORE_HOUSE + end + +Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 + lock + faceplayer + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_160E36 + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS, Route109_SeashoreHouse_EventScript_160E08 + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_160DFE + msgbox Route109_SeashoreHouse_Text_19B4D9, 4 + setflag FLAG_TEMP_2 + release + end + +Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE + msgbox Route109_SeashoreHouse_Text_19B5B9, 4 + release + end + +Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 + msgbox Route109_SeashoreHouse_Text_19B609, 4 + giveitem_std ITEM_SODA_POP, 6 + compare RESULT, 0 + goto_if_eq Route109_SeashoreHouse_EventScript_160E2C + setflag FLAG_RECEIVED_6_SODA_POP + release + end + +Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C + msgbox Route109_SeashoreHouse_Text_19B6BE, 4 + release + end + +Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 + showmoneybox 0, 0 + nop + msgbox Route109_SeashoreHouse_Text_19B702, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route109_SeashoreHouse_EventScript_160E5A + msgbox Route109_SeashoreHouse_Text_19B773, 4 + hidemoneybox 0, 0 + release + end + +Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A + checkmoney 0x12c, 0 + compare RESULT, 0 + goto_if_eq Route109_SeashoreHouse_EventScript_160E9E + checkitemspace ITEM_SODA_POP, 1 + compare RESULT, 0 + goto_if_eq Route109_SeashoreHouse_EventScript_160EAB + msgbox Route109_SeashoreHouse_Text_19B74C, 4 + takemoney 0x12c, 0 + updatemoneybox 0, 0 + nop + giveitem_std ITEM_SODA_POP + hidemoneybox 0, 0 + release + end + +Route109_SeashoreHouse_EventScript_160E9E:: @ 8160E9E + msgbox Route109_SeashoreHouse_Text_19B759, 4 + hidemoneybox 0, 0 + release + end + +Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB + msgbox Route109_SeashoreHouse_Text_1A0CC2, 4 + hidemoneybox 0, 0 + release + end + +Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 + trainerbattle 2, OPPONENT_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + msgbox Route109_SeashoreHouse_Text_19B89F, 6 + end + +Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3 + trainerbattle 2, OPPONENT_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + msgbox Route109_SeashoreHouse_Text_19B955, 6 + end + +Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE + trainerbattle 2, OPPONENT_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + msgbox Route109_SeashoreHouse_Text_19B9E5, 6 + end + +Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 + goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 + setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS + release + end + +Route109_SeashoreHouse_EventScript_160F29:: @ 8160F29 + release + end diff --git a/data/maps/Route109_SeashoreHouse/text.inc b/data/maps/Route109_SeashoreHouse/text.inc new file mode 100644 index 000000000..ebd6f05e5 --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/text.inc @@ -0,0 +1,92 @@ +Route109_SeashoreHouse_Text_19B4D9:: @ 819B4D9 + .string "I’m the owner of the SEASHORE HOUSE.\n" + .string "But you can call me MR. SEA!\p" + .string "What I love above all is to see hot\n" + .string "POKéMON battles.\p" + .string "Let me see that your heart burns hot!\p" + .string "If you can defeat all the TRAINERS\n" + .string "here, I’ll reward your efforts.$" + +Route109_SeashoreHouse_Text_19B5B9:: @ 819B5B9 + .string "Show me some hot matches!\p" + .string "I run this SEASHORE HOUSE just for\n" + .string "that reason alone!$" + +Route109_SeashoreHouse_Text_19B609:: @ 819B609 + .string "You’re scorching hot!\n" + .string "Those battles blazed!\l" + .string "I’m more than just satisfied!\p" + .string "As thanks for showing me your hot\n" + .string "streak, I want you to take these.\p" + .string "It’s half a dozen bottles of SODA POP!$" + +Route109_SeashoreHouse_Text_19B6BE:: @ 819B6BE + .string "Oh, but hey, your BAG’s jammed full.\n" + .string "I’ll hang on to these for you.$" + +Route109_SeashoreHouse_Text_19B702:: @ 819B702 + .string "Want to buy some SODA POP?\n" + .string "POKéMON love it!\p" + .string "Just ¥300 a bottle!\n" + .string "Buy some!$" + +Route109_SeashoreHouse_Text_19B74C:: @ 819B74C + .string "Here you go!$" + +Route109_SeashoreHouse_Text_19B759:: @ 819B759 + .string "You don’t have the money.$" + +Route109_SeashoreHouse_Text_19B773:: @ 819B773 + .string "No?\n" + .string "That’s too bad.$" + +UnknownString_819B787: @ 819B787 + .string "SODA POP! The POKéMON favorite!\n" + .string "Just ¥300 a bottle! Want one?$" + +UnknownString_819B7C5: @ 819B7C5 + .string "Here you go!$" + +UnknownString_819B7D2: @ 819B7D2 + .string "Oh, dear!\n" + .string "You don’t have enough money.$" + +UnknownString_819B7F9: @ 819B7F9 + .string "That’s too bad.$" + +Route109_SeashoreHouse_Text_19B809:: @ 819B809 + .string "If you’re looking for a battle on the\n" + .string "high seas, you’ll find no hotter \l" + .string "TRAINER than me, matey!$" + +Route109_SeashoreHouse_Text_19B869:: @ 819B869 + .string "That was a hot battle!\n" + .string "I can accept that loss, matey!$" + +Route109_SeashoreHouse_Text_19B89F:: @ 819B89F + .string "Whenever I’m in SLATEPORT, I enjoy\n" + .string "hot battles and ice-cold SODA POP!$" + +Route109_SeashoreHouse_Text_19B8E5:: @ 819B8E5 + .string "Boring battles aren’t worth the effort.\p" + .string "Fiery hot battles are what toughen up\n" + .string "TRAINERS and POKéMON!$" + +Route109_SeashoreHouse_Text_19B949:: @ 819B949 + .string "That’s hot!$" + +Route109_SeashoreHouse_Text_19B955:: @ 819B955 + .string "Whew, I’m all thirsty.\n" + .string "Maybe I’ll have a SODA POP.$" + +Route109_SeashoreHouse_Text_19B988:: @ 819B988 + .string "I’m going to show you how great my\n" + .string "POKéMON are, but don’t cry!$" + +Route109_SeashoreHouse_Text_19B9C7:: @ 819B9C7 + .string "...I lost, but I won’t cry...$" + +Route109_SeashoreHouse_Text_19B9E5:: @ 819B9E5 + .string "If one of my POKéMON knew the move\n" + .string "for carrying me across water on its\l" + .string "back, I could get rid of this inner tube.$" diff --git a/data/maps/Route110/border.bin b/data/maps/Route110/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route110/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc index eb032e0cc..eb032e0cc 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/Route110/events.inc diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 442a02ccb..952233450 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,9 +1,9 @@ Route110:: @ 8305704 - .4byte Route110_MapAttributes + .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 26 .byte 25 .byte 0 diff --git a/data/maps/Route110/map.bin b/data/maps/Route110/map.bin Binary files differdeleted file mode 100644 index e10394048..000000000 --- a/data/maps/Route110/map.bin +++ /dev/null diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc new file mode 100644 index 000000000..36e5cd7a2 --- /dev/null +++ b/data/maps/Route110/scripts.inc @@ -0,0 +1,539 @@ +Route110_MapScripts:: @ 814F900 + map_script 5, Route110_MapScript1_14F910 + map_script 3, Route110_MapScript1_14F914 + map_script 2, Route110_MapScript2_14F933 + .byte 0 + +Route110_MapScript1_14F910:: @ 814F910 + special UpdateCyclingRoadState + end + +Route110_MapScript1_14F914:: @ 814F914 + call Route110_EventScript_1A0196 + call Route110_EventScript_1A014E + call Route110_EventScript_1A0172 + compare VAR_CYCLING_CHALLENGE_STATE, 1 + call_if_eq Route110_EventScript_14F92F + end + +Route110_EventScript_14F92F:: @ 814F92F + savebgm MUS_CYCLING + return + +Route110_MapScript2_14F933:: @ 814F933 + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D + .2byte 0 + +Route110_EventScript_14F93D:: @ 814F93D + special ScrSpecial_BeginCyclingRoadChallenge + setvar VAR_CYCLING_CHALLENGE_STATE, 2 + return + +Route110_EventScript_14F946:: @ 814F946 + lock + faceplayer + msgbox Route110_Text_16E6C0, 4 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 + release + end + +Route110_EventScript_14F95C:: @ 814F95C + lock + faceplayer + msgbox Route110_Text_16E6F2, 4 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 + release + end + +Route110_EventScript_14F972:: @ 814F972 + lock + faceplayer + msgbox Route110_Text_16E729, 4 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 + release + end + +Route110_EventScript_14F988:: @ 814F988 + lock + faceplayer + msgbox Route110_Text_16E76A, 4 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 + release + end + +Route110_EventScript_14F99E:: @ 814F99E + msgbox Route110_Text_16EB22, 2 + end + +Route110_EventScript_14F9A7:: @ 814F9A7 + msgbox Route110_Text_16EB65, 2 + end + +Route110_EventScript_14F9B0:: @ 814F9B0 + msgbox Route110_Text_16EBC9, 2 + end + +Route110_EventScript_14F9B9:: @ 814F9B9 + msgbox Route110_Text_16EDC5, 2 + end + +Route110_EventScript_14F9C2:: @ 814F9C2 + msgbox Route110_Text_16EE30, 2 + end + +Route110_EventScript_14F9CB:: @ 814F9CB + msgbox Route110_Text_16EE74, 2 + end + +Route110_EventScript_14F9D4:: @ 814F9D4 + msgbox Route110_Text_16EEF6, 2 + end + +Route110_EventScript_14F9DD:: @ 814F9DD + msgbox Route110_Text_16F381, 3 + end + +Route110_EventScript_14F9E6:: @ 814F9E6 + msgbox Route110_Text_16F39C, 3 + end + +Route110_EventScript_14F9EF:: @ 814F9EF + msgbox Route110_Text_16F3B1, 3 + end + +Route110_EventScript_14F9F8:: @ 814F9F8 + msgbox Route110_Text_16F3E9, 3 + end + +Route110_EventScript_14FA01:: @ 814FA01 + msgbox Route110_Text_16F3FF, 3 + end + +Route110_EventScript_14FA0A:: @ 814FA0A + msgbox Route110_Text_16F40F, 3 + end + +Route110_EventScript_14FA13:: @ 814FA13 + msgbox Route110_Text_16F429, 3 + end + +Route110_EventScript_14FA1C:: @ 814FA1C + msgbox Route110_Text_16F4AE, 3 + end + +Route110_EventScript_14FA25:: @ 814FA25 + msgbox Route110_Text_16F4F7, 3 + end + +Route110_EventScript_14FA2E:: @ 814FA2E + lockall + specialvar RESULT, GetRecordedCyclingRoadResults + compare RESULT, 0 + goto_if_eq Route110_EventScript_14FA49 + msgbox Route110_Text_16F53A, 4 + releaseall + end + +Route110_EventScript_14FA49:: @ 814FA49 + msgbox Route110_Text_16F57C, 4 + releaseall + end + +Route110_EventScript_14FA53:: @ 814FA53 + lock + faceplayer + specialvar RESULT, GetPlayerAvatarBike + compare RESULT, 1 + goto_if_eq Route110_EventScript_14FA84 + compare VAR_CYCLING_CHALLENGE_STATE, 0 + goto_if_eq Route110_EventScript_14FA7A + msgbox Route110_Text_16F26A, 4 + release + end + +Route110_EventScript_14FA7A:: @ 814FA7A + msgbox Route110_Text_16F1D0, 4 + release + end + +Route110_EventScript_14FA84:: @ 814FA84 + msgbox Route110_Text_16F2C4, 4 + release + end + +Route110_EventScript_14FA8E:: @ 814FA8E + trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + msgbox Route110_Text_1BA6F8, 6 + end + +Route110_EventScript_14FAA5:: @ 814FAA5 + trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + msgbox Route110_Text_1BA76C, 6 + end + +Route110_EventScript_14FABC:: @ 814FABC + trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route110_EventScript_14FAE3 + msgbox Route110_Text_1BA829, 6 + end + +Route110_EventScript_14FAE3:: @ 814FAE3 + trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + msgbox Route110_Text_1BA8E9, 6 + end + +Route110_EventScript_14FAFA:: @ 814FAFA + trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C + msgbox Route110_Text_1BA94A, 6 + end + +Route110_EventScript_14FB11:: @ 814FB11 + trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + msgbox Route110_Text_1BA27C, 6 + end + +Route110_EventScript_14FB28:: @ 814FB28 + trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + msgbox Route110_Text_1BA30C, 6 + end + +Route110_EventScript_14FB3F:: @ 814FB3F + trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route110_EventScript_14FB66 + msgbox Route110_Text_1BA3A5, 6 + end + +Route110_EventScript_14FB66:: @ 814FB66 + trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + msgbox Route110_Text_1BA456, 6 + end + +Route110_EventScript_14FB7D:: @ 814FB7D + trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + msgbox Route110_Text_1BA65F, 6 + end + +Route110_EventScript_14FB94:: @ 814FB94 + trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route110_EventScript_14FBBB + msgbox Route110_Text_1BA52E, 6 + end + +Route110_EventScript_14FBBB:: @ 814FBBB + trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + msgbox Route110_Text_1BA5C4, 6 + end + +Route110_EventScript_14FBD2:: @ 814FBD2 + trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route110_EventScript_14FBF9 + msgbox Route110_Text_1BA9E9, 6 + end + +Route110_EventScript_14FBF9:: @ 814FBF9 + trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + msgbox Route110_Text_1BAA8F, 6 + end + +Route110_EventScript_14FC10:: @ 814FC10 + trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + msgbox Route110_Text_1BAB19, 6 + end + +Route110_EventScript_14FC27:: @ 814FC27 + lockall + applymovement 21, Route110_Movement_1A0843 + waitmovement 0 + call Route110_EventScript_14FC39 + releaseall + end + +Route110_EventScript_14FC39:: @ 814FC39 + special FinishCyclingRoadChallenge + msgbox Route110_Text_16EF65, 4 + switch RESULT + case 10, Route110_EventScript_14FCC3 + case 9, Route110_EventScript_14FCD1 + case 8, Route110_EventScript_14FCD1 + case 7, Route110_EventScript_14FCD1 + case 6, Route110_EventScript_14FCDF + case 5, Route110_EventScript_14FCDF + case 4, Route110_EventScript_14FCDF + case 3, Route110_EventScript_14FCED + case 2, Route110_EventScript_14FCED + case 1, Route110_EventScript_14FCED + case 0, Route110_EventScript_14FCFB + end + +Route110_EventScript_14FCC3:: @ 814FCC3 + msgbox Route110_Text_16EF9F, 4 + goto Route110_EventScript_14FD09 + end + +Route110_EventScript_14FCD1:: @ 814FCD1 + msgbox Route110_Text_16F012, 4 + goto Route110_EventScript_14FD09 + end + +Route110_EventScript_14FCDF:: @ 814FCDF + msgbox Route110_Text_16F069, 4 + goto Route110_EventScript_14FD09 + end + +Route110_EventScript_14FCED:: @ 814FCED + msgbox Route110_Text_16F0D0, 4 + goto Route110_EventScript_14FD09 + end + +Route110_EventScript_14FCFB:: @ 814FCFB + msgbox Route110_Text_16F139, 4 + goto Route110_EventScript_14FD09 + end + +Route110_EventScript_14FD09:: @ 814FD09 + setvar VAR_CYCLING_CHALLENGE_STATE, 3 + savebgm 0 + fadedefaultbgm + return + +Route110_EventScript_14FD13:: @ 814FD13 + setvar VAR_SPECIAL_8, 1 + goto Route110_EventScript_14FD34 + end + +Route110_EventScript_14FD1E:: @ 814FD1E + setvar VAR_SPECIAL_8, 2 + goto Route110_EventScript_14FD34 + end + +Route110_EventScript_14FD29:: @ 814FD29 + setvar VAR_SPECIAL_8, 3 + goto Route110_EventScript_14FD34 + end + +Route110_EventScript_14FD34:: @ 814FD34 + lockall + checkplayergender + compare RESULT, 0 + call_if_eq Route110_EventScript_14FDA7 + compare RESULT, 1 + call_if_eq Route110_EventScript_14FDAC + applymovement 28, Route110_Movement_1A0845 + waitmovement 0 + applymovement 28, Route110_Movement_1A0833 + waitmovement 0 + applymovement 28, Route110_Movement_1A0835 + waitmovement 0 + delay 30 + compare VAR_SPECIAL_8, 1 + call_if_eq Route110_EventScript_14FF14 + compare VAR_SPECIAL_8, 2 + call_if_eq Route110_EventScript_14FF1F + compare VAR_SPECIAL_8, 3 + call_if_eq Route110_EventScript_14FF2A + checkplayergender + compare RESULT, 0 + goto_if_eq Route110_EventScript_14FDB1 + compare RESULT, 1 + goto_if_eq Route110_EventScript_14FE2B + releaseall + end + +Route110_EventScript_14FDA7:: @ 814FDA7 + playbgm MUS_GIRL_SUP, TRUE + return + +Route110_EventScript_14FDAC:: @ 814FDAC + playbgm MUS_BOY_SUP, TRUE + return + +Route110_EventScript_14FDB1:: @ 814FDB1 + msgbox Route110_Text_16E7A1, 4 + switch VAR_STARTER_MON + case 0, Route110_EventScript_14FDE0 + case 1, Route110_EventScript_14FDF0 + case 2, Route110_EventScript_14FE00 + end + +Route110_EventScript_14FDE0:: @ 814FDE0 + trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 + goto Route110_EventScript_14FE10 + end + +Route110_EventScript_14FDF0:: @ 814FDF0 + trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 + goto Route110_EventScript_14FE10 + end + +Route110_EventScript_14FE00:: @ 814FE00 + trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 + goto Route110_EventScript_14FE10 + end + +Route110_EventScript_14FE10:: @ 814FE10 + msgbox Route110_Text_16E84C, 4 + call Route110_EventScript_14FEA5 + msgbox Route110_Text_16E8B3, 4 + goto Route110_EventScript_14FEB2 + end + +Route110_EventScript_14FE2B:: @ 814FE2B + msgbox Route110_Text_16E99A, 4 + switch VAR_STARTER_MON + case 0, Route110_EventScript_14FE5A + case 1, Route110_EventScript_14FE6A + case 2, Route110_EventScript_14FE7A + end + +Route110_EventScript_14FE5A:: @ 814FE5A + trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F + goto Route110_EventScript_14FE8A + end + +Route110_EventScript_14FE6A:: @ 814FE6A + trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F + goto Route110_EventScript_14FE8A + end + +Route110_EventScript_14FE7A:: @ 814FE7A + trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F + goto Route110_EventScript_14FE8A + end + +Route110_EventScript_14FE8A:: @ 814FE8A + msgbox Route110_Text_16EA2A, 4 + call Route110_EventScript_14FEA5 + msgbox Route110_Text_16EA7B, 4 + goto Route110_EventScript_14FEB2 + end + +Route110_EventScript_14FEA5:: @ 814FEA5 + giveitem_std ITEM_ITEMFINDER + return + +Route110_EventScript_14FEB2:: @ 814FEB2 + closemessage + compare VAR_SPECIAL_8, 1 + call_if_eq Route110_EventScript_14FF56 + compare VAR_SPECIAL_8, 2 + call_if_eq Route110_EventScript_14FF5E + compare VAR_SPECIAL_8, 3 + call_if_eq Route110_EventScript_14FF66 + setobjectmovementtype 28, 10 + setobjectmovementtype 29, 10 + removeobject 28 + addobject 29 + delay 45 + compare VAR_SPECIAL_8, 1 + call_if_eq Route110_EventScript_14FF35 + compare VAR_SPECIAL_8, 2 + call_if_eq Route110_EventScript_14FF40 + compare VAR_SPECIAL_8, 3 + call_if_eq Route110_EventScript_14FF4B + removeobject 29 + setvar VAR_ROUTE110_STATE, 1 + savebgm 0 + fadedefaultbgm + releaseall + end + +Route110_EventScript_14FF14:: @ 814FF14 + applymovement 28, Route110_Movement_14FF6E + waitmovement 0 + return + +Route110_EventScript_14FF1F:: @ 814FF1F + applymovement 28, Route110_Movement_14FF72 + waitmovement 0 + return + +Route110_EventScript_14FF2A:: @ 814FF2A + applymovement 28, Route110_Movement_14FF74 + waitmovement 0 + return + +Route110_EventScript_14FF35:: @ 814FF35 + applymovement 29, Route110_Movement_14FF78 + waitmovement 0 + return + +Route110_EventScript_14FF40:: @ 814FF40 + applymovement 29, Route110_Movement_14FF80 + waitmovement 0 + return + +Route110_EventScript_14FF4B:: @ 814FF4B + applymovement 29, Route110_Movement_14FF89 + waitmovement 0 + return + +Route110_EventScript_14FF56:: @ 814FF56 + setobjectxyperm 29, 33, 55 + return + +Route110_EventScript_14FF5E:: @ 814FF5E + setobjectxyperm 29, 34, 55 + return + +Route110_EventScript_14FF66:: @ 814FF66 + setobjectxyperm 29, 35, 55 + return + +Route110_Movement_14FF6E:: @ 814FF6E + walk_down + walk_left + walk_in_place_fastest_down + end_movement + +Route110_Movement_14FF72:: @ 814FF72 + walk_down + end_movement + +Route110_Movement_14FF74:: @ 814FF74 + walk_down + walk_right + walk_in_place_fastest_down + end_movement + +Route110_Movement_14FF78:: @ 814FF78 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +Route110_Movement_14FF80:: @ 814FF80 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_down + end_movement + +Route110_Movement_14FF89:: @ 814FF89 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement diff --git a/data/maps/Route110/text.inc b/data/maps/Route110/text.inc new file mode 100644 index 000000000..78be8d595 --- /dev/null +++ b/data/maps/Route110/text.inc @@ -0,0 +1,236 @@ +Route110_Text_16E6C0:: @ 816E6C0 + .string "TEAM {EVIL_TEAM}’s activities must be kept\n" + .string "secret for now.$" + +Route110_Text_16E6F2:: @ 816E6F2 + .string "I want to get going to SLATEPORT and\n" + .string "kick up a ruckus!$" + +Route110_Text_16E729:: @ 816E729 + .string "This is my first job after joining\n" + .string "TEAM {EVIL_TEAM}. I’ve got the shakes!$" + +Route110_Text_16E76A:: @ 816E76A + .string "TEAM {EVIL_TEAM}’s actions will put a smile\n" + .string "on everyone’s face!$" + +Route110_Text_16E7A1:: @ 816E7A1 + .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" + .string "While I was searching for other\n" + .string "POKéMON, my POKéMON grew stronger.\p" + .string "So...\n" + .string "How about a little battle?$" + +Route110_Text_16E826:: @ 816E826 + .string "Yikes!\n" + .string "You’re better than I expected!$" + +Route110_Text_16E84C:: @ 816E84C + .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" + .string "training, too, haven’t you?\p" + .string "I think you deserve a reward!\n" + .string "This is from me!$" + +Route110_Text_16E8B3:: @ 816E8B3 + .string "MAY: That’s an ITEMFINDER.\p" + .string "Try it out. If there is an item that’s\n" + .string "not visible, it emits a sound.\p" + .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" + .string "I know it’s a little silly coming from\n" + .string "me, but I think you should train a lot\l" + .string "harder for the next time.$" + +Route110_Text_16E99A:: @ 816E99A + .string "BRENDAN: Hey, {PLAYER}.\n" + .string "So this is where you were.\l" + .string "How’s it going?\p" + .string "Have you been raising your POKéMON?\n" + .string "I’ll check for you.$" + +Route110_Text_16EA0F:: @ 816EA0F + .string "Hmm...\n" + .string "You’re pretty good.$" + +Route110_Text_16EA2A:: @ 816EA2A + .string "BRENDAN: {PLAYER}, you’ve trained\n" + .string "without me noticing...\p" + .string "Good enough!\n" + .string "Here, take this.$" + +Route110_Text_16EA7B:: @ 816EA7B + .string "BRENDAN: That’s an ITEMFINDER.\p" + .string "Use it to root around for items that\n" + .string "aren’t visible.\p" + .string "If it senses something, it emits a\n" + .string "sound.\p" + .string "Anyway, I’m off to look for new\n" + .string "POKéMON.$" + +Route110_Text_16EB22:: @ 816EB22 + .string "Wouldn’t it be great to ride a BIKE\n" + .string "at full speed on CYCLING ROAD?$" + +Route110_Text_16EB65:: @ 816EB65 + .string "How do you like the way my raven-\n" + .string "colored hair streams behind me?\p" + .string "I grew my hair out just for that.$" + +Route110_Text_16EBC9:: @ 816EBC9 + .string "Oh, hey, you got that BIKE from RYDEL!\p" + .string "Oh, it’s glaringly obvious.\n" + .string "It says right on your bike...\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL...\n" + .string "That name’s everywhere.\p" + .string "You should ride it around all over\n" + .string "the place - it’s good advertising!$" + +Route110_Text_16EDC5:: @ 816EDC5 + .string "The two roads, one above, one below...\p" + .string "A road each for people and POKéMON.\n" + .string "Perhaps that is right and fair.$" + +Route110_Text_16EE30:: @ 816EE30 + .string "I don’t have a BIKE, so I’ll take a\n" + .string "leisurely walk on the low road.$" + +Route110_Text_16EE74:: @ 816EE74 + .string "Learning techniques will make BIKE\n" + .string "riding even more fun.\p" + .string "There are some places that you can\n" + .string "reach only by using a BIKE technique.$" + +Route110_Text_16EEF6:: @ 816EEF6 + .string "Which should I choose?\p" + .string "Make a beeline for MAUVILLE on\n" + .string "CYCLING ROAD, or take the low road\l" + .string "and look for POKéMON?$" + +Route110_Text_16EF65:: @ 816EF65 + .string "Number of collisions:\n" + .string "... ... {STR_VAR_1}!\p" + .string "Total time:\n" + .string "... ... {STR_VAR_2}!$" + +Route110_Text_16EF9F:: @ 816EF9F + .string "Bravo! Splendid showing!\p" + .string "Your love of cycling comes from deep\n" + .string "within your heart.\l" + .string "You’ve shaken me to my very soul!$" + +Route110_Text_16F012:: @ 816F012 + .string "Your technique is remarkable.\p" + .string "I suggest you slow down just enough\n" + .string "to avoid collisions.$" + +Route110_Text_16F069:: @ 816F069 + .string "I would consider you a work in\n" + .string "progress.\p" + .string "Still, I hope you don’t forget the\n" + .string "sheer pleasure of cycling.$" + +Route110_Text_16F0D0:: @ 816F0D0 + .string "My word... Your cycling skills border\n" + .string "on terrifying.\p" + .string "Most certainly, you need much more\n" + .string "practice riding.$" + +Route110_Text_16F139:: @ 816F139 + .string "...I am aghast...\p" + .string "You’re perhaps not cut out for this\n" + .string "unfortunate cycling business.\p" + .string "You ought to give serious thought to\n" + .string "returning that BIKE to RYDEL.$" + +Route110_Text_16F1D0:: @ 816F1D0 + .string "This is CYCLING ROAD.\p" + .string "If you were to ride from MAUVILLE to\n" + .string "SLATEPORT on a MACH BIKE, you would\l" + .string "be rated for the number of collisions\l" + .string "and your total time.$" + +Route110_Text_16F26A:: @ 816F26A + .string "Regardless of the results, I count on\n" + .string "seeing more challenges from you.\l" + .string "Always aim higher!$" + +Route110_Text_16F2C4:: @ 816F2C4 + .string "On this CYCLING ROAD, those riding\n" + .string "MACH BIKES are rated for their number\l" + .string "of collisions and their total times.\p" + .string "ACRO BIKES do not qualify for rating.\n" + .string "They are easy to turn, so it’s not fair.$" + +Route110_Text_16F381:: @ 816F381 + .string "ROUTE 110\n" + .string "{0x7A} SLATEPORT CITY$" + +Route110_Text_16F39C:: @ 816F39C + .string "SEASIDE CYCLING ROAD$" + +Route110_Text_16F3B1:: @ 816F3B1 + .string "“TEAM {EVIL_TEAM} RULEZ!”\p" + .string "Somebody scribbled that on the sign...$" + +Route110_Text_16F3E9:: @ 816F3E9 + .string "ROUTE 110\n" + .string "{0x7B} ROUTE 103$" + +Route110_Text_16F3FF:: @ 816F3FF + .string "SEASIDE PARKING$" + +Route110_Text_16F40F:: @ 816F40F + .string "ROUTE 110\n" + .string "{0x79} MAUVILLE CITY$" + +Route110_Text_16F429:: @ 816F429 + .string "TRAINER TIPS\p" + .string "The foe can be made helpless by\n" + .string "paralyzing it or causing it to sleep.\p" + .string "It is an important technique for\n" + .string "POKéMON battles.$" + +Route110_Text_16F4AE:: @ 816F4AE + .string "TRAINER TIPS\p" + .string "The items in the BAG can be reorganized\n" + .string "by pressing SELECT.$" + +Route110_Text_16F4F7:: @ 816F4F7 + .string "“Three steps {0x7C} and two steps {0x79}\n" + .string "to reach the wondrous TRICK HOUSE.”$" + +Route110_Text_16F53A:: @ 816F53A + .string "THE BEST RECORD TO DATE...\p" + .string "No. of collisions: {STR_VAR_1}\p" + .string "Elapsed time: {STR_VAR_2}$" + +Route110_Text_16F57C:: @ 816F57C + .string "THE BEST RECORD TO DATE...\p" + .string "No one seems to have taken the\n" + .string "challenge. There is no record...$" + +UnknownString_816F5D7: @ 816F5D7 + .string "I watered the plants every day.\n" + .string "They grew lots of flowers.\p" + .string "And they gave me lots of BERRIES, too.\p" + .string "Here you go!\n" + .string "You can have it!$" + +UnknownString_816F657: @ 816F657 + .string "I’m trying to make RED {POKEBLOCK}S!\n" + .string "I hope you do, too!$" + +UnknownString_816F68A: @ 816F68A + .string "Your BAG’s BERRIES POCKET is full.\p" + .string "I’ll give it to you another time.$" + +UnknownString_816F6CF: @ 816F6CF + .string "I’m going to look for red BERRIES to\n" + .string "make RED {POKEBLOCK}S.$" diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 0474772cb..0474772cb 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 749ab18e9..1fb9928b3 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -1,9 +1,9 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrace_Layout .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 257 .byte 25 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc new file mode 100644 index 000000000..8d6465c89 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -0,0 +1,61 @@ +Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 + map_script 3, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE + .byte 0 + +Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE + compare VAR_CYCLING_CHALLENGE_STATE, 3 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + compare VAR_CYCLING_CHALLENGE_STATE, 2 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 + return + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB + lock + faceplayer + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E406, 4 + release + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 +@ Coord event directly in front of the gatesman heading left to right + lockall + specialvar RESULT, GetPlayerAvatarBike @ player state? + compare RESULT, 2 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D + compare RESULT, 0 + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 + setflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 1 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D +@ You're on the Mach Bike! + setvar VAR_CYCLING_CHALLENGE_STATE, 1 + return + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 +@ You don't have a bike! + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4 + closemessage + applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 + waitmovement 0 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 + walk_left + end_movement + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A +@ Coord event directly in front of the gatesman heading right to left + lockall + setvar VAR_CYCLING_CHALLENGE_STATE, 0 + clearflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 0 + releaseall + end diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc new file mode 100644 index 000000000..8d5a0433e --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc @@ -0,0 +1,10 @@ +Route110_SeasideCyclingRoadNorthEntrance_Text_19E406:: @ 819E406 + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" + +UnknownString_819E48D: @ 819E48D + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 996562b61..996562b61 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a4bd0cbd7..a4da7397c 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -1,9 +1,9 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrace_Layout .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 257 .byte 25 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin deleted file mode 100644 index e9fc770d4..000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -x2p2p2p2p2622226x2p2p2p22h2h2h2h26666662h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6
\ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc new file mode 100644 index 000000000..edae49291 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -0,0 +1,38 @@ +Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 816347E + .byte 0 + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F + lock + faceplayer + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E326, 4 + release + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B + lockall + specialvar RESULT, GetPlayerAvatarBike + compare RESULT, 0 + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 + setflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 1 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4 + closemessage + applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB + waitmovement 0 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB + walk_left + end_movement + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD + lockall + clearflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 0 + releaseall + end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc new file mode 100644 index 000000000..77bf90751 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc @@ -0,0 +1,11 @@ +Route110_SeasideCyclingRoadSouthEntrance_Text_19E326:: @ 819E326 + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" + +Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD:: @ 819E3AD +Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD:: @ 819E3AD + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/maps/Route110_TrickHouseCorridor/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route110_TrickHouseCorridor/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc index 4b7e39efd..4b7e39efd 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ b/data/maps/Route110_TrickHouseCorridor/events.inc diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index f2b2c691d..14997e663 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,9 +1,9 @@ Route110_TrickHouseCorridor:: @ 8307D84 - .4byte Route110_TrickHouseCorridor_MapAttributes + .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 247 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/maps/Route110_TrickHouseCorridor/map.bin deleted file mode 100644 index 8981d28bd..000000000 --- a/data/maps/Route110_TrickHouseCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ - 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)22!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!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2 !2)2)22!22!2)2)2)222
\ No newline at end of file diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc new file mode 100644 index 000000000..be70476e6 --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -0,0 +1,7 @@ +Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC + map_script 3, Route110_TrickHouseCorridor_MapScript1_161CF2 + .byte 0 + +Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 + setvar VAR_TRICK_HOUSE_STATE, 1 + end diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/maps/Route110_TrickHouseEnd/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route110_TrickHouseEnd/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 732c6c705..732c6c705 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index d61808d7f..58ca3e71d 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,9 +1,9 @@ Route110_TrickHouseEnd:: @ 8307D68 - .4byte Route110_TrickHouseEnd_MapAttributes + .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 246 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/maps/Route110_TrickHouseEnd/map.bin deleted file mode 100644 index 506fdb644..000000000 --- a/data/maps/Route110_TrickHouseEnd/map.bin +++ /dev/null @@ -1 +0,0 @@ - 2 6 2 6!22222!2!2!22!2!2!2!2)2)2)2)2)2D2)2)2)2)2)2!2)2)2)2)2NO)2)2)2)2)2!2)2)2)2D2VWD2)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
\ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc new file mode 100644 index 000000000..ca992427c --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -0,0 +1,251 @@ +Route110_TrickHouseEnd_MapScripts:: @ 8161936 + map_script 5, Route110_TrickHouseEnd_MapScript1_16194B + map_script 3, Route110_TrickHouseEnd_MapScript1_161957 + map_script 2, Route110_TrickHouseEnd_MapScript2_16197C + map_script 4, Route110_TrickHouseEnd_MapScript2_161965 + .byte 0 + +Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B + compare VAR_TEMP_1, 1 + call_if_eq Route110_TrickHouseEnd_EventScript_161994 + end + +Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + special SetTrickHouseEndRoomFlag + end + +Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F + .2byte 0 + +Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F + addobject 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END + turnobject 1, 4 + end + +Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986 + .2byte 0 + +Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 + setvar VAR_TEMP_1, 1 + call Route110_TrickHouseEnd_EventScript_161994 + special DrawWholeMapView + end + +Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 + setmetatile 10, 1, 539, 1 + return + +Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E + lock + faceplayer + msgbox Route110_TrickHouseEnd_Text_19C281, 4 + setvar VAR_TEMP_2, 1 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED + case 0, Route110_TrickHouseEnd_EventScript_161A0B + case 1, Route110_TrickHouseEnd_EventScript_161A47 + case 2, Route110_TrickHouseEnd_EventScript_161A83 + case 3, Route110_TrickHouseEnd_EventScript_161ABF + case 4, Route110_TrickHouseEnd_EventScript_161AFB + case 5, Route110_TrickHouseEnd_EventScript_161B37 + case 6, Route110_TrickHouseEnd_EventScript_161B73 + case 7, Route110_TrickHouseEnd_EventScript_161BAF + end + +Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B + msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_RARE_CANDY + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 + msgbox Route110_TrickHouseEnd_Text_19C333, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_TIMER_BALL + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 + msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_HARD_STONE + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF + msgbox Route110_TrickHouseEnd_Text_19C41F, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_SMOKE_BALL + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB + msgbox Route110_TrickHouseEnd_Text_19C491, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_TM12_TAUNT + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 + msgbox Route110_TrickHouseEnd_Text_19C515, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_MAGNET + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 + msgbox Route110_TrickHouseEnd_Text_19C567, 4 + msgbox Route110_TrickHouseEnd_Text_19C90B, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + giveitem_std ITEM_PP_MAX + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E + msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 + closemessage + call Route110_TrickHouseEnd_EventScript_161C2E + release + end + +Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF + msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 + closemessage + compare FACING, 1 + call_if_eq Route110_TrickHouseEnd_EventScript_161C74 + compare FACING, 2 + call_if_eq Route110_TrickHouseEnd_EventScript_161C7F + compare FACING, 3 + call_if_eq Route110_TrickHouseEnd_EventScript_161C8A + compare FACING, 4 + call_if_eq Route110_TrickHouseEnd_EventScript_161C95 + delay 30 + msgbox Route110_TrickHouseEnd_Text_19C602, 4 + closemessage + applymovement 1, Route110_TrickHouseEnd_Movement_1A0839 + waitmovement 0 + delay 30 + msgbox Route110_TrickHouseEnd_Text_19C691, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + .ifdef SAPPHIRE + givedecoration_std DECOR_BLUE_TENT + .else + givedecoration_std DECOR_RED_TENT + .endc + compare RESULT, 0 + call_if_eq Route110_TrickHouseEnd_EventScript_161C61 + msgbox Route110_TrickHouseEnd_Text_19C85C, 4 + call Route110_TrickHouseEnd_EventScript_161C2E + special ResetTrickHouseEndRoomFlag + release + end + +Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E + applymovement 1, Route110_TrickHouseEnd_Movement_161315 + waitmovement 0 + playse SE_W153 + applymovement 1, Route110_TrickHouseEnd_Movement_16131E + waitmovement 0 + removeobject 1 + addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 + return + +Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E + call Route110_TrickHouseEnd_EventScript_1A02A5 + msgbox Route110_TrickHouseEnd_Text_19C92E, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 + return + +Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 + call Route110_TrickHouseEnd_EventScript_1A02B8 + msgbox Route110_TrickHouseEnd_Text_19C7D7, 4 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 + return + +Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0845 + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F + applymovement 1, Route110_TrickHouseEnd_Movement_1A0841 + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A + applymovement 1, Route110_TrickHouseEnd_Movement_1A083F + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0843 + waitmovement 0 + return + +Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 + lockall + turnobject 1, 3 + playse SE_PIN + applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 + waitmovement 0 + delay 20 + applymovement 1, Route110_TrickHouseEnd_Movement_161CEA + waitmovement 0 + playse SE_W153 + applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 + waitmovement 0 + msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 + closemessage + applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 + waitmovement 0 + delay 4 + turnobject 1, 4 + releaseall + end + +Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8 + walk_down + end_movement + +Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA + jump_in_place_left + end_movement diff --git a/data/maps/Route110_TrickHouseEnd/text.inc b/data/maps/Route110_TrickHouseEnd/text.inc new file mode 100644 index 000000000..03f2252fd --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/text.inc @@ -0,0 +1,110 @@ +Route110_TrickHouseEnd_Text_19C281:: @ 819C281 + .string "Aak!\n" + .string "You’ve made it to me?\l" + .string "Hmmm... You’re sharp!$" + +Route110_TrickHouseEnd_Text_19C2B2:: @ 819C2B2 + .string "It took me all night to plant all those\n" + .string "trees...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four, five, six places!$" + +Route110_TrickHouseEnd_Text_19C333:: @ 819C333 + .string "It took me all night to make the maze...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four, five places!$" + +Route110_TrickHouseEnd_Text_19C3A7:: @ 819C3A7 + .string "It took me all night to bring in those\n" + .string "boulders...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four places!$" + +Route110_TrickHouseEnd_Text_19C41F:: @ 819C41F + .string "It took me all night to shove in those\n" + .string "boulders...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three places!$" + +Route110_TrickHouseEnd_Text_19C491:: @ 819C491 + .string "It took me all night to make MECHADOLLS\n" + .string "and another to think up the quiz...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two places!$" + +Route110_TrickHouseEnd_Text_19C515:: @ 819C515 + .string "It took me all night to install\n" + .string "the doors...\p" + .string "You’re almost my equal in greatness!$" + +Route110_TrickHouseEnd_Text_19C567:: @ 819C567 + .string "It took me all night setting up arrows...\p" + .string "You’re my equal in greatness!$" + +Route110_TrickHouseEnd_Text_19C5AF:: @ 819C5AF + .string "It took me all night polishing floors...\p" + .string "You’re above me in greatness!\n" + .string "Possibly...$" + +Route110_TrickHouseEnd_Text_19C602:: @ 819C602 + .string "Wh-what should I do?\n" + .string "My fountain of ideas for tricks has\l" + .string "run dry...\p" + .string "Perhaps it is time I toured the country\n" + .string "on a quest to devise new tricks...$" + +Route110_TrickHouseEnd_Text_19C691:: @ 819C691 + .string "I hate to admit defeat, but you have\n" + .string "bested me!\p" + .string "Still, you must have been reeled in by\n" + .string "my charisma for you to visit me again\l" + .string "and again. Yes, you must have!\p" + .string "But that has nothing to do with my\n" + .string "losing!\p" + .string "In recognition of the friendship\n" + .string "between you, the driven, and the genius\l" + .string "that is myself, I demand that you take\l" + .string "this keepsake!$" + +Route110_TrickHouseEnd_Text_19C7D7:: @ 819C7D7 + .string "What? No room in your PC?\n" + .string "What am I to make of that?\p" + .string "I wish I could say that, but I am much\n" + .string "too kind and caring, so come back later!$" + +Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C + .string "... ... ... ... ... ...\p" + .string "I am leaving on a journey of discovery.\n" + .string "A quest in search of new tricks.\p" + .string "I wish that you will one day visit and\n" + .string "entertain me again.\p" + .string "And now, farewell!$" + +Route110_TrickHouseEnd_Text_19C90B:: @ 819C90B + .string "Fine!\n" + .string "You have earned this reward!$" + +Route110_TrickHouseEnd_Text_19C92E:: @ 819C92E + .string "What? Have you no room for this?\n" + .string "What manner of items do you carry?\p" + .string "But fine, since you’ve reached me,\n" + .string "your reward will be with me till later.$" + +Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD + .string "Scrub that smug smirk from your face!\n" + .string "It’s much too early to think you’ve won!\p" + .string "I’ll make new tricks to stump you, I will.\n" + .string "You may mock me only when you’re done.\p" + .string "Come back for the next exciting\n" + .string "installment!$" + +Route110_TrickHouseEnd_Text_19CA8B:: @ 819CA8B + .string "Now, now! You’re ignoring me now?\n" + .string "Now that, I consider heartbreaking!$" + +UnknownString_819CAD1: @ 819CAD1 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is fabulous.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/maps/Route110_TrickHouseEntrance/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route110_TrickHouseEntrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 07c5a6555..07c5a6555 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 80d6c597f..8146c2fa0 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,9 +1,9 @@ Route110_TrickHouseEntrance:: @ 8307D4C - .4byte Route110_TrickHouseEntrance_MapAttributes + .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 245 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/maps/Route110_TrickHouseEntrance/map.bin deleted file mode 100644 index 1306bb9b5..000000000 --- a/data/maps/Route110_TrickHouseEntrance/map.bin +++ /dev/null @@ -1 +0,0 @@ - 6 !2!2!2!2!2!2!2!2!2222!2)2)2)2D2NOD2)2)2)2)23)2)2)2D2VWD2)2)2)23'7)2)2)2)2)2)2)2)2)2)2"7 333333333333#333332233333
\ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc new file mode 100644 index 000000000..79f52f7bf --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -0,0 +1,759 @@ +Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B + map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B + map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD + map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2 + .byte 0 + +Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B + setflag FLAG_LANDMARK_TRICK_HOUSE + compare VAR_TRICK_HOUSE_STATE, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 + case 0, Route110_TrickHouseEntrance_EventScript_16109A + case 1, Route110_TrickHouseEntrance_EventScript_1610A0 + case 3, Route110_TrickHouseEntrance_EventScript_1610A6 + case 4, Route110_TrickHouseEntrance_EventScript_1610AC + end + +Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 + end + +Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 + end + +Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + end + +Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 + call_if_eq Route110_TrickHouseEntrance_EventScript_16103C + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 + call_if_eq Route110_TrickHouseEntrance_EventScript_161046 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 + call_if_eq Route110_TrickHouseEntrance_EventScript_161050 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 + call_if_eq Route110_TrickHouseEntrance_EventScript_16105A + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 + call_if_eq Route110_TrickHouseEntrance_EventScript_161064 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 + call_if_eq Route110_TrickHouseEntrance_EventScript_16106E + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 + call_if_eq Route110_TrickHouseEntrance_EventScript_161078 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 + call_if_eq Route110_TrickHouseEntrance_EventScript_161082 + return + +Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088 + return + +Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 + return + +Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 + return + +Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E + setobjectxyperm 1, 5, 2 + setobjectmovementtype 1, 4 + end + +Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 + end + +Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + end + +Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + end + +Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + end + +Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE + .2byte 0 + +Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 + addobject 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + turnobject 1, 4 + turnobject 255, 3 + end + +Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 + addobject 1 + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED + case 0, Route110_TrickHouseEntrance_EventScript_16116B + case 1, Route110_TrickHouseEntrance_EventScript_161173 + case 2, Route110_TrickHouseEntrance_EventScript_161193 + case 3, Route110_TrickHouseEntrance_EventScript_161183 + case 4, Route110_TrickHouseEntrance_EventScript_16118B + case 5, Route110_TrickHouseEntrance_EventScript_16117B + case 6, Route110_TrickHouseEntrance_EventScript_16119B + case 7, Route110_TrickHouseEntrance_EventScript_1611A3 + end + +Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B + setobjectxy 1, 6, 3 + end + +Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173 + setobjectxy 1, 11, 5 + end + +Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B + setobjectxy 1, 11, 1 + end + +Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183 + setobjectxy 1, 3, 1 + end + +Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B + setobjectxy 1, 0, 5 + end + +Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193 + setobjectxy 1, 9, 1 + end + +Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B + setobjectxy 1, 8, 1 + end + +Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3 + setobjectxy 1, 4, 4 + end + +Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB + removeobject 1 + end + +Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 2 + end + +Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 1 + end + +Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7 + .2byte 0 + +Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 + lockall + delay 20 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_161327 + msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 + closemessage + delay 20 + applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + waitmovement 0 + playse SE_W153 + applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + waitmovement 0 + removeobject 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 + releaseall + end + +@ 8161218 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A + lockall + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 + case 0, Route110_TrickHouseEntrance_EventScript_16124D + case 2, Route110_TrickHouseEntrance_EventScript_16136E + case 3, Route110_TrickHouseEntrance_EventScript_161330 + case 6, Route110_TrickHouseEntrance_EventScript_161518 + end + +Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D + playse SE_PIN + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 + waitmovement 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 + call_if_eq Route110_TrickHouseEntrance_EventScript_161303 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 + call_if_eq Route110_TrickHouseEntrance_EventScript_16130C + closemessage + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 + warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD + msgbox Route110_TrickHouseEntrance_Text_19BA6E, 4 + return + +Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6 + msgbox Route110_TrickHouseEntrance_Text_19BAC0, 4 + return + +Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF + msgbox Route110_TrickHouseEntrance_Text_19BB11, 4 + return + +Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8 + msgbox Route110_TrickHouseEntrance_Text_19BB61, 4 + return + +Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1 + msgbox Route110_TrickHouseEntrance_Text_19BBB4, 4 + return + +Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA + msgbox Route110_TrickHouseEntrance_Text_19BC04, 4 + return + +Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303 + msgbox Route110_TrickHouseEntrance_Text_19BC55, 4 + return + +Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C + msgbox Route110_TrickHouseEntrance_Text_19BCA8, 4 + return + +Route110_TrickHouseEnd_Movement_161315:: @ 8161315 +Route110_TrickHouseEntrance_Movement_161315:: @ 8161315 + face_up + delay_4 + face_left + delay_4 + face_down + delay_4 + face_right + delay_4 + end_movement + +Route110_TrickHouseEnd_Movement_16131E:: @ 816131E +Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up + end_movement + +Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 + msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4 + return + +Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 + msgbox Route110_TrickHouseEntrance_Text_19BF19, 4 + closemessage + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 + playse SE_PIN + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 + waitmovement 0 + msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + waitmovement 0 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 + msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 + goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 + end + +Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE + giveitem_std ITEM_RARE_CANDY + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA + giveitem_std ITEM_TIMER_BALL + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 + giveitem_std ITEM_HARD_STONE + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 + giveitem_std ITEM_SMOKE_BALL + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E + giveitem_std ITEM_TM12_TAUNT + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA + giveitem_std ITEM_MAGNET + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 + giveitem_std ITEM_PP_MAX + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + waitmovement 0 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 + msgbox Route110_TrickHouseEntrance_Text_19C128, 4 + .ifdef SAPPHIRE + givedecoration_std DECOR_BLUE_TENT + .else + givedecoration_std DECOR_RED_TENT + .endif + compare RESULT, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 + compare RESULT, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8 + msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 + msgbox Route110_TrickHouseEntrance_Text_19C17E, 4 + closemessage + applymovement 1, Route110_TrickHouseEntrance_Movement_16309F + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + waitmovement 0 + playse SE_W153 + applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + waitmovement 0 + removeobject 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A + lockall + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 + case 0, Route110_TrickHouseEntrance_EventScript_1615BD + case 1, Route110_TrickHouseEntrance_EventScript_1615C7 + case 4, Route110_TrickHouseEntrance_EventScript_1616B8 + case 5, Route110_TrickHouseEntrance_EventScript_1616C2 + end + +Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD + msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 + msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO + closemessage + compare RESULT, YES + goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD + setmetatile 5, 1, 537, 0 + special DrawWholeMapView + delay 20 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_16165E + waitmovement 0 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED + case 0, Route110_TrickHouseEntrance_EventScript_161660 + case 1, Route110_TrickHouseEntrance_EventScript_16166B + case 2, Route110_TrickHouseEntrance_EventScript_161676 + case 3, Route110_TrickHouseEntrance_EventScript_161681 + case 4, Route110_TrickHouseEntrance_EventScript_16168C + case 5, Route110_TrickHouseEntrance_EventScript_161697 + case 6, Route110_TrickHouseEntrance_EventScript_1616A2 + case 7, Route110_TrickHouseEntrance_EventScript_1616AD + end + +Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E + set_invisible + end_movement + +Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 + msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 + msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7 + msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4 + releaseall + end + +gUnknown_081616E1:: @ 81616E1 + lockall + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED + case 0, Route110_TrickHouseEntrance_EventScript_161740 + case 1, Route110_TrickHouseEntrance_EventScript_161769 + case 2, Route110_TrickHouseEntrance_EventScript_161792 + case 3, Route110_TrickHouseEntrance_EventScript_1617BB + case 4, Route110_TrickHouseEntrance_EventScript_1617E4 + case 5, Route110_TrickHouseEntrance_EventScript_16180D + case 6, Route110_TrickHouseEntrance_EventScript_161836 + case 7, Route110_TrickHouseEntrance_EventScript_16185F + end + +Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819CAD1, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819CCCB, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819CEF9, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819D164, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819D3A5, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819DC0A, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819DE8D, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + msgbox UnknownString_819E0FF, 4 + playse SE_PIN + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 + setmetatile 13, 1, 523, 0 + special DrawWholeMapView + releaseall + end + +Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888 + msgbox UnknownString_819C21F, 4 + releaseall + end + +Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle3_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle4_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892 +Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892 + msgbox Route110_TrickHousePuzzle1_Text_19C1FF, 4 + releaseall + end + +Route110_TrickHousePuzzle1_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle2_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle3_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle4_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C + playfanfare MUS_FANFA4 + message Route110_TrickHousePuzzle1_Text_19C1B8 + waitfanfare + waitmessage + msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4 + releaseall + end + +Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 + lockall + msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 + releaseall + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 + call_if_eq Route110_TrickHouseEntrance_EventScript_16190B + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + end + +Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 + setvar VAR_SPECIAL_4, 6 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 0 + call Route110_TrickHouseEntrance_EventScript_161920 + return + +Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 + setvar VAR_SPECIAL_4, 11 + setvar VAR_SPECIAL_5, 5 + setvar VAR_SPECIAL_6, 0 + call Route110_TrickHouseEntrance_EventScript_161920 + return + +Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B + setvar VAR_SPECIAL_4, 9 + setvar VAR_SPECIAL_5, 2 + setvar VAR_SPECIAL_6, 0 + call Route110_TrickHouseEntrance_EventScript_161920 + return + +Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 + setfieldeffectargument 0, 32772 + setfieldeffectargument 1, 32773 + setfieldeffectargument 2, 32774 + dofieldeffect FLDEFF_SPARKLE + waitfieldeffect FLDEFF_SPARKLE + delay 10 + return diff --git a/data/maps/Route110_TrickHouseEntrance/text.inc b/data/maps/Route110_TrickHouseEntrance/text.inc new file mode 100644 index 000000000..fe39a4441 --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/text.inc @@ -0,0 +1,111 @@ +Route110_TrickHouseEntrance_Text_19BA56:: @ 819BA56 + .string "You’re being watched...$" + +Route110_TrickHouseEntrance_Text_19BA6E:: @ 819BA6E + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "beneath this desk? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BAC0:: @ 819BAC0 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "behind this tree? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BB11:: @ 819BB11 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "in this dresser? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BB61:: @ 819BB61 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "beyond this window? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BBB4:: @ 819BBB4 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "in this planter? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BC04:: @ 819BC04 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "in this cupboard? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BC55:: @ 819BC55 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "behind this window? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BCA8:: @ 819BCA8 + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "beneath this cushion? You’re sharp!$" + +Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD + .string "Behold!\p" + .string "For I am the greatest living mystery\n" + .string "of a man in all of HOENN!\l" + .string "They call me...\p" + .string "The TRICK MASTER!\n" + .string "Wahahaha! Glad to meet you!$" + +Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 + .string "You, you’ve come to challenge my\n" + .string "TRICK HOUSE, haven’t you?\p" + .string "That’s why you’re here, isn’t it?\n" + .string "Yes, it is!\p" + .string "Consider your challenge accepted!\p" + .string "Enter through the scroll there,\n" + .string "and let your challenge commence!\p" + .string "I shall be waiting in the back!$" + +Route110_TrickHouseEntrance_Text_19BE6E:: @ 819BE6E + .string "It’s a scroll.$" + +Route110_TrickHouseEntrance_Text_19BE7D:: @ 819BE7D + .string "There is a big hole behind the scroll!\p" + .string "Want to go in?$" + +Route110_TrickHouseEntrance_Text_19BEB3:: @ 819BEB3 + .string "There is a note affixed to the scroll...\p" + .string "“I am leaving on a journey.\n" + .string "Don’t look for me. TRICK MASTER”$" + +Route110_TrickHouseEntrance_Text_19BF19:: @ 819BF19 + .string "For the next time, I’ll use this trick,\n" + .string "and that scheme, and those ruses...\p" + .string "Mufufufu... If I may say so, it’s\n" + .string "brilliantly difficult, even for me!$" + +Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB + .string "Hah? What?!\n" + .string "Oh, it’s you!\p" + .string "I’m in the midst of devising new tricky\n" + .string "challenges!\p" + .string "It’s not too much to ask for a bit more\n" + .string "time for me to think, is it now?\l" + .string "You wouldn’t begrudge me that?\l" + .string "Come back in a little while!$" + +Route110_TrickHouseEntrance_Text_19C07E:: @ 819C07E + .string "Ah, it’s you! You’re here to accept the\n" + .string "reward from before, isn’t that right?\l" + .string "Yes, right I am!\p" + .string "Here!\n" + .string "I’ll give it to you now!$" + +Route110_TrickHouseEntrance_Text_19C0FC:: @ 819C0FC + .string "Hah?\n" + .string "Did you not come to claim your reward?$" + +Route110_TrickHouseEntrance_Text_19C128:: @ 819C128 + .string "MECHADOLL 5 I AM!\n" + .string "IF REWARD IS NOT TAKEN BY YOU,\l" + .string "THEN TRICK MASTER YOU CANNOT FOLLOW.$" + +Route110_TrickHouseEntrance_Text_19C17E:: @ 819C17E + .string "THEN FAREWELL.$" + +Route110_TrickHouseEntrance_Text_19C18D:: @ 819C18D + .string "YOUR PC STATUS: FULL AGAIN.\n" + .string "MEAN, YOU ARE.$" diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/maps/Route110_TrickHousePuzzle1/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle1/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index ef5b7732f..ef5b7732f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index c4c87877c..18d772089 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 - .4byte Route110_TrickHousePuzzle1_MapAttributes + .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 248 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/maps/Route110_TrickHousePuzzle1/map.bin deleted file mode 100644 index c809b7482..000000000 --- a/data/maps/Route110_TrickHousePuzzle1/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o233333333334 -w6 #$+$$$+$$$$!222Z2Z2*Z2Z2Z2*Z2Z2Z2Z2*22222222222222222222, 2 2 2, 2 2 2 2, 2 2 22#$$+$$$$+$$$$%2Z2Z2Z2"Z2Z2Z2Z2*Z2Z2Z2Z2Z22222"2222222222 222, 222 2, 2 2 2 2 2012 $%2 $$$$+$%Z2Z22*Z2Z22"Z2Z2Z2Z2*Z2Z22222222"222222222 2, 2 2 2, 2 2 2 2, 222#$$$+$$$$+$$%22Z2Z2Z2Z2"Z2Z2Z2Z2*Z2Z2Z2222222"2222222222 2 222, 2 2 2 2, 222 2#$%2#$$+$$$%201Z2Z2Z22Z2Z2Z2"Z2Z2Z2Z22Z2Z22222222*22222222222222Z22222222
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc new file mode 100644 index 000000000..df0484baf --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -0,0 +1,39 @@ +Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 + map_script 1, Route110_TrickHousePuzzle1_MapScript1_161CFE + .byte 0 + +Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A + end + +Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A + setmetatile 13, 1, 523, 0 + end + +Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 + lockall + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 + goto Route110_TrickHousePuzzle1_EventScript_161892 + end + +Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 + goto Route110_TrickHousePuzzle1_EventScript_16189C + end + +Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 + trainerbattle 0, OPPONENT_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 + end + +Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 + trainerbattle 0, OPPONENT_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 + end + +Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F + trainerbattle 0, OPPONENT_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle1/text.inc b/data/maps/Route110_TrickHousePuzzle1/text.inc new file mode 100644 index 000000000..84208ead5 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/text.inc @@ -0,0 +1,38 @@ +Route110_TrickHousePuzzle1_Text_19CB4F:: @ 819CB4F + .string "I’ll hack and slash my way to victory\n" + .string "with the CUT we just learned!$" + +Route110_TrickHousePuzzle1_Text_19CB93:: @ 819CB93 + .string "Why are you so serious?$" + +Route110_TrickHousePuzzle1_Text_19CBAB:: @ 819CBAB + .string "I never get tired of hacking\n" + .string "and slashing!$" + +Route110_TrickHousePuzzle1_Text_19CBD6:: @ 819CBD6 + .string "I wandered into this weird house\n" + .string "by accident...$" + +Route110_TrickHousePuzzle1_Text_19CC06:: @ 819CC06 + .string "And now I’ve lost...$" + +Route110_TrickHousePuzzle1_Text_19CC1B:: @ 819CC1B + .string "I lost my way, I lost a battle, and I’m\n" + .string "even more lost... I can’t get out...$" + +Route110_TrickHousePuzzle1_Text_19CC68:: @ 819CC68 + .string "Just who is the TRICK MASTER?$" + +Route110_TrickHousePuzzle1_Text_19CC86:: @ 819CC86 + .string "I lost while I was lost in thought!$" + +Route110_TrickHousePuzzle1_Text_19CCAA:: @ 819CCAA + .string "You’re strong!\n" + .string "Just who are you?$" + +UnknownString_819CCCB: @ 819CCCB + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is smart.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/maps/Route110_TrickHousePuzzle2/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle2/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index c815a1624..c815a1624 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index d278ca3aa..489d213d9 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2:: @ 8307DBC - .4byte Route110_TrickHousePuzzle2_MapAttributes + .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 249 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/maps/Route110_TrickHousePuzzle2/map.bin deleted file mode 100644 index 819080ced..000000000 --- a/data/maps/Route110_TrickHousePuzzle2/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o
-w6 222X22222222222222222222222i2222222i222222222222222222222222222222222222222X22222222222222i22222222222i22222222222222222222222222222222X2222222222222222222222222222222222222222X2
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc new file mode 100644 index 000000000..cdde15d1a --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -0,0 +1,105 @@ +Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 + map_script 5, Route110_TrickHousePuzzle2_MapScript1_161D81 + map_script 3, Route110_TrickHousePuzzle2_MapScript1_161DAE + .byte 0 + +Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 + compare VAR_TEMP_1, 1 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E2C + compare VAR_TEMP_2, 1 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E3F + compare VAR_TEMP_3, 1 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E52 + compare VAR_TEMP_4, 1 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E65 + end + +Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + end + +Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 + lockall + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 + goto Route110_TrickHousePuzzle2_EventScript_161892 + end + +Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 + goto Route110_TrickHousePuzzle2_EventScript_16189C + end + +Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 + lockall + setvar VAR_TEMP_1, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_161E2C + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 + lockall + setvar VAR_TEMP_2, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_161E3F + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 + lockall + setvar VAR_TEMP_3, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_161E52 + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 + lockall + setvar VAR_TEMP_4, 1 + playse SE_PIN + call Route110_TrickHousePuzzle2_EventScript_161E65 + special DrawWholeMapView + releaseall + end + +Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C + setmetatile 14, 21, 601, 0 + setmetatile 1, 12, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F + setmetatile 8, 17, 601, 0 + setmetatile 12, 13, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 + setmetatile 4, 10, 601, 0 + setmetatile 8, 4, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 + setmetatile 5, 2, 601, 0 + setmetatile 12, 5, 618, 0 + return + +Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 + trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 + end + +Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F + trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 + end + +Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 + trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle2/text.inc b/data/maps/Route110_TrickHousePuzzle2/text.inc new file mode 100644 index 000000000..cb64f04d8 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/text.inc @@ -0,0 +1,39 @@ +Route110_TrickHousePuzzle2_Text_19CD46:: @ 819CD46 + .string "Which switch closes which hole?$" + +Route110_TrickHousePuzzle2_Text_19CD66:: @ 819CD66 + .string "After that battle, I’m even more\n" + .string "confused!$" + +Route110_TrickHousePuzzle2_Text_19CD91:: @ 819CD91 + .string "Can I get you to push all the buttons\n" + .string "for me?$" + +Route110_TrickHousePuzzle2_Text_19CDBF:: @ 819CDBF + .string "Oh! You’re on your second TRICK HOUSE\n" + .string "challenge!$" + +Route110_TrickHousePuzzle2_Text_19CDF0:: @ 819CDF0 + .string "You’re good at battling too?$" + +Route110_TrickHousePuzzle2_Text_19CE0D:: @ 819CE0D + .string "The TRICK MASTER rigged all the tricks\n" + .string "in this house all by himself.$" + +Route110_TrickHousePuzzle2_Text_19CE52:: @ 819CE52 + .string "I want to make my own GYM one day.\n" + .string "So, I’m studying how to set traps.$" + +Route110_TrickHousePuzzle2_Text_19CE98:: @ 819CE98 + .string "I didn’t study battling enough!$" + +Route110_TrickHousePuzzle2_Text_19CEB8:: @ 819CEB8 + .string "You’re strong, aren’t you?\n" + .string "Maybe even enough to be a GYM LEADER!$" + +UnknownString_819CEF9: @ 819CEF9 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is coveted.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/maps/Route110_TrickHousePuzzle3/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle3/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index e45f2d33b..e45f2d33b 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 736a1dc19..c8b2da4a3 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 - .4byte Route110_TrickHousePuzzle3_MapAttributes + .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 250 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/maps/Route110_TrickHousePuzzle3/map.bin deleted file mode 100644 index 4dc43a00d..000000000 --- a/data/maps/Route110_TrickHousePuzzle3/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o
-w6 &22&22&22&X22&22-X22-22-K2L2-22-K2L2522:225S2T2:22MS2T2q222B22q222B22U222 K2L2 8292 22 ./ 225S2T25@AM22:675X22~22X222U222Bq2q2q222 ./&K2L2 K2L2&22 K2L2567"S2T2:S2T2"2X2MS2T2q2q2q2"22B22"22U222 22-X22 8292-8292 22522M22:@A5@A:22q222U222B22q222B22 8292 ./ 22 22 K2L25@A567:22M22:S2T2q222q2q2q2B22U222B22 22 K2L2 K2L2 8292 ./5225S2T25S2T25@A567q222q22X2q222q222q2q2q2222222222222222
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc new file mode 100644 index 000000000..14a021e8d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -0,0 +1,396 @@ +Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD + map_script 5, Route110_TrickHousePuzzle3_MapScript1_161EC8 + map_script 3, Route110_TrickHousePuzzle3_MapScript1_161EE4 + .byte 0 + +Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 + call Route110_TrickHousePuzzle3_EventScript_161F12 + compare VAR_TEMP_9, 0 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 + end + +Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 + end + +Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 + setmetatile 5, 20, 600, 0 + setmetatile 4, 12, 600, 0 + setmetatile 11, 10, 600, 0 + setmetatile 3, 8, 600, 0 + setmetatile 13, 7, 600, 0 + setmetatile 1, 3, 600, 0 + setmetatile 10, 2, 600, 0 + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FA9 + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FB3 + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FBD + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FC7 + compare VAR_TEMP_8, 6 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FD1 + compare VAR_TEMP_8, 7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FDB + return + +Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F + setmetatile 5, 20, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 + setmetatile 4, 12, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 + setmetatile 11, 10, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD + setmetatile 3, 8, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 + setmetatile 13, 7, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 + setmetatile 1, 3, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB + setmetatile 10, 2, 601, 0 + return + +Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 + setmetatile 1, 6, 587, 0 + setmetatile 2, 6, 588, 0 + setmetatile 1, 7, 595, 0 + setmetatile 2, 7, 596, 0 + setmetatile 4, 9, 587, 0 + setmetatile 5, 9, 588, 0 + setmetatile 4, 10, 595, 0 + setmetatile 5, 10, 596, 0 + setmetatile 4, 18, 587, 0 + setmetatile 5, 18, 588, 0 + setmetatile 4, 19, 595, 0 + setmetatile 5, 19, 596, 0 + setmetatile 7, 3, 587, 0 + setmetatile 8, 3, 588, 0 + setmetatile 7, 4, 595, 0 + setmetatile 8, 4, 596, 0 + setmetatile 7, 9, 587, 0 + setmetatile 8, 9, 588, 0 + setmetatile 7, 10, 595, 0 + setmetatile 8, 10, 596, 0 + setmetatile 7, 18, 587, 0 + setmetatile 8, 18, 588, 0 + setmetatile 7, 19, 595, 0 + setmetatile 8, 19, 596, 0 + setmetatile 13, 3, 587, 0 + setmetatile 14, 3, 588, 0 + setmetatile 13, 4, 595, 0 + setmetatile 14, 4, 596, 0 + setmetatile 13, 9, 587, 0 + setmetatile 14, 9, 588, 0 + setmetatile 13, 10, 595, 0 + setmetatile 14, 10, 596, 0 + setmetatile 13, 15, 587, 0 + setmetatile 14, 15, 588, 0 + setmetatile 13, 16, 595, 0 + setmetatile 14, 16, 596, 0 + setmetatile 3, 13, 589, 1 + setmetatile 3, 14, 597, 0 + setmetatile 6, 7, 589, 1 + setmetatile 6, 8, 597, 0 + setmetatile 9, 16, 589, 1 + setmetatile 9, 17, 597, 0 + setmetatile 12, 4, 589, 1 + setmetatile 12, 5, 597, 0 + setmetatile 12, 10, 589, 1 + setmetatile 12, 11, 597, 0 + setmetatile 1, 15, 568, 0 + setmetatile 2, 15, 569, 0 + setmetatile 1, 16, 576, 1 + setmetatile 2, 16, 577, 1 + setmetatile 4, 6, 568, 0 + setmetatile 5, 6, 569, 0 + setmetatile 4, 7, 576, 1 + setmetatile 5, 7, 577, 1 + setmetatile 7, 12, 568, 0 + setmetatile 8, 12, 569, 0 + setmetatile 7, 13, 576, 1 + setmetatile 8, 13, 577, 1 + setmetatile 10, 12, 568, 0 + setmetatile 11, 12, 569, 0 + setmetatile 10, 13, 576, 1 + setmetatile 11, 13, 577, 1 + setmetatile 10, 18, 568, 0 + setmetatile 11, 18, 569, 0 + setmetatile 10, 19, 576, 1 + setmetatile 11, 19, 577, 1 + setmetatile 3, 4, 570, 1 + setmetatile 3, 5, 578, 1 + setmetatile 6, 10, 570, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 13, 570, 1 + setmetatile 6, 14, 578, 1 + setmetatile 6, 16, 570, 1 + setmetatile 6, 17, 578, 1 + setmetatile 9, 4, 570, 1 + setmetatile 9, 5, 578, 1 + setmetatile 9, 7, 570, 1 + setmetatile 9, 8, 578, 1 + setmetatile 12, 13, 570, 1 + setmetatile 12, 14, 578, 1 + setmetatile 12, 16, 570, 1 + setmetatile 12, 17, 578, 1 + return + +Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 + setmetatile 1, 6, 571, 0 + setmetatile 2, 6, 572, 0 + setmetatile 1, 7, 579, 1 + setmetatile 2, 7, 580, 1 + setmetatile 4, 9, 571, 0 + setmetatile 5, 9, 572, 0 + setmetatile 4, 10, 579, 1 + setmetatile 5, 10, 580, 1 + setmetatile 4, 18, 571, 0 + setmetatile 5, 18, 572, 0 + setmetatile 4, 19, 579, 1 + setmetatile 5, 19, 580, 1 + setmetatile 7, 3, 571, 0 + setmetatile 8, 3, 572, 0 + setmetatile 7, 4, 579, 1 + setmetatile 8, 4, 580, 1 + setmetatile 7, 9, 571, 0 + setmetatile 8, 9, 572, 0 + setmetatile 7, 10, 579, 1 + setmetatile 8, 10, 580, 1 + setmetatile 7, 18, 571, 0 + setmetatile 8, 18, 572, 0 + setmetatile 7, 19, 579, 1 + setmetatile 8, 19, 580, 1 + setmetatile 13, 3, 571, 0 + setmetatile 14, 3, 572, 0 + setmetatile 13, 4, 579, 1 + setmetatile 14, 4, 580, 1 + setmetatile 13, 9, 571, 0 + setmetatile 14, 9, 572, 0 + setmetatile 13, 10, 579, 1 + setmetatile 14, 10, 580, 1 + setmetatile 13, 15, 571, 0 + setmetatile 14, 15, 572, 0 + setmetatile 13, 16, 579, 1 + setmetatile 14, 16, 580, 1 + setmetatile 3, 13, 573, 1 + setmetatile 3, 14, 581, 1 + setmetatile 6, 7, 573, 1 + setmetatile 6, 8, 581, 1 + setmetatile 9, 16, 573, 1 + setmetatile 9, 17, 581, 1 + setmetatile 12, 4, 573, 1 + setmetatile 12, 5, 581, 1 + setmetatile 12, 10, 573, 1 + setmetatile 12, 11, 581, 1 + setmetatile 1, 15, 584, 0 + setmetatile 2, 15, 585, 0 + setmetatile 1, 16, 592, 0 + setmetatile 2, 16, 593, 0 + setmetatile 4, 6, 584, 0 + setmetatile 5, 6, 585, 0 + setmetatile 4, 7, 592, 0 + setmetatile 5, 7, 593, 0 + setmetatile 7, 12, 584, 0 + setmetatile 8, 12, 585, 0 + setmetatile 7, 13, 592, 0 + setmetatile 8, 13, 593, 0 + setmetatile 10, 12, 584, 0 + setmetatile 11, 12, 585, 0 + setmetatile 10, 13, 592, 0 + setmetatile 11, 13, 593, 0 + setmetatile 10, 18, 584, 0 + setmetatile 11, 18, 585, 0 + setmetatile 10, 19, 592, 0 + setmetatile 11, 19, 593, 0 + setmetatile 3, 4, 586, 1 + setmetatile 3, 5, 594, 0 + setmetatile 6, 10, 586, 1 + setmetatile 6, 11, 594, 0 + setmetatile 6, 13, 586, 1 + setmetatile 6, 14, 594, 0 + setmetatile 6, 16, 586, 1 + setmetatile 6, 17, 594, 0 + setmetatile 9, 4, 586, 1 + setmetatile 9, 5, 594, 0 + setmetatile 9, 7, 586, 1 + setmetatile 9, 8, 594, 0 + setmetatile 12, 13, 586, 1 + setmetatile 12, 14, 594, 0 + setmetatile 12, 16, 586, 1 + setmetatile 12, 17, 594, 0 + return + +Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB + lockall + setvar VAR_TEMP_8, 1 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 + lockall + setvar VAR_TEMP_8, 2 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 + lockall + setvar VAR_TEMP_8, 3 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF + lockall + setvar VAR_TEMP_8, 4 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB + lockall + setvar VAR_TEMP_8, 5 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 + lockall + setvar VAR_TEMP_8, 6 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 + lockall + setvar VAR_TEMP_8, 7 + goto Route110_TrickHousePuzzle3_EventScript_1625FF + end + +Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF + call Route110_TrickHousePuzzle3_EventScript_162612 + playse SE_PIN + call Route110_TrickHousePuzzle3_EventScript_161F12 + goto Route110_TrickHousePuzzle3_EventScript_1626AD + end + +Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162683 + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162689 + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle3_EventScript_16268F + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162695 + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_16269B + compare VAR_TEMP_8, 6 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A1 + compare VAR_TEMP_8, 7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A7 + return + +Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 + setvar VAR_TEMP_1, 1 + return + +Route110_TrickHousePuzzle3_EventScript_162689:: @ 8162689 + setvar VAR_TEMP_2, 1 + return + +Route110_TrickHousePuzzle3_EventScript_16268F:: @ 816268F + setvar VAR_TEMP_3, 1 + return + +Route110_TrickHousePuzzle3_EventScript_162695:: @ 8162695 + setvar VAR_TEMP_4, 1 + return + +Route110_TrickHousePuzzle3_EventScript_16269B:: @ 816269B + setvar VAR_TEMP_5, 1 + return + +Route110_TrickHousePuzzle3_EventScript_1626A1:: @ 81626A1 + setvar VAR_TEMP_6, 1 + return + +Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 + setvar VAR_TEMP_7, 1 + return + +Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 + compare VAR_TEMP_9, 0 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 + special DrawWholeMapView + compare VAR_TEMP_9, 1 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD + compare VAR_TEMP_9, 0 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 + end + +Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD + setvar VAR_TEMP_9, 0 + releaseall + end + +Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 + setvar VAR_TEMP_9, 1 + releaseall + end + +Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB + lockall + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD + goto Route110_TrickHousePuzzle3_EventScript_161892 + end + +Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 + goto Route110_TrickHousePuzzle3_EventScript_16189C + end + +Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 + trainerbattle 0, OPPONENT_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 + end + +Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F + trainerbattle 0, OPPONENT_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 + end + +Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 + trainerbattle 0, OPPONENT_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle3/text.inc b/data/maps/Route110_TrickHousePuzzle3/text.inc new file mode 100644 index 000000000..01287a068 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/text.inc @@ -0,0 +1,41 @@ +Route110_TrickHousePuzzle3_Text_19CF76:: @ 819CF76 + .string "I keep coming back to this same place!$" + +Route110_TrickHousePuzzle3_Text_19CF9D:: @ 819CF9D + .string "I’m already having trouble, and then\n" + .string "you have to beat me? It’s not fair!$" + +Route110_TrickHousePuzzle3_Text_19CFE6:: @ 819CFE6 + .string "It’s full of doors here!\n" + .string "It’s too small and dark in here! Help!$" + +Route110_TrickHousePuzzle3_Text_19D026:: @ 819D026 + .string "I don’t know what’s going on here.\n" + .string "I’m starting to feel sad...$" + +Route110_TrickHousePuzzle3_Text_19D065:: @ 819D065 + .string "You... You’re awful!$" + +Route110_TrickHousePuzzle3_Text_19D07A:: @ 819D07A + .string "I know I’m weak!\n" + .string "And, I have no sense of direction!$" + +Route110_TrickHousePuzzle3_Text_19D0AE:: @ 819D0AE + .string "I don’t get it. What would anyone want\n" + .string "with a house this bizarre?$" + +Route110_TrickHousePuzzle3_Text_19D0F0:: @ 819D0F0 + .string "I don’t get it.\n" + .string "How did I lose?$" + +Route110_TrickHousePuzzle3_Text_19D110:: @ 819D110 + .string "I don’t get it.\n" + .string "How many traps are in this house?\p" + .string "You may be the one to solve that.$" + +UnknownString_819D164: @ 819D164 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is cool.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/maps/Route110_TrickHousePuzzle4/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle4/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 4d7189920..4d7189920 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index f4117a578..b06a1404f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 - .4byte Route110_TrickHousePuzzle4_MapAttributes + .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 251 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/maps/Route110_TrickHousePuzzle4/map.bin deleted file mode 100644 index e0b8cf33f..000000000 --- a/data/maps/Route110_TrickHousePuzzle4/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o -w6 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc new file mode 100644 index 000000000..3808f1f2d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -0,0 +1,29 @@ +Route110_TrickHousePuzzle4_MapScripts:: @ 816274D + .byte 0 + +Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E + lockall + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 + goto Route110_TrickHousePuzzle4_EventScript_161892 + end + +Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 + goto Route110_TrickHousePuzzle4_EventScript_16189C + end + +Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B + trainerbattle 0, OPPONENT_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 + end + +Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 + trainerbattle 0, OPPONENT_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 + end + +Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 + trainerbattle 0, OPPONENT_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle4/text.inc b/data/maps/Route110_TrickHousePuzzle4/text.inc new file mode 100644 index 000000000..293e5ab93 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/text.inc @@ -0,0 +1,40 @@ +Route110_TrickHousePuzzle4_Text_19D1DE:: @ 819D1DE + .string "It’s too much bother to think this out.\n" + .string "I only wanted to battle!$" + +Route110_TrickHousePuzzle4_Text_19D21F:: @ 819D21F + .string "Even though I lost, I still like battling\n" + .string "the best!$" + +Route110_TrickHousePuzzle4_Text_19D253:: @ 819D253 + .string "Wouldn’t you agree? You would go\n" + .string "anywhere if TRAINERS were there.$" + +Route110_TrickHousePuzzle4_Text_19D295:: @ 819D295 + .string "Heh! Boulders like this, I can brush\n" + .string "aside with one finger!$" + +Route110_TrickHousePuzzle4_Text_19D2D1:: @ 819D2D1 + .string "I can push boulders, but I can’t solve\n" + .string "the puzzle...$" + +Route110_TrickHousePuzzle4_Text_19D306:: @ 819D306 + .string "It’s not good enough to be brawny...\n" + .string "You have to use your head. Be brainy!$" + +Route110_TrickHousePuzzle4_Text_19D351:: @ 819D351 + .string "The TRICK HOUSE is getting trickier,\n" + .string "isn’t it?$" + +Route110_TrickHousePuzzle4_Text_19D380:: @ 819D380 + .string "Aaak!$" + +Route110_TrickHousePuzzle4_Text_19D386:: @ 819D386 + .string "Has anyone made it to the end?$" + +UnknownString_819D3A5: @ 819D3A5 + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is a genius.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/maps/Route110_TrickHousePuzzle5/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle5/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 66884fc3d..66884fc3d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 7216f556e..dc42453f4 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5:: @ 8307E10 - .4byte Route110_TrickHousePuzzle5_MapAttributes + .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 252 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/maps/Route110_TrickHousePuzzle5/map.bin deleted file mode 100644 index a64ea34b6..000000000 --- a/data/maps/Route110_TrickHousePuzzle5/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o -w6 hhhhh22222hh222hhh2222222222hhhh22222222222hhh222222hh2222hhh2222hhhhh2222hh2222hhhhh2222hh222hhhhh22222hhhhhhhhh22222hhhhhhhh222222hhhhhhhh222222hhhhhhhh222222hhhhhhhhh2222hhhhhhhhhhh222hhhhhhhhhhhhh22hhhhhhhhhhhhhh2hhhhhhhhhhhhh222hhhhhhhhhhh22222hhhhh2222222222hhhhh22hhh22222hhhhh22hhhh222hhhhhh
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc new file mode 100644 index 000000000..a7f283b2d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -0,0 +1,725 @@ +Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 + map_script 3, Route110_TrickHousePuzzle5_MapScript1_1627B6 + .byte 0 + +Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 + end + +Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 + lockall + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 + goto Route110_TrickHousePuzzle5_EventScript_161892 + end + +Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 + goto Route110_TrickHousePuzzle5_EventScript_16189C + end + +Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 + lockall + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 + compare VAR_TEMP_1, 1 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_16293F + end + +Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 + lockall + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 + compare VAR_TEMP_2, 1 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 + end + +Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 + lockall + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 + compare VAR_TEMP_3, 1 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_162A27 + end + +Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 + lockall + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 + compare VAR_TEMP_4, 1 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_162A9B + end + +Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 + lockall + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 + compare VAR_TEMP_5, 1 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_162B0F + end + +Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_16293F + end + +Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_16293F + end + +Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_16293F + end + +Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB + lockall + setvar VAR_TEMP_9, 3 + goto Route110_TrickHousePuzzle5_EventScript_16293F + end + +Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 + end + +Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 + end + +Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_162A27 + end + +Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_162A27 + end + +Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_162A27 + end + +Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_162A9B + end + +Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_162A9B + end + +Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B + lockall + setvar VAR_TEMP_9, 0 + goto Route110_TrickHousePuzzle5_EventScript_162B0F + end + +Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 + lockall + setvar VAR_TEMP_9, 1 + goto Route110_TrickHousePuzzle5_EventScript_162B0F + end + +Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 + lockall + setvar VAR_TEMP_9, 2 + goto Route110_TrickHousePuzzle5_EventScript_162B0F + end + +Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 + playse SE_PIN + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 + compare VAR_TEMP_9, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B + compare VAR_TEMP_9, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 + msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 + random 3 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162B83 + case 1, Route110_TrickHousePuzzle5_EventScript_162BA6 + case 2, Route110_TrickHousePuzzle5_EventScript_162BC9 + end + +Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 + playse SE_PIN + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B + compare VAR_TEMP_9, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 + compare VAR_TEMP_9, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B + msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 + random 3 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162BEC + case 1, Route110_TrickHousePuzzle5_EventScript_162C0F + case 2, Route110_TrickHousePuzzle5_EventScript_162C32 + end + +Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 + playse SE_PIN + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 + compare VAR_TEMP_9, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B + compare VAR_TEMP_9, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 + msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 + random 3 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162C55 + case 1, Route110_TrickHousePuzzle5_EventScript_162C78 + case 2, Route110_TrickHousePuzzle5_EventScript_162C9B + end + +Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 + playse SE_PIN + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 + compare VAR_TEMP_9, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B + compare VAR_TEMP_9, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 + msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 + random 3 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162CBE + case 1, Route110_TrickHousePuzzle5_EventScript_162CE1 + case 2, Route110_TrickHousePuzzle5_EventScript_162D04 + end + +Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 + playse SE_PIN + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 + compare VAR_TEMP_9, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B + compare VAR_TEMP_9, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 + compare VAR_TEMP_9, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B + msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 + random 3 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162D27 + case 1, Route110_TrickHousePuzzle5_EventScript_162D4A + case 2, Route110_TrickHousePuzzle5_EventScript_162D6D + end + +Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83 + msgbox Route110_TrickHousePuzzle5_Text_19D4AE, 4 + multichoice 0, 0, 25, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 + msgbox Route110_TrickHousePuzzle5_Text_19D501, 4 + multichoice 0, 0, 26, 1 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 + msgbox Route110_TrickHousePuzzle5_Text_19D553, 4 + multichoice 0, 0, 27, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC + msgbox Route110_TrickHousePuzzle5_Text_19D68E, 4 + multichoice 0, 0, 28, 1 + switch RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F + msgbox Route110_TrickHousePuzzle5_Text_19D6EC, 4 + multichoice 0, 0, 29, 1 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 + msgbox Route110_TrickHousePuzzle5_Text_19D745, 4 + multichoice 0, 0, 30, 1 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 + msgbox Route110_TrickHousePuzzle5_Text_19D81B, 4 + multichoice 0, 0, 31, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 + msgbox Route110_TrickHousePuzzle5_Text_19D865, 4 + multichoice 0, 0, 32, 1 + switch RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B + msgbox Route110_TrickHousePuzzle5_Text_19D8BA, 4 + multichoice 0, 0, 33, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE + msgbox Route110_TrickHousePuzzle5_Text_19D987, 4 + multichoice 0, 0, 34, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 + msgbox Route110_TrickHousePuzzle5_Text_19D9DC, 4 + multichoice 0, 0, 35, 1 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 + msgbox Route110_TrickHousePuzzle5_Text_19DA1D, 4 + multichoice 0, 0, 36, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 + msgbox Route110_TrickHousePuzzle5_Text_19DAEF, 4 + multichoice 0, 0, 37, 1 + switch RESULT + case 1, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A + msgbox Route110_TrickHousePuzzle5_Text_19DB43, 4 + multichoice 0, 0, 38, 1 + switch RESULT + case 0, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D + msgbox Route110_TrickHousePuzzle5_Text_19DB97, 4 + multichoice 0, 0, 39, 1 + switch RESULT + case 2, Route110_TrickHousePuzzle5_EventScript_162DDF + goto Route110_TrickHousePuzzle5_EventScript_162D90 + end + +Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 + waitse + playse SE_HAZURE + msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F + msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4 + waitmovement 0 + closemessage + msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 + closemessage + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 + waitstate + releaseall + end + +Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF + waitse + playse SE_SEIKAI + goto Route110_TrickHousePuzzle5_EventScript_162DE9 + end + +Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 + msgbox Route110_TrickHousePuzzle5_Text_19D599, 4 + releaseall + end + +Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43 + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59 + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64 + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F + return + +Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85 + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90 + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6 + return + +Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1 + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7 + compare VAR_TEMP_9, 4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2 + compare VAR_TEMP_9, 5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD + return + +Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8 + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3 + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163009 + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163014 + return + +Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163035 + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163040 + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B + return + +Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B + compare VAR_TEMP_8, 1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163056 + compare VAR_TEMP_8, 2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163061 + compare VAR_TEMP_8, 3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C + compare VAR_TEMP_8, 4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163077 + compare VAR_TEMP_8, 5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163082 + return + +Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F4E:: @ 8162F4E + applymovement 2, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F59:: @ 8162F59 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F64:: @ 8162F64 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F6F:: @ 8162F6F + applymovement 5, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F7A:: @ 8162F7A + applymovement 1, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F85:: @ 8162F85 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F90:: @ 8162F90 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162F9B:: @ 8162F9B + applymovement 4, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FA6:: @ 8162FA6 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FB1:: @ 8162FB1 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FBC:: @ 8162FBC + applymovement 2, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FC7:: @ 8162FC7 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FD2:: @ 8162FD2 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FDD:: @ 8162FDD + applymovement 5, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FE8:: @ 8162FE8 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FF3:: @ 8162FF3 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_162FFE:: @ 8162FFE + applymovement 3, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163009:: @ 8163009 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163014:: @ 8163014 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_16301F:: @ 816301F + applymovement 1, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_16302A:: @ 816302A + applymovement 2, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163035:: @ 8163035 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163040:: @ 8163040 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_16304B:: @ 816304B + applymovement 5, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163056:: @ 8163056 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163061:: @ 8163061 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_16306C:: @ 816306C + applymovement 3, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163077:: @ 8163077 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 + return + +Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 + return + +Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D + walk_left + end_movement + +Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F + walk_left + walk_left + end_movement + +Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092 + walk_left + walk_left + walk_left + end_movement + +Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096 + walk_right + end_movement + +Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098 + walk_right + walk_right + end_movement + +Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B + walk_right + walk_right + walk_right + end_movement + +Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F +Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_down + end_movement diff --git a/data/maps/Route110_TrickHousePuzzle5/text.inc b/data/maps/Route110_TrickHousePuzzle5/text.inc new file mode 100644 index 000000000..8cddc3f65 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/text.inc @@ -0,0 +1,141 @@ +Route110_TrickHousePuzzle5_Text_19D423:: @ 819D423 + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 1 AM I!\p" + .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" + .string "THEN YOU WILL GO TO MECHADOLL 5.\l" + .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" + +Route110_TrickHousePuzzle5_Text_19D4AE:: @ 819D4AE + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON is not found\n" + .string "on ROUTE 103. Which one is it?$" + +Route110_TrickHousePuzzle5_Text_19D501:: @ 819D501 + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON is not of the\n" + .string "GRASS type. Which one is it?$" + +Route110_TrickHousePuzzle5_Text_19D553:: @ 819D553 + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON uses SCRATCH.\n" + .string "Which one is it?$" + +Route110_TrickHousePuzzle5_Text_19D599:: @ 819D599 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +Route110_TrickHousePuzzle5_Text_19D5CF:: @ 819D5CF + .string "BZZZT. DISAPPOINTMENT.\n" + .string "ERROR.$" + +Route110_TrickHousePuzzle5_Text_19D5ED:: @ 819D5ED + .string "WAHAHAHAHA! WAHAHAHAHA!\n" + .string "CLICKETY-CLACK!$" + +Route110_TrickHousePuzzle5_Text_19D615:: @ 819D615 + .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" + +Route110_TrickHousePuzzle5_Text_19D636:: @ 819D636 + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 2 AM I!\p" + .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" + .string "IS SET TOO LOW.$" + +Route110_TrickHousePuzzle5_Text_19D68E:: @ 819D68E + .string "MECHADOLL 2 QUIZ.\p" + .string "In PROF. BIRCH’s bag, there were three\n" + .string "POKéMON. Which one was at the right?$" + +Route110_TrickHousePuzzle5_Text_19D6EC:: @ 819D6EC + .string "MECHADOLL 2 QUIZ.\p" + .string "Which POKéMON was offered for a trade\n" + .string "at the POKéMON TRAINER’S SCHOOL?$" + +Route110_TrickHousePuzzle5_Text_19D745:: @ 819D745 + .string "MECHADOLL 2 QUIZ.\p" + .string "The DEVON RESEARCHER was looking for\n" + .string "what POKéMON in PETALBURG WOODS?$" + +UnknownString_819D79D: @ 819D79D + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +Route110_TrickHousePuzzle5_Text_19D7D3:: @ 819D7D3 + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 3 AM I!\p" + .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" + +Route110_TrickHousePuzzle5_Text_19D81B:: @ 819D81B + .string "MECHADOLL 3 QUIZ.\p" + .string "Which costs more?\n" + .string "Three POKé BALLS or one SUPER POTION?$" + +Route110_TrickHousePuzzle5_Text_19D865:: @ 819D865 + .string "MECHADOLL 3 QUIZ.\p" + .string "Sell one ESCAPE ROPE and buy\n" + .string "one ANTIDOTE. How much money remains?$" + +Route110_TrickHousePuzzle5_Text_19D8BA:: @ 819D8BA + .string "MECHADOLL 3 QUIZ.\p" + .string "Do one FULL HEAL and GREAT BALL\n" + .string "cost more than one REVIVE?$" + +UnknownString_819D907: @ 819D907 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +Route110_TrickHousePuzzle5_Text_19D93D:: @ 819D93D + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 4 THAT IS ME!\p" + .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" + +Route110_TrickHousePuzzle5_Text_19D987:: @ 819D987 + .string "MECHADOLL 4 QUIZ.\p" + .string "RUSTBORO GYM LEADER ROXANNE used a\n" + .string "GEODUDE. Was it male or female?$" + +Route110_TrickHousePuzzle5_Text_19D9DC:: @ 819D9DC + .string "MECHADOLL 4 QUIZ.\p" + .string "In DEWFORD HALL, were there more men\n" + .string "or women?$" + +Route110_TrickHousePuzzle5_Text_19DA1D:: @ 819DA1D + .string "MECHADOLL 4 QUIZ.\p" + .string "The first TRAINER in DEWFORD GYM was\n" + .string "male or female?$" + +UnknownString_819DA64: @ 819DA64 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +Route110_TrickHousePuzzle5_Text_19DA9A:: @ 819DA9A + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 5 AM I!\p" + .string "THE MASTER’S BEST AND PROUDEST\n" + .string "ACHIEVEMENT AM I.$" + +Route110_TrickHousePuzzle5_Text_19DAEF:: @ 819DAEF + .string "MECHADOLL 5 QUIZ.\p" + .string "How many BIKES does RYDEL have on\n" + .string "display outside his cycle shop?$" + +Route110_TrickHousePuzzle5_Text_19DB43:: @ 819DB43 + .string "MECHADOLL 5 QUIZ.\p" + .string "How many people give you BERRIES at the\n" + .string "PRETTY PETAL flower shop?$" + +Route110_TrickHousePuzzle5_Text_19DB97:: @ 819DB97 + .string "MECHADOLL 5 QUIZ.\p" + .string "How many signs are there in\n" + .string "LILYCOVE CITY?$" + +UnknownString_819DBD4: @ 819DBD4 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +UnknownString_819DC0A: @ 819DC0A + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is my life.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/maps/Route110_TrickHousePuzzle6/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle6/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 6ac299c5f..6ac299c5f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 5ffc844bd..3377987da 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle6:: @ 8307E2C - .4byte Route110_TrickHousePuzzle6_MapAttributes + .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 253 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/maps/Route110_TrickHousePuzzle6/map.bin deleted file mode 100644 index ec8447889..000000000 --- a/data/maps/Route110_TrickHousePuzzle6/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o -w6 222222222222222222222222222222222222222222222222222222222222222222222222622222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc new file mode 100644 index 000000000..971d2a275 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -0,0 +1,43 @@ +Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD + map_script 3, Route110_TrickHousePuzzle6_MapScript1_1630D8 + map_script 4, Route110_TrickHousePuzzle6_MapScript2_1630DC + .byte 0 + +Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 + special RotatingGate_InitPuzzle + end + +Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 + .2byte 0 + +Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 + special RotatingGate_InitPuzzleAndGraphics + end + +Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA + lockall + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC + goto Route110_TrickHousePuzzle6_EventScript_161892 + end + +Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 + goto Route110_TrickHousePuzzle6_EventScript_16189C + end + +Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 + trainerbattle 0, OPPONENT_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 + end + +Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E + trainerbattle 0, OPPONENT_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 + end + +Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 + trainerbattle 0, OPPONENT_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle6/text.inc b/data/maps/Route110_TrickHousePuzzle6/text.inc new file mode 100644 index 000000000..7fb5aa914 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/text.inc @@ -0,0 +1,42 @@ +Route110_TrickHousePuzzle6_Text_19DC87:: @ 819DC87 + .string "When I heard there was a strange\n" + .string "house, I had to check it out.$" + +Route110_TrickHousePuzzle6_Text_19DCC6:: @ 819DCC6 + .string "I’ve discovered a tough TRAINER!$" + +Route110_TrickHousePuzzle6_Text_19DCE7:: @ 819DCE7 + .string "I’m sure having a good time checking\n" + .string "this place out.\p" + .string "It’s a challenge I’ve found worth\n" + .string "repeating!$" + +Route110_TrickHousePuzzle6_Text_19DD49:: @ 819DD49 + .string "Maybe I could get my BIRD POKéMON\n" + .string "to fly over the wall...$" + +Route110_TrickHousePuzzle6_Text_19DD83:: @ 819DD83 + .string "Gwaaah! I blew it!$" + +Route110_TrickHousePuzzle6_Text_19DD96:: @ 819DD96 + .string "Ehehehe... I guess I lost because I\n" + .string "was trying to cheat.$" + +Route110_TrickHousePuzzle6_Text_19DDCF:: @ 819DDCF + .string "I’m getting dizzy from these rotating\n" + .string "doors...$" + +Route110_TrickHousePuzzle6_Text_19DDFE:: @ 819DDFE + .string "Everything’s spinning around and\n" + .string "around. I can’t take this anymore...$" + +Route110_TrickHousePuzzle6_Text_19DE44:: @ 819DE44 + .string "You don’t seem to be affected at all.\n" + .string "Or do you have your poker face on?$" + +UnknownString_819DE8D: @ 819DE8D + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is huggable.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/maps/Route110_TrickHousePuzzle7/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle7/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index d57546ce1..d57546ce1 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index cea170daa..84014fdb5 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle7:: @ 8307E48 - .4byte Route110_TrickHousePuzzle7_MapAttributes + .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 254 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/maps/Route110_TrickHousePuzzle7/map.bin deleted file mode 100644 index 5859601f6..000000000 --- a/data/maps/Route110_TrickHousePuzzle7/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o -w6 222222g2F262222222g2e22g222e22d2f22222g2>62g22`222f222f2g22g22>6f22zW2V2W2W2W2W2V2[2W2W2{2[2V2t2uBnB]nBnBmBmB\mBuByBuBnBnBnBnBp^2pNNp^2}OpO}}}px2v2x2N2N2x2v22O2x2O2222x2d2f22f2f2d2f2g22>g222222f2d2f2f2f2g222g2d22222>2e2f2f2g222g2c2e2e2e2e2e2f2f2f2g2e2e2e2e2e2e2e2e2e2a2f2f2f2g22222d2d2d2d2g2f2e2f2f2f2g22g2e2e2e2e2e2g22e2f2f2f2f2g22g2g2e2e2e22g22>6f2f222g222g22222g222c2f222g222e2e2e2e2e22g2f2222G222e22e2e2e2e2e2e2f222222e2e2222g2222f22222e2e22222d2d2d2d2f2
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc new file mode 100644 index 000000000..1ee608166 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -0,0 +1,234 @@ +Route110_TrickHousePuzzle7_MapScripts:: @ 816314C + map_script 5, Route110_TrickHousePuzzle7_MapScript1_163161 + map_script 3, Route110_TrickHousePuzzle7_MapScript1_163253 + map_script 1, Route110_TrickHousePuzzle7_MapScript1_16326F + map_script 2, Route110_TrickHousePuzzle7_MapScript2_16327B + .byte 0 + +Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 + call Route110_TrickHousePuzzle7_EventScript_163167 + end + +Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 + return + +Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 + setmetatile 13, 17, 610, 0 + setmetatile 12, 16, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 + setmetatile 12, 13, 610, 0 + setmetatile 12, 11, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB + setmetatile 7, 12, 610, 0 + setmetatile 5, 10, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE + setmetatile 6, 6, 636, 0 + setmetatile 4, 4, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 + setmetatile 8, 4, 609, 0 + setmetatile 7, 5, 575, 1 + return + +Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 + setmetatile 13, 17, 611, 0 + setmetatile 12, 16, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 + setmetatile 12, 13, 609, 0 + setmetatile 12, 11, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A + setmetatile 7, 12, 611, 0 + setmetatile 5, 10, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D + setmetatile 6, 6, 635, 0 + setmetatile 4, 4, 574, 1 + return + +Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 + setmetatile 8, 4, 608, 0 + setmetatile 7, 5, 574, 1 + return + +Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 + end + +Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E + end + +Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 + call_if_eq Route110_TrickHousePuzzle7_EventScript_163167 + end + +Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_163285 + .2byte 0 + +Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 + end + +Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B + lockall + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D + goto Route110_TrickHousePuzzle7_EventScript_161892 + end + +Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 + goto Route110_TrickHousePuzzle7_EventScript_16189C + end + +Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 + lockall + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 + waitstate + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 + lockall + delay 32 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 + special DrawWholeMapView + playse SE_TK_KASYA + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 + end + +Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 + lockall + delay 32 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 + special DrawWholeMapView + playse SE_TK_KASYA + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 + end + +Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 + lockall + delay 32 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A + special DrawWholeMapView + playse SE_TK_KASYA + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD + end + +Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 + lockall + delay 32 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D + special DrawWholeMapView + playse SE_TK_KASYA + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 + end + +Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 + lockall + delay 32 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 + special DrawWholeMapView + playse SE_TK_KASYA + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 + end + +Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 + releaseall + end + +Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 + trainerbattle 0, OPPONENT_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 + end + +Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED + trainerbattle 0, OPPONENT_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 + end + +Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 + trainerbattle 0, OPPONENT_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle7/text.inc b/data/maps/Route110_TrickHousePuzzle7/text.inc new file mode 100644 index 000000000..e8ce4b3a4 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/text.inc @@ -0,0 +1,42 @@ +Route110_TrickHousePuzzle7_Text_19DF0B:: @ 819DF0B + .string "The TRICK MASTER always vanishes\n" + .string "like smoke. How does he do it?$" + +Route110_TrickHousePuzzle7_Text_19DF4B:: @ 819DF4B + .string "Aiyeeeh! You’re much too strong!\n" + .string "How do you do it?$" + +Route110_TrickHousePuzzle7_Text_19DF7E:: @ 819DF7E + .string "I wish I could appear and disappear as\n" + .string "if I were smoke, too.$" + +Route110_TrickHousePuzzle7_Text_19DFBB:: @ 819DFBB + .string "Going around the same spot...\n" + .string "It begets ill fortune...$" + +Route110_TrickHousePuzzle7_Text_19DFF2:: @ 819DFF2 + .string "Defeated!\n" + .string "It’s a bad sign...$" + +Route110_TrickHousePuzzle7_Text_19E00F:: @ 819E00F + .string "I’ve circled the same spot over ten\n" + .string "times now... It’s ill fortune...$" + +Route110_TrickHousePuzzle7_Text_19E054:: @ 819E054 + .string "Whoever wins will get through here\n" + .string "first. That’s the feeling I get.$" + +Route110_TrickHousePuzzle7_Text_19E098:: @ 819E098 + .string "Oh!\n" + .string "Well, go ahead, then!$" + +Route110_TrickHousePuzzle7_Text_19E0B2:: @ 819E0B2 + .string "You’re solving all the puzzles in the\n" + .string "TRICK HOUSE. That’s the feeling I get.$" + +UnknownString_819E0FF: @ 819E0FF + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER I love.”\n" + .string "... ... ... ... ... ... ... ...\p" + .string "The lock clicked open!$" diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/maps/Route110_TrickHousePuzzle8/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route110_TrickHousePuzzle8/border.bin +++ /dev/null diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 481b2d926..481b2d926 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 6a4dc7051..ede90bbe4 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle8:: @ 8307E64 - .4byte Route110_TrickHousePuzzle8_MapAttributes + .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 - .2byte BGM_KARAKURI + .2byte MUS_KARAKURI .2byte 255 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/maps/Route110_TrickHousePuzzle8/map.bin deleted file mode 100644 index d8c131da6..000000000 --- a/data/maps/Route110_TrickHousePuzzle8/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -o -w6 666666666666226k2k2k2k2k2k2k2k2k2k2k2l6k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2l6l6k2k2k2k2k2l6l6l6l6l6k2l6l6l6l6l6l6l6l6222266266226222666266666626662k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2l6k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2226666666666222222266666662222
\ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc new file mode 100644 index 000000000..2c55aae4c --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -0,0 +1,29 @@ +Route110_TrickHousePuzzle8_MapScripts:: @ 816341B + .byte 0 + +Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C + lockall + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 + goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E + goto Route110_TrickHousePuzzle8_EventScript_161892 + end + +Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 + goto Route110_TrickHousePuzzle8_EventScript_16189C + end + +Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 + trainerbattle 0, OPPONENT_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 + end + +Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 + trainerbattle 0, OPPONENT_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 + end + +Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 + trainerbattle 0, OPPONENT_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 + end diff --git a/data/maps/Route110_TrickHousePuzzle8/text.inc b/data/maps/Route110_TrickHousePuzzle8/text.inc new file mode 100644 index 000000000..8b0025bfb --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/text.inc @@ -0,0 +1,34 @@ +Route110_TrickHousePuzzle8_Text_19E178:: @ 819E178 + .string "Not many TRAINERS have made it\n" + .string "this far.$" + +Route110_TrickHousePuzzle8_Text_19E1A1:: @ 819E1A1 + .string "That must mean you’re tough, too...$" + +Route110_TrickHousePuzzle8_Text_19E1C5:: @ 819E1C5 + .string "You’ve beaten the POKéMON LEAGUE\n" + .string "CHAMPION? That’s too much!$" + +Route110_TrickHousePuzzle8_Text_19E201:: @ 819E201 + .string "Consider yourself lucky to be\n" + .string "battling me!$" + +Route110_TrickHousePuzzle8_Text_19E22C:: @ 819E22C + .string "This isn’t right!\n" + .string "I can’t lose!$" + +Route110_TrickHousePuzzle8_Text_19E24C:: @ 819E24C + .string "It’s a miracle that you beat me.\n" + .string "You can brag about it.$" + +Route110_TrickHousePuzzle8_Text_19E284:: @ 819E284 + .string "You’ve been slugging through the TRICK\n" + .string "HOUSE challenge, too.$" + +Route110_TrickHousePuzzle8_Text_19E2C1:: @ 819E2C1 + .string "I see...\n" + .string "You possess an extraordinary style.$" + +Route110_TrickHousePuzzle8_Text_19E2EE:: @ 819E2EE + .string "Seeing someone like you should please\n" + .string "the TRICK MASTER.$" diff --git a/data/maps/Route111/border.bin b/data/maps/Route111/border.bin Binary files differdeleted file mode 100644 index 4531975c7..000000000 --- a/data/maps/Route111/border.bin +++ /dev/null diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc index 837c17c39..837c17c39 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/Route111/events.inc diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 5af1fb1c2..3dd09e33b 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,9 +1,9 @@ Route111:: @ 8305720 - .4byte Route111_MapAttributes + .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 27 .byte 26 .byte 0 diff --git a/data/maps/Route111/map.bin b/data/maps/Route111/map.bin Binary files differdeleted file mode 100644 index 50fc935bd..000000000 --- a/data/maps/Route111/map.bin +++ /dev/null diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc new file mode 100644 index 000000000..e554de5f4 --- /dev/null +++ b/data/maps/Route111/scripts.inc @@ -0,0 +1,442 @@ +Route111_MapScripts:: @ 814FF91 + map_script 1, Route111_MapScript1_14FF9C + map_script 3, Route111_MapScript1_14FFB9 + .byte 0 + +Route111_MapScript1_14FF9C:: @ 814FF9C + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6 + end + +Route111_EventScript_14FFA6:: @ 814FFA6 + setmetatile 29, 86, 124, 1 + setmetatile 29, 87, 145, 1 + return + +Route111_MapScript1_14FFB9:: @ 814FFB9 + call Route111_EventScript_14FFCD + call Route111_EventScript_1AE313 + goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D + end + +Route111_EventScript_14FFCD:: @ 814FFCD + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 + goto_if_lt Route111_EventScript_15000C + compare VAR_TEMP_1, 107 + goto_if_gt Route111_EventScript_15000C + compare VAR_TEMP_1, 72 + goto_if_gt Route111_EventScript_150009 + compare VAR_TEMP_0, 2000 + goto_if_gt Route111_EventScript_15000C + compare VAR_TEMP_0, 8 + goto_if_lt Route111_EventScript_15000C + +Route111_EventScript_150009:: @ 8150009 + setweather WEATHER_SANDSTORM + +Route111_EventScript_15000C:: @ 815000C + return + +Route111_EventScript_15000D:: @ 815000D + clearflag FLAG_HIDE_VICTOR_WINSTRATE + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE + cleartrainerflag OPPONENT_VICTOR + cleartrainerflag OPPONENT_VICTORIA + cleartrainerflag OPPONENT_VIVI + end + +Route111_EventScript_150023:: @ 8150023 + lockall + msgbox Route111_Text_16FA54, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route111_EventScript_15005F + giveitem_std ITEM_ROOT_FOSSIL + closemessage + setflag FLAG_HIDE_ROOT_FOSSIL + setflag FLAG_HIDE_CLAW_FOSSIL + removeobject 34 + delay 30 + applymovement 35, Route111_Movement_1500AF + waitmovement 0 + removeobject 35 + releaseall + end + +Route111_EventScript_15005F:: @ 815005F + msgbox Route111_Text_16FACE, 4 + releaseall + end + +Route111_EventScript_150069:: @ 8150069 + lockall + msgbox Route111_Text_16FAED, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route111_EventScript_1500A5 + giveitem_std ITEM_CLAW_FOSSIL + closemessage + setflag FLAG_HIDE_CLAW_FOSSIL + setflag FLAG_HIDE_ROOT_FOSSIL + removeobject 35 + delay 30 + applymovement 34, Route111_Movement_1500AF + waitmovement 0 + removeobject 34 + releaseall + end + +Route111_EventScript_1500A5:: @ 81500A5 + msgbox Route111_Text_16FB67, 4 + releaseall + end + +Route111_Movement_1500AF:: @ 81500AF + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + end_movement + +Route111_EventScript_1500C5:: @ 81500C5 + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 + msgbox Route111_Text_1C56F0, 4 + giveitem_std ITEM_RAZZ_BERRY + compare RESULT, 0 + goto_if_eq Route111_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 + special GetPlayerBigGuyGirlString + msgbox Route111_Text_1C5781, 4 + release + end + +Route111_EventScript_150100:: @ 8150100 + msgbox Route111_Text_1C57D2, 4 + release + end + +@ 815010A + lockall + setvar VAR_SPECIAL_4, 0 + goto Route111_EventScript_15013A + end + +Route111_EventScript_150116:: @ 8150116 + lockall + setvar VAR_SPECIAL_4, 1 + goto Route111_EventScript_15013A + end + +Route111_EventScript_150122:: @ 8150122 + lockall + setvar VAR_SPECIAL_4, 2 + goto Route111_EventScript_15013A + end + +@ 815012E + lockall + setvar VAR_SPECIAL_4, 3 + goto Route111_EventScript_15013A + end + +Route111_EventScript_15013A:: @ 815013A + checkitem ITEM_GO_GOGGLES, 1 + compare RESULT, 0 + goto_if_eq Route111_EventScript_150151 + setvar VAR_TEMP_3, 1 + releaseall + end + +Route111_EventScript_150151:: @ 8150151 + msgbox Route111_Text_1A0F93, 4 + closemessage + compare VAR_SPECIAL_4, 0 + call_if_eq Route111_EventScript_150188 + compare VAR_SPECIAL_4, 1 + call_if_eq Route111_EventScript_150193 + compare VAR_SPECIAL_4, 2 + call_if_eq Route111_EventScript_15019E + compare VAR_SPECIAL_4, 3 + call_if_eq Route111_EventScript_1501A9 + releaseall + end + +Route111_EventScript_150188:: @ 8150188 + applymovement 255, Route111_Movement_1501B4 + waitmovement 0 + return + +Route111_EventScript_150193:: @ 8150193 + applymovement 255, Route111_Movement_1501B6 + waitmovement 0 + return + +Route111_EventScript_15019E:: @ 815019E + applymovement 255, Route111_Movement_1501B8 + waitmovement 0 + return + +Route111_EventScript_1501A9:: @ 81501A9 + applymovement 255, Route111_Movement_1501BA + waitmovement 0 + return + +Route111_Movement_1501B4:: @ 81501B4 + walk_up + end_movement + +Route111_Movement_1501B6:: @ 81501B6 + walk_down + end_movement + +Route111_Movement_1501B8:: @ 81501B8 + walk_left + end_movement + +Route111_Movement_1501BA:: @ 81501BA + walk_right + end_movement + +Route111_EventScript_1501BC:: @ 81501BC + setweather WEATHER_SUNNY + fadenewbgm MUS_DOORO_X1 + doweather + setvar VAR_TEMP_3, 0 + end + +Route111_EventScript_1501C9:: @ 81501C9 + setweather WEATHER_SANDSTORM + fadenewbgm MUS_ASHROAD + doweather + end + +Route111_EventScript_1501D1:: @ 81501D1 + lock + faceplayer + setflag FLAG_LANDMARK_WINSTRATE_FAMILY + msgbox Route111_Text_16F705, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route111_EventScript_1501F3 + msgbox Route111_Text_16F785, 4 + release + end + +Route111_EventScript_1501F3:: @ 81501F3 + msgbox Route111_Text_16F7B3, 4 + trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 + applymovement 1, Route111_Movement_1A0841 + waitmovement 0 + call Route111_EventScript_150348 + msgbox Route111_Text_16F7FF, 4 + closemessage + applymovement 1, Route111_Movement_150356 + waitmovement 0 + removeobject 1 + call Route111_EventScript_15034F + applymovement 255, Route111_Movement_15035B + waitmovement 0 + call Route111_EventScript_150348 + addobject 2 + applymovement 2, Route111_Movement_150359 + waitmovement 0 + call Route111_EventScript_15034F + msgbox Route111_Text_16F82D, 4 + trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 + applymovement 2, Route111_Movement_1A0841 + waitmovement 0 + call Route111_EventScript_150348 + msgbox Route111_Text_16F8D5, 4 + closemessage + applymovement 2, Route111_Movement_150356 + waitmovement 0 + removeobject 2 + call Route111_EventScript_15034F + applymovement 255, Route111_Movement_15035B + waitmovement 0 + call Route111_EventScript_150348 + addobject 3 + applymovement 3, Route111_Movement_150359 + waitmovement 0 + call Route111_EventScript_15034F + msgbox Route111_Text_16F90E, 4 + trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 + applymovement 3, Route111_Movement_1A0841 + waitmovement 0 + call Route111_EventScript_150348 + msgbox Route111_Text_16F96C, 4 + closemessage + applymovement 3, Route111_Movement_150356 + waitmovement 0 + removeobject 3 + call Route111_EventScript_15034F + applymovement 255, Route111_Movement_15035B + waitmovement 0 + call Route111_EventScript_150348 + addobject 4 + applymovement 4, Route111_Movement_150359 + waitmovement 0 + call Route111_EventScript_15034F + msgbox Route111_Text_16F991, 4 + trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC + msgbox Route111_Text_16FA22, 4 + closemessage + applymovement 4, Route111_Movement_1A0841 + waitmovement 0 + call Route111_EventScript_150348 + applymovement 4, Route111_Movement_150356 + waitmovement 0 + removeobject 4 + call Route111_EventScript_15034F + release + end + +Route111_EventScript_150348:: @ 8150348 + opendoor 13, 113 + waitdooranim + return + +Route111_EventScript_15034F:: @ 815034F + closedoor 13, 113 + waitdooranim + return + +Route111_Movement_150356:: @ 8150356 + walk_in_place_fastest_up + walk_up + end_movement + +Route111_Movement_150359:: @ 8150359 + walk_down + end_movement + +Route111_Movement_15035B:: @ 815035B + delay_16 + delay_16 + delay_16 + end_movement + +Route111_EventScript_15035F:: @ 815035F + msgbox Route111_Text_16FC9C, 3 + end + +Route111_EventScript_150368:: @ 8150368 + msgbox Route111_Text_16FCB6, 3 + end + +Route111_EventScript_150371:: @ 8150371 + msgbox Route111_Text_16FCEF, 3 + end + +Route111_EventScript_15037A:: @ 815037A + msgbox Route111_Text_16FD05, 3 + end + +Route111_EventScript_150383:: @ 8150383 + msgbox Route111_Text_16FD1B, 3 + end + +Route111_EventScript_15038C:: @ 815038C + msgbox Route111_Text_16FD55, 3 + end + +Route111_EventScript_150395:: @ 8150395 + msgbox Route111_Text_16FB86, 2 + end + +Route111_EventScript_15039E:: @ 815039E + msgbox Route111_Text_16FC3A, 2 + end + +Route111_EventScript_1503A7:: @ 81503A7 + trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + msgbox Route111_Text_1BAC10, 6 + end + +Route111_EventScript_1503BE:: @ 81503BE + trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + msgbox Route111_Text_1BACD8, 6 + end + +Route111_EventScript_1503D5:: @ 81503D5 + trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + msgbox Route111_Text_1BADC2, 6 + end + +Route111_EventScript_1503EC:: @ 81503EC + trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + msgbox Route111_Text_1BAE81, 6 + end + +Route111_EventScript_150403:: @ 8150403 + trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route111_EventScript_15042A + msgbox Route111_Text_1BAF5B, 6 + end + +Route111_EventScript_15042A:: @ 815042A + trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + msgbox Route111_Text_1BB070, 6 + end + +Route111_EventScript_150441:: @ 8150441 + trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 + msgbox Route111_Text_1BB15B, 6 + end + +Route111_EventScript_150458:: @ 8150458 + trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + msgbox Route111_Text_1BB1F6, 6 + end + +Route111_EventScript_15046F:: @ 815046F + trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E + msgbox Route111_Text_1BB290, 6 + end + +Route111_EventScript_150486:: @ 8150486 + trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route111_EventScript_1504AD + msgbox Route111_Text_1BB33E, 6 + end + +Route111_EventScript_1504AD:: @ 81504AD + trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + msgbox Route111_Text_1BB40E, 6 + end + +Route111_EventScript_1504C4:: @ 81504C4 + trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route111_EventScript_1504EB + msgbox Route111_Text_1BB4CE, 6 + end + +Route111_EventScript_1504EB:: @ 81504EB + trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + msgbox Route111_Text_1BB5C1, 6 + end diff --git a/data/maps/Route111/text.inc b/data/maps/Route111/text.inc new file mode 100644 index 000000000..24bcc1008 --- /dev/null +++ b/data/maps/Route111/text.inc @@ -0,0 +1,119 @@ +Route111_Text_16F705:: @ 816F705 + .string "Hello! I take it you’re a traveler.\p" + .string "How’s this? What do you say to taking\n" + .string "on our family of four in a series of\l" + .string "POKéMON battles?$" + +Route111_Text_16F785:: @ 816F785 + .string "Is that so?\n" + .string "Drop in, if you change your mind!$" + +Route111_Text_16F7B3:: @ 816F7B3 + .string "That’s the spirit! I like you!$" + +Route111_Text_16F7D2:: @ 816F7D2 + .string "Aiyah!\n" + .string "You’re a lot tougher than I expected!$" + +Route111_Text_16F7FF:: @ 816F7FF + .string "Hey, all!\n" + .string "I’ve found a pretty strong TRAINER!$" + +Route111_Text_16F82D:: @ 816F82D + .string "Oh, my goodness! Aren’t you young?\p" + .string "You must be quite the TRAINER to beat\n" + .string "my husband, though.\p" + .string "It’s my turn to battle now!$" + +Route111_Text_16F8A6:: @ 816F8A6 + .string "Oh, gosh!\n" + .string "I can’t get over how strong you are!$" + +Route111_Text_16F8D5:: @ 816F8D5 + .string "There’s a strong TRAINER here!\n" + .string "This one’s really strong!$" + +Route111_Text_16F90E:: @ 816F90E + .string "You’re stronger than Mommy? Wow!\p" + .string "But I’m strong, too!\n" + .string "Really! Honestly!$" + +Route111_Text_16F956:: @ 816F956 + .string "Huh? Did I just lose?$" + +Route111_Text_16F96C:: @ 816F96C + .string "This stinks...\p" + .string "...Snivel... Grandma!$" + +Route111_Text_16F991:: @ 816F991 + .string "How dare you make my granddaughter\n" + .string "cry!\p" + .string "For that, I’m going to smack you!\n" + .string "Prepare to lose!$" + +Route111_Text_16F9EC:: @ 816F9EC + .string "Kwah! You are strong...\n" + .string "My granddaughter was right...$" + +Route111_Text_16FA22:: @ 816FA22 + .string "If you’re not in any hurry, visit with\n" + .string "us awhile.$" + +Route111_Text_16FA54:: @ 816FA54 + .string "You found the ROOT FOSSIL.\p" + .string "If this FOSSIL is taken, the other\n" + .string "one will sink into the sand...\p" + .string "Take the ROOT FOSSIL anyway?$" + +Route111_Text_16FACE:: @ 816FACE + .string "{PLAYER} left the ROOT FOSSIL alone.$" + +Route111_Text_16FAED:: @ 816FAED + .string "You found the CLAW FOSSIL.\p" + .string "If this FOSSIL is taken, the other\n" + .string "one will sink into the sand...\p" + .string "Take the CLAW FOSSIL anyway?$" + +Route111_Text_16FB67:: @ 816FB67 + .string "{PLAYER} left the CLAW FOSSIL alone.$" + +Route111_Text_16FB86:: @ 816FB86 + .string "If you don’t raise your POKéMON some\n" + .string "more, it could be tough to keep winning\l" + .string "up through the ranks.\p" + .string "I’ve heard the POKéMON LEAGUE’s\n" + .string "ELITE FOUR are far stronger than\l" + .string "any GYM LEADER.$" + +Route111_Text_16FC3A:: @ 816FC3A + .string "I challenged the WINSTRATE family,\n" + .string "but four matches in a row is tough\l" + .string "going... They destroyed me.$" + +Route111_Text_16FC9C:: @ 816FC9C + .string "ROUTE 111\n" + .string "{0x7A} MAUVILLE CITY$" + +Route111_Text_16FCB6:: @ 816FCB6 + .string "“Our family’s hearts beat as one!”\n" + .string "THE WINSTRATE’S HOUSE$" + +Route111_Text_16FCEF:: @ 816FCEF + .string "ROUTE 111\n" + .string "{0x7B} ROUTE 112$" + +Route111_Text_16FD05:: @ 816FD05 + .string "ROUTE 111\n" + .string "{0x7B} ROUTE 113$" + +Route111_Text_16FD1B:: @ 816FD1B + .string "OLD LADY’S REST STOP\n" + .string "“Come in and rest your tired bones.”$" + +Route111_Text_16FD55:: @ 816FD55 + .string "TRAINER TIPS\p" + .string "One of the indicators of a POKéMON’s\n" + .string "powerfulness is SP. ATK. It stands for\l" + .string "“SPECIAL ATTACK.”\p" + .string "Likewise, SP. DEF stands for “SPECIAL\n" + .string "DEFENSE.”$" diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc index da7f2f605..da7f2f605 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 23f4959a3..8536613b9 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,9 +1,9 @@ Route111_OldLadysRestStop:: @ 8306C74 - .4byte Route111_OldLadysRestStop_MapAttributes + .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 64 .byte 26 .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc new file mode 100644 index 000000000..1263c4b83 --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -0,0 +1,33 @@ +Route111_OldLadysRestStop_MapScripts:: @ 815BFD1 + map_script 3, Route111_OldLadysRestStop_MapScript1_15BFD7 + .byte 0 + +Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP + end + +Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB + lock + faceplayer + msgbox Route111_OldLadysRestStop_Text_1923AF, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC + compare RESULT, NO + goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 + end + +Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC + msgbox Route111_OldLadysRestStop_Text_192423, 4 + closemessage + call Route111_OldLadysRestStop_EventScript_1A02CA + msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC + compare RESULT, NO + goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 + end + +Route111_OldLadysRestStop_EventScript_15C029:: @ 815C029 + msgbox Route111_OldLadysRestStop_Text_1924C6, 4 + release + end diff --git a/data/maps/Route111_OldLadysRestStop/text.inc b/data/maps/Route111_OldLadysRestStop/text.inc new file mode 100644 index 000000000..aeef47a32 --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/text.inc @@ -0,0 +1,19 @@ +Route111_OldLadysRestStop_Text_1923AF:: @ 81923AF + .string "Oh, dear, dear.\n" + .string "Aren’t your POKéMON exhausted?\p" + .string "If you’d like, rest up here.\n" + .string "That’s a fine idea! You should do that.$" + +Route111_OldLadysRestStop_Text_192423:: @ 8192423 + .string "That’s right.\n" + .string "Take your time and rest up!$" + +Route111_OldLadysRestStop_Text_19244D:: @ 819244D + .string "Oh, dear, dear.\n" + .string "Are your POKéMON still tired?\p" + .string "You should take another rest here.\n" + .string "That’s a fine idea. You should do that.$" + +Route111_OldLadysRestStop_Text_1924C6:: @ 81924C6 + .string "Is that so?\n" + .string "You don’t need to be shy about it.$" diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index 70d00eabc..70d00eabc 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index d7333f070..7cac82463 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,9 +1,9 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 26 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc new file mode 100644 index 000000000..020b51791 --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -0,0 +1,58 @@ +Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 + .byte 0 + +Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 + lock + faceplayer + setvar VAR_SPECIAL_8, 2 + msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 + end + +Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A + lock + faceplayer + setvar VAR_SPECIAL_8, 3 + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72 + msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 + giveitem_std ITEM_MACHO_BRACE + compare RESULT, 0 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B + setflag FLAG_RECEIVED_MACHO_BRACE + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 + end + +Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 + msgbox Route111_WinstrateFamilysHouse_Text_19214D, 4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 + end + +Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 + lock + faceplayer + setvar VAR_SPECIAL_8, 1 + msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 + end + +Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 + lock + faceplayer + setvar VAR_SPECIAL_8, 4 + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6 + msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 + setflag FLAG_TEMP_4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 + end + +Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 + msgbox Route111_WinstrateFamilysHouse_Text_192334, 4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 + end + +Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 + closemessage + applymovement VAR_SPECIAL_8, Route111_WinstrateFamilysHouse_Movement_1A083D + waitmovement 0 + release + end diff --git a/data/maps/Route111_WinstrateFamilysHouse/text.inc b/data/maps/Route111_WinstrateFamilysHouse/text.inc new file mode 100644 index 000000000..e1986320b --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/text.inc @@ -0,0 +1,43 @@ +Route111_WinstrateFamilysHouse_Text_191FCE:: @ 8191FCE + .string "You’re the first TRAINER I’ve seen who\n" + .string "deploys POKéMON so masterfully.\p" + .string "But, I should tell you - my son is\n" + .string "stronger than you.\p" + .string "He even took the POKéMON LEAGUE\n" + .string "challenge, I’ll have you know.$" + +Route111_WinstrateFamilysHouse_Text_19208A:: @ 819208A + .string "We use this MACHO BRACE to more\n" + .string "effectively strengthen our POKéMON\l" + .string "in training.\p" + .string "Since you’ve beaten our entire family,\n" + .string "I don’t know if you need it, but we\l" + .string "would like you to have our MACHO BRACE.$" + +Route111_WinstrateFamilysHouse_Text_19214D:: @ 819214D + .string "When it comes to POKéMON battles,\n" + .string "we tend to be pretty passionate.$" + +Route111_WinstrateFamilysHouse_Text_192190:: @ 8192190 + .string "Mommy is stronger than Daddy.\p" + .string "I’m stronger than Mommy.\p" + .string "And Grandma’s stronger than me!\p" + .string "But my big brother is even stronger\n" + .string "than Grandma.$" + +Route111_WinstrateFamilysHouse_Text_192219:: @ 8192219 + .string "There’s no question that you’re strong.\p" + .string "But if you were to battle my grandson,\n" + .string "you’d end up crying in frustration.\p" + .string "He’s much stronger than any TRAINER\n" + .string "our family knows.\p" + .string "He must be challenging the POKéMON\n" + .string "LEAGUE CHAMPION by now.\p" + .string "Knowing my grandson, he could be the\n" + .string "CHAMPION already!$" + +Route111_WinstrateFamilysHouse_Text_192334:: @ 8192334 + .string "My grandson must be challenging the\n" + .string "POKéMON LEAGUE CHAMPION by now.\p" + .string "Knowing my grandson, he could be the\n" + .string "CHAMPION already!$" diff --git a/data/maps/Route112/border.bin b/data/maps/Route112/border.bin deleted file mode 100644 index 9ae2c2126..000000000 --- a/data/maps/Route112/border.bin +++ /dev/null @@ -1 +0,0 @@ -qqqq
\ No newline at end of file diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc index e1673dc69..e1673dc69 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/Route112/events.inc diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index f798451d6..dc9a96bd6 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,9 +1,9 @@ Route112:: @ 830573C - .4byte Route112_MapAttributes + .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 28 .byte 27 .byte 0 diff --git a/data/maps/Route112/map.bin b/data/maps/Route112/map.bin Binary files differdeleted file mode 100644 index bc194cbc5..000000000 --- a/data/maps/Route112/map.bin +++ /dev/null diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc new file mode 100644 index 000000000..83d93f222 --- /dev/null +++ b/data/maps/Route112/scripts.inc @@ -0,0 +1,60 @@ +Route112_MapScripts:: @ 8150502 + map_script 3, Route112_MapScript1_150508 + .byte 0 + +Route112_MapScript1_150508:: @ 8150508 + call Route112_EventScript_1A0196 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 + end + +Route112_EventScript_150513:: @ 8150513 + msgbox Route112_Text_16FDF0, 2 + end + +Route112_EventScript_15051C:: @ 815051C + msgbox Route112_Text_16FE3E, 2 + end + +Route112_EventScript_150525:: @ 8150525 + msgbox Route112_Text_16FEED, 3 + end + +Route112_EventScript_15052E:: @ 815052E + msgbox Route112_Text_16FF19, 3 + end + +Route112_EventScript_150537:: @ 8150537 + msgbox Route112_Text_16FF64, 3 + end + +Route112_EventScript_150540:: @ 8150540 + msgbox Route112_Text_16FE7A, 2 + end + +Route112_EventScript_150549:: @ 8150549 + trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + msgbox Route112_Text_1BB667, 6 + end + +Route112_EventScript_150560:: @ 8150560 + trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route112_EventScript_150587 + msgbox Route112_Text_1BB721, 6 + end + +Route112_EventScript_150587:: @ 8150587 + trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + msgbox Route112_Text_1BB819, 6 + end + +Route112_EventScript_15059E:: @ 815059E + trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + msgbox Route112_Text_1BB8BE, 6 + end + +Route112_EventScript_1505B5:: @ 81505B5 + trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + msgbox Route112_Text_1BB958, 6 + end diff --git a/data/maps/Route112/text.inc b/data/maps/Route112/text.inc new file mode 100644 index 000000000..c967c562c --- /dev/null +++ b/data/maps/Route112/text.inc @@ -0,0 +1,27 @@ +Route112_Text_16FDF0:: @ 816FDF0 + .string "Grumble...\p" + .string "What happened to the others who went\n" + .string "to FALLARBOR? They’re late...$" + +Route112_Text_16FE3E:: @ 816FE3E + .string "Grumble...\p" + .string "I’d like to ride the CABLE CAR to the\n" + .string "top, too..$" + +Route112_Text_16FE7A:: @ 816FE7A + .string "Eh, I’d like to get to MAUVILLE, but if\n" + .string "I went down these ledges, it’d be no\l" + .string "easy matter to get back to LAVARIDGE.$" + +Route112_Text_16FEED:: @ 816FEED + .string "MT. CHIMNEY CABLE CAR\n" + .string "“A short walk {0x79} way!”$" + +Route112_Text_16FF19:: @ 816FF19 + .string "MT. CHIMNEY\p" + .string "“For LAVARIDGE TOWN or the summit,\n" + .string "please take the CABLE CAR.”$" + +Route112_Text_16FF64:: @ 816FF64 + .string "ROUTE 112\n" + .string "{0x7B} LAVARIDGE TOWN$" diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/maps/Route112_CableCarStation/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route112_CableCarStation/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc index a2c93ca9d..a2c93ca9d 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/Route112_CableCarStation/events.inc diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 3d025fb7b..881f4591d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,9 +1,9 @@ Route112_CableCarStation:: @ 8306C90 - .4byte Route112_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 119 .byte 27 .byte 0 diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/maps/Route112_CableCarStation/map.bin Binary files differdeleted file mode 100644 index 93db9d5f0..000000000 --- a/data/maps/Route112_CableCarStation/map.bin +++ /dev/null diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc new file mode 100644 index 000000000..a593ccccc --- /dev/null +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -0,0 +1,88 @@ +Route112_CableCarStation_MapScripts:: @ 815C033 + map_script 3, Route112_CableCarStation_MapScript1_15C03E + map_script 2, Route112_CableCarStation_MapScript2_15C05E + .byte 0 + +Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E + setescapewarp MAP_ROUTE112, 255, 28, 28 + compare VAR_CABLE_CAR_STATION_STATE, 2 + call_if_eq Route112_CableCarStation_EventScript_15C052 + end + +Route112_CableCarStation_EventScript_15C052:: @ 815C052 + setobjectxyperm 1, 7, 4 + setobjectmovementtype 1, 9 + return + +Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_15C068 + .2byte 0 + +Route112_CableCarStation_EventScript_15C068:: @ 815C068 + lockall + applymovement 255, Route112_CableCarStation_Movement_15C0F5 + applymovement 1, Route112_CableCarStation_Movement_15C0EB + waitmovement 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 + releaseall + end + +Route112_CableCarStation_EventScript_15C08C:: @ 815C08C + lock + faceplayer + msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route112_CableCarStation_EventScript_15C0AD + compare RESULT, NO + goto_if_eq Route112_CableCarStation_EventScript_15C0DC + end + +Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD + msgbox Route112_CableCarStation_Text_1925A9, 4 + closemessage + applymovement 1, Route112_CableCarStation_Movement_15C0E6 + applymovement 255, Route112_CableCarStation_Movement_15C0F0 + waitmovement 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 1 + incrementgamestat GAME_STAT_RODE_CABLE_CAR + special CableCarWarp + special CableCar + waitstate + release + end + +Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC + msgbox Route112_CableCarStation_Text_192548, 4 + release + end + +Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6 + walk_up + walk_up + walk_right + walk_in_place_fastest_left + end_movement + +Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB + delay_16 + walk_left + walk_down + walk_down + end_movement + +Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0 + walk_up + walk_up + walk_up + delay_16 + end_movement + +Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5 + walk_down + walk_down + walk_down + delay_16 + end_movement diff --git a/data/maps/Route112_CableCarStation/text.inc b/data/maps/Route112_CableCarStation/text.inc new file mode 100644 index 000000000..245172542 --- /dev/null +++ b/data/maps/Route112_CableCarStation/text.inc @@ -0,0 +1,9 @@ +Route112_CableCarStation_Text_1924F5:: @ 81924F5 + .string "The CABLE CAR is ready to go up.\n" + .string "Would you like to be on it?$" + +UnknownString_8192532: @ 8192532 + .string "Please step this way.$" + +Route112_CableCarStation_Text_192548:: @ 8192548 + .string "Please ride with us another time.$" diff --git a/data/maps/Route113/border.bin b/data/maps/Route113/border.bin deleted file mode 100644 index 73e1e3c60..000000000 --- a/data/maps/Route113/border.bin +++ /dev/null @@ -1 +0,0 @@ -mnuv
\ No newline at end of file diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc index 3fd5ea281..3fd5ea281 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/Route113/events.inc diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 5792f97c3..9097be2f9 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,9 +1,9 @@ Route113:: @ 8305758 - .4byte Route113_MapAttributes + .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections - .2byte BGM_KAZANBAI + .2byte MUS_KAZANBAI .2byte 29 .byte 28 .byte 0 diff --git a/data/maps/Route113/map.bin b/data/maps/Route113/map.bin deleted file mode 100644 index 1d6c6b283..000000000 --- a/data/maps/Route113/map.bin +++ /dev/null @@ -1,288 +0,0 @@ -yyyyyyyyyyyppp.n6mnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmn
mnmnmnmnmnmn
llllllllyyyyyyyyyyppp vu
vuvuvu
vuvuvuvuvuvu
mnmnmn
mnm22n
2 qkllllll ppp n6m22nmnmnm22nmnmnmnm22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2/222
222/2222
/ -2 -2 -2kqqqqqqiiiiiiiiiiiixpp vu
mnmn
-2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 222222 -2 -222)22 2222222222 -2 -2 -2 qqkllqqqqqqqiiiiiiiiiiiiixp n6m %
222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 2262 -2 -2 -2 -2 -2222 222)22222222 -2 -2 -2 qq{||qqqt|||iiiiiiiiiiiiiix vu
22)2222 22222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 qq -2 -2 -2 2222 -2 -2 -2 -2 -2 -222 22222222222 -2 -2 -2||||{|||}qqqq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2 n6m22222 -2 -2 22)2222222 -2 -2 -2 -2 -2 -2 -2 -2 -2222 qq 222 -2 -2 -2 -2 -2 -2 -2 -2 -2 22222222222 -2 -2 -2 -22220xyqqqqqty22222y222222y22y22 vu
22 -2 -2 -2 -2 22222222 -2 -2 -2 -2 -2 -2 -2 -222222 qq 222 -2 -2 -2 -2 -2 -2 -2 -2 -2 q mnmn
' -2 -2 -2 -22222000xyyyyyz022222y222222y2y222 2
2 -2 -2 -2 -2 -2 -2& %22222 -2 -2 -2 -2 -2222y ' -2 -2 -2 -2 -2 -2222 q 2u
-2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -222200000000001122222y222222y222& -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 2222222 -2 -2 -2 qqq 2222222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2222y
-2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -222200000000000(1)1y2y2y2y2y2y2y2y2y2y2y2y2y22222222 -2 -2 -2 -2 -2 -2 -2 -2 -2& 22 -2 -2 -2 qqq 2222222 -2 -2 -2 -2 -2 -2 -2$ 222 '22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2220000000000000022222y222222y22222222222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -222222 -2 -2 qqq 222222222 -2 -2 -2 -2 -2 22222222222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -222220000hiiiiiiiii22222222222y22222222222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2222222 qqq222222 -2 -2 -2 -2 2222222222222 -2 -2 -2 -2iiiiqqqklllll22222y22222222222222222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2222222 qqqqq 222 222222222222222 qkllllllllllmsqqqqq22222222222l6ml6
m222222222 -2 -2 -2 -2 -2 -222222222qqqq 2222 qq 2n
mnmn
mn
kllkllllllmqqukqqqqqststs66ts6tst22uvuvuvuvu
mnm2yyyy2n
m2 qq ' v22uvuv22uv222 sqqqsqqqqt|}qqusqqqqqq6k6l6k22l6k622l6k6l6mnmn
mn
m2 qqqqqqq
m222222nm22n
qq22nmnmnmnmnmnmn
sqqq{||||}qt||}sqqqqqq22sts6t6ststs6t6stuvuv22uv22u
qqqqqqqqq 222uvuvuvuvuvuv2 qqqq 2uvuvuvuvuvuvuv2 qq{|qqqqqt||}qqq{||||||k6l6k6l6klk6l6k6l6klk6l6k6nmnmnmnmnm2 qqqqqqqqq mnmnmnmnmnmnmn
qqqq mnmnmnmnmnmnmn
qqqq{|||||}qqqqqqqqqqqqqststs6t6ststs6t6stsv6uvuvuvuvu
yyyyyyyyy2uvuvuvuvuvuvuv2yyyy2uvuvuvuvuvuvuv2yyyyyyyyyyyyyyyyyyy
\ No newline at end of file diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc new file mode 100644 index 000000000..41b289db0 --- /dev/null +++ b/data/maps/Route113/scripts.inc @@ -0,0 +1,100 @@ +Route113_MapScripts:: @ 81505CC + map_script 5, Route113_MapScript1_1505D7 + map_script 3, Route113_MapScript1_1505DA + .byte 0 + +Route113_MapScript1_1505D7:: @ 81505D7 + setstepcallback 1 + end + +Route113_MapScript1_1505DA:: @ 81505DA + call Route113_EventScript_1505E5 + call Route113_EventScript_1A0196 + end + +Route113_EventScript_1505E5:: @ 81505E5 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 + goto_if_lt Route113_EventScript_150604 + compare VAR_TEMP_0, 84 + goto_if_gt Route113_EventScript_150604 + setweather WEATHER_ASH + return + +Route113_EventScript_150604:: @ 8150604 + return + +Route113_EventScript_150605:: @ 8150605 + msgbox Route113_Text_16FF7F, 2 + end + +Route113_EventScript_15060E:: @ 815060E + msgbox Route113_Text_16FFEE, 2 + end + +Route113_EventScript_150617:: @ 8150617 + msgbox Route113_Text_170065, 3 + end + +Route113_EventScript_150620:: @ 8150620 + msgbox Route113_Text_17007B, 3 + end + +Route113_EventScript_150629:: @ 8150629 + msgbox Route113_Text_17011D, 3 + end + +Route113_EventScript_150632:: @ 8150632 + msgbox Route113_Text_170096, 3 + end + +Route113_EventScript_15063B:: @ 815063B + trainerbattle 0, OPPONENT_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + msgbox Route113_Text_1BB9FB, 6 + end + +Route113_EventScript_150652:: @ 8150652 + trainerbattle 0, OPPONENT_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + msgbox Route113_Text_1BBAB7, 6 + end + +Route113_EventScript_150669:: @ 8150669 + trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route113_EventScript_150690 + msgbox Route113_Text_1BBB9A, 6 + end + +Route113_EventScript_150690:: @ 8150690 + trainerbattle 5, OPPONENT_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + msgbox Route113_Text_1BBC1C, 6 + end + +Route113_EventScript_1506A7:: @ 81506A7 + trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route113_EventScript_1506CE + msgbox Route113_Text_1BBCAB, 6 + end + +Route113_EventScript_1506CE:: @ 81506CE + trainerbattle 5, OPPONENT_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + msgbox Route113_Text_1BBD38, 6 + end + +Route113_EventScript_1506E5:: @ 81506E5 + trainerbattle 0, OPPONENT_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + msgbox Route113_Text_1BBE1D, 6 + end + +Route113_EventScript_1506FC:: @ 81506FC + trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + msgbox Route113_Text_1BBEE4, 6 + end + +Route113_EventScript_150717:: @ 8150717 + trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + msgbox Route113_Text_1BBFE2, 6 + end diff --git a/data/maps/Route113/text.inc b/data/maps/Route113/text.inc new file mode 100644 index 000000000..2ce41fda9 --- /dev/null +++ b/data/maps/Route113/text.inc @@ -0,0 +1,30 @@ +Route113_Text_16FF7F:: @ 816FF7F + .string "Wahahaha! Today’s technology is a\n" + .string "wondrous thing!\p" + .string "Take this volcanic ash here.\n" + .string "It can be fashioned into glass.$" + +Route113_Text_16FFEE:: @ 816FFEE + .string "It’s fun walking through the volcano’s\n" + .string "ashes on the ground and grass.\p" + .string "You can see where you walked - it’s\n" + .string "really neat!$" + +Route113_Text_170065:: @ 8170065 + .string "ROUTE 113\n" + .string "{0x7C} ROUTE 111$" + +Route113_Text_17007B:: @ 817007B + .string "ROUTE 113\n" + .string "{0x7B} FALLARBOR TOWN$" + +Route113_Text_170096:: @ 8170096 + .string "TRAINER TIPS\p" + .string "You may register one of the KEY ITEMS\n" + .string "in your BAG as SELECT.\p" + .string "Simply press SELECT to use the\n" + .string "registered item conveniently.$" + +Route113_Text_17011D:: @ 817011D + .string "GLASS WORKSHOP\n" + .string "“Turning Volcanic Ash into Glass Items”$" diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc index 24b90b2d7..24b90b2d7 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index a8bfdd35d..e63be2dee 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,9 +1,9 @@ Route113_GlassWorkshop:: @ 8307EB8 - .4byte Route113_GlassWorkshop_MapAttributes + .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 67 .byte 28 .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc new file mode 100644 index 000000000..e42a6f89a --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -0,0 +1,308 @@ +Route113_GlassWorkshop_MapScripts:: @ 816354A + map_script 3, Route113_GlassWorkshop_MapScript1_163550 + .byte 0 + +Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 + setflag FLAG_LANDMARK_GLASS_WORKSHOP + compare VAR_GLASS_WORKSHOP_STATE, 1 + call_if_eq Route113_GlassWorkshop_EventScript_16355F + end + +Route113_GlassWorkshop_EventScript_16355F:: @ 816355F + setvar VAR_GLASS_WORKSHOP_STATE, 2 + return + +Route113_GlassWorkshop_EventScript_163565:: @ 8163565 + lock + faceplayer + compare VAR_GLASS_WORKSHOP_STATE, 10 + goto_if_ge Route113_GlassWorkshop_EventScript_1638D2 + compare VAR_GLASS_WORKSHOP_STATE, 2 + goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 + compare VAR_GLASS_WORKSHOP_STATE, 1 + goto_if_eq Route113_GlassWorkshop_EventScript_1635AB + msgbox Route113_GlassWorkshop_Text_19E4E6, 4 + giveitem_std ITEM_SOOT_SACK + setvar VAR_GLASS_WORKSHOP_STATE, 1 + msgbox Route113_GlassWorkshop_Text_19E59B, 4 + release + end + +Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB + msgbox Route113_GlassWorkshop_Text_19E59B, 4 + release + end + +Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 + checkitem ITEM_SOOT_SACK, 1 + compare RESULT, 0 + goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 + msgbox Route113_GlassWorkshop_Text_19E65B, 4 + compare VAR_ASH_GATHER_COUNT, 250 + goto_if_lt Route113_GlassWorkshop_EventScript_163818 + message Route113_GlassWorkshop_Text_19E757 + waitmessage + goto Route113_GlassWorkshop_EventScript_1635EE + end + +Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 + msgbox Route113_GlassWorkshop_Text_19EAC1, 4 + release + end + +Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE + setvar VAR_SPECIAL_9, 0 + special ShowGlassWorkshopMenu + waitstate + switch RESULT + case 0, Route113_GlassWorkshop_EventScript_163660 + case 1, Route113_GlassWorkshop_EventScript_16369C + case 2, Route113_GlassWorkshop_EventScript_1636D8 + case 3, Route113_GlassWorkshop_EventScript_163714 + case 4, Route113_GlassWorkshop_EventScript_163750 + case 5, Route113_GlassWorkshop_EventScript_16378C + case 6, Route113_GlassWorkshop_EventScript_1637CD + case 7, Route113_GlassWorkshop_EventScript_16380E + case 127, Route113_GlassWorkshop_EventScript_16380E + end + +Route113_GlassWorkshop_EventScript_163660:: @ 8163660 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 250 + compare VAR_ASH_GATHER_COUNT, 250 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 10 + subvar VAR_ASH_GATHER_COUNT, 250 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_16369C:: @ 816369C + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 500 + compare VAR_ASH_GATHER_COUNT, 500 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 11 + subvar VAR_ASH_GATHER_COUNT, 500 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 500 + compare VAR_ASH_GATHER_COUNT, 500 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 12 + subvar VAR_ASH_GATHER_COUNT, 500 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_163714:: @ 8163714 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 13 + subvar VAR_ASH_GATHER_COUNT, 1000 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_163750:: @ 8163750 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 14 + subvar VAR_ASH_GATHER_COUNT, 1000 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_16378C:: @ 816378C + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 6000 + compare VAR_ASH_GATHER_COUNT, 6000 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 15 + subvar VAR_ASH_GATHER_COUNT, 6000 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 8000 + compare VAR_ASH_GATHER_COUNT, 8000 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route113_GlassWorkshop_EventScript_163845 + setvar VAR_GLASS_WORKSHOP_STATE, 16 + subvar VAR_ASH_GATHER_COUNT, 8000 + goto Route113_GlassWorkshop_EventScript_163851 + end + +Route113_GlassWorkshop_EventScript_16380E:: @ 816380E + msgbox Route113_GlassWorkshop_Text_19E990, 4 + release + end + +Route113_GlassWorkshop_EventScript_163818:: @ 8163818 + setvar VAR_SPECIAL_A, 250 + subvar VAR_SPECIAL_A, 16456 + buffernumberstring 0, 32778 + msgbox Route113_GlassWorkshop_Text_19E697, 4 + release + end + +Route113_GlassWorkshop_EventScript_163830:: @ 8163830 + subvar VAR_SPECIAL_A, 16456 + buffernumberstring 1, 32778 + message Route113_GlassWorkshop_Text_19E890 + waitmessage + goto Route113_GlassWorkshop_EventScript_1635EE + end + +Route113_GlassWorkshop_EventScript_163845:: @ 8163845 + message Route113_GlassWorkshop_Text_19E802 + waitmessage + goto Route113_GlassWorkshop_EventScript_1635EE + end + +Route113_GlassWorkshop_EventScript_163851:: @ 8163851 + msgbox Route113_GlassWorkshop_Text_19E827, 4 + closemessage + fadescreen 1 + playse SE_SELECT + delay 30 + fadescreen 0 + msgbox Route113_GlassWorkshop_Text_19E9D7, 4 + compare VAR_SPECIAL_9, 0 + call_if_eq Route113_GlassWorkshop_EventScript_163889 + compare VAR_SPECIAL_9, 1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 + setvar VAR_GLASS_WORKSHOP_STATE, 2 + release + end + +Route113_GlassWorkshop_EventScript_163889:: @ 8163889 + giveitem_std VAR_SPECIAL_8 + compare RESULT, 0 + goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 + return + +Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 + givedecoration_std VAR_SPECIAL_8 + compare RESULT, 0 + goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 + return + +Route113_GlassWorkshop_EventScript_1638B4:: @ 81638B4 + call Route113_GlassWorkshop_EventScript_1A02A5 + msgbox Route113_GlassWorkshop_Text_19EA06, 4 + release + end + +Route113_GlassWorkshop_EventScript_1638C3:: @ 81638C3 + call Route113_GlassWorkshop_EventScript_1A02B8 + msgbox Route113_GlassWorkshop_Text_19EA64, 4 + release + end + +Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 + switch VAR_GLASS_WORKSHOP_STATE + case 10, Route113_GlassWorkshop_EventScript_163925 + case 11, Route113_GlassWorkshop_EventScript_163939 + case 12, Route113_GlassWorkshop_EventScript_16394D + case 13, Route113_GlassWorkshop_EventScript_163961 + case 14, Route113_GlassWorkshop_EventScript_163975 + case 15, Route113_GlassWorkshop_EventScript_163989 + case 16, Route113_GlassWorkshop_EventScript_16399D + end + +Route113_GlassWorkshop_EventScript_163925:: @ 8163925 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_163939:: @ 8163939 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_16394D:: @ 816394D + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_163961:: @ 8163961 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_163975:: @ 8163975 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE + bufferitemname 0, VAR_SPECIAL_8 + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_163989:: @ 8163989 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR + bufferdecorationname 0, DECOR_PRETTY_CHAIR + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_16399D:: @ 816399D + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK + bufferdecorationname 0, DECOR_PRETTY_DESK + goto Route113_GlassWorkshop_EventScript_1639B1 + end + +Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 + msgbox Route113_GlassWorkshop_Text_19E9D7, 4 + compare VAR_SPECIAL_9, 0 + call_if_eq Route113_GlassWorkshop_EventScript_163889 + compare VAR_SPECIAL_9, 1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 + setvar VAR_GLASS_WORKSHOP_STATE, 2 + release + end + +Route113_GlassWorkshop_EventScript_1639D6:: @ 81639D6 + msgbox Route113_GlassWorkshop_Text_19EB3B, 2 + end diff --git a/data/maps/Route113_GlassWorkshop/text.inc b/data/maps/Route113_GlassWorkshop/text.inc new file mode 100644 index 000000000..2923255a4 --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/text.inc @@ -0,0 +1,86 @@ +Route113_GlassWorkshop_Text_19E4E6:: @ 819E4E6 + .string "This area is covered in volcanic ash,\n" + .string "huff-puff!\p" + .string "I’m specially gifted, huff-puff.\p" + .string "I make glass out of volcanic ash\n" + .string "and make items, huff-puff.\p" + .string "Go collect ashes with this, huff-puff.$" + +Route113_GlassWorkshop_Text_19E59B:: @ 819E59B + .string "Just take that SOOT SACK and walk\n" + .string "through piles of ash, huff-puff.\p" + .string "And it will fill up with the volcanic ash,\n" + .string "huff-puff.\p" + .string "Once you think you’ve collected a good\n" + .string "amount, come see me, huff-puff.$" + +Route113_GlassWorkshop_Text_19E65B:: @ 819E65B + .string "Have you collected ashes, huff-puff?\n" + .string "Let me see, huff-puff.$" + +Route113_GlassWorkshop_Text_19E697:: @ 819E697 + .string "Hmmm...\n" + .string "There’s not enough ash here, huff-puff.\l" + .string "I can’t make glass with this, huff-puff.\p" + .string "Let’s see... {STR_VAR_1} is the number of steps\n" + .string "you’ll need to walk for me to make you\l" + .string "a BLUE FLUTE, huff-puff.$" + +Route113_GlassWorkshop_Text_19E757:: @ 819E757 + .string "Oh!\n" + .string "You’ve got a lot of ashes, huff-puff!\p" + .string "I’ll make you a glass item, huff-puff!\n" + .string "Which one would you like, huff-puff?$" + +Route113_GlassWorkshop_Text_19E7CD:: @ 819E7CD + .string "A {STR_VAR_1}, huff-puff?\n" + .string "Is that the one for you, huff-puff?$" + +Route113_GlassWorkshop_Text_19E802:: @ 819E802 + .string "Which one would you like, huff-puff?$" + +Route113_GlassWorkshop_Text_19E827:: @ 819E827 + .string "A {STR_VAR_1} it is, then, huff-puff!\p" + .string "Okay! I’ll make it for you, huff-puff.\n" + .string "Just wait a little while, huff-puff.$" + +Route113_GlassWorkshop_Text_19E890:: @ 819E890 + .string "A {STR_VAR_1}, huff-puff?\p" + .string "There’s not enough ash here to make\n" + .string "that, though, huff-puff.\p" + .string "Let’s see... {STR_VAR_2} is the number of steps\n" + .string "you’ll need to walk through volcanic ash\l" + .string "for me to make that item, huff-puff.\p" + .string "Which item would you rather have me\n" + .string "make instead, huff-puff?$" + +Route113_GlassWorkshop_Text_19E990:: @ 819E990 + .string "You’ve collected all that ash, but you\n" + .string "don’t want anything, huff-puff?$" + +Route113_GlassWorkshop_Text_19E9D7:: @ 819E9D7 + .string "Ah, I’ve finished your {STR_VAR_1}.\n" + .string "Take it, huff-puff.$" + +Route113_GlassWorkshop_Text_19EA06:: @ 819EA06 + .string "Oh?\n" + .string "You’ve no room in your BAG, huff-puff.\p" + .string "I’ll hold on to it, so come back later,\n" + .string "huff-puff.$" + +Route113_GlassWorkshop_Text_19EA64:: @ 819EA64 + .string "Oh?\n" + .string "You’ve no room in your PC, huff-puff?\p" + .string "I’ll hold on to it, so come back later,\n" + .string "huff-puff.$" + +Route113_GlassWorkshop_Text_19EAC1:: @ 819EAC1 + .string "Hah? You haven’t got your SOOT SACK\n" + .string "with you, huff-puff.\p" + .string "You have to keep it with you to collect\n" + .string "volcanic ash, huff-puff.$" + +Route113_GlassWorkshop_Text_19EB3B:: @ 819EB3B + .string "It’s fun to blow a glass flute while my\n" + .string "boss is talking.\p" + .string "Huff-huff! Puff-puff!$" diff --git a/data/maps/Route114/border.bin b/data/maps/Route114/border.bin deleted file mode 100644 index 23e2a92e5..000000000 --- a/data/maps/Route114/border.bin +++ /dev/null @@ -1 +0,0 @@ -klst
\ No newline at end of file diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc index eb05dd1ce..eb05dd1ce 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/Route114/events.inc diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index cfb5f4114..afeb34813 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,9 +1,9 @@ Route114:: @ 8305774 - .4byte Route114_MapAttributes + .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 30 .byte 29 .byte 0 diff --git a/data/maps/Route114/map.bin b/data/maps/Route114/map.bin Binary files differdeleted file mode 100644 index 0d92450f4..000000000 --- a/data/maps/Route114/map.bin +++ /dev/null diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc new file mode 100644 index 000000000..54a4ee59a --- /dev/null +++ b/data/maps/Route114/scripts.inc @@ -0,0 +1,130 @@ +Route114_MapScripts:: @ 8150732 + .byte 0 + +Route114_EventScript_150733:: @ 8150733 + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 + msgbox Route114_Text_1C5803, 4 + random 5 + addvar RESULT, 15 + addvar RESULT, 133 + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq Route114_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 + msgbox Route114_Text_1C5861, 4 + release + end + +Route114_EventScript_150778:: @ 8150778 + msgbox Route114_Text_1C5878, 4 + release + end + +Route114_EventScript_150782:: @ 8150782 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 + msgbox Route114_Text_170154, 4 + giveitem_std ITEM_TM05_ROAR + compare RESULT, 0 + goto_if_eq Route114_EventScript_1A029B + setflag FLAG_RECEIVED_TM05 + msgbox Route114_Text_1701C5, 4 + release + end + +Route114_EventScript_1507B9:: @ 81507B9 + msgbox Route114_Text_1701C5, 4 + release + end + +Route114_EventScript_1507C3:: @ 81507C3 + lock + faceplayer + waitse + playmoncry SPECIES_POOCHYENA, 2 + msgbox Route114_Text_1701F9, 4 + waitmoncry + release + end + +Route114_EventScript_1507D6:: @ 81507D6 + msgbox Route114_Text_170206, 3 + end + +Route114_EventScript_1507DF:: @ 81507DF + msgbox Route114_Text_17022E, 3 + end + +Route114_EventScript_1507E8:: @ 81507E8 + msgbox Route114_Text_170263, 3 + end + +Route114_EventScript_1507F1:: @ 81507F1 + trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + msgbox Route114_Text_1BC0C3, 6 + end + +Route114_EventScript_150808:: @ 8150808 + trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 + msgbox Route114_Text_1BC184, 6 + end + +Route114_EventScript_15081F:: @ 815081F + trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + msgbox Route114_Text_1BC24F, 6 + end + +Route114_EventScript_150836:: @ 8150836 + trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + msgbox Route114_Text_1BC2C6, 6 + end + +Route114_EventScript_15084D:: @ 815084D + trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route114_EventScript_150874 + msgbox Route114_Text_1BC337, 6 + end + +Route114_EventScript_150874:: @ 8150874 + trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + msgbox Route114_Text_1BC40F, 6 + end + +Route114_EventScript_15088B:: @ 815088B + trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route114_EventScript_1508B2 + msgbox Route114_Text_1BC4B5, 6 + end + +Route114_EventScript_1508B2:: @ 81508B2 + trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 + msgbox Route114_Text_1BC58C, 6 + end + +Route114_EventScript_1508C9:: @ 81508C9 + trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + msgbox Route114_Text_1BC679, 6 + end + +Route114_EventScript_1508E0:: @ 81508E0 + trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + msgbox Route114_Text_1BC78A, 6 + end + +Route114_EventScript_1508F7:: @ 81508F7 + trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + msgbox Route114_Text_1BC858, 6 + end + +Route114_EventScript_150912:: @ 8150912 + trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + msgbox Route114_Text_1BC91E, 6 + end diff --git a/data/maps/Route114/text.inc b/data/maps/Route114/text.inc new file mode 100644 index 000000000..9a46954da --- /dev/null +++ b/data/maps/Route114/text.inc @@ -0,0 +1,23 @@ +Route114_Text_170154:: @ 8170154 + .string "All my POKéMON does is ROAR...\n" + .string "No one dares to come near me...\p" + .string "Sigh... If you would, please take\n" + .string "this TM away...$" + +Route114_Text_1701C5:: @ 81701C5 + .string "TM05 contains ROAR.\n" + .string "A ROAR sends POKéMON scurrying.$" + +Route114_Text_1701F9:: @ 81701F9 + .string "Bow! Bowwow!$" + +Route114_Text_170206:: @ 8170206 + .string "METEOR FALLS\n" + .string "RUSTBORO CITY THROUGH HERE$" + +Route114_Text_17022E:: @ 817022E + .string "FOSSIL MANIAC’S HOUSE\n" + .string "“Fossils gratefully accepted!”$" + +Route114_Text_170263:: @ 8170263 + .string "LANETTE’S HOUSE$" diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/maps/Route114_FossilManiacsHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route114_FossilManiacsHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 1f41db668..1f41db668 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 2da95c284..cd580f692 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,9 +1,9 @@ Route114_FossilManiacsHouse:: @ 8306CC8 - .4byte Route114_FossilManiacsHouse_MapAttributes + .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 120 .byte 29 .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/maps/Route114_FossilManiacsHouse/map.bin deleted file mode 100644 index ea2d94fda..000000000 --- a/data/maps/Route114_FossilManiacsHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ - 6 22!22233@2!2)2)2)2)277222!2NOD2)222)2)2)2Y2VW)2)2)2)2)2)2)2 3333333333#33333333
\ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc new file mode 100644 index 000000000..c93584561 --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -0,0 +1,32 @@ +Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9 + map_script 3, Route114_FossilManiacsHouse_MapScript1_15C1BF + .byte 0 + +Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE + end + +Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 + msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 + giveitem_std ITEM_TM28_DIG + compare RESULT, 0 + goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B + setflag FLAG_RECEIVED_TM28 + release + end + +Route114_FossilManiacsHouse_EventScript_15C1F2:: @ 815C1F2 + msgbox Route114_FossilManiacsHouse_Text_1926AE, 4 + release + end + +Route114_FossilManiacsHouse_EventScript_15C1FC:: @ 815C1FC + msgbox Route114_FossilManiacsHouse_Text_1926FA, 3 + end + +Route114_FossilManiacsHouse_EventScript_15C205:: @ 815C205 + msgbox Route114_FossilManiacsHouse_Text_192729, 3 + end diff --git a/data/maps/Route114_FossilManiacsHouse/text.inc b/data/maps/Route114_FossilManiacsHouse/text.inc new file mode 100644 index 000000000..4515a161a --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/text.inc @@ -0,0 +1,21 @@ +Route114_FossilManiacsHouse_Text_1925E1:: @ 81925E1 + .string "My big brother’s the FOSSIL MANIAC...\n" + .string "He’s a nice guy who loves fossils...\p" + .string "He loves digging holes, too...\n" + .string "He dug this hole by himself...\p" + .string "You can have this, so you can DIG\n" + .string "holes just like my big brother...$" + +Route114_FossilManiacsHouse_Text_1926AE:: @ 81926AE + .string "If you make a POKéMON DIG inside a\n" + .string "cave, you’re returned to the entrance...$" + +Route114_FossilManiacsHouse_Text_1926FA:: @ 81926FA + .string "Rocks in peculiar shapes fill the\n" + .string "display case$" + +Route114_FossilManiacsHouse_Text_192729:: @ 8192729 + .string "THE COMPOSITION OF STRATA...\n" + .string "HOW RAIN SHAPES THE LAND...\l" + .string "STONES, SOIL, AND ROCK...\p" + .string "It’s crammed with books.$" diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/maps/Route114_FossilManiacsTunnel/border.bin deleted file mode 100644 index 580a207f4..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/border.bin +++ /dev/null @@ -1 +0,0 @@ -wwww
\ No newline at end of file diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index 13db6a8ca..13db6a8ca 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index b410c822c..7cd10eb1a 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,9 +1,9 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 - .4byte Route114_FossilManiacsTunnel_MapAttributes + .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 121 .byte 29 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/maps/Route114_FossilManiacsTunnel/map.bin deleted file mode 100644 index 586216000..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/map.bin +++ /dev/null @@ -1 +0,0 @@ -w2whiiiiiijw2w2w2whxhiiiijrw2ww2wphxhiijrzjwww2pphx33rzjrw2wwppp3 32zjrrw6wwppp6y233rrrw6wwppp3y2y26rrrw6wwppp3y2y22rrrwwwpp7y2y22rrrw6wwp7p3y26rrrwwww6pp3y22rrrw6w6ww6ppp3y26rrw6w6ww6ppp62r6rzjw6ww6ppp32r3zjrw6ww6ppp32r3y6rrw6ww6ppp32r3y6rrw6whxp32r3y6rrw6wp2p2p 3r 77rrw6wp6p2p 3zj3rzjwp2p6p 33r3r3rwp2p2p32r3r 7rwp2p2p36r3zjrhx2p 7p32r 77rrpy62phx32zj3rrpy62pp3 333r3rrpy62pp3222r3rr
\ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc new file mode 100644 index 000000000..740a48314 --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -0,0 +1,26 @@ +Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E + .byte 0 + +Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F + lock + faceplayer + goto_if_set FLAG_RECEIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_15C24E + checkitem ITEM_ROOT_FOSSIL, 1 + compare RESULT, 1 + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 + checkitem ITEM_CLAW_FOSSIL, 1 + compare RESULT, 1 + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 + msgbox Route114_FossilManiacsTunnel_Text_192795, 4 + release + end + +Route114_FossilManiacsTunnel_EventScript_15C244:: @ 815C244 + msgbox Route114_FossilManiacsTunnel_Text_1928DE, 4 + release + end + +Route114_FossilManiacsTunnel_EventScript_15C24E:: @ 815C24E + msgbox Route114_FossilManiacsTunnel_Text_1929DC, 4 + release + end diff --git a/data/maps/Route114_FossilManiacsTunnel/text.inc b/data/maps/Route114_FossilManiacsTunnel/text.inc new file mode 100644 index 000000000..cbcd6172d --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/text.inc @@ -0,0 +1,26 @@ +Route114_FossilManiacsTunnel_Text_192795:: @ 8192795 + .string "I’m the FOSSIL MANIAC...\n" + .string "I’m a nice guy who loves fossils...\p" + .string "Do you want a fossil?\p" + .string "But the fossils around these parts all\n" + .string "belong to me... None for you...\p" + .string "If you can’t go without a fossil, go to\n" + .string "the desert on ROUTE 111...\p" + .string "From what I’ve heard, fossils that were\n" + .string "buried in the sand sometimes rise to\l" + .string "the surface from sandstorms...$" + +Route114_FossilManiacsTunnel_Text_1928DE:: @ 81928DE + .string "You found a FOSSIL, didn’t you?\n" + .string "That’s so nice... It’s so dreamy...\p" + .string "What are you going to do with that\n" + .string "FOSSIL?\p" + .string "From what I’ve heard, DEVON is doing\n" + .string "research on reviving POKéMON from\l" + .string "FOSSILS...\p" + .string "I love my FOSSILS, so I would never\n" + .string "do anything like that...$" + +Route114_FossilManiacsTunnel_Text_1929DC:: @ 81929DC + .string "FOSSILS are so... Wonderful...\n" + .string "It’s so dreamy...$" diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/maps/Route114_LanettesHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route114_LanettesHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc index 86ebf06de..86ebf06de 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/Route114_LanettesHouse/events.inc diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index a5b7eea50..d37f4a323 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,9 +1,9 @@ Route114_LanettesHouse:: @ 8306D00 - .4byte Route114_LanettesHouse_MapAttributes + .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 - .2byte BGM_TONEKUSA + .2byte MUS_TONEKUSA .2byte 122 .byte 29 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/maps/Route114_LanettesHouse/map.bin deleted file mode 100644 index de1858be4..000000000 --- a/data/maps/Route114_LanettesHouse/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - -L !2 !22"2#2"2#2 !2(2(202PQ2(:2Q62%2282XY22BY,-2@22J262%2P4522222)2,-XJ2222145
\ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc new file mode 100644 index 000000000..30eb844ac --- /dev/null +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -0,0 +1,53 @@ +Route114_LanettesHouse_MapScripts:: @ 815C258 + map_script 3, Route114_LanettesHouse_MapScript1_15C25E + .byte 0 + +Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E + setflag FLAG_LANDMARK_LANETTES_HOUSE + end + +Route114_LanettesHouse_EventScript_15C262:: @ 815C262 + lock + faceplayer + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_15C28F + setflag FLAG_SYS_PC_LANETTE + msgbox Route114_LanettesHouse_Text_192A0D, 4 + .ifdef SAPPHIRE + givedecoration_std DECOR_LOTAD_DOLL + .else + givedecoration_std DECOR_SEEDOT_DOLL + .endif + compare RESULT, 0 + goto_if_eq Route114_LanettesHouse_EventScript_1A02AE + setflag FLAG_RECEIVED_DOLL_LANETTE + release + end + +Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F + msgbox Route114_LanettesHouse_Text_192ACC, 4 + release + end + +Route114_LanettesHouse_EventScript_15C299:: @ 815C299 + lockall + msgbox Route114_LanettesHouse_Text_192B4A, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 + msgbox Route114_LanettesHouse_Text_192DA9, 4 + releaseall + end + +Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 + msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO + compare RESULT, YES + call_if_eq Route114_LanettesHouse_EventScript_15C2CC + releaseall + end + +Route114_LanettesHouse_EventScript_15C2CC:: @ 815C2CC + msgbox Route114_LanettesHouse_Text_192CB4, 4 + return + +Route114_LanettesHouse_EventScript_15C2D5:: @ 815C2D5 + msgbox Route114_LanettesHouse_Text_192DC1, 3 + end diff --git a/data/maps/Route114_LanettesHouse/text.inc b/data/maps/Route114_LanettesHouse/text.inc new file mode 100644 index 000000000..5d6747895 --- /dev/null +++ b/data/maps/Route114_LanettesHouse/text.inc @@ -0,0 +1,56 @@ +Route114_LanettesHouse_Text_192A0D:: @ 8192A0D + .string "LANETTE: Oh! {PLAYER}{KUN}!\p" + .string "I’m sorry everything is so cluttered...\n" + .string "When I get engrossed in research,\l" + .string "things end up this way...\p" + .string "This is embarrassing... Please keep\n" + .string "this a secret in exchange for this.$" + +Route114_LanettesHouse_Text_192ACC:: @ 8192ACC + .string "May I offer advice about my POKéMON\n" + .string "Storage System?\p" + .string "You should organize your BOXES so you\n" + .string "can tell which POKéMON are in them.$" + +Route114_LanettesHouse_Text_192B4A:: @ 8192B4A + .string "It’s LANETTE’s research notes.\n" + .string "There’s information about BOXES.\p" + .string "Design BOXES to hold 30 POKéMON each.\p" + .string "Each TRAINER should be able to store\n" + .string "420 POKéMON on the PC system.\p" + .string "Keep reading?$" + +Route114_LanettesHouse_Text_192C01:: @ 8192C01 + .string "A marking system should be added to\n" + .string "make POKéMON easier to organize.\p" + .string "The name and wallpaper design of each\n" + .string "BOX will be made changeable to please\l" + .string "the stored POKéMON.\p" + .string "Keep reading?$" + +Route114_LanettesHouse_Text_192CB4:: @ 8192CB4 + .string "When storing a POKéMON, it should be\n" + .string "sent to the BOX inspected last.\p" + .string "If that BOX is full, the received\n" + .string "POKéMON is stored in the next BOX.\p" + .string "In other words, when a BOX is examined,\n" + .string "it is automatically selected as the BOX\l" + .string "to which POKéMON are sent.$" + +Route114_LanettesHouse_Text_192DA9:: @ 8192DA9 + .string "{PLAYER} closed the notebook.$" + +Route114_LanettesHouse_Text_192DC1:: @ 8192DC1 + .string "There’s an e-mail from someone on\n" + .string "the PC.\p" + .string "“... ... ... ... ... ... ...\p" + .string "“Your Storage System offers more\n" + .string "convenience than mine.\p" + .string "“It has a lot of user-friendly features\n" + .string "that make it fun and useful, too.\p" + .string "“It makes me proud that I played\n" + .string "a part in its development.\p" + .string "“Here’s hoping that you’ll continue\n" + .string "research in Storage Systems.\p" + .string "“From BILL\n" + .string "... ... ... ... ... ... ... ...”$" diff --git a/data/maps/Route115/border.bin b/data/maps/Route115/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route115/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc index e03d62fb4..e03d62fb4 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/Route115/events.inc diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index b11134e28..208c24a76 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,9 +1,9 @@ Route115:: @ 8305790 - .4byte Route115_MapAttributes + .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 31 .byte 30 .byte 0 diff --git a/data/maps/Route115/map.bin b/data/maps/Route115/map.bin Binary files differdeleted file mode 100644 index d6e8e9f1c..000000000 --- a/data/maps/Route115/map.bin +++ /dev/null diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc new file mode 100644 index 000000000..f16c2088a --- /dev/null +++ b/data/maps/Route115/scripts.inc @@ -0,0 +1,68 @@ +Route115_MapScripts:: @ 815092D + .byte 0 + +Route115_EventScript_15092E:: @ 815092E + msgbox Route115_Text_170273, 2 + end + +Route115_EventScript_150937:: @ 8150937 + msgbox Route115_Text_1702E7, 3 + end + +Route115_EventScript_150940:: @ 8150940 + msgbox Route115_Text_170301, 3 + end + +Route115_EventScript_150949:: @ 8150949 + trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route115_EventScript_150970 + msgbox Route115_Text_1BCA0E, 6 + end + +Route115_EventScript_150970:: @ 8150970 + trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + msgbox Route115_Text_1BCAC6, 6 + end + +Route115_EventScript_150987:: @ 8150987 + trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + msgbox Route115_Text_1BCB40, 6 + end + +Route115_EventScript_15099E:: @ 815099E + trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route115_EventScript_1509C5 + msgbox Route115_Text_1BCBDE, 6 + end + +Route115_EventScript_1509C5:: @ 81509C5 + trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + msgbox Route115_Text_1BCCBA, 6 + end + +Route115_EventScript_1509DC:: @ 81509DC + trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route115_EventScript_150A03 + msgbox Route115_Text_1BCD4C, 6 + end + +Route115_EventScript_150A03:: @ 8150A03 + trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + msgbox Route115_Text_1BCDEF, 6 + end + +Route115_EventScript_150A1A:: @ 8150A1A +.ifdef SAPPHIRE + trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + msgbox UnknownString_81BCEA4, 6 +.else + trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + msgbox Route115_Text_1BCF3D, 6 +.endc + end diff --git a/data/maps/Route115/text.inc b/data/maps/Route115/text.inc new file mode 100644 index 000000000..f5fc22b0d --- /dev/null +++ b/data/maps/Route115/text.inc @@ -0,0 +1,13 @@ +Route115_Text_170273:: @ 8170273 + .string "Exploring a cave isn’t like walking\n" + .string "on a road.\p" + .string "You never know when wild POKéMON will\n" + .string "appear. It’s full of suspense.$" + +Route115_Text_1702E7:: @ 81702E7 + .string "ROUTE 115\n" + .string "{0x7A} RUSTBORO CITY$" + +Route115_Text_170301:: @ 8170301 + .string "METEOR FALLS\n" + .string "FALLARBOR TOWN THROUGH HERE$" diff --git a/data/maps/Route116/border.bin b/data/maps/Route116/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route116/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc index fd1b98f0a..fd1b98f0a 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/Route116/events.inc diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index f4e145bf1..27d26658f 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,9 +1,9 @@ Route116:: @ 83057AC - .4byte Route116_MapAttributes + .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections - .2byte BGM_NEXTROAD + .2byte MUS_NEXTROAD .2byte 32 .byte 31 .byte 0 diff --git a/data/maps/Route116/map.bin b/data/maps/Route116/map.bin Binary files differdeleted file mode 100644 index 055562dbb..000000000 --- a/data/maps/Route116/map.bin +++ /dev/null diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc new file mode 100644 index 000000000..77fbf57a4 --- /dev/null +++ b/data/maps/Route116/scripts.inc @@ -0,0 +1,271 @@ +Route116_MapScripts:: @ 8150A31 + map_script 3, Route116_MapScript1_150A37 + .byte 0 + +Route116_MapScript1_150A37:: @ 8150A37 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41 + end + +Route116_EventScript_150A41:: @ 8150A41 + setobjectxyperm 21, 41, 10 + return + +Route116_EventScript_150A49:: @ 8150A49 + lock + faceplayer + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67 + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71 + msgbox Route116_Text_1703CF, 4 + release + end + +Route116_EventScript_150A67:: @ 8150A67 + msgbox Route116_Text_170556, 4 + release + end + +Route116_EventScript_150A71:: @ 8150A71 + msgbox Route116_Text_1703F7, 4 + release + end + +Route116_EventScript_150A7B:: @ 8150A7B + lock + faceplayer + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04 + msgbox Route116_Text_1705AE, 4 + goto Route116_EventScript_150A94 + end + +Route116_EventScript_150A94:: @ 8150A94 + setflag FLAG_MET_DEVON_EMPLOYEE + giveitem_std ITEM_REPEAT_BALL + compare RESULT, 0 + goto_if_eq Route116_EventScript_150B12 + msgbox Route116_Text_1707B8, 4 + closemessage + compare FACING, 2 + call_if_eq Route116_EventScript_150AEE + compare FACING, 1 + call_if_eq Route116_EventScript_150AEE + compare FACING, 3 + call_if_eq Route116_EventScript_150AEE + compare FACING, 4 + call_if_eq Route116_EventScript_150AF9 + removeobject LAST_TALKED + clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F + setflag FLAG_RECEIVED_REPEAT_BALL + release + end + +Route116_EventScript_150AEE:: @ 8150AEE + applymovement LAST_TALKED, Route116_Movement_150B1C + waitmovement 0 + return + +Route116_EventScript_150AF9:: @ 8150AF9 + applymovement LAST_TALKED, Route116_Movement_150B25 + waitmovement 0 + return + +Route116_EventScript_150B04:: @ 8150B04 + msgbox Route116_Text_170865, 4 + goto Route116_EventScript_150A94 + end + +Route116_EventScript_150B12:: @ 8150B12 + msgbox Route116_Text_17082A, 4 + release + end + +Route116_Movement_150B1C:: @ 8150B1C + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +Route116_Movement_150B25:: @ 8150B25 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +Route116_EventScript_150B30:: @ 8150B30 + msgbox Route116_Text_170A46, 3 + end + +Route116_EventScript_150B39:: @ 8150B39 + msgbox Route116_Text_170A60, 3 + end + +Route116_EventScript_150B42:: @ 8150B42 + msgbox Route116_Text_170AB8, 3 + end + +Route116_EventScript_150B4B:: @ 8150B4B + msgbox Route116_Text_170ACE, 3 + end + +Route116_EventScript_150B54:: @ 8150B54 + msgbox Route116_Text_170B7D, 3 + end + +Route116_EventScript_150B5D:: @ 8150B5D + lock + faceplayer + msgbox Route116_Text_17032A, 4 + setvar VAR_ROUTE116_STATE, 2 + release + end + +Route116_EventScript_150B6E:: @ 8150B6E + lockall + applymovement 11, Route116_Movement_1A0843 + applymovement 255, Route116_Movement_1A083F + waitmovement 0 + msgbox Route116_Text_17032A, 4 + setvar VAR_ROUTE116_STATE, 2 + releaseall + end + +Route116_EventScript_150B8F:: @ 8150B8F + lock + faceplayer + checkitem ITEM_BLACK_GLASSES, 1 + compare RESULT, 1 + goto_if_eq Route116_EventScript_150BCA + specialvar RESULT, FoundBlackGlasses + compare RESULT, 1 + goto_if_eq Route116_EventScript_150BBB + msgbox Route116_Text_1708EE, 4 + release + end + +Route116_EventScript_150BBB:: @ 8150BBB + msgbox Route116_Text_1709B7, 4 + closemessage + goto Route116_EventScript_150C03 + end + +Route116_EventScript_150BCA:: @ 8150BCA + msgbox Route116_Text_1708EE, 4 + msgbox Route116_Text_170921, 4 + specialvar RESULT, FoundBlackGlasses + compare RESULT, 1 + goto_if_eq Route116_EventScript_150BF4 + msgbox Route116_Text_170A03, 4 + release + end + +Route116_EventScript_150BF4:: @ 8150BF4 + msgbox Route116_Text_17094D, 4 + closemessage + goto Route116_EventScript_150C03 + end + +Route116_EventScript_150C03:: @ 8150C03 + delay 20 + compare FACING, 2 + call_if_eq Route116_EventScript_150C37 + compare FACING, 1 + call_if_eq Route116_EventScript_150C37 + compare FACING, 3 + call_if_eq Route116_EventScript_150C37 + compare FACING, 4 + call_if_eq Route116_EventScript_150C42 + removeobject LAST_TALKED + release + end + +Route116_EventScript_150C37:: @ 8150C37 + applymovement LAST_TALKED, Route116_Movement_150C4D + waitmovement 0 + return + +Route116_EventScript_150C42:: @ 8150C42 + applymovement LAST_TALKED, Route116_Movement_150C57 + waitmovement 0 + return + +Route116_Movement_150C4D:: @ 8150C4D + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +Route116_Movement_150C57:: @ 8150C57 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +Route116_EventScript_150C62:: @ 8150C62 + trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + msgbox Route116_Text_1BD078, 6 + end + +Route116_EventScript_150C79:: @ 8150C79 + trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + msgbox Route116_Text_1BD0F4, 6 + end + +Route116_EventScript_150C90:: @ 8150C90 + trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route116_EventScript_150CB7 + msgbox Route116_Text_1BD248, 6 + end + +Route116_EventScript_150CB7:: @ 8150CB7 + trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + msgbox Route116_Text_1BD31A, 6 + end + +Route116_EventScript_150CCE:: @ 8150CCE + trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + msgbox Route116_Text_1BCFE3, 6 + end + +Route116_EventScript_150CE5:: @ 8150CE5 + trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 + msgbox Route116_Text_1BD180, 6 + end + +Route116_EventScript_150CFC:: @ 8150CFC + trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route116_EventScript_150D23 + msgbox Route116_Text_1BD3C3, 6 + end + +Route116_EventScript_150D23:: @ 8150D23 + trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A + msgbox Route116_Text_1BD466, 6 + end diff --git a/data/maps/Route116/text.inc b/data/maps/Route116/text.inc new file mode 100644 index 000000000..64694199d --- /dev/null +++ b/data/maps/Route116/text.inc @@ -0,0 +1,119 @@ +Route116_Text_17032A:: @ 817032A + .string "Ohhh, what am I to do?\p" + .string "We were on our walk, PEEKO and I, when\n" + .string "we were jumped by an odd thug...\p" + .string "The scoundrel made off with my\n" + .string "darling PEEKO!\p" + .string "Wrrrooooooaaaar! PEEKO!$" + +Route116_Text_1703CF:: @ 81703CF + .string "Nnn... Roar!\p" + .string "I want to dig that tunnel!$" + +Route116_Text_1703F7:: @ 81703F7 + .string "Nnn... Roar!\n" + .string "What’s going on?\p" + .string "I was digging the tunnel without any\n" + .string "tools when some goon ordered me out!\p" + .string "That tunnel’s filled with POKéMON\n" + .string "that react badly to loud noises.\l" + .string "They could cause an uproar.\p" + .string "That’s why we stopped using heavy\n" + .string "equipment for tunneling...\p" + .string "I’m worried that the goon will do\n" + .string "something stupid and startle the\l" + .string "POKéMON into an uproar.$" + +Route116_Text_170556:: @ 8170556 + .string "Nnn... Roar!\p" + .string "That goofy goon hightailed it out of\n" + .string "the tunnel! I can go back to digging!$" + +Route116_Text_1705AE:: @ 81705AE + .string "Oh! It’s you!\p" + .string "You’re that person who not only helped\n" + .string "me in PETALBURG WOODS, but also got\l" + .string "back my stolen package and then even\l" + .string "graciously delivered it to SLATEPORT!\p" + .string "CAPT. STERN informed us that the\n" + .string "package arrived, too!\p" + .string "I thank you very, very much!\p" + .string "Why, if I were a rain cloud, I would\n" + .string "shower you with gratitude and hail\l" + .string "you as a hero!\p" + .string "For you, the most wonderful TRAINER,\n" + .string "I bear good news!\p" + .string "Recently, our company developed a new\n" + .string "kind of POKé BALL.\p" + .string "As a token of our appreciation, this\n" + .string "is our gift to our wonderful TRAINER!$" + +Route116_Text_1707B8:: @ 81707B8 + .string "Our new POKé BALL will be available\n" + .string "at the POKéMON MART in RUSTBORO.\p" + .string "Please do try it out!\n" + .string "Thank you and bye-bye!$" + +Route116_Text_17082A:: @ 817082A + .string "Your BAG is jam-packed.\n" + .string "I can’t give you this REPEAT BALL.$" + +Route116_Text_170865:: @ 8170865 + .string "As a token of our appreciation for\n" + .string "your delivering our package, I have a\l" + .string "gift of a new kind of POKé BALL for our\l" + .string "most wonderful TRAINER!$" + +Route116_Text_1708EE:: @ 81708EE + .string "I dropped my glasses...\n" + .string "Can you help me find them?$" + +Route116_Text_170921:: @ 8170921 + .string "Those glasses!\n" + .string "May I see them for a second?$" + +Route116_Text_17094D:: @ 817094D + .string "Hmm...\n" + .string "These are BLACKGLASSES.\l" + .string "They’re not what I’m looking for...\p" + .string "Maybe my glasses aren’t around\n" + .string "here...$" + +Route116_Text_1709B7:: @ 81709B7 + .string "Hmm...\n" + .string "I can’t find my glasses anywhere...\l" + .string "Maybe they’re not around here...$" + +Route116_Text_170A03:: @ 8170A03 + .string "Hmm...\n" + .string "These are BLACKGLASSES.\l" + .string "They’re not what I’m looking for...$" + +Route116_Text_170A46:: @ 8170A46 + .string "ROUTE 116\n" + .string "{0x7B} RUSTBORO CITY$" + +Route116_Text_170A60:: @ 8170A60 + .string "RUSTURF TUNNEL\n" + .string "“Linking RUSTBORO and VERDANTURF\p" + .string "“The tunnel project has been\n" + .string "canceled.”$" + +Route116_Text_170AB8:: @ 8170AB8 + .string "TUNNELER’S REST HOUSE$" + +Route116_Text_170ACE:: @ 8170ACE + .string "TRAINER TIPS\p" + .string "If you want to stop a POKéMON from\n" + .string "evolving, press the B Button while it\l" + .string "is trying to evolve.\l" + .string "The startled POKéMON will stop.\p" + .string "This is called an evolution cancel.$" + +Route116_Text_170B7D:: @ 8170B7D + .string "TRAINER TIPS\p" + .string "Your BAG has several POCKETS.\p" + .string "Items you obtain are automatically\n" + .string "placed in the appropriate POCKETS.\p" + .string "No TRAINER can afford to be without\n" + .string "a BAG of their own.$" diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/maps/Route116_TunnelersRestHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route116_TunnelersRestHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 454f184e3..454f184e3 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index a52c6cada..a446833da 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,9 +1,9 @@ Route116_TunnelersRestHouse:: @ 8306D1C - .4byte Route116_TunnelersRestHouse_MapAttributes + .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 123 .byte 31 .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/maps/Route116_TunnelersRestHouse/map.bin deleted file mode 100644 index 91e2c2019..000000000 --- a/data/maps/Route116_TunnelersRestHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ - 222!2!2!2!2222!2)2)2)2)2)2)2)2)2)2Y2NO)2)2)2)2NOD2!2VWD2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333
\ No newline at end of file diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc new file mode 100644 index 000000000..5ec6ef642 --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -0,0 +1,28 @@ +Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE + map_script 3, Route116_TunnelersRestHouse_MapScript1_15C2E4 + .byte 0 + +Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4 + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE + end + +Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8 + msgbox Route116_TunnelersRestHouse_Text_192F33, 2 + end + +Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 + msgbox Route116_TunnelersRestHouse_Text_193049, 2 + end + +Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA + lock + faceplayer + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_15C30F + msgbox Route116_TunnelersRestHouse_Text_193135, 4 + release + end + +Route116_TunnelersRestHouse_EventScript_15C30F:: @ 815C30F + msgbox Route116_TunnelersRestHouse_Text_1931C1, 4 + release + end diff --git a/data/maps/Route116_TunnelersRestHouse/text.inc b/data/maps/Route116_TunnelersRestHouse/text.inc new file mode 100644 index 000000000..d777ff0c8 --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/text.inc @@ -0,0 +1,31 @@ +Route116_TunnelersRestHouse_Text_192F33:: @ 8192F33 + .string "That RUSTURF TUNNEL there...\p" + .string "At first, we had a huge work crew boring\n" + .string "through rock with the latest machinery.\l" + .string "But, we had to stop.\p" + .string "It turns out that we would have had\n" + .string "a negative effect on wild POKéMON in\l" + .string "the area.\p" + .string "So, we’ve got nothing to do but loll\n" + .string "around here doing nothing.$" + +Route116_TunnelersRestHouse_Text_193049:: @ 8193049 + .string "There’s a man digging his way to\n" + .string "VERDANTURF all by his lonesome.\l" + .string "He’s desperate to get through.\p" + .string "He says that if he digs little by little\n" + .string "without using machines, he won’t\l" + .string "disturb POKéMON, and he’ll avoid harming\l" + .string "the natural environment.$" + +Route116_TunnelersRestHouse_Text_193135:: @ 8193135 + .string "To get to VERDANTURF without using\n" + .string "this TUNNEL, you’d have to cross the\l" + .string "sea to DEWFORD, sail on to SLATEPORT,\l" + .string "then travel through MAUVILLE.$" + +Route116_TunnelersRestHouse_Text_1931C1:: @ 81931C1 + .string "Did you hear? The TUNNEL to VERDANTURF\n" + .string "has gone through!\p" + .string "Sometimes, if you hope strongly enough,\n" + .string "dreams do come true.$" diff --git a/data/maps/Route117/border.bin b/data/maps/Route117/border.bin Binary files differdeleted file mode 100644 index addb5d6ce..000000000 --- a/data/maps/Route117/border.bin +++ /dev/null diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc index a668f4b32..a668f4b32 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/Route117/events.inc diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 9649f4728..11df4b60f 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,9 +1,9 @@ Route117:: @ 83057C8 - .4byte Route117_MapAttributes + .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections - .2byte BGM_DOORO_X1 + .2byte MUS_DOORO_X1 .2byte 33 .byte 32 .byte 0 diff --git a/data/maps/Route117/map.bin b/data/maps/Route117/map.bin deleted file mode 100644 index 9aaa06fef..000000000 --- a/data/maps/Route117/map.bin +++ /dev/null @@ -1,11 +0,0 @@ -5670
2
000000000
0
0 -20000000000
0
00000h4s4q0u4i0j4000
2
0000040
0
0
0
00000000
0
0
0
0
0
0
00000000p4{4|4}4q0r440
0
000000
0000 0 0 -00000008IIIIII:0000000p4q0q0t4y4z40
0
00000
0 200 2004000@2 22 -222B000000 -2x4y4y4z400
00
04000000 20 000000@22 22 -22B000000000000 !"@222 22 -2B000000000 -20200000000000000000000000000020@2222 22B011111110000020001111111111111110000000000IIIIIIIHI0000IJ0 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202000000000 1"1000000000011111!1!1!1!1*10(1)1!1!1!1111000002202020011111111!1"100 20000(1)1!1!1!1!1!1!1*10110(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100200000(1)1!1!1!1"10000 1!1*1000000020202000000000000000000000(1!1!1"1000 1"100000000II@@@@II8II000II:0
0
00200000 1!1!110K1L5L5L5M1001!1"10000000000@22 22 -222B
0
0
00
0
0
00(1!1!1"101111100 1!1*10000@222 22 -22B
0
0
0
0
0
0
0
00 1!1!1100000000001!1"100@2222 22 -2B
0
0
0
0
0
0
0
0
0(1!1!1!11111111111!1!1*100H0IIIIIIJ@@@------%0%0
0
0
0
0
0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000000000000000 0 0%0%0
0
0
00000000000000000000%0%0%00000
\ No newline at end of file diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc new file mode 100644 index 000000000..9f42412ab --- /dev/null +++ b/data/maps/Route117/scripts.inc @@ -0,0 +1,121 @@ +Route117_MapScripts:: @ 8150D3A + map_script 3, Route117_MapScript1_150D40 + .byte 0 + +Route117_MapScript1_150D40:: @ 8150D40 + call Route117_EventScript_150D46 + end + +Route117_EventScript_150D46:: @ 8150D46 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_150D56 + setobjectxyperm 3, 47, 6 + +Route117_EventScript_150D56:: @ 8150D56 + return + +Route117_EventScript_150D57:: @ 8150D57 + msgbox Route117_Text_170CA7, 2 + end + +Route117_EventScript_150D60:: @ 8150D60 + msgbox Route117_Text_170CEB, 2 + end + +Route117_EventScript_150D69:: @ 8150D69 + msgbox Route117_Text_170C26, 2 + end + +Route117_EventScript_150D72:: @ 8150D72 + msgbox Route117_Text_170D02, 3 + end + +Route117_EventScript_150D7B:: @ 8150D7B + msgbox Route117_Text_170D1E, 3 + end + +Route117_EventScript_150D84:: @ 8150D84 + msgbox Route117_Text_170D38, 3 + end + +Route117_EventScript_150D8D:: @ 8150D8D + trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route117_EventScript_150DB4 + msgbox Route117_Text_1BD4F9, 6 + end + +Route117_EventScript_150DB4:: @ 8150DB4 + trainerbattle 5, OPPONENT_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + msgbox Route117_Text_1BD5F2, 6 + end + +Route117_EventScript_150DCB:: @ 8150DCB + trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route117_EventScript_150DF2 + msgbox Route117_Text_1BD69B, 6 + end + +Route117_EventScript_150DF2:: @ 8150DF2 + trainerbattle 5, OPPONENT_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + msgbox Route117_Text_1BD74F, 6 + end + +Route117_EventScript_150E09:: @ 8150E09 + trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route117_EventScript_150E30 + msgbox Route117_Text_1BD7F5, 6 + end + +Route117_EventScript_150E30:: @ 8150E30 + trainerbattle 5, OPPONENT_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + msgbox Route117_Text_1BD8BD, 6 + end + +Route117_EventScript_150E47:: @ 8150E47 + trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route117_EventScript_150E6E + msgbox Route117_Text_1BD98F, 6 + end + +Route117_EventScript_150E6E:: @ 8150E6E + trainerbattle 5, OPPONENT_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + msgbox Route117_Text_1BDA6B, 6 + end + +Route117_EventScript_150E85:: @ 8150E85 + trainerbattle 0, OPPONENT_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + msgbox Route117_Text_1BDB24, 6 + end + +Route117_EventScript_150E9C:: @ 8150E9C + trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route117_EventScript_150EC7 + msgbox Route117_Text_1BDC44, 6 + end + +Route117_EventScript_150EC7:: @ 8150EC7 + trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + msgbox Route117_Text_1BDE55, 6 + end + +Route117_EventScript_150EE2:: @ 8150EE2 + trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route117_EventScript_150F0D + msgbox Route117_Text_1BDD4E, 6 + end + +Route117_EventScript_150F0D:: @ 8150F0D + trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + msgbox Route117_Text_1BDF37, 6 + end diff --git a/data/maps/Route117/text.inc b/data/maps/Route117/text.inc new file mode 100644 index 000000000..deadb8f5d --- /dev/null +++ b/data/maps/Route117/text.inc @@ -0,0 +1,25 @@ +Route117_Text_170C26:: @ 8170C26 + .string "I left my POKéMON at the DAY CARE.\p" + .string "When I got it back, it had a new move\n" + .string "that I didn’t teach it.\l" + .string "I was really, really surprised.$" + +Route117_Text_170CA7:: @ 8170CA7 + .string "What do you think?\n" + .string "Aren’t these flowers pretty?\p" + .string "I planted them all!$" + +Route117_Text_170CEB:: @ 8170CEB + .string "The air is tasty here!$" + +Route117_Text_170D02:: @ 8170D02 + .string "ROUTE 117\n" + .string "{0x7B} VERDANTURF TOWN$" + +Route117_Text_170D1E:: @ 8170D1E + .string "ROUTE 117\n" + .string "{0x7C} MAUVILLE CITY$" + +Route117_Text_170D38:: @ 8170D38 + .string "POKéMON DAY CARE\n" + .string "“Let us raise your POKéMON.”$" diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/maps/Route117_PokemonDayCare/border.bin deleted file mode 100644 index 7f603e844..000000000 --- a/data/maps/Route117_PokemonDayCare/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc index 3f2c3be51..3f2c3be51 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 567819b48..0a4f59499 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,9 +1,9 @@ Route117_PokemonDayCare:: @ 8306D38 - .4byte Route117_PokemonDayCare_MapAttributes + .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 124 .byte 32 .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/maps/Route117_PokemonDayCare/map.bin deleted file mode 100644 index bd4b64e13..000000000 --- a/data/maps/Route117_PokemonDayCare/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -567
-=>? $2&22&244222 2 2 .!.#22 2222222(222322222-202 2222222222)*%2222222820212 222222C222922%2;<22@AAAAA
\ No newline at end of file diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc new file mode 100644 index 000000000..9ad740b4e --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -0,0 +1,7 @@ +Route117_PokemonDayCare_MapScripts:: @ 815C319 + map_script 3, Route117_PokemonDayCare_MapScript1_15C31F + .byte 0 + +Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F + setflag FLAG_LANDMARK_POKEMON_DAYCARE + end diff --git a/data/maps/Route118/border.bin b/data/maps/Route118/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route118/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc index c12e77bd9..c12e77bd9 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/Route118/events.inc diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 5b1190621..930a9d860 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,9 +1,9 @@ Route118:: @ 83057E4 - .4byte Route118_MapAttributes + .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections - .2byte BGM_ROUTE_118 + .2byte MUS_ROUTE_118 .2byte 34 .byte 33 .byte 0 diff --git a/data/maps/Route118/map.bin b/data/maps/Route118/map.bin Binary files differdeleted file mode 100644 index c8b0865d0..000000000 --- a/data/maps/Route118/map.bin +++ /dev/null diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc new file mode 100644 index 000000000..b938d0cc2 --- /dev/null +++ b/data/maps/Route118/scripts.inc @@ -0,0 +1,205 @@ +Route118_MapScripts:: @ 8150F28 + map_script 3, Route118_MapScript1_150F2E + .byte 0 + +Route118_MapScript1_150F2E:: @ 8150F2E + call Route118_EventScript_1AE313 + end + +Route118_EventScript_150F34:: @ 8150F34 + lock + faceplayer + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89 + msgbox Route118_Text_170F12, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route118_EventScript_150F5E + compare RESULT, NO + goto_if_eq Route118_EventScript_150F7F + end + +Route118_EventScript_150F5E:: @ 8150F5E + msgbox Route118_Text_170F46, 4 + giveitem_std ITEM_GOOD_ROD + setflag FLAG_RECEIVED_GOOD_ROD + msgbox Route118_Text_170F7E, 4 + release + end + +Route118_EventScript_150F7F:: @ 8150F7F + msgbox Route118_Text_170FB0, 4 + release + end + +Route118_EventScript_150F89:: @ 8150F89 + msgbox Route118_Text_170FC8, 4 + release + end + +Route118_EventScript_150F93:: @ 8150F93 + msgbox Route118_Text_170FFE, 2 + end + +Route118_EventScript_150F9C:: @ 8150F9C + msgbox Route118_Text_17108B, 3 + end + +Route118_EventScript_150FA5:: @ 8150FA5 + msgbox Route118_Text_1710A5, 3 + end + +Route118_EventScript_150FAE:: @ 8150FAE + lockall + setvar VAR_SPECIAL_8, 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + applymovement 19, Route118_Movement_151069 + waitmovement 0 + goto Route118_EventScript_151004 + end + +Route118_EventScript_150FCE:: @ 8150FCE + lockall + setvar VAR_SPECIAL_8, 1 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + goto Route118_EventScript_151004 + end + +Route118_EventScript_150FE4:: @ 8150FE4 + lockall + setvar VAR_SPECIAL_8, 2 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + applymovement 19, Route118_Movement_15106B + waitmovement 0 + goto Route118_EventScript_151004 + end + +Route118_EventScript_151004:: @ 8151004 + playse SE_DANSA + applymovement 19, Route118_Movement_15106D + waitmovement 0 + delay 30 + msgbox Route118_Text_170D66, 4 + closemessage + compare VAR_SPECIAL_8, 0 + call_if_eq Route118_EventScript_151048 + compare VAR_SPECIAL_8, 1 + call_if_eq Route118_EventScript_151053 + compare VAR_SPECIAL_8, 2 + call_if_eq Route118_EventScript_15105E + setvar VAR_ROUTE118_STATE, 1 + removeobject 19 + releaseall + end + +Route118_EventScript_151048:: @ 8151048 + applymovement 19, Route118_Movement_151071 + waitmovement 0 + return + +Route118_EventScript_151053:: @ 8151053 + applymovement 19, Route118_Movement_15107C + waitmovement 0 + return + +Route118_EventScript_15105E:: @ 815105E + applymovement 19, Route118_Movement_151086 + waitmovement 0 + return + +Route118_Movement_151069:: @ 8151069 + walk_left + end_movement + +Route118_Movement_15106B:: @ 815106B + walk_right + end_movement + +Route118_Movement_15106D:: @ 815106D + jump_2_down + delay_16 + walk_down + end_movement + +Route118_Movement_151071:: @ 8151071 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +Route118_Movement_15107C:: @ 815107C + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +Route118_Movement_151086:: @ 8151086 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +Route118_EventScript_15108F:: @ 815108F + trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route118_EventScript_1510B6 + msgbox Route118_Text_1BE05E, 6 + end + +Route118_EventScript_1510B6:: @ 81510B6 + trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + msgbox Route118_Text_1BE104, 6 + end + +Route118_EventScript_1510CD:: @ 81510CD + trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + msgbox Route118_Text_1BE2BE, 6 + end + +Route118_EventScript_1510E4:: @ 81510E4 + trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + msgbox Route118_Text_1BE39C, 6 + end + +Route118_EventScript_1510FB:: @ 81510FB + trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route118_EventScript_151122 + msgbox Route118_Text_1BE413, 6 + end + +Route118_EventScript_151122:: @ 8151122 + trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + msgbox Route118_Text_1BE4D9, 6 + end + +Route118_EventScript_151139:: @ 8151139 + trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + msgbox Route118_Text_1BE19D, 6 + end + +Route118_EventScript_151150:: @ 8151150 + trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + msgbox Route118_Text_1BE20D, 6 + end diff --git a/data/maps/Route118/text.inc b/data/maps/Route118/text.inc new file mode 100644 index 000000000..649efe3f0 --- /dev/null +++ b/data/maps/Route118/text.inc @@ -0,0 +1,55 @@ +Route118_Text_170D66:: @ 8170D66 + .string "STEVEN: Hi!\p" + .string "You’re that TRAINER I met in DEWFORD!\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "Oh, okay, you’re {PLAYER}{KUN}.\n" + .string "I’ll remember it.\p" + .string "{PLAYER}{KUN}.\p" + .string "In this vast world, there are many\n" + .string "kinds of POKéMON.\l" + .string "They come in many types.\p" + .string "Do you raise different types?\n" + .string "Or do you raise only POKéMON of a\l" + .string "certain type?\p" + .string "What do you think as a TRAINER?\p" + .string "Sorry, it’s not my place to ask, is it?\p" + .string "Well, anyway, I hope to see you\n" + .string "again.$" + +Route118_Text_170F12:: @ 8170F12 + .string "Hmm!\n" + .string "A GOOD ROD is really good!\p" + .string "Wouldn’t you agree?$" + +Route118_Text_170F46:: @ 8170F46 + .string "Hmm!\n" + .string "We’re of identical minds!\p" + .string "Hmm!\n" + .string "Take this GOOD ROD!$" + +Route118_Text_170F7E:: @ 8170F7E + .string "Wherever there’s water, try your luck\n" + .string "at fishing.$" + +Route118_Text_170FB0:: @ 8170FB0 + .string "Don’t you like to fish?$" + +Route118_Text_170FC8:: @ 8170FC8 + .string "Try catching all sorts of POKéMON\n" + .string "with your GOOD ROD.$" + +Route118_Text_170FFE:: @ 8170FFE + .string "Even if there isn’t a boat, you can\n" + .string "cross rivers and the sea if you have\l" + .string "a POKéMON that knows SURF.\p" + .string "POKéMON can be counted on to do so\n" + .string "much!$" + +Route118_Text_17108B:: @ 817108B + .string "ROUTE 118\n" + .string "{0x7B} MAUVILLE CITY$" + +Route118_Text_1710A5:: @ 81710A5 + .string "ROUTE 118\n" + .string "{0x79} ROUTE 119$" diff --git a/data/maps/Route119/border.bin b/data/maps/Route119/border.bin Binary files differdeleted file mode 100644 index 864ac15fa..000000000 --- a/data/maps/Route119/border.bin +++ /dev/null diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc index 49677e8e5..49677e8e5 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/Route119/events.inc diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index ef5887676..98d0ea5f6 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,9 +1,9 @@ Route119:: @ 8305800 - .4byte Route119_MapAttributes + .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 35 .byte 34 .byte 0 diff --git a/data/maps/Route119/map.bin b/data/maps/Route119/map.bin Binary files differdeleted file mode 100644 index cd1c748d9..000000000 --- a/data/maps/Route119/map.bin +++ /dev/null diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc new file mode 100644 index 000000000..fe1ef4e45 --- /dev/null +++ b/data/maps/Route119/scripts.inc @@ -0,0 +1,382 @@ +Route119_MapScripts:: @ 8151167 + map_script 5, Route119_MapScript1_151172 + map_script 3, Route119_MapScript1_15119B + .byte 0 + +Route119_MapScript1_151172:: @ 8151172 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C + end + +Route119_EventScript_15117C:: @ 815117C + compare VAR_SPECIAL_4, 6 + call_if_eq Route119_EventScript_151193 + compare VAR_SPECIAL_4, 7 + call_if_eq Route119_EventScript_151197 + return + +Route119_EventScript_151193:: @ 8151193 + removeobject 35 + return + +Route119_EventScript_151197:: @ 8151197 + removeobject 36 + return + +Route119_MapScript1_15119B:: @ 815119B + call Route119_EventScript_1A014E + call Route119_EventScript_1A0172 + call Route119_EventScript_1A0196 + compare VAR_WEATHER_INSTITUTE_STATE, 1 + call_if_eq Route119_EventScript_1511B9 + special SetRoute119Weather + end + +Route119_EventScript_1511B9:: @ 81511B9 + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + setvar VAR_WEATHER_INSTITUTE_STATE, 2 + return + +Route119_EventScript_1511C5:: @ 81511C5 + setvar VAR_TEMP_1, 1 + goto Route119_EventScript_1511DB + end + +Route119_EventScript_1511D0:: @ 81511D0 + setvar VAR_TEMP_1, 2 + goto Route119_EventScript_1511DB + end + +Route119_EventScript_1511DB:: @ 81511DB + lockall + addobject 25 + checkplayergender + compare RESULT, 0 + call_if_eq Route119_EventScript_151254 + compare RESULT, 1 + call_if_eq Route119_EventScript_151259 + delay 65 + compare VAR_TEMP_1, 1 + call_if_eq Route119_EventScript_1513A6 + compare VAR_TEMP_1, 2 + call_if_eq Route119_EventScript_1513B1 + applymovement 255, Route119_Movement_1A0845 + waitmovement 0 + delay 30 + compare VAR_TEMP_1, 1 + call_if_eq Route119_EventScript_1513D2 + compare VAR_TEMP_1, 2 + call_if_eq Route119_EventScript_1513E1 + removeobject 25 + addobject 16 + delay 30 + checkplayergender + compare RESULT, 0 + goto_if_eq Route119_EventScript_15125E + compare RESULT, 1 + goto_if_eq Route119_EventScript_1512D8 + releaseall + end + +Route119_EventScript_151254:: @ 8151254 + playbgm MUS_GIRL_SUP, TRUE + return + +Route119_EventScript_151259:: @ 8151259 + playbgm MUS_BOY_SUP, TRUE + return + +Route119_EventScript_15125E:: @ 815125E + msgbox Route119_Text_1710BB, 4 + switch VAR_STARTER_MON + case 0, Route119_EventScript_15128D + case 1, Route119_EventScript_15129D + case 2, Route119_EventScript_1512AD + end + +Route119_EventScript_15128D:: @ 815128D + trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 + goto Route119_EventScript_1512BD + end + +Route119_EventScript_15129D:: @ 815129D + trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 + goto Route119_EventScript_1512BD + end + +Route119_EventScript_1512AD:: @ 81512AD + trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 + goto Route119_EventScript_1512BD + end + +Route119_EventScript_1512BD:: @ 81512BD + msgbox Route119_Text_1711B1, 4 + call Route119_EventScript_151352 + msgbox Route119_Text_171214, 4 + goto Route119_EventScript_151362 + end + +Route119_EventScript_1512D8:: @ 81512D8 + msgbox Route119_Text_171358, 4 + switch VAR_STARTER_MON + case 0, Route119_EventScript_151307 + case 1, Route119_EventScript_151317 + case 2, Route119_EventScript_151327 + end + +Route119_EventScript_151307:: @ 8151307 + trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 + goto Route119_EventScript_151337 + end + +Route119_EventScript_151317:: @ 8151317 + trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 + goto Route119_EventScript_151337 + end + +Route119_EventScript_151327:: @ 8151327 + trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 + goto Route119_EventScript_151337 + end + +Route119_EventScript_151337:: @ 8151337 + msgbox Route119_Text_17140B, 4 + call Route119_EventScript_151352 + msgbox Route119_Text_171475, 4 + goto Route119_EventScript_151362 + end + +Route119_EventScript_151352:: @ 8151352 + giveitem_std ITEM_HM02_FLY + setflag FLAG_RECEIVED_HM02 + return + +Route119_EventScript_151362:: @ 8151362 + closemessage + compare VAR_TEMP_1, 1 + call_if_eq Route119_EventScript_1513D2 + compare VAR_TEMP_1, 2 + call_if_eq Route119_EventScript_1513E1 + removeobject 16 + addobject 25 + delay 30 + compare VAR_TEMP_1, 1 + call_if_eq Route119_EventScript_1513BC + compare VAR_TEMP_1, 2 + call_if_eq Route119_EventScript_1513C7 + removeobject 25 + setvar VAR_ROUTE119_STATE, 1 + savebgm 0 + fadedefaultbgm + releaseall + end + +Route119_EventScript_1513A6:: @ 81513A6 + applymovement 25, Route119_Movement_1513F0 + waitmovement 0 + return + +Route119_EventScript_1513B1:: @ 81513B1 + applymovement 25, Route119_Movement_1513FA + waitmovement 0 + return + +Route119_EventScript_1513BC:: @ 81513BC + applymovement 25, Route119_Movement_151405 + waitmovement 0 + return + +Route119_EventScript_1513C7:: @ 81513C7 + applymovement 25, Route119_Movement_15140F + waitmovement 0 + return + +Route119_EventScript_1513D2:: @ 81513D2 + setobjectxyperm 16, 25, 32 + setobjectxyperm 25, 25, 32 + return + +Route119_EventScript_1513E1:: @ 81513E1 + setobjectxyperm 16, 26, 32 + setobjectxyperm 25, 26, 32 + return + +Route119_Movement_1513F0:: @ 81513F0 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement + +Route119_Movement_1513FA:: @ 81513FA + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement + +Route119_Movement_151405:: @ 8151405 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +Route119_Movement_15140F:: @ 815140F + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +Route119_EventScript_15141A:: @ 815141A + msgbox Route119_Text_171698, 2 + end + +Route119_EventScript_151423:: @ 8151423 + msgbox Route119_Text_171749, 3 + end + +Route119_EventScript_15142C:: @ 815142C + msgbox Route119_Text_171762, 3 + end + +Route119_EventScript_151435:: @ 8151435 + trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F + msgbox Route119_Text_1BE561, 6 + end + +Route119_EventScript_15144C:: @ 815144C + trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + msgbox Route119_Text_1BE5F8, 6 + end + +Route119_EventScript_151463:: @ 8151463 + trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B + msgbox Route119_Text_1BE695, 6 + end + +Route119_EventScript_15147A:: @ 815147A + trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + msgbox Route119_Text_1BE748, 6 + end + +Route119_EventScript_151491:: @ 8151491 + trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + msgbox Route119_Text_1BE7E9, 6 + end + +Route119_EventScript_1514A8:: @ 81514A8 + trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + msgbox Route119_Text_1BE89A, 6 + end + +Route119_EventScript_1514BF:: @ 81514BF + trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route119_EventScript_1514E6 + msgbox Route119_Text_1BE937, 6 + end + +Route119_EventScript_1514E6:: @ 81514E6 + trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + msgbox Route119_Text_1BE9E8, 6 + end + +Route119_EventScript_1514FD:: @ 81514FD + trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route119_EventScript_151524 + msgbox Route119_Text_1BEAB3, 6 + end + +Route119_EventScript_151524:: @ 8151524 + trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + msgbox Route119_Text_1BEB68, 6 + end + +Route119_EventScript_15153B:: @ 815153B + trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + msgbox Route119_Text_1BEC2A, 6 + end + +Route119_EventScript_151552:: @ 8151552 + trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + msgbox Route119_Text_1BECB1, 6 + end + +Route119_EventScript_151569:: @ 8151569 + trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + msgbox Route119_Text_1BED5C, 6 + end + +Route119_EventScript_151580:: @ 8151580 + trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + msgbox Route119_Text_1BEE06, 6 + end + +Route119_EventScript_151597:: @ 8151597 + trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + msgbox Route119_Text_1BEE66, 6 + end + +Route119_EventScript_1515AE:: @ 81515AE + trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + msgbox Route119_Text_1BEF67, 6 + end + +Route119_EventScript_1515C5:: @ 81515C5 + lock + faceplayer + msgbox Route119_Text_171520, 4 + closemessage + applymovement LAST_TALKED, Route119_Movement_1A083D + waitmovement 0 + release + end + +Route119_EventScript_1515DC:: @ 81515DC + lock + faceplayer + msgbox Route119_Text_17157C, 4 + closemessage + applymovement LAST_TALKED, Route119_Movement_1A083D + waitmovement 0 + release + end + +Route119_EventScript_1515F3:: @ 81515F3 + msgbox Route119_Text_1715D7, 2 + end + +Route119_EventScript_1515FC:: @ 81515FC + msgbox Route119_Text_1716F4, 2 + end + +Route119_EventScript_151605:: @ 8151605 + msgbox Route119_Text_171774, 3 + end diff --git a/data/maps/Route119/text.inc b/data/maps/Route119/text.inc new file mode 100644 index 000000000..489ca053d --- /dev/null +++ b/data/maps/Route119/text.inc @@ -0,0 +1,102 @@ +Route119_Text_1710BB:: @ 81710BB + .string "MAY: {PLAYER}{KUN}!\n" + .string "Where were you? I was looking for you!\p" + .string "How much stronger have you gotten?\n" + .string "Let me check for you!\p" + .string "Ready with your POKéMON?\n" + .string "Of course you are! Go!$" + +Route119_Text_171156:: @ 8171156 + .string "Achah!\n" + .string "{PLAYER}{KUN}, you’re strong!\p" + .string "I was worried that you might be\n" + .string "struggling with your training.$" + +Route119_Text_1711B1:: @ 81711B1 + .string "MAY: But I had absolutely nothing to\n" + .string "worry about! Keep it up!\p" + .string "And, here! I have a present for you.$" + +Route119_Text_171214:: @ 8171214 + .string "MAY: Use FLY, and your POKéMON will\n" + .string "instantly carry you to any town you’ve\l" + .string "already visited.\p" + .string "But, to use FLY, you have to get the\n" + .string "GYM BADGE from FORTREE CITY.\l" + .string "That’s important, so don’t forget.\p" + .string "You should FLY home and visit\n" + .string "LITTLEROOT for a change.\p" + .string "I bet your mom’s worried about you,\n" + .string "{PLAYER}{KUN}.\p" + .string "Well, let’s meet again somewhere!$" + +Route119_Text_171358:: @ 8171358 + .string "BRENDAN: {PLAYER}! So this is where\n" + .string "you’ve been looking for POKéMON?\p" + .string "Let me see how good you got.\n" + .string "I’ll test you!\p" + .string "Now!\n" + .string "It’s a battle, so battle!$" + +Route119_Text_1713E2:: @ 81713E2 + .string "Hmm...\n" + .string "You’ve gotten pretty darn decent.$" + +Route119_Text_17140B:: @ 817140B + .string "BRENDAN: I’d say you’re good enough\n" + .string "to search for POKéMON anywhere.\p" + .string "Here, I’ll give you this.\n" + .string "Try it out.$" + +Route119_Text_171475:: @ 8171475 + .string "BRENDAN: Use FLY, and your POKéMON\n" + .string "instantly carries you to any town\l" + .string "you’ve already visited.\p" + .string "But you need the FORTREE GYM BADGE \n" + .string "to do that.\p" + .string "Anyway, I have to move along.$" + +Route119_Text_171520:: @ 8171520 + .string "We’re standing lookout here.\p" + .string "Hey, you! Stay away from the WEATHER\n" + .string "INSTITUTE. It’s not safe.$" + +Route119_Text_17157C:: @ 817157C + .string "Lookout duty is surprisingly boring.\p" + .string "Hey, you! Please don’t go near the\n" + .string "WEATHER INSTITUTE.$" + +Route119_Text_1715D7:: @ 81715D7 + .string "I thought you FLY by catching a whole\n" + .string "flock of BIRD POKéMON, and then\l" + .string "hanging on to them somehow.\p" + .string "But it turns out there’s an HM move\n" + .string "called FLY!\p" + .string "I wish I’d known about that a long\n" + .string "time ago...$" + +Route119_Text_171698:: @ 8171698 + .string "Tch... It’s a no-go...\p" + .string "The tall grass snares BIKE tires.\n" + .string "There’s no way you can cycle here.$" + +Route119_Text_1716F4:: @ 81716F4 + .string "Can your POKéMON use its SECRET POWER\n" + .string "on a big pile of grass and make a\l" + .string "SECRET BASE?$" + +Route119_Text_171749:: @ 8171749 + .string "ROUTE 119\n" + .string "{0x7C} FORTREE CITY$" + +Route119_Text_171762:: @ 8171762 + .string "WEATHER INSTITUTE$" + +Route119_Text_171774:: @ 8171774 + .string "TRAINER TIPS\p" + .string "Up to sixteen decorations and\n" + .string "furniture items can be placed in\l" + .string "a SECRET BASE.\p" + .string "Pick your favorite items and create\n" + .string "your very own SECRET BASE exactly the\l" + .string "way you want.$" diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc index 0b7bc6b70..0b7bc6b70 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/Route119_House/events.inc diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index d64c4b804..3a7cdcbbd 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,9 +1,9 @@ Route119_House:: @ 8307F28 - .4byte House1_MapAttributes + .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 59 .byte 34 .byte 0 diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc new file mode 100644 index 000000000..76763c68e --- /dev/null +++ b/data/maps/Route119_House/scripts.inc @@ -0,0 +1,16 @@ +Route119_House_MapScripts:: @ 8163DDD + .byte 0 + +Route119_House_EventScript_163DDE:: @ 8163DDE + msgbox Route119_House_Text_19F371, 2 + end + +Route119_House_EventScript_163DE7:: @ 8163DE7 + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox Route119_House_Text_19F406, 4 + waitmoncry + release + end diff --git a/data/maps/Route119_House/text.inc b/data/maps/Route119_House/text.inc new file mode 100644 index 000000000..fe069c1ed --- /dev/null +++ b/data/maps/Route119_House/text.inc @@ -0,0 +1,9 @@ +Route119_House_Text_19F371:: @ 819F371 + .string "I heard about a cave called the CAVE\n" + .string "OF ORIGIN.\p" + .string "People rumor that the spirits of\n" + .string "POKéMON are revived there.\l" + .string "Could something like that really happen?$" + +Route119_House_Text_19F406:: @ 819F406 + .string "WINGULL: Pihyo?$" diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/maps/Route119_WeatherInstitute_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 0107020cd..0107020cd 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index b392fbc41..b35d3cccf 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 - .4byte Route119_WeatherInstitute_1F_MapAttributes + .4byte Route119_WeatherInstitute_1F_Layout .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 272 .byte 34 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/maps/Route119_WeatherInstitute_1F/map.bin deleted file mode 100644 index 07a4e7ebb..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -__nk___k______|}~_ggkgggk,-,-gglmv2kj2z2z2k4545j222z2222tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R22w2R2R22w2R2R2R2R2R2R2U22fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z22R2R2R22z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2
\ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc new file mode 100644 index 000000000..e5ca6550b --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -0,0 +1,55 @@ +Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A + map_script 3, Route119_WeatherInstitute_1F_MapScript1_163C30 + .byte 0 + +Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 + call Route119_WeatherInstitute_1F_EventScript_1A0196 + compare VAR_WEATHER_INSTITUTE_STATE, 0 + call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41 + end + +Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 + setobjectxyperm 5, 0, 5 + setobjectmovementtype 5, 10 + return + +Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D + lock + faceplayer + special GetPlayerBigGuyGirlString + compare VAR_WEATHER_INSTITUTE_STATE, 0 + goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 + msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 + release + end + +Route119_WeatherInstitute_1F_EventScript_163C67:: @ 8163C67 + msgbox Route119_WeatherInstitute_1F_Text_19ECF4, 4 + release + end + +Route119_WeatherInstitute_1F_EventScript_163C71:: @ 8163C71 + msgbox Route119_WeatherInstitute_1F_Text_19ED6B, 2 + end + +Route119_WeatherInstitute_1F_EventScript_163C7A:: @ 8163C7A + msgbox Route119_WeatherInstitute_1F_Text_19EE25, 2 + end + +Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 + lockall + msgbox Route119_WeatherInstitute_1F_Text_19EE8B, 4 + closemessage + call Route119_WeatherInstitute_1F_EventScript_1A02CA + releaseall + end + +Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 + trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 + end + +Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB + trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 + end diff --git a/data/maps/Route119_WeatherInstitute_1F/text.inc b/data/maps/Route119_WeatherInstitute_1F/text.inc new file mode 100644 index 000000000..1f7fff794 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/text.inc @@ -0,0 +1,54 @@ +Route119_WeatherInstitute_1F_Text_19EB8A:: @ 819EB8A + .string "The BOSS got interested in the\n" + .string "research they have going here, so he\l" + .string "sent us out.\p" + .string "You quit meddling!$" + +Route119_WeatherInstitute_1F_Text_19EBEE:: @ 819EBEE + .string "Blast it...\n" + .string "Blasted by a kid...$" + +Route119_WeatherInstitute_1F_Text_19EC0E:: @ 819EC0E + .string "Our BOSS knows everything.\p" + .string "But I’m just a GRUNT. What would I know\n" + .string "about what he’s thinking?$" + +Route119_WeatherInstitute_1F_Text_19EC6B:: @ 819EC6B + .string "Huh?\n" + .string "What’s a kid doing here?$" + +Route119_WeatherInstitute_1F_Text_19EC89:: @ 819EC89 + .string "Huh?\n" + .string "I lost?!$" + +Route119_WeatherInstitute_1F_Text_19EC97:: @ 819EC97 + .string "Oh, no...\n" + .string "I’ll catch an earful for losing to a kid...\p" + .string "I should just take a nap in the bed...$" + +Route119_WeatherInstitute_1F_Text_19ECF4:: @ 819ECF4 + .string "While I was sleeping, everyone went\n" + .string "upstairs!$" + +Route119_WeatherInstitute_1F_Text_19ED22:: @ 819ED22 + .string "Wow, you’re really strong!\p" + .string "I wish I could be a POKéMON TRAINER\n" + .string "like you!$" + +Route119_WeatherInstitute_1F_Text_19ED6B:: @ 819ED6B + .string "The PROFESSOR loves rain.\n" + .string "That’s a fact.\p" + .string "But if it keeps raining, people will be in\n" + .string "trouble. That’s another fact.\p" + .string "And thus, the PROFESSOR is studying\n" + .string "if the rain can be put to good use.$" + +Route119_WeatherInstitute_1F_Text_19EE25:: @ 819EE25 + .string "Hello!\n" + .string "We’ve been saved by your actions!\p" + .string "What I don’t understand is what on\n" + .string "earth the {EVIL_TEAM}S were up to.$" + +Route119_WeatherInstitute_1F_Text_19EE8B:: @ 819EE8B + .string "There’s a bed...\n" + .string "Let’s take a rest.$" diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/maps/Route119_WeatherInstitute_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index 62cb0391f..62cb0391f 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 9a5c3d9d8..b93deba00 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_2F:: @ 8307F0C - .4byte Route119_WeatherInstitute_2F_MapAttributes + .4byte Route119_WeatherInstitute_2F_Layout .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 273 .byte 34 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/maps/Route119_WeatherInstitute_2F/map.bin deleted file mode 100644 index 97953f463..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -__k___________|6}6~6_ggk,-,-,-,-,-g66gj222z2k4545454545j22z22z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2i2i2i2i2i2i2i2i2r2i2i2i22w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2i2i2i2i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2
\ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc new file mode 100644 index 000000000..0a1a51562 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -0,0 +1,92 @@ +Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 + map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8 + .byte 0 + +Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 + call Route119_WeatherInstitute_2F_EventScript_1A0196 + compare VAR_WEATHER_INSTITUTE_STATE, 0 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4 + compare VAR_WEATHER_INSTITUTE_STATE, 1 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0 + end + +Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 + setobjectxyperm 5, 1, 6 + setobjectmovementtype 5, 10 + return + +Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 + setobjectxyperm 5, 4, 6 + setobjectmovementtype 5, 10 + return + +Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC + trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 + end + +Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 + trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 + end + +Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A + trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 + end + +Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 + msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 + closemessage + setvar VAR_WEATHER_INSTITUTE_STATE, 1 + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + fadedefaultbgm + fadescreen 1 + setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + removeobject 1 + removeobject 2 + removeobject 3 + fadescreen 0 + applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 + waitmovement 0 + moveobjectoffscreen 5 + goto Route119_WeatherInstitute_2F_EventScript_163D7A + end + +Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A + msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 + getpartysize + compare RESULT, 6 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 + playfanfare MUS_FANFA4 + message Route119_WeatherInstitute_2F_Text_19F267 + waitfanfare + waitmessage + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + setflag FLAG_RECEIVED_CASTFORM + msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 + release + end + +Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4 + msgbox Route119_WeatherInstitute_2F_Text_19F231, 4 + release + end + +Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE + msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4 + release + end + +Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 + walk_right + walk_right + walk_right + end_movement + +Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC + lock + faceplayer + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE + goto Route119_WeatherInstitute_2F_EventScript_163D7A + end diff --git a/data/maps/Route119_WeatherInstitute_2F/text.inc b/data/maps/Route119_WeatherInstitute_2F/text.inc new file mode 100644 index 000000000..f2854f6d0 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/text.inc @@ -0,0 +1,71 @@ +Route119_WeatherInstitute_2F_Text_19EEAF:: @ 819EEAF + .string "The INSTITUTE created a type of\n" + .string "POKéMON that has something to do with\l" + .string "the weather. We’re here to take them!$" + +Route119_WeatherInstitute_2F_Text_19EF1B:: @ 819EF1B + .string "Our plan’s being spoiled by a kid?$" + +Route119_WeatherInstitute_2F_Text_19EF3E:: @ 819EF3E + .string "If the POKéMON they made here can\n" + .string "control the weather freely, then we of\l" + .string "TEAM {EVIL_TEAM} definitely need it!$" + +Route119_WeatherInstitute_2F_Text_19EFA3:: @ 819EFA3 + .string "We’re TEAM {EVIL_TEAM}!\n" + .string "We appear wherever anything rare is\l" + .string "found!$" + +Route119_WeatherInstitute_2F_Text_19EFDD:: @ 819EFDD + .string "You got me!$" + +Route119_WeatherInstitute_2F_Text_19EFE9:: @ 819EFE9 + .string "You don’t have any idea what we of\n" + .string "TEAM {EVIL_TEAM} are working towards!\l" + .string "You stay out of our way!$" + +Route119_WeatherInstitute_2F_Text_19F042:: @ 819F042 + .string "Ahahahaha!\p" + .string "You’re going to meddle in TEAM {EVIL_TEAM}’s\n" + .string "affairs?\p" + .string "You’re either absolutely fearless,\n" + .string "simply ignorant, or both!\p" + .string "You’re so cute, you’re disgusting!\n" + .string "I’ll put you down, kiddy!$" + +Route119_WeatherInstitute_2F_Text_19F0F4:: @ 819F0F4 + .string "Ahahahaha!\n" + .string "You’re disgustingly strong!$" + +Route119_WeatherInstitute_2F_Text_19F11B:: @ 819F11B + .string "Ahahahaha!\n" + .string "We got meddled with unexpectedly!\p" + .string "We’re out of options.\n" + .string "We’ll have to pull out.\p" + .string "But this isn’t the last you’ll see of\n" + .string "TEAM {EVIL_TEAM}! We have other plans!\l" + .string "Don’t you forget it!$" + +Route119_WeatherInstitute_2F_Text_19F1CF:: @ 819F1CF + .string "Thanks!\n" + .string "Thanks to you, we’re safe!\p" + .string "It might be an odd way of thanking you,\n" + .string "but take this POKéMON.$" + +Route119_WeatherInstitute_2F_Text_19F231:: @ 819F231 + .string "Hm? You don’t seem to have any room\n" + .string "for this POKéMON.$" + +Route119_WeatherInstitute_2F_Text_19F267:: @ 819F267 + .string "{PLAYER} received CASTFORM!$" + +Route119_WeatherInstitute_2F_Text_19F27D:: @ 819F27D + .string "That POKéMON changes shape according\n" + .string "to the weather conditions.\p" + .string "There’re plenty of them in the\n" + .string "INSTITUTE - go ahead and take it.$" + +Route119_WeatherInstitute_2F_Text_19F2FE:: @ 819F2FE + .string "I’ve been researching rain for many\n" + .string "years, but it’s ridiculous to think that\l" + .string "humans can freely change the weather.$" diff --git a/data/maps/Route120/border.bin b/data/maps/Route120/border.bin Binary files differdeleted file mode 100644 index 864ac15fa..000000000 --- a/data/maps/Route120/border.bin +++ /dev/null diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc index 1c0444b22..1c0444b22 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/Route120/events.inc diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 3f8be7e95..10f7725b7 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,9 +1,9 @@ Route120:: @ 830581C - .4byte Route120_MapAttributes + .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 36 .byte 35 .byte 0 diff --git a/data/maps/Route120/map.bin b/data/maps/Route120/map.bin Binary files differdeleted file mode 100644 index bb98e751c..000000000 --- a/data/maps/Route120/map.bin +++ /dev/null diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc new file mode 100644 index 000000000..6f561391f --- /dev/null +++ b/data/maps/Route120/scripts.inc @@ -0,0 +1,351 @@ +Route120_MapScripts:: @ 815160E + map_script 5, Route120_MapScript1_15161E + map_script 3, Route120_MapScript1_1516DF + map_script 1, Route120_MapScript1_151686 + .byte 0 + +Route120_MapScript1_15161E:: @ 815161E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628 + end + +Route120_EventScript_151628:: @ 8151628 + compare VAR_SPECIAL_4, 0 + call_if_eq Route120_EventScript_15166B + compare VAR_SPECIAL_4, 1 + call_if_eq Route120_EventScript_151672 + compare VAR_SPECIAL_4, 2 + call_if_eq Route120_EventScript_151676 + compare VAR_SPECIAL_4, 3 + call_if_eq Route120_EventScript_15167A + compare VAR_SPECIAL_4, 4 + call_if_eq Route120_EventScript_15167E + compare VAR_SPECIAL_4, 5 + call_if_eq Route120_EventScript_151682 + return + +Route120_EventScript_15166B:: @ 815166B + removeobject 30 + removeobject 36 + return + +Route120_EventScript_151672:: @ 8151672 + removeobject 37 + return + +Route120_EventScript_151676:: @ 8151676 + removeobject 38 + return + +Route120_EventScript_15167A:: @ 815167A + removeobject 39 + return + +Route120_EventScript_15167E:: @ 815167E + removeobject 41 + return + +Route120_EventScript_151682:: @ 8151682 + removeobject 40 + return + +Route120_MapScript1_151686:: @ 8151686 + call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2 + call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5 + call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA + end + +Route120_EventScript_1516A2:: @ 81516A2 + setmetatile 7, 54, 124, 1 + setmetatile 7, 55, 145, 1 + return + +Route120_EventScript_1516B5:: @ 81516B5 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 + return + +Route120_EventScript_1516DA:: @ 81516DA + setobjectmovementtype 36, 10 + return + +Route120_MapScript1_1516DF:: @ 81516DF + call Route120_EventScript_1AE313 + call Route120_EventScript_1516EA + end + +Route120_EventScript_1516EA:: @ 81516EA + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 + goto_if_le Route120_EventScript_151715 + compare VAR_TEMP_1, 60 + goto_if_le Route120_EventScript_151719 + compare VAR_TEMP_1, 61 + goto_if_ge Route120_EventScript_151711 + return + +Route120_EventScript_151711:: @ 8151711 + setweather WEATHER_CLOUDS + return + +Route120_EventScript_151715:: @ 8151715 + setweather WEATHER_SUNNY + return + +Route120_EventScript_151719:: @ 8151719 + compare VAR_TEMP_0, 7 + goto_if_le Route120_EventScript_151735 + compare VAR_TEMP_0, 19 + goto_if_le Route120_EventScript_151715 + goto Route120_EventScript_151735 + end + +Route120_EventScript_151735:: @ 8151735 + setweather WEATHER_RAIN_LIGHT + return + +Route120_EventScript_151739:: @ 8151739 + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 + msgbox Route120_Text_1C58F1, MSGBOX_YESNO + compare RESULT, YES + call_if_eq Route120_EventScript_151841 + compare RESULT, NO + call_if_eq Route120_EventScript_15184A + specialvar RESULT, GetPlayerTrainerIdOnesDigit + switch RESULT + case 0, Route120_EventScript_1517DC + case 5, Route120_EventScript_1517DC + case 1, Route120_EventScript_1517E7 + case 6, Route120_EventScript_1517E7 + case 2, Route120_EventScript_1517F2 + case 7, Route120_EventScript_1517F2 + case 3, Route120_EventScript_1517FD + case 8, Route120_EventScript_1517FD + case 4, Route120_EventScript_151808 + case 9, Route120_EventScript_151808 + end + +Route120_EventScript_1517DC:: @ 81517DC + setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY + goto Route120_EventScript_151813 + end + +Route120_EventScript_1517E7:: @ 81517E7 + setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY + goto Route120_EventScript_151813 + end + +Route120_EventScript_1517F2:: @ 81517F2 + setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY + goto Route120_EventScript_151813 + end + +Route120_EventScript_1517FD:: @ 81517FD + setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY + goto Route120_EventScript_151813 + end + +Route120_EventScript_151808:: @ 8151808 + setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY + goto Route120_EventScript_151813 + end + +Route120_EventScript_151813:: @ 8151813 + giveitem_std VAR_SPECIAL_4 + compare RESULT, 0 + goto_if_eq Route120_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 + msgbox Route120_Text_1C5A0B, 4 + release + end + +Route120_EventScript_151837:: @ 8151837 + msgbox Route120_Text_1C5A4D, 4 + release + end + +Route120_EventScript_151841:: @ 8151841 + msgbox Route120_Text_1C5979, 4 + return + +Route120_EventScript_15184A:: @ 815184A + msgbox Route120_Text_1C59B5, 4 + return + +Route120_EventScript_151853:: @ 8151853 + lock + faceplayer + goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884 + msgbox Route120_Text_171827, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route120_EventScript_151877 + goto Route120_EventScript_15189D + end + +Route120_EventScript_151877:: @ 8151877 + msgbox Route120_Text_17193D, 4 + setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 + release + end + +Route120_EventScript_151884:: @ 8151884 + msgbox Route120_Text_17196F, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route120_EventScript_151877 + goto Route120_EventScript_15189D + end + +Route120_EventScript_15189D:: @ 815189D + msgbox Route120_Text_1719A0, 4 + closemessage + compare FACING, 2 + call_if_eq Route120_EventScript_15197F + compare FACING, 3 + call_if_eq Route120_EventScript_15198A + applymovement 31, Route120_Movement_1A083F + waitmovement 0 + delay 20 + msgbox Route120_Text_1719D4, 4 + closemessage + applymovement 30, Route120_Movement_1A0843 + waitmovement 0 + applymovement 30, Route120_Movement_1A0662 + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setvar VAR_SPECIAL_4, 0 + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + goto Route120_EventScript_151908 + end + +Route120_EventScript_151908:: @ 8151908 + applymovement 31, Route120_Movement_1A0845 + applymovement 255, Route120_Movement_1A0841 + waitmovement 0 + msgbox Route120_Text_171A40, 4 + giveitem_std ITEM_DEVON_SCOPE + setflag FLAG_RECEIVED_DEVON_SCOPE + msgbox Route120_Text_171B0E, 4 + closemessage + applymovement 31, Route120_Movement_1A0845 + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect FLDEFF_NPCFLY_OUT + delay 15 + removeobject 31 + waitfieldeffect FLDEFF_NPCFLY_OUT + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 + special DrawWholeMapView + release + end + +Route120_EventScript_15197F:: @ 815197F + applymovement 255, Route120_Movement_1A083F + waitmovement 0 + return + +Route120_EventScript_15198A:: @ 815198A + applymovement 255, Route120_Movement_151995 + waitmovement 0 + return + +Route120_Movement_151995:: @ 8151995 + walk_down + walk_left + end_movement + +Route120_EventScript_151998:: @ 8151998 + msgbox Route120_Text_171B93, 2 + end + +Route120_EventScript_1519A1:: @ 81519A1 + msgbox Route120_Text_171C5E, 3 + end + +Route120_EventScript_1519AA:: @ 81519AA + msgbox Route120_Text_171C77, 3 + end + +Route120_EventScript_1519B3:: @ 81519B3 + trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + msgbox Route120_Text_1BF015, 6 + end + +Route120_EventScript_1519CA:: @ 81519CA + trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route120_EventScript_1519F1 + msgbox Route120_Text_1BF0C3, 6 + end + +Route120_EventScript_1519F1:: @ 81519F1 + trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + msgbox Route120_Text_1BF154, 6 + end + +Route120_EventScript_151A08:: @ 8151A08 + trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + msgbox Route120_Text_1BF215, 6 + end + +Route120_EventScript_151A1F:: @ 8151A1F + trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + msgbox Route120_Text_1BF2EA, 6 + end + +Route120_EventScript_151A36:: @ 8151A36 + trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route120_EventScript_151A5D + msgbox Route120_Text_1BF38D, 6 + end + +Route120_EventScript_151A5D:: @ 8151A5D + trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + msgbox Route120_Text_1BF43E, 6 + end + +Route120_EventScript_151A74:: @ 8151A74 + trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + msgbox Route120_Text_1BF51F, 6 + end + +Route120_EventScript_151A8B:: @ 8151A8B + trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + msgbox Route120_Text_1BF5F4, 6 + end + +Route120_EventScript_151AA2:: @ 8151AA2 + trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + msgbox Route120_Text_1BF6D0, 6 + end + +Route120_EventScript_151AB9:: @ 8151AB9 + trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C + msgbox Route120_Text_1BF7B2, 6 + end + +Route120_EventScript_151AD0:: @ 8151AD0 + trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + msgbox Route120_Text_1BF891, 6 + end + +Route120_EventScript_151AE7:: @ 8151AE7 + trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + msgbox Route120_Text_1BF946, 6 + end diff --git a/data/maps/Route120/text.inc b/data/maps/Route120/text.inc new file mode 100644 index 000000000..adaf369b1 --- /dev/null +++ b/data/maps/Route120/text.inc @@ -0,0 +1,69 @@ +Route120_Text_171827:: @ 8171827 + .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" + .string "It’s been a while.\p" + .string "There’s something here that you can’t\n" + .string "see, right?\p" + .string "Now, if I were to use this device on\n" + .string "the invisible obstacle...\p" + .string "No, no. Rather than describing it,\n" + .string "I should just show you.\l" + .string "That would be more fun.\p" + .string "{PLAYER}{KUN}, are your POKéMON ready for\n" + .string "battle?$" + +Route120_Text_17193D:: @ 817193D + .string "STEVEN: No?\p" + .string "I’ll wait here, so you can get ready.$" + +Route120_Text_17196F:: @ 817196F + .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" + .string "ready for battle?$" + +Route120_Text_1719A0:: @ 81719A0 + .string "STEVEN: {PLAYER}{KUN}, show me your true\n" + .string "power as a TRAINER!$" + +Route120_Text_1719D4:: @ 81719D4 + .string "STEVEN used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON attacked!$" + +Route120_Text_171A40:: @ 8171A40 + .string "STEVEN: I see...\n" + .string "Your battle style is intriguing.\p" + .string "Your POKéMON have obviously grown\n" + .string "since I first met you in DEWFORD.\p" + .string "I’d like you to have this\n" + .string "DEVON SCOPE.\p" + .string "Who knows, there may be other\n" + .string "concealed POKéMON.$" + +Route120_Text_171B0E:: @ 8171B0E + .string "STEVEN: {PLAYER}{KUN}.\p" + .string "I enjoy seeing POKéMON and TRAINERS\n" + .string "who strive together.\p" + .string "I think you’re doing great.\p" + .string "Well, let’s meet again somewhere.$" + +Route119_Text_171B93:: @ 8171B93 +Route120_Text_171B93:: @ 8171B93 + .string "Something unseeable is in the way.$" + +Route119_Text_171BB6:: @ 8171BB6 + .string "Something unseeable is in the way.\p" + .string "Want to use the DEVON SCOPE?$" + +Route119_Text_171BF6:: @ 8171BF6 + .string "{PLAYER} used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON attacked!$" + +Route120_Text_171C5E:: @ 8171C5E + .string "ROUTE 120\n" + .string "{0x7B} FORTREE CITY$" + +Route120_Text_171C77:: @ 8171C77 + .string "{0x7C} ROUTE 121\n" + .string "{0x7B} ROUTE 120$" diff --git a/data/maps/Route121/border.bin b/data/maps/Route121/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route121/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc index 7405af540..7405af540 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/Route121/events.inc diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index ba2c3d2da..918fe47f6 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,9 +1,9 @@ Route121:: @ 8305838 - .4byte Route121_MapAttributes + .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 37 .byte 36 .byte 0 diff --git a/data/maps/Route121/map.bin b/data/maps/Route121/map.bin deleted file mode 100644 index 5c5397c0b..000000000 --- a/data/maps/Route121/map.bin +++ /dev/null @@ -1 +0,0 @@ -urX011120Z6ururX011120Zururs6L5L5u6X0000000001112000Zur00000000000000000000ur{211}255X000000008999:000Zur000000000000000000||||}r
0
0
0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQRD55
0
0
0
000000
0
0
0000000110BD-EC0tyy}r00000000
0
0
0
0
0000000000
0
0
0
00Z0000000000000000000000000000
0
0
0
0
000000000000r 0 0tz000000000
0
0
0
0
0
0
000000
0
0
0
0
0
0Z0000000000000000000000000000
0
0
0
0
0000001100000r&'rPQQQQR00PQQR000PR00PQQQQQQQQR000000000001111111100000000
0
0
0
0
0
0
00000t00yyz00r
0
0000000000Z000XZ00X00000000Z00000000011!1!1)1)1)1)1)1*10
0
0
0PQQQQQQQQQQQR00r0000000r
0
0
0PQQQQR0PR000XZ00PQQQQQQQQR000011111!1!1!1*100000
0
0
0
0
0
0
0
0
0
0
00t|||||00||||z0000000r
0
0
0
0
0
0
00000Z
0
00XZ0000
0
0
0
0
0
000001155)1)1)1)1)1*10011111111
0
0
0
0t|||}t00yyyy00zPQQQQQQQQQQR
0
0
0XZ000
0
0
0
0
0
000000555500000000t|||}tz000000000000
0
0
0
0
0000000000000
0
0
0
0
0XZPQQQQQQQQR000055t|00000000555utz00000tyy00yy0000
0
0
0
0
0
0
0000000000
0
0
0
0
0XZ011111100000t|||}yyyyyy||||||||}u00000t|||}]^0^0^0_{||||
0
0
0
0
0
0
00000000
0
0
0
0
0
0PR026666200000uPPPPPPt}t||||}]^0^0^0^0_{||||||||||||||||||||||||||||||||||}p1p1p1p111P55t||}q0q0q0q0q0q0t}pPe]^0^0^0^0_dQppp1p1p1p1Pt|}t||||||}ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p155t}q0q0uppppppppPQe^0^0^0^0gpXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}pppppppppppppppppXYpppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1
\ No newline at end of file diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc new file mode 100644 index 000000000..5fe7f6330 --- /dev/null +++ b/data/maps/Route121/scripts.inc @@ -0,0 +1,113 @@ +Route121_MapScripts:: @ 8151AFE + map_script 3, Route121_MapScript1_151B04 + .byte 0 + +Route121_MapScript1_151B04:: @ 8151B04 + call Route121_EventScript_1A0196 + end + +Route121_EventScript_151B0A:: @ 8151B0A + msgbox Route121_Text_171CB4, 2 + end + +Route121_EventScript_151B13:: @ 8151B13 + msgbox Route121_Text_171D0C, 3 + end + +Route121_EventScript_151B1C:: @ 8151B1C + msgbox Route121_Text_171D5B, 3 + end + +Route121_EventScript_151B25:: @ 8151B25 + lockall + msgbox Route121_Text_171C8F, 4 + closemessage + applymovement 12, Route121_Movement_151B57 + applymovement 13, Route121_Movement_151B60 + applymovement 14, Route121_Movement_151B69 + waitmovement 0 + removeobject 12 + removeobject 13 + removeobject 14 + setvar VAR_ROUTE121_STATE, 1 + releaseall + end + +Route121_Movement_151B57:: @ 8151B57 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +Route121_Movement_151B60:: @ 8151B60 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +Route121_Movement_151B69:: @ 8151B69 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +Route121_EventScript_151B72:: @ 8151B72 + trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + msgbox Route121_Text_1BF9BA, 6 + end + +Route121_EventScript_151B89:: @ 8151B89 + trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route121_EventScript_151BB0 + msgbox Route121_Text_1BFA9D, 6 + end + +Route121_EventScript_151BB0:: @ 8151BB0 + trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + msgbox Route121_Text_1BFB5C, 6 + end + +Route121_EventScript_151BC7:: @ 8151BC7 + trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + msgbox Route121_Text_1BFBFD, 6 + end + +Route121_EventScript_151BDE:: @ 8151BDE + trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + msgbox Route121_Text_1BFCB3, 6 + end + +Route121_EventScript_151BF9:: @ 8151BF9 + trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + msgbox Route121_Text_1BFDC1, 6 + end + +Route121_EventScript_151C14:: @ 8151C14 + trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route121_EventScript_151C3B + msgbox Route121_Text_1BFEAE, 6 + end + +Route121_EventScript_151C3B:: @ 8151C3B + trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + msgbox Route121_Text_1BFF3A, 6 + end diff --git a/data/maps/Route121/text.inc b/data/maps/Route121/text.inc new file mode 100644 index 000000000..7861b1744 --- /dev/null +++ b/data/maps/Route121/text.inc @@ -0,0 +1,17 @@ +Route121_Text_171C8F:: @ 8171C8F + .string "Okay!\n" + .string "We’re to move out to MT. PYRE!$" + +Route121_Text_171CB4:: @ 8171CB4 + .string "Ahead looms MT. PYRE...\p" + .string "It is a natural monument to the spirits \n" + .string "of departed POKéMON...$" + +Route121_Text_171D0C:: @ 8171D0C + .string "MT. PYRE PIER\p" + .string "...The sign is old and worn out.\n" + .string "The words are barely legible...$" + +Route121_Text_171D5B:: @ 8171D5B + .string "“Filled with rare POKéMON!”\n" + .string "SAFARI ZONE$" diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/maps/Route121_SafariZoneEntrance/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route121_SafariZoneEntrance/border.bin +++ /dev/null diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 6ed6613ec..6ed6613ec 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 4a0bbe244..0d97afab4 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,9 +1,9 @@ Route121_SafariZoneEntrance:: @ 8306D54 - .4byte Route121_SafariZoneEntrance_MapAttributes + .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 125 .byte 36 .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/maps/Route121_SafariZoneEntrance/map.bin deleted file mode 100644 index 35c1badac..000000000 --- a/data/maps/Route121_SafariZoneEntrance/map.bin +++ /dev/null @@ -1 +0,0 @@ -]x2p2p2p2p2p22222e2x2p2p2p2p22h2h2h2h2h22h22h2h22\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h22d6h2h2h2h2ababh2h2h2h2h2h2h22h2h2h222\2h2h2h2dh2h2h2x22h2h2h222h2h2h222h2h2h2\2h2h2h2q22d6h2h2t6
\ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc new file mode 100644 index 000000000..30cba964b --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -0,0 +1,138 @@ +Route121_SafariZoneEntrance_MapScripts:: @ 815C323 + map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329 + .byte 0 + +Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333 + .2byte 0 + +Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 + lockall + applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 + waitmovement 0 + special ExitSafariMode + setvar VAR_SAFARI_ZONE_STATE, 0 + releaseall + end + +Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 + msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2 + end + +Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A + lock + faceplayer + msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 + msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 + release + end + +Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379 + msgbox Route121_SafariZoneEntrance_Text_1C375F, 4 + release + end + +Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 + lockall + applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841 + waitmovement 0 + showmoneybox 0, 0 + nop + msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 + msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 + goto Route121_SafariZoneEntrance_EventScript_15C46C + end + +Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 + checkitem ITEM_POKEBLOCK_CASE, 1 + compare RESULT, 0 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 + call Route121_SafariZoneEntrance_EventScript_15C425 + checkmoney 0x1f4, 0 + compare RESULT, 0 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E + msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 + takemoney 0x1f4, 0 + updatemoneybox 0, 0 + nop + msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 + playfanfare MUS_FANFA4 + message Route121_SafariZoneEntrance_Text_1C3910 + waitfanfare + waitmessage + msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 + closemessage + hidemoneybox 0, 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E + waitmovement 0 + special EnterSafariMode + setvar VAR_SAFARI_ZONE_STATE, 2 + warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 + waitstate + end + +Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 + getpartysize + compare RESULT, 6 + goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F + specialvar RESULT, CheckFreePokemonStorageSpace + compare RESULT, 1 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F + msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 + goto Route121_SafariZoneEntrance_EventScript_15C46C + end + +Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F + return + +Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450 + msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4 + goto Route121_SafariZoneEntrance_EventScript_15C46C + end + +Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E + msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4 + goto Route121_SafariZoneEntrance_EventScript_15C46C + end + +Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C + closemessage + hidemoneybox 0, 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C + waitmovement 0 + releaseall + end + +Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C + walk_right + end_movement + +Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 + end_movement + +Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487 + msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3 + end diff --git a/data/maps/Route122/border.bin b/data/maps/Route122/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route122/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc index 3bad2b895..3bad2b895 100644 --- a/data/maps/events/Route122.inc +++ b/data/maps/Route122/events.inc diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 9889cc813..c6a2d4e4d 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,9 +1,9 @@ Route122:: @ 8305854 - .4byte Route122_MapAttributes + .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections - .2byte BGM_DOORO_X4 + .2byte MUS_DOORO_X4 .2byte 38 .byte 37 .byte 0 diff --git a/data/maps/Route122/map.bin b/data/maps/Route122/map.bin Binary files differdeleted file mode 100644 index 1c76b0b0a..000000000 --- a/data/maps/Route122/map.bin +++ /dev/null diff --git a/data/maps/Route122/scripts.inc b/data/maps/Route122/scripts.inc new file mode 100644 index 000000000..4c4e49aa1 --- /dev/null +++ b/data/maps/Route122/scripts.inc @@ -0,0 +1,2 @@ +Route122_MapScripts:: @ 8151C52 + .byte 0 diff --git a/data/maps/Route123/border.bin b/data/maps/Route123/border.bin Binary files differdeleted file mode 100644 index 864ac15fa..000000000 --- a/data/maps/Route123/border.bin +++ /dev/null diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc index b25ec5c64..b25ec5c64 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/Route123/events.inc diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index f33ab3e98..87c3ed8a6 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,9 +1,9 @@ Route123:: @ 8305870 - .4byte Route123_MapAttributes + .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections - .2byte BGM_DOORO_X4 + .2byte MUS_DOORO_X4 .2byte 39 .byte 38 .byte 0 diff --git a/data/maps/Route123/map.bin b/data/maps/Route123/map.bin deleted file mode 100644 index 9b5573cc5..000000000 --- a/data/maps/Route123/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -pppppppppppppppppppppE00Gppppppppppppppppp@000000000@00hiiiiiiiiiiiij
0
0
0
0
00
0
04K1L5L5L5M1pppppppppppppppppppE00Gppppppppppppppppp@AIIIIIIII90@00000pqqqqqqqqqqqqr0
0
0
0
0
0
0
0
0
0
0011111 0 0pppppppppppppppppE00Gppppppppppppppppp@Bs6u60s6u60s6u6@00 0 0 -00@00000040xyyyyqqqqqr00
0
0
0
0
0
0
0
0
0
0000000ppppppppppppppppE00Gppppppppppppppppp@B{2}20{2}20{2}2@00@00000000
0
0xqqqqr000
0
0
0
0
0
0
0
0
0
0
00000000pppppppppppppppE00Gppppppppppppppppp@Bs6u60s6u60s6u6@0 0@0000000
0
0
0
0xyyw44444440
0
0000
0
00000
0
000000000pppppppppppppE00Gppppppppppppppppp0@B{2}20{2}20{2}2@0 !"0@00000000
0
0
0
0
04o000000000
0000000000
0
0
0
0
00pppppppppppE00Gpppppppppppppp000@3II0000II2400000@04000000000
0
0
0
0
0
00000000000000000000
0
0
0
0
0
0
00ppppppppppE00Gpppppppppppp00000@0000000000000000@000000000000%0%0
0
0
0
0000000000000400000%0
0
0
0
0
0
00ppppppppE00Gppppppppp00000000@00000000011000@000000000000000004000%0
0
0
00004444440
0
0
000000%0
0
0
0
0
0
00pppE00Gpp000000000@000000000011000@0000000000000000000
0
00000000000%0
0
00000%0
0
0
0
0
00000000000>4>4>40000>4>4>4000000000HIIIIIIIIII0110II200440444444o400000000000000
0
0
0
04000
0
0
000040001100400000000000400000000001100000000000000000000000000%0
0
0
0
0000000000000000000
0
0
00000001!1"1000000000000000000000000000000011000000000000000000004444444%0%0
0
00000000000400000000
0
0
0
0
00K1L5L5L5M100111!1!1*10000000011111111111111111111111111111111000444444o0000000
000001111011111000000
0
0
0
0
0
0
000001111111!1!1!1!1*1000000000000111111111111111111111111111111110000000000001111111000111!1!1)1*10(1)1)1!1!1111140
0
0
0
0
0
0
00011111111111!1!1!1)1)1*1004000000000000000000000000000000000000000111111110000(1)1)1)1)1!1!11111100(1)1)1)1*1000000(1)1)1)1)1*10%0%0%0
0
0
0
0
000(1)1)1)1)1)1)1)1)1)1)1)1)1*10000000@4I0IIIIIIIIIII@4@4IIIII0@40000000(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10000000040000000000%0%0%0%0
0000000004000000000000000000000000000000000000000400000000000000400000000000000000040000000000000000000000000000000000000000000000000000
\ No newline at end of file diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc new file mode 100644 index 000000000..d954bec1a --- /dev/null +++ b/data/maps/Route123/scripts.inc @@ -0,0 +1,101 @@ +Route123_MapScripts:: @ 8151C53 + map_script 3, Route123_MapScript1_151C59 + .byte 0 + +Route123_MapScript1_151C59:: @ 8151C59 + special SetRoute123Weather + end + +Route123_EventScript_151C5D:: @ 8151C5D + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC + msgbox Route123_Text_171D83, 4 + special IsGrassTypeInParty + compare RESULT, 0 + goto_if_eq Route123_EventScript_151CAA + msgbox Route123_Text_171DC2, 4 + giveitem_std ITEM_TM19_GIGA_DRAIN + compare RESULT, 0 + goto_if_eq Route123_EventScript_1A029B + setflag FLAG_RECEIVED_TM19 + msgbox Route123_Text_171E34, 4 + release + end + +Route123_EventScript_151CAA:: @ 8151CAA + release + end + +Route123_EventScript_151CAC:: @ 8151CAC + msgbox Route123_Text_171E34, 4 + release + end + +Route123_EventScript_151CB6:: @ 8151CB6 + msgbox Route123_Text_171E76, 3 + end + +Route123_EventScript_151CBF:: @ 8151CBF + msgbox Route123_Text_171E8E, 3 + end + +Route123_EventScript_151CC8:: @ 8151CC8 + msgbox Route123_Text_171EBC, 3 + end + +Route123_EventScript_151CD1:: @ 8151CD1 + trainerbattle 0, OPPONENT_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + msgbox Route123_Text_1BFFC1, 6 + end + +Route123_EventScript_151CE8:: @ 8151CE8 + trainerbattle 0, OPPONENT_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + msgbox Route123_Text_1C0075, 6 + end + +Route123_EventScript_151CFF:: @ 8151CFF + trainerbattle 0, OPPONENT_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + msgbox Route123_Text_1C0100, 6 + end + +Route123_EventScript_151D16:: @ 8151D16 + trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route123_EventScript_151D3D + msgbox Route123_Text_1C01B1, 6 + end + +Route123_EventScript_151D3D:: @ 8151D3D + trainerbattle 5, OPPONENT_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + msgbox Route123_Text_1C024E, 6 + end + +Route123_EventScript_151D54:: @ 8151D54 + trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route123_EventScript_151D7B + msgbox Route123_Text_1C030F, 6 + end + +Route123_EventScript_151D7B:: @ 8151D7B + trainerbattle 5, OPPONENT_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 + msgbox Route123_Text_1C038C, 6 + end + +Route123_EventScript_151D92:: @ 8151D92 + trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + msgbox Route123_Text_1C0423, 6 + end + +Route123_EventScript_151DAD:: @ 8151DAD + trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + msgbox Route123_Text_1C04E3, 6 + end + +Route123_EventScript_151DC8:: @ 8151DC8 + trainerbattle 0, OPPONENT_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F + msgbox Route123_Text_1C05BC, 6 + end diff --git a/data/maps/Route123/text.inc b/data/maps/Route123/text.inc new file mode 100644 index 000000000..911915f9e --- /dev/null +++ b/data/maps/Route123/text.inc @@ -0,0 +1,25 @@ +Route123_Text_171D83:: @ 8171D83 + .string "I love GRASS-type POKéMON!\p" + .string "Do you have any GRASS-type POKéMON?$" + +Route123_Text_171DC2:: @ 8171DC2 + .string "Oh?\p" + .string "You like GRASS-type POKéMON, too,\n" + .string "don’t you?\p" + .string "I’m so happy, you can have this!\n" + .string "It’s a token of our friendship.$" + +Route123_Text_171E34:: @ 8171E34 + .string "I check trees with my GRASS-type\n" + .string "POKéMON. I’m like a tree doctor.$" + +Route123_Text_171E76:: @ 8171E76 + .string "{0x7C} ROUTE 123\n" + .string "{0x7B} ROUTE 118$" + +Route123_Text_171E8E:: @ 8171E8E + .string "{0x79} MT. PYRE\n" + .string "“Forbidden to the faint of heart.”$" + +Route123_Text_171EBC:: @ 8171EBC + .string "BERRY MASTER’S HOUSE$" diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc index ff950e5cb..ff950e5cb 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 0eb77ca2e..427ef4720 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,9 +1,9 @@ Route123_BerryMastersHouse:: @ 8307ED4 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 60 .byte 38 .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc new file mode 100644 index 000000000..3356df83b --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -0,0 +1,145 @@ +Route123_BerryMastersHouse_MapScripts:: @ 81639DF + map_script 3, Route123_BerryMastersHouse_MapScript1_1639E5 + .byte 0 + +Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE + end + +Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A + msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 + random 10 + addvar RESULT, 20 + addvar RESULT, 133 + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER + msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 + random 10 + addvar RESULT, 20 + addvar RESULT, 133 + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 + release + end + +Route123_BerryMastersHouse_EventScript_163A5A:: @ 8163A5A + msgbox Route123_BerryMastersHouse_Text_1C5CDC, 4 + release + end + +Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 + lock + faceplayer + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 + msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 + setvar VAR_SPECIAL_4, 13 + call Route123_BerryMastersHouse_EventScript_1A00F3 + lock + faceplayer + compare RESULT, 1 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B + end + +Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B + msgbox Route123_BerryMastersHouse_Text_1C5EC0, 4 + msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 + release + end + +Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD + compare VAR_SPECIAL_4, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + compare VAR_SPECIAL_4, 1 + goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E + compare VAR_SPECIAL_4, 2 + goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F + compare VAR_SPECIAL_4, 3 + goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 + compare VAR_SPECIAL_4, 4 + goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 + compare VAR_SPECIAL_4, 5 + goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 + end + +Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 + msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 + random 10 + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto Route123_BerryMastersHouse_EventScript_163C1D + release + end + +Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 + msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 + giveitem_std ITEM_SPELON_BERRY + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + setflag FLAG_RECEIVED_SPELON_BERRY + goto Route123_BerryMastersHouse_EventScript_163C1D + end + +Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 + msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 + giveitem_std ITEM_PAMTRE_BERRY + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + setflag FLAG_RECEIVED_PAMTRE_BERRY + goto Route123_BerryMastersHouse_EventScript_163C1D + end + +Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 + msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 + giveitem_std ITEM_WATMEL_BERRY + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + setflag FLAG_RECEIVED_WATMEL_BERRY + goto Route123_BerryMastersHouse_EventScript_163C1D + end + +Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 + msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 + giveitem_std ITEM_DURIN_BERRY + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + setflag FLAG_RECEIVED_DURIN_BERRY + goto Route123_BerryMastersHouse_EventScript_163C1D + end + +Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 + msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 + giveitem_std ITEM_BELUE_BERRY + compare RESULT, 0 + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + setflag FLAG_RECEIVED_BELUE_BERRY + goto Route123_BerryMastersHouse_EventScript_163C1D + end + +Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 + msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 + release + end + +Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE + msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 + release + end diff --git a/data/maps/Route123_BerryMastersHouse/text.inc b/data/maps/Route123_BerryMastersHouse/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/Route124/border.bin b/data/maps/Route124/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route124/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc index 694718fb6..694718fb6 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/Route124/events.inc diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 6e4466225..c2c5cd41d 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,9 +1,9 @@ Route124:: @ 830588C - .4byte Route124_MapAttributes + .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 40 .byte 39 .byte 0 diff --git a/data/maps/Route124/map.bin b/data/maps/Route124/map.bin Binary files differdeleted file mode 100644 index 212135178..000000000 --- a/data/maps/Route124/map.bin +++ /dev/null diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc new file mode 100644 index 000000000..3f02fc6e3 --- /dev/null +++ b/data/maps/Route124/scripts.inc @@ -0,0 +1,70 @@ +Route124_MapScripts:: @ 8151DDF + map_script 3, Route124_MapScript1_151DE5 + .byte 0 + +Route124_MapScript1_151DE5:: @ 8151DE5 + call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1 + end + +Route124_EventScript_151DEF:: @ 8151DEF + msgbox Route124_Text_171ED1, 3 + end + +Route124_EventScript_151DF8:: @ 8151DF8 + trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 + msgbox Route124_Text_1C0693, 6 + end + +Route124_EventScript_151E0F:: @ 8151E0F + trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + msgbox Route124_Text_1C0750, 6 + end + +Route124_EventScript_151E26:: @ 8151E26 + trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route124_EventScript_151E4D + msgbox Route124_Text_1C080E, 6 + end + +Route124_EventScript_151E4D:: @ 8151E4D + trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + msgbox Route124_Text_1C08EA, 6 + end + +Route124_EventScript_151E64:: @ 8151E64 + trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B + msgbox Route124_Text_1C0994, 6 + end + +Route124_EventScript_151E7B:: @ 8151E7B + trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + msgbox Route124_Text_1C0A52, 6 + end + +Route124_EventScript_151E92:: @ 8151E92 + trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route124_EventScript_151EBD + msgbox Route124_Text_1C0B72, 6 + end + +Route124_EventScript_151EBD:: @ 8151EBD + trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + msgbox Route124_Text_1C0E06, 6 + end + +Route124_EventScript_151ED8:: @ 8151ED8 + trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route124_EventScript_151F03 + msgbox Route124_Text_1C0C7F, 6 + end + +Route124_EventScript_151F03:: @ 8151F03 + trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + msgbox Route124_Text_1C0F19, 6 + end diff --git a/data/maps/Route124/text.inc b/data/maps/Route124/text.inc new file mode 100644 index 000000000..6f33d40b7 --- /dev/null +++ b/data/maps/Route124/text.inc @@ -0,0 +1,2 @@ +Route124_Text_171ED1:: @ 8171ED1 + .string "HUNTER’S HOUSE$" diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/maps/Route124_DivingTreasureHuntersHouse/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin +++ /dev/null diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index e165c9da8..e165c9da8 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 472ebc45a..259e378de 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,9 +1,9 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes + .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 - .2byte BGM_MINAMO + .2byte MUS_MINAMO .2byte 302 .byte 39 .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/maps/Route124_DivingTreasureHuntersHouse/map.bin deleted file mode 100644 index 8f1f6cbef..000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -yzX
g
22222$2$2$2$2$29252626262626272#2#292=2H6I6>?#2#292=2P6Q6>?#2#292E2F2F2F2F2F2G#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6
\ No newline at end of file diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc new file mode 100644 index 000000000..7bcddfe19 --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -0,0 +1,294 @@ +Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA + map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_163E00 + .byte 0 + +Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 + setflag FLAG_LANDMARK_HUNTERS_HOUSE + end + +Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 + lock + faceplayer + goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_163E20 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 + setflag FLAG_MET_DIVING_TREASURE_HUNTER + goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E + end + +Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F48F, 4 + goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E + end + +Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E + call Route124_DivingTreasureHuntersHouse_EventScript_163E44 + compare VAR_TEMP_1, 0 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 + goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 + end + +Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 + setvar VAR_TEMP_1, 0 + checkitem ITEM_RED_SHARD, 1 + compare RESULT, 1 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E8A + checkitem ITEM_YELLOW_SHARD, 1 + compare RESULT, 1 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E90 + checkitem ITEM_BLUE_SHARD, 1 + compare RESULT, 1 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E96 + checkitem ITEM_GREEN_SHARD, 1 + compare RESULT, 1 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E9C + return + +Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A + addvar VAR_TEMP_1, 1 + return + +Route124_DivingTreasureHuntersHouse_EventScript_163E90:: @ 8163E90 + addvar VAR_TEMP_1, 2 + return + +Route124_DivingTreasureHuntersHouse_EventScript_163E96:: @ 8163E96 + addvar VAR_TEMP_1, 4 + return + +Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C + addvar VAR_TEMP_1, 8 + return + +Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F544, 4 + goto Route124_DivingTreasureHuntersHouse_EventScript_163EB0 + end + +Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 + message Route124_DivingTreasureHuntersHouse_Text_19F5C5 + waitmessage + switch VAR_TEMP_1 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_163FAD + case 4, Route124_DivingTreasureHuntersHouse_EventScript_163FDE + case 5, Route124_DivingTreasureHuntersHouse_EventScript_164004 + case 6, Route124_DivingTreasureHuntersHouse_EventScript_164035 + case 7, Route124_DivingTreasureHuntersHouse_EventScript_164066 + case 8, Route124_DivingTreasureHuntersHouse_EventScript_1640A2 + case 9, Route124_DivingTreasureHuntersHouse_EventScript_1640C8 + case 10, Route124_DivingTreasureHuntersHouse_EventScript_1640F9 + case 11, Route124_DivingTreasureHuntersHouse_EventScript_16412A + case 12, Route124_DivingTreasureHuntersHouse_EventScript_164166 + case 13, Route124_DivingTreasureHuntersHouse_EventScript_164197 + case 14, Route124_DivingTreasureHuntersHouse_EventScript_1641D3 + case 15, Route124_DivingTreasureHuntersHouse_EventScript_16420F + end + +Route124_DivingTreasureHuntersHouse_EventScript_163F61:: @ 8163F61 + multichoice 0, 0, 58, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 + multichoice 0, 0, 59, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD + multichoice 0, 0, 60, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE + multichoice 0, 0, 61, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 + multichoice 0, 0, 62, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 + multichoice 0, 0, 63, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 + multichoice 0, 0, 64, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 + multichoice 0, 0, 65, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 + multichoice 0, 0, 66, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 + multichoice 0, 0, 67, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A + multichoice 0, 0, 68, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 + multichoice 0, 0, 69, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 + multichoice 0, 0, 70, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 + multichoice 0, 0, 71, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F + multichoice 0, 0, 72, 0 + switch RESULT + case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 + case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 + case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 + case 3, Route124_DivingTreasureHuntersHouse_EventScript_164283 + case 4, Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 + setvar VAR_SPECIAL_8, ITEM_RED_SHARD + setvar VAR_SPECIAL_9, ITEM_FIRE_STONE + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 + +Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 + setvar VAR_SPECIAL_8, ITEM_YELLOW_SHARD + setvar VAR_SPECIAL_9, ITEM_THUNDER_STONE + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 + +Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 + setvar VAR_SPECIAL_8, ITEM_BLUE_SHARD + setvar VAR_SPECIAL_9, ITEM_WATER_STONE + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 + +Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 + setvar VAR_SPECIAL_8, ITEM_GREEN_SHARD + setvar VAR_SPECIAL_9, ITEM_LEAF_STONE + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 + +Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 + bufferitemname 0, VAR_SPECIAL_8 + bufferitemname 1, VAR_SPECIAL_9 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F + checkitemspace VAR_SPECIAL_9, 1 + compare RESULT, 1 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 + checkitem VAR_SPECIAL_8, 2 + compare RESULT, 0 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 + goto Route124_DivingTreasureHuntersHouse_EventScript_164315 + end + +Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 + takeitem VAR_SPECIAL_8, 1 + giveitem_std VAR_SPECIAL_9 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 + call Route124_DivingTreasureHuntersHouse_EventScript_163E44 + compare VAR_TEMP_1, 0 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F + end + +Route124_DivingTreasureHuntersHouse_EventScript_164315:: @ 8164315 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F64E, 4 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_16431F:: @ 816431F + msgbox Route124_DivingTreasureHuntersHouse_Text_19F686, 4 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_164329:: @ 8164329 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F4D1, 4 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_164333:: @ 8164333 + release + end + +Route124_DivingTreasureHuntersHouse_EventScript_164335:: @ 8164335 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F6C5, 3 + end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/text.inc b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc new file mode 100644 index 000000000..3eda96254 --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc @@ -0,0 +1,53 @@ +Route124_DivingTreasureHuntersHouse_Text_19F416:: @ 819F416 + .string "I’m the DIVING TREASURE HUNTER!\p" + .string "I’m the awesome dude who makes\n" + .string "deep-sea dives to gather treasures\l" + .string "resting at the bottom.$" + +Route124_DivingTreasureHuntersHouse_Text_19F48F:: @ 819F48F + .string "Tell me, have you seen any SHARDS of\n" + .string "tools made in ancient times?$" + +Route124_DivingTreasureHuntersHouse_Text_19F4D1:: @ 819F4D1 + .string "You haven’t got any treasures\n" + .string "for me...\p" + .string "If you see any SHARDS, like the RED\n" + .string "SHARD, you’ve got to trade it with me!$" + +Route124_DivingTreasureHuntersHouse_Text_19F544:: @ 819F544 + .string "Oh, hey! That...\n" + .string "That’s a SHARD! I’m looking for those!\p" + .string "Oh, man, you’ve got to trade that\n" + .string "with me! I’ll give you something good!$" + +Route124_DivingTreasureHuntersHouse_Text_19F5C5:: @ 819F5C5 + .string "What do you want to trade?$" + +Route124_DivingTreasureHuntersHouse_Text_19F5E0:: @ 819F5E0 + .string "You’ll trade your {STR_VAR_1} for\n" + .string "my {STR_VAR_2}, then?$" + +Route124_DivingTreasureHuntersHouse_Text_19F606:: @ 819F606 + .string "It’s a done deal!\n" + .string "Use that wisely!$" + +Route124_DivingTreasureHuntersHouse_Text_19F629:: @ 819F629 + .string "Do you want to trade something else?$" + +Route124_DivingTreasureHuntersHouse_Text_19F64E:: @ 819F64E + .string "Whoops, your BAG’s full.\n" + .string "Get rid of some items, friend!$" + +Route124_DivingTreasureHuntersHouse_Text_19F686:: @ 819F686 + .string "No? That’s a downer.\n" + .string "Well, if you change your mind, come back.$" + +Route124_DivingTreasureHuntersHouse_Text_19F6C5:: @ 819F6C5 + .string "Wanted item Trade item\n" + .string " RED SHARD {0x7B}{0x7C} FIRE STONE\p" + .string "Wanted item Trade item\n" + .string " YELLOW SHARD {0x7B}{0x7C} THUNDERSTONE\p" + .string "Wanted item Trade item\n" + .string " BLUE SHARD {0x7B}{0x7C} WATER STONE\p" + .string "Wanted item Trade item\n" + .string " GREEN SHARD {0x7B}{0x7C} LEAF STONE$" diff --git a/data/maps/Route125/border.bin b/data/maps/Route125/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route125/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc index 8ad4ce22a..8ad4ce22a 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/Route125/events.inc diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index e7a43a64d..cb315cc66 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,9 +1,9 @@ Route125:: @ 83058A8 - .4byte Route125_MapAttributes + .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 41 .byte 40 .byte 0 diff --git a/data/maps/Route125/map.bin b/data/maps/Route125/map.bin Binary files differdeleted file mode 100644 index 12dab2a0b..000000000 --- a/data/maps/Route125/map.bin +++ /dev/null diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc new file mode 100644 index 000000000..a1495ac83 --- /dev/null +++ b/data/maps/Route125/scripts.inc @@ -0,0 +1,50 @@ +Route125_MapScripts:: @ 8151F1E + map_script 3, Route125_MapScript1_151F24 + .byte 0 + +Route125_MapScript1_151F24:: @ 8151F24 + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 + end + +Route125_EventScript_151F2E:: @ 8151F2E + trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + msgbox Route125_Text_1C1013, 6 + end + +Route125_EventScript_151F45:: @ 8151F45 + trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + msgbox Route125_Text_1C1083, 6 + end + +Route125_EventScript_151F5C:: @ 8151F5C + trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + msgbox Route125_Text_1C110C, 6 + end + +Route125_EventScript_151F73:: @ 8151F73 + trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + msgbox Route125_Text_1C117F, 6 + end + +Route125_EventScript_151F8A:: @ 8151F8A + trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route125_EventScript_151FB1 + msgbox Route125_Text_1C1208, 6 + end + +Route125_EventScript_151FB1:: @ 8151FB1 + trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + msgbox Route125_Text_1C12EE, 6 + end + +Route125_EventScript_151FC8:: @ 8151FC8 + trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + msgbox Route125_Text_1C141C, 6 + end + +Route125_EventScript_151FE3:: @ 8151FE3 + trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + msgbox Route125_Text_1C1508, 6 + end diff --git a/data/maps/Route126/border.bin b/data/maps/Route126/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route126/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc index f90152ea4..f90152ea4 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/Route126/events.inc diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index a973af531..0539f9007 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,9 +1,9 @@ Route126:: @ 83058C4 - .4byte Route126_MapAttributes + .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 42 .byte 41 .byte 0 diff --git a/data/maps/Route126/map.bin b/data/maps/Route126/map.bin Binary files differdeleted file mode 100644 index 2d684cf64..000000000 --- a/data/maps/Route126/map.bin +++ /dev/null diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc new file mode 100644 index 000000000..4a28abfb7 --- /dev/null +++ b/data/maps/Route126/scripts.inc @@ -0,0 +1,27 @@ +Route126_MapScripts:: @ 8151FFE + map_script 3, Route126_MapScript1_152004 + .byte 0 + +Route126_MapScript1_152004:: @ 8152004 + call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1 + end + +Route126_EventScript_15200E:: @ 815200E + trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + msgbox Route126_Text_1C15D8, 6 + end + +Route126_EventScript_152025:: @ 8152025 + trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + msgbox Route126_Text_1C166F, 6 + end + +Route126_EventScript_15203C:: @ 815203C + trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + msgbox Route126_Text_1C1702, 6 + end + +Route126_EventScript_152053:: @ 8152053 + trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + msgbox Route126_Text_1C1773, 6 + end diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route127/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc index 66078b122..66078b122 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/Route127/events.inc diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index a9f887a2b..abd4154cc 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,9 +1,9 @@ Route127:: @ 83058E0 - .4byte Route127_MapAttributes + .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 43 .byte 42 .byte 0 diff --git a/data/maps/Route127/map.bin b/data/maps/Route127/map.bin Binary files differdeleted file mode 100644 index 3d4690c18..000000000 --- a/data/maps/Route127/map.bin +++ /dev/null diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc new file mode 100644 index 000000000..7552f7c5d --- /dev/null +++ b/data/maps/Route127/scripts.inc @@ -0,0 +1,42 @@ +Route127_MapScripts:: @ 815206A + map_script 3, Route127_MapScript1_152070 + .byte 0 + +Route127_MapScript1_152070:: @ 8152070 + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1 + end + +Route127_EventScript_15207A:: @ 815207A + trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + msgbox Route127_Text_1C17EC, 6 + end + +Route127_EventScript_152091:: @ 8152091 + trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + msgbox Route127_Text_1C1877, 6 + end + +Route127_EventScript_1520A8:: @ 81520A8 + trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + msgbox Route127_Text_1C195D, 6 + end + +Route127_EventScript_1520BF:: @ 81520BF + trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + msgbox Route127_Text_1C19E7, 6 + end + +Route127_EventScript_1520D6:: @ 81520D6 + trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + msgbox Route127_Text_1C1AA0, 6 + end + +Route127_EventScript_1520ED:: @ 81520ED + trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + msgbox Route127_Text_1C1B39, 6 + end + +Route127_EventScript_152104:: @ 8152104 + trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + msgbox Route127_Text_1C1BEC, 6 + end diff --git a/data/maps/Route128/border.bin b/data/maps/Route128/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route128/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc index 9ea71c52e..9ea71c52e 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/Route128/events.inc diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 9ecc76fb7..df2b21a6e 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,9 +1,9 @@ Route128:: @ 83058FC - .4byte Route128_MapAttributes + .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 44 .byte 43 .byte 0 diff --git a/data/maps/Route128/map.bin b/data/maps/Route128/map.bin Binary files differdeleted file mode 100644 index fae8a373e..000000000 --- a/data/maps/Route128/map.bin +++ /dev/null diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc new file mode 100644 index 000000000..ec4fb954e --- /dev/null +++ b/data/maps/Route128/scripts.inc @@ -0,0 +1,221 @@ +Route128_MapScripts:: @ 815211B + map_script 3, Route128_MapScript1_152126 + map_script 2, Route128_MapScript2_152135 + .byte 0 + +Route128_MapScript1_152126:: @ 8152126 + call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1 + call Route128_EventScript_1A0196 + end + +Route128_MapScript2_152135:: @ 8152135 + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_15213F + .2byte 0 + +Route128_EventScript_15213F:: @ 815213F + lockall + delay 20 + .ifndef SAPPHIRE + special sub_807E25C + waitstate + .endif + applymovement 4, Route128_Movement_152271 + waitmovement 0 + msgbox Route128_Text_171EE0, 4 + applymovement 4, Route128_Movement_152279 + waitmovement 0 + msgbox Route128_Text_171F35, 4 + closemessage + applymovement 5, Route128_Movement_152293 + waitmovement 0 + applymovement 4, Route128_Movement_1A0841 + waitmovement 0 + msgbox Route128_Text_171F4B, 4 + closemessage + applymovement 5, Route128_Movement_1522A1 + waitmovement 0 + applymovement 255, Route128_Movement_1A0841 + waitmovement 0 + msgbox Route128_Text_172008, 4 + closemessage + applymovement 4, Route128_Movement_15227E + applymovement 255, Route128_Movement_1A083F + applymovement 5, Route128_Movement_152290 + waitmovement 0 + msgbox Route128_Text_17210B, 4 + closemessage + delay 40 + applymovement 5, Route128_Movement_152296 + applymovement 4, Route128_Movement_152283 + waitmovement 0 + removeobject 5 + removeobject 4 + delay 100 + setfieldeffectargument 0, 1 + dofieldeffect FLDEFF_NPCFLY_OUT + waitfieldeffect FLDEFF_NPCFLY_OUT + addobject 3 + applymovement 3, Route128_Movement_15226F + waitmovement 0 + applymovement 255, Route128_Movement_1A0843 + waitmovement 0 + msgbox Route128_Text_172181, 4 + closemessage + applymovement 3, Route128_Movement_15226D + applymovement 255, Route128_Movement_1A0841 + waitmovement 0 + .ifdef SAPPHIRE + msgbox Route128_Text_1721A2, 4 + .else + msgbox Route128_Text_1722A1, 4 + .endif + applymovement 3, Route128_Movement_1A0845 + waitmovement 0 + msgbox Route128_Text_1723BE, 4 + closemessage + applymovement 3, Route128_Movement_1A0845 + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect FLDEFF_NPCFLY_OUT + delay 15 + removeobject 3 + waitfieldeffect FLDEFF_NPCFLY_OUT + setvar VAR_ROUTE128_STATE, 2 + releaseall + end + +@ 815225E + walk_fast_left + end_movement + +@ 8152260 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +Route128_Movement_15226D:: @ 815226D + walk_up + end_movement + +Route128_Movement_15226F:: @ 815226F + walk_fast_left + end_movement + +Route128_Movement_152271:: @ 8152271 + walk_fast_down + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement + +Route128_Movement_152279:: @ 8152279 + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction + end_movement + +Route128_Movement_15227E:: @ 815227E + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right + end_movement + +Route128_Movement_152283:: @ 8152283 + delay_16 + delay_16 + walk_fast_up + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +Route128_Movement_152290:: @ 8152290 + walk_left + walk_left + end_movement + +Route128_Movement_152293:: @ 8152293 + walk_left + walk_in_place_fastest_down + end_movement + +Route128_Movement_152296:: @ 8152296 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +Route128_Movement_1522A1:: @ 81522A1 + walk_right + walk_in_place_fastest_down + end_movement + +Route128_EventScript_1522A4:: @ 81522A4 + trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route128_EventScript_1522CB + msgbox Route128_Text_1C1CC3, 6 + end + +Route128_EventScript_1522CB:: @ 81522CB + trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + msgbox Route128_Text_1C1D6B, 6 + end + +Route128_EventScript_1522E2:: @ 81522E2 + trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route128_EventScript_152309 + msgbox Route128_Text_1C1E4A, 6 + end + +Route128_EventScript_152309:: @ 8152309 + trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + msgbox Route128_Text_1C1F2E, 6 + end + +Route128_EventScript_152320:: @ 8152320 + trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + msgbox Route128_Text_1C1FE8, 6 + end + +Route128_EventScript_152337:: @ 8152337 + trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 + msgbox Route128_Text_1C2060, 6 + end + +Route128_EventScript_15234E:: @ 815234E + trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC + msgbox Route128_Text_1C210D, 6 + end diff --git a/data/maps/Route128/text.inc b/data/maps/Route128/text.inc new file mode 100644 index 000000000..da813609b --- /dev/null +++ b/data/maps/Route128/text.inc @@ -0,0 +1,65 @@ +Route128_Text_171EE0:: @ 8171EE0 + .string "{EVIL_LEADER}: What happened...\n" + .string "What is this wretched scene...\p" + .string "Did I...make a horrible mistake?$" + +Route128_Text_171F35:: @ 8171F35 + .string "I...\n" + .string "I only wanted...$" + +Route128_Text_171F4B:: @ 8171F4B + .string "{GOOD_LEADER}: Do you understand now,\n" + .string "{EVIL_LEADER}?\p" + .string "Do you finally see how disastrous\n" + .string "your dream turned out to be?\p" + .string "We have to hurry! We have to do\n" + .string "something before the situation goes\l" + .string "completely out of control!$" + +Route128_Text_172008:: @ 8172008 + .string "{GOOD_LEADER}: {PLAYER}{KUN}...\p" + .string "We, TEAM {GOOD_TEAM}, had been pursuing TEAM\n" + .string "{EVIL_TEAM} to prevent this from happening.\p" + .string "You’ve been very helpful, but I fear\n" + .string "the worst has happened...\p" + .string "It’s gone too far for a child like you\n" + .string "to manage...\p" + .string "Leave things to us, and get out of\n" + .string "here while you still can!$" + +Route128_Text_17210B:: @ 817210B + .string "{GOOD_LEADER}: This defies belief...\p" + .string "A super-ancient POKéMON...\p" + .string "Its power is unbelievable.\n" + .string "It has upset the balance of nature...$" + +Route128_Text_172181:: @ 8172181 + .string "STEVEN: {PLAYER}{KUN}!\n" + .string "What is happening?$" + +Route128_Text_1721A2:: @ 81721A2 + .string "This is terrible...\p" + .string "If this doesn’t stop, all HOENN...\n" + .string "No, the whole world will drown.\p" + .string "This huge rain cloud is spreading\n" + .string "from above SOOTOPOLIS?\p" + .string "What in the world is taking place there?\p" + .string "There’s no point arguing here...\n" + .string "SOOTOPOLIS should provide answers...$" + +Route128_Text_1722A1:: @ 81722A1 + .string "This is terrible...\p" + .string "If this doesn’t stop, all of HOENN...\n" + .string "No, the whole world will be parched.\p" + .string "The cause of this calamity, the blazing\n" + .string "sun, is in the sky above SOOTOPOLIS...\p" + .string "What in the world is taking place there?\p" + .string "There’s no point arguing here...\n" + .string "SOOTOPOLIS should provide answers...$" + +Route128_Text_1723BE:: @ 81723BE + .string "{PLAYER}{KUN}...\n" + .string "I don’t know what you intend to do,\l" + .string "but don’t do anything reckless.\p" + .string "Okay.\n" + .string "I’m going to SOOTOPOLIS.$" diff --git a/data/maps/Route129/border.bin b/data/maps/Route129/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route129/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc index e86dd6ce0..e86dd6ce0 100644 --- a/data/maps/events/Route129.inc +++ b/data/maps/Route129/events.inc diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 580d69fc7..a1285fe08 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,9 +1,9 @@ Route129:: @ 8305918 - .4byte Route129_MapAttributes + .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 45 .byte 44 .byte 0 diff --git a/data/maps/Route129/map.bin b/data/maps/Route129/map.bin Binary files differdeleted file mode 100644 index 8d09787fd..000000000 --- a/data/maps/Route129/map.bin +++ /dev/null diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc new file mode 100644 index 000000000..ea43c5eab --- /dev/null +++ b/data/maps/Route129/scripts.inc @@ -0,0 +1,22 @@ +Route129_MapScripts:: @ 8152365 + .byte 0 + +Route129_EventScript_152366:: @ 8152366 + trainerbattle 0, OPPONENT_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 + msgbox Route129_Text_1C21B4, 6 + end + +Route129_EventScript_15237D:: @ 815237D + trainerbattle 0, OPPONENT_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F + msgbox Route129_Text_1C2243, 6 + end + +Route129_EventScript_152394:: @ 8152394 + trainerbattle 0, OPPONENT_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + msgbox Route129_Text_1C230F, 6 + end + +Route129_EventScript_1523AB:: @ 81523AB + trainerbattle 0, OPPONENT_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 + msgbox Route129_Text_1C23A3, 6 + end diff --git a/data/maps/Route130/border.bin b/data/maps/Route130/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route130/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc index f6770fa34..f6770fa34 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/Route130/events.inc diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index a788bf9b5..f286a2b81 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,9 +1,9 @@ Route130:: @ 8305934 - .4byte Route130_MapAttributes + .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 264 .byte 45 .byte 0 diff --git a/data/maps/Route130/map.bin b/data/maps/Route130/map.bin deleted file mode 100644 index b06fa74dc..000000000 --- a/data/maps/Route130/map.bin +++ /dev/null @@ -1 +0,0 @@ -pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppprqkllmqvppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{qklllmqvppppuvq{|||}qt}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqkklmmqvppp}~pyqqqtyppu{{vppyppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~qq{qqqt}qtppXYpppuvppppppuvyypXYpp}~ppppppXYpppppppppppppppppppppPQppp}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQpyypp}~q|ppppppppppPQppppXYppPQpppppppu{q{vpppppppppppppppuvu{qq|pppXYppppppppuvppppyppppppppppXYppppppppXYpppppuvqqqqvpppppppppppppp}~zqqqtppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~pyyyyyuvppppppu{{vpuvpyyyuvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{kmv}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuvyyppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppztppppppp}~pppppppppppppppppppppppp}~PQyyqqtp}~ppppppppppppppppppppppppp}~ppppppppppppppppppppppppppppppppppppppXYpppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppppuvy}~pppppppppppppppppppppppppppppu{{qqqqqqv}~qqtpPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc new file mode 100644 index 000000000..b0381969d --- /dev/null +++ b/data/maps/Route130/scripts.inc @@ -0,0 +1,40 @@ +Route130_MapScripts:: @ 81523C2 + map_script 3, Route130_MapScript1_1523C8 + .byte 0 + +Route130_MapScript1_1523C8:: @ 81523C8 + specialvar RESULT, IsMirageIslandPresent + compare RESULT, 1 + goto_if_eq Route130_EventScript_15240C + setflag FLAG_TEMP_11 + setflag FLAG_TEMP_12 + setflag FLAG_TEMP_13 + setflag FLAG_TEMP_14 + setflag FLAG_TEMP_15 + setflag FLAG_TEMP_16 + setflag FLAG_TEMP_17 + setflag FLAG_TEMP_18 + setflag FLAG_TEMP_19 + setflag FLAG_TEMP_1A + setflag FLAG_TEMP_1B + setflag FLAG_TEMP_1C + setflag FLAG_TEMP_1D + setflag FLAG_TEMP_1E + setflag FLAG_TEMP_1F + setflag FLAG_TEMP_20 + setmaplayoutindex 264 + end + +Route130_EventScript_15240C:: @ 815240C + setmaplayoutindex 46 + end + +Route130_EventScript_152410:: @ 8152410 + trainerbattle 0, OPPONENT_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D + msgbox Route130_Text_1C2479, 6 + end + +Route130_EventScript_152427:: @ 8152427 + trainerbattle 0, OPPONENT_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + msgbox Route130_Text_1C256E, 6 + end diff --git a/data/maps/Route131/border.bin b/data/maps/Route131/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route131/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc index 0d61e6f95..0d61e6f95 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/Route131/events.inc diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index e7d9ea231..51b4d9e4f 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,9 +1,9 @@ Route131:: @ 8305950 - .4byte Route131_MapAttributes + .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 47 .byte 46 .byte 0 diff --git a/data/maps/Route131/map.bin b/data/maps/Route131/map.bin deleted file mode 100644 index ca8079e0f..000000000 --- a/data/maps/Route131/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqqqqqqt||}ut|}ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}upppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt|||}qt}pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt|}ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt|||}ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp|}uvpu{vp}~ppppppVOOOOOOOOOOOOOVpppppppppppppppppppZ[ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppppXYppppuvppppypppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppypVOOOOOOOOVu|pppuvpppuqqvpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQpyyyyPQppppppppppppppppppppuvppppppp}~uvVVVVVVuvypppppXYuvpppppXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~pppppppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppppppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|ppppppppp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|pppppppppppPQppppppppppppppppppppppppppppppppppppppppXYyyypppppppppppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYppuvppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vpppp}~uvppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvppppp}~puqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc new file mode 100644 index 000000000..ffd204bb9 --- /dev/null +++ b/data/maps/Route131/scripts.inc @@ -0,0 +1,41 @@ +Route131_MapScripts:: @ 815243E + map_script 3, Route131_MapScript1_152444 + .byte 0 + +Route131_MapScript1_152444:: @ 8152444 + call_if_set FLAG_SYS_GAME_CLEAR, Route131_EventScript_15244E + end + +Route131_EventScript_15244E:: @ 815244E + setmaplayoutindex 320 + return + +Route131_EventScript_152452:: @ 8152452 + trainerbattle 0, OPPONENT_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + msgbox Route131_Text_1C262A, 6 + end + +Route131_EventScript_152469:: @ 8152469 + trainerbattle 0, OPPONENT_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F + msgbox Route131_Text_1C2726, 6 + end + +Route131_EventScript_152480:: @ 8152480 + trainerbattle 0, OPPONENT_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + msgbox Route131_Text_1C27CF, 6 + end + +Route131_EventScript_152497:: @ 8152497 + trainerbattle 0, OPPONENT_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 + msgbox Route131_Text_1C2898, 6 + end + +Route131_EventScript_1524AE:: @ 81524AE + trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + msgbox Route131_Text_1C2950, 6 + end + +Route131_EventScript_1524C9:: @ 81524C9 + trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + msgbox Route131_Text_1C2A5D, 6 + end diff --git a/data/maps/Route132/border.bin b/data/maps/Route132/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route132/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc index 167fbfd4b..167fbfd4b 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/Route132/events.inc diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index d7ad0b2a4..4f2e2d47f 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,9 +1,9 @@ Route132:: @ 830596C - .4byte Route132_MapAttributes + .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 48 .byte 47 .byte 0 diff --git a/data/maps/Route132/map.bin b/data/maps/Route132/map.bin Binary files differdeleted file mode 100644 index f122b2865..000000000 --- a/data/maps/Route132/map.bin +++ /dev/null diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc new file mode 100644 index 000000000..642330fd4 --- /dev/null +++ b/data/maps/Route132/scripts.inc @@ -0,0 +1,22 @@ +Route132_MapScripts:: @ 81524E4 + .byte 0 + +Route132_EventScript_1524E5:: @ 81524E5 + trainerbattle 0, OPPONENT_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + msgbox Route132_Text_1C2B71, 6 + end + +Route132_EventScript_1524FC:: @ 81524FC + trainerbattle 0, OPPONENT_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + msgbox Route132_Text_1C2BFA, 6 + end + +Route132_EventScript_152513:: @ 8152513 + trainerbattle 0, OPPONENT_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + msgbox Route132_Text_1C2C78, 6 + end + +Route132_EventScript_15252A:: @ 815252A + trainerbattle 0, OPPONENT_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + msgbox Route132_Text_1C2D3E, 6 + end diff --git a/data/maps/Route133/border.bin b/data/maps/Route133/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route133/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc index d71755575..d71755575 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/Route133/events.inc diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 4c0f718ec..3cd851068 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,9 +1,9 @@ Route133:: @ 8305988 - .4byte Route133_MapAttributes + .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 49 .byte 48 .byte 0 diff --git a/data/maps/Route133/map.bin b/data/maps/Route133/map.bin deleted file mode 100644 index dfb44fe81..000000000 --- a/data/maps/Route133/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppuvuvPQppppPQppppppuvppppPQPQppppuvPQPQPQpppPQppPQppuvPQuvppppPQPQuvPQuvpppPQPQpp}~}~XYppuvXYPQuvPQ}~PQuvXYXYppPQ}~XYXYXYpuvXYPQXYPQ}~XY}~PQuvXYXY}~XY}~PQpXYXYuvppppppuv}~ppXY}~XYccXY}~ppppPQXYpppppppPQ}~ppXYppXYccppppXY}~cccccpppppXYPQppp}~pppppp}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WcccccXYcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2111_ccccPQccccccccccccccccccccccccccccc^111111111111_ccccccc}~11111111111^WWWW_OgccccXYccccccccccccccccccccfGGN111111111_ccccVF2F2F2F21111^WWWWWWWtyo_cccccccccccccccccccccccccccccfGGN111111_cccc^^W_11111ftyyo11_cccccccccccccccccccVF2F2F2WccccccccccfGN1111_cccV>2f_11^Wtyyyyyo111OGgcccccccccccccccccccc^111?2F2F2WccccccccfGGGGgccc^^WWtyyo1111111OGgccccccccccccccccccfN11111?2F2F2WcccccccccccccV>2f1111111OGGgcccccu{{{{{{{{{{{{tccfN1111111?2F2F2Wccccccccccc^1ftyyyyo1OGGGGGgcccu{{{{tccfN111111111?2F2F2Wccccccccc^1nyyo111111_ccccccccutyyyyyyyyyy{tccfN11111111111?2F2F2Wccccccccccc^1111111OGGGgcccccu{{tyy$1$1$1$1$1$1$1$1$1$1yyy|ccfN1111111111111_cccccccccccfGN1111Ogccccccccccccu{tyyy$1111111$1$111111$1$1$1tccccfGGGGGGGGGGGGGgccccccccccfGGGGgcccccccccccccztyo11111111111111nytcccccccccccccccccccPQcccccccccccccccccccccccccc}~ppp}y~cccccccccccccccccccXYcccccccccccccccccccccccccccppppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccPQPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{tPQXYccXYcPQXYXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYppppputyyyyytyyyyy~XYcccccccXYppppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{to1111n1111?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{tyyo111111no111111?2WccpppppppppppPQXYO1O1O1O1O11_cccccccccuv}~llllcccccccccccpputo11111^_111111^_111_cppppppppppppXYO1O1O1O1O1O1O11_ccccccccc}~llllccccccccccccccc}yyyo11111no1111111fg^_1_ccpppppppppppPQO1O1O1O1O1O1O11_cccccccccclllccccccccccccccccccccc^1111^_111111111nofg1_cccppppppppppXYO1O1O1O1O1O1O11_ccccccccccccccccccccccccccccccccccfGN11fg1111111111no1_cccccpppppppccPQO1O1O1O1O1O11_cccccccccccccccccccccccccccccccccccc^11no1111OGGGN1111OgcccccccppPQccXYPQO1O1O1O11_cccccccccc\\\cccccccccccccccccccccccfN11111OGgcccfGGGGgccccccccccXYccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfN111OgccccccccccccccccccccccccccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp
\ No newline at end of file diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc new file mode 100644 index 000000000..78bec4141 --- /dev/null +++ b/data/maps/Route133/scripts.inc @@ -0,0 +1,27 @@ +Route133_MapScripts:: @ 8152541 + .byte 0 + +Route133_EventScript_152542:: @ 8152542 + trainerbattle 0, OPPONENT_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + msgbox Route133_Text_1C2E09, 6 + end + +Route133_EventScript_152559:: @ 8152559 + trainerbattle 0, OPPONENT_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + msgbox Route133_Text_1C2ECD, 6 + end + +Route133_EventScript_152570:: @ 8152570 + trainerbattle 0, OPPONENT_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + msgbox Route133_Text_1C2F25, 6 + end + +Route133_EventScript_152587:: @ 8152587 + trainerbattle 0, OPPONENT_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + msgbox Route133_Text_1C2FC7, 6 + end + +Route133_EventScript_15259E:: @ 815259E + trainerbattle 0, OPPONENT_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F + msgbox Route133_Text_1C307E, 6 + end diff --git a/data/maps/Route134/border.bin b/data/maps/Route134/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route134/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc index b167d48b1..b167d48b1 100644 --- a/data/maps/events/Route134.inc +++ b/data/maps/Route134/events.inc diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 2ca22c40e..15fe8168e 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,9 +1,9 @@ Route134:: @ 83059A4 - .4byte Route134_MapAttributes + .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections - .2byte BGM_GRANROAD + .2byte MUS_GRANROAD .2byte 50 .byte 49 .byte 0 diff --git a/data/maps/Route134/map.bin b/data/maps/Route134/map.bin Binary files differdeleted file mode 100644 index fbb491539..000000000 --- a/data/maps/Route134/map.bin +++ /dev/null diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc new file mode 100644 index 000000000..06b53ce31 --- /dev/null +++ b/data/maps/Route134/scripts.inc @@ -0,0 +1,32 @@ +Route134_MapScripts:: @ 81525B5 + map_script 5, Route134_MapScript1_1525BB + .byte 0 + +Route134_MapScript1_1525BB:: @ 81525BB + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 + end + +Route134_EventScript_1525C4:: @ 81525C4 + trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + msgbox Route134_Text_1C311A, 6 + end + +Route134_EventScript_1525DB:: @ 81525DB + trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + msgbox Route134_Text_1C31A0, 6 + end + +Route134_EventScript_1525F2:: @ 81525F2 + trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + msgbox Route134_Text_1C3229, 6 + end + +Route134_EventScript_152609:: @ 8152609 + trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + msgbox Route134_Text_1C336E, 6 + end + +Route134_EventScript_152620:: @ 8152620 + trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + msgbox Route134_Text_1C32D6, 6 + end diff --git a/data/maps/RustboroCity/border.bin b/data/maps/RustboroCity/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/RustboroCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc index bfc6cff77..bfc6cff77 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/RustboroCity/events.inc diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index d1352ea3e..73af7f1fc 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,9 +1,9 @@ RustboroCity:: @ 830549C - .4byte RustboroCity_MapAttributes + .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 4 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity/map.bin b/data/maps/RustboroCity/map.bin Binary files differdeleted file mode 100644 index d8921ec3f..000000000 --- a/data/maps/RustboroCity/map.bin +++ /dev/null diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc new file mode 100644 index 000000000..72699ab79 --- /dev/null +++ b/data/maps/RustboroCity/scripts.inc @@ -0,0 +1,584 @@ +RustboroCity_MapScripts:: @ 814C372 + map_script 3, RustboroCity_MapScript1_14C378 + .byte 0 + +RustboroCity_MapScript1_14C378:: @ 814C378 + setflag FLAG_VISITED_RUSTBORO_CITY + call RustboroCity_EventScript_1A0196 + call RustboroCity_EventScript_1A014E + end + +RustboroCity_EventScript_14C386:: @ 814C386 + lock + faceplayer + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B + msgbox RustboroCity_Text_16689D, 4 + release + end + +RustboroCity_EventScript_14C39B:: @ 814C39B + msgbox RustboroCity_Text_16690C, 4 + release + end + +RustboroCity_EventScript_14C3A5:: @ 814C3A5 + lock + faceplayer + msgbox RustboroCity_Text_166A67, 4 + release + end + +RustboroCity_EventScript_14C3B1:: @ 814C3B1 + msgbox RustboroCity_Text_166AE0, 2 + end + +RustboroCity_EventScript_14C3BA:: @ 814C3BA + lock + faceplayer + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF + msgbox RustboroCity_Text_16696D, 4 + release + end + +RustboroCity_EventScript_14C3CF:: @ 814C3CF + msgbox RustboroCity_Text_1669FE, 4 + release + end + +RustboroCity_EventScript_14C3D9:: @ 814C3D9 + lock + faceplayer + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE + msgbox RustboroCity_Text_166B86, 4 + release + end + +RustboroCity_EventScript_14C3EE:: @ 814C3EE + msgbox RustboroCity_Text_166BEF, 4 + release + end + +RustboroCity_EventScript_14C3F8:: @ 814C3F8 + msgbox RustboroCity_Text_166C98, 2 + end + +RustboroCity_EventScript_14C401:: @ 814C401 + msgbox RustboroCity_Text_166CFA, 3 + end + +RustboroCity_EventScript_14C40A:: @ 814C40A + msgbox RustboroCity_Text_167374, 3 + end + +RustboroCity_EventScript_14C413:: @ 814C413 + msgbox RustboroCity_Text_1673FA, 3 + end + +RustboroCity_EventScript_14C41C:: @ 814C41C + msgbox RustboroCity_Text_167439, 3 + end + +@ 814C425 + msgbox RustboroCity_Text_167485, 3 + end + +RustboroCity_EventScript_14C42E:: @ 814C42E + msgbox RustboroCity_Text_1674DD, 3 + end + +RustboroCity_EventScript_14C437:: @ 814C437 + msgbox RustboroCity_Text_167525, 3 + end + +RustboroCity_EventScript_14C440:: @ 814C440 + msgbox RustboroCity_Text_167568, 3 + end + +RustboroCity_EventScript_14C449:: @ 814C449 + lock + faceplayer + msgbox RustboroCity_Text_166D59, 4 + applymovement 7, RustboroCity_Movement_1A083D + waitmovement 0 + release + end + +RustboroCity_EventScript_14C45F:: @ 814C45F + lock + faceplayer + msgbox RustboroCity_Text_166DB0, 4 + applymovement 8, RustboroCity_Movement_1A083D + waitmovement 0 + release + end + +RustboroCity_EventScript_14C475:: @ 814C475 + lock + faceplayer + msgbox RustboroCity_Text_166DEE, 4 + release + end + +RustboroCity_EventScript_14C481:: @ 814C481 + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_SPECIAL_4, 0 + goto RustboroCity_EventScript_14C4F4 + end + +RustboroCity_EventScript_14C498:: @ 814C498 + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_SPECIAL_4, 1 + goto RustboroCity_EventScript_14C4F4 + end + +RustboroCity_EventScript_14C4AF:: @ 814C4AF + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_SPECIAL_4, 2 + goto RustboroCity_EventScript_14C4F4 + end + +RustboroCity_EventScript_14C4C6:: @ 814C4C6 + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_SPECIAL_4, 3 + goto RustboroCity_EventScript_14C4F4 + end + +RustboroCity_EventScript_14C4DD:: @ 814C4DD + lockall + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 + setvar VAR_SPECIAL_4, 4 + goto RustboroCity_EventScript_14C4F4 + end + +RustboroCity_EventScript_14C4F4:: @ 814C4F4 + msgbox RustboroCity_Text_166E65, 4 + closemessage + addobject 10 + addobject 9 + applymovement 10, RustboroCity_Movement_14C5C2 + waitmovement 0 + removeobject 10 + applymovement 9, RustboroCity_Movement_14C5D3 + waitmovement 0 + msgbox RustboroCity_Text_166E7E, 4 + closemessage + applymovement 9, RustboroCity_Movement_14C5DB + waitmovement 0 + removeobject 9 + setobjectxyperm 9, 30, 10 + clearflag FLAG_HIDE_DEVON_RUSTBORO + setflag FLAG_DEVON_GOODS_STOLEN + setvar VAR_RUSTBORO_STATE, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 + setvar VAR_ROUTE116_STATE, 1 + clearflag FLAG_HIDE_BRINEY_ROUTE116 + clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + releaseall + end + +@ 814C55D + msgbox RustboroCity_Text_166F6B, 4 + return + +@ 814C566 + msgbox RustboroCity_Text_166FB4, 4 + return + +@ 814C56F + applymovement 9, RustboroCity_Movement_14C5E3 + waitmovement 0 + return + +@ 814C57A + applymovement 9, RustboroCity_Movement_14C5E7 + waitmovement 0 + return + +@ 814C585 + applymovement 9, RustboroCity_Movement_14C5EC + waitmovement 0 + return + +@ 814C590 + applymovement 9, RustboroCity_Movement_14C5F1 + waitmovement 0 + return + +@ 814C59B + applymovement 9, RustboroCity_Movement_14C5F7 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 + return + +@ 814C5B0 + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +RustboroCity_Movement_14C5C2:: @ 814C5C2 + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement + +RustboroCity_Movement_14C5D3:: @ 814C5D3 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement + +RustboroCity_Movement_14C5DB:: @ 814C5DB + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement + +RustboroCity_Movement_14C5E3:: @ 814C5E3 + walk_down + walk_right + walk_right + end_movement + +RustboroCity_Movement_14C5E7:: @ 814C5E7 + walk_down + walk_down + walk_right + walk_right + end_movement + +RustboroCity_Movement_14C5EC:: @ 814C5EC + walk_down + walk_down + walk_right + walk_right + end_movement + +RustboroCity_Movement_14C5F1:: @ 814C5F1 + walk_down + walk_down + walk_down + walk_right + walk_right + end_movement + +RustboroCity_Movement_14C5F7:: @ 814C5F7 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement + +RustboroCity_EventScript_14C5FF:: @ 814C5FF + lock + faceplayer + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614 + msgbox RustboroCity_Text_166F6B, 4 + release + end + +RustboroCity_EventScript_14C614:: @ 814C614 + waitse + setvar VAR_TEMP_1, 4 + goto RustboroCity_EventScript_14C77D + end + +RustboroCity_EventScript_14C620:: @ 814C620 + lockall + setvar VAR_TEMP_1, 0 + goto RustboroCity_EventScript_14C650 + end + +RustboroCity_EventScript_14C62C:: @ 814C62C + lockall + setvar VAR_TEMP_1, 1 + goto RustboroCity_EventScript_14C650 + end + +RustboroCity_EventScript_14C638:: @ 814C638 + lockall + setvar VAR_TEMP_1, 2 + goto RustboroCity_EventScript_14C650 + end + +RustboroCity_EventScript_14C644:: @ 814C644 + lockall + setvar VAR_TEMP_1, 3 + goto RustboroCity_EventScript_14C650 + end + +RustboroCity_EventScript_14C650:: @ 814C650 + compare VAR_TEMP_1, 0 + call_if_eq RustboroCity_EventScript_14C691 + compare VAR_TEMP_1, 1 + call_if_eq RustboroCity_EventScript_14C6BD + compare VAR_TEMP_1, 2 + call_if_eq RustboroCity_EventScript_14C6E9 + compare VAR_TEMP_1, 3 + call_if_eq RustboroCity_EventScript_14C715 + setflag FLAG_UNKNOWN_9F + setvar VAR_RUSTBORO_STATE, 3 + moveobjectoffscreen 9 + msgbox RustboroCity_Text_166EA5, 4 + releaseall + end + +RustboroCity_EventScript_14C691:: @ 814C691 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 + return + +RustboroCity_EventScript_14C6BD:: @ 814C6BD + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0843 + waitmovement 0 + return + +RustboroCity_EventScript_14C6E9:: @ 814C6E9 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 + return + +RustboroCity_EventScript_14C715:: @ 814C715 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 + return + +RustboroCity_Movement_14C74B:: @ 814C74B + walk_down + end_movement + +RustboroCity_EventScript_14C74D:: @ 814C74D + lockall + setvar VAR_TEMP_1, 0 + goto RustboroCity_EventScript_14C77D + end + +RustboroCity_EventScript_14C759:: @ 814C759 + lockall + setvar VAR_TEMP_1, 1 + goto RustboroCity_EventScript_14C77D + end + +RustboroCity_EventScript_14C765:: @ 814C765 + lockall + setvar VAR_TEMP_1, 2 + goto RustboroCity_EventScript_14C77D + end + +RustboroCity_EventScript_14C771:: @ 814C771 + lockall + setvar VAR_TEMP_1, 3 + goto RustboroCity_EventScript_14C77D + end + +RustboroCity_EventScript_14C77D:: @ 814C77D + compare VAR_TEMP_1, 0 + call_if_eq RustboroCity_EventScript_14C7FE + compare VAR_TEMP_1, 1 + call_if_eq RustboroCity_EventScript_14C82A + compare VAR_TEMP_1, 2 + call_if_eq RustboroCity_EventScript_14C856 + compare VAR_TEMP_1, 3 + call_if_eq RustboroCity_EventScript_14C882 + compare VAR_TEMP_1, 4 + call_if_eq RustboroCity_EventScript_14C8B8 + msgbox RustboroCity_Text_166FB4, 4 + giveitem_std ITEM_GREAT_BALL + compare RESULT, 0 + call_if_eq RustboroCity_EventScript_14C7F5 + msgbox RustboroCity_Text_16707F, 4 + closemessage + setflag FLAG_RETURNED_DEVON_GOODS + setflag FLAG_HIDE_DEVON_RUSTBORO + setvar VAR_RUSTBORO_STATE, 5 + delay 30 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 + waitstate + releaseall + end + +RustboroCity_EventScript_14C7F5:: @ 814C7F5 + msgbox RustboroCity_Text_16704C, 4 + return + +RustboroCity_EventScript_14C7FE:: @ 814C7FE + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 + return + +RustboroCity_EventScript_14C82A:: @ 814C82A + applymovement 9, RustboroCity_Movement_1A0843 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A083F + waitmovement 0 + return + +RustboroCity_EventScript_14C856:: @ 814C856 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 + return + +RustboroCity_EventScript_14C882:: @ 814C882 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 + return + +RustboroCity_EventScript_14C8B8:: @ 814C8B8 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 + playse SE_PIN + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + return + +RustboroCity_EventScript_14C8DA:: @ 814C8DA + lock + faceplayer + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 + checkplayergender + compare RESULT, 0 + goto_if_eq RustboroCity_EventScript_14C8FD + compare RESULT, 1 + goto_if_eq RustboroCity_EventScript_14C90A + end + +RustboroCity_EventScript_14C8FD:: @ 814C8FD + setflag FLAG_MET_RIVAL_RUSTBORO + msgbox RustboroCity_Text_1670A7, 4 + release + end + +RustboroCity_EventScript_14C90A:: @ 814C90A + setflag FLAG_MET_RIVAL_RUSTBORO + msgbox RustboroCity_Text_167213, 4 + release + end + +RustboroCity_EventScript_14C917:: @ 814C917 + checkplayergender + compare RESULT, 0 + goto_if_eq RustboroCity_EventScript_14C92F + compare RESULT, 1 + goto_if_eq RustboroCity_EventScript_14C939 + end + +RustboroCity_EventScript_14C92F:: @ 814C92F + msgbox RustboroCity_Text_16713C, 4 + release + end + +RustboroCity_EventScript_14C939:: @ 814C939 + msgbox RustboroCity_Text_1672B8, 4 + release + end diff --git a/data/maps/RustboroCity/text.inc b/data/maps/RustboroCity/text.inc new file mode 100644 index 000000000..4f2954f35 --- /dev/null +++ b/data/maps/RustboroCity/text.inc @@ -0,0 +1,178 @@ +RustboroCity_Text_16689D:: @ 816689D + .string "The DEVON CORPORATION...\n" + .string "We all just shorten it to DEVON.\p" + .string "That company makes all sorts of\n" + .string "convenient products.$" + +RustboroCity_Text_16690C:: @ 816690C + .string "Hm? A sneaky-looking man?\p" + .string "Come to think of it, yes, a shady-\n" + .string "looking guy went around the corner.$" + +RustboroCity_Text_16696D:: @ 816696D + .string "Have you taken the POKéMON GYM\n" + .string "challenge?\p" + .string "When you get that shiny GYM BADGE\n" + .string "in hand, I guess TRAINERS begin to\l" + .string "realize what is required of them.$" + +RustboroCity_Text_1669FE:: @ 81669FE + .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" + .string "Out of all the POKéMON GYM BADGES,\n" + .string "RUSTBORO’s is the coolest, I’d say.$" + +RustboroCity_Text_166A67:: @ 8166A67 + .string "Oh? Who might you be?\n" + .string "You’re a new face around these parts.\p" + .string "Have you just transferred into the\n" + .string "POKéMON TRAINER’S SCHOOL?$" + +RustboroCity_Text_166AE0:: @ 8166AE0 + .string "I challenged the GYM LEADER, but...\p" + .string "It’s not going to be easy winning with\n" + .string "my FIRE-type POKéMON...\p" + .string "FIRE-type POKéMON don’t match up\n" + .string "well against ROCK-type POKéMON...$" + +RustboroCity_Text_166B86:: @ 8166B86 + .string "The old sailor MR. BRINEY lives in a\n" + .string "cottage by the sea.\p" + .string "He goes for walks in the tunnel every\n" + .string "so often.$" + +RustboroCity_Text_166BEF:: @ 8166BEF + .string "The old sailor MR. BRINEY lives in a\n" + .string "cottage by the sea.\p" + .string "He said he was going shopping in\n" + .string "SLATEPORT for his pet, PEEKO.\p" + .string "That old seadog, he must really love\n" + .string "that PEEKO.$" + +RustboroCity_Text_166C98:: @ 8166C98 + .string "Wow, you have POKéMON with you, too.\p" + .string "When I get bigger, I’m going to go\n" + .string "places with POKéMON, too.$" + +RustboroCity_Text_166CFA:: @ 8166CFA + .string "POKéMON TRAINER’S SCHOOL!\p" + .string "If I go to this school, will I be able\n" + .string "to catch rare POKéMON easily?$" + +RustboroCity_Text_166D59:: @ 8166D59 + .string "If a POKéMON gains experience in\n" + .string "battles, it can sometimes change in\l" + .string "the way it looks.$" + +RustboroCity_Text_166DB0:: @ 8166DB0 + .string "A POKéMON changes shape?\n" + .string "If one did that, I would be shocked!$" + +RustboroCity_Text_166DEE:: @ 8166DEE + .string "A POKéMON you get in a trade from\n" + .string "someone grows fast.\p" + .string "But if you don’t have certain GYM\n" + .string "BADGES, it may not obey you...$" + +RustboroCity_Text_166E65:: @ 8166E65 + .string "Get out! Out of the way!$" + +RustboroCity_Text_166E7E:: @ 8166E7E + .string "Wait! Pleeeaaase!\p" + .string "Don’t take my GOODS!$" + +RustboroCity_Text_166EA5:: @ 8166EA5 + .string "Oh, it’s you!\p" + .string "You’re that fantastic TRAINER who\n" + .string "helped me in PETALBURG WOODS!\p" + .string "Help me! I was robbed by TEAM {EVIL_TEAM}!\n" + .string "I have to get the DEVON GOODS back!\p" + .string "If I don’t...\n" + .string "I’m going to be in serious trouble.$" + +RustboroCity_Text_166F6B:: @ 8166F6B + .string "That shady character, I think he took\n" + .string "off towards the tunnel over there.$" + +RustboroCity_Text_166FB4:: @ 8166FB4 + .string "Oh! How did it go?\n" + .string "The DEVON GOODS?\p" + .string "You did!\n" + .string "You got them back!\p" + .string "You really are a great TRAINER!\p" + .string "I know! As my thanks, I’ll give you\n" + .string "another GREAT BALL!$" + +RustboroCity_Text_16704C:: @ 816704C + .string "Your BAG’s full.\n" + .string "I can’t give you this GREAT BALL.$" + +RustboroCity_Text_16707F:: @ 816707F + .string "Excuse me, please!\n" + .string "Please come with me!$" + +RustboroCity_Text_1670A7:: @ 81670A7 + .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" + .string "How’s your POKéDEX coming along?\p" + .string "Mine’s looking pretty decent.\p" + .string "I caught POKéMON in PETALBURG WOODS\n" + .string "until I ran out of POKé BALLS.$" + +RustboroCity_Text_16713C:: @ 816713C + .string "MAY: Oh, by the way, I passed MR. BRINEY\n" + .string "in PETALBURG WOODS.\p" + .string "I guess he’s on his way home to his\n" + .string "cottage by the sea.\p" + .string "{PLAYER}{KUN}, you just moved here so you\n" + .string "might not know this, but MR. BRINEY\l" + .string "was once a revered seafarer.$" + +RustboroCity_Text_167213:: @ 8167213 + .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" + .string "Have you filled in any pages yet?\p" + .string "Mine rules.\p" + .string "I went on a POKéMON-catching frenzy\n" + .string "in PETALBURG WOODS until I ran out\l" + .string "of POKé BALLS.$" + +RustboroCity_Text_1672B8:: @ 81672B8 + .string "BRENDAN: By the way, I walked by MR.\n" + .string "BRINEY in PETALBURG WOODS.\p" + .string "I bet he was on his way home to his\n" + .string "cottage by the sea.\p" + .string "I bet you didn’t know this, but he’s\n" + .string "always got a POKéMON with him.$" + +RustboroCity_Text_167374:: @ 8167374 + .string "“Timesaving tunnel nearing\n" + .string "completion!”\p" + .string "...Is what it says on the sign, but\n" + .string "there’s also a big “X” splashed\l" + .string "across it in red paint...$" + +RustboroCity_Text_1673FA:: @ 81673FA + .string "DEVON CORPORATION\p" + .string "“For all your living needs, we make\n" + .string "it all.”$" + +RustboroCity_Text_167439:: @ 8167439 + .string "RUSTBORO CITY POKéMON GYM\n" + .string "LEADER: ROXANNE\p" + .string "“The ROCK-loving honors student!”$" + +RustboroCity_Text_167485: @ 8167485 + .string "DEVON CORP. BRANCH OFFICE\p" + .string "“Access limited to DEVON employees\n" + .string "and authorized personnel.”$" + +RustboroCity_Text_1674DD:: @ 81674DD + .string "RUSTBORO CITY\p" + .string "“The city probing the integration of\n" + .string "nature and science.”$" + +RustboroCity_Text_167525:: @ 8167525 + .string "POKéMON TRAINER’S SCHOOL\p" + .string "“We’ll teach you anything about\n" + .string "POKéMON!”$" + +RustboroCity_Text_167568:: @ 8167568 + .string "CUTTER’S HOUSE$" diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/maps/RustboroCity_CuttersHouse/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_CuttersHouse/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index 6a96e223c..6a96e223c 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index c3b5a6d7c..c1aa1fc37 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,9 +1,9 @@ RustboroCity_CuttersHouse:: @ 8306360 - .4byte RustboroCity_CuttersHouse_MapAttributes + .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 98 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/maps/RustboroCity_CuttersHouse/map.bin deleted file mode 100644 index 5515d00cf..000000000 --- a/data/maps/RustboroCity_CuttersHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -yzfg8898x88no@@A@VW33v3w3+3+3+3+33^3_3+3{3|3|3}3,3,3,3,3,3,3+33>2>23,3,3,3j7k7E3+33>2>23,3,3D3r7s7E3+33333,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3
\ No newline at end of file diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc new file mode 100644 index 000000000..b43e0aafe --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -0,0 +1,22 @@ +RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 + .byte 0 + +RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 + lock + faceplayer + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 + msgbox RustboroCity_CuttersHouse_Text_18509C, 4 + giveitem_std ITEM_HM01_CUT + setflag FLAG_RECEIVED_HM01 + msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 + release + end + +RustboroCity_CuttersHouse_EventScript_157D53:: @ 8157D53 + msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 + release + end + +RustboroCity_CuttersHouse_EventScript_157D5D:: @ 8157D5D + msgbox RustboroCity_CuttersHouse_Text_1852B3, 2 + end diff --git a/data/maps/RustboroCity_CuttersHouse/text.inc b/data/maps/RustboroCity_CuttersHouse/text.inc new file mode 100644 index 000000000..8b4c237f5 --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/text.inc @@ -0,0 +1,27 @@ +RustboroCity_CuttersHouse_Text_18509C:: @ 818509C + .string "That determined expression...\n" + .string "That limber way you move...\l" + .string "And your well-trained POKéMON...\p" + .string "You’re obviously a skilled TRAINER!\p" + .string "No, wait, don’t say a word.\n" + .string "I can tell just by looking at you.\p" + .string "I’m sure that you will be capable\n" + .string "of putting this HM to good use.\p" + .string "No need to be modest or shy.\n" + .string "Go on, take it!$" + +RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 + .string "That HM, it’s CUT.\p" + .string "An HM move is one that can be used\n" + .string "by POKéMON out of a battle.\p" + .string "Any POKéMON that’s learned CUT can\n" + .string "chop down thin trees if the TRAINER\l" + .string "has earned the STONE BADGE.\p" + .string "And, unlike a TM, an HM doesn’t break\n" + .string "after one use.$" + +RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 + .string "When they were expanding the city of\n" + .string "RUSTBORO, my dad helped out.\p" + .string "He made his POKéMON use CUT to clear\n" + .string "the land of trees.$" diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/maps/RustboroCity_DevonCorp_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index 5cfbd5134..5cfbd5134 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 5539006ff..e0148dea7 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,9 +1,9 @@ RustboroCity_DevonCorp_1F:: @ 830622C - .4byte RustboroCity_DevonCorp_1F_MapAttributes + .4byte RustboroCity_DevonCorp_1F_Layout .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 92 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/maps/RustboroCity_DevonCorp_1F/map.bin deleted file mode 100644 index 78cc0c199..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -333333333333333333333333333333333333333333333333333333333333333333333333333333333333322333333333333
\ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc new file mode 100644 index 000000000..7b56c72a2 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -0,0 +1,71 @@ +RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 + map_script 3, RustboroCity_DevonCorp_1F_MapScript1_15740C + .byte 0 + +RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416 + end + +RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 + setobjectxyperm 2, 14, 2 + setobjectmovementtype 2, 8 + return + +RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 + lock + faceplayer + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440 + msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_157440:: @ 8157440 + msgbox RustboroCity_DevonCorp_1F_Text_182A19, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A + msgbox RustboroCity_DevonCorp_1F_Text_182AB3, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 + lock + faceplayer + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485 + msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_15747B:: @ 815747B + msgbox RustboroCity_DevonCorp_1F_Text_182B5A, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 + msgbox RustboroCity_DevonCorp_1F_Text_182B2D, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F + lock + faceplayer + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0 + msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_1574B6:: @ 81574B6 + msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 + release + end + +RustboroCity_DevonCorp_1F_EventScript_1574C0:: @ 81574C0 + msgbox RustboroCity_DevonCorp_1F_Text_18295E, 4 + release + end diff --git a/data/maps/RustboroCity_DevonCorp_1F/text.inc b/data/maps/RustboroCity_DevonCorp_1F/text.inc new file mode 100644 index 000000000..209fd049c --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/text.inc @@ -0,0 +1,38 @@ +RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE + .string "Hello and welcome to the DEVON\n" + .string "CORPORATION.\p" + .string "We’re proud producers of items and\n" + .string "medicine that enhance your life.$" + +RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E + .string "One of our research staff stupidly\n" + .string "got robbed of an important parcel.$" + +RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 + .string "Hey, those RUNNING SHOES!\n" + .string "They’re one of our products!\p" + .string "It makes me happy when I see someone\n" + .string "using something we made.$" + +RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 + .string "That stolen parcel...\p" + .string "Well, sure it’s important, but it’s not\n" + .string "anything that anyone can use.\p" + .string "In my estimation, that robber must not\n" + .string "have been very bright.$" + +RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 + .string "It sounds like they’ve recovered\n" + .string "the ripped-off DEVON GOODS.$" + +RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 + .string "I’m sorry, only authorized people\n" + .string "are allowed to enter here.$" + +RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D + .string "It’s beyond stupid.\n" + .string "How could we get robbed?$" + +RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A + .string "Hi, there!\n" + .string "You’re always welcome here!$" diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/maps/RustboroCity_DevonCorp_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index 1babeffd7..1babeffd7 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 76bbea60b..dbed45197 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,9 +1,9 @@ RustboroCity_DevonCorp_2F:: @ 8306248 - .4byte RustboroCity_DevonCorp_2F_MapAttributes + .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 93 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/maps/RustboroCity_DevonCorp_2F/map.bin deleted file mode 100644 index 03985c572..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -33333333333333333333333333333333333337773377337733773333377333733333333333333333333333333333333333377337733773333333333333333333333
\ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc new file mode 100644 index 000000000..e0b0e30f8 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -0,0 +1,175 @@ +RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA + map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0 + .byte 0 + +RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + end + +RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 + return + +RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 + lock + faceplayer + compare VAR_FOSSIL_RESURRECTION_STATE, 1 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 + lock + faceplayer + compare VAR_FOSSIL_RESURRECTION_STATE, 1 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519 + msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 + msgbox RustboroCity_DevonCorp_2F_Text_182C25, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 + lock + faceplayer + compare VAR_FOSSIL_RESURRECTION_STATE, 1 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543 + msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 + msgbox RustboroCity_DevonCorp_2F_Text_182D7E, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D + lock + faceplayer + compare VAR_FOSSIL_RESURRECTION_STATE, 1 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 + lock + faceplayer + compare VAR_FOSSIL_RESURRECTION_STATE, 2 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A + compare VAR_FOSSIL_RESURRECTION_STATE, 1 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 + msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 + checkitem ITEM_ROOT_FOSSIL, 1 + compare RESULT, 1 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 + checkitem ITEM_CLAW_FOSSIL, 1 + compare RESULT, 1 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE + release + end + +RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 + closemessage + playse SE_PIN + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + waitmovement 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 + bufferitemname 0, ITEM_ROOT_FOSSIL + msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 + takeitem ITEM_ROOT_FOSSIL, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 + release + end + +RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE + closemessage + playse SE_PIN + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + waitmovement 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 + bufferitemname 0, ITEM_CLAW_FOSSIL + msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 + takeitem ITEM_CLAW_FOSSIL, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636 + msgbox RustboroCity_DevonCorp_2F_Text_182FD7, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 + msgbox RustboroCity_DevonCorp_2F_Text_183072, 4 + release + end + +RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A + compare VAR_WHICH_FOSSIL_REVIVED, 1 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 + compare VAR_WHICH_FOSSIL_REVIVED, 2 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 + end + +RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 + bufferspeciesname 1, SPECIES_LILEEP + msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 + getpartysize + compare RESULT, 6 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 + copyvar VAR_SPECIAL_4, RESULT + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 + setflag FLAG_RECEIVED_FOSSIL_MON + playfanfare MUS_FANFA4 + message RustboroCity_DevonCorp_2F_Text_18319E + waitfanfare + waitmessage + givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 + release + end + +RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 + bufferspeciesname 1, SPECIES_ANORITH + msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 + getpartysize + compare RESULT, 6 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 + copyvar VAR_SPECIAL_4, RESULT + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 + setflag FLAG_RECEIVED_FOSSIL_MON + playfanfare MUS_FANFA4 + message RustboroCity_DevonCorp_2F_Text_18319E + waitfanfare + waitmessage + givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 + release + end + +RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707 + msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4 + release + end diff --git a/data/maps/RustboroCity_DevonCorp_2F/text.inc b/data/maps/RustboroCity_DevonCorp_2F/text.inc new file mode 100644 index 000000000..a6a6bb6c2 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/text.inc @@ -0,0 +1,88 @@ +RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 + .string "We’re developing a device for talking\n" + .string "with POKéMON.\p" + .string "But we haven’t had much success...$" + +RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 + .string "I’m developing new kinds of\n" + .string "POKé BALLS...\p" + .string "But I haven’t made much headway...$" + +RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 + .string "We finally made new kinds of POKé BALLS!\p" + .string "The REPEAT BALL makes it easier to\n" + .string "catch POKéMON you’d caught before.\p" + .string "The TIMER BALL gets better at catching\n" + .string "POKéMON the longer a battle runs.\p" + .string "Both are proudly developed by the\n" + .string "DEVON CORPORATION.\p" + .string "Please give them a try!$" + +RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A + .string "I made the POKéNAV!\p" + .string "As an engineer, I feel blessed to have\n" + .string "made something so great!$" + +RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E + .string "Oh, wow!\n" + .string "That’s a POKéNAV!\p" + .string "It came about as a result of our\n" + .string "PRESIDENT’s desire to learn about\l" + .string "the feelings of POKéMON.\p" + .string "Would you like me to describe its\n" + .string "features in detail?\p" + .string "No, no. I think you’ll find out just by\n" + .string "trying the POKéNAV out.$" + +RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B + .string "I’m trying to develop a device that\n" + .string "visually reproduces the dreams of\l" + .string "POKéMON...\p" + .string "But it’s not going well.$" + +RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 + .string "I’ve been trying to develop a device\n" + .string "that resurrects POKéMON from fossils...\p" + .string "And, it’s working!$" + +RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 + .string "Wait! That thing you have there...\n" + .string "Is that a POKéMON fossil?\p" + .string "Would you like to bring that POKéMON\n" + .string "back to life?\p" + .string "I can with my newly developed\n" + .string "FOSSIL REGENERATOR.$" + +RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 + .string "Oh, is that so?\p" + .string "DEVON’s technological expertise\n" + .string "is outstanding, I tell you.$" + +RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 + .string "Excellent!\n" + .string "Let’s do this right away.\p" + .string "{PLAYER} handed the {STR_VAR_1} to\n" + .string "the DEVON RESEARCHER.$" + +RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 + .string "The FOSSIL REGENERATOR, which I made,\n" + .string "is incredible.\p" + .string "But it has one drawback - it takes\n" + .string "a long time to work.\p" + .string "So, uh... How about you go for a stroll\n" + .string "and look around for a while?$" + +RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 + .string "Thanks for waiting!\p" + .string "Your fossilized POKéMON has been\n" + .string "brought back to life!\p" + .string "The fossil was an ancient POKéMON.\n" + .string "{STR_VAR_2}, it was!$" + +RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E + .string "{PLAYER} received {STR_VAR_2} from\n" + .string "the DEVON RESEARCHER.$" + +RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 + .string "Uh-oh, you’ve got too many POKéMON.\n" + .string "You have no room for this one.$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/maps/RustboroCity_DevonCorp_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index b77f343af..b77f343af 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index c3d4549de..b8cadbed2 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,9 +1,9 @@ RustboroCity_DevonCorp_3F:: @ 8306264 - .4byte RustboroCity_DevonCorp_3F_MapAttributes + .4byte RustboroCity_DevonCorp_3F_Layout .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 270 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/maps/RustboroCity_DevonCorp_3F/map.bin deleted file mode 100644 index 8333a8bc3..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -IJK33333333Q3R3S333333333333333333333333333332333H33333233333P33333333233333333333333333333333333333333333333333333333
\ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc new file mode 100644 index 000000000..cead5e5a2 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -0,0 +1,194 @@ +RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 + map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721 + map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739 + map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748 + .byte 0 + +RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 + compare VAR_DEVON_CORP_3F_STATE, 0 + call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D + end + +RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D + setobjectxyperm 2, 3, 2 + setobjectmovementtype 2, 9 + return + +RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743 + .2byte 0 + +RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 + turnobject 255, 4 + end + +RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752 + .2byte 0 + +RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 + lockall + msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4 + closemessage + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 + waitmovement 0 + delay 80 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E + waitmovement 0 + msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 + closemessage + playbgm MUS_TSURETEK, FALSE + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 + waitmovement 0 + msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 + closemessage + fadedefaultbgm + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 + waitmovement 0 + msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 + giveitem_std ITEM_LETTER + msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 + playfanfare MUS_FANFA4 + message RustboroCity_DevonCorp_3F_Text_183422 + waitfanfare + waitmessage + setflag FLAG_SYS_POKENAV_GET + setflag FLAG_RECEIVED_POKENAV + msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 + setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setvar VAR_BRINEY_LOCATION, 1 + clearflag FLAG_HIDE_RIVAL_RUSTBORO + setvar VAR_DEVON_CORP_3F_STATE, 1 + releaseall + end + +@ 81577FE + walk_up + walk_up + walk_up + walk_in_place_fastest_left + end_movement + +RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left + end_movement + +RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 + delay_16 + walk_in_place_fastest_down + end_movement + +RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement + +RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + end_movement + +RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right + end_movement + +RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B + lock + faceplayer + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 + msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 + closemessage + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 + release + end + +RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 + msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 + giveitem_std ITEM_EXP_SHARE + compare RESULT, 0 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B + setflag FLAG_RECEIVED_EXP_SHARE + msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 + closemessage + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 + release + end + +RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B + msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 + closemessage + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 + release + end + +RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 + lock + faceplayer + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 + msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 + release + end + +RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5 + msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4 + release + end + +RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF + msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3 + end diff --git a/data/maps/RustboroCity_DevonCorp_3F/text.inc b/data/maps/RustboroCity_DevonCorp_3F/text.inc new file mode 100644 index 000000000..c868a4836 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/text.inc @@ -0,0 +1,98 @@ +RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B + .string "I’m MR. STONE, the PRESIDENT of\n" + .string "the DEVON CORPORATION.\p" + .string "I’d just got word about you!\p" + .string "You saved our staff not just once,\n" + .string "but twice!\p" + .string "I have a favor to ask of an amazing\n" + .string "person like you.\p" + .string "I understand that you’re delivering\n" + .string "a package to SLATEPORT’s SHIPYARD.\p" + .string "Well, on the way, could you stop off in\n" + .string "DEWFORD TOWN?\p" + .string "I was hoping that you’d deliver a LETTER\n" + .string "to STEVEN in DEWFORD.$" + +RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E + .string "MR. STONE: Now, you should know that\n" + .string "I am a great PRESIDENT.\p" + .string "So, I’d never be so cheap as to ask\n" + .string "a favor for nothing in return.\p" + .string "That’s why I want you to have this!$" + +RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 + .string "{PLAYER} received a POKéNAV.$" + +RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 + .string "MR. STONE: That device...\p" + .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" + .string "for short.\p" + .string "It’s an indispensable tool for any\n" + .string "TRAINER on an adventure.\p" + .string "It has a map of the HOENN region.\p" + .string "You can check the locations of\n" + .string "DEWFORD and SLATEPORT easily!$" + +RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E + .string "MR. STONE: I’m counting on you!$" + +RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E + .string "MR. STONE: You delivered my LETTER?\n" + .string "Thank you kindly!\p" + .string "This is my way of thanking you.\n" + .string "It should help you, a TRAINER.$" + +RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 + .string "MR. STONE: A POKéMON holding that\n" + .string "EXP. SHARE will be given some of the\l" + .string "EXP Points from battle.\p" + .string "It will get EXP Points even if it didn’t\n" + .string "actually battle.\p" + .string "I would say EXP. SHARE is quite useful\n" + .string "for raising weak POKéMON.$" + +RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D + .string "MR. STONE: Since my youth, I’ve immersed\n" + .string "myself in work.\p" + .string "Consequently, I’m not familiar with\n" + .string "trends and that sort of thing.\p" + .string "But do young people all want to be\n" + .string "TRAINERS in the POKéMON LEAGUE?$" + +RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C + .string "This is the DEVON CORPORATION’s\n" + .string "third floor.\p" + .string "Our PRESIDENT’s OFFICE is on this floor.\p" + .string "Anyway, I can’t tell you how much I’m\n" + .string "grateful for what you’ve done.\p" + .string "Um... By the way, that parcel you got\n" + .string "back for us...\p" + .string "Could I get you to deliver that to the\n" + .string "SHIPYARD in SLATEPORT?\p" + .string "It would be awful if those robbers\n" + .string "tried to take it again.\p" + .string "Uh... Hehehe, so, uh, could I count\n" + .string "on you to do that for me?\p" + .string "Oh, that’s right.\n" + .string "Could you wait here a second?$" + +RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 + .string "Our PRESIDENT would like to have\n" + .string "a word with you.\p" + .string "Please come with me.$" + +RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A + .string "Please, go ahead.$" + +RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C + .string "If you visit the SHIPYARD in SLATEPORT,\n" + .string "you should go see CAPT. STERN.$" + +RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 + .string "DEVON’s new products, the REPEAT BALL\n" + .string "and TIMER BALL, have become hugely\l" + .string "popular among TRAINERS.$" + +RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 + .string "It’s a collection of rare rocks and\n" + .string "stones assembled by the PRESIDENT.$" diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/maps/RustboroCity_Flat1_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat1_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index 22a262f47..22a262f47 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 68a5697be..3d1739875 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,9 +1,9 @@ RustboroCity_Flat1_1F:: @ 830630C - .4byte RustboroCity_Flat1_1F_MapAttributes + .4byte RustboroCity_Flat1_1F_Layout .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 314 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/maps/RustboroCity_Flat1_1F/map.bin deleted file mode 100644 index 017298e71..000000000 --- a/data/maps/RustboroCity_Flat1_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -8()*:888:8x88:H0 2B@@@B@VWBP3+3+3+3+3+3+3+3+3+33^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,332H6I623+3p7q7E3,3,3,3,33>2P6Q623F3G3,3,3,3,3,3,3333333N7O7,3,3,3,3LM,3,3,3,3,3,3
\ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc new file mode 100644 index 000000000..dbbdf22b7 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -0,0 +1,10 @@ +RustboroCity_Flat1_1F_MapScripts:: @ 8157C5F + .byte 0 + +RustboroCity_Flat1_1F_EventScript_157C60:: @ 8157C60 + msgbox RustboroCity_Flat1_1F_Text_184DB4, 2 + end + +RustboroCity_Flat1_1F_EventScript_157C69:: @ 8157C69 + msgbox RustboroCity_Flat1_1F_Text_184DE9, 2 + end diff --git a/data/maps/RustboroCity_Flat1_1F/text.inc b/data/maps/RustboroCity_Flat1_1F/text.inc new file mode 100644 index 000000000..4721931e4 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/text.inc @@ -0,0 +1,6 @@ +RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 + .string "Every POKéMON has a special ability\n" + .string "that it can use.$" + +RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 + .string "POKéMON are such strange creatures.$" diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/maps/RustboroCity_Flat1_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat1_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index e906fe011..e906fe011 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index f0b29ae0d..0ae9dd797 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,9 +1,9 @@ RustboroCity_Flat1_2F:: @ 8306328 - .4byte RustboroCity_Flat1_2F_MapAttributes + .4byte RustboroCity_Flat1_2F_Layout .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 315 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/maps/RustboroCity_Flat1_2F/map.bin deleted file mode 100644 index 17a611343..000000000 --- a/data/maps/RustboroCity_Flat1_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3{3|3|3|3}3,3+3D3~777E3,3,33>2>2>23,3+3,3777E3,3,33>2>2>23,3+3G3G3,3,3,3,3,333333,3+3O7O7,3,3,3,3,3,3,3,3,3,3,3
\ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc new file mode 100644 index 000000000..53672bb42 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -0,0 +1,6 @@ +RustboroCity_Flat1_2F_MapScripts:: @ 8157C72 + .byte 0 + +RustboroCity_Flat1_2F_EventScript_157C73:: @ 8157C73 + msgbox RustboroCity_Flat1_2F_Text_184E0D, 2 + end diff --git a/data/maps/RustboroCity_Flat1_2F/text.inc b/data/maps/RustboroCity_Flat1_2F/text.inc new file mode 100644 index 000000000..7ddb678bf --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/text.inc @@ -0,0 +1,8 @@ +RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D + .string "Oh, it’s so hard every day...\p" + .string "What’s hard?\n" + .string "You need to ask?\p" + .string "It’s trying to figure out what to\n" + .string "make for meals every day.\p" + .string "It really isn’t easy coming up with\n" + .string "meals every day.$" diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/maps/RustboroCity_Flat2_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat2_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index 76ed3f04e..76ed3f04e 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 5f54f2624..3a9ee86c3 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,9 +1,9 @@ RustboroCity_Flat2_1F:: @ 8306398 - .4byte RustboroCity_Flat2_1F_MapAttributes + .4byte RustboroCity_Flat2_1F_Layout .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 295 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/maps/RustboroCity_Flat2_1F/map.bin Binary files differdeleted file mode 100644 index 0f6829f9c..000000000 --- a/data/maps/RustboroCity_Flat2_1F/map.bin +++ /dev/null diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc new file mode 100644 index 000000000..a6ba54ce7 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -0,0 +1,16 @@ +RustboroCity_Flat2_1F_MapScripts:: @ 8157D79 + .byte 0 + +RustboroCity_Flat2_1F_EventScript_157D7A:: @ 8157D7A + msgbox RustboroCity_Flat2_1F_Text_1853DD, 2 + end + +RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox RustboroCity_Flat2_1F_Text_185410, 4 + waitmoncry + release + end diff --git a/data/maps/RustboroCity_Flat2_1F/text.inc b/data/maps/RustboroCity_Flat2_1F/text.inc new file mode 100644 index 000000000..d949a0ab8 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/text.inc @@ -0,0 +1,6 @@ +RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD + .string "DEVON CORPORATION’s workers live in\n" + .string "this building.$" + +RustboroCity_Flat2_1F_Text_185410:: @ 8185410 + .string "SKITTY: Gyaaaah!$" diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/maps/RustboroCity_Flat2_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat2_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 3f56e718c..3f56e718c 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 086947abf..da3544023 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,9 +1,9 @@ RustboroCity_Flat2_2F:: @ 83063B4 - .4byte RustboroCity_Flat2_2F_MapAttributes + .4byte RustboroCity_Flat2_2F_Layout .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 296 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/maps/RustboroCity_Flat2_2F/map.bin Binary files differdeleted file mode 100644 index 9f3750fb4..000000000 --- a/data/maps/RustboroCity_Flat2_2F/map.bin +++ /dev/null diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc new file mode 100644 index 000000000..5ed9ac0ef --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -0,0 +1,23 @@ +RustboroCity_Flat2_2F_MapScripts:: @ 8157D96 + .byte 0 + +RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 + msgbox RustboroCity_Flat2_2F_Text_185421, 2 + end + +RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 + lock + faceplayer + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF + msgbox RustboroCity_Flat2_2F_Text_185461, 4 + giveitem_std ITEM_PREMIER_BALL + compare RESULT, 0 + goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B + setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO + release + end + +RustboroCity_Flat2_2F_EventScript_157DCF:: @ 8157DCF + msgbox RustboroCity_Flat2_2F_Text_1854C4, 4 + release + end diff --git a/data/maps/RustboroCity_Flat2_2F/text.inc b/data/maps/RustboroCity_Flat2_2F/text.inc new file mode 100644 index 000000000..8a3d52fda --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/text.inc @@ -0,0 +1,13 @@ +RustboroCity_Flat2_2F_Text_185421:: @ 8185421 + .string "Way back in the old days, DEVON was just\n" + .string "a teeny, tiny company.$" + +RustboroCity_Flat2_2F_Text_185461:: @ 8185461 + .string "My daddy’s working at the CORPORATION.\p" + .string "My daddy made this!\n" + .string "But I can’t use it, so you can have it.$" + +RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 + .string "My daddy’s working at the CORPORATION.\p" + .string "When I grow up, I’m going to work for\n" + .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/maps/RustboroCity_Flat2_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_Flat2_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index ed3ef80e7..ed3ef80e7 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 42866ebf2..9d5235d93 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,9 +1,9 @@ RustboroCity_Flat2_3F:: @ 83063D0 - .4byte RustboroCity_Flat2_3F_MapAttributes + .4byte RustboroCity_Flat2_3F_Layout .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 297 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/maps/RustboroCity_Flat2_3F/map.bin Binary files differdeleted file mode 100644 index 2112fe799..000000000 --- a/data/maps/RustboroCity_Flat2_3F/map.bin +++ /dev/null diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc new file mode 100644 index 000000000..d3b05b5bf --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -0,0 +1,10 @@ +RustboroCity_Flat2_3F_MapScripts:: @ 8157DD9 + .byte 0 + +RustboroCity_Flat2_3F_EventScript_157DDA:: @ 8157DDA + msgbox RustboroCity_Flat2_3F_Text_18551D, 2 + end + +RustboroCity_Flat2_3F_EventScript_157DE3:: @ 8157DE3 + msgbox RustboroCity_Flat2_3F_Text_18554D, 2 + end diff --git a/data/maps/RustboroCity_Flat2_3F/text.inc b/data/maps/RustboroCity_Flat2_3F/text.inc new file mode 100644 index 000000000..9f95ce92e --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/text.inc @@ -0,0 +1,7 @@ +RustboroCity_Flat2_3F_Text_18551D:: @ 818551D + .string "DEVON’s PRESIDENT likes to collect\n" + .string "rare stones.$" + +RustboroCity_Flat2_3F_Text_18554D:: @ 818554D + .string "I think the PRESIDENT’s son also\n" + .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/maps/RustboroCity_Gym/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/RustboroCity_Gym/border.bin +++ /dev/null diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc index 97b5a6627..97b5a6627 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/RustboroCity_Gym/events.inc diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 5d18e933b..d98b04da8 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,9 +1,9 @@ RustboroCity_Gym:: @ 8306280 - .4byte RustboroCity_Gym_MapAttributes + .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 94 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/maps/RustboroCity_Gym/map.bin deleted file mode 100644 index bc69d8879..000000000 --- a/data/maps/RustboroCity_Gym/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - -%262222262
2726$2 2 2$ 622 22222222222"2&2&2!2222 2!22-2)( .222)*/21)*%22222)*/21)062!2222)*/215 .222 ./211%2"2#2222"2'26241/2)*/222 +*1/2)*/22222)*1/2)*/222 2&23*,/2 ./222 . 2722272222222 22222222222 222222222 222222222
\ No newline at end of file diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc new file mode 100644 index 000000000..307617e50 --- /dev/null +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -0,0 +1,79 @@ +RustboroCity_Gym_MapScripts:: @ 81578D8 + .byte 0 + +RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 + trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C + msgbox RustboroCity_Gym_Text_184252, 4 + release + end + +RustboroCity_Gym_EventScript_1578FE:: @ 81578FE + message RustboroCity_Gym_Text_1840AB + waitmessage + call RustboroCity_Gym_EventScript_1A02C5 + msgbox RustboroCity_Gym_Text_1840D5, 4 + setflag FLAG_DEFEATED_RUSTBORO_GYM + setflag FLAG_BADGE01_GET + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_SPECIAL_8, 1 + call RustboroCity_Gym_EventScript_1A01C0 + compare VAR_PETALBURG_GYM_STATE, 6 + call_if_eq RustboroCity_Gym_EventScript_1A00FB + goto RustboroCity_Gym_EventScript_15793C + end + +RustboroCity_Gym_EventScript_15793C:: @ 815793C + giveitem_std ITEM_TM39_ROCK_TOMB + compare RESULT, 0 + goto_if_eq RustboroCity_Gym_EventScript_1A029B + setflag FLAG_RECEIVED_TM39 + msgbox RustboroCity_Gym_Text_184170, 4 + release + end + +RustboroCity_Gym_EventScript_157960:: @ 8157960 + trainerbattle 0, OPPONENT_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + msgbox RustboroCity_Gym_Text_183DF9, 6 + end + +RustboroCity_Gym_EventScript_157977:: @ 8157977 + trainerbattle 0, OPPONENT_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + msgbox RustboroCity_Gym_Text_183E98, 6 + end + +RustboroCity_Gym_EventScript_15798E:: @ 815798E + lock + faceplayer + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3 + msgbox RustboroCity_Gym_Text_183A4B, 4 + release + end + +RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 + msgbox RustboroCity_Gym_Text_183C90, 4 + release + end + +RustboroCity_Gym_EventScript_1579AD:: @ 81579AD + lockall + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD + goto RustboroCity_Gym_EventScript_1579D7 + end + +RustboroCity_Gym_EventScript_1579BD:: @ 81579BD + lockall + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD + goto RustboroCity_Gym_EventScript_1579D7 + end + +RustboroCity_Gym_EventScript_1579CD:: @ 81579CD + msgbox RustboroCity_Gym_Text_1842E6, 4 + releaseall + end + +RustboroCity_Gym_EventScript_1579D7:: @ 81579D7 + msgbox RustboroCity_Gym_Text_1842CC, 4 + releaseall + end diff --git a/data/maps/RustboroCity_Gym/text.inc b/data/maps/RustboroCity_Gym/text.inc new file mode 100644 index 000000000..7bb737097 --- /dev/null +++ b/data/maps/RustboroCity_Gym/text.inc @@ -0,0 +1,111 @@ +RustboroCity_Gym_Text_183A4B:: @ 8183A4B + .string "Yo, how’s it going?\p" + .string "Listen, my friend!\n" + .string "Would you like to become the CHAMPION?\p" + .string "I’m no TRAINER, not me, but I can\n" + .string "sure give you winning advice.\p" + .string "That’s settled, then! We’ll aim for the\n" + .string "POKéMON CHAMPIONSHIP together!\p" + .string "It’s your job as a TRAINER to collect\n" + .string "GYM BADGES, am I right?\p" + .string "But GYM LEADERS aren’t pushovers!\p" + .string "And that’s where I come in!\n" + .string "I’m here to provide expert advice!\p" + .string "ROXANNE, the GYM LEADER, is a user\n" + .string "of ROCK-type POKéMON.\p" + .string "The ROCK type is very durable, but\n" + .string "it can’t stand WATER-type and\l" + .string "GRASS-type moves.\p" + .string "Come see me afterwards, if you beat\n" + .string "the GYM LEADER.\p" + .string "Well, go for it!$" + +RustboroCity_Gym_Text_183C90:: @ 8183C90 + .string "Whoa! What a breathtaking victory!\n" + .string "My cheering must’ve worked!\p" + .string "Great!\n" + .string "Check your TRAINER CARD.\p" + .string "The STONE BADGE you got should be\n" + .string "properly recorded on it.\p" + .string "In other words...\p" + .string "You’ve climbed the first step on\n" + .string "the stairs to the CHAMPIONSHIP!\p" + .string "That’s got to feel awesome!$" + +RustboroCity_Gym_Text_183D99:: @ 8183D99 + .string "Don’t take us GYM TRAINERS lightly!\n" + .string "I’ll show you why we’re better!$" + +RustboroCity_Gym_Text_183DDD:: @ 8183DDD + .string "You were too good for me...$" + +RustboroCity_Gym_Text_183DF9:: @ 8183DF9 + .string "You haven’t seen anything of the ROCK\n" + .string "type’s terrifying power!$" + +RustboroCity_Gym_Text_183E38:: @ 8183E38 + .string "If you can’t beat me, you won’t stand\n" + .string "a chance against ROXANNE!$" + +RustboroCity_Gym_Text_183E78:: @ 8183E78 + .string "Wow! You’ve got some potential!$" + +RustboroCity_Gym_Text_183E98:: @ 8183E98 + .string "ROXANNE is stronger than me by\n" + .string "several times.\p" + .string "You’d better be on your guard!$" + +RustboroCity_Gym_Text_183EE5:: @ 8183EE5 + .string "Hello, I am ROXANNE, the RUSTBORO\n" + .string "POKéMON GYM LEADER.\p" + .string "I became a GYM LEADER so that I may\n" + .string "apply what I learned at the POKéMON\l" + .string "TRAINER’S SCHOOL in battle.\p" + .string "Would you kindly demonstrate how you\n" + .string "battle, and with which POKéMON?$" + +RustboroCity_Gym_Text_183FC4:: @ 8183FC4 + .string "So...\n" + .string "I lost...\p" + .string "It seems that I still have much more\n" + .string "to learn...\p" + .string "I understand.\p" + .string "The POKéMON LEAGUE’s rules state\n" + .string "that TRAINERS are to be given this\l" + .string "if they defeat a GYM LEADER.\p" + .string "Please accept the official POKéMON\n" + .string "LEAGUE STONE BADGE.$" + +RustboroCity_Gym_Text_1840AB:: @ 81840AB + .string "{PLAYER} received the STONE BADGE\n" + .string "from ROXANNE.$" + +RustboroCity_Gym_Text_1840D5:: @ 81840D5 + .string "The STONE BADGE heightens the ATTACK\n" + .string "power of your POKéMON.\p" + .string "It also enables them to use the HM move\n" + .string "CUT outside of battle.\p" + .string "Please take this with you, too.$" + +RustboroCity_Gym_Text_184170:: @ 8184170 + .string "That TM39 contains ROCK TOMB.\p" + .string "It not only inflicts damage by dropping\n" + .string "rocks, it also lowers SPEED.\p" + .string "If you use a TM, it instantly teaches\n" + .string "the move to a POKéMON.\p" + .string "Remember, a TM can be used only once,\n" + .string "so think before you use it.$" + +RustboroCity_Gym_Text_184252:: @ 8184252 + .string "Since you are so strong, you should\n" + .string "challenge other GYM LEADERS.\p" + .string "By battling many TRAINERS, you should\n" + .string "learn many things.$" + +RustboroCity_Gym_Text_1842CC:: @ 81842CC + .string "RUSTBORO CITY POKéMON GYM$" + +RustboroCity_Gym_Text_1842E6:: @ 81842E6 + .string "RUSTBORO CITY POKéMON GYM\p" + .string "ROXANNE’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/RustboroCity_House1/border.bin b/data/maps/RustboroCity_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc index 5a8023d2f..5a8023d2f 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/RustboroCity_House1/events.inc diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 9ee09b4e3..34d733c02 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,9 +1,9 @@ RustboroCity_House1:: @ 8306344 - .4byte RustboroCity_House1_MapAttributes + .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 97 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House1/map.bin b/data/maps/RustboroCity_House1/map.bin deleted file mode 100644 index a14fc0405..000000000 --- a/data/maps/RustboroCity_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -888188::88888CJK @@BB@TUICN7R3S363+3+3+3+3+3\3]3Q3N7+3,3,3,3,3,3,3,3{3|3|3}3,3+3,3D3~777E3,33>2>23,3+3,3D3777,3,33333,3F3,3,3,3,3,3,3,3,3,3,3,3G3N7,3,3,3,3LM,3,3,3,3,3O7
\ No newline at end of file diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc new file mode 100644 index 000000000..abbac505b --- /dev/null +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -0,0 +1,53 @@ +RustboroCity_House1_MapScripts:: @ 8157C7C + .byte 0 + +RustboroCity_House1_EventScript_157C7D:: @ 8157C7D + lock + faceplayer + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 + setvar VAR_SPECIAL_8, 0 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + specialvar RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_SPECIAL_9, RESULT + msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq RustboroCity_House1_EventScript_157CFB + special SelectMonForNPCTrade + waitstate + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 + goto_if_eq RustboroCity_House1_EventScript_157CFB + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + specialvar RESULT, GetTradeSpecies + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 + goto_if_ne RustboroCity_House1_EventScript_157D05 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + special CreateInGameTradePokemon + special DoInGameTradeScene + waitstate + msgbox RustboroCity_House1_Text_184F6B, 4 + setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED + release + end + +RustboroCity_House1_EventScript_157CFB:: @ 8157CFB + msgbox RustboroCity_House1_Text_184FC1, 4 + release + end + +RustboroCity_House1_EventScript_157D05:: @ 8157D05 + bufferspeciesname 0, VAR_SPECIAL_9 + msgbox RustboroCity_House1_Text_184F8F, 4 + release + end + +RustboroCity_House1_EventScript_157D13:: @ 8157D13 + msgbox RustboroCity_House1_Text_184FDD, 4 + release + end + +RustboroCity_House1_EventScript_157D1D:: @ 8157D1D + msgbox RustboroCity_House1_Text_185020, 2 + end diff --git a/data/maps/RustboroCity_House1/text.inc b/data/maps/RustboroCity_House1/text.inc new file mode 100644 index 000000000..6427aa326 --- /dev/null +++ b/data/maps/RustboroCity_House1/text.inc @@ -0,0 +1,27 @@ +RustboroCity_House1_Text_184EBA:: @ 8184EBA + .string "Do you nickname your POKéMON?\n" + .string "I gave a cool name to mine.\p" + .string "But when I call my POKéMON by that\n" + .string "name, people laugh at me...\p" + .string "If it’s okay with you, want to trade\n" + .string "your {STR_VAR_1} for my {STR_VAR_2}?$" + +RustboroCity_House1_Text_184F6B:: @ 8184F6B + .string "Eheheheh, ooh, this is so exciting!$" + +RustboroCity_House1_Text_184F8F:: @ 8184F8F + .string "But that’s no {STR_VAR_1}.\n" + .string "Tch, that’s so disappointing...$" + +RustboroCity_House1_Text_184FC1:: @ 8184FC1 + .string "Aww, it’s a good POKéMON...$" + +RustboroCity_House1_Text_184FDD:: @ 8184FDD + .string "Don’t you get curious about what other\n" + .string "people named their POKéMON?$" + +RustboroCity_House1_Text_185020:: @ 8185020 + .string "In all sorts of places, there are all\n" + .string "sorts of POKéMON and people.\p" + .string "I find that fascinating, so I go to all\n" + .string "sorts of places.$" diff --git a/data/maps/RustboroCity_House2/border.bin b/data/maps/RustboroCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/RustboroCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc index 4a7a60f12..4a7a60f12 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/RustboroCity_House2/events.inc diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 0122c6a92..be12d46f8 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,9 +1,9 @@ RustboroCity_House2:: @ 830637C - .4byte RustboroCity_House2_MapAttributes + .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 96 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House2/map.bin b/data/maps/RustboroCity_House2/map.bin deleted file mode 100644 index 5a53bbc77..000000000 --- a/data/maps/RustboroCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -yz89888819fgIA@@JK Ano33Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,332H^23,3,3,3+3,3,332PQ23,3,3,3+3,3,3333333,3,3,3F3,3,3,3,3,3,3,3,3,3,3G3N,3,3,3,3LM,3,3,3,3O
\ No newline at end of file diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc new file mode 100644 index 000000000..b448065f4 --- /dev/null +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -0,0 +1,10 @@ +RustboroCity_House2_MapScripts:: @ 8157D66 + .byte 0 + +RustboroCity_House2_EventScript_157D67:: @ 8157D67 + msgbox RustboroCity_House2_Text_18532D, 2 + end + +RustboroCity_House2_EventScript_157D70:: @ 8157D70 + msgbox RustboroCity_House2_Text_185388, 2 + end diff --git a/data/maps/RustboroCity_House2/text.inc b/data/maps/RustboroCity_House2/text.inc new file mode 100644 index 000000000..7a1d9c706 --- /dev/null +++ b/data/maps/RustboroCity_House2/text.inc @@ -0,0 +1,9 @@ +RustboroCity_House2_Text_18532D:: @ 818532D + .string "The TRAINER’S SCHOOL is excellent.\p" + .string "If you study there, you could even\n" + .string "become a GYM LEADER.$" + +RustboroCity_House2_Text_185388:: @ 8185388 + .string "ROXANNE, the GYM LEADER, really knows\n" + .string "a lot about POKéMON.\p" + .string "She’s really strong, too!$" diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc index bdd17333c..bdd17333c 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/RustboroCity_House3/events.inc diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 8876f8499..7c23668ca 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,9 +1,9 @@ RustboroCity_House3:: @ 83063EC - .4byte RustboroCity_House3_MapAttributes + .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 - .2byte BGM_GOTOWN + .2byte MUS_GOTOWN .2byte 96 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc new file mode 100644 index 000000000..86d77c18e --- /dev/null +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -0,0 +1,20 @@ +RustboroCity_House3_MapScripts:: @ 8157DEC + .byte 0 + +RustboroCity_House3_EventScript_157DED:: @ 8157DED + msgbox RustboroCity_House3_Text_185584, 2 + end + +RustboroCity_House3_EventScript_157DF6:: @ 8157DF6 + msgbox RustboroCity_House3_Text_1855FA, 2 + end + +RustboroCity_House3_EventScript_157DFF:: @ 8157DFF + lock + faceplayer + waitse + playmoncry SPECIES_PIKACHU, 0 + msgbox RustboroCity_House3_Text_18567D, 4 + waitmoncry + release + end diff --git a/data/maps/RustboroCity_House3/text.inc b/data/maps/RustboroCity_House3/text.inc new file mode 100644 index 000000000..43a3f6ff0 --- /dev/null +++ b/data/maps/RustboroCity_House3/text.inc @@ -0,0 +1,14 @@ +RustboroCity_House3_Text_185584:: @ 8185584 + .string "For my own POKéMON, I give them\n" + .string "perfectly suited nicknames!\p" + .string "It’s my expression of, uh...\n" + .string "originality, yes, that’s it!$" + +RustboroCity_House3_Text_1855FA:: @ 81855FA + .string "But giving the name PEKACHU to a\n" + .string "PIKACHU? It seems pointless.\p" + .string "I suppose it is good to use a name\n" + .string "that’s easy to understand, but...$" + +RustboroCity_House3_Text_18567D:: @ 818567D + .string "PEKACHU: Peka!$" diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc index b39aec815..b39aec815 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/RustboroCity_Mart/events.inc diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 535c3e2fc..88af62f92 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,9 +1,9 @@ RustboroCity_Mart:: @ 83062F0 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc new file mode 100644 index 000000000..c8e3f3a43 --- /dev/null +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -0,0 +1,69 @@ +RustboroCity_Mart_MapScripts:: @ 8157BD3 + .byte 0 + +RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 + lock + faceplayer + message RustboroCity_Mart_Text_1A0BE4 + waitmessage + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 + end + +RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF + pokemart RustboroCity_Mart_Items1 + msgbox RustboroCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +RustboroCity_Mart_Items1:: @ 8157C00 + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_NONE + release + end + +RustboroCity_Mart_EventScript_157C18:: @ 8157C18 + pokemart RustboroCity_Mart_Items2 + msgbox RustboroCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +RustboroCity_Mart_Items2:: @ 8157C28 + .2byte ITEM_POKE_BALL + .2byte ITEM_TIMER_BALL + .2byte ITEM_REPEAT_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_X_SPEED + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_NONE + release + end + +RustboroCity_Mart_EventScript_157C44:: @ 8157C44 + msgbox RustboroCity_Mart_Text_184C76, 2 + end + +RustboroCity_Mart_EventScript_157C4D:: @ 8157C4D + msgbox RustboroCity_Mart_Text_184CD8, 2 + end + +RustboroCity_Mart_EventScript_157C56:: @ 8157C56 + msgbox RustboroCity_Mart_Text_184D43, 2 + end diff --git a/data/maps/RustboroCity_Mart/text.inc b/data/maps/RustboroCity_Mart/text.inc new file mode 100644 index 000000000..f11395b68 --- /dev/null +++ b/data/maps/RustboroCity_Mart/text.inc @@ -0,0 +1,17 @@ +RustboroCity_Mart_Text_184C76:: @ 8184C76 + .string "I’m buying some PARLYZ HEALS and\n" + .string "ANTIDOTES.\p" + .string "Just in case I run into SHROOMISH\n" + .string "in PETALBURG WOODS.$" + +RustboroCity_Mart_Text_184CD8:: @ 8184CD8 + .string "My POKéMON evolved.\n" + .string "It has a lot of HP now.\p" + .string "I should buy SUPER POTIONS for it\n" + .string "instead of ordinary POTIONS.$" + +RustboroCity_Mart_Text_184D43:: @ 8184D43 + .string "I’m getting an ESCAPE ROPE just in\n" + .string "case I get lost in a cave.\p" + .string "I just need to use it to get back to the\n" + .string "entrance.$" diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index 7173fb49c..7173fb49c 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 57cb84729..9b98aff0c 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..653cceb25 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,28 @@ +RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 + map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_157B7F + .byte 0 + +RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F + setrespawn 6 + call RustboroCity_PokemonCenter_1F_EventScript_19FD1B + end + +RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 + setvar VAR_SPECIAL_B, 1 + call RustboroCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +RustboroCity_PokemonCenter_1F_EventScript_157B96:: @ 8157B96 + msgbox RustboroCity_PokemonCenter_1F_Text_184B37, 2 + end + +RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F + msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, 2 + end + +RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8 + msgbox RustboroCity_PokemonCenter_1F_Text_184C19, 2 + end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/text.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..0265f0363 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/text.inc @@ -0,0 +1,16 @@ +RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 + .string "My POKéMON has a NAIVE nature, and my\n" + .string "friend’s has a JOLLY nature.\p" + .string "It’s fascinating how POKéMON have\n" + .string "personalities!$" + +RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB + .string "Just like people, there are male and\n" + .string "female POKéMON.\p" + .string "But no one seems to have any idea how\n" + .string "they’re different.$" + +RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 + .string "The man next door gave me an HM!\p" + .string "I used it to teach my POKéMON how to\n" + .string "CUT down skinny trees.$" diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index bf5737d14..bf5737d14 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 838a5e5a9..ff85dfc1d 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..d0ffc5435 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +RustboroCity_PokemonCenter_2F_MapScripts:: @ 8157BB1 + map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +RustboroCity_PokemonCenter_2F_EventScript_157BC1:: @ 8157BC1 + call RustboroCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +RustboroCity_PokemonCenter_2F_EventScript_157BC7:: @ 8157BC7 + call RustboroCity_PokemonCenter_2F_EventScript_1A40CC + end + +RustboroCity_PokemonCenter_2F_EventScript_157BCD:: @ 8157BCD + call RustboroCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/maps/RustboroCity_PokemonSchool/border.bin deleted file mode 100644 index 8f857616b..000000000 --- a/data/maps/RustboroCity_PokemonSchool/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index fc3f934fa..fc3f934fa 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index dfb46b6f1..98f0e1b1d 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,9 +1,9 @@ RustboroCity_PokemonSchool:: @ 830629C - .4byte RustboroCity_PokemonSchool_MapAttributes + .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 - .2byte BGM_P_SCHOOL + .2byte MUS_P_SCHOOL .2byte 95 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/maps/RustboroCity_PokemonSchool/map.bin Binary files differdeleted file mode 100644 index 3f3b183d3..000000000 --- a/data/maps/RustboroCity_PokemonSchool/map.bin +++ /dev/null diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc new file mode 100644 index 000000000..f8193cbb8 --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -0,0 +1,164 @@ +RustboroCity_PokemonSchool_MapScripts:: @ 81579E1 + .byte 0 + +RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 + lockall + msgbox RustboroCity_PokemonSchool_Text_184321, 4 + goto RustboroCity_PokemonSchool_EventScript_1579F1 + end + +RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 + message RustboroCity_PokemonSchool_Text_184368 + waitmessage + multichoicegrid 8, 1, 13, 3, 0 + switch RESULT + case 0, RustboroCity_PokemonSchool_EventScript_157A50 + case 1, RustboroCity_PokemonSchool_EventScript_157A5E + case 2, RustboroCity_PokemonSchool_EventScript_157A6C + case 3, RustboroCity_PokemonSchool_EventScript_157A7A + case 4, RustboroCity_PokemonSchool_EventScript_157A88 + case 5, RustboroCity_PokemonSchool_EventScript_157A96 + case 127, RustboroCity_PokemonSchool_EventScript_157A96 + end + +RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50 + msgbox RustboroCity_PokemonSchool_Text_184389, 4 + goto RustboroCity_PokemonSchool_EventScript_1579F1 + end + +RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E + msgbox RustboroCity_PokemonSchool_Text_184447, 4 + goto RustboroCity_PokemonSchool_EventScript_1579F1 + end + +RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C + msgbox RustboroCity_PokemonSchool_Text_1844EC, 4 + goto RustboroCity_PokemonSchool_EventScript_1579F1 + end + +RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A + msgbox RustboroCity_PokemonSchool_Text_1845A5, 4 + goto RustboroCity_PokemonSchool_EventScript_1579F1 + end + +RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88 + msgbox RustboroCity_PokemonSchool_Text_184627, 4 + goto RustboroCity_PokemonSchool_EventScript_1579F1 + end + +RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96 + releaseall + end + +RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98 + msgbox RustboroCity_PokemonSchool_Text_18480E, 2 + end + +RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1 + msgbox RustboroCity_PokemonSchool_Text_18483C, 2 + end + +RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA + msgbox RustboroCity_PokemonSchool_Text_184873, 2 + end + +RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3 + msgbox RustboroCity_PokemonSchool_Text_1848D8, 2 + end + +RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC + msgbox RustboroCity_PokemonSchool_Text_184988, 2 + end + +RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 + msgbox RustboroCity_PokemonSchool_Text_184A17, 3 + end + +RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE + lock + faceplayer + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 + compare FACING, 4 + call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E + compare FACING, 3 + call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 + msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 + giveitem_std ITEM_QUICK_CLAW + compare RESULT, 0 + goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B + closemessage + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + waitmovement 0 + setflag FLAG_RECEIVED_QUICK_CLAW + release + end + +RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 + waitmovement 0 + return + +RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 + waitmovement 0 + return + +RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 + msgbox RustboroCity_PokemonSchool_Text_184737, 4 + closemessage + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + waitmovement 0 + release + end + +RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_left + walk_left + walk_up + walk_up + walk_right + end_movement + +RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 + walk_right + walk_right + walk_down + walk_down + walk_left + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_left + walk_left + end_movement diff --git a/data/maps/RustboroCity_PokemonSchool/text.inc b/data/maps/RustboroCity_PokemonSchool/text.inc new file mode 100644 index 000000000..e12349bd2 --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/text.inc @@ -0,0 +1,101 @@ +RustboroCity_PokemonSchool_Text_184321:: @ 8184321 + .string "The blackboard lists status changes\n" + .string "that may affect POKéMON in battle.$" + +RustboroCity_PokemonSchool_Text_184368:: @ 8184368 + .string "Which topic do you want to read?$" + +RustboroCity_PokemonSchool_Text_184389:: @ 8184389 + .string "If a POKéMON is poisoned, it will\n" + .string "steadily lose HP.\p" + .string "The effects of poison remain after\n" + .string "a battle.\p" + .string "A poisoned POKéMON’s HP will drop\n" + .string "while it is traveling.\p" + .string "Heal a poisoning using an ANTIDOTE.$" + +RustboroCity_PokemonSchool_Text_184447:: @ 8184447 + .string "If a POKéMON becomes paralyzed,\n" + .string "its SPEED drops.\p" + .string "It may also not be able to move while\n" + .string "it is in battle.\p" + .string "Paralysis remains after battle.\n" + .string "Cure it using a PARLYZ HEAL.$" + +RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC + .string "If a POKéMON falls asleep, it will be\n" + .string "unable to attack.\p" + .string "A POKéMON may wake up on its own,\n" + .string "but if a battle ends while it is sleeping,\l" + .string "it will stay asleep.\p" + .string "Wake it up using an AWAKENING.$" + +RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 + .string "A burn reduces ATTACK power, and it\n" + .string "steadily reduces the victim’s HP.\p" + .string "A burn lingers after battle.\n" + .string "Cure a burn using a BURN HEAL.$" + +RustboroCity_PokemonSchool_Text_184627:: @ 8184627 + .string "If a POKéMON is frozen, it becomes\n" + .string "completely helpless.\p" + .string "It will remain frozen after battle.\n" + .string "Thaw it out using an ICE HEAL.$" + +RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 + .string "Students who don’t study get a little\n" + .string "taste of my QUICK CLAW.\p" + .string "Whether or not you are a good student \n" + .string "will be evident from the way you use\l" + .string "this item.$" + +RustboroCity_PokemonSchool_Text_184737:: @ 8184737 + .string "A POKéMON holding the QUICK CLAW will\n" + .string "occasionally speed up and get to move\l" + .string "before its opponent.\p" + .string "There are many other items that are\n" + .string "meant to be held by POKéMON.\p" + .string "Just those alone will give you many\n" + .string "topics to study!$" + +RustboroCity_PokemonSchool_Text_18480E:: @ 818480E + .string "I’m trading POKéMON with my friend\n" + .string "right now.$" + +RustboroCity_PokemonSchool_Text_18483C:: @ 818483C + .string "I always wanted a SEEDOT, and\n" + .string "I’m finally getting one!$" + +RustboroCity_PokemonSchool_Text_184873:: @ 8184873 + .string "POKéMON can hold items, but they\n" + .string "don’t know what to do with man-made\l" + .string "items like POTION and ANTIDOTE.$" + +RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 + .string "You know how some POKéMON moves can\n" + .string "confuse a POKéMON?\p" + .string "A confused POKéMON will sometimes\n" + .string "attack itself without meaning to.\p" + .string "But once it leaves battle, it will\n" + .string "return to normal.$" + +RustboroCity_PokemonSchool_Text_184988:: @ 8184988 + .string "A POKéMON holding a BERRY will heal\n" + .string "itself...\p" + .string "There are many kinds of items that\n" + .string "POKéMON can hold...\p" + .string "Boy, it sure is hard taking notes\n" + .string "down...$" + +RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 + .string "It’s this student’s notebook...\p" + .string "POKéMON are to be caught using\n" + .string "POKé BALLS.\p" + .string "Up to six POKéMON can accompany\n" + .string "a TRAINER.\p" + .string "A TRAINER is someone who catches\n" + .string "POKéMON, raises them, and battles\l" + .string "with them.\p" + .string "A TRAINER’s mission is to defeat the\n" + .string "strong TRAINERS who await challengers\l" + .string "in POKéMON GYMS.$" diff --git a/data/maps/RusturfTunnel/border.bin b/data/maps/RusturfTunnel/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/RusturfTunnel/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc index 9dda724af..9dda724af 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/RusturfTunnel/events.inc diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 3e497a1e5..a3d4108ce 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,9 +1,9 @@ RusturfTunnel:: @ 8306DE0 - .4byte RusturfTunnel_MapAttributes + .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 130 .byte 60 .byte 0 diff --git a/data/maps/RusturfTunnel/map.bin b/data/maps/RusturfTunnel/map.bin deleted file mode 100644 index 87ce9bc73..000000000 --- a/data/maps/RusturfTunnel/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - 3!43!!!4 222222@<A@<<<A 2222222 2222 22222222222222222222222222222222222222222222222222222 2 -2222 222223!!4222222222234@<<A3422222222222@A@A2222222222 2 PQR 3!422 @<A2223!!4 "22222222234@<<A342222222222 "@A @A2222222222222 " 2222222222222 2222 PQR 342222 @A2222 222 PQR 3!4 3!4@<A @<A
\ No newline at end of file diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc new file mode 100644 index 000000000..13fb80043 --- /dev/null +++ b/data/maps/RusturfTunnel/scripts.inc @@ -0,0 +1,420 @@ +RusturfTunnel_MapScripts:: @ 815C745 + map_script 3, RusturfTunnel_MapScript1_15C762 + map_script 2, RusturfTunnel_MapScript2_15C750 + .byte 0 + +RusturfTunnel_MapScript2_15C750:: @ 815C750 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1 + .2byte 0 + +RusturfTunnel_MapScript1_15C762:: @ 815C762 + call RusturfTunnel_EventScript_1A0196 + compare VAR_RUSTURF_TUNNEL_STATE, 2 + call_if_eq RusturfTunnel_EventScript_15C773 + end + +RusturfTunnel_EventScript_15C773:: @ 815C773 + setobjectxyperm 7, 13, 4 + setobjectxyperm 6, 13, 5 + return + +RusturfTunnel_EventScript_15C782:: @ 815C782 + lock + faceplayer + msgbox RusturfTunnel_Text_194766, 4 + closemessage + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 + release + end + +RusturfTunnel_EventScript_15C799:: @ 815C799 + lock + faceplayer + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC + setflag FLAG_TEMP_1 + msgbox RusturfTunnel_Text_1944C5, 4 + closemessage + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 + release + end + +RusturfTunnel_EventScript_15C7BC:: @ 815C7BC + msgbox RusturfTunnel_Text_1945B2, 4 + closemessage + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 + release + end + +RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 + lockall + compare VAR_TEMP_1, 1 + call_if_eq RusturfTunnel_EventScript_15C8CA + compare VAR_TEMP_1, 2 + call_if_eq RusturfTunnel_EventScript_15C8DF + compare VAR_TEMP_1, 3 + call_if_eq RusturfTunnel_EventScript_15C8EA + call RusturfTunnel_EventScript_15C92D + msgbox RusturfTunnel_Text_19461D, 4 + compare VAR_TEMP_1, 2 + call_if_eq RusturfTunnel_EventScript_15C8EB + compare VAR_TEMP_1, 3 + call_if_eq RusturfTunnel_EventScript_15C8EB + giveitem_std ITEM_HM04_STRENGTH + setflag FLAG_RECEIVED_HM04 + msgbox RusturfTunnel_Text_194693, 4 + closemessage + compare VAR_TEMP_1, 1 + call_if_eq RusturfTunnel_EventScript_15C880 + compare VAR_TEMP_1, 2 + call_if_eq RusturfTunnel_EventScript_15C892 + compare VAR_TEMP_1, 3 + call_if_eq RusturfTunnel_EventScript_15C8AE + msgbox RusturfTunnel_Text_194706, 4 + closemessage + compare VAR_TEMP_1, 1 + call_if_eq RusturfTunnel_EventScript_15C8F7 + compare VAR_TEMP_1, 2 + call_if_eq RusturfTunnel_EventScript_15C909 + compare VAR_TEMP_1, 3 + call_if_eq RusturfTunnel_EventScript_15C91B + call RusturfTunnel_EventScript_1A0442 + releaseall + end + +RusturfTunnel_EventScript_15C880:: @ 815C880 + applymovement 255, RusturfTunnel_Movement_15C96A + applymovement 1, RusturfTunnel_Movement_15C98F + waitmovement 0 + return + +RusturfTunnel_EventScript_15C892:: @ 815C892 + applymovement 255, RusturfTunnel_Movement_15C96D + applymovement 1, RusturfTunnel_Movement_15C994 + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_1A0845 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C8AE:: @ 815C8AE + applymovement 255, RusturfTunnel_Movement_15C96D + applymovement 1, RusturfTunnel_Movement_15C994 + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_1A0845 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C8CA:: @ 815C8CA + applymovement 1, RusturfTunnel_Movement_1A0841 + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_1A0845 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C8DF:: @ 815C8DF + applymovement 1, RusturfTunnel_Movement_15C970 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C8EA:: @ 815C8EA + return + +RusturfTunnel_EventScript_15C8EB:: @ 815C8EB + closemessage + applymovement 1, RusturfTunnel_Movement_15C98D + waitmovement 0 + return + +RusturfTunnel_EventScript_15C8F7:: @ 815C8F7 + applymovement 10, RusturfTunnel_Movement_15C945 + applymovement 1, RusturfTunnel_Movement_15C973 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C909:: @ 815C909 + applymovement 10, RusturfTunnel_Movement_15C951 + applymovement 1, RusturfTunnel_Movement_15C980 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C91B:: @ 815C91B + applymovement 10, RusturfTunnel_Movement_15C951 + applymovement 1, RusturfTunnel_Movement_15C980 + waitmovement 0 + return + +RusturfTunnel_EventScript_15C92D:: @ 815C92D + playse SE_PIN + applymovement 1, RusturfTunnel_Movement_1A0833 + waitmovement 0 + applymovement 1, RusturfTunnel_Movement_1A0835 + waitmovement 0 + return + +RusturfTunnel_Movement_15C945:: @ 815C945 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +RusturfTunnel_Movement_15C951:: @ 815C951 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +@ 815C95D + walk_left + walk_in_place_fastest_right + end_movement + +@ 815C960 + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + end_movement + +@ 815C965 + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + end_movement + +RusturfTunnel_Movement_15C96A:: @ 815C96A + walk_left + walk_in_place_fastest_right + end_movement + +RusturfTunnel_Movement_15C96D:: @ 815C96D + walk_right + walk_in_place_fastest_left + end_movement + +RusturfTunnel_Movement_15C970:: @ 815C970 + walk_up + walk_in_place_fastest_right + end_movement + +RusturfTunnel_Movement_15C973:: @ 815C973 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +RusturfTunnel_Movement_15C980:: @ 815C980 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement + +RusturfTunnel_Movement_15C98D:: @ 815C98D + walk_right + end_movement + +RusturfTunnel_Movement_15C98F:: @ 815C98F + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right + end_movement + +RusturfTunnel_Movement_15C994:: @ 815C994 + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up + end_movement + +RusturfTunnel_EventScript_15C999:: @ 815C999 + setvar VAR_TEMP_1, 1 + end + +RusturfTunnel_EventScript_15C99F:: @ 815C99F + setvar VAR_TEMP_1, 2 + end + +RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 + setvar VAR_TEMP_1, 3 + end + +RusturfTunnel_EventScript_15C9AB:: @ 815C9AB + lockall + msgbox RusturfTunnel_Text_194159, 4 + closemessage + applymovement 6, RusturfTunnel_Movement_15C9D3 + applymovement 7, RusturfTunnel_Movement_15C9D3 + waitmovement 0 + moveobjectoffscreen 6 + moveobjectoffscreen 7 + setvar VAR_RUSTURF_TUNNEL_STATE, 3 + releaseall + end + +RusturfTunnel_Movement_15C9D3:: @ 815C9D3 + lock_facing_direction + walk_right + unlock_facing_direction + end_movement + +RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox RusturfTunnel_Text_194188, 4 + waitmoncry + release + end + +RusturfTunnel_EventScript_15C9EA:: @ 815C9EA + lock + faceplayer + playbgm MUS_EVIL_TEAM, FALSE + msgbox RusturfTunnel_Text_19419B, 4 + trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + msgbox RusturfTunnel_Text_194274, 4 + giveitem_std ITEM_DEVON_GOODS + closemessage + applymovement 255, RusturfTunnel_Movement_15CA99 + applymovement 6, RusturfTunnel_Movement_15CAA2 + waitmovement 0 + removeobject 6 + delay 50 + addobject 5 + applymovement 5, RusturfTunnel_Movement_15CAAC + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_15CA9F + applymovement 5, RusturfTunnel_Movement_15CAC0 + waitmovement 0 + msgbox RusturfTunnel_Text_19432A, 4 + applymovement 5, RusturfTunnel_Movement_1A0839 + waitmovement 0 + message RusturfTunnel_Text_19434F + waitmessage + waitse + playmoncry SPECIES_WINGULL, 0 + waitbuttonpress + waitmoncry + closemessage + applymovement 5, RusturfTunnel_Movement_15CAB4 + applymovement 7, RusturfTunnel_Movement_15CAC3 + waitmovement 0 + removeobject 5 + removeobject 7 + clearflag FLAG_DEVON_GOODS_STOLEN + setflag FLAG_RECOVERED_DEVON_GOODS + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 + setflag FLAG_HIDE_BRINEY_ROUTE116 + release + end + +RusturfTunnel_Movement_15CA99:: @ 815CA99 + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left + end_movement + +RusturfTunnel_Movement_15CA9F:: @ 815CA9F + walk_down + walk_in_place_fastest_up + end_movement + +RusturfTunnel_Movement_15CAA2:: @ 815CAA2 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + end_movement + +RusturfTunnel_Movement_15CAAC:: @ 815CAAC + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +RusturfTunnel_Movement_15CAB4:: @ 815CAB4 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +RusturfTunnel_Movement_15CAC0:: @ 815CAC0 + delay_16 + walk_right + end_movement + +RusturfTunnel_Movement_15CAC3:: @ 815CAC3 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +RusturfTunnel_EventScript_15CACD:: @ 815CACD + trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + msgbox RusturfTunnel_Text_1948C4, 6 + end diff --git a/data/maps/RusturfTunnel/text.inc b/data/maps/RusturfTunnel/text.inc new file mode 100644 index 000000000..3403808fd --- /dev/null +++ b/data/maps/RusturfTunnel/text.inc @@ -0,0 +1,105 @@ +RusturfTunnel_Text_194159:: @ 8194159 + .string "What, are you coming?\n" + .string "Come and get some, then!$" + +RusturfTunnel_Text_194188:: @ 8194188 + .string "PEEKO: Pii pihyoh!$" + +RusturfTunnel_Text_19419B:: @ 819419B + .string "Grah, keelhaul it all!\p" + .string "That hostage POKéMON turned out to\n" + .string "be worthless!\p" + .string "And to think I made a getaway...\n" + .string "In this tunnel to nowhere!\p" + .string "Hey! You!\n" + .string "So you want to battle me?$" + +RusturfTunnel_Text_194243:: @ 8194243 + .string "Urrrggh! My career in crime comes to\n" + .string "a dead end!$" + +RusturfTunnel_Text_194274:: @ 8194274 + .string "This is plain not right...\p" + .string "The BOSS told me this would be a\n" + .string "slick-and-easy job to pull.\p" + .string "All I had to do was steal some package\n" + .string "from DEVON.\p" + .string "Tch!\n" + .string "You want it back that badly, take it!$" + +RusturfTunnel_Text_19432A:: @ 819432A + .string "PEEKO! Am I glad to see you’re safe!$" + +RusturfTunnel_Text_19434F:: @ 819434F + .string "PEEKO owes her life to you!\p" + .string "They call me MR. BRINEY.\n" + .string "And, you are?\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "Ah, so you are {PLAYER}{KUN}!\n" + .string "I sincerely thank you!\p" + .string "Now, if there’s anything that troubles\n" + .string "you, don’t hesitate to tell me!\p" + .string "You can usually find me in my cottage\n" + .string "by the sea near PETALBURG WOODS.\p" + .string "Come, PEEKO, we should make our way\n" + .string "home.\p" + .string "PEEKO: Pihyoh!$" + +RusturfTunnel_Text_1944C5:: @ 81944C5 + .string "... ...\p" + .string "Why can’t they keep digging?\n" + .string "Is the bedrock too hard?\p" + .string "My beloved awaits me in VERDANTURF\n" + .string "TOWN just beyond here...\p" + .string "If RUSTBORO and VERDANTURF were\n" + .string "joined by this tunnel, I could visit\l" + .string "her every day...\p" + .string "But this...\n" + .string "What am I to do?$" + +RusturfTunnel_Text_1945B2:: @ 81945B2 + .string "To get from RUSTBORO to VERDANTURF,\n" + .string "you need to go to DEWFORD, then pass\l" + .string "through SLATEPORT and MAUVILLE...$" + +RusturfTunnel_Text_19461D:: @ 819461D + .string "Wow! You shattered that boulder\n" + .string "blocking the way.\p" + .string "To show you how much I appreciate it,\n" + .string "I’d like you to have this HM.$" + +RusturfTunnel_Text_194693:: @ 8194693 + .string "That HM contains STRENGTH.\p" + .string "If a muscular POKéMON were to learn\n" + .string "that, it would be able to move even\l" + .string "large boulders.$" + +RusturfTunnel_Text_194706:: @ 8194706 + .string "WANDA!\n" + .string "Now I can see you anytime!\p" + .string "WANDA: That’s...wonderful.\p" + .string "Please, take some rest at my home.$" + +RusturfTunnel_Text_194766:: @ 8194766 + .string "On the other side of this rock...\n" + .string "My boyfriend is there.\p" + .string "He... He’s not just digging the tunnel\n" + .string "to come see me.\p" + .string "He works his hands raw and rough\n" + .string "for the benefit of everyone.$" + +RusturfTunnel_Text_194814:: @ 8194814 + .string "What do you call a wild man up in the\n" + .string "mountains? A mountain man, right?\p" + .string "So why don’t they call a POKéMON in the\n" + .string "mountains a mountain POKéMON?$" + +RusturfTunnel_Text_1948A2:: @ 81948A2 + .string "My POKéMON...\n" + .string "Ran out of power...$" + +RusturfTunnel_Text_1948C4:: @ 81948C4 + .string "They halted development here to\n" + .string "protect POKéMON, right?\l" + .string "There’s a feel-good story!$" diff --git a/data/maps/SSTidalCorridor/border.bin b/data/maps/SSTidalCorridor/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SSTidalCorridor/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc index 0e034da5c..0e034da5c 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/SSTidalCorridor/events.inc diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 6370e81ca..4f55319d8 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,9 +1,9 @@ SSTidalCorridor:: @ 8307B54 - .4byte SSTidalCorridor_MapAttributes + .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 - .2byte BGM_M_BOAT + .2byte MUS_M_BOAT .2byte 278 .byte 87 .byte 0 diff --git a/data/maps/SSTidalCorridor/map.bin b/data/maps/SSTidalCorridor/map.bin deleted file mode 100644 index f8cf1725d..000000000 --- a/data/maps/SSTidalCorridor/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222 6222222222222222222201111111111222222011111111112222220111111111122222201111111111222222%#$"#$"#$"#&22222-+6{*+6{*+6{*+622222222222222222222 22222222222222222
\ No newline at end of file diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc new file mode 100644 index 000000000..7bc5a7fdd --- /dev/null +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -0,0 +1,189 @@ +SSTidalCorridor_MapScripts:: @ 815FC94 + map_script 2, SSTidalCorridor_MapScript2_15FC9A + .byte 0 + +SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A + map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_15FCBC + map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_15FCD2 + map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_15FD24 + map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_15FD3A + .2byte 0 + +SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC + special SetSSTidalFlag + setvar VAR_PORTHOLE_STATE, 2 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_199007, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 + setvar VAR_PORTHOLE_STATE, 6 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_199088, 4 + releaseall + end + +SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 + special SetSSTidalFlag + setvar VAR_PORTHOLE_STATE, 7 + playse SE_PINPON + msgbox SSTidalRooms_Text_199007, 4 + return + +SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 + special ResetSSTidalFlag + setvar VAR_PORTHOLE_STATE, 4 + playse SE_PINPON + msgbox SSTidalRooms_Text_1990F8, 4 + return + +gUnknown_0815FD0D:: @ 815FD0D + compare VAR_PORTHOLE_STATE, 2 + goto_if_eq SSTidalCorridor_EventScript_15FD24 + compare VAR_PORTHOLE_STATE, 7 + goto_if_eq SSTidalCorridor_EventScript_15FD3A + end + +SSTidalCorridor_EventScript_15FD24:: @ 815FD24 + special ResetSSTidalFlag + setvar VAR_PORTHOLE_STATE, 3 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_199088, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A + special ResetSSTidalFlag + setvar VAR_PORTHOLE_STATE, 8 + lockall + playse SE_PINPON + msgbox SSTidalCorridor_Text_1990B4, 4 + releaseall + end + +SSTidalRooms_EventScript_15FD50:: @ 815FD50 + special ResetSSTidalFlag + setvar VAR_PORTHOLE_STATE, 8 + playse SE_PINPON + msgbox SSTidalRooms_Text_1990B4, 4 + return + +SSTidalRooms_EventScript_15FD64:: @ 815FD64 + switch VAR_PORTHOLE_STATE + case 2, SSTidalRooms_EventScript_15FCF9 + case 3, SSTidalRooms_EventScript_15FCF9 + case 6, SSTidalRooms_EventScript_15FCE5 + case 7, SSTidalRooms_EventScript_15FD50 + return + +SSTidalCorridor_EventScript_15FD96:: @ 815FD96 + msgbox SSTidalCorridor_Text_199291, 2 + end + +SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F + lock + faceplayer + waitse + playmoncry SPECIES_WINGULL, 0 + msgbox SSTidalCorridor_Text_199388, 4 + waitmoncry + release + end + +SSTidalCorridor_EventScript_15FDB2:: @ 815FDB2 + msgbox SSTidalCorridor_Text_1993A1, 3 + end + +SSTidalCorridor_EventScript_15FDBB:: @ 815FDBB + msgbox SSTidalCorridor_Text_1993A9, 3 + end + +SSTidalCorridor_EventScript_15FDC4:: @ 815FDC4 + msgbox SSTidalCorridor_Text_1993B1, 3 + end + +SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD + msgbox SSTidalCorridor_Text_1993B9, 3 + end + +SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 + lock + faceplayer + compare VAR_PORTHOLE_STATE, 4 + goto_if_eq SSTidalCorridor_EventScript_15FDF8 + compare VAR_PORTHOLE_STATE, 8 + goto_if_eq SSTidalCorridor_EventScript_15FE17 + msgbox SSTidalCorridor_Text_19913B, 4 + release + end + +SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 + setrespawn 8 + msgbox SSTidalCorridor_Text_1991F4, 4 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_15FE17:: @ 815FE17 + setrespawn 4 + msgbox SSTidalCorridor_Text_1991F4, 4 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_15FE36:: @ 815FE36 + setflag FLAG_HIDE_TM_49_GIVER_SS_TIDAL + return + +SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A + lockall + compare VAR_PORTHOLE_STATE, 2 + goto_if_eq SSTidalCorridor_EventScript_15FE5B + compare VAR_PORTHOLE_STATE, 7 + goto_if_eq SSTidalCorridor_EventScript_15FE5B + msgbox SSTidalCorridor_Text_199268, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B + special sub_80C7958 + waitstate + end + +SSTidalCorridor_EventScript_15FE60:: @ 815FE60 + lock + faceplayer + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A + call SSTidalCorridor_EventScript_15FE84 + msgbox SSTidalCorridor_Text_199203, 4 + release + end + +SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A + msgbox SSTidalCorridor_Text_199255, 4 + release + end + +SSTidalCorridor_EventScript_15FE84:: @ 815FE84 + goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 + setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS + goto SSTidalCorridor_EventScript_15FE7A + return + +SSTidalCorridor_EventScript_15FED5:: @ 815FED5 + return diff --git a/data/maps/SSTidalCorridor/text.inc b/data/maps/SSTidalCorridor/text.inc new file mode 100644 index 000000000..530ff6c55 --- /dev/null +++ b/data/maps/SSTidalCorridor/text.inc @@ -0,0 +1,67 @@ +SSTidalCorridor_Text_199007:: @ 8199007 +SSTidalRooms_Text_199007:: @ 8199007 + .string "This ferry is built to plow through\n" + .string "fast-running currents.\p" + .string "We hope you enjoy your voyage with us.\n" + .string "Feel free to explore the ship.$" + +SSTidalCorridor_Text_199088:: @ 8199088 + .string "We hope you enjoy your voyage on\n" + .string "our ferry.$" + +SSTidalCorridor_Text_1990B4:: @ 81990B4 +SSTidalRooms_Text_1990B4:: @ 81990B4 + .string "We have made land in SLATEPORT CITY.\n" + .string "Thank you for sailing with us.$" + +SSTidalRooms_Text_1990F8:: @ 81990F8 + .string "We have made land in LILYCOVE CITY.\n" + .string "Thank you for sailing with us.$" + +SSTidalCorridor_Text_19913B:: @ 819913B + .string "It’ll be some time before we make land,\n" + .string "I reckon.\p" + .string "You can rest up in your cabin if you’d\n" + .string "like. Your cabin’s No. 2.\p" + .string "The bed in there is soft and plushy.\n" + .string "I can attest to how comfy it is!$" + +SSTidalCorridor_Text_1991F4:: @ 81991F4 + .string "We’ve arrived!$" + +SSTidalCorridor_Text_199203:: @ 8199203 + .string "Go visit other cabins.\n" + .string "TRAINERS bored of the boat trip will\l" + .string "be itching to battle.$" + +SSTidalCorridor_Text_199255:: @ 8199255 + .string "Enjoy your cruise!$" + +SSTidalCorridor_Text_199268:: @ 8199268 + .string "The horizon spreads beyond the\n" + .string "porthole.$" + +SSTidalCorridor_Text_199291:: @ 8199291 + .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" + .string "They made me honorary captain of the\n" + .string "S.S. TIDAL!\p" + .string "You can call me CAPTAIN BRINEY now!\p" + .string "You know, I retired once before, but\n" + .string "when I saw this majestic ship...\p" + .string "Let me just say, it stirred my sleeping\n" + .string "soul as a sailor!$" + +SSTidalCorridor_Text_199388:: @ 8199388 + .string "PEEKO: Pihyo pihyohyo...$" + +SSTidalCorridor_Text_1993A1:: @ 81993A1 + .string "Cabin 1$" + +SSTidalCorridor_Text_1993A9:: @ 81993A9 + .string "Cabin 2$" + +SSTidalCorridor_Text_1993B1:: @ 81993B1 + .string "Cabin 3$" + +SSTidalCorridor_Text_1993B9:: @ 81993B9 + .string "Cabin 4$" diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/maps/SSTidalLowerDeck/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SSTidalLowerDeck/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc index c9cbf6715..c9cbf6715 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/SSTidalLowerDeck/events.inc diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 5b6bec321..c52690612 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,9 +1,9 @@ SSTidalLowerDeck:: @ 8307B70 - .4byte SSTidalLowerDeck_MapAttributes + .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 - .2byte BGM_M_BOAT + .2byte MUS_M_BOAT .2byte 279 .byte 87 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/maps/SSTidalLowerDeck/map.bin deleted file mode 100644 index 059ce30fe..000000000 --- a/data/maps/SSTidalLowerDeck/map.bin +++ /dev/null @@ -1 +0,0 @@ - 2 2 2 2 2 22 2
22
22
22
2
2
2 2
2222
2222
22222
2
2
2 2222222
222
2222
2
2
2 2222
2
2 2222
2
2 222222222222222
2
2 2
2
2
2
2
2
2
2
2
2
2
2
2
2
222 2222222
222
222
2
2 2222
2662222222
2
\ No newline at end of file diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc new file mode 100644 index 000000000..e91c20625 --- /dev/null +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -0,0 +1,12 @@ +SSTidalLowerDeck_MapScripts:: @ 815FED6 + .byte 0 + +SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 + trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + msgbox SSTidalLowerDeck_Text_19942E, 6 + end + +SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE + trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + msgbox SSTidalLowerDeck_Text_199508, 6 + end diff --git a/data/maps/SSTidalLowerDeck/text.inc b/data/maps/SSTidalLowerDeck/text.inc new file mode 100644 index 000000000..2c54d743c --- /dev/null +++ b/data/maps/SSTidalLowerDeck/text.inc @@ -0,0 +1,25 @@ +SSTidalLowerDeck_Text_1993C1:: @ 81993C1 + .string "Arrrgh! I’m fed up and dog-tired of\n" + .string "cleaning this huge place!\p" + .string "Let’s have a quick battle!$" + +SSTidalLowerDeck_Text_19941A:: @ 819941A + .string "Little bro, I lost!$" + +SSTidalLowerDeck_Text_19942E:: @ 819942E + .string "We’re the CLEANUP BROTHERS!\p" + .string "The old one dumps the detergent,\n" + .string "and the young one does the scrubbing!$" + +SSTidalLowerDeck_Text_199491:: @ 8199491 + .string "This is the bottom of the ship’s hull.\n" + .string "There’s plenty of room.\l" + .string "It’ll be alright for a POKéMON battle.$" + +SSTidalLowerDeck_Text_1994F7:: @ 81994F7 + .string "Big bro, I lost!$" + +SSTidalLowerDeck_Text_199508:: @ 8199508 + .string "We’re the CLEANUP BROTHERS!\p" + .string "The old one dumps the detergent,\n" + .string "and the young one does the scrubbing!$" diff --git a/data/maps/SSTidalRooms/border.bin b/data/maps/SSTidalRooms/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SSTidalRooms/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc index e86c60ed6..e86c60ed6 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/SSTidalRooms/events.inc diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 36bcab75e..09fb99472 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,9 +1,9 @@ SSTidalRooms:: @ 8307B8C - .4byte SSTidalRooms_MapAttributes + .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 - .2byte BGM_M_BOAT + .2byte MUS_M_BOAT .2byte 280 .byte 87 .byte 0 diff --git a/data/maps/SSTidalRooms/map.bin b/data/maps/SSTidalRooms/map.bin deleted file mode 100644 index 6103ad0c2..000000000 --- a/data/maps/SSTidalRooms/map.bin +++ /dev/null @@ -1 +0,0 @@ -6@kcmE@kcmE@kc''@kcmE7>HsuMHsuMHs////uM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr66;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282?
\ No newline at end of file diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc new file mode 100644 index 000000000..89372bd84 --- /dev/null +++ b/data/maps/SSTidalRooms/scripts.inc @@ -0,0 +1,64 @@ +SSTidalRooms_MapScripts:: @ 815FF05 + .byte 0 + +SSTidalRooms_EventScript_15FF06:: @ 815FF06 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D + msgbox SSTidalRooms_Text_199B65, 4 + giveitem_std ITEM_TM49_SNATCH + compare RESULT, 0 + goto_if_eq SSTidalRooms_EventScript_1A029B + setflag FLAG_RECEIVED_TM49 + msgbox SSTidalRooms_Text_199C1A, 4 + release + end + +SSTidalRooms_EventScript_15FF3D:: @ 815FF3D + msgbox SSTidalRooms_Text_199C1A, 4 + release + end + +SSTidalRooms_EventScript_15FF47:: @ 815FF47 + lockall + msgbox SSTidalRooms_Text_19956B, 4 + closemessage + call SSTidalRooms_EventScript_1A02CA + call SSTidalRooms_EventScript_15FD64 + releaseall + end + +SSTidalRooms_EventScript_15FF5D:: @ 815FF5D + trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + msgbox SSTidalRooms_Text_199630, 6 + end + +SSTidalRooms_EventScript_15FF74:: @ 815FF74 + trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + msgbox SSTidalRooms_Text_1996E1, 6 + end + +SSTidalRooms_EventScript_15FF8B:: @ 815FF8B + trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + msgbox SSTidalRooms_Text_199778, 6 + end + +SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 + trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + msgbox SSTidalRooms_Text_199820, 6 + end + +SSTidalRooms_EventScript_15FFBD:: @ 815FFBD + trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + msgbox SSTidalRooms_Text_19991C, 6 + end + +SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 + trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + msgbox SSTidalRooms_Text_199A10, 6 + end + +SSTidalRooms_EventScript_15FFEF:: @ 815FFEF + trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + msgbox SSTidalRooms_Text_199ADE, 6 + end diff --git a/data/maps/SSTidalRooms/text.inc b/data/maps/SSTidalRooms/text.inc new file mode 100644 index 000000000..a0f9000d3 --- /dev/null +++ b/data/maps/SSTidalRooms/text.inc @@ -0,0 +1,111 @@ +SSTidalRooms_Text_19956B:: @ 819956B + .string "It’s a bed.\n" + .string "Let’s take a rest.$" + +SSTidalRooms_Text_19958A:: @ 819958A + .string "Go back and forth between LILYCOVE\n" + .string "and SLATEPORT, that’s what I do.\p" + .string "It’s my hobby - going from port to port\n" + .string "to take in POKéMON CONTESTS.$" + +SSTidalRooms_Text_199613:: @ 8199613 + .string "That was an enjoyable match!$" + +SSTidalRooms_Text_199630:: @ 8199630 + .string "I get so excited imagining what kinds\n" + .string "of POKéMON I’ll get to see in the next\l" + .string "CONTEST. The anticipation of it thrills!$" + +SSTidalRooms_Text_1996A6:: @ 81996A6 + .string "Are your friends strong?$" + +SSTidalRooms_Text_1996BF:: @ 81996BF + .string "Your friends are, indeed, strong.$" + +SSTidalRooms_Text_1996E1:: @ 81996E1 + .string "Friends need not be human.\n" + .string "For me, POKéMON are treasured friends!$" + +SSTidalRooms_Text_199723:: @ 8199723 + .string "Child...\n" + .string "Did you knock on the door?$" + +SSTidalRooms_Text_199747:: @ 8199747 + .string "A loss is to be accepted without haste\n" + .string "or panic.$" + +SSTidalRooms_Text_199778:: @ 8199778 + .string "To be never ruffled in any situation is\n" + .string "the GENTLEMAN’s code of conduct.$" + +SSTidalRooms_Text_1997C1:: @ 81997C1 + .string "JED: I feel a little shy about this, but...\n" + .string "We’ll show you our lovey-dovey power!$" + +SSTidalRooms_Text_199813:: @ 8199813 + .string "JED: Sigh...$" + +SSTidalRooms_Text_199820:: @ 8199820 + .string "JED: It’s the first time that our lovey-\n" + .string "dovey power couldn’t prevail!\l" + .string "You must be an awesome TRAINER!$" + +SSTidalRooms_Text_199887:: @ 8199887 + .string "JED: You only have one POKéMON?\n" + .string "Isn’t that just too lonesome?$" + +SSTidalRooms_Text_1998C5:: @ 81998C5 + .string "LEA: I feel a little silly, but...\n" + .string "We’ll show you our lovey-dovey power!$" + +SSTidalRooms_Text_19990E:: @ 819990E + .string "LEA: Oh, boo!$" + +SSTidalRooms_Text_19991C:: @ 819991C + .string "LEA: I can’t believe it!\n" + .string "Our lovey-dovey power failed...\l" + .string "You must be an awesome TRAINER!$" + +SSTidalRooms_Text_199975:: @ 8199975 + .string "LEA: I wanted to battle...\n" + .string "But you don’t even have two POKéMON...$" + +SSTidalRooms_Text_1999B7:: @ 81999B7 + .string "Ah, you’ve come just in time.\p" + .string "I’m bored, you see.\n" + .string "You may entertain me.$" + +SSTidalRooms_Text_1999FF:: @ 81999FF + .string "...That will do.$" + +SSTidalRooms_Text_199A10:: @ 8199A10 + .string "Perhaps I shall get Father to acquire\n" + .string "a yacht for me.\l" + .string "A yacht for me and POKéMON!$" + +SSTidalRooms_Text_199A62:: @ 8199A62 + .string "Oh, you’re such an adorable TRAINER.\n" + .string "Would you like to have tea?\l" + .string "Or would you rather battle?$" + +SSTidalRooms_Text_199ABF:: @ 8199ABF + .string "I see.\n" + .string "You’re the active sort.$" + +SSTidalRooms_Text_199ADE:: @ 8199ADE + .string "A world cruise on a luxury liner has its\n" + .string "charms, I must say...\p" + .string "But, I will admit there is an appealing\n" + .string "side to touring HOENN by ferry.$" + +SSTidalRooms_Text_199B65:: @ 8199B65 + .string "Uh... Hi! I... I’m not acting suspicious!\n" + .string "Uh... You can have this! For free!\p" + .string "It... Honestly, I didn’t SNATCH it from\n" + .string "someone! I’d never do such a thing!\l" + .string "It’s clean! You can use it!$" + +SSTidalRooms_Text_199C1A:: @ 8199C1A + .string "SNATCH steals the foe’s move in\n" + .string "advance, and then uses the snatched\l" + .string "move on the foe.$" diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/maps/SafariZone_Northeast/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Northeast/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc index ed750532f..ed750532f 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/SafariZone_Northeast/events.inc diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 55bef875f..b4939c053 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,9 +1,9 @@ SafariZone_Northeast:: @ 8307BC4 - .4byte SafariZone_Northeast_MapAttributes + .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 240 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/maps/SafariZone_Northeast/map.bin Binary files differdeleted file mode 100644 index d5e7fd825..000000000 --- a/data/maps/SafariZone_Northeast/map.bin +++ /dev/null diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc new file mode 100644 index 000000000..11e14da0f --- /dev/null +++ b/data/maps/SafariZone_Northeast/scripts.inc @@ -0,0 +1,10 @@ +SafariZone_Northeast_MapScripts:: @ 8160010 + .byte 0 + +SafariZone_Northeast_EventScript_160011:: @ 8160011 + msgbox SafariZone_Northeast_Text_1C3D19, 2 + end + +SafariZone_Northeast_EventScript_16001A:: @ 816001A + msgbox SafariZone_Northeast_Text_1C3D80, 2 + end diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/maps/SafariZone_Northwest/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Northwest/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc index 18a6db38e..18a6db38e 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/SafariZone_Northwest/events.inc diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index a3c85c6ed..533f797a5 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,9 +1,9 @@ SafariZone_Northwest:: @ 8307BA8 - .4byte SafariZone_Northwest_MapAttributes + .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 239 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/maps/SafariZone_Northwest/map.bin Binary files differdeleted file mode 100644 index 1825a1c92..000000000 --- a/data/maps/SafariZone_Northwest/map.bin +++ /dev/null diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc new file mode 100644 index 000000000..f17b7078d --- /dev/null +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -0,0 +1,6 @@ +SafariZone_Northwest_MapScripts:: @ 8160006 + .byte 0 + +SafariZone_Northwest_EventScript_160007:: @ 8160007 + msgbox SafariZone_Northwest_Text_1C3CAE, 2 + end diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/maps/SafariZone_RestHouse/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/SafariZone_RestHouse/border.bin +++ /dev/null diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc index 8ed841ff1..8ed841ff1 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/SafariZone_RestHouse/events.inc diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 3db84b0b7..f13ab4f49 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,9 +1,9 @@ SafariZone_RestHouse:: @ 8307CDC - .4byte SafariZone_RestHouse_MapAttributes + .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 330 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/maps/SafariZone_RestHouse/map.bin deleted file mode 100644 index c57c99c7b..000000000 --- a/data/maps/SafariZone_RestHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -
$2$2$2$2$2$2$2$2$2$292#24266<2#2#2#2#292#24266<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2
\ No newline at end of file diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc new file mode 100644 index 000000000..edaee1580 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -0,0 +1,14 @@ +SafariZone_RestHouse_MapScripts:: @ 8160C2E + .byte 0 + +SafariZone_RestHouse_EventScript_160C2F:: @ 8160C2F + msgbox SafariZone_RestHouse_Text_1C3EC9, 2 + end + +SafariZone_RestHouse_EventScript_160C38:: @ 8160C38 + msgbox SafariZone_RestHouse_Text_1C3F71, 2 + end + +SafariZone_RestHouse_EventScript_160C41:: @ 8160C41 + msgbox SafariZone_RestHouse_Text_1C3FF4, 2 + end diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/maps/SafariZone_Southeast/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Southeast/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc index a18b2b394..a18b2b394 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/SafariZone_Southeast/events.inc diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 1307c9700..f60a67472 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,9 +1,9 @@ SafariZone_Southeast:: @ 8307BFC - .4byte SafariZone_Southeast_MapAttributes + .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 242 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/maps/SafariZone_Southeast/map.bin Binary files differdeleted file mode 100644 index 540798144..000000000 --- a/data/maps/SafariZone_Southeast/map.bin +++ /dev/null diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc new file mode 100644 index 000000000..d7d581891 --- /dev/null +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -0,0 +1,118 @@ +SafariZone_Southeast_MapScripts:: @ 8160036 + map_script 3, SafariZone_Southeast_MapScript1_160073 + map_script 2, SafariZone_Southeast_MapScript2_160041 + .byte 0 + +SafariZone_Southeast_MapScript2_160041:: @ 8160041 + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_Southeast_EventScript_16004B + .2byte 0 + +SafariZone_Southeast_EventScript_16004B:: @ 816004B + lockall + setvar VAR_TEMP_1, 0 + applymovement 255, SafariZone_Southeast_Movement_160087 + waitmovement 0 + applymovement 1, SafariZone_Southeast_Movement_160089 + waitmovement 0 + setobjectxyperm 1, 32, 34 + setvar VAR_SAFARI_ZONE_STATE, 0 + releaseall + end + +SafariZone_Southeast_MapScript1_160073:: @ 8160073 + compare VAR_SAFARI_ZONE_STATE, 2 + call_if_eq SafariZone_Southeast_EventScript_16007F + end + +SafariZone_Southeast_EventScript_16007F:: @ 816007F + setobjectxyperm 1, 31, 34 + return + +SafariZone_Southeast_Movement_160087:: @ 8160087 + walk_down + end_movement + +SafariZone_Southeast_Movement_160089:: @ 8160089 + walk_right + walk_in_place_fastest_down + end_movement + +SafariZone_Southeast_EventScript_16008C:: @ 816008C + msgbox SafariZone_Southeast_Text_1C3B71, 2 + end + +SafariZone_Southeast_EventScript_160095:: @ 8160095 + msgbox SafariZone_Southeast_Text_1C3BBD, 2 + end + +SafariZone_Southeast_EventScript_16009E:: @ 816009E + msgbox SafariZone_Southeast_Text_1C3DCE, 2 + end + +SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 + lock + faceplayer + compare VAR_TEMP_1, 0 + goto_if_eq SafariZone_Southeast_EventScript_1600D1 + msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq SafariZone_Southeast_EventScript_1600E0 + msgbox SafariZone_Southeast_Text_1C3A9C, 4 + release + end + +SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 + setvar VAR_TEMP_1, 1 + msgbox SafariZone_Southeast_Text_1C3B2D, 4 + release + end + +SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 + msgbox SafariZone_Southeast_Text_1C3ACA, 4 + closemessage + switch FACING + case 2, SafariZone_Southeast_EventScript_160105 + case 4, SafariZone_Southeast_EventScript_16011F + end + +SafariZone_Southeast_EventScript_160105:: @ 8160105 + applymovement 1, SafariZone_Southeast_Movement_160150 + waitmovement 0 + applymovement 255, SafariZone_Southeast_Movement_16014B + waitmovement 0 + goto SafariZone_Southeast_EventScript_160139 + end + +SafariZone_Southeast_EventScript_16011F:: @ 816011F + applymovement 1, SafariZone_Southeast_Movement_160153 + waitmovement 0 + applymovement 255, SafariZone_Southeast_Movement_16014D + waitmovement 0 + goto SafariZone_Southeast_EventScript_160139 + end + +SafariZone_Southeast_EventScript_160139:: @ 8160139 + setvar VAR_SAFARI_ZONE_STATE, 1 + special ExitSafariMode + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + waitstate + end + +SafariZone_Southeast_Movement_16014B:: @ 816014B + walk_up + end_movement + +SafariZone_Southeast_Movement_16014D:: @ 816014D + walk_right + walk_in_place_fastest_up + end_movement + +SafariZone_Southeast_Movement_160150:: @ 8160150 + walk_left + walk_in_place_fastest_right + end_movement + +SafariZone_Southeast_Movement_160153:: @ 8160153 + walk_down + walk_in_place_fastest_up + end_movement diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/maps/SafariZone_Southwest/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SafariZone_Southwest/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc index 909997d64..909997d64 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/SafariZone_Southwest/events.inc diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 548dc24b7..9a472f3ec 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,9 +1,9 @@ SafariZone_Southwest:: @ 8307BE0 - .4byte SafariZone_Southwest_MapAttributes + .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections - .2byte BGM_SAFARI + .2byte MUS_SAFARI .2byte 241 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/maps/SafariZone_Southwest/map.bin Binary files differdeleted file mode 100644 index 0074b6e55..000000000 --- a/data/maps/SafariZone_Southwest/map.bin +++ /dev/null diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc new file mode 100644 index 000000000..51bffeeab --- /dev/null +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -0,0 +1,10 @@ +SafariZone_Southwest_MapScripts:: @ 8160023 + .byte 0 + +SafariZone_Southwest_EventScript_160024:: @ 8160024 + msgbox SafariZone_Southwest_Text_1C3C39, 2 + end + +SafariZone_Southwest_EventScript_16002D:: @ 816002D + msgbox SafariZone_Southwest_Text_1C3EA3, 3 + end diff --git a/data/maps/ScorchedSlab/border.bin b/data/maps/ScorchedSlab/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ScorchedSlab/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc index a90403222..a90403222 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/ScorchedSlab/events.inc diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 16e45546e..43b6b24b5 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,9 +1,9 @@ ScorchedSlab:: @ 830756C - .4byte ScorchedSlab_MapAttributes + .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 312 .byte 80 .byte 0 diff --git a/data/maps/ScorchedSlab/map.bin b/data/maps/ScorchedSlab/map.bin deleted file mode 100644 index edbd982ee..000000000 --- a/data/maps/ScorchedSlab/map.bin +++ /dev/null @@ -1 +0,0 @@ - 22222 2222222222222222222222222222 ppppppppppppppppppppppppppppppppppppppppppppppppppppGG^^^^GGG $G
\ No newline at end of file diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc new file mode 100644 index 000000000..f0ed9c005 --- /dev/null +++ b/data/maps/ScorchedSlab/scripts.inc @@ -0,0 +1,7 @@ +ScorchedSlab_MapScripts:: @ 815F29D + map_script 3, ScorchedSlab_MapScript1_15F2A3 + .byte 0 + +ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 + setflag FLAG_LANDMARK_SCORCHED_SLAB + end diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/maps/SeafloorCavern_Entrance/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc index 4f6fa0c07..4f6fa0c07 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index d768c1099..4f48878a8 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Entrance:: @ 8307064 - .4byte SeafloorCavern_Entrance_MapAttributes + .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 148 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/maps/SeafloorCavern_Entrance/map.bin deleted file mode 100644 index 3861044dd..000000000 --- a/data/maps/SeafloorCavern_Entrance/map.bin +++ /dev/null @@ -1,11 +0,0 @@ -3
$1$1$1$1$1 $1$1$1$1$1$1$1$1$1
$1$1$1$1$1$1$1$1$1 $1$1$1$1$1$1$1$1$1$1$1$1
$1$1$1$1$1$1$1$1$1$1$1$1 - $1$1$1$1$1$1$1$1$1$1$1$1$1$1$1 - $1$1$1$1$111111$1$1$1$1$1 - $1$1$1111111111$1$1$1 - $1$111111111111$1$1 - $1111111$1 - 111ppppp11$1 - 11ppppppp11 - 11ppppppppp11 - 11ppppppppp11 -1ppVVVVppppVVpVV
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc new file mode 100644 index 000000000..9d59279ea --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -0,0 +1,8 @@ +SeafloorCavern_Entrance_MapScripts:: @ 815DA4A + map_script 5, SeafloorCavern_Entrance_MapScript1_15DA50 + .byte 0 + +SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + end diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/maps/SeafloorCavern_Room1/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc index cb6442135..cb6442135 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index affbaf21c..411e65b1b 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1:: @ 8307080 - .4byte SeafloorCavern_Room1_MapAttributes + .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 149 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/maps/SeafloorCavern_Room1/map.bin deleted file mode 100644 index 57cd82f78..000000000 --- a/data/maps/SeafloorCavern_Room1/map.bin +++ /dev/null @@ -1 +0,0 @@ -222322222222222222222222222222222222222622222226222222222222222222222222222222222222226666222222266662222<22266666222662222222222222222222222
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc new file mode 100644 index 000000000..6478efac1 --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -0,0 +1,17 @@ +SeafloorCavern_Room1_MapScripts:: @ 815DA61 + map_script 3, SeafloorCavern_Room1_MapScript1_15DA67 + .byte 0 + +SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 + call SeafloorCavern_Room1_EventScript_1A0196 + end + +SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D + trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA + msgbox SeafloorCavern_Room1_Text_1974FF, 6 + end + +SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 + trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 + msgbox SeafloorCavern_Room1_Text_197589, 6 + end diff --git a/data/maps/SeafloorCavern_Room1/text.inc b/data/maps/SeafloorCavern_Room1/text.inc new file mode 100644 index 000000000..da6e207ae --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/text.inc @@ -0,0 +1,22 @@ +SeafloorCavern_Room1_Text_1974BA:: @ 81974BA + .string "We don’t need a kid around!\n" + .string "Go on home already!$" + +SeafloorCavern_Room1_Text_1974EA:: @ 81974EA + .string "I want to go home...$" + +SeafloorCavern_Room1_Text_1974FF:: @ 81974FF + .string "I want to get a promotion so I can\n" + .string "boss around the GRUNTS...$" + +SeafloorCavern_Room1_Text_19753C:: @ 819753C + .string "That submarine... It’s tiny inside.\n" + .string "I’m sore all over!$" + +SeafloorCavern_Room1_Text_197573:: @ 8197573 + .string "Losing makes me sore!$" + +SeafloorCavern_Room1_Text_197589:: @ 8197589 + .string "That submarine we jacked, man, it’s\n" + .string "brutal as a ride.\l" + .string "It’s way too tight in there!$" diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/maps/SeafloorCavern_Room2/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc index eefcffd2e..eefcffd2e 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 6e0e7455d..a8e6ce80e 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room2:: @ 830709C - .4byte SeafloorCavern_Room2_MapAttributes + .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 150 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/maps/SeafloorCavern_Room2/map.bin deleted file mode 100644 index 01b66f2f3..000000000 --- a/data/maps/SeafloorCavern_Room2/map.bin +++ /dev/null @@ -1 +0,0 @@ -33222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room2/scripts.inc b/data/maps/SeafloorCavern_Room2/scripts.inc new file mode 100644 index 000000000..b4507c8b9 --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/scripts.inc @@ -0,0 +1,2 @@ +SeafloorCavern_Room2_MapScripts:: @ 815DA9B + .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/maps/SeafloorCavern_Room3/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc index 5f8f769d3..5f8f769d3 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index e2a432cd9..b062079b7 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room3:: @ 83070B8 - .4byte SeafloorCavern_Room3_MapAttributes + .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 151 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/maps/SeafloorCavern_Room3/map.bin deleted file mode 100644 index b5e92ca20..000000000 --- a/data/maps/SeafloorCavern_Room3/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666663666662226666622266666222666662226662226662226662222222222222222222222222222222222222QQQM2222222222222222226666666
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc new file mode 100644 index 000000000..2ff8c4b26 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -0,0 +1,12 @@ +SeafloorCavern_Room3_MapScripts:: @ 815DA9C + map_script 3, SeafloorCavern_Room3_MapScript1_15DAA2 + .byte 0 + +SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 + call SeafloorCavern_Room3_EventScript_1A0196 + end + +SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 + trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 + msgbox SeafloorCavern_Room3_Text_197704, 6 + end diff --git a/data/maps/SeafloorCavern_Room3/text.inc b/data/maps/SeafloorCavern_Room3/text.inc new file mode 100644 index 000000000..07187b142 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/text.inc @@ -0,0 +1,24 @@ +SeafloorCavern_Room3_Text_1975DC:: @ 81975DC + .string "Ahahahaha!\p" + .string "How did you manage to get here without\n" + .string "a submarine?\l" + .string "What an impressive child!\p" + .string "But... It won’t do to have you\n" + .string "meddling about here.\p" + .string "And, I do want payback for what\n" + .string "happened at the WEATHER INSTITUTE...\p" + .string "I’m going to give you a little taste\n" + .string "of pain! Resign yourself to it!$" + +SeafloorCavern_Room3_Text_1976F3:: @ 81976F3 + .string "Ahahahaha!\p" + .string "Ouch!$" + +SeafloorCavern_Room3_Text_197704:: @ 8197704 + .string "Ahahahaha!\n" + .string "You’re so darn strong.\p" + .string "It’s terribly disappointing that you’re\n" + .string "not a TEAM {EVIL_TEAM} member.\p" + .string "You could have enjoyed the fabulous\n" + .string "world our BOSS has promised to one\l" + .string "of our own...$" diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/maps/SeafloorCavern_Room4/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc index a31f0f5d8..a31f0f5d8 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 0416091d4..bee900fed 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room4:: @ 83070D4 - .4byte SeafloorCavern_Room4_MapAttributes + .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 152 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/maps/SeafloorCavern_Room4/map.bin deleted file mode 100644 index 928749c95..000000000 --- a/data/maps/SeafloorCavern_Room4/map.bin +++ /dev/null @@ -1 +0,0 @@ -3362222222622222226LQQM22262222222292222222222229222222222222222222666222222222222223222222229222222222229222222LQQQM2222222222
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc new file mode 100644 index 000000000..cbed797c0 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -0,0 +1,12 @@ +SeafloorCavern_Room4_MapScripts:: @ 815DABF + map_script 3, SeafloorCavern_Room4_MapScript1_15DAC5 + .byte 0 + +SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 + call SeafloorCavern_Room4_EventScript_1A0196 + end + +SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB + trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 + msgbox SeafloorCavern_Room4_Text_1977ED, 6 + end diff --git a/data/maps/SeafloorCavern_Room4/text.inc b/data/maps/SeafloorCavern_Room4/text.inc new file mode 100644 index 000000000..ca0600450 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/text.inc @@ -0,0 +1,10 @@ +SeafloorCavern_Room4_Text_1977B9:: @ 81977B9 + .string "Who are you?\n" + .string "Where did you come in from?$" + +SeafloorCavern_Room4_Text_1977E2:: @ 81977E2 + .string "Lost it...$" + +SeafloorCavern_Room4_Text_1977ED:: @ 81977ED + .string "I can’t find the way out!\p" + .string "I’m not afraid. Don’t get me wrong!$" diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/maps/SeafloorCavern_Room5/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room5/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc index 767fa6dc1..767fa6dc1 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 3272c7021..9e7560fe2 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room5:: @ 83070F0 - .4byte SeafloorCavern_Room5_MapAttributes + .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 153 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/maps/SeafloorCavern_Room5/map.bin deleted file mode 100644 index 386430fe4..000000000 --- a/data/maps/SeafloorCavern_Room5/map.bin +++ /dev/null @@ -1 +0,0 @@ -32222222222222222222222222222222222222222222222222222222222222222222222222222222222222
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room5/scripts.inc b/data/maps/SeafloorCavern_Room5/scripts.inc new file mode 100644 index 000000000..79b65c2e6 --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/scripts.inc @@ -0,0 +1,2 @@ +SeafloorCavern_Room5_MapScripts:: @ 815DAE2 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/maps/SeafloorCavern_Room6/border.bin deleted file mode 100644 index a00c39057..000000000 --- a/data/maps/SeafloorCavern_Room6/border.bin +++ /dev/null @@ -1 +0,0 @@ -~~~~
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc index adf36455a..adf36455a 100644 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ b/data/maps/SeafloorCavern_Room6/events.inc diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 18fab912d..0b9fdb9d1 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room6:: @ 830710C - .4byte SeafloorCavern_Room6_MapAttributes + .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 154 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/maps/SeafloorCavern_Room6/map.bin deleted file mode 100644 index 3776cc4c7..000000000 --- a/data/maps/SeafloorCavern_Room6/map.bin +++ /dev/null @@ -1 +0,0 @@ -z2xzzy2y2y2y2xxzzy2y2y2y2pxxzzy2y2y2y2ppppppppppppxxzzy2y2y2y2ppppuvvvwpppxxzzpppu~~~wppxxzzppppppp}ppxxzzppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppppxxzzppppppxxzzpppppppppppppxxzzppppppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppxxzzppppppppppxxzzpppppppppppuvzzpppppuo2o2o2vwpuv~~~~vvvvvz~22~2x~v~~~~~~~~~~~~~~~~~~~~~~~~~
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room6/scripts.inc b/data/maps/SeafloorCavern_Room6/scripts.inc new file mode 100644 index 000000000..3ebeae07f --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/scripts.inc @@ -0,0 +1,2 @@ +SeafloorCavern_Room6_MapScripts:: @ 815DAE3 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/maps/SeafloorCavern_Room7/border.bin deleted file mode 100644 index a00c39057..000000000 --- a/data/maps/SeafloorCavern_Room7/border.bin +++ /dev/null @@ -1 +0,0 @@ -~~~~
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc index 616376e32..616376e32 100644 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ b/data/maps/SeafloorCavern_Room7/events.inc diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index ff7579206..ee640a183 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room7:: @ 8307128 - .4byte SeafloorCavern_Room7_MapAttributes + .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 155 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/maps/SeafloorCavern_Room7/map.bin deleted file mode 100644 index c1afaebcf..000000000 --- a/data/maps/SeafloorCavern_Room7/map.bin +++ /dev/null @@ -1 +0,0 @@ -z2~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2xzzpppxxzzpppppppppppppppppxxzzppxxzzpppppppppppppppxxzzppxxzzppppppppppppppxxzzpppppppxxzzpppppppppppppppxxzzpppppxxzzpppppppppppxxzzpppppppppppxxzzpppxxzzpppppppppppppxxzzpppppppppppppxxzzpppxxz66q2ypppppppppppppxxzy6z6y2pppppppppppppxxzy6z6y2q2q2q2q2q2yppppppppxxz66y2y2y2y2y2y2ppppppppxxzzy22y2y2sy2tppppppppxxqqvvvvvvvvvv
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room7/scripts.inc b/data/maps/SeafloorCavern_Room7/scripts.inc new file mode 100644 index 000000000..acad96ad0 --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/scripts.inc @@ -0,0 +1,2 @@ +SeafloorCavern_Room7_MapScripts:: @ 815DAE4 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/maps/SeafloorCavern_Room8/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room8/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc index 450eb894a..450eb894a 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index f443c8530..43ff7baa4 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room8:: @ 8307144 - .4byte SeafloorCavern_Room8_MapAttributes + .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 156 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/maps/SeafloorCavern_Room8/map.bin deleted file mode 100644 index e70e95b47..000000000 --- a/data/maps/SeafloorCavern_Room8/map.bin +++ /dev/null @@ -1 +0,0 @@ -632222222222222222222222222222222222LQM22222222222
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room8/scripts.inc b/data/maps/SeafloorCavern_Room8/scripts.inc new file mode 100644 index 000000000..117f9e6b5 --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/scripts.inc @@ -0,0 +1,2 @@ +SeafloorCavern_Room8_MapScripts:: @ 815DAE5 + .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/maps/SeafloorCavern_Room9/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/SeafloorCavern_Room9/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc index f4efdbcc0..f4efdbcc0 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 10303ec46..c45181c89 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room9:: @ 8307160 - .4byte SeafloorCavern_Room9_MapAttributes + .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 157 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/maps/SeafloorCavern_Room9/map.bin deleted file mode 100644 index 252112ac2..000000000 --- a/data/maps/SeafloorCavern_Room9/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222 222222 22222222222 222222
222
222
2222222
2222222222
2222222 #
222 #2222 #
2222
2222 #
2222
222 #
OO
222OOOO222pNOOOONp222 ppNNNNpp22222pppppppp22222
ppppppppp22222222#2s2lpppppppp222222222#2lpppppjs2s2$222222222#2s2s2s2s2s2$22222222222222222222222
\ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc new file mode 100644 index 000000000..74d624141 --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -0,0 +1,291 @@ +SeafloorCavern_Room9_MapScripts:: @ 815DAE6 + map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC + .byte 0 + +SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC + call SeafloorCavern_Room9_EventScript_1A0196 + call SeafloorCavern_Room9_EventScript_1A01B5 + .ifdef SAPPHIRE + setmaplayoutindex 157 + .else + setmaplayoutindex 327 + .endif + end + +SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA + lockall + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_7, 5 + applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 + applymovement 255, SeafloorCavern_Room9_Movement_15DD68 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B41B8, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4850, 4 + .endif + closemessage + addobject VAR_SPECIAL_4 + applymovement 255, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B41D5, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B486C, 4 + .endif + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B4201, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4897, 4 + .endif + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B4289, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B491F, 4 + .endif + .ifdef SAPPHIRE + trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 + .else + trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE + .endif + .ifdef SAPPHIRE + msgbox UnknownString_81B432C, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B49C1, 4 + .endif + setweather WEATHER_NONE + doweather + special sub_8081924 + waitstate + .ifdef SAPPHIRE + msgbox UnknownString_81B43C4, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4A5A, 4 + .endif + special WaitWeather + waitstate + .ifdef SAPPHIRE + setvar RESULT, 1 + .else + setvar RESULT, 0 + .endif + playse SE_W197 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + waitfieldeffect FLDEFF_SPARKLE + .ifdef SAPPHIRE + setvar RESULT, 0 + .else + setvar RESULT, 1 + .endif + playfanfare MUS_ME_TAMA + playse SE_TAMA + special sub_80818A4 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 + delay 150 + removeobject 7 + addobject 1 + waitstate + delay 60 + applymovement 1, SeafloorCavern_Room9_Movement_15DD4C + waitmovement 0 + special sub_80818FC + waitstate + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + special sub_810F758 + waitstate + applymovement 1, SeafloorCavern_Room9_Movement_15DD57 + waitmovement 0 + removeobject 1 + delay 4 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 2 + special sub_810F758 + waitstate + delay 30 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_7, 5 + .ifdef SAPPHIRE + msgbox UnknownString_81B43F2, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4A89, 4 + .endif + playse SE_PC_LOGON + applymovement 255, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B4443, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 + .endif + closemessage + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B447A, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4B11, 4 + .endif + closemessage + playse SE_PC_OFF + delay 20 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B45C6, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4C79, 4 + .endif + closemessage + addobject VAR_SPECIAL_5 + addobject VAR_SPECIAL_6 + addobject VAR_SPECIAL_7 + applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A + waitmovement 0 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B464D, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4D02, 4 + .endif + playse SE_PIN + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 + waitmovement 0 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B4723, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4DD3, 4 + .endif + .ifdef SAPPHIRE + msgbox UnknownString_81B4786, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4E37, 4 + .endif + closemessage + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46 + waitmovement 0 + .ifdef SAPPHIRE + msgbox UnknownString_81B4818, 4 + .else + msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 + .endif + setvar VAR_ROUTE128_STATE, 1 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS + clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS + setvar VAR_SOOTOPOLIS_STATE, 1 + clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 + clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 + setflag FLAG_SYS_WEATHER_CTRL + setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS + setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN + setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE + setvar VAR_STEVENS_HOUSE_STATE, 1 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + warp MAP_ROUTE128, 255, 38, 22 + waitstate + releaseall + end + +SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +@ 815DD3E + walk_left + walk_left + end_movement + +SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41 + walk_left + delay_16 + end_movement + +@ 815DD44 + walk_right + end_movement + +SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46 + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right + end_movement + +SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + end_movement + +SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57 + slide_up + slide_up + end_movement + +SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60 + walk_right + walk_right + end_movement + +SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68 + delay_16 + delay_16 + end_movement diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/maps/SealedChamber_InnerRoom/border.bin Binary files differdeleted file mode 100644 index 9afd13cdc..000000000 --- a/data/maps/SealedChamber_InnerRoom/border.bin +++ /dev/null diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc index a457a4e03..a457a4e03 100644 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 6ae714a1f..d919de498 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,9 +1,9 @@ SealedChamber_InnerRoom:: @ 8307550 - .4byte SealedChamber_InnerRoom_MapAttributes + .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 305 .byte 78 .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/maps/SealedChamber_InnerRoom/map.bin deleted file mode 100644 index 823fa5fab..000000000 --- a/data/maps/SealedChamber_InnerRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -222222222222777222222222222222222222222222222222222222722222722222222222222222222222222222222222222222222222222722222222272222222222222222222222222222222222222222222222222722222722222222222222
\ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc new file mode 100644 index 000000000..11aba3ac8 --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -0,0 +1,87 @@ +SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 + .byte 0 + +SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C53C1 + waitbuttonpress + erasebox 0, 0, 29, 19 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247 + specialvar RESULT, CheckRelicanthWailord + compare RESULT, 0 + goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 + fadeoutbgm 0 + playse SE_TRACK_MOVE + special DoSealedChamberShakingEffect1 + waitstate + delay 40 + special DoSealedChamberShakingEffect2 + waitstate + playse SE_DOOR + delay 40 + special DoSealedChamberShakingEffect2 + waitstate + playse SE_DOOR + delay 40 + special DoSealedChamberShakingEffect2 + waitstate + playse SE_DOOR + delay 40 + msgbox SealedChamber_InnerRoom_Text_1A138B, 4 + closemessage + fadeinbgm 0 + setflag FLAG_REGI_DOORS_OPENED + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C53F2 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C5414 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C5435 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C545C + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C5470 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F + lockall + braillemessage SealedChamber_InnerRoom_Braille_1C549B + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/maps/SealedChamber_OuterRoom/border.bin Binary files differdeleted file mode 100644 index 9afd13cdc..000000000 --- a/data/maps/SealedChamber_OuterRoom/border.bin +++ /dev/null diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 634f41f60..634f41f60 100644 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fe35a8210..f40159b44 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,9 +1,9 @@ SealedChamber_OuterRoom:: @ 8307534 - .4byte SealedChamber_OuterRoom_MapAttributes + .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 285 .byte 78 .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/maps/SealedChamber_OuterRoom/map.bin deleted file mode 100644 index bf1482f97..000000000 --- a/data/maps/SealedChamber_OuterRoom/map.bin +++ /dev/null @@ -1,11 +0,0 @@ - `*+,a )2324) 222222222222222222222222222222 -2 -2 -555255525222222222222222 -2 -2 -555255525222222222222222 -2 -222255525552222222222222222222 -2 -222255525552222222222222222222222222222222222VVV2222222222VGV22222$ggggg_____ggggg#$ #$$ ##
\ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc new file mode 100644 index 000000000..1f2159010 --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -0,0 +1,129 @@ +SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 + map_script 5, SealedChamber_OuterRoom_MapScript1_15F0D6 + map_script 3, SealedChamber_OuterRoom_MapScript1_15F0E7 + map_script 1, SealedChamber_OuterRoom_MapScript1_15F0EB + .byte 0 + +SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + end + +SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 + setflag FLAG_LANDMARK_SEALED_CHAMBER + end + +SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F0F5 + end + +SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 + setmetatile 9, 1, 553, 1 + setmetatile 10, 1, 553, 1 + setmetatile 11, 1, 553, 1 + setmetatile 9, 2, 565, 1 + setmetatile 10, 2, 565, 1 + setmetatile 11, 2, 565, 1 + return + +SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C534F + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C5359 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C5363 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C536D + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C5377 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C5381 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C538B + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C5396 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C539E + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C53A9 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 + lockall + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F1CF + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF + msgbox SealedChamber_OuterRoom_Text_1A13BE, 4 + releaseall + end + +SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 + lockall + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/maps/SecretBase_BlueCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc index 7f883e7e9..7f883e7e9 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 24641e4e6..08ab9ab97 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,9 +1,9 @@ SecretBase_BlueCave1:: @ 8307710 - .4byte SecretBase_BlueCave1_MapAttributes + .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 200 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/maps/SecretBase_BlueCave1/map.bin deleted file mode 100644 index 371b2a8d5..000000000 --- a/data/maps/SecretBase_BlueCave1/map.bin +++ /dev/null @@ -1,50 +0,0 @@ -6 -2 -2 -2 -2 -2 6 -2 -22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -26 -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 -22 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave1/scripts.inc b/data/maps/SecretBase_BlueCave1/scripts.inc new file mode 100644 index 000000000..bca6bee55 --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/maps/SecretBase_BlueCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc index 93e7b67f8..93e7b67f8 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 599abd34a..89546ddaf 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,9 +1,9 @@ SecretBase_BlueCave2:: @ 83077B8 - .4byte SecretBase_BlueCave2_MapAttributes + .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 206 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/maps/SecretBase_BlueCave2/map.bin deleted file mode 100644 index 4993e5b65..000000000 --- a/data/maps/SecretBase_BlueCave2/map.bin +++ /dev/null @@ -1,57 +0,0 @@ - 62 -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 -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 -2 -2 -22 -2 -2 -26
\ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave2/scripts.inc b/data/maps/SecretBase_BlueCave2/scripts.inc new file mode 100644 index 000000000..4fc579fb9 --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/maps/SecretBase_BlueCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc index bb761d2e8..bb761d2e8 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 2adbdb4e5..67df8c009 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,9 +1,9 @@ SecretBase_BlueCave3:: @ 8307860 - .4byte SecretBase_BlueCave3_MapAttributes + .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 212 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/maps/SecretBase_BlueCave3/map.bin deleted file mode 100644 index 968aade07..000000000 --- a/data/maps/SecretBase_BlueCave3/map.bin +++ /dev/null @@ -1,51 +0,0 @@ - -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 -222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -2 -2
-2 6 -222 -2 -22 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave3/scripts.inc b/data/maps/SecretBase_BlueCave3/scripts.inc new file mode 100644 index 000000000..0a8199f19 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/maps/SecretBase_BlueCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BlueCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc index 082600bec..082600bec 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 269a276ef..7cf1ed137 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,9 +1,9 @@ SecretBase_BlueCave4:: @ 8307908 - .4byte SecretBase_BlueCave4_MapAttributes + .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 218 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/maps/SecretBase_BlueCave4/map.bin deleted file mode 100644 index 631ac0f81..000000000 --- a/data/maps/SecretBase_BlueCave4/map.bin +++ /dev/null @@ -1,57 +0,0 @@ - -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 -2 -2 -2 -2 -2 6 -2 -2"6 #6 2 -2
6 -22 -2 -2 -2 -22 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave4/scripts.inc b/data/maps/SecretBase_BlueCave4/scripts.inc new file mode 100644 index 000000000..72c1e9612 --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/scripts.inc @@ -0,0 +1 @@ +SecretBase_BlueCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/maps/SecretBase_BrownCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc index c3219bf43..c3219bf43 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b54737d93..b6d298eb9 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,9 +1,9 @@ SecretBase_BrownCave1:: @ 83076F4 - .4byte SecretBase_BrownCave1_MapAttributes + .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 199 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/maps/SecretBase_BrownCave1/map.bin deleted file mode 100644 index 56d3436ca..000000000 --- a/data/maps/SecretBase_BrownCave1/map.bin +++ /dev/null @@ -1,54 +0,0 @@ -6 -2 -2 -2 -2 -2 -2 -2 -2 6 -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 -26 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave1/scripts.inc b/data/maps/SecretBase_BrownCave1/scripts.inc new file mode 100644 index 000000000..ddbf182e4 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/maps/SecretBase_BrownCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc index e57348a00..e57348a00 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index e84bfd2eb..3a50de1fa 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,9 +1,9 @@ SecretBase_BrownCave2:: @ 830779C - .4byte SecretBase_BrownCave2_MapAttributes + .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 205 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/maps/SecretBase_BrownCave2/map.bin deleted file mode 100644 index 184896975..000000000 --- a/data/maps/SecretBase_BrownCave2/map.bin +++ /dev/null @@ -1,56 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2 -2 6
-26 -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 -2 -2 -2 -2 -2 -2 2 6 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave2/scripts.inc b/data/maps/SecretBase_BrownCave2/scripts.inc new file mode 100644 index 000000000..06dcb6335 --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/maps/SecretBase_BrownCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc index c1003816a..c1003816a 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 9e0dc78e0..4da609d11 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,9 +1,9 @@ SecretBase_BrownCave3:: @ 8307844 - .4byte SecretBase_BrownCave3_MapAttributes + .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 211 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/maps/SecretBase_BrownCave3/map.bin deleted file mode 100644 index d9967522a..000000000 --- a/data/maps/SecretBase_BrownCave3/map.bin +++ /dev/null @@ -1,69 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -2
66 -2 -2 -2 -2 -2 -2 6 -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 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave3/scripts.inc b/data/maps/SecretBase_BrownCave3/scripts.inc new file mode 100644 index 000000000..a0a85dc11 --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/maps/SecretBase_BrownCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_BrownCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc index 02afc20c4..02afc20c4 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d21c844da..471b29596 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,9 +1,9 @@ SecretBase_BrownCave4:: @ 83078EC - .4byte SecretBase_BrownCave4_MapAttributes + .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 217 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/maps/SecretBase_BrownCave4/map.bin deleted file mode 100644 index 8b5a763c4..000000000 --- a/data/maps/SecretBase_BrownCave4/map.bin +++ /dev/null @@ -1,70 +0,0 @@ - 62 -2 -2 -2 -2 -2 -2 -2"6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2#6 -2 -2 -2 -2 -2 -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 -22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave4/scripts.inc b/data/maps/SecretBase_BrownCave4/scripts.inc new file mode 100644 index 000000000..12d931e9e --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/scripts.inc @@ -0,0 +1 @@ +SecretBase_BrownCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/maps/SecretBase_RedCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc index 18fea4c40..18fea4c40 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/SecretBase_RedCave1/events.inc diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 60df36c7e..6508fe62a 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,9 +1,9 @@ SecretBase_RedCave1:: @ 83076D8 - .4byte SecretBase_RedCave1_MapAttributes + .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 198 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/maps/SecretBase_RedCave1/map.bin deleted file mode 100644 index ce666b57d..000000000 --- a/data/maps/SecretBase_RedCave1/map.bin +++ /dev/null @@ -1,51 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2 6 -2 -2 -2 -2 -2 -2 -2
6 -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -2 -2 -2 -22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
6 -2 -22 -2 -2 -26
\ No newline at end of file diff --git a/data/maps/SecretBase_RedCave1/scripts.inc b/data/maps/SecretBase_RedCave1/scripts.inc new file mode 100644 index 000000000..77b99daec --- /dev/null +++ b/data/maps/SecretBase_RedCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave1/text.inc b/data/maps/SecretBase_RedCave1/text.inc new file mode 100644 index 000000000..efb2c8fdb --- /dev/null +++ b/data/maps/SecretBase_RedCave1/text.inc @@ -0,0 +1,2 @@ +SecretBase_RedCave1_Text_198F89:: @ 8198F89 + .string "Want to make your SECRET BASE here?$" diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/maps/SecretBase_RedCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc index 1d9bdde09..1d9bdde09 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/SecretBase_RedCave2/events.inc diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 5325c424e..f4c61d108 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,9 +1,9 @@ SecretBase_RedCave2:: @ 8307780 - .4byte SecretBase_RedCave2_MapAttributes + .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 204 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/maps/SecretBase_RedCave2/map.bin deleted file mode 100644 index 4fa03acfe..000000000 --- a/data/maps/SecretBase_RedCave2/map.bin +++ /dev/null @@ -1,42 +0,0 @@ - -22 -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 -2 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -26 -26 -2 2
\ No newline at end of file diff --git a/data/maps/SecretBase_RedCave2/scripts.inc b/data/maps/SecretBase_RedCave2/scripts.inc new file mode 100644 index 000000000..735d386fc --- /dev/null +++ b/data/maps/SecretBase_RedCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/maps/SecretBase_RedCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc index 923616945..923616945 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/SecretBase_RedCave3/events.inc diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index a86997805..681f4c403 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,9 +1,9 @@ SecretBase_RedCave3:: @ 8307828 - .4byte SecretBase_RedCave3_MapAttributes + .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 210 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/maps/SecretBase_RedCave3/map.bin deleted file mode 100644 index 0528e565d..000000000 --- a/data/maps/SecretBase_RedCave3/map.bin +++ /dev/null @@ -1,47 +0,0 @@ - -2 -22 -2 6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
6 -2 -2 -2 -2 -2 -2 -2 -2 -222 -22 -2 -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -2 -2 -2 -22 -2 -2 6 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc new file mode 100644 index 000000000..c9b72ca30 --- /dev/null +++ b/data/maps/SecretBase_RedCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/maps/SecretBase_RedCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_RedCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc index 25a0f2ec6..25a0f2ec6 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/SecretBase_RedCave4/events.inc diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 40e830726..77b6e06a7 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,9 +1,9 @@ SecretBase_RedCave4:: @ 83078D0 - .4byte SecretBase_RedCave4_MapAttributes + .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 216 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/maps/SecretBase_RedCave4/map.bin deleted file mode 100644 index 526763290..000000000 --- a/data/maps/SecretBase_RedCave4/map.bin +++ /dev/null @@ -1,56 +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 "66 #6 2 -2 -2 -2 -22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
6 -22 -2 -2 -2 -2 6 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc new file mode 100644 index 000000000..6d2402f03 --- /dev/null +++ b/data/maps/SecretBase_RedCave4/scripts.inc @@ -0,0 +1 @@ +SecretBase_RedCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/maps/SecretBase_Shrub1/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc index e1583e86d..e1583e86d 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/SecretBase_Shrub1/events.inc diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 3b634c729..cc85dea9e 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,9 +1,9 @@ SecretBase_Shrub1:: @ 8307764 - .4byte SecretBase_Shrub1_MapAttributes + .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 203 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/maps/SecretBase_Shrub1/map.bin deleted file mode 100644 index 4b566cc1b..000000000 --- a/data/maps/SecretBase_Shrub1/map.bin +++ /dev/null @@ -1,53 +0,0 @@ - -2 -2
-2 -2 -2 -2 -2 -2 6 -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 -26 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc new file mode 100644 index 000000000..79116a0cf --- /dev/null +++ b/data/maps/SecretBase_Shrub1/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/maps/SecretBase_Shrub2/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc index 72bdcc380..72bdcc380 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/SecretBase_Shrub2/events.inc diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 1c27f8945..932fcaca5 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,9 +1,9 @@ SecretBase_Shrub2:: @ 830780C - .4byte SecretBase_Shrub2_MapAttributes + .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 209 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/maps/SecretBase_Shrub2/map.bin deleted file mode 100644 index 8cb88cc44..000000000 --- a/data/maps/SecretBase_Shrub2/map.bin +++ /dev/null @@ -1,57 +0,0 @@ - 6 -2 -2 -2 -2 -2 -2 -2 -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 -22 -2 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_Shrub2/scripts.inc b/data/maps/SecretBase_Shrub2/scripts.inc new file mode 100644 index 000000000..49835f7f3 --- /dev/null +++ b/data/maps/SecretBase_Shrub2/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/maps/SecretBase_Shrub3/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc index b09c206e7..b09c206e7 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/SecretBase_Shrub3/events.inc diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index e6e85c9ed..a3a660338 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,9 +1,9 @@ SecretBase_Shrub3:: @ 83078B4 - .4byte SecretBase_Shrub3_MapAttributes + .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 215 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/maps/SecretBase_Shrub3/map.bin deleted file mode 100644 index d51aeea21..000000000 --- a/data/maps/SecretBase_Shrub3/map.bin +++ /dev/null @@ -1,65 +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 -2 -2 -2 -2 -2
-2 -2 -2 -22 -2 6 -2 -2 -2
-2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc new file mode 100644 index 000000000..0aeb7bdf9 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/maps/SecretBase_Shrub4/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Shrub4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc index a9f636e54..a9f636e54 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/SecretBase_Shrub4/events.inc diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 1e610463f..0966db367 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,9 +1,9 @@ SecretBase_Shrub4:: @ 830795C - .4byte SecretBase_Shrub4_MapAttributes + .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 221 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/maps/SecretBase_Shrub4/map.bin deleted file mode 100644 index 8a4cf836d..000000000 --- a/data/maps/SecretBase_Shrub4/map.bin +++ /dev/null @@ -1,69 +0,0 @@ - -2 -2"6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2#6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
-2 -2 -2 -2 -22 -2 -2 6 -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 -22 -2 -2 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc new file mode 100644 index 000000000..f131b308d --- /dev/null +++ b/data/maps/SecretBase_Shrub4/scripts.inc @@ -0,0 +1 @@ +SecretBase_Shrub4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/maps/SecretBase_Tree1/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc index 467789f32..467789f32 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/SecretBase_Tree1/events.inc diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 64722268c..1d0ce9509 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,9 +1,9 @@ SecretBase_Tree1:: @ 8307748 - .4byte SecretBase_Tree1_MapAttributes + .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 202 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/maps/SecretBase_Tree1/map.bin deleted file mode 100644 index 907f1486a..000000000 --- a/data/maps/SecretBase_Tree1/map.bin +++ /dev/null @@ -1,56 +0,0 @@ - -2 -22 -2 -2 -2 -2 -2 6 -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 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -26 -2 -2 -22 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_Tree1/scripts.inc b/data/maps/SecretBase_Tree1/scripts.inc new file mode 100644 index 000000000..7345c3bbb --- /dev/null +++ b/data/maps/SecretBase_Tree1/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/maps/SecretBase_Tree2/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc index ef2280e01..ef2280e01 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/SecretBase_Tree2/events.inc diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index fefd54e68..7138440cd 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,9 +1,9 @@ SecretBase_Tree2:: @ 83077F0 - .4byte SecretBase_Tree2_MapAttributes + .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 208 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/maps/SecretBase_Tree2/map.bin deleted file mode 100644 index c2e5698b0..000000000 --- a/data/maps/SecretBase_Tree2/map.bin +++ /dev/null @@ -1,48 +0,0 @@ - -2 -22 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
6 -2 -2 -2 -2 6 -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 -26 -26 -2 2
\ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc new file mode 100644 index 000000000..0f2976a8c --- /dev/null +++ b/data/maps/SecretBase_Tree2/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/maps/SecretBase_Tree3/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc index 25bc95466..25bc95466 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/SecretBase_Tree3/events.inc diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 09e55e66d..d3f49d3e0 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,9 +1,9 @@ SecretBase_Tree3:: @ 8307898 - .4byte SecretBase_Tree3_MapAttributes + .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 214 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/maps/SecretBase_Tree3/map.bin deleted file mode 100644 index b6ae04b00..000000000 --- a/data/maps/SecretBase_Tree3/map.bin +++ /dev/null @@ -1,63 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
6 2 -2 -2 -2 -2 -2 -2 -2 -2 -2 6 -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 -2 -2 -2 -2 -2 2 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc new file mode 100644 index 000000000..cb80b0d25 --- /dev/null +++ b/data/maps/SecretBase_Tree3/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/maps/SecretBase_Tree4/border.bin deleted file mode 100644 index 064786e8c..000000000 --- a/data/maps/SecretBase_Tree4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc index 6f0e5b3b5..6f0e5b3b5 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/SecretBase_Tree4/events.inc diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index cfb58242e..53a723432 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,9 +1,9 @@ SecretBase_Tree4:: @ 8307940 - .4byte SecretBase_Tree4_MapAttributes + .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 220 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/maps/SecretBase_Tree4/map.bin deleted file mode 100644 index b3b381d9e..000000000 --- a/data/maps/SecretBase_Tree4/map.bin +++ /dev/null @@ -1,77 +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 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 "6 -2 -2 -2 -2 #6 "6 2
#6 -2 6 -2 -2 -2 -2 -222 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -26
\ No newline at end of file diff --git a/data/maps/SecretBase_Tree4/scripts.inc b/data/maps/SecretBase_Tree4/scripts.inc new file mode 100644 index 000000000..0a6771740 --- /dev/null +++ b/data/maps/SecretBase_Tree4/scripts.inc @@ -0,0 +1 @@ +SecretBase_Tree4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/maps/SecretBase_YellowCave1/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc index 930cbc21d..930cbc21d 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 42a63256f..ecf3d4ea2 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,9 +1,9 @@ SecretBase_YellowCave1:: @ 830772C - .4byte SecretBase_YellowCave1_MapAttributes + .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 201 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/maps/SecretBase_YellowCave1/map.bin deleted file mode 100644 index 1301e7317..000000000 --- a/data/maps/SecretBase_YellowCave1/map.bin +++ /dev/null @@ -1,57 +0,0 @@ - -2 -22 -2 -2 -2 -2 -2
-2 -2 -2 -2 -2 -2 -2 -2 6 -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 -2 -2 -2 -2 -2 -2 -2 -2 -22 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave1/scripts.inc b/data/maps/SecretBase_YellowCave1/scripts.inc new file mode 100644 index 000000000..b76a5f44e --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/scripts.inc @@ -0,0 +1 @@ +SecretBase_YellowCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/maps/SecretBase_YellowCave2/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc index fd3e265e5..fd3e265e5 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index d57acde5c..cbee83030 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,9 +1,9 @@ SecretBase_YellowCave2:: @ 83077D4 - .4byte SecretBase_YellowCave2_MapAttributes + .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 207 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/maps/SecretBase_YellowCave2/map.bin deleted file mode 100644 index e18cb47c6..000000000 --- a/data/maps/SecretBase_YellowCave2/map.bin +++ /dev/null @@ -1,56 +0,0 @@ - 2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -26 -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 -2 -2 -2 -2 -2 -2 2
\ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave2/scripts.inc b/data/maps/SecretBase_YellowCave2/scripts.inc new file mode 100644 index 000000000..0bc1fc354 --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/scripts.inc @@ -0,0 +1 @@ +SecretBase_YellowCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/maps/SecretBase_YellowCave3/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc index 99f0ae8b4..99f0ae8b4 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index ecb6b7086..cea1c9175 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,9 +1,9 @@ SecretBase_YellowCave3:: @ 830787C - .4byte SecretBase_YellowCave3_MapAttributes + .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 213 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/maps/SecretBase_YellowCave3/map.bin deleted file mode 100644 index b7d80a0ab..000000000 --- a/data/maps/SecretBase_YellowCave3/map.bin +++ /dev/null @@ -1,63 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2
-2 -2 -2 -2 -2 6 -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 -2 -266 -2 -2 -22 -2 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave3/scripts.inc b/data/maps/SecretBase_YellowCave3/scripts.inc new file mode 100644 index 000000000..137f04316 --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/scripts.inc @@ -0,0 +1 @@ +SecretBase_YellowCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/maps/SecretBase_YellowCave4/border.bin deleted file mode 100644 index 5c0908a6a..000000000 --- a/data/maps/SecretBase_YellowCave4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc index af59e0067..af59e0067 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 97de9362b..e744080bd 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,9 +1,9 @@ SecretBase_YellowCave4:: @ 8307924 - .4byte SecretBase_YellowCave4_MapAttributes + .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 - .2byte BGM_MACHI_S3 + .2byte MUS_MACHI_S3 .2byte 219 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/maps/SecretBase_YellowCave4/map.bin deleted file mode 100644 index d3c3e0204..000000000 --- a/data/maps/SecretBase_YellowCave4/map.bin +++ /dev/null @@ -1,80 +0,0 @@ - -2 -2 -2 -2 -2 -2 -2 -2"6 -2 -2 -2 -2 -2 -2 -2 -2 -2 -2#6 -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 -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 -22 -2 -2 -2
\ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc new file mode 100644 index 000000000..bb673b7b6 --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -0,0 +1,23 @@ +SecretBase_YellowCave4_MapScripts:: @ 815F337 + map_script 4, SecretBase_RedCave1_MapScript2_15F358 + map_script 3, SecretBase_RedCave1_MapScript1_15F34F + map_script 2, SecretBase_RedCave1_MapScript2_15F362 + map_script 5, SecretBase_RedCave1_MapScript1_15F34C + .byte 0 + +SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C + setstepcallback 6 + end + +SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F + call SecretBase_RedCave1_EventScript_1A2F3D + special sub_80BBFA4 + end + +SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 + map_script_2 0x4089, 0, SecretBase_RedCave1_EventScript_1A2F68 + .2byte 0 + +SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 + map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE + .2byte 0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/maps/ShoalCave_HighTideEntranceRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc index c7225843f..c7225843f 100644 --- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index e012b1a69..16287338d 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes + .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 169 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/maps/ShoalCave_HighTideEntranceRoom/map.bin deleted file mode 100644 index 0e4b88c8f..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -
22 222222222222 22822222222222222222|z22822222222222222222|pppppz22@QQQQQ22222pppppz222222222222|pppppz222222222222|ppppppppppppp2 222222|pppppppppppppz22pppppppppppppppppppz22|pppppppppppppppppppz22|pppppppppppppppppppppppz22|pppppppppppppppppppppppz22|pppppppppppp11111111112C22]C]CUCUCUCUC^pppppp1111111111122BBBBBB|pppppp1111111111m#222BBBBB|pppppp11111222BBB2ppppppppppp11111 BBB|ppppppppppp11111BBB|pppppppppppppp111mn# BBB|pppppppppppppp111BBB2ppppppppppppp111BBB1111111111111111111 BBB1111111111111111111 BBB1111111111111111111BBB1111111111111111111BBB#BnBnBnBnBnBnBo111111111111BBBBBBBBBB111111111111# "111111111111111111u211111 " nnnnnXYZnnnn "
\ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc new file mode 100644 index 000000000..ae1f2c279 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc @@ -0,0 +1,2 @@ +ShoalCave_HighTideEntranceRoom_MapScripts:: @ 815E488 + .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/maps/ShoalCave_HighTideInnerRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc index e7951742a..e7951742a 100644 --- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index c3f16869b..63bb3f47e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 - .4byte ShoalCave_HighTideInnerRoom_MapAttributes + .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 170 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/maps/ShoalCave_HighTideInnerRoom/map.bin deleted file mode 100644 index c540a4008..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ - BB BB BBBBBBB22222BBBBBBBBBBB22222BBBBBBBBBBB BBBBBppppppppppppppppppppppppBBBBBBBBBBppppppppppppppppppppppppBBBBBBBBBB[32pppppppppppppppppppppppp BBB22ppp111111111111111111111RRRRR[SRBBB22ppp111111111111111111111RRRRRRBBB22pppmnRnRnRnRnRnRnRnRnRnRnRo111111112 BBB2pppR[S B B B B B B B"#R Ro11BBBpppRRBBBBBBBRR11pppppppppBBBpppppRRBBBBBBBRR11pppppppppBBBpppppRR BBBBRR11pppppppppBBBppppp BBBBRR1111111111111BBBppppp111BBBBRR1111111111111BBBpppppppBBBBRR111111mnRnRnRnRnRnR#RBBBppppppppppBBBBRR111111RRRRR[SRBBBBBBBBBBBRR111111RRRRRRRBBBBBBBBBBB111111RRRRRRRppppppppppB2111111 RRRR111pppppppBBBBBB1111RRRR#RnRnRnRnRnRopppppppBBBBBBpppppRRRRRRRRRRppppp11BBBBBBpppppppppRRRRRRRpppppmn# "pppppppppRRRRRRR1111111111 pppppppppRRRRRRR1111111111pppppppppRRRRRRR1111111111 "11111111111RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R11111111111RRRRRRRRRRRRRRRRRRR##nnnnnnnnnn1#RRRRRRRRRRRRRRRR<RRRR# "RR<RRR# XYZ ## XYZ ## "# "# "# ## ## #
\ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc new file mode 100644 index 000000000..9b47c97e7 --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc @@ -0,0 +1,2 @@ +ShoalCave_HighTideInnerRoom_MapScripts:: @ 815E489 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/maps/ShoalCave_LowTideEntranceRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index fe4a2eae9..fe4a2eae9 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index db63a0f9d..05cac9619 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes + .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 165 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/maps/ShoalCave_LowTideEntranceRoom/map.bin deleted file mode 100644 index 1cf7c87f2..000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -
22 222222222222 22822222222222222222
228222222222222222222 22@QQQQQ2222222222222222222222222222222222222222i2222 22222222222222222 2222222222222 2222222222222222222222222222222222222222222222222222 22# -2222 2222222222222#B B B B B B -22222222222222222BBBBBB22222222222222p#222BBBBBB22222 22222222BBBB2222h2 22222 #BBB22222222222222BBB222222222222p # #BBB222222222222222BBB# #222BBB#2 222222222222222222 #BBB2222222222222222222 #BBB2222222222222222222BBB2222222222211112222BBB#B B B B B B Bq222111111222BBBBBBBBBB222111111222# "221111111122221111u211122# "# XYZ ## "# ## ## #
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc new file mode 100644 index 000000000..2005cb67b --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -0,0 +1,100 @@ +ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 + map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D + .byte 0 + +ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D + special UpdateShoalTideFlag + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_15E06E + goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 + +ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E + setmaplayoutindex 169 + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 + setmaplayoutindex 165 + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 + lock + faceplayer + dodailyevents + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 + checkitem ITEM_SHOAL_SALT, 4 + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 + checkitem ITEM_SHOAL_SHELL, 4 + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C + checkitemspace ITEM_SHELL_BELL, 1 + compare RESULT, 0 + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106 + compare RESULT, 2 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 + takeitem ITEM_SHOAL_SALT, 4 + takeitem ITEM_SHOAL_SHELL, 4 + giveitem_std ITEM_SHELL_BELL + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B + msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 + setflag FLAG_TEMP_2 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 + checkitem ITEM_SHOAL_SALT, 5 + compare RESULT, 1 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 + return + +ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 + checkitem ITEM_SHOAL_SHELL, 5 + compare RESULT, 1 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 + return + +ShoalCave_LowTideEntranceRoom_EventScript_15E128:: @ 815E128 + setvar RESULT, 2 + return + +ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E + msgbox ShoalCave_LowTideEntranceRoom_Text_1C69F5, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 + checkitem ITEM_SHOAL_SALT, 1 + compare RESULT, 1 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 + checkitem ITEM_SHOAL_SHELL, 1 + compare RESULT, 1 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E162:: @ 815E162 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C670D, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6944, 4 + release + end + +ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_4 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 + clearflag FLAG_SYS_SHOAL_ITEM + return diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/text.inc b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/maps/ShoalCave_LowTideIceRoom/border.bin deleted file mode 100644 index 206bd63f8..000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 87d291c40..87d291c40 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index ba36a090d..3cc9967fb 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideIceRoom:: @ 8307684 - .4byte ShoalCave_LowTideIceRoom_MapAttributes + .4byte ShoalCave_LowTideIceRoom_Layout .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 329 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/maps/ShoalCave_LowTideIceRoom/map.bin deleted file mode 100644 index 222f1f26c..000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ -{|{|3333~33~33333}333333333}333333333}3~333323333333|33333~33333333333xyCyCyCz33~}333xCCCC3333|333CCCCww|3xyCCCCCC33333333CCCCCC33333333CCC~CC33333333c|CCC33333333233CCC333~333333}CCCCz333333}333CCCCCyCz333333~3CC~CC}3333z333C}CCCCCz333z33|CCCCC3333333CCCCC3333333|CCC333{3}3}33CCC333{}333333333333333333333333333333233333333333~23333}3233333yyz33~3333333333yyyyyz3333333yyyyyyy
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideIceRoom/scripts.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc new file mode 100644 index 000000000..311ff2126 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc @@ -0,0 +1,2 @@ +ShoalCave_LowTideIceRoom_MapScripts:: @ 815F300 + .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/maps/ShoalCave_LowTideInnerRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 746f36cdc..746f36cdc 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index c038dafcd..be5fb9413 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 - .4byte ShoalCave_LowTideInnerRoom_MapAttributes + .4byte ShoalCave_LowTideInnerRoom_Layout .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 166 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/maps/ShoalCave_LowTideInnerRoom/map.bin deleted file mode 100644 index 87df28cf4..000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - BB BB BBBBB BB22222BBBBBBBBBBBBB22222BBBBBBBBBBBBB BBBBBRRRRRRRRRRRRRRRRRRRRRRRRBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRZSRRBBBBBBBBBB[32RRRRRRRRRRRRRRRRRRRRRRRR BBB22RRR 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2#2RRRRR[SRBBB22RRR222222222222222222222RRRRRRRBBB22RRR R R R R R R R R R R R"22222222 BBB2RRRR[S B B B B B B B"#R R"222 BBBRRRRRBBBBBBBRR222 BBBRRRRRRRBBBBBBBRR222222222BBBRRRRRRR BBBBRR22# #BBBRRRRR BBBBRR22#2 2 2 2 2 2 2 2 2 2#2BBB
BBBBRR2222222222222BBB2222 BBBBRR222222 R R R R R R#RBBB22222222BBBBRR222222RRRRR[SRBBBBBBBBBBBBBBBRR222222RRRRRRRBBBBBBBBBBBBBBBRR222222RRRRRRR22222222B222222R RRRR# -2222BBBBBB
2 RRRR#R R R R#R R1 2"22 #BBBBBB22 RRRRRRRRRR22Z3 #BBBBBB2222222RRRRRRR222 # "2222222RRRRRRR2222# # #2222222RRRRRRR2222#2 2 2 2 2#22222222RRRRRRR2222222222 "# XYZ#RRRRRRR R R R R R R R R R R R#R# #RRRRRRRRRRRRRRRRRRR## 1 R R R#RRRRRRRRRRRRRRRR<RRRR# "RRRRR<RRR# XYZ ## XYZ ## "# "# "# ## ## #
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc new file mode 100644 index 000000000..21997d076 --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -0,0 +1,142 @@ +ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 + map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3 + map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_15E19D + .byte 0 + +ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1AB + goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF + +ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB + setmaplayoutindex 170 + end + +ShoalCave_LowTideInnerRoom_EventScript_15E1AF:: @ 815E1AF + setmaplayoutindex 166 + end + +ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 + call ShoalCave_LowTideInnerRoom_EventScript_15E1B9 + end + +ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1DA + setmetatile 31, 8, 856, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA + end + +ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1FB + setmetatile 14, 26, 856, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB + end + +ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E213 + setmetatile 41, 20, 857, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_15E213 + end + +ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E22B + setmetatile 41, 10, 857, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_15E22B + end + +ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E243 + setmetatile 6, 9, 857, 1 + goto ShoalCave_LowTideInnerRoom_EventScript_15E243 + end + +ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E256 + setmetatile 16, 13, 857, 1 + return + +ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 + return + +ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 + giveitem_std ITEM_SHOAL_SHELL + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + setmetatile 41, 20, 859, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 + msgbox ShoalCave_LowTideInnerRoom_Text_1C69B8, 4 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 + giveitem_std ITEM_SHOAL_SHELL + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + setmetatile 41, 10, 859, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 + giveitem_std ITEM_SHOAL_SHELL + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + setmetatile 6, 9, 859, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 + giveitem_std ITEM_SHOAL_SHELL + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + setmetatile 16, 13, 859, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B + giveitem_std ITEM_SHOAL_SALT + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + setmetatile 31, 8, 858, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B + msgbox ShoalCave_LowTideInnerRoom_Text_1C6979, 4 + releaseall + end + +ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B + giveitem_std ITEM_SHOAL_SALT + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + setmetatile 14, 26, 858, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 + releaseall + end diff --git a/data/maps/ShoalCave_LowTideInnerRoom/text.inc b/data/maps/ShoalCave_LowTideInnerRoom/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/maps/ShoalCave_LowTideLowerRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index 6ff9a44b3..6ff9a44b3 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 6fe4efb01..5d82ba865 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC - .4byte ShoalCave_LowTideLowerRoom_MapAttributes + .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 168 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/maps/ShoalCave_LowTideLowerRoom/map.bin deleted file mode 100644 index 04bf2baf3..000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin +++ /dev/null @@ -1,4 +0,0 @@ - 222222222222Z32 2222222222222222222222222222222HQQQQQ 6 6 6 -2222222222922222 6 6 6 -2222222222222292222222XYZ -222# "222222222222XYZ#6 6 6#6# ##6 6 6 6 6#6
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc new file mode 100644 index 000000000..19223a499 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -0,0 +1,49 @@ +ShoalCave_LowTideLowerRoom_MapScripts:: @ 815E3F3 + map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_15E3F9 + .byte 0 + +ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 + call ShoalCave_LowTideLowerRoom_EventScript_15E3FF + end + +ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E412 + setmetatile 18, 2, 856, 1 + return + +ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 + return + +ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 + giveitem_std ITEM_SHOAL_SALT + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B + setmetatile 18, 2, 858, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 + releaseall + end + +ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 + msgbox ShoalCave_LowTideLowerRoom_Text_1C6979, 4 + releaseall + end + +ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F + lock + faceplayer + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E + msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 + giveitem_std ITEM_FOCUS_BAND + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B + setflag FLAG_RECEIVED_FOCUS_BAND + release + end + +ShoalCave_LowTideLowerRoom_EventScript_15E47E:: @ 815E47E + msgbox ShoalCave_LowTideLowerRoom_Text_1982A2, 4 + release + end diff --git a/data/maps/ShoalCave_LowTideLowerRoom/text.inc b/data/maps/ShoalCave_LowTideLowerRoom/text.inc new file mode 100644 index 000000000..c9d4337de --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/text.inc @@ -0,0 +1,9 @@ +ShoalCave_LowTideLowerRoom_Text_198200:: @ 8198200 + .string "The penetrating cold around these\n" + .string "parts is an impediment to training.\p" + .string "But with focus, one can overcome!\p" + .string "With this FOCUS BAND, buckle down and\n" + .string "withstand the cold!$" + +ShoalCave_LowTideLowerRoom_Text_1982A2:: @ 81982A2 + .string "Everything starts with focus!$" diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/maps/ShoalCave_LowTideStairsRoom/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 65570d256..65570d256 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index d3d904731..976bc6ad9 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 - .4byte ShoalCave_LowTideStairsRoom_MapAttributes + .4byte ShoalCave_LowTideStairsRoom_Layout .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 - .2byte BGM_M_DUNGON + .2byte MUS_M_DUNGON .2byte 167 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/maps/ShoalCave_LowTideStairsRoom/map.bin deleted file mode 100644 index f2b56644d..000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin +++ /dev/null @@ -1 +0,0 @@ - 1 22222262 2626222222622222622262222 222Z322222222222222266222222222222#
\ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc new file mode 100644 index 000000000..5f9726038 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -0,0 +1,32 @@ +ShoalCave_LowTideStairsRoom_MapScripts:: @ 815E397 + map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_15E39D + .byte 0 + +ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D + call ShoalCave_LowTideStairsRoom_EventScript_15E3A3 + end + +ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3B6 + setmetatile 11, 11, 856, 1 + return + +ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 + return + +ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 + lockall + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 + giveitem_std ITEM_SHOAL_SALT + compare RESULT, 0 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B + setmetatile 11, 11, 858, 0 + special DrawWholeMapView + setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 + releaseall + end + +ShoalCave_LowTideStairsRoom_EventScript_15E3E9:: @ 815E3E9 + msgbox ShoalCave_LowTideStairsRoom_Text_1C6979, 4 + releaseall + end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/text.inc b/data/maps/ShoalCave_LowTideStairsRoom/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/maps/SingleBattleColosseum/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SingleBattleColosseum/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc index e6da2e027..e6da2e027 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/SingleBattleColosseum/events.inc diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index f62205a55..99e0b090b 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,9 +1,9 @@ SingleBattleColosseum:: @ 8307978 - .4byte SingleBattleColosseum_MapAttributes + .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 222 .byte 87 .byte 0 diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/maps/SingleBattleColosseum/map.bin deleted file mode 100644 index 1f66ab707..000000000 --- a/data/maps/SingleBattleColosseum/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_22L2M22222M2N2222U2T2U2U2b2c2U2U2V2U222U2`2U2U2d2e2U2U2a2U222U2T2U2U2f2g2U2U2V2U222U2\2]2]2]2]2]2]2^2U22!2!2
\ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc new file mode 100644 index 000000000..d3f2bdcaf --- /dev/null +++ b/data/maps/SingleBattleColosseum/scripts.inc @@ -0,0 +1,2 @@ +SingleBattleColosseum_MapScripts:: @ 815F57C + .byte 0 diff --git a/data/maps/SkyPillar_1F/border.bin b/data/maps/SkyPillar_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SkyPillar_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc index 2af7aaa76..2af7aaa76 100644 --- a/data/maps/events/SkyPillar_1F.inc +++ b/data/maps/SkyPillar_1F/events.inc diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 4ccc410da..c530fde86 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,9 +1,9 @@ SkyPillar_1F:: @ 8307614 - .4byte SkyPillar_1F_MapAttributes + .4byte SkyPillar_1F_Layout .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 323 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_1F/map.bin b/data/maps/SkyPillar_1F/map.bin deleted file mode 100644 index 1eb299c49..000000000 --- a/data/maps/SkyPillar_1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -''''''''';<=''/////////CD2E//222222222222222 2222 22222222 222222222222289999:2222222@AAAAB2222 22AAAAAA22 222AAAAAA2 22222AAAAAA222 222IMMMMJ22222 222222222222222222222222 22222"2#222222
\ No newline at end of file diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc new file mode 100644 index 000000000..aa6c117da --- /dev/null +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -0,0 +1,2 @@ +SkyPillar_1F_MapScripts:: @ 815F2C8 + .byte 0 diff --git a/data/maps/SkyPillar_2F/border.bin b/data/maps/SkyPillar_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SkyPillar_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc index 48fcb9fec..48fcb9fec 100644 --- a/data/maps/events/SkyPillar_2F.inc +++ b/data/maps/SkyPillar_2F/events.inc diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 1e3b0393d..ce61cf5b8 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,9 +1,9 @@ SkyPillar_2F:: @ 8307630 - .4byte SkyPillar_2F_MapAttributes + .4byte SkyPillar_2F_Layout .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 324 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_2F/map.bin b/data/maps/SkyPillar_2F/map.bin deleted file mode 100644 index 8ec9bf213..000000000 --- a/data/maps/SkyPillar_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<='''';<=''//CD2E////CL2E//525252525252525252525252524242424242 424242424242424242424242424242 4242424242424289999:62626262 4242@AAAAB6262626242426262AAAAAA424242 62626262AAAAAA4242424262626262AAAAAA4242424262624242IMMMMJ62624242624242 6262424242 626262624242 426262424242426262626242424262626242424242424242
\ No newline at end of file diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc new file mode 100644 index 000000000..bd87e8562 --- /dev/null +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -0,0 +1,10 @@ +SkyPillar_2F_MapScripts:: @ 815F2C9 + map_script 2, SkyPillar_2F_MapScript2_1C6BB5 + map_script 3, SkyPillar_2F_MapScript1_1C6BBF + map_script 5, SkyPillar_2F_MapScript1_15F2D9 + .byte 0 + +SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 + setstepcallback 7 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 + end diff --git a/data/maps/SkyPillar_3F/border.bin b/data/maps/SkyPillar_3F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SkyPillar_3F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc index 4aeda3339..4aeda3339 100644 --- a/data/maps/events/SkyPillar_3F.inc +++ b/data/maps/SkyPillar_3F/events.inc diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index bd6d9cb86..eaed10d93 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,9 +1,9 @@ SkyPillar_3F:: @ 830764C - .4byte SkyPillar_3F_MapAttributes + .4byte SkyPillar_3F_Layout .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 325 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_3F/map.bin b/data/maps/SkyPillar_3F/map.bin deleted file mode 100644 index d6c76d48c..000000000 --- a/data/maps/SkyPillar_3F/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<=';<=';<='//CL2E/CD2E/CD2E/22222222222222222 22222222 22222 22222 22289999:2222222@AAAAB 22222 2AAAAAA222222 2AAAAAA2222222AAAAAA2222222IMMMMJ2 222222 222 222222222222222222222222 22222
\ No newline at end of file diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc new file mode 100644 index 000000000..2dc97fc9c --- /dev/null +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -0,0 +1,2 @@ +SkyPillar_3F_MapScripts:: @ 815F2E4 + .byte 0 diff --git a/data/maps/SkyPillar_4F/border.bin b/data/maps/SkyPillar_4F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SkyPillar_4F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc index 3e908ed74..3e908ed74 100644 --- a/data/maps/events/SkyPillar_4F.inc +++ b/data/maps/SkyPillar_4F/events.inc diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 50869e629..f14e016c8 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,9 +1,9 @@ SkyPillar_4F:: @ 8307668 - .4byte SkyPillar_4F_MapAttributes + .4byte SkyPillar_4F_Layout .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 326 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_4F/map.bin b/data/maps/SkyPillar_4F/map.bin deleted file mode 100644 index 02e82bb4f..000000000 --- a/data/maps/SkyPillar_4F/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<=';<=';<='//CD2E/CL2E/CL2E/52525252525252526525252525262626 6 64242426 42426242626242626424242426424289999:4262626242424242@AAAAB426262624262 62AAAAAA42626424262662AAAAAA4242426 62662AAAAAA42424242 624242IMMMMJ4242424242424262426426242662624242424264262426242624262624242424242624262426426262624242
\ No newline at end of file diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc new file mode 100644 index 000000000..860f35b48 --- /dev/null +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -0,0 +1,10 @@ +SkyPillar_4F_MapScripts:: @ 815F2E5 + map_script 2, SkyPillar_4F_MapScript2_1C6BB5 + map_script 3, SkyPillar_4F_MapScript1_1C6BBF + map_script 5, SkyPillar_4F_MapScript1_15F2F5 + .byte 0 + +SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 + setstepcallback 7 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 + end diff --git a/data/maps/SkyPillar_5F/border.bin b/data/maps/SkyPillar_5F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SkyPillar_5F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc index badae77af..badae77af 100644 --- a/data/maps/events/SkyPillar_5F.inc +++ b/data/maps/SkyPillar_5F/events.inc diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 16da8bcf4..e4ff00b1a 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,9 +1,9 @@ SkyPillar_5F:: @ 83076A0 - .4byte SkyPillar_5F_MapAttributes + .4byte SkyPillar_5F_Layout .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 331 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_5F/map.bin b/data/maps/SkyPillar_5F/map.bin deleted file mode 100644 index b8cd541d5..000000000 --- a/data/maps/SkyPillar_5F/map.bin +++ /dev/null @@ -1 +0,0 @@ -'';<='''';<=''//CL2E////CD2E//2222262226222222622222 6222222228999999:622 622@AAAAAAB6222 62AAAAAAAA22 6222AAAAAAAA222222AAAAAAAA22222AAAAAAAA2 62222AAAAAAAA 62222IMMMMMMJ222222222222 226226222 22222222
\ No newline at end of file diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc new file mode 100644 index 000000000..64e6d0f38 --- /dev/null +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -0,0 +1,2 @@ +SkyPillar_5F_MapScripts:: @ 815F301 + .byte 0 diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/maps/SkyPillar_Entrance/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/SkyPillar_Entrance/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc index 904b3b9ae..904b3b9ae 100644 --- a/data/maps/events/SkyPillar_Entrance.inc +++ b/data/maps/SkyPillar_Entrance/events.inc diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 89d9becd9..84dfe9b5c 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,9 +1,9 @@ SkyPillar_Entrance:: @ 83075DC - .4byte SkyPillar_Entrance_MapAttributes + .4byte SkyPillar_Entrance_Layout .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 321 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/maps/SkyPillar_Entrance/map.bin deleted file mode 100644 index b215b86ef..000000000 --- a/data/maps/SkyPillar_Entrance/map.bin +++ /dev/null @@ -1 +0,0 @@ - 222222222222222222226 222222222222222222 ##2 2 #2226 #2222222222222 222222222222222########
\ No newline at end of file diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc new file mode 100644 index 000000000..ab991d845 --- /dev/null +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -0,0 +1,7 @@ +SkyPillar_Entrance_MapScripts:: @ 815F2BD + map_script 3, SkyPillar_Entrance_MapScript1_15F2C3 + .byte 0 + +SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3 + setflag FLAG_LANDMARK_SKY_PILLAR + end diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/maps/SkyPillar_Outside/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/SkyPillar_Outside/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc index 120cd982b..120cd982b 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/SkyPillar_Outside/events.inc diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 44e9a5991..71aa1ad84 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,9 +1,9 @@ SkyPillar_Outside:: @ 83075F8 - .4byte SkyPillar_Outside_MapAttributes + .4byte SkyPillar_Outside_Layout .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 322 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/maps/SkyPillar_Outside/map.bin deleted file mode 100644 index 4517589d0..000000000 --- a/data/maps/SkyPillar_Outside/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppppppppr6666t5pppppppppppppppr66!1!1666tppppppppppr66!1!1!166!1!1!1!1ustppppppprs!1!1!1!1666!1!1uqutppppprss!1!1!1!1!1666!1!1uquuypppxsss!1!1!126666!1uquupppss{!1$1$12222226uquupppssqs$1$1$1$12222222ut}uppps{s$1$1$1$1$1$12222222t}uquppp{ss$1$1$1$1$1$1$122uququpppss{$1$1$1$1$1$1qqu2uququppppssqs$1$1$1$1$1sqqqu2uqut}pppps{{$1$1$1$1{|d|}2ut}uqppPQ{{{$1$1$10t}ut}ppXY{{{$1$1$1$1$1$14$1$1ut}upppppp{{s$1$1$1$1$1$1$1$1t}ut}ppPQppppsqs{$1$1$14$1t|}quuppXYppppPesq{{4$1$1t}qt|}upPQppppppXm{q{{|||}qt}t|}pXYppppPQp{q{|}qupppppppXYpp{|0|}ppppppppppPQpp$1$1$1$1$1Z[ppppppppppXYppppp$1$1$1$1$1pXYu{{{tp
\ No newline at end of file diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc new file mode 100644 index 000000000..51e6a4e83 --- /dev/null +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -0,0 +1,2 @@ +SkyPillar_Outside_MapScripts:: @ 815F2C7 + .byte 0 diff --git a/data/maps/SkyPillar_Top/border.bin b/data/maps/SkyPillar_Top/border.bin Binary files differdeleted file mode 100644 index e0241fa60..000000000 --- a/data/maps/SkyPillar_Top/border.bin +++ /dev/null diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc index 9fc989c78..9fc989c78 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/SkyPillar_Top/events.inc diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 0c241fe27..aaaf40fc4 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,9 +1,9 @@ SkyPillar_Top:: @ 83076BC - .4byte SkyPillar_Top_MapAttributes + .4byte SkyPillar_Top_Layout .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 332 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Top/map.bin b/data/maps/SkyPillar_Top/map.bin deleted file mode 100644 index fe6c2ad43..000000000 --- a/data/maps/SkyPillar_Top/map.bin +++ /dev/null @@ -1 +0,0 @@ -d2d2d2d2d2d2d2d2d2d2d26d2d2d2d2d26d26d2d2d2d2d2d2d2424242424242 4276 424242424242 424242424242424242424242424242 42424242424242424242 4242424242424242424242424242424242424242424242424242 42424242424242424242 42 4242424242424242424242424242424242424242424242424242 42424242424242 42427642424242424242424242 424242424242424242424242 4242 42424242424242424276 42424242424242 4242 4242424242424242424242424242 42 424242424242424242764242424242424242424242 42427642424242424242 427642424242424242''''''''''m22n';<='''''''''//////////j22k/CL2E/////////5252525252525252525252525252525252525252525252524242 424242 42424242424242424242424242424242 424242424242 4242424242424242424242 4242 4242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[
\ No newline at end of file diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc new file mode 100644 index 000000000..82149a4bc --- /dev/null +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -0,0 +1,27 @@ +SkyPillar_Top_MapScripts:: @ 815F302 + map_script 5, SkyPillar_Top_MapScript1_15F308 + .byte 0 + +SkyPillar_Top_MapScript1_15F308:: @ 815F308 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_15F312 + end + +SkyPillar_Top_EventScript_15F312:: @ 815F312 + removeobject LAST_TALKED + return + +SkyPillar_Top_EventScript_15F316:: @ 815F316 + lock + faceplayer + setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE + waitse + playmoncry SPECIES_RAYQUAZA, 2 + delay 40 + waitmoncry + setflag FLAG_HIDE_RAYQUAZA + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartRayquazaBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + release + end diff --git a/data/maps/SlateportCity/border.bin b/data/maps/SlateportCity/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/SlateportCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc index 685bc7359..685bc7359 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/SlateportCity/events.inc diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 6575e0de5..738a383e7 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,9 +1,9 @@ SlateportCity:: @ 8305464 - .4byte SlateportCity_MapAttributes + .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 2 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity/map.bin b/data/maps/SlateportCity/map.bin Binary files differdeleted file mode 100644 index 97046ab59..000000000 --- a/data/maps/SlateportCity/map.bin +++ /dev/null diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc new file mode 100644 index 000000000..5583762d3 --- /dev/null +++ b/data/maps/SlateportCity/scripts.inc @@ -0,0 +1,641 @@ +SlateportCity_MapScripts:: @ 814BA36 + map_script 3, SlateportCity_MapScript1_14BA3C + .byte 0 + +SlateportCity_MapScript1_14BA3C:: @ 814BA3C + .ifdef SAPPHIRE + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + .else + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + .endif + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 + call SlateportCity_EventScript_14BA5C + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BA68 + end + +SlateportCity_EventScript_14BA5C:: @ 814BA5C + setflag FLAG_VISITED_SLATEPORT_CITY + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + return + +SlateportCity_EventScript_14BA68:: @ 814BA68 + setobjectxyperm 11, 28, 13 + setobjectxyperm 7, 25, 13 + setobjectxyperm 3, 25, 14 + setobjectxyperm 6, 27, 16 + setobjectxyperm 8, 28, 16 + setobjectxyperm 1, 29, 16 + setobjectxyperm 2, 31, 14 + setobjectmovementtype 11, 8 + setobjectmovementtype 7, 18 + setobjectmovementtype 3, 16 + setobjectmovementtype 6, 7 + setobjectmovementtype 8, 7 + setobjectmovementtype 1, 7 + setobjectmovementtype 2, 9 + return + +SlateportCity_EventScript_14BAB6:: @ 814BAB6 + lock + faceplayer + message SlateportCity_Text_164642 + waitmessage + pokemart SlateportCity_Items1 + msgbox SlateportCity_Text_1A0C02, 4 + release + end + + .align 2 +SlateportCity_Items1:: @ 814BAD0 + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_CARBOS + .2byte ITEM_ZINC + .2byte ITEM_CALCIUM + .2byte ITEM_HP_UP + .2byte ITEM_NONE + release + end + +SlateportCity_EventScript_14BAE0:: @ 814BAE0 + lock + faceplayer + bufferleadmonspeciesname 0 + msgbox SlateportCity_Text_164682, 4 + specialvar RESULT, LeadMonHasEffortRibbon + compare RESULT, 1 + call_if_eq SlateportCity_EventScript_14BB35 + specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut + compare RESULT, 0 + call_if_eq SlateportCity_EventScript_14BB2B + msgbox SlateportCity_Text_164691, 4 + playfanfare MUS_FANFA4 + message SlateportCity_Text_1646DD + waitfanfare + waitmessage + msgbox SlateportCity_Text_1646FC, 4 + special GivLeadMonEffortRibbon + release + end + +SlateportCity_EventScript_14BB2B:: @ 814BB2B + msgbox SlateportCity_Text_16471C, 4 + release + end + +SlateportCity_EventScript_14BB35:: @ 814BB35 + msgbox SlateportCity_Text_164775, 4 + release + end + +SlateportCity_EventScript_14BB3F:: @ 814BB3F + lock + faceplayer + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BB56 + msgbox SlateportCity_Text_164814, 4 + release + end + +SlateportCity_EventScript_14BB56:: @ 814BB56 + msgbox SlateportCity_Text_165376, 4 + release + end + +SlateportCity_EventScript_14BB60:: @ 814BB60 + lock + faceplayer + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BB77 + msgbox SlateportCity_Text_1648A0, 4 + release + end + +SlateportCity_EventScript_14BB77:: @ 814BB77 + msgbox SlateportCity_Text_165222, 4 + release + end + +SlateportCity_EventScript_14BB81:: @ 814BB81 + lock + faceplayer + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BBA1 + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB + msgbox SlateportCity_Text_164937, 4 + release + end + +SlateportCity_EventScript_14BBA1:: @ 814BBA1 + msgbox SlateportCity_Text_1652A0, 4 + release + end + +SlateportCity_EventScript_14BBAB:: @ 814BBAB + msgbox SlateportCity_Text_164995, 4 + release + end + +SlateportCity_EventScript_14BBB5:: @ 814BBB5 + lock + faceplayer + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BBCC + msgbox SlateportCity_Text_164A30, 4 + release + end + +SlateportCity_EventScript_14BBCC:: @ 814BBCC + msgbox SlateportCity_Text_16530A, 4 + release + end + +SlateportCity_EventScript_14BBD6:: @ 814BBD6 + compare VAR_SLATEPORT_STATE, 1 + goto_if_eq SlateportCity_EventScript_14BBEA + msgbox SlateportCity_Text_164AA9, 2 + end + +SlateportCity_EventScript_14BBEA:: @ 814BBEA + msgbox SlateportCity_Text_1653D1, 3 + end + +SlateportCity_EventScript_14BBF3:: @ 814BBF3 + lock + faceplayer + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BC0A + msgbox SlateportCity_Text_164B34, 4 + release + end + +SlateportCity_EventScript_14BC0A:: @ 814BC0A + msgbox SlateportCity_Text_1653F4, 4 + release + end + +SlateportCity_EventScript_14BC14:: @ 814BC14 + lock + faceplayer + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29 + msgbox SlateportCity_Text_164BBF, 4 + release + end + +SlateportCity_EventScript_14BC29:: @ 814BC29 + msgbox SlateportCity_Text_164BEA, 4 + release + end + +SlateportCity_EventScript_14BC33:: @ 814BC33 + msgbox SlateportCity_Text_165856, 3 + end + +SlateportCity_EventScript_14BC3C:: @ 814BC3C + lockall + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63 + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59 + msgbox SlateportCity_Text_1658A0, 4 + releaseall + end + +SlateportCity_EventScript_14BC59:: @ 814BC59 + msgbox SlateportCity_Text_1658E8, 4 + releaseall + end + +SlateportCity_EventScript_14BC63:: @ 814BC63 + msgbox SlateportCity_Text_165952, 4 + releaseall + end + +SlateportCity_EventScript_14BC6D:: @ 814BC6D + msgbox SlateportCity_Text_1659B3, 3 + end + +SlateportCity_EventScript_14BC76:: @ 814BC76 + msgbox SlateportCity_Text_1659E3, 3 + end + +SlateportCity_EventScript_14BC7F:: @ 814BC7F + msgbox SlateportCity_Text_165A17, 3 + end + +SlateportCity_EventScript_14BC88:: @ 814BC88 + msgbox SlateportCity_Text_165A57, 3 + end + +SlateportCity_EventScript_14BC91:: @ 814BC91 + lockall + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5 + msgbox SlateportCity_Text_165A8B, 4 + releaseall + end + +SlateportCity_EventScript_14BCA5:: @ 814BCA5 + msgbox SlateportCity_Text_165B02, 4 + releaseall + end + +SlateportCity_EventScript_14BCAF:: @ 814BCAF + msgbox SlateportCity_Text_165B48, 3 + end + +SlateportCity_EventScript_14BCB8:: @ 814BCB8 + lock + faceplayer + compare VAR_SLATEPORT_STATE, 1 + call_if_eq SlateportCity_EventScript_14BCCF + msgbox SlateportCity_Text_164F9E, 4 + release + end + +SlateportCity_EventScript_14BCCF:: @ 814BCCF + msgbox SlateportCity_Text_164F9E, 4 + release + end + +SlateportCity_EventScript_14BCD9:: @ 814BCD9 + msgbox SlateportCity_Text_164FFC, 2 + end + +SlateportCity_EventScript_14BCE2:: @ 814BCE2 + msgbox SlateportCity_Text_164E85, 2 + end + +SlateportCity_EventScript_14BCEB:: @ 814BCEB + msgbox SlateportCity_Text_164EDB, 2 + end + +SlateportCity_EventScript_14BCF4:: @ 814BCF4 + msgbox SlateportCity_Text_164F62, 2 + end + +SlateportCity_EventScript_14BCFD:: @ 814BCFD + msgbox SlateportCity_Text_16507C, 2 + end + +SlateportCity_EventScript_14BD06:: @ 814BD06 + lock + faceplayer + msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO + compare RESULT, YES + call_if_eq SlateportCity_EventScript_14BD28 + compare RESULT, NO + call_if_eq SlateportCity_EventScript_14BD31 + release + end + +SlateportCity_EventScript_14BD28:: @ 814BD28 + msgbox SlateportCity_Text_16511E, 4 + return + +SlateportCity_EventScript_14BD31:: @ 814BD31 + msgbox SlateportCity_Text_1651A1, 4 + return + +SlateportCity_EventScript_14BD3A:: @ 814BD3A + lock + faceplayer + msgbox SlateportCity_Text_164C64, 4 + closemessage + applymovement 5, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BD51:: @ 814BD51 + lock + faceplayer + msgbox SlateportCity_Text_164C9F, 4 + closemessage + applymovement 19, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BD68:: @ 814BD68 + lock + faceplayer + msgbox SlateportCity_Text_164CE8, 4 + closemessage + applymovement 20, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BD7F:: @ 814BD7F + lock + faceplayer + msgbox SlateportCity_Text_164D2B, 4 + closemessage + applymovement 27, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BD96:: @ 814BD96 + lock + faceplayer + msgbox SlateportCity_Text_164D92, 4 + closemessage + applymovement 28, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BDAD:: @ 814BDAD + lock + faceplayer + msgbox SlateportCity_Text_164DD5, 4 + closemessage + applymovement 29, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BDC4:: @ 814BDC4 + lock + faceplayer + msgbox SlateportCity_Text_164DF4, 4 + closemessage + applymovement 30, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BDDB:: @ 814BDDB + lock + faceplayer + msgbox SlateportCity_Text_164E46, 4 + closemessage + applymovement 31, SlateportCity_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_EventScript_14BDF2:: @ 814BDF2 + lock + faceplayer + message SlateportCity_Text_1A0BE4 + waitmessage + pokemartdecoration SlateportCity_Decorations1 + msgbox SlateportCity_Text_1A0C02, 4 + release + end + + .align 2 +SlateportCity_Decorations1:: @ 814BE0C + .2byte DECOR_AZURILL_DOLL + .2byte DECOR_MARILL_DOLL + .2byte DECOR_SKITTY_DOLL + .2byte DECOR_NONE + release + end + +SlateportCity_EventScript_14BE16:: @ 814BE16 + msgbox SlateportCity_Text_1A116E, 4 + release + end + +SlateportCity_EventScript_14BE20:: @ 814BE20 + lock + faceplayer + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 + message SlateportCity_Text_1A0BE4 + waitmessage + pokemartdecoration SlateportCity_Decorations2 + msgbox SlateportCity_Text_1A0C02, 4 + release + end + + .align 2 +SlateportCity_Decorations2:: @ 814BE40 + .2byte DECOR_RED_BRICK + .2byte DECOR_BLUE_BRICK + .2byte DECOR_YELLOW_BRICK + .2byte DECOR_RED_BALLOON + .2byte DECOR_BLUE_BALLOON + .2byte DECOR_YELLOW_BALLOON + .2byte DECOR_C_LOW_NOTE_MAT + .2byte DECOR_D_NOTE_MAT + .2byte DECOR_E_NOTE_MAT + .2byte DECOR_F_NOTE_MAT + .2byte DECOR_G_NOTE_MAT + .2byte DECOR_A_NOTE_MAT + .2byte DECOR_B_NOTE_MAT + .2byte DECOR_C_HIGH_NOTE_MAT + .2byte DECOR_NONE + release + end + +@ 814BE60 + lock + faceplayer + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 + message SlateportCity_Text_1A0BE4 + waitmessage + pokemartdecoration SlateportCity_Decorations3 + msgbox SlateportCity_Text_1A0C02, 4 + release + end + + .align 2 +SlateportCity_Decorations3:: @ 814BE80 + .2byte DECOR_MUD_BALL + .2byte DECOR_SLIDE + .2byte DECOR_FENCE_LENGTH + .2byte DECOR_FENCE_WIDTH + .2byte DECOR_TIRE + .2byte DECOR_BREAKABLE_DOOR + .2byte DECOR_SOLID_BOARD + .2byte DECOR_STAND + .2byte DECOR_TV + .2byte DECOR_ROUND_TV + .2byte DECOR_CUTE_TV + .2byte DECOR_NONE + release + end + +SlateportCity_EventScript_14BE9A:: @ 814BE9A + lock + faceplayer + message SlateportCity_Text_1A0BE4 + waitmessage + pokemart SlateportCity_Items2 + msgbox SlateportCity_Text_1A0C02, 4 + release + end + + .align 2 +SlateportCity_Items2:: @ 814BEB4 + .2byte ITEM_TM10_HIDDEN_POWER + .2byte ITEM_TM43_SECRET_POWER + .2byte ITEM_NONE + release + end + +SlateportCity_EventScript_14BEBC:: @ 814BEBC + lockall + msgbox SlateportCity_Text_165498, 4 + msgbox SlateportCity_Text_1654E0, 4 + closemessage + applymovement 10, SlateportCity_Movement_1A0843 + waitmovement 0 + delay 10 + applymovement 9, SlateportCity_Movement_1A0845 + waitmovement 0 + delay 25 + applymovement 11, SlateportCity_Movement_14C000 + applymovement 255, SlateportCity_Movement_14C00E + applymovement 10, SlateportCity_Movement_14BFDD + applymovement 9, SlateportCity_Movement_14BFEA + waitmovement 0 + removeobject 10 + removeobject 9 + msgbox SlateportCity_Text_16558D, 4 + applymovement 11, SlateportCity_Movement_1A0841 + waitmovement 0 + msgbox SlateportCity_Text_1655E7, 4 + playbgm MUS_EVIL_TEAM, FALSE + msgbox SlateportCity_Text_1656BC, 4 + applymovement 6, SlateportCity_Movement_1A083F + applymovement 1, SlateportCity_Movement_1A083F + applymovement 7, SlateportCity_Movement_14BFCD + applymovement 3, SlateportCity_Movement_1A0831 + applymovement 2, SlateportCity_Movement_14BFD5 + waitmovement 0 + applymovement 11, SlateportCity_Movement_1A0845 + waitmovement 0 + msgbox SlateportCity_Text_16578F, 4 + playse SE_PIN + applymovement 11, SlateportCity_Movement_1A0833 + waitmovement 0 + applymovement 11, SlateportCity_Movement_1A0835 + waitmovement 0 + msgbox SlateportCity_Text_1657FA, 4 + applymovement 11, SlateportCity_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_Text_16583A, 4 + closemessage + applymovement 11, SlateportCity_Movement_14BFFB + applymovement 255, SlateportCity_Movement_14C008 + waitmovement 0 + removeobject 11 + clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + setvar VAR_SLATEPORT_STATE, 2 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 + waitstate + releaseall + end + +SlateportCity_Movement_14BFCD:: @ 814BFCD + delay_16 + delay_16 + emote_question_mark + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_left + end_movement + +SlateportCity_Movement_14BFD5:: @ 814BFD5 + emote_question_mark + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_in_place_fastest_left + end_movement + +SlateportCity_Movement_14BFDD:: @ 814BFDD + delay_16 + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +SlateportCity_Movement_14BFEA:: @ 814BFEA + walk_down + walk_left + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +@ 814BFF8 + walk_down + walk_in_place_fastest_up + end_movement + +SlateportCity_Movement_14BFFB:: @ 814BFFB + walk_right + walk_up + walk_up + set_invisible + end_movement + +SlateportCity_Movement_14C000:: @ 814C000 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left + end_movement + +SlateportCity_Movement_14C008:: @ 814C008 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up + end_movement + +SlateportCity_Movement_14C00E:: @ 814C00E + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement + +SlateportCity_EventScript_14C017:: @ 814C017 + msgbox SlateportCity_Text_165425, 3 + end + +SlateportCity_EventScript_14C020:: @ 814C020 + msgbox SlateportCity_Text_165458, 3 + end + +SlateportCity_EventScript_14C029:: @ 814C029 + msgbox SlateportCity_Text_1647A7, 2 + end diff --git a/data/maps/SlateportCity/text.inc b/data/maps/SlateportCity/text.inc new file mode 100644 index 000000000..3ff5d51bf --- /dev/null +++ b/data/maps/SlateportCity/text.inc @@ -0,0 +1,321 @@ +SlateportCity_Text_164642:: @ 8164642 + .string "I’m the ENERGY GURU!\n" + .string "I’ll go for it and sell you what you need!$" + +SlateportCity_Text_164682:: @ 8164682 + .string "Oh?\n" + .string "Your {STR_VAR_1}...$" + +SlateportCity_Text_164691:: @ 8164691 + .string "Went for it stupendously!\p" + .string "As its reward, please give it this\n" + .string "EFFORT RIBBON.$" + +SlateportCity_Text_1646DD:: @ 81646DD + .string "{PLAYER} received the EFFORT RIBBON.$" + +SlateportCity_Text_1646FC:: @ 81646FC + .string "{PLAYER} put the EFFORT RIBBON\n" + .string "on {STR_VAR_1}.$" + +SlateportCity_Text_16471C:: @ 816471C + .string "You have to go for it a little harder.\p" + .string "If you do, I’ll give your POKéMON\n" + .string "something nice.$" + +SlateportCity_Text_164775:: @ 8164775 + .string "Oh! Your {STR_VAR_1}, that EFFORT\n" + .string "RIBBON looks good on it!$" + +SlateportCity_Text_1647A7:: @ 81647A7 + .string "The light of the lighthouse reaches\n" + .string "dozens of miles away.\p" + .string "I wonder if it doesn’t startle POKéMON\n" + .string "in the sea.$" + +SlateportCity_Text_164814:: @ 8164814 + .string "Ooh, look at this!\p" + .string "The seaweed you can get around these\n" + .string "parts is fresh and full of life.\p" + .string "Why, it looks like it can even rear up\n" + .string "and attack!$" + +SlateportCity_Text_1648A0:: @ 81648A0 + .string "Where the water is clean, the fruits\n" + .string "of bountiful harvest gather.\p" + .string "And where people gather, a market\n" + .string "soon starts.\p" + .string "That is how a town is born and grows.$" + +SlateportCity_Text_164937:: @ 8164937 + .string "Shopping where you can breathe the\n" + .string "scent of the ocean...\p" + .string "SLATEPORT is such a wonderful place!$" + +SlateportCity_Text_164995:: @ 8164995 + .string "If you put DOLLS or CUSHIONS on the\n" + .string "floor, they’ll get dirty.\p" + .string "I’m going to buy some BRICKS so my\n" + .string "DOLLS and CUSHIONS won’t get dirty\l" + .string "when I leave them out.$" + +SlateportCity_Text_164A30:: @ 8164A30 + .string "Yeah! I’ve waited so long for this!\n" + .string "POKéMON CONTESTS!\l" + .string "I’m going to enter!\p" + .string "But before I do, I have to catch some\n" + .string "POKéMON!$" + +SlateportCity_Text_164AA9:: @ 8164AA9 + .string "Whew... I’m just bushed...\p" + .string "I hiked over from MAUVILLE CITY.\n" + .string "But, boy, this city’s huge.\p" + .string "If I’d known this, I would’ve ridden\n" + .string "my BIKE here.$" + +SlateportCity_Text_164B34:: @ 8164B34 + .string "STERN, the fellow who built the\n" + .string "MUSEUM, also happens to be the leader\l" + .string "of an undersea exploration team.\p" + .string "So, everyone calls him CAPT. STERN.$" + +SlateportCity_Text_164BBF:: @ 8164BBF + .string "What is that over there?\n" + .string "That long line...$" + +SlateportCity_Text_164BEA:: @ 8164BEA + .string "When I was a child, I visited the\n" + .string "MUSEUM often.\p" + .string "I used to dream about the mysteries of\n" + .string "the sea after seeing the exhibits.$" + +SlateportCity_Text_164C64:: @ 8164C64 + .string "Hey, there! Quit pushing!\n" + .string "This is the line, can’t you see?$" + +SlateportCity_Text_164C9F:: @ 8164C9F + .string "TEAM {EVIL_TEAM} has a policy of\n" + .string "assembling and dispersing at the\l" + .string "operation site.$" + +SlateportCity_Text_164CE8:: @ 8164CE8 + .string "Our BOSS is brilliant.\p" + .string "What would he want to do with a\n" + .string "MUSEUM now?$" + +SlateportCity_Text_164D2B:: @ 8164D2B + .string "What’s the new scheme, I wonder?\p" + .string "Our BOSS is scary when he’s mad, so\n" + .string "I’d better not screw things up...$" + +SlateportCity_Text_164D92:: @ 8164D92 + .string "If there’s something we need in the\n" + .string "MUSEUM, we should take it all!$" + +SlateportCity_Text_164DD5:: @ 8164DD5 + .string "Hey, you there!\n" + .string "Don’t butt in!$" + +SlateportCity_Text_164DF4:: @ 8164DF4 + .string "A long line, huh?\p" + .string "It reminds me of the times I lined up to\n" + .string "buy smash-hit games...$" + +SlateportCity_Text_164E46:: @ 8164E46 + .string "Why are we even lining up and paying?\n" + .string "We should just march in!$" + +SlateportCity_Text_164E85:: @ 8164E85 + .string "The sea is just so vast...\p" + .string "Could the sea have been made by the\n" + .string "tears shed by POKéMON?$" + +SlateportCity_Text_164EDB:: @ 8164EDB + .string "Do you know what they do with old\n" + .string "ships that become too creaky to sail?\p" + .string "They sink them in the sea so they\n" + .string "become habitats for POKéMON.$" + +SlateportCity_Text_164F62:: @ 8164F62 + .string "Whenever I visit here, I get carried\n" + .string "away and buy too much.$" + +SlateportCity_Text_164F9E:: @ 8164F9E + .string "If you want to change your POKéMON’s\n" + .string "nickname, you’ll have to get the NAME\l" + .string "RATER to help you.$" + +SlateportCity_Text_164FFC:: @ 8164FFC + .string "Any POKéMON you get in a trade, you\n" + .string "can’t change its nickname.\p" + .string "The original TRAINER’s love for that\n" + .string "POKéMON is in the nickname.$" + +SlateportCity_Text_16507C:: @ 816507C + .string "A POKéMON CONTEST HALL opened in\n" + .string "SLATEPORT recently.\p" + .string "I plan on entering after I improve the\n" + .string "condition of my POKéMON.$" + +SlateportCity_Text_1650F1:: @ 81650F1 + .string "Do you know about the machine\n" + .string "BERRY BLENDER?$" + +SlateportCity_Text_16511E:: @ 816511E + .string "People have to work together to get it\n" + .string "to spin faster.\p" + .string "The faster you can make it spin, the\n" + .string "better {POKEBLOCK}S you can get, I’ve heard.$" + +SlateportCity_Text_1651A1:: @ 81651A1 + .string "It’s used for making a kind of candy\n" + .string "called a {POKEBLOCK}.\p" + .string "If you give a good {POKEBLOCK} to a POKéMON,\n" + .string "its condition will improve by a lot.$" + +SlateportCity_Text_165222:: @ 8165222 + .string "I was hoping that it was a famous star\n" + .string "so I could get an autograph.\p" + .string "But who’s that being interviewed?\n" + .string "Isn’t that CAPT. STERN?$" + +SlateportCity_Text_1652A0:: @ 81652A0 + .string "That lady interviewer is so cool and\n" + .string "pretty.\p" + .string "When I grow up, I’m going to be an\n" + .string "international journalist!$" + +SlateportCity_Text_16530A:: @ 816530A + .string "CAPT. STERN says they discovered\n" + .string "something at the bottom of the sea.\p" + .string "I wonder what it is?\n" + .string "What could it be?$" + +SlateportCity_Text_165376:: @ 8165376 + .string "What’s going on here?\p" + .string "Did the good CAPTAIN come back with\n" + .string "a big fish from the ocean floor?$" + +SlateportCity_Text_1653D1:: @ 81653D1 + .string "Hey! Are you watching?\n" + .string "Am I on TV?$" + +SlateportCity_Text_1653F4:: @ 81653F4 + .string "A TV interview! Here!\n" + .string "The CAPTAIN’s a celebrity!$" + +SlateportCity_Text_165425:: @ 8165425 + .string "TY: Okay, CAPT. STERN, a big smile\n" + .string "for the camera!$" + +SlateportCity_Text_165458:: @ 8165458 + .string "GABBY: I see, I see. You’ve had a most\n" + .string "invaluable experience...$" + +SlateportCity_Text_165498:: @ 8165498 + .string "CAPT. STERN: Yes, indeed. We intend to\n" + .string "move ahead with our exploration.$" + +SlateportCity_Text_1654E0:: @ 81654E0 + .string "GABBY: That’s wonderful, CAPT. STERN!\n" + .string "Thank you for taking the time from\l" + .string "your busy schedule to talk to us.\p" + .string "We hope we can interview you again\n" + .string "with news of more discoveries!$" + +SlateportCity_Text_16558D:: @ 816558D + .string "CAPT. STERN: Whew...\p" + .string "That was my first time to be filmed for\n" + .string "TV. That was nerve wracking.$" + +SlateportCity_Text_1655E7:: @ 81655E7 + .string "Oh! {PLAYER}{KUN}!\n" + .string "You’re looking great!\p" + .string "We made a huge discovery on our last\n" + .string "seafloor exploration.\p" + .string "We found an underwater cavern on\n" + .string "ROUTE 128.\p" + .string "We think it’s the habitat of a POKéMON\n" + .string "that’s said to have been long extinct.$" + +SlateportCity_Text_1656BC:: @ 81656BC + .string "Fufufu...\n" + .string "CAPT. STERN, I presume.\p" + .string "We of TEAM {EVIL_TEAM} will assume\n" + .string "control of your submarine!\p" + .string "Your objections are meaningless!\n" + .string "We expect your total cooperation!\p" + .string "Fufufu...\n" + .string "Just watch and learn what TEAM\l" + .string "{EVIL_TEAM} has planned!$" + +SlateportCity_Text_16578F:: @ 816578F + .string "CAPT. STERN: What was that all about?\p" + .string "It sounded like someone using a\n" + .string "megaphone...\p" + .string "Where did it come from?$" + +SlateportCity_Text_1657FA:: @ 81657FA + .string "It’s from the HARBOR!\p" + .string "The submarine!\n" + .string "They’re trying to take it!$" + +SlateportCity_Text_16583A:: @ 816583A + .string "{PLAYER}{KUN}!\n" + .string "Please, come with me!$" + +SlateportCity_Text_165856:: @ 8165856 + .string "POKéMON CONTESTS\n" + .string "HYPER RANK REGISTRATION\l" + .string "“Let it burn! POKéMON TRAINERS!”$" + +SlateportCity_Text_1658A0:: @ 81658A0 + .string "STERN’S SHIPYARD\p" + .string "“Wanted: A sailor capable of sailing\n" + .string "in all currents.”$" + +SlateportCity_Text_1658E8:: @ 81658E8 + .string "STERN’S SHIPYARD\p" + .string "“The ferry S.S. TIDAL nears\n" + .string "completion for serving the ports of\l" + .string "SLATEPORT and LILYCOVE.”$" + +SlateportCity_Text_165952:: @ 8165952 + .string "STERN’S SHIPYARD\p" + .string "“Boarding of the SLATEPORT-LILYCOVE\n" + .string "ferry S.S. TIDAL is handled at the\l" + .string "HARBOR.”$" + +SlateportCity_Text_1659B3:: @ 81659B3 + .string "POKéMON FAN CLUB\n" + .string "“Calling all fans of POKéMON!”$" + +SlateportCity_Text_1659E3:: @ 81659E3 + .string "“The endless sea sustains\n" + .string "all life.”\p" + .string "OCEANIC MUSEUM$" + +SlateportCity_Text_165A17:: @ 8165A17 + .string "SLATEPORT CITY\p" + .string "“The port where people and POKéMON\n" + .string "cross paths.”$" + +SlateportCity_Text_165A57:: @ 8165A57 + .string "SLATEPORT MARKET\n" + .string "“Unique items found nowhere else!”$" + +SlateportCity_Text_165A8B:: @ 8165A8B + .string "SLATEPORT HARBOR\p" + .string "“The ferry S.S. TIDAL is under\n" + .string "construction in the SHIPYARD.\p" + .string "“Service is scheduled to begin\n" + .string "shortly.”$" + +SlateportCity_Text_165B02:: @ 8165B02 + .string "SLATEPORT HARBOR\p" + .string "“Enjoy a delightful cruise on the\n" + .string "ferry S.S. TIDAL.”$" + +SlateportCity_Text_165B48:: @ 8165B48 + .string "NAME RATER’S HOUSE\n" + .string "“POKéMON nicknames rated.”$" diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/events.inc index b2a57ccc9..b2a57ccc9 100644 --- a/data/maps/events/SlateportCity_ContestHall.inc +++ b/data/maps/SlateportCity_ContestHall/events.inc diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index 64cc06565..d327e87c7 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -1,9 +1,9 @@ SlateportCity_ContestHall:: @ 8306034 - .4byte SlateportCity_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte SlateportCity_ContestHall_MapEvents .4byte SlateportCity_ContestHall_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 73 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_ContestHall/scripts.inc b/data/maps/SlateportCity_ContestHall/scripts.inc new file mode 100644 index 000000000..5f6a3c15d --- /dev/null +++ b/data/maps/SlateportCity_ContestHall/scripts.inc @@ -0,0 +1,112 @@ +SlateportCity_ContestHall_MapScripts:: @ 815554B + .byte 0 + +SlateportCity_ContestHall_EventScript_15554C:: @ 815554C + msgbox SlateportCity_ContestHall_Text_17CB71, 2 + end + +SlateportCity_ContestHall_EventScript_155555:: @ 8155555 + msgbox SlateportCity_ContestHall_Text_17CC80, 2 + end + +SlateportCity_ContestHall_EventScript_15555E:: @ 815555E + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 + msgbox SlateportCity_ContestHall_Text_17CCE2, 4 + giveitem_std ITEM_TM41_TORMENT + compare RESULT, 0 + goto_if_eq SlateportCity_ContestHall_EventScript_1A029B + setflag FLAG_RECEIVED_TM41 + msgbox SlateportCity_ContestHall_Text_17CE28, 4 + release + end + +SlateportCity_ContestHall_EventScript_155595:: @ 8155595 + msgbox SlateportCity_ContestHall_Text_17CE28, 4 + release + end + +SlateportCity_ContestHall_EventScript_15559F:: @ 815559F + msgbox SlateportCity_ContestHall_Text_17CEF3, 2 + lockall + applymovement 3, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_1555B4:: @ 81555B4 + msgbox SlateportCity_ContestHall_Text_17CFA7, 2 + lockall + applymovement 4, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_1555C9:: @ 81555C9 + msgbox SlateportCity_ContestHall_Text_17D054, 2 + lockall + applymovement 5, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_1555DE:: @ 81555DE + msgbox SlateportCity_ContestHall_Text_17D07F, 2 + lockall + applymovement 6, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_1555F3:: @ 81555F3 + msgbox SlateportCity_ContestHall_Text_17D0F9, 2 + lockall + applymovement 7, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_155608:: @ 8155608 + msgbox SlateportCity_ContestHall_Text_17D222, 2 + lockall + applymovement 8, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_15561D:: @ 815561D + msgbox SlateportCity_ContestHall_Text_17D39A, 2 + lockall + applymovement 9, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_155632:: @ 8155632 + msgbox SlateportCity_ContestHall_Text_17D3F0, 2 + lockall + applymovement 10, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_155647:: @ 8155647 + msgbox SlateportCity_ContestHall_Text_17D300, 2 + lockall + applymovement 12, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_15565C:: @ 815565C + msgbox SlateportCity_ContestHall_Text_17D27F, 2 + lockall + applymovement 11, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_ContestHall_EventScript_155671:: @ 8155671 + msgbox SlateportCity_ContestHall_Text_17D447, 3 + end diff --git a/data/maps/SlateportCity_ContestHall/text.inc b/data/maps/SlateportCity_ContestHall/text.inc new file mode 100644 index 000000000..6199157fb --- /dev/null +++ b/data/maps/SlateportCity_ContestHall/text.inc @@ -0,0 +1,105 @@ +SlateportCity_ContestHall_Text_17CB71:: @ 817CB71 + .string "Want a tasty little bit of advice\n" + .string "for CONTESTS?\p" + .string "Using a certain move after another\n" + .string "certain kind of move sometimes gets\l" + .string "you extra attention.\p" + .string "If you know what you’re doing, you\n" + .string "can score big in appeal.\p" + .string "Of course, your opponents might try\n" + .string "disrupting your POKéMON’s showing.$" + +SlateportCity_ContestHall_Text_17CC80:: @ 817CC80 + .string "My papa, he’s a CONTEST JUDGE.\p" + .string "I wonder what I should be when I\n" + .string "grow up, a JUDGE or a GYM LEADER?$" + +SlateportCity_ContestHall_Text_17CCE2:: @ 817CCE2 + .string "Hey, man, I’m like majorly cheesed,\n" + .string "you know. Like, you know, I just\l" + .string "wanted to know why my POKéMON\l" + .string "never won, you know, like, hey?\p" + .string "So, like, I gave the JUDGE my two\n" + .string "cents, you know, they’re free.\p" + .string "And he wouldn’t hear me out, like, hey!\n" + .string "So, like, total bummer, man!\p" + .string "Hey, like, you! Zip it, you know?\n" + .string "Just, you know, take this!$" + +SlateportCity_ContestHall_Text_17CE28:: @ 817CE28 + .string "That’s, like, TM41, you know?\n" + .string "Hey, it’s TORMENT, you hearing me?\p" + .string "Like, it won’t let the other guy\n" + .string "use the same move twice in a row, see?\p" + .string "Hey, now, you listen here, like,\n" + .string "I’m not laying a torment on you!$" + +SlateportCity_ContestHall_Text_17CEF3:: @ 817CEF3 + .string "MC: Oh, my, my!\n" + .string "Now isn’t that a dandy of a POKéMON?\p" + .string "Please! Do step right up and take\n" + .string "part in our splendid CONTESTS!\p" + .string "You’ll do well! I’m sure of it!\n" + .string "My eyes have never failed me!$" + +SlateportCity_ContestHall_Text_17CFA7:: @ 817CFA7 + .string "JUDGE: Well, hello there!\n" + .string "I see that you’re a TRAINER!\p" + .string "Then, it just wouldn’t do for you\n" + .string "to miss a POKéMON CONTEST!\p" + .string "Get a CONTEST PASS in VERDANTURF\n" + .string "CITY and enter anytime!$" + +SlateportCity_ContestHall_Text_17D054:: @ 817D054 + .string "It’s appeal time!\n" + .string "What should I lead with?$" + +SlateportCity_ContestHall_Text_17D07F:: @ 817D07F + .string "They didn’t pay much attention to\n" + .string "my POKéMON’s appeal...\p" + .string "Humph, that JUDGE, he doesn’t know\n" + .string "a good thing when he sees it.$" + +SlateportCity_ContestHall_Text_17D0F9:: @ 817D0F9 + .string "Oh, hi! You must be a serious fan to get\n" + .string "this close to the action.\p" + .string "I’ll reward your enthusiasm with this\n" + .string "sage advice.\p" + .string "If a move goes over really well,\n" + .string "the audience will get excited.\p" + .string "The POKéMON that makes its appeal\n" + .string "right when everyone’s excited...\p" + .string "Well, you’d think something good has\n" + .string "to happen!$" + +SlateportCity_ContestHall_Text_17D222:: @ 817D222 + .string "I can’t do this! I’m more freaked out\n" + .string "than my POKéMON.\p" + .string "I’m shivering and my heart is racing!$" + +SlateportCity_ContestHall_Text_17D27F:: @ 817D27F + .string "A battle and a CONTEST aren’t the\n" + .string "same, but they are alike, too.\p" + .string "You need to work hard and believe\n" + .string "in the POKéMON you’ve raised.$" + +SlateportCity_ContestHall_Text_17D300:: @ 817D300 + .string "That POKéMON looks like it’s on top\n" + .string "of its game, huh?\p" + .string "A POKéMON that does good in the\n" + .string "secondary judging seems to be more\l" + .string "relaxed when it’s doing appeals.$" + +SlateportCity_ContestHall_Text_17D39A:: @ 817D39A + .string "Will you look at that sorry sight?\p" + .string "Heh, my POKéMON’s absolutely better\n" + .string "than that lot!$" + +SlateportCity_ContestHall_Text_17D3F0:: @ 817D3F0 + .string "Don’t you get the urge to move with\n" + .string "POKéMON if they’re putting on an\l" + .string "energetic appeal?$" + +SlateportCity_ContestHall_Text_17D447:: @ 817D447 + .string "POKéMON CONTESTS\n" + .string "HYPER RANK STAGE!$" diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/events.inc index 8981bf455..8981bf455 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/SlateportCity_ContestLobby/events.inc diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 440139e64..0531ef226 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -1,9 +1,9 @@ SlateportCity_ContestLobby:: @ 8306018 - .4byte SlateportCity_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte SlateportCity_ContestLobby_MapEvents .4byte SlateportCity_ContestLobby_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 72 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc new file mode 100644 index 000000000..fd26671dd --- /dev/null +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -0,0 +1,134 @@ +SlateportCity_ContestLobby_MapScripts:: @ 8155411 + map_script 3, SlateportCity_ContestLobby_MapScript1_155417 + .byte 0 + +SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 + call SlateportCity_ContestLobby_EventScript_1AE188 + end + +SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D + setvar VAR_SPECIAL_B, 7 + setvar CONTEST_RANK, 2 + call SlateportCity_ContestLobby_EventScript_1A4E92 + call SlateportCity_ContestLobby_EventScript_155448 + special SetContestTrainerGfxIds + call SlateportCity_ContestLobby_EventScript_15FBDB + setvar VAR_CONTEST_LOCATION, 3 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 + waitstate + end + +SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 + lockall + applymovement 1, SlateportCity_ContestLobby_Movement_1554CC + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 + special DrawWholeMapView + applymovement 1, SlateportCity_ContestLobby_Movement_1554CF + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 1, SlateportCity_ContestLobby_Movement_1554DC + waitmovement 0 + applymovement 255, SlateportCity_ContestLobby_Movement_1554CA + waitmovement 0 + msgbox SlateportCity_ContestLobby_Text_1A6832, 4 + closemessage + applymovement 1, SlateportCity_ContestLobby_Movement_1554D3 + applymovement 255, SlateportCity_ContestLobby_Movement_1554C0 + waitmovement 0 + releaseall + return + +SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA + walk_in_place_fastest_left + end_movement + +SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC + walk_left + walk_in_place_fastest_down + end_movement + +SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF + walk_down + walk_down + walk_in_place_fastest_up + end_movement + +SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC + walk_in_place_fastest_right + end_movement + +SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE + msgbox SlateportCity_ContestLobby_Text_17C937, 2 + end + +SlateportCity_ContestLobby_EventScript_1554E7:: @ 81554E7 + msgbox SlateportCity_ContestLobby_Text_17C9D5, 2 + end + +SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 + msgbox SlateportCity_ContestLobby_Text_17CAEC, 2 + end + +SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 + lockall + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526 + applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_ContestLobby_Text_17CA67, 4 + giveitem_std ITEM_POKEBLOCK_CASE + setflag FLAG_RECEIVED_POKEBLOCK_CASE + releaseall + end + +SlateportCity_ContestLobby_EventScript_155526:: @ 8155526 + msgbox SlateportCity_ContestLobby_Text_17CA88, 2 + end + +SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F + lockall + fadescreen 1 + drawcontestwinner 3 + releaseall + end + +SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 + msgbox SlateportCity_ContestLobby_Text_1B7225, 2 + end + +@ 815553F + lockall + special ShowBerryBlenderRecordWindow + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/SlateportCity_ContestLobby/text.inc b/data/maps/SlateportCity_ContestLobby/text.inc new file mode 100644 index 000000000..7c32cd8ac --- /dev/null +++ b/data/maps/SlateportCity_ContestLobby/text.inc @@ -0,0 +1,27 @@ +SlateportCity_ContestLobby_Text_17C937:: @ 817C937 + .string "I want to raise a POKéMON that’s\n" + .string "the ultimate in “great” for both\l" + .string "battles and CONTESTS.\p" + .string "It’s vexing, trying to figure out\n" + .string "which moves I should make it learn.$" + +SlateportCity_ContestLobby_Text_17C9D5:: @ 817C9D5 + .string "Do any of your friends have any\n" + .string "BERRIES?\p" + .string "You can use that BERRY BLENDER and\n" + .string "make {POKEBLOCK}S with your friends!\p" + .string "You should try it - it’s a lot of fun!$" + +SlateportCity_ContestLobby_Text_17CA67:: @ 817CA67 + .string "I have two, so you can have one!$" + +SlateportCity_ContestLobby_Text_17CA88:: @ 817CA88 + .string "Make {POKEBLOCK}S and put them in there.\p" + .string "When you make a {POKEBLOCK}, everyone\n" + .string "has to put in a different BERRY.$" + +SlateportCity_ContestLobby_Text_17CAEC:: @ 817CAEC + .string "If you win a CONTEST, they put up a\n" + .string "poster of your POKéMON on the wall.\p" + .string "It will have a portrait of your\n" + .string "POKéMON and both your names.$" diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/maps/SlateportCity_Harbor/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SlateportCity_Harbor/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc index a7581ab2a..a7581ab2a 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/SlateportCity_Harbor/events.inc diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index d7da07b49..5de5d2e5f 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,9 +1,9 @@ SlateportCity_Harbor:: @ 83060C0 - .4byte SlateportCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 88 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/maps/SlateportCity_Harbor/map.bin deleted file mode 100644 index c77c1edfb..000000000 --- a/data/maps/SlateportCity_Harbor/map.bin +++ /dev/null @@ -1 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!222MNNNNNNNNNNNNNNNNNNNN222Gqqqqqqqqqqqqqqqqqqqq222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222hVVW[3[3UVVVVVVVF77VVVV222222222%222%222%22`77776*622222222222222222`77777722222222222222222`*6*6*6*677222222222222222`(6(6(6(677
\ No newline at end of file diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc new file mode 100644 index 000000000..872c70352 --- /dev/null +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -0,0 +1,369 @@ +SlateportCity_Harbor_MapScripts:: @ 8155F5D + map_script 3, SlateportCity_Harbor_MapScript1_155F63 + .byte 0 + +SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 + setvar VAR_TEMP_1, 0 + compare VAR_SLATEPORT_HARBOR_STATE, 1 + call_if_eq SlateportCity_Harbor_EventScript_155F89 + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85 + end + +SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + return + +SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 + savebgm MUS_EVIL_TEAM + setobjectxyperm 4, 12, 13 + setobjectmovementtype 4, 9 + setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + return + +SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B + lockall + setvar VAR_SPECIAL_8, 0 + goto SlateportCity_Harbor_EventScript_155FD5 + end + +SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 + lockall + setvar VAR_SPECIAL_8, 1 + goto SlateportCity_Harbor_EventScript_155FD5 + end + +SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 + lockall + setvar VAR_SPECIAL_8, 2 + goto SlateportCity_Harbor_EventScript_155FD5 + end + +SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF + lockall + setvar VAR_SPECIAL_8, 3 + applymovement 255, SlateportCity_Harbor_Movement_1560C2 + waitmovement 0 + goto SlateportCity_Harbor_EventScript_155FD5 + end + +SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 + applymovement 7, SlateportCity_Harbor_Movement_1A0845 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0841 + waitmovement 0 + msgbox SlateportCity_Harbor_Text_17FD7D, 4 + closemessage + applymovement 6, SlateportCity_Harbor_Movement_15609B + applymovement 7, SlateportCity_Harbor_Movement_15609B + applymovement 8, SlateportCity_Harbor_Movement_1560A5 + waitmovement 0 + removeobject 6 + removeobject 7 + removeobject 8 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 + compare VAR_SPECIAL_8, 0 + call_if_eq SlateportCity_Harbor_EventScript_15605C + compare VAR_SPECIAL_8, 1 + call_if_eq SlateportCity_Harbor_EventScript_156071 + compare VAR_SPECIAL_8, 2 + call_if_eq SlateportCity_Harbor_EventScript_156086 + compare VAR_SPECIAL_8, 3 + call_if_eq SlateportCity_Harbor_EventScript_156086 + msgbox SlateportCity_Harbor_Text_17FE60, 4 + closemessage + setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + moveobjectoffscreen 4 + setobjectmovementtype 4, 10 + releaseall + end + +SlateportCity_Harbor_EventScript_15605C:: @ 815605C + applymovement 4, SlateportCity_Harbor_Movement_1560B3 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0845 + waitmovement 0 + return + +SlateportCity_Harbor_EventScript_156071:: @ 8156071 + applymovement 4, SlateportCity_Harbor_Movement_1560B9 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0843 + waitmovement 0 + return + +SlateportCity_Harbor_EventScript_156086:: @ 8156086 + applymovement 4, SlateportCity_Harbor_Movement_1560BE + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0843 + waitmovement 0 + return + +SlateportCity_Harbor_Movement_15609B:: @ 815609B + delay_16 + delay_16 + jump_up + set_invisible + end_movement + +@ 81560A0 + delay_16 + delay_16 + jump_up + set_invisible + end_movement + +SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement + +SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 + walk_left + walk_left + walk_left + walk_left + walk_up + end_movement + +SlateportCity_Harbor_Movement_1560B9:: @ 81560B9 + walk_left + walk_left + walk_up + walk_left + end_movement + +SlateportCity_Harbor_Movement_1560BE:: @ 81560BE + walk_left + walk_left + walk_left + end_movement + +SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 + walk_up + end_movement + +SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 + lock + faceplayer + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9 + msgbox SlateportCity_Harbor_Text_17FA0A, 4 + release + end + +SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 + msgbox SlateportCity_Harbor_Text_17FA73, 4 + checkitem ITEM_SS_TICKET, 1 + compare RESULT, 0 + goto_if_eq SlateportCity_Harbor_EventScript_156135 + message SlateportCity_Harbor_Text_17FB0A + waitmessage + goto SlateportCity_Harbor_EventScript_1560FD + end + +SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD + multichoicedefault 18, 6, 52, 2, 0 + switch RESULT + case 0, SlateportCity_Harbor_EventScript_15613F + case 1, SlateportCity_Harbor_EventScript_156167 + case 2, SlateportCity_Harbor_EventScript_1561DA + case 127, SlateportCity_Harbor_EventScript_1561DA + end + +SlateportCity_Harbor_EventScript_156135:: @ 8156135 + msgbox SlateportCity_Harbor_Text_17FAAD, 4 + release + end + +SlateportCity_Harbor_EventScript_15613F:: @ 815613F + msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq SlateportCity_Harbor_EventScript_15618A + setvar VAR_PORTHOLE_STATE, 1 + call SlateportCity_Harbor_EventScript_156196 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 + waitstate + release + end + +SlateportCity_Harbor_EventScript_156167:: @ 8156167 + msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq SlateportCity_Harbor_EventScript_15618A + call SlateportCity_Harbor_EventScript_156196 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 + waitstate + release + end + +SlateportCity_Harbor_EventScript_15618A:: @ 815618A + message SlateportCity_Harbor_Text_17FBE5 + waitmessage + goto SlateportCity_Harbor_EventScript_1560FD + end + +SlateportCity_Harbor_EventScript_156196:: @ 8156196 + msgbox SlateportCity_Harbor_Text_17FBB6, 4 + closemessage + applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 + waitmovement 0 + delay 30 + hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR + compare FACING, 2 + call_if_eq SlateportCity_Harbor_EventScript_1561EF + compare FACING, 4 + call_if_eq SlateportCity_Harbor_EventScript_1561E4 + delay 30 + hideobjectat 255, MAP_PETALBURG_CITY + setvar VAR_SPECIAL_4, 5 + call SlateportCity_Harbor_EventScript_1A040E + return + +SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA + msgbox SlateportCity_Harbor_Text_17FB5F, 4 + release + end + +SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4 + applymovement 255, SlateportCity_Harbor_Movement_1561FA + waitmovement 0 + return + +SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF + applymovement 255, SlateportCity_Harbor_Movement_1561FD + waitmovement 0 + return + +SlateportCity_Harbor_Movement_1561FA:: @ 81561FA + walk_right + walk_in_place_fastest_up + end_movement + +SlateportCity_Harbor_Movement_1561FD:: @ 81561FD + walk_up + end_movement + +SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF + msgbox SlateportCity_Harbor_Text_17FC07, 2 + end + +SlateportCity_Harbor_EventScript_156208:: @ 8156208 + msgbox SlateportCity_Harbor_Text_17FC7C, 2 + end + +SlateportCity_Harbor_EventScript_156211:: @ 8156211 + lock + faceplayer + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258 + compare VAR_SLATEPORT_HARBOR_STATE, 2 + goto_if_eq SlateportCity_Harbor_EventScript_15624E + msgbox SlateportCity_Harbor_Text_17FD1C, 4 + closemessage + applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D + waitmovement 0 + release + end + +SlateportCity_Harbor_EventScript_15624E:: @ 815624E + msgbox SlateportCity_Harbor_Text_17FE60, 4 + release + end + +SlateportCity_Harbor_EventScript_156258:: @ 8156258 + setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE + msgbox SlateportCity_Harbor_Text_17FF35, 4 + release + end + +SlateportCity_Harbor_EventScript_156265:: @ 8156265 + msgbox SlateportCity_Harbor_Text_1800A0, 4 + release + end + +SlateportCity_Harbor_EventScript_15626F:: @ 815626F + compare VAR_TEMP_1, 1 + goto_if_eq SlateportCity_Harbor_EventScript_156380 + checkitem ITEM_SCANNER, 1 + compare RESULT, 1 + goto_if_eq SlateportCity_Harbor_EventScript_1562A7 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D + msgbox SlateportCity_Harbor_Text_18017B, 4 + release + end + +SlateportCity_Harbor_EventScript_15629D:: @ 815629D + msgbox SlateportCity_Harbor_Text_1801EA, 4 + release + end + +SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 + message SlateportCity_Harbor_Text_18028B + waitmessage + goto SlateportCity_Harbor_EventScript_1562B3 + end + +SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 + multichoice 0, 0, 46, 0 + switch RESULT + case 0, SlateportCity_Harbor_EventScript_1562EA + case 1, SlateportCity_Harbor_EventScript_15632A + case 2, SlateportCity_Harbor_EventScript_15636A + case 127, SlateportCity_Harbor_EventScript_15636A + end + +SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA + msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq SlateportCity_Harbor_EventScript_156374 + giveitem_std ITEM_DEEP_SEA_TOOTH + compare RESULT, 0 + goto_if_eq SlateportCity_Harbor_EventScript_1A029B + takeitem ITEM_SCANNER, 1 + msgbox SlateportCity_Harbor_Text_18046B, 4 + setflag FLAG_EXCHANGED_SCANNER + goto SlateportCity_Harbor_EventScript_156380 + end + +SlateportCity_Harbor_EventScript_15632A:: @ 815632A + msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq SlateportCity_Harbor_EventScript_156374 + giveitem_std ITEM_DEEP_SEA_SCALE + compare RESULT, 0 + goto_if_eq SlateportCity_Harbor_EventScript_1A029B + takeitem ITEM_SCANNER, 1 + msgbox SlateportCity_Harbor_Text_18046B, 4 + setflag FLAG_EXCHANGED_SCANNER + goto SlateportCity_Harbor_EventScript_156380 + end + +SlateportCity_Harbor_EventScript_15636A:: @ 815636A + msgbox SlateportCity_Harbor_Text_180360, 4 + release + end + +SlateportCity_Harbor_EventScript_156374:: @ 8156374 + message SlateportCity_Harbor_Text_180447 + waitmessage + goto SlateportCity_Harbor_EventScript_1562B3 + end + +SlateportCity_Harbor_EventScript_156380:: @ 8156380 + setvar VAR_TEMP_1, 1 + msgbox SlateportCity_Harbor_Text_180491, 4 + release + end diff --git a/data/maps/SlateportCity_Harbor/text.inc b/data/maps/SlateportCity_Harbor/text.inc new file mode 100644 index 000000000..187dfe07c --- /dev/null +++ b/data/maps/SlateportCity_Harbor/text.inc @@ -0,0 +1,148 @@ +SlateportCity_Harbor_Text_17FA0A:: @ 817FA0A + .string "I beg your pardon?\n" + .string "You’re looking for a ship?\p" + .string "I’m sorry, the ferry service isn’t\n" + .string "available at present...$" + +SlateportCity_Harbor_Text_17FA73:: @ 817FA73 + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" + +SlateportCity_Harbor_Text_17FAAD:: @ 817FAAD + .string "{PLAYER} doesn’t have the TICKET...\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" + +SlateportCity_Harbor_Text_17FB0A:: @ 817FB0A + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" + +SlateportCity_Harbor_Text_17FB5F:: @ 817FB5F + .string "Please sail with us another time!$" + +SlateportCity_Harbor_Text_17FB81:: @ 817FB81 + .string "LILYCOVE CITY it is, then!$" + +SlateportCity_Harbor_Text_17FB9C:: @ 817FB9C + .string "BATTLE TOWER it is, then!$" + +SlateportCity_Harbor_Text_17FBB6:: @ 817FBB6 + .string "Please board the ferry and wait for\n" + .string "departure.$" + +SlateportCity_Harbor_Text_17FBE5:: @ 817FBE5 + .string "Then, where would you like to go?$" + +SlateportCity_Harbor_Text_17FC07:: @ 817FC07 + .string "A journey to the bottom of the sea...\n" + .string "I wonder what it’d be like?\p" + .string "I’d love to go deep underwater like\n" + .string "that some day.$" + +SlateportCity_Harbor_Text_17FC7C:: @ 817FC7C + .string "I wanted to go with CAPT. STERN on\n" + .string "the ocean floor exploration.\p" + .string "But the sub’s too small for me.\p" + .string "If I squeezed in, there wouldn’t be\n" + .string "any room for the CAPTAIN...$" + +SlateportCity_Harbor_Text_17FD1C:: @ 817FD1C + .string "CAPT. STERN: Those thugs...\p" + .string "They’re the same lot who tried to rob\n" + .string "the DEVON GOODS at the MUSEUM.$" + +SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D + .string "{EVIL_LEADER}: Fwahahaha...\n" + .string "I commiserate with you!\p" + .string "All that effort you spent following\n" + .string "me here all the way from MT. PYRE.\p" + .string "But now...\n" + .string "No one can stop us! No one!\p" + .string "Or, will you follow us back to our\n" + .string "HIDEOUT in LILYCOVE CITY?\p" + .string "Fwahahahaha...$" + +SlateportCity_Harbor_Text_17FE60:: @ 817FE60 + .string "CAPT. STERN: Why...\p" + .string "Why would TEAM {EVIL_TEAM} steal my\n" + .string "SUBMARINE EXPLORER 1?\p" + .string "They can’t be after the slumbering\n" + .string "POKéMON at the bottom of the sea...\p" + .string "But even if I were to chase them,\n" + .string "I don’t stand a chance against them...$" + +SlateportCity_Harbor_Text_17FF35:: @ 817FF35 + .string "CAPT. STERN: Oh, {PLAYER}{KUN}...\p" + .string "Okay... So TEAM {EVIL_TEAM} left before you\n" + .string "could stop them...\p" + .string "Oh, no, don’t blame yourself.\n" + .string "You’re not responsible for this.\p" + .string "Trying to catch a submarine...\n" + .string "It’s impossible for most people.\p" + .string "You would need a POKéMON that knows\n" + .string "how to DIVE...\p" + .string "Perhaps if you went out to\n" + .string "MOSSDEEP CITY...\p" + .string "A lot of divers live out there, so\n" + .string "someone might teach you...$" + +SlateportCity_Harbor_Text_1800A0:: @ 81800A0 + .string "CAPT. STERN: Trying to catch a\n" + .string "submarine... It’s impossible.\p" + .string "You would need a POKéMON that knows\n" + .string "how to DIVE...\p" + .string "Perhaps if you went out to\n" + .string "MOSSDEEP CITY...\p" + .string "A lot of divers live out there, so\n" + .string "someone might teach you...$" + +SlateportCity_Harbor_Text_18017B:: @ 818017B + .string "CAPT. STERN: Oh, yes.\n" + .string "MR. BRINEY came to our SHIPYARD.\p" + .string "It won’t be long now before we finish\n" + .string "making the ferry!$" + +SlateportCity_Harbor_Text_1801EA:: @ 81801EA + .string "CAPT. STERN: {PLAYER}{KUN}!\p" + .string "We finally finished making the ferry\n" + .string "S.S. TIDAL!\p" + .string "We couldn’t have done it without your\n" + .string "friend MR. BRINEY.\p" + .string "Please go for a short cruise on it!$" + +SlateportCity_Harbor_Text_18028B:: @ 818028B + .string "CAPT. STERN: Oh?\n" + .string "{PLAYER}{KUN}, that item you have...\p" + .string "That’s a SCANNER! That would sure\n" + .string "help us on our explorations.\p" + .string "{PLAYER}{KUN}, would you trade your\n" + .string "SCANNER for something?\p" + .string "Like say a DEEPSEATOOTH or a\n" + .string "DEEPSEASCALE that I have?$" + +SlateportCity_Harbor_Text_180360:: @ 8180360 + .string "CAPT. STERN: Are you certain?\n" + .string "It’s useless to you, {PLAYER}{KUN}...\p" + .string "Well, okay, then. If you want to trade\n" + .string "your SCANNER, let me know.$" + +SlateportCity_Harbor_Text_1803DD:: @ 81803DD + .string "CAPT. STERN: So you’ll trade it for\n" + .string "my DEEPSEATOOTH?$" + +SlateportCity_Harbor_Text_180412:: @ 8180412 + .string "CAPT. STERN: So you’ll trade it for\n" + .string "my DEEPSEASCALE?$" + +SlateportCity_Harbor_Text_180447:: @ 8180447 + .string "CAPT. STERN: Which one do you want?$" + +SlateportCity_Harbor_Text_18046B:: @ 818046B + .string "{PLAYER} handed the SCANNER to\n" + .string "CAPT. STERN.$" + +SlateportCity_Harbor_Text_180491:: @ 8180491 + .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" + .string "This will help our research a lot!$" diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc index bc83e91ce..bc83e91ce 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/SlateportCity_House1/events.inc diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 75a5cdb72..548424b49 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,9 +1,9 @@ SlateportCity_House1:: @ 8306050 - .4byte SlateportCity_House1_MapAttributes + .4byte HouseWithBed_Layout .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 80 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc new file mode 100644 index 000000000..be2955937 --- /dev/null +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -0,0 +1,72 @@ +SlateportCity_House1_MapScripts:: @ 815567A + .byte 0 + +SlateportCity_House1_EventScript_15567B:: @ 815567B + lock + faceplayer + msgbox SlateportCity_House1_Text_17D46A, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq SlateportCity_House1_EventScript_15569C + compare RESULT, NO + goto_if_eq SlateportCity_House1_EventScript_1556BF + end + +SlateportCity_House1_EventScript_15569C:: @ 815569C + msgbox SlateportCity_House1_Text_17D4DB, 4 + special SelectMonForNPCTrade + waitstate + compare VAR_SPECIAL_4, 255 + goto_if_ne SlateportCity_House1_EventScript_1556C9 + compare VAR_SPECIAL_4, 255 + goto_if_eq SlateportCity_House1_EventScript_1556BF + end + +SlateportCity_House1_EventScript_1556BF:: @ 81556BF + msgbox SlateportCity_House1_Text_17D61E, 4 + release + end + +SlateportCity_House1_EventScript_1556C9:: @ 81556C9 + specialvar RESULT, ScriptGetPartyMonSpecies + compare RESULT, SPECIES_EGG + goto_if_eq SlateportCity_House1_EventScript_15571C + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID + compare RESULT, 1 + goto_if_eq SlateportCity_House1_EventScript_155726 + specialvar RESULT, MonOTNameMatchesPlayer + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare RESULT, 1 + goto_if_eq SlateportCity_House1_EventScript_155726 + msgbox SlateportCity_House1_Text_17D505, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq SlateportCity_House1_EventScript_155730 + compare RESULT, NO + goto_if_eq SlateportCity_House1_EventScript_1556BF + end + +SlateportCity_House1_EventScript_15571C:: @ 815571C + msgbox SlateportCity_House1_Text_17D752, 4 + release + end + +SlateportCity_House1_EventScript_155726:: @ 8155726 + msgbox SlateportCity_House1_Text_17D6CC, 4 + release + end + +SlateportCity_House1_EventScript_155730:: @ 8155730 + msgbox SlateportCity_House1_Text_17D580, 4 + call SlateportCity_House1_EventScript_1A0678 + specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare RESULT, 1 + goto_if_eq SlateportCity_House1_EventScript_15575A + msgbox SlateportCity_House1_Text_17D63A, 4 + release + end + +SlateportCity_House1_EventScript_15575A:: @ 815575A + msgbox SlateportCity_House1_Text_17D5B0, 4 + release + end diff --git a/data/maps/SlateportCity_House1/text.inc b/data/maps/SlateportCity_House1/text.inc new file mode 100644 index 000000000..c711aec2f --- /dev/null +++ b/data/maps/SlateportCity_House1/text.inc @@ -0,0 +1,47 @@ +SlateportCity_House1_Text_17D46A:: @ 817D46A + .string "Hi, hi! I’m the NAME RATER!\n" + .string "I’m the fortune-teller of names!\p" + .string "I shall be pleased to rate your\n" + .string "POKéMON’s nickname.$" + +SlateportCity_House1_Text_17D4DB:: @ 817D4DB + .string "Which POKéMON’s nickname should\n" + .string "I divine?$" + +SlateportCity_House1_Text_17D505:: @ 817D505 + .string "Hmmm... {STR_VAR_1}, is it? That is\n" + .string "quite a fine name you bestowed.\p" + .string "But! What say you, if I were to\n" + .string "suggest a slightly better name?$" + +SlateportCity_House1_Text_17D580:: @ 817D580 + .string "Ah, good. Then, what shall the new\n" + .string "nickname be?$" + +SlateportCity_House1_Text_17D5B0:: @ 817D5B0 + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It is a better name than before!\n" + .string "How fortunate for you!$" + +SlateportCity_House1_Text_17D61E:: @ 817D61E + .string "I see.\n" + .string "Do come visit again.$" + +SlateportCity_House1_Text_17D63A:: @ 817D63A + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It looks no different from before,\n" + .string "and yet, this is vastly superior!\l" + .string "How fortunate for you!$" + +SlateportCity_House1_Text_17D6CC:: @ 817D6CC + .string "Hmmm... {STR_VAR_1} it is!\p" + .string "This is a magnificent nickname!\n" + .string "It is impeccably beyond reproach!\p" + .string "You’ll do well to cherish your\n" + .string "{STR_VAR_1} now and beyond.$" + +SlateportCity_House1_Text_17D752:: @ 817D752 + .string "Now, now.\n" + .string "That is merely an EGG!$" diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc index d115e8225..d115e8225 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/SlateportCity_House2/events.inc diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 00b9399a3..d731c0542 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,9 +1,9 @@ SlateportCity_House2:: @ 83060DC - .4byte House2_MapAttributes + .4byte House2_Layout .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 60 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc new file mode 100644 index 000000000..934fae153 --- /dev/null +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -0,0 +1,21 @@ +SlateportCity_House2_MapScripts:: @ 815638F + .byte 0 + +SlateportCity_House2_EventScript_156390:: @ 8156390 + msgbox SlateportCity_House2_Text_1804CF, 2 + end + +SlateportCity_House2_EventScript_156399:: @ 8156399 + lock + faceplayer + checkitem ITEM_CONTEST_PASS, 1 + compare RESULT, 1 + goto_if_eq SlateportCity_House2_EventScript_1563B5 + msgbox SlateportCity_House2_Text_180567, 4 + release + end + +SlateportCity_House2_EventScript_1563B5:: @ 81563B5 + msgbox SlateportCity_House2_Text_1805CD, 4 + release + end diff --git a/data/maps/SlateportCity_House2/text.inc b/data/maps/SlateportCity_House2/text.inc new file mode 100644 index 000000000..c3d8346bc --- /dev/null +++ b/data/maps/SlateportCity_House2/text.inc @@ -0,0 +1,16 @@ +SlateportCity_House2_Text_1804CF:: @ 81804CF + .string "My POKéMON has a HASTY nature.\p" + .string "It has higher SPEED compared to my\n" + .string "other POKéMON.\p" + .string "Maybe their nature has something to\n" + .string "do with the stat gains of POKéMON.$" + +SlateportCity_House2_Text_180567:: @ 8180567 + .string "You need a CONTEST PASS to enter a\n" + .string "CONTEST.\p" + .string "It’s easy to get. They give it to\n" + .string "anyone who has POKéMON.$" + +SlateportCity_House2_Text_1805CD:: @ 81805CD + .string "Oh, a CONTEST PASS!\n" + .string "You’re going to be a contestant?$" diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc index abf6ebdce..abf6ebdce 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/SlateportCity_Mart/events.inc diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 12f2172be..d66d2452e 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,9 +1,9 @@ SlateportCity_Mart:: @ 8306130 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc new file mode 100644 index 000000000..39a1d5ba2 --- /dev/null +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -0,0 +1,35 @@ +SlateportCity_Mart_MapScripts:: @ 8156410 + .byte 0 + +SlateportCity_Mart_EventScript_156411:: @ 8156411 + lock + faceplayer + message SlateportCity_Mart_Text_1A0BE4 + waitmessage + pokemart SlateportCity_Mart_Items + msgbox SlateportCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +SlateportCity_Mart_Items:: @ 8156428 + .2byte ITEM_POKE_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_POTION + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_HARBOR_MAIL + .2byte ITEM_NONE + release + end + +SlateportCity_Mart_EventScript_15643E:: @ 815643E + msgbox SlateportCity_Mart_Text_180730, 2 + end + +SlateportCity_Mart_EventScript_156447:: @ 8156447 + msgbox SlateportCity_Mart_Text_18079D, 2 + end diff --git a/data/maps/SlateportCity_Mart/text.inc b/data/maps/SlateportCity_Mart/text.inc new file mode 100644 index 000000000..b5243d406 --- /dev/null +++ b/data/maps/SlateportCity_Mart/text.inc @@ -0,0 +1,11 @@ +SlateportCity_Mart_Text_180730:: @ 8180730 + .string "The MARKET does have some interesting\n" + .string "merchandise.\p" + .string "But there are some items you can only\n" + .string "get at a POKé MART.$" + +SlateportCity_Mart_Text_18079D:: @ 818079D + .string "A GREAT BALL is better than a POKé BALL\n" + .string "at catching POKéMON.\p" + .string "With this, I should be able to get that\n" + .string "elusive POKéMON...$" diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/maps/SlateportCity_OceanicMuseum_1F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin +++ /dev/null diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 825c589de..825c589de 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 7aaa2ff91..60fe69e70 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,9 +1,9 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 - .4byte SlateportCity_OceanicMuseum_1F_MapAttributes + .4byte SlateportCity_OceanicMuseum_1F_Layout .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 - .2byte BGM_FUNE_KAN + .2byte MUS_FUNE_KAN .2byte 86 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/maps/SlateportCity_OceanicMuseum_1F/map.bin deleted file mode 100644 index f18b01e49..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -]W&'&'
^_ ./ ./ 22222222262722627222222222 2222222222222!222!2222(C222222222222)6C22)6C2222K22"2#2#2$222"2#2#2$22K222K222 222U6H6I6V6C22U6I636V6C222!2222(C22>6D22>6C22>6D22>6C222)6C2222K22`6C22`6 - `6C22`6C2222K2
\ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc new file mode 100644 index 000000000..cb65f1be5 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -0,0 +1,217 @@ +SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA + map_script 3, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0 + .byte 0 + +SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 + .ifdef SAPPHIRE + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + .else + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + .endif + end + +SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB + msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 + lockall + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 + lockall + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 + waitmovement 0 + goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 + showmoneybox 0, 0 + nop + msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D + closemessage + hidemoneybox 0, 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + waitmovement 0 + releaseall + end + +SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D + checkmoney 0x32, 0 + compare RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A + takemoney 0x32, 0 + updatemoneybox 0, 0 + nop + msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 + hidemoneybox 0, 0 + releaseall + end + +SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B + msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 + closemessage + hidemoneybox 0, 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + waitmovement 0 + releaseall + end + +SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B + msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 + hidemoneybox 0, 0 + releaseall + end + +SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D + walk_down + end_movement + +SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F + msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155B98:: @ 8155B98 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E2E3, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BA1:: @ 8155BA1 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E338, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BAA:: @ 8155BAA + msgbox SlateportCity_OceanicMuseum_1F_Text_17E36F, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BB3:: @ 8155BB3 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E3A9, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BBC:: @ 8155BBC + msgbox SlateportCity_OceanicMuseum_1F_Text_17E3ED, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BC5:: @ 8155BC5 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E6C9, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BCE:: @ 8155BCE + msgbox SlateportCity_OceanicMuseum_1F_Text_17E741, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BD7:: @ 8155BD7 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E7C4, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BE0:: @ 8155BE0 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E892, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BE9:: @ 8155BE9 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E944, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BF2:: @ 8155BF2 + msgbox SlateportCity_OceanicMuseum_1F_Text_17EA19, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155BFB:: @ 8155BFB + msgbox SlateportCity_OceanicMuseum_1F_Text_17EB0D, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C04:: @ 8155C04 + msgbox SlateportCity_OceanicMuseum_1F_Text_17EBBC, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C0D:: @ 8155C0D + msgbox SlateportCity_OceanicMuseum_1F_Text_17EC98, 3 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C16:: @ 8155C16 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E434, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C1F:: @ 8155C1F + msgbox SlateportCity_OceanicMuseum_1F_Text_17E477, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C28:: @ 8155C28 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E4D7, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E540, 2 + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A + lock + faceplayer + delay 8 + playse SE_PIN + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 + waitmovement 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 + giveitem_std ITEM_TM46_THIEF + compare RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 + setflag FLAG_RECEIVED_TM46 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 + closemessage + compare FACING, 2 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 + compare FACING, 2 + goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD + end + +SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 + waitmovement 0 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM + playse SE_KAIDAN + removeobject 13 + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC + waitmovement 0 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM + playse SE_KAIDAN + removeobject 13 + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E695, 4 + release + end + +SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement + +SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/text.inc b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc new file mode 100644 index 000000000..0d3d1eec6 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc @@ -0,0 +1,157 @@ +SlateportCity_OceanicMuseum_1F_Text_17E18D:: @ 817E18D + .string "Welcome to the OCEANIC MUSEUM.\p" + .string "The entrance fee is ¥50.\n" + .string "Would you like to enter?$" + +SlateportCity_OceanicMuseum_1F_Text_17E1DE:: @ 817E1DE + .string "Please enjoy yourself.$" + +SlateportCity_OceanicMuseum_1F_Text_17E1F5:: @ 817E1F5 + .string "Oh? I’m sorry, but you don’t seem to\n" + .string "have enough money.$" + +SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D + .string "Oh? You’re with that group that\n" + .string "went in earlier?\p" + .string "You’re the only one who’s late.\n" + .string "You’d better go catch up to them!$" + +UnknownString_817E2A0: @ 817E2A0 + .string "Please visit another time!$" + +SlateportCity_OceanicMuseum_1F_Text_17E2BB:: @ 817E2BB + .string "We, TEAM {EVIL_TEAM}, exist for the good\n" + .string "of all!$" + +SlateportCity_OceanicMuseum_1F_Text_17E2E3:: @ 817E2E3 + .string "We were told to assemble here, so\n" + .string "we did, but...\p" + .string "Our BOSS, the lynchpin, isn’t here.$" + +SlateportCity_OceanicMuseum_1F_Text_17E338:: @ 817E338 + .string "If I ripped off the stuff here,\n" + .string "would it make me rich?$" + +SlateportCity_OceanicMuseum_1F_Text_17E36F:: @ 817E36F + .string "What I learn here, I can put to use on\n" + .string "nefarious deeds...$" + +SlateportCity_OceanicMuseum_1F_Text_17E3A9:: @ 817E3A9 + .string "If our goons didn’t bungle things\n" + .string "in RUSTBORO, we wouldn’t be here!$" + +SlateportCity_OceanicMuseum_1F_Text_17E3ED:: @ 817E3ED + .string "I didn’t have ¥50, so it took a long\n" + .string "time getting by the receptionist.$" + +SlateportCity_OceanicMuseum_1F_Text_17E434:: @ 817E434 + .string "I want to learn about the sea and\n" + .string "use that knowledge for battling.$" + +SlateportCity_OceanicMuseum_1F_Text_17E477:: @ 817E477 + .string "I get all giddy and gooey when I\n" + .string "see the sea!\p" + .string "For me, CAPT. STERN is the number\n" + .string "one role model!$" + +SlateportCity_OceanicMuseum_1F_Text_17E4D7:: @ 817E4D7 + .string "The sea is vast without end, and\n" + .string "infinitely deep...\p" + .string "There must be many POKéMON that we\n" + .string "don’t know about.$" + +SlateportCity_OceanicMuseum_1F_Text_17E540:: @ 817E540 + .string "I want a sea POKéMON.\p" + .string "I think it would feel cool and nice\n" + .string "to hug.$" + +SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 + .string "Aiyeeeh!\n" + .string "What are you doing here?\p" + .string "Me? I’m the TEAM {EVIL_TEAM} member you\n" + .string "thumped before, remember?\p" + .string "Here, take this!\n" + .string "You have to forgive me!$" + +SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 + .string "Aww, darn it!\n" + .string "You so screwed up our plans!\p" + .string "I was going to rip off something\n" + .string "to make up for it, but...\p" + .string "Just you wait!\n" + .string "You’ll get yours one day!$" + +SlateportCity_OceanicMuseum_1F_Text_17E695:: @ 817E695 + .string "Awww, come on!\n" + .string "You have to take this and let me go!$" + +SlateportCity_OceanicMuseum_1F_Text_17E6C9:: @ 817E6C9 + .string "A blue fluid is spiraling inside a\n" + .string "glass vessel.\p" + .string "“This is an experiment to create a\n" + .string "WHIRLPOOL artificially using wind.”$" + +SlateportCity_OceanicMuseum_1F_Text_17E741:: @ 817E741 + .string "A red ball is bobbing up and down\n" + .string "inside a glass vessel.\p" + .string "“This is an experiment simulating a\n" + .string "WATERFALL using the ball’s buoyancy.”$" + +SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 + .string "It’s a sample of soil from the ocean\n" + .string "floor.\p" + .string "“Over many years, the remains of\n" + .string "life-forms settle at the bottom of\l" + .string "the sea making sedimentary layers.\p" + .string "“By analyzing these layers, the\n" + .string "ancient past is revealed.”$" + +SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 + .string "It’s a sample of beach sand.\p" + .string "“Stones from mountains are washed\n" + .string "down by rivers where they are\l" + .string "chipped and ground down.\p" + .string "“They are reduced to grains and end\n" + .string "up as sand on beaches.”$" + +SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 + .string "“OCEANIC MINI FACT 1\n" + .string "Why is seawater blue?\p" + .string "“Light is composed of many colors.\p" + .string "“When light passes through water,\n" + .string "most kinds of light lose color.\p" + .string "“However, blue light retains its\n" + .string "color, making the sea appear blue.”$" + +SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 + .string "“OCEANIC MINI FACT 2\n" + .string "Why is the sea salty?\p" + .string "“Seawater contains dissolved salt in\n" + .string "the form of sodium and chlorine ions.\p" + .string "“These ions leach out of rocks and are\n" + .string "carried out to sea by rain.\p" + .string "“The concentration of dissolved salt\n" + .string "makes the sea salty.”$" + +SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D + .string "“OCEANIC MINI FACT 3\n" + .string "Which is bigger? The sea or land?\p" + .string "“The sea covers about 70% of the\n" + .string "planet, and the rest is land.\p" + .string "“The sea is therefore more than twice\n" + .string "the size of land.”$" + +SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC + .string "It’s a fossil with wavy ridges on it.\p" + .string "“Soil on the ocean floor gets scoured\n" + .string "by the tide.\p" + .string "“The flowing seawater marks the soil\n" + .string "with small ridges and valleys.\p" + .string "“If this soil becomes fossilized, it is\n" + .string "called a ripple mark.”$" + +SlateportCity_OceanicMuseum_1F_Text_17EC98:: @ 817EC98 + .string "A strange machine is rotating under\n" + .string "a glass dome.\p" + .string "Maybe it’s for measuring the depth\n" + .string "of something...$" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/maps/SlateportCity_OceanicMuseum_2F/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin +++ /dev/null diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index bb52f2403..bb52f2403 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 3d9153f56..8baa101fa 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,9 +1,9 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes + .4byte SlateportCity_OceanicMuseum_2F_Layout .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 - .2byte BGM_FUNE_KAN + .2byte MUS_FUNE_KAN .2byte 87 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/maps/SlateportCity_OceanicMuseum_2F/map.bin deleted file mode 100644 index 1fa2cdc18..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ -ac % bd% 22M2N2N2O22222-222222222C2289@,C22225C2S2T22S2T22 22C222334C22222K2[\2[\2(C2C22E2F2F2G2K2222222222222K2C22*01,C2222222Q2R2222 22C222334C2222222YZC222(C2C222222K222222222K2222K2
\ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc new file mode 100644 index 000000000..ce0bc855f --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -0,0 +1,272 @@ +SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA + map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0 + .byte 0 + +SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0 + call SlateportCity_OceanicMuseum_2F_EventScript_1A0196 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 + lock + faceplayer + msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 + closemessage + playbgm MUS_EVIL_TEAM, TRUE + addobject 3 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 + waitmovement 0 + addobject 4 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 + waitmovement 0 + compare FACING, 1 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 + compare FACING, 4 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 + msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 + compare FACING, 4 + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D + msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 + closemessage + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + waitmovement 0 + compare FACING, 1 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 + compare FACING, 3 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 + trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E + msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 + closemessage + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 + savebgm 0 + trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 + closemessage + delay 35 + addobject 2 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6 + waitmovement 0 + .ifdef SAPPHIRE + msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4 + .else + msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4 + .endif + closemessage + fadescreen 1 + removeobject 2 + removeobject 3 + removeobject 4 + fadescreen 0 + delay 30 + setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 + waitmovement 0 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 + setvar VAR_SPECIAL_4, 269 + call SlateportCity_OceanicMuseum_2F_EventScript_1A067F + msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 + closemessage + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 + waitmovement 0 + playse SE_KAIDAN + removeobject 1 + setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 + setflag FLAG_DELIVERED_DEVON_GOODS + clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F + release + end + +SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92 + waitmovement 0 + return + +SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E + walk_left + walk_down + walk_in_place_fastest_left + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up + delay_8 + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6 + walk_right + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2 + walk_right + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4 + walk_down + walk_right + walk_in_place_fastest_down + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF + lock_facing_direction + walk_left + unlock_facing_direction + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3 + walk_down + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement + +SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_fast_down + walk_in_place_fastest_up + end_movement + +SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA + msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC + msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE + msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B + msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, 3 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34 + msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, 2 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D + msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, 2 + end + +SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 + lock + faceplayer + msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4 + closemessage + applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D + waitmovement 0 + release + end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/text.inc b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc new file mode 100644 index 000000000..a3c624f0c --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc @@ -0,0 +1,176 @@ +SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD + .string "Yes? If you’re looking for STERN,\n" + .string "that would be me.\p" + .string "Ah! That must be the part I\n" + .string "ordered from MR. STONE of DEVON.\p" + .string "Thank you! That’s great!\n" + .string "We can prepare for our expedition now.$" + +SlateportCity_OceanicMuseum_2F_Text_17EDAE:: @ 817EDAE + .string "Hehehe, hold it!\n" + .string "We’ll take those parts!$" + +SlateportCity_OceanicMuseum_2F_Text_17EDD7:: @ 817EDD7 + .string "CAPT. STERN: Wh-what?\n" + .string "Who are you people?$" + +SlateportCity_OceanicMuseum_2F_Text_17EE01:: @ 817EE01 + .string "We’re TEAM {EVIL_TEAM}!\p" + .string "Our BOSS wants those parts!\n" + .string "Shut your yap and fork them over!$" + +SlateportCity_OceanicMuseum_2F_Text_17EE4E:: @ 817EE4E + .string "Awaaaah!\n" + .string "A kid beat me!$" + +SlateportCity_OceanicMuseum_2F_Text_17EE66:: @ 817EE66 + .string "Oh, man, what a disaster...\n" + .string "The BOSS is going to be furious...$" + +SlateportCity_OceanicMuseum_2F_Text_17EEA5:: @ 817EEA5 + .string "Humph, sniveling wimp!\n" + .string "Let me take care of this!$" + +SlateportCity_OceanicMuseum_2F_Text_17EED6:: @ 817EED6 + .string "What?!\n" + .string "I lost, too!$" + +SlateportCity_OceanicMuseum_2F_Text_17EEEA:: @ 817EEEA + .string "Now what? If we don’t get the parts,\n" + .string "we’re in for it!\p" + .string "Arrgh, I didn’t count on being meddled\n" + .string "with by some meddling kid!$" + +SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62 + .string "I came to see what was taking so\n" + .string "long to snatch some parts, and you\l" + .string "simps are held up by a mere child?$" + +SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 + .string "I am TEAM AQUA’s ARCHIE.\p" + .string "Tell me, why do you meddle in the\n" + .string "noble affairs of TEAM AQUA?\p" + .string "POKéMON, people, all life depends on\n" + .string "the sea.\p" + .string "So, TEAM AQUA is dedicated to the\n" + .string "expansion of the sea.\p" + .string "Don’t you agree? What we are doing\n" + .string "is a magnificent undertaking.\p" + .string "Ah, fine...\n" + .string "You’re still too young.\p" + .string "It can’t be helped that you do not\n" + .string "understand our ideals.\p" + .string "But, if you ever oppose us again,\n" + .string "there will be consequences!\p" + .string "Heed my warning!\n" + .string "Farewell!$" + +SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E + .string "I am TEAM MAGMA’s MAXIE.\p" + .string "Why on earth do you feel compelled\n" + .string "to mess up TEAM MAGMA’s plans?\p" + .string "POKéMON, people, all life exists on land...\p" + .string "That’s why TEAM MAGMA is trying to\n" + .string "expand the world’s landmass.\p" + .string "Don’t you agree? What we are doing\n" + .string "is a magnificent undertaking.\p" + .string "Well, no matter...\n" + .string "You’re young.\p" + .string "Your inability to understand our\n" + .string "noble cause can’t be helped...\p" + .string "But, if you were to impede us ever\n" + .string "again, you’ll see no mercy from us!\p" + .string "Keep that firmly in mind!\n" + .string "Farewell!$" + +SlateportCity_OceanicMuseum_2F_Text_17F352:: @ 817F352 + .string "CAPT. STERN: You’re...\n" + .string "Ah, okay, you’re {PLAYER}{KUN}...\p" + .string "Anyway, that was a tense situation!\n" + .string "Thank you for saving us!\p" + .string "Oh, yes, I almost forgot that you\n" + .string "even brought the parts from DEVON!$" + +UnknownString_817F404: @ 817F404 + .string "{PLAYER} handed over the DEVON GOODS\n" + .string "to CAPT. STERN.$" + +SlateportCity_OceanicMuseum_2F_Text_17F433:: @ 817F433 + .string "CAPT. STERN: Whoops!\n" + .string "There’s no time to lose!\p" + .string "We have to set out on our ocean floor\n" + .string "expedition really soon.\p" + .string "Thanks, and excuse me!$" + +SlateportCity_OceanicMuseum_2F_Text_17F4B6:: @ 817F4B6 + .string "I saw a model of a ship here.\p" + .string "It reminded me of the ABANDONED SHIP\n" + .string "near DEWFORD TOWN...$" + +SlateportCity_OceanicMuseum_2F_Text_17F50E:: @ 817F50E + .string "Don’t you dare run around inside\n" + .string "the MUSEUM!$" + +SlateportCity_OceanicMuseum_2F_Text_17F53B:: @ 817F53B + .string "Wow, the submarine’s awesome!\n" + .string "I want to go for a ride!$" + +SlateportCity_OceanicMuseum_2F_Text_17F572:: @ 817F572 + .string "“KANTO WATER QUALITY SAMPLE,” the\n" + .string "label says.\p" + .string "The sea is all connected, but the\n" + .string "water seems to differ by region.$" + +SlateportCity_OceanicMuseum_2F_Text_17F5E3:: @ 817F5E3 + .string "“JOHTO WATER QUALITY SAMPLE,” the\n" + .string "label says.\p" + .string "Maybe the water’s saltiness differs\n" + .string "from one region to another...$" + +SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 + .string "A rubber ball is expanding and shrinking.\p" + .string "“In the sea, the weight of water itself\n" + .string "exerts pressure.\p" + .string "“In shallow water, the pressure is not\n" + .string "very heavy.\p" + .string "“However, in extremely deep water,\n" + .string "the pressure can reach even tens of\l" + .string "thousands of tons on a small area.”$" + +SlateportCity_OceanicMuseum_2F_Text_17F754:: @ 817F754 + .string "“MODEL OF HOENN REGION”\p" + .string "It’s a miniature diorama of the\n" + .string "HOENN region.\p" + .string "Where is LITTLEROOT TOWN on this?$" + +SlateportCity_OceanicMuseum_2F_Text_17F7BC:: @ 817F7BC + .string "It’s a display on the flow of seawater.\p" + .string "“Near the bottom of the sea, water\n" + .string "flows due to differences in such\l" + .string "factors as temperature and salinity.”$" + +SlateportCity_OceanicMuseum_2F_Text_17F84E:: @ 817F84E + .string "It’s a display on the flow of\n" + .string "seawater.\p" + .string "“Toward the surface, seawater flows\n" + .string "as currents driven by the winds.”$" + +SlateportCity_OceanicMuseum_2F_Text_17F8BC:: @ 817F8BC + .string "“THE FERRY S.S. TIDAL\p" + .string "“A scale replica of the ship under\n" + .string "construction at STERN’S SHIPYARD.”$" + +SlateportCity_OceanicMuseum_2F_Text_17F918:: @ 817F918 + .string "“SUBMARINE EXPLORER 1\p" + .string "“A replica of the high-performance\n" + .string "ocean floor exploration submarine.”$" + +SlateportCity_OceanicMuseum_2F_Text_17F975:: @ 817F975 + .string "“SUBMERSIBLE POD\p" + .string "“A replica of a compact, unmanned\n" + .string "pod for seafloor exploration.”$" + +SlateportCity_OceanicMuseum_2F_Text_17F9C7:: @ 817F9C7 + .string "“S.S. ANNE\p" + .string "“A replica of the luxury liner that\n" + .string "circles the globe.”$" diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index d4d9ab405..d4d9ab405 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index d668f0efc..35d90cdc2 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..37b2b95ab --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,24 @@ +SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF + map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_1563C5 + .byte 0 + +SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 + setrespawn 4 + call SlateportCity_PokemonCenter_1F_EventScript_19FD1B + end + +SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE + setvar VAR_SPECIAL_B, 1 + call SlateportCity_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +SlateportCity_PokemonCenter_1F_EventScript_1563DC:: @ 81563DC + msgbox SlateportCity_PokemonCenter_1F_Text_180602, 2 + end + +SlateportCity_PokemonCenter_1F_EventScript_1563E5:: @ 81563E5 + msgbox SlateportCity_PokemonCenter_1F_Text_1806CB, 2 + end diff --git a/data/maps/SlateportCity_PokemonCenter_1F/text.inc b/data/maps/SlateportCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..2a87ffa93 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/text.inc @@ -0,0 +1,13 @@ +SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 + .string "Want a tip for battling?\p" + .string "I’d say it’s raising different kinds\n" + .string "of POKéMON in a balanced manner.\p" + .string "It’s no good to make just one\n" + .string "POKéMON strong.\p" + .string "If it has a type disadvantage, it\n" + .string "might not stand a chance.$" + +SlateportCity_PokemonCenter_1F_Text_1806CB:: @ 81806CB + .string "I trade POKéMON with my friends.\p" + .string "If a traded POKéMON is holding an\n" + .string "item, it makes me twice as happy!$" diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index df2da68bb..df2da68bb 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 36c726d7f..738074ba1 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..98782b24d --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +SlateportCity_PokemonCenter_2F_MapScripts:: @ 81563EE + map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +SlateportCity_PokemonCenter_2F_EventScript_1563FE:: @ 81563FE + call SlateportCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +SlateportCity_PokemonCenter_2F_EventScript_156404:: @ 8156404 + call SlateportCity_PokemonCenter_2F_EventScript_1A40CC + end + +SlateportCity_PokemonCenter_2F_EventScript_15640A:: @ 815640A + call SlateportCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/maps/SlateportCity_PokemonFanClub/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/SlateportCity_PokemonFanClub/border.bin +++ /dev/null diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 55b0a693d..55b0a693d 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 1672d21b1..8094f192f 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,9 +1,9 @@ SlateportCity_PokemonFanClub:: @ 830606C - .4byte SlateportCity_PokemonFanClub_MapAttributes + .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 85 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/maps/SlateportCity_PokemonFanClub/map.bin Binary files differdeleted file mode 100644 index 71ae8c7c9..000000000 --- a/data/maps/SlateportCity_PokemonFanClub/map.bin +++ /dev/null diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc new file mode 100644 index 000000000..6a8c88e1e --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -0,0 +1,252 @@ +SlateportCity_PokemonFanClub_MapScripts:: @ 8155764 + map_script 3, SlateportCity_PokemonFanClub_MapScript1_15576A + .byte 0 + +SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A + end + +SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B + lock + faceplayer + switch VAR_SLATEPORT_FAN_CLUB_STATE + case 0, SlateportCity_PokemonFanClub_EventScript_155795 + case 1, SlateportCity_PokemonFanClub_EventScript_1557A8 + case 2, SlateportCity_PokemonFanClub_EventScript_1557FE + release + end + +SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 + msgbox SlateportCity_PokemonFanClub_Text_17D773, 4 + goto SlateportCity_PokemonFanClub_EventScript_155808 + end + +SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 + setvar VAR_TEMP_2, 0 + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + compare VAR_TEMP_2, 5 + call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE + msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 + goto SlateportCity_PokemonFanClub_EventScript_155808 + end + +SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE + msgbox SlateportCity_PokemonFanClub_Text_17DDD5, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 + msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 + setvar VAR_TEMP_1, 0 + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7 + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_1559D0 + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_1559B9 + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_1559A2 + bufferleadmonspeciesname 0 + switch VAR_TEMP_1 + case 0, SlateportCity_PokemonFanClub_EventScript_155899 + case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 + case 2, SlateportCity_PokemonFanClub_EventScript_1558D4 + case 3, SlateportCity_PokemonFanClub_EventScript_155905 + case 4, SlateportCity_PokemonFanClub_EventScript_155936 + case 5, SlateportCity_PokemonFanClub_EventScript_155967 + release + end + +SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 + return + +SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 + addvar VAR_TEMP_2, 1 + return + +SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 + msgbox SlateportCity_PokemonFanClub_Text_17DA5C, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 + checkitemspace ITEM_RED_SCARF, 1 + compare RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 + msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 + setflag FLAG_RECEIVED_RED_SCARF + giveitem_std ITEM_RED_SCARF + msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 + checkitemspace ITEM_BLUE_SCARF, 1 + compare RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 + msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 + setflag FLAG_RECEIVED_BLUE_SCARF + giveitem_std ITEM_BLUE_SCARF + msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 + checkitemspace ITEM_PINK_SCARF, 1 + compare RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 + msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 + setflag FLAG_RECEIVED_PINK_SCARF + giveitem_std ITEM_PINK_SCARF + msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 + checkitemspace ITEM_GREEN_SCARF, 1 + compare RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 + msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 + setflag FLAG_RECEIVED_GREEN_SCARF + giveitem_std ITEM_GREEN_SCARF + msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 + checkitemspace ITEM_YELLOW_SCARF, 1 + compare RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 + msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 + setflag FLAG_RECEIVED_YELLOW_SCARF + giveitem_std ITEM_YELLOW_SCARF + msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 + msgbox SlateportCity_PokemonFanClub_Text_17DB0B, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 + specialvar RESULT, CheckLeadMonCool + compare RESULT, 1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3 + return + +SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 + setvar VAR_TEMP_1, 1 + return + +SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 + specialvar RESULT, CheckLeadMonBeauty + compare RESULT, 1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA + return + +SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA + setvar VAR_TEMP_1, 2 + return + +SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 + specialvar RESULT, CheckLeadMonCute + compare RESULT, 1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1 + return + +SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 + setvar VAR_TEMP_1, 3 + return + +SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 + specialvar RESULT, CheckLeadMonSmart + compare RESULT, 1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8 + return + +SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 + setvar VAR_TEMP_1, 4 + return + +SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE + specialvar RESULT, CheckLeadMonTough + compare RESULT, 1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F + return + +SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F + setvar VAR_TEMP_1, 5 + return + +SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 + lock + faceplayer + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75 + msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 + specialvar RESULT, GetLeadMonFriendshipScore + compare RESULT, 4 + goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A + release + end + +SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A + playse SE_PIN + applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 + waitmovement 0 + msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 + giveitem_std ITEM_SOOTHE_BELL + compare RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B + setflag FLAG_RECEIVED_SOOTHE_BELL + release + end + +SlateportCity_PokemonFanClub_EventScript_155A75:: @ 8155A75 + msgbox SlateportCity_PokemonFanClub_Text_17DFB8, 4 + release + end + +SlateportCity_PokemonFanClub_EventScript_155A7F:: @ 8155A7F + msgbox SlateportCity_PokemonFanClub_Text_17E03B, 2 + end + +SlateportCity_PokemonFanClub_EventScript_155A88:: @ 8155A88 + msgbox SlateportCity_PokemonFanClub_Text_17E0ED, 2 + end + +SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 + lock + faceplayer + waitse + playmoncry SPECIES_SKITTY, 0 + msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 + waitmoncry + release + end + +SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 + lock + faceplayer + waitse + playmoncry SPECIES_ZIGZAGOON, 0 + msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 + waitmoncry + release + end + +SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 + lock + faceplayer + waitse + playmoncry SPECIES_AZUMARILL, 0 + msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 + waitmoncry + release + end diff --git a/data/maps/SlateportCity_PokemonFanClub/text.inc b/data/maps/SlateportCity_PokemonFanClub/text.inc new file mode 100644 index 000000000..eab516c2b --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/text.inc @@ -0,0 +1,131 @@ +SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 + .string "Er-hem! I am the CHAIRMAN of the\n" + .string "POKéMON FAN CLUB!\p" + .string "Being the CHAIRMAN, I am naturally\n" + .string "the most important!\p" + .string "No one could best me when it comes\n" + .string "to raising POKéMON. No one!\p" + .string "In any CONTEST, my victory is a\n" + .string "foregone conclusion!\p" + .string "But, that would deprive others of\n" + .string "their enjoyment.\p" + .string "So, I now while away my time\n" + .string "examining the POKéMON of others.\p" + .string "It is marvelous to witness how\n" + .string "others have raised POKéMON.\p" + .string "The contented faces of properly\n" + .string "raised POKéMON...\p" + .string "The kind and loving gazes of their\n" + .string "TRAINERS...\p" + .string "My heart is overwhelmed - there is\n" + .string "so much happiness.\p" + .string "Oh, my! Excuse me! I seem to have\n" + .string "nattered on far too long!\p" + .string "Please, do allow me to examine your\n" + .string "POKéMON and see how it’s grown.$" + +SlateportCity_PokemonFanClub_Text_17DA14:: @ 817DA14 + .string "How is your POKéMON growing?\n" + .string "Allow me to examine it.$" + +SlateportCity_PokemonFanClub_Text_17DA49:: @ 817DA49 + .string "Hm, hm...\n" + .string "I see...$" + +SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C + .string "Hmmm... It’s not bad, but it’s not\n" + .string "good, either...\p" + .string "You, the TRAINER, must put more\n" + .string "effort into raising this POKéMON!\p" + .string "For instance, may I suggest that\n" + .string "you give it more {POKEBLOCK}S?$" + +SlateportCity_PokemonFanClub_Text_17DB0B:: @ 817DB0B + .string "Oh, my...\p" + .string "Your POKéMON is growing quite well,\n" + .string "so you deserve a reward.\p" + .string "Unfortunately, you have no space for\n" + .string "this in your BAG.$" + +SlateportCity_PokemonFanClub_Text_17DB89:: @ 817DB89 + .string "Your {STR_VAR_1}, it is growing in\n" + .string "a most impressive manner!\l" + .string "It is one fine specimen!\p" + .string "But! If you were to give it this,\n" + .string "it would grow even better! Indeed!$" + +SlateportCity_PokemonFanClub_Text_17DC1B:: @ 817DC1B + .string "Let a POKéMON hold that RED SCARF.\p" + .string "Everyone will recognize the coolness\n" + .string "of that POKéMON!$" + +SlateportCity_PokemonFanClub_Text_17DC74:: @ 817DC74 + .string "Let a POKéMON hold that BLUE SCARF.\p" + .string "Its beauty will be accentuated much\n" + .string "more than now!$" + +SlateportCity_PokemonFanClub_Text_17DCCB:: @ 817DCCB + .string "Let a POKéMON hold that PINK SCARF.\p" + .string "It will draw out the cuteness of\n" + .string "the POKéMON some more!$" + +SlateportCity_PokemonFanClub_Text_17DD27:: @ 817DD27 + .string "Let a POKéMON hold that GREEN SCARF.\p" + .string "That will enhance the\n" + .string "smartness of POKéMON!$" + +SlateportCity_PokemonFanClub_Text_17DD78:: @ 817DD78 + .string "Let a POKéMON hold that YELLOW SCARF.\p" + .string "It will bolster your POKéMON’s\n" + .string "toughness so much more!$" + +SlateportCity_PokemonFanClub_Text_17DDD5:: @ 817DDD5 + .string "I’m sorry, but I’ve nothing else to\n" + .string "give you! None at all!\p" + .string "After all, you’re blessed with the gift\n" + .string "of raising POKéMON without resorting\l" + .string "to any items!$" + +SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B + .string "I love seeing POKéMON that love\n" + .string "their TRAINERS.\p" + .string "POKéMON are very sensitive to the\n" + .string "feelings of their TRAINERS.\p" + .string "If you treat your POKéMON with love\n" + .string "and care, they’ll love you back.\p" + .string "When your POKéMON grow to love you,\n" + .string "please come show me.$" + +SlateportCity_PokemonFanClub_Text_17DF57:: @ 817DF57 + .string "Your POKéMON really adores you.\p" + .string "For you, a most compassionate\n" + .string "TRAINER, a gift from the FAN CLUB!$" + +SlateportCity_PokemonFanClub_Text_17DFB8:: @ 817DFB8 + .string "POKéMON are very sensitive to the\n" + .string "feelings of their TRAINERS.\p" + .string "If you treat your POKéMON with love\n" + .string "and care, they’ll love you back.$" + +SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B + .string "If you keep letting a POKéMON faint\n" + .string "in battle, it’ll come to resent it.\p" + .string "Soon, it will become less trusting\n" + .string "of the TRAINER.\p" + .string "In other words, it certainly won’t\n" + .string "like you very much.$" + +SlateportCity_PokemonFanClub_Text_17E0ED:: @ 817E0ED + .string "Do POKéMON enjoy having items used\n" + .string "on them?\p" + .string "Mine acted really happy when I gave\n" + .string "it some PROTEIN.$" + +SlateportCity_PokemonFanClub_Text_17E14E:: @ 817E14E + .string "SKITTY: Fffnyaaaah...$" + +SlateportCity_PokemonFanClub_Text_17E164:: @ 817E164 + .string "ZIGZAGOON: Kyuuu...$" + +SlateportCity_PokemonFanClub_Text_17E178:: @ 817E178 + .string "AZUMARILL: Marimari?$" diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/maps/SlateportCity_SternsShipyard_1F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index cd5c7c25b..cd5c7c25b 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c3516151e..2d98ef5b8 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,9 +1,9 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 - .4byte SlateportCity_SternsShipyard_1F_MapAttributes + .4byte SlateportCity_SternsShipyard_1F_Layout .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 81 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/maps/SlateportCity_SternsShipyard_1F/map.bin deleted file mode 100644 index 036f5ce26..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin +++ /dev/null @@ -1,7 +0,0 @@ - ! -!012! #!$!"!!"2222 -)28292:2)22)2)2)2)2)2)2)2)2222222 2 2 2 2 2 2 2 2&2)2)2)2)2 2A2B22222?)2)2)2 'IJ222 2 -G$[\3456 )2)2)2''2 222
O)2cd;<=>2)2)2)2/7A2B222)2)2k2l2CDEF)2)2)2)2)2)2IJ22 22 )2)2)2)2K2LMN2)2)2)2)2)2)2 2222222)2)2)253)2UV)2)2)2)2)2)2)2A2B222222)2)2(2_2(2*2*253)2)2)2)2)2 2IJ2222 2)2(2_2(2(2(2_2)2)2)2 '2 22222 -' 2(2W(2(2(2W)2)2)2'''222222 -/' (2(2(2(2(2)2)2)2//7222222 -77/)2)2)2)2)2)2)2)2)2)2)2
\ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc new file mode 100644 index 000000000..dd31e8e26 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -0,0 +1,63 @@ +SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 + .byte 0 + +SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 + lockall + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_155388 + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0 + msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4 + closemessage + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + waitmovement 0 + setflag FLAG_DOCK_REJECTED_DEVON_GOODS + setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_155388:: @ 8155388 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_17C472, 4 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_15539C:: @ 815539C + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, 4 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4 + closemessage + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + waitmovement 0 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_1553CF:: @ 81553CF + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 + msgbox SlateportCity_SternsShipyard_1F_Text_17C360, 4 + releaseall + end + +SlateportCity_SternsShipyard_1F_EventScript_1553E3:: @ 81553E3 + msgbox SlateportCity_SternsShipyard_1F_Text_17C6BB, 2 + end + +SlateportCity_SternsShipyard_1F_EventScript_1553EC:: @ 81553EC + msgbox SlateportCity_SternsShipyard_1F_Text_17C764, 2 + end + +SlateportCity_SternsShipyard_1F_EventScript_1553F5:: @ 81553F5 + msgbox SlateportCity_SternsShipyard_1F_Text_17C53D, 2 + end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/text.inc b/data/maps/SlateportCity_SternsShipyard_1F/text.inc new file mode 100644 index 000000000..8a08a15ae --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/text.inc @@ -0,0 +1,79 @@ +SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B + .string "Umm... If this goes here, and that\n" + .string "goes over there...\p" + .string "Then where does this thing go?\n" + .string "And what about that doohickey?\p" + .string "Aaargh! I can’t make heads or tails\n" + .string "of this!$" + +SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC + .string "Hm?\n" + .string "Hi, I’m DOCK.\p" + .string "CAPT. STERN commissioned me to\n" + .string "design a ferry.\p" + .string "Oh! That there...\n" + .string "Are they DEVON GOODS?\p" + .string "But, hmm...\n" + .string "This won’t do...\p" + .string "CAPT. STERN went off somewhere.\n" + .string "He said he had some work to do.\p" + .string "Could I get you to go find CAPT.\n" + .string "STERN and deliver that to him?$" + +SlateportCity_SternsShipyard_1F_Text_17C2F2:: @ 817C2F2 + .string "DOCK: Where could CAPT. STERN have\n" + .string "gone off to?\p" + .string "Could you go find CAPT. STERN and\n" + .string "deliver that parcel to him?$" + +SlateportCity_SternsShipyard_1F_Text_17C360:: @ 817C360 + .string "DOCK: Shipbuilding is an art.\p" + .string "A lot of things can’t be figured out\n" + .string "just by calculating.\p" + .string "I really could use advice from a veteran\n" + .string "who knows the seas...$" + +SlateportCity_SternsShipyard_1F_Text_17C3F7:: @ 817C3F7 + .string "DOCK: Hi! MR. BRINEY’s joined us to\n" + .string "lend us his help.\p" + .string "Thanks to the veteran sailor, the\n" + .string "ferry is steadily coming together.$" + +SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 + .string "DOCK: The ferry is finally ready!\p" + .string "The new S.S. TIDAL is truly a marvel\n" + .string "of technology!\p" + .string "But, I get the feeling that we can\n" + .string "make something even better.\p" + .string "You know, there’s never an end to\n" + .string "technology’s march.$" + +SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D + .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" + .string "It’s been too long!\p" + .string "Aye, since I met you, this old seadog’s\n" + .string "been feeling frisky!\p" + .string "So I’ve decided to help DOCK make a\n" + .string "ferry.\p" + .string "Aye, after all, a ferry would be able\n" + .string "to carry a lot of people.\p" + .string "But, you know, that DOCK is really\n" + .string "something special.\p" + .string "With his knack for technology and\n" + .string "my experience, I’m sure that we can\l" + .string "build one great ship, aye!$" + +UnknownString_817C6A6: @ 817C6A6 + .string "PEEKO: Pii piihyoro!$" + +SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB + .string "The seasons, the weather, where the\n" + .string "moon sits in the sky...\p" + .string "These and other conditions make the\n" + .string "sea change its expression.\p" + .string "That’s right!\n" + .string "The sea is like a living thing!$" + +SlateportCity_SternsShipyard_1F_Text_17C764:: @ 817C764 + .string "I get seasick real easily.\n" + .string "So I get to help out here instead.$" diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/maps/SlateportCity_SternsShipyard_2F/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index aa5c02e40..aa5c02e40 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 242e061aa..e7f1b74b8 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,9 +1,9 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC - .4byte SlateportCity_SternsShipyard_2F_MapAttributes + .4byte SlateportCity_SternsShipyard_2F_Layout .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 - .2byte BGM_FINECITY + .2byte MUS_FINECITY .2byte 82 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/maps/SlateportCity_SternsShipyard_2F/map.bin deleted file mode 100644 index d10ed2ac2..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin +++ /dev/null @@ -1 +0,0 @@ - !!!$#! !!$! !!22222222222222222222222222
22
22@2B2A2B22222 22 222HJIJ2222PQQQQQQR22 22 2222 2`cd;<=>2A2B2@2B2222 2`klCDEF2IJHJ2222`))KLMN2 222 2222 2`)5)UV)2A2B2@2B22222`(W2(**52IJHJ222`(W2(((W222 22 22222hiiiij222222222222%2%2222222222222222222222
\ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc new file mode 100644 index 000000000..df9227dd3 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -0,0 +1,10 @@ +SlateportCity_SternsShipyard_2F_MapScripts:: @ 81553FE + .byte 0 + +SlateportCity_SternsShipyard_2F_EventScript_1553FF:: @ 81553FF + msgbox SlateportCity_SternsShipyard_2F_Text_17C7A2, 2 + end + +SlateportCity_SternsShipyard_2F_EventScript_155408:: @ 8155408 + msgbox SlateportCity_SternsShipyard_2F_Text_17C80C, 2 + end diff --git a/data/maps/SlateportCity_SternsShipyard_2F/text.inc b/data/maps/SlateportCity_SternsShipyard_2F/text.inc new file mode 100644 index 000000000..0bf4e27e0 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/text.inc @@ -0,0 +1,18 @@ +SlateportCity_SternsShipyard_2F_Text_17C7A2:: @ 817C7A2 + .string "Designing a large ship is more like\n" + .string "making a big building than putting\l" + .string "together a transportation vehicle.$" + +SlateportCity_SternsShipyard_2F_Text_17C80C:: @ 817C80C + .string "Don’t you think it’s strange that a\n" + .string "ship made of heavy iron floats?\p" + .string "It floats because of a principle\n" + .string "called buoyancy.$" + +UnknownString_817C882: @ 817C882 + .string "The sea between SLATEPORT and\n" + .string "PACIFIDLOG has a fast-running tide.\p" + .string "Ordinary ships can’t make headway\n" + .string "through there.\p" + .string "You’d need substantial propulsion\n" + .string "to plow through those waters...$" diff --git a/data/maps/SootopolisCity/border.bin b/data/maps/SootopolisCity/border.bin deleted file mode 100644 index c07869a9f..000000000 --- a/data/maps/SootopolisCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc index cb793ea47..cb793ea47 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/SootopolisCity/events.inc diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index d5cbae0be..bd41a5c2b 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,9 +1,9 @@ SootopolisCity:: @ 830550C - .4byte SootopolisCity_MapAttributes + .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 8 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity/map.bin b/data/maps/SootopolisCity/map.bin deleted file mode 100644 index 4269e22a6..000000000 --- a/data/maps/SootopolisCity/map.bin +++ /dev/null @@ -1,12 +0,0 @@ -222922222922222229KLM929222222 -
222222222 - 2222 - 22%7'222222KLM2222 - - U22-?/22@AAAB
Z2222#$_222222 222222222222222222 22KLM22+ ,_22D2E222222222222222222222 2@AAAAAAAB2
@AAF2G\22222222222@AF22GAAAB22D222%6'2bD2c22222222222bD2E2c2222922->/22D2222222222222D2AAAAAB22222222222D2E2D2 - D2E2D2E222222222222222222222D2E226222222 222822D2E22222222222229222222222222222222@AF22GAAAAAAAAB2222222222T - B22222222bD2E2cQR[RS22TA - 222228222222;2222^#$222D2E2222222 !2"2^2#$22222222^+ ,222D2E222222()2)2)2*222^2+ ,2222 - - KLM^22222222222n22o0q0q0q022222^22222D2E2
2
^22222222222bD2E2cq06q06q022^2222D2E2%7'2%7']AAAB2222D2q0q0q0q0q0q06q06q0q0q0^222222222-?/2AAB-?/2D2E222D2q0q0q0q0q0q0q0q0q0q0q0q0q0q0]AB222222222222222222222q0q0q0q0q0q0q0q0q0q0q0q0q0q0D2E2KLM22222KLMD2E2222q0q0t||||||||||TB222
2222222KL22TYZB22D2E2ty}s^2222222222222
22^22222q0q0t}yyyyyyyy{y^2222 22222%6'22^ 222k6l6l6m6q0q0uyyyyyyyyyys^2222222
22222->/22^2222220123q0q0uyyyyyyyyyyyyys]AAB22222222AAAAB]AAAAB89:;q0q0uyyyyyyys{|}~2222 222222ABwq0q0uyyyyysTPQRS2222D22222222222222q0q0uyyyyys^XYZ[222222222222222222222222222q0q0uyyyyys^abvD2E222222KLM22222D2E2q0q0q0uy01110yys^22222222222I222TYZB2222q0q0q0q0q0q0uy000000100yys^22222222222222^2222q0q0q0q0q0q0t}y00000100yys]B22@AF22222 - 22^ 2222q0tD2E2yzy00000000yysD2E2N22
2222^2222222q0r0000yy00000000yy{yyyD2E2N22%7'2]B2222q0r0000yyyy04000pN22-?/2222222tyyz0yyyyyyyyyyyyyyy00000pV@AAAAAAB2qtyyz0000yyyyyyyyyyyyyyyyyyyy00000p2qqr0000000yyyyyyyyyyyyyyyyyyyy000xyyyyqqq2qqr0000000yyyyyyyyyyyyyyyyyyyyyy00000000x2qqr000000000yyyyyyyyyyyyyyyyyyyyyy000000000pq2qqr000000000yyyyyyyyyyyyyyyyyyyyyy000011pq2qqr00000001100yyyyyyyyyyyyyyyyyyyyyyyyy0000pqq2qr000000000yyyyyyyyyyyyyyyyyyyyyyyyy0000pqqiiij000yyyyyyyyyyyyyyyyyyyyyyyyypqqij0yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyypr0yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy`ii0i0i00iijyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyqqqqqryyyyyyyyyyyyyyyyyyyyyyyyiiiiiiqryyyyyyyyyyyyyyyyyyyyyyyyqqqqqqqryyyyyyyyyyyyyyyiiiiqqqqryyyyyyyyyyyqqqqqqqryyyyyyyyyqqqqqiiiiyyiiqqqqqqiiiiiiiiiiiiiiiiiqqqqqqqqqqqqqqqqqqqqqqqqq
\ No newline at end of file diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc new file mode 100644 index 000000000..e18eca17c --- /dev/null +++ b/data/maps/SootopolisCity/scripts.inc @@ -0,0 +1,458 @@ +SootopolisCity_MapScripts:: @ 814D07D + map_script 1, SootopolisCity_MapScript1_14D08D + map_script 3, SootopolisCity_MapScript1_14D10D + map_script 5, SootopolisCity_MapScript1_14D165 + .byte 0 + +SootopolisCity_MapScript1_14D08D:: @ 814D08D + call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1 + end + +SootopolisCity_EventScript_14D0A0:: @ 814D0A0 + setobjectxyperm 3, 31, 18 + setmetatile 31, 32, 592, 1 + return + +SootopolisCity_EventScript_14D0B1:: @ 814D0B1 + call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB + return + +SootopolisCity_EventScript_14D0BB:: @ 814D0BB + setmetatile 9, 6, 584, 1 + setmetatile 9, 17, 584, 1 + setmetatile 9, 26, 584, 1 + setmetatile 44, 17, 584, 1 + setmetatile 8, 35, 584, 1 + setmetatile 53, 28, 584, 1 + setmetatile 45, 6, 584, 1 + setmetatile 48, 25, 584, 1 + setmetatile 31, 32, 592, 1 + return + +SootopolisCity_MapScript1_14D10D:: @ 814D10D + setflag FLAG_VISITED_SOOTOPOLIS_CITY + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159 + call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123 + end + +SootopolisCity_EventScript_14D123:: @ 814D123 + call SootopolisCity_EventScript_1A02C1 + setobjectxyperm 1, 29, 19 + setobjectxyperm 2, 33, 19 + compare VAR_SOOTOPOLIS_STATE, 1 + call_if_eq SootopolisCity_EventScript_14D142 + return + +SootopolisCity_EventScript_14D142:: @ 814D142 + setobjectxyperm 10, 29, 6 + setobjectmovementtype 10, 10 + setobjectxyperm 5, 30, 6 + setobjectmovementtype 5, 9 + return + +SootopolisCity_EventScript_14D159:: @ 814D159 + setobjectxyperm 10, 31, 33 + setobjectmovementtype 10, 8 + return + +SootopolisCity_MapScript1_14D165:: @ 814D165 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 + end + +SootopolisCity_EventScript_14D16E:: @ 814D16E + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183 + msgbox SootopolisCity_Text_1696A4, 4 + release + end + +SootopolisCity_EventScript_14D183:: @ 814D183 + msgbox SootopolisCity_Text_16A455, 4 + release + end + +SootopolisCity_EventScript_14D18D:: @ 814D18D + msgbox SootopolisCity_Text_16A2B2, 2 + end + +SootopolisCity_EventScript_14D196:: @ 814D196 + msgbox SootopolisCity_Text_16A2FB, 2 + end + +SootopolisCity_EventScript_14D19F:: @ 814D19F + lock + faceplayer + dodailyevents + special GetPlayerBigGuyGirlString + goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 + msgbox SootopolisCity_Text_1C63F2, 4 + random 10 + addvar RESULT, 20 + addvar RESULT, ITEM_CHERI_BERRY + giveitem_std RESULT + compare RESULT, 0 + goto_if_eq SootopolisCity_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS + msgbox SootopolisCity_Text_1C64D0, 4 + random 2 + compare RESULT, 0 + goto_if_eq SootopolisCity_EventScript_14D1FF + compare RESULT, 1 + goto_if_eq SootopolisCity_EventScript_14D220 + end + +SootopolisCity_EventScript_14D1FF:: @ 814D1FF + giveitem_std ITEM_FIGY_BERRY + compare RESULT, 0 + goto_if_eq SootopolisCity_EventScript_1A029B + msgbox SootopolisCity_Text_1C650B, 4 + release + end + +SootopolisCity_EventScript_14D220:: @ 814D220 + giveitem_std ITEM_IAPAPA_BERRY + compare RESULT, 0 + goto_if_eq SootopolisCity_EventScript_1A029B + msgbox SootopolisCity_Text_1C650B, 4 + release + end + +SootopolisCity_EventScript_14D241:: @ 814D241 + msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq SootopolisCity_EventScript_14D25E + msgbox SootopolisCity_Text_1C6626, 4 + release + end + +SootopolisCity_EventScript_14D25E:: @ 814D25E + msgbox SootopolisCity_Text_1C65D4, 4 + release + end + +SootopolisCity_EventScript_14D268:: @ 814D268 + lock + faceplayer + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D + msgbox SootopolisCity_Text_16A4D6, 4 + release + end + +SootopolisCity_EventScript_14D27D:: @ 814D27D + msgbox SootopolisCity_Text_16A531, 4 + release + end + +SootopolisCity_EventScript_14D287:: @ 814D287 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C + msgbox SootopolisCity_Text_169813, 4 + release + end + +SootopolisCity_EventScript_14D29C:: @ 814D29C + msgbox SootopolisCity_Text_16A587, 4 + release + end + +SootopolisCity_EventScript_14D2A6:: @ 814D2A6 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB + msgbox SootopolisCity_Text_1698A0, 4 + release + end + +SootopolisCity_EventScript_14D2BB:: @ 814D2BB + msgbox SootopolisCity_Text_16A614, 4 + release + end + +SootopolisCity_EventScript_14D2C5:: @ 814D2C5 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA + msgbox SootopolisCity_Text_1697A7, 4 + release + end + +SootopolisCity_EventScript_14D2DA:: @ 814D2DA + msgbox SootopolisCity_Text_16A6AE, 4 + release + end + +SootopolisCity_EventScript_14D2E4:: @ 814D2E4 + msgbox SootopolisCity_Text_16972B, 2 + end + +SootopolisCity_EventScript_14D2ED:: @ 814D2ED + msgbox SootopolisCity_Text_16A6C7, 3 + end + +SootopolisCity_EventScript_14D2F6:: @ 814D2F6 + msgbox SootopolisCity_Text_16A711, 3 + end + +ClosedSootopolisDoorScript:: @ 814D2FF + msgbox ClosedSootopolisDoorText, 3 + end + +SootopolisCity_EventScript_14D308:: @ 814D308 + lockall + applymovement 10, SootopolisCity_Movement_1A083F + applymovement 255, SootopolisCity_Movement_1A0843 + waitmovement 0 + playse SE_PIN + applymovement 10, SootopolisCity_Movement_1A0833 + waitmovement 0 + applymovement 10, SootopolisCity_Movement_1A0835 + waitmovement 0 + applymovement 10, SootopolisCity_Movement_14D413 + waitmovement 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169988, 4 + .else + msgbox SootopolisCity_Text_169E0F, 4 + .endif + closemessage + applymovement 10, SootopolisCity_Movement_14D417 + applymovement 255, SootopolisCity_Movement_14D440 + waitmovement 10 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_1699FD, 4 + .else + msgbox SootopolisCity_Text_169E82, 4 + .endif + playse SE_PIN + applymovement 5, SootopolisCity_Movement_1A0833 + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A0835 + waitmovement 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169AB7, 4 + .else + msgbox SootopolisCity_Text_169F3C, 4 + .endif + closemessage + delay 30 + applymovement 5, SootopolisCity_Movement_14D46A + applymovement 10, SootopolisCity_Movement_14D41D + applymovement 255, SootopolisCity_Movement_14D445 + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A0843 + applymovement 255, SootopolisCity_Movement_1A0843 + waitmovement 0 + delay 30 + applymovement 10, SootopolisCity_Movement_1A0845 + waitmovement 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169AE7, 4 + .else + msgbox SootopolisCity_Text_169F6B, 4 + .endif + closemessage + delay 30 + applymovement 5, SootopolisCity_Movement_14D47C + applymovement 255, SootopolisCity_Movement_14D457 + applymovement 10, SootopolisCity_Movement_14D42D + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A083F + waitmovement 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169BC7, 4 + .else + msgbox SootopolisCity_Text_16A06C, 4 + .endif + applymovement 255, SootopolisCity_Movement_1A083F + waitmovement 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169C99, 4 + .else + msgbox SootopolisCity_Text_16A13E, 4 + .endif + moveobjectoffscreen 5 + setobjectmovementtype 5, 9 + moveobjectoffscreen 10 + setobjectmovementtype 10, 10 + setvar VAR_SOOTOPOLIS_STATE, 2 + releaseall + end + +SootopolisCity_Movement_14D413:: @ 814D413 + walk_left + walk_left + walk_left + end_movement + +SootopolisCity_Movement_14D417:: @ 814D417 + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_down + end_movement + +SootopolisCity_Movement_14D41D:: @ 814D41D + walk_down + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + end_movement + +SootopolisCity_Movement_14D42D:: @ 814D42D + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement + +SootopolisCity_Movement_14D440:: @ 814D440 + walk_right + walk_right + walk_right + walk_right + end_movement + +SootopolisCity_Movement_14D445:: @ 814D445 + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +SootopolisCity_Movement_14D457:: @ 814D457 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +SootopolisCity_Movement_14D46A:: @ 814D46A + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement + +SootopolisCity_Movement_14D47C:: @ 814D47C + delay_16 + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement + +SootopolisCity_EventScript_14D48F:: @ 814D48F + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169D37, 2 + .else + msgbox SootopolisCity_Text_16A1DB, 2 + .endif + end + +SootopolisCity_EventScript_14D498:: @ 814D498 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169DA6, 4 + .else + msgbox SootopolisCity_Text_16A249, 4 + .endif + release + end + +SootopolisCity_EventScript_14D4AD:: @ 814D4AD + msgbox SootopolisCity_Text_16A33E, 4 + closemessage + applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 + waitmovement 0 + delay 50 + setfieldeffectargument 0, 1 + dofieldeffect FLDEFF_NPCFLY_OUT + delay 15 + removeobject LAST_TALKED + waitfieldeffect FLDEFF_NPCFLY_OUT + release + end diff --git a/data/maps/SootopolisCity/text.inc b/data/maps/SootopolisCity/text.inc new file mode 100644 index 000000000..cfe3fd2e2 --- /dev/null +++ b/data/maps/SootopolisCity/text.inc @@ -0,0 +1,215 @@ +ClosedSootopolisDoorText: @ 8169690 + .string "The door is closed.$" + +SootopolisCity_Text_1696A4:: @ 81696A4 + .string "Who might you be?\p" + .string "This is the CAVE OF ORIGIN.\p" + .string "The spirits of POKéMON, becalmed at\n" + .string "MT. PYRE, are said to be revived here.\p" + .string "Please leave.$" + +SootopolisCity_Text_16972B:: @ 816972B + .string "Diving in the sea. Climbing up and\n" + .string "down stairs all the time...\p" + .string "If you live in this town, you end up\n" + .string "getting physically fit.$" + +SootopolisCity_Text_1697A7:: @ 81697A7 + .string "I... I’ve never been out of this city.\p" + .string "I wonder what the world is like on the\n" + .string "other side of this round sky?$" + +SootopolisCity_Text_169813:: @ 8169813 + .string "Hm!\n" + .string "You’ve come all the way to SOOTOPOLIS?\l" + .string "You’re no ordinary tourist.\p" + .string "But I suppose that doesn’t make you an\n" + .string "extraordinary tourist, either.$" + +SootopolisCity_Text_1698A0:: @ 81698A0 + .string "SOOTOPOLIS sprang up as a town in the\n" + .string "crater of a volcano.\p" + .string "If you look up at the sky, the lip of\n" + .string "the crater is also visible.\l" + .string "So, all you see is the sky in a circle.\p" + .string "But that’s what makes the sky above\n" + .string "SOOTOPOLIS the most beautiful.$" + +SootopolisCity_Text_169988:: @ 8169988 + .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" + .string "In this terrible rainstorm, yet...\p" + .string "Oh, yes, can you hear out what my\n" + .string "friend has to say?$" + +SootopolisCity_Text_1699FD:: @ 81699FD + .string "My name is WALLACE.\n" + .string "I’m this town’s GYM LEADER.\p" + .string "I’ve also been entrusted with the\n" + .string "protection of the CAVE OF ORIGIN.\p" + .string "This downpour is caused by a power\n" + .string "emanating from the CAVE OF ORIGIN.$" + +SootopolisCity_Text_169AB7:: @ 8169AB7 + .string "That... That is the BLUE ORB.\p" + .string "I see.\n" + .string "Follow me.$" + +SootopolisCity_Text_169AE7:: @ 8169AE7 + .string "STEVEN: This rain...\p" + .string "People and POKéMON need water to live...\p" + .string "But why does this rain fill us with\n" + .string "so much dread?\p" + .string "The rain clouds over SOOTOPOLIS will\n" + .string "keep building and soon extend all\l" + .string "over HOENN...\p" + .string "If that were to happen...$" + +SootopolisCity_Text_169BC7:: @ 8169BC7 + .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" + .string "No one from SOOTOPOLIS is permitted\n" + .string "to enter the CAVE OF ORIGIN.\p" + .string "But you must go.\n" + .string "Together with your BLUE ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" + +SootopolisCity_Text_169C99:: @ 8169C99 + .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" + .string "to be holding the BLUE ORB.\p" + .string "You’ll be okay. With your POKéMON,\n" + .string "you’ll get things done no matter what.\p" + .string "I’m convinced of it!$" + +SootopolisCity_Text_169D37:: @ 8169D37 + .string "WALLACE: You must go together with\n" + .string "your BLUE ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" + +SootopolisCity_Text_169DA6:: @ 8169DA6 + .string "STEVEN: You’ll be okay. With your\n" + .string "POKéMON, you’ll get things done\l" + .string "whatever happens.\p" + .string "I’m convinced of it!$" + +SootopolisCity_Text_169E0F:: @ 8169E0F + .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" + .string "Under this scorching sun, yet...\p" + .string "Oh, yes, can you hear out what my\n" + .string "friend has to say?$" + +SootopolisCity_Text_169E82:: @ 8169E82 + .string "My name is WALLACE.\n" + .string "I’m this town’s GYM LEADER.\p" + .string "I’ve also been entrusted with the\n" + .string "protection of the CAVE OF ORIGIN.\p" + .string "This sunshine is caused by a power\n" + .string "emanating from the CAVE OF ORIGIN.$" + +SootopolisCity_Text_169F3C:: @ 8169F3C + .string "That... That is the RED ORB.\p" + .string "I see.\n" + .string "Follow me.$" + +SootopolisCity_Text_169F6B:: @ 8169F6B + .string "STEVEN: This sunlight...\p" + .string "People and POKéMON need sunlight\n" + .string "to live...\p" + .string "But why does this sunlight fill us\n" + .string "with so much dread?\p" + .string "The blazing sun over SOOTOPOLIS is\n" + .string "intensifying... Soon, all of HOENN\l" + .string "will be under its withering glare...\p" + .string "If that were to happen...$" + +SootopolisCity_Text_16A06C:: @ 816A06C + .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" + .string "No one from SOOTOPOLIS is permitted\n" + .string "to enter the CAVE OF ORIGIN.\p" + .string "But you must go. \n" + .string "Together with your RED ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" + +SootopolisCity_Text_16A13E:: @ 816A13E + .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" + .string "to be holding the RED ORB.\p" + .string "You’ll be okay. With your POKéMON,\n" + .string "you’ll get things done no matter what.\p" + .string "I’m convinced of it!$" + +SootopolisCity_Text_16A1DB:: @ 816A1DB + .string "WALLACE: You must go together with\n" + .string "your RED ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" + +SootopolisCity_Text_16A249:: @ 816A249 + .string "STEVEN: You’ll be okay. With your\n" + .string "POKéMON, you’ll get things done\l" + .string "whatever happens.\p" + .string "I’m convinced of it!$" + +SootopolisCity_Text_16A2B2:: @ 816A2B2 + .string "The legend told by the old man on\n" + .string "MT. PYRE... It wasn’t a made-up story.$" + +SootopolisCity_Text_16A2FB:: @ 816A2FB + .string "The natural balance of HOENN is going\n" + .string "through a wrenching shift...$" + +SootopolisCity_Text_16A33E:: @ 816A33E + .string "STEVEN: {PLAYER}{KUN}, we owe it all to you.\p" + .string "The sky above SOOTOPOLIS has returned\n" + .string "to normal. For that, WALLACE sends his\l" + .string "thanks, too.\p" + .string "And, that same WALLACE is waiting for\n" + .string "you inside.\p" + .string "He’s strong.\n" + .string "But the way you are now, you should be\l" + .string "on equal footing with him.\p" + .string "Give it your best shot.$" + +SootopolisCity_Text_16A455:: @ 816A455 + .string "All life starts at the CAVE OF ORIGIN,\n" + .string "and it all ends on MT. PYRE...\p" + .string "Where do people and POKéMON come\n" + .string "from? Where are we bound?$" + +SootopolisCity_Text_16A4D6:: @ 816A4D6 + .string "Let me guess, you’re going to challenge\n" + .string "WALLACE?\p" + .string "Oh, you are really?\n" + .string "You’re awfully brave!$" + +SootopolisCity_Text_16A531:: @ 816A531 + .string "Let me guess, you’ve beaten WALLACE!\n" + .string "Oh, you did, really?\p" + .string "Maybe I’ll become your fan!$" + +SootopolisCity_Text_16A587:: @ 816A587 + .string "Hm!\n" + .string "You’ve come all the way to SOOTOPOLIS?\l" + .string "You’re no ordinary tourist.\p" + .string "But I suppose that doesn’t make you an\n" + .string "extraordinary tourist, either.$" + +SootopolisCity_Text_16A614:: @ 816A614 + .string "A circle of a night sky framed by the\n" + .string "crater of a volcano...\p" + .string "And in that ring, stars flicker and\n" + .string "blink as if they were alive...\l" + .string "It’s my favorite scenery.$" + +SootopolisCity_Text_16A6AE:: @ 816A6AE + .string "Hunh? Where is my house?$" + +SootopolisCity_Text_16A6C7:: @ 816A6C7 + .string "SOOTOPOLIS CITY POKéMON GYM\n" + .string "LEADER: WALLACE\p" + .string "“Artist, and lover of WATER.”$" + +SootopolisCity_Text_16A711:: @ 816A711 + .string "SOOTOPOLIS CITY\p" + .string "“The mystical city where history\n" + .string "slumbers.”$" diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/maps/SootopolisCity_Gym_1F/border.bin deleted file mode 100644 index 12819766e..000000000 --- a/data/maps/SootopolisCity_Gym_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 43cd0fe75..43cd0fe75 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 185bdc970..0583679dc 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,9 +1,9 @@ SootopolisCity_Gym_1F:: @ 830692C - .4byte SootopolisCity_Gym_1F_MapAttributes + .4byte SootopolisCity_Gym_1F_Layout .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 110 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/maps/SootopolisCity_Gym_1F/map.bin deleted file mode 100644 index a4a20d477..000000000 --- a/data/maps/SootopolisCity_Gym_1F/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -<JJ - !JJJ! - JJ9DER)RRR)R@AJLMF21*2+2,21G2HIJRRU?2>2>2>2223242>2>2>2>2PRRXYZJJJ:2;JJJJ`b DERRRRB2CRRRR@ADM22222
222222HADM
2
2
2
2
2
2
2
2
2HADM
2
2
2
2
2
2
2
2
2
2
2HANLM
2
2
2
2
2
2
2
2
2HIJVRU<JJJ:2;JJJ9PRR DERRB2CRR@A DM222
2222HADM
2
2
2
2
2
2HANJJLM
2
2
2
2
2
2HIJJJVRRRU<J:2;J9PRRRR DEB2C@A DM2
2HANJJJJLM
2
2
2HIJJJJJVRRRRRU
2
2PRRRRRR XYY[:2;`aab DERRB2CRR@ADMF2G2G2G2G2G2 2HADM?22>2>2>22>2HADM?2 >2>2>2 >2HADM?2G2>2G2>2HA
\ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc new file mode 100644 index 000000000..a404013e0 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -0,0 +1,155 @@ +SootopolisCity_Gym_1F_MapScripts:: @ 815AF07 + map_script 2, SootopolisCity_Gym_1F_MapScript2_15AF86 + map_script 5, SootopolisCity_Gym_1F_MapScript1_15AF22 + map_script 1, SootopolisCity_Gym_1F_MapScript1_15AF25 + map_script 3, SootopolisCity_Gym_1F_MapScript1_15AF1C + .byte 0 + +SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C + setvar VAR_ICE_STEP_COUNT, 1 + end + +SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 + setstepcallback 4 + end + +SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 + call SootopolisCity_Gym_1F_EventScript_15AF2E + special SetSootopolisGymCrackedIceMetatiles + end + +SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E + compare VAR_ICE_STEP_COUNT, 8 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85 + compare VAR_ICE_STEP_COUNT, 28 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73 + compare VAR_ICE_STEP_COUNT, 69 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61 + setmetatile 8, 4, 519, 0 + setmetatile 8, 5, 519, 0 + +SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 + setmetatile 8, 10, 519, 0 + setmetatile 8, 11, 519, 0 + +SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 + setmetatile 8, 15, 519, 0 + setmetatile 8, 16, 519, 0 + +SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 + return + +SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC + map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 + .2byte 0 + +SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 + addvar VAR_ICE_STEP_COUNT, 1 + delay 40 + playse SE_RU_GASHIN + call SootopolisCity_Gym_1F_EventScript_15AF2E + special DrawWholeMapView + end + +SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC + addvar VAR_ICE_STEP_COUNT, 1 + delay 40 + playse SE_RU_GASHIN + call SootopolisCity_Gym_1F_EventScript_15AF2E + special DrawWholeMapView + end + +SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 + addvar VAR_ICE_STEP_COUNT, 1 + delay 40 + playse SE_RU_GASHIN + call SootopolisCity_Gym_1F_EventScript_15AF2E + special DrawWholeMapView + end + +SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 + lockall + delay 20 + applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD + waitmovement 0 + playse SE_RU_HYUU + delay 60 + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F + waitstate + end + +SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD + set_invisible + end_movement + +SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF + trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A + msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D + message SootopolisCity_Gym_1F_Text_18F342 + waitmessage + call SootopolisCity_Gym_1F_EventScript_1A02C5 + msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 + setflag FLAG_DEFEATED_SOOTOPOLIS_GYM + setflag FLAG_BADGE08_GET + setvar VAR_SPECIAL_8, 8 + call SootopolisCity_Gym_1F_EventScript_1A01C0 + goto SootopolisCity_Gym_1F_EventScript_15B056 + end + +SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 + giveitem_std ITEM_TM03_WATER_PULSE + compare RESULT, 0 + goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B + msgbox SootopolisCity_Gym_1F_Text_18F466, 4 + setflag FLAG_RECEIVED_TM03 + release + end + +SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A + msgbox SootopolisCity_Gym_1F_Text_18F5B4, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 + lock + faceplayer + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099 + msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 + msgbox SootopolisCity_Gym_1F_Text_18E9C9, 4 + release + end + +SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 + lockall + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 + goto SootopolisCity_Gym_1F_EventScript_15B0CD + end + +SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 + lockall + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 + goto SootopolisCity_Gym_1F_EventScript_15B0CD + end + +SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3 + msgbox SootopolisCity_Gym_1F_Text_18F665, 4 + releaseall + end + +SootopolisCity_Gym_1F_EventScript_15B0CD:: @ 815B0CD + msgbox SootopolisCity_Gym_1F_Text_18F649, 4 + releaseall + end diff --git a/data/maps/SootopolisCity_Gym_1F/text.inc b/data/maps/SootopolisCity_Gym_1F/text.inc new file mode 100644 index 000000000..1047a5326 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/text.inc @@ -0,0 +1,192 @@ +SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 + .string "Yo! How’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "SOOTOPOLIS’s GYM LEADER WALLACE is\n" + .string "a master of WATER-type POKéMON.\p" + .string "And, to get to WALLACE, an icy floor\n" + .string "will hamper your progress...\p" + .string "Listen, I’m sorry, but that’s all the\n" + .string "advice that I have for you.\p" + .string "The rest of the way, you have to\n" + .string "go for it yourself!$" + +SootopolisCity_Gym_1F_Text_18E9C9:: @ 818E9C9 + .string "Yow! You’ve beaten even WALLACE, who\n" + .string "was supposedly the best in all HOENN!\p" + .string "Okay! Check out your TRAINER’s CARD.\p" + .string "If you’ve gotten all the BADGES, you’re\n" + .string "set for the POKéMON LEAGUE challenge!$" + +SootopolisCity_Gym_B1F_Text_18EA87:: @ 818EA87 + .string "I’ll show you the sublime techniques\n" + .string "I learned from our LEADER WALLACE!$" + +SootopolisCity_Gym_B1F_Text_18EACF:: @ 818EACF + .string "Please forgive me, WALLACE...$" + +SootopolisCity_Gym_B1F_Text_18EAED:: @ 818EAED + .string "Watch what happens if you crack all\n" + .string "the floor tiles.$" + +SootopolisCity_Gym_B1F_Text_18EB22:: @ 818EB22 + .string "You came all the way here, but you won’t\n" + .string "get to see WALLACE.\p" + .string "Not if you lose to me, you won’t!$" + +SootopolisCity_Gym_B1F_Text_18EB81:: @ 818EB81 + .string "You’re strong!\n" + .string "I was fooled by your cute looks!$" + +SootopolisCity_Gym_B1F_Text_18EBB1:: @ 818EBB1 + .string "You might be good enough to avoid\n" + .string "being wiped out in one hit by WALLACE.$" + +SootopolisCity_Gym_B1F_Text_18EBFA:: @ 818EBFA + .string "The sight of WALLACE conducting a\n" + .string "battle...\p" + .string "The very beauty of it compelled me to\n" + .string "become a TRAINER.$" + +SootopolisCity_Gym_B1F_Text_18EC5E:: @ 818EC5E + .string "You battled with more beauty than\n" + .string "I could muster...$" + +SootopolisCity_Gym_B1F_Text_18EC92:: @ 818EC92 + .string "The grace you bring to battle is\n" + .string "fabulous.\p" + .string "Oh... I’m so fortunate to have found\n" + .string "POKéMON.$" + +SootopolisCity_Gym_B1F_Text_18ECEB:: @ 818ECEB + .string "I should teach you how harsh battles\n" + .string "can be.$" + +SootopolisCity_Gym_B1F_Text_18ED18:: @ 818ED18 + .string "Oh.\n" + .string "You’re strong.$" + +SootopolisCity_Gym_B1F_Text_18ED2B:: @ 818ED2B + .string "I’ll tell you something good.\p" + .string "If you want to reach WALLACE, you\n" + .string "need to walk on each floor tile once.$" + +SootopolisCity_Gym_B1F_Text_18ED91:: @ 818ED91 + .string "The POKéMON GYM of the highest level\n" + .string "in the HOENN region...\p" + .string "That’s the SOOTOPOLIS GYM.$" + +SootopolisCity_Gym_B1F_Text_18EDE8:: @ 818EDE8 + .string "What a high level you are!$" + +SootopolisCity_Gym_B1F_Text_18EE03:: @ 818EE03 + .string "Rather than being satisfied by being\n" + .string "in a strong GYM, I imagine training in\l" + .string "other places will make you stronger.\l" + .string "But above all, it looks more fun.$" + +SootopolisCity_Gym_B1F_Text_18EE96:: @ 818EE96 + .string "I train my POKéMON together with\n" + .string "WALLACE.\p" + .string "Don’t think I’m a pushover.$" + +SootopolisCity_Gym_B1F_Text_18EEDC:: @ 818EEDC + .string "I was bowled right over...$" + +SootopolisCity_Gym_B1F_Text_18EEF7:: @ 818EEF7 + .string "I think you have potential.\n" + .string "Why don’t you stay and train with us?$" + +SootopolisCity_Gym_B1F_Text_18EF39:: @ 818EF39 + .string "A graceful glide across the ice while\n" + .string "crossing no lines...\p" + .string "A TRAINER putting on that performance\n" + .string "would be elegantly beautiful!$" + +SootopolisCity_Gym_B1F_Text_18EFB8:: @ 818EFB8 + .string "Well, excuse me?!$" + +SootopolisCity_Gym_B1F_Text_18EFCA:: @ 818EFCA + .string "This is really obvious, but how strong\n" + .string "you are as a TRAINER has nothing to do\l" + .string "with how young or old you are.$" + +SootopolisCity_Gym_B1F_Text_18F037:: @ 818F037 + .string "When I’m with my POKéMON, the time\n" + .string "flies by before you can say, “Oops!”$" + +SootopolisCity_Gym_B1F_Text_18F07F:: @ 818F07F + .string "Oops!$" + +SootopolisCity_Gym_B1F_Text_18F085:: @ 818F085 + .string "I wish I can forget about lost causes\n" + .string "before I can manage an “Oops!”$" + +SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA + .string "Allow me to formally introduce\n" + .string "myself.\p" + .string "I am WALLACE.\n" + .string "The GYM LEADER of SOOTOPOLIS.\p" + .string "There’s something about you...\n" + .string "A difference in your demeanor.\p" + .string "I think I sense that in you.\p" + .string "What happened inside the CAVE OF\n" + .string "ORIGIN, and what you did, I will likely\l" + .string "learn through our upcoming battle.\p" + .string "Now, show me. Show me the power you\n" + .string "wield with your POKéMON.\p" + .string "And I, in turn, shall present you with\n" + .string "a performance of illusions in water\l" + .string "by me and my POKéMON!$" + +SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 + .string "Bravo.\p" + .string "I realize now your authenticity and\n" + .string "magnificence as a POKéMON TRAINER.\p" + .string "I find much joy in having met you and\n" + .string "your POKéMON.\p" + .string "You have proven yourself worthy of\n" + .string "the RAIN BADGE. Accept it.$" + +SootopolisCity_Gym_1F_Text_18F342:: @ 818F342 + .string "{PLAYER} received the RAIN BADGE\n" + .string "from WALLACE.$" + +SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B + .string "Having that BADGE assures you the\n" + .string "full obedience of all your POKéMON to\l" + .string "every command you make.\p" + .string "The BADGE also allows the use of the\n" + .string "HM move WATERFALL to scale walls\l" + .string "of cascading water.\p" + .string "And, so that you never forget the\n" + .string "battle we shared, take this...$" + +SootopolisCity_Gym_1F_Text_18F466:: @ 818F466 + .string "The TM I handed you contains\n" + .string "WATER PULSE.\p" + .string "In use, it will occasionally confuse\n" + .string "the target with ultrasonic waves.$" + +SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 + .string "TRAINERS who have gathered all the\n" + .string "GYM BADGES of HOENN should make way\l" + .string "for the ultimate destination.\p" + .string "The POKéMON LEAGUE.\p" + .string "Travel to the easternmost reaches\n" + .string "of HOENN, to the island EVER GRANDE.\l" + .string "The POKéMON LEAGUE is there.$" + +SootopolisCity_Gym_1F_Text_18F5B4:: @ 818F5B4 + .string "There remains but one BADGE to\n" + .string "obtain in HOENN.\p" + .string "If you wish to challenge the POKéMON\n" + .string "LEAGUE, you must obtain the last\l" + .string "BADGE from the GYM in FORTREE.$" + +SootopolisCity_Gym_1F_Text_18F649:: @ 818F649 + .string "SOOTOPOLIS CITY POKéMON GYM$" + +SootopolisCity_Gym_1F_Text_18F665:: @ 818F665 + .string "SOOTOPOLIS CITY POKéMON GYM\p" + .string "WALLACE’S CERTIFIED TRAINERS:\n" + .string "{PLAYER}$" diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/maps/SootopolisCity_Gym_B1F/border.bin deleted file mode 100644 index 12819766e..000000000 --- a/data/maps/SootopolisCity_Gym_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 9ccf07ef6..9ccf07ef6 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 104ee8215..ea131c587 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,9 +1,9 @@ SootopolisCity_Gym_B1F:: @ 8306948 - .4byte SootopolisCity_Gym_B1F_MapAttributes + .4byte SootopolisCity_Gym_B1F_Layout .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 - .2byte BGM_GIM + .2byte MUS_GIM .2byte 111 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/maps/SootopolisCity_Gym_B1F/map.bin deleted file mode 100644 index eb73a4d2f..000000000 --- a/data/maps/SootopolisCity_Gym_B1F/map.bin +++ /dev/null @@ -1 +0,0 @@ -%&&&&&&&&&&&&&'-% '/--22222222222//--22222222222//--22222222222//&5-22222222222/7&&&5 2 7&&...-% 2 '/...--2222222//--2222222//&&&5-2222222/7&&&&&&&5 2 7&&&&.....-% 2 '/.....--222//&&&&&5-222/7&&&&&&&&&&&52227&&&&&&...%&&&2&&&'...-% 2 '/--2222222//--2222222//--2222222//--2222222//
\ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc new file mode 100644 index 000000000..e54970701 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -0,0 +1,42 @@ +SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 + .byte 0 + +SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 + trainerbattle 0, OPPONENT_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF + trainerbattle 0, OPPONENT_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 + trainerbattle 0, OPPONENT_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D + trainerbattle 0, OPPONENT_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 + trainerbattle 0, OPPONENT_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B + trainerbattle 0, OPPONENT_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 + trainerbattle 0, OPPONENT_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6 + end + +SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 + trainerbattle 0, OPPONENT_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 + end diff --git a/data/maps/SootopolisCity_Gym_B1F/text.inc b/data/maps/SootopolisCity_Gym_B1F/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/maps/SootopolisCity_House1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SootopolisCity_House1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc index a4b4c7932..a4b4c7932 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/SootopolisCity_House1/events.inc diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 5ff1eb351..924b6a382 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House1:: @ 83069B8 - .4byte SootopolisCity_House1_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/maps/SootopolisCity_House1/map.bin deleted file mode 100644 index 43f11b194..000000000 --- a/data/maps/SootopolisCity_House1/map.bin +++ /dev/null @@ -1 +0,0 @@ -023333332332772333327723333333333333 333
\ No newline at end of file diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc new file mode 100644 index 000000000..d1b842f7b --- /dev/null +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -0,0 +1,28 @@ +SootopolisCity_House1_MapScripts:: @ 815B29A + .byte 0 + +SootopolisCity_House1_EventScript_15B29B:: @ 815B29B + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 + msgbox SootopolisCity_House1_Text_18F991, 4 + giveitem_std ITEM_TM31_BRICK_BREAK + setflag FLAG_RECEIVED_TM31 + msgbox SootopolisCity_House1_Text_18FA03, 4 + release + end + +SootopolisCity_House1_EventScript_15B2C7:: @ 815B2C7 + msgbox SootopolisCity_House1_Text_18FA03, 4 + release + end + +SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 + lock + faceplayer + waitse + playmoncry SPECIES_KECLEON, 0 + msgbox SootopolisCity_House1_Text_18FA50, 4 + waitmoncry + release + end diff --git a/data/maps/SootopolisCity_House1/text.inc b/data/maps/SootopolisCity_House1/text.inc new file mode 100644 index 000000000..78e8454e5 --- /dev/null +++ b/data/maps/SootopolisCity_House1/text.inc @@ -0,0 +1,12 @@ +SootopolisCity_House1_Text_18F991:: @ 818F991 + .string "For thirty years I’ve remained in\n" + .string "SOOTOPOLIS honing my skills.\p" + .string "I developed a shattering TM.\n" + .string "I bequeath it to you!$" + +SootopolisCity_House1_Text_18FA03:: @ 818FA03 + .string "TM31 contains BRICK BREAK! It’s a move\n" + .string "so horrible that I can’t describe it.$" + +SootopolisCity_House1_Text_18FA50:: @ 818FA50 + .string "KECLEON: Puu puhyaah.$" diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/maps/SootopolisCity_House2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SootopolisCity_House2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc index 146a1d871..146a1d871 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/SootopolisCity_House2/events.inc diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 1ff5a7df1..6360bcf03 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House2:: @ 83069D4 - .4byte SootopolisCity_House2_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 309 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/maps/SootopolisCity_House2/map.bin deleted file mode 100644 index 632e1e36a..000000000 --- a/data/maps/SootopolisCity_House2/map.bin +++ /dev/null @@ -1 +0,0 @@ -vw62223336333277233333772333333333333 333
\ No newline at end of file diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc new file mode 100644 index 000000000..d714993d4 --- /dev/null +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -0,0 +1,21 @@ +SootopolisCity_House2_MapScripts:: @ 815B2E4 + .byte 0 + +SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 + lock + faceplayer + msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO + compare RESULT, YES + call_if_eq SootopolisCity_House2_EventScript_15B307 + compare RESULT, NO + call_if_eq SootopolisCity_House2_EventScript_15B310 + release + end + +SootopolisCity_House2_EventScript_15B307:: @ 815B307 + msgbox SootopolisCity_House2_Text_18FAAE, 4 + return + +SootopolisCity_House2_EventScript_15B310:: @ 815B310 + msgbox SootopolisCity_House2_Text_18FB04, 4 + return diff --git a/data/maps/SootopolisCity_House2/text.inc b/data/maps/SootopolisCity_House2/text.inc new file mode 100644 index 000000000..e132b20f7 --- /dev/null +++ b/data/maps/SootopolisCity_House2/text.inc @@ -0,0 +1,13 @@ +SootopolisCity_House2_Text_18FA66:: @ 818FA66 + .string "MT. PYRE...\p" + .string "At its peak are two orbs placed side\n" + .string "by side. Did you know?$" + +SootopolisCity_House2_Text_18FAAE:: @ 818FAAE + .string "Yes, two orbs side by side...\p" + .string "The sight of them together...\n" + .string "It is somehow soothing...$" + +SootopolisCity_House2_Text_18FB04:: @ 818FB04 + .string "Is that so?\n" + .string "Perhaps you ought to visit and see...$" diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/maps/SootopolisCity_House3/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SootopolisCity_House3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc index d813189e8..d813189e8 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/SootopolisCity_House3/events.inc diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 3c6075fe7..f7d724e5f 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House3:: @ 83069F0 - .4byte SootopolisCity_House3_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 310 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/maps/SootopolisCity_House3/map.bin deleted file mode 100644 index 8bbd6c517..000000000 --- a/data/maps/SootopolisCity_House3/map.bin +++ /dev/null @@ -1 +0,0 @@ -62233322333333337723333377333333333 333
\ No newline at end of file diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc new file mode 100644 index 000000000..6ffa30d3d --- /dev/null +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -0,0 +1,21 @@ +SootopolisCity_House3_MapScripts:: @ 815B319 + .byte 0 + +SootopolisCity_House3_EventScript_15B31A:: @ 815B31A + lock + faceplayer + msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO + compare RESULT, YES + goto_if_eq SootopolisCity_House3_EventScript_15B339 + msgbox SootopolisCity_House3_Text_18FBC0, 4 + release + end + +SootopolisCity_House3_EventScript_15B339:: @ 815B339 + msgbox SootopolisCity_House3_Text_18FB9C, 4 + release + end + +SootopolisCity_House3_EventScript_15B343:: @ 815B343 + msgbox SootopolisCity_House3_Text_18FC1A, 2 + end diff --git a/data/maps/SootopolisCity_House3/text.inc b/data/maps/SootopolisCity_House3/text.inc new file mode 100644 index 000000000..b67e0a4dc --- /dev/null +++ b/data/maps/SootopolisCity_House3/text.inc @@ -0,0 +1,20 @@ +SootopolisCity_House3_Text_18FB36:: @ 818FB36 + .string "You’re a POKéMON TRAINER, aren’t you?\p" + .string "SOOTOPOLIS’s GYM LEADER WALLACE has\n" + .string "many fans.\l" + .string "Do you have any?$" + +SootopolisCity_House3_Text_18FB9C:: @ 818FB9C + .string "Oh, then you must be pretty strong.$" + +SootopolisCity_House3_Text_18FBC0:: @ 818FBC0 + .string "Oh, dear...\n" + .string "That’s a little lonesome.\p" + .string "Try working a little harder to get a\n" + .string "fan following.$" + +SootopolisCity_House3_Text_18FC1A:: @ 818FC1A + .string "Dedicated fans come over from even\n" + .string "KANTO and JOHTO.\p" + .string "It was really wild when I went to the\n" + .string "TRAINER FAN CLUB in LILYCOVE.$" diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc index 128d0ff99..128d0ff99 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/SootopolisCity_House4/events.inc diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f155d1980..d18dc2edc 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House4:: @ 8306A0C - .4byte SootopolisCity_House4_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc new file mode 100644 index 000000000..b552cc6d6 --- /dev/null +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -0,0 +1,20 @@ +SootopolisCity_House4_MapScripts:: @ 815B34C + .byte 0 + +SootopolisCity_House4_EventScript_15B34D:: @ 815B34D + msgbox SootopolisCity_House4_Text_18FC92, 2 + end + +SootopolisCity_House4_EventScript_15B356:: @ 815B356 + msgbox SootopolisCity_House4_Text_18FD41, 2 + end + +SootopolisCity_House4_EventScript_15B35F:: @ 815B35F + lock + faceplayer + waitse + playmoncry SPECIES_AZUMARILL, 0 + msgbox SootopolisCity_House4_Text_18FDD8, 4 + waitmoncry + release + end diff --git a/data/maps/SootopolisCity_House4/text.inc b/data/maps/SootopolisCity_House4/text.inc new file mode 100644 index 000000000..277e2e060 --- /dev/null +++ b/data/maps/SootopolisCity_House4/text.inc @@ -0,0 +1,17 @@ +SootopolisCity_House4_Text_18FC92:: @ 818FC92 + .string "Listen up, and I’ll tell you something\n" + .string "good.\p" + .string "There’s supposed to be an ancient\n" + .string "ruin in the sea around here.\p" + .string "There could be treasures just waiting\n" + .string "to be discovered down there.$" + +SootopolisCity_House4_Text_18FD41:: @ 818FD41 + .string "Ancient treasures...\p" + .string "It would be nice if they existed, but\n" + .string "even if they didn’t, it would be so\l" + .string "beautiful to take an underwater\l" + .string "stroll with my POKéMON.$" + +SootopolisCity_House4_Text_18FDD8:: @ 818FDD8 + .string "AZUMARILL: Marurii.$" diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc index 2217f3e0f..2217f3e0f 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/SootopolisCity_House5/events.inc diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 7cfe101ac..f34f45f53 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House5:: @ 8306A28 - .4byte SootopolisCity_House5_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 309 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc new file mode 100644 index 000000000..26e5c7d5c --- /dev/null +++ b/data/maps/SootopolisCity_House5/scripts.inc @@ -0,0 +1,10 @@ +SootopolisCity_House5_MapScripts:: @ 815B372 + .byte 0 + +SootopolisCity_House5_EventScript_15B373:: @ 815B373 + msgbox SootopolisCity_House5_Text_18FDEC, 2 + end + +SootopolisCity_House5_EventScript_15B37C:: @ 815B37C + msgbox SootopolisCity_House5_Text_18FE7B, 2 + end diff --git a/data/maps/SootopolisCity_House5/text.inc b/data/maps/SootopolisCity_House5/text.inc new file mode 100644 index 000000000..c5887ffe2 --- /dev/null +++ b/data/maps/SootopolisCity_House5/text.inc @@ -0,0 +1,8 @@ +SootopolisCity_House5_Text_18FDEC:: @ 818FDEC + .string "There appears to be some connection\n" + .string "between SOOTOPOLIS and MT. PYRE.\p" + .string "My friends and I did some research on\n" + .string "it at the lab where I used to work.$" + +SootopolisCity_House5_Text_18FE7B:: @ 818FE7B + .string "My big brother used to study the sea.$" diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc index a189b98ba..a189b98ba 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/SootopolisCity_House6/events.inc diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 536872e88..639ea99ba 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House6:: @ 8306A44 - .4byte SootopolisCity_House6_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 310 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc new file mode 100644 index 000000000..24c59500a --- /dev/null +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -0,0 +1,34 @@ +SootopolisCity_House6_MapScripts:: @ 815B385 + .byte 0 + +SootopolisCity_House6_EventScript_15B386:: @ 815B386 + lock + faceplayer + goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD + msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO + compare RESULT, NO + call_if_eq SootopolisCity_House6_EventScript_15B3C3 + msgbox SootopolisCity_House6_Text_18FF12, 4 + givedecoration_std DECOR_WAILMER_DOLL + compare RESULT, 0 + goto_if_eq SootopolisCity_House6_EventScript_15B3D7 + setflag FLAG_RECEIVED_WAILMER_DOLL + release + end + +SootopolisCity_House6_EventScript_15B3C3:: @ 815B3C3 + msgbox SootopolisCity_House6_Text_18FF6D, 4 + release + end + +SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD + msgbox SootopolisCity_House6_Text_18FF95, 4 + release + end + +SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 + bufferdecorationname 1, DECOR_WAILMER_DOLL + msgbox SootopolisCity_House6_Text_1A0CEF, 4 + msgbox SootopolisCity_House6_Text_18FF28, 4 + release + end diff --git a/data/maps/SootopolisCity_House6/text.inc b/data/maps/SootopolisCity_House6/text.inc new file mode 100644 index 000000000..c8547b412 --- /dev/null +++ b/data/maps/SootopolisCity_House6/text.inc @@ -0,0 +1,19 @@ +SootopolisCity_House6_Text_18FEA1:: @ 818FEA1 + .string "Hello! You’re our first guest in a\n" + .string "good while.\p" + .string "You’ve brightened up my day, so I’ll\n" + .string "give you a big WAILMER DOLL.$" + +SootopolisCity_House6_Text_18FF12:: @ 818FF12 + .string "Take good care of it!$" + +SootopolisCity_House6_Text_18FF28:: @ 818FF28 + .string "Oh, you want it, but not right now?\n" + .string "Okay, then I’ll hold it for you.$" + +SootopolisCity_House6_Text_18FF6D:: @ 818FF6D + .string "Are you sure?\n" + .string "You don’t want this DOLL?$" + +SootopolisCity_House6_Text_18FF95:: @ 818FF95 + .string "I love plush DOLLS!$" diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc index 39bc71e79..39bc71e79 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/SootopolisCity_House7/events.inc diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 598a84316..1d785ec47 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House7:: @ 8306A60 - .4byte SootopolisCity_House7_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc new file mode 100644 index 000000000..a9b06b176 --- /dev/null +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -0,0 +1,10 @@ +SootopolisCity_House7_MapScripts:: @ 815B3ED + .byte 0 + +SootopolisCity_House7_EventScript_15B3EE:: @ 815B3EE + msgbox SootopolisCity_House7_Text_18FFA9, 2 + end + +SootopolisCity_House7_EventScript_15B3F7:: @ 815B3F7 + msgbox SootopolisCity_House7_Text_19005B, 2 + end diff --git a/data/maps/SootopolisCity_House7/text.inc b/data/maps/SootopolisCity_House7/text.inc new file mode 100644 index 000000000..756a96a1b --- /dev/null +++ b/data/maps/SootopolisCity_House7/text.inc @@ -0,0 +1,14 @@ +SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 + .string "An underwater volcano erupted and\n" + .string "forced itself up from the depths.\p" + .string "Its crater emerged from the sea and\n" + .string "became filled with rainwater.\p" + .string "That’s how SOOTOPOLIS CITY came into\n" + .string "being.$" + +SootopolisCity_House7_Text_19005B:: @ 819005B + .string "The cave that links SOOTOPOLIS and\n" + .string "the outside world...\p" + .string "It seems as if the cave was made to\n" + .string "keep something from getting out.\p" + .string "Or am I just imagining things?$" diff --git a/data/maps/SootopolisCity_House8/border.bin b/data/maps/SootopolisCity_House8/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/SootopolisCity_House8/border.bin +++ /dev/null diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/events.inc index d6b139f34..d6b139f34 100644 --- a/data/maps/events/SootopolisCity_House8.inc +++ b/data/maps/SootopolisCity_House8/events.inc diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 4d6619797..58432de80 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -1,9 +1,9 @@ SootopolisCity_House8:: @ 8306A7C - .4byte SootopolisCity_House8_MapAttributes + .4byte SootopolisCity_House8_Layout .4byte SootopolisCity_House8_MapEvents .4byte SootopolisCity_House8_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 298 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House8/map.bin b/data/maps/SootopolisCity_House8/map.bin deleted file mode 100644 index ffeea7269..000000000 --- a/data/maps/SootopolisCity_House8/map.bin +++ /dev/null @@ -1 +0,0 @@ -XX``22333366333773333327723333333333333 333
\ No newline at end of file diff --git a/data/maps/SootopolisCity_House8/scripts.inc b/data/maps/SootopolisCity_House8/scripts.inc new file mode 100644 index 000000000..91dd3490b --- /dev/null +++ b/data/maps/SootopolisCity_House8/scripts.inc @@ -0,0 +1,114 @@ +SootopolisCity_House8_MapScripts:: @ 815B400 + .byte 0 + +SootopolisCity_House8_EventScript_15B401:: @ 815B401 + special GetShroomishSizeRecordInfo + lock + faceplayer + msgbox SootopolisCity_House8_Text_1900F7, 4 + special SelectMonForNPCTrade + waitstate + copyvar RESULT, VAR_SPECIAL_4 + compare RESULT, 255 + goto_if_eq SootopolisCity_House8_EventScript_15B448 + special CompareShroomishSize + compare RESULT, 1 + goto_if_eq SootopolisCity_House8_EventScript_15B452 + compare RESULT, 2 + goto_if_eq SootopolisCity_House8_EventScript_15B45C + compare RESULT, 3 + goto_if_eq SootopolisCity_House8_EventScript_15B466 + release + end + +SootopolisCity_House8_EventScript_15B448:: @ 815B448 + msgbox SootopolisCity_House8_Text_190366, 4 + release + end + +SootopolisCity_House8_EventScript_15B452:: @ 815B452 + msgbox SootopolisCity_House8_Text_190329, 4 + release + end + +SootopolisCity_House8_EventScript_15B45C:: @ 815B45C + msgbox SootopolisCity_House8_Text_1902E4, 4 + release + end + +SootopolisCity_House8_EventScript_15B466:: @ 815B466 + msgbox SootopolisCity_House8_Text_19021D, 4 + giveitem_std ITEM_ELIXIR + compare RESULT, 0 + goto_if_eq SootopolisCity_House8_EventScript_15B488 + closemessage + release + end + +SootopolisCity_House8_EventScript_15B488:: @ 815B488 + msgbox SootopolisCity_House8_Text_1902C4, 4 + release + end + +SootopolisCity_House8_EventScript_15B492:: @ 815B492 + special GetBarboachSizeRecordInfo + lock + faceplayer + msgbox SootopolisCity_House8_Text_190431, 4 + special SelectMonForNPCTrade + waitstate + copyvar RESULT, VAR_SPECIAL_4 + compare RESULT, 255 + goto_if_eq SootopolisCity_House8_EventScript_15B4D9 + special CompareBarboachSize + compare RESULT, 1 + goto_if_eq SootopolisCity_House8_EventScript_15B4E3 + compare RESULT, 2 + goto_if_eq SootopolisCity_House8_EventScript_15B4ED + compare RESULT, 3 + goto_if_eq SootopolisCity_House8_EventScript_15B4F7 + release + end + +SootopolisCity_House8_EventScript_15B4D9:: @ 815B4D9 + msgbox SootopolisCity_House8_Text_19065A, 4 + release + end + +SootopolisCity_House8_EventScript_15B4E3:: @ 815B4E3 + msgbox SootopolisCity_House8_Text_190628, 4 + release + end + +SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED + msgbox SootopolisCity_House8_Text_1905E6, 4 + release + end + +SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 + msgbox SootopolisCity_House8_Text_190536, 4 + giveitem_std ITEM_ELIXIR + compare RESULT, 0 + goto_if_eq SootopolisCity_House8_EventScript_15B519 + closemessage + release + end + +SootopolisCity_House8_EventScript_15B519:: @ 815B519 + msgbox SootopolisCity_House8_Text_1905C1, 4 + release + end + +SootopolisCity_House8_EventScript_15B523:: @ 815B523 + special GetShroomishSizeRecordInfo + lockall + msgbox SootopolisCity_House8_Text_1903C9, 4 + releaseall + end + +SootopolisCity_House8_EventScript_15B531:: @ 815B531 + special GetBarboachSizeRecordInfo + lockall + msgbox SootopolisCity_House8_Text_1906BE, 4 + releaseall + end diff --git a/data/maps/SootopolisCity_House8/text.inc b/data/maps/SootopolisCity_House8/text.inc new file mode 100644 index 000000000..4efc111cc --- /dev/null +++ b/data/maps/SootopolisCity_House8/text.inc @@ -0,0 +1,90 @@ +SootopolisCity_House8_Text_1900F7:: @ 81900F7 + .string "Do you know the POKéMON SHROOMISH?\n" + .string "It’s hardly ever seen in SOOTOPOLIS.\p" + .string "Anyway, I love big SHROOMISH.\n" + .string "The bigger the better.\p" + .string "But my younger brother, he says that\n" + .string "BARBOACH is bigger.\p" + .string "That’s silly. SHROOMISH has to be\n" + .string "bigger than that!\p" + .string "Huh? Do you have a SHROOMISH with you?\n" + .string "P-p-please, show me!$" + +SootopolisCity_House8_Text_19021D:: @ 819021D + .string "{STR_VAR_2} inches!\n" + .string "Oh, my gosh, this is a big one!\p" + .string "It might even beat the big BARBOACH\n" + .string "my younger brother saw!\p" + .string "Thanks for showing me.\n" + .string "This is my thanks!$" + +UnknownString_81902AE: @ 81902AE + .string "{PLAYER} received a POTION.$" + +SootopolisCity_House8_Text_1902C4:: @ 81902C4 + .string "Hunh?\n" + .string "Your BAG is crammed full.$" + +SootopolisCity_House8_Text_1902E4:: @ 81902E4 + .string "{STR_VAR_2} inches, is it?\p" + .string "Hmm... I’ve seen a bigger SHROOMISH\n" + .string "than this one.$" + +SootopolisCity_House8_Text_190329:: @ 8190329 + .string "Oh, now this is quite something...\n" + .string "But it’s not a SHROOMISH!$" + +SootopolisCity_House8_Text_190366:: @ 8190366 + .string "You don’t have a big SHROOMISH?\n" + .string "That’s too bad...\p" + .string "If you get a big SHROOMISH, please\n" + .string "come show me.$" + +SootopolisCity_House8_Text_1903C9:: @ 81903C9 + .string "The biggest SHROOMISH in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" + .string "A SHROOMISH bigger than a BARBOACH\n" + .string "always wanted!$" + +SootopolisCity_House8_Text_190431:: @ 8190431 + .string "Do you know the POKéMON BARBOACH?\n" + .string "It’s rarely seen in SOOTOPOLIS.\p" + .string "I love, I mean love, big BARBOACH!\p" + .string "My big brother says that SHROOMISH is\n" + .string "bigger.\p" + .string "But that’s wrong! Everyone knows that\n" + .string "BARBOACH is a lot bigger.\p" + .string "Hunh? Do you have a BARBOACH?\n" + .string "P-p-please show me!$" + +SootopolisCity_House8_Text_190536:: @ 8190536 + .string "{STR_VAR_2} inches!\n" + .string "Wow, that is big!\p" + .string "It might be even bigger than the huge\n" + .string "SHROOMISH my big brother saw.\p" + .string "Thanks for showing me!\n" + .string "This is my thanks!$" + +SootopolisCity_House8_Text_1905C1:: @ 81905C1 + .string "Whoops, looks like your BAG is full.$" + +SootopolisCity_House8_Text_1905E6:: @ 81905E6 + .string "{STR_VAR_2} inches?\p" + .string "Hmm... I’ve seen a bigger BARBOACH\n" + .string "than this one here.$" + +SootopolisCity_House8_Text_190628:: @ 8190628 + .string "Well, isn’t this something!\n" + .string "But it’s no BARBOACH!$" + +SootopolisCity_House8_Text_19065A:: @ 819065A + .string "Don’t you have a big BARBOACH?\n" + .string "How disappointing...\p" + .string "If you get a big BARBOACH, please\n" + .string "come show me!$" + +SootopolisCity_House8_Text_1906BE:: @ 81906BE + .string "The biggest BARBOACH in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" + .string "A BARBOACH bigger than a SHROOMISH\n" + .string "always wanted!$" diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc index 38d3f30f0..38d3f30f0 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/SootopolisCity_Mart/events.inc diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 47505e04d..ecf6040c4 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,9 +1,9 @@ SootopolisCity_Mart:: @ 830699C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc new file mode 100644 index 000000000..1687bd91e --- /dev/null +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -0,0 +1,55 @@ +SootopolisCity_Mart_MapScripts:: @ 815B21A + .byte 0 + +SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B + lock + faceplayer + message SootopolisCity_Mart_Text_1A0BE4 + waitmessage + pokemart SootopolisCity_Mart_Items + msgbox SootopolisCity_Mart_Text_1A0C02, 4 + release + end + + .align 2 +SootopolisCity_Mart_Items:: @ 815B234 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_MAX_POTION + .2byte ITEM_FULL_HEAL + .2byte ITEM_REVIVE + .2byte ITEM_MAX_REPEL + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_SHADOW_MAIL + .2byte ITEM_NONE + release + end + +SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268 + msgbox SootopolisCity_Mart_Text_18F8D7, 4 + release + end + +SootopolisCity_Mart_EventScript_15B268:: @ 815B268 + msgbox SootopolisCity_Mart_Text_18F890, 4 + release + end + +SootopolisCity_Mart_EventScript_15B272:: @ 815B272 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290 + msgbox SootopolisCity_Mart_Text_18F96B, 4 + release + end + +SootopolisCity_Mart_EventScript_15B290:: @ 815B290 + msgbox SootopolisCity_Mart_Text_18F8F2, 4 + release + end diff --git a/data/maps/SootopolisCity_Mart/text.inc b/data/maps/SootopolisCity_Mart/text.inc new file mode 100644 index 000000000..858d1530d --- /dev/null +++ b/data/maps/SootopolisCity_Mart/text.inc @@ -0,0 +1,17 @@ +SootopolisCity_Mart_Text_18F890:: @ 818F890 + .string "PP UP is great!\p" + .string "It raises the POWER POINTS, the PP,\n" + .string "of a POKéMON move.$" + +SootopolisCity_Mart_Text_18F8D7:: @ 818F8D7 + .string "What... What is happening?$" + +SootopolisCity_Mart_Text_18F8F2:: @ 818F8F2 + .string "Do you know FULL RESTORE?\p" + .string "Full restoration of HP!\n" + .string "Eradication of all status problems!\p" + .string "It’s truly an item of your dreams!$" + +SootopolisCity_Mart_Text_18F96B:: @ 818F96B + .string "This weather...\n" + .string "Did something awaken?$" diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index 8852ba87c..8852ba87c 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index d0cef1039..496a40444 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..820dd4858 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,43 @@ +SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 + map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_15B196 + .byte 0 + +SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 + setrespawn 10 + end + +@ 815B19A + setvar VAR_SPECIAL_B, 1 + call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 + msgbox SootopolisCity_PokemonCenter_1F_Text_18F6A2, 4 + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 + lock + faceplayer + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_15B1EE:: @ 815B1EE + msgbox SootopolisCity_PokemonCenter_1F_Text_18F7EA, 4 + release + end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/text.inc b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..fd078ad0c --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc @@ -0,0 +1,24 @@ +SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 + .string "WALLACE, this town’s GYM LEADER, is a\n" + .string "powerful TRAINER.\p" + .string "He’s rumored to be the best in the\n" + .string "whole HOENN region.\p" + .string "But the ELITE FOUR...\p" + .string "They’re said to be even stronger than\n" + .string "WALLACE. How strong could they be?$" + +SootopolisCity_PokemonCenter_1F_Text_18F770:: @ 818F770 + .string "Everyone in town has taken refuge\n" + .string "and won’t come out of their homes.\p" + .string "This weather..\n" + .string "Could it be the prelude to something?$" + +SootopolisCity_PokemonCenter_1F_Text_18F7EA:: @ 818F7EA + .string "Whenever, wherever, and whatever\n" + .string "happens, I will always be friends with\l" + .string "POKéMON.\p" + .string "Because it’s fun to be with POKéMON!$" + +SootopolisCity_PokemonCenter_1F_Text_18F860:: @ 818F860 + .string "I don’t know why...\n" + .string "But... I’m really scared...$" diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 2b6b7a022..2b6b7a022 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 4bdb48a7d..78a1a486d 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..0547e666f --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +SootopolisCity_PokemonCenter_2F_MapScripts:: @ 815B1F8 + map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +SootopolisCity_PokemonCenter_2F_EventScript_15B208:: @ 815B208 + call SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +SootopolisCity_PokemonCenter_2F_EventScript_15B20E:: @ 815B20E + call SootopolisCity_PokemonCenter_2F_EventScript_1A40CC + end + +SootopolisCity_PokemonCenter_2F_EventScript_15B214:: @ 815B214 + call SootopolisCity_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/maps/SouthernIsland_Exterior/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/SouthernIsland_Exterior/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc index 38ff07de5..38ff07de5 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 0579c81bc..e70d1a97a 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,9 +1,9 @@ SouthernIsland_Exterior:: @ 8307CA4 - .4byte SouthernIsland_Exterior_MapAttributes + .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 291 .byte 73 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/maps/SouthernIsland_Exterior/map.bin deleted file mode 100644 index 8c2c2df4a..000000000 --- a/data/maps/SouthernIsland_Exterior/map.bin +++ /dev/null @@ -1 +0,0 @@ -qss444444444444444444444440uuuuqss444444444444444444444444t}uuuqss444444444444444444444444uquuuqss444444444444444444444444uquuuqss444444444447744444444444ut}uuqss444444444443344444444444uuquuss04444444444334444444444t}ut}uss{|444444440004444444444uquut}s{qs444444440000440000004ut}uu{sqs444444440000000444000uuquups{s044444444000004444400uuquups{s{64444444400044444t00zuquup{s{44p0444444444t6666z000ut}upssq{|{||444444tz4444t00yzuqupssqqq{44{666|||}tyyyyz0000ut}ps{|||44x444tz0000000t|}upsqqqq{||xyyyz0000000000t}qt}pp{||qqqqs0000000000t||||}t|}pp{||q{|||||00|||}t}pppppp{|]^0^0_}ppppppppppp]^0^0_ppppppppppppppppppppUV0V0V02^0^0_qpppppppppppppppppppppppp]^0^0^0^0^0^0_qppppppppppppppppppppppppSTTV3W3TTUqpppppppppppppppppppppppp[\\\\\\]qppppppppppppppppppppppppqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc new file mode 100644 index 000000000..13e4774e2 --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -0,0 +1,54 @@ +SouthernIsland_Exterior_MapScripts:: @ 8160AD6 + map_script 3, SouthernIsland_Exterior_MapScript1_160ADC + .byte 0 + +SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC + setflag FLAG_LANDMARK_SOUTHERN_ISLAND + end + +SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 + lock + faceplayer + msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO + compare RESULT, NO + goto_if_eq SouthernIsland_Exterior_EventScript_160B25 + msgbox SouthernIsland_Exterior_Text_1C5281, 4 + closemessage + applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 + waitmovement 0 + delay 30 + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR + setvar VAR_SPECIAL_4, 2 + call SouthernIsland_Exterior_EventScript_1A047C + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 + waitstate + release + end + +SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25 + msgbox SouthernIsland_Exterior_Text_1C52A6, 4 + release + end + +BattleTower_Outside_EventScript_160B2F:: @ 8160B2F + applymovement 255, BattleTower_Outside_Movement_160B45 + waitmovement 0 + return + +BattleTower_Outside_EventScript_160B3A:: @ 8160B3A + applymovement 255, BattleTower_Outside_Movement_160B47 + waitmovement 0 + return + +BattleTower_Outside_Movement_160B45:: @ 8160B45 + walk_down + end_movement + +BattleTower_Outside_Movement_160B47:: @ 8160B47 + walk_left + walk_in_place_fastest_down + end_movement + +SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A + msgbox SouthernIsland_Exterior_Text_1C52FB, 3 + end diff --git a/data/maps/SouthernIsland_Exterior/text.inc b/data/maps/SouthernIsland_Exterior/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/maps/SouthernIsland_Interior/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/SouthernIsland_Interior/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc index cba468ef7..cba468ef7 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/SouthernIsland_Interior/events.inc diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 42cf6db66..2dbee0b85 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,9 +1,9 @@ SouthernIsland_Interior:: @ 8307CC0 - .4byte SouthernIsland_Interior_MapAttributes + .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 - .2byte BGM_DAN02 + .2byte MUS_DAN02 .2byte 292 .byte 73 .byte 0 diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/maps/SouthernIsland_Interior/map.bin deleted file mode 100644 index db1e4b153..000000000 --- a/data/maps/SouthernIsland_Interior/map.bin +++ /dev/null @@ -1 +0,0 @@ -000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000011000000000000001111001112211
\ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc new file mode 100644 index 000000000..7094ebed8 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -0,0 +1,110 @@ +SouthernIsland_Interior_MapScripts:: @ 8160B53 + map_script 5, SouthernIsland_Interior_MapScript1_160B5E + map_script 3, SouthernIsland_Interior_MapScript1_160B6C + .byte 0 + +SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68 + end + +SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 + removeobject 2 + return + +SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C + .ifdef SAPPHIRE + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS + .else + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS + .endif + call SouthernIsland_Interior_EventScript_160B77 + end + +SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 + checkplayergender + compare RESULT, 0 + goto_if_eq SouthernIsland_Interior_EventScript_160B8F + compare RESULT, 1 + goto_if_eq SouthernIsland_Interior_EventScript_160B95 + end + +SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return + +SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B + lockall + setvar VAR_SPECIAL_8, 12 + goto SouthernIsland_Interior_EventScript_160BA7 + end + +SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 + goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08 + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08 + setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS + special SpawnCameraDummy + applymovement 127, SouthernIsland_Interior_Movement_160C12 + waitmovement 0 + delay 50 + waitse + playmoncry SPECIES_LATIAS_OR_LATIOS, 0 + delay 30 + waitmoncry + addobject 2 + delay 30 + applymovement 127, SouthernIsland_Interior_Movement_160C16 + applymovement 2, SouthernIsland_Interior_Movement_160C22 + waitmovement 0 + delay 50 + special RemoveCameraDummy + setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW + setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartSouthernIslandBattle + waitstate + clearflag FLAG_SYS_CTRL_OBJ_DELETE + releaseall + end + +SouthernIsland_Interior_EventScript_160C08:: @ 8160C08 + msgbox SouthernIsland_Interior_Text_1C52C5, 4 + releaseall + end + +SouthernIsland_Interior_Movement_160C12:: @ 8160C12 + walk_up + walk_up + walk_up + end_movement + +SouthernIsland_Interior_Movement_160C16:: @ 8160C16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_up + end_movement + +SouthernIsland_Interior_Movement_160C22:: @ 8160C22 + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + end_movement diff --git a/data/maps/SouthernIsland_Interior/text.inc b/data/maps/SouthernIsland_Interior/text.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/text.inc @@ -0,0 +1 @@ + diff --git a/data/maps/TradeCenter/border.bin b/data/maps/TradeCenter/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/TradeCenter/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc index bb69d402e..bb69d402e 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/TradeCenter/events.inc diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 62bac5400..dc60b2dd1 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,9 +1,9 @@ TradeCenter:: @ 8307994 - .4byte TradeCenter_MapAttributes + .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 223 .byte 87 .byte 0 diff --git a/data/maps/TradeCenter/map.bin b/data/maps/TradeCenter/map.bin deleted file mode 100644 index 7e592dbe6..000000000 --- a/data/maps/TradeCenter/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -017456742389?<= >?<:;@AGDE((FGDBCHI2.2222222.2J2KP22 -2 2 2
22222SPQ2+22222+2R2SP2222 2 2 2 222SXY222#2$2%2&222Z2[,2-2
\ No newline at end of file diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..dadb3e875 --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,2 @@ +TradeCenter_MapScripts:: @ 815F57D + .byte 0 diff --git a/data/maps/Underwater1/border.bin b/data/maps/Underwater1/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater1/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc index 12b3cf72b..12b3cf72b 100644 --- a/data/maps/events/Underwater1.inc +++ b/data/maps/Underwater1/events.inc diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index cfd06e4ce..87e3260c9 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,9 +1,9 @@ Underwater1:: @ 83059C0 - .4byte Underwater1_MapAttributes + .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 275 .byte 50 .byte 0 diff --git a/data/maps/Underwater1/map.bin b/data/maps/Underwater1/map.bin deleted file mode 100644 index 230e3dcd2..000000000 --- a/data/maps/Underwater1/map.bin +++ /dev/null @@ -1,17 +0,0 @@ - 2222222222222222222222222222 222222222222222222222222222222222222222222# 22 -"##~222222222222222222222222222222222# "#####~22222222222}####### 22 -||~22###~22222222# "22######~2222 222222222222222222222222222222222222222222222222}|||| 22 -"22222222222# "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~222 22#~2222222222222#~2222222222#|||# 22 -"22# "222222222222222222222222222222222222222222222222222222222222222222222222222222 2222222222222222222222222222222222222222222222222 22222222222222222# 22 -"22}"2222222222222222222y2y222222222222y2y22222222222 2222# 22 -""~22222222222222222222222# "222222222222}|"222222222 22222222222222222# 22 -|||"2222222222222222222# "2222"~222222222}|"222# 22 -""|~22222}|"22}|# ""|||||"222222222222222222222222 22222222222222222222222222}||~2222222222222222}"22222222# 22 -"2222"~2222222# " 222222}""|~}"2222222}""|||||22222222222222# 22 -"2222# "2222 22"~22222222"~2222222 22"~22z222 -"22222222222222y2y22222222222222222#~22# 22 -"||||~2222222222 22# "#|~2222 222222222222222222222222222#|~2222222222222# 22 -"||||||# 22 -"222# "# "22222222}" 222222222222222 - "# 22 -"# "
\ No newline at end of file diff --git a/data/maps/Underwater1/scripts.inc b/data/maps/Underwater1/scripts.inc new file mode 100644 index 000000000..ab2e910fe --- /dev/null +++ b/data/maps/Underwater1/scripts.inc @@ -0,0 +1,2 @@ +Underwater1_MapScripts:: @ 8152637 + .byte 0 diff --git a/data/maps/Underwater2/border.bin b/data/maps/Underwater2/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater2/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc index a628cf972..a628cf972 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/Underwater2/events.inc diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 38446fecc..244cab761 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,9 +1,9 @@ Underwater2:: @ 83059DC - .4byte Underwater2_MapAttributes + .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 51 .byte 51 .byte 0 diff --git a/data/maps/Underwater2/map.bin b/data/maps/Underwater2/map.bin deleted file mode 100644 index 0c6377c30..000000000 --- a/data/maps/Underwater2/map.bin +++ /dev/null @@ -1,35 +0,0 @@ - 2222222 222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||# 2222222222 222222222222222 # 22222222222 /# 222222222222222 222 - 222222222 222222222222# 22222222 222222222222222# 222222222 22222222222222222# 222222222222 222222222222222222222222222222222 2222 - 22222222222222222222222222222 222 -"
# 222/2222222
222222222222222222222
"#/# "# 22222 -"222222222222222222222## "
"2222222222222222222222/
" 222222 - 2222222222222 22222 - 22222222222 222222/ 2222222222 /22222 22222222/# 22222# 22 2222222 22222222222 2222 -" #22/ 2222222222222222222222222222 22222 22 22222222222222222222222222222222222222 2222 22222222222222222222222222222222222222 -"2 222222222222222222222222222222222222222222222222# 22222222222222222 - 2222222222222222222222222 22 2222222222222 - "# 22222222222222222222222222222222222 - "
/# 22222222222222/2222222222 -"/
"
#/# 22222222/22222 22222222 - "
"
"# /#/# 222222222222 2222222 - "
"/
"#/#/# 2222222 222222222222 -"
"/
"#/## 222222 2222 -" 222222 -"
"
"#/#/# 22222# 222/2222222
"/
"### 22222 #/222222222 -"
"##22222222222222
"
"#/# 2222222222222## 2222 ## 2 -" 22222 -
"/2222/# "/222222
"##2222# 22222222222 #2222222/### 2222/2222222//622222/222222 - 22222222222/ 22222#222222/222222222222/ 222222 #222222 2222222//2222222 222222 -"2222222 2222222222222 //62222222/# 2222222/ 2222222/
"2222222/ 2222222 -"## 2222222 /222222 -"
"22222222 222222/222222222 / 222222 -"/
"# 222222222/ 22222222222222222/ / 2222222
"222222222222/ / 2222222 -"#/# 22222222222222 efg 2222222222/
"## 222222222222222222mno 2222222222222222222 # 222222222222222222222222222222222222222222 -"
"222222 /# 222222222222222222222222222222222222222 -"2222222## 22222222222222222222222222222222 - "
"6222222222/# 222222222222222222222222222222 -"/62222z222x22## 2222222222222222222222222 - "
"622}~2y2y22} # 22222222222222222222 - "622 |||| ## 222222222222222 - "/
"622/# 2222222 - "622## "/
"62222//
"6222222#"222222|~22222 ||||
\ No newline at end of file diff --git a/data/maps/Underwater2/scripts.inc b/data/maps/Underwater2/scripts.inc new file mode 100644 index 000000000..cf60a2b34 --- /dev/null +++ b/data/maps/Underwater2/scripts.inc @@ -0,0 +1,2 @@ +Underwater2_MapScripts:: @ 8152638 + .byte 0 diff --git a/data/maps/Underwater3/border.bin b/data/maps/Underwater3/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater3/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc index 62518bafa..62518bafa 100644 --- a/data/maps/events/Underwater3.inc +++ b/data/maps/Underwater3/events.inc diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 3cc773730..965109718 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,9 +1,9 @@ Underwater3:: @ 83059F8 - .4byte Underwater3_MapAttributes + .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 52 .byte 52 .byte 0 diff --git a/data/maps/Underwater3/map.bin b/data/maps/Underwater3/map.bin deleted file mode 100644 index 1f7addb2d..000000000 --- a/data/maps/Underwater3/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666666666666666666666666666666 6666666666666 6666666666666 666666666666 666666666 6 6 6 6 ;2;2 66666666 66 6 6 6 6 ;2;2;2;266666666666 @2C2C2A2 6666666 666 <2P2Q2:2 666666666 66 <2T2R:2 666666 66666 <2T2R:2 666666666666 @2G2T2R2:266666666 66 6 @2A2 @2G2P2\2R2B2A2 66666666666@2D2B2A2 <2P2\2V2Z2Q2:266666666666 ?2P2Q2B2:2 <2K2L2V2V2R2B2A2666666666 66?2W2]2Q2:2 3242T2V2V2R2S2:266666666666 ?2W2S2U2:2 # ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:266666 66666 ?2Y2O2U2B2A2 ## ?2K2K2L2R2:26666666 666 I242W2U2S2:2 #32422L2R2:266666666 66 ?2W2]2Q2:2## 422L2R2:26666 666666?2Y2O2U2:2 #3242L2R2:2666666 666 I242W2U2B2A2 ## 42T2R2:26666666666 ?2W2U2S2:2 #42T2R2:26666666 66?2W2]2Q2:2 42T2R20 66666666?2W2S2U2:2;2 42T2R2866666666?2Y2O2U2B2A2 42T2R28
"666666666 I242W2U2S2:2 ;2 42T2R28
"666666666 ?2W2]2Q2:2 @2C2A2###!a6`"
666666666?2W2S2U2:2 ?2S2:2 # #"
"66666666 6 ?2W2S2U2B2A2 ?2S2:266666666 ?2W2S2U2S2:2 ?2S2B2A2 #
"666 66666 ?2W2S2U2S2:23242S2:2
"66666666 ?2W2S2U2S2:2@2A2 # ?2S2B2A2#
"66666 666 ?2W2S2]2Q2:2?2B2A2 ?2S2S2:2 666666 666 ?2W2P2Q2U2:2?2S2:2 ?22S2:26666666 66?2W2T2R2U2:2 ?2S2:2?2S2S2:2#"66666666 6 @2A2 ?2W2T2R2U2:2?2S2B2A2?2S2S2:2#
"6666 66666 <2:2 ?2W2T2R2U2:2 @2D2P2Q2:2 ?2S2S2:2#
666666666@22B2A2 ?2W2T2R2U2:2?2P2_2U2:2 @2D2S2S2:2#"666666666@2222:2 ?2W2T2R2U2:2?2W2S2U2:2 ?2S2S22232#666666666<2222B2A2 ?2W2T2R2U2:2;2?2W2S2U2:2 ?2S2S2:2"
"666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2 @2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2 ?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2 ?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2 ?2W2S2T2V2R2U2:2 ?2T2U22232 ?2S2S2:2"
222266666666I242T2R2:2 ?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232
22222266 66666# ?2T2R2B2A2 ?2W2T2V2V2R2U2B2A2?2T2U2:2 @2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2
222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"
2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2
22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232
2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2"
"
2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232
"222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"
#~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2
"""
2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20"
"#~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"
"22666666666##1T2R28
"
>2>2I242W2Y2L2V2V2R2S2U2S22232
"#~}|666666669T2R28
">2>2>2?2Y2O2T2V2V2R2M2K22232"
"66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2
"
##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2"
"
666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2
"
"
666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232
"
"666666666##)) ## >2I242W2T2V2R2U2:2>2
"66666666#
>2>2?2W2T2J2K2U2:2"66666#6666#
"
"### >2?2W2T2R2S2U2:2
"
666666666#
">2?2W2T2R2S2U2:2
"66666666
"##>2?2W2T2R2S2U2:2
"
" 66#6666666#">2?2W2T2R22U2:2 666666666#>2?2W2T2R2S2U2:2 666666666>2?2W2T2R2S2U2:2 666666666>2?2W2T2R2S2U2:2 666666666>2?2W2T2Z22U2:2 6666666#66
">2?2W2T2V2R2U2:2 666666666>2?2W2T2V2R2U2:2 666666666>2?2W2T2V2R2U2:2
\ No newline at end of file diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc new file mode 100644 index 000000000..c34b07b1c --- /dev/null +++ b/data/maps/Underwater3/scripts.inc @@ -0,0 +1,2 @@ +Underwater3_MapScripts:: @ 8152639 + .byte 0 diff --git a/data/maps/Underwater4/border.bin b/data/maps/Underwater4/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc index fad99382b..fad99382b 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/Underwater4/events.inc diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 8fb1e6faa..6433cde8e 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,9 +1,9 @@ Underwater4:: @ 8305A14 - .4byte Underwater4_MapAttributes + .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 53 .byte 53 .byte 0 diff --git a/data/maps/Underwater4/map.bin b/data/maps/Underwater4/map.bin deleted file mode 100644 index 23f987681..000000000 --- a/data/maps/Underwater4/map.bin +++ /dev/null @@ -1 +0,0 @@ -666666666
>2?2W2T2V2R2U2:2 666666666 >2?2W2T2V2R2U2:2 666666666 >2?2W2K2L2R2U2:2 666666666 # ?2K2O2T2R2U2:2 666666666
3242W2T2R2U2:2 666666666
"# ?2W2T2R2U2:2
66666666#?2W2T2R2U2:2# 666666666
"?2W2T2R2U2B2A2
666 666666?2W2T2R2]2Q2B2C2C2C2A2
#
#6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2
#
#6666666666 #)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2 ;2;2;2
666666666 6 6 aV2V2V2V2V2Z2[2[2[2Q2U2B2A2 @2C2C2C2C2C2C2C2C2C28
666666666 ##))))))aV2V2R2]2Q2B2C2A2 @2C2C2D2P2[2[2[2[2[2[2[2[28 666666666
#)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`# 666666 66666666
"#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)" 66666666666666 ##a[2[2[2[2[2[2[2[2\2V2V2`))))" 66666666666666 #aV2V2V2V2V2V2V2V2`)" 66666666666 d2V2V2V2V2V2`)"@2C2A2
6666 6666666666 @2C2C2A2 <2L2V2V2V2`"
@2D22B2C2A2 6666666 6666666 <222:2<2T2L2V2b28
"
#<2P2[2[2Q2B2C2C2C2C2C2A2 6666666666666 @2A2## 12:2@2D2T2T2J20
#1W2P2Q2]2[2[2[2[2[2Q2B2C2A2 666666666666666@2D2B2A2 " !"" <2P2_2T2R28 #aT2Z2[2[2[2[2[2Q2]2[2Q2B2C2 6666 66666666666 <2P2Q2:2 <2T2P2V2R28 #aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2 <2T2T2V2R28 #)aV2V2V2V2`))))"666666666666666#1T2R2B2A2 @2D2T2T2V2R28 #))))"666666666666666 #aZ2Q2B2C2A2 efg @2C2D2P2_2T2V2R28
6666666666666666#aZ2[2Q2B2C2A2 mn2o @2D2P2[2_2P2V2`)"#
6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)"
#
"#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2`
" 6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2`
" 6666666666666666
#aZ2[2[2[2[2[2[2[2[2[2b2
6666666666666666
"##)aV2V2V2V2V2V2V2J2:2
"
" 666666666666666
d2V2V2V2V2V2J2U2:2
"
"6666666666666666 @2D2L2V2V2V2V2R2U2B2A2
"
" 6666666 666666666# <2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2
6666666666666666# <2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:2 6666666666666666# @2D2T2`))"#))a[2[2[2[2`))" 6666666666666666#
@2C2C2D2P2`"
#))))"
" 66666666666666666""# )))))"
"#66666666666666666#"#"
\ No newline at end of file diff --git a/data/maps/Underwater4/scripts.inc b/data/maps/Underwater4/scripts.inc new file mode 100644 index 000000000..0d2256e07 --- /dev/null +++ b/data/maps/Underwater4/scripts.inc @@ -0,0 +1,2 @@ +Underwater4_MapScripts:: @ 815263A + .byte 0 diff --git a/data/maps/Underwater_Route134/border.bin b/data/maps/Underwater_Route134/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_Route134/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc index 6dc462c80..6dc462c80 100644 --- a/data/maps/events/Underwater_Route134.inc +++ b/data/maps/Underwater_Route134/events.inc diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index fbc90290c..94328b851 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,9 +1,9 @@ Underwater_Route134:: @ 83074FC - .4byte Underwater_Route134_MapAttributes + .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 283 .byte 79 .byte 0 diff --git a/data/maps/Underwater_Route134/map.bin b/data/maps/Underwater_Route134/map.bin deleted file mode 100644 index 77bdd37aa..000000000 --- a/data/maps/Underwater_Route134/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - (2(2(2(2(2(2(2(2(2 (2(2(2(2(2(2(2### # (2(2$(2(2(2 -""""# +,- "
\ No newline at end of file diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc new file mode 100644 index 000000000..464731b10 --- /dev/null +++ b/data/maps/Underwater_Route134/scripts.inc @@ -0,0 +1,7 @@ +Underwater_Route134_MapScripts:: @ 815F071 + map_script 5, Underwater_Route134_MapScript1_15F077 + .byte 0 + +Underwater_Route134_MapScript1_15F077:: @ 815F077 + setdivewarp MAP_ROUTE134, 255, 60, 31 + end diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/maps/Underwater_SeafloorCavern/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_SeafloorCavern/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc index 3b1798716..3b1798716 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 09f36c16f..e4a84f835 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,9 +1,9 @@ Underwater_SeafloorCavern:: @ 8307048 - .4byte Underwater_SeafloorCavern_MapAttributes + .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 147 .byte 69 .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/maps/Underwater_SeafloorCavern/map.bin deleted file mode 100644 index 4cacc495e..000000000 --- a/data/maps/Underwater_SeafloorCavern/map.bin +++ /dev/null @@ -1,2 +0,0 @@ - 6666 (22222(2 (2(2(2(2(2(2(2### (2(2$(2(2(2 -"""# +,- "
\ No newline at end of file diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc new file mode 100644 index 000000000..d34558e40 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -0,0 +1,43 @@ +Underwater_SeafloorCavern_MapScripts:: @ 815D99E + map_script 5, Underwater_SeafloorCavern_MapScript1_15DA36 + map_script 3, Underwater_SeafloorCavern_MapScript1_15D9AE + map_script 1, Underwater_SeafloorCavern_MapScript1_15D9BF + .byte 0 + +Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9BB + end + +Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB + setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + end + +Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9C9 + end + +Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 + setmetatile 5, 3, 542, 1 + setmetatile 6, 3, 542, 1 + setmetatile 7, 3, 542, 1 + setmetatile 8, 3, 542, 1 + setmetatile 5, 4, 552, 0 + setmetatile 6, 4, 552, 0 + setmetatile 7, 4, 552, 0 + setmetatile 8, 4, 552, 0 + setmetatile 5, 5, 552, 0 + setmetatile 6, 5, 552, 0 + setmetatile 7, 5, 552, 0 + setmetatile 8, 5, 552, 0 + return + +Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 + end + +Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F + lockall + msgbox Underwater_SeafloorCavern_Text_197435, 4 + releaseall + end diff --git a/data/maps/Underwater_SeafloorCavern/text.inc b/data/maps/Underwater_SeafloorCavern/text.inc new file mode 100644 index 000000000..8df6cb492 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/text.inc @@ -0,0 +1,7 @@ +Underwater_SeafloorCavern_Text_197435:: @ 8197435 + .string "“SUBMARINE EXPLORER 1” is painted\n" + .string "on the hull.\p" + .string "This is the submarine TEAM {EVIL_TEAM}\n" + .string "stole in SLATEPORT!\p" + .string "TEAM {EVIL_TEAM} must have gone\n" + .string "ashore here.$" diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/maps/Underwater_SealedChamber/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_SealedChamber/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc index ede501142..ede501142 100644 --- a/data/maps/events/Underwater_SealedChamber.inc +++ b/data/maps/Underwater_SealedChamber/events.inc diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 86ff3384d..f11030bd8 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,9 +1,9 @@ Underwater_SealedChamber:: @ 8307518 - .4byte Underwater_SealedChamber_MapAttributes + .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 284 .byte 79 .byte 0 diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/maps/Underwater_SealedChamber/map.bin deleted file mode 100644 index 5ac0b4a73..000000000 --- a/data/maps/Underwater_SealedChamber/map.bin +++ /dev/null @@ -1 +0,0 @@ - efg mno 2222222222222222222 22222 22222222222222222222222222222222222222222222222222222222222 222222222222222 2222222#222222222222222222222 222222 222222#2222222 222222 222222#2222222 222222222222222222222222#222222 222222222222222 22222 22222222 2222222222222222 2222222222222222222222222222222 p 2222222222C2C2C2222222222222S2S2S2222222# 22222S2S2S22222 "# "
\ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc new file mode 100644 index 000000000..3151c4575 --- /dev/null +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -0,0 +1,27 @@ +Underwater_SealedChamber_MapScripts:: @ 815F080 + map_script 6, Underwater_SealedChamber_MapScript1_15F086 + .byte 0 + +Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 + getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 12 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 + compare VAR_SPECIAL_5, 44 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 + goto Underwater_SealedChamber_EventScript_15F0AF + +Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 + setdivewarp MAP_ROUTE134, 255, 60, 31 + end + +Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 + end + +Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 + lockall + braillemessage Underwater_SealedChamber_Braille_1C533D + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/maps/Underwater_SootopolisCity/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/Underwater_SootopolisCity/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc index f745dc557..f745dc557 100644 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ b/data/maps/Underwater_SootopolisCity/events.inc diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 8aa8bb316..f7626d966 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,9 +1,9 @@ Underwater_SootopolisCity:: @ 8306DFC - .4byte Underwater_SootopolisCity_MapAttributes + .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 - .2byte BGM_DEEPDEEP + .2byte MUS_DEEPDEEP .2byte 131 .byte 54 .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/maps/Underwater_SootopolisCity/map.bin deleted file mode 100644 index 71346ab72..000000000 --- a/data/maps/Underwater_SootopolisCity/map.bin +++ /dev/null @@ -1,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(2(2 -""""# +,- "
\ No newline at end of file diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc new file mode 100644 index 000000000..bba04eec8 --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -0,0 +1,7 @@ +Underwater_SootopolisCity_MapScripts:: @ 815CAE4 + map_script 5, Underwater_SootopolisCity_MapScript1_15CAEA + .byte 0 + +Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 + end diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/maps/UnknownMap_082CF564/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_082CF564/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/maps/UnknownMap_082CF564/map.bin Binary files differdeleted file mode 100644 index ca93fa0e2..000000000 --- a/data/maps/UnknownMap_082CF564/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/maps/UnknownMap_082D05D8/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_082D05D8/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/maps/UnknownMap_082D05D8/map.bin Binary files differdeleted file mode 100644 index 37f05b971..000000000 --- a/data/maps/UnknownMap_082D05D8/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/maps/UnknownMap_082D05FC/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_082D05FC/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/maps/UnknownMap_082D05FC/map.bin Binary files differdeleted file mode 100644 index ca93fa0e2..000000000 --- a/data/maps/UnknownMap_082D05FC/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/maps/UnknownMap_082E55C8/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E55C8/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/maps/UnknownMap_082E55C8/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E55C8/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/maps/UnknownMap_082E55EC/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E55EC/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/maps/UnknownMap_082E55EC/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E55EC/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/maps/UnknownMap_082E5610/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E5610/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/maps/UnknownMap_082E5610/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E5610/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/maps/UnknownMap_082E5634/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E5634/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/maps/UnknownMap_082E5634/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E5634/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/maps/UnknownMap_082E5658/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E5658/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/maps/UnknownMap_082E5658/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E5658/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/maps/UnknownMap_082E567C/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E567C/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/maps/UnknownMap_082E567C/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E567C/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/maps/UnknownMap_082E56A0/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E56A0/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/maps/UnknownMap_082E56A0/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E56A0/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/maps/UnknownMap_082E56C4/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E56C4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/maps/UnknownMap_082E56C4/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E56C4/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/maps/UnknownMap_082E56E8/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E56E8/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/maps/UnknownMap_082E56E8/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E56E8/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/maps/UnknownMap_082E570C/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E570C/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/maps/UnknownMap_082E570C/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E570C/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/maps/UnknownMap_082E5730/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E5730/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/maps/UnknownMap_082E5730/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E5730/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/maps/UnknownMap_082E5754/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E5754/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/maps/UnknownMap_082E5754/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E5754/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/maps/UnknownMap_082E5778/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E5778/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/maps/UnknownMap_082E5778/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E5778/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/maps/UnknownMap_082E579C/border.bin deleted file mode 100644 index b15c94f96..000000000 --- a/data/maps/UnknownMap_082E579C/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/maps/UnknownMap_082E579C/map.bin Binary files differdeleted file mode 100644 index 22a47d94e..000000000 --- a/data/maps/UnknownMap_082E579C/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/maps/UnknownMap_082EDF30/border.bin deleted file mode 100644 index 9e4b3fb7a..000000000 --- a/data/maps/UnknownMap_082EDF30/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/maps/UnknownMap_082EDF30/map.bin deleted file mode 100644 index 028da0526..000000000 --- a/data/maps/UnknownMap_082EDF30/map.bin +++ /dev/null @@ -1,3 +0,0 @@ -22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666
662222222222222222222222222
-2266662BBBB2222222222222222222222222666666BBBB66BBBB22222226666 6622222g2g2g2g2g2g2g2g22222222222202 GG 2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222 -IIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22
22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,- 222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222
\ No newline at end of file diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/maps/UnknownMap_082FF894/border.bin deleted file mode 100644 index f1629c020..000000000 --- a/data/maps/UnknownMap_082FF894/border.bin +++ /dev/null @@ -1 +0,0 @@ -3333
\ No newline at end of file diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/maps/UnknownMap_082FF894/map.bin Binary files differdeleted file mode 100644 index fd294d9b6..000000000 --- a/data/maps/UnknownMap_082FF894/map.bin +++ /dev/null diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/maps/UnknownMap_08302970/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/UnknownMap_08302970/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/maps/UnknownMap_08302970/map.bin deleted file mode 100644 index dd82c58d3..000000000 --- a/data/maps/UnknownMap_08302970/map.bin +++ /dev/null @@ -1 +0,0 @@ -qqqqqqqqqqqt||}ut|}ppp{qs{$14$1$1$1$14$1$1uuqupppppppppppppqqqqqqqqt||}qqt}uppppp{{s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppsqs{$1$1$14$1t|}quupppppppppppppqqqqqt|||}qt}pppppppppPesq{{4$1$1t}qt|}uppppppppppppppqqt||}qqqt|}ppppppppppXm{q{{|||}qt}t|}pppppppppppppp||}qt|||}ppuvpppppPQp{q{|}qupppppppppppppp|}uvpu{vp}~pppppXYpp{|0|}ppppppppppppppppZ[ppppp}~pzq|pppppppppPQpp$1$1$1$1$1Z[ppppPQpppppppppppXYppppuvppppypppppppuvXYppppp$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppppuvyq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppy}~ppuvpppppu|ppppppppuqqvpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|ppppppppyyyyPQppppppppppppppppppppuvpppppppppppppppppuvypppppppuvpppppXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~pppppppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppppppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|ppppppppp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|pppppppppppPQppppppppppppppppppppppp}~pppppppppppppppppyyypppppppppppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYppuvppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vpppp}~uvppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvppppp}~puqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/maps/UnknownMap_083041B4/border.bin deleted file mode 100644 index f0eabd248..000000000 --- a/data/maps/UnknownMap_083041B4/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/maps/UnknownMap_083041B4/map.bin deleted file mode 100644 index ec344933f..000000000 --- a/data/maps/UnknownMap_083041B4/map.bin +++ /dev/null @@ -1 +0,0 @@ -2222222222222222222222222222222222222222222222222222222222222222222222222222222 222222 22222222222 222222
222
222
2222222
2222222222
2222222 #
222 #2222 #
2222
2222 #
2222
efg
222 #
esdrfg
222efsd_ddrfg222qdd_d__ddp222 qd______dp22222es_d____d_p22222
qdd______dp22222222#2#2bdd_d_d_dp222222222#2b_d_d_`a3a3#222222222#2a3a3a3a3a3#22222222222222222222222
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/maps/UnknownMap_25_29/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_29/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc index 5f3412382..5f3412382 100644 --- a/data/maps/events/UnknownMap_25_29.inc +++ b/data/maps/UnknownMap_25_29/events.inc diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 93d3ab03f..0a2845319 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,9 +1,9 @@ UnknownMap_25_29:: @ 8307A04 - .4byte UnknownMap_25_29_MapAttributes + .4byte UnknownMap_25_29_Layout .4byte UnknownMap_25_29_MapEvents .4byte UnknownMap_25_29_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 227 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/maps/UnknownMap_25_29/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_29/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownMap_25_29/scripts.inc new file mode 100644 index 000000000..a62e0c9f3 --- /dev/null +++ b/data/maps/UnknownMap_25_29/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_29_MapScripts:: @ 815F580 diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/maps/UnknownMap_25_30/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_30/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc index 8ce359a0b..8ce359a0b 100644 --- a/data/maps/events/UnknownMap_25_30.inc +++ b/data/maps/UnknownMap_25_30/events.inc diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 96f2e3de2..699998409 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,9 +1,9 @@ UnknownMap_25_30:: @ 8307A20 - .4byte UnknownMap_25_30_MapAttributes + .4byte UnknownMap_25_30_Layout .4byte UnknownMap_25_30_MapEvents .4byte UnknownMap_25_30_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 228 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/maps/UnknownMap_25_30/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_30/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownMap_25_30/scripts.inc new file mode 100644 index 000000000..70a1f0ac2 --- /dev/null +++ b/data/maps/UnknownMap_25_30/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_30_MapScripts:: @ 815F580 diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/maps/UnknownMap_25_31/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_31/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc index f2eabe57f..f2eabe57f 100644 --- a/data/maps/events/UnknownMap_25_31.inc +++ b/data/maps/UnknownMap_25_31/events.inc diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 135e1c4b1..704562ea1 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,9 +1,9 @@ UnknownMap_25_31:: @ 8307A3C - .4byte UnknownMap_25_31_MapAttributes + .4byte UnknownMap_25_31_Layout .4byte UnknownMap_25_31_MapEvents .4byte UnknownMap_25_31_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 229 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/maps/UnknownMap_25_31/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_31/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownMap_25_31/scripts.inc new file mode 100644 index 000000000..44c67cab5 --- /dev/null +++ b/data/maps/UnknownMap_25_31/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_31_MapScripts:: @ 815F580 diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/maps/UnknownMap_25_32/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_32/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc index aa0435850..aa0435850 100644 --- a/data/maps/events/UnknownMap_25_32.inc +++ b/data/maps/UnknownMap_25_32/events.inc diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 4aaae9710..ef1d675de 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,9 +1,9 @@ UnknownMap_25_32:: @ 8307A58 - .4byte UnknownMap_25_32_MapAttributes + .4byte UnknownMap_25_32_Layout .4byte UnknownMap_25_32_MapEvents .4byte UnknownMap_25_32_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 230 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/maps/UnknownMap_25_32/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_32/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownMap_25_32/scripts.inc new file mode 100644 index 000000000..485a626e6 --- /dev/null +++ b/data/maps/UnknownMap_25_32/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_32_MapScripts:: @ 815F580 diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/maps/UnknownMap_25_33/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_33/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc index db91b6ef5..db91b6ef5 100644 --- a/data/maps/events/UnknownMap_25_33.inc +++ b/data/maps/UnknownMap_25_33/events.inc diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index e0bebe753..ba13111f1 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,9 +1,9 @@ UnknownMap_25_33:: @ 8307A74 - .4byte UnknownMap_25_33_MapAttributes + .4byte UnknownMap_25_33_Layout .4byte UnknownMap_25_33_MapEvents .4byte UnknownMap_25_33_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 231 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/maps/UnknownMap_25_33/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_33/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownMap_25_33/scripts.inc new file mode 100644 index 000000000..68feb9cc6 --- /dev/null +++ b/data/maps/UnknownMap_25_33/scripts.inc @@ -0,0 +1 @@ +UnknownMap_25_33_MapScripts:: @ 815F580 diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/maps/UnknownMap_25_34/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/UnknownMap_25_34/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc index 7cca882bc..7cca882bc 100644 --- a/data/maps/events/UnknownMap_25_34.inc +++ b/data/maps/UnknownMap_25_34/events.inc diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index b2c174c06..f082e3c09 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,9 +1,9 @@ UnknownMap_25_34:: @ 8307A90 - .4byte UnknownMap_25_34_MapAttributes + .4byte UnknownMap_25_34_Layout .4byte UnknownMap_25_34_MapEvents .4byte UnknownMap_25_34_MapScripts .4byte 0x0 - .2byte BGM_NIBI + .2byte MUS_NIBI .2byte 232 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/maps/UnknownMap_25_34/map.bin deleted file mode 100644 index 5fc1e81ec..000000000 --- a/data/maps/UnknownMap_25_34/map.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc new file mode 100644 index 000000000..47599d41b --- /dev/null +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -0,0 +1,429 @@ +UnknownMap_25_34_MapScripts:: @ 815F580 + map_script 4, LinkContestRoom1_MapScript2_15F610 + map_script 2, LinkContestRoom1_MapScript2_15F606 + map_script 3, LinkContestRoom1_MapScript1_15F595 + map_script 5, LinkContestRoom1_MapScript1_15F5F4 + .byte 0 + +LinkContestRoom1_MapScript1_15F595:: @ 815F595 + call LinkContestRoom1_EventScript_15F5A5 + setvar VAR_TEMP_0, 1 + call LinkContestRoom1_EventScript_15F630 + end + +LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 + special ScriptGetMultiplayerId + compare RESULT, 0 + call_if_eq LinkContestRoom1_EventScript_15F5E0 + compare RESULT, 1 + call_if_eq LinkContestRoom1_EventScript_15F5E4 + compare RESULT, 2 + call_if_eq LinkContestRoom1_EventScript_15F5E8 + compare RESULT, 3 + call_if_eq LinkContestRoom1_EventScript_15F5EC + compare RESULT, 4 + call_if_eq LinkContestRoom1_EventScript_15F5F0 + return + +LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 + savebgm MUS_TEST1 + return + +LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 + savebgm MUS_TEST2 + return + +LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 + savebgm MUS_TEST3 + return + +LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC + savebgm MUS_TEST4 + return + +LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 + savebgm MUS_CONTEST0 + return + +LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 + compare VAR_TEMP_9, 1 + call_if_eq LinkContestRoom1_EventScript_15F600 + end + +LinkContestRoom1_EventScript_15F600:: @ 815F600 + call LinkContestRoom1_EventScript_15F919 + return + +LinkContestRoom1_MapScript2_15F606:: @ 815F606 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A + .2byte 0 + +LinkContestRoom1_MapScript2_15F610:: @ 815F610 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625 + .2byte 0 + +LinkContestRoom1_EventScript_15F61A:: @ 815F61A + call LinkContestRoom1_EventScript_1A514D + call LinkContestRoom1_EventScript_15FB64 + end + +LinkContestRoom1_EventScript_15F625:: @ 815F625 + hideobjectat 255, MAP_LITTLEROOT_TOWN + call LinkContestRoom1_EventScript_15F919 + end + +LinkContestRoom1_EventScript_15F630:: @ 815F630 + call LinkContestRoom1_EventScript_15F6E6 + call LinkContestRoom1_EventScript_15F646 + compare VAR_TEMP_0, 8 + goto_if_lt LinkContestRoom1_EventScript_15F630 + return + +LinkContestRoom1_EventScript_15F646:: @ 815F646 + switch VAR_TEMP_0 + case 1, LinkContestRoom1_EventScript_15F699 + case 2, LinkContestRoom1_EventScript_15F6A4 + case 3, LinkContestRoom1_EventScript_15F6AF + case 4, LinkContestRoom1_EventScript_15F6BA + case 5, LinkContestRoom1_EventScript_15F6C5 + case 6, LinkContestRoom1_EventScript_15F6D0 + case 7, LinkContestRoom1_EventScript_15F6DB + end + +LinkContestRoom1_EventScript_15F699:: @ 815F699 + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 + setvar RESULT, 32 + special ScriptRandom + addvar RESULT, 1 + switch RESULT + case 1, LinkContestRoom1_EventScript_15F859 + case 2, LinkContestRoom1_EventScript_15F85F + case 3, LinkContestRoom1_EventScript_15F865 + case 4, LinkContestRoom1_EventScript_15F86B + case 5, LinkContestRoom1_EventScript_15F871 + case 6, LinkContestRoom1_EventScript_15F877 + case 7, LinkContestRoom1_EventScript_15F87D + case 8, LinkContestRoom1_EventScript_15F883 + case 9, LinkContestRoom1_EventScript_15F889 + case 10, LinkContestRoom1_EventScript_15F88F + case 11, LinkContestRoom1_EventScript_15F895 + case 12, LinkContestRoom1_EventScript_15F89B + case 13, LinkContestRoom1_EventScript_15F8A1 + case 14, LinkContestRoom1_EventScript_15F8A7 + case 15, LinkContestRoom1_EventScript_15F8AD + case 16, LinkContestRoom1_EventScript_15F8B3 + case 17, LinkContestRoom1_EventScript_15F8B9 + case 18, LinkContestRoom1_EventScript_15F8BF + case 19, LinkContestRoom1_EventScript_15F8C5 + case 20, LinkContestRoom1_EventScript_15F8CB + case 21, LinkContestRoom1_EventScript_15F8D1 + case 22, LinkContestRoom1_EventScript_15F8D7 + case 23, LinkContestRoom1_EventScript_15F8DD + case 24, LinkContestRoom1_EventScript_15F8E3 + case 25, LinkContestRoom1_EventScript_15F8E9 + case 26, LinkContestRoom1_EventScript_15F8EF + case 27, LinkContestRoom1_EventScript_15F8F5 + case 28, LinkContestRoom1_EventScript_15F8FB + case 29, LinkContestRoom1_EventScript_15F901 + case 30, LinkContestRoom1_EventScript_15F907 + case 31, LinkContestRoom1_EventScript_15F90D + case 32, LinkContestRoom1_EventScript_15F913 + end + +LinkContestRoom1_EventScript_15F859:: @ 815F859 + setvar VAR_TEMP_1, 5 + return + +LinkContestRoom1_EventScript_15F85F:: @ 815F85F + setvar VAR_TEMP_1, 6 + return + +LinkContestRoom1_EventScript_15F865:: @ 815F865 + setvar VAR_TEMP_1, 7 + return + +LinkContestRoom1_EventScript_15F86B:: @ 815F86B + setvar VAR_TEMP_1, 8 + return + +LinkContestRoom1_EventScript_15F871:: @ 815F871 + setvar VAR_TEMP_1, 10 + return + +LinkContestRoom1_EventScript_15F877:: @ 815F877 + setvar VAR_TEMP_1, 11 + return + +LinkContestRoom1_EventScript_15F87D:: @ 815F87D + setvar VAR_TEMP_1, 12 + return + +LinkContestRoom1_EventScript_15F883:: @ 815F883 + setvar VAR_TEMP_1, 13 + return + +LinkContestRoom1_EventScript_15F889:: @ 815F889 + setvar VAR_TEMP_1, 14 + return + +LinkContestRoom1_EventScript_15F88F:: @ 815F88F + setvar VAR_TEMP_1, 15 + return + +LinkContestRoom1_EventScript_15F895:: @ 815F895 + setvar VAR_TEMP_1, 17 + return + +LinkContestRoom1_EventScript_15F89B:: @ 815F89B + setvar VAR_TEMP_1, 18 + return + +LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1 + setvar VAR_TEMP_1, 19 + return + +LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7 + setvar VAR_TEMP_1, 20 + return + +LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD + setvar VAR_TEMP_1, 21 + return + +LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3 + setvar VAR_TEMP_1, 22 + return + +LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9 + setvar VAR_TEMP_1, 25 + return + +LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF + setvar VAR_TEMP_1, 26 + return + +LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5 + setvar VAR_TEMP_1, 27 + return + +LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB + setvar VAR_TEMP_1, 47 + return + +LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1 + setvar VAR_TEMP_1, 30 + return + +LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7 + setvar VAR_TEMP_1, 31 + return + +LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD + setvar VAR_TEMP_1, 32 + return + +LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3 + setvar VAR_TEMP_1, 33 + return + +LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9 + setvar VAR_TEMP_1, 34 + return + +LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF + setvar VAR_TEMP_1, 35 + return + +LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5 + setvar VAR_TEMP_1, 36 + return + +LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB + setvar VAR_TEMP_1, 37 + return + +LinkContestRoom1_EventScript_15F901:: @ 815F901 + setvar VAR_TEMP_1, 38 + return + +LinkContestRoom1_EventScript_15F907:: @ 815F907 + setvar VAR_TEMP_1, 44 + return + +LinkContestRoom1_EventScript_15F90D:: @ 815F90D + setvar VAR_TEMP_1, 45 + return + +LinkContestRoom1_EventScript_15F913:: @ 815F913 + setvar VAR_TEMP_1, 46 + return + +LinkContestRoom1_EventScript_15F919:: @ 815F919 + switch VAR_CONTEST_LOCATION + case 1, LinkContestRoom1_EventScript_15F956 + case 2, LinkContestRoom1_EventScript_15F969 + case 3, LinkContestRoom1_EventScript_15F9C4 + case 4, LinkContestRoom1_EventScript_15FA70 + case 5, LinkContestRoom1_EventScript_15FA70 + return + +LinkContestRoom1_EventScript_15F956:: @ 815F956 + createvobject 5, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_15F969:: @ 815F969 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 46, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 12, 13, 12, 8, 3, 3 + createvobject 47, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 48, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 22, 20, 3, 2, 3, 1 + createvobject 23, 20, 6, 2, 3, 1 + createvobject 34, 20, 7, 2, 3, 1 + createvobject 46, 24, 8, 2, 3, 1 + createvobject 48, 24, 11, 2, 3, 1 + createvobject 11, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 17, 27, 5, 9, 3, 2 + createvobject 41, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_15FA70:: @ 815FA70 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + createvobject 49, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 48, 27, 5, 9, 3, 2 + createvobject 41, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_15FB64:: @ 815FB64 + switch VAR_CONTEST_LOCATION + case 1, LinkContestRoom1_EventScript_15FBA1 + case 2, LinkContestRoom1_EventScript_15FBAD + case 3, LinkContestRoom1_EventScript_15FBB9 + case 4, LinkContestRoom1_EventScript_15FBC5 + case 5, LinkContestRoom1_EventScript_15FBD1 + return + +LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 + incrementgamestat GAME_STAT_ENTERED_CONTEST + warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4 + waitstate + end + +LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD + incrementgamestat GAME_STAT_ENTERED_CONTEST + warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4 + waitstate + end + +LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 + incrementgamestat GAME_STAT_ENTERED_CONTEST + warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4 + waitstate + end + +LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 + incrementgamestat GAME_STAT_ENTERED_CONTEST + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4 + waitstate + end + +LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4 + waitstate + end + +FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB +LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB +SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB +VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB + checkplayergender + compare RESULT, 0 + goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 + compare RESULT, 1 + goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 + return + +FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return diff --git a/data/maps/UnreferencedMap/border.bin b/data/maps/UnreferencedMap/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/UnreferencedMap/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/UnreferencedMap/map.bin b/data/maps/UnreferencedMap/map.bin deleted file mode 100644 index 17a14a8d5..000000000 --- a/data/maps/UnreferencedMap/map.bin +++ /dev/null @@ -1 +0,0 @@ -pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp00000000000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000
0
0
0000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000
0
0
0
0
0
0
0
0000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppps00000
0
0
0
0
0
0
0
0
0
000rpppppppppppppppppppppppppppppppppppppppppppppppppppppppp000000
0
0
0
0
0
0
0
0
0
0
00000ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp000000
0
0
0
0
0
0
0
0
0
0
0
00000ppppPQpppppppppppppppppppppprqkllmqvppppuvppppPQprs000000
0
0
0
0
0
0
0
0
0
0
01110utpPQXYpppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vXYrss0000000000
0
0
0
0
0
0
0 1 5
10uutXYpuvpu{{qklllmqvppppuvq{|||}qt}~pppppzq|}sss00000000004400
0
0
0
0
01110uuu~p}~pzqqqkklmmqvppp}~pyqqqtyppu{{vppyfsss00000000000444400
0
0
00000uuugppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|puvppfsss000000000004444440
000000uuuguv}~qq{qqqt}qtppXYpppuvppppppuvyyp}~ppfss{|||00000000444444400t|||}uug}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQppppfs{s000000000444444400ut}ugppppPQpyypp}~q|ppppppppppPQppppXYppuvf{ss000000000044444400uut}gppppXYppppppppuvppppyppppppppppXYpppppppp}~nss{|||0000004444t|||}uutopuvppppppppppp}~ppppppppppppppppppppppppuvpp1$1$1$1s{{||0000t||}t}ur$1$1$11p}~pppppuvppppppppppppuvpppppppppppppppp}~pp111$1{{{|22|}t}t}r$1$1$11pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp111$1{{22}t}t$1$1$11ppppppppppppppppppppuvppztppppppp}~pppppppp111$1$1$1"10x{22}tz00 1$1$1$111pppppppppppppppppppp}~pppppppppppppppppppp111$1"10000x22z00000 1$1$111pppppppppppppppppppppppppppppppppppppppppppppp111$1$1100000000000000000001$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp111$1$1!11000000000000000011$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1!11100000000000111$1$1$1$1111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1$1"100000000011$1$1$1$1$1$11111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1111111111$1$1$1$1$1$1$1$111pppppppppPQpppppppuvpppppppppppppppppppppppppppppp1111$1$1$1$1$1$1$1$1$1$1$1$1$1$111111111ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp11111$1$1$1$1$1$1$1$1$1$1$1$11111ppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppp11111111111111111111ppppppppppppppu{{qqqqqqv}~qqtpPQppppppppppppppppppppppppppppppppuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/VerdanturfTown/border.bin b/data/maps/VerdanturfTown/border.bin Binary files differdeleted file mode 100644 index 864ac15fa..000000000 --- a/data/maps/VerdanturfTown/border.bin +++ /dev/null diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc index 920703b72..920703b72 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/VerdanturfTown/events.inc diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index ee41c767f..cbba95897 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,9 +1,9 @@ VerdanturfTown:: @ 83055D0 - .4byte VerdanturfTown_MapAttributes + .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 15 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown/map.bin b/data/maps/VerdanturfTown/map.bin Binary files differdeleted file mode 100644 index 0dbece956..000000000 --- a/data/maps/VerdanturfTown/map.bin +++ /dev/null diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc new file mode 100644 index 000000000..c8adf85c3 --- /dev/null +++ b/data/maps/VerdanturfTown/scripts.inc @@ -0,0 +1,63 @@ +VerdanturfTown_MapScripts:: @ 814E854 + map_script 3, VerdanturfTown_MapScript1_14E85A + .byte 0 + +VerdanturfTown_MapScript1_14E85A:: @ 814E85A + setflag FLAG_VISITED_VERDANTURF_TOWN + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + end + +VerdanturfTown_EventScript_14E866:: @ 814E866 + lock + faceplayer + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885 + msgbox VerdanturfTown_Text_16CAEB, 4 + applymovement 2, VerdanturfTown_Movement_1A083D + waitmovement 0 + release + end + +VerdanturfTown_EventScript_14E885:: @ 814E885 + msgbox VerdanturfTown_Text_16CBCE, 4 + applymovement 2, VerdanturfTown_Movement_1A083D + waitmovement 0 + release + end + +VerdanturfTown_EventScript_14E899:: @ 814E899 + msgbox VerdanturfTown_Text_16CC24, 2 + end + +VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 + msgbox VerdanturfTown_Text_16CCD0, 2 + end + +VerdanturfTown_EventScript_14E8AB:: @ 814E8AB + lock + faceplayer + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0 + msgbox VerdanturfTown_Text_16CD4D, 4 + release + end + +VerdanturfTown_EventScript_14E8C0:: @ 814E8C0 + msgbox VerdanturfTown_Text_16CE30, 4 + release + end + +VerdanturfTown_EventScript_14E8CA:: @ 814E8CA + msgbox VerdanturfTown_Text_16CEC0, 3 + end + +VerdanturfTown_EventScript_14E8D3:: @ 814E8D3 + msgbox VerdanturfTown_Text_16CF0D, 3 + end + +VerdanturfTown_EventScript_14E8DC:: @ 814E8DC + msgbox VerdanturfTown_Text_16CF1B, 3 + end + +VerdanturfTown_EventScript_14E8E5:: @ 814E8E5 + msgbox VerdanturfTown_Text_16CF6D, 3 + end diff --git a/data/maps/VerdanturfTown/text.inc b/data/maps/VerdanturfTown/text.inc new file mode 100644 index 000000000..a3ccdd34e --- /dev/null +++ b/data/maps/VerdanturfTown/text.inc @@ -0,0 +1,62 @@ +VerdanturfTown_Text_16CAEB:: @ 816CAEB + .string "My papa told me.\p" + .string "He says this tunnel is full of\n" + .string "timid POKéMON.\p" + .string "They get all scared of loud noise and\n" + .string "make a big uproar.\p" + .string "So they had to stop the big tunnel\n" + .string "project.\p" + .string "But there’s one man.\n" + .string "He’s trying to dig the tunnel by himself!$" + +VerdanturfTown_Text_16CBCE:: @ 816CBCE + .string "There was a man who dug a tunnel for\n" + .string "a lady he loved.\p" + .string "I don’t really get it, but hey!$" + +VerdanturfTown_Text_16CC24:: @ 816CC24 + .string "The way the winds blow, volcanic ash\n" + .string "is never blown in this direction.\p" + .string "The air is clean and delicious here.\n" + .string "Living here should do wonders for even\l" + .string "frail and sickly people.$" + +VerdanturfTown_Text_16CCD0:: @ 816CCD0 + .string "I’m feeling a little confident about the\n" + .string "cuteness of my POKéMON.\p" + .string "I wanted to make its CONTEST debut,\n" + .string "so that’s why I’m here.$" + +VerdanturfTown_Text_16CD4D:: @ 816CD4D + .string "Did you see the cave next to the\n" + .string "POKéMON MART?\p" + .string "There’s a guy in there who’s trying to\n" + .string "bust up boulders so he can bust out\l" + .string "through to the other side.\p" + .string "It’d be great if we could go through...\n" + .string "It’ll make it easy to visit RUSTBORO.$" + +VerdanturfTown_Text_16CE30:: @ 816CE30 + .string "That cave next to the POKéMON MART\n" + .string "is now a tunnel to the other side.\p" + .string "It’s great - it’s easy to go shop for new\n" + .string "DEVON products in RUSTBORO now.$" + +VerdanturfTown_Text_16CEC0:: @ 816CEC0 + .string "VERDANTURF TOWN\p" + .string "“The windswept highlands with the\n" + .string "sweet fragrance of grass.”$" + +VerdanturfTown_Text_16CF0D:: @ 816CF0D + .string "WANDA’S HOUSE$" + +VerdanturfTown_Text_16CF1B:: @ 816CF1B + .string "POKéMON CONTESTS\n" + .string "NORMAL RANK REGISTRATION\p" + .string "“Gather here, all ye POKéMON TRAINERS!”$" + +VerdanturfTown_Text_16CF6D:: @ 816CF6D + .string "RUSTURF TUNNEL\n" + .string "“Linking RUSTBORO and VERDANTURF\p" + .string "“The tunnel project has been\n" + .string "canceled.”$" diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/events.inc index 78224364f..78224364f 100644 --- a/data/maps/events/VerdanturfTown_ContestHall.inc +++ b/data/maps/VerdanturfTown_ContestHall/events.inc diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index 1c0179afb..de3e6848e 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_ContestHall:: @ 8305D94 - .4byte VerdanturfTown_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte VerdanturfTown_ContestHall_MapEvents .4byte VerdanturfTown_ContestHall_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 73 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestHall/scripts.inc b/data/maps/VerdanturfTown_ContestHall/scripts.inc new file mode 100644 index 000000000..380385a88 --- /dev/null +++ b/data/maps/VerdanturfTown_ContestHall/scripts.inc @@ -0,0 +1,20 @@ +VerdanturfTown_ContestHall_MapScripts:: @ 8153E95 + .byte 0 + + .byte 0 @ XXX + +VerdanturfTown_ContestHall_EventScript_153E97:: @ 8153E97 + msgbox VerdanturfTown_ContestHall_Text_177FB4, 2 + end + +VerdanturfTown_ContestHall_EventScript_153EA0:: @ 8153EA0 + msgbox VerdanturfTown_ContestHall_Text_178091, 2 + end + +VerdanturfTown_ContestHall_EventScript_153EA9:: @ 8153EA9 + msgbox VerdanturfTown_ContestHall_Text_178120, 2 + end + +VerdanturfTown_ContestHall_EventScript_153EB2:: @ 8153EB2 + msgbox VerdanturfTown_ContestHall_Text_1781A5, 3 + end diff --git a/data/maps/VerdanturfTown_ContestHall/text.inc b/data/maps/VerdanturfTown_ContestHall/text.inc new file mode 100644 index 000000000..2bf97f1de --- /dev/null +++ b/data/maps/VerdanturfTown_ContestHall/text.inc @@ -0,0 +1,26 @@ +VerdanturfTown_ContestHall_Text_177FB4:: @ 8177FB4 + .string "Which CONTEST are you entering?\n" + .string "Want a piece of advice?\p" + .string "In any CONTEST, for example, a CUTE\n" + .string "CONTEST, I don’t think they judge you\l" + .string "only on cuteness in the first round.\p" + .string "You need to work out ways for raising\n" + .string "POKéMON better.$" + +VerdanturfTown_ContestHall_Text_178091:: @ 8178091 + .string "I raised my POKéMON to be cute.\p" + .string "I found out you can put POKéMON in\n" + .string "a CONTEST for cuteness!\p" + .string "I’m so glad I raised my POKéMON with\n" + .string "loving care...$" + +VerdanturfTown_ContestHall_Text_178120:: @ 8178120 + .string "My POKéMON rules!\p" + .string "It’s cool, tough yet beautiful, cute,\n" + .string "and smart. It’s complete!\p" + .string "I may as well go for wins in every\n" + .string "single CONTEST.$" + +VerdanturfTown_ContestHall_Text_1781A5:: @ 81781A5 + .string "POKéMON CONTESTS\n" + .string "NORMAL RANK STAGE!$" diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc index 3ab316792..3ab316792 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/VerdanturfTown_ContestLobby/events.inc diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 31274e19f..60849fb0a 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_ContestLobby:: @ 8305D78 - .4byte VerdanturfTown_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte VerdanturfTown_ContestLobby_MapEvents .4byte VerdanturfTown_ContestLobby_MapScripts .4byte 0x0 - .2byte BGM_CONLOBBY + .2byte MUS_CONLOBBY .2byte 72 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc new file mode 100644 index 000000000..32661485d --- /dev/null +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -0,0 +1,128 @@ +VerdanturfTown_ContestLobby_MapScripts:: @ 8153D6A + map_script 3, VerdanturfTown_ContestLobby_MapScript1_153D70 + .byte 0 + +VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 + call VerdanturfTown_ContestLobby_EventScript_1AE188 + end + +VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 + setvar VAR_SPECIAL_B, 5 + setvar CONTEST_RANK, 0 + call VerdanturfTown_ContestLobby_EventScript_1A4E92 + call VerdanturfTown_ContestLobby_EventScript_153DA1 + special SetContestTrainerGfxIds + call VerdanturfTown_ContestLobby_EventScript_15FBDB + setvar VAR_CONTEST_LOCATION, 1 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 + waitstate + end + +VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 + lockall + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 + special DrawWholeMapView + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 + waitmovement 0 + playse SE_HASHI + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 + special DrawWholeMapView + delay 20 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 + waitmovement 0 + applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23 + waitmovement 0 + msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4 + closemessage + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C + applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19 + waitmovement 0 + releaseall + return + +VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23 + walk_in_place_fastest_left + end_movement + +VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25 + walk_left + walk_in_place_fastest_down + end_movement + +VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28 + walk_down + walk_down + walk_in_place_fastest_up + end_movement + +VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement + +VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 + walk_in_place_fastest_right + end_movement + +VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 + lockall + fadescreen 1 + drawcontestwinner 1 + releaseall + end + +VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E + msgbox VerdanturfTown_ContestLobby_Text_177D6C, 2 + end + +VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 + msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 + giveitem_std ITEM_TM45_ATTRACT + compare RESULT, 0 + goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B + setflag FLAG_RECEIVED_TM45 + release + end + +VerdanturfTown_ContestLobby_EventScript_153E76:: @ 8153E76 + msgbox VerdanturfTown_ContestLobby_Text_177E98, 4 + release + end + +VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80 + msgbox VerdanturfTown_ContestLobby_Text_177ECD, 2 + end + +VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 + lockall + special ShowBerryBlenderRecordWindow + waitbuttonpress + erasebox 0, 0, 29, 19 + releaseall + end diff --git a/data/maps/VerdanturfTown_ContestLobby/text.inc b/data/maps/VerdanturfTown_ContestLobby/text.inc new file mode 100644 index 000000000..2f9121c52 --- /dev/null +++ b/data/maps/VerdanturfTown_ContestLobby/text.inc @@ -0,0 +1,28 @@ +VerdanturfTown_ContestLobby_Text_177D6C:: @ 8177D6C + .string "I went in through the entrance and\n" + .string "took a look around the CONTEST hall.\p" + .string "Getting up on that big stage...\n" + .string "It’s going to be tense!$" + +VerdanturfTown_ContestLobby_Text_177DEC:: @ 8177DEC + .string "Oh, my love for POKéMON...\n" + .string "The attraction they evoke in me...\p" + .string "Whoops!\n" + .string "You weren’t meant to see that!\l" + .string "Well, anyway.\p" + .string "If you’re entering a CONTEST, try this\n" + .string "move on for size.$" + +VerdanturfTown_ContestLobby_Text_177E98:: @ 8177E98 + .string "My feelings for POKéMON...\n" + .string "Oh, they attract me so...$" + +VerdanturfTown_ContestLobby_Text_177ECD:: @ 8177ECD + .string "Which CONTEST are you planning on\n" + .string "entering?\p" + .string "If you’re entering a COOL CONTEST,\n" + .string "a cool POKéMON has to be the one!\p" + .string "Pick a POKéMON worthy of the CONTEST\n" + .string "theme, and make sure it has the\l" + .string "right set of moves to match.\p" + .string "That’s fundamental!$" diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index c03706d90..c03706d90 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index f1aae5a19..4152aef1b 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 - .4byte House2_MapAttributes + .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 60 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc new file mode 100644 index 000000000..ed60ec1c7 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -0,0 +1,63 @@ +VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 815402F + .byte 0 + +VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030 + lock + faceplayer + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, 4 + specialvar RESULT, GetLeadMonFriendshipScore + switch RESULT + case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093 + case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D + case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_1540A7 + case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_1540B1 + case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_1540BB + case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_1540C5 + case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_154093:: @ 8154093 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C90, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_15409D:: @ 815409D + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C39, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_1540A7:: @ 81540A7 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BFA, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_1540B1:: @ 81540B1 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BC4, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_1540BB:: @ 81540BB + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B82, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_1540C5:: @ 81540C5 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B43, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF:: @ 81540CF + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178AF2, 4 + release + end + +VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 + lock + faceplayer + waitse + playmoncry SPECIES_PIKACHU, 0 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 + waitmoncry + release + end diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc new file mode 100644 index 000000000..e6e7f9730 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc @@ -0,0 +1,39 @@ +VerdanturfTown_FriendshipRatersHouse_Text_178A9C:: @ 8178A9C + .string "Let me see your POKéMON.\n" + .string "I’ll check to see how much it likes you.\p" + .string "Oh.\n" + .string "Your POKéMON...$" + +VerdanturfTown_FriendshipRatersHouse_Text_178AF2:: @ 8178AF2 + .string "It adores you.\n" + .string "It can’t possibly love you any more.\l" + .string "I even feel happy seeing it.$" + +VerdanturfTown_FriendshipRatersHouse_Text_178B43:: @ 8178B43 + .string "It seems to be very happy.\n" + .string "It obviously likes you a whole lot.$" + +VerdanturfTown_FriendshipRatersHouse_Text_178B82:: @ 8178B82 + .string "It likes you quite a lot.\n" + .string "It seems to want to be babied a little.$" + +VerdanturfTown_FriendshipRatersHouse_Text_178BC4:: @ 8178BC4 + .string "It’s getting used to you.\n" + .string "It seems to believe in you.$" + +VerdanturfTown_FriendshipRatersHouse_Text_178BFA:: @ 8178BFA + .string "It’s not very used to you yet.\n" + .string "It neither loves nor hates you.$" + +VerdanturfTown_FriendshipRatersHouse_Text_178C39:: @ 8178C39 + .string "It’s very wary.\n" + .string "It has scary viciousness in its eyes.\l" + .string "It doesn’t like you much at all.$" + +VerdanturfTown_FriendshipRatersHouse_Text_178C90:: @ 8178C90 + .string "This is a little hard for me to say...\p" + .string "Your POKéMON simply detests you.\n" + .string "Doesn’t that make you uncomfortable?$" + +VerdanturfTown_FriendshipRatersHouse_Text_178CFD:: @ 8178CFD + .string "PIKACHU: Pika pika!$" diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc index ca7d2a4dd..ca7d2a4dd 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/VerdanturfTown_House/events.inc diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index e81adee1b..838905374 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_House:: @ 8305E3C - .4byte House1_MapAttributes + .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 59 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc new file mode 100644 index 000000000..45a22ae93 --- /dev/null +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -0,0 +1,10 @@ +VerdanturfTown_House_MapScripts:: @ 81540EC + .byte 0 + +VerdanturfTown_House_EventScript_1540ED:: @ 81540ED + msgbox VerdanturfTown_House_Text_178D11, 2 + end + +VerdanturfTown_House_EventScript_1540F6:: @ 81540F6 + msgbox VerdanturfTown_House_Text_178D8E, 2 + end diff --git a/data/maps/VerdanturfTown_House/text.inc b/data/maps/VerdanturfTown_House/text.inc new file mode 100644 index 000000000..8db1656ee --- /dev/null +++ b/data/maps/VerdanturfTown_House/text.inc @@ -0,0 +1,13 @@ +VerdanturfTown_House_Text_178D11:: @ 8178D11 + .string "Far away, deep in EVER GRANDE CITY,\n" + .string "is the POKéMON LEAGUE.\p" + .string "The TRAINERS who gather there are\n" + .string "all frighteningly well skilled.$" + +VerdanturfTown_House_Text_178D8E:: @ 8178D8E + .string "In the POKéMON LEAGUE, I think the\n" + .string "rules say that you have to battle the\l" + .string "ELITE FOUR all in a row.\p" + .string "If you lose to any of them, you have\n" + .string "to begin your challenge again from the\l" + .string "first one.$" diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc index f4ca8b8f3..f4ca8b8f3 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index db037960c..7d34f77a7 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_Mart:: @ 8305DB0 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 - .2byte BGM_FRIENDLY + .2byte MUS_FRIENDLY .2byte 63 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc new file mode 100644 index 000000000..db72de227 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -0,0 +1,41 @@ +VerdanturfTown_Mart_MapScripts:: @ 8153EBB + .byte 0 + +VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC + lock + faceplayer + message VerdanturfTown_Mart_Text_1A0BE4 + waitmessage + pokemart VerdanturfTown_Mart_Items + msgbox VerdanturfTown_Mart_Text_1A0C02, 4 + release + end + + .align 2 +VerdanturfTown_Mart_Items:: @ 8153ED4 + .2byte ITEM_GREAT_BALL + .2byte ITEM_NEST_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_REPEL + .2byte ITEM_X_SPECIAL + .2byte ITEM_FLUFFY_TAIL + .2byte ITEM_NONE + release + end + +VerdanturfTown_Mart_EventScript_153EEE:: @ 8153EEE + msgbox VerdanturfTown_Mart_Text_1781C9, 2 + end + +VerdanturfTown_Mart_EventScript_153EF7:: @ 8153EF7 + msgbox VerdanturfTown_Mart_Text_178240, 2 + end + +VerdanturfTown_Mart_EventScript_153F00:: @ 8153F00 + msgbox VerdanturfTown_Mart_Text_1782C0, 2 + end diff --git a/data/maps/VerdanturfTown_Mart/text.inc b/data/maps/VerdanturfTown_Mart/text.inc new file mode 100644 index 000000000..fbd655f08 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/text.inc @@ -0,0 +1,17 @@ +VerdanturfTown_Mart_Text_1781C9:: @ 81781C9 + .string "For any POKéMON match, X SPECIAL\n" + .string "is crucial.\p" + .string "It jacks up the power of some moves\n" + .string "even though it’s only for one battle.$" + +VerdanturfTown_Mart_Text_178240:: @ 8178240 + .string "They don’t sell any items that will let\n" + .string "you win CONTESTS...\p" + .string "It means you have to raise POKéMON\n" + .string "diligently on an everyday basis.$" + +VerdanturfTown_Mart_Text_1782C0:: @ 81782C0 + .string "The NEST BALL works better on\n" + .string "weakened POKéMON.\p" + .string "VERDANTURF is the only place you can\n" + .string "buy it.$" diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 8cf8b1dab..8cf8b1dab 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 384c8719e..7e1269720 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 61 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..956a28ac5 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,25 @@ +VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 + map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F + .byte 0 + +VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F + setrespawn 18 + call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B + end + +PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 +VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 + setvar VAR_SPECIAL_B, 1 + call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B + waitmessage + waitbuttonpress + release + end + +VerdanturfTown_PokemonCenter_1F_EventScript_153F26:: @ 8153F26 + msgbox VerdanturfTown_PokemonCenter_1F_Text_17831D, 2 + end + +VerdanturfTown_PokemonCenter_1F_EventScript_153F2F:: @ 8153F2F + msgbox VerdanturfTown_PokemonCenter_1F_Text_178389, 2 + end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..e79898ead --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc @@ -0,0 +1,9 @@ +VerdanturfTown_PokemonCenter_1F_Text_17831D:: @ 817831D + .string "I daresay a TRAINER isn’t qualified if\n" + .string "POKéMON aren’t settled and friendly.\l" + .string "Have you given them any {POKEBLOCK}S?$" + +VerdanturfTown_PokemonCenter_1F_Text_178389:: @ 8178389 + .string "Let me hazard a guess why you’re in\n" + .string "VERDANTURF. The reason: CONTESTS.\p" + .string "All CONTEST challenges originate here.$" diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index 51fe22275..51fe22275 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 518c11352..c29f42e15 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..ec52d45a7 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8153F38 + map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +PacifidlogTown_PokemonCenter_2F_EventScript_153F48:: @ 8153F48 +VerdanturfTown_PokemonCenter_2F_EventScript_153F48:: @ 8153F48 + call VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6 + end + +PacifidlogTown_PokemonCenter_2F_EventScript_153F4E:: @ 8153F4E +VerdanturfTown_PokemonCenter_2F_EventScript_153F4E:: @ 8153F4E + call VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC + end + +VerdanturfTown_PokemonCenter_2F_EventScript_153F54:: @ 8153F54 + call VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB + end diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/maps/VerdanturfTown_WandasHouse/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/VerdanturfTown_WandasHouse/border.bin +++ /dev/null diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index 709c5aeb6..709c5aeb6 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index bc31f5457..57e835308 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse:: @ 8305E04 - .4byte VerdanturfTown_WandasHouse_MapAttributes + .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 - .2byte BGM_GOMACHI0 + .2byte MUS_GOMACHI0 .2byte 76 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/maps/VerdanturfTown_WandasHouse/map.bin Binary files differdeleted file mode 100644 index 95d14d3c4..000000000 --- a/data/maps/VerdanturfTown_WandasHouse/map.bin +++ /dev/null diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc new file mode 100644 index 000000000..4410beaba --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -0,0 +1,83 @@ +VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A + .byte 0 + +VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B + lock + faceplayer + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73 + msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 + setflag FLAG_WALLY_SPEECH + release + end + +VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 + msgbox VerdanturfTown_WandasHouse_Text_178521, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D + lock + faceplayer + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B + msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153F9B:: @ 8153F9B + msgbox VerdanturfTown_WandasHouse_Text_178683, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153FA5:: @ 8153FA5 + msgbox VerdanturfTown_WandasHouse_Text_1786B5, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF + msgbox VerdanturfTown_WandasHouse_Text_17886A, 2 + end + +VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 + lock + faceplayer + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0 + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6 + msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153FD6:: @ 8153FD6 + msgbox VerdanturfTown_WandasHouse_Text_178739, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 + msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA + lock + faceplayer + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011 + msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_154011:: @ 8154011 + msgbox VerdanturfTown_WandasHouse_Text_178983, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_15401B:: @ 815401B + msgbox VerdanturfTown_WandasHouse_Text_1789DD, 4 + release + end + +VerdanturfTown_WandasHouse_EventScript_154025:: @ 8154025 + msgbox VerdanturfTown_WandasHouse_Text_178A47, 4 + release + end diff --git a/data/maps/VerdanturfTown_WandasHouse/text.inc b/data/maps/VerdanturfTown_WandasHouse/text.inc new file mode 100644 index 000000000..d8aae2958 --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/text.inc @@ -0,0 +1,83 @@ +VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 + .string "WALLY: I lost to you, {PLAYER}, but I’m\n" + .string "not feeling down anymore.\p" + .string "Because I have a new purpose in life.\n" + .string "Together with my RALTS, I’m going\l" + .string "to challenge POKéMON GYMS and become\l" + .string "a great TRAINER.\p" + .string "Please watch me, {PLAYER}.\n" + .string "I’m going to be stronger than you.\p" + .string "When I do, I’m going to challenge you\n" + .string "to another battle.$" + +VerdanturfTown_WandasHouse_Text_178521:: @ 8178521 + .string "WALLY: Please watch me, {PLAYER}.\n" + .string "I’m going to get stronger than you.\p" + .string "When I do, I’m going to challenge you\n" + .string "to another battle.$" + +VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A + .string "UNCLE: Oh! {PLAYER}{KUN}!\n" + .string "WALLY’s next door.\p" + .string "But, boy, there’s something I have to\n" + .string "tell you.\p" + .string "This natural environment is doing\n" + .string "wonders for WALLY’s health.\p" + .string "Maybe it’s not just the environment.\n" + .string "It could be POKéMON that are giving the\l" + .string "boy hope.$" + +VerdanturfTown_WandasHouse_Text_178683:: @ 8178683 + .string "WALLY’s gone away...\n" + .string "He slipped off on his own...$" + +VerdanturfTown_WandasHouse_Text_1786B5:: @ 81786B5 + .string "UNCLE: Is that right?\n" + .string "WALLY’s gone away that far all by\l" + .string "himself...\p" + .string "Well, I have to give him credit - he is\n" + .string "my little brother’s son.$" + +VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 + .string "WANDA: You are?\n" + .string "Oh, right, I get it!\p" + .string "You’re the {PLAYER} who WALLY was\n" + .string "telling me about.\p" + .string "I’m WALLY’s cousin.\n" + .string "Glad to meet you!\p" + .string "I think WALLY’s become a lot more lively\n" + .string "and healthy since he came here.$" + +VerdanturfTown_WandasHouse_Text_1787FB:: @ 81787FB + .string "WANDA: Don’t worry about WALLY.\n" + .string "He’ll be just fine.\p" + .string "I know my little cousin, and he has\n" + .string "POKéMON with him, too.$" + +VerdanturfTown_WandasHouse_Text_17886A:: @ 817886A + .string "Thanks to you, I can see my girlfriend\n" + .string "every day.\l" + .string "Happy? You bet I am!$" + +VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 + .string "My daughter’s boyfriend is a very\n" + .string "driven and passionate sort of person.\p" + .string "He’s been digging a tunnel nonstop\n" + .string "just so he can see my daughter.\p" + .string "My daughter’s a little concerned,\n" + .string "so she goes out to the tunnel a lot.$" + +VerdanturfTown_WandasHouse_Text_178983:: @ 8178983 + .string "It’s amazing. My daughter’s boyfriend\n" + .string "was digging the tunnel by hand!\p" + .string "It’s so incredible!$" + +VerdanturfTown_WandasHouse_Text_1789DD:: @ 81789DD + .string "If anything were to happen to WALLY,\n" + .string "I would never be able to look his\l" + .string "parents in PETALBURG in the eye...$" + +VerdanturfTown_WandasHouse_Text_178A47:: @ 8178A47 + .string "WALLY was in EVER GRANDE?\p" + .string "His parents in PETALBURG would be\n" + .string "astonished to hear that!$" diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/maps/VictoryRoad_1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/VictoryRoad_1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc index 916e9bfc2..916e9bfc2 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/VictoryRoad_1F/events.inc diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 21937891e..61c47f001 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,9 +1,9 @@ VictoryRoad_1F:: @ 8307224 - .4byte VictoryRoad_1F_MapAttributes + .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 164 .byte 70 .byte 0 diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/maps/VictoryRoad_1F/map.bin deleted file mode 100644 index a78316ef9..000000000 --- a/data/maps/VictoryRoad_1F/map.bin +++ /dev/null @@ -1,10 +0,0 @@ - 22222222226 22222222222'222222222226222 XYZ # -222 #222 #F222222222222 BBBBBBB BBBBB2222 BBBBBBBBBBBBBB2222 BBBBBBBBBBBBBB# # -222222 -BBBB BBBBBBBB B B B"22222#BBB BBBBBBBBBBBBBBBB B B B B"BBBBBBBBBBBBBBBBBBBBBBBBBB 22222BB 2222222BB222 222222222 BB2222222222222222222222222 22 BB22222222222222222 222222 BB222 -2222222222222222222222 BBBBBBB B B B"22222222222222222222222BBBBBBBBBB22 -2222 -2222222222 B B BBBBBB B"22L6Q6M6222P6BBBBBBBBB2222222222222228#2222222222222222222228 # -222222222222222222228222222222222222222 -2228222222222222222222 B B B"2228# #22222222BBBBBBBB B B B"22222222222222#22BBBBBBBBBBB222222222222222 #B2222282222222222 ###B222228222222222# B B#B#BB22222 222222@QI22222222 ## # B#BBBBBB22222'62222222822222222 B B B B B B#BBBBBBBB# -2262222222822 # ## "# XYZ # # # ## "# # # ##"# ## #
\ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc new file mode 100644 index 000000000..045189759 --- /dev/null +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -0,0 +1,119 @@ +VictoryRoad_1F_MapScripts:: @ 815DE83 + map_script 3, VictoryRoad_1F_MapScript1_15DE89 + .byte 0 + +VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 + call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93 + end + +VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD + return + +VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 + lockall + addobject 4 + applymovement 4, VictoryRoad_1F_Movement_15DF07 + waitmovement 0 + goto VictoryRoad_1F_EventScript_15DED3 + end + +VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB + lockall + addobject 4 + applymovement 4, VictoryRoad_1F_Movement_15DF13 + waitmovement 0 + goto VictoryRoad_1F_EventScript_15DED3 + end + +VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF + lockall + addobject 4 + applymovement 4, VictoryRoad_1F_Movement_15DF1E + waitmovement 0 + goto VictoryRoad_1F_EventScript_15DED3 + end + +VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 + applymovement 255, VictoryRoad_1F_Movement_1A083F + waitmovement 0 + msgbox VictoryRoad_1F_Text_19782B, 4 + trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 + msgbox VictoryRoad_1F_Text_197967, 4 + clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD + moveobjectoffscreen 4 + setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD + setvar VAR_VICTORY_ROAD_1F_STATE, 1 + releaseall + end + +VictoryRoad_1F_Movement_15DF07:: @ 815DF07 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement + +VictoryRoad_1F_Movement_15DF13:: @ 815DF13 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement + +VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement + +VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 + msgbox VictoryRoad_1F_Text_197967, 2 + end + +VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 + trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq VictoryRoad_1F_EventScript_15DF58 + msgbox VictoryRoad_1F_Text_197A47, 6 + end + +VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 + trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + msgbox VictoryRoad_1F_Text_197A47, 6 + end + +VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F + trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + msgbox VictoryRoad_1F_Text_197B36, 6 + end + +VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 + trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + msgbox VictoryRoad_1F_Text_197BF7, 6 + end + +VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D + trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + msgbox VictoryRoad_1F_Text_197CAF, 6 + end diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc new file mode 100644 index 000000000..2f52e5cd4 --- /dev/null +++ b/data/maps/VictoryRoad_1F/text.inc @@ -0,0 +1,72 @@ +VictoryRoad_1F_Text_19782B:: @ 819782B + .string "WALLY: Hi! {PLAYER}!\p" + .string "I bet you’re surprised to see me here!\p" + .string "I made it all the way here, and it’s\n" + .string "all thanks to you!\p" + .string "{PLAYER}, losing to you that time\n" + .string "made me stronger!\p" + .string "But I’m not going to lose anymore!\p" + .string "I’m going to win! For the POKéMON who\n" + .string "gave me courage and strength!\p" + .string "Okay... Here I come!$" + +VictoryRoad_1F_Text_197943:: @ 8197943 + .string "Wow!\n" + .string "{PLAYER}, you are strong, after all!$" + +VictoryRoad_1F_Text_197967:: @ 8197967 + .string "WALLY: I couldn’t beat you today,\n" + .string "{PLAYER}, but one of these days, I’ll\l" + .string "catch up to you!$" + +VictoryRoad_1F_Text_1979BA:: @ 81979BA + .string "WALLY: Hi! {PLAYER}!\p" + .string "I’ve gotten stronger since that last\n" + .string "time! I wanted to show you, {PLAYER}!\p" + .string "Okay... Here I come!$" + +VictoryRoad_1F_Text_197A23:: @ 8197A23 + .string "Wow!\n" + .string "{PLAYER}, you are strong, after all!$" + +VictoryRoad_1F_Text_197A47:: @ 8197A47 + .string "WALLY: I couldn’t beat you this time,\n" + .string "too... But one of these days, {PLAYER},\l" + .string "I’m going to catch up to you...\p" + .string "And challenge the POKéMON LEAGUE!$" + +VictoryRoad_1F_Text_197AD1:: @ 8197AD1 + .string "I’ve made it this far a couple times,\n" + .string "but the last stretch is so long...$" + +VictoryRoad_1F_Text_197B1A:: @ 8197B1A + .string "My dream ends here again...$" + +VictoryRoad_1F_Text_197B36:: @ 8197B36 + .string "You’ve made it this far. Keep the\n" + .string "momentum going and become the\l" + .string "CHAMPION! If anyone can, it’s you!$" + +VictoryRoad_1F_Text_197B99:: @ 8197B99 + .string "I didn’t come all this way to lose now.\n" + .string "That possibility doesn’t exist!$" + +VictoryRoad_1F_Text_197BE1:: @ 8197BE1 + .string "Impossible...\n" + .string "I lost?$" + +VictoryRoad_1F_Text_197BF7:: @ 8197BF7 + .string "I lost here...\p" + .string "That means I lack the qualifications\n" + .string "to become the CHAMPION...$" + +VictoryRoad_1F_Text_197C45:: @ 8197C45 + .string "This seemingly infinite and harsh road\n" + .string "lives up to its name of VICTORY.$" + +VictoryRoad_1F_Text_197C8D:: @ 8197C8D + .string "Your battle style is fantastic...$" + +VictoryRoad_1F_Text_197CAF:: @ 8197CAF + .string "You seem to have the potential for\n" + .string "becoming the CHAMPION.$" diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/maps/VictoryRoad_B1F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/VictoryRoad_B1F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc index af5c86254..af5c86254 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/VictoryRoad_B1F/events.inc diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index ebaa67358..b705dc527 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,9 +1,9 @@ VictoryRoad_B1F:: @ 8307240 - .4byte VictoryRoad_B1F_MapAttributes + .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 286 .byte 70 .byte 1 diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/maps/VictoryRoad_B1F/map.bin deleted file mode 100644 index 706c96974..000000000 --- a/data/maps/VictoryRoad_B1F/map.bin +++ /dev/null @@ -1,25 +0,0 @@ - B BBBB BBBB222 2 222 BBBB2222222P22222222 # -222 BBBB2 -2282222222222 -222# -222BBBB222R2222 -2#222# -22 #BBBB 2222222 -2# #22#2#BBBBB# -2 -22 B B B BBBBB B B B B -2fBBBf#"22 22BBBBBBBBBBBB2 BBBBB2222222222222 BfBB# -2#2222 222 #"# "2222222222P2222222222#"2222222 -22228222# -22222 ## ## -228222# -22 B B#B # 22R222 #B B B BBBBBBBB222P22622# -22BBBBBBBBBBB2222222228222222222BBB2222222222R222 #22 22BBB22# -222 2222222#22BB #22 # -2222# -2222#22BB22222#222# #222BB22# 22# -22222BB 22 # -222# -222 222 # -222 222 2222222222222222222P222# -222222222222222222222282222222222222 #2222222222R222# ## ## ## #
\ No newline at end of file diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc new file mode 100644 index 000000000..e07cd4286 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -0,0 +1,17 @@ +VictoryRoad_B1F_MapScripts:: @ 815DFB4 + .byte 0 + +VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 + trainerbattle 0, OPPONENT_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + msgbox VictoryRoad_B1F_Text_197D5B, 6 + end + +VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC + trainerbattle 0, OPPONENT_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + msgbox VictoryRoad_B1F_Text_197E13, 6 + end + +VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 + trainerbattle 0, OPPONENT_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + msgbox VictoryRoad_B1F_Text_197EB6, 6 + end diff --git a/data/maps/VictoryRoad_B1F/text.inc b/data/maps/VictoryRoad_B1F/text.inc new file mode 100644 index 000000000..d820a5c31 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/text.inc @@ -0,0 +1,35 @@ +VictoryRoad_B1F_Text_197CE9:: @ 8197CE9 + .string "The thought that I’m getting closer to\n" + .string "the POKéMON LEAGUE...\p" + .string "I’m getting stage fright...$" + +VictoryRoad_B1F_Text_197D42:: @ 8197D42 + .string "I couldn’t do a thing...$" + +VictoryRoad_B1F_Text_197D5B:: @ 8197D5B + .string "The POKéMON LEAGUE became distant\n" + .string "again... What a letdown...$" + +VictoryRoad_B1F_Text_197D98:: @ 8197D98 + .string "To win your way through the POKéMON\n" + .string "LEAGUE, you need the trust of your\l" + .string "POKéMON.$" + +VictoryRoad_B1F_Text_197DE8:: @ 8197DE8 + .string "Your relationship is based on\n" + .string "solid trust.$" + +VictoryRoad_B1F_Text_197E13:: @ 8197E13 + .string "By being together all the time, trust\n" + .string "grows between POKéMON and TRAINERS.$" + +VictoryRoad_B1F_Text_197E5D:: @ 8197E5D + .string "This isn’t the goal. It’s only a place\n" + .string "on the way to the POKéMON LEAGUE.$" + +VictoryRoad_B1F_Text_197EA6:: @ 8197EA6 + .string "That’s the way!$" + +VictoryRoad_B1F_Text_197EB6:: @ 8197EB6 + .string "You’ll do fine, for sure!\n" + .string "Your POKéMON are all eager to go!$" diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/maps/VictoryRoad_B2F/border.bin deleted file mode 100644 index 423a0732e..000000000 --- a/data/maps/VictoryRoad_B2F/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc index b482e6f04..b482e6f04 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/VictoryRoad_B2F/events.inc diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 4690acbb7..7eb649cfb 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,9 +1,9 @@ VictoryRoad_B2F:: @ 830725C - .4byte VictoryRoad_B2F_MapAttributes + .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 - .2byte BGM_C_ROAD + .2byte MUS_C_ROAD .2byte 287 .byte 70 .byte 1 diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/maps/VictoryRoad_B2F/map.bin deleted file mode 100644 index 682c31764..000000000 --- a/data/maps/VictoryRoad_B2F/map.bin +++ /dev/null @@ -1 +0,0 @@ - 2 {{{{{{{{{{{{{{{{{{{{{{2222{{{{{{{{{{{{{{{{{{{{{{222222 22{{{{{{{{{{{{{{{{{{{{{{ 222222222{{{{{TUUUV{{{{{{{{{{{{22222222222W3W3W3y{W3W3W3W3W3W3W3W3y{{{222 "22222222222{22222222W3W3y{ #B22#B"222222222222{222222222222{222222222222222{2 2222222222{2 222222222 22222222222Z[tuv222 222222{222XY{{{{{{{{22222222222tuv{{PQ{{{{{{{22222222{{{{{{{{{{{{{{{{XY{{{{{{{{{{x #222222###UUUV{{{{{{{{{TUUUUUUUUUUV{{ 2#2222222# "V{{{TUUUU "D2D2D22222222#2 2 2 B B"D2D2D2 # B B B B B BBBBBBBB222222222BBBBBBBBB B B B B#BBBBBBBBBBBBBB2222 BBBBBBBBBBBBBBBBBBB222 NRRRO222BBBBBBBB222 22222222222 222222222 222222 222Q22222 222222 2229222222222222222222 622222S2222222222222222222226# ## #6# ## ## ## #
\ No newline at end of file diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc new file mode 100644 index 000000000..6b8fe2569 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -0,0 +1,22 @@ +VictoryRoad_B2F_MapScripts:: @ 815DFFA + .byte 0 + +VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB + trainerbattle 0, OPPONENT_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + msgbox VictoryRoad_B2F_Text_197F71, 6 + end + +VictoryRoad_B2F_EventScript_15E012:: @ 815E012 + trainerbattle 0, OPPONENT_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + msgbox VictoryRoad_B2F_Text_198047, 6 + end + +VictoryRoad_B2F_EventScript_15E029:: @ 815E029 + trainerbattle 0, OPPONENT_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + msgbox VictoryRoad_B2F_Text_1980C8, 6 + end + +VictoryRoad_B2F_EventScript_15E040:: @ 815E040 + trainerbattle 0, OPPONENT_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + msgbox VictoryRoad_B2F_Text_1981BA, 6 + end diff --git a/data/maps/VictoryRoad_B2F/text.inc b/data/maps/VictoryRoad_B2F/text.inc new file mode 100644 index 000000000..760a732ff --- /dev/null +++ b/data/maps/VictoryRoad_B2F/text.inc @@ -0,0 +1,49 @@ +VictoryRoad_B2F_Text_197EF2:: @ 8197EF2 + .string "I trained together with my whole family,\n" + .string "every one of us!\l" + .string "I’m not losing to anyone!$" + +VictoryRoad_B2F_Text_197F46:: @ 8197F46 + .string "Better than my family?!\n" + .string "Is that possible?!$" + +VictoryRoad_B2F_Text_197F71:: @ 8197F71 + .string "I was better than everyone in my\n" + .string "family. I’ve never lost before...\p" + .string "I’ve lost my confidence...\n" + .string "Maybe I’ll go home...$" + +VictoryRoad_B2F_Text_197FE5:: @ 8197FE5 + .string "I’d heard that there was a tough\n" + .string "little kid around. Do they mean you?$" + +VictoryRoad_B2F_Text_19802B:: @ 819802B + .string "The little shrimp is tough!$" + +VictoryRoad_B2F_Text_198047:: @ 8198047 + .string "The rumors I heard, that tough little\n" + .string "kid is from PETALBURG CITY.$" + +VictoryRoad_B2F_Text_198089:: @ 8198089 + .string "You must be getting a little tired.$" + +VictoryRoad_B2F_Text_1980AD:: @ 81980AD + .string "No signs of tiring at all!$" + +VictoryRoad_B2F_Text_1980C8:: @ 81980C8 + .string "VICTORY ROAD and the POKéMON LEAGUE\n" + .string "are long and grueling challenges.\l" + .string "Beware of fatigue!$" + +VictoryRoad_B2F_Text_198121:: @ 8198121 + .string "You shouldn’t get complacent just\n" + .string "because you have a lot of GYM BADGES.\p" + .string "There’s always going to be someone\n" + .string "who’s better than you!$" + +VictoryRoad_B2F_Text_1981A3:: @ 81981A3 + .string "You’re better than me!$" + +VictoryRoad_B2F_Text_1981BA:: @ 81981BA + .string "Gaze on your collected BADGES and\n" + .string "remember the TRAINERS you’ve faced.$" diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc deleted file mode 100644 index a9cc15869..000000000 --- a/data/maps/_assets.inc +++ /dev/null @@ -1,5006 +0,0 @@ -PetalburgCity_MapBorder:: @ 8287264 - .incbin "data/maps/PetalburgCity/border.bin" - -PetalburgCity_MapBlockdata:: @ 828726C - .incbin "data/maps/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_MapAttributes:: @ 8287974 - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .4byte PetalburgCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -SlateportCity_MapBorder:: @ 828798C - .incbin "data/maps/SlateportCity/border.bin" - -SlateportCity_MapBlockdata:: @ 8287994 - .incbin "data/maps/SlateportCity/map.bin" - - .align 2 -SlateportCity_MapAttributes:: @ 8288C54 - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .4byte SlateportCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - -MauvilleCity_MapBorder:: @ 8288C6C - .incbin "data/maps/MauvilleCity/border.bin" - -MauvilleCity_MapBlockdata:: @ 8288C74 - .incbin "data/maps/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_MapAttributes:: @ 82892B4 - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .4byte MauvilleCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -RustboroCity_MapBorder:: @ 82892CC - .incbin "data/maps/RustboroCity/border.bin" - -RustboroCity_MapBlockdata:: @ 82892D4 - .incbin "data/maps/RustboroCity/map.bin" - - .align 2 -RustboroCity_MapAttributes:: @ 828A594 - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .4byte RustboroCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -FortreeCity_MapBorder:: @ 828A5AC - .incbin "data/maps/FortreeCity/border.bin" - -FortreeCity_MapBlockdata:: @ 828A5B4 - .incbin "data/maps/FortreeCity/map.bin" - - .align 2 -FortreeCity_MapAttributes:: @ 828ABF4 - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .4byte FortreeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - -LilycoveCity_MapBorder:: @ 828AC0C - .incbin "data/maps/LilycoveCity/border.bin" - -LilycoveCity_MapBlockdata:: @ 828AC14 - .incbin "data/maps/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_MapAttributes:: @ 828C514 - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .4byte LilycoveCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -MossdeepCity_MapBorder:: @ 828C52C - .incbin "data/maps/MossdeepCity/border.bin" - -MossdeepCity_MapBlockdata:: @ 828C534 - .incbin "data/maps/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_MapAttributes:: @ 828DE34 - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .4byte MossdeepCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -SootopolisCity_MapBorder:: @ 828DE4C - .incbin "data/maps/SootopolisCity/border.bin" - -SootopolisCity_MapBlockdata:: @ 828DE54 - .incbin "data/maps/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_MapAttributes:: @ 828FA74 - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .4byte SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - -EverGrandeCity_MapBorder:: @ 828FA8C - .incbin "data/maps/EverGrandeCity/border.bin" - -EverGrandeCity_MapBlockdata:: @ 828FA94 - .incbin "data/maps/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_MapAttributes:: @ 8291394 - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .4byte EverGrandeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_EverGrande - -LittlerootTown_MapBorder:: @ 82913AC - .incbin "data/maps/LittlerootTown/border.bin" - -LittlerootTown_MapBlockdata:: @ 82913B4 - .incbin "data/maps/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_MapAttributes:: @ 82916D4 - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .4byte LittlerootTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -OldaleTown_MapBorder:: @ 82916EC - .incbin "data/maps/OldaleTown/border.bin" - -OldaleTown_MapBlockdata:: @ 82916F4 - .incbin "data/maps/OldaleTown/map.bin" - - .align 2 -OldaleTown_MapAttributes:: @ 8291A14 - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -DewfordTown_MapBorder:: @ 8291A2C - .incbin "data/maps/DewfordTown/border.bin" - -DewfordTown_MapBlockdata:: @ 8291A34 - .incbin "data/maps/DewfordTown/map.bin" - - .align 2 -DewfordTown_MapAttributes:: @ 8291D54 - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .4byte DewfordTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -LavaridgeTown_MapBorder:: @ 8291D6C - .incbin "data/maps/LavaridgeTown/border.bin" - -LavaridgeTown_MapBlockdata:: @ 8291D74 - .incbin "data/maps/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_MapAttributes:: @ 8292094 - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .4byte LavaridgeTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -FallarborTown_MapBorder:: @ 82920AC - .incbin "data/maps/FallarborTown/border.bin" - -FallarborTown_MapBlockdata:: @ 82920B4 - .incbin "data/maps/FallarborTown/map.bin" - - .align 2 -FallarborTown_MapAttributes:: @ 82923D4 - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .4byte FallarborTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -VerdanturfTown_MapBorder:: @ 82923EC - .incbin "data/maps/VerdanturfTown/border.bin" - -VerdanturfTown_MapBlockdata:: @ 82923F4 - .incbin "data/maps/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_MapAttributes:: @ 8292714 - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .4byte VerdanturfTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -PacifidlogTown_MapBorder:: @ 829272C - .incbin "data/maps/PacifidlogTown/border.bin" - -PacifidlogTown_MapBlockdata:: @ 8292734 - .incbin "data/maps/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_MapAttributes:: @ 8292D74 - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .4byte PacifidlogTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route101_MapBorder:: @ 8292D8C - .incbin "data/maps/Route101/border.bin" - -Route101_MapBlockdata:: @ 8292D94 - .incbin "data/maps/Route101/map.bin" - - .align 2 -Route101_MapAttributes:: @ 82930B4 - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -Route102_MapBorder:: @ 82930CC - .incbin "data/maps/Route102/border.bin" - -Route102_MapBlockdata:: @ 82930D4 - .incbin "data/maps/Route102/map.bin" - - .align 2 -Route102_MapAttributes:: @ 82938A4 - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -Route103_MapBorder:: @ 82938BC - .incbin "data/maps/Route103/border.bin" - -Route103_MapBlockdata:: @ 82938C4 - .incbin "data/maps/Route103/map.bin" - - .align 2 -Route103_MapAttributes:: @ 8294544 - .4byte 0x50 - .4byte 0x14 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -Route104_MapBorder:: @ 829455C - .incbin "data/maps/Route104/border.bin" - -Route104_MapBlockdata:: @ 8294564 - .incbin "data/maps/Route104/map.bin" - - .align 2 -Route104_MapAttributes:: @ 8295E64 - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .4byte Route104_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -Route105_MapBorder:: @ 8295E7C - .incbin "data/maps/Route105/border.bin" - -Route105_MapBlockdata:: @ 8295E84 - .incbin "data/maps/Route105/map.bin" - - .align 2 -Route105_MapAttributes:: @ 8297784 - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -Route106_MapBorder:: @ 829779C - .incbin "data/maps/Route106/border.bin" - -Route106_MapBlockdata:: @ 82977A4 - .incbin "data/maps/Route106/map.bin" - - .align 2 -Route106_MapAttributes:: @ 8298424 - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -Route107_MapBorder:: @ 829843C - .incbin "data/maps/Route107/border.bin" - -Route107_MapBlockdata:: @ 8298444 - .incbin "data/maps/Route107/map.bin" - - .align 2 -Route107_MapAttributes:: @ 8298DA4 - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -Route108_MapBorder:: @ 8298DBC - .incbin "data/maps/Route108/border.bin" - -Route108_MapBlockdata:: @ 8298DC4 - .incbin "data/maps/Route108/map.bin" - - .align 2 -Route108_MapAttributes:: @ 8299724 - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - -Route109_MapBorder:: @ 829973C - .incbin "data/maps/Route109/border.bin" - -Route109_MapBlockdata:: @ 8299744 - .incbin "data/maps/Route109/map.bin" - - .align 2 -Route109_MapAttributes:: @ 829AA04 - .4byte 0x28 - .4byte 0x3c - .4byte Route109_MapBorder - .4byte Route109_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - -Route110_MapBorder:: @ 829AA1C - .incbin "data/maps/Route110/border.bin" - -Route110_MapBlockdata:: @ 829AA24 - .incbin "data/maps/Route110/map.bin" - - .align 2 -Route110_MapAttributes:: @ 829C964 - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .4byte Route110_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route111_MapBorder:: @ 829C97C - .incbin "data/maps/Route111/border.bin" - -Route111_MapBlockdata:: @ 829C984 - .incbin "data/maps/Route111/map.bin" - - .align 2 -Route111_MapAttributes:: @ 829F544 - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route112_MapBorder:: @ 829F55C - .incbin "data/maps/Route112/border.bin" - -Route112_MapBlockdata:: @ 829F564 - .incbin "data/maps/Route112/map.bin" - - .align 2 -Route112_MapAttributes:: @ 82A0824 - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -Route113_MapBorder:: @ 82A083C - .incbin "data/maps/Route113/border.bin" - -Route113_MapBlockdata:: @ 82A0844 - .incbin "data/maps/Route113/map.bin" - - .align 2 -Route113_MapAttributes:: @ 82A17E4 - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route114_MapBorder:: @ 82A17FC - .incbin "data/maps/Route114/border.bin" - -Route114_MapBlockdata:: @ 82A1804 - .incbin "data/maps/Route114/map.bin" - - .align 2 -Route114_MapAttributes:: @ 82A3104 - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .4byte Route114_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route115_MapBorder:: @ 82A311C - .incbin "data/maps/Route115/border.bin" - -Route115_MapBlockdata:: @ 82A3124 - .incbin "data/maps/Route115/map.bin" - - .align 2 -Route115_MapAttributes:: @ 82A4A24 - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route116_MapBorder:: @ 82A4A3C - .incbin "data/maps/Route116/border.bin" - -Route116_MapBlockdata:: @ 82A4A44 - .incbin "data/maps/Route116/map.bin" - - .align 2 -Route116_MapAttributes:: @ 82A59E4 - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .4byte Route116_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -Route117_MapBorder:: @ 82A59FC - .incbin "data/maps/Route117/border.bin" - -Route117_MapBlockdata:: @ 82A5A04 - .incbin "data/maps/Route117/map.bin" - - .align 2 -Route117_MapAttributes:: @ 82A6364 - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .4byte Route117_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route118_MapBorder:: @ 82A637C - .incbin "data/maps/Route118/border.bin" - -Route118_MapBlockdata:: @ 82A6384 - .incbin "data/maps/Route118/map.bin" - - .align 2 -Route118_MapAttributes:: @ 82A7004 - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route119_MapBorder:: @ 82A701C - .incbin "data/maps/Route119/border.bin" - -Route119_MapBlockdata:: @ 82A7024 - .incbin "data/maps/Route119/map.bin" - - .align 2 -Route119_MapAttributes:: @ 82A9BE4 - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .4byte Route119_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - -Route120_MapBorder:: @ 82A9BFC - .incbin "data/maps/Route120/border.bin" - -Route120_MapBlockdata:: @ 82A9C04 - .incbin "data/maps/Route120/map.bin" - - .align 2 -Route120_MapAttributes:: @ 82ABB44 - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - -Route121_MapBorder:: @ 82ABB5C - .incbin "data/maps/Route121/border.bin" - -Route121_MapBlockdata:: @ 82ABB64 - .incbin "data/maps/Route121/map.bin" - - .align 2 -Route121_MapAttributes:: @ 82AC7E4 - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .4byte Route121_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -Route122_MapBorder:: @ 82AC7FC - .incbin "data/maps/Route122/border.bin" - -Route122_MapBlockdata:: @ 82AC804 - .incbin "data/maps/Route122/map.bin" - - .align 2 -Route122_MapAttributes:: @ 82AD484 - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -Route123_MapBorder:: @ 82AD49C - .incbin "data/maps/Route123/border.bin" - -Route123_MapBlockdata:: @ 82AD4A4 - .incbin "data/maps/Route123/map.bin" - - .align 2 -Route123_MapAttributes:: @ 82AEA84 - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -Route124_MapBorder:: @ 82AEA9C - .incbin "data/maps/Route124/border.bin" - -Route124_MapBlockdata:: @ 82AEAA4 - .incbin "data/maps/Route124/map.bin" - - .align 2 -Route124_MapAttributes:: @ 82B1CA4 - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .4byte Route124_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route125_MapBorder:: @ 82B1CBC - .incbin "data/maps/Route125/border.bin" - -Route125_MapBlockdata:: @ 82B1CC4 - .incbin "data/maps/Route125/map.bin" - - .align 2 -Route125_MapAttributes:: @ 82B35C4 - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route126_MapBorder:: @ 82B35DC - .incbin "data/maps/Route126/border.bin" - -Route126_MapBlockdata:: @ 82B35E4 - .incbin "data/maps/Route126/map.bin" - - .align 2 -Route126_MapAttributes:: @ 82B67E4 - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route127_MapBorder:: @ 82B67FC - .incbin "data/maps/Route127/border.bin" - -Route127_MapBlockdata:: @ 82B6804 - .incbin "data/maps/Route127/map.bin" - - .align 2 -Route127_MapAttributes:: @ 82B9A04 - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route128_MapBorder:: @ 82B9A1C - .incbin "data/maps/Route128/border.bin" - -Route128_MapBlockdata:: @ 82B9A24 - .incbin "data/maps/Route128/map.bin" - - .align 2 -Route128_MapAttributes:: @ 82BBFA4 - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route129_MapBorder:: @ 82BBFBC - .incbin "data/maps/Route129/border.bin" - -Route129_MapBlockdata:: @ 82BBFC4 - .incbin "data/maps/Route129/map.bin" - - .align 2 -Route129_MapAttributes:: @ 82BD8C4 - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -UnreferencedMap_MapBorder: @ 82BD8DC - .incbin "data/maps/UnreferencedMap/border.bin" - -UnreferencedMap_MapBlockdata: @ 82BD8E4 - .incbin "data/maps/UnreferencedMap/map.bin" - - .align 2 -UnreferencedMap_MapAttributes:: @ 82BF1E4 - .4byte 0x50 - .4byte 0x28 - .4byte UnreferencedMap_MapBorder - .4byte UnreferencedMap_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -Route131_MapBorder:: @ 82BF1FC - .incbin "data/maps/Route131/border.bin" - -Route131_MapBlockdata:: @ 82BF204 - .incbin "data/maps/Route131/map.bin" - - .align 2 -Route131_MapAttributes:: @ 82C04C4 - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route132_MapBorder:: @ 82C04DC - .incbin "data/maps/Route132/border.bin" - -Route132_MapBlockdata:: @ 82C04E4 - .incbin "data/maps/Route132/map.bin" - - .align 2 -Route132_MapAttributes:: @ 82C1DE4 - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route133_MapBorder:: @ 82C1DFC - .incbin "data/maps/Route133/border.bin" - -Route133_MapBlockdata:: @ 82C1E04 - .incbin "data/maps/Route133/map.bin" - - .align 2 -Route133_MapAttributes:: @ 82C3704 - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route134_MapBorder:: @ 82C371C - .incbin "data/maps/Route134/border.bin" - -Route134_MapBlockdata:: @ 82C3724 - .incbin "data/maps/Route134/map.bin" - - .align 2 -Route134_MapAttributes:: @ 82C5024 - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Underwater2_MapBorder:: @ 82C503C - .incbin "data/maps/Underwater2/border.bin" - -Underwater2_MapBlockdata:: @ 82C5044 - .incbin "data/maps/Underwater2/map.bin" - - .align 2 -Underwater2_MapAttributes:: @ 82C8244 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -Underwater3_MapBorder:: @ 82C825C - .incbin "data/maps/Underwater3/border.bin" - -Underwater3_MapBlockdata:: @ 82C8264 - .incbin "data/maps/Underwater3/map.bin" - - .align 2 -Underwater3_MapAttributes:: @ 82CB464 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -Underwater4_MapBorder:: @ 82CB47C - .incbin "data/maps/Underwater4/border.bin" - -Underwater4_MapBlockdata:: @ 82CB484 - .incbin "data/maps/Underwater4/map.bin" - - .align 2 -Underwater4_MapAttributes:: @ 82CDA04 - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin" - -LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24 - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04 - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin" - -LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4 - .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin" - -LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC - .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84 - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C - .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin" - -LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4 - .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34 - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin" - -LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54 - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8 - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -House1_MapBorder:: @ 82CDEC0 - .incbin "data/maps/House1/border.bin" - -House1_MapBlockdata:: @ 82CDEC8 - .incbin "data/maps/House1/map.bin" - - .align 2 -House1_MapAttributes:: @ 82CDF7C - .4byte 0xa - .4byte 0x9 - .4byte House1_MapBorder - .4byte House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -House2_MapBorder:: @ 82CDF94 - .incbin "data/maps/House2/border.bin" - -House2_MapBlockdata:: @ 82CDF9C - .incbin "data/maps/House2/map.bin" - - .align 2 -House2_MapAttributes:: @ 82CE04C - .4byte 0xb - .4byte 0x8 - .4byte House2_MapBorder - .4byte House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PokemonCenter_1F_MapBorder:: @ 82CE064 - .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin" - -PokemonCenter_1F_MapBlockdata:: @ 82CE06C - .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin" - - .align 2 -PokemonCenter_1F_MapAttributes:: @ 82CE168 - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_1F_MapBorder - .4byte PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -PokemonCenter_2F_MapBorder:: @ 82CE180 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin" - -PokemonCenter_2F_MapBlockdata:: @ 82CE188 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin" - - .align 2 -PokemonCenter_2F_MapAttributes:: @ 82CE284 - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_2F_MapBorder - .4byte PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -PokeMart_MapBorder:: @ 82CE29C - .incbin "data/maps/OldaleTown_Mart/border.bin" - -PokeMart_MapBlockdata:: @ 82CE2A4 - .incbin "data/maps/OldaleTown_Mart/map.bin" - - .align 2 -PokeMart_MapAttributes:: @ 82CE354 - .4byte 0xb - .4byte 0x8 - .4byte PokeMart_MapBorder - .4byte PokeMart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -DewfordTown_House1_MapBorder:: @ 82CE36C - .incbin "data/maps/DewfordTown_House1/border.bin" - -DewfordTown_House1_MapBlockdata:: @ 82CE374 - .incbin "data/maps/DewfordTown_House1/map.bin" - - .align 2 -DewfordTown_House1_MapAttributes:: @ 82CE414 -LavaridgeTown_House_MapAttributes:: @ 82CE414 -Route111_OldLadysRestStop_MapAttributes:: @ 82CE414 - .4byte 0xa - .4byte 0x8 - .4byte DewfordTown_House1_MapBorder - .4byte DewfordTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -DewfordTown_Gym_MapBorder:: @ 82CE42C - .incbin "data/maps/DewfordTown_Gym/border.bin" - -DewfordTown_Gym_MapBlockdata:: @ 82CE434 - .incbin "data/maps/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_MapAttributes:: @ 82CE824 - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .4byte DewfordTown_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_DewfordGym - -DewfordTown_Hall_MapBorder:: @ 82CE83C - .incbin "data/maps/DewfordTown_Hall/border.bin" - -DewfordTown_Hall_MapBlockdata:: @ 82CE844 - .incbin "data/maps/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_MapAttributes:: @ 82CE978 - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -DewfordTown_House2_MapBorder:: @ 82CE990 - .incbin "data/maps/DewfordTown_House2/border.bin" - -DewfordTown_House2_MapBlockdata:: @ 82CE998 - .incbin "data/maps/DewfordTown_House2/map.bin" - - .align 2 -DewfordTown_House2_MapAttributes:: @ 82CEA4C -Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C - .4byte 0xa - .4byte 0x9 - .4byte DewfordTown_House2_MapBorder - .4byte DewfordTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64 - .incbin "data/maps/LavaridgeTown_HerbShop/border.bin" - -LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C - .incbin "data/maps/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34 - .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin" - -LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C - .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C - .4byte 0xb - .4byte 0x18 - .4byte LavaridgeTown_Gym_1F_MapBorder - .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - -LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64 - .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin" - -LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C - .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C - .4byte 0xb - .4byte 0x18 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - -LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94 - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin" - -LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098 - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0 - .incbin "data/maps/FallarborTown_ContestLobby/border.bin" - -FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8 - .incbin "data/maps/FallarborTown_ContestLobby/map.bin" - - .align 2 -FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C -SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C -VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_ContestLobby_MapBorder - .4byte FallarborTown_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -FallarborTown_ContestHall_MapBorder:: @ 82CF1A4 - .incbin "data/maps/FallarborTown_ContestHall/border.bin" - -FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC - .incbin "data/maps/FallarborTown_ContestHall/map.bin" - - .align 2 -FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0 -SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0 -VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0 - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_ContestHall_MapBorder - .4byte FallarborTown_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LilycoveCity_House2_MapBorder:: @ 82CF4B8 - .incbin "data/maps/LilycoveCity_House2/border.bin" - -LilycoveCity_House2_MapBlockdata:: @ 82CF4C0 - .incbin "data/maps/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_MapAttributes:: @ 82CF540 - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .4byte LilycoveCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -UnknownMapBorder_082CF564: - .incbin "data/maps/UnknownMap_082CF564/border.bin" - -UnknownMapBlockdata_082CF564: - .incbin "data/maps/UnknownMap_082CF564/map.bin" - - .align 2 -UnknownMapAttributes_082CF564:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082CF564 - .4byte UnknownMapBlockdata_082CF564 - .4byte gTileset_Building - .4byte gTileset_Contest - -VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C - .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin" - -VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584 - .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694 - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PacifidlogTown_House1_MapBorder:: @ 82CF6AC - .incbin "data/maps/PacifidlogTown_House1/border.bin" - -PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4 - .incbin "data/maps/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_MapAttributes:: @ 82CF768 -PacifidlogTown_House3_MapAttributes:: @ 82CF768 -PacifidlogTown_House5_MapAttributes:: @ 82CF768 - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .4byte PacifidlogTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PacifidlogTown_House2_MapBorder:: @ 82CF780 - .incbin "data/maps/PacifidlogTown_House2/border.bin" - -PacifidlogTown_House2_MapBlockdata:: @ 82CF788 - .incbin "data/maps/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_MapAttributes:: @ 82CF83C -PacifidlogTown_House4_MapAttributes:: @ 82CF83C - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PetalburgCity_Gym_MapBorder:: @ 82CF854 - .incbin "data/maps/PetalburgCity_Gym/border.bin" - -PetalburgCity_Gym_MapBlockdata:: @ 82CF85C - .incbin "data/maps/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_MapAttributes:: @ 82D003C - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - -PetalburgCity_House2_MapBorder:: @ 82D0054 - .incbin "data/maps/PetalburgCity_House2/border.bin" - -PetalburgCity_House2_MapBlockdata:: @ 82D005C - .incbin "data/maps/PetalburgCity_House2/map.bin" - - .align 2 -MossdeepCity_House4_MapAttributes:: @ 82D00FC -PetalburgCity_House2_MapAttributes:: @ 82D00FC -SlateportCity_House1_MapAttributes:: @ 82D00FC - .4byte 0xa - .4byte 0x8 - .4byte PetalburgCity_House2_MapBorder - .4byte PetalburgCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114 - .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin" - -SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C - .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394 - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC - .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin" - -SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4 - .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4 - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -UnknownMapBorder_082D05D8:: - .incbin "data/maps/UnknownMap_082D05D8/border.bin" - -UnknownMapBlockdata_082D05D8:: - .incbin "data/maps/UnknownMap_082D05D8/map.bin" - - .align 2 -UnknownMapAttributes_082D05D8:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082D05D8 - .4byte UnknownMapBlockdata_082D05D8 - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMapBorder_082D05FC:: - .incbin "data/maps/UnknownMap_082D05FC/border.bin" - -UnknownMapBlockdata_082D05FC:: - .incbin "data/maps/UnknownMap_082D05FC/map.bin" - - .align 2 -UnknownMapAttributes_082D05FC:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082D05FC - .4byte UnknownMapBlockdata_082D05FC - .4byte gTileset_Building - .4byte gTileset_Contest - -SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614 - .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin" - -SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C - .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750 - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonFanClub - -SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768 - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin" - -SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770 - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8 - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - -SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0 - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin" - -SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8 - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60 - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - -SlateportCity_Harbor_MapBorder:: @ 82D0A78 - .incbin "data/maps/SlateportCity_Harbor/border.bin" - -SlateportCity_Harbor_MapBlockdata:: @ 82D0A80 - .incbin "data/maps/SlateportCity_Harbor/map.bin" - - .align 2 -LilycoveCity_Harbor_MapAttributes:: @ 82D0D50 -SlateportCity_Harbor_MapAttributes:: @ 82D0D50 - .4byte 0x18 - .4byte 0xf - .4byte SlateportCity_Harbor_MapBorder - .4byte SlateportCity_Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MauvilleCity_Gym_MapBorder:: @ 82D0D68 - .incbin "data/maps/MauvilleCity_Gym/border.bin" - -MauvilleCity_Gym_MapBlockdata:: @ 82D0D70 - .incbin "data/maps/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_MapAttributes:: @ 82D0F14 - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .4byte MauvilleCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGym - -MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C - .incbin "data/maps/MauvilleCity_BikeShop/border.bin" - -MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34 - .incbin "data/maps/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_MapAttributes:: @ 82D100C - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - -MauvilleCity_GameCorner_MapBorder:: @ 82D1024 - .incbin "data/maps/MauvilleCity_GameCorner/border.bin" - -MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C - .incbin "data/maps/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_MapAttributes:: @ 82D1210 - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGameCorner - -RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228 - .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin" - -RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230 - .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0 - .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin" - -RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8 - .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -RustboroCity_Gym_MapBorder:: @ 82D1518 - .incbin "data/maps/RustboroCity_Gym/border.bin" - -RustboroCity_Gym_MapBlockdata:: @ 82D1520 - .incbin "data/maps/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_MapAttributes:: @ 82D16C4 - .4byte 0xb - .4byte 0x13 - .4byte RustboroCity_Gym_MapBorder - .4byte RustboroCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_RustboroGym - -RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC - .incbin "data/maps/RustboroCity_PokemonSchool/border.bin" - -RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4 - .incbin "data/maps/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - -RustboroCity_House2_MapBorder:: @ 82D1804 - .incbin "data/maps/RustboroCity_House2/border.bin" - -RustboroCity_House2_MapBlockdata:: @ 82D180C - .incbin "data/maps/RustboroCity_House2/map.bin" - - .align 2 -RustboroCity_House2_MapAttributes:: @ 82D18E4 -RustboroCity_House3_MapAttributes:: @ 82D18E4 - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House2_MapBorder - .4byte RustboroCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_House1_MapBorder:: @ 82D18FC - .incbin "data/maps/RustboroCity_House1/border.bin" - -RustboroCity_House1_MapBlockdata:: @ 82D1904 - .incbin "data/maps/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_MapAttributes:: @ 82D19D4 - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .4byte RustboroCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC - .incbin "data/maps/RustboroCity_CuttersHouse/border.bin" - -RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4 - .incbin "data/maps/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -FortreeCity_House1_MapBorder:: @ 82D1AD4 - .incbin "data/maps/FortreeCity_House1/border.bin" - -FortreeCity_House1_MapBlockdata:: @ 82D1ADC - .incbin "data/maps/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_MapAttributes:: @ 82D1B3C -FortreeCity_House3_MapAttributes:: @ 82D1B3C -FortreeCity_House5_MapAttributes:: @ 82D1B3C - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .4byte FortreeCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -FortreeCity_Gym_MapBorder:: @ 82D1B54 - .incbin "data/maps/FortreeCity_Gym/border.bin" - -FortreeCity_Gym_MapBlockdata:: @ 82D1B5C - .incbin "data/maps/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_MapAttributes:: @ 82D1F44 - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .4byte FortreeCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_FortreeGym - -FortreeCity_House2_MapBorder:: @ 82D1F5C - .incbin "data/maps/FortreeCity_House2/border.bin" - -FortreeCity_House2_MapBlockdata:: @ 82D1F64 - .incbin "data/maps/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_MapAttributes:: @ 82D1FC4 -FortreeCity_House4_MapAttributes:: @ 82D1FC4 - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .4byte FortreeCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC - .incbin "data/maps/Route104_MrBrineysHouse/border.bin" - -Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4 - .incbin "data/maps/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin" - -LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328 - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - -LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin" - -LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584 - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - -LilycoveCity_ContestLobby_MapBorder:: @ 82D259C - .incbin "data/maps/LilycoveCity_ContestLobby/border.bin" - -LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4 - .incbin "data/maps/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC - .4byte 0x17 - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LilycoveCity_ContestHall_MapBorder:: @ 82D27E4 - .incbin "data/maps/LilycoveCity_ContestHall/border.bin" - -LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC - .incbin "data/maps/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_MapAttributes:: @ 82D3514 - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin" - -LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534 - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684 - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LilycoveCity_EmptyMap_MapBorder:: @ 82D369C - .incbin "data/maps/LilycoveCity_EmptyMap/border.bin" - -LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4 - .incbin "data/maps/LilycoveCity_EmptyMap/map.bin" - - .align 2 -LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8 - .4byte 0x1 - .4byte 0x1 - .4byte LilycoveCity_EmptyMap_MapBorder - .4byte LilycoveCity_EmptyMap_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MossdeepCity_Gym_MapBorder:: @ 82D36C0 - .incbin "data/maps/MossdeepCity_Gym/border.bin" - -MossdeepCity_Gym_MapBlockdata:: @ 82D36C8 - .incbin "data/maps/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_MapAttributes:: @ 82D3B78 - .4byte 0x14 - .4byte 0x1e - .4byte MossdeepCity_Gym_MapBorder - .4byte MossdeepCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGym - -SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90 - .incbin "data/maps/SootopolisCity_Gym_1F/border.bin" - -SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98 - .incbin "data/maps/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - -SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24 - .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin" - -SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C - .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0 - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - -EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8 - .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin" - -EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0 - .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444 - .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin" - -EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C - .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0 - .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin" - -EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8 - .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C - .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin" - -EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764 - .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8 - .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin" - -EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0 - .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44 - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C - .incbin "data/maps/EverGrandeCity_Corridor1/border.bin" - -EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64 - .incbin "data/maps/EverGrandeCity_Corridor1/map.bin" - - .align 2 -EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84 -EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84 -EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84 -EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84 - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_Corridor1_MapBorder - .4byte EverGrandeCity_Corridor1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C - .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin" - -Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4 - .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4 -Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4 - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PrettyPetalFlowerShop - -Route112_CableCarStation_MapBorder:: @ 82D4CCC - .incbin "data/maps/Route112_CableCarStation/border.bin" - -Route112_CableCarStation_MapBlockdata:: @ 82D4CD4 - .incbin "data/maps/Route112_CableCarStation/map.bin" - - .align 2 -MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C -Route112_CableCarStation_MapAttributes:: @ 82D4E0C - .4byte 0xd - .4byte 0xc - .4byte Route112_CableCarStation_MapBorder - .4byte Route112_CableCarStation_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24 - .incbin "data/maps/Route114_FossilManiacsHouse/border.bin" - -Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C - .incbin "data/maps/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4 - .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin" - -Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC - .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190 - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route114_LanettesHouse_MapBorder:: @ 82D51A8 - .incbin "data/maps/Route114_LanettesHouse/border.bin" - -Route114_LanettesHouse_MapBlockdata:: @ 82D51B0 - .incbin "data/maps/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_MapAttributes:: @ 82D5260 - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -Route116_TunnelersRestHouse_MapBorder:: @ 82D5278 - .incbin "data/maps/Route116_TunnelersRestHouse/border.bin" - -Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280 - .incbin "data/maps/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334 - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route117_PokemonDayCare_MapBorder:: @ 82D534C - .incbin "data/maps/Route117_PokemonDayCare/border.bin" - -Route117_PokemonDayCare_MapBlockdata:: @ 82D5354 - .incbin "data/maps/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_MapAttributes:: @ 82D542C - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - -Route121_SafariZoneEntrance_MapBorder:: @ 82D5444 - .incbin "data/maps/Route121_SafariZoneEntrance/border.bin" - -Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C - .incbin "data/maps/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644 - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -MeteorFalls_1F_1R_MapBorder:: @ 82D565C - .incbin "data/maps/MeteorFalls_1F_1R/border.bin" - -MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664 - .incbin "data/maps/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_MapAttributes:: @ 82D603C - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -MeteorFalls_1F_2R_MapBorder:: @ 82D6054 - .incbin "data/maps/MeteorFalls_1F_2R/border.bin" - -MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C - .incbin "data/maps/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4 - .incbin "data/maps/MeteorFalls_B1F_1R/border.bin" - -MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC - .incbin "data/maps/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098 - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0 - .incbin "data/maps/MeteorFalls_B1F_2R/border.bin" - -MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8 - .incbin "data/maps/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244 - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -RusturfTunnel_MapBorder:: @ 82D725C - .incbin "data/maps/RusturfTunnel/border.bin" - -RusturfTunnel_MapBlockdata:: @ 82D7264 - .incbin "data/maps/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_MapAttributes:: @ 82D7924 - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - -Underwater_SootopolisCity_MapBorder:: @ 82D793C - .incbin "data/maps/Underwater_SootopolisCity/border.bin" - -Underwater_SootopolisCity_MapBlockdata:: @ 82D7944 - .incbin "data/maps/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4 - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -DesertRuins_MapBorder:: @ 82D7AEC - .incbin "data/maps/DesertRuins/border.bin" - -DesertRuins_MapBlockdata:: @ 82D7AF4 - .incbin "data/maps/DesertRuins/map.bin" - - .align 2 -DesertRuins_MapAttributes:: @ 82D7F58 - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -GraniteCave_1F_MapBorder:: @ 82D7F70 - .incbin "data/maps/GraniteCave_1F/border.bin" - -GraniteCave_1F_MapBlockdata:: @ 82D7F78 - .incbin "data/maps/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_MapAttributes:: @ 82D8464 - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .4byte GraniteCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -GraniteCave_B1F_MapBorder:: @ 82D847C - .incbin "data/maps/GraniteCave_B1F/border.bin" - -GraniteCave_B1F_MapBlockdata:: @ 82D8484 - .incbin "data/maps/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_MapAttributes:: @ 82D8B04 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .4byte GraniteCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -GraniteCave_B2F_MapBorder:: @ 82D8B1C - .incbin "data/maps/GraniteCave_B2F/border.bin" - -GraniteCave_B2F_MapBlockdata:: @ 82D8B24 - .incbin "data/maps/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_MapAttributes:: @ 82D91A4 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .4byte GraniteCave_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -PetalburgWoods_MapBorder:: @ 82D91BC - .incbin "data/maps/PetalburgWoods/border.bin" - -PetalburgWoods_MapBlockdata:: @ 82D91C4 - .incbin "data/maps/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_MapAttributes:: @ 82DA244 - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .4byte PetalburgWoods_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -MtChimney_MapBorder:: @ 82DA25C - .incbin "data/maps/MtChimney/border.bin" - -MtChimney_MapBlockdata:: @ 82DA264 - .incbin "data/maps/MtChimney/map.bin" - - .align 2 -MtChimney_MapAttributes:: @ 82DB114 - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .4byte MtChimney_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -MtPyre_1F_MapBorder:: @ 82DB12C - .incbin "data/maps/MtPyre_1F/border.bin" - -MtPyre_1F_MapBlockdata:: @ 82DB134 - .incbin "data/maps/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_MapAttributes:: @ 82DB478 - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .4byte MtPyre_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_2F_MapBorder:: @ 82DB490 - .incbin "data/maps/MtPyre_2F/border.bin" - -MtPyre_2F_MapBlockdata:: @ 82DB498 - .incbin "data/maps/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_MapAttributes:: @ 82DB5EC - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .4byte MtPyre_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_3F_MapBorder:: @ 82DB604 - .incbin "data/maps/MtPyre_3F/border.bin" - -MtPyre_3F_MapBlockdata:: @ 82DB60C - .incbin "data/maps/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_MapAttributes:: @ 82DB760 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .4byte MtPyre_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_4F_MapBorder:: @ 82DB778 - .incbin "data/maps/MtPyre_4F/border.bin" - -MtPyre_4F_MapBlockdata:: @ 82DB780 - .incbin "data/maps/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_MapAttributes:: @ 82DB8D4 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .4byte MtPyre_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_5F_MapBorder:: @ 82DB8EC - .incbin "data/maps/MtPyre_5F/border.bin" - -MtPyre_5F_MapBlockdata:: @ 82DB8F4 - .incbin "data/maps/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_MapAttributes:: @ 82DBA48 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .4byte MtPyre_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_6F_MapBorder:: @ 82DBA60 - .incbin "data/maps/MtPyre_6F/border.bin" - -MtPyre_6F_MapBlockdata:: @ 82DBA68 - .incbin "data/maps/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_MapAttributes:: @ 82DBBBC - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .4byte MtPyre_6F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AquaHideout_1F_MapBorder:: @ 82DBBD4 - .incbin "data/maps/AquaHideout_1F/border.bin" - -AquaHideout_1F_MapBlockdata:: @ 82DBBDC - .incbin "data/maps/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_MapAttributes:: @ 82DC26C - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .4byte AquaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AquaHideout_B1F_MapBorder:: @ 82DC284 - .incbin "data/maps/AquaHideout_B1F/border.bin" - -AquaHideout_B1F_MapBlockdata:: @ 82DC28C - .incbin "data/maps/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_MapAttributes:: @ 82DCC1C - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .4byte AquaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AquaHideout_B2F_MapBorder:: @ 82DCC34 - .incbin "data/maps/AquaHideout_B2F/border.bin" - -AquaHideout_B2F_MapBlockdata:: @ 82DCC3C - .incbin "data/maps/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_MapAttributes:: @ 82DD29C - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .4byte AquaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4 - .incbin "data/maps/Underwater_SeafloorCavern/border.bin" - -Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC - .incbin "data/maps/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8 - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0 - .incbin "data/maps/SeafloorCavern_Entrance/border.bin" - -SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8 - .incbin "data/maps/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room1_MapBorder:: @ 82DD710 - .incbin "data/maps/SeafloorCavern_Room1/border.bin" - -SeafloorCavern_Room1_MapBlockdata:: @ 82DD718 - .incbin "data/maps/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_MapAttributes:: @ 82DDA60 - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .4byte SeafloorCavern_Room1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room2_MapBorder:: @ 82DDA78 - .incbin "data/maps/SeafloorCavern_Room2/border.bin" - -SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80 - .incbin "data/maps/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_MapAttributes:: @ 82DDD74 - .4byte 0x12 - .4byte 0x15 - .4byte SeafloorCavern_Room2_MapBorder - .4byte SeafloorCavern_Room2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room3_MapBorder:: @ 82DDD8C - .incbin "data/maps/SeafloorCavern_Room3/border.bin" - -SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94 - .incbin "data/maps/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4 - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .4byte SeafloorCavern_Room3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room4_MapBorder:: @ 82DDFCC - .incbin "data/maps/SeafloorCavern_Room4/border.bin" - -SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4 - .incbin "data/maps/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_MapAttributes:: @ 82DE280 - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .4byte SeafloorCavern_Room4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room5_MapBorder:: @ 82DE298 - .incbin "data/maps/SeafloorCavern_Room5/border.bin" - -SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0 - .incbin "data/maps/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .4byte SeafloorCavern_Room5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room6_MapBorder:: @ 82DE5D8 - .incbin "data/maps/SeafloorCavern_Room6/border.bin" - -SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0 - .incbin "data/maps/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_MapAttributes:: @ 82DEA30 - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .4byte SeafloorCavern_Room6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SeafloorCavern_Room7_MapBorder:: @ 82DEA48 - .incbin "data/maps/SeafloorCavern_Room7/border.bin" - -SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50 - .incbin "data/maps/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_MapAttributes:: @ 82DEED0 - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .4byte SeafloorCavern_Room7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SeafloorCavern_Room8_MapBorder:: @ 82DEEE8 - .incbin "data/maps/SeafloorCavern_Room8/border.bin" - -SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0 - .incbin "data/maps/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_MapAttributes:: @ 82DF024 - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .4byte SeafloorCavern_Room8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room9_MapBorder:: @ 82DF03C - .incbin "data/maps/SeafloorCavern_Room9/border.bin" - -SeafloorCavern_Room9_MapBlockdata:: @ 82DF044 - .incbin "data/maps/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8 - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .4byte SeafloorCavern_Room9_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10 - .incbin "data/maps/CaveOfOrigin_Entrance/border.bin" - -CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18 - .incbin "data/maps/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4 - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_1F_MapBorder:: @ 82DFE0C - .incbin "data/maps/CaveOfOrigin_1F/border.bin" - -CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14 - .incbin "data/maps/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_MapAttributes:: @ 82E0238 - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .4byte CaveOfOrigin_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B1F_MapBorder:: @ 82E0250 - .incbin "data/maps/CaveOfOrigin_B1F/border.bin" - -CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258 - .incbin "data/maps/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_MapAttributes:: @ 82E067C - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_B1F_MapBorder - .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B2F_MapBorder:: @ 82E0694 - .incbin "data/maps/CaveOfOrigin_B2F/border.bin" - -CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C - .incbin "data/maps/CaveOfOrigin_B2F/map.bin" - - .align 2 -CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10 - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_B2F_MapBorder - .4byte CaveOfOrigin_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B3F_MapBorder:: @ 82E0A28 - .incbin "data/maps/CaveOfOrigin_B3F/border.bin" - -CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30 - .incbin "data/maps/CaveOfOrigin_B3F/map.bin" - - .align 2 -CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50 - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_B3F_MapBorder - .4byte CaveOfOrigin_B3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B4F_MapBorder:: @ 82E0D68 - .incbin "data/maps/CaveOfOrigin_B4F/border.bin" - -CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70 - .incbin "data/maps/CaveOfOrigin_B4F/map.bin" - - .align 2 -CaveOfOrigin_B4F_MapAttributes:: @ 82E1044 - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B4F_MapBorder - .4byte CaveOfOrigin_B4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -VictoryRoad_1F_MapBorder:: @ 82E105C - .incbin "data/maps/VictoryRoad_1F/border.bin" - -VictoryRoad_1F_MapBlockdata:: @ 82E1064 - .incbin "data/maps/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_MapAttributes:: @ 82E2090 - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .4byte VictoryRoad_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin" - -ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44 - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C - .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin" - -ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64 - .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824 - .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin" - -ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C - .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4 - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC - .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin" - -ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4 - .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28 - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin" - -ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4 - .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin" - -ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC - .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4 - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E55C8: - .incbin "data/maps/UnknownMap_082E55C8/border.bin" - -UnknownMapBlockdata_082E55C8: - .incbin "data/maps/UnknownMap_082E55C8/map.bin" - - .align 2 -UnknownMapAttributes_082E55C8: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E55C8 - .4byte UnknownMapBlockdata_082E55C8 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E55EC: - .incbin "data/maps/UnknownMap_082E55EC/border.bin" - -UnknownMapBlockdata_082E55EC: - .incbin "data/maps/UnknownMap_082E55EC/map.bin" - - .align 2 -UnknownMapAttributes_082E55EC: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E55EC - .4byte UnknownMapBlockdata_082E55EC - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5610: - .incbin "data/maps/UnknownMap_082E5610/border.bin" - -UnknownMapBlockdata_082E5610: - .incbin "data/maps/UnknownMap_082E5610/map.bin" - - .align 2 -UnknownMapAttributes_082E5610: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5610 - .4byte UnknownMapBlockdata_082E5610 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5634: - .incbin "data/maps/UnknownMap_082E5634/border.bin" - -UnknownMapBlockdata_082E5634: - .incbin "data/maps/UnknownMap_082E5634/map.bin" - - .align 2 -UnknownMapAttributes_082E5634: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5634 - .4byte UnknownMapBlockdata_082E5634 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5658: - .incbin "data/maps/UnknownMap_082E5658/border.bin" - -UnknownMapBlockdata_082E5658: - .incbin "data/maps/UnknownMap_082E5658/map.bin" - - .align 2 -UnknownMapAttributes_082E5658: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5658 - .4byte UnknownMapBlockdata_082E5658 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E567C: - .incbin "data/maps/UnknownMap_082E567C/border.bin" - -UnknownMapBlockdata_082E567C: - .incbin "data/maps/UnknownMap_082E567C/map.bin" - - .align 2 -UnknownMapAttributes_082E567C: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E567C - .4byte UnknownMapBlockdata_082E567C - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E56A0: - .incbin "data/maps/UnknownMap_082E56A0/border.bin" - -UnknownMapBlockdata_082E56A0: - .incbin "data/maps/UnknownMap_082E56A0/map.bin" - - .align 2 -UnknownMapAttributes_082E56A0: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E56A0 - .4byte UnknownMapBlockdata_082E56A0 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E56C4: - .incbin "data/maps/UnknownMap_082E56C4/border.bin" - -UnknownMapBlockdata_082E56C4: - .incbin "data/maps/UnknownMap_082E56C4/map.bin" - - .align 2 -UnknownMapAttributes_082E56C4: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E56C4 - .4byte UnknownMapBlockdata_082E56C4 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E56E8: - .incbin "data/maps/UnknownMap_082E56E8/border.bin" - -UnknownMapBlockdata_082E56E8: - .incbin "data/maps/UnknownMap_082E56E8/map.bin" - - .align 2 -UnknownMapAttributes_082E56E8: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E56E8 - .4byte UnknownMapBlockdata_082E56E8 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E570C: - .incbin "data/maps/UnknownMap_082E570C/border.bin" - -UnknownMapBlockdata_082E570C: - .incbin "data/maps/UnknownMap_082E570C/map.bin" - - .align 2 -UnknownMapAttributes_082E570C: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E570C - .4byte UnknownMapBlockdata_082E570C - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5730: - .incbin "data/maps/UnknownMap_082E5730/border.bin" - -UnknownMapBlockdata_082E5730: - .incbin "data/maps/UnknownMap_082E5730/map.bin" - - .align 2 -UnknownMapAttributes_082E5730: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5730 - .4byte UnknownMapBlockdata_082E5730 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5754: - .incbin "data/maps/UnknownMap_082E5754/border.bin" - -UnknownMapBlockdata_082E5754: - .incbin "data/maps/UnknownMap_082E5754/map.bin" - - .align 2 -UnknownMapAttributes_082E5754: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5754 - .4byte UnknownMapBlockdata_082E5754 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5778: - .incbin "data/maps/UnknownMap_082E5778/border.bin" - -UnknownMapBlockdata_082E5778: - .incbin "data/maps/UnknownMap_082E5778/map.bin" - - .align 2 -UnknownMapAttributes_082E5778: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5778 - .4byte UnknownMapBlockdata_082E5778 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E579C: - .incbin "data/maps/UnknownMap_082E579C/border.bin" - -UnknownMapBlockdata_082E579C: - .incbin "data/maps/UnknownMap_082E579C/map.bin" - - .align 2 -UnknownMapAttributes_082E579C: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E579C - .4byte UnknownMapBlockdata_082E579C - .4byte gTileset_General - .4byte gTileset_Cave - -NewMauville_Entrance_MapBorder:: @ 82E57B4 - .incbin "data/maps/NewMauville_Entrance/border.bin" - -NewMauville_Entrance_MapBlockdata:: @ 82E57BC - .incbin "data/maps/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_MapAttributes:: @ 82E5860 - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .4byte NewMauville_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -NewMauville_Inside_MapBorder:: @ 82E5878 - .incbin "data/maps/NewMauville_Inside/border.bin" - -NewMauville_Inside_MapBlockdata:: @ 82E5880 - .incbin "data/maps/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_MapAttributes:: @ 82E65A4 - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - -AbandonedShip_Deck_MapBorder:: @ 82E65BC - .incbin "data/maps/AbandonedShip_Deck/border.bin" - -AbandonedShip_Deck_MapBlockdata:: @ 82E65C4 - .incbin "data/maps/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_MapAttributes:: @ 82E698C - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .4byte AbandonedShip_Deck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4 - .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin" - -AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC - .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74 - .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin" - -AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C - .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0 - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8 - .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin" - -AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00 - .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04 - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C - .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin" - -AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24 - .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4 - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC - .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin" - -AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4 - .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214 - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Underwater1_MapBorder:: @ 82E722C - .incbin "data/maps/AbandonedShip_Underwater1/border.bin" - -AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234 - .incbin "data/maps/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4 - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC - .incbin "data/maps/AbandonedShip_Room_B1F/border.bin" - -AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4 - .incbin "data/maps/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364 - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C - .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin" - -AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384 - .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8 - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0 - .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin" - -AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8 - .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558 - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AbandonedShip_Underwater2_MapBorder:: @ 82E7570 - .incbin "data/maps/AbandonedShip_Underwater2/border.bin" - -AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578 - .incbin "data/maps/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0 - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SecretBase_RedCave1_MapBorder:: @ 82E76B8 - .incbin "data/maps/SecretBase_RedCave1/border.bin" - -SecretBase_RedCave1_MapBlockdata:: @ 82E76C0 - .incbin "data/maps/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_MapAttributes:: @ 82E7788 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .4byte SecretBase_RedCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave1_MapBorder:: @ 82E77A0 - .incbin "data/maps/SecretBase_BrownCave1/border.bin" - -SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8 - .incbin "data/maps/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_MapAttributes:: @ 82E7870 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .4byte SecretBase_BrownCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave1_MapBorder:: @ 82E7888 - .incbin "data/maps/SecretBase_BlueCave1/border.bin" - -SecretBase_BlueCave1_MapBlockdata:: @ 82E7890 - .incbin "data/maps/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_MapAttributes:: @ 82E7958 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .4byte SecretBase_BlueCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave1_MapBorder:: @ 82E7970 - .incbin "data/maps/SecretBase_YellowCave1/border.bin" - -SecretBase_YellowCave1_MapBlockdata:: @ 82E7978 - .incbin "data/maps/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_MapAttributes:: @ 82E7A40 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .4byte SecretBase_YellowCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree1_MapBorder:: @ 82E7A58 - .incbin "data/maps/SecretBase_Tree1/border.bin" - -SecretBase_Tree1_MapBlockdata:: @ 82E7A60 - .incbin "data/maps/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_MapAttributes:: @ 82E7B28 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .4byte SecretBase_Tree1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub1_MapBorder:: @ 82E7B40 - .incbin "data/maps/SecretBase_Shrub1/border.bin" - -SecretBase_Shrub1_MapBlockdata:: @ 82E7B48 - .incbin "data/maps/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_MapAttributes:: @ 82E7C10 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .4byte SecretBase_Shrub1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SecretBase_RedCave2_MapBorder:: @ 82E7C28 - .incbin "data/maps/SecretBase_RedCave2/border.bin" - -SecretBase_RedCave2_MapBlockdata:: @ 82E7C30 - .incbin "data/maps/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_MapAttributes:: @ 82E7D10 - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .4byte SecretBase_RedCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave2_MapBorder:: @ 82E7D28 - .incbin "data/maps/SecretBase_BrownCave2/border.bin" - -SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30 - .incbin "data/maps/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .4byte SecretBase_BrownCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave2_MapBorder:: @ 82E7E44 - .incbin "data/maps/SecretBase_BlueCave2/border.bin" - -SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C - .incbin "data/maps/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_MapAttributes:: @ 82E7F20 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .4byte SecretBase_BlueCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave2_MapBorder:: @ 82E7F38 - .incbin "data/maps/SecretBase_YellowCave2/border.bin" - -SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40 - .incbin "data/maps/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_MapAttributes:: @ 82E803C - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .4byte SecretBase_YellowCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree2_MapBorder:: @ 82E8054 - .incbin "data/maps/SecretBase_Tree2/border.bin" - -SecretBase_Tree2_MapBlockdata:: @ 82E805C - .incbin "data/maps/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_MapAttributes:: @ 82E813C - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub2_MapBorder:: @ 82E8154 - .incbin "data/maps/SecretBase_Shrub2/border.bin" - -SecretBase_Shrub2_MapBlockdata:: @ 82E815C - .incbin "data/maps/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_MapAttributes:: @ 82E8230 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .4byte SecretBase_Shrub2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SecretBase_RedCave3_MapBorder:: @ 82E8248 - .incbin "data/maps/SecretBase_RedCave3/border.bin" - -SecretBase_RedCave3_MapBlockdata:: @ 82E8250 - .incbin "data/maps/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_MapAttributes:: @ 82E8340 - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .4byte SecretBase_RedCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave3_MapBorder:: @ 82E8358 - .incbin "data/maps/SecretBase_BrownCave3/border.bin" - -SecretBase_BrownCave3_MapBlockdata:: @ 82E8360 - .incbin "data/maps/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_MapAttributes:: @ 82E84AC - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .4byte SecretBase_BrownCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave3_MapBorder:: @ 82E84C4 - .incbin "data/maps/SecretBase_BlueCave3/border.bin" - -SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC - .incbin "data/maps/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_MapAttributes:: @ 82E8620 - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .4byte SecretBase_BlueCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave3_MapBorder:: @ 82E8638 - .incbin "data/maps/SecretBase_YellowCave3/border.bin" - -SecretBase_YellowCave3_MapBlockdata:: @ 82E8640 - .incbin "data/maps/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_MapAttributes:: @ 82E8748 - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .4byte SecretBase_YellowCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree3_MapBorder:: @ 82E8760 - .incbin "data/maps/SecretBase_Tree3/border.bin" - -SecretBase_Tree3_MapBlockdata:: @ 82E8768 - .incbin "data/maps/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_MapAttributes:: @ 82E8878 - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .4byte SecretBase_Tree3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub3_MapBorder:: @ 82E8890 - .incbin "data/maps/SecretBase_Shrub3/border.bin" - -SecretBase_Shrub3_MapBlockdata:: @ 82E8898 - .incbin "data/maps/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_MapAttributes:: @ 82E89B8 - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .4byte SecretBase_Shrub3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SecretBase_RedCave4_MapBorder:: @ 82E89D0 - .incbin "data/maps/SecretBase_RedCave4/border.bin" - -SecretBase_RedCave4_MapBlockdata:: @ 82E89D8 - .incbin "data/maps/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_MapAttributes:: @ 82E8AE8 - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .4byte SecretBase_RedCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave4_MapBorder:: @ 82E8B00 - .incbin "data/maps/SecretBase_BrownCave4/border.bin" - -SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08 - .incbin "data/maps/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_MapAttributes:: @ 82E8C58 - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .4byte SecretBase_BrownCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave4_MapBorder:: @ 82E8C70 - .incbin "data/maps/SecretBase_BlueCave4/border.bin" - -SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78 - .incbin "data/maps/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .4byte SecretBase_BlueCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave4_MapBorder:: @ 82E8DC4 - .incbin "data/maps/SecretBase_YellowCave4/border.bin" - -SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC - .incbin "data/maps/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_MapAttributes:: @ 82E8F38 - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .4byte SecretBase_YellowCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree4_MapBorder:: @ 82E8F50 - .incbin "data/maps/SecretBase_Tree4/border.bin" - -SecretBase_Tree4_MapBlockdata:: @ 82E8F58 - .incbin "data/maps/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_MapAttributes:: @ 82E90E0 - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .4byte SecretBase_Tree4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub4_MapBorder:: @ 82E90F8 - .incbin "data/maps/SecretBase_Shrub4/border.bin" - -SecretBase_Shrub4_MapBlockdata:: @ 82E9100 - .incbin "data/maps/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_MapAttributes:: @ 82E9234 - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .4byte SecretBase_Shrub4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SingleBattleColosseum_MapBorder:: @ 82E924C - .incbin "data/maps/SingleBattleColosseum/border.bin" - -SingleBattleColosseum_MapBlockdata:: @ 82E9254 - .incbin "data/maps/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_MapAttributes:: @ 82E9350 - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .4byte SingleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -TradeCenter_MapBorder:: @ 82E9368 - .incbin "data/maps/TradeCenter/border.bin" - -TradeCenter_MapBlockdata:: @ 82E9370 - .incbin "data/maps/TradeCenter/map.bin" - - .align 2 -TradeCenter_MapAttributes:: @ 82E9448 - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .4byte TradeCenter_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -RecordCorner_MapBorder:: @ 82E9460 - .incbin "data/maps/RecordCorner/border.bin" - -RecordCorner_MapBlockdata:: @ 82E9468 - .incbin "data/maps/RecordCorner/map.bin" - - .align 2 -RecordCorner_MapAttributes:: @ 82E95F8 - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -DoubleBattleColosseum_MapBorder:: @ 82E9610 - .incbin "data/maps/DoubleBattleColosseum/border.bin" - -DoubleBattleColosseum_MapBlockdata:: @ 82E9618 - .incbin "data/maps/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_MapAttributes:: @ 82E9714 - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -LinkContestRoom1_MapBorder:: @ 82E972C - .incbin "data/maps/LinkContestRoom1/border.bin" - -LinkContestRoom1_MapBlockdata:: @ 82E9734 - .incbin "data/maps/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_MapAttributes:: @ 82E9880 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -UnknownMap_25_29_MapBorder:: @ 82E9898 - .incbin "data/maps/UnknownMap_25_29/border.bin" - -UnknownMap_25_29_MapBlockdata:: @ 82E98A0 - .incbin "data/maps/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_MapAttributes:: @ 82E98A4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .4byte UnknownMap_25_29_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_30_MapBorder:: @ 82E98BC - .incbin "data/maps/UnknownMap_25_30/border.bin" - -UnknownMap_25_30_MapBlockdata:: @ 82E98C4 - .incbin "data/maps/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_MapAttributes:: @ 82E98C8 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .4byte UnknownMap_25_30_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_31_MapBorder:: @ 82E98E0 - .incbin "data/maps/UnknownMap_25_31/border.bin" - -UnknownMap_25_31_MapBlockdata:: @ 82E98E8 - .incbin "data/maps/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_MapAttributes:: @ 82E98EC - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .4byte UnknownMap_25_31_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_32_MapBorder:: @ 82E9904 - .incbin "data/maps/UnknownMap_25_32/border.bin" - -UnknownMap_25_32_MapBlockdata:: @ 82E990C - .incbin "data/maps/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_MapAttributes:: @ 82E9910 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .4byte UnknownMap_25_32_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_33_MapBorder:: @ 82E9928 - .incbin "data/maps/UnknownMap_25_33/border.bin" - -UnknownMap_25_33_MapBlockdata:: @ 82E9930 - .incbin "data/maps/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_MapAttributes:: @ 82E9934 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .4byte UnknownMap_25_33_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_34_MapBorder:: @ 82E994C - .incbin "data/maps/UnknownMap_25_34/border.bin" - -UnknownMap_25_34_MapBlockdata:: @ 82E9954 - .incbin "data/maps/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_MapAttributes:: @ 82E9958 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .4byte UnknownMap_25_34_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LinkContestRoom2_MapBorder:: @ 82E9970 - .incbin "data/maps/LinkContestRoom2/border.bin" - -LinkContestRoom2_MapBlockdata:: @ 82E9978 - .incbin "data/maps/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_MapAttributes:: @ 82E9AC4 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom3_MapBorder:: @ 82E9ADC - .incbin "data/maps/LinkContestRoom3/border.bin" - -LinkContestRoom3_MapBlockdata:: @ 82E9AE4 - .incbin "data/maps/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_MapAttributes:: @ 82E9C30 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom4_MapBorder:: @ 82E9C48 - .incbin "data/maps/LinkContestRoom4/border.bin" - -LinkContestRoom4_MapBlockdata:: @ 82E9C50 - .incbin "data/maps/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_MapAttributes:: @ 82E9D9C - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom5_MapBorder:: @ 82E9DB4 - .incbin "data/maps/LinkContestRoom5/border.bin" - -LinkContestRoom5_MapBlockdata:: @ 82E9DBC - .incbin "data/maps/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_MapAttributes:: @ 82E9F08 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom6_MapBorder:: @ 82E9F20 - .incbin "data/maps/LinkContestRoom6/border.bin" - -LinkContestRoom6_MapBlockdata:: @ 82E9F28 - .incbin "data/maps/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_MapAttributes:: @ 82EA074 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -InsideOfTruck_MapBorder:: @ 82EA08C - .incbin "data/maps/InsideOfTruck/border.bin" - -InsideOfTruck_MapBlockdata:: @ 82EA094 - .incbin "data/maps/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_MapAttributes:: @ 82EA0C8 - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - -SafariZone_Northwest_MapBorder:: @ 82EA0E0 - .incbin "data/maps/SafariZone_Northwest/border.bin" - -SafariZone_Northwest_MapBlockdata:: @ 82EA0E8 - .incbin "data/maps/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_MapAttributes:: @ 82EAD68 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .4byte SafariZone_Northwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -SafariZone_Northeast_MapBorder:: @ 82EAD80 - .incbin "data/maps/SafariZone_Northeast/border.bin" - -SafariZone_Northeast_MapBlockdata:: @ 82EAD88 - .incbin "data/maps/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_MapAttributes:: @ 82EBA08 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .4byte SafariZone_Northeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -SafariZone_Southwest_MapBorder:: @ 82EBA20 - .incbin "data/maps/SafariZone_Southwest/border.bin" - -SafariZone_Southwest_MapBlockdata:: @ 82EBA28 - .incbin "data/maps/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_MapAttributes:: @ 82EC6A8 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -SafariZone_Southeast_MapBorder:: @ 82EC6C0 - .incbin "data/maps/SafariZone_Southeast/border.bin" - -SafariZone_Southeast_MapBlockdata:: @ 82EC6C8 - .incbin "data/maps/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_MapAttributes:: @ 82ED348 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .4byte SafariZone_Southeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -UnknownMapBorder_082EDF30: - .incbin "data/maps/UnknownMap_082EDF30/border.bin" - -UnknownMapBlockdata_082EDF30: - .incbin "data/maps/UnknownMap_082EDF30/map.bin" - - .align 2 -UnknownMapAttributes_082EDF30: - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMapBorder_082EDF30 - .4byte UnknownMapBlockdata_082EDF30 - .4byte gTileset_General - .4byte 0 - -Route109_SeashoreHouse_MapBorder:: @ 82EDF48 - .incbin "data/maps/Route109_SeashoreHouse/border.bin" - -Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50 - .incbin "data/maps/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_MapAttributes:: @ 82EE07C - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - -Route110_TrickHouseEntrance_MapBorder:: @ 82EE094 - .incbin "data/maps/Route110_TrickHouseEntrance/border.bin" - -Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C - .incbin "data/maps/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_TrickHouseEnd_MapBorder:: @ 82EE174 - .incbin "data/maps/Route110_TrickHouseEnd/border.bin" - -Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C - .incbin "data/maps/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_TrickHouseCorridor_MapBorder:: @ 82EE254 - .incbin "data/maps/Route110_TrickHouseCorridor/border.bin" - -Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C - .incbin "data/maps/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544 - .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin" - -Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C - .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8 - .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin" - -Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800 - .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC - .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin" - -Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4 - .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60 - .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin" - -Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68 - .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014 - .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin" - -Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C - .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8 - .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin" - -Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0 - .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C - .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin" - -Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584 - .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830 - .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin" - -Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838 - .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4 - .incbin "data/maps/FortreeCity_DecorationShop/border.bin" - -FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC - .incbin "data/maps/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64 - .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin" - -Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C - .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin" - - .align 2 -Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20 -Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20 - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin" - -LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin" - -LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin" - -LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin" - -LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin" - -LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin" - -LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430 - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -Route130_MapBorder:: @ 82F0448 - .incbin "data/maps/Route130/border.bin" - -Route130_MapBlockdata:: @ 82F0450 - .incbin "data/maps/Route130/map.bin" - - .align 2 -Route130_MapAttributes:: @ 82F1D50 - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -BattleTower_Lobby_MapBorder:: @ 82F1D68 - .incbin "data/maps/BattleTower_Lobby/border.bin" - -BattleTower_Lobby_MapBlockdata:: @ 82F1D70 - .incbin "data/maps/BattleTower_Lobby/map.bin" - - .align 2 -BattleTower_Lobby_MapAttributes:: @ 82F1E6C - .4byte 0xe - .4byte 0x9 - .4byte BattleTower_Lobby_MapBorder - .4byte BattleTower_Lobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -BattleTower_Outside_MapBorder:: @ 82F1E84 - .incbin "data/maps/BattleTower_Outside/border.bin" - -BattleTower_Outside_MapBlockdata:: @ 82F1E8C - .incbin "data/maps/BattleTower_Outside/map.bin" - - .align 2 -BattleTower_Outside_MapAttributes:: @ 82F2558 - .4byte 0x1d - .4byte 0x1e - .4byte BattleTower_Outside_MapBorder - .4byte BattleTower_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -BattleTower_Elevator_MapBorder:: @ 82F2570 - .incbin "data/maps/BattleTower_Elevator/border.bin" - -BattleTower_Elevator_MapBlockdata:: @ 82F2578 - .incbin "data/maps/BattleTower_Elevator/map.bin" - - .align 2 -BattleTower_Elevator_MapAttributes:: @ 82F25B0 - .4byte 0x4 - .4byte 0x7 - .4byte BattleTower_Elevator_MapBorder - .4byte BattleTower_Elevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -BattleTower_Corridor_MapBorder:: @ 82F25C8 - .incbin "data/maps/BattleTower_Corridor/border.bin" - -BattleTower_Corridor_MapBlockdata:: @ 82F25D0 - .incbin "data/maps/BattleTower_Corridor/map.bin" - - .align 2 -BattleTower_Corridor_MapAttributes:: @ 82F267C - .4byte 0x11 - .4byte 0x5 - .4byte BattleTower_Corridor_MapBorder - .4byte BattleTower_Corridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -BattleTower_BattleRoom_MapBorder:: @ 82F2694 - .incbin "data/maps/BattleTower_BattleRoom/border.bin" - -BattleTower_BattleRoom_MapBlockdata:: @ 82F269C - .incbin "data/maps/BattleTower_BattleRoom/map.bin" - - .align 2 -BattleTower_BattleRoom_MapAttributes:: @ 82F2750 - .4byte 0xa - .4byte 0x9 - .4byte BattleTower_BattleRoom_MapBorder - .4byte BattleTower_BattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768 - .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin" - -RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770 - .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0 - .incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin" - -EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8 - .incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0 - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_MapBorder - .4byte EverGrandeCity_PokemonLeague_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8 - .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin" - -Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0 - .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8 - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0 - .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin" - -Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8 - .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0 - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8 - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin" - -LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0 - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00 - .4byte 0x4 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -Underwater1_MapBorder:: @ 82F2F18 - .incbin "data/maps/Underwater1/border.bin" - -Underwater1_MapBlockdata:: @ 82F2F20 - .incbin "data/maps/Underwater1/map.bin" - - .align 2 -Underwater1_MapAttributes:: @ 82F6120 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin" - -MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin" - -MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -SSTidalCorridor_MapBorder:: @ 82F63F8 - .incbin "data/maps/SSTidalCorridor/border.bin" - -SSTidalCorridor_MapBlockdata:: @ 82F6400 - .incbin "data/maps/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_MapAttributes:: @ 82F65D4 - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SSTidalLowerDeck_MapBorder:: @ 82F65EC - .incbin "data/maps/SSTidalLowerDeck/border.bin" - -SSTidalLowerDeck_MapBlockdata:: @ 82F65F4 - .incbin "data/maps/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_MapAttributes:: @ 82F67B0 - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SSTidalRooms_MapBorder:: @ 82F67C8 - .incbin "data/maps/SSTidalRooms/border.bin" - -SSTidalRooms_MapBlockdata:: @ 82F67D0 - .incbin "data/maps/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_MapAttributes:: @ 82F6CE0 - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .4byte SSTidalRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -IslandCave_MapBorder:: @ 82F6CF8 - .incbin "data/maps/IslandCave/border.bin" - -IslandCave_MapBlockdata:: @ 82F6D00 - .incbin "data/maps/IslandCave/map.bin" - - .align 2 -IslandCave_MapAttributes:: @ 82F7164 - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -AncientTomb_MapBorder:: @ 82F717C - .incbin "data/maps/AncientTomb/border.bin" - -AncientTomb_MapBlockdata:: @ 82F7184 - .incbin "data/maps/AncientTomb/map.bin" - - .align 2 -AncientTomb_MapAttributes:: @ 82F75E8 - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .4byte AncientTomb_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -Underwater_Route134_MapBorder:: @ 82F7600 - .incbin "data/maps/Underwater_Route134/border.bin" - -Underwater_Route134_MapBlockdata:: @ 82F7608 - .incbin "data/maps/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_MapAttributes:: @ 82F7770 - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .4byte Underwater_Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -Underwater_SealedChamber_MapBorder:: @ 82F7788 - .incbin "data/maps/Underwater_SealedChamber/border.bin" - -Underwater_SealedChamber_MapBlockdata:: @ 82F7790 - .incbin "data/maps/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_MapAttributes:: @ 82F7FD0 - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .4byte Underwater_SealedChamber_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8 - .incbin "data/maps/SealedChamber_OuterRoom/border.bin" - -SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0 - .incbin "data/maps/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -VictoryRoad_B1F_MapBorder:: @ 82F83D0 - .incbin "data/maps/VictoryRoad_B1F/border.bin" - -VictoryRoad_B1F_MapBlockdata:: @ 82F83D8 - .incbin "data/maps/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_MapAttributes:: @ 82F8EFC - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .4byte VictoryRoad_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -VictoryRoad_B2F_MapBorder:: @ 82F8F14 - .incbin "data/maps/VictoryRoad_B2F/border.bin" - -VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C - .incbin "data/maps/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_MapAttributes:: @ 82F9A40 - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -Route104_Prototype_MapBorder:: @ 82F9A58 - .incbin "data/maps/Route104_Prototype/border.bin" - -Route104_Prototype_MapBlockdata:: @ 82F9A60 - .incbin "data/maps/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_MapAttributes:: @ 82F9A64 - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C - .incbin "data/maps/GraniteCave_StevensRoom/border.bin" - -GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84 - .incbin "data/maps/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28 - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin" - -AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68 - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SouthernIsland_Exterior_MapBorder:: @ 82F9D80 - .incbin "data/maps/SouthernIsland_Exterior/border.bin" - -SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88 - .incbin "data/maps/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_MapAttributes:: @ 82FA544 - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .4byte SouthernIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -SouthernIsland_Interior_MapBorder:: @ 82FA55C - .incbin "data/maps/SouthernIsland_Interior/border.bin" - -SouthernIsland_Interior_MapBlockdata:: @ 82FA564 - .incbin "data/maps/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_MapAttributes:: @ 82FAA74 - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .4byte SouthernIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -JaggedPass_MapBorder:: @ 82FAA8C - .incbin "data/maps/JaggedPass/border.bin" - -JaggedPass_MapBlockdata:: @ 82FAA94 - .incbin "data/maps/JaggedPass/map.bin" - - .align 2 -JaggedPass_MapAttributes:: @ 82FB55C - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -FieryPath_MapBorder:: @ 82FB574 - .incbin "data/maps/FieryPath/border.bin" - -FieryPath_MapBlockdata:: @ 82FB57C - .incbin "data/maps/FieryPath/map.bin" - - .align 2 -FieryPath_MapAttributes:: @ 82FBFE0 - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8 - .incbin "data/maps/RustboroCity_Flat2_1F/border.bin" - -RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000 - .incbin "data/maps/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_Flat2_2F_MapBorder:: @ 82FC114 - .incbin "data/maps/RustboroCity_Flat2_2F/border.bin" - -RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C - .incbin "data/maps/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_Flat2_3F_MapBorder:: @ 82FC230 - .incbin "data/maps/RustboroCity_Flat2_3F/border.bin" - -RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238 - .incbin "data/maps/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House8_MapBorder:: @ 82FC34C - .incbin "data/maps/SootopolisCity_House8/border.bin" - -SootopolisCity_House8_MapBlockdata:: @ 82FC354 - .incbin "data/maps/SootopolisCity_House8/map.bin" - - .align 2 -SootopolisCity_House8_MapAttributes:: @ 82FC3C4 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House8_MapBorder - .4byte SootopolisCity_House8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC - .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin" - -EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4 - .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4 - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin" - -LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin" - -LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4 - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin" - -Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4 - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8 - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -MtPyre_Exterior_MapBorder:: @ 82FC8C0 - .incbin "data/maps/MtPyre_Exterior/border.bin" - -MtPyre_Exterior_MapBlockdata:: @ 82FC8C8 - .incbin "data/maps/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_MapAttributes:: @ 82FD7EC - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .4byte MtPyre_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_Summit_MapBorder:: @ 82FD804 - .incbin "data/maps/MtPyre_Summit/border.bin" - -MtPyre_Summit_MapBlockdata:: @ 82FD80C - .incbin "data/maps/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_MapAttributes:: @ 82FE680 - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .4byte MtPyre_Summit_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -SealedChamber_InnerRoom_MapBorder:: @ 82FE698 - .incbin "data/maps/SealedChamber_InnerRoom/border.bin" - -SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0 - .incbin "data/maps/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80 - .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin" - -MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88 - .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38 - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_GameCorner_1F_MapBorder - .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin" - -MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30 - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House1_MapBorder:: @ 82FEC48 - .incbin "data/maps/SootopolisCity_House1/border.bin" - -SootopolisCity_House1_MapBlockdata:: @ 82FEC50 - .incbin "data/maps/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_MapAttributes:: @ 82FECC0 -SootopolisCity_House4_MapAttributes:: @ 82FECC0 -SootopolisCity_House7_MapAttributes:: @ 82FECC0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .4byte SootopolisCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House2_MapBorder:: @ 82FECD8 - .incbin "data/maps/SootopolisCity_House2/border.bin" - -SootopolisCity_House2_MapBlockdata:: @ 82FECE0 - .incbin "data/maps/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_MapAttributes:: @ 82FED50 -SootopolisCity_House5_MapAttributes:: @ 82FED50 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .4byte SootopolisCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House3_MapBorder:: @ 82FED68 - .incbin "data/maps/SootopolisCity_House3/border.bin" - -SootopolisCity_House3_MapBlockdata:: @ 82FED70 - .incbin "data/maps/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_MapAttributes:: @ 82FEDE0 -SootopolisCity_House6_MapAttributes:: @ 82FEDE0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .4byte SootopolisCity_House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin" - -AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328 - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -ScorchedSlab_MapBorder:: @ 82FF340 - .incbin "data/maps/ScorchedSlab/border.bin" - -ScorchedSlab_MapBlockdata:: @ 82FF348 - .incbin "data/maps/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_MapAttributes:: @ 82FF5A0 - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .4byte ScorchedSlab_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082FF894: - .incbin "data/maps/UnknownMap_082FF894/border.bin" - -UnknownMapBlockdata_082FF894: - .incbin "data/maps/UnknownMap_082FF894/map.bin" - - .align 2 -UnknownMapAttributes_082FF894: - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMapBorder_082FF894 - .4byte UnknownMapBlockdata_082FF894 - .4byte gTileset_General - .4byte gTileset_Cave - -RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC - .incbin "data/maps/RustboroCity_Flat1_1F/border.bin" - -RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4 - .incbin "data/maps/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC - .incbin "data/maps/RustboroCity_Flat1_2F/border.bin" - -RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4 - .incbin "data/maps/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC - .incbin "data/maps/EverGrandeCity_Corridor4/border.bin" - -EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4 - .incbin "data/maps/EverGrandeCity_Corridor4/map.bin" - - .align 2 -EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0 - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Corridor4_MapBorder - .4byte EverGrandeCity_Corridor4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -MagmaHideout_1F_MapBorder:: @ 82FFDB8 - .incbin "data/maps/MagmaHideout_1F/border.bin" - -MagmaHideout_1F_MapBlockdata:: @ 82FFDC0 - .incbin "data/maps/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_MapAttributes:: @ 8300450 - .4byte 0x1c - .4byte 0x1e - .4byte MagmaHideout_1F_MapBorder - .4byte MagmaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MagmaHideout_B1F_MapBorder:: @ 8300468 - .incbin "data/maps/MagmaHideout_B1F/border.bin" - -MagmaHideout_B1F_MapBlockdata:: @ 8300470 - .incbin "data/maps/MagmaHideout_B1F/map.bin" - - .align 2 -MagmaHideout_B1F_MapAttributes:: @ 8301010 - .4byte 0x3e - .4byte 0x18 - .4byte MagmaHideout_B1F_MapBorder - .4byte MagmaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MagmaHideout_B2F_MapBorder:: @ 8301028 - .incbin "data/maps/MagmaHideout_B2F/border.bin" - -MagmaHideout_B2F_MapBlockdata:: @ 8301030 - .incbin "data/maps/MagmaHideout_B2F/map.bin" - - .align 2 -MagmaHideout_B2F_MapAttributes:: @ 8301690 - .4byte 0x22 - .4byte 0x18 - .4byte MagmaHideout_B2F_MapBorder - .4byte MagmaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -UnknownMapBorder_08302970: - .incbin "data/maps/UnknownMap_08302970/border.bin" - -UnknownMapBlockdata_08302970: - .incbin "data/maps/UnknownMap_08302970/map.bin" - - .align 2 -UnknownMapAttributes_08302970: - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMapBorder_08302970 - .4byte UnknownMapBlockdata_08302970 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_Entrance_MapBorder:: @ 8302988 - .incbin "data/maps/SkyPillar_Entrance/border.bin" - -SkyPillar_Entrance_MapBlockdata:: @ 8302990 - .incbin "data/maps/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_MapAttributes:: @ 8302C18 - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .4byte SkyPillar_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SkyPillar_Outside_MapBorder:: @ 8302C30 - .incbin "data/maps/SkyPillar_Outside/border.bin" - -SkyPillar_Outside_MapBlockdata:: @ 8302C38 - .incbin "data/maps/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_MapAttributes:: @ 8303140 - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .4byte SkyPillar_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_1F_MapBorder:: @ 8303158 - .incbin "data/maps/SkyPillar_1F/border.bin" - -SkyPillar_1F_MapBlockdata:: @ 8303160 - .incbin "data/maps/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_MapAttributes:: @ 83032E8 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .4byte SkyPillar_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_2F_MapBorder:: @ 8303300 - .incbin "data/maps/SkyPillar_2F/border.bin" - -SkyPillar_2F_MapBlockdata:: @ 8303308 - .incbin "data/maps/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_MapAttributes:: @ 8303490 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .4byte SkyPillar_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_3F_MapBorder:: @ 83034A8 - .incbin "data/maps/SkyPillar_3F/border.bin" - -SkyPillar_3F_MapBlockdata:: @ 83034B0 - .incbin "data/maps/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_MapAttributes:: @ 8303638 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .4byte SkyPillar_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_4F_MapBorder:: @ 8303650 - .incbin "data/maps/SkyPillar_4F/border.bin" - -SkyPillar_4F_MapBlockdata:: @ 8303658 - .incbin "data/maps/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_MapAttributes:: @ 83037E0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .4byte SkyPillar_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -UnknownMapBorder_083041B4: - .incbin "data/maps/UnknownMap_083041B4/border.bin" - -UnknownMapBlockdata_083041B4: - .incbin "data/maps/UnknownMap_083041B4/map.bin" - - .align 2 -UnknownMapAttributes_083041B4: - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMapBorder_083041B4 - .4byte UnknownMapBlockdata_083041B4 - .4byte gTileset_General - .4byte gTileset_Cave - -MossdeepCity_StevensHouse_MapBorder:: @ 83041CC - .incbin "data/maps/MossdeepCity_StevensHouse/border.bin" - -MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4 - .incbin "data/maps/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_MapAttributes:: @ 8304284 - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C - .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin" - -ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4 - .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754 - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SafariZone_RestHouse_MapBorder:: @ 830476C - .incbin "data/maps/SafariZone_RestHouse/border.bin" - -SafariZone_RestHouse_MapBlockdata:: @ 8304774 - .incbin "data/maps/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_MapAttributes:: @ 8304828 - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .4byte SafariZone_RestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SkyPillar_5F_MapBorder:: @ 8304840 - .incbin "data/maps/SkyPillar_5F/border.bin" - -SkyPillar_5F_MapBlockdata:: @ 8304848 - .incbin "data/maps/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_MapAttributes:: @ 83049D0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .4byte SkyPillar_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_Top_MapBorder:: @ 83049E8 - .incbin "data/maps/SkyPillar_Top/border.bin" - -SkyPillar_Top_MapBlockdata:: @ 83049F0 - .incbin "data/maps/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_MapAttributes:: @ 8304F00 - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc deleted file mode 100644 index 41b0df228..000000000 --- a/data/maps/attributes_table.inc +++ /dev/null @@ -1,334 +0,0 @@ - .align 2 -gMapAttributes:: @ 8304F18 - .4byte PetalburgCity_MapAttributes - .4byte SlateportCity_MapAttributes - .4byte MauvilleCity_MapAttributes - .4byte RustboroCity_MapAttributes - .4byte FortreeCity_MapAttributes - .4byte LilycoveCity_MapAttributes - .4byte MossdeepCity_MapAttributes - .4byte SootopolisCity_MapAttributes - .4byte EverGrandeCity_MapAttributes - .4byte LittlerootTown_MapAttributes - .4byte OldaleTown_MapAttributes - .4byte DewfordTown_MapAttributes - .4byte LavaridgeTown_MapAttributes - .4byte FallarborTown_MapAttributes - .4byte VerdanturfTown_MapAttributes - .4byte PacifidlogTown_MapAttributes - .4byte Route101_MapAttributes - .4byte Route102_MapAttributes - .4byte Route103_MapAttributes - .4byte Route104_MapAttributes - .4byte Route105_MapAttributes - .4byte Route106_MapAttributes - .4byte Route107_MapAttributes - .4byte Route108_MapAttributes - .4byte Route109_MapAttributes - .4byte Route110_MapAttributes - .4byte Route111_MapAttributes - .4byte Route112_MapAttributes - .4byte Route113_MapAttributes - .4byte Route114_MapAttributes - .4byte Route115_MapAttributes - .4byte Route116_MapAttributes - .4byte Route117_MapAttributes - .4byte Route118_MapAttributes - .4byte Route119_MapAttributes - .4byte Route120_MapAttributes - .4byte Route121_MapAttributes - .4byte Route122_MapAttributes - .4byte Route123_MapAttributes - .4byte Route124_MapAttributes - .4byte Route125_MapAttributes - .4byte Route126_MapAttributes - .4byte Route127_MapAttributes - .4byte Route128_MapAttributes - .4byte Route129_MapAttributes - .4byte UnreferencedMap_MapAttributes - .4byte Route131_MapAttributes - .4byte Route132_MapAttributes - .4byte Route133_MapAttributes - .4byte Route134_MapAttributes - .4byte Underwater2_MapAttributes - .4byte Underwater3_MapAttributes - .4byte Underwater4_MapAttributes - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes - .4byte LittlerootTown_MaysHouse_1F_MapAttributes - .4byte LittlerootTown_MaysHouse_2F_MapAttributes - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes - .4byte House1_MapAttributes - .4byte House2_MapAttributes - .4byte PokemonCenter_1F_MapAttributes - .4byte PokemonCenter_2F_MapAttributes - .4byte PokeMart_MapAttributes - .4byte DewfordTown_House1_MapAttributes - .4byte DewfordTown_Gym_MapAttributes - .4byte DewfordTown_Hall_MapAttributes - .4byte DewfordTown_House2_MapAttributes - .4byte LavaridgeTown_HerbShop_MapAttributes - .4byte LavaridgeTown_Gym_1F_MapAttributes - .4byte LavaridgeTown_Gym_B1F_MapAttributes - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes - .4byte FallarborTown_ContestLobby_MapAttributes - .4byte FallarborTown_ContestHall_MapAttributes - .4byte LilycoveCity_House2_MapAttributes - .4byte UnknownMapAttributes_082CF564 - .4byte VerdanturfTown_WandasHouse_MapAttributes - .4byte PacifidlogTown_House1_MapAttributes - .4byte PacifidlogTown_House2_MapAttributes - .4byte PetalburgCity_Gym_MapAttributes - .4byte MossdeepCity_House4_MapAttributes - .4byte SlateportCity_SternsShipyard_1F_MapAttributes - .4byte SlateportCity_SternsShipyard_2F_MapAttributes - .4byte UnknownMapAttributes_082D05D8 - .4byte UnknownMapAttributes_082D05FC - .4byte SlateportCity_PokemonFanClub_MapAttributes - .4byte SlateportCity_OceanicMuseum_1F_MapAttributes - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes - .4byte LilycoveCity_Harbor_MapAttributes - .4byte MauvilleCity_Gym_MapAttributes - .4byte MauvilleCity_BikeShop_MapAttributes - .4byte MauvilleCity_GameCorner_MapAttributes - .4byte RustboroCity_DevonCorp_1F_MapAttributes - .4byte RustboroCity_DevonCorp_2F_MapAttributes - .4byte RustboroCity_Gym_MapAttributes - .4byte RustboroCity_PokemonSchool_MapAttributes - .4byte RustboroCity_House2_MapAttributes - .4byte RustboroCity_House1_MapAttributes - .4byte RustboroCity_CuttersHouse_MapAttributes - .4byte FortreeCity_House1_MapAttributes - .4byte FortreeCity_Gym_MapAttributes - .4byte FortreeCity_House2_MapAttributes - .4byte Route104_MrBrineysHouse_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes - .4byte LilycoveCity_ContestLobby_MapAttributes - .4byte LilycoveCity_ContestHall_MapAttributes - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes - .4byte LilycoveCity_EmptyMap_MapAttributes - .4byte MossdeepCity_Gym_MapAttributes - .4byte SootopolisCity_Gym_1F_MapAttributes - .4byte SootopolisCity_Gym_B1F_MapAttributes - .4byte EverGrandeCity_SidneysRoom_MapAttributes - .4byte EverGrandeCity_PhoebesRoom_MapAttributes - .4byte EverGrandeCity_GlaciasRoom_MapAttributes - .4byte EverGrandeCity_DrakesRoom_MapAttributes - .4byte EverGrandeCity_ChampionsRoom_MapAttributes - .4byte EverGrandeCity_Corridor1_MapAttributes - .4byte Route104_PrettyPetalFlowerShop_MapAttributes - .4byte Route112_CableCarStation_MapAttributes - .4byte Route114_FossilManiacsHouse_MapAttributes - .4byte Route114_FossilManiacsTunnel_MapAttributes - .4byte Route114_LanettesHouse_MapAttributes - .4byte Route116_TunnelersRestHouse_MapAttributes - .4byte Route117_PokemonDayCare_MapAttributes - .4byte Route121_SafariZoneEntrance_MapAttributes - .4byte MeteorFalls_1F_1R_MapAttributes - .4byte MeteorFalls_1F_2R_MapAttributes - .4byte MeteorFalls_B1F_1R_MapAttributes - .4byte MeteorFalls_B1F_2R_MapAttributes - .4byte RusturfTunnel_MapAttributes - .4byte Underwater_SootopolisCity_MapAttributes - .4byte DesertRuins_MapAttributes - .4byte GraniteCave_1F_MapAttributes - .4byte GraniteCave_B1F_MapAttributes - .4byte GraniteCave_B2F_MapAttributes - .4byte PetalburgWoods_MapAttributes - .4byte MtChimney_MapAttributes - .4byte MtPyre_1F_MapAttributes - .4byte MtPyre_2F_MapAttributes - .4byte MtPyre_3F_MapAttributes - .4byte MtPyre_4F_MapAttributes - .4byte MtPyre_5F_MapAttributes - .4byte MtPyre_6F_MapAttributes - .4byte AquaHideout_1F_MapAttributes - .4byte AquaHideout_B1F_MapAttributes - .4byte AquaHideout_B2F_MapAttributes - .4byte Underwater_SeafloorCavern_MapAttributes - .4byte SeafloorCavern_Entrance_MapAttributes - .4byte SeafloorCavern_Room1_MapAttributes - .4byte SeafloorCavern_Room2_MapAttributes - .4byte SeafloorCavern_Room3_MapAttributes - .4byte SeafloorCavern_Room4_MapAttributes - .4byte SeafloorCavern_Room5_MapAttributes - .4byte SeafloorCavern_Room6_MapAttributes - .4byte SeafloorCavern_Room7_MapAttributes - .4byte SeafloorCavern_Room8_MapAttributes - .4byte SeafloorCavern_Room9_MapAttributes - .4byte CaveOfOrigin_Entrance_MapAttributes - .4byte CaveOfOrigin_1F_MapAttributes - .4byte CaveOfOrigin_B1F_MapAttributes - .4byte CaveOfOrigin_B2F_MapAttributes - .4byte CaveOfOrigin_B3F_MapAttributes - .4byte CaveOfOrigin_B4F_MapAttributes - .4byte VictoryRoad_1F_MapAttributes - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes - .4byte ShoalCave_LowTideInnerRoom_MapAttributes - .4byte ShoalCave_LowTideStairsRoom_MapAttributes - .4byte ShoalCave_LowTideLowerRoom_MapAttributes - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes - .4byte ShoalCave_HighTideInnerRoom_MapAttributes - .4byte UnknownMapAttributes_082E55C8 @ unused maps - .4byte UnknownMapAttributes_082E55EC - .4byte UnknownMapAttributes_082E5610 - .4byte UnknownMapAttributes_082E5634 - .4byte UnknownMapAttributes_082E5658 - .4byte UnknownMapAttributes_082E567C - .4byte UnknownMapAttributes_082E56A0 - .4byte UnknownMapAttributes_082E56C4 - .4byte UnknownMapAttributes_082E56E8 - .4byte UnknownMapAttributes_082E570C - .4byte UnknownMapAttributes_082E5730 - .4byte UnknownMapAttributes_082E5754 - .4byte UnknownMapAttributes_082E5778 - .4byte UnknownMapAttributes_082E579C - .4byte NewMauville_Entrance_MapAttributes - .4byte NewMauville_Inside_MapAttributes - .4byte AbandonedShip_Deck_MapAttributes - .4byte AbandonedShip_Corridors_1F_MapAttributes - .4byte AbandonedShip_Rooms_1F_MapAttributes - .4byte AbandonedShip_Corridors_B1F_MapAttributes - .4byte AbandonedShip_Rooms_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_B1F_MapAttributes - .4byte AbandonedShip_Underwater1_MapAttributes - .4byte AbandonedShip_Room_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_1F_MapAttributes - .4byte AbandonedShip_CaptainsOffice_MapAttributes - .4byte AbandonedShip_Underwater2_MapAttributes - .4byte SecretBase_RedCave1_MapAttributes - .4byte SecretBase_BrownCave1_MapAttributes - .4byte SecretBase_BlueCave1_MapAttributes - .4byte SecretBase_YellowCave1_MapAttributes - .4byte SecretBase_Tree1_MapAttributes - .4byte SecretBase_Shrub1_MapAttributes - .4byte SecretBase_RedCave2_MapAttributes - .4byte SecretBase_BrownCave2_MapAttributes - .4byte SecretBase_BlueCave2_MapAttributes - .4byte SecretBase_YellowCave2_MapAttributes - .4byte SecretBase_Tree2_MapAttributes - .4byte SecretBase_Shrub2_MapAttributes - .4byte SecretBase_RedCave3_MapAttributes - .4byte SecretBase_BrownCave3_MapAttributes - .4byte SecretBase_BlueCave3_MapAttributes - .4byte SecretBase_YellowCave3_MapAttributes - .4byte SecretBase_Tree3_MapAttributes - .4byte SecretBase_Shrub3_MapAttributes - .4byte SecretBase_RedCave4_MapAttributes - .4byte SecretBase_BrownCave4_MapAttributes - .4byte SecretBase_BlueCave4_MapAttributes - .4byte SecretBase_YellowCave4_MapAttributes - .4byte SecretBase_Tree4_MapAttributes - .4byte SecretBase_Shrub4_MapAttributes - .4byte SingleBattleColosseum_MapAttributes - .4byte TradeCenter_MapAttributes - .4byte RecordCorner_MapAttributes - .4byte DoubleBattleColosseum_MapAttributes - .4byte LinkContestRoom1_MapAttributes - .4byte UnknownMap_25_29_MapAttributes - .4byte UnknownMap_25_30_MapAttributes - .4byte UnknownMap_25_31_MapAttributes - .4byte UnknownMap_25_32_MapAttributes - .4byte UnknownMap_25_33_MapAttributes - .4byte UnknownMap_25_34_MapAttributes - .4byte LinkContestRoom2_MapAttributes - .4byte LinkContestRoom3_MapAttributes - .4byte LinkContestRoom4_MapAttributes - .4byte LinkContestRoom5_MapAttributes - .4byte LinkContestRoom6_MapAttributes - .4byte InsideOfTruck_MapAttributes - .4byte SafariZone_Northwest_MapAttributes - .4byte SafariZone_Northeast_MapAttributes - .4byte SafariZone_Southwest_MapAttributes - .4byte SafariZone_Southeast_MapAttributes - .4byte UnknownMapAttributes_082EDF30 - .4byte Route109_SeashoreHouse_MapAttributes - .4byte Route110_TrickHouseEntrance_MapAttributes - .4byte Route110_TrickHouseEnd_MapAttributes - .4byte Route110_TrickHouseCorridor_MapAttributes - .4byte Route110_TrickHousePuzzle1_MapAttributes - .4byte Route110_TrickHousePuzzle2_MapAttributes - .4byte Route110_TrickHousePuzzle3_MapAttributes - .4byte Route110_TrickHousePuzzle4_MapAttributes - .4byte Route110_TrickHousePuzzle5_MapAttributes - .4byte Route110_TrickHousePuzzle6_MapAttributes - .4byte Route110_TrickHousePuzzle7_MapAttributes - .4byte Route110_TrickHousePuzzle8_MapAttributes - .4byte FortreeCity_DecorationShop_MapAttributes - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes - .4byte Route130_MapAttributes - .4byte BattleTower_Lobby_MapAttributes - .4byte BattleTower_Outside_MapAttributes - .4byte BattleTower_Elevator_MapAttributes - .4byte BattleTower_Corridor_MapAttributes - .4byte BattleTower_BattleRoom_MapAttributes - .4byte RustboroCity_DevonCorp_3F_MapAttributes - .4byte EverGrandeCity_PokemonLeague_MapAttributes - .4byte Route119_WeatherInstitute_1F_MapAttributes - .4byte Route119_WeatherInstitute_2F_MapAttributes - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes - .4byte Underwater1_MapAttributes - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes - .4byte SSTidalCorridor_MapAttributes - .4byte SSTidalLowerDeck_MapAttributes - .4byte SSTidalRooms_MapAttributes - .4byte IslandCave_MapAttributes - .4byte AncientTomb_MapAttributes - .4byte Underwater_Route134_MapAttributes - .4byte Underwater_SealedChamber_MapAttributes - .4byte SealedChamber_OuterRoom_MapAttributes - .4byte VictoryRoad_B1F_MapAttributes - .4byte VictoryRoad_B2F_MapAttributes - .4byte Route104_Prototype_MapAttributes - .4byte GraniteCave_StevensRoom_MapAttributes - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes - .4byte SouthernIsland_Exterior_MapAttributes - .4byte SouthernIsland_Interior_MapAttributes - .4byte JaggedPass_MapAttributes - .4byte FieryPath_MapAttributes - .4byte RustboroCity_Flat2_1F_MapAttributes - .4byte RustboroCity_Flat2_2F_MapAttributes - .4byte RustboroCity_Flat2_3F_MapAttributes - .4byte SootopolisCity_House8_MapAttributes - .4byte EverGrandeCity_HallOfFame_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes - .4byte MtPyre_Exterior_MapAttributes - .4byte MtPyre_Summit_MapAttributes - .4byte SealedChamber_InnerRoom_MapAttributes - .4byte MossdeepCity_GameCorner_1F_MapAttributes - .4byte MossdeepCity_GameCorner_B1F_MapAttributes - .4byte SootopolisCity_House1_MapAttributes - .4byte SootopolisCity_House2_MapAttributes - .4byte SootopolisCity_House3_MapAttributes - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes - .4byte ScorchedSlab_MapAttributes - .4byte UnknownMapAttributes_082FF894 - .4byte RustboroCity_Flat1_1F_MapAttributes - .4byte RustboroCity_Flat1_2F_MapAttributes - .4byte EverGrandeCity_Corridor4_MapAttributes - .4byte MagmaHideout_1F_MapAttributes - .4byte MagmaHideout_B1F_MapAttributes - .4byte MagmaHideout_B2F_MapAttributes - .4byte UnknownMapAttributes_08302970 - .4byte SkyPillar_Entrance_MapAttributes - .4byte SkyPillar_Outside_MapAttributes - .4byte SkyPillar_1F_MapAttributes - .4byte SkyPillar_2F_MapAttributes - .4byte SkyPillar_3F_MapAttributes - .4byte SkyPillar_4F_MapAttributes - .4byte UnknownMapAttributes_083041B4 - .4byte MossdeepCity_StevensHouse_MapAttributes - .4byte ShoalCave_LowTideIceRoom_MapAttributes - .4byte SafariZone_RestHouse_MapAttributes - .4byte SkyPillar_5F_MapAttributes - .4byte SkyPillar_Top_MapAttributes diff --git a/data/maps/_groups.inc b/data/maps/groups.inc index 478f03e86..478f03e86 100644 --- a/data/maps/_groups.inc +++ b/data/maps/groups.inc |