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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SaffronCity_Dojo/scripts.inc
+21 -28
View File
@@ -6,7 +6,7 @@ SaffronCity_Dojo_MapScripts::
SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterLeft
waitmovement 0
releaseall
end
@@ -14,7 +14,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
SaffronCity_Dojo_EventScript_TriggerMasterBattleRight::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterRight
waitmovement 0
releaseall
end
@@ -23,16 +23,15 @@ SaffronCity_Dojo_EventScript_HitmonleeBall::
lock
faceplayer
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
drawmonpic SPECIES_HITMONLEE, 10, 3
showmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONLEE
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
call EventScript_RestorePrevTextColor
compare VAR_RESULT, YES
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
goto_if_eq VAR_RESULT, YES, SaffronCity_Dojo_EventScript_GiveHitmon
hidemonpic
release
end
@@ -45,42 +44,37 @@ SaffronCity_Dojo_EventScript_HitmonchanBall::
lock
faceplayer
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
drawmonpic SPECIES_HITMONCHAN, 10, 3
showmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONCHAN
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
call EventScript_RestorePrevTextColor
compare VAR_RESULT, YES
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
goto_if_eq VAR_RESULT, YES, SaffronCity_Dojo_EventScript_GiveHitmon
hidemonpic
release
end
SaffronCity_Dojo_EventScript_GiveHitmon::
erasemonpic
givemon VAR_TEMP_1, 25, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty
compare VAR_RESULT, 1
goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC
compare VAR_RESULT, 2
goto_if_eq EventScript_NoMoreRoomForPokemon
hidemonpic
givemon VAR_TEMP_1, 25
goto_if_eq VAR_RESULT, 0, SaffronCity_Dojo_EventScript_ReceivedHitmonParty
goto_if_eq VAR_RESULT, 1, SaffronCity_Dojo_EventScript_ReceivedHitmonPC
goto_if_eq VAR_RESULT, 2, EventScript_NoMoreRoomForPokemon
release
end
SaffronCity_Dojo_EventScript_ReceivedHitmonParty::
removeobject VAR_LAST_TALKED
getspeciesname 0, VAR_TEMP_1
bufferspeciesname STR_VAR_1, VAR_TEMP_1
playfanfare MUS_LEVEL_UP
message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
waitmessage
waitfanfare
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon
goto_if_eq VAR_RESULT, NO, SaffronCity_Dojo_EventScript_EndGiveMon
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto SaffronCity_Dojo_EventScript_EndGiveMon
@@ -88,15 +82,14 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonParty::
SaffronCity_Dojo_EventScript_ReceivedHitmonPC::
removeobject VAR_LAST_TALKED
getspeciesname 0, VAR_TEMP_1
bufferspeciesname STR_VAR_1, VAR_TEMP_1
playfanfare MUS_LEVEL_UP
message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
waitmessage
waitfanfare
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC
goto_if_eq VAR_RESULT, NO, SaffronCity_Dojo_EventScript_TransferredHitmonToPC
call EventScript_NameReceivedBoxMon
goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC
end