From ac987dd9c18710c1caf0ae413fbcc0043c9dedbc Mon Sep 17 00:00:00 2001 From: TheSylphIsIn Date: Sat, 8 Feb 2025 14:58:43 -0500 Subject: [PATCH 1/4] Document ScrCmds 065, 0B4, 0B5, 0A1, 0DE, 096, 097 I did these commands together because they're all used in the script for choosing your starter. --- asm/macros/scrcmd.inc | 33 +++--- include/map_object.h | 2 +- include/overlay005/ov5_021E622C.h | 2 +- include/pokemon.h | 2 +- include/scrcmd.h | 2 +- include/unk_02017038.h | 2 +- include/unk_020474B8.h | 2 +- include/unk_0204CFFC.h | 4 +- include/unk_02054884.h | 2 +- include/unk_0206AFE0.h | 6 +- res/field/scripts/scripts_acuity_cavern.s | 2 +- res/field/scripts/scripts_acuity_lakefront.s | 2 +- res/field/scripts/scripts_amity_square.s | 2 +- res/field/scripts/scripts_battle_arcade.s | 4 +- res/field/scripts/scripts_battle_castle.s | 4 +- res/field/scripts/scripts_battle_factory.s | 2 +- res/field/scripts/scripts_battle_frontier.s | 2 +- res/field/scripts/scripts_battle_hall.s | 8 +- res/field/scripts/scripts_battle_park.s | 4 +- res/field/scripts/scripts_battle_tower.s | 8 +- .../scripts_battle_tower_battle_room.s | 2 +- .../scripts/scripts_battle_tower_elevator.s | 6 +- .../scripts_battle_tower_multi_battle_room.s | 4 +- res/field/scripts/scripts_battleground.s | 2 +- res/field/scripts/scripts_canalave_city.s | 14 +-- .../scripts_canalave_city_east_house.s | 4 +- ...ipts_canalave_city_sailor_eldritch_house.s | 2 +- .../scripts/scripts_canalave_library_1f.s | 2 +- .../scripts/scripts_canalave_library_2f.s | 2 +- .../scripts/scripts_canalave_library_3f.s | 8 +- res/field/scripts/scripts_celestic_town.s | 4 +- .../scripts/scripts_celestic_town_cave.s | 6 +- .../scripts/scripts_contest_hall_lobby.s | 16 +-- .../scripts_distortion_world_giratina_room.s | 2 +- res/field/scripts/scripts_eterna_city.s | 14 +-- .../scripts_eterna_city_condominiums_1f.s | 4 +- ...cripts_eterna_city_underground_man_house.s | 2 +- res/field/scripts/scripts_eterna_forest.s | 4 +- res/field/scripts/scripts_fight_area.s | 26 ++-- res/field/scripts/scripts_floaroma_meadow.s | 8 +- res/field/scripts/scripts_flower_paradise.s | 2 +- .../scripts/scripts_fullmoon_island_forest.s | 2 +- res/field/scripts/scripts_galactic_hq_1f.s | 4 +- res/field/scripts/scripts_galactic_hq_3f.s | 4 +- res/field/scripts/scripts_galactic_hq_4f.s | 6 +- res/field/scripts/scripts_galactic_hq_b2f.s | 4 +- .../scripts_galactic_hq_control_room.s | 14 +-- res/field/scripts/scripts_galactic_hq_hall.s | 72 +++++------ res/field/scripts/scripts_game_corner.s | 2 +- .../scripts/scripts_global_terminal_1f.s | 4 +- ...ts_grand_lake_valor_lakefront_west_house.s | 4 +- res/field/scripts/scripts_hall_of_origin.s | 2 +- res/field/scripts/scripts_hearthome_city.s | 4 +- .../scripts_hearthome_city_gym_leader_room.s | 4 +- .../scripts_hearthome_city_northwest_house.s | 2 +- res/field/scripts/scripts_iron_island.s | 2 +- .../scripts_iron_island_b2f_left_room.s | 6 +- res/field/scripts/scripts_iron_island_house.s | 4 +- res/field/scripts/scripts_jubilife_city.s | 28 ++--- res/field/scripts/scripts_jubilife_tv_2f.s | 2 +- .../scripts/scripts_jubilife_tv_2f_gallery.s | 28 ++--- res/field/scripts/scripts_jubilife_tv_3f.s | 4 +- res/field/scripts/scripts_lake_acuity.s | 4 +- res/field/scripts/scripts_lake_verity.s | 12 +- .../scripts/scripts_lake_verity_low_water.s | 8 +- res/field/scripts/scripts_mining_museum.s | 2 +- .../scripts/scripts_mt_coronet_1f_south.s | 2 +- .../scripts/scripts_newmoon_island_forest.s | 2 +- ...cripts_old_chateau_back_middle_east_room.s | 2 +- .../scripts/scripts_old_chateau_dining_area.s | 2 +- res/field/scripts/scripts_oreburgh_city.s | 2 +- .../scripts_oreburgh_city_north_house_1f.s | 2 +- res/field/scripts/scripts_oreburgh_mine_b1f.s | 2 +- res/field/scripts/scripts_oreburgh_mine_b2f.s | 4 +- res/field/scripts/scripts_pal_park_lobby.s | 2 +- res/field/scripts/scripts_pastoria_city.s | 14 +-- .../scripts_pastoria_city_east_house.s | 4 +- .../scripts_pokemon_league_aaron_room.s | 2 +- .../scripts_pokemon_league_bertha_room.s | 2 +- .../scripts_pokemon_league_flint_room.s | 2 +- .../scripts_pokemon_league_hall_of_fame.s | 2 +- .../scripts_pokemon_league_lucian_room.s | 2 +- ...ripts_pokemon_league_north_pokecenter_1f.s | 4 +- res/field/scripts/scripts_pokemon_mansion.s | 4 +- .../scripts/scripts_pokemon_mansion_office.s | 2 +- res/field/scripts/scripts_resort_area.s | 2 +- res/field/scripts/scripts_rotoms_room.s | 18 +-- res/field/scripts/scripts_route_201.s | 28 ++--- res/field/scripts/scripts_route_202.s | 4 +- res/field/scripts/scripts_route_203.s | 4 +- res/field/scripts/scripts_route_207.s | 2 +- ...scripts_route_209_gate_to_hearthome_city.s | 4 +- .../scripts_route_210_grandma_wilma_house.s | 4 +- res/field/scripts/scripts_route_210_south.s | 10 +- res/field/scripts/scripts_route_212_house.s | 4 +- res/field/scripts/scripts_route_213.s | 6 +- res/field/scripts/scripts_route_217.s | 2 +- .../scripts_route_218_gate_to_canalave_city.s | 2 +- .../scripts/scripts_route_222_east_house.s | 2 +- res/field/scripts/scripts_route_224.s | 2 +- res/field/scripts/scripts_route_226_house.s | 2 +- res/field/scripts/scripts_route_227.s | 4 +- .../scripts/scripts_route_228_north_house.s | 4 +- res/field/scripts/scripts_sandgem_town.s | 8 +- ...cripts_sandgem_town_pokemon_research_lab.s | 6 +- res/field/scripts/scripts_snowpoint_city.s | 2 +- .../scripts_snowpoint_city_east_house.s | 4 +- .../scripts_snowpoint_city_west_house.s | 2 +- .../scripts/scripts_snowpoint_temple_b5f.s | 2 +- res/field/scripts/scripts_solaceon_town.s | 2 +- res/field/scripts/scripts_spear_pillar.s | 4 +- .../scripts/scripts_spear_pillar_distorted.s | 4 +- .../scripts/scripts_stark_mountain_outside.s | 8 +- .../scripts/scripts_stark_mountain_room_1.s | 10 +- .../scripts/scripts_stark_mountain_room_2.s | 2 +- .../scripts/scripts_stark_mountain_room_3.s | 14 +-- res/field/scripts/scripts_sunyshore_city.s | 6 +- .../scripts_sunyshore_city_northeast_house.s | 14 +-- res/field/scripts/scripts_survival_area.s | 4 +- .../scripts_survival_area_north_house.s | 4 +- ...scripts_team_galactic_eterna_building_1f.s | 6 +- ...scripts_team_galactic_eterna_building_4f.s | 8 +- res/field/scripts/scripts_trainers_school.s | 6 +- .../scripts_turnback_cave_giratina_room.s | 4 +- res/field/scripts/scripts_twinleaf_town.s | 2 +- .../scripts_twinleaf_town_player_house_1f.s | 2 +- .../scripts_twinleaf_town_player_house_2f.s | 2 +- .../scripts_twinleaf_town_rival_house_2f.s | 2 +- res/field/scripts/scripts_underground.s | 2 +- res/field/scripts/scripts_union_room.s | 30 ++--- res/field/scripts/scripts_unk_0001.s | 2 +- res/field/scripts/scripts_unk_0211.s | 18 +-- res/field/scripts/scripts_unk_0212.s | 12 +- res/field/scripts/scripts_unk_0213.s | 4 +- res/field/scripts/scripts_unk_0404.s | 2 +- res/field/scripts/scripts_unk_0409.s | 8 +- res/field/scripts/scripts_unk_0413.s | 4 +- res/field/scripts/scripts_unk_0422.s | 2 +- res/field/scripts/scripts_unk_0423.s | 2 +- res/field/scripts/scripts_unk_0426.s | 2 +- res/field/scripts/scripts_unk_0499.s | 2 +- res/field/scripts/scripts_unk_0500.s | 2 +- res/field/scripts/scripts_unk_0501.s | 2 +- res/field/scripts/scripts_unk_1051.s | 2 +- res/field/scripts/scripts_unk_1116.s | 2 +- .../scripts_valley_windworks_building.s | 12 +- .../scripts_valley_windworks_outside.s | 6 +- res/field/scripts/scripts_valor_cavern.s | 4 +- res/field/scripts/scripts_valor_lakefront.s | 8 +- res/field/scripts/scripts_veilstone_city.s | 18 +-- ...cripts_veilstone_city_galactic_warehouse.s | 10 +- .../scripts_veilstone_city_northeast_house.s | 2 +- .../scripts_veilstone_city_prize_exchange.s | 2 +- .../scripts_veilstone_city_southwest_house.s | 2 +- .../scripts/scripts_veilstone_store_1f.s | 2 +- res/field/scripts/scripts_verity_cavern.s | 10 +- .../scripts/scripts_victory_road_1f_room_2.s | 2 +- res/field/scripts/scripts_villa.s | 42 +++---- res/field/scripts/scripts_vista_lighthouse.s | 2 +- res/field/scripts/scripts_wayward_cave_1f.s | 2 +- .../scripts/scripts_wifi_plaza_entrance.s | 2 +- src/field_menu.c | 2 +- src/map_object.c | 2 +- src/overlay005/ov5_021E622C.c | 52 ++++---- src/pokemon.c | 12 +- src/scrcmd.c | 112 +++++++++--------- src/unk_02017038.c | 7 +- src/unk_020474B8.c | 18 +-- src/unk_0204B830.c | 4 +- src/unk_0204CFFC.c | 58 ++++----- src/unk_0204EDA4.c | 4 +- src/unk_02054884.c | 16 +-- src/unk_0206AFE0.c | 31 ++--- src/unk_02092494.c | 64 +++++----- 174 files changed, 679 insertions(+), 674 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 2011f72feb..c70e0f2127 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -557,9 +557,9 @@ .short \arg0 .endm - .macro ScrCmd_065 arg0 + .macro RemoveObject localID .short 101 - .short \arg0 + .short \localID .endm .macro ScrCmd_066 arg0, arg1 @@ -852,18 +852,19 @@ .short \arg1 .endm - .macro ScrCmd_096 arg0, arg1, arg2, arg3 + .macro GivePokemon species, level, arg2, arg3 .short 150 - .short \arg0 - .short \arg1 + .short \species + .short \level .short \arg2 .short \arg3 .endm - .macro ScrCmd_097 arg0, arg1 + @ eggGiverTextId corresponds to an entry in special_met_location_names.gmm. 9 is "Traveling Man", 10 is "Riley", 11 is "Cynthia". + .macro GiveEgg species, eggGiverTextId .short 151 - .short \arg0 - .short \arg1 + .short \species + .short \eggGiverTextId .endm .macro ScrCmd_098 arg0, arg1, arg2 @@ -912,7 +913,7 @@ .short 160 .endm - .macro ScrCmd_0A1 + .macro ReturnToField .short 161 .endm @@ -1000,11 +1001,11 @@ .short \arg0 .endm - .macro ScrCmd_0B4 + .macro StartChooseStarterScene .short 180 .endm - .macro ScrCmd_0B5 + .macro SaveChosenStarter .short 181 .endm @@ -1206,9 +1207,9 @@ .byte \arg0 .endm - .macro BufferSpeciesNameFromVar bufferId, var, unused1, unused2 + .macro BufferSpeciesNameFromVar templateArg, var, unused1, unused2 .short 218 - .byte \bufferId + .byte \templateArg .short \var .short \unused1 .byte \unused2 @@ -1219,9 +1220,9 @@ .byte \arg0 .endm - .macro ScrCmd_0DC arg0 + .macro BufferRivalStarterSpeciesName templateArg .short 220 - .byte \arg0 + .byte \templateArg .endm .macro ScrCmd_0DD arg0 @@ -1229,7 +1230,7 @@ .byte \arg0 .endm - .macro ScrCmd_0DE arg0 + .macro GetPlayerStarterSpecies arg0 .short 222 .short \arg0 .endm diff --git a/include/map_object.h b/include/map_object.h index 7a8d78858f..e39bbea2f9 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -62,7 +62,7 @@ MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEv void sub_02061AB4(MapObject *mapObj, int graphicsID); void sub_02061AD4(MapObject *mapObj, int param1); void MapObject_Delete(MapObject *mapObj); -void sub_02061B28(MapObject *mapObj); +void MapObject_SetFlagAndDeleteObject(MapObject *mapObj); void sub_02061B48(MapObject *mapObj); void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan); void sub_02061BF0(MapObjectManager *mapObjMan); diff --git a/include/overlay005/ov5_021E622C.h b/include/overlay005/ov5_021E622C.h index 434ac7dcdb..83a6d153cb 100644 --- a/include/overlay005/ov5_021E622C.h +++ b/include/overlay005/ov5_021E622C.h @@ -25,7 +25,7 @@ int ov5_021E6630(UnkStruct_02026310 *param0, u8 param1, StringTemplate *param2); u8 ov5_021E6640(UnkStruct_02026310 *param0, int param1, StringTemplate *param2); void ov5_021E6720(UnkStruct_02026310 *param0); void ov5_021E6B40(UnkStruct_02026310 *param0); -void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, int param4, int param5); +void Egg_CreateEgg(Pokemon *mon, u16 species, u8 param2, TrainerInfo *trainerInfo, int param4, int metLocation); void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 param3, u8 param4); void ov5_021E6EA8(UnkStruct_02026310 *param0, Party *param1, TrainerInfo *param2); BOOL ov5_021E7154(UnkStruct_02026310 *param0, Party *param1, FieldSystem *fieldSystem); diff --git a/include/pokemon.h b/include/pokemon.h index 3836ab990e..031f34bb9c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -805,7 +805,7 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie */ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay); BOOL Pokemon_IsEligibleForAction(Pokemon *mon); -void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); +void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId); void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); void Pokemon_GiveHeldItem(Pokemon *mon, u32 battleType, int itemRates); BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID); diff --git a/include/scrcmd.h b/include/scrcmd.h index 86100ed575..b3940ba240 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -4,6 +4,6 @@ #include "field_script_context.h" BOOL sub_02041CC8(ScriptContext *ctx); -BOOL sub_02041D60(ScriptContext *ctx); +BOOL ScrCmd_ResumeScriptOnAppExit(ScriptContext *ctx); #endif // POKEPLATINUM_SCRCMD_H diff --git a/include/unk_02017038.h b/include/unk_02017038.h index 14d332616c..86af43d662 100644 --- a/include/unk_02017038.h +++ b/include/unk_02017038.h @@ -3,7 +3,7 @@ int sub_02017038(u32 param0); int sub_02017058(u32 param0); -int sub_02017070(int param0, int param1); +int SpecialMetLoc_GetId(int baseValue, int modifier); BOOL sub_0201708C(u16 param0); #endif // POKEPLATINUM_UNK_02017038_H diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index 9abef1db8a..b9ddd07e26 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -23,7 +23,7 @@ BOOL ScrCmd_0D8(ScriptContext *param0); BOOL ScrCmd_0D9(ScriptContext *param0); BOOL ScrCmd_BufferSpeciesNameFromVar(ScriptContext *ctx); BOOL ScrCmd_0DB(ScriptContext *param0); -BOOL ScrCmd_0DC(ScriptContext *param0); +BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *param0); BOOL ScrCmd_0DD(ScriptContext *param0); BOOL ScrCmd_BufferUndergroundGoodsName(ScriptContext *ctx); BOOL ScrCmd_BufferUndergroundTrapName(ScriptContext *ctx); diff --git a/include/unk_0204CFFC.h b/include/unk_0204CFFC.h index f823707bea..d4f2cbf38f 100644 --- a/include/unk_0204CFFC.h +++ b/include/unk_0204CFFC.h @@ -3,10 +3,10 @@ #include "field_script_context.h" -BOOL ScrCmd_096(ScriptContext *param0); +BOOL ScrCmd_GivePokemon(ScriptContext *param0); BOOL ScrCmd_198(ScriptContext *param0); BOOL ScrCmd_199(ScriptContext *param0); -BOOL ScrCmd_097(ScriptContext *param0); +BOOL ScrCmd_GiveEgg(ScriptContext *param0); BOOL ScrCmd_098(ScriptContext *param0); BOOL ScrCmd_099(ScriptContext *param0); BOOL ScrCmd_09A(ScriptContext *param0); diff --git a/include/unk_02054884.h b/include/unk_02054884.h index 6a8060c66d..ba6a377892 100644 --- a/include/unk_02054884.h +++ b/include/unk_02054884.h @@ -8,7 +8,7 @@ #define PARTY_SLOT_NONE 0xFF BOOL Pokemon_CanBattle(Pokemon *mon); -BOOL sub_020548B0(int heapID, SaveData *saveData, u16 param2, u8 param3, u16 param4, int param5, int param6); +BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 level, u16 param4, int param5, int param6); BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int param4, int param5); void sub_02054988(Party *party, int param1, int param2, u16 param3); int Party_HasMonWithMove(Party *party, u16 moveID); diff --git a/include/unk_0206AFE0.h b/include/unk_0206AFE0.h index dd732534e2..e06400f564 100644 --- a/include/unk_0206AFE0.h +++ b/include/unk_0206AFE0.h @@ -13,9 +13,9 @@ enum HiddenLocations { BOOL sub_0206B024(VarsFlags *varsFlags, u16 param1); u16 sub_0206B034(VarsFlags *varsFlags); -BOOL sub_0206B044(VarsFlags *varsFlags, u16 param1); -u16 sub_0206B054(VarsFlags *varsFlags); -u16 sub_0206B064(VarsFlags *varsFlags); +BOOL VarsFlags_SetPlayerStarterSpecies(VarsFlags *varsFlags, u16 param1); +u16 VarsFlags_GetPlayerStarterSpecies(VarsFlags *varsFlags); +u16 VarsFlags_GetRivalStarterSpecies(VarsFlags *varsFlags); u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *varsFlags); u16 sub_0206B0B4(VarsFlags *varsFlags); BOOL sub_0206B0C4(VarsFlags *varsFlags, u16 param1); diff --git a/res/field/scripts/scripts_acuity_cavern.s b/res/field/scripts/scripts_acuity_cavern.s index 7305251168..f6b1303ff6 100644 --- a/res/field/scripts/scripts_acuity_cavern.s +++ b/res/field/scripts/scripts_acuity_cavern.s @@ -18,7 +18,7 @@ _0014: _0021: SetFlag 0x1E1 - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 End diff --git a/res/field/scripts/scripts_acuity_lakefront.s b/res/field/scripts/scripts_acuity_lakefront.s index 70187062cb..4638522081 100644 --- a/res/field/scripts/scripts_acuity_lakefront.s +++ b/res/field/scripts/scripts_acuity_lakefront.s @@ -57,7 +57,7 @@ _009A: CloseMessage ApplyMovement 2, _00F8 WaitMovement - ScrCmd_065 2 + RemoveObject 2 ApplyMovement 241, _00F0 WaitMovement ScrCmd_067 diff --git a/res/field/scripts/scripts_amity_square.s b/res/field/scripts/scripts_amity_square.s index 328c782808..e29f72e445 100644 --- a/res/field/scripts/scripts_amity_square.s +++ b/res/field/scripts/scripts_amity_square.s @@ -253,7 +253,7 @@ _0365: End _037D: - ScrCmd_065 5 + RemoveObject 5 GoTo _0389 End diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index 59033659e8..db46928529 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -134,7 +134,7 @@ _020B: WaitFadeScreen ScrCmd_2D9 4, 0x40BE, 0x800C ScrCmd_2DB 0x4002, 0x4005, 0x4006 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4002, 0xFF, _0145 @@ -292,7 +292,7 @@ _04DC: ScrCmd_1F8 ScrCmd_2C4 15 CallIfEq 0x40BE, 2, _0545 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_313 1 diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index 2ff8308bbd..7225597b5c 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -131,7 +131,7 @@ _01FF: WaitFadeScreen ScrCmd_2D2 4, 0x40BD, 0x800C ScrCmd_2D4 0x4002, 0x4005, 0x4006 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4002, 0xFF, _0139 @@ -289,7 +289,7 @@ _04D0: ScrCmd_1F8 ScrCmd_2C4 11 CallIfEq 0x40BD, 2, _0539 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_313 1 diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index ba7adc64a9..bea6c00109 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -241,7 +241,7 @@ _03C1: ScrCmd_1F8 ScrCmd_2C4 3 CallIfEq 0x40B8, 2, _042A - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_313 1 diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 570c37baf4..b2e514e6d0 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -285,7 +285,7 @@ _027E: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_2E2 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index 91d7b63afc..ed83332f3b 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -55,7 +55,7 @@ _00B5: End _00DB: - ScrCmd_065 13 + RemoveObject 13 SetFlag 0x2CB Return @@ -107,7 +107,7 @@ _0196: Return _019C: - ScrCmd_065 10 + RemoveObject 10 SetFlag 0x2C1 Return @@ -257,7 +257,7 @@ _03F5: WaitFadeScreen ScrCmd_2CC 4, 0x40BB, 0x800C ScrCmd_2D0 0x4002, 0x4005 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4002, 0xFF, _034D @@ -408,7 +408,7 @@ _06C3: ScrCmd_1F8 ScrCmd_2C4 9 CallIfEq 0x40BB, 2, _072C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_313 1 diff --git a/res/field/scripts/scripts_battle_park.s b/res/field/scripts/scripts_battle_park.s index 17c5a820d3..aa3d6173cb 100644 --- a/res/field/scripts/scripts_battle_park.s +++ b/res/field/scripts/scripts_battle_park.s @@ -51,7 +51,7 @@ _0032: CallIfEq 0x8004, 24, _0204 CallIfEq 0x8004, 25, _0218 CallIfEq 0x8004, 26, _022C - ScrCmd_065 11 + RemoveObject 11 ClearFlag 0x277 ScrCmd_064 12 ScrCmd_062 12 @@ -72,7 +72,7 @@ _0032: CallIfEq 0x8004, 24, _0254 CallIfEq 0x8004, 25, _0268 CallIfEq 0x8004, 26, _027C - ScrCmd_065 12 + RemoveObject 12 SetVar 0x410E, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index cbcc18ceab..ed5bbff3ac 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -298,7 +298,7 @@ _04BE: WaitFadeScreen CloseMessage ScrCmd_1DD 30, 0, 0 - ScrCmd_0A1 + ReturnToField ScrCmd_1DD 31, 0, 0x800C FadeScreen 6, 1, 1, 0 WaitFadeScreen @@ -588,7 +588,7 @@ _097F: ScrCmd_0B3 0x4000 ScrCmd_1DD 16, 0x4001, 0x4000 SetVar 0x4001, 0x4000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen SetVar 0x800C, 0x4001 @@ -1169,7 +1169,7 @@ _1304: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_1D9 0x8000, 0x8001 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -1283,7 +1283,7 @@ _140A: CloseMessage ScrCmd_191 ScrCmd_193 0x800C - ScrCmd_0A1 + ReturnToField SetVar 0x8000, 0x800C FadeScreen 6, 1, 1, 0 WaitFadeScreen diff --git a/res/field/scripts/scripts_battle_tower_battle_room.s b/res/field/scripts/scripts_battle_tower_battle_room.s index fdabce42ab..9ddfa9799c 100644 --- a/res/field/scripts/scripts_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_battle_room.s @@ -275,7 +275,7 @@ _0492: ApplyMovement 1, _0550 WaitMovement SetFlag 0x1CB - ScrCmd_065 1 + RemoveObject 1 Return _04A6: diff --git a/res/field/scripts/scripts_battle_tower_elevator.s b/res/field/scripts/scripts_battle_tower_elevator.s index 876010dfd1..303aeb46bc 100644 --- a/res/field/scripts/scripts_battle_tower_elevator.s +++ b/res/field/scripts/scripts_battle_tower_elevator.s @@ -45,7 +45,7 @@ _00A6: GoToIfEq 0x800C, 5, _01F8 ScrCmd_1F8 ScrCmd_2C4 5 - ScrCmd_0A1 + ReturnToField Warp MAP_HEADER_BATTLE_TOWER, 0, 15, 6, 0 End @@ -54,7 +54,7 @@ _00E9: WaitFadeScreen ScrCmd_1F8 ScrCmd_2C4 6 - ScrCmd_0A1 + ReturnToField Warp MAP_HEADER_BATTLE_TOWER, 0, 11, 6, 0 End @@ -153,7 +153,7 @@ _01E4: _01F8: ScrCmd_1F8 ScrCmd_2C4 5 - ScrCmd_0A1 + ReturnToField Warp MAP_HEADER_BATTLE_TOWER, 0, 19, 6, 0 End diff --git a/res/field/scripts/scripts_battle_tower_multi_battle_room.s b/res/field/scripts/scripts_battle_tower_multi_battle_room.s index 626abfbde1..21f4510d83 100644 --- a/res/field/scripts/scripts_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_multi_battle_room.s @@ -321,8 +321,8 @@ _0541: WaitMovement SetFlag 0x1EA SetFlag 0x1EB - ScrCmd_065 5 - ScrCmd_065 4 + RemoveObject 5 + RemoveObject 4 Return _0565: diff --git a/res/field/scripts/scripts_battleground.s b/res/field/scripts/scripts_battleground.s index 80fa744a7a..3c83d3949a 100644 --- a/res/field/scripts/scripts_battleground.s +++ b/res/field/scripts/scripts_battleground.s @@ -115,7 +115,7 @@ _0183: CallIfEq 0x8005, 8, _01E9 CallIfEq 0x8005, 9, _01FD PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 SetFlag 231 SetFlag 0x1D6 ReleaseAll diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index a009652e98..607de85166 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -156,7 +156,7 @@ _028A: BufferPlayerName 1 Message 0 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _02EB GoToIfEq 0x800C, 0x186, _02F7 GoTo _02DF @@ -181,7 +181,7 @@ _0303: CloseMessage ApplyMovement 11, _035C WaitMovement - ScrCmd_065 11 + RemoveObject 11 SetVar 0x4078, 1 ReleaseAll End @@ -229,7 +229,7 @@ _0377: ApplyMovement 11, _03AC ApplyMovement 0xFF, _03BC WaitMovement - ScrCmd_065 11 + RemoveObject 11 SetVar 0x4078, 3 SetVar 0x40B2, 1 ReleaseAll @@ -263,7 +263,7 @@ _03C8: CloseMessage ApplyMovement 14, _04B8 WaitMovement - ScrCmd_065 14 + RemoveObject 14 ApplyMovement 11, _04C0 WaitMovement BufferRivalName 0 @@ -271,7 +271,7 @@ _03C8: CloseMessage ApplyMovement 11, _04C8 WaitMovement - ScrCmd_065 11 + RemoveObject 11 ApplyMovement 13, _04A0 WaitMovement BufferRivalName 0 @@ -699,7 +699,7 @@ _0959: CloseMessage ApplyMovement 16, _09AC WaitMovement - ScrCmd_065 16 + RemoveObject 16 ScrCmd_186 16, 45, 0x2EE ScrCmd_189 16, 2 ScrCmd_188 16, 16 @@ -751,7 +751,7 @@ _09FA: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 18 + RemoveObject 18 ReleaseAll End diff --git a/res/field/scripts/scripts_canalave_city_east_house.s b/res/field/scripts/scripts_canalave_city_east_house.s index e94cafad7d..8e07d99cdc 100644 --- a/res/field/scripts/scripts_canalave_city_east_house.s +++ b/res/field/scripts/scripts_canalave_city_east_house.s @@ -32,7 +32,7 @@ _0054: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8002, 0xFF, _0130 @@ -46,7 +46,7 @@ _0054: WaitFadeScreen ScrCmd_1C6 0x8002 ScrCmd_1C7 0x8001 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8001, 0xFF, _0049 diff --git a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s index cda3ca18f7..7f4291b71e 100644 --- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s @@ -179,7 +179,7 @@ _026E: ApplyMovement 2, _02DC WaitMovement SetFlag 0x25B - ScrCmd_065 2 + RemoveObject 2 PlayFanfare SEQ_SE_DP_KAIDAN2 WaitFanfare SEQ_SE_DP_KAIDAN2 Return diff --git a/res/field/scripts/scripts_canalave_library_1f.s b/res/field/scripts/scripts_canalave_library_1f.s index e7ec668257..4acb97b751 100644 --- a/res/field/scripts/scripts_canalave_library_1f.s +++ b/res/field/scripts/scripts_canalave_library_1f.s @@ -114,7 +114,7 @@ _0115: CallIfEq 0x8000, 2, _0169 CallIfEq 0x8000, 3, _0175 PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 2 + RemoveObject 2 WaitFanfare SEQ_SE_DP_KAIDAN2 ReleaseAll End diff --git a/res/field/scripts/scripts_canalave_library_2f.s b/res/field/scripts/scripts_canalave_library_2f.s index 1d4fbeebac..b21bed6fca 100644 --- a/res/field/scripts/scripts_canalave_library_2f.s +++ b/res/field/scripts/scripts_canalave_library_2f.s @@ -125,7 +125,7 @@ _0159: ApplyMovement 0xFF, _01E0 ApplyMovement 1, _01D4 WaitMovement - ScrCmd_065 1 + RemoveObject 1 SetVar 0x4056, 3 ReleaseAll End diff --git a/res/field/scripts/scripts_canalave_library_3f.s b/res/field/scripts/scripts_canalave_library_3f.s index e93073a4e3..92fc28446e 100644 --- a/res/field/scripts/scripts_canalave_library_3f.s +++ b/res/field/scripts/scripts_canalave_library_3f.s @@ -144,7 +144,7 @@ _0184: WaitFadeScreen ScrCmd_067 ScrCmd_310 - ScrCmd_0A1 + ReturnToField GetPlayerMapPos 0x8004, 0x8005 ScrCmd_066 0x8004, 0x8005 ApplyMovement 241, _0340 @@ -167,8 +167,8 @@ _0184: ApplyMovement 2, _02F0 ApplyMovement 241, _0348 WaitMovement - ScrCmd_065 4 - ScrCmd_065 3 + RemoveObject 4 + RemoveObject 3 ScrCmd_067 ApplyMovement 0xFF, _02C0 WaitMovement @@ -178,7 +178,7 @@ _0184: ApplyMovement 2, _0308 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 2 + RemoveObject 2 ScrCmd_04A 0x603 SetVar 0x4078, 4 SetVar 0x40B2, 2 diff --git a/res/field/scripts/scripts_celestic_town.s b/res/field/scripts/scripts_celestic_town.s index 300bad10e0..b215ac54a4 100644 --- a/res/field/scripts/scripts_celestic_town.s +++ b/res/field/scripts/scripts_celestic_town.s @@ -81,8 +81,8 @@ _0114: GoTo _0166 _013C: - ScrCmd_065 2 - ScrCmd_065 3 + RemoveObject 2 + RemoveObject 3 ScrCmd_186 3, 0x1D2, 0x213 ScrCmd_189 3, 0 ScrCmd_188 3, 14 diff --git a/res/field/scripts/scripts_celestic_town_cave.s b/res/field/scripts/scripts_celestic_town_cave.s index da3dd03cee..f34196a3f8 100644 --- a/res/field/scripts/scripts_celestic_town_cave.s +++ b/res/field/scripts/scripts_celestic_town_cave.s @@ -117,7 +117,7 @@ _01C3: WaitTime 15, 0x800C FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 1 + RemoveObject 1 FadeScreen 6, 1, 1, 0 WaitFadeScreen GetPlayerMapPos 0x8004, 0x8005 @@ -138,7 +138,7 @@ _01C3: CallIfEq 0x8004, 9, _0357 CallIfEq 0x8004, 10, _036B CallIfEq 0x8004, 11, _037F - ScrCmd_065 0 + RemoveObject 0 Return _0285: @@ -592,7 +592,7 @@ _075E: GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8004, 9, _0788 CallIfEq 0x8004, 10, _079C - ScrCmd_065 2 + RemoveObject 2 ReleaseAll End diff --git a/res/field/scripts/scripts_contest_hall_lobby.s b/res/field/scripts/scripts_contest_hall_lobby.s index d09f64015a..a8b8322c31 100644 --- a/res/field/scripts/scripts_contest_hall_lobby.s +++ b/res/field/scripts/scripts_contest_hall_lobby.s @@ -47,7 +47,7 @@ _002E: ApplyMovement 6, _0160 ApplyMovement 0xFF, _01DC WaitMovement - ScrCmd_065 6 + RemoveObject 6 SetVar 0x40F7, 1 ApplyMovement 5, _0190 ApplyMovement 0xFF, _01E4 @@ -80,7 +80,7 @@ _0104: ApplyMovement 5, _01B0 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 5 + RemoveObject 5 WaitFanfare SEQ_SE_DP_KAIDAN2 SetFlag 0x978 ReleaseAll @@ -201,7 +201,7 @@ _01EC: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A8 0, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -215,7 +215,7 @@ _0229: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A8 1, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -229,7 +229,7 @@ _0266: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A8 2, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -243,7 +243,7 @@ _02A3: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A8 3, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -257,7 +257,7 @@ _02E0: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A8 4, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -473,7 +473,7 @@ _05B9: _05D3: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 10 + RemoveObject 10 WaitFanfare SEQ_SE_DP_KAIDAN2 SetFlag 0x18D ReleaseAll diff --git a/res/field/scripts/scripts_distortion_world_giratina_room.s b/res/field/scripts/scripts_distortion_world_giratina_room.s index 4b56f5e0cc..0b918e786f 100644 --- a/res/field/scripts/scripts_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_distortion_world_giratina_room.s @@ -24,7 +24,7 @@ _0026: _0033: ScrCmd_31F SetVar 0x4055, 14 - ScrCmd_065 128 + RemoveObject 128 End _0041: diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index 5b39677fa4..c0e095f003 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -298,7 +298,7 @@ _0411: End _042B: - ScrCmd_065 12 + RemoveObject 12 SetVar 0x407A, 2 ReleaseAll End @@ -778,7 +778,7 @@ _08FC: ScrCmd_169 77 ApplyMovement 31, _094C WaitMovement - ScrCmd_065 31 + RemoveObject 31 ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -898,7 +898,7 @@ _0AB6: ApplyMovement 33, _0BC0 ApplyMovement 0xFF, _0CAC WaitMovement - ScrCmd_065 32 + RemoveObject 32 WaitTime 35, 0x800C ApplyMovement 33, _0BD4 ApplyMovement 0xFF, _0CC0 @@ -909,7 +909,7 @@ _0AB6: ApplyMovement 33, _0BCC ApplyMovement 0xFF, _0CC8 WaitMovement - ScrCmd_065 33 + RemoveObject 33 SetVar 0x407A, 1 ReleaseAll End @@ -1169,7 +1169,7 @@ _0DF6: Call _0E4B ApplyMovement 12, _0EA0 WaitMovement - ScrCmd_065 12 + RemoveObject 12 GoTo _0E83 End @@ -1179,7 +1179,7 @@ _0E4B: Message 10 Message 16 CloseMessage - ScrCmd_097 175, 11 + GiveEgg SPECIES_TOGEPI, 11 SetVar 0x407A, 5 Return @@ -1267,7 +1267,7 @@ _0F78: End _0F92: - ScrCmd_065 12 + RemoveObject 12 GoTo _0FBA End diff --git a/res/field/scripts/scripts_eterna_city_condominiums_1f.s b/res/field/scripts/scripts_eterna_city_condominiums_1f.s index 7e881c99aa..5e683c3899 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_1f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_1f.s @@ -26,7 +26,7 @@ _0032: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _00B3 @@ -109,7 +109,7 @@ _0168: WaitFadeScreen ScrCmd_2A5 ScrCmd_193 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _01D9 diff --git a/res/field/scripts/scripts_eterna_city_underground_man_house.s b/res/field/scripts/scripts_eterna_city_underground_man_house.s index 87e08ab3f0..f326242338 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -259,7 +259,7 @@ _0347: End _037F: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x186, _03A3 GoToIfEq 0x800C, 0x183, _03B5 GoTo _03C7 diff --git a/res/field/scripts/scripts_eterna_forest.s b/res/field/scripts/scripts_eterna_forest.s index f9a6d6e59c..7580edf8cf 100644 --- a/res/field/scripts/scripts_eterna_forest.s +++ b/res/field/scripts/scripts_eterna_forest.s @@ -209,7 +209,7 @@ _02CB: WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 ClearHasPartner - ScrCmd_065 0 + RemoveObject 0 WaitFanfare SEQ_SE_DP_KAIDAN2 SetFlag 227 SetVar 0x40B1, 2 @@ -389,7 +389,7 @@ _04A2: End _04B4: - ScrCmd_065 24 + RemoveObject 24 ReleaseAll End diff --git a/res/field/scripts/scripts_fight_area.s b/res/field/scripts/scripts_fight_area.s index 839000b462..fb07bfda56 100644 --- a/res/field/scripts/scripts_fight_area.s +++ b/res/field/scripts/scripts_fight_area.s @@ -161,13 +161,13 @@ _0198: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 25 - ScrCmd_065 24 - ScrCmd_065 29 - ScrCmd_065 28 - ScrCmd_065 27 - ScrCmd_065 30 - ScrCmd_065 31 + RemoveObject 25 + RemoveObject 24 + RemoveObject 29 + RemoveObject 28 + RemoveObject 27 + RemoveObject 30 + RemoveObject 31 FadeScreen 6, 1, 1, 0 WaitFadeScreen ApplyMovement 7, _0378 @@ -201,7 +201,7 @@ _0198: ApplyMovement 26, _03D4 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 26 + RemoveObject 26 WaitFanfare SEQ_SE_DP_KAIDAN2 BufferRivalName 0 Message 18 @@ -211,7 +211,7 @@ _0198: ApplyMovement 7, _03A4 ApplyMovement 0xFF, _0428 WaitMovement - ScrCmd_065 7 + RemoveObject 7 ApplyMovement 8, _0478 ApplyMovement 0xFF, _043C WaitMovement @@ -220,15 +220,15 @@ _0198: ApplyMovement 8, _0484 ApplyMovement 0xFF, _041C WaitMovement - ScrCmd_065 8 + RemoveObject 8 ScrCmd_22D 2, 0x800C CallIfEq 0x800C, 1, _02E0 SetVar 0x4081, 2 Return _02E0: - ScrCmd_065 22 - ScrCmd_065 23 + RemoveObject 22 + RemoveObject 23 SetFlag 0x294 Return @@ -248,7 +248,7 @@ _0306: End _030C: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x39D GoToIfEq 0x800C, 0x186, _033E SetVar 0x8004, 0x39C diff --git a/res/field/scripts/scripts_floaroma_meadow.s b/res/field/scripts/scripts_floaroma_meadow.s index b0b1780dc7..9e853760b0 100644 --- a/res/field/scripts/scripts_floaroma_meadow.s +++ b/res/field/scripts/scripts_floaroma_meadow.s @@ -113,8 +113,8 @@ _010E: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 0 - ScrCmd_065 1 + RemoveObject 0 + RemoveObject 1 SetVar 0x40E9, 1 FadeScreen 6, 1, 1, 0 WaitFadeScreen @@ -123,7 +123,7 @@ _010E: GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8004, 12, _01BA CallIfEq 0x8004, 13, _01C6 - ScrCmd_065 3 + RemoveObject 3 Message 7 SetVar 0x8004, 0x1B6 SetVar 0x8005, 1 @@ -260,6 +260,6 @@ _0306: CallCommonScript 0x7FC CloseMessage SetFlag 159 - ScrCmd_065 3 + RemoveObject 3 ReleaseAll End diff --git a/res/field/scripts/scripts_flower_paradise.s b/res/field/scripts/scripts_flower_paradise.s index 9204767877..d9151829ad 100644 --- a/res/field/scripts/scripts_flower_paradise.s +++ b/res/field/scripts/scripts_flower_paradise.s @@ -30,7 +30,7 @@ _0062: _006F: SetFlag 0x251 - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 End diff --git a/res/field/scripts/scripts_fullmoon_island_forest.s b/res/field/scripts/scripts_fullmoon_island_forest.s index 91171939bd..f132ce0632 100644 --- a/res/field/scripts/scripts_fullmoon_island_forest.s +++ b/res/field/scripts/scripts_fullmoon_island_forest.s @@ -24,7 +24,7 @@ _000C: ScrCmd_26A 0, 6, 8 ScrCmd_062 0 SetFlag 0x24F - ScrCmd_065 0 + RemoveObject 0 ScrCmd_21C 1 GoToIfEq 0x4058, 3, _0074 ClearFlag 0x452 diff --git a/res/field/scripts/scripts_galactic_hq_1f.s b/res/field/scripts/scripts_galactic_hq_1f.s index dd883b6e22..562364f220 100644 --- a/res/field/scripts/scripts_galactic_hq_1f.s +++ b/res/field/scripts/scripts_galactic_hq_1f.s @@ -128,8 +128,8 @@ _012A: ApplyMovement 6, _016C WaitMovement SetFlag 0x224 - ScrCmd_065 5 - ScrCmd_065 6 + RemoveObject 5 + RemoveObject 6 CloseMessage ReleaseAll End diff --git a/res/field/scripts/scripts_galactic_hq_3f.s b/res/field/scripts/scripts_galactic_hq_3f.s index c2f25cdc4f..ff1d3aa170 100644 --- a/res/field/scripts/scripts_galactic_hq_3f.s +++ b/res/field/scripts/scripts_galactic_hq_3f.s @@ -47,8 +47,8 @@ _006C: ApplyMovement 6, _00B0 WaitMovement SetFlag 0x225 - ScrCmd_065 5 - ScrCmd_065 6 + RemoveObject 5 + RemoveObject 6 CloseMessage ReleaseAll End diff --git a/res/field/scripts/scripts_galactic_hq_4f.s b/res/field/scripts/scripts_galactic_hq_4f.s index 9cada72f17..84c63b497a 100644 --- a/res/field/scripts/scripts_galactic_hq_4f.s +++ b/res/field/scripts/scripts_galactic_hq_4f.s @@ -51,7 +51,7 @@ _0074: CloseMessage ApplyMovement 0, _0124 WaitMovement - ScrCmd_065 0 + RemoveObject 0 SetVar 0x40D6, 1 ReleaseAll End @@ -129,8 +129,8 @@ _0177: ApplyMovement 2, _01BC WaitMovement SetFlag 0x226 - ScrCmd_065 1 - ScrCmd_065 2 + RemoveObject 1 + RemoveObject 2 CloseMessage ReleaseAll End diff --git a/res/field/scripts/scripts_galactic_hq_b2f.s b/res/field/scripts/scripts_galactic_hq_b2f.s index 6a72ea5d0a..b92bafa3a1 100644 --- a/res/field/scripts/scripts_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_galactic_hq_b2f.s @@ -57,8 +57,8 @@ _007F: ApplyMovement 7, _00C4 WaitMovement SetFlag 0x227 - ScrCmd_065 6 - ScrCmd_065 7 + RemoveObject 6 + RemoveObject 7 CloseMessage ReleaseAll End diff --git a/res/field/scripts/scripts_galactic_hq_control_room.s b/res/field/scripts/scripts_galactic_hq_control_room.s index 6f18fe2b86..16f1be50a1 100644 --- a/res/field/scripts/scripts_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_galactic_hq_control_room.s @@ -200,18 +200,18 @@ _01FB: Call _0296 Call _0296 Call _0296 - ScrCmd_065 2 - ScrCmd_065 1 - ScrCmd_065 3 + RemoveObject 2 + RemoveObject 1 + RemoveObject 3 GoToIfEq 0x4002, 0, _02C0 GoToIfEq 0x4002, 2, _02DA GoToIfEq 0x4002, 3, _02F4 End _0296: - ScrCmd_065 2 - ScrCmd_065 1 - ScrCmd_065 3 + RemoveObject 2 + RemoveObject 1 + RemoveObject 3 WaitTime 2, 0x800C ClearFlag 0x236 ScrCmd_064 2 @@ -246,7 +246,7 @@ _030E: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 0 + RemoveObject 0 FadeScreen 6, 1, 1, 0 WaitFadeScreen SetFlag 0x235 diff --git a/res/field/scripts/scripts_galactic_hq_hall.s b/res/field/scripts/scripts_galactic_hq_hall.s index 03cb4f2f1b..e692d3888a 100644 --- a/res/field/scripts/scripts_galactic_hq_hall.s +++ b/res/field/scripts/scripts_galactic_hq_hall.s @@ -45,46 +45,46 @@ _0006: WaitTime 15, 0x800C ApplyMovement 2, _01E8 WaitMovement - ScrCmd_065 2 + RemoveObject 2 FadeScreen 6, 3, 0, 0 WaitFadeScreen ApplyMovement 241, _0204 WaitMovement ScrCmd_067 - ScrCmd_065 0 - ScrCmd_065 1 - ScrCmd_065 4 - ScrCmd_065 5 - ScrCmd_065 6 - ScrCmd_065 7 - ScrCmd_065 8 - ScrCmd_065 9 - ScrCmd_065 10 - ScrCmd_065 11 - ScrCmd_065 12 - ScrCmd_065 13 - ScrCmd_065 14 - ScrCmd_065 15 - ScrCmd_065 16 - ScrCmd_065 17 - ScrCmd_065 18 - ScrCmd_065 19 - ScrCmd_065 20 - ScrCmd_065 21 - ScrCmd_065 22 - ScrCmd_065 23 - ScrCmd_065 24 - ScrCmd_065 25 - ScrCmd_065 26 - ScrCmd_065 27 - ScrCmd_065 28 - ScrCmd_065 29 - ScrCmd_065 30 - ScrCmd_065 31 - ScrCmd_065 32 - ScrCmd_065 33 - ScrCmd_065 34 - ScrCmd_065 35 + RemoveObject 0 + RemoveObject 1 + RemoveObject 4 + RemoveObject 5 + RemoveObject 6 + RemoveObject 7 + RemoveObject 8 + RemoveObject 9 + RemoveObject 10 + RemoveObject 11 + RemoveObject 12 + RemoveObject 13 + RemoveObject 14 + RemoveObject 15 + RemoveObject 16 + RemoveObject 17 + RemoveObject 18 + RemoveObject 19 + RemoveObject 20 + RemoveObject 21 + RemoveObject 22 + RemoveObject 23 + RemoveObject 24 + RemoveObject 25 + RemoveObject 26 + RemoveObject 27 + RemoveObject 28 + RemoveObject 29 + RemoveObject 30 + RemoveObject 31 + RemoveObject 32 + RemoveObject 33 + RemoveObject 34 + RemoveObject 35 ApplyMovement 3, _0248 ApplyMovement 0xFF, _0224 WaitMovement @@ -96,7 +96,7 @@ _0006: ApplyMovement 3, _0250 ApplyMovement 0xFF, _022C WaitMovement - ScrCmd_065 3 + RemoveObject 3 SetVar 0x408E, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_game_corner.s b/res/field/scripts/scripts_game_corner.s index 8d9a9949d0..c5a148eea5 100644 --- a/res/field/scripts/scripts_game_corner.s +++ b/res/field/scripts/scripts_game_corner.s @@ -84,7 +84,7 @@ _00EA: WaitFadeScreen CreateJournalEvent LOCATION_EVENT_GAME_CORNER, 0, 0, 0, 0 ScrCmd_267 0x8004 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_global_terminal_1f.s b/res/field/scripts/scripts_global_terminal_1f.s index 794d21c244..af004063bc 100644 --- a/res/field/scripts/scripts_global_terminal_1f.s +++ b/res/field/scripts/scripts_global_terminal_1f.s @@ -192,7 +192,7 @@ _020D: SetVar 0x8004, 0x800C ScrCmd_0B2 0x8004, 0x800C GoToIfEq 0x800C, 0, _02CE - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen Call _0077 @@ -200,7 +200,7 @@ _020D: End _02CE: - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen Call _0077 diff --git a/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s b/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s index 34767a0aa5..cddd7cf13a 100644 --- a/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s +++ b/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s @@ -36,7 +36,7 @@ _0057: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_1EA - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -53,7 +53,7 @@ _0095: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_1EB - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_hall_of_origin.s b/res/field/scripts/scripts_hall_of_origin.s index 392c0adf44..91b4a82ffd 100644 --- a/res/field/scripts/scripts_hall_of_origin.s +++ b/res/field/scripts/scripts_hall_of_origin.s @@ -26,7 +26,7 @@ _003B: _0048: SetFlag 0x24E - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 End diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index 0e2fe664bb..ad1f00af38 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -601,12 +601,12 @@ _0820: Message 1 ScrCmd_04C 0x1AB, 0 ScrCmd_04D - ScrCmd_065 31 + RemoveObject 31 Message 2 CloseMessage ApplyMovement 32, _089C WaitMovement - ScrCmd_065 32 + RemoveObject 32 SetVar 0x40F6, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s index a849faa6d9..a6633250b3 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s @@ -17,8 +17,8 @@ _001A: _0027: SetFlag 0x29C - ScrCmd_065 2 - ScrCmd_065 1 + RemoveObject 2 + RemoveObject 1 ClearFlag 142 End diff --git a/res/field/scripts/scripts_hearthome_city_northwest_house.s b/res/field/scripts/scripts_hearthome_city_northwest_house.s index d37a052cfc..01a8c688e2 100644 --- a/res/field/scripts/scripts_hearthome_city_northwest_house.s +++ b/res/field/scripts/scripts_hearthome_city_northwest_house.s @@ -36,7 +36,7 @@ _0057: BufferPlayerName 0 Message 3 WaitSound - ScrCmd_096 133, 20, 0, 0x800C + GivePokemon SPECIES_EEVEE, 20, 0, 0x800C SetFlag 0x131 Message 4 ScrCmd_03E 0x800C diff --git a/res/field/scripts/scripts_iron_island.s b/res/field/scripts/scripts_iron_island.s index fdac13bc31..a4075099df 100644 --- a/res/field/scripts/scripts_iron_island.s +++ b/res/field/scripts/scripts_iron_island.s @@ -118,7 +118,7 @@ _014B: ApplyMovement 1, _0168 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 WaitFanfare SEQ_SE_DP_KAIDAN2 ReleaseAll End diff --git a/res/field/scripts/scripts_iron_island_b2f_left_room.s b/res/field/scripts/scripts_iron_island_b2f_left_room.s index 95dd6b0863..9193de373a 100644 --- a/res/field/scripts/scripts_iron_island_b2f_left_room.s +++ b/res/field/scripts/scripts_iron_island_b2f_left_room.s @@ -187,8 +187,8 @@ _01AA: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 5 - ScrCmd_065 6 + RemoveObject 5 + RemoveObject 6 FadeScreen 6, 1, 1, 0 WaitFadeScreen GetPlayerMapPos 0x8004, 0x8005 @@ -261,7 +261,7 @@ _031C: PlaySound SEQ_FANFA4 WaitSound Message 12 - ScrCmd_097 0x1BF, 10 + GiveEgg SPECIES_RIOLU, 10 SetFlag 0x1E5 ClearFlag 226 Call _0371 diff --git a/res/field/scripts/scripts_iron_island_house.s b/res/field/scripts/scripts_iron_island_house.s index 47f25f3637..8469560c0f 100644 --- a/res/field/scripts/scripts_iron_island_house.s +++ b/res/field/scripts/scripts_iron_island_house.s @@ -51,7 +51,7 @@ _00B2: ApplyMovement 0, _00F0 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 0 + RemoveObject 0 WaitFanfare SEQ_SE_DP_KAIDAN2 ScrCmd_04A 0x603 ReleaseAll @@ -61,7 +61,7 @@ _00D0: ApplyMovement 0, _00FC WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 0 + RemoveObject 0 WaitFanfare SEQ_SE_DP_KAIDAN2 ScrCmd_04A 0x603 ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index 279b0d365a..626c10d32b 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -186,7 +186,7 @@ _02BB: ApplyMovement 7, _0474 ApplyMovement 0xFF, _04F8 WaitMovement - ScrCmd_065 7 + RemoveObject 7 SetVar 0x4077, 1 ReleaseAll End @@ -889,8 +889,8 @@ _0AFE: ApplyMovement 17, _0EA4 ApplyMovement 18, _0EAC WaitMovement - ScrCmd_065 17 - ScrCmd_065 18 + RemoveObject 17 + RemoveObject 18 SetFlag 0x19C ApplyMovement 16, _0EF8 ApplyMovement 7, _0E54 @@ -911,7 +911,7 @@ _0BAA: End _0BCA: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x268 GoToIfEq 0x800C, 0x186, _0C2E SetVar 0x8004, 0x269 @@ -920,7 +920,7 @@ _0BCA: Return _0BFC: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x265 GoToIfEq 0x800C, 0x186, _0C2E SetVar 0x8004, 0x266 @@ -957,15 +957,15 @@ _0C52: End _0C7C: - ScrCmd_065 7 - ScrCmd_065 16 + RemoveObject 7 + RemoveObject 16 ClearFlag 0x198 SetVar 0x4077, 4 SetVar 0x4076, 2 SetVar 0x4079, 3 - ScrCmd_065 24 - ScrCmd_065 25 - ScrCmd_065 27 + RemoveObject 24 + RemoveObject 25 + RemoveObject 27 ScrCmd_186 30, 174, 0x2EE ScrCmd_188 30, 14 ClearFlag 0x18B @@ -980,7 +980,7 @@ _0C7C: WaitTime 15, 0x800C ApplyMovement 30, _0DC8 WaitMovement - ScrCmd_065 30 + RemoveObject 30 ReleaseAll End @@ -1599,10 +1599,10 @@ _12BB: End _12D5: - ScrCmd_065 23 + RemoveObject 23 SetFlag 243 ClearFlag 0x1F7 - ScrCmd_065 31 + RemoveObject 31 SetFlag 0x181 ReleaseAll End @@ -1795,7 +1795,7 @@ _14CF: CloseMessage ApplyMovement 31, _154C WaitMovement - ScrCmd_065 31 + RemoveObject 31 CallCommonScript 0x808 SetVar 0x4076, 2 ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_2f.s b/res/field/scripts/scripts_jubilife_tv_2f.s index 9cb96689e7..276157a15f 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_jubilife_tv_2f.s @@ -34,7 +34,7 @@ _0044: LockAll FacePlayer GoToIfSet 0x13D, _00A4 - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C CallIfEq 0x800C, 0x183, _00B4 CallIfEq 0x800C, 0x186, _00BC CallIfEq 0x800C, 0x189, _00C4 diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index d6c66592ea..81ee64b11e 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -81,7 +81,7 @@ _0121: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x4002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4002, 0xFF, _02B3 @@ -124,7 +124,7 @@ _01EC: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A6 0x4002, 0x8005, 0x8007 - ScrCmd_0A1 + ReturnToField ApplyMovement 0xFF, _0360 WaitMovement FadeScreen 6, 1, 1, 0 @@ -178,7 +178,7 @@ _02C7: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8004 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _0328 @@ -292,7 +292,7 @@ _03CC: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 0, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -306,7 +306,7 @@ _0409: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 1, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -320,7 +320,7 @@ _0446: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 2, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -334,7 +334,7 @@ _0483: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 3, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -348,7 +348,7 @@ _04C0: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 4, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -362,7 +362,7 @@ _04FD: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 5, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -376,7 +376,7 @@ _053A: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 6, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -390,7 +390,7 @@ _0577: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 7, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -404,7 +404,7 @@ _05B4: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 8, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -418,7 +418,7 @@ _05F1: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 9, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -432,7 +432,7 @@ _062E: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0A7 10, 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_3f.s b/res/field/scripts/scripts_jubilife_tv_3f.s index 4445151895..6b3d06d614 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_jubilife_tv_3f.s @@ -70,7 +70,7 @@ _009C: WaitFadeScreen CloseMessage ScrCmd_244 0, 0x800C, 0x8000, 0x8001 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _015B @@ -79,7 +79,7 @@ _009C: WaitFadeScreen CloseMessage ScrCmd_244 0, 0x800C, 0x8002, 0x8003 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _015B diff --git a/res/field/scripts/scripts_lake_acuity.s b/res/field/scripts/scripts_lake_acuity.s index 0d0bb75db8..d87c62965e 100644 --- a/res/field/scripts/scripts_lake_acuity.s +++ b/res/field/scripts/scripts_lake_acuity.s @@ -32,7 +32,7 @@ _0006: CallIfEq 0x8004, 14, _0168 CallIfEq 0x8004, 15, _0174 PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 WaitFanfare SEQ_SE_DP_KAIDAN2 GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8004, 14, _0180 @@ -55,7 +55,7 @@ _0006: ApplyMovement 0xFF, _01B8 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 2 + RemoveObject 2 WaitFanfare SEQ_SE_DP_KAIDAN2 SetFlag 0x98F ClearFlag 0x223 diff --git a/res/field/scripts/scripts_lake_verity.s b/res/field/scripts/scripts_lake_verity.s index cf4a75227c..d0f6146adb 100644 --- a/res/field/scripts/scripts_lake_verity.s +++ b/res/field/scripts/scripts_lake_verity.s @@ -204,12 +204,12 @@ _0230: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 7 - ScrCmd_065 8 - ScrCmd_065 0 - ScrCmd_065 1 - ScrCmd_065 2 - ScrCmd_065 3 + RemoveObject 7 + RemoveObject 8 + RemoveObject 0 + RemoveObject 1 + RemoveObject 2 + RemoveObject 3 SetFlag 0x98E ApplyMovement 6, _02FC ApplyMovement 0xFF, _0304 diff --git a/res/field/scripts/scripts_lake_verity_low_water.s b/res/field/scripts/scripts_lake_verity_low_water.s index aca1b875da..066050bbde 100644 --- a/res/field/scripts/scripts_lake_verity_low_water.s +++ b/res/field/scripts/scripts_lake_verity_low_water.s @@ -32,8 +32,8 @@ _004E: _005B: SetFlag 0x18F - ScrCmd_065 3 - ScrCmd_065 2 + RemoveObject 3 + RemoveObject 2 ClearFlag 142 End End @@ -66,7 +66,7 @@ _006F: ApplyMovement 4, _01F0 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 4 + RemoveObject 4 WaitTime 50, 0x800C ApplyMovement 0xFF, _0378 ApplyMovement 5, _02AC @@ -104,7 +104,7 @@ _006F: ApplyMovement 0xFF, _039C WaitMovement SetFlag 0x196 - ScrCmd_065 5 + RemoveObject 5 PlayFanfare SEQ_SE_DP_KAIDAN2 GoTo _01A1 End diff --git a/res/field/scripts/scripts_mining_museum.s b/res/field/scripts/scripts_mining_museum.s index db65d6f3b0..5ac3852c15 100644 --- a/res/field/scripts/scripts_mining_museum.s +++ b/res/field/scripts/scripts_mining_museum.s @@ -231,7 +231,7 @@ _03F2: PlaySound SEQ_FANFA4 Message 8 WaitSound - ScrCmd_096 0x40B4, 20, 0, 0x800C + GivePokemon 0x40B4, 20, 0, 0x800C IncrementGameRecord RECORD_UNK_115 SetVar 0x40B4, 0 Message 9 diff --git a/res/field/scripts/scripts_mt_coronet_1f_south.s b/res/field/scripts/scripts_mt_coronet_1f_south.s index 6f56e52b98..fdc2871e76 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_south.s +++ b/res/field/scripts/scripts_mt_coronet_1f_south.s @@ -24,7 +24,7 @@ _0006: ApplyMovement 0xFF, _00B0 ApplyMovement 6, _0080 WaitMovement - ScrCmd_065 6 + RemoveObject 6 SetVar 0x4096, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_newmoon_island_forest.s b/res/field/scripts/scripts_newmoon_island_forest.s index 1d73827ac2..348eec163a 100644 --- a/res/field/scripts/scripts_newmoon_island_forest.s +++ b/res/field/scripts/scripts_newmoon_island_forest.s @@ -29,7 +29,7 @@ _005E: _006B: SetFlag 0x240 - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 End diff --git a/res/field/scripts/scripts_old_chateau_back_middle_east_room.s b/res/field/scripts/scripts_old_chateau_back_middle_east_room.s index 79d31314ab..7a9f33f377 100644 --- a/res/field/scripts/scripts_old_chateau_back_middle_east_room.s +++ b/res/field/scripts/scripts_old_chateau_back_middle_east_room.s @@ -22,7 +22,7 @@ _002E: ApplyMovement 1, _004C WaitMovement SetFlag 0x27C - ScrCmd_065 1 + RemoveObject 1 SetVar 0x4111, 0 ReleaseAll End diff --git a/res/field/scripts/scripts_old_chateau_dining_area.s b/res/field/scripts/scripts_old_chateau_dining_area.s index 41ff09616e..9fbf14e7c1 100644 --- a/res/field/scripts/scripts_old_chateau_dining_area.s +++ b/res/field/scripts/scripts_old_chateau_dining_area.s @@ -23,7 +23,7 @@ _002E: ApplyMovement 0, _0064 WaitMovement SetFlag 0x27B - ScrCmd_065 0 + RemoveObject 0 SetVar 0x4110, 0 ReleaseAll End diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index 983f46fe5d..1d702a4fa8 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -177,7 +177,7 @@ _026D: _0287: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 3 + RemoveObject 3 CallCommonScript 0x7FB SetVar 0x4079, 3 ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s index 4266c3137a..747015bad8 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s @@ -24,7 +24,7 @@ _003B: WaitFadeScreen ScrCmd_2A5 ScrCmd_193 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _00AC diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index 96bbe5b038..7b05095ffd 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s @@ -82,7 +82,7 @@ _00F0: _0102: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 3 + RemoveObject 3 SetVar 0x4056, 2 ReleaseAll End diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index 0e9d209166..25274ebb81 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -43,7 +43,7 @@ _0044: CloseMessage ScrCmd_29E 2, 0x8005 WaitTime 10, 0x800C - ScrCmd_065 1 + RemoveObject 1 _0059: WaitTime 1, 0x800C GoToIfEq 0x8005, 0, _0059 @@ -83,7 +83,7 @@ _0091: GoTo _00A1 _00A1: - ScrCmd_065 0 + RemoveObject 0 SetFlag 122 SetFlag 0x17C ReleaseAll diff --git a/res/field/scripts/scripts_pal_park_lobby.s b/res/field/scripts/scripts_pal_park_lobby.s index aed7f6733c..8dd120ed82 100644 --- a/res/field/scripts/scripts_pal_park_lobby.s +++ b/res/field/scripts/scripts_pal_park_lobby.s @@ -405,7 +405,7 @@ _04F6: ApplyMovement 1, _0564 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x40C6, 1 ReleaseAll diff --git a/res/field/scripts/scripts_pastoria_city.s b/res/field/scripts/scripts_pastoria_city.s index d5506cf829..efc82a39d5 100644 --- a/res/field/scripts/scripts_pastoria_city.s +++ b/res/field/scripts/scripts_pastoria_city.s @@ -107,7 +107,7 @@ _012F: LockAll FacePlayer GoToIfSet 0x128, _0189 - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C CallIfEq 0x800C, 0x183, _0194 CallIfEq 0x800C, 0x186, _019C CallIfEq 0x800C, 0x189, _01A4 @@ -236,7 +236,7 @@ _02B2: _02D2: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 21 + RemoveObject 21 SetFlag 0x103 ReleaseAll End @@ -576,7 +576,7 @@ _04C8: CloseMessage ApplyMovement 26, _05CC WaitMovement - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _054B GoToIfEq 0x800C, 0x186, _0557 GoTo _053F @@ -602,7 +602,7 @@ _0563: CloseMessage ApplyMovement 26, _05D4 WaitMovement - ScrCmd_065 26 + RemoveObject 26 SetVar 0x407C, 2 ReleaseAll End @@ -866,7 +866,7 @@ _08D9: Return _08FA: - ScrCmd_065 21 + RemoveObject 21 ClearFlag 0x20C ScrCmd_186 21, 0x27D, 0x32C ScrCmd_188 21, 17 @@ -880,7 +880,7 @@ _091C: ApplyMovement 27, _0B88 ApplyMovement 0xFF, _099C WaitMovement - ScrCmd_065 27 + RemoveObject 27 GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8004, 0x261, _0981 CallIfEq 0x8004, 0x263, _098D @@ -1166,7 +1166,7 @@ _0C22: ApplyMovement 28, _0C70 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 28 + RemoveObject 28 WaitFanfare SEQ_SE_DP_KAIDAN2 ReleaseAll End diff --git a/res/field/scripts/scripts_pastoria_city_east_house.s b/res/field/scripts/scripts_pastoria_city_east_house.s index 12fc645864..6defd6e2a2 100644 --- a/res/field/scripts/scripts_pastoria_city_east_house.s +++ b/res/field/scripts/scripts_pastoria_city_east_house.s @@ -39,7 +39,7 @@ _006A: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8005 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8005, 0xFF, _005F @@ -53,7 +53,7 @@ _006A: WaitFadeScreen ScrCmd_221 0x8005 ScrCmd_223 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _005F diff --git a/res/field/scripts/scripts_pokemon_league_aaron_room.s b/res/field/scripts/scripts_pokemon_league_aaron_room.s index d4308c8aaf..ce41ee5239 100644 --- a/res/field/scripts/scripts_pokemon_league_aaron_room.s +++ b/res/field/scripts/scripts_pokemon_league_aaron_room.s @@ -21,7 +21,7 @@ _000A: GoToIfEq 0x800C, 0, _00A6 SetFlag 176 PlayFanfare SEQ_SE_DP_KI_GASYAN - ScrCmd_065 2 + RemoveObject 2 CallIfUnset 214, _008A CallIfSet 214, _0098 Message 1 diff --git a/res/field/scripts/scripts_pokemon_league_bertha_room.s b/res/field/scripts/scripts_pokemon_league_bertha_room.s index a56c8e8ce2..451e6fe0c2 100644 --- a/res/field/scripts/scripts_pokemon_league_bertha_room.s +++ b/res/field/scripts/scripts_pokemon_league_bertha_room.s @@ -21,7 +21,7 @@ _000A: GoToIfEq 0x800C, 0, _00A6 SetFlag 177 PlayFanfare SEQ_SE_DP_KI_GASYAN - ScrCmd_065 2 + RemoveObject 2 CallIfUnset 214, _008A CallIfSet 214, _0098 Message 1 diff --git a/res/field/scripts/scripts_pokemon_league_flint_room.s b/res/field/scripts/scripts_pokemon_league_flint_room.s index 8b62446567..43192270e9 100644 --- a/res/field/scripts/scripts_pokemon_league_flint_room.s +++ b/res/field/scripts/scripts_pokemon_league_flint_room.s @@ -22,7 +22,7 @@ _000A: GoToIfEq 0x800C, 0, _00CC SetFlag 178 PlayFanfare SEQ_SE_DP_KI_GASYAN - ScrCmd_065 1 + RemoveObject 1 CallIfUnset 214, _00B0 CallIfSet 214, _00BE CallIfUnset 0x964, _0109 diff --git a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s index b33d0042a2..c81c47e8b7 100644 --- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s @@ -54,7 +54,7 @@ _008C: ScrCmd_260 24 Call _0174 ScrCmd_0B0 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_pokemon_league_lucian_room.s b/res/field/scripts/scripts_pokemon_league_lucian_room.s index 80af90653f..94053837b5 100644 --- a/res/field/scripts/scripts_pokemon_league_lucian_room.s +++ b/res/field/scripts/scripts_pokemon_league_lucian_room.s @@ -21,7 +21,7 @@ _000A: GoToIfEq 0x800C, 0, _00A6 SetFlag 179 PlayFanfare SEQ_SE_DP_KI_GASYAN - ScrCmd_065 1 + RemoveObject 1 CallIfUnset 214, _008A CallIfSet 214, _0098 Message 1 diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s index 6ded2db8b3..df27ca1ed8 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -149,7 +149,7 @@ _01C1: BufferRivalName 0 Message 0 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _0203 GoToIfEq 0x800C, 0x186, _020F GoTo _01F7 @@ -196,7 +196,7 @@ _0286: _0296: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 5 + RemoveObject 5 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x40EF, 1 ReleaseAll diff --git a/res/field/scripts/scripts_pokemon_mansion.s b/res/field/scripts/scripts_pokemon_mansion.s index 16fb325e63..d792b2583d 100644 --- a/res/field/scripts/scripts_pokemon_mansion.s +++ b/res/field/scripts/scripts_pokemon_mansion.s @@ -160,7 +160,7 @@ _00FF: CloseMessage ApplyMovement 5, _0414 WaitMovement - ScrCmd_065 5 + RemoveObject 5 ApplyMovement 2, _0408 WaitMovement BufferNumber 0, 0x404C @@ -190,7 +190,7 @@ _00FF: CloseMessage ApplyMovement 4, _0414 WaitMovement - ScrCmd_065 4 + RemoveObject 4 ApplyMovement 2, _0408 WaitMovement CallIfEq 0x8006, 0, _03E1 diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index 4d35b67ea7..402a5f7f57 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -83,7 +83,7 @@ _00FB: CloseMessage ApplyMovement 2, _01F0 WaitMovement - ScrCmd_065 2 + RemoveObject 2 SetVar 0x400B, 1 Call _016C SetFlag 0xAA2 diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index 6f71c94831..3fe7b8168f 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -162,7 +162,7 @@ _0184: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 13 + RemoveObject 13 SetVar 0x40C8, 1 SetVar 0x404E, 0xFF FadeScreen 6, 1, 0, 0 diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index 0e5c147bb9..283ad6dcda 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -204,7 +204,7 @@ _037B: CloseMessage ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _03F3 @@ -236,7 +236,7 @@ _0403: CloseMessage ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _0740 @@ -299,7 +299,7 @@ _0541: CloseMessage ScrCmd_2E7 0x8000, 0x8001 ScrCmd_2E8 0x8002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8002, 4, _05DD @@ -355,23 +355,23 @@ _0613: End _067F: - ScrCmd_065 0 + RemoveObject 0 Return _0685: - ScrCmd_065 2 + RemoveObject 2 Return _068B: - ScrCmd_065 3 + RemoveObject 3 Return _0691: - ScrCmd_065 1 + RemoveObject 1 Return _0697: - ScrCmd_065 4 + RemoveObject 4 Return _069D: @@ -542,7 +542,7 @@ _081E: ApplyMovement 6, _0900 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 6 + RemoveObject 6 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x411B, 2 ReleaseAll diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index 66b99259ca..6f0fc94472 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -277,20 +277,20 @@ _042E: FadeScreen 6, 1, 0, 0 WaitFadeScreen SetFlag 0x17D - ScrCmd_065 12 - ScrCmd_0B4 - ScrCmd_0B5 - ScrCmd_0A1 + RemoveObject 12 + StartChooseStarterScene + SaveChosenStarter + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen - ScrCmd_0DE 0x8000 - ScrCmd_096 0x8000, 5, 0, 0x800C + GetPlayerStarterSpecies 0x8000 + GivePokemon 0x8000, 5, 0, 0x800C ApplyMovement 5, _07F8 ApplyMovement 2, _0760 ApplyMovement 0xFF, _0884 WaitMovement BufferRivalName 0 - ScrCmd_0DC 2 + BufferRivalStarterSpeciesName 2 Message 36 Message 37 Message 38 @@ -300,7 +300,7 @@ _042E: ApplyMovement 0xFF, _089C WaitMovement SetFlag 0x178 - ScrCmd_065 5 + RemoveObject 5 GetPlayerGender 0x800C GoToIfEq 0x800C, 0, _04CA GoTo _04EE @@ -333,7 +333,7 @@ _0512: ApplyMovement 6, _08E0 WaitMovement SetFlag 0x179 - ScrCmd_065 6 + RemoveObject 6 BufferRivalName 0 Message 43 CloseMessage @@ -358,7 +358,7 @@ _057A: Message 47 CloseMessage ScrCmd_06D 2, 15 - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _05BB GoToIfEq 0x800C, 0x186, _05C5 GoTo _05B1 @@ -387,7 +387,7 @@ _05CF: End _05F5: - ScrCmd_0A1 + ReturnToField ScrCmd_062 2 FadeScreen 6, 3, 1, 0 WaitFadeScreen @@ -1019,7 +1019,7 @@ _0BBB: _0BF5: BufferCounterpartName 0 ScrCmd_0DB 1 - ScrCmd_0DC 2 + BufferRivalStarterSpeciesName 2 ApplyMovement 5, _0D70 WaitMovement GoToIfEq 0x8005, 0x355, _0C3E @@ -1071,8 +1071,8 @@ _0CE1: GoTo _0CF1 _0CF1: - ScrCmd_065 6 - ScrCmd_065 5 + RemoveObject 6 + RemoveObject 5 SetVar 0x4086, 3 ScrCmd_06C 254, 0 ClearHasPartner diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index 3071f26c01..e39495ea43 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -171,7 +171,7 @@ _0262: CloseMessage ApplyMovement 3, _0498 WaitMovement - ScrCmd_065 3 + RemoveObject 3 SetVar 0x4087, 1 ReleaseAll End @@ -457,7 +457,7 @@ _0635: Return _0641: - ScrCmd_065 3 + RemoveObject 3 ClearFlag 0x177 SetVar 0x4087, 3 ReleaseAll diff --git a/res/field/scripts/scripts_route_203.s b/res/field/scripts/scripts_route_203.s index 6a25e9cb65..9b947c0348 100644 --- a/res/field/scripts/scripts_route_203.s +++ b/res/field/scripts/scripts_route_203.s @@ -90,7 +90,7 @@ _0111: BufferPlayerName 1 Message 0 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _014C GoToIfEq 0x800C, 0x186, _0158 GoTo _0140 @@ -141,7 +141,7 @@ _01E9: GoTo _01F9 _01F9: - ScrCmd_065 5 + RemoveObject 5 SetVar 0x4088, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_route_207.s b/res/field/scripts/scripts_route_207.s index 1a19fbdb15..c9c331053b 100644 --- a/res/field/scripts/scripts_route_207.s +++ b/res/field/scripts/scripts_route_207.s @@ -99,7 +99,7 @@ _0156: CloseMessage ApplyMovement 18, _01A8 WaitMovement - ScrCmd_065 18 + RemoveObject 18 CallCommonScript 0x7F9 SetVar 0x408C, 1 ReleaseAll diff --git a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s index aa5850bd61..0f635b2627 100644 --- a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s @@ -32,7 +32,7 @@ _001D: BufferPlayerName 1 Message 1 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _00B3 GoToIfEq 0x800C, 0x186, _00C1 GoTo _00A5 @@ -67,7 +67,7 @@ _00CF: CallIfEq 0x8005, 8, _01AE CallIfEq 0x8005, 9, _01BA PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x407B, 2 ReleaseAll diff --git a/res/field/scripts/scripts_route_210_grandma_wilma_house.s b/res/field/scripts/scripts_route_210_grandma_wilma_house.s index 98b1775013..a726f1ae06 100644 --- a/res/field/scripts/scripts_route_210_grandma_wilma_house.s +++ b/res/field/scripts/scripts_route_210_grandma_wilma_house.s @@ -96,7 +96,7 @@ _010F: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _005B @@ -116,7 +116,7 @@ _019B: WaitFadeScreen ScrCmd_224 0x8000, 0x1B2 ScrCmd_225 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _005B diff --git a/res/field/scripts/scripts_route_210_south.s b/res/field/scripts/scripts_route_210_south.s index 45433bc73f..01bfd4644d 100644 --- a/res/field/scripts/scripts_route_210_south.s +++ b/res/field/scripts/scripts_route_210_south.s @@ -72,10 +72,10 @@ _00CA: ApplyMovement 26, _0280 ApplyMovement 19, _02B4 WaitMovement - ScrCmd_065 27 - ScrCmd_065 28 - ScrCmd_065 26 - ScrCmd_065 19 + RemoveObject 27 + RemoveObject 28 + RemoveObject 26 + RemoveObject 19 WaitTime 45, 0x800C GetPlayerMapPos 0x8004, 0x8005 GoToIfEq 0x8004, 0x230, _015B @@ -135,7 +135,7 @@ _0230: GoTo _0240 _0240: - ScrCmd_065 20 + RemoveObject 20 SetFlag 0x107 ReleaseAll End diff --git a/res/field/scripts/scripts_route_212_house.s b/res/field/scripts/scripts_route_212_house.s index 071ff0e7dd..1457ccca78 100644 --- a/res/field/scripts/scripts_route_212_house.s +++ b/res/field/scripts/scripts_route_212_house.s @@ -60,7 +60,7 @@ _007E: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _0264 @@ -92,7 +92,7 @@ _012F: CloseMessage ScrCmd_2E7 0x8000, 0x8003 ScrCmd_2E8 0x8002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8002, 4, _01E9 diff --git a/res/field/scripts/scripts_route_213.s b/res/field/scripts/scripts_route_213.s index c374fb1f3a..8c8b3f9407 100644 --- a/res/field/scripts/scripts_route_213.s +++ b/res/field/scripts/scripts_route_213.s @@ -76,7 +76,7 @@ _00F1: _010B: SetFlag 0x118 - ScrCmd_065 30 + RemoveObject 30 ScrCmd_186 30, 0x2AB, 0x341 ScrCmd_189 30, 3 ScrCmd_188 30, 17 @@ -114,7 +114,7 @@ _0180: End _019A: - ScrCmd_065 30 + RemoveObject 30 SetFlag 0x104 ClearFlag 0x1E8 ScrCmd_064 33 @@ -135,7 +135,7 @@ _019A: CallIfEq 0x8004, 3, _02CB CallIfEq 0x8004, 0, _02DF CallIfEq 0x8004, 1, _02F3 - ScrCmd_065 33 + RemoveObject 33 CallCommonScript 0x808 ScrCmd_315 0x800C CallIfEq 0x800C, 2, _0261 diff --git a/res/field/scripts/scripts_route_217.s b/res/field/scripts/scripts_route_217.s index a78d3b79e6..8d18e955fc 100644 --- a/res/field/scripts/scripts_route_217.s +++ b/res/field/scripts/scripts_route_217.s @@ -55,7 +55,7 @@ _004D: GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8004, 0x12E, _00E2 CallIfEq 0x8004, 0x12F, _00F6 - ScrCmd_065 15 + RemoveObject 15 SetVar 0x40A8, 1 SetFlag 0x298 ReleaseAll diff --git a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s index 018139f759..15fbc4b7cf 100644 --- a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s +++ b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s @@ -34,7 +34,7 @@ _0047: Call _00E8 PlayFanfare SEQ_SE_DP_KAIDAN2 SetFlag 0x21C - ScrCmd_065 1 + RemoveObject 1 SetVar 0x4105, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_route_222_east_house.s b/res/field/scripts/scripts_route_222_east_house.s index 692d14b527..930aae9b46 100644 --- a/res/field/scripts/scripts_route_222_east_house.s +++ b/res/field/scripts/scripts_route_222_east_house.s @@ -23,7 +23,7 @@ _0010: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8002, 0xFF, _011E diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index 12b6fdf84c..9525470745 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -201,7 +201,7 @@ _02B8: ApplyMovement 16, _0448 WaitMovement SetFlag 0x25C - ScrCmd_065 16 + RemoveObject 16 ScrCmd_04C 0x1EC, 0 ScrCmd_04D ApplyMovement 3, _03C0 diff --git a/res/field/scripts/scripts_route_226_house.s b/res/field/scripts/scripts_route_226_house.s index d85cb9f622..229fc18da1 100644 --- a/res/field/scripts/scripts_route_226_house.s +++ b/res/field/scripts/scripts_route_226_house.s @@ -39,7 +39,7 @@ _0060: WaitFadeScreen ScrCmd_2A5 ScrCmd_193 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _00D1 diff --git a/res/field/scripts/scripts_route_227.s b/res/field/scripts/scripts_route_227.s index 555a4c1256..a329ca07ba 100644 --- a/res/field/scripts/scripts_route_227.s +++ b/res/field/scripts/scripts_route_227.s @@ -40,7 +40,7 @@ _0012: ApplyMovement 0xFF, _012C ApplyMovement 3, _0168 WaitMovement - ScrCmd_065 4 + RemoveObject 4 ApplyMovement 3, _0170 ApplyMovement 0xFF, _0108 WaitMovement @@ -52,7 +52,7 @@ _0012: ApplyMovement 3, _0178 ApplyMovement 0xFF, _0118 WaitMovement - ScrCmd_065 3 + RemoveObject 3 SetVar 0x408B, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_route_228_north_house.s b/res/field/scripts/scripts_route_228_north_house.s index fa6b15b5c8..d4b0d93fad 100644 --- a/res/field/scripts/scripts_route_228_north_house.s +++ b/res/field/scripts/scripts_route_228_north_house.s @@ -31,7 +31,7 @@ _0055: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _028F @@ -76,7 +76,7 @@ _015E: WaitFadeScreen ScrCmd_224 0x8000, 0x8003 ScrCmd_225 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _028F diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index baf415e6fe..3992226fc3 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -185,7 +185,7 @@ _02B5: ApplyMovement 4, _0470 ApplyMovement 3, _056C WaitMovement - ScrCmd_065 3 + RemoveObject 3 CallCommonScript 0x7FB GetPlayerGender 0x800C GoToIfEq 0x800C, 0, _0344 @@ -211,7 +211,7 @@ _035E: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 4 + RemoveObject 4 SetVar 0x4071, 1 FadeScreen 6, 1, 0, 0 WaitFadeScreen @@ -474,7 +474,7 @@ _057C: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 14 + RemoveObject 14 WaitTime 30, 0x800C GetPlayerGender 0x800C GoToIfEq 0x800C, 0, _0610 @@ -585,7 +585,7 @@ _0772: ApplyMovement 0xFF, _07E4 WaitMovement CallCommonScript 0x801 - ScrCmd_065 4 + RemoveObject 4 SetVar 0x4071, 2 ReleaseAll End diff --git a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s index 038637157e..e4e28b7be4 100644 --- a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s @@ -297,7 +297,7 @@ _042B: _043C: BufferPlayerName 0 - ScrCmd_0DC 1 + BufferRivalStarterSpeciesName 1 Message 20 GoTo _044D End @@ -307,7 +307,7 @@ _044D: ApplyMovement 0xFF, _04C4 ApplyMovement 3, _04D8 WaitMovement - ScrCmd_065 3 + RemoveObject 3 ClearFlag 0x177 SetVar 0x40A6, 1 ReleaseAll @@ -591,7 +591,7 @@ _0677: CloseMessage ApplyMovement 4, _0898 WaitMovement - ScrCmd_065 4 + RemoveObject 4 Message 42 CloseMessage WaitTime 15, 0x800C diff --git a/res/field/scripts/scripts_snowpoint_city.s b/res/field/scripts/scripts_snowpoint_city.s index 46713d7ba5..9673a8c2a0 100644 --- a/res/field/scripts/scripts_snowpoint_city.s +++ b/res/field/scripts/scripts_snowpoint_city.s @@ -271,7 +271,7 @@ _02A0: CloseMessage ApplyMovement 10, _0348 WaitMovement - ScrCmd_065 10 + RemoveObject 10 ApplyMovement 0xFF, _0318 WaitMovement SetFlag 0x157 diff --git a/res/field/scripts/scripts_snowpoint_city_east_house.s b/res/field/scripts/scripts_snowpoint_city_east_house.s index 7b44c3667a..7a317d9eaf 100644 --- a/res/field/scripts/scripts_snowpoint_city_east_house.s +++ b/res/field/scripts/scripts_snowpoint_city_east_house.s @@ -64,7 +64,7 @@ _00B0: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _0296 @@ -96,7 +96,7 @@ _0161: CloseMessage ScrCmd_2E7 0x8000, 0x8003 ScrCmd_2E8 0x8002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8002, 4, _021B diff --git a/res/field/scripts/scripts_snowpoint_city_west_house.s b/res/field/scripts/scripts_snowpoint_city_west_house.s index 736d280e09..cf726573a5 100644 --- a/res/field/scripts/scripts_snowpoint_city_west_house.s +++ b/res/field/scripts/scripts_snowpoint_city_west_house.s @@ -41,7 +41,7 @@ _0060: WaitFadeScreen ScrCmd_2A5 ScrCmd_193 0x800C - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0xFF, _00D1 diff --git a/res/field/scripts/scripts_snowpoint_temple_b5f.s b/res/field/scripts/scripts_snowpoint_temple_b5f.s index 9088193aa4..10048ee05a 100644 --- a/res/field/scripts/scripts_snowpoint_temple_b5f.s +++ b/res/field/scripts/scripts_snowpoint_temple_b5f.s @@ -13,7 +13,7 @@ _000A: _0017: SetFlag 0x243 - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 End diff --git a/res/field/scripts/scripts_solaceon_town.s b/res/field/scripts/scripts_solaceon_town.s index d737e5189c..51509dc481 100644 --- a/res/field/scripts/scripts_solaceon_town.s +++ b/res/field/scripts/scripts_solaceon_town.s @@ -168,7 +168,7 @@ _0168: CloseMessage ApplyMovement 18, _0210 WaitMovement - ScrCmd_065 18 + RemoveObject 18 CallCommonScript 0x7FB SetVar 0x4073, 1 ReleaseAll diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index 4dd3bd0b46..d82875c2b6 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -232,7 +232,7 @@ _0249: ScrCmd_18C 0xFF, 1 ApplyMovement 5, _0500 WaitMovement - ScrCmd_065 5 + RemoveObject 5 SetVar 0x4098, 2 GoTo _0508 End @@ -336,7 +336,7 @@ _041C: EndMovement _0424: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x26C GoToIfEq 0x800C, 0x186, _0454 SetVar 0x8004, 0x26B diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index fbe97e63d6..4f5f755f4e 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -38,7 +38,7 @@ _0022: _0088: ScrCmd_20D 6, 0x800C GoToIfEq 0x800C, 0, _0088 - ScrCmd_065 1 + RemoveObject 1 ApplyMovement 241, _0178 WaitMovement ScrCmd_067 @@ -67,7 +67,7 @@ _00FD: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_320 - ScrCmd_0A1 + ReturnToField ScrCmd_328 1 Warp MAP_HEADER_DISTORTION_WORLD_1F, 0, 55, 40, 1 FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_stark_mountain_outside.s b/res/field/scripts/scripts_stark_mountain_outside.s index cc6191879f..bc6987cf23 100644 --- a/res/field/scripts/scripts_stark_mountain_outside.s +++ b/res/field/scripts/scripts_stark_mountain_outside.s @@ -43,8 +43,8 @@ _002F: ApplyMovement 7, _0108 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 6 - ScrCmd_065 7 + RemoveObject 6 + RemoveObject 7 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x40A0, 1 ReleaseAll @@ -137,7 +137,7 @@ _0118: ApplyMovement 5, _0214 ApplyMovement 0xFF, _0238 WaitMovement - ScrCmd_065 5 + RemoveObject 5 ApplyMovement 4, _01E8 ApplyMovement 0xFF, _0240 WaitMovement @@ -146,7 +146,7 @@ _0118: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 4 + RemoveObject 4 FadeScreen 6, 1, 1, 0 WaitFadeScreen SetVar 0x40A0, 3 diff --git a/res/field/scripts/scripts_stark_mountain_room_1.s b/res/field/scripts/scripts_stark_mountain_room_1.s index 82c598b02d..a1d962b8bd 100644 --- a/res/field/scripts/scripts_stark_mountain_room_1.s +++ b/res/field/scripts/scripts_stark_mountain_room_1.s @@ -74,11 +74,11 @@ _0014: ApplyMovement 15, _0210 ApplyMovement 16, _021C WaitMovement - ScrCmd_065 14 - ScrCmd_065 0 - ScrCmd_065 4 - ScrCmd_065 15 - ScrCmd_065 16 + RemoveObject 14 + RemoveObject 0 + RemoveObject 4 + RemoveObject 15 + RemoveObject 16 SetVar 0x40AD, 1 ReleaseAll End diff --git a/res/field/scripts/scripts_stark_mountain_room_2.s b/res/field/scripts/scripts_stark_mountain_room_2.s index 60ed7e25e9..c3b3a5d004 100644 --- a/res/field/scripts/scripts_stark_mountain_room_2.s +++ b/res/field/scripts/scripts_stark_mountain_room_2.s @@ -162,7 +162,7 @@ _01AB: WaitMovement WaitFanfare SEQ_SE_CONFIRM PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 14 + RemoveObject 14 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x4094, 2 ReleaseAll diff --git a/res/field/scripts/scripts_stark_mountain_room_3.s b/res/field/scripts/scripts_stark_mountain_room_3.s index 52d4a84414..5fa26627c5 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -41,7 +41,7 @@ _0089: _0096: SetFlag 0x1DD - ScrCmd_065 1 + RemoveObject 1 ClearFlag 142 End @@ -192,7 +192,7 @@ _019C: CloseMessage ApplyMovement 5, _03B0 WaitMovement - ScrCmd_065 3 + RemoveObject 3 Message 2 Message 3 ScrCmd_04C 0x1C5, 0 @@ -211,8 +211,8 @@ _019C: WaitTime 15, 0x800C Message 5 CloseMessage - ScrCmd_065 0 - ScrCmd_065 6 + RemoveObject 0 + RemoveObject 6 ClearFlag 0x231 ScrCmd_064 4 CallCommonScript 0x807 @@ -262,9 +262,9 @@ _019C: ApplyMovement 7, _04E0 ApplyMovement 8, _0510 WaitMovement - ScrCmd_065 5 - ScrCmd_065 7 - ScrCmd_065 8 + RemoveObject 5 + RemoveObject 7 + RemoveObject 8 BufferPlayerName 0 Message 14 CloseMessage diff --git a/res/field/scripts/scripts_sunyshore_city.s b/res/field/scripts/scripts_sunyshore_city.s index 54c7c55d35..7214527578 100644 --- a/res/field/scripts/scripts_sunyshore_city.s +++ b/res/field/scripts/scripts_sunyshore_city.s @@ -110,7 +110,7 @@ _017C: CallIfEq 0x8004, 0x357, _0322 CallIfEq 0x8004, 0x358, _032E CallIfEq 0x8004, 0x359, _0342 - ScrCmd_065 20 + RemoveObject 20 CallIfEq 0x8004, 0x355, _0356 CallIfEq 0x8004, 0x356, _0362 CallIfEq 0x8004, 0x357, _036E @@ -476,7 +476,7 @@ _05D7: WaitTime 15, 0x800C ApplyMovement 18, _0678 WaitMovement - ScrCmd_065 18 + RemoveObject 18 WaitTime 1, 0x800C ScrCmd_186 18, 0x34D, 0x2EC ScrCmd_188 18, 15 @@ -724,7 +724,7 @@ _08D6: GoTo _08EE _08EE: - ScrCmd_065 18 + RemoveObject 18 ReleaseAll End diff --git a/res/field/scripts/scripts_sunyshore_city_northeast_house.s b/res/field/scripts/scripts_sunyshore_city_northeast_house.s index 3d30d1ead8..39ae323d59 100644 --- a/res/field/scripts/scripts_sunyshore_city_northeast_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northeast_house.s @@ -117,7 +117,7 @@ _019E: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA @@ -135,7 +135,7 @@ _01F2: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA @@ -153,7 +153,7 @@ _0246: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA @@ -171,7 +171,7 @@ _029A: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA @@ -189,7 +189,7 @@ _02EE: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA @@ -207,7 +207,7 @@ _0342: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA @@ -225,7 +225,7 @@ _0396: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_243 0, 0x800C, 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _03EA diff --git a/res/field/scripts/scripts_survival_area.s b/res/field/scripts/scripts_survival_area.s index f0b4d6303e..cbd64c22ed 100644 --- a/res/field/scripts/scripts_survival_area.s +++ b/res/field/scripts/scripts_survival_area.s @@ -105,7 +105,7 @@ _00D5: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 8 + RemoveObject 8 ReleaseAll End @@ -171,7 +171,7 @@ _01BE: BufferPlayerName 1 Message 2 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _0236 GoToIfEq 0x800C, 0x186, _0272 GoTo _01FA diff --git a/res/field/scripts/scripts_survival_area_north_house.s b/res/field/scripts/scripts_survival_area_north_house.s index 87795487d6..e9b3cdbecf 100644 --- a/res/field/scripts/scripts_survival_area_north_house.s +++ b/res/field/scripts/scripts_survival_area_north_house.s @@ -35,7 +35,7 @@ _004C: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _0232 @@ -67,7 +67,7 @@ _00FD: CloseMessage ScrCmd_2E7 0x8000, 0x8003 ScrCmd_2E8 0x8002 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8002, 4, _01B7 diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s index 20f7518d8f..b9aca430b1 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s @@ -68,7 +68,7 @@ _006A: ScrCmd_188 5, 16 ScrCmd_189 5, 2 ScrCmd_064 5 - ScrCmd_065 4 + RemoveObject 4 SetFlag 113 SetVar 0x411D, 1 WaitTime 30, 0x800C @@ -80,7 +80,7 @@ _006A: ScrCmd_188 4, 16 ScrCmd_189 4, 2 ScrCmd_064 4 - ScrCmd_065 5 + RemoveObject 5 CloseMessage ReleaseAll End @@ -127,7 +127,7 @@ _0134: PlayFanfare SEQ_SE_DP_W062 FadeScreen 6, 1, 0, 0x7FFF WaitFadeScreen - ScrCmd_065 6 + RemoveObject 6 WaitFanfare SEQ_SE_DP_W062 FadeScreen 6, 1, 1, 0x7FFF WaitFadeScreen diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s index f25c6b0100..712f6c05d1 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s @@ -35,7 +35,7 @@ _0022: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 0 + RemoveObject 0 FadeScreen 6, 1, 1, 0 WaitFadeScreen WaitTime 15, 0x800C @@ -76,9 +76,9 @@ _00E2: ClearFlag 0x192 ClearFlag 0x200 ClearFlag 0x1FE - ScrCmd_065 2 - ScrCmd_065 1 - ScrCmd_065 3 + RemoveObject 2 + RemoveObject 1 + RemoveObject 3 SetVar 0x407A, 3 FadeScreen 6, 1, 1, 0 WaitFadeScreen diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index 4d11811761..038f7190ff 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -68,7 +68,7 @@ _00D8: _00F2: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 WaitFanfare SEQ_SE_DP_KAIDAN2 SetVar 0x40E7, 1 SetFlag 241 @@ -169,7 +169,7 @@ _01A6: _01E7: Message 10 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _0220 GoToIfEq 0x800C, 0x186, _022E GoTo _0212 @@ -263,7 +263,7 @@ _02E4: _031A: Message 16 CloseMessage - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C GoToIfEq 0x800C, 0x183, _0353 GoToIfEq 0x800C, 0x186, _0361 GoTo _0345 diff --git a/res/field/scripts/scripts_turnback_cave_giratina_room.s b/res/field/scripts/scripts_turnback_cave_giratina_room.s index 36671f9325..ad09889421 100644 --- a/res/field/scripts/scripts_turnback_cave_giratina_room.s +++ b/res/field/scripts/scripts_turnback_cave_giratina_room.s @@ -20,7 +20,7 @@ _001C: _0029: SetFlag 0x250 - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 End @@ -72,7 +72,7 @@ _00CB: GoToIfEq 0x800C, 0, _010C CallCommonScript 0x7E0 CloseMessage - ScrCmd_065 1 + RemoveObject 1 ReleaseAll End diff --git a/res/field/scripts/scripts_twinleaf_town.s b/res/field/scripts/scripts_twinleaf_town.s index 9fdf719e24..f56787c560 100644 --- a/res/field/scripts/scripts_twinleaf_town.s +++ b/res/field/scripts/scripts_twinleaf_town.s @@ -418,7 +418,7 @@ _04D0: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 2 + RemoveObject 2 CallCommonScript 0x7FB SetVar 0x4070, 1 SetVar 0x40E6, 1 diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s index e78d0cf2b7..2104257894 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s @@ -454,7 +454,7 @@ _065C: _0676: PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 SetVar 0x40A4, 6 ReleaseAll End diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s index 1f758e48b3..a70ff3d368 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s @@ -135,7 +135,7 @@ _00E0: CallIfEq 0x4000, 2, _0369 CallIfEq 0x4000, 3, _037D PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 0 + RemoveObject 0 CallCommonScript 0x7FB WaitFanfare SEQ_SE_DP_KAIDAN2 SetFlag 0x173 diff --git a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s index 05b5b6921e..8ca3be75c2 100644 --- a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s @@ -23,7 +23,7 @@ _000E: ApplyMovement 0xFF, _0080 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 0 + RemoveObject 0 CallCommonScript 0x7FB SetFlag 234 SetVar 0x40A3, 1 diff --git a/res/field/scripts/scripts_underground.s b/res/field/scripts/scripts_underground.s index ba11794bb4..24a32b14ef 100644 --- a/res/field/scripts/scripts_underground.s +++ b/res/field/scripts/scripts_underground.s @@ -180,7 +180,7 @@ _0289: PlayFanfare SEQ_SE_DP_PYUU2 ApplyMovement 16, _02F0 WaitMovement - ScrCmd_065 16 + RemoveObject 16 SetVar 0x40D0, 1 SetFlag 0x992 End diff --git a/res/field/scripts/scripts_union_room.s b/res/field/scripts/scripts_union_room.s index 764c527a64..c1117332ed 100644 --- a/res/field/scripts/scripts_union_room.s +++ b/res/field/scripts/scripts_union_room.s @@ -100,7 +100,7 @@ _019F: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AD - ScrCmd_0A1 + ReturnToField Call _0BB2 MessageInstant 16 GoTo _00D0 @@ -125,7 +125,7 @@ _0219: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AE - ScrCmd_0A1 + ReturnToField Call _0BB2 GoTo _00D0 End @@ -155,7 +155,7 @@ _02A4: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_192 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen Message 202 @@ -191,7 +191,7 @@ _0351: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AC - ScrCmd_0A1 + ReturnToField Call _0BB2 GoTo _0476 End @@ -212,7 +212,7 @@ _03B1: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AF - ScrCmd_0A1 + ReturnToField Call _0BB2 GoTo _0476 End @@ -237,7 +237,7 @@ _0433: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_2C6 - ScrCmd_0A1 + ReturnToField Call _0BB2 GoTo _0476 End @@ -294,7 +294,7 @@ _04AD: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AC - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 GoTo _0476 End @@ -325,7 +325,7 @@ _053A: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AF - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 GoTo _0476 End @@ -351,7 +351,7 @@ _05AF: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_2C6 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 GoTo _0476 End @@ -543,7 +543,7 @@ _0853: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AD - ScrCmd_0A1 + ReturnToField Call _0BB2 GoTo _07D4 End @@ -572,7 +572,7 @@ _08C7: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AE - ScrCmd_0A1 + ReturnToField ScrCmd_139 11 Call _0BB2 GoTo _07D4 @@ -608,7 +608,7 @@ _095C: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_192 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen Message 202 @@ -651,7 +651,7 @@ _0A28: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AF - ScrCmd_0A1 + ReturnToField Call _0BB2 ReleaseAll End @@ -674,7 +674,7 @@ _0A82: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_2C6 - ScrCmd_0A1 + ReturnToField Call _0BB2 ReleaseAll End @@ -695,7 +695,7 @@ _0AED: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AC - ScrCmd_0A1 + ReturnToField Call _0BB2 ReleaseAll End diff --git a/res/field/scripts/scripts_unk_0001.s b/res/field/scripts/scripts_unk_0001.s index fd84c3000a..0f7e6ed7f2 100644 --- a/res/field/scripts/scripts_unk_0001.s +++ b/res/field/scripts/scripts_unk_0001.s @@ -92,7 +92,7 @@ _00AE: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_0AA - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_unk_0211.s b/res/field/scripts/scripts_unk_0211.s index 06570b132d..b7ae37791a 100644 --- a/res/field/scripts/scripts_unk_0211.s +++ b/res/field/scripts/scripts_unk_0211.s @@ -1007,35 +1007,35 @@ _0DC2: CloseMessage Call _0F94 ScrCmd_0AB 0 - ScrCmd_0A1 + ReturnToField GoTo _0E21 _0DD5: CloseMessage Call _0F94 ScrCmd_0AB 1 - ScrCmd_0A1 + ReturnToField GoTo _0E21 _0DE8: CloseMessage Call _0F94 ScrCmd_0AB 2 - ScrCmd_0A1 + ReturnToField GoTo _0E21 _0DFB: CloseMessage Call _0F94 ScrCmd_0AB 3 - ScrCmd_0A1 + ReturnToField GoTo _0E21 _0E0E: CloseMessage Call _0F94 ScrCmd_0AB 4 - ScrCmd_0A1 + ReturnToField GoTo _0E21 _0E21: @@ -1115,7 +1115,7 @@ _0F2C: GoToIfEq 0x800C, 1, _0F59 Call _0F94 ScrCmd_0B1 - ScrCmd_0A1 + ReturnToField Call _0F80 GoTo _0C1C @@ -1375,7 +1375,7 @@ _1282: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_205 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReleaseAll @@ -1653,14 +1653,14 @@ _15E7: SetVar 0x8004, 0x800C ScrCmd_2F6 0x8005, 0x8004, 0x800C GoToIfEq 0x800C, 0, _1624 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReturnCommonScript End _1624: - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ReturnCommonScript diff --git a/res/field/scripts/scripts_unk_0212.s b/res/field/scripts/scripts_unk_0212.s index 63b7c36083..053f96c7ec 100644 --- a/res/field/scripts/scripts_unk_0212.s +++ b/res/field/scripts/scripts_unk_0212.s @@ -416,7 +416,7 @@ _0596: GoTo _0596 _05C1: - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4002, 0xFF, _05E4 @@ -873,19 +873,19 @@ _0D3A: Return _0D86: - ScrCmd_065 1 + RemoveObject 1 Return _0D8C: - ScrCmd_065 2 + RemoveObject 2 Return _0D92: - ScrCmd_065 3 + RemoveObject 3 Return _0D98: - ScrCmd_065 4 + RemoveObject 4 Return .balign 4, 0 @@ -1320,7 +1320,7 @@ _111B: GoTo _111B _1146: - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4002, 0xFF, _10F4 diff --git a/res/field/scripts/scripts_unk_0213.s b/res/field/scripts/scripts_unk_0213.s index 0b6efa6f12..4a6bf39fdd 100644 --- a/res/field/scripts/scripts_unk_0213.s +++ b/res/field/scripts/scripts_unk_0213.s @@ -514,7 +514,7 @@ _069E: _06A0: ScrCmd_1F8 ScrCmd_0A3 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen End @@ -552,7 +552,7 @@ _0724: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_12B - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoTo _074A diff --git a/res/field/scripts/scripts_unk_0404.s b/res/field/scripts/scripts_unk_0404.s index 425967b731..3f25956c4b 100644 --- a/res/field/scripts/scripts_unk_0404.s +++ b/res/field/scripts/scripts_unk_0404.s @@ -2314,7 +2314,7 @@ _1EEA: _1EF0: CallCommonScript 0x7D1 - ScrCmd_065 0x800D + RemoveObject 0x800D AddItem 0x8004, 0x8005, 0x800C ScrCmd_2A2 0x8004 CallIfEq 0x8004, 0x1CF, _20C0 diff --git a/res/field/scripts/scripts_unk_0409.s b/res/field/scripts/scripts_unk_0409.s index bcc3f5a791..1281ac89cd 100644 --- a/res/field/scripts/scripts_unk_0409.s +++ b/res/field/scripts/scripts_unk_0409.s @@ -54,7 +54,7 @@ _00AE: ScrCmd_0C5 0x8004 ScrCmd_29E 0, 0x8005 WaitTime 7, 0x800C - ScrCmd_065 0x800D + RemoveObject 0x800D ScrCmd_201 0x8004 CreateJournalEvent LOCATION_EVENT_USED_CUT, 0x8004, 0, 0, 0 _00E8: @@ -71,7 +71,7 @@ _0103: ScrCmd_0C5 0x8000 ScrCmd_29E 0, 0x8005 WaitTime 7, 0x800C - ScrCmd_065 0x800D + RemoveObject 0x800D ScrCmd_201 0x8004 CreateJournalEvent LOCATION_EVENT_USED_CUT, 0x8004, 0, 0, 0 _0133: @@ -155,7 +155,7 @@ _0284: ScrCmd_0C5 0x8004 ScrCmd_29E 1, 0x8005 WaitTime 10, 0x800C - ScrCmd_065 0x800D + RemoveObject 0x800D ScrCmd_201 0x8004 CreateJournalEvent LOCATION_EVENT_USED_ROCK_SMASH, 0x8004, 0, 0, 0 _02B2: @@ -172,7 +172,7 @@ _02CD: ScrCmd_0C5 0x8000 ScrCmd_29E 1, 0x8005 WaitTime 10, 0x800C - ScrCmd_065 0x800D + RemoveObject 0x800D ScrCmd_201 0x8004 CreateJournalEvent LOCATION_EVENT_USED_ROCK_SMASH, 0x8004, 0, 0, 0 _02FD: diff --git a/res/field/scripts/scripts_unk_0413.s b/res/field/scripts/scripts_unk_0413.s index ebdb3c2269..1db8bc2427 100644 --- a/res/field/scripts/scripts_unk_0413.s +++ b/res/field/scripts/scripts_unk_0413.s @@ -238,7 +238,7 @@ _042D: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_178 0 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_179 0x8005 @@ -274,7 +274,7 @@ _04EE: FadeScreen 6, 1, 0, 0 WaitFadeScreen ScrCmd_178 1 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_179 0x800C diff --git a/res/field/scripts/scripts_unk_0422.s b/res/field/scripts/scripts_unk_0422.s index 134dfa56f3..46d5868acf 100644 --- a/res/field/scripts/scripts_unk_0422.s +++ b/res/field/scripts/scripts_unk_0422.s @@ -75,7 +75,7 @@ _00BA: _00CA: BufferRivalName 0 - ScrCmd_0DC 1 + BufferRivalStarterSpeciesName 1 Message 4 WaitABXPadPress GoTo _00ED diff --git a/res/field/scripts/scripts_unk_0423.s b/res/field/scripts/scripts_unk_0423.s index 5fcbac5d9e..bada303bc0 100644 --- a/res/field/scripts/scripts_unk_0423.s +++ b/res/field/scripts/scripts_unk_0423.s @@ -234,7 +234,7 @@ _0333: _035A: ScrCmd_0A3 _035C: - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen ScrCmd_168 0, 0, 8, 2, 77 diff --git a/res/field/scripts/scripts_unk_0426.s b/res/field/scripts/scripts_unk_0426.s index 14272f435b..d823cea17d 100644 --- a/res/field/scripts/scripts_unk_0426.s +++ b/res/field/scripts/scripts_unk_0426.s @@ -51,7 +51,7 @@ _0085: Return _0097: - ScrCmd_0A1 + ReturnToField PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer diff --git a/res/field/scripts/scripts_unk_0499.s b/res/field/scripts/scripts_unk_0499.s index cd37ec57b6..6130dbb67e 100644 --- a/res/field/scripts/scripts_unk_0499.s +++ b/res/field/scripts/scripts_unk_0499.s @@ -57,7 +57,7 @@ _0085: ScrCmd_2E4 1, 0x4002, 0x4003 ScrCmd_2E4 2, 0x4004, 0x4005 ScrCmd_2E3 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen SetVar 0x8000, 0 diff --git a/res/field/scripts/scripts_unk_0500.s b/res/field/scripts/scripts_unk_0500.s index c3663468f5..43d802cbde 100644 --- a/res/field/scripts/scripts_unk_0500.s +++ b/res/field/scripts/scripts_unk_0500.s @@ -194,7 +194,7 @@ _032B: _0341: ScrCmd_2C8 0x8001, 0x8000, 0x8003 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen Return diff --git a/res/field/scripts/scripts_unk_0501.s b/res/field/scripts/scripts_unk_0501.s index 1c423a87aa..73dc861cb7 100644 --- a/res/field/scripts/scripts_unk_0501.s +++ b/res/field/scripts/scripts_unk_0501.s @@ -136,7 +136,7 @@ _01B9: GoTo _01B9 _01DE: - ScrCmd_0A1 + ReturnToField ScrCmd_072 20, 2 FadeScreen 6, 1, 1, 0 WaitFadeScreen diff --git a/res/field/scripts/scripts_unk_1051.s b/res/field/scripts/scripts_unk_1051.s index cde2f01215..6e4ad7a796 100644 --- a/res/field/scripts/scripts_unk_1051.s +++ b/res/field/scripts/scripts_unk_1051.s @@ -145,7 +145,7 @@ _029F: End _02B1: - ScrCmd_065 4 + RemoveObject 4 ClearFlag 0x188 SetVar 0x4087, 2 ReleaseAll diff --git a/res/field/scripts/scripts_unk_1116.s b/res/field/scripts/scripts_unk_1116.s index da97ea99ad..9200afdfbd 100644 --- a/res/field/scripts/scripts_unk_1116.s +++ b/res/field/scripts/scripts_unk_1116.s @@ -123,7 +123,7 @@ _0190: WaitFadeScreen CloseMessage ScrCmd_243 0, 0x800C, 0x8004 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x800C, 0, _02AE diff --git a/res/field/scripts/scripts_valley_windworks_building.s b/res/field/scripts/scripts_valley_windworks_building.s index 5d1d10548b..65426d531e 100644 --- a/res/field/scripts/scripts_valley_windworks_building.s +++ b/res/field/scripts/scripts_valley_windworks_building.s @@ -36,7 +36,7 @@ _005F: ApplyMovement 0, _0098 ApplyMovement 0xFF, _00A0 WaitMovement - ScrCmd_065 0 + RemoveObject 0 SetVar 0x40CF, 1 ReleaseAll End @@ -107,11 +107,11 @@ _0107: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 1 - ScrCmd_065 7 - ScrCmd_065 6 - ScrCmd_065 3 - ScrCmd_065 4 + RemoveObject 1 + RemoveObject 7 + RemoveObject 6 + RemoveObject 3 + RemoveObject 4 SetFlag 0x1A2 ClearFlag 0x17F SetVar 0x4089, 2 diff --git a/res/field/scripts/scripts_valley_windworks_outside.s b/res/field/scripts/scripts_valley_windworks_outside.s index 9bd3c4cb09..bc3b5f18ac 100644 --- a/res/field/scripts/scripts_valley_windworks_outside.s +++ b/res/field/scripts/scripts_valley_windworks_outside.s @@ -46,7 +46,7 @@ _008A: _00AD: SetFlag 0x20B - ScrCmd_065 4 + RemoveObject 4 ClearFlag 142 End @@ -80,7 +80,7 @@ _00CF: ScrCmd_169 77 ScrCmd_16A 77 Message 4 - ScrCmd_065 0 + RemoveObject 0 CloseMessage ReleaseAll End @@ -194,7 +194,7 @@ _0201: ApplyMovement 0xFF, _02C8 ApplyMovement 6, _0324 WaitMovement - ScrCmd_065 6 + RemoveObject 6 SetVar 0x411E, 2 ReleaseAll End diff --git a/res/field/scripts/scripts_valor_cavern.s b/res/field/scripts/scripts_valor_cavern.s index 66d3fd19c1..2bf7262a14 100644 --- a/res/field/scripts/scripts_valor_cavern.s +++ b/res/field/scripts/scripts_valor_cavern.s @@ -32,7 +32,7 @@ _0042: _0069: SetFlag 0x1E0 - ScrCmd_065 0 + RemoveObject 0 ClearFlag 142 Return @@ -84,7 +84,7 @@ _00D3: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 1 + RemoveObject 1 SetFlag 0x13E SetFlag 0x984 FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_valor_lakefront.s b/res/field/scripts/scripts_valor_lakefront.s index 846eb388e2..89cfd11a90 100644 --- a/res/field/scripts/scripts_valor_lakefront.s +++ b/res/field/scripts/scripts_valor_lakefront.s @@ -113,7 +113,7 @@ _01AD: GoTo _01C5 _01C5: - ScrCmd_065 5 + RemoveObject 5 SetFlag 0x211 ClearFlag 0x156 GoTo _0248 @@ -219,7 +219,7 @@ _0248: ApplyMovement 0xFF, _05E8 ApplyMovement 10, _058C WaitMovement - ScrCmd_065 10 + RemoveObject 10 CallCommonScript 0x7FB Message 8 CloseMessage @@ -356,7 +356,7 @@ _0522: GoTo _053A _053A: - ScrCmd_065 0 + RemoveObject 0 SetVar 0x4083, 2 SetFlag 183 SetFlag 0x1A9 @@ -514,7 +514,7 @@ _065A: ScrCmd_169 77 ApplyMovement 8, _06B0 WaitMovement - ScrCmd_065 8 + RemoveObject 8 ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index cfb6917b16..d48e6e45e2 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -109,7 +109,7 @@ _00F6: CallIfEq 0x8004, 0x2AA, _039D CallIfEq 0x8004, 0x2AB, _03B9 CallIfEq 0x8004, 0x2AC, _03D5 - ScrCmd_065 25 + RemoveObject 25 WaitTime 20, 0x800C GetPlayerGender 0x8004 CallIfEq 0x8004, 0, _02A7 @@ -120,7 +120,7 @@ _00F6: CallIfEq 0x8004, 0x2AA, _0405 CallIfEq 0x8004, 0x2AB, _0419 CallIfEq 0x8004, 0x2AC, _042D - ScrCmd_065 6 + RemoveObject 6 SetVar 0x40F5, 1 ReleaseAll End @@ -521,13 +521,13 @@ _0656: GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8005, 0x253, _09F3 CallIfEq 0x8005, 0x255, _09FF - ScrCmd_065 7 + RemoveObject 7 Message 18 CloseMessage GetPlayerMapPos 0x8004, 0x8005 CallIfEq 0x8005, 0x253, _0A0B CallIfEq 0x8005, 0x255, _0A17 - ScrCmd_065 20 + RemoveObject 20 GetPlayerGender 0x8004 CallIfEq 0x8004, 0, _0A23 CallIfEq 0x8004, 1, _0A28 @@ -564,7 +564,7 @@ _0656: ApplyMovement 6, _0B44 ApplyMovement 26, _0A88 WaitMovement - ScrCmd_065 6 + RemoveObject 6 GetPlayerMapPos 0x8004, 0x8005 GoToIfEq 0x8005, 0x253, _083A GoToIfEq 0x8005, 0x255, _0854 @@ -647,7 +647,7 @@ _0919: End _0939: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x271 GoToIfEq 0x800C, 0x186, _099D SetVar 0x8004, 0x272 @@ -656,7 +656,7 @@ _0939: Return _096B: - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x26E GoToIfEq 0x800C, 0x186, _099D SetVar 0x8004, 0x26F @@ -1271,7 +1271,7 @@ _0EA4: End _0ECC: - ScrCmd_065 23 + RemoveObject 23 GoTo _0ED8 End @@ -1536,7 +1536,7 @@ _1184: CloseMessage ApplyMovement 6, _11FC WaitMovement - ScrCmd_065 6 + RemoveObject 6 Call _00BA ClearFlag 0x1A8 ScrCmd_064 6 diff --git a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s index d554da637f..5d722b6c4c 100644 --- a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s +++ b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s @@ -50,8 +50,8 @@ _0086: ApplyMovement 2, _00C8 ApplyMovement 3, _00D0 WaitMovement - ScrCmd_065 2 - ScrCmd_065 3 + RemoveObject 2 + RemoveObject 3 CloseMessage ReleaseAll End @@ -163,15 +163,15 @@ _0197: ApplyMovement 2, _00C8 ApplyMovement 3, _00D0 WaitMovement - ScrCmd_065 2 - ScrCmd_065 3 + RemoveObject 2 + RemoveObject 3 CallIfEq 0x8004, 8, _0282 CallIfEq 0x8004, 9, _028E Message 6 CloseMessage CallIfEq 0x8004, 8, _029A CallIfEq 0x8004, 9, _02AE - ScrCmd_065 4 + RemoveObject 4 SetFlag 0x28A SetVar 0x411F, 4 ReleaseAll diff --git a/res/field/scripts/scripts_veilstone_city_northeast_house.s b/res/field/scripts/scripts_veilstone_city_northeast_house.s index ab132d4d68..7b61965bcd 100644 --- a/res/field/scripts/scripts_veilstone_city_northeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_northeast_house.s @@ -37,7 +37,7 @@ _005B: BufferPlayerName 0 Message 3 WaitSound - ScrCmd_096 137, 25, 0, 0x800C + GivePokemon SPECIES_PORYGON, 25, 0, 0x800C SetFlag 151 Message 4 ScrCmd_03E 0x800C diff --git a/res/field/scripts/scripts_veilstone_city_prize_exchange.s b/res/field/scripts/scripts_veilstone_city_prize_exchange.s index 351d3e64b9..4bc4a3d52a 100644 --- a/res/field/scripts/scripts_veilstone_city_prize_exchange.s +++ b/res/field/scripts/scripts_veilstone_city_prize_exchange.s @@ -120,7 +120,7 @@ _01CB: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x8000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x8000, 0xFF, _0250 diff --git a/res/field/scripts/scripts_veilstone_city_southwest_house.s b/res/field/scripts/scripts_veilstone_city_southwest_house.s index af09100238..4f22a2fb64 100644 --- a/res/field/scripts/scripts_veilstone_city_southwest_house.s +++ b/res/field/scripts/scripts_veilstone_city_southwest_house.s @@ -22,7 +22,7 @@ _000E: WaitFadeScreen ScrCmd_191 ScrCmd_193 0x4000 - ScrCmd_0A1 + ReturnToField FadeScreen 6, 1, 1, 0 WaitFadeScreen GoToIfEq 0x4000, 0xFF, _00EB diff --git a/res/field/scripts/scripts_veilstone_store_1f.s b/res/field/scripts/scripts_veilstone_store_1f.s index 97b5e3f8be..eedde41856 100644 --- a/res/field/scripts/scripts_veilstone_store_1f.s +++ b/res/field/scripts/scripts_veilstone_store_1f.s @@ -86,7 +86,7 @@ _00A9: LockAll FacePlayer GoToIfSet 0x129, _0109 - ScrCmd_0DE 0x800C + GetPlayerStarterSpecies 0x800C CallIfEq 0x800C, 0x183, _0119 CallIfEq 0x800C, 0x186, _0121 CallIfEq 0x800C, 0x189, _0129 diff --git a/res/field/scripts/scripts_verity_cavern.s b/res/field/scripts/scripts_verity_cavern.s index 0d012459f4..e4455831f7 100644 --- a/res/field/scripts/scripts_verity_cavern.s +++ b/res/field/scripts/scripts_verity_cavern.s @@ -22,25 +22,25 @@ _0010: Message 0 CloseMessage SetFlag 0x1DF - ScrCmd_065 0 + RemoveObject 0 WaitTime 8, 0x800C ClearFlag 0x1DF ScrCmd_064 0 WaitTime 8, 0x800C SetFlag 0x1DF - ScrCmd_065 0 + RemoveObject 0 WaitTime 8, 0x800C ClearFlag 0x1DF ScrCmd_064 0 WaitTime 8, 0x800C SetFlag 0x1DF - ScrCmd_065 0 + RemoveObject 0 WaitTime 8, 0x800C ClearFlag 0x1DF ScrCmd_064 0 WaitTime 8, 0x800C SetFlag 0x1DF - ScrCmd_065 0 + RemoveObject 0 ScrCmd_21C 0 Message 1 CloseMessage @@ -94,7 +94,7 @@ _011E: CloseMessage ApplyMovement 1, _01A8 WaitMovement - ScrCmd_065 1 + RemoveObject 1 ReleaseAll End diff --git a/res/field/scripts/scripts_victory_road_1f_room_2.s b/res/field/scripts/scripts_victory_road_1f_room_2.s index a784b0d533..f0e860be30 100644 --- a/res/field/scripts/scripts_victory_road_1f_room_2.s +++ b/res/field/scripts/scripts_victory_road_1f_room_2.s @@ -282,7 +282,7 @@ _0389: GoTo _03A1 _03A1: - ScrCmd_065 28 + RemoveObject 28 SetFlag 230 SetVar 0x4090, 2 ReleaseAll diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index 8744848e71..26714b0cf2 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -1308,7 +1308,7 @@ _1263: ApplyMovement 1, _1468 WaitMovement PlayFanfare SEQ_SE_DP_KAIDAN2 - ScrCmd_065 1 + RemoveObject 1 Return _12A3: @@ -1461,7 +1461,7 @@ _1485: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 15 + RemoveObject 15 FadeScreen 6, 1, 1, 0 WaitFadeScreen ApplyMovement 14, _14FC @@ -1471,7 +1471,7 @@ _1485: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 14 + RemoveObject 14 Call _156D FadeScreen 6, 1, 1, 0 WaitFadeScreen @@ -1518,7 +1518,7 @@ _1532: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_065 15 + RemoveObject 15 Call _156D FadeScreen 6, 1, 1, 0 WaitFadeScreen @@ -2299,74 +2299,74 @@ _2209: Return _22CE: - ScrCmd_065 1 + RemoveObject 1 Return _22D4: - ScrCmd_065 0 + RemoveObject 0 Return _22DA: GoToIfUnset 0x9AB, _2395 - ScrCmd_065 2 + RemoveObject 2 Return _22EB: - ScrCmd_065 3 + RemoveObject 3 Return _22F1: GoToIfUnset 0x9AB, _2395 - ScrCmd_065 4 + RemoveObject 4 Return _2302: GoToIfUnset 0x9AB, _2395 - ScrCmd_065 5 + RemoveObject 5 Return _2313: GoToIfUnset 0x9AC, _2393 - ScrCmd_065 6 + RemoveObject 6 Return _2324: GoToIfUnset 0x9AB, _2395 - ScrCmd_065 7 + RemoveObject 7 Return _2335: GoToIfUnset 0x9AC, _2393 - ScrCmd_065 9 + RemoveObject 9 Return _2346: GoToIfUnset 0x9AB, _2395 - ScrCmd_065 8 + RemoveObject 8 Return _2357: GoToIfUnset 0x9AC, _2393 - ScrCmd_065 10 + RemoveObject 10 Return _2368: - ScrCmd_065 11 + RemoveObject 11 Return _236E: GoToIfUnset 0x9AC, _2393 - ScrCmd_065 12 + RemoveObject 12 Return _237F: - ScrCmd_065 13 - ScrCmd_065 11 + RemoveObject 13 + RemoveObject 11 Return _2389: - ScrCmd_065 7 - ScrCmd_065 10 + RemoveObject 7 + RemoveObject 10 Return _2393: diff --git a/res/field/scripts/scripts_vista_lighthouse.s b/res/field/scripts/scripts_vista_lighthouse.s index cb688afaa9..e866dcda94 100644 --- a/res/field/scripts/scripts_vista_lighthouse.s +++ b/res/field/scripts/scripts_vista_lighthouse.s @@ -80,7 +80,7 @@ _00D2: ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_065 2 + RemoveObject 2 SetFlag 0x162 ReleaseAll End diff --git a/res/field/scripts/scripts_wayward_cave_1f.s b/res/field/scripts/scripts_wayward_cave_1f.s index 6834288a58..b4c40a6a65 100644 --- a/res/field/scripts/scripts_wayward_cave_1f.s +++ b/res/field/scripts/scripts_wayward_cave_1f.s @@ -120,7 +120,7 @@ _016A: GoTo _0182 _0182: - ScrCmd_065 4 + RemoveObject 4 SetFlag 228 SetVar 0x4091, 2 ReleaseAll diff --git a/res/field/scripts/scripts_wifi_plaza_entrance.s b/res/field/scripts/scripts_wifi_plaza_entrance.s index cec413549c..15f41e16bd 100644 --- a/res/field/scripts/scripts_wifi_plaza_entrance.s +++ b/res/field/scripts/scripts_wifi_plaza_entrance.s @@ -70,7 +70,7 @@ _00D9: ScrCmd_0B3 0x800C SetVar 0x8004, 0x800C ScrCmd_2F7 0x8004 - ScrCmd_0A1 + ReturnToField SetVar 0x4080, 1 ScrCmd_1B2 0xFF FadeScreen 6, 1, 1, 0 diff --git a/src/field_menu.c b/src/field_menu.c index bd1d4a1352..1393d5faaa 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -363,7 +363,7 @@ static u32 sub_0203ABD0(FieldSystem *fieldSystem) v0 |= 0x1; } - if (sub_0206B054(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0) { + if (VarsFlags_GetPlayerStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)) == 0) { v0 |= 0x2; } diff --git a/src/map_object.c b/src/map_object.c index bbb3e033c6..401d09c598 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -339,7 +339,7 @@ void MapObject_Delete(MapObject *mapObj) sub_0206243C(mapObj); } -void sub_02061B28(MapObject *mapObj) +void MapObject_SetFlagAndDeleteObject(MapObject *mapObj) { int flag = MapObject_GetFlag(mapObj); FieldSystem_SetFlag(MapObject_FieldSystem(mapObj), flag); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 0f3b30e66f..8c47b48700 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2596,45 +2596,45 @@ static u16 ov5_021E6C20(UnkStruct_02026310 *param0, u8 param1[]) return v4; } -void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, int param4, int param5) +void Egg_CreateEgg(Pokemon *egg, u16 species, u8 param2, TrainerInfo *trainerInfo, int param4, int metLocation) { - u8 v0, v1, v2; - u16 v3; - u8 hatchCycles = SpeciesData_GetSpeciesValue(param1, SPECIES_DATA_HATCH_CYCLES); - Strbuf *v5; + u8 metLvl, isEgg; + u16 ball; + u8 hatchCycles = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_HATCH_CYCLES); + Strbuf *eggName; - Pokemon_InitWith(param0, param1, 1, 32, FALSE, 0, OTID_NOT_SET, 0); + Pokemon_InitWith(egg, species, 1, 32, FALSE, 0, OTID_NOT_SET, 0); - v0 = 0; - v3 = ITEM_POKE_BALL; + metLvl = 0; + ball = ITEM_POKE_BALL; - Pokemon_SetValue(param0, MON_DATA_POKEBALL, &v3); - Pokemon_SetValue(param0, MON_DATA_FRIENDSHIP, &hatchCycles); - Pokemon_SetValue(param0, MON_DATA_MET_LEVEL, &v0); + Pokemon_SetValue(egg, MON_DATA_POKEBALL, &ball); + Pokemon_SetValue(egg, MON_DATA_FRIENDSHIP, &hatchCycles); + Pokemon_SetValue(egg, MON_DATA_MET_LEVEL, &metLvl); if (param2) { - Pokemon_SetValue(param0, MON_DATA_MET_LOCATION, ¶m2); + Pokemon_SetValue(egg, MON_DATA_MET_LOCATION, ¶m2); } - v2 = 1; - Pokemon_SetValue(param0, MON_DATA_IS_EGG, &v2); + isEgg = TRUE; + Pokemon_SetValue(egg, MON_DATA_IS_EGG, &isEgg); - v5 = MessageUtil_SpeciesName(SPECIES_EGG, 4); - Pokemon_SetValue(param0, MON_DATA_NICKNAME_STRBUF, v5); - Strbuf_Free(v5); + eggName = MessageUtil_SpeciesName(SPECIES_EGG, HEAP_ID_FIELD); + Pokemon_SetValue(egg, MON_DATA_NICKNAME_STRBUF, eggName); + Strbuf_Free(eggName); if (param4 == 4) { - u32 v6 = TrainerInfo_ID(param3); - u32 v7 = TrainerInfo_Gender(param3); - Strbuf *v8 = TrainerInfo_NameNewStrbuf(param3, 32); + u32 v6 = TrainerInfo_ID(trainerInfo); + u32 v7 = TrainerInfo_Gender(trainerInfo); + Strbuf *v8 = TrainerInfo_NameNewStrbuf(trainerInfo, 32); - Pokemon_SetValue(param0, MON_DATA_OTNAME_STRBUF, v8); - Pokemon_SetValue(param0, MON_DATA_OT_ID, &v6); - Pokemon_SetValue(param0, MON_DATA_OT_GENDER, &v7); + Pokemon_SetValue(egg, MON_DATA_OTNAME_STRBUF, v8); + Pokemon_SetValue(egg, MON_DATA_OT_ID, &v6); + Pokemon_SetValue(egg, MON_DATA_OT_GENDER, &v7); Strbuf_Free(v8); } - sub_0209304C(param0, param3, param4, param5, 0); + sub_0209304C(egg, trainerInfo, param4, metLocation, 0); } void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 param3, u8 param4) @@ -2699,7 +2699,7 @@ void ov5_021E6EA8(UnkStruct_02026310 *param0, Party *param1, TrainerInfo *param2 ov5_021E67B0(v3, param0); ov5_021E6948(v3, ov5_021E622C(param0, v1[1]), ov5_021E622C(param0, v1[0])); - sub_0209304C(v3, param2, 3, sub_02017070(1, 0), 4); + sub_0209304C(v3, param2, 3, SpecialMetLoc_GetId(1, 0), 4); if (v0 == 172) { ov5_021E6BD0(v3, param0); @@ -3064,7 +3064,7 @@ static void ov5_021E742C(Pokemon *param0, int param1) if (v0 == SPECIES_MANAPHY) { int v17 = Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL); - if (v17 == sub_02017070(2, 1)) { + if (v17 == SpecialMetLoc_GetId(2, 1)) { while (Pokemon_IsPersonalityShiny(v4, v3)) { v3 = ARNG_Next(v3); } diff --git a/src/pokemon.c b/src/pokemon.c index 4d6eff03c3..2837849c28 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -124,7 +124,7 @@ static BOOL Pokemon_HasMove(Pokemon *mon, u16 moveID); static s8 BoxPokemon_GetFlavorAffinity(BoxPokemon *boxMon, int flavor); static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon); static BOOL BoxPokemonHasCuredPokerus(BoxPokemon *boxMon); -static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); +static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId); static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID); static void BoxPokemon_CalcAbility(BoxPokemon *boxMon); @@ -4372,9 +4372,9 @@ BOOL Pokemon_IsEligibleForAction(Pokemon *mon) return sub_02005844(monSpecies, monForm); } -void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5) +void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId) { - InitializeBoxPokemonAfterCapture(&mon->box, param1, monPokeball, param3, param4, param5); + InitializeBoxPokemonAfterCapture(&mon->box, param1, monPokeball, metLocation, metTerrain, heapId); if (monPokeball == ITEM_HEAL_BALL) { int monMaxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL); @@ -4385,12 +4385,12 @@ void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, in } } -static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5) +static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, int heapId) { - UpdateBoxMonStatusAndTrainerInfo(boxMon, param1, 0, param3, param5); + UpdateBoxMonStatusAndTrainerInfo(boxMon, trainer, 0, metLocation, heapId); BoxPokemon_SetValue(boxMon, MON_DATA_MET_GAME, &gGameVersion); BoxPokemon_SetValue(boxMon, MON_DATA_POKEBALL, &monPokeball); - BoxPokemon_SetValue(boxMon, MON_DATA_MET_TERRAIN, ¶m4); + BoxPokemon_SetValue(boxMon, MON_DATA_MET_TERRAIN, &metTerrain); } void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5) diff --git a/src/scrcmd.c b/src/scrcmd.c index 089723a857..5b347d0f15 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -337,7 +337,7 @@ static BOOL ScrCmd_ReleaseAll(ScriptContext *ctx); static BOOL ScrCmd_062(ScriptContext *ctx); static BOOL ScrCmd_063(ScriptContext *ctx); static BOOL ScrCmd_064(ScriptContext *ctx); -static BOOL ScrCmd_065(ScriptContext *ctx); +static BOOL ScrCmd_RemoveObject(ScriptContext *ctx); static BOOL ScrCmd_066(ScriptContext *ctx); static BOOL ScrCmd_067(ScriptContext *ctx); static BOOL ScrCmd_308(ScriptContext *ctx); @@ -360,7 +360,7 @@ static BOOL ScrCmd_09C(ScriptContext *ctx); static BOOL ScrCmd_09D(ScriptContext *ctx); static BOOL ScrCmd_09E(ScriptContext *ctx); static BOOL ScrCmd_09F(ScriptContext *ctx); -static BOOL ScrCmd_0A1(ScriptContext *ctx); +static BOOL ScrCmd_ReturnToField(ScriptContext *ctx); static BOOL ScrCmd_1F8(ScriptContext *ctx); static BOOL ScrCmd_0A2(ScriptContext *ctx); static BOOL ScrCmd_0A3(ScriptContext *ctx); @@ -394,8 +394,8 @@ static BOOL ScrCmd_0B1(ScriptContext *ctx); static BOOL ScrCmd_336(ScriptContext *ctx); static BOOL ScrCmd_0B2(ScriptContext *ctx); static BOOL ScrCmd_0B3(ScriptContext *ctx); -static BOOL ScrCmd_0B4(ScriptContext *ctx); -static BOOL ScrCmd_0B5(ScriptContext *ctx); +static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx); +static BOOL ScrCmd_SaveChosenStarter(ScriptContext *ctx); static BOOL ScrCmd_0BA(ScriptContext *ctx); static BOOL ScrCmd_0BB(ScriptContext *ctx); static BOOL ScrCmd_271(ScriptContext *ctx); @@ -418,7 +418,7 @@ static BOOL ScrCmd_0C9(ScriptContext *ctx); static BOOL ScrCmd_GetPlayerState(ScriptContext *ctx); static BOOL ScrCmd_SetPlayerState(ScriptContext *ctx); static BOOL ScrCmd_ChangePlayerState(ScriptContext *ctx); -static BOOL ScrCmd_0DE(ScriptContext *ctx); +static BOOL ScrCmd_GetPlayerStarterSpecies(ScriptContext *ctx); static BOOL ScrCmd_GetSwarmMapAndSpecies(ScriptContext *ctx); static BOOL ScrCmd_0E6(ScriptContext *ctx); static BOOL ScrCmd_0F2(ScriptContext *ctx); @@ -864,7 +864,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_062, ScrCmd_063, ScrCmd_064, - ScrCmd_065, + ScrCmd_RemoveObject, ScrCmd_066, ScrCmd_067, ScrCmd_FacePlayer, @@ -913,8 +913,8 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_093, ScrCmd_094, ScrCmd_095, - ScrCmd_096, - ScrCmd_097, + ScrCmd_GivePokemon, + ScrCmd_GiveEgg, ScrCmd_098, ScrCmd_099, ScrCmd_09A, @@ -924,7 +924,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_09E, ScrCmd_09F, ScrCmd_0A0, - ScrCmd_0A1, + ScrCmd_ReturnToField, ScrCmd_0A2, ScrCmd_0A3, ScrCmd_0A4, @@ -943,8 +943,8 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_0B1, ScrCmd_0B2, ScrCmd_0B3, - ScrCmd_0B4, - ScrCmd_0B5, + ScrCmd_StartChooseStarterScene, + ScrCmd_SaveChosenStarter, ScrCmd_0B6, ScrCmd_0B7, ScrCmd_0B8, @@ -983,9 +983,9 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_0D9, ScrCmd_BufferSpeciesNameFromVar, ScrCmd_0DB, - ScrCmd_0DC, + ScrCmd_BufferRivalStarterSpeciesName, ScrCmd_0DD, - ScrCmd_0DE, + ScrCmd_GetPlayerStarterSpecies, ScrCmd_BufferUndergroundGoodsName, ScrCmd_BufferUndergroundTrapName, ScrCmd_BufferUndergroundItemName, @@ -3278,7 +3278,7 @@ static BOOL ScrCmd_064(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_065(ScriptContext *ctx) +static BOOL ScrCmd_RemoveObject(ScriptContext *ctx) { MapObject *mapObj; FieldSystem *fieldSystem = ctx->fieldSystem; @@ -3288,10 +3288,10 @@ static BOOL ScrCmd_065(ScriptContext *ctx) if (mapObj == NULL) { GF_ASSERT(FALSE); } else { - sub_02061B28(mapObj); + MapObject_SetFlagAndDeleteObject(mapObj); } - return 0; + return FALSE; } static BOOL ScrCmd_066(ScriptContext *ctx) @@ -3534,7 +3534,7 @@ static BOOL ScrCmd_191(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3C0(32, ctx->fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -3545,7 +3545,7 @@ static BOOL ScrCmd_2A5(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3E4(32, ctx->fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -3712,7 +3712,7 @@ static BOOL ScrCmd_194(ScriptContext *ctx) u16 v4 = ScriptContext_GetVar(ctx); *v0 = sub_0203D578(32, ctx->fieldSystem, v3, v2, v4, v1); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -3754,7 +3754,7 @@ static BOOL ScrCmd_196(ScriptContext *ctx) u16 v1 = ScriptContext_GetVar(ctx); *v0 = sub_0203D5C8(32, ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -3784,7 +3784,7 @@ static BOOL ScrCmd_2E7(ScriptContext *ctx) u16 v2 = ScriptContext_GetVar(ctx); *v0 = sub_0203E63C(32, ctx->fieldSystem, v1, v2); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -3908,21 +3908,21 @@ static BOOL sub_02041D3C(ScriptContext *ctx) return 1; } -BOOL sub_02041D60(ScriptContext *ctx) +BOOL ScrCmd_ResumeScriptOnAppExit(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; if (FieldSystem_IsRunningApplication(fieldSystem)) { - return 0; + return FALSE; } - return 1; + return TRUE; } -static BOOL ScrCmd_0A1(ScriptContext *ctx) +static BOOL ScrCmd_ReturnToField(ScriptContext *ctx) { FieldTransition_StartMap(ctx->fieldSystem->task); - return 1; + return TRUE; } static BOOL ScrCmd_1F8(ScriptContext *ctx) @@ -4216,7 +4216,7 @@ static BOOL ScrCmd_130(ScriptContext *ctx) static BOOL ScrCmd_205(ScriptContext *ctx) { sub_0203E224(ctx->fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -4224,7 +4224,7 @@ static BOOL ScrCmd_205(ScriptContext *ctx) static BOOL ScrCmd_310(ScriptContext *ctx) { sub_0203E704(ctx->fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -4322,7 +4322,7 @@ static BOOL ScrCmd_0AC(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; sub_0203DDFC(fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -4391,7 +4391,7 @@ static BOOL ScrCmd_0B2(ScriptContext *ctx) if (sub_02039074(ctx->fieldSystem->saveData)) { *v1 = 1; sub_0203E0FC(ctx->fieldSystem, v0); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); } else { *v1 = 0; } @@ -4407,34 +4407,34 @@ static BOOL ScrCmd_0B3(ScriptContext *ctx) return 1; } -static BOOL ScrCmd_0B4(ScriptContext *ctx) +static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx) { - ChooseStarterData *v0; - void **v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + ChooseStarterData *chooseStarterData; + void **fieldSysDataPtr = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); - *v1 = Heap_AllocFromHeap(11, sizeof(ChooseStarterData)); - v0 = *v1; + *fieldSysDataPtr = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(ChooseStarterData)); + chooseStarterData = *fieldSysDataPtr; - v0->options = SaveData_Options(ctx->fieldSystem->saveData); + chooseStarterData->options = SaveData_Options(ctx->fieldSystem->saveData); - sub_0203E0C0(ctx->fieldSystem, *v1); - ScriptContext_Pause(ctx, sub_02041D60); + sub_0203E0C0(ctx->fieldSystem, *fieldSysDataPtr); // launches choose_starter application + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); - return 1; + return TRUE; } -static BOOL ScrCmd_0B5(ScriptContext *ctx) +static BOOL ScrCmd_SaveChosenStarter(ScriptContext *ctx) { - ChooseStarterData *v0; - void **v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + ChooseStarterData *chooseStarterData; + void **fieldSysDataPtr = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); - v0 = (*v1); + chooseStarterData = (*fieldSysDataPtr); - sub_0206B044(SaveData_GetVarsFlags(ctx->fieldSystem->saveData), v0->species); + VarsFlags_SetPlayerStarterSpecies(SaveData_GetVarsFlags(ctx->fieldSystem->saveData), chooseStarterData->species); - Heap_FreeToHeap(*v1); + Heap_FreeToHeap(*fieldSysDataPtr); - return 0; + return FALSE; } static BOOL ScrCmd_178(ScriptContext *ctx) @@ -4452,7 +4452,7 @@ static BOOL ScrCmd_178(ScriptContext *ctx) GF_ASSERT(*v0 == 0); *v0 = sub_0203D264(ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -4809,12 +4809,12 @@ static BOOL ScrCmd_GetSwarmMapAndSpecies(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_0DE(ScriptContext *ctx) +static BOOL ScrCmd_GetPlayerStarterSpecies(ScriptContext *ctx) { - u16 *v0 = ScriptContext_GetVarPointer(ctx); + u16 *species = ScriptContext_GetVarPointer(ctx); - *v0 = sub_0206B054(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); - return 0; + *species = VarsFlags_GetPlayerStarterSpecies(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); + return FALSE; } static BOOL ScrCmd_0E6(ScriptContext *ctx) @@ -5124,7 +5124,7 @@ static BOOL ScrCmd_12A(ScriptContext *ctx) static BOOL ScrCmd_12B(ScriptContext *ctx) { sub_0203E0D0(ctx->fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -7471,7 +7471,7 @@ static BOOL ScrCmd_290(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D410(32, ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -7902,7 +7902,7 @@ BOOL ScrCmd_2E2(ScriptContext *ctx) void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E608(ctx->fieldSystem, 32); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -8058,7 +8058,7 @@ static BOOL ScrCmd_2F6(ScriptContext *ctx) if (sub_02039074(ctx->fieldSystem->saveData)) { *v2 = 1; sub_0203E6C0(ctx->fieldSystem, v1, v0); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); } else { *v2 = 0; } @@ -8271,7 +8271,7 @@ static BOOL ScrCmd_313(ScriptContext *ctx) static BOOL ScrCmd_320(ScriptContext *ctx) { sub_0203E714(ctx->fieldSystem); - ScriptContext_Pause(ctx, sub_02041D60); + ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); return 1; } diff --git a/src/unk_02017038.c b/src/unk_02017038.c index 09f119a721..55b7a7311e 100644 --- a/src/unk_02017038.c +++ b/src/unk_02017038.c @@ -28,10 +28,11 @@ int sub_02017058(u32 param0) return param0 - Unk_020E565C[v0]; } -int sub_02017070(int param0, int param1) +// baseValue 1 = Transfer mons and eggs +int SpecialMetLoc_GetId(int baseValue, int modifier) { - GF_ASSERT(param0 < 3); - return Unk_020E565C[param0] + param1; + GF_ASSERT(baseValue < 3); + return Unk_020E565C[baseValue] + modifier; } BOOL sub_0201708C(u16 param0) diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 176004bdb9..7474a1126e 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -289,7 +289,7 @@ BOOL ScrCmd_0DB(ScriptContext *param0) { StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B054(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); + u16 v2 = VarsFlags_GetPlayerStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); Strbuf *v3 = GetSpeciesNameStrbuf(v2, HEAP_ID_FIELD); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -298,17 +298,17 @@ BOOL ScrCmd_0DB(ScriptContext *param0) return 0; } -BOOL ScrCmd_0DC(ScriptContext *param0) +BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *ctx) { - StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); - u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B064(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); - Strbuf *v3 = GetSpeciesNameStrbuf(v2, HEAP_ID_FIELD); + StringTemplate **stringTemplate = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + u8 templateArg = ScriptContext_ReadByte(ctx); + u16 species = VarsFlags_GetRivalStarterSpecies(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); + Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD); - StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); - Strbuf_Free(v3); + StringTemplate_SetStrbuf(*stringTemplate, templateArg, speciesName, 0, 1, GAME_LANGUAGE); + Strbuf_Free(speciesName); - return 0; + return FALSE; } BOOL ScrCmd_0DD(ScriptContext *param0) diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index d2555ba146..be8571a331 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -155,7 +155,7 @@ static BOOL sub_0204BA50(FieldSystem *fieldSystem, void *param1) static void sub_0204BA68(FieldSystem *fieldSystem, void *param1) { - sub_02054930(HEAP_ID_FIELD_TASK, fieldSystem->saveData, 490, 1, 2, 1); + sub_02054930(HEAP_ID_FIELD_TASK, fieldSystem->saveData, SPECIES_MANAPHY, 1, 2, 1); } static void sub_0204BA88(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) @@ -285,7 +285,7 @@ static void sub_0204BAAC(FieldSystem *fieldSystem, void *param1) Strbuf_Free(v15); } - sub_0209304C(v4, v1, 4, sub_02017070(2, v12), 32); + sub_0209304C(v4, v1, 4, SpecialMetLoc_GetId(2, v12), 32); if (Pokemon_GetValue(v4, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(v4, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 9791754a5a..67b74c1a1b 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -28,19 +28,19 @@ #include "unk_0206CCB0.h" #include "unk_020797C8.h" -BOOL ScrCmd_096(ScriptContext *param0) +BOOL ScrCmd_GivePokemon(ScriptContext *ctx) { - int v0 = MapHeader_GetMapLabelTextID(param0->fieldSystem->location->mapId); - int v1 = 24; - Party *v2; - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v4 = ScriptContext_GetVar(param0); - u16 v5 = ScriptContext_GetVar(param0); - u16 v6 = ScriptContext_GetVar(param0); - u16 *v7 = ScriptContext_GetVarPointer(param0); + int metLocation = MapHeader_GetMapLabelTextID(ctx->fieldSystem->location->mapId); + int metTerrain = TERRAIN_MAX; + Party *playerParty; + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 species = ScriptContext_GetVar(ctx); + u16 level = ScriptContext_GetVar(ctx); + u16 heldItem = ScriptContext_GetVar(ctx); + u16 *partyHasRoom = ScriptContext_GetVarPointer(ctx); - v2 = Party_GetFromSavedata(fieldSystem->saveData); - *v7 = sub_020548B0(HEAP_ID_FIELDMAP, fieldSystem->saveData, v4, v5, v6, v0, v1); + playerParty = Party_GetFromSavedata(fieldSystem->saveData); + *partyHasRoom = Pokemon_GiveMonFromScript(HEAP_ID_FIELDMAP, fieldSystem->saveData, species, level, heldItem, metLocation, metTerrain); return 0; } @@ -85,30 +85,30 @@ BOOL ScrCmd_199(ScriptContext *param0) return 0; } -BOOL ScrCmd_097(ScriptContext *param0) +BOOL ScrCmd_GiveEgg(ScriptContext *param0) { - int v0; - u8 v1; - BOOL v2; - Party *v3; - Pokemon *v4; + int specialMetLoc; + u8 partyCount; + BOOL partyHasRoom; + Party *playerParty; + Pokemon *egg; FieldSystem *fieldSystem = param0->fieldSystem; - TrainerInfo *v6 = SaveData_GetTrainerInfo(fieldSystem->saveData); - u16 v7 = ScriptContext_GetVar(param0); - u16 v8 = ScriptContext_GetVar(param0); + TrainerInfo *trainer = SaveData_GetTrainerInfo(fieldSystem->saveData); + u16 species = ScriptContext_GetVar(param0); + u16 eggGiver = ScriptContext_GetVar(param0); - v3 = Party_GetFromSavedata(fieldSystem->saveData); - v1 = Party_GetCurrentCount(v3); + playerParty = Party_GetFromSavedata(fieldSystem->saveData); + partyCount = Party_GetCurrentCount(playerParty); - if (v1 < 6) { - v4 = Pokemon_New(11); - Pokemon_Init(v4); + if (partyCount < 6) { + egg = Pokemon_New(HEAP_ID_FIELDMAP); + Pokemon_Init(egg); - v0 = sub_02017070(1, v8); - ov5_021E6CF0(v4, v7, 1, v6, 3, v0); + specialMetLoc = SpecialMetLoc_GetId(1, eggGiver); + Egg_CreateEgg(egg, species, 1, trainer, 3, specialMetLoc); - v2 = Party_AddPokemon(v3, v4); - Heap_FreeToHeap(v4); + partyHasRoom = Party_AddPokemon(playerParty, egg); + Heap_FreeToHeap(egg); } return 0; diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 0739f815d1..a19587a192 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -27,7 +27,7 @@ BOOL ScrCmd_1C6(ScriptContext *param0) v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19); *v1 = sub_0203D6E4(32, param0->fieldSystem, v0); - ScriptContext_Pause(param0, sub_02041D60); + ScriptContext_Pause(param0, ScrCmd_ResumeScriptOnAppExit); return 1; } @@ -86,7 +86,7 @@ static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 v1->unk_15 = param1; sub_0203E284(param0->fieldSystem, v1); - ScriptContext_Pause(param0, sub_02041D60); + ScriptContext_Pause(param0, ScrCmd_ResumeScriptOnAppExit); Heap_FreeToHeap(param3); } diff --git a/src/unk_02054884.c b/src/unk_02054884.c index 0c55de2847..555add0e92 100644 --- a/src/unk_02054884.c +++ b/src/unk_02054884.c @@ -29,11 +29,11 @@ BOOL Pokemon_CanBattle(Pokemon *mon) return !Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL); } -BOOL sub_020548B0(int heapID, SaveData *saveData, u16 param2, u8 param3, u16 param4, int param5, int param6) +BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain) { BOOL result; Pokemon *mon; - u32 v2; + u32 item; Party *party; TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(saveData); @@ -41,11 +41,11 @@ BOOL sub_020548B0(int heapID, SaveData *saveData, u16 param2, u8 param3, u16 par mon = Pokemon_New(heapID); Pokemon_Init(mon); - Pokemon_InitWith(mon, param2, param3, 32, FALSE, 0, OTID_NOT_SET, 0); - Pokemon_SetCatchData(mon, trainerInfo, ITEM_POKE_BALL, param5, param6, heapID); + Pokemon_InitWith(mon, species, level, 32, FALSE, 0, OTID_NOT_SET, 0); + Pokemon_SetCatchData(mon, trainerInfo, ITEM_POKE_BALL, metLocation, metTerrain, heapID); - v2 = param4; - Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &v2); + item = heldItem; + Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &item); result = Party_AddPokemon(party, mon); if (result) { @@ -67,8 +67,8 @@ BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int par Pokemon_Init(mon); - v0 = sub_02017070(param4, param5); - ov5_021E6CF0(mon, param2, param3, trainerInfo, 4, v0); + v0 = SpecialMetLoc_GetId(param4, param5); + Egg_CreateEgg(mon, param2, param3, trainerInfo, 4, v0); result = Party_AddPokemon(party, mon); Heap_FreeToHeap(mon); diff --git a/src/unk_0206AFE0.c b/src/unk_0206AFE0.c index feabab7b2a..82ff82b7b5 100644 --- a/src/unk_0206AFE0.c +++ b/src/unk_0206AFE0.c @@ -5,6 +5,7 @@ #include "constants/savedata/vars_flags.h" #include "generated/map_headers.h" +#include "generated/species.h" #include "struct_decls/struct_0203A790_decl.h" @@ -18,9 +19,9 @@ static BOOL sub_0206AFE0(VarsFlags *param0, u16 param1, u16 param2); static u16 sub_0206B010(VarsFlags *param0, u16 param1); -BOOL sub_0206B044(VarsFlags *param0, u16 param1); -u16 sub_0206B054(VarsFlags *param0); -u16 sub_0206B064(VarsFlags *param0); +BOOL VarsFlags_SetPlayerStarterSpecies(VarsFlags *param0, u16 param1); +u16 VarsFlags_GetPlayerStarterSpecies(VarsFlags *param0); +u16 VarsFlags_GetRivalStarterSpecies(VarsFlags *param0); u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *param0); void sub_0206B558(VarsFlags *param0, u16 param1); void sub_0206B514(SaveData *param0); @@ -64,30 +65,30 @@ u16 sub_0206B034(VarsFlags *param0) return sub_0206B010(param0, (15 + (((0 + VARS_START) + 32) + 16))); } -BOOL sub_0206B044(VarsFlags *param0, u16 param1) +BOOL VarsFlags_SetPlayerStarterSpecies(VarsFlags *var, u16 species) { - return sub_0206AFE0(param0, (0 + (((0 + VARS_START) + 32) + 16)), param1); + return sub_0206AFE0(var, (0 + (((0 + VARS_START) + 32) + 16)), species); } -u16 sub_0206B054(VarsFlags *param0) +u16 VarsFlags_GetPlayerStarterSpecies(VarsFlags *param0) { return sub_0206B010(param0, (0 + (((0 + VARS_START) + 32) + 16))); } -u16 sub_0206B064(VarsFlags *param0) +u16 VarsFlags_GetRivalStarterSpecies(VarsFlags *vars) { - u16 v0; - u16 v1 = sub_0206B010(param0, (0 + (((0 + VARS_START) + 32) + 16))); + u16 rivalStarter; + u16 playerStarter = sub_0206B010(vars, (0 + (((0 + VARS_START) + 32) + 16))); - if (v1 == 387) { - v0 = 390; - } else if (v1 == 390) { - v0 = 393; + if (playerStarter == SPECIES_TURTWIG) { + rivalStarter = SPECIES_CHIMCHAR; + } else if (playerStarter == SPECIES_CHIMCHAR) { + rivalStarter = SPECIES_PIPLUP; } else { - v0 = 387; + rivalStarter = SPECIES_TURTWIG; } - return v0; + return rivalStarter; } u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *param0) diff --git a/src/unk_02092494.c b/src/unk_02092494.c index a8650887a9..c7bb4bca3f 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -5,6 +5,8 @@ #include "struct_defs/struct_02090800.h" +#include "global/pm_version.h" + #include "heap.h" #include "message.h" #include "pokemon.h" @@ -360,28 +362,28 @@ static void InitializeAlternateMetInfoStrBuf(PokemonInfoDisplayStruct *param0, i switch (Pokemon_GetValue(param0->unk_0C, MON_DATA_MET_GAME, NULL)) { default: - StringTemplate_SetMetLocationName(param0->unk_08, 4, (sub_02017070(1, 7))); + StringTemplate_SetMetLocationName(param0->unk_08, 4, (SpecialMetLoc_GetId(1, 7))); break; - case 4: - case 5: - StringTemplate_SetMetLocationName(param0->unk_08, 4, (sub_02017070(1, 3))); + case FIRERED: + case LEAFGREEN: + StringTemplate_SetMetLocationName(param0->unk_08, 4, (SpecialMetLoc_GetId(1, 3))); break; - case 7: - case 8: - StringTemplate_SetMetLocationName(param0->unk_08, 4, (sub_02017070(1, 4))); + case HEARTGOLD: + case SOULSILVER: + StringTemplate_SetMetLocationName(param0->unk_08, 4, (SpecialMetLoc_GetId(1, 4))); break; - case 2: - case 1: - case 3: - StringTemplate_SetMetLocationName(param0->unk_08, 4, (sub_02017070(1, 5))); + case RUBY: + case SAPPHIRE: + case EMERALD: + StringTemplate_SetMetLocationName(param0->unk_08, 4, (SpecialMetLoc_GetId(1, 5))); break; - case 15: - StringTemplate_SetMetLocationName(param0->unk_08, 4, (sub_02017070(1, 8))); + case COLOSSEUM: + StringTemplate_SetMetLocationName(param0->unk_08, 4, (SpecialMetLoc_GetId(1, 8))); break; - case 10: - case 11: - case 12: - StringTemplate_SetMetLocationName(param0->unk_08, 4, (sub_02017070(1, 7))); + case DIAMOND: + case PEARL: + case PLATINUM: + StringTemplate_SetMetLocationName(param0->unk_08, 4, (SpecialMetLoc_GetId(1, 7))); break; } @@ -670,7 +672,7 @@ static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) if (Pokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) { if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == 0) { - if (Pokemon_GetValue(param0, MON_DATA_HATCH_LOCATION, NULL) == (sub_02017070(0, 55))) { + if (Pokemon_GetValue(param0, MON_DATA_HATCH_LOCATION, NULL) == (SpecialMetLoc_GetId(0, 55))) { v0 = 15; } else if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { if (param1 == 1) { @@ -678,7 +680,7 @@ static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) } else { v0 = 8; } - } else if (Pokemon_GetValue(param0, MON_DATA_HATCH_LOCATION, NULL) == (sub_02017070(1, 1))) { + } else if (Pokemon_GetValue(param0, MON_DATA_HATCH_LOCATION, NULL) == (SpecialMetLoc_GetId(1, 1))) { v0 = 2; } else { if (param1 == 1) { @@ -689,13 +691,13 @@ static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) } } else { if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { - if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 2)) { + if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(1, 2)) { if (param1 == 1) { v0 = 13; } else { v0 = 14; } - } else if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(2, 1)) { + } else if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(2, 1)) { if (param1 == 1) { v0 = 11; } else { @@ -709,7 +711,7 @@ static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) } } } else { - if ((Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 1)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 0)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 9)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 10)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 11))) { + if ((Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(1, 1)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(1, 0)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(1, 9)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(1, 10)) || (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == SpecialMetLoc_GetId(1, 11))) { if (param1 == 1) { v0 = 5; } else { @@ -727,7 +729,7 @@ static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) } else { if (param1 == 1) { if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { - if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == (sub_02017070(2, 1))) { + if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == (SpecialMetLoc_GetId(2, 1))) { v0 = 20; } else { v0 = 18; @@ -756,8 +758,8 @@ void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerIn { switch (sel) { case 0: - if (metLocation > (sub_02017070(1, 0))) { - metLocation = (sub_02017070(2, 2)); + if (metLocation > (SpecialMetLoc_GetId(1, 0))) { + metLocation = (SpecialMetLoc_GetId(2, 2)); } if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) { @@ -774,16 +776,16 @@ void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerIn case 1: if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) { ResetBoxPokemonEggStatus(boxMon, 0); - SetMetLocationForBoxPokemon(boxMon, (sub_02017070(1, 1)), 1); + SetMetLocationForBoxPokemon(boxMon, (SpecialMetLoc_GetId(1, 1)), 1); FinalizeBoxPokemonData(boxMon); } else { ResetBoxPokemonEggStatus(boxMon, 0); - SetMetLocationForBoxPokemon(boxMon, (sub_02017070(1, 1)), 1); + SetMetLocationForBoxPokemon(boxMon, (SpecialMetLoc_GetId(1, 1)), 1); } break; case 2: ResetBoxPokemonEggStatus(boxMon, 0); - SetMetLocationForBoxPokemon(boxMon, (sub_02017070(0, 55)), 1); + SetMetLocationForBoxPokemon(boxMon, (SpecialMetLoc_GetId(0, 55)), 1); FinalizeBoxPokemonData(boxMon); break; case 3: @@ -818,12 +820,12 @@ void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerIn if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) { (void)0; } else { - SetMetLocationForBoxPokemon(boxMon, (sub_02017070(1, 2)), 1); + SetMetLocationForBoxPokemon(boxMon, (SpecialMetLoc_GetId(1, 2)), 1); } break; case 6: - if (metLocation > (sub_02017070(1, 0))) { - metLocation = (sub_02017070(2, 2)); + if (metLocation > (SpecialMetLoc_GetId(1, 0))) { + metLocation = (SpecialMetLoc_GetId(2, 2)); } if (sub_0207884C(boxMon, trainerInfo, heapID) == 0) { From 64abb1b69cfde684449da0934a98d8264c67113a Mon Sep 17 00:00:00 2001 From: TheSylphIsIn Date: Sat, 8 Feb 2025 15:03:52 -0500 Subject: [PATCH 2/4] clean up missing arg names oopsie --- asm/macros/scrcmd.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index c70e0f2127..b50e8717a2 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -852,12 +852,12 @@ .short \arg1 .endm - .macro GivePokemon species, level, arg2, arg3 + .macro GivePokemon species, level, heldItem, successVar .short 150 .short \species .short \level - .short \arg2 - .short \arg3 + .short \heldItem + .short \successVar .endm @ eggGiverTextId corresponds to an entry in special_met_location_names.gmm. 9 is "Traveling Man", 10 is "Riley", 11 is "Cynthia". @@ -1230,9 +1230,9 @@ .byte \arg0 .endm - .macro GetPlayerStarterSpecies arg0 + .macro GetPlayerStarterSpecies destVar .short 222 - .short \arg0 + .short \destVar .endm .macro BufferUndergroundGoodsName templateArg, goods From 67eb129ac857049910b2cec5156492a8a0657ddd Mon Sep 17 00:00:00 2001 From: TheSylphIsIn Date: Sat, 8 Feb 2025 16:38:52 -0500 Subject: [PATCH 3/4] ScrCmd review cleanup --- asm/macros/scrcmd.inc | 2 +- include/pokemon.h | 4 +- include/scrcmd.h | 2 +- include/unk_0203D1B8.h | 2 +- include/unk_020474B8.h | 2 +- include/unk_0204CFFC.h | 2 +- include/unk_02054884.h | 2 +- res/field/scripts/scripts_canalave_city.s | 4 +- res/field/scripts/scripts_eterna_city.s | 3 +- ...cripts_eterna_city_underground_man_house.s | 4 +- res/field/scripts/scripts_fight_area.s | 4 +- .../scripts_hearthome_city_northwest_house.s | 2 +- .../scripts_iron_island_b2f_left_room.s | 3 +- res/field/scripts/scripts_jubilife_city.s | 8 ++-- res/field/scripts/scripts_jubilife_tv_2f.s | 6 +-- res/field/scripts/scripts_mining_museum.s | 2 +- res/field/scripts/scripts_pastoria_city.s | 10 ++--- ...ripts_pokemon_league_north_pokecenter_1f.s | 4 +- res/field/scripts/scripts_route_201.s | 6 +-- res/field/scripts/scripts_route_203.s | 4 +- ...scripts_route_209_gate_to_hearthome_city.s | 4 +- res/field/scripts/scripts_spear_pillar.s | 4 +- res/field/scripts/scripts_survival_area.s | 4 +- res/field/scripts/scripts_trainers_school.s | 8 ++-- res/field/scripts/scripts_veilstone_city.s | 8 ++-- .../scripts_veilstone_city_northeast_house.s | 2 +- .../scripts/scripts_veilstone_store_1f.s | 6 +-- res/text/special_met_location_names.gmm | 26 ++++++------- src/field_battle_data_transfer.c | 4 +- src/overlay005/ov5_021E622C.c | 20 +++++----- src/overlay006/ov6_02246184.c | 2 +- src/overlay006/wild_encounters.c | 2 +- src/overlay087/ov87_021D106C.c | 2 +- src/pokemon.c | 10 ++--- src/roaming_pokemon.c | 2 +- src/scrcmd.c | 38 +++++++++---------- src/string_template.c | 2 +- src/unk_0203D1B8.c | 4 +- src/unk_0204CFFC.c | 12 +++--- src/unk_0204EDA4.c | 4 +- src/unk_02054884.c | 4 +- src/unk_02094EDC.c | 2 +- 42 files changed, 125 insertions(+), 121 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index b50e8717a2..513641c492 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -860,7 +860,7 @@ .short \successVar .endm - @ eggGiverTextId corresponds to an entry in special_met_location_names.gmm. 9 is "Traveling Man", 10 is "Riley", 11 is "Cynthia". + @ eggGiverTextId corresponds to an entry in special_met_location_names.gmm. .macro GiveEgg species, eggGiverTextId .short 151 .short \species diff --git a/include/pokemon.h b/include/pokemon.h index 031f34bb9c..2fbfb27201 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -33,6 +33,8 @@ #define FACE_BACK 0 #define FACE_FRONT 2 +#define INIT_IVS_RANDOM 32 + enum EvolutionClass { EVO_CLASS_BY_LEVEL = 0, EVO_CLASS_BY_TRADE, @@ -805,7 +807,7 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie */ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay); BOOL Pokemon_IsEligibleForAction(Pokemon *mon); -void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId); +void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId); void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); void Pokemon_GiveHeldItem(Pokemon *mon, u32 battleType, int itemRates); BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID); diff --git a/include/scrcmd.h b/include/scrcmd.h index b3940ba240..6663dd0c04 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -4,6 +4,6 @@ #include "field_script_context.h" BOOL sub_02041CC8(ScriptContext *ctx); -BOOL ScrCmd_ResumeScriptOnAppExit(ScriptContext *ctx); +BOOL ScriptContext_WaitForApplication(ScriptContext *ctx); #endif // POKEPLATINUM_SCRCMD_H diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index f661c52c90..7666e67887 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -70,7 +70,7 @@ void sub_0203DE88(FieldSystem *fieldSystem, SaveData *param1); void sub_0203DFE8(FieldTask *param0, int param1, int param2, int param3, int param4, const u16 *param5, u16 *param6); void sub_0203E09C(FieldSystem *fieldSystem, TrainerCard *param1); BOOL sub_0203E0AC(FieldSystem *fieldSystem, void *param1); -void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1); +void FieldSystem_LaunchChooseStarterApp(FieldSystem *fieldSystem, ChooseStarterData *param1); void sub_0203E0D0(FieldSystem *fieldSystem); void sub_0203E0FC(FieldSystem *fieldSystem, int param1); void *sub_0203E1AC(FieldSystem *fieldSystem, int param1, int param2); diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index b9ddd07e26..9cd4f7d8f5 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -23,7 +23,7 @@ BOOL ScrCmd_0D8(ScriptContext *param0); BOOL ScrCmd_0D9(ScriptContext *param0); BOOL ScrCmd_BufferSpeciesNameFromVar(ScriptContext *ctx); BOOL ScrCmd_0DB(ScriptContext *param0); -BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *param0); +BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *ctx); BOOL ScrCmd_0DD(ScriptContext *param0); BOOL ScrCmd_BufferUndergroundGoodsName(ScriptContext *ctx); BOOL ScrCmd_BufferUndergroundTrapName(ScriptContext *ctx); diff --git a/include/unk_0204CFFC.h b/include/unk_0204CFFC.h index d4f2cbf38f..c1247fb2b2 100644 --- a/include/unk_0204CFFC.h +++ b/include/unk_0204CFFC.h @@ -6,7 +6,7 @@ BOOL ScrCmd_GivePokemon(ScriptContext *param0); BOOL ScrCmd_198(ScriptContext *param0); BOOL ScrCmd_199(ScriptContext *param0); -BOOL ScrCmd_GiveEgg(ScriptContext *param0); +BOOL ScrCmd_GiveEgg(ScriptContext *ctx); BOOL ScrCmd_098(ScriptContext *param0); BOOL ScrCmd_099(ScriptContext *param0); BOOL ScrCmd_09A(ScriptContext *param0); diff --git a/include/unk_02054884.h b/include/unk_02054884.h index ba6a377892..4cc4d825f9 100644 --- a/include/unk_02054884.h +++ b/include/unk_02054884.h @@ -8,7 +8,7 @@ #define PARTY_SLOT_NONE 0xFF BOOL Pokemon_CanBattle(Pokemon *mon); -BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 level, u16 param4, int param5, int param6); +BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain); BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int param4, int param5); void sub_02054988(Party *party, int param1, int param2, u16 param3); int Party_HasMonWithMove(Party *party, u16 moveID); diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index 607de85166..2f1faa5202 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -157,8 +157,8 @@ _028A: Message 0 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _02EB - GoToIfEq 0x800C, 0x186, _02F7 + GoToIfEq 0x800C, SPECIES_TURTWIG, _02EB + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _02F7 GoTo _02DF _02DF: diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index c0e095f003..901c3ecaff 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -1,5 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city.h" +#include "res/text/bank/special_met_location_names.h" .data @@ -1179,7 +1180,7 @@ _0E4B: Message 10 Message 16 CloseMessage - GiveEgg SPECIES_TOGEPI, 11 + GiveEgg SPECIES_TOGEPI, SPECIAL_METLOC_NAME_CYNTHIA SetVar 0x407A, 5 Return diff --git a/res/field/scripts/scripts_eterna_city_underground_man_house.s b/res/field/scripts/scripts_eterna_city_underground_man_house.s index f326242338..ff3683279e 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -260,8 +260,8 @@ _0347: _037F: GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x186, _03A3 - GoToIfEq 0x800C, 0x183, _03B5 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _03A3 + GoToIfEq 0x800C, SPECIES_TURTWIG, _03B5 GoTo _03C7 _03A3: diff --git a/res/field/scripts/scripts_fight_area.s b/res/field/scripts/scripts_fight_area.s index fb07bfda56..e1a32585c3 100644 --- a/res/field/scripts/scripts_fight_area.s +++ b/res/field/scripts/scripts_fight_area.s @@ -250,9 +250,9 @@ _0306: _030C: GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x39D - GoToIfEq 0x800C, 0x186, _033E + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _033E SetVar 0x8004, 0x39C - GoToIfEq 0x800C, 0x183, _033E + GoToIfEq 0x800C, SPECIES_TURTWIG, _033E SetVar 0x8004, 0x39B Return diff --git a/res/field/scripts/scripts_hearthome_city_northwest_house.s b/res/field/scripts/scripts_hearthome_city_northwest_house.s index 01a8c688e2..8250786157 100644 --- a/res/field/scripts/scripts_hearthome_city_northwest_house.s +++ b/res/field/scripts/scripts_hearthome_city_northwest_house.s @@ -36,7 +36,7 @@ _0057: BufferPlayerName 0 Message 3 WaitSound - GivePokemon SPECIES_EEVEE, 20, 0, 0x800C + GivePokemon SPECIES_EEVEE, 20, ITEM_NONE, 0x800C SetFlag 0x131 Message 4 ScrCmd_03E 0x800C diff --git a/res/field/scripts/scripts_iron_island_b2f_left_room.s b/res/field/scripts/scripts_iron_island_b2f_left_room.s index 9193de373a..ce1980103e 100644 --- a/res/field/scripts/scripts_iron_island_b2f_left_room.s +++ b/res/field/scripts/scripts_iron_island_b2f_left_room.s @@ -1,5 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/iron_island_b2f_left_room.h" +#include "res/text/bank/special_met_location_names.h" .data @@ -261,7 +262,7 @@ _031C: PlaySound SEQ_FANFA4 WaitSound Message 12 - GiveEgg SPECIES_RIOLU, 10 + GiveEgg SPECIES_RIOLU, SPECIAL_METLOC_NAME_RILEY SetFlag 0x1E5 ClearFlag 226 Call _0371 diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index 626c10d32b..a993ed7f0b 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -913,18 +913,18 @@ _0BAA: _0BCA: GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x268 - GoToIfEq 0x800C, 0x186, _0C2E + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0C2E SetVar 0x8004, 0x269 - GoToIfEq 0x800C, 0x189, _0C2E + GoToIfEq 0x800C, SPECIES_PIPLUP, _0C2E SetVar 0x8004, 0x26A Return _0BFC: GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x265 - GoToIfEq 0x800C, 0x186, _0C2E + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0C2E SetVar 0x8004, 0x266 - GoToIfEq 0x800C, 0x189, _0C2E + GoToIfEq 0x800C, SPECIES_PIPLUP, _0C2E SetVar 0x8004, 0x267 Return diff --git a/res/field/scripts/scripts_jubilife_tv_2f.s b/res/field/scripts/scripts_jubilife_tv_2f.s index 276157a15f..022318c8c2 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_jubilife_tv_2f.s @@ -35,9 +35,9 @@ _0044: FacePlayer GoToIfSet 0x13D, _00A4 GetPlayerStarterSpecies 0x800C - CallIfEq 0x800C, 0x183, _00B4 - CallIfEq 0x800C, 0x186, _00BC - CallIfEq 0x800C, 0x189, _00C4 + CallIfEq 0x800C, SPECIES_TURTWIG, _00B4 + CallIfEq 0x800C, SPECIES_CHIMCHAR, _00BC + CallIfEq 0x800C, SPECIES_PIPLUP, _00C4 SetVar 0x410A, 0x8004 ScrCmd_343 0, 0x8004 Message 1 diff --git a/res/field/scripts/scripts_mining_museum.s b/res/field/scripts/scripts_mining_museum.s index 5ac3852c15..599ec60d89 100644 --- a/res/field/scripts/scripts_mining_museum.s +++ b/res/field/scripts/scripts_mining_museum.s @@ -231,7 +231,7 @@ _03F2: PlaySound SEQ_FANFA4 Message 8 WaitSound - GivePokemon 0x40B4, 20, 0, 0x800C + GivePokemon 0x40B4, 20, ITEM_NONE, 0x800C IncrementGameRecord RECORD_UNK_115 SetVar 0x40B4, 0 Message 9 diff --git a/res/field/scripts/scripts_pastoria_city.s b/res/field/scripts/scripts_pastoria_city.s index efc82a39d5..548d91d156 100644 --- a/res/field/scripts/scripts_pastoria_city.s +++ b/res/field/scripts/scripts_pastoria_city.s @@ -108,9 +108,9 @@ _012F: FacePlayer GoToIfSet 0x128, _0189 GetPlayerStarterSpecies 0x800C - CallIfEq 0x800C, 0x183, _0194 - CallIfEq 0x800C, 0x186, _019C - CallIfEq 0x800C, 0x189, _01A4 + CallIfEq 0x800C, SPECIES_TURTWIG, _0194 + CallIfEq 0x800C, SPECIES_CHIMCHAR, _019C + CallIfEq 0x800C, SPECIES_PIPLUP, _01A4 ScrCmd_261 0, 0x8004 Message 37 SetVar 0x8005, 1 @@ -577,8 +577,8 @@ _04C8: ApplyMovement 26, _05CC WaitMovement GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _054B - GoToIfEq 0x800C, 0x186, _0557 + GoToIfEq 0x800C, SPECIES_TURTWIG, _054B + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0557 GoTo _053F _053F: diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s index df27ca1ed8..bc35e08d4a 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -150,8 +150,8 @@ _01C1: Message 0 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _0203 - GoToIfEq 0x800C, 0x186, _020F + GoToIfEq 0x800C, SPECIES_TURTWIG, _0203 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _020F GoTo _01F7 _01F7: diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index 6f0fc94472..de0b7cbee0 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -284,7 +284,7 @@ _042E: FadeScreen 6, 1, 1, 0 WaitFadeScreen GetPlayerStarterSpecies 0x8000 - GivePokemon 0x8000, 5, 0, 0x800C + GivePokemon 0x8000, 5, ITEM_NONE, 0x800C ApplyMovement 5, _07F8 ApplyMovement 2, _0760 ApplyMovement 0xFF, _0884 @@ -359,8 +359,8 @@ _057A: CloseMessage ScrCmd_06D 2, 15 GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _05BB - GoToIfEq 0x800C, 0x186, _05C5 + GoToIfEq 0x800C, SPECIES_TURTWIG, _05BB + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _05C5 GoTo _05B1 End diff --git a/res/field/scripts/scripts_route_203.s b/res/field/scripts/scripts_route_203.s index 9b947c0348..d95a3181d8 100644 --- a/res/field/scripts/scripts_route_203.s +++ b/res/field/scripts/scripts_route_203.s @@ -91,8 +91,8 @@ _0111: Message 0 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _014C - GoToIfEq 0x800C, 0x186, _0158 + GoToIfEq 0x800C, SPECIES_TURTWIG, _014C + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0158 GoTo _0140 _0140: diff --git a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s index 0f635b2627..abbf716491 100644 --- a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s @@ -33,8 +33,8 @@ _001D: Message 1 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _00B3 - GoToIfEq 0x800C, 0x186, _00C1 + GoToIfEq 0x800C, SPECIES_TURTWIG, _00B3 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _00C1 GoTo _00A5 End diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index d82875c2b6..d04d8b922e 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -338,9 +338,9 @@ _041C: _0424: GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x26C - GoToIfEq 0x800C, 0x186, _0454 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0454 SetVar 0x8004, 0x26B - GoToIfEq 0x800C, 0x183, _0454 + GoToIfEq 0x800C, SPECIES_TURTWIG, _0454 SetVar 0x8004, 0x25F _0454: Return diff --git a/res/field/scripts/scripts_survival_area.s b/res/field/scripts/scripts_survival_area.s index cbd64c22ed..18696ed023 100644 --- a/res/field/scripts/scripts_survival_area.s +++ b/res/field/scripts/scripts_survival_area.s @@ -172,8 +172,8 @@ _01BE: Message 2 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _0236 - GoToIfEq 0x800C, 0x186, _0272 + GoToIfEq 0x800C, SPECIES_TURTWIG, _0236 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0272 GoTo _01FA End diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index 038f7190ff..18594b7a6b 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -170,8 +170,8 @@ _01E7: Message 10 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _0220 - GoToIfEq 0x800C, 0x186, _022E + GoToIfEq 0x800C, SPECIES_TURTWIG, _0220 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _022E GoTo _0212 End @@ -264,8 +264,8 @@ _031A: Message 16 CloseMessage GetPlayerStarterSpecies 0x800C - GoToIfEq 0x800C, 0x183, _0353 - GoToIfEq 0x800C, 0x186, _0361 + GoToIfEq 0x800C, SPECIES_TURTWIG, _0353 + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _0361 GoTo _0345 End diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index d48e6e45e2..09f7a62ffd 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -649,18 +649,18 @@ _0919: _0939: GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x271 - GoToIfEq 0x800C, 0x186, _099D + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _099D SetVar 0x8004, 0x272 - GoToIfEq 0x800C, 0x189, _099D + GoToIfEq 0x800C, SPECIES_PIPLUP, _099D SetVar 0x8004, 0x270 Return _096B: GetPlayerStarterSpecies 0x800C SetVar 0x8004, 0x26E - GoToIfEq 0x800C, 0x186, _099D + GoToIfEq 0x800C, SPECIES_CHIMCHAR, _099D SetVar 0x8004, 0x26F - GoToIfEq 0x800C, 0x189, _099D + GoToIfEq 0x800C, SPECIES_PIPLUP, _099D SetVar 0x8004, 0x26D Return diff --git a/res/field/scripts/scripts_veilstone_city_northeast_house.s b/res/field/scripts/scripts_veilstone_city_northeast_house.s index 7b61965bcd..f0a7bedc88 100644 --- a/res/field/scripts/scripts_veilstone_city_northeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_northeast_house.s @@ -37,7 +37,7 @@ _005B: BufferPlayerName 0 Message 3 WaitSound - GivePokemon SPECIES_PORYGON, 25, 0, 0x800C + GivePokemon SPECIES_PORYGON, 25, ITEM_NONE, 0x800C SetFlag 151 Message 4 ScrCmd_03E 0x800C diff --git a/res/field/scripts/scripts_veilstone_store_1f.s b/res/field/scripts/scripts_veilstone_store_1f.s index eedde41856..e9a643fc73 100644 --- a/res/field/scripts/scripts_veilstone_store_1f.s +++ b/res/field/scripts/scripts_veilstone_store_1f.s @@ -87,9 +87,9 @@ _00A9: FacePlayer GoToIfSet 0x129, _0109 GetPlayerStarterSpecies 0x800C - CallIfEq 0x800C, 0x183, _0119 - CallIfEq 0x800C, 0x186, _0121 - CallIfEq 0x800C, 0x189, _0129 + CallIfEq 0x800C, SPECIES_TURTWIG, _0119 + CallIfEq 0x800C, SPECIES_CHIMCHAR, _0121 + CallIfEq 0x800C, SPECIES_PIPLUP, _0129 SetVar 0x4107, 0x8004 ScrCmd_343 0, 0x8004 Message 3 diff --git a/res/text/special_met_location_names.gmm b/res/text/special_met_location_names.gmm index b4e84a9bdf..ad8dea5e8a 100644 --- a/res/text/special_met_location_names.gmm +++ b/res/text/special_met_location_names.gmm @@ -1,55 +1,55 @@ - + used Day-Care Couple - + used Link trade - + used Link trade - + used Kanto - + used Johto - + used Hoenn - + used Sinnoh - + used ---- - + used Distant land - + used Traveling Man - + used Riley - + used Cynthia - + used Mystery Zone diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 30fa530e81..5115a68c13 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -169,9 +169,9 @@ FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const Fie Bag_TryAddItem(dto->bag, ITEM_POKE_BALL, 20, heapID); mon = Pokemon_New(heapID); - Pokemon_InitWith(mon, VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, FALSE, 0, OTID_NOT_SHINY, 0); + Pokemon_InitWith(mon, VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SHINY, 0); Party_AddPokemon(dto->parties[BATTLER_PLAYER_1], mon); - Pokemon_InitWith(mon, SPECIES_BIDOOF, 2, 32, FALSE, 0, OTID_NOT_SHINY, 0); + Pokemon_InitWith(mon, SPECIES_BIDOOF, 2, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SHINY, 0); Party_AddPokemon(dto->parties[BATTLER_ENEMY_1], mon); Heap_FreeToHeap(mon); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 8c47b48700..743181c4ff 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2603,7 +2603,7 @@ void Egg_CreateEgg(Pokemon *egg, u16 species, u8 param2, TrainerInfo *trainerInf u8 hatchCycles = SpeciesData_GetSpeciesValue(species, SPECIES_DATA_HATCH_CYCLES); Strbuf *eggName; - Pokemon_InitWith(egg, species, 1, 32, FALSE, 0, OTID_NOT_SET, 0); + Pokemon_InitWith(egg, species, 1, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0); metLvl = 0; ball = ITEM_POKE_BALL; @@ -2624,14 +2624,14 @@ void Egg_CreateEgg(Pokemon *egg, u16 species, u8 param2, TrainerInfo *trainerInf Strbuf_Free(eggName); if (param4 == 4) { - u32 v6 = TrainerInfo_ID(trainerInfo); - u32 v7 = TrainerInfo_Gender(trainerInfo); - Strbuf *v8 = TrainerInfo_NameNewStrbuf(trainerInfo, 32); + u32 trainerId = TrainerInfo_ID(trainerInfo); + u32 gender = TrainerInfo_Gender(trainerInfo); + Strbuf *otName = TrainerInfo_NameNewStrbuf(trainerInfo, 32); - Pokemon_SetValue(egg, MON_DATA_OTNAME_STRBUF, v8); - Pokemon_SetValue(egg, MON_DATA_OT_ID, &v6); - Pokemon_SetValue(egg, MON_DATA_OT_GENDER, &v7); - Strbuf_Free(v8); + Pokemon_SetValue(egg, MON_DATA_OTNAME_STRBUF, otName); + Pokemon_SetValue(egg, MON_DATA_OT_ID, &trainerId); + Pokemon_SetValue(egg, MON_DATA_OT_GENDER, &gender); + Strbuf_Free(otName); } sub_0209304C(egg, trainerInfo, param4, metLocation, 0); @@ -2663,7 +2663,7 @@ void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 p } } - Pokemon_InitWith(param0, param1, 1, 32, TRUE, v2, OTID_NOT_SET, 0); + Pokemon_InitWith(param0, param1, 1, INIT_IVS_RANDOM, TRUE, v2, OTID_NOT_SET, 0); v0 = 0; v1 = ITEM_POKE_BALL; @@ -3071,7 +3071,7 @@ static void ov5_021E742C(Pokemon *param0, int param1) } } - Pokemon_InitWith(v16, v0, 1, 32, TRUE, v3, OTID_NOT_SET, 0); + Pokemon_InitWith(v16, v0, 1, INIT_IVS_RANDOM, TRUE, v3, OTID_NOT_SET, 0); for (v7 = 0; v7 < LEARNED_MOVES_MAX; v7++) { Pokemon_SetValue(v16, MON_DATA_MOVE1 + v7, &(v1[v7])); diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c index 3da6d8cb60..f48c5191b3 100644 --- a/src/overlay006/ov6_02246184.c +++ b/src/overlay006/ov6_02246184.c @@ -157,7 +157,7 @@ static void ov6_0224630C(Pokemon *param0, UnkStruct_ov6_0224630C *param1, u32 pa u8 v1; u32 v2; - Pokemon_InitWith(param0, param1->unk_00, param2, 32, TRUE, param1->unk_38, OTID_SET, param1->unk_20); + Pokemon_InitWith(param0, param1->unk_00, param2, INIT_IVS_RANDOM, TRUE, param1->unk_38, OTID_SET, param1->unk_20); v0 = ov6_022462E4(param4, param3); diff --git a/src/overlay006/wild_encounters.c b/src/overlay006/wild_encounters.c index 7651ac4d04..556e87b52a 100644 --- a/src/overlay006/wild_encounters.c +++ b/src/overlay006/wild_encounters.c @@ -1039,7 +1039,7 @@ static void CreateWildMonShinyWithGenderOrNature(const u16 species, const u8 lev } while (TRUE); } - Pokemon_InitWith(newEncounter, species, level, 32, TRUE, newEncounterPersonality, OTID_SET, encounterFieldParams->trainerID); + Pokemon_InitWith(newEncounter, species, level, INIT_IVS_RANDOM, TRUE, newEncounterPersonality, OTID_SET, encounterFieldParams->trainerID); GF_ASSERT(AddWildMonToParty(partyId, encounterFieldParams, newEncounter, battleParams)); Heap_FreeToHeap(newEncounter); diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index fcb3f60d3b..acb79f2b31 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -539,7 +539,7 @@ static void ov87_021D1970(UnkStruct_ov87_021D106C *param0) v2 = param0->unk_04; for (v3 = 0; v3 < v2->unk_14; v3++) { - Pokemon_InitWith(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, 32, TRUE, v2->unk_20[v3].unk_08, OTID_SET, v2->unk_20[v3].unk_0C); + Pokemon_InitWith(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, INIT_IVS_RANDOM, TRUE, v2->unk_20[v3].unk_08, OTID_SET, v2->unk_20[v3].unk_0C); Pokemon_SetValue(param0->unk_1FC, MON_DATA_FORM, (void *)(&(v2->unk_20[v3].unk_13))); Pokemon_BuildArchivedSprite(&v1, param0->unk_1FC, 2); sub_02013720(v1.archive, v1.character, 61, &v0, param0->unk_200, v2->unk_20[v3].unk_08, 0, 2, v2->unk_20[v3].unk_10); diff --git a/src/pokemon.c b/src/pokemon.c index 2837849c28..22244af207 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -124,7 +124,7 @@ static BOOL Pokemon_HasMove(Pokemon *mon, u16 moveID); static s8 BoxPokemon_GetFlavorAffinity(BoxPokemon *boxMon, int flavor); static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon); static BOOL BoxPokemonHasCuredPokerus(BoxPokemon *boxMon); -static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId); +static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId); static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5); static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID); static void BoxPokemon_CalcAbility(BoxPokemon *boxMon); @@ -291,7 +291,7 @@ static void sub_02073E18(BoxPokemon *boxMon, int monSpecies, int monLevel, int m v1 = ITEM_POKE_BALL; BoxPokemon_SetValue(boxMon, MON_DATA_POKEBALL, &v1); - if (monIVs < 32) { + if (monIVs < INIT_IVS_RANDOM) { BoxPokemon_SetValue(boxMon, MON_DATA_HP_IV, &monIVs); BoxPokemon_SetValue(boxMon, MON_DATA_ATK_IV, &monIVs); BoxPokemon_SetValue(boxMon, MON_DATA_DEF_IV, &monIVs); @@ -4372,9 +4372,9 @@ BOOL Pokemon_IsEligibleForAction(Pokemon *mon) return sub_02005844(monSpecies, monForm); } -void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int metLocation, int metTerrain, int heapId) +void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId) { - InitializeBoxPokemonAfterCapture(&mon->box, param1, monPokeball, metLocation, metTerrain, heapId); + InitializeBoxPokemonAfterCapture(&mon->box, trainerInfo, monPokeball, metLocation, metTerrain, heapId); if (monPokeball == ITEM_HEAL_BALL) { int monMaxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL); @@ -4385,7 +4385,7 @@ void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, in } } -static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, int heapId) +static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, enum HeapId heapId) { UpdateBoxMonStatusAndTrainerInfo(boxMon, trainer, 0, metLocation, heapId); BoxPokemon_SetValue(boxMon, MON_DATA_MET_GAME, &gGameVersion); diff --git a/src/roaming_pokemon.c b/src/roaming_pokemon.c index b9fbe83966..42560504ee 100644 --- a/src/roaming_pokemon.c +++ b/src/roaming_pokemon.c @@ -321,7 +321,7 @@ void RoamingPokemon_ActivateSlot(SaveData *saveData, const u8 slot) roamerMonData = Pokemon_New(4); Pokemon_Init(roamerMonData); - Pokemon_InitWith(roamerMonData, species, level, 32, FALSE, 0, OTID_SET, TrainerInfo_ID_LowHalf(trainer)); + Pokemon_InitWith(roamerMonData, species, level, INIT_IVS_RANDOM, FALSE, 0, OTID_SET, TrainerInfo_ID_LowHalf(trainer)); Roamer_SetData(newRoamer, ROAMER_DATA_STATUS, 0); Roamer_SetData(newRoamer, ROAMER_DATA_ACTIVE, 1); Roamer_SetData(newRoamer, ROAMER_DATA_IVS, Pokemon_GetValue(roamerMonData, MON_DATA_COMBINED_IVS, NULL)); diff --git a/src/scrcmd.c b/src/scrcmd.c index 5b347d0f15..24966a60e6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3534,7 +3534,7 @@ static BOOL ScrCmd_191(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3C0(32, ctx->fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -3545,7 +3545,7 @@ static BOOL ScrCmd_2A5(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3E4(32, ctx->fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -3712,7 +3712,7 @@ static BOOL ScrCmd_194(ScriptContext *ctx) u16 v4 = ScriptContext_GetVar(ctx); *v0 = sub_0203D578(32, ctx->fieldSystem, v3, v2, v4, v1); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -3754,7 +3754,7 @@ static BOOL ScrCmd_196(ScriptContext *ctx) u16 v1 = ScriptContext_GetVar(ctx); *v0 = sub_0203D5C8(32, ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -3784,7 +3784,7 @@ static BOOL ScrCmd_2E7(ScriptContext *ctx) u16 v2 = ScriptContext_GetVar(ctx); *v0 = sub_0203E63C(32, ctx->fieldSystem, v1, v2); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -3908,7 +3908,7 @@ static BOOL sub_02041D3C(ScriptContext *ctx) return 1; } -BOOL ScrCmd_ResumeScriptOnAppExit(ScriptContext *ctx) +BOOL ScriptContext_WaitForApplication(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; @@ -4216,7 +4216,7 @@ static BOOL ScrCmd_130(ScriptContext *ctx) static BOOL ScrCmd_205(ScriptContext *ctx) { sub_0203E224(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -4224,7 +4224,7 @@ static BOOL ScrCmd_205(ScriptContext *ctx) static BOOL ScrCmd_310(ScriptContext *ctx) { sub_0203E704(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -4322,7 +4322,7 @@ static BOOL ScrCmd_0AC(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; sub_0203DDFC(fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -4391,7 +4391,7 @@ static BOOL ScrCmd_0B2(ScriptContext *ctx) if (sub_02039074(ctx->fieldSystem->saveData)) { *v1 = 1; sub_0203E0FC(ctx->fieldSystem, v0); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); } else { *v1 = 0; } @@ -4417,8 +4417,8 @@ static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx) chooseStarterData->options = SaveData_Options(ctx->fieldSystem->saveData); - sub_0203E0C0(ctx->fieldSystem, *fieldSysDataPtr); // launches choose_starter application - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + FieldSystem_LaunchChooseStarterApp(ctx->fieldSystem, *fieldSysDataPtr); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return TRUE; } @@ -4452,7 +4452,7 @@ static BOOL ScrCmd_178(ScriptContext *ctx) GF_ASSERT(*v0 == 0); *v0 = sub_0203D264(ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -5124,7 +5124,7 @@ static BOOL ScrCmd_12A(ScriptContext *ctx) static BOOL ScrCmd_12B(ScriptContext *ctx) { sub_0203E0D0(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -6769,7 +6769,7 @@ static void sub_020451B4(FieldSystem *fieldSystem, u16 param1) Pokemon *v1 = Pokemon_New(32); Pokemon_Init(v1); - Pokemon_InitWith(v1, param1, 50, 32, FALSE, 0, OTID_NOT_SET, 0); + Pokemon_InitWith(v1, param1, 50, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0); Pokedex_Encounter(v0, v1); Heap_FreeToHeap(v1); @@ -7471,7 +7471,7 @@ static BOOL ScrCmd_290(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D410(32, ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -7902,7 +7902,7 @@ BOOL ScrCmd_2E2(ScriptContext *ctx) void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E608(ctx->fieldSystem, 32); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } @@ -8058,7 +8058,7 @@ static BOOL ScrCmd_2F6(ScriptContext *ctx) if (sub_02039074(ctx->fieldSystem->saveData)) { *v2 = 1; sub_0203E6C0(ctx->fieldSystem, v1, v0); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); } else { *v2 = 0; } @@ -8271,7 +8271,7 @@ static BOOL ScrCmd_313(ScriptContext *ctx) static BOOL ScrCmd_320(ScriptContext *ctx) { sub_0203E714(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); return 1; } diff --git a/src/string_template.c b/src/string_template.c index cfe6709686..7a25290e26 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -490,7 +490,7 @@ void StringTemplate_SetMetLocationName(StringTemplate *template, u32 idx, u32 lo u32 bankID, msgID; if (metLocationType == 0 && metLocationID == 0) { bankID = sMetLocationBanks[1]; - msgID = pl_msg_00000435_00012; + msgID = SPECIAL_METLOC_NAME_MYSTERY_ZONE; } else { bankID = sMetLocationBanks[2]; msgID = pl_msg_00000434_00002; diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 012745c127..426f0657bd 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1317,7 +1317,7 @@ BOOL sub_0203E0AC(FieldSystem *fieldSystem, void *param1) return 1; } -void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1) +void FieldSystem_LaunchChooseStarterApp(FieldSystem *fieldSystem, ChooseStarterData *chooseStarterData) { FS_EXTERN_OVERLAY(choose_starter); @@ -1328,7 +1328,7 @@ void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1) FS_OVERLAY_ID(choose_starter) }; - FieldSystem_StartChildProcess(fieldSystem, &template, param1); + FieldSystem_StartChildProcess(fieldSystem, &template, chooseStarterData); } void sub_0203E0D0(FieldSystem *fieldSystem) diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 67b74c1a1b..5484d63f6c 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -42,7 +42,7 @@ BOOL ScrCmd_GivePokemon(ScriptContext *ctx) playerParty = Party_GetFromSavedata(fieldSystem->saveData); *partyHasRoom = Pokemon_GiveMonFromScript(HEAP_ID_FIELDMAP, fieldSystem->saveData, species, level, heldItem, metLocation, metTerrain); - return 0; + return FALSE; } BOOL ScrCmd_198(ScriptContext *param0) @@ -85,17 +85,17 @@ BOOL ScrCmd_199(ScriptContext *param0) return 0; } -BOOL ScrCmd_GiveEgg(ScriptContext *param0) +BOOL ScrCmd_GiveEgg(ScriptContext *ctx) { int specialMetLoc; u8 partyCount; BOOL partyHasRoom; Party *playerParty; Pokemon *egg; - FieldSystem *fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; TrainerInfo *trainer = SaveData_GetTrainerInfo(fieldSystem->saveData); - u16 species = ScriptContext_GetVar(param0); - u16 eggGiver = ScriptContext_GetVar(param0); + u16 species = ScriptContext_GetVar(ctx); + u16 eggGiver = ScriptContext_GetVar(ctx); playerParty = Party_GetFromSavedata(fieldSystem->saveData); partyCount = Party_GetCurrentCount(playerParty); @@ -111,7 +111,7 @@ BOOL ScrCmd_GiveEgg(ScriptContext *param0) Heap_FreeToHeap(egg); } - return 0; + return FALSE; } BOOL ScrCmd_098(ScriptContext *param0) diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index a19587a192..4d716e7331 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -27,7 +27,7 @@ BOOL ScrCmd_1C6(ScriptContext *param0) v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19); *v1 = sub_0203D6E4(32, param0->fieldSystem, v0); - ScriptContext_Pause(param0, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(param0, ScriptContext_WaitForApplication); return 1; } @@ -86,7 +86,7 @@ static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 v1->unk_15 = param1; sub_0203E284(param0->fieldSystem, v1); - ScriptContext_Pause(param0, ScrCmd_ResumeScriptOnAppExit); + ScriptContext_Pause(param0, ScriptContext_WaitForApplication); Heap_FreeToHeap(param3); } diff --git a/src/unk_02054884.c b/src/unk_02054884.c index 555add0e92..c69cf77aa9 100644 --- a/src/unk_02054884.c +++ b/src/unk_02054884.c @@ -29,7 +29,7 @@ BOOL Pokemon_CanBattle(Pokemon *mon) return !Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL); } -BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain) +BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain) { BOOL result; Pokemon *mon; @@ -41,7 +41,7 @@ BOOL Pokemon_GiveMonFromScript(int heapID, SaveData *saveData, u16 species, u8 l mon = Pokemon_New(heapID); Pokemon_Init(mon); - Pokemon_InitWith(mon, species, level, 32, FALSE, 0, OTID_NOT_SET, 0); + Pokemon_InitWith(mon, species, level, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0); Pokemon_SetCatchData(mon, trainerInfo, ITEM_POKE_BALL, metLocation, metTerrain, heapID); item = heldItem; diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index 5dc37339f2..1d9441be00 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -622,7 +622,7 @@ void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int par u32 v2; v2 = sub_02074128(param0->unk_14, param0->unk_20_12, 0); - Pokemon_InitWith(param1, param0->unk_14, 10, 32, TRUE, v2, OTID_NOT_SHINY, 0xf0f0f0f); + Pokemon_InitWith(param1, param0->unk_14, 10, INIT_IVS_RANDOM, TRUE, v2, OTID_NOT_SHINY, 0xf0f0f0f); for (v0 = 0; v0 < 4; v0++) { v1 = param0->unk_0C[v0]; From e970e50e18c11e83cf54fcbf7da19c111f2ab5c4 Mon Sep 17 00:00:00 2001 From: TheSylphIsIn Date: Sat, 8 Feb 2025 16:54:52 -0500 Subject: [PATCH 4/4] WaitForApplication rename --- include/scrcmd.h | 2 +- src/scrcmd.c | 34 +++++++++++++++++----------------- src/unk_0204EDA4.c | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/scrcmd.h b/include/scrcmd.h index 6663dd0c04..bcadc78059 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -4,6 +4,6 @@ #include "field_script_context.h" BOOL sub_02041CC8(ScriptContext *ctx); -BOOL ScriptContext_WaitForApplication(ScriptContext *ctx); +BOOL ScriptContext_WaitForApplicationExit(ScriptContext *ctx); #endif // POKEPLATINUM_SCRCMD_H diff --git a/src/scrcmd.c b/src/scrcmd.c index 24966a60e6..dd7d2adfbb 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3534,7 +3534,7 @@ static BOOL ScrCmd_191(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3C0(32, ctx->fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -3545,7 +3545,7 @@ static BOOL ScrCmd_2A5(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3E4(32, ctx->fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -3712,7 +3712,7 @@ static BOOL ScrCmd_194(ScriptContext *ctx) u16 v4 = ScriptContext_GetVar(ctx); *v0 = sub_0203D578(32, ctx->fieldSystem, v3, v2, v4, v1); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -3754,7 +3754,7 @@ static BOOL ScrCmd_196(ScriptContext *ctx) u16 v1 = ScriptContext_GetVar(ctx); *v0 = sub_0203D5C8(32, ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -3784,7 +3784,7 @@ static BOOL ScrCmd_2E7(ScriptContext *ctx) u16 v2 = ScriptContext_GetVar(ctx); *v0 = sub_0203E63C(32, ctx->fieldSystem, v1, v2); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -3908,7 +3908,7 @@ static BOOL sub_02041D3C(ScriptContext *ctx) return 1; } -BOOL ScriptContext_WaitForApplication(ScriptContext *ctx) +BOOL ScriptContext_WaitForApplicationExit(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; @@ -4216,7 +4216,7 @@ static BOOL ScrCmd_130(ScriptContext *ctx) static BOOL ScrCmd_205(ScriptContext *ctx) { sub_0203E224(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -4224,7 +4224,7 @@ static BOOL ScrCmd_205(ScriptContext *ctx) static BOOL ScrCmd_310(ScriptContext *ctx) { sub_0203E704(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -4322,7 +4322,7 @@ static BOOL ScrCmd_0AC(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; sub_0203DDFC(fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -4391,7 +4391,7 @@ static BOOL ScrCmd_0B2(ScriptContext *ctx) if (sub_02039074(ctx->fieldSystem->saveData)) { *v1 = 1; sub_0203E0FC(ctx->fieldSystem, v0); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); } else { *v1 = 0; } @@ -4418,7 +4418,7 @@ static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx) chooseStarterData->options = SaveData_Options(ctx->fieldSystem->saveData); FieldSystem_LaunchChooseStarterApp(ctx->fieldSystem, *fieldSysDataPtr); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return TRUE; } @@ -4452,7 +4452,7 @@ static BOOL ScrCmd_178(ScriptContext *ctx) GF_ASSERT(*v0 == 0); *v0 = sub_0203D264(ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -5124,7 +5124,7 @@ static BOOL ScrCmd_12A(ScriptContext *ctx) static BOOL ScrCmd_12B(ScriptContext *ctx) { sub_0203E0D0(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -7471,7 +7471,7 @@ static BOOL ScrCmd_290(ScriptContext *ctx) v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D410(32, ctx->fieldSystem, v1); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -7902,7 +7902,7 @@ BOOL ScrCmd_2E2(ScriptContext *ctx) void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E608(ctx->fieldSystem, 32); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } @@ -8058,7 +8058,7 @@ static BOOL ScrCmd_2F6(ScriptContext *ctx) if (sub_02039074(ctx->fieldSystem->saveData)) { *v2 = 1; sub_0203E6C0(ctx->fieldSystem, v1, v0); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); } else { *v2 = 0; } @@ -8271,7 +8271,7 @@ static BOOL ScrCmd_313(ScriptContext *ctx) static BOOL ScrCmd_320(ScriptContext *ctx) { sub_0203E714(ctx->fieldSystem); - ScriptContext_Pause(ctx, ScriptContext_WaitForApplication); + ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return 1; } diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 4d716e7331..48fa833f5c 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -27,7 +27,7 @@ BOOL ScrCmd_1C6(ScriptContext *param0) v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19); *v1 = sub_0203D6E4(32, param0->fieldSystem, v0); - ScriptContext_Pause(param0, ScriptContext_WaitForApplication); + ScriptContext_Pause(param0, ScriptContext_WaitForApplicationExit); return 1; } @@ -86,7 +86,7 @@ static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 v1->unk_15 = param1; sub_0203E284(param0->fieldSystem, v1); - ScriptContext_Pause(param0, ScriptContext_WaitForApplication); + ScriptContext_Pause(param0, ScriptContext_WaitForApplicationExit); Heap_FreeToHeap(param3); }