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

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

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SaffronCity_Dojo/scripts.inc
+21 -21
View File
@@ -1,9 +1,9 @@
.equ LOCALID_KARATE_MASTER, 5
SaffronCity_Dojo_MapScripts:: @ 816EBDB
SaffronCity_Dojo_MapScripts::
.byte 0
SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC
SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft
@@ -11,7 +11,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC
releaseall
end
SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE
SaffronCity_Dojo_EventScript_TriggerMasterBattleRight::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight
@@ -19,7 +19,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE
releaseall
end
SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
SaffronCity_Dojo_EventScript_HitmonleeBall::
lock
faceplayer
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
@@ -36,12 +36,12 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
release
end
SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C
SaffronCity_Dojo_EventScript_AlreadyGotHitmon::
msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy
release
end
SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
SaffronCity_Dojo_EventScript_HitmonchanBall::
lock
faceplayer
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
@@ -58,7 +58,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
release
end
SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82
SaffronCity_Dojo_EventScript_GiveHitmon::
erasemonpic
givemon VAR_TEMP_1, 25, ITEM_NONE
compare VAR_RESULT, 0
@@ -70,7 +70,7 @@ SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82
release
end
SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5
SaffronCity_Dojo_EventScript_ReceivedHitmonParty::
removeobject VAR_LAST_TALKED
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_LEVEL_UP
@@ -86,7 +86,7 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5
goto SaffronCity_Dojo_EventScript_EndGiveMon
end
SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC
SaffronCity_Dojo_EventScript_ReceivedHitmonPC::
removeobject VAR_LAST_TALKED
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_LEVEL_UP
@@ -101,59 +101,59 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC
goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC
end
SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E
SaffronCity_Dojo_EventScript_TransferredHitmonToPC::
call EventScript_TransferredToPC
goto SaffronCity_Dojo_EventScript_EndGiveMon
end
SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29
SaffronCity_Dojo_EventScript_EndGiveMon::
release
end
SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B
SaffronCity_Dojo_EventScript_Statue::
msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN
end
SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34
SaffronCity_Dojo_EventScript_LeftScroll::
msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN
end
SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D
SaffronCity_Dojo_EventScript_RightScroll::
msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN
end
SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46
SaffronCity_Dojo_EventScript_Hitoshi::
trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat
msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D
SaffronCity_Dojo_EventScript_Hideki::
trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat
msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74
SaffronCity_Dojo_EventScript_Aaron::
trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat
msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B
SaffronCity_Dojo_EventScript_Mike::
trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat
msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2
SaffronCity_Dojo_EventScript_MasterKoichi::
trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon
msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6
SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon::
msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs
release
end
SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0
SaffronCity_Dojo_EventScript_DefeatedMasterKoichi::
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
release
end
data/maps/SaffronCity_Dojo/text.inc
+24 -24
View File
@@ -1,4 +1,4 @@
SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C
SaffronCity_Dojo_Text_MasterKoichiIntro::
.string "Grunt!\p"
.string "I am the KARATE MASTER!\n"
.string "I am the LEADER here!\p"
@@ -6,11 +6,11 @@ SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C
.string "Expect no mercy!\p"
.string "Fwaaa!$"
SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193
SaffronCity_Dojo_Text_MasterKoichiDefeat::
.string "Hwa!\n"
.string "Arrgh! Beaten!$"
SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7
SaffronCity_Dojo_Text_ChoosePrizedFightingMon::
.string "Indeed, I have lost!\p"
.string "But, I beseech you, do not take\n"
.string "our emblem as your trophy!\p"
@@ -18,85 +18,85 @@ SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7
.string "FIGHTING POKéMON!\p"
.string "Choose whichever one you like!$"
SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C
SaffronCity_Dojo_Text_StayAndTrainWithUs::
.string "Grunt!\n"
.string "Stay and train at karate with us!$"
SaffronCity_Dojo_Text_MikeIntro:: @ 819B275
SaffronCity_Dojo_Text_MikeIntro::
.string "Hoargh!\n"
.string "Take your shoes off!$"
SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292
SaffronCity_Dojo_Text_MikeDefeat::
.string "I give up!$"
SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D
SaffronCity_Dojo_Text_MikePostBattle::
.string "You wait 'til you see our MASTER!\n"
.string "I'm a small fry compared to him!$"
SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0
SaffronCity_Dojo_Text_HidekiIntro::
.string "I hear you're good!\n"
.string "Show me!$"
SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD
SaffronCity_Dojo_Text_HidekiDefeat::
.string "Judge!\n"
.string "One point!$"
SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F
SaffronCity_Dojo_Text_HidekiPostBattle::
.string "Our MASTER is a pro fighter.\n"
.string "Be prepared to lose!$"
SaffronCity_Dojo_Text_AaronIntro:: @ 819B341
SaffronCity_Dojo_Text_AaronIntro::
.string "Hiyah!\n"
.string "I have no fear for anything tough!\p"
.string "I shatter boulders for training\n"
.string "every day!$"
SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396
SaffronCity_Dojo_Text_AaronDefeat::
.string "Yow!\n"
.string "Stubbed fingers!$"
SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC
SaffronCity_Dojo_Text_AaronPostBattle::
.string "The only thing that frightens us is\n"
.string "psychic power!$"
SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF
SaffronCity_Dojo_Text_HitoshiIntro::
.string "Hwaah!\p"
.string "You're trespassing in our\n"
.string "FIGHTING DOJO!$"
SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F
SaffronCity_Dojo_Text_HitoshiDefeat::
.string "Oof!\n"
.string "I give up!$"
SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F
SaffronCity_Dojo_Text_HitoshiPostBattle::
.string "The prime fighters across the land\n"
.string "train here.$"
SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E
SaffronCity_Dojo_Text_YouWantHitmonlee::
.string "You want the hard-kicking\n"
.string "HITMONLEE?$"
SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473
SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster::
.string "{PLAYER} received the {STR_VAR_1}\n"
.string "from the KARATE MASTER.$"
SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E
SaffronCity_Dojo_Text_YouWantHitmonchan::
.string "You want the piston-punching\n"
.string "HITMONCHAN?$"
SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7
SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2::
.string "{PLAYER}は　カラテ　だいおう　から\n"
.string "{STR_VAR_1}を　もらった！$"
SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1
SaffronCity_Dojo_Text_BetterNotGetGreedy::
.string "Better not get greedy…$"
SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8
SaffronCity_Dojo_Text_EnemiesOnEverySide::
.string "Enemies on every side!$"
SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F
SaffronCity_Dojo_Text_GoesAroundComesAround::
.string "What goes around comes around.$"
SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E
SaffronCity_Dojo_Text_FightingDojo::
.string "FIGHTING DOJO$"