dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflicts, review changes, daycare

Browse Source
This commit is contained in:
DizzyEggg
2017-11-17 19:31:03 +01:00
parent ba00a1c688 a98c6bf210
commit 1b7246395d
61 changed files with 3368 additions and 6216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+1 -1
View File
@@ -1058,7 +1058,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
end
OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626
specialvar VAR_RESULT, sub_80C7008
specialvar VAR_RESULT, CountPartyNonEggMons
compare_var_to_value VAR_RESULT, 2
goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C
specialvar VAR_RESULT, sub_80F9370
data/scripts/day_care.inc
+4 -4
View File
@@ -21,7 +21,7 @@ Route117_EventScript_291C4D:: @ 8291C4D
compare_var_to_value VAR_RESULT, 1
goto_eq Route117_EventScript_291C83
msgbox Route117_Text_292149, 4
clearflag FLAG_0x086
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
release
end
@@ -41,7 +41,7 @@ Route117_EventScript_291C9D:: @ 8291C9D
waitbuttonpress
msgbox Route117_Text_2921CF, 4
special GiveEggFromDaycare
clearflag FLAG_0x086
clearflag FLAG_PENDING_DAYCARE_EGG
release
end
@@ -95,7 +95,7 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
end
Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
specialvar VAR_RESULT, sub_80C7008
specialvar VAR_RESULT, CountPartyNonEggMons
compare_var_to_value VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291DED
specialvar VAR_RESULT, sub_80722E0
@@ -107,7 +107,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
waitstate
compare_var_to_value VAR_0x8004, 255
goto_eq Route117_PokemonDayCare_EventScript_291DCA
specialvar VAR_RESULT, sub_80C70AC
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare_var_to_value VAR_RESULT, 0
goto_eq Route117_PokemonDayCare_EventScript_291DF7
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
data/scripts/maps/Route117.inc
+1 -1
View File
@@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983
end
Route117_EventScript_1F3989:: @ 81F3989
checkflag FLAG_0x086
checkflag FLAG_PENDING_DAYCARE_EGG
goto_if 0, Route117_EventScript_1F3999
setobjectxyperm 3, 47, 6