Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
+22 -22
View File
@@ -1,38 +1,38 @@
FuchsiaCity_MapScripts:: @ 8166D75
FuchsiaCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_OnTransition
.byte 0
FuchsiaCity_OnTransition:: @ 8166D7B
FuchsiaCity_OnTransition::
setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY
call_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_SetOmanyteGfx
call_if_unset FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_SetKabutoGfx
end
FuchsiaCity_EventScript_SetOmanyteGfx:: @ 8166D91
FuchsiaCity_EventScript_SetOmanyteGfx::
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OMANYTE
return
FuchsiaCity_EventScript_SetKabutoGfx:: @ 8166D97
FuchsiaCity_EventScript_SetKabutoGfx::
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_KABUTO
return
FuchsiaCity_EventScript_LittleBoy:: @ 8166D9D
FuchsiaCity_EventScript_LittleBoy::
msgbox FuchsiaCity_Text_DidYouTrySafariGame, MSGBOX_NPC
end
FuchsiaCity_EventScript_OldMan:: @ 8166DA6
FuchsiaCity_EventScript_OldMan::
msgbox FuchsiaCity_Text_SafariZoneZooInFront, MSGBOX_NPC
end
FuchsiaCity_EventScript_Erik:: @ 8166DAF
FuchsiaCity_EventScript_Erik::
msgbox FuchsiaCity_Text_WheresSara, MSGBOX_NPC
end
FuchsiaCity_EventScript_Youngster:: @ 8166DB8
FuchsiaCity_EventScript_Youngster::
msgbox FuchsiaCity_Text_ItemBallInThere, MSGBOX_NPC
end
FuchsiaCity_EventScript_Lass:: @ 8166DC1
FuchsiaCity_EventScript_Lass::
lock
faceplayer
famechecker FAMECHECKER_KOGA, 3
@@ -40,35 +40,35 @@ FuchsiaCity_EventScript_Lass:: @ 8166DC1
release
end
FuchsiaCity_EventScript_CitySign:: @ 8166DDA
FuchsiaCity_EventScript_CitySign::
msgbox FuchsiaCity_Text_CitySign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_SafariZoneSign:: @ 8166DE3
FuchsiaCity_EventScript_SafariZoneSign::
msgbox FuchsiaCity_Text_SafariZoneSign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_SafariGameSign:: @ 8166DEC
FuchsiaCity_EventScript_SafariGameSign::
msgbox FuchsiaCity_Text_SafariGameSign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_WardensHomeSign:: @ 8166DF5
FuchsiaCity_EventScript_WardensHomeSign::
msgbox FuchsiaCity_Text_WardensHomeSign, MSGBOX_SIGN
end
@ Unused
FuchsiaCity_EventScript_SafariZoneOfficeSign:: @ 8166DFE
FuchsiaCity_EventScript_SafariZoneOfficeSign::
msgbox FuchsiaCity_Text_SafariZoneOfficeSign, MSGBOX_SIGN
end
FuchsiaCity_EventScript_GymSign:: @ 8166E07
FuchsiaCity_EventScript_GymSign::
lockall
famechecker FAMECHECKER_KOGA, 0
msgbox FuchsiaCity_Text_GymSign
releaseall
end
FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
FuchsiaCity_EventScript_ChanseySign::
lockall
setvar VAR_0x8004, SPECIES_CHANSEY
special SetSeenMon
@@ -78,7 +78,7 @@ FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
releaseall
end
FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
FuchsiaCity_EventScript_VoltorbSign::
lockall
setvar VAR_0x8004, SPECIES_VOLTORB
special SetSeenMon
@@ -88,7 +88,7 @@ FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
releaseall
end
FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
FuchsiaCity_EventScript_KangaskhanSign::
lockall
setvar VAR_0x8004, SPECIES_KANGASKHAN
special SetSeenMon
@@ -98,7 +98,7 @@ FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
releaseall
end
FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
FuchsiaCity_EventScript_SlowpokeSign::
lockall
setvar VAR_0x8004, SPECIES_SLOWPOKE
special SetSeenMon
@@ -108,7 +108,7 @@ FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
releaseall
end
FuchsiaCity_EventScript_LaprasSign:: @ 8166E83
FuchsiaCity_EventScript_LaprasSign::
lockall
setvar VAR_0x8004, SPECIES_LAPRAS
special SetSeenMon
@@ -118,7 +118,7 @@ FuchsiaCity_EventScript_LaprasSign:: @ 8166E83
releaseall
end
FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
FuchsiaCity_EventScript_FossilMonSign::
lockall
goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign
setvar VAR_0x8004, SPECIES_KABUTO
@@ -129,7 +129,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
releaseall
end
FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE
FuchsiaCity_EventScript_OmanyteSign::
setvar VAR_0x8004, SPECIES_OMANYTE
special SetSeenMon
drawmonpic SPECIES_OMANYTE, 10, 3
+23 -23
View File
@@ -1,86 +1,86 @@
FuchsiaCity_Text_DidYouTrySafariGame:: @ 818056E
FuchsiaCity_Text_DidYouTrySafariGame::
.string "Did you try the SAFARI GAME?\p"
.string "There are some rare POKéMON that\n"
.string "can only be caught there.$"
FuchsiaCity_Text_SafariZoneZooInFront:: @ 81805C6
FuchsiaCity_Text_SafariZoneZooInFront::
.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.$"
FuchsiaCity_Text_WheresSara:: @ 818062C
FuchsiaCity_Text_WheresSara::
.string "ERIK: Where's SARA?\n"
.string "I said I'd meet her here.$"
FuchsiaCity_Text_ItemBallInThere:: @ 818065A
FuchsiaCity_Text_ItemBallInThere::
.string "That item ball in there…\n"
.string "Were you wanting that?\p"
.string "Me, too!\n"
.string "…Huh? That's a POKéMON?$"
FuchsiaCity_Text_CitySign:: @ 81806AB
FuchsiaCity_Text_CitySign::
.string "FUCHSIA CITY\n"
.string "Behold! It's Passion Pink!$"
FuchsiaCity_Text_SafariZoneSign:: @ 81806D3
FuchsiaCity_Text_SafariZoneSign::
.string "POKéMON PARADISE\n"
.string "SAFARI ZONE$"
FuchsiaCity_Text_SafariGameSign:: @ 81806F0
FuchsiaCity_Text_SafariGameSign::
.string "SAFARI GAME\n"
.string "POKéMON-U-CATCH!$"
FuchsiaCity_Text_WardensHomeSign:: @ 818070D
FuchsiaCity_Text_WardensHomeSign::
.string "SAFARI ZONE\n"
.string "WARDEN'S HOME$"
FuchsiaCity_Text_SafariZoneOfficeSign:: @ 8180727
FuchsiaCity_Text_SafariZoneOfficeSign::
.string "POKéMON PARADISE!\n"
.string "Welcome to the SAFARI ZONE!\l"
.string "SAFARI ZONE OFFICE$"
FuchsiaCity_Text_GymSign:: @ 8180768
FuchsiaCity_Text_GymSign::
.string "FUCHSIA CITY POKéMON GYM\n"
.string "LEADER: KOGA\l"
.string "The Poisonous Ninja Master$"
FuchsiaCity_Text_ChanseySign:: @ 81807A9
FuchsiaCity_Text_ChanseySign::
.string "Name: CHANSEY\n"
.string "Catching one is all up to chance.$"
FuchsiaCity_Text_VoltorbSign:: @ 81807D9
FuchsiaCity_Text_VoltorbSign::
.string "Name: VOLTORB\n"
.string "The very image of a POKé BALL.$"
FuchsiaCity_Text_KangaskhanSign:: @ 8180806
FuchsiaCity_Text_KangaskhanSign::
.string "Name: KANGASKHAN\p"
.string "A maternal POKéMON that raises its\n"
.string "young in a pouch on its belly.$"
FuchsiaCity_Text_SlowpokeSign:: @ 8180859
FuchsiaCity_Text_SlowpokeSign::
.string "Name: SLOWPOKE\n"
.string "Friendly and very slow moving.$"
FuchsiaCity_Text_LaprasSign:: @ 8180887
FuchsiaCity_Text_LaprasSign::
.string "Name: LAPRAS\n"
.string "AKA the king of the seas.$"
FuchsiaCity_Text_OmanyteSign:: @ 81808AE
FuchsiaCity_Text_OmanyteSign::
.string "Name: OMANYTE\n"
.string "An extremely rare POKéMON that was\l"
.string "regenerated from a fossil.$"
FuchsiaCity_Text_KabutoSign:: @ 81808FA
FuchsiaCity_Text_KabutoSign::
.string "Name: KABUTO\n"
.string "An extremely rare POKéMON that was\l"
.string "regenerated from a fossil.$"
@ Unused. May have been meant to be the placeholder text for the zoo mons, similar to RB's "!" text
FuchsiaCity_Text_Ellipsis:: @ 8180945
FuchsiaCity_Text_Ellipsis::
.string "……$"
Text_SubstituteTeach:: @ 8180948
Text_SubstituteTeach::
.string "Aww, I wish I was a KANGASKHAN\n"
.string "baby.\p"
.string "I'd love to be a substitute for the\n"
@@ -92,19 +92,19 @@ Text_SubstituteTeach:: @ 8180948
.string "Want me to teach SUBSTITUTE to\n"
.string "one of your POKéMON?$"
Text_SubstituteDeclined:: @ 8180A32
Text_SubstituteDeclined::
.string "Oh, really?\n"
.string "SUBSTITUTE seems so fun…$"
Text_SubstituteWhichMon:: @ 8180A57
Text_SubstituteWhichMon::
.string "Which POKéMON wants to learn\n"
.string "SUBSTITUTE?$"
Text_SubstituteTaught:: @ 8180A80
Text_SubstituteTaught::
.string "Boy, what I'd give to crawl inside\n"
.string "a KANGASKHAN belly pouch…$"
FuchsiaCity_Text_MyFatherIsGymLeader:: @ 8180ABD
FuchsiaCity_Text_MyFatherIsGymLeader::
.string "My father is the GYM LEADER of\n"
.string "this town.\p"
.string "I'm training to use POISON POKéMON\n"