diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-17 18:48:53 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-17 18:48:53 -0400 |
commit | d045449298a6edba1492e6e99100862d4e5b9510 (patch) | |
tree | 2a4c6e291469d3e135522956a6f52ddf6b2792c3 /data | |
parent | 74b3004c43ee29c7c2772a93f4a8a139acd597df (diff) |
prof_pc
Diffstat (limited to 'data')
-rw-r--r-- | data/maps/PalletTown/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route11_EastEntrance_2F/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route15_WestEntrance_2F/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route16_NorthEntrance_2F/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route2_EastBuilding/scripts.inc | 2 | ||||
-rw-r--r-- | data/specials.inc | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index ed9d01395..c1790fb90 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -54,7 +54,7 @@ EventScript_1654D8:: @ 81654D8 goto_if 0, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 44f6bbc5a..449c31027 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -836,7 +836,7 @@ Movement_1698D0:: @ 81698D0 EventScript_1698D6:: @ 81698D6 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 15889ad8f..7d47d07df 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -37,7 +37,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare_var_to_value VAR_0x8006, 20 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index abc877c0e..334e71ec4 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -66,7 +66,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare_var_to_value VAR_0x8006, 30 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 36ea31ca0..1e06c0394 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -27,7 +27,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 compare_var_to_value VAR_0x8006, 50 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 32685e669..6fa870c27 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -27,7 +27,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F compare_var_to_value VAR_0x8006, 40 diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 9716879a1..a1b2d0e7a 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -11,7 +11,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare_var_to_value VAR_0x8006, 10 diff --git a/data/specials.inc b/data/specials.inc index ad439ae07..f40c3d3be 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -221,7 +221,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CA3D8 + def_special Special_GetPokedexCount def_special sub_80CA524 def_special sub_80CA86C def_special sub_80CA9A8 |