From d9115ada86efcdf2cb07690c794cece15119a7c6 Mon Sep 17 00:00:00 2001 From: Fontbane Date: Mon, 13 May 2019 10:48:41 -0400 Subject: [PATCH] Use species constants for VAR_TEMP_1 before givemon --- data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc | 6 +++--- data/maps/MossdeepCity_StevensHouse/scripts.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index a3ad4dff7c..2b0dde7ae0 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -334,7 +334,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C bufferspeciesname 0, SPECIES_CYNDAQUIL - setvar VAR_TEMP_1, 155 + setvar VAR_TEMP_1, SPECIES_CYNDAQUIL givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 @@ -379,7 +379,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D bufferspeciesname 0, SPECIES_TOTODILE - setvar VAR_TEMP_1, 158 + setvar VAR_TEMP_1, SPECIES_TOTODILE givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 @@ -424,7 +424,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE bufferspeciesname 0, SPECIES_CHIKORITA - setvar VAR_TEMP_1, 152 + setvar VAR_TEMP_1, SPECIES_CHIKORITA givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 55c32653a3..f7dd186281 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -84,7 +84,7 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B end MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 - setvar VAR_TEMP_1, 398 + setvar VAR_TEMP_1, SPECIES_BELDUM givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_222895 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 1a9ccfa7ee..d5a2de5ce1 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -83,7 +83,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT - setvar VAR_TEMP_1, 385 + setvar VAR_TEMP_1, SPECIES_CASTFORM givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index dfcd03dc6d..8549d1644b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -156,7 +156,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C end RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E - setvar VAR_TEMP_1, 388 + setvar VAR_TEMP_1, SPECIES_LILEEP givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E @@ -205,7 +205,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 end RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 - setvar VAR_TEMP_1, 390 + setvar VAR_TEMP_1, SPECIES_ANORITH givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11