dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-cinnabar

Browse Source
This commit is contained in:
GriffinR
2020-01-22 11:41:40 -05:00
committed by GitHub
parent fbf0c4616c e97d3532d4
commit d58a5decde
126 changed files with 1878 additions and 1914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCave_B1F/map.json
+1 -1
View File
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1624F5",
"script": "CeruleanCave_B1F_EventScript_Mewtwo",
"flag": "FLAG_HIDE_MEWTWO"
},
{
data/maps/CeruleanCave_B1F/scripts.inc
+11 -15
View File
@@ -4,10 +4,10 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE
.byte 0
CeruleanCave_B1F_OnResume:: @ 81624C9
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, CeruleanCave_B1F_EventScript_TryRemoveMewtwo
end
EventScript_1624D3:: @ 81624D3
CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -15,21 +15,21 @@ EventScript_1624D3:: @ 81624D3
return
CeruleanCave_B1F_OnTransition:: @ 81624E7
call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1
call_if_unset FLAG_FOUGHT_MEWTWO, CeruleanCave_B1F_EventScript_ShowMewtwo
end
EventScript_1624F1:: @ 81624F1
CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1
clearflag FLAG_HIDE_MEWTWO
return
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
waitse
playmoncry SPECIES_MEWTWO, 2
message Text_177F9F
message CeruleanCave_B1F_Text_Mew
waitmessage
waitmoncry
delay 20
@@ -42,25 +42,21 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_162558
goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_162561
goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_162561
goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
setflag FLAG_FOUGHT_MEWTWO
release
end
EventScript_162558:: @ 8162558
CeruleanCave_B1F_EventScript_DefeatedMewtwo:: @ 8162558
setflag FLAG_FOUGHT_MEWTWO
goto EventScript_RemoveStaticMon
EventScript_162560:: @ 8162560
end
EventScript_162561:: @ 8162561
CeruleanCave_B1F_EventScript_RanFromMewtwo:: @ 8162561
setvar VAR_0x8004, SPECIES_MEWTWO
goto EventScript_MonFlewAway
EventScript_16256B:: @ 816256B
end
data/maps/CeruleanCave_B1F/text.inc
+1 -1
View File
@@ -1,3 +1,3 @@
Text_177F9F:: @ 8177F9F
CeruleanCave_B1F_Text_Mew:: @ 8177F9F
.string "Mew!$"
data/maps/FuchsiaCity/map.json
+18 -18
View File
@@ -39,7 +39,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_166DAF",
"script": "FuchsiaCity_EventScript_Erik",
"flag": "0"
},
{
@@ -78,7 +78,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_166DB8",
"script": "FuchsiaCity_EventScript_Youngster",
"flag": "0"
},
{
@@ -104,7 +104,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_166D9D",
"script": "FuchsiaCity_EventScript_LittleBoy",
"flag": "0"
},
{
@@ -130,7 +130,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_166DA6",
"script": "FuchsiaCity_EventScript_OldMan",
"flag": "0"
},
{
@@ -234,7 +234,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_166DC1",
"script": "FuchsiaCity_EventScript_Lass",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
@@ -250,7 +250,7 @@
"x": 33,
"y": 31,
"elevation": 0,
"dest_map": "MAP_FUCHSIA_CITY_BUILDING1",
"dest_map": "MAP_FUCHSIA_CITY_WARDENS_HOUSE",
"dest_warp_id": 1
},
{
@@ -264,7 +264,7 @@
"x": 28,
"y": 16,
"elevation": 0,
"dest_map": "MAP_FUCHSIA_CITY_ZOO_BUILDING",
"dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE",
"dest_warp_id": 1
},
{
@@ -324,77 +324,77 @@
"x": 31,
"y": 18,
"elevation": 3,
"script": "FuchsiaCity_EventScript_166DDA"
"script": "FuchsiaCity_EventScript_CitySign"
},
{
"type": "bg_event_type_0",
"x": 26,
"y": 18,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166DE3"
"script": "FuchsiaCity_EventScript_SafariZoneSign"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 32,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166E07"
"script": "FuchsiaCity_EventScript_GymSign"
},
{
"type": "bg_event_type_0",
"x": 31,
"y": 31,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166DF5"
"script": "FuchsiaCity_EventScript_WardensHomeSign"
},
{
"type": "bg_event_type_0",
"x": 35,
"y": 10,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166E38"
"script": "FuchsiaCity_EventScript_VoltorbSign"
},
{
"type": "bg_event_type_0",
"x": 38,
"y": 16,
"elevation": 3,
"script": "FuchsiaCity_EventScript_166E6A"
"script": "FuchsiaCity_EventScript_SlowpokeSign"
},
{
"type": "bg_event_type_0",
"x": 41,
"y": 10,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166E1F"
"script": "FuchsiaCity_EventScript_ChanseySign"
},
{
"type": "bg_event_type_0",
"x": 17,
"y": 10,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166E51"
"script": "FuchsiaCity_EventScript_KangaskhanSign"
},
{
"type": "bg_event_type_0",
"x": 11,
"y": 10,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166E9C"
"script": "FuchsiaCity_EventScript_FossilMonSign"
},
{
"type": "bg_event_type_0",
"x": 17,
"y": 18,
"elevation": 3,
"script": "FuchsiaCity_EventScript_166E83"
"script": "FuchsiaCity_EventScript_LaprasSign"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 7,
"elevation": 0,
"script": "FuchsiaCity_EventScript_166DEC"
"script": "FuchsiaCity_EventScript_SafariGameSign"
},
{
"type": "hidden_item",
data/maps/FuchsiaCity/scripts.inc
+42 -41
View File
@@ -4,135 +4,136 @@ FuchsiaCity_MapScripts:: @ 8166D75
FuchsiaCity_OnTransition:: @ 8166D7B
setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY
call_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166D91
call_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_166D97
call_if_set FLAG_GOT_DOME_FOSSIL, FuchsicaCity_EventScript_SetOmanyteGfx
call_if_unset FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_SetKabutoGfx
end
EventScript_166D91:: @ 8166D91
FuchsicaCity_EventScript_SetOmanyteGfx:: @ 8166D91
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE
return
EventScript_166D97:: @ 8166D97
FuchsiaCity_EventScript_SetKabutoGfx:: @ 8166D97
setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO
return
FuchsiaCity_EventScript_166D9D:: @ 8166D9D
msgbox gUnknown_818056E, MSGBOX_NPC
FuchsiaCity_EventScript_LittleBoy:: @ 8166D9D
msgbox FuchsiaCity_Text_DidYouTrySafariGame, MSGBOX_NPC
end
FuchsiaCity_EventScript_166DA6:: @ 8166DA6
msgbox gUnknown_81805C6, MSGBOX_NPC
FuchsiaCity_EventScript_OldMan:: @ 8166DA6
msgbox FuchsiaCity_Text_SafariZoneZooInFront, MSGBOX_NPC
end
FuchsiaCity_EventScript_166DAF:: @ 8166DAF
msgbox gUnknown_818062C, MSGBOX_NPC
FuchsiaCity_EventScript_Erik:: @ 8166DAF
msgbox FuchsiaCity_Text_WheresSara, MSGBOX_NPC
end
FuchsiaCity_EventScript_166DB8:: @ 8166DB8
msgbox gUnknown_818065A, MSGBOX_NPC
FuchsiaCity_EventScript_Youngster:: @ 8166DB8
msgbox FuchsiaCity_Text_ItemBallInThere, MSGBOX_NPC
end
FuchsiaCity_EventScript_166DC1:: @ 8166DC1
FuchsiaCity_EventScript_Lass:: @ 8166DC1
lock
faceplayer
famechecker FAMECHECKER_KOGA, 3
msgbox gUnknown_8180ABD
msgbox FuchsiaCity_Text_MyFatherIsGymLeader
release
end
FuchsiaCity_EventScript_166DDA:: @ 8166DDA
msgbox gUnknown_81806AB, MSGBOX_SIGN
FuchsiaCity_EventScript_CitySign:: @ 8166DDA
msgbox FuchsiaCity_Text_CitySign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_166DE3:: @ 8166DE3
msgbox gUnknown_81806D3, MSGBOX_SIGN
FuchsiaCity_EventScript_SafariZoneSign:: @ 8166DE3
msgbox FuchsiaCity_Text_SafariZoneSign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_166DEC:: @ 8166DEC
msgbox gUnknown_81806F0, MSGBOX_SIGN
FuchsiaCity_EventScript_SafariGameSign:: @ 8166DEC
msgbox FuchsiaCity_Text_SafariGameSign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_166DF5:: @ 8166DF5
msgbox gUnknown_818070D, MSGBOX_SIGN
FuchsiaCity_EventScript_WardensHomeSign:: @ 8166DF5
msgbox FuchsiaCity_Text_WardensHomeSign, MSGBOX_SIGN
end
EventScript_166DFE:: @ 8166DFE
msgbox gUnknown_8180727, MSGBOX_SIGN
@ Unused
FuchsiaCity_EventScript_SafariZoneOfficeSign:: @ 8166DFE
msgbox FuchsiaCity_Text_SafariZoneOfficeSign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_166E07:: @ 8166E07
FuchsiaCity_EventScript_GymSign:: @ 8166E07
lockall
famechecker FAMECHECKER_KOGA, 0
msgbox gUnknown_8180768
msgbox FuchsiaCity_Text_GymSign
releaseall
end
FuchsiaCity_EventScript_166E1F:: @ 8166E1F
FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
lockall
setvar VAR_0x8004, SPECIES_CHANSEY
special Special_SetSeenMon
drawmonpic SPECIES_CHANSEY, 10, 3
msgbox gUnknown_81807A9
msgbox FuchsiaCity_Text_ChanseySign
erasemonpic
releaseall
end
FuchsiaCity_EventScript_166E38:: @ 8166E38
FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
lockall
setvar VAR_0x8004, SPECIES_VOLTORB
special Special_SetSeenMon
drawmonpic SPECIES_VOLTORB, 10, 3
msgbox gUnknown_81807D9
msgbox FuchsiaCity_Text_VoltorbSign
erasemonpic
releaseall
end
FuchsiaCity_EventScript_166E51:: @ 8166E51
FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
lockall
setvar VAR_0x8004, SPECIES_KANGASKHAN
special Special_SetSeenMon
drawmonpic SPECIES_KANGASKHAN, 10, 3
msgbox gUnknown_8180806
msgbox FuchsiaCity_Text_KangaskhanSign
erasemonpic
releaseall
end
FuchsiaCity_EventScript_166E6A:: @ 8166E6A
FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
lockall
setvar VAR_0x8004, SPECIES_SLOWPOKE
special Special_SetSeenMon
drawmonpic SPECIES_SLOWPOKE, 10, 3
msgbox gUnknown_8180859
msgbox FuchsiaCity_Text_SlowpokeSign
erasemonpic
releaseall
end
FuchsiaCity_EventScript_166E83:: @ 8166E83
FuchsiaCity_EventScript_LaprasSign:: @ 8166E83
lockall
setvar VAR_0x8004, SPECIES_LAPRAS
special Special_SetSeenMon
drawmonpic SPECIES_LAPRAS, 10, 3
msgbox gUnknown_8180887
msgbox FuchsiaCity_Text_LaprasSign
erasemonpic
releaseall
end
FuchsiaCity_EventScript_166E9C:: @ 8166E9C
FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
lockall
goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166EBE
goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign
setvar VAR_0x8004, SPECIES_KABUTO
special Special_SetSeenMon
drawmonpic SPECIES_KABUTO, 10, 3
msgbox gUnknown_81808FA
msgbox FuchsiaCity_Text_KabutoSign
erasemonpic
releaseall
end
EventScript_166EBE:: @ 8166EBE
FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE
setvar VAR_0x8004, SPECIES_OMANYTE
special Special_SetSeenMon
drawmonpic SPECIES_OMANYTE, 10, 3
msgbox gUnknown_81808AE
msgbox FuchsiaCity_Text_OmanyteSign
erasemonpic
releaseall
end
data/maps/FuchsiaCity/text.inc
+20 -19
View File
@@ -1,82 +1,83 @@
gUnknown_818056E:: @ 818056E
FuchsiaCity_Text_DidYouTrySafariGame:: @ 818056E
.string "Did you try the SAFARI GAME?\p"
.string "There are some rare POKéMON that\n"
.string "can only be caught there.$"
gUnknown_81805C6:: @ 81805C6
FuchsiaCity_Text_SafariZoneZooInFront:: @ 81805C6
.string "The SAFARI ZONE has a zoo in front\n"
.string "of the entrance.\p"
.string "Out back is the SAFARI GAME for\n"
.string "catching POKéMON.$"
gUnknown_818062C:: @ 818062C
FuchsiaCity_Text_WheresSara:: @ 818062C
.string "ERIK: Where's SARA?\n"
.string "I said I'd meet her here.$"
gUnknown_818065A:: @ 818065A
FuchsiaCity_Text_ItemBallInThere:: @ 818065A
.string "That item ball in there…\n"
.string "Were you wanting that?\p"
.string "Me, too!\n"
.string "…Huh? That's a POKéMON?$"
gUnknown_81806AB:: @ 81806AB
FuchsiaCity_Text_CitySign:: @ 81806AB
.string "FUCHSIA CITY\n"
.string "Behold! It's Passion Pink!$"
gUnknown_81806D3:: @ 81806D3
FuchsiaCity_Text_SafariZoneSign:: @ 81806D3
.string "POKéMON PARADISE\n"
.string "SAFARI ZONE$"
gUnknown_81806F0:: @ 81806F0
FuchsiaCity_Text_SafariGameSign:: @ 81806F0
.string "SAFARI GAME\n"
.string "POKéMON-U-CATCH!$"
gUnknown_818070D:: @ 818070D
FuchsiaCity_Text_WardensHomeSign:: @ 818070D
.string "SAFARI ZONE\n"
.string "WARDEN'S HOME$"
gUnknown_8180727:: @ 8180727
FuchsiaCity_Text_SafariZoneOfficeSign:: @ 8180727
.string "POKéMON PARADISE!\n"
.string "Welcome to the SAFARI ZONE!\l"
.string "SAFARI ZONE OFFICE$"
gUnknown_8180768:: @ 8180768
FuchsiaCity_Text_GymSign:: @ 8180768
.string "FUCHSIA CITY POKéMON GYM\n"
.string "LEADER: KOGA\l"
.string "The Poisonous Ninja Master$"
gUnknown_81807A9:: @ 81807A9
FuchsiaCity_Text_ChanseySign:: @ 81807A9
.string "Name: CHANSEY\n"
.string "Catching one is all up to chance.$"
gUnknown_81807D9:: @ 81807D9
FuchsiaCity_Text_VoltorbSign:: @ 81807D9
.string "Name: VOLTORB\n"
.string "The very image of a POKé BALL.$"
gUnknown_8180806:: @ 8180806
FuchsiaCity_Text_KangaskhanSign:: @ 8180806
.string "Name: KANGASKHAN\p"
.string "A maternal POKéMON that raises its\n"
.string "young in a pouch on its belly.$"
gUnknown_8180859:: @ 8180859
FuchsiaCity_Text_SlowpokeSign:: @ 8180859
.string "Name: SLOWPOKE\n"
.string "Friendly and very slow moving.$"
gUnknown_8180887:: @ 8180887
FuchsiaCity_Text_LaprasSign:: @ 8180887
.string "Name: LAPRAS\n"
.string "AKA the king of the seas.$"
gUnknown_81808AE:: @ 81808AE
FuchsiaCity_Text_OmanyteSign:: @ 81808AE
.string "Name: OMANYTE\n"
.string "An extremely rare POKéMON that was\l"
.string "regenerated from a fossil.$"
gUnknown_81808FA:: @ 81808FA
FuchsiaCity_Text_KabutoSign:: @ 81808FA
.string "Name: KABUTO\n"
.string "An extremely rare POKéMON that was\l"
.string "regenerated from a fossil.$"
Text_180945:: @ 8180945
@ Unused. May have been meant to be the placeholder text for the zoo mons, similar to RB's "!" text
FuchsiaCity_Text_Ellipsis:: @ 8180945
.string "……$"
Text_SubstituteTeach:: @ 8180948
@@ -103,7 +104,7 @@ Text_SubstituteTaught:: @ 8180A80
.string "Boy, what I'd give to crawl inside\n"
.string "a KANGASKHAN belly pouch…$"
gUnknown_8180ABD:: @ 8180ABD
FuchsiaCity_Text_MyFatherIsGymLeader:: @ 8180ABD
.string "My father is the GYM LEADER of\n"
.string "this town.\p"
.string "I'm training to use POISON POKéMON\n"
data/maps/FuchsiaCity_Building1/scripts.inc
-63
View File
@@ -1,63 +0,0 @@
FuchsiaCity_Building1_MapScripts:: @ 816D74B
.byte 0
FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
lock
faceplayer
goto_if_set FLAG_GOT_HM04, EventScript_16D7FA
goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780
msgbox gUnknown_8198DF9, MSGBOX_YESNO
compare VAR_RESULT, YES
call_if_eq EventScript_16D7E8
compare VAR_RESULT, NO
call_if_eq EventScript_16D7F1
release
end
EventScript_16D780:: @ 816D780
textcolor 3
playfanfare MUS_ME_WAZA
message Text_198E84
waitmessage
waitfanfare
msgbox gUnknown_8198EAA
call EventScript_1A6675
checkplayergender
compare VAR_RESULT, MALE
call_if_eq EventScript_16D7D6
compare VAR_RESULT, FEMALE
call_if_eq EventScript_16D7DF
giveitem_msg gUnknown_8199068, ITEM_HM04
setflag FLAG_GOT_HM04
removeitem ITEM_GOLD_TEETH, 1
release
end
EventScript_16D7D6:: @ 816D7D6
msgbox gUnknown_8198ECA
return
EventScript_16D7DF:: @ 816D7DF
msgbox gUnknown_8198F96
return
EventScript_16D7E8:: @ 816D7E8
msgbox gUnknown_8198E3F
return
EventScript_16D7F1:: @ 816D7F1
msgbox gUnknown_8198E63
return
EventScript_16D7FA:: @ 816D7FA
msgbox gUnknown_819908A
release
end
FuchsiaCity_Building1_EventScript_16D804:: @ 816D804
msgbox gUnknown_819913C, MSGBOX_SIGN
end
FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D
msgbox gUnknown_8199167, MSGBOX_SIGN
end
data/maps/FuchsiaCity_Gym/map.json
+10 -10
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "FuchsiaCity_Gym_EventScript_16D65A",
"script": "FuchsiaCity_Gym_EventScript_Kayden",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "FuchsiaCity_Gym_EventScript_16D643",
"script": "FuchsiaCity_Gym_EventScript_Shawn",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "FuchsiaCity_Gym_EventScript_16D61F",
"script": "FuchsiaCity_Gym_EventScript_Kirk",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "FuchsiaCity_Gym_EventScript_16D608",
"script": "FuchsiaCity_Gym_EventScript_Edgar",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "FuchsiaCity_Gym_EventScript_16D5F1",
"script": "FuchsiaCity_Gym_EventScript_Phil",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "FuchsiaCity_Gym_EventScript_16D671",
"script": "FuchsiaCity_Gym_EventScript_Nate",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Gym_EventScript_16D54E",
"script": "FuchsiaCity_Gym_EventScript_Koga",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Gym_EventScript_16D688",
"script": "FuchsiaCity_Gym_EventScript_GymGuy",
"flag": "0"
}
],
@@ -148,14 +148,14 @@
"x": 4,
"y": 19,
"elevation": 0,
"script": "FuchsiaCity_Gym_EventScript_16D6A7"
"script": "FuchsiaCity_Gym_EventScript_GymStatue"
},
{
"type": "bg_event_type_0",
"x": 10,
"y": 19,
"elevation": 0,
"script": "FuchsiaCity_Gym_EventScript_16D6A7"
"script": "FuchsiaCity_Gym_EventScript_GymStatue"
}
]
}
data/maps/FuchsiaCity_Gym/scripts.inc
+41 -41
View File
@@ -1,91 +1,91 @@
FuchsiaCity_Gym_MapScripts:: @ 816D54D
.byte 0
FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
FuchsiaCity_Gym_EventScript_Koga:: @ 816D54E
famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_KOGA, Text_19832E, Text_198444, EventScript_16D580, NO_MUSIC
goto_if_unset FLAG_GOT_TM06_FROM_KOGA, EventScript_16D5A6
msgbox gUnknown_8198481
trainerbattle_single TRAINER_LEADER_KOGA, FuchsiaCity_Gym_Text_KogaIntro, FuchsiaCity_Gym_Text_KogaDefeat, FuchsiaCity_Gym_EventScript_DefeatedKoga, NO_MUSIC
goto_if_unset FLAG_GOT_TM06_FROM_KOGA, FuchsiaCity_Gym_EventScript_GiveTM06
msgbox FuchsiaCity_Gym_Text_KogaPostBattle
release
end
EventScript_16D580:: @ 816D580
FuchsiaCity_Gym_EventScript_DefeatedKoga:: @ 816D580
famechecker FAMECHECKER_KOGA, 1
clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL
setflag FLAG_DEFEATED_KOGA
setflag FLAG_BADGE05_GET
set_gym_trainers 5
goto EventScript_16D5A6
goto FuchsiaCity_Gym_EventScript_GiveTM06
end
EventScript_16D5A6:: @ 816D5A6
msgbox gUnknown_819850E
FuchsiaCity_Gym_EventScript_GiveTM06:: @ 816D5A6
msgbox FuchsiaCity_Gym_Text_KogaExplainSoulBadge
checkitemspace ITEM_TM06, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D5E7
giveitem_msg gUnknown_819858F, ITEM_TM06
goto_if_eq FuchsiaCity_Gym_EventScript_NoRoomForTM06
giveitem_msg FuchsiaCity_Gym_Text_ReceivedTM06FromKoga, ITEM_TM06
setflag FLAG_GOT_TM06_FROM_KOGA
msgbox gUnknown_81985AB
msgbox FuchsiaCity_Gym_Text_KogaExplainTM06
release
end
EventScript_16D5E7:: @ 816D5E7
msgbox gUnknown_819860D
FuchsiaCity_Gym_EventScript_NoRoomForTM06:: @ 816D5E7
msgbox FuchsiaCity_Gym_Text_MakeSpaceForThis
release
end
FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6
msgbox gUnknown_81988CB, MSGBOX_AUTOCLOSE
FuchsiaCity_Gym_EventScript_Phil:: @ 816D5F1
trainerbattle_single TRAINER_TAMER_PHIL, FuchsiaCity_Gym_Text_PhilIntro, FuchsiaCity_Gym_Text_PhilDefeat
msgbox FuchsiaCity_Gym_Text_PhilPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F
msgbox gUnknown_8198985, MSGBOX_AUTOCLOSE
FuchsiaCity_Gym_EventScript_Edgar:: @ 816D608
trainerbattle_single TRAINER_TAMER_EDGAR, FuchsiaCity_Gym_Text_EdgarIntro, FuchsiaCity_Gym_Text_EdgarDefeat
msgbox FuchsiaCity_Gym_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779
FuchsiaCity_Gym_EventScript_Kirk:: @ 816D61F
trainerbattle_single TRAINER_JUGGLER_KIRK, FuchsiaCity_Gym_Text_KirkIntro, FuchsiaCity_Gym_Text_KirkDefeat
famechecker FAMECHECKER_KOGA, 2
msgbox gUnknown_8198787, MSGBOX_AUTOCLOSE
msgbox FuchsiaCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA
msgbox gUnknown_8198A10, MSGBOX_AUTOCLOSE
FuchsiaCity_Gym_EventScript_Shawn:: @ 816D643
trainerbattle_single TRAINER_JUGGLER_SHAWN, FuchsiaCity_Gym_Text_ShawnIntro, FuchsiaCity_Gym_Text_ShawnDefeat
msgbox FuchsiaCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4
msgbox gUnknown_81986C9, MSGBOX_AUTOCLOSE
FuchsiaCity_Gym_EventScript_Kayden:: @ 816D65A
trainerbattle_single TRAINER_JUGGLER_KAYDEN, FuchsiaCity_Gym_Text_KaydenIntro, FuchsiaCity_Gym_Text_KaydenDefeat
msgbox FuchsiaCity_Gym_Text_KaydenPostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812
msgbox gUnknown_8198825, MSGBOX_AUTOCLOSE
FuchsiaCity_Gym_EventScript_Nate:: @ 816D671
trainerbattle_single TRAINER_JUGGLER_NATE, FuchsiaCity_Gym_Text_NateIntro, FuchsiaCity_Gym_Text_NateDefeat
msgbox FuchsiaCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE
end
FuchsiaCity_Gym_EventScript_16D688:: @ 816D688
FuchsiaCity_Gym_EventScript_GymGuy:: @ 816D688
lock
faceplayer
goto_if_set FLAG_DEFEATED_KOGA, EventScript_16D69D
msgbox gUnknown_8198A5E
goto_if_set FLAG_DEFEATED_KOGA, FuchsiaCity_Gym_EventScript_GymGuyPostVictory
msgbox FuchsiaCity_Gym_Text_GymGuyAdvice
release
end
EventScript_16D69D:: @ 816D69D
msgbox gUnknown_8198B1D
FuchsiaCity_Gym_EventScript_GymGuyPostVictory:: @ 816D69D
msgbox FuchsiaCity_Gym_Text_GymGuyPostVictory
release
end
FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
FuchsiaCity_Gym_EventScript_GymStatue:: @ 816D6A7
lockall
goto_if_set FLAG_BADGE05_GET, EventScript_16D6BB
msgbox gUnknown_8198B4B
goto_if_set FLAG_BADGE05_GET, FuchsiaCity_Gym_EventScript_GymStatuePostVictory
msgbox FuchsiaCity_Gym_Text_GymStatue
releaseall
end
EventScript_16D6BB:: @ 816D6BB
msgbox gUnknown_8198B81
FuchsiaCity_Gym_EventScript_GymStatuePostVictory:: @ 816D6BB
msgbox FuchsiaCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/FuchsiaCity_Gym/text.inc
+29 -29
View File
@@ -1,4 +1,4 @@
Text_19832E:: @ 819832E
FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E
.string "KOGA: Fwahahaha!\p"
.string "A mere child like you dares to\n"
.string "challenge me?\p"
@@ -11,20 +11,20 @@ Text_19832E:: @ 819832E
.string "Despair to the creeping horror of\n"
.string "POISON-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$"
Text_198444:: @ 8198444
FuchsiaCity_Gym_Text_KogaDefeat:: @ 8198444
.string "Humph!\n"
.string "You have proven your worth!\p"
.string "Here!\n"
.string "Take the SOULBADGE!$"
gUnknown_8198481:: @ 8198481
FuchsiaCity_Gym_Text_KogaPostBattle:: @ 8198481
.string "When afflicted by TOXIC, a POKéMON\n"
.string "suffers more and more.\p"
.string "It suffers worsening damage as the\n"
.string "battle wears on!\p"
.string "It will surely terrorize foes!$"
gUnknown_819850E:: @ 819850E
FuchsiaCity_Gym_Text_KogaExplainSoulBadge:: @ 819850E
.string "Now that you have the SOULBADGE,\n"
.string "the DEFENSE of your POKéMON rises.\p"
.string "It also lets you SURF outside of\n"
@@ -32,103 +32,103 @@ gUnknown_819850E:: @ 819850E
.string "Ah!\n"
.string "Take this, too!$"
gUnknown_819858F:: @ 819858F
FuchsiaCity_Gym_Text_ReceivedTM06FromKoga:: @ 819858F
.string "{PLAYER} received TM06\n"
.string "from KOGA.$"
gUnknown_81985AB:: @ 81985AB
FuchsiaCity_Gym_Text_KogaExplainTM06:: @ 81985AB
.string "Sealed within that TM06 lies\n"
.string "TOXIC!\p"
.string "It is a secret technique dating\n"
.string "back some four hundred years.$"
gUnknown_819860D:: @ 819860D
FuchsiaCity_Gym_Text_MakeSpaceForThis:: @ 819860D
.string "Make space for this, child!$"
Text_198629:: @ 8198629
FuchsiaCity_Gym_Text_KaydenIntro:: @ 8198629
.string "Strength isn't the key for POKéMON.\n"
.string "Do you understand this?\p"
.string "POKéMON is about strategy!\p"
.string "I'll show you how strategy can\n"
.string "beat brute strength.$"
Text_1986B4:: @ 81986B4
FuchsiaCity_Gym_Text_KaydenDefeat:: @ 81986B4
.string "What?\n"
.string "Extraordinary!$"
gUnknown_81986C9:: @ 81986C9
FuchsiaCity_Gym_Text_KaydenPostBattle:: @ 81986C9
.string "So, you mix brawn with brains?\n"
.string "Good strategy!\p"
.string "That's remarkable for a child\n"
.string "TRAINER.$"
Text_19871E:: @ 819871E
FuchsiaCity_Gym_Text_KirkIntro:: @ 819871E
.string "I was a magician once upon a time.\p"
.string "But I dreamt of becoming a ninja,\n"
.string "so I joined this GYM.$"
Text_198779:: @ 8198779
FuchsiaCity_Gym_Text_KirkDefeat:: @ 8198779
.string "I'm done for!$"
gUnknown_8198787:: @ 8198787
FuchsiaCity_Gym_Text_KirkPostBattle:: @ 8198787
.string "Even though I've lost, I will keep\n"
.string "training according to the teachings\l"
.string "of KOGA, my ninja master.$"
Text_1987E8:: @ 81987E8
FuchsiaCity_Gym_Text_NateIntro:: @ 81987E8
.string "Let's see you beat my special\n"
.string "techniques!$"
Text_198812:: @ 8198812
FuchsiaCity_Gym_Text_NateDefeat:: @ 8198812
.string "You had me fooled!$"
gUnknown_8198825:: @ 8198825
FuchsiaCity_Gym_Text_NatePostBattle:: @ 8198825
.string "I like poison and sleep techniques,\n"
.string "as they linger after battle!$"
Text_198866:: @ 8198866
FuchsiaCity_Gym_Text_PhilIntro:: @ 8198866
.string "Stop right there!\p"
.string "The famed invisible walls of\n"
.string "FUCHSIA GYM have you frustrated?$"
Text_1988B6:: @ 81988B6
FuchsiaCity_Gym_Text_PhilDefeat:: @ 81988B6
.string "Whoa!\n"
.string "You've got it!$"
gUnknown_81988CB:: @ 81988CB
FuchsiaCity_Gym_Text_PhilPostBattle:: @ 81988CB
.string "You impressed me!\n"
.string "Here's a hint!\p"
.string "Look very closely for gaps in the\n"
.string "invisible walls!$"
Text_19891F:: @ 819891F
FuchsiaCity_Gym_Text_EdgarIntro:: @ 819891F
.string "I also study the way of the ninja\n"
.string "with Master KOGA!\p"
.string "Ninja have a long history of using\n"
.string "animals!$"
Text_19897F:: @ 819897F
FuchsiaCity_Gym_Text_EdgarDefeat:: @ 819897F
.string "Awoo!$"
gUnknown_8198985:: @ 8198985
FuchsiaCity_Gym_Text_EdgarPostBattle:: @ 8198985
.string "I still have much to learn.$"
Text_1989A1:: @ 81989A1
FuchsiaCity_Gym_Text_ShawnIntro:: @ 81989A1
.string "Master KOGA comes from a long line\n"
.string "of ninjas.\p"
.string "What did you descend from?$"
Text_1989EA:: @ 81989EA
FuchsiaCity_Gym_Text_ShawnDefeat:: @ 81989EA
.string "You're more skilled than I'd\n"
.string "thought!$"
gUnknown_8198A10:: @ 8198A10
FuchsiaCity_Gym_Text_ShawnPostBattle:: @ 8198A10
.string "Where there is light, there is\n"
.string "shadow!\p"
.string "Light and shadow!\n"
.string "Which do you choose?$"
gUnknown_8198A5E:: @ 8198A5E
FuchsiaCity_Gym_Text_GymGuyAdvice:: @ 8198A5E
.string "Yo!\n"
.string "Champ in the making!\p"
.string "FUCHSIA GYM is a tricked-up place.\n"
@@ -138,17 +138,17 @@ gUnknown_8198A5E:: @ 8198A5E
.string "You have to find gaps in the walls\n"
.string "to reach him.$"
gUnknown_8198B1D:: @ 8198B1D
FuchsiaCity_Gym_Text_GymGuyPostVictory:: @ 8198B1D
.string "It's amazing how ninja can terrify,\n"
.string "even now!$"
gUnknown_8198B4B:: @ 8198B4B
FuchsiaCity_Gym_Text_GymStatue:: @ 8198B4B
.string "FUCHSIA POKéMON GYM\n"
.string "LEADER: KOGA\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
gUnknown_8198B81:: @ 8198B81
FuchsiaCity_Gym_Text_GymStatuePlayerWon:: @ 8198B81
.string "FUCHSIA POKéMON GYM\n"
.string "LEADER: KOGA\p"
.string "WINNING TRAINERS:\n"
data/maps/FuchsiaCity_House1/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_House1_EventScript_16D6CF",
"script": "FuchsiaCity_House1_EventScript_OldMan",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_House1_EventScript_16D6C6",
"script": "FuchsiaCity_House1_EventScript_Woman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_House1_EventScript_16D6E8",
"script": "FuchsiaCity_House1_EventScript_LittleBoy",
"flag": "0"
}
],
data/maps/FuchsiaCity_House1/scripts.inc
+6 -6
View File
@@ -1,18 +1,18 @@
FuchsiaCity_House1_MapScripts:: @ 816D6C5
.byte 0
FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6
msgbox gUnknown_8198BBB, MSGBOX_NPC
FuchsiaCity_House1_EventScript_Woman:: @ 816D6C6
msgbox FuchsiaCity_House1_Text_WardenIsOldHasFalseTeeth, MSGBOX_NPC
end
FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF
FuchsiaCity_House1_EventScript_OldMan:: @ 816D6CF
lock
faceplayer
famechecker FAMECHECKER_BILL, 2
msgbox gUnknown_8198C1F
msgbox FuchsiaCity_House1_Text_BillIsMyGrandson
release
end
FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8
msgbox gUnknown_8198C7B, MSGBOX_NPC
FuchsiaCity_House1_EventScript_LittleBoy:: @ 816D6E8
msgbox FuchsiaCity_House1_Text_BillFilesHisOwnMonData, MSGBOX_NPC
end
data/maps/FuchsiaCity_House1/text.inc
+3 -3
View File
@@ -1,16 +1,16 @@
gUnknown_8198BBB:: @ 8198BBB
FuchsiaCity_House1_Text_WardenIsOldHasFalseTeeth:: @ 8198BBB
.string "The SAFARI ZONE's WARDEN is old, \n"
.string "but he's still very much active.\p"
.string "All his teeth are false, though.$"
gUnknown_8198C1F:: @ 8198C1F
FuchsiaCity_House1_Text_BillIsMyGrandson:: @ 8198C1F
.string "Hmm?\n"
.string "You've met BILL?\p"
.string "He's my grandson!\p"
.string "He always liked collecting things,\n"
.string "even as a child!$"
gUnknown_8198C7B:: @ 8198C7B
FuchsiaCity_House1_Text_BillFilesHisOwnMonData:: @ 8198C7B
.string "BILL files his own POKéMON data on\n"
.string "his PC.\p"
.string "Did he show you?$"
data/maps/FuchsiaCity_House2/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_House2_EventScript_16D817",
"script": "FuchsiaCity_House2_EventScript_FishingGurusBrother",
"flag": "0"
}
],
data/maps/FuchsiaCity_House2/scripts.inc
+14 -14
View File
@@ -1,34 +1,34 @@
FuchsiaCity_House2_MapScripts:: @ 816D816
.byte 0
FuchsiaCity_House2_EventScript_16D817:: @ 816D817
FuchsiaCity_House2_EventScript_FishingGurusBrother:: @ 816D817
lock
faceplayer
goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F
msgbox gUnknown_819918E, MSGBOX_YESNO
goto_if_set FLAG_GOT_GOOD_ROD, FuchsiaCity_House2_EventScript_AlreadyGotGoodRod
msgbox FuchsiaCity_House2_Text_DoYouLikeToFish, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_16D849
msgbox gUnknown_8199337
goto_if_eq FuchsiaCity_House2_EventScript_GiveGoodRod
msgbox FuchsiaCity_House2_Text_OhThatsDisappointing
release
end
EventScript_16D83F:: @ 816D83F
msgbox gUnknown_8199354
FuchsiaCity_House2_EventScript_AlreadyGotGoodRod:: @ 816D83F
msgbox FuchsiaCity_House2_Text_HowAreTheFishBiting
release
end
EventScript_16D849:: @ 816D849
msgbox gUnknown_8199207
FuchsiaCity_House2_EventScript_GiveGoodRod:: @ 816D849
msgbox FuchsiaCity_House2_Text_LikeYourStyleTakeThis
checkitemspace ITEM_GOOD_ROD, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D88A
giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD
msgbox gUnknown_8199296
goto_if_eq FuchsiaCity_House2_EventScript_NoRoomForGoodRod
giveitem_msg FuchsiaCity_House2_Text_ReceivedGoodRod, ITEM_GOOD_ROD
msgbox FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons
setflag FLAG_GOT_GOOD_ROD
release
end
EventScript_16D88A:: @ 816D88A
msgbox gUnknown_819937E
FuchsiaCity_House2_EventScript_NoRoomForGoodRod:: @ 816D88A
msgbox FuchsiaCity_House2_Text_YouHaveNoRoomForGift
release
end
data/maps/FuchsiaCity_House2/text.inc
+7 -7
View File
@@ -1,20 +1,20 @@
gUnknown_819918E:: @ 819918E
FuchsiaCity_House2_Text_DoYouLikeToFish:: @ 819918E
.string "I'm the FISHING GURU's older\n"
.string "brother.\p"
.string "I simply looove fishing!\n"
.string "I can't bear to go without.\p"
.string "Tell me, do you like to fish?$"
gUnknown_8199207:: @ 8199207
FuchsiaCity_House2_Text_LikeYourStyleTakeThis:: @ 8199207
.string "Grand! I like your style.\n"
.string "I think we can be friends.\p"
.string "Take this and fish, young friend!$"
gUnknown_819925E:: @ 819925E
FuchsiaCity_House2_Text_ReceivedGoodRod:: @ 819925E
.string "{PLAYER} received a GOOD ROD from\n"
.string "the FISHING GURU's brother.$"
gUnknown_8199296:: @ 8199296
FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons:: @ 8199296
.string "Fishing is a way of life!\n"
.string "It is like the finest poetry.\p"
.string "A crummy OLD ROD could only catch\n"
@@ -22,15 +22,15 @@ gUnknown_8199296:: @ 8199296
.string "But with a GOOD ROD, you can\n"
.string "catch much better POKéMON.$"
gUnknown_8199337:: @ 8199337
FuchsiaCity_House2_Text_OhThatsDisappointing:: @ 8199337
.string "Oh…\n"
.string "That's so disappointing…$"
gUnknown_8199354:: @ 8199354
FuchsiaCity_House2_Text_HowAreTheFishBiting:: @ 8199354
.string "Hello there, {PLAYER}!\p"
.string "How are the fish biting?$"
gUnknown_819937E:: @ 819937E
FuchsiaCity_House2_Text_YouHaveNoRoomForGift:: @ 819937E
.string "Oh, no!\p"
.string "I had a gift for you, but you have\n"
.string "no room for it!$"
data/maps/FuchsiaCity_House3/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_House3_EventScript_16D895",
"script": "FuchsiaCity_House3_EventScript_MoveDeleter",
"flag": "0"
}
],
data/maps/FuchsiaCity_House3/scripts.inc
+25 -25
View File
@@ -1,60 +1,60 @@
FuchsiaCity_House3_MapScripts:: @ 816D894
.byte 0
FuchsiaCity_House3_EventScript_16D895:: @ 816D895
FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895
lock
faceplayer
msgbox gUnknown_81993B9, MSGBOX_YESNO
msgbox FuchsiaCity_House3_Text_WouldYouLikeToForgetMove, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_16D8B0
goto EventScript_16D941
goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
goto FuchsiaCity_House3_EventScript_CancelForgetMove
end
EventScript_16D8B0:: @ 816D8B0
msgbox gUnknown_8199421
FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove
special Special_ChooseMonFromParty
waitstate
compare VAR_0x8004, 6
goto_if_ge EventScript_16D941
compare VAR_0x8004, PARTY_SIZE
goto_if_ge FuchsiaCity_House3_EventScript_CancelForgetMove
special Special_IsSelectedMonEgg
compare VAR_RESULT, 1
goto_if_eq EventScript_16D937
compare VAR_RESULT, TRUE
goto_if_eq FuchsiaCity_House3_EventScript_CantForgetMoveEgg
special Special_GetNumMovesSelectedMonHas
compare VAR_RESULT, 1
goto_if_eq EventScript_16D92A
msgbox gUnknown_8199445
goto_if_eq FuchsiaCity_House3_EventScript_CantForgetOnlyMove
msgbox FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten
fadescreen FADE_TO_BLACK
special Special_SelectMove
fadescreen FADE_FROM_BLACK
compare VAR_0x8005, 4
goto_if_eq EventScript_16D8B0
compare VAR_0x8005, MAX_MON_MOVES
goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
special Special_BufferMoveDeleterNicknameAndMove
msgbox gUnknown_8199485, MSGBOX_YESNO
msgbox FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_16D919
goto EventScript_16D941
goto_if_eq FuchsiaCity_House3_EventScript_ForgetMove
goto FuchsiaCity_House3_EventScript_CancelForgetMove
end
EventScript_16D919:: @ 816D919
FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
special Special_MoveDeleterForgetMove
playfanfare MUS_ME_WASURE
waitfanfare
msgbox gUnknown_81994B1
msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely
release
end
EventScript_16D92A:: @ 816D92A
FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: @ 816D92A
special Special_BufferMoveDeleterNicknameAndMove
msgbox gUnknown_8199465
msgbox FuchsiaCity_House3_Text_MonOnlyKnowsOneMove
release
end
EventScript_16D937:: @ 816D937
msgbox gUnknown_819951F
FuchsiaCity_House3_EventScript_CantForgetMoveEgg:: @ 816D937
msgbox FuchsiaCity_House3_Text_NoEggShouldKnowMoves
release
end
EventScript_16D941:: @ 816D941
msgbox gUnknown_81994EA
FuchsiaCity_House3_EventScript_CancelForgetMove:: @ 816D941
msgbox FuchsiaCity_House3_Text_ComeAgainToForgetOtherMoves
release
end
data/maps/FuchsiaCity_House3/text.inc
+8 -8
View File
@@ -1,35 +1,35 @@
gUnknown_81993B9:: @ 81993B9
FuchsiaCity_House3_Text_WouldYouLikeToForgetMove:: @ 81993B9
.string "Uh…\n"
.string "Oh, yes, I'm the MOVE DELETER.\p"
.string "I can make POKéMON forget their\n"
.string "moves.\p"
.string "Would you like me to do that?$"
gUnknown_8199421:: @ 8199421
FuchsiaCity_House3_Text_WhichMonShouldForgetMove:: @ 8199421
.string "Which POKéMON should forget a\n"
.string "move?$"
gUnknown_8199445:: @ 8199445
FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten:: @ 8199445
.string "Which move should be forgotten?$"
gUnknown_8199465:: @ 8199465
FuchsiaCity_House3_Text_MonOnlyKnowsOneMove:: @ 8199465
.string "{STR_VAR_1} seems to know only one\n"
.string "move…$"
gUnknown_8199485:: @ 8199485
FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten:: @ 8199485
.string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n"
.string "That move should be forgotten?$"
gUnknown_81994B1:: @ 81994B1
FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely:: @ 81994B1
.string "It worked to perfection!\p"
.string "{STR_VAR_1} has forgotten\n"
.string "{STR_VAR_2} completely.$"
gUnknown_81994EA:: @ 81994EA
FuchsiaCity_House3_Text_ComeAgainToForgetOtherMoves:: @ 81994EA
.string "Come again if there are other\n"
.string "moves to be forgotten.$"
gUnknown_819951F:: @ 819951F
FuchsiaCity_House3_Text_NoEggShouldKnowMoves:: @ 819951F
.string "What?\n"
.string "No EGG should know any moves.$"
data/maps/FuchsiaCity_Mart/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Mart_EventScript_16D4F3",
"script": "FuchsiaCity_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Mart_EventScript_16D4EA",
"script": "FuchsiaCity_Mart_EventScript_Gentleman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Mart_EventScript_16D4E1",
"script": "FuchsiaCity_Mart_EventScript_CooltrainerF",
"flag": "0"
}
],
data/maps/FuchsiaCity_Mart/scripts.inc
+7 -7
View File
@@ -1,27 +1,27 @@
FuchsiaCity_Mart_MapScripts:: @ 816D4E0
.byte 0
FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1
msgbox gUnknown_8198134, MSGBOX_NPC
FuchsiaCity_Mart_EventScript_CooltrainerF:: @ 816D4E1
msgbox FuchsiaCity_Mart_Text_DidYouTryXSpeed, MSGBOX_NPC
end
FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
msgbox gUnknown_81980BC, MSGBOX_NPC
FuchsiaCity_Mart_EventScript_Gentleman:: @ 816D4EA
msgbox FuchsiaCity_Mart_Text_DontTheyHaveSafariZonePennants, MSGBOX_NPC
end
FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
FuchsiaCity_Mart_EventScript_Clerk:: @ 816D4F3
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
pokemart Items_16D518
pokemart FuchsiaCity_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
Items_16D518:: @ 816D518
FuchsiaCity_Mart_Items:: @ 816D518
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_SUPER_POTION
data/maps/FuchsiaCity_Mart/text.inc
+2 -2
View File
@@ -1,10 +1,10 @@
gUnknown_81980BC:: @ 81980BC
FuchsiaCity_Mart_Text_DontTheyHaveSafariZonePennants:: @ 81980BC
.string "Don't they have any pennants\n"
.string "promoting the SAFARI ZONE?\p"
.string "How about some paper lanterns?\n"
.string "Aren't there even any calendars?$"
gUnknown_8198134:: @ 8198134
FuchsiaCity_Mart_Text_DidYouTryXSpeed:: @ 8198134
.string "Did you try X SPEED?\n"
.string "It speeds up a POKéMON in battle.$"
data/maps/FuchsiaCity_PokemonCenter_1F/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D700",
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D709",
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_Man",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D712",
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D71B",
"script": "FuchsiaCity_PokemonCenter_1F_EventScript_Youngster",
"flag": "0"
}
],
data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+7 -7
View File
@@ -7,21 +7,21 @@ FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC
setrespawn SPAWN_FUCHSIA_CITY
end
FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
FuchsiaCity_PokemonCenter_1F_EventScript_Nurse:: @ 816D700
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709
msgbox gUnknown_8198CB7, MSGBOX_NPC
FuchsiaCity_PokemonCenter_1F_EventScript_Man:: @ 816D709
msgbox FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon, MSGBOX_NPC
end
FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712
msgbox gUnknown_8198D2E, MSGBOX_NPC
FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816D712
msgbox FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian, MSGBOX_NPC
end
FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B
msgbox gUnknown_8198D9B, MSGBOX_NPC
FuchsiaCity_PokemonCenter_1F_EventScript_Youngster:: @ 816D71B
msgbox FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex, MSGBOX_NPC
end
data/maps/FuchsiaCity_PokemonCenter_1F/text.inc
+3 -3
View File
@@ -1,16 +1,16 @@
gUnknown_8198CB7:: @ 8198CB7
FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon:: @ 8198CB7
.string "You can't become a good TRAINER\n"
.string "with just one strong POKéMON.\p"
.string "But raising many POKéMON evenly\n"
.string "is no easy task, either.$"
gUnknown_8198D2E:: @ 8198D2E
FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian:: @ 8198D2E
.string "There's a narrow trail west of\n"
.string "VIRIDIAN CITY.\p"
.string "It goes to the POKéMON LEAGUE HQ.\n"
.string "The HQ governs all TRAINERS.$"
gUnknown_8198D9B:: @ 8198D9B
FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex:: @ 8198D9B
.string "If you're working on a POKéDEX,\n"
.string "visit the SAFARI ZONE.\p"
.string "All sorts of rare POKéMON breed\n"
data/maps/FuchsiaCity_SafariZone_Entrance/map.json
+4 -4
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7",
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant",
"flag": "0"
}
],
@@ -78,7 +78,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D"
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerMid"
},
{
"type": "trigger",
@@ -87,7 +87,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379"
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerRight"
},
{
"type": "trigger",
@@ -96,7 +96,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385"
"script": "FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft"
}
],
"bg_events": []
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+71 -68
View File
@@ -3,210 +3,213 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8
.byte 0
FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE
map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2
map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312
map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8
map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn
map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly
map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn
.2byte 0
EventScript_16D2C8:: @ 816D2C8
@ When player runs out of balls mid-battle
FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn:: @ 816D2C8
lockall
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D36A
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter
waitmovement 0
msgbox gUnknown_8197E85
msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D367
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
releaseall
end
EventScript_16D2F2:: @ 816D2F2
@ When player runs of out balls after catching a pokemon, or runs out of steps
FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn:: @ 816D2F2
lockall
textcolor 0
msgbox gUnknown_8197E85
msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
releaseall
end
EventScript_16D312:: @ 816D312
@ When player re-enters the entrance building with balls/steps remaining
FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly:: @ 816D312
lockall
textcolor 0
msgbox gUnknown_8197E1A, MSGBOX_YESNO
msgbox FuchsiaCity_SafariZone_Entrance_Text_GoingToLeaveSafariZoneEarly, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16D345
msgbox gUnknown_8197E48
goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone
msgbox FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
releaseall
end
EventScript_16D345:: @ 816D345
msgbox gUnknown_8197E7A
FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone:: @ 816D345
msgbox FuchsiaCity_SafariZone_Entrance_Text_GoodLuck
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D365
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter
waitmovement 0
warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
waitstate
end
Movement_16D362:: @ 816D362
FuchsiaCity_SafariZone_Entrance_Movement_Exit:: @ 816D362
walk_down
walk_down
step_end
Movement_16D365:: @ 816D365
FuchsiaCity_SafariZone_Entrance_Movement_ReEnter:: @ 816D365
walk_up
step_end
Movement_16D367:: @ 816D367
FuchsiaCity_SafariZone_Entrance_Movement_Exit2:: @ 816D367
walk_down
walk_down
step_end
Movement_16D36A:: @ 816D36A
FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter:: @ 816D36A
walk_down
delay_8
step_end
FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D
FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerMid:: @ 816D36D
lockall
setvar VAR_TEMP_2, 0
goto EventScript_16D391
goto FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone
end
FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379
FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerRight:: @ 816D379
lockall
setvar VAR_TEMP_2, 1
goto EventScript_16D391
goto FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone
end
FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385
FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft:: @ 816D385
lockall
setvar VAR_TEMP_2, 2
goto EventScript_16D391
goto FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone
end
EventScript_16D391:: @ 816D391
FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: @ 816D391
textcolor 0
msgbox gUnknown_8197C6B
msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
showmoneybox 0, 0, 0
msgbox gUnknown_8197C87, MSGBOX_YESNO
msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_16D3CA
msgbox gUnknown_8197DE9
goto EventScript_16D49A
goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone
msgbox FuchsiaCity_SafariZone_Entrance_Text_OkayPleaseComeAgain
goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack
end
EventScript_16D3CA:: @ 816D3CA
call EventScript_16D462
FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA
call FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons
checkmoney 500, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D48C
goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney
removemoney 500, 0
updatemoneybox 0, 0, 0
msgbox gUnknown_8197D07
msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls
textcolor 3
playfanfare MUS_FANFA1
message Text_197D50
message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls
waitfanfare
call EventScript_1A6675
msgbox gUnknown_8197D80
msgbox FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut
closemessage
hidemoneybox 0, 0
compare VAR_TEMP_2, 0
call_if_eq EventScript_16D44C
call_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid
compare VAR_TEMP_2, 1
call_if_eq EventScript_16D441
call_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight
compare VAR_TEMP_2, 2
call_if_eq EventScript_16D457
call_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft
special EnterSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
waitstate
end
EventScript_16D441:: @ 816D441
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AF
FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight:: @ 816D441
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight
waitmovement 0
return
EventScript_16D44C:: @ 816D44C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AC
FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid:: @ 816D44C
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid
waitmovement 0
return
EventScript_16D457:: @ 816D457
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4B3
FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft:: @ 816D457
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft
waitmovement 0
return
EventScript_16D462:: @ 816D462
FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_ne EventScript_Return
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_Return
msgbox gUnknown_81BFEAC
goto EventScript_16D49A
msgbox SafariZone_Text_ExcuseMeYourPCBoxIsFull
goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack
end
EventScript_16D48C:: @ 816D48C
msgbox gUnknown_8197E02
goto EventScript_16D49A
FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney:: @ 816D48C
msgbox FuchsiaCity_SafariZone_Entrance_Text_OopsNotEnoughMoney
goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack
end
EventScript_16D49A:: @ 816D49A
FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack:: @ 816D49A
closemessage
hidemoneybox 0, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AA
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack
waitmovement 0
releaseall
end
Movement_16D4AA:: @ 816D4AA
FuchsiaCity_SafariZone_Entrance_Movement_ForceBack:: @ 816D4AA
walk_down
step_end
Movement_16D4AC:: @ 816D4AC
FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid:: @ 816D4AC
walk_up
walk_up
step_end
Movement_16D4AF:: @ 816D4AF
FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight:: @ 816D4AF
walk_up
walk_left
walk_up
step_end
Movement_16D4B3:: @ 816D4B3
FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft:: @ 816D4B3
walk_up
walk_right
walk_up
step_end
FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant:: @ 816D4B7
lock
faceplayer
msgbox gUnknown_8197EB0, MSGBOX_YESNO
msgbox FuchsiaCity_SafariZone_Entrance_Text_FirstTimeAtSafariZone, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_16D4D6
msgbox gUnknown_819809E
goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_ExplainSafariZone
msgbox FuchsiaCity_SafariZone_Entrance_Text_SorryYoureARegularHere
release
end
EventScript_16D4D6:: @ 816D4D6
msgbox gUnknown_8197EE3
FuchsiaCity_SafariZone_Entrance_EventScript_ExplainSafariZone:: @ 816D4D6
msgbox FuchsiaCity_SafariZone_Entrance_Text_ExplainSafariZone
release
end
data/maps/FuchsiaCity_SafariZone_Entrance/text.inc
+14 -14
View File
@@ -1,56 +1,56 @@
gUnknown_8197C6B:: @ 8197C6B
FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone:: @ 8197C6B
.string "Welcome to the SAFARI ZONE!$"
gUnknown_8197C87:: @ 8197C87
FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500:: @ 8197C87
.string "For just ¥500, you can play the\n"
.string "SAFARI GAME.\p"
.string "You can roam the wide-open safari\n"
.string "and catch what you like.\p"
.string "Would you like to play?$"
gUnknown_8197D07:: @ 8197D07
FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls:: @ 8197D07
.string "That'll be ¥500, please!\p"
.string "We only use a special kind of \n"
.string "POKé BALLS here.$"
Text_197D50:: @ 8197D50
FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls:: @ 8197D50
.string "{PLAYER} received 30 SAFARI BALLS\n"
.string "from the attendant.$"
gUnknown_8197D80:: @ 8197D80
FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut:: @ 8197D80
.string "We'll call you on the PA when you\n"
.string "run out of time or SAFARI BALLS.\p"
.string "Well, I'll wish you the best of\n"
.string "luck!$"
gUnknown_8197DE9:: @ 8197DE9
FuchsiaCity_SafariZone_Entrance_Text_OkayPleaseComeAgain:: @ 8197DE9
.string "Okay.\n"
.string "Please come again!$"
gUnknown_8197E02:: @ 8197E02
FuchsiaCity_SafariZone_Entrance_Text_OopsNotEnoughMoney:: @ 8197E02
.string "Oops!\n"
.string "Not enough money!$"
gUnknown_8197E1A:: @ 8197E1A
FuchsiaCity_SafariZone_Entrance_Text_GoingToLeaveSafariZoneEarly:: @ 8197E1A
.string "Are you going to leave the\n"
.string "SAFARI ZONE early?$"
gUnknown_8197E48:: @ 8197E48
FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls:: @ 8197E48
.string "Please return any SAFARI BALLS\n"
.string "you may have left.$"
gUnknown_8197E7A:: @ 8197E7A
FuchsiaCity_SafariZone_Entrance_Text_GoodLuck:: @ 8197E7A
.string "Good luck!$"
gUnknown_8197E85:: @ 8197E85
FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain:: @ 8197E85
.string "Did you catch your fair share?\n"
.string "Come again!$"
gUnknown_8197EB0:: @ 8197EB0
FuchsiaCity_SafariZone_Entrance_Text_FirstTimeAtSafariZone:: @ 8197EB0
.string "Hi! Is it your first time here at\n"
.string "the SAFARI ZONE?$"
gUnknown_8197EE3:: @ 8197EE3
FuchsiaCity_SafariZone_Entrance_Text_ExplainSafariZone:: @ 8197EE3
.string "The SAFARI ZONE actually has\n"
.string "four zones in it.\p"
.string "Each zone has different kinds of\n"
@@ -68,6 +68,6 @@ gUnknown_8197EE3:: @ 8197EE3
.string "When you run out of time or SAFARI\n"
.string "BALLS, it's game over for you!$"
gUnknown_819809E:: @ 819809E
FuchsiaCity_SafariZone_Entrance_Text_SorryYoureARegularHere:: @ 819809E
.string "Sorry, you're a regular here!$"
data/maps/FuchsiaCity_ZooBuilding/map.json → data/maps/FuchsiaCity_SafariZone_Office/map.json
+7 -7
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_FUCHSIA_CITY_ZOO_BUILDING",
"name": "FuchsiaCity_ZooBuilding",
"layout": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING",
"id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE",
"name": "FuchsiaCity_SafariZone_Office",
"layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_FUCHSIA_CITY",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_ZooBuilding_EventScript_16D532",
"script": "FuchsiaCity_SafariZone_Office_EventScript_Worker2",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_ZooBuilding_EventScript_16D53B",
"script": "FuchsiaCity_SafariZone_Office_EventScript_Worker3",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_ZooBuilding_EventScript_16D529",
"script": "FuchsiaCity_SafariZone_Office_EventScript_Worker1",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_ZooBuilding_EventScript_16D544",
"script": "FuchsiaCity_SafariZone_Office_EventScript_Worker4",
"flag": "0"
}
],
data/maps/FuchsiaCity_SafariZone_Office/scripts.inc
+18
View File
@@ -0,0 +1,18 @@
FuchsiaCity_SafariZone_Office_MapScripts:: @ 816D528
.byte 0
FuchsiaCity_SafariZone_Office_EventScript_Worker1:: @ 816D529
msgbox FuchsiaCity_SafariZone_Office_Text_NicknamedWardenSlowpoke, MSGBOX_NPC
end
FuchsiaCity_SafariZone_Office_EventScript_Worker2:: @ 816D532
msgbox FuchsiaCity_SafariZone_Office_Text_WardenIsVeryKnowledgeable, MSGBOX_NPC
end
FuchsiaCity_SafariZone_Office_EventScript_Worker3:: @ 816D53B
msgbox FuchsiaCity_SafariZone_Office_Text_CouldntUnderstandWarden, MSGBOX_NPC
end
FuchsiaCity_SafariZone_Office_EventScript_Worker4:: @ 816D544
msgbox FuchsiaCity_SafariZone_Office_Text_PrizeInSafariZone, MSGBOX_NPC
end
data/maps/FuchsiaCity_ZooBuilding/text.inc → data/maps/FuchsiaCity_SafariZone_Office/text.inc
+4 -4
View File
@@ -1,21 +1,21 @@
gUnknown_819816B:: @ 819816B
FuchsiaCity_SafariZone_Office_Text_NicknamedWardenSlowpoke:: @ 819816B
.string "We nicknamed the WARDEN\n"
.string "“SLOWPOKE.”\p"
.string "You know, he has that vacant look\n"
.string "like a SLOWPOKE.$"
gUnknown_81981C2:: @ 81981C2
FuchsiaCity_SafariZone_Office_Text_WardenIsVeryKnowledgeable:: @ 81981C2
.string "WARDEN SLOWPOKE is very\n"
.string "knowledgeable about POKéMON.\p"
.string "He even has some fossils of rare,\n"
.string "extinct POKéMON.$"
gUnknown_819822A:: @ 819822A
FuchsiaCity_SafariZone_Office_Text_CouldntUnderstandWarden:: @ 819822A
.string "WARDEN SLOWPOKE came in, but\n"
.string "I couldn't understand him.\p"
.string "I think he's got a speech problem!$"
gUnknown_8198285:: @ 8198285
FuchsiaCity_SafariZone_Office_Text_PrizeInSafariZone:: @ 8198285
.string "WARDEN SLOWPOKE is running a\n"
.string "promotion campaign right now.\p"
.string "Try to get to the farthest corner\n"
data/maps/FuchsiaCity_Building1/map.json → data/maps/FuchsiaCity_WardensHouse/map.json
+11 -11
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_FUCHSIA_CITY_BUILDING1",
"name": "FuchsiaCity_Building1",
"layout": "LAYOUT_FUCHSIA_CITY_BUILDING1",
"id": "MAP_FUCHSIA_CITY_WARDENS_HOUSE",
"name": "FuchsiaCity_WardensHouse",
"layout": "LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE",
"music": "MUS_HANADA",
"region_map_section": "MAPSEC_FUCHSIA_CITY",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Building1_EventScript_16D74C",
"script": "FuchsiaCity_WardensHouse_EventScript_Warden",
"flag": "0"
},
{
@@ -49,8 +49,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Building1_EventScript_ItemRareCandy",
"flag": "FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY"
"script": "FuchsiaCity_WardensHouse_EventScript_ItemRareCandy",
"flag": "FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY"
},
{
"graphics_id": "0",
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Building1_EventScript_1ACEB8",
"script": "FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga",
"flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL"
}
],
@@ -96,28 +96,28 @@
"x": 7,
"y": 4,
"elevation": 0,
"script": "FuchsiaCity_Building1_EventScript_16D80D"
"script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign2"
},
{
"type": "bg_event_type_0",
"x": 4,
"y": 4,
"elevation": 0,
"script": "FuchsiaCity_Building1_EventScript_16D804"
"script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign1"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 4,
"elevation": 0,
"script": "FuchsiaCity_Building1_EventScript_16D804"
"script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign1"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 4,
"elevation": 0,
"script": "FuchsiaCity_Building1_EventScript_16D80D"
"script": "FuchsiaCity_WardensHouse_EventScript_DisplaySign2"
}
]
}
data/maps/FuchsiaCity_WardensHouse/scripts.inc
+63
View File
@@ -0,0 +1,63 @@
FuchsiaCity_WardensHouse_MapScripts:: @ 816D74B
.byte 0
FuchsiaCity_WardensHouse_EventScript_Warden:: @ 816D74C
lock
faceplayer
goto_if_set FLAG_GOT_HM04, FuchsiaCity_WardensHouse_EventScript_ExplainStrength
goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth
msgbox FuchsiaCity_WardensHouse_Text_HifFuffHefifoo, MSGBOX_YESNO
compare VAR_RESULT, YES
call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenYes
compare VAR_RESULT, NO
call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenNo
release
end
FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780
textcolor 3
playfanfare MUS_ME_WAZA
message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden
waitmessage
waitfanfare
msgbox FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth
call EventScript_1A6675
checkplayergender
compare VAR_RESULT, MALE
call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksMale
compare VAR_RESULT, FEMALE
call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale
giveitem_msg FuchsiaCity_WardensHouse_Text_ReceivedHM04FromWarden, ITEM_HM04
setflag FLAG_GOT_HM04
removeitem ITEM_GOLD_TEETH, 1
release
end
FuchsiaCity_WardensHouse_EventScript_WardenThanksMale:: @ 816D7D6
msgbox FuchsiaCity_WardensHouse_Text_ThanksSonGiveYouSomething
return
FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale:: @ 816D7DF
msgbox FuchsiaCity_WardensHouse_Text_ThanksLassieGiveYouSomething
return
FuchsiaCity_WardensHouse_EventScript_WardenYes:: @ 816D7E8
msgbox FuchsiaCity_WardensHouse_Text_AhHowheeHoHoo
return
FuchsiaCity_WardensHouse_EventScript_WardenNo:: @ 816D7F1
msgbox FuchsiaCity_WardensHouse_Text_HeOhayHeHaHoo
return
FuchsiaCity_WardensHouse_EventScript_ExplainStrength:: @ 816D7FA
msgbox FuchsiaCity_WardensHouse_Text_ExplainStrength
release
end
FuchsiaCity_WardensHouse_EventScript_DisplaySign1:: @ 816D804
msgbox FuchsiaCity_WardensHouse_Text_MonPhotosFossilsOnDisplay, MSGBOX_SIGN
end
FuchsiaCity_WardensHouse_EventScript_DisplaySign2:: @ 816D80D
msgbox FuchsiaCity_WardensHouse_Text_OldMonMerchandiseOnDisplay, MSGBOX_SIGN
end
data/maps/FuchsiaCity_Building1/text.inc → data/maps/FuchsiaCity_WardensHouse/text.inc
+13 -12
View File
@@ -1,24 +1,24 @@
gUnknown_8198DF9:: @ 8198DF9
FuchsiaCity_WardensHouse_Text_HifFuffHefifoo:: @ 8198DF9
.string "WARDEN: Hif fuff hefifoo!\p"
.string "Ha lof ha feef ee hafahi ho.\n"
.string "Heff hee fwee!$"
gUnknown_8198E3F:: @ 8198E3F
FuchsiaCity_WardensHouse_Text_AhHowheeHoHoo:: @ 8198E3F
.string "Ah howhee ho hoo!\n"
.string "Eef ee hafahi ho!$"
gUnknown_8198E63:: @ 8198E63
FuchsiaCity_WardensHouse_Text_HeOhayHeHaHoo:: @ 8198E63
.string "Ha?\n"
.string "He ohay heh ha hoo ee haheh!$"
Text_198E84:: @ 8198E84
FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden:: @ 8198E84
.string "{PLAYER} gave the GOLD TEETH\n"
.string "to the WARDEN.$"
gUnknown_8198EAA:: @ 8198EAA
FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth:: @ 8198EAA
.string "The WARDEN popped in his teeth!$"
gUnknown_8198ECA:: @ 8198ECA
FuchsiaCity_WardensHouse_Text_ThanksSonGiveYouSomething:: @ 8198ECA
.string "WARDEN: Thanks, son!\n"
.string "You're a real lifesaver!\p"
.string "No one could understand a word\n"
@@ -28,7 +28,7 @@ gUnknown_8198ECA:: @ 8198ECA
.string "Let me give you something for your\n"
.string "trouble.$"
gUnknown_8198F96:: @ 8198F96
FuchsiaCity_WardensHouse_Text_ThanksLassieGiveYouSomething:: @ 8198F96
.string "WARDEN: Thank you, lassie!\n"
.string "You're a real lifesaver!\p"
.string "No one could understand a word\n"
@@ -38,11 +38,11 @@ gUnknown_8198F96:: @ 8198F96
.string "Let me give you something for your\n"
.string "trouble.$"
gUnknown_8199068:: @ 8199068
FuchsiaCity_WardensHouse_Text_ReceivedHM04FromWarden:: @ 8199068
.string "{PLAYER} received HM04\n"
.string "from the WARDEN.$"
gUnknown_819908A:: @ 819908A
FuchsiaCity_WardensHouse_Text_ExplainStrength:: @ 819908A
.string "WARDEN: Inside HM04 you'll find\n"
.string "STRENGTH.\p"
.string "It lets POKéMON move boulders when\n"
@@ -50,15 +50,16 @@ gUnknown_819908A:: @ 819908A
.string "Oh yes, did you find the SECRET\n"
.string "HOUSE in the SAFARI ZONE?$"
Text_19912B:: @ 819912B
@ Unused
FuchsiaCity_WardensHouse_Text_YouHaveTooMuchStuff:: @ 819912B
.string "なんや　にもつ\n"
.string "いっぱいやんけ！$"
gUnknown_819913C:: @ 819913C
FuchsiaCity_WardensHouse_Text_MonPhotosFossilsOnDisplay:: @ 819913C
.string "POKéMON photos and fossils are on\n"
.string "display.$"
gUnknown_8199167:: @ 8199167
FuchsiaCity_WardensHouse_Text_OldMonMerchandiseOnDisplay:: @ 8199167
.string "Old POKéMON merchandise is on\n"
.string "display.$"
data/maps/FuchsiaCity_ZooBuilding/scripts.inc
-18
View File
@@ -1,18 +0,0 @@
FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528
.byte 0
FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529
msgbox gUnknown_819816B, MSGBOX_NPC
end
FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532
msgbox gUnknown_81981C2, MSGBOX_NPC
end
FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B
msgbox gUnknown_819822A, MSGBOX_NPC
end
FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544
msgbox gUnknown_8198285, MSGBOX_NPC
end
data/maps/MtEmber_Exterior/map.json
+8 -8
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_16397F",
"script": "MtEmber_Exterior_EventScript_Grunt1",
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1639F0",
"script": "MtEmber_Exterior_EventScript_Grunt2",
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "MtEmber_Exterior_EventScript_163AE2",
"script": "MtEmber_Exterior_EventScript_Jocelyn",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "MtEmber_Exterior_EventScript_163AB4",
"script": "MtEmber_Exterior_EventScript_Logan",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "MtEmber_Exterior_EventScript_163ACB",
"script": "MtEmber_Exterior_EventScript_Beth",
"flag": "0"
},
{
@@ -326,7 +326,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR",
"var_value": 1,
"script": "MtEmber_Exterior_EventScript_163A4E"
"script": "MtEmber_Exterior_EventScript_RocketPasswordScene"
},
{
"type": "trigger",
@@ -335,7 +335,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR",
"var_value": 1,
"script": "MtEmber_Exterior_EventScript_163A4E"
"script": "MtEmber_Exterior_EventScript_RocketPasswordScene"
},
{
"type": "trigger",
@@ -344,7 +344,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR",
"var_value": 1,
"script": "MtEmber_Exterior_EventScript_163A4E"
"script": "MtEmber_Exterior_EventScript_RocketPasswordScene"
}
],
"bg_events": [
data/maps/MtEmber_Exterior/scripts.inc
+46 -46
View File
@@ -6,50 +6,50 @@ MtEmber_Exterior_MapScripts:: @ 8163946
MtEmber_Exterior_OnTransition:: @ 8163951
setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR
compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
call_if_eq EventScript_163960
call_if_eq MtEmber_Exterior_EventScript_RocketsFaceDown
end
EventScript_163960:: @ 8163960
setobjectmovementtype 2, 8
setobjectmovementtype 3, 8
MtEmber_Exterior_EventScript_RocketsFaceDown:: @ 8163960
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype 3, MOVEMENT_TYPE_FACE_DOWN
return
MtEmber_Exterior_OnLoad:: @ 8163969
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
call_if_ge EventScript_163975
call_if_ge MtEmber_Exterior_EventScript_OpenCave
end
EventScript_163975:: @ 8163975
setmetatile 42, 39, 838, 0
MtEmber_Exterior_EventScript_OpenCave:: @ 8163975
setmetatile 42, 39, METATILE_MtEmber_CaveEntrance, 0
return
MtEmber_Exterior_EventScript_16397F:: @ 816397F
MtEmber_Exterior_EventScript_Grunt1:: @ 816397F
lock
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_16399E
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_EventScript_Grunt1Defeated
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_1639A8
msgbox gUnknown_817A82A
goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt1
msgbox MtEmber_Exterior_Text_WellTryDiggingHere
release
end
EventScript_16399E:: @ 816399E
msgbox gUnknown_817AA3F
MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E
msgbox MtEmber_Exterior_Text_Grunt1PostBattle
release
end
EventScript_1639A8:: @ 81639A8
MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8
applymovement 2, Movement_FacePlayer
waitmovement 0
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA06
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34
msgbox gUnknown_817AA3F
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_1639DB
msgbox MtEmber_Exterior_Text_Grunt1Intro
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_Text_Grunt1Defeat
msgbox MtEmber_Exterior_Text_Grunt1PostBattle
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_EventScript_DefeatedBothGrunts
release
end
EventScript_1639DB:: @ 81639DB
msgbox gUnknown_817AAD7
MtEmber_Exterior_EventScript_DefeatedBothGrunts:: @ 81639DB
msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere
closemessage
fadescreen FADE_TO_BLACK
removeobject 2
@@ -58,44 +58,44 @@ EventScript_1639DB:: @ 81639DB
release
end
MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
MtEmber_Exterior_EventScript_Grunt2:: @ 81639F0
lock
faceplayer
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_163A1B
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_EventScript_DefeatedGrunt2
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_163A25
msgbox gUnknown_817A88C
goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt2
msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
closemessage
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
EventScript_163A1B:: @ 8163A1B
msgbox gUnknown_817AA99
MtEmber_Exterior_EventScript_DefeatedGrunt2:: @ 8163A1B
msgbox MtEmber_Exterior_Text_Grunt2PostBattle
release
end
EventScript_163A25:: @ 8163A25
MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA56
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A
msgbox gUnknown_817AA99
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_1639DB
msgbox MtEmber_Exterior_Text_Grunt2Intro
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_Text_Grunt2Defeat
msgbox MtEmber_Exterior_Text_Grunt2PostBattle
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_EventScript_DefeatedBothGrunts
release
end
MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
MtEmber_Exterior_EventScript_RocketPasswordScene:: @ 8163A4E
lockall
textcolor 0
msgbox gUnknown_817A8B4
message Text_17A8EE
msgbox MtEmber_Exterior_Text_PunchedThroughAtLast
message MtEmber_Exterior_Text_WhatsPasswordAgain
waitmessage
playse SE_PIN
applymovement 3, Movement_QuestionMark
waitmovement 0
waitbuttonpress
msgbox gUnknown_817A970
msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
@@ -105,23 +105,23 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
waitmovement 0
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
call EventScript_163960
msgbox gUnknown_817A9E1
call MtEmber_Exterior_EventScript_RocketsFaceDown
msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn
setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
releaseall
end
MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4
trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA
msgbox gUnknown_817ABD8, MSGBOX_AUTOCLOSE
MtEmber_Exterior_EventScript_Logan:: @ 8163AB4
trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, MtEmber_Exterior_Text_LoganIntro, MtEmber_Exterior_Text_LoganDefeat
msgbox MtEmber_Exterior_Text_LoganPostBattle, MSGBOX_AUTOCLOSE
end
MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB
trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82
msgbox gUnknown_817ACA2, MSGBOX_AUTOCLOSE
MtEmber_Exterior_EventScript_Beth:: @ 8163ACB
trainerbattle_single TRAINER_PKMN_RANGER_BETH, MtEmber_Exterior_Text_BethIntro, MtEmber_Exterior_Text_BethDefeat
msgbox MtEmber_Exterior_Text_BethPostBattle, MSGBOX_AUTOCLOSE
end
MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2
trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B
msgbox gUnknown_817AD89, MSGBOX_AUTOCLOSE
MtEmber_Exterior_EventScript_Jocelyn:: @ 8163AE2
trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, MtEmber_Exterior_Text_JocelynIntro, MtEmber_Exterior_Text_JocelynDefeat
msgbox MtEmber_Exterior_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/MtEmber_Exterior/text.inc
+27 -26
View File
@@ -20,7 +20,8 @@ Text_ExplosionTaught:: @ 817A756
.string "volcano…\p"
.string "What a terrifying thrill!$"
Text_17A797:: @ 817A797
@ Below 4 are unused JP versions of the above texts
Text_ExplosionTeachJP:: @ 817A797
.string "こ　この　かざんが\n"
.string "もし　だいばくはつ　したら\l"
.string "お　おれら　ひとたまりも\l"
@@ -28,72 +29,72 @@ Text_17A797:: @ 817A797
.string "こ　こわい　ついでに\n"
.string "だいばくはつ　でも　おぼえてみる？$"
Text_17A7E5:: @ 817A7E5
Text_ExplosionDeclinedJP:: @ 817A7E5
.string "や　やっぱ　こわいもんな\n"
.string "ブルブル$"
Text_17A7F7:: @ 817A7F7
Text_ExplosionWhichMonJP:: @ 817A7F7
.string "つ　つよきだね！\n"
.string "じゃあ　どの　ポケモンに　する？$"
Text_17A811:: @ 817A811
Text_ExplosionTaughtJP:: @ 817A811
.string "かざんで　だいばくはつを‥\n"
.string "す　すごい　スリル！$"
gUnknown_817A82A:: @ 817A82A
MtEmber_Exterior_Text_WellTryDiggingHere:: @ 817A82A
.string "Over here.\n"
.string "We'll try digging here.\p"
.string "That treasure the ADMINS've been\n"
.string "talking about should be here.$"
gUnknown_817A88C:: @ 817A88C
MtEmber_Exterior_Text_YoureInTheWayGetLost:: @ 817A88C
.string "What the…?\n"
.string "You're in the way. Get lost.$"
gUnknown_817A8B4:: @ 817A8B4
MtEmber_Exterior_Text_PunchedThroughAtLast:: @ 817A8B4
.string "Whew, punched through at last.\n"
.string "Let's go treasure hunting!$"
Text_17A8EE:: @ 817A8EE
MtEmber_Exterior_Text_WhatsPasswordAgain:: @ 817A8EE
.string "Any treasure we find, we haul back\n"
.string "to the WAREHOUSE, understood?\p"
.string "…Oh, and what're the passwords?\n"
.string "At the ROCKET WAREHOUSE, I mean.$"
gUnknown_817A970:: @ 817A970
MtEmber_Exterior_Text_FirstPasswordGoldeen:: @ 817A970
.string "What, you forgot the password?\n"
.string "There're actually two.\p"
.string "The first one's “GOLDEEN need\n"
.string "log.”\p"
.string "And the second one is…$"
gUnknown_817A9E1:: @ 817A9E1
MtEmber_Exterior_Text_SnoopsBeenListeningIn:: @ 817A9E1
.string "Hey!\n"
.string "This snoop's been listening in!$"
gUnknown_817AA06:: @ 817AA06
MtEmber_Exterior_Text_Grunt1Intro:: @ 817AA06
.string "You've been eavesdropping on us,\n"
.string "haven't you?$"
Text_17AA34:: @ 817AA34
MtEmber_Exterior_Text_Grunt1Defeat:: @ 817AA34
.string "Huh, what?$"
gUnknown_817AA3F:: @ 817AA3F
MtEmber_Exterior_Text_Grunt1PostBattle:: @ 817AA3F
.string "Why'd you have to win?$"
gUnknown_817AA56:: @ 817AA56
MtEmber_Exterior_Text_Grunt2Intro:: @ 817AA56
.string "Trying to horn in on our treasure?\n"
.string "Don't bet on it!$"
Text_17AA8A:: @ 817AA8A
MtEmber_Exterior_Text_Grunt2Defeat:: @ 817AA8A
.string "Wait!\n"
.string "But how?$"
gUnknown_817AA99:: @ 817AA99
MtEmber_Exterior_Text_Grunt2PostBattle:: @ 817AA99
.string "Develop amnesia conveniently and\n"
.string "forget everything you heard!$"
gUnknown_817AAD7:: @ 817AAD7
MtEmber_Exterior_Text_WellRegroupDontStepInsideThere:: @ 817AAD7
.string "What a setback…\n"
.string "We'll have to regroup.\p"
.string "You! Don't even think about taking\n"
@@ -101,43 +102,43 @@ gUnknown_817AAD7:: @ 817AAD7
.string "If you know what's good for you,\n"
.string "don't even think about this!$"
Text_17AB73:: @ 817AB73
MtEmber_Exterior_Text_LoganIntro:: @ 817AB73
.string "An active volcano is one that's\n"
.string "erupting, or about to.$"
Text_17ABAA:: @ 817ABAA
MtEmber_Exterior_Text_LoganDefeat:: @ 817ABAA
.string "Whew… That was hot!\n"
.string "Sweat's erupting from me!$"
gUnknown_817ABD8:: @ 817ABD8
MtEmber_Exterior_Text_LoganPostBattle:: @ 817ABD8
.string "They say there're over 1,500\n"
.string "active volcanoes in the world.\p"
.string "Just thinking about them makes me\n"
.string "feel all hot and gooey inside!$"
Text_17AC55:: @ 817AC55
MtEmber_Exterior_Text_BethIntro:: @ 817AC55
.string "Do you know how caves form inside\n"
.string "volcanoes?$"
Text_17AC82:: @ 817AC82
MtEmber_Exterior_Text_BethDefeat:: @ 817AC82
.string "Atchah!\n"
.string "You're shockingly good!$"
gUnknown_817ACA2:: @ 817ACA2
MtEmber_Exterior_Text_BethPostBattle:: @ 817ACA2
.string "When lava at the surface of magma\n"
.string "hardens, and the magma inside flows\l"
.string "out, caverns are left behind.$"
Text_17AD06:: @ 817AD06
MtEmber_Exterior_Text_JocelynIntro:: @ 817AD06
.string "I've been in training so I can mend\n"
.string "my broken heart…\p"
.string "It toughened me up physically at\n"
.string "least! Hi-yah!$"
Text_17AD6B:: @ 817AD6B
MtEmber_Exterior_Text_JocelynDefeat:: @ 817AD6B
.string "I think I tried to overdo it…$"
gUnknown_817AD89:: @ 817AD89
MtEmber_Exterior_Text_JocelynPostBattle:: @ 817AD89
.string "The way you battle, it reminds me\n"
.string "of the guy who dumped me…$"
data/maps/MtEmber_RubyPath_B3F/scripts.inc
+3 -3
View File
@@ -1,12 +1,12 @@
MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48
.byte 0
MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49
MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
@ Odd that this is here and not in MtEmber_RubyPath_B5F/scripts.inc
MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49
lock
faceplayer
setflag FLAG_GOT_RUBY
removeobject 1
giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5
giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_FAN5
release
end
data/maps/MtEmber_RubyPath_B3F/text.inc
+1 -1
View File
@@ -1,3 +1,3 @@
gUnknown_817ADC5:: @ 817ADC5
MtEmber_RubyPath_B3F_Text_FoundARuby:: @ 817ADC5
.string "{PLAYER} found a RUBY!$"
data/maps/MtEmber_RubyPath_B4F/map.json
+26 -26
View File
@@ -36,182 +36,182 @@
"x": 3,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163907"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163907"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163907"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163910"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163910"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163910"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163919"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163919"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163919"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163922"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
},
{
"type": "bg_event_type_1",
"x": 11,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163934"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePeriod"
},
{
"type": "bg_event_type_1",
"x": 11,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16393D"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleComma"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163922"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163922"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16392B"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16392B"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16392B"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
}
]
}
data/maps/MtEmber_RubyPath_B4F/scripts.inc
+20 -20
View File
@@ -1,72 +1,72 @@
MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB
.byte 0
MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC
MtEmber_RubyPath_B4F_EventScript_BrailleABC:: @ 81638EC
lockall
braillemessage gUnknown_81A929F
braillemessage Braille_Text_ABC
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5
MtEmber_RubyPath_B4F_EventScript_BrailleGHI:: @ 81638F5
lockall
braillemessage gUnknown_81A92A3
braillemessage Braille_Text_GHI
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE
MtEmber_RubyPath_B4F_EventScript_BrailleMNO:: @ 81638FE
lockall
braillemessage gUnknown_81A92A7
braillemessage Braille_Text_MNO
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907
MtEmber_RubyPath_B4F_EventScript_BrailleTUV:: @ 8163907
lockall
braillemessage gUnknown_81A92AB
braillemessage Braille_Text_TUV
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910
MtEmber_RubyPath_B4F_EventScript_BrailleDEF:: @ 8163910
lockall
braillemessage gUnknown_81A92AF
braillemessage Braille_Text_DEF
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919
MtEmber_RubyPath_B4F_EventScript_BrailleJKL:: @ 8163919
lockall
braillemessage gUnknown_81A92B3
braillemessage Braille_Text_JKL
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922
MtEmber_RubyPath_B4F_EventScript_BraillePQRS:: @ 8163922
lockall
braillemessage gUnknown_81A92B7
braillemessage Braille_Text_PQRS
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B
MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ:: @ 816392B
lockall
braillemessage gUnknown_81A92BC
braillemessage Braille_Text_WXYZ
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934
MtEmber_RubyPath_B4F_EventScript_BraillePeriod:: @ 8163934
lockall
braillemessage gUnknown_81A92C1
braillemessage Braille_Text_Period
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D
MtEmber_RubyPath_B4F_EventScript_BrailleComma:: @ 816393D
lockall
braillemessage gUnknown_81A92C3
braillemessage Braille_Text_Comma
waitbuttonpress
releaseall
end
data/maps/MtEmber_RubyPath_B5F/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B5F_EventScript_163C49",
"script": "MtEmber_RubyPath_B5F_EventScript_Ruby",
"flag": "FLAG_HIDE_RUBY"
}
],
@@ -43,7 +43,7 @@
"x": 7,
"y": 2,
"elevation": 0,
"script": "MtEmber_RubyPath_B5F_EventScript_163BAB"
"script": "MtEmber_RubyPath_B5F_EventScript_BrailleMessage"
}
]
}
data/maps/MtEmber_RubyPath_B5F/scripts.inc
+9 -30
View File
@@ -1,38 +1,17 @@
MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA
.byte 0
MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
MtEmber_RubyPath_B5F_EventScript_BrailleMessage:: @ 8163BAB
lockall
setvar VAR_0x8005, 130
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92C5
getbraillestringwidth gUnknown_81A92C5
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92D0
getbraillestringwidth gUnknown_81A92D0
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92DC
getbraillestringwidth gUnknown_81A92DC
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92E6
getbraillestringwidth gUnknown_81A92E6
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92F2
getbraillestringwidth gUnknown_81A92F2
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92FE
getbraillestringwidth gUnknown_81A92FE
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A930A
getbraillestringwidth gUnknown_81A930A
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A9316
braillemessage_wait Braille_Text_Everything
braillemessage_wait Braille_Text_HasMeaning1
braillemessage_wait Braille_Text_Existence
braillemessage_wait Braille_Text_HasMeaning2
braillemessage_wait Braille_Text_BeingAlive
braillemessage_wait Braille_Text_HasMeaning3
braillemessage_wait Braille_Text_HaveDreams
braillemessage Braille_Text_UsePower
waitbuttonpress
releaseall
end
data/maps/MtEmber_Summit/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_163B33",
"script": "MtEmber_Summit_EventScript_Moltres",
"flag": "FLAG_HIDE_MOLTRES"
},
{
data/maps/MtEmber_Summit/scripts.inc
+11 -11
View File
@@ -4,10 +4,10 @@ MtEmber_Summit_MapScripts:: @ 8163AFC
.byte 0
MtEmber_Summit_OnResume:: @ 8163B07
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163B11
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, MtEmber_Summit_EventScript_TryRemoveMoltres
end
EventScript_163B11:: @ 8163B11
MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -15,14 +15,14 @@ EventScript_163B11:: @ 8163B11
return
MtEmber_Summit_OnTransition:: @ 8163B25
call_if_unset FLAG_FOUGHT_MOLTRES, EventScript_163B2F
call_if_unset FLAG_FOUGHT_MOLTRES, MtEmber_Summit_EventScript_ShowMoltres
end
EventScript_163B2F:: @ 8163B2F
MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F
clearflag FLAG_HIDE_MOLTRES
return
MtEmber_Summit_EventScript_163B33:: @ 8163B33
MtEmber_Summit_EventScript_Moltres:: @ 8163B33
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
@@ -30,7 +30,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
waitse
playmoncry SPECIES_MOLTRES, 2
message Text_1A6448
message Text_Gyaoo
waitmessage
waitmoncry
delay 10
@@ -42,21 +42,21 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_163B96
goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163B9F
goto_if_eq MtEmber_Summit_EventScript_RanFromMoltres
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163B9F
goto_if_eq MtEmber_Summit_EventScript_RanFromMoltres
setflag FLAG_FOUGHT_MOLTRES
release
end
EventScript_163B96:: @ 8163B96
MtEmber_Summit_EventScript_DefeatedMoltres:: @ 8163B96
setflag FLAG_FOUGHT_MOLTRES
goto EventScript_RemoveStaticMon
end
EventScript_163B9F:: @ 8163B9F
MtEmber_Summit_EventScript_RanFromMoltres:: @ 8163B9F
setvar VAR_0x8004, SPECIES_MOLTRES
goto EventScript_MonFlewAway
end
data/maps/PowerPlant/map.json
+3 -3
View File
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1637B8",
"script": "PowerPlant_EventScript_Zapdos",
"flag": "FLAG_HIDE_ZAPDOS"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16388D",
"script": "PowerPlant_EventScript_Electrode2",
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16382F",
"script": "PowerPlant_EventScript_Electrode1",
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_1"
}
],
data/maps/PowerPlant/scripts.inc
+25 -25
View File
@@ -4,10 +4,10 @@ PowerPlant_MapScripts:: @ 8163764
.byte 0
PowerPlant_OnResume:: @ 816376F
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163779
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, PowerPlant_EventScript_TryRemoveStaticMon
end
EventScript_163779:: @ 8163779
PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -16,24 +16,24 @@ EventScript_163779:: @ 8163779
PowerPlant_OnTransition:: @ 816378D
setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
call_if_unset FLAG_FOUGHT_ZAPDOS, EventScript_1637AC
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, EventScript_1637B0
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, EventScript_1637B4
call_if_unset FLAG_FOUGHT_ZAPDOS, PowerPlant_EventScript_ShowZapdos
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, PowerPlant_EventScript_ShowElectrode1
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, PowerPlant_EventScript_ShowElectrode2
end
EventScript_1637AC:: @ 81637AC
PowerPlant_EventScript_ShowZapdos:: @ 81637AC
clearflag FLAG_HIDE_ZAPDOS
return
EventScript_1637B0:: @ 81637B0
PowerPlant_EventScript_ShowElectrode1:: @ 81637B0
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1
return
EventScript_1637B4:: @ 81637B4
PowerPlant_EventScript_ShowElectrode2:: @ 81637B4
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2
return
PowerPlant_EventScript_1637B8:: @ 81637B8
PowerPlant_EventScript_Zapdos:: @ 81637B8
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
@@ -41,7 +41,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
waitse
playmoncry SPECIES_ZAPDOS, 2
message Text_1A6448
message Text_Gyaoo
waitmessage
waitmoncry
delay 10
@@ -53,26 +53,26 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16381B
goto_if_eq PowerPlant_EventScript_DefeatedZapdos
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163824
goto_if_eq PowerPlant_EventScript_RanFromZapdos
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163824
goto_if_eq PowerPlant_EventScript_RanFromZapdos
setflag FLAG_FOUGHT_ZAPDOS
release
end
EventScript_16381B:: @ 816381B
PowerPlant_EventScript_DefeatedZapdos:: @ 816381B
setflag FLAG_FOUGHT_ZAPDOS
goto EventScript_RemoveStaticMon
end
EventScript_163824:: @ 8163824
PowerPlant_EventScript_RanFromZapdos:: @ 8163824
setvar VAR_0x8004, SPECIES_ZAPDOS
goto EventScript_MonFlewAway
end
PowerPlant_EventScript_16382F:: @ 816382F
PowerPlant_EventScript_Electrode1:: @ 816382F
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -87,21 +87,21 @@ PowerPlant_EventScript_16382F:: @ 816382F
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_163884
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163884
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163884
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
end
EventScript_163884:: @ 8163884
PowerPlant_EventScript_FoughtElectrode1:: @ 8163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
goto EventScript_RemoveStaticMon
end
PowerPlant_EventScript_16388D:: @ 816388D
PowerPlant_EventScript_Electrode2:: @ 816388D
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -116,16 +116,16 @@ PowerPlant_EventScript_16388D:: @ 816388D
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_1638E2
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_1638E2
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_1638E2
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
end
EventScript_1638E2:: @ 81638E2
PowerPlant_EventScript_FoughtElectrode2:: @ 81638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
goto EventScript_RemoveStaticMon
end
data/maps/Route12/map.json
+3 -3
View File
@@ -91,7 +91,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_168014",
"script": "Route12_EventScript_Snorlax",
"flag": "FLAG_HIDE_ROUTE_12_SNORLAX"
},
{
@@ -249,14 +249,14 @@
"x": 17,
"y": 13,
"elevation": 0,
"script": "Route12_EventScript_1680A3"
"script": "Route12_EventScript_RouteSign"
},
{
"type": "bg_event_type_0",
"x": 15,
"y": 69,
"elevation": 0,
"script": "Route12_EventScript_1680AC"
"script": "Route12_EventScript_FishingSign"
},
{
"type": "hidden_item",
data/maps/Route12/scripts.inc
+18 -18
View File
@@ -3,22 +3,22 @@ Route12_MapScripts:: @ 8168000
.byte 0
Route12_OnResume:: @ 8168006
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_168010
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route12_EventScript_TryRemoveSnorlax
end
EventScript_168010:: @ 8168010
Route12_EventScript_TryRemoveSnorlax:: @ 8168010
removeobject VAR_LAST_TALKED
return
Route12_EventScript_168014:: @ 8168014
Route12_EventScript_Snorlax:: @ 8168014
lock
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099
goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16808D
goto_if_eq Route12_EventScript_DontUsePokeFlute
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
@@ -32,32 +32,32 @@ Route12_EventScript_168014:: @ 8168014
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16808F
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_16808F
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_16808F
goto_if_eq Route12_EventScript_FoughtSnorlax
release
end
EventScript_16808D:: @ 816808D
Route12_EventScript_DontUsePokeFlute:: @ 816808D
release
end
EventScript_16808F:: @ 816808F
msgbox gUnknown_8185383
Route12_EventScript_FoughtSnorlax:: @ 816808F
msgbox Text_SnorlaxReturnedToMountains
release
end
EventScript_168099:: @ 8168099
msgbox gUnknown_8185317
Route12_EventScript_SnorlaxNoPokeFlute:: @ 8168099
msgbox Route12_Text_MonSprawledOutInSlumber
release
end
Route12_EventScript_1680A3:: @ 81680A3
msgbox gUnknown_8185797, MSGBOX_SIGN
Route12_EventScript_RouteSign:: @ 81680A3
msgbox Route12_Text_RouteSign, MSGBOX_SIGN
end
Route12_EventScript_1680AC:: @ 81680AC
msgbox gUnknown_81857B3, MSGBOX_SIGN
Route12_EventScript_FishingSign:: @ 81680AC
msgbox Route12_Text_SportfishingArea, MSGBOX_SIGN
end
data/maps/Route12/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
gUnknown_8185317:: @ 8185317
Route12_Text_MonSprawledOutInSlumber:: @ 8185317
.string "A POKéMON is sprawled out in\n"
.string "a deep and comfortable slumber.$"
@@ -6,12 +6,12 @@ Text_SnorlaxWokeUp:: @ 8185354
.string "SNORLAX woke up!\p"
.string "It attacked in a grumpy rage!$"
gUnknown_8185383:: @ 8185383
Text_SnorlaxReturnedToMountains:: @ 8185383
.string "SNORLAX calmed down.\n"
.string "It gave a huge yawn…\l"
.string "And returned to the mountains.$"
gUnknown_81853CC:: @ 81853CC
Text_WantToUsePokeFlute:: @ 81853CC
.string "Want to use the POKé FLUTE?$"
Text_PlayedPokeFlute:: @ 81853E8
@@ -102,10 +102,10 @@ Text_18574D:: @ 818574D
.string "I catch them all the time, sure.\n"
.string "But, boy are they wimpy.$"
gUnknown_8185797:: @ 8185797
Route12_Text_RouteSign:: @ 8185797
.string "ROUTE 12 \n"
.string "North to LAVENDER$"
gUnknown_81857B3:: @ 81857B3
Route12_Text_SportfishingArea:: @ 81857B3
.string "SPORTFISHING AREA$"
data/maps/Route16/map.json
+3 -3
View File
@@ -151,7 +151,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route16_EventScript_168121",
"script": "Route16_EventScript_Snorlax",
"flag": "FLAG_HIDE_ROUTE_16_SNORLAX"
}
],
@@ -199,14 +199,14 @@
"x": 6,
"y": 17,
"elevation": 0,
"script": "Route16_EventScript_1681B6"
"script": "Route16_EventScript_RouteSign"
},
{
"type": "bg_event_type_0",
"x": 33,
"y": 11,
"elevation": 0,
"script": "Route16_EventScript_1681AD"
"script": "Route16_EventScript_CyclingRoadSign"
},
{
"type": "hidden_item",
data/maps/Route16/scripts.inc
+22 -22
View File
@@ -5,39 +5,39 @@ Route16_MapScripts:: @ 81680E5
.byte 0
Route16_OnResume:: @ 81680F5
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1680FF
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route16_EventScript_RemoveSnorlax
end
EventScript_1680FF:: @ 81680FF
Route16_EventScript_RemoveSnorlax:: @ 81680FF
removeobject VAR_LAST_TALKED
return
Route16_OnTransition:: @ 8168103
compare VAR_MAP_SCENE_ROUTE16, 1
call_if_eq EventScript_16810F
call_if_eq Route16_EventScript_EnterCyclingRoad
end
EventScript_16810F:: @ 816810F
Route16_EventScript_EnterCyclingRoad:: @ 816810F
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route16_OnWarp:: @ 8168113
map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D
map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad
.2byte 0
EventScript_16811D:: @ 816811D
Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D
special Special_ForcePlayerOntoBike
end
Route16_EventScript_168121:: @ 8168121
Route16_EventScript_Snorlax:: @ 8168121
lock
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3
goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_168197
goto_if_eq Route16_EventScript_DontUsePokeFlute
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
@@ -50,32 +50,32 @@ Route16_EventScript_168121:: @ 8168121
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_168199
goto_if_eq Route16_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_168199
goto_if_eq Route16_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_168199
goto_if_eq Route16_EventScript_FoughtSnorlax
release
end
EventScript_168197:: @ 8168197
Route16_EventScript_DontUsePokeFlute:: @ 8168197
release
end
EventScript_168199:: @ 8168199
msgbox gUnknown_8185383
Route16_EventScript_FoughtSnorlax:: @ 8168199
msgbox Text_SnorlaxReturnedToMountains
release
end
EventScript_1681A3:: @ 81681A3
msgbox gUnknown_8186F3D
Route16_EventScript_SnorlaxNoPokeFlute:: @ 81681A3
msgbox Route16_Text_MonSprawledOutInSlumber
release
end
Route16_EventScript_1681AD:: @ 81681AD
msgbox gUnknown_8186F7A, MSGBOX_SIGN
Route16_EventScript_CyclingRoadSign:: @ 81681AD
msgbox Route16_Text_CyclingRoadSign, MSGBOX_SIGN
end
Route16_EventScript_1681B6:: @ 81681B6
msgbox gUnknown_8186F98, MSGBOX_SIGN
Route16_EventScript_RouteSign:: @ 81681B6
msgbox Route16_Text_RouteSign, MSGBOX_SIGN
end
data/maps/Route16/text.inc
+3 -3
View File
@@ -99,15 +99,15 @@ Text_186EC7:: @ 8186EC7
.string "They're great for startling people.\n"
.string "And, they bite, too.$"
gUnknown_8186F3D:: @ 8186F3D
Route16_Text_MonSprawledOutInSlumber:: @ 8186F3D
.string "A POKéMON is sprawled out in\n"
.string "a deep and comfortable slumber.$"
gUnknown_8186F7A:: @ 8186F7A
Route16_Text_CyclingRoadSign:: @ 8186F7A
.string "Enjoy the slope!\n"
.string "CYCLING ROAD$"
gUnknown_8186F98:: @ 8186F98
Route16_Text_RouteSign:: @ 8186F98
.string "ROUTE 16\n"
.string "CELADON CITY - FUCHSIA CITY$"
data/maps/SafariZone_Building1/scripts.inc
-10
View File
@@ -1,10 +0,0 @@
SafariZone_Building1_MapScripts:: @ 81623EB
.byte 0
SafariZone_Building1_EventScript_1623EC:: @ 81623EC
msgbox gUnknown_8177A5A, MSGBOX_NPC
end
SafariZone_Building1_EventScript_1623F5:: @ 81623F5
msgbox gUnknown_8177A82, MSGBOX_NPC
end
data/maps/SafariZone_Building2/scripts.inc
-14
View File
@@ -1,14 +0,0 @@
SafariZone_Building2_MapScripts:: @ 81623FE
.byte 0
SafariZone_Building2_EventScript_1623FF:: @ 81623FF
msgbox gUnknown_8177AE2, MSGBOX_NPC
end
SafariZone_Building2_EventScript_162408:: @ 8162408
msgbox gUnknown_8177AAE, MSGBOX_NPC
end
SafariZone_Building2_EventScript_162411:: @ 8162411
msgbox gUnknown_8177B16, MSGBOX_NPC
end
data/maps/SafariZone_Building3/scripts.inc
-14
View File
@@ -1,14 +0,0 @@
SafariZone_Building3_MapScripts:: @ 816241A
.byte 0
SafariZone_Building3_EventScript_16241B:: @ 816241B
msgbox gUnknown_8177BAB, MSGBOX_NPC
end
SafariZone_Building3_EventScript_162424:: @ 8162424
msgbox gUnknown_8177B38, MSGBOX_NPC
end
SafariZone_Building3_EventScript_16242D:: @ 816242D
msgbox gUnknown_8177BEC, MSGBOX_NPC
end
data/maps/SafariZone_Building4/scripts.inc
-14
View File
@@ -1,14 +0,0 @@
SafariZone_Building4_MapScripts:: @ 8162436
.byte 0
SafariZone_Building4_EventScript_162437:: @ 8162437
msgbox gUnknown_8177D39, MSGBOX_NPC
end
SafariZone_Building4_EventScript_162440:: @ 8162440
msgbox gUnknown_8177CEB, MSGBOX_NPC
end
SafariZone_Building4_EventScript_162449:: @ 8162449
msgbox gUnknown_8177D8B, MSGBOX_NPC
end
data/maps/SafariZone_Center/map.json
+4 -4
View File
@@ -116,7 +116,7 @@
"x": 29,
"y": 25,
"elevation": 0,
"dest_map": "MAP_SAFARI_ZONE_BUILDING1",
"dest_map": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE",
"dest_warp_id": 1
}
],
@@ -127,14 +127,14 @@
"x": 30,
"y": 26,
"elevation": 0,
"script": "SafariZone_Center_EventScript_162361"
"script": "SafariZone_Center_EventScript_RestHouseSign"
},
{
"type": "bg_event_type_0",
"x": 25,
"y": 27,
"elevation": 0,
"script": "SafariZone_Center_EventScript_16236A"
"script": "SafariZone_Center_EventScript_TrainerTips"
},
{
"type": "hidden_item",
@@ -151,7 +151,7 @@
"x": 33,
"y": 20,
"elevation": 0,
"script": "SafariZone_Center_EventScript_162373"
"script": "SafariZone_Center_EventScript_AreaSign"
}
]
}
data/maps/SafariZone_Center/scripts.inc
+6 -6
View File
@@ -6,14 +6,14 @@ SafariZone_Center_OnTransition:: @ 816235D
setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER
end
SafariZone_Center_EventScript_162361:: @ 8162361
msgbox gUnknown_81777F2, MSGBOX_SIGN
SafariZone_Center_EventScript_RestHouseSign:: @ 8162361
msgbox SafariZone_Center_Text_RestHouse, MSGBOX_SIGN
end
SafariZone_Center_EventScript_16236A:: @ 816236A
msgbox gUnknown_81777FD, MSGBOX_SIGN
SafariZone_Center_EventScript_TrainerTips:: @ 816236A
msgbox SafariZone_Center_Text_PressStartToCheckTime, MSGBOX_SIGN
end
SafariZone_Center_EventScript_162373:: @ 8162373
msgbox gUnknown_817782F, MSGBOX_SIGN
SafariZone_Center_EventScript_AreaSign:: @ 8162373
msgbox SafariZone_Center_Text_CenterArea, MSGBOX_SIGN
end
data/maps/SafariZone_Center/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
gUnknown_81777F2:: @ 81777F2
SafariZone_Center_Text_RestHouse:: @ 81777F2
.string "REST HOUSE$"
gUnknown_81777FD:: @ 81777FD
SafariZone_Center_Text_PressStartToCheckTime:: @ 81777FD
.string "TRAINER TIPS\p"
.string "Press START to check\n"
.string "remaining time.$"
gUnknown_817782F:: @ 817782F
SafariZone_Center_Text_CenterArea:: @ 817782F
.string "CENTER AREA$"
data/maps/SafariZone_Building1/map.json → data/maps/SafariZone_Center_RestHouse/map.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SAFARI_ZONE_BUILDING1",
"name": "SafariZone_Building1",
"layout": "LAYOUT_SAFARI_ZONE_BUILDING",
"id": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE",
"name": "SafariZone_Center_RestHouse",
"layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
"music": "MUS_SHINKA",
"region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building1_EventScript_1623F5",
"script": "SafariZone_Center_RestHouse_EventScript_Scientist",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building1_EventScript_1623EC",
"script": "SafariZone_Center_RestHouse_EventScript_Sara",
"flag": "0"
}
],
data/maps/SafariZone_Center_RestHouse/scripts.inc
+10
View File
@@ -0,0 +1,10 @@
SafariZone_Center_RestHouse_MapScripts:: @ 81623EB
.byte 0
SafariZone_Center_RestHouse_EventScript_Sara:: @ 81623EC
msgbox SafariZone_Center_Text_WhereDidErikGo, MSGBOX_NPC
end
SafariZone_Center_RestHouse_EventScript_Scientist:: @ 81623F5
msgbox SafariZone_Center_Text_CatchingMonsAsGifts, MSGBOX_NPC
end
data/maps/SafariZone_Building1/text.inc → data/maps/SafariZone_Center_RestHouse/text.inc
+2 -2
View File
@@ -1,8 +1,8 @@
gUnknown_8177A5A:: @ 8177A5A
SafariZone_Center_Text_WhereDidErikGo:: @ 8177A5A
.string "SARA: Where did my boyfriend,\n"
.string "ERIK, go?$"
gUnknown_8177A82:: @ 8177A82
SafariZone_Center_Text_CatchingMonsAsGifts:: @ 8177A82
.string "I'm catching POKéMON to take home\n"
.string "as gifts.$"
data/maps/SafariZone_East/map.json
+4 -4
View File
@@ -113,7 +113,7 @@
"x": 40,
"y": 14,
"elevation": 0,
"dest_map": "MAP_SAFARI_ZONE_BUILDING2",
"dest_map": "MAP_SAFARI_ZONE_EAST_REST_HOUSE",
"dest_warp_id": 1
}
],
@@ -124,21 +124,21 @@
"x": 18,
"y": 27,
"elevation": 0,
"script": "SafariZone_East_EventScript_16238F"
"script": "SafariZone_East_EventScript_AreaSign"
},
{
"type": "bg_event_type_0",
"x": 43,
"y": 15,
"elevation": 0,
"script": "SafariZone_East_EventScript_16237D"
"script": "SafariZone_East_EventScript_RestHouseSign"
},
{
"type": "bg_event_type_0",
"x": 17,
"y": 8,
"elevation": 0,
"script": "SafariZone_East_EventScript_162386"
"script": "SafariZone_East_EventScript_TrainerTips"
}
]
}
data/maps/SafariZone_East/scripts.inc
+6 -6
View File
@@ -1,14 +1,14 @@
SafariZone_East_MapScripts:: @ 816237C
.byte 0
SafariZone_East_EventScript_16237D:: @ 816237D
msgbox gUnknown_817783B, MSGBOX_SIGN
SafariZone_East_EventScript_RestHouseSign:: @ 816237D
msgbox SafariZone_East_Text_RestHouse, MSGBOX_SIGN
end
SafariZone_East_EventScript_162386:: @ 8162386
msgbox gUnknown_8177846, MSGBOX_SIGN
SafariZone_East_EventScript_TrainerTips:: @ 8162386
msgbox SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk, MSGBOX_SIGN
end
SafariZone_East_EventScript_16238F:: @ 816238F
msgbox gUnknown_8177884, MSGBOX_SIGN
SafariZone_East_EventScript_AreaSign:: @ 816238F
msgbox SafariZone_East_Text_AreaSign, MSGBOX_SIGN
end
data/maps/SafariZone_East/text.inc
+3 -3
View File
@@ -1,12 +1,12 @@
gUnknown_817783B:: @ 817783B
SafariZone_East_Text_RestHouse:: @ 817783B
.string "REST HOUSE$"
gUnknown_8177846:: @ 8177846
SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk:: @ 8177846
.string "TRAINER TIPS\p"
.string "The remaining time declines only\n"
.string "while you walk.$"
gUnknown_8177884:: @ 8177884
SafariZone_East_Text_AreaSign:: @ 8177884
.string "AREA 1\n"
.string "WEST: CENTER AREA$"
data/maps/SafariZone_Building2/map.json → data/maps/SafariZone_East_RestHouse/map.json
+6 -6
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SAFARI_ZONE_BUILDING2",
"name": "SafariZone_Building2",
"layout": "LAYOUT_SAFARI_ZONE_BUILDING",
"id": "MAP_SAFARI_ZONE_EAST_REST_HOUSE",
"name": "SafariZone_East_RestHouse",
"layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
"music": "MUS_SHINKA",
"region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building2_EventScript_162408",
"script": "SafariZone_East_RestHouse_EventScript_Scientist",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building2_EventScript_1623FF",
"script": "SafariZone_East_RestHouse_EventScript_Rocker",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building2_EventScript_162411",
"script": "SafariZone_East_RestHouse_EventScript_BaldingMan",
"flag": "0"
}
],
data/maps/SafariZone_East_RestHouse/scripts.inc
+14
View File
@@ -0,0 +1,14 @@
SafariZone_East_RestHouse_MapScripts:: @ 81623FE
.byte 0
SafariZone_East_RestHouse_EventScript_Rocker:: @ 81623FF
msgbox SafariZone_East_Text_CaughtChanseyAllWorthwhile, MSGBOX_NPC
end
SafariZone_East_RestHouse_EventScript_Scientist:: @ 8162408
msgbox SafariZone_East_Text_HowManyDidYouCatch, MSGBOX_NPC
end
SafariZone_East_RestHouse_EventScript_BaldingMan:: @ 8162411
msgbox SafariZone_East_Text_TiredFromAllTheFun, MSGBOX_NPC
end
data/maps/SafariZone_Building2/text.inc → data/maps/SafariZone_East_RestHouse/text.inc
+3 -3
View File
@@ -1,12 +1,12 @@
gUnknown_8177AAE:: @ 8177AAE
SafariZone_East_Text_HowManyDidYouCatch:: @ 8177AAE
.string "How many did you catch?\n"
.string "I'm bushed from the effort!$"
gUnknown_8177AE2:: @ 8177AE2
SafariZone_East_Text_CaughtChanseyAllWorthwhile:: @ 8177AE2
.string "I caught a CHANSEY!\p"
.string "That makes this all worthwhile.$"
gUnknown_8177B16:: @ 8177B16
SafariZone_East_Text_TiredFromAllTheFun:: @ 8177B16
.string "Whew!\n"
.string "I'm tired from all the fun!$"
data/maps/SafariZone_North/map.json
+6 -6
View File
@@ -142,7 +142,7 @@
"x": 43,
"y": 8,
"elevation": 0,
"dest_map": "MAP_SAFARI_ZONE_BUILDING3",
"dest_map": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE",
"dest_warp_id": 1
}
],
@@ -153,35 +153,35 @@
"x": 13,
"y": 27,
"elevation": 0,
"script": "SafariZone_North_EventScript_1623A2"
"script": "SafariZone_North_EventScript_TrainerTips1"
},
{
"type": "bg_event_type_0",
"x": 23,
"y": 31,
"elevation": 0,
"script": "SafariZone_North_EventScript_1623AB"
"script": "SafariZone_North_EventScript_AreaSign"
},
{
"type": "bg_event_type_0",
"x": 29,
"y": 32,
"elevation": 0,
"script": "SafariZone_North_EventScript_1623B4"
"script": "SafariZone_North_EventScript_TrainerTips2"
},
{
"type": "bg_event_type_0",
"x": 34,
"y": 28,
"elevation": 0,
"script": "SafariZone_North_EventScript_1623BD"
"script": "SafariZone_North_EventScript_TrainerTips3"
},
{
"type": "bg_event_type_0",
"x": 44,
"y": 9,
"elevation": 0,
"script": "SafariZone_North_EventScript_162399"
"script": "SafariZone_North_EventScript_RestHouseSign"
}
]
}
data/maps/SafariZone_North/scripts.inc
+10 -10
View File
@@ -1,22 +1,22 @@
SafariZone_North_MapScripts:: @ 8162398
.byte 0
SafariZone_North_EventScript_162399:: @ 8162399
msgbox gUnknown_817789D, MSGBOX_SIGN
SafariZone_North_EventScript_RestHouseSign:: @ 8162399
msgbox SafariZone_North_Text_RestHouse, MSGBOX_SIGN
end
SafariZone_North_EventScript_1623A2:: @ 81623A2
msgbox gUnknown_81778A8, MSGBOX_SIGN
SafariZone_North_EventScript_TrainerTips1:: @ 81623A2
msgbox SafariZone_North_Text_SecretHouseStillAhead, MSGBOX_SIGN
end
SafariZone_North_EventScript_1623AB:: @ 81623AB
msgbox gUnknown_81778D6, MSGBOX_SIGN
SafariZone_North_EventScript_AreaSign:: @ 81623AB
msgbox SafariZone_North_Text_Area2, MSGBOX_SIGN
end
SafariZone_North_EventScript_1623B4:: @ 81623B4
msgbox gUnknown_81778DD, MSGBOX_SIGN
SafariZone_North_EventScript_TrainerTips2:: @ 81623B4
msgbox SafariZone_North_Text_ZigzagThroughTallGrass, MSGBOX_SIGN
end
SafariZone_North_EventScript_1623BD:: @ 81623BD
msgbox gUnknown_8177935, MSGBOX_SIGN
SafariZone_North_EventScript_TrainerTips3:: @ 81623BD
msgbox SafariZone_North_Text_WinFreeHMFindSecretHouse, MSGBOX_SIGN
end
data/maps/SafariZone_North/text.inc
+5 -5
View File
@@ -1,20 +1,20 @@
gUnknown_817789D:: @ 817789D
SafariZone_North_Text_RestHouse:: @ 817789D
.string "REST HOUSE$"
gUnknown_81778A8:: @ 81778A8
SafariZone_North_Text_SecretHouseStillAhead:: @ 81778A8
.string "TRAINER TIPS\p"
.string "The SECRET HOUSE is still ahead.$"
gUnknown_81778D6:: @ 81778D6
SafariZone_North_Text_Area2:: @ 81778D6
.string "AREA 2$"
gUnknown_81778DD:: @ 81778DD
SafariZone_North_Text_ZigzagThroughTallGrass:: @ 81778DD
.string "TRAINER TIPS\p"
.string "POKéMON hide in tall grass.\p"
.string "Zigzag through grassy areas to\n"
.string "flush them out.$"
gUnknown_8177935:: @ 8177935
SafariZone_North_Text_WinFreeHMFindSecretHouse:: @ 8177935
.string "TRAINER TIPS\p"
.string "Win a free HM for finding the\n"
.string "SECRET HOUSE.$"
data/maps/SafariZone_Building3/map.json → data/maps/SafariZone_North_RestHouse/map.json
+7 -7
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SAFARI_ZONE_BUILDING3",
"name": "SafariZone_Building3",
"layout": "LAYOUT_SAFARI_ZONE_BUILDING",
"id": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE",
"name": "SafariZone_North_RestHouse",
"layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
"music": "MUS_SHINKA",
"region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building3_EventScript_16242D",
"script": "SafariZone_North_RestHouse_EventScript_Gentleman",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building3_EventScript_162424",
"script": "SafariZone_North_RestHouse_EventScript_Scientist",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building3_EventScript_16241B",
"script": "SafariZone_North_RestHouse_EventScript_Fisher",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building3_EventScript_1ACED3",
"script": "SafariZone_North_RestHouse_EventScript_BaldingMan",
"flag": "0"
}
],
data/maps/SafariZone_North_RestHouse/scripts.inc
+14
View File
@@ -0,0 +1,14 @@
SafariZone_North_RestHouse_MapScripts:: @ 816241A
.byte 0
SafariZone_North_RestHouse_EventScript_Fisher:: @ 816241B
msgbox SafariZone_East_Text_PrizeInDeepestPartOfSafariZone, MSGBOX_NPC
end
SafariZone_North_RestHouse_EventScript_Scientist:: @ 8162424
msgbox SafariZone_East_Text_KeepAnyItemFoundOnSafari, MSGBOX_NPC
end
SafariZone_North_RestHouse_EventScript_Gentleman:: @ 816242D
msgbox SafariZone_East_Text_MyEeveeEvolvedIntoFlareon, MSGBOX_NPC
end
data/maps/SafariZone_Building3/text.inc → data/maps/SafariZone_North_RestHouse/text.inc
+3 -3
View File
@@ -1,14 +1,14 @@
gUnknown_8177B38:: @ 8177B38
SafariZone_East_Text_KeepAnyItemFoundOnSafari:: @ 8177B38
.string "You can keep any item you find in\n"
.string "the SAFARI ZONE.\p"
.string "But, you'll run out of time if you\n"
.string "try for all of them at once.$"
gUnknown_8177BAB:: @ 8177BAB
SafariZone_East_Text_PrizeInDeepestPartOfSafariZone:: @ 8177BAB
.string "Go to the deepest part of the\n"
.string "SAFARI ZONE. You will win a prize!$"
gUnknown_8177BEC:: @ 8177BEC
SafariZone_East_Text_MyEeveeEvolvedIntoFlareon:: @ 8177BEC
.string "My EEVEE evolved into FLAREON.\p"
.string "But, a friend's EEVEE turned into a\n"
.string "VAPOREON. I wonder why?$"
data/maps/SafariZone_SecretHouse/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_SecretHouse_EventScript_162453",
"script": "SafariZone_SecretHouse_EventScript_Attendant",
"flag": "0"
}
],
data/maps/SafariZone_SecretHouse/scripts.inc
+10 -10
View File
@@ -1,26 +1,26 @@
SafariZone_SecretHouse_MapScripts:: @ 8162452
.byte 0
SafariZone_SecretHouse_EventScript_162453:: @ 8162453
SafariZone_SecretHouse_EventScript_Attendant:: @ 8162453
lock
faceplayer
goto_if_set FLAG_GOT_HM03, EventScript_1624A9
msgbox gUnknown_8177DC1
goto_if_set FLAG_GOT_HM03, SafariZone_SecretHouse_EventScript_ExplainSurf
msgbox SafariZone_SecretHouse_Text_CongratsYouveWon
checkitemspace ITEM_HM03, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16249F
giveitem_msg gUnknown_8177E92, ITEM_HM03
msgbox gUnknown_8177EB7
goto_if_eq SafariZone_SecretHouse_EventScript_NoRoomForHM03
giveitem_msg SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant, ITEM_HM03
msgbox SafariZone_SecretHouse_Text_ExplainSurf
setflag FLAG_GOT_HM03
release
end
EventScript_16249F:: @ 816249F
msgbox gUnknown_8177F72
SafariZone_SecretHouse_EventScript_NoRoomForHM03:: @ 816249F
msgbox SafariZone_SecretHouse_Text_DontHaveRoomForPrize
release
end
EventScript_1624A9:: @ 81624A9
msgbox gUnknown_8177EB7
SafariZone_SecretHouse_EventScript_ExplainSurf:: @ 81624A9
msgbox SafariZone_SecretHouse_Text_ExplainSurf
release
end
data/maps/SafariZone_SecretHouse/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
gUnknown_8177DC1:: @ 8177DC1
SafariZone_SecretHouse_Text_CongratsYouveWon:: @ 8177DC1
.string "Ah! Finally!\p"
.string "You're the first person to reach\n"
.string "the SECRET HOUSE!\p"
@@ -9,11 +9,11 @@ gUnknown_8177DC1:: @ 8177DC1
.string "Congratulations!\n"
.string "You have won!$"
gUnknown_8177E92:: @ 8177E92
SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant:: @ 8177E92
.string "{PLAYER} received HM03\n"
.string "from the attendant!$"
gUnknown_8177EB7:: @ 8177EB7
SafariZone_SecretHouse_Text_ExplainSurf:: @ 8177EB7
.string "HM03 is SURF.\p"
.string "POKéMON will be able to ferry you\n"
.string "across water using it.\p"
@@ -22,7 +22,7 @@ gUnknown_8177EB7:: @ 8177EB7
.string "You're super lucky for winning this\n"
.string "fabulous prize!$"
gUnknown_8177F72:: @ 8177F72
SafariZone_SecretHouse_Text_DontHaveRoomForPrize:: @ 8177F72
.string "You don't have room for this\n"
.string "fabulous prize!$"
data/maps/SafariZone_West/map.json
+5 -5
View File
@@ -141,7 +141,7 @@
"x": 19,
"y": 18,
"elevation": 0,
"dest_map": "MAP_SAFARI_ZONE_BUILDING4",
"dest_map": "MAP_SAFARI_ZONE_WEST_REST_HOUSE",
"dest_warp_id": 1
}
],
@@ -152,28 +152,28 @@
"x": 27,
"y": 9,
"elevation": 0,
"script": "SafariZone_West_EventScript_1623D0"
"script": "SafariZone_West_EventScript_LostTeethNotice"
},
{
"type": "bg_event_type_0",
"x": 36,
"y": 10,
"elevation": 0,
"script": "SafariZone_West_EventScript_1623D9"
"script": "SafariZone_West_EventScript_TrainerTips"
},
{
"type": "bg_event_type_0",
"x": 35,
"y": 26,
"elevation": 0,
"script": "SafariZone_West_EventScript_1623E2"
"script": "SafariZone_West_EventScript_AreaSign"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 19,
"elevation": 0,
"script": "SafariZone_West_EventScript_1623C7"
"script": "SafariZone_West_EventScript_RestHouseSign"
},
{
"type": "hidden_item",
data/maps/SafariZone_West/scripts.inc
+8 -8
View File
@@ -1,18 +1,18 @@
SafariZone_West_MapScripts:: @ 81623C6
.byte 0
SafariZone_West_EventScript_1623C7:: @ 81623C7
msgbox gUnknown_817796E, MSGBOX_SIGN
SafariZone_West_EventScript_RestHouseSign:: @ 81623C7
msgbox SafariZone_West_Text_RestHouse, MSGBOX_SIGN
end
SafariZone_West_EventScript_1623D0:: @ 81623D0
msgbox gUnknown_8177979, MSGBOX_SIGN
SafariZone_West_EventScript_LostTeethNotice:: @ 81623D0
msgbox SafariZone_West_Text_PleaseFindWardensLostTeeth, MSGBOX_SIGN
end
SafariZone_West_EventScript_1623D9:: @ 81623D9
msgbox gUnknown_81779F8, MSGBOX_SIGN
SafariZone_West_EventScript_TrainerTips:: @ 81623D9
msgbox SafariZone_West_Text_SearchForSecretHouse, MSGBOX_SIGN
end
SafariZone_West_EventScript_1623E2:: @ 81623E2
msgbox gUnknown_8177A41, MSGBOX_SIGN
SafariZone_West_EventScript_AreaSign:: @ 81623E2
msgbox SafariZone_West_Text_AreaSign, MSGBOX_SIGN
end
data/maps/SafariZone_West/text.inc
+4 -4
View File
@@ -1,7 +1,7 @@
gUnknown_817796E:: @ 817796E
SafariZone_West_Text_RestHouse:: @ 817796E
.string "REST HOUSE$"
gUnknown_8177979:: @ 8177979
SafariZone_West_Text_PleaseFindWardensLostTeeth:: @ 8177979
.string "REQUEST NOTICE\p"
.string "Please find the SAFARI WARDEN's\n"
.string "lost GOLD TEETH.\l"
@@ -9,12 +9,12 @@ gUnknown_8177979:: @ 8177979
.string "Reward offered!\n"
.string "Contact: WARDEN$"
gUnknown_81779F8:: @ 81779F8
SafariZone_West_Text_SearchForSecretHouse:: @ 81779F8
.string "TRAINER TIPS\p"
.string "Zone Exploration Campaign!\n"
.string "The Search for the SECRET HOUSE!$"
gUnknown_8177A41:: @ 8177A41
SafariZone_West_Text_AreaSign:: @ 8177A41
.string "AREA 3\n"
.string "EAST: CENTER AREA$"
data/maps/SafariZone_Building4/map.json → data/maps/SafariZone_West_RestHouse/map.json
+6 -6
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SAFARI_ZONE_BUILDING4",
"name": "SafariZone_Building4",
"layout": "LAYOUT_SAFARI_ZONE_BUILDING",
"id": "MAP_SAFARI_ZONE_WEST_REST_HOUSE",
"name": "SafariZone_West_RestHouse",
"layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
"music": "MUS_SHINKA",
"region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building4_EventScript_162440",
"script": "SafariZone_West_RestHouse_EventScript_Scientist",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building4_EventScript_162437",
"script": "SafariZone_West_RestHouse_EventScript_Man",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Building4_EventScript_162449",
"script": "SafariZone_West_RestHouse_EventScript_CooltrainerF",
"flag": "0"
}
],
data/maps/SafariZone_West_RestHouse/scripts.inc
+14
View File
@@ -0,0 +1,14 @@
SafariZone_West_RestHouse_MapScripts:: @ 8162436
.byte 0
SafariZone_West_RestHouse_EventScript_Man:: @ 8162437
msgbox SafariZone_West_Text_BaitMakesMonStickAround, MSGBOX_NPC
end
SafariZone_West_RestHouse_EventScript_Scientist:: @ 8162440
msgbox SafariZone_West_Text_RocksMakeMonRunButEasierCatch, MSGBOX_NPC
end
SafariZone_West_RestHouse_EventScript_CooltrainerF:: @ 8162449
msgbox SafariZone_West_Text_HikedLotsDidntSeeMonIWanted, MSGBOX_NPC
end
data/maps/SafariZone_Building4/text.inc → data/maps/SafariZone_West_RestHouse/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_177C47:: @ 8177C47
SafariZone_West_Text_KogaPatrolsSafariEverySoOften:: @ 8177C47
.string "The SAFARI ZONE's huge, wouldn't\n"
.string "you say?\p"
.string "FUCHSIA's GYM LEADER, KOGA, \n"
@@ -6,17 +6,17 @@ Text_177C47:: @ 8177C47
.string "Thanks to him, we can play here\n"
.string "knowing that we're safe.$"
gUnknown_8177CEB:: @ 8177CEB
SafariZone_West_Text_RocksMakeMonRunButEasierCatch:: @ 8177CEB
.string "Tossing ROCKS at POKéMON might\n"
.string "make them run, but they'll be\l"
.string "easier to catch.$"
gUnknown_8177D39:: @ 8177D39
SafariZone_West_Text_BaitMakesMonStickAround:: @ 8177D39
.string "Using BAIT will make POKéMON more\n"
.string "likely to stick around if they get\l"
.string "busy eating.$"
gUnknown_8177D8B:: @ 8177D8B
SafariZone_West_Text_HikedLotsDidntSeeMonIWanted:: @ 8177D8B
.string "I hiked a lot, but I didn't see any\n"
.string "POKéMON I wanted.$"
data/maps/SeafoamIslands_B3F/scripts.inc
+31 -29
View File
@@ -1,71 +1,73 @@
.equ NUM_BOULDERS_PRESENT, VAR_TEMP_2
SeafoamIslands_B3F_MapScripts:: @ 8162F4F
map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame
.byte 0
SeafoamIslands_B3F_OnTransition:: @ 8162F5A
call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F6D
call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F94
call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, SeafoamIslands_B3F_EventScript_CheckStoppedCurrent
call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, SeafoamIslands_B3F_EventScript_SetNoCurrentLayout
end
EventScript_162F6D:: @ 8162F6D
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0
compare VAR_TEMP_2, 2
call_if_eq EventScript_162F90
SeafoamIslands_B3F_EventScript_CheckStoppedCurrent:: @ 8162F6D
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, SeafoamIslands_B3F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, SeafoamIslands_B3F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
call_if_eq SeafoamIslands_B3F_EventScript_StoppedCurrent
return
EventScript_162F90:: @ 8162F90
SeafoamIslands_B3F_EventScript_StoppedCurrent:: @ 8162F90
setflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
return
EventScript_162F94:: @ 8162F94
setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC
SeafoamIslands_B3F_EventScript_SetNoCurrentLayout:: @ 8162F94
setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED
return
SeafoamIslands_B3F_OnFrame:: @ 8162F98
map_script_2 VAR_TEMP_1, 1, EventScript_162FA2
map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B3F_EventScript_EnterByFalling
.2byte 0
EventScript_162FA2:: @ 8162FA2
SeafoamIslands_B3F_EventScript_EnterByFalling:: @ 8162FA2
lockall
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0
compare VAR_TEMP_2, 2
goto_if_eq EventScript_16300C
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, SeafoamIslands_B3F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, SeafoamIslands_B3F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
goto_if_eq SeafoamIslands_B3F_EventScript_CurrentBlocked
getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 24
call_if_lt EventScript_162FF6
call_if_lt SeafoamIslands_B3F_EventScript_RideCurrentFar
compare VAR_0x8008, 24
call_if_ge EventScript_163001
call_if_ge SeafoamIslands_B3F_EventScript_RideCurrentClose
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1
warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21
waitstate
releaseall
end
EventScript_162FF0:: @ 8162FF0
addvar VAR_TEMP_2, 1
SeafoamIslands_B3F_EventScript_AddBoulderPresent:: @ 8162FF0
addvar NUM_BOULDERS_PRESENT, 1
return
EventScript_162FF6:: @ 8162FF6
applymovement OBJ_EVENT_ID_PLAYER, Movement_163013
SeafoamIslands_B3F_EventScript_RideCurrentFar:: @ 8162FF6
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar
waitmovement 0
return
EventScript_163001:: @ 8163001
applymovement OBJ_EVENT_ID_PLAYER, Movement_163021
SeafoamIslands_B3F_EventScript_RideCurrentClose:: @ 8163001
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose
waitmovement 0
return
EventScript_16300C:: @ 816300C
SeafoamIslands_B3F_EventScript_CurrentBlocked:: @ 816300C
setvar VAR_TEMP_1, 0
releaseall
end
Movement_163013:: @ 8163013
SeafoamIslands_B3F_Movement_RideCurrentFar:: @ 8163013
walk_fast_down
walk_fast_down
walk_fast_down
@@ -81,7 +83,7 @@ Movement_163013:: @ 8163013
walk_fast_down
step_end
Movement_163021:: @ 8163021
SeafoamIslands_B3F_Movement_RideCurrentClose:: @ 8163021
walk_fast_down
walk_fast_down
walk_fast_down
data/maps/SeafoamIslands_B4F/map.json
+6 -6
View File
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B4F_EventScript_1631AC",
"script": "SeafoamIslands_B4F_EventScript_Articuno",
"flag": "FLAG_HIDE_ARTICUNO"
},
{
@@ -104,7 +104,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
"var_value": 0,
"script": "SeafoamIslands_B4F_EventScript_16319D"
"script": "SeafoamIslands_B4F_EventScript_UpwardCurrent"
},
{
"type": "trigger",
@@ -113,7 +113,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
"var_value": 0,
"script": "SeafoamIslands_B4F_EventScript_16319D"
"script": "SeafoamIslands_B4F_EventScript_UpwardCurrent"
},
{
"type": "trigger",
@@ -122,7 +122,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
"var_value": 0,
"script": "SeafoamIslands_B4F_EventScript_16319D"
"script": "SeafoamIslands_B4F_EventScript_UpwardCurrent"
}
],
"bg_events": [
@@ -141,14 +141,14 @@
"x": 30,
"y": 2,
"elevation": 0,
"script": "SeafoamIslands_B4F_EventScript_16322C"
"script": "SeafoamIslands_B4F_EventScript_FastCurrentSign"
},
{
"type": "bg_event_type_0",
"x": 14,
"y": 18,
"elevation": 0,
"script": "SeafoamIslands_B4F_EventScript_163223"
"script": "SeafoamIslands_B4F_EventScript_BoulderHintSign"
}
]
}
data/maps/SeafoamIslands_B4F/scripts.inc
+66 -65
View File
@@ -1,3 +1,5 @@
.equ NUM_BOULDERS_PRESENT, VAR_TEMP_2
SeafoamIslands_B4F_MapScripts:: @ 816302E
map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume
@@ -7,10 +9,10 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E
.byte 0
SeafoamIslands_B4F_OnResume:: @ 8163048
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163052
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, SeafoamIslands_B4F_EventScript_TryRemoveArticuno
end
EventScript_163052:: @ 8163052
SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -18,109 +20,111 @@ EventScript_163052:: @ 8163052
return
SeafoamIslands_B4F_OnTransition:: @ 8163066
call_if_unset FLAG_FOUGHT_ARTICUNO, EventScript_1630AD
call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_163082
call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_1630A9
call_if_unset FLAG_FOUGHT_ARTICUNO, SeafoamIslands_B4F_EventScript_ShowArticuno
call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_CheckStoppedCurrent
call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_SetNoCurrentLayout
end
EventScript_163082:: @ 8163082
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
compare VAR_TEMP_2, 2
call_if_eq EventScript_1630A5
SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: @ 8163082
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
call_if_eq SeafoamIslands_B4F_EventScript_StoppedCurrent
return
EventScript_1630A5:: @ 81630A5
SeafoamIslands_B4F_EventScript_StoppedCurrent:: @ 81630A5
setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
return
EventScript_1630A9:: @ 81630A9
setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30
SeafoamIslands_B4F_EventScript_SetNoCurrentLayout:: @ 81630A9
setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED
return
EventScript_1630AD:: @ 81630AD
SeafoamIslands_B4F_EventScript_ShowArticuno:: @ 81630AD
clearflag FLAG_HIDE_ARTICUNO
return
SeafoamIslands_B4F_OnLoad:: @ 81630B1
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
compare VAR_TEMP_2, 2
goto_if_eq EventScript_1630D4
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
goto_if_eq SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs
end
EventScript_1630D4:: @ 81630D4
setmetatile 12, 14, 299, 0
setmetatile 13, 14, 299, 0
SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs:: @ 81630D4
setmetatile 12, 14, METATILE_General_CalmWater, 0
setmetatile 13, 14, METATILE_General_CalmWater, 0
end
SeafoamIslands_B4F_OnWarp:: @ 81630E7
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_WarpInOnCurrent
.2byte 0
EventScript_1630F1:: @ 81630F1
SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
special Special_ForcePlayerToStartSurfing
end
SeafoamIslands_B4F_OnFrame:: @ 81630F9
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B
map_script_2 VAR_TEMP_1, 1, EventScript_163121
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_EnterOnCurrent
map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B4F_EventScript_EnterByFalling
.2byte 0
EventScript_16310B:: @ 816310B
@ The current the player is forced in on from B3F
SeafoamIslands_B4F_EventScript_EnterOnCurrent:: @ 816310B
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_16311D
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent
waitmovement 0
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0
releaseall
end
Movement_16311D:: @ 816311D
SeafoamIslands_B4F_Movement_EnterOnCurrent:: @ 816311D
walk_fast_up
walk_fast_up
walk_fast_up
step_end
EventScript_163121:: @ 8163121
@ The current the player lands on when entering the map by falling
SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121
lockall
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
compare VAR_TEMP_2, 2
goto_if_eq EventScript_163185
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
goto_if_eq SeafoamIslands_B4F_EventScript_CurrentBlocked
getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 9
call_if_lt EventScript_16316F
call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar
compare VAR_0x8008, 9
call_if_ge EventScript_16317A
call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose
special sub_805D1A8
setvar VAR_TEMP_1, 0
releaseall
end
EventScript_163169:: @ 8163169
addvar VAR_TEMP_2, 1
SeafoamIslands_B4F_EventScript_AddBoulderPresent:: @ 8163169
addvar NUM_BOULDERS_PRESENT, 1
return
EventScript_16316F:: @ 816316F
applymovement OBJ_EVENT_ID_PLAYER, Movement_16318C
SeafoamIslands_B4F_EventScript_RideCurrentFar:: @ 816316F
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar
waitmovement 0
return
EventScript_16317A:: @ 816317A
applymovement OBJ_EVENT_ID_PLAYER, Movement_163195
SeafoamIslands_B4F_EventScript_RideCurrentClose:: @ 816317A
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose
waitmovement 0
return
EventScript_163185:: @ 8163185
SeafoamIslands_B4F_EventScript_CurrentBlocked:: @ 8163185
setvar VAR_TEMP_1, 0
releaseall
end
Movement_16318C:: @ 816318C
SeafoamIslands_B4F_Movement_RideCurrentFar:: @ 816318C
walk_up
walk_up
walk_up
@@ -131,7 +135,7 @@ Movement_16318C:: @ 816318C
walk_up
step_end
Movement_163195:: @ 8163195
SeafoamIslands_B4F_Movement_RideCurrentClose:: @ 8163195
walk_up
walk_up
walk_up
@@ -141,18 +145,19 @@ Movement_163195:: @ 8163195
walk_up
step_end
SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
@ Triggers blocking re-entry to B3F
SeafoamIslands_B4F_EventScript_UpwardCurrent:: @ 816319D
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_1631AA
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp
waitmovement 0
releaseall
end
Movement_1631AA:: @ 81631AA
SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA
walk_up
step_end
SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
@@ -160,7 +165,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
waitse
playmoncry SPECIES_ARTICUNO, 2
message Text_1A6448
message Text_Gyaoo
waitmessage
waitmoncry
delay 10
@@ -172,33 +177,29 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16320F
goto_if_eq SeafoamIslands_B4F_EventScript_DefeatedArticuno
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163218
goto_if_eq SeafoamIslands_B4F_EventScript_RanFromArticuno
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163218
goto_if_eq SeafoamIslands_B4F_EventScript_RanFromArticuno
setflag FLAG_FOUGHT_ARTICUNO
release
end
EventScript_16320F:: @ 816320F
SeafoamIslands_B4F_EventScript_DefeatedArticuno:: @ 816320F
setflag FLAG_FOUGHT_ARTICUNO
goto EventScript_RemoveStaticMon
EventScript_163217:: @ 8163217
end
EventScript_163218:: @ 8163218
SeafoamIslands_B4F_EventScript_RanFromArticuno:: @ 8163218
setvar VAR_0x8004, SPECIES_ARTICUNO
goto EventScript_MonFlewAway
EventScript_163222:: @ 8163222
end
SeafoamIslands_B4F_EventScript_163223:: @ 8163223
msgbox gUnknown_8179B36, MSGBOX_SIGN
SeafoamIslands_B4F_EventScript_BoulderHintSign:: @ 8163223
msgbox SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow, MSGBOX_SIGN
end
SeafoamIslands_B4F_EventScript_16322C:: @ 816322C
msgbox gUnknown_8179B65, MSGBOX_SIGN
SeafoamIslands_B4F_EventScript_FastCurrentSign:: @ 816322C
msgbox SeafoamIslands_B4F_Text_DangerFastCurrent, MSGBOX_SIGN
end
data/maps/SeafoamIslands_B4F/text.inc
+2 -2
View File
@@ -19,11 +19,11 @@ Text_RockSlideTaught:: @ 8179B0A
.string "It might be scary to use it in this\n"
.string "tunnel…$"
gUnknown_8179B36:: @ 8179B36
SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow:: @ 8179B36
.string "Hint: Boulders might change the\n"
.string "flow of water.$"
gUnknown_8179B65:: @ 8179B65
SeafoamIslands_B4F_Text_DangerFastCurrent:: @ 8179B65
.string "DANGER\n"
.string "Fast current!$"
data/maps/SixIsland_DottedHole_1F/scripts.inc
+4 -4
View File
@@ -8,28 +8,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188
SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
lockall
braillemessage gUnknown_81A9288
braillemessage Braille_Text_Up
waitbuttonpress
releaseall
end
SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195
lockall
braillemessage gUnknown_81A928B
braillemessage Braille_Text_Down
waitbuttonpress
releaseall
end
SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
lockall
braillemessage gUnknown_81A9290
braillemessage Braille_Text_Right
waitbuttonpress
releaseall
end
SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
lockall
braillemessage gUnknown_81A9296
braillemessage Braille_Text_Left
waitbuttonpress
releaseall
end
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+16 -61
View File
@@ -238,67 +238,22 @@ Movement_16441C:: @ 816441C
SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
lockall
setvar VAR_0x8005, 130
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9321
getbraillestringwidth gUnknown_81A9321
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A932D
getbraillestringwidth gUnknown_81A932D
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9338
getbraillestringwidth gUnknown_81A9338
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A933F
getbraillestringwidth gUnknown_81A933F
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A934A
getbraillestringwidth gUnknown_81A934A
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9356
getbraillestringwidth gUnknown_81A9356
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9362
getbraillestringwidth gUnknown_81A9362
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9368
getbraillestringwidth gUnknown_81A9368
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9374
getbraillestringwidth gUnknown_81A9374
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A937C
getbraillestringwidth gUnknown_81A937C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9387
getbraillestringwidth gUnknown_81A9387
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9393
getbraillestringwidth gUnknown_81A9393
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A939F
getbraillestringwidth gUnknown_81A939F
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93AB
getbraillestringwidth gUnknown_81A93AB
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93B4
getbraillestringwidth gUnknown_81A93B4
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A93C0
braillemessage_wait Braille_Text_LetTheTwo
braillemessage_wait Braille_Text_Glittering
braillemessage_wait Braille_Text_Stones
braillemessage_wait Braille_Text_OneInRed
braillemessage_wait Braille_Text_OneInBlue
braillemessage_wait Braille_Text_ConnectThe
braillemessage_wait Braille_Text_Past
braillemessage_wait Braille_Text_TwoFriends
braillemessage_wait Braille_Text_Sharing
braillemessage_wait Braille_Text_PowerOpen
braillemessage_wait Braille_Text_AWindowTo
braillemessage_wait Braille_Text_ANewWorld
braillemessage_wait Braille_Text_ThatGlows
braillemessage_wait Braille_Text_TheNext
braillemessage_wait Braille_Text_WorldWaits
braillemessage Braille_Text_ForYou
waitbuttonpress
releaseall
end
data/maps/SixIsland_RuinValley/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
compare VAR_RESULT, NO
goto_if_eq EventScript_168BCB
msgbox gUnknown_818BE11
braillemessage gUnknown_81A929B
braillemessage Braille_Text_Cut
waitbuttonpress
releaseall
end
data/maps/map_groups.json
+6 -6
View File
@@ -119,10 +119,10 @@
"SafariZone_East",
"SafariZone_North",
"SafariZone_West",
"SafariZone_Building1",
"SafariZone_Building2",
"SafariZone_Building3",
"SafariZone_Building4",
"SafariZone_Center_RestHouse",
"SafariZone_East_RestHouse",
"SafariZone_North_RestHouse",
"SafariZone_West_RestHouse",
"SafariZone_SecretHouse",
"CeruleanCave_1F",
"CeruleanCave_2F",
@@ -385,12 +385,12 @@
"gMapGroup11": [
"FuchsiaCity_SafariZone_Entrance",
"FuchsiaCity_Mart",
"FuchsiaCity_ZooBuilding",
"FuchsiaCity_SafariZone_Office",
"FuchsiaCity_Gym",
"FuchsiaCity_House1",
"FuchsiaCity_PokemonCenter_1F",
"FuchsiaCity_PokemonCenter_2F",
"FuchsiaCity_Building1",
"FuchsiaCity_WardensHouse",
"FuchsiaCity_House2",
"FuchsiaCity_House3"
],