Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
@@ -14,13 +14,10 @@ Route12_NorthEntrance_2F_EventScript_Lass::
faceplayer
goto_if_set FLAG_GOT_TM27, Route12_NorthEntrance_2F_EventScript_ExplainTM27
checkplayergender
compare VAR_RESULT, MALE
call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMMale
compare VAR_RESULT, FEMALE
call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMFemale
checkitemspace ITEM_TM27, 1
compare VAR_RESULT, FALSE
goto_if_eq Route12_NorthEntrance_2F_EventScript_NoRoomForTM27
call_if_eq VAR_RESULT, MALE, Route12_NorthEntrance_2F_EventScript_TakeTMMale
call_if_eq VAR_RESULT, FEMALE, Route12_NorthEntrance_2F_EventScript_TakeTMFemale
checkitemspace ITEM_TM27
goto_if_eq VAR_RESULT, FALSE, Route12_NorthEntrance_2F_EventScript_NoRoomForTM27
giveitem_msg Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl, ITEM_TM27
msgbox Route12_NorthEntrance_2F_Text_ExplainTM27
setflag FLAG_GOT_TM27